Welcome. WordPress is a very special project to me. Every developer and contributor adds something unique to the mix, and together we create something beautiful that I’m proud to be a part of. Thousands of hours have gone into WordPress, and we’re dedicated to making it better every day. Thank you for making it part of your world.

Installation: Famous 5-minute install

Updating

Using the Automatic Updater

Updating

Using the Automatic Updater

If you are updating from version 2.7 or higher, you can use the automatic updater:

Updating Manually

Migrating from other systems

System Requirements

System Recommendations

Recommendations

Online Resources

If you have any questions that aren’t addressed in this document, please take advantage of WordPress’ numerous online resources:

Final Notes

Share the Love

WordPress has no multi-million dollar marketing campaign or celebrity sponsors, but we do have something even better—you. If you enjoy WordPress please consider telling a friend, setting it up for someone less knowledgable than yourself, or writing the author of a media article that overlooks us.

WordPress is the official continuation of b2/cafélog, which came from Michel V. The work has been continued by the WordPress developers. If you would like to support WordPress, please consider donating.

License

WordPress is free software, and is released under the terms of the GPL version 2 or (at your option) any later version. See license.txt.

@@ -84,7 +85,7 @@ get_header(); get_error_code() || 'blog_taken' == $result->get_error_code() ) { $signup = $result->get_error_data(); @@ -105,28 +106,32 @@ get_header(); echo '

'.$result->get_error_message().'

'; } } else { - extract($result); - $url = get_blogaddress_by_id( (int) $blog_id); - $user = get_userdata( (int) $user_id); + $url = isset( $result['blog_id'] ) ? get_blogaddress_by_id( (int) $result['blog_id'] ) : ''; + $user = get_userdata( (int) $result['user_id'] ); ?>

- -

View your site or Log in'), $url, $url . 'wp-login.php' ); ?>

+ +

View your site or Log in' ), $url, esc_url( $login_url ) ); ?>

- + - -

- -

- - - - - - - -

- -

Version %1$s addressed %2$s bug.', - 'Version %1$s addressed %2$s bugs.', 34 ), '3.9.1', number_format_i18n( 34 ) ); ?> - the release notes.' ), 'http://codex.wordpress.org/Version_3.9.1' ); ?> -

- -

+ +

+ + + +

+ +

Version %s addressed some security issues.' ), '4.5.2' ); ?> + the release notes.' ), 'https://codex.wordpress.org/Version_4.5.2' ); ?> +

Version %1$s addressed %2$s bug.', + 'Version %1$s addressed %2$s bugs.', 12 ), '4.5.1', number_format_i18n( 12 ) ); ?> + the release notes.' ), 'https://codex.wordpress.org/Version_4.5.1' ); ?> +

- -

+ +

- - +

+ +

- -

- '//s.w.org/images/core/3.9/widgets.mp4', - 'ogv' => '//s.w.org/images/core/3.9/widgets.ogv', - 'webm' => '//s.w.org/images/core/3.9/widgets.webm', - 'loop' => true, - 'autoplay' => true, - 'width' => 499 - ) ); - ?> -

- -

- +

+ +

+ customizer.' ), + esc_url( $customize_url ) + ); + } else { + _e( 'Preview mobile, tablet, and desktop views directly in the customizer.' ); + } + ?>

+ Site Identity section of the customizer.' ), + esc_url( add_query_arg( array( 'autofocus' => array( 'section' => 'title_tagline' ) ), $customize_url ) ) + ); + } else { + _e( 'The Twenty Fifteen and Twenty Sixteen themes have been updated to support custom logos, which can be found in the Site Identity section of the customizer.' ); + } + ?>

- -

+ +

comprehensive framework for rendering parts of the preview without rewriting your PHP code in JavaScript.' ), + 'https://make.wordpress.org/core/2016/02/16/selective-refresh-in-the-customizer/' + ); + if ( current_user_can( 'customize' ) && current_user_can( 'edit_theme_options' ) ) { + if ( current_theme_supports( 'menus' ) && ! current_theme_supports( 'customize-selective-refresh-widgets' ) ) { + printf( + /* translators: %s: URL to Menus section of the customizer */ + ' ' . __( 'See it in action with Menus.' ), + esc_url( add_query_arg( array( 'autofocus' => array( 'panel' => 'nav_menus' ) ), $customize_url ) ) + ); + } elseif ( current_theme_supports( 'customize-selective-refresh-widgets' ) ) { // If widgets are supported, menus are also because of the menus widget. + printf( + /* translators: 1: URL to Menus section of the customizer, 2: URL to Widgets section of the customizer */ + ' ' . __( 'See it in action with Menus or Widgets.' ), + esc_url( add_query_arg( array( 'autofocus' => array( 'panel' => 'nav_menus' ) ), $customize_url ) ), + esc_url( add_query_arg( array( 'autofocus' => array( 'panel' => 'widgets' ) ), $customize_url ) ) + ); + } + } + ?>

It’s really cool.' ), + 'https://make.wordpress.org/core/2016/03/12/performance-improvements-for-images-in-wordpress-4-5/' + ); + ?>

wp_add_inline_script()' + ); + ?>

directly overridden by themes via the template hierarchy.' ), + 'https://make.wordpress.org/core/2016/03/11/embeds-changes-in-wordpress-4-5/' + ); + ?>

+ + + + | + + +

doing_action() and doing_filter(), and manipulate custom image sizes with has_image_size() and remove_image_size().' ); ?>

- -

- - | - - -

- -

Version %1$s addressed a security issue.', - 'Version %1$s addressed some security issues.' ); +/* translators: %s: WordPress version number */ +__( 'Version %s addressed one security issue.' ); +/* translators: %s: WordPress version number */ +__( 'Version %s addressed some security issues.' ); /* translators: 1: WordPress version number, 2: plural number of bugs. */ _n_noop( 'Version %1$s addressed %2$s bug.', @@ -277,4 +224,5 @@ _n_noop( 'Version %1$s addressed a security issue and fixed %2$ _n_noop( 'Version %1$s addressed some security issues and fixed %2$s bug.', 'Version %1$s addressed some security issues and fixed %2$s bugs.' ); +/* translators: %s: Codex URL */ __( 'For more information, see the release notes.' ); diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php index f7aae0f..f3a816a 100644 --- a/wp-admin/admin-ajax.php +++ b/wp-admin/admin-ajax.php @@ -5,7 +5,7 @@ * @package WordPress * @subpackage Administration * - * @link http://codex.wordpress.org/AJAX_in_Plugins + * @link https://codex.wordpress.org/AJAX_in_Plugins */ /** @@ -14,12 +14,14 @@ * @since 2.1.0 */ define( 'DOING_AJAX', true ); -define( 'WP_ADMIN', true ); +if ( ! defined( 'WP_ADMIN' ) ) { + define( 'WP_ADMIN', true ); +} /** 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 @@ -54,13 +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', 'delete-inactive-widgets', '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', + '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', 'crop-image', 'generate-password', 'save-wporg-username', ); +// 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 ); @@ -74,7 +81,7 @@ if ( is_user_logged_in() ) { /** * Fires authenticated AJAX actions for logged-in users. * - * The dynamic portion of the hook name, $_REQUEST['action'], + * The dynamic portion of the hook name, `$_REQUEST['action']`, * refers to the name of the AJAX action callback being fired. * * @since 2.1.0 @@ -84,7 +91,7 @@ if ( is_user_logged_in() ) { /** * Fires non-authenticated AJAX actions for logged-out users. * - * The dynamic portion of the hook name, $_REQUEST['action'], + * The dynamic portion of the hook name, `$_REQUEST['action']`, * refers to the name of the AJAX action callback being fired. * * @since 2.8.0 diff --git a/wp-admin/admin-footer.php b/wp-admin/admin-footer.php index 0619c86..a99eaba 100644 --- a/wp-admin/admin-footer.php +++ b/wp-admin/admin-footer.php @@ -15,7 +15,7 @@ if ( !defined('ABSPATH') )

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' ); @@ -34,7 +46,7 @@ else $admin_title = sprintf( __( '%1$s ‹ %2$s — WordPress' ), $title, $admin_title ); /** - * Filter the content for an admin page. + * Filter the title tag content for an admin page. * * @since 3.1.0 * @@ -108,14 +120,17 @@ do_action( "admin_print_scripts-$hook_suffix" ); do_action( 'admin_print_scripts' ); /** - * Fires in <head> for a specific admin page based on $hook_suffix. + * Fires in head section for a specific admin page. + * + * The dynamic portion of the hook, `$hook_suffix`, refers to the hook suffix + * for the admin page. * * @since 2.1.0 */ do_action( "admin_head-$hook_suffix" ); /** - * Fires in <head> for all admin pages. + * Fires in head section for all admin pages. * * @since 2.1.0 */ @@ -159,30 +174,34 @@ $admin_body_class .= ' no-customize-support no-svg'; </head> <?php /** - * Filter the admin <body> CSS classes. + * Filter the CSS classes for the body tag in the admin. + * + * This filter differs from the {@see 'post_class'} and {@see 'body_class'} filters + * in two important ways: * - * This filter differs from the post_class or body_class filters in two important ways: - * 1. $classes is a space-separated string of class names instead of an array. - * 2. Not all core admin classes are filterable, notably: wp-admin, wp-core-ui, and no-js cannot be removed. + * 1. `$classes` is a space-separated string of class names instead of an array. + * 2. Not all core admin classes are filterable, notably: wp-admin, wp-core-ui, + * and no-js cannot be removed. * * @since 2.3.0 * - * @param string $classes Space-separated string of CSS classes. + * @param string $classes Space-separated list of CSS classes. */ +$admin_body_classes = apply_filters( 'admin_body_class', '' ); ?> -<body class="wp-admin wp-core-ui no-js <?php echo apply_filters( 'admin_body_class', '' ) . " $admin_body_class"; ?>"> +<body class="wp-admin wp-core-ui no-js <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>"> <script type="text/javascript"> document.body.className = document.body.className.replace('no-js','js'); </script> <?php // Make sure the customize body classes are correct as early as possible. -if ( current_user_can( 'edit_theme_options' ) ) +if ( current_user_can( 'customize' ) ) { wp_customize_support_script(); +} ?> <div id="wpwrap"> -<a tabindex="1" href="#wpbody-content" class="screen-reader-shortcut"><?php _e('Skip to main content'); ?></a> <?php require(ABSPATH . 'wp-admin/menu-header.php'); ?> <div id="wpcontent"> @@ -195,7 +214,7 @@ if ( current_user_can( 'edit_theme_options' ) ) do_action( 'in_admin_header' ); ?> -<div id="wpbody"> +<div id="wpbody" role="main"> <?php unset($title_class, $blog_name, $total_update_count, $update_title); diff --git a/wp-admin/admin-post.php b/wp-admin/admin-post.php index 7103994..d3135f2 100644 --- a/wp-admin/admin-post.php +++ b/wp-admin/admin-post.php @@ -9,14 +9,16 @@ */ /** We are located in WordPress Administration Screens */ -define('WP_ADMIN', true); +if ( ! defined( 'WP_ADMIN' ) ) { + define( 'WP_ADMIN', true ); +} if ( defined('ABSPATH') ) require_once(ABSPATH . 'wp-load.php'); 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'); @@ -26,20 +28,44 @@ nocache_headers(); /** This action is documented in wp-admin/admin.php */ do_action( 'admin_init' ); -$action = 'admin_post'; +$action = empty( $_REQUEST['action'] ) ? '' : $_REQUEST['action']; -if ( !wp_validate_auth_cookie() ) - $action .= '_nopriv'; - -if ( !empty($_REQUEST['action']) ) - $action .= '_' . $_REQUEST['action']; - -/** - * Fires the requested handler action. - * - * admin_post_nopriv_{$_REQUEST['action']} is called for not-logged-in users. - * admin_post_{$_REQUEST['action']} is called for logged-in users. - * - * @since 2.6.0 - */ -do_action( $action ); +if ( ! wp_validate_auth_cookie() ) { + if ( empty( $action ) ) { + /** + * Fires on a non-authenticated admin post request where no action was supplied. + * + * @since 2.6.0 + */ + do_action( 'admin_post_nopriv' ); + } else { + /** + * Fires on a non-authenticated admin post request for the given action. + * + * The dynamic portion of the hook name, `$action`, refers to the given + * request action. + * + * @since 2.6.0 + */ + do_action( "admin_post_nopriv_{$action}" ); + } +} else { + if ( empty( $action ) ) { + /** + * Fires on an authenticated admin post request where no action was supplied. + * + * @since 2.6.0 + */ + do_action( 'admin_post' ); + } else { + /** + * Fires on an authenticated admin post request for the given action. + * + * The dynamic portion of the hook name, `$action`, refers to the given + * request action. + * + * @since 2.6.0 + */ + do_action( "admin_post_{$action}" ); + } +} diff --git a/wp-admin/admin.php b/wp-admin/admin.php index a617d11..a54ca21 100644 --- a/wp-admin/admin.php +++ b/wp-admin/admin.php @@ -11,8 +11,9 @@ * * @since 2.3.2 */ -if ( ! defined('WP_ADMIN') ) - define('WP_ADMIN', true); +if ( ! defined( 'WP_ADMIN' ) ) { + define( 'WP_ADMIN', true ); +} if ( ! defined('WP_NETWORK_ADMIN') ) define('WP_NETWORK_ADMIN', false); @@ -50,19 +51,23 @@ if ( get_option('db_upgraded') ) { * Filter whether to attempt to perform the multisite DB upgrade routine. * * In single site, the user would be redirected to wp-admin/upgrade.php. - * In multisite, it is automatically fired, but only when this filter - * returns true. + * In multisite, the DB upgrade routine is automatically fired, but only + * when this filter returns true. * * If the network is 50 sites or less, it will run every time. Otherwise, * it will throttle itself to reduce load. * * @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(); - // If 50 or fewer sites, run every time. Else, run "about ten percent" of the time. Shh, don't check that math. + + /* + * If there are 50 or fewer sites, run every time. Otherwise, throttle to reduce load: + * attempt to do no more than threshold value, with some +/- allowed. + */ if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int)( $c / 50 ) ) == 1 ) ) { require_once( ABSPATH . WPINC . '/http.php' ); $response = wp_remote_get( admin_url( 'upgrade.php?step=1' ), array( 'timeout' => 120, 'httpversion' => '1.1' ) ); @@ -79,16 +84,35 @@ require_once(ABSPATH . 'wp-admin/includes/admin.php'); auth_redirect(); // Schedule trash collection -if ( !wp_next_scheduled('wp_scheduled_delete') && !defined('WP_INSTALLING') ) +if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) && ! wp_installing() ) wp_schedule_event(time(), 'daily', 'wp_scheduled_delete'); 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' ); + + + +/** + * $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; + $editing = false; if ( isset($_GET['page']) ) { @@ -122,7 +146,7 @@ if ( current_user_can( 'manage_options' ) ) { * 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 * @@ -137,7 +161,7 @@ if ( current_user_can( 'manage_options' ) ) { * 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 */ @@ -150,7 +174,8 @@ if ( isset($plugin_page) ) { $the_parent = $pagenow; if ( ! $page_hook = get_plugin_page_hook($plugin_page, $the_parent) ) { $page_hook = get_plugin_page_hook($plugin_page, $plugin_page); - // backwards compatibility for plugins using add_management_page + + // Backwards compatibility for plugins using add_management_page(). if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php') ) { // There could be plugin specific params on the URL, so we need the whole query string if ( !empty($_SERVER[ 'QUERY_STRING' ]) ) @@ -165,12 +190,13 @@ if ( isset($plugin_page) ) { } $hook_suffix = ''; -if ( isset($page_hook) ) +if ( isset( $page_hook ) ) { $hook_suffix = $page_hook; -else if ( isset($plugin_page) ) +} elseif ( isset( $plugin_page ) ) { $hook_suffix = $plugin_page; -else if ( isset($pagenow) ) +} elseif ( isset( $pagenow ) ) { $hook_suffix = $pagenow; +} set_current_screen(); @@ -183,14 +209,14 @@ if ( isset($plugin_page) ) { * The load-* hook fires in a number of contexts. This hook is for plugin screens * where a callback is provided when the screen is registered. * - * The dynamic portion of the hook name, $page_hook, refers to a mixture of plugin + * The dynamic portion of the hook name, `$page_hook`, refers to a mixture of plugin * page information including: * 1. The page type. If the plugin page is registered as a submenu page, such as for * Settings, the page type would be 'settings'. Otherwise the type is 'toplevel'. * 2. A separator of '_page_'. * 3. The plugin basename minus the file extension. * - * Together, the three parts form the $page_hook. Citing the example above, + * Together, the three parts form the `$page_hook`. Citing the example above, * the hook name used would be 'load-settings_page_pluginbasename'. * * @see get_plugin_page_hook() @@ -204,8 +230,7 @@ if ( isset($plugin_page) ) { /** * Used to call the registered callback for a plugin screen. * - * @access private - * + * @ignore * @since 1.5.0 */ do_action( $page_hook ); @@ -222,7 +247,7 @@ if ( isset($plugin_page) ) { * The load-* hook fires in a number of contexts. This hook is for plugin screens * where the file to load is directly included, rather than the use of a function. * - * The dynamic portion of the hook name, $plugin_page, refers to the plugin basename. + * The dynamic portion of the hook name, `$plugin_page`, refers to the plugin basename. * * @see plugin_basename() * @@ -242,7 +267,7 @@ if ( isset($plugin_page) ) { include(ABSPATH . 'wp-admin/admin-footer.php'); exit(); -} else if (isset($_GET['import'])) { +} elseif ( isset( $_GET['import'] ) ) { $importer = $_GET['import']; @@ -262,7 +287,7 @@ if ( isset($plugin_page) ) { /** * Fires before an importer screen is loaded. * - * The dynamic portion of the hook name, $importer, refers to the importer slug. + * The dynamic portion of the hook name, `$importer`, refers to the importer slug. * * @since 3.5.0 */ @@ -287,10 +312,11 @@ if ( isset($plugin_page) ) { * * @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 ) ) + if ( apply_filters( 'force_filtered_html_on_import', false ) ) { kses_init_filters(); // Always filter imported data with kses on multisite. + } call_user_func($wp_importers[$importer][2]); @@ -306,15 +332,19 @@ if ( isset($plugin_page) ) { * * The load-* hook fires in a number of contexts. This hook is for core screens. * - * The dynamic portion of the hook name, $pagenow, is a global variable + * The dynamic portion of the hook name, `$pagenow`, is a global variable * referring to the filename of the current page, such as 'admin.php', - * 'post-new.php' etc. A complete hook for the latter would be 'load-post-new.php'. + * 'post-new.php' etc. A complete hook for the latter would be + * 'load-post-new.php'. * * @since 2.1.0 */ do_action( 'load-' . $pagenow ); - // Backwards compatibility with old load-page-new.php, load-page.php, - // and load-categories.php actions. + + /* + * The following hooks are fired to ensure backward compatibility. + * In all other cases, 'load-' . $pagenow should be used instead. + */ if ( $typenow == 'page' ) { if ( $pagenow == 'post-new.php' ) do_action( 'load-page-new.php' ); @@ -325,6 +355,8 @@ if ( isset($plugin_page) ) { 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' ); } } @@ -332,8 +364,8 @@ if ( ! empty( $_REQUEST['action'] ) ) { /** * Fires when an 'action' request variable is sent. * - * The dynamic portion of the hook name, $_REQUEST['action'], - * refers to the action derived from the GET or POST request. + * The dynamic portion of the hook name, `$_REQUEST['action']`, + * refers to the action derived from the `GET` or `POST` request. * * @since 2.6.0 */ diff --git a/wp-admin/async-upload.php b/wp-admin/async-upload.php index e43fb58..371a65d 100644 --- a/wp-admin/async-upload.php +++ b/wp-admin/async-upload.php @@ -1,6 +1,6 @@ <?php /** - * Accepts file uploads from swfupload or other asynchronous upload methods. + * Server-side file upload handler from wp-plupload, swfupload or other asynchronous upload methods. * * @package WordPress * @subpackage Administration @@ -10,7 +10,9 @@ if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] define( 'DOING_AJAX', true ); } -define('WP_ADMIN', true); +if ( ! defined( 'WP_ADMIN' ) ) { + define( 'WP_ADMIN', true ); +} if ( defined('ABSPATH') ) require_once(ABSPATH . 'wp-load.php'); @@ -30,13 +32,10 @@ if ( ! ( isset( $_REQUEST['action'] ) && 'upload-attachment' == $_REQUEST['actio require_once( ABSPATH . 'wp-admin/admin.php' ); -if ( !current_user_can('upload_files') ) - wp_die(__('You do not have permission to upload files.')); - -header('Content-Type: text/html; charset=' . get_option('blog_charset')); +header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) ); if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) { - include ABSPATH . 'wp-admin/includes/ajax-actions.php'; + include( ABSPATH . 'wp-admin/includes/ajax-actions.php' ); send_nosniff_header(); nocache_headers(); @@ -45,6 +44,10 @@ if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] die( '0' ); } +if ( ! current_user_can( 'upload_files' ) ) { + wp_die( __( 'You do not have permission to upload files.' ) ); +} + // just fetch the detail form for that attachment if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) { $post = get_post( $id ); @@ -58,7 +61,10 @@ if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id if ( $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true ) ) echo '<img class="pinkynail" src="' . esc_url( $thumb_url[0] ) . '" alt="" />'; echo '<a class="edit-attachment" href="' . esc_url( get_edit_post_link( $id ) ) . '" target="_blank">' . _x( 'Edit', 'media item' ) . '</a>'; - $title = $post->post_title ? $post->post_title : wp_basename( $post->guid ); // title shouldn't ever be empty, but use filename just in cas.e + + // Title shouldn't ever be empty, but use filename just in case. + $file = get_attached_file( $post->ID ); + $title = $post->post_title ? $post->post_title : wp_basename( $file ); echo '<div class="filename new"><span class="title">' . esc_html( wp_html_excerpt( $title, 60, '…' ) ) . '</span></div>'; break; case 2 : @@ -84,24 +90,24 @@ if ( isset( $_REQUEST['post_id'] ) ) { $id = media_handle_upload( 'async-upload', $post_id ); if ( is_wp_error($id) ) { - echo '<div class="error-div"> + echo '<div class="error-div error"> <a class="dismiss" href="#" onclick="jQuery(this).parents(\'div.media-item\').slideUp(200, function(){jQuery(this).remove();});">' . __('Dismiss') . '</a> - <strong>' . sprintf(__('“%s” has failed to upload due to an error'), esc_html($_FILES['async-upload']['name']) ) . '</strong><br />' . + <strong>' . sprintf(__('“%s” has failed to upload.'), esc_html($_FILES['async-upload']['name']) ) . '</strong><br />' . esc_html($id->get_error_message()) . '</div>'; exit; } if ( $_REQUEST['short'] ) { - // short form response - attachment ID only + // Short form response - attachment ID only. echo $id; } else { - // long form response - big chunk o html + // Long form response - big chunk o html. $type = $_REQUEST['type']; /** * Filter the returned ID of an uploaded attachment. * - * The dynamic portion of the hook name, $type, refers to the attachment type, + * The dynamic portion of the hook name, `$type`, refers to the attachment type, * such as 'image', 'audio', 'video', 'file', etc. * * @since 2.5.0 diff --git a/wp-admin/comment.php b/wp-admin/comment.php index 30c8d6d..ba700ba 100644 --- a/wp-admin/comment.php +++ b/wp-admin/comment.php @@ -12,6 +12,10 @@ 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') ); if ( isset( $_POST['deletecomment'] ) ) @@ -29,17 +33,6 @@ if ( isset( $_GET['dt'] ) ) { $action = 'trash'; } -/** - * Display error message at bottom of comments. - * - * @param string $msg Error Message. Assumed to contain HTML and be sanitized. - */ -function comment_footer_die( $msg ) { - echo "<div class='wrap'><p>$msg</p></div>"; - include( ABSPATH . 'wp-admin/admin-footer.php' ); - die; -} - switch( $action ) { case 'editcomment' : @@ -55,7 +48,7 @@ case 'editcomment' : get_current_screen()->set_help_sidebar( '<p><strong>' . __( 'For more information:' ) . '</strong></p>' . - '<p>' . __( '<a href="http://codex.wordpress.org/Administration_Screens#Comments" target="_blank">Documentation on Comments</a>' ) . '</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>' ); @@ -65,7 +58,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.') ); @@ -88,7 +81,7 @@ case 'spam' : $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(); } @@ -111,21 +104,19 @@ case 'spam' : $nonce_action .= $comment_id; ?> -<div class='wrap'> - -<div class="narrow"> +<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 = __('Spam Comment'); + $button = _x( 'Mark as Spam', 'comment' ); break; case 'trash' : $caution_msg = __('You are about to move the following comment to the Trash:'); - $button = __('Trash Comment'); + $button = __('Move to Trash'); break; case 'delete' : $caution_msg = __('You are about to delete the following comment:'); @@ -150,53 +141,96 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved $message = __('This comment is currently in the Trash.'); break; } - if ( $message ) - echo '<div class="updated"><p>' . $message . '</p></div>'; + if ( $message ) { + 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 class="alt"> +<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('E-mail'); ?></th> -<td><?php echo $comment->comment_author_email; ?></td> +<th scope="row"><?php _e('Email'); ?></th> +<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> + <th scope="row"><?php /* translators: column name or table row header */ _e( 'In Response To' ); ?></th> + <td> + <?php + $post_id = $comment->comment_post_ID; + if ( current_user_can( 'edit_post', $post_id ) ) { + $post_link = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>"; + $post_link .= esc_html( get_the_title( $post_id ) ) . '</a>'; + } else { + $post_link = esc_html( get_the_title( $post_id ) ); + } + echo $post_link; + + if ( $comment->comment_parent ) { + $parent = get_comment( $comment->comment_parent ); + $parent_link = esc_url( get_comment_link( $parent ) ); + $name = get_comment_author( $parent ); + printf( + /* translators: %s: comment link */ + ' | ' . __( 'In reply to %s.' ), + '<a href="' . $parent_link . '">' . $name . '</a>' + ); + } + ?> + </td> +</tr> +<tr> + <th scope="row"><?php _e( 'Submitted on' ); ?></th> + <td> + <?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&c={$comment->comment_ID}" ); ?>"><?php esc_attr_e( 'Edit' ); ?></a></p> +</td> </tr> </table> -<p><?php _e('Are you sure you want to do this?'); ?></p> +<form action="comment.php" method="get" class="comment-ays-submit"> -<form action='comment.php' method='get'> - -<table width="100%"> -<tr> -<td><a class="button" href="<?php echo admin_url('edit-comments.php'); ?>"><?php esc_attr_e('No'); ?></a></td> -<td class="textright"><?php submit_button( $button, 'button' ); ?></td> -</tr> -</table> +<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> +</p> <?php wp_nonce_field( $nonce_action ); ?> -<input type='hidden' name='action' value='<?php echo esc_attr($formaction); ?>' /> -<input type='hidden' name='c' value='<?php echo esc_attr($comment->comment_ID); ?>' /> -<input type='hidden' name='noredir' value='1' /> +<input type="hidden" name="action" value="<?php echo esc_attr($formaction); ?>" /> +<input type="hidden" name="c" value="<?php echo esc_attr($comment->comment_ID); ?>" /> +<input type="hidden" name="noredir" value="1" /> </form> -</div> </div> <?php break; @@ -218,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.') ); @@ -235,38 +269,37 @@ case 'unapprovecomment' : switch ( $action ) { case 'deletecomment' : - wp_delete_comment( $comment_id ); + wp_delete_comment( $comment ); $redir = add_query_arg( array('deleted' => '1'), $redir ); break; case 'trashcomment' : - wp_trash_comment($comment_id); + wp_trash_comment( $comment ); $redir = add_query_arg( array('trashed' => '1', 'ids' => $comment_id), $redir ); break; case 'untrashcomment' : - wp_untrash_comment($comment_id); + wp_untrash_comment( $comment ); $redir = add_query_arg( array('untrashed' => '1'), $redir ); break; case 'spamcomment' : - wp_spam_comment($comment_id); + wp_spam_comment( $comment ); $redir = add_query_arg( array('spammed' => '1', 'ids' => $comment_id), $redir ); break; case 'unspamcomment' : - wp_unspam_comment($comment_id); + wp_unspam_comment( $comment ); $redir = add_query_arg( array('unspammed' => '1'), $redir ); break; case 'approvecomment' : - wp_set_comment_status( $comment_id, 'approve' ); + wp_set_comment_status( $comment, 'approve' ); $redir = add_query_arg( array( 'approved' => 1 ), $redir ); break; case 'unapprovecomment' : - wp_set_comment_status( $comment_id, 'hold' ); + wp_set_comment_status( $comment, 'hold' ); $redir = add_query_arg( array( 'unapproved' => 1 ), $redir ); break; } wp_redirect( $redir ); die; - break; case 'editedcomment' : @@ -291,11 +324,9 @@ case 'editedcomment' : wp_redirect( $location ); exit(); - break; default: wp_die( __('Unknown action.') ); - break; } // end switch diff --git a/wp-admin/credits.php b/wp-admin/credits.php index 87ebc86..3b29c03 100644 --- a/wp-admin/credits.php +++ b/wp-admin/credits.php @@ -8,72 +8,10 @@ /** WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); +require_once( dirname( __FILE__ ) . '/includes/credits.php' ); $title = __( 'Credits' ); -/** - * Retrieve the contributor credits. - * - * @global string $wp_version The current WordPress version. - * - * @since 3.2.0 - * - * @return array|bool A list of all of the contributors, or false on error. -*/ -function wp_credits() { - global $wp_version; - $locale = get_locale(); - - $results = get_site_transient( 'wordpress_credits_' . $locale ); - - if ( ! is_array( $results ) - || false !== strpos( $wp_version, '-' ) - || ( isset( $results['data']['version'] ) && strpos( $wp_version, $results['data']['version'] ) !== 0 ) - ) { - $response = wp_remote_get( "http://api.wordpress.org/core/credits/1.1/?version=$wp_version&locale=$locale" ); - - if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) - return false; - - $results = json_decode( wp_remote_retrieve_body( $response ), true ); - - if ( ! is_array( $results ) ) - return false; - - set_site_transient( 'wordpress_credits_' . $locale, $results, DAY_IN_SECONDS ); - } - - return $results; -} - -/** - * Retrieve the link to a contributor's WordPress.org profile page. - * - * @access private - * @since 3.2.0 - * - * @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>'; -} - -/** - * Retrieve the link to an external library used in WordPress. - * - * @access private - * @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>'; -} - list( $display_version ) = explode( '-', $wp_version ); include( ABSPATH . 'wp-admin/admin-header.php' ); @@ -82,18 +20,14 @@ 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 has lots of refinements we think you’ll love.' ), $display_version ); ?></div> +<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s streamlines your workflow, whether you’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"> - <a href="about.php" class="nav-tab"> - <?php _e( 'What’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> +<h2 class="nav-tab-wrapper wp-clearfix"> + <a href="about.php" class="nav-tab"><?php _e( 'What’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> </h2> <?php @@ -101,18 +35,19 @@ include( ABSPATH . 'wp-admin/admin-header.php' ); $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 */ - __( 'http://codex.wordpress.org/Contributing_to_WordPress' ) ) . '</p>'; + __( 'https://make.wordpress.org/' ) + ); + echo '</p>'; include( ABSPATH . 'wp-admin/admin-footer.php' ); exit; } 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 +59,7 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) { $title = translate( $group_data['name'] ); } - echo '<h4 class="wp-people-group">' . $title . "</h4>\n"; + echo '<h3 class="wp-people-group">' . esc_html( $title ) . "</h3>\n"; } if ( ! empty( $group_data['shuffle'] ) ) @@ -144,11 +79,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 . '" 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] ) ) . '" 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="" />' . "\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"; @@ -159,9 +97,12 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) { } ?> -<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 @@ -172,20 +113,12 @@ return; // 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' ); -__( 'User Experience Lead' ); +__( 'Release Lead' ); +__( 'Release Design Lead' ); +__( 'Release Deputy' ); __( 'Core Developer' ); -__( 'Core Committer' ); -__( 'Guest Committer' ); -__( 'Developer' ); -__( 'Designer' ); -__( 'XML-RPC' ); -__( 'Internationalization' ); __( 'External Libraries' ); -__( 'Icon Design' ); diff --git a/wp-admin/css/about-rtl.css b/wp-admin/css/about-rtl.css index 873f7ac..4ee7cda 100644 --- a/wp-admin/css/about-rtl.css +++ b/wp-admin/css/about-rtl.css @@ -1,17 +1,30 @@ /*------------------------------------------------------------------------------ 22.0 - About Pages + + 1.0 Global: About, Credits, Freedoms + 1.1 Typography + 1.2 Structure + 1.3 Point Releases + 2.0 About Page + 2.1 Typography + 2.2 Structure + 3.0 Credits & Freedoms Pages +------------------------------------------------------------------------------*/ + +/*------------------------------------------------------------------------------ + 1.0 - Global: About, Credits, Freedoms ------------------------------------------------------------------------------*/ .about-wrap { position: relative; margin: 25px 20px 0 40px; max-width: 1050px; /* readability */ - font-size: 15px; } .about-wrap div.updated, -.about-wrap div.error { +.about-wrap div.error, +.about-wrap .notice { display: none !important; } @@ -25,10 +38,54 @@ .about-wrap img { margin: 0; max-width: 100%; + height: auto; vertical-align: middle; } -/* Typography */ +.about-wrap .jetpack-video-wrapper { + margin-bottom: 0; +} + +/* WordPress Version Badge */ + +.wp-badge { + background: #0073aa url(../images/w-logo-white.png?ver=20160308) no-repeat; + background-position: center 25px; + -webkit-background-size: 80px 80px; + background-size: 80px 80px; + color: #fff; + font-size: 14px; + text-align: center; + font-weight: 600; + margin: 5px 0 0; + padding-top: 120px; + height: 40px; + display: inline-block; + width: 140px; + text-rendering: optimizeLegibility; + -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.2); + box-shadow: 0 1px 3px rgba(0,0,0,0.2); +} + +.svg .wp-badge { + background-image: url(../images/wordpress-logo-white.svg?ver=20160308); +} + +.about-wrap .wp-badge { + position: absolute; + top: 0; + left: 0; +} + +/* Tabs */ + +.about-wrap .nav-tab { + padding-left: 15px; + padding-right: 15px; + font-size: 18px; +} + +/* 1.1 - Typography */ .about-wrap p { line-height: 1.6em; @@ -37,86 +94,115 @@ .about-wrap h1 { margin: 0.2em 0 0 200px; - color: #333; + padding: 0; + color: #32373c; line-height: 1.2em; font-size: 2.8em; font-weight: 400; } +.about-wrap h2 { + margin: 50px 0 1em; + font-size: 1.8em; + line-height: 1.3; + font-weight: 300; + text-align: center; +} + +.about-wrap .changelog h2, +.about-wrap h3 { + margin: 1.25em 0 .6em; + font-size: 1.25em; + line-height: 1.5em; +} + +.about-wrap .changelog h2 { + margin-top: 40px; + font-weight: 600; + text-align: right; +} + .about-wrap h4 { - color: #222; + color: #23282d; +} + +.about-wrap .changelog h3 { + margin: 1.33em 0; + font-size: 1em; + line-height: inherit; + color: #23282d; } -.about-wrap .about-text, -.about-wrap p.about-description, -.about-wrap li.wp-person a.web { +.about-wrap code, +.about-wrap ol li p { + font-size: 14px; font-weight: normal; - line-height: 1.6em; - font-size: 19px; } -.about-description { +.about-wrap .about-description, +.about-wrap .about-text { margin-top: 1.4em; + font-weight: normal; + line-height: 1.6em; + font-size: 19px; } -.about-text { +.about-wrap .about-text { margin: 1em 0 1em 200px; min-height: 60px; - color: #777; - font-size: 24px; + color: #555d66; } -.about-wrap .changelog h2.about-headline-callout { - margin: 1.1em 0 0.2em; - font-size: 2.4em; - font-weight: 300; - line-height: 1.3; - text-align: center; -} +/* 1.2 - Structure */ -.about-wrap h3 { - margin: 1em 0 .6em; - font-size: 1.5em; - line-height: 1.5em; +.about-wrap [class$=col] .col { + float: right; + position: relative; } -.customize h3 { - margin-top: 1.75em; - text-align: center; +.about-wrap .two-col .col { + margin-left: 4.799999999%; + width: 47.6%; } -.about-wrap .feature-section h4 { - margin: 1.4em 0 0.6em 0; - font-size: 1.2em; +.about-wrap .two-col img { + margin-bottom: 1.5em; } -.about-wrap .feature-section p { - margin-top: 0.6em; +.about-wrap .feature-section.two-col .col { + display: inline-block; + float: none; + margin-top: 1em; + margin-left: 4.799999999%; + width: -webkit-calc( 47.6% - 4px ); + width: calc( 47.6% - 4px ); + vertical-align: top; } -.about-wrap code, -.about-wrap ol li p { - font-size: 14px; +.about-wrap .three-col .col { + margin-left: 4.999999999%; + width: 29.95%; } -.about-wrap .button.button-large { - padding: 8px 20px 10px !important; - height: 46px !important; - font-size: 14px; - line-height: 28px !important; +.about-wrap .two-col .col:nth-of-type(2n), +.about-wrap .three-col .col:nth-of-type(3n) { + margin-left: 0; } -/* 3.8 Images */ +.about-wrap .under-the-hood { + clear: both; + overflow: hidden; +} -.about-wrap .about-overview-img { - margin: 0; +.about-wrap .under-the-hood:nth-of-type(2n) { + margin-top: 3em; } -/* Point Releases */ +/* 1.3 - Point Releases */ .about-wrap .point-releases { margin-top: 5px; - border-bottom: 1px solid #dfdfdf; + border-bottom: 1px solid #ddd; } .about-wrap .changelog.point-releases h3 { @@ -127,110 +213,111 @@ padding-top: 7px; } -/* WordPress Version Badge */ +/*------------------------------------------------------------------------------ + 2.0 - About Page +------------------------------------------------------------------------------*/ -.wp-badge { - background: #0074a2 url(../images/w-logo-white.png?ver=20131202) no-repeat; - background: #0074a2, url(../images/wordpress-logo-white.svg?ver=20131110) no-repeat; /* multiple backgrounds are ignored by browsers that don't support SVGs */ - background-position: center 24px; - -webkit-background-size: 85px 85px; - background-size: 85px 85px; - color: #78c8e6; - font-size: 14px; +/* 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; - font-weight: 600; - margin: 5px 0 0; - padding-top: 120px; - height: 40px; - display: inline-block; - width: 150px; - text-rendering: optimizeLegibility; - -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.2); - box-shadow: 0 1px 3px rgba(0,0,0,0.2); } +.about-wrap .headline-feature h3 { + margin-top: 0; + text-align: right; +} -.about-wrap .wp-badge { - position: absolute; - top: 0; - left: 0; +.about-wrap .feature-section.two-col h3 { + margin-top: 0; } -/* Tabs */ +.about-wrap .feature-section h4 { + margin: 1.4em 0 0.6em 0; + font-size: 1em; +} -.about-wrap h2.nav-tab-wrapper { - padding-right: 6px; +.about-wrap .feature-section p { + margin-top: 0.6em; } -.about-wrap h2 .nav-tab { - padding: 4px 15px 6px; - margin: 0 0 -1px 3px; - font-size: 18px; - vertical-align: top; - border-width: 1px; +.about-wrap .two-col-text { + -webkit-column-count: 2; + -moz-column-count: 2; + column-count: 2; + -webkit-column-gap: 40px; + -moz-column-gap: 40px; + column-gap: 40px; } -/* Changelog / Update screen */ +.about-wrap .two-col-text p:first-of-type { + margin-top: 0; +} -.about-overview { - margin-top: 40px; +/* 2.2 - Structure */ + +.about-wrap .headline-feature.feature-video { + position: relative; + margin: 40px 0; + padding-bottom: 56.25%; + width: 100%; + max-width: 100%; + height: 0; text-align: center; } -.about-overview .wp-video { - margin: 0 auto; +.about-wrap .feature-video embed { + position: absolute; + top: 0; + right: 0; + width: 100%; + height: 100%; } -.changelog .wp-playlist .wp-playlist-current-item img { - height: 64px; - width: auto; - max-width: 100%; +.about-wrap .featured-image { + text-align: center; } .about-wrap .feature-section { - margin-top: 40px; - padding-bottom: 20px; + overflow: hidden; + padding: 0 0 40px; } -.about-wrap .feature-section.two-col > div { - position: relative; - width: 47.5%; - margin-left: 4.999999999%; - float: right; +.about-wrap .headline-feature { + margin: 0 auto; + max-width: 80%; } -.about-wrap .feature-section.three-col > div { - position: relative; - width: 29.95%; - margin-left: 4.999999999%; - float: right; +.about-wrap .feature-section .media-container { + overflow: hidden; } -.about-wrap .feature-section.col .last-feature { - margin-left: 0; +.about-wrap .embed-container { + text-align: center; } -.about-wrap .under-the-hood .feature-section { - margin-top: 0; +.about-wrap .embed-container iframe { + max-width: 100%; } -.about-wrap .changelog .feature-section { - overflow: hidden; +.about-wrap .wp-embedded-content { + max-width: 100%; } -.about-wrap .feature-section.two-col div p { - margin-left: 3%; +.about-wrap .feature-section .col { + margin-top: 40px; } -.about-wrap .feature-section div p img { - float: left; - margin-right: 10px; - max-width: 20%; +.about-wrap .changelog { + margin-bottom: 40px; } -.about-wrap .changelog li { - list-style-type: disc; - margin-right: 3em; +.about-wrap .changelog.feature-section .col { + margin-top: 40px; } /* Return to Dashboard Home link */ @@ -246,66 +333,73 @@ padding: 0 5px; } +/*------------------------------------------------------------------------------ + 3.0 - Credits & Freedoms Pages +------------------------------------------------------------------------------*/ + /* Credits */ -.about-wrap h4.wp-people-group { - margin-top: 2.6em; +.about-wrap h3.wp-people-group { + margin: 2.6em 0 1.33em; + padding: 0; font-size: 16px; + line-height: inherit; } -.about-wrap ul.wp-people-group { - overflow: hidden; +.about-wrap .wp-people-group { padding: 0 5px; margin: 0 -5px 0 -15px; } -.about-wrap ul.compact { +.about-wrap .compact { margin-bottom: 0 } -.about-wrap li.wp-person { - float: right; +.about-wrap .wp-person { + display: inline-block; + vertical-align: top; margin-left: 10px; + padding-bottom: 15px; + height: 70px; + width: 280px; +} + +.about-wrap .compact .wp-person { + height: auto; + width: 180px; + padding-bottom: 0; + margin-bottom: 0; } -.about-wrap li.wp-person img.gravatar { +.about-wrap .wp-person .gravatar { float: right; margin: 0 0 10px 10px; - padding: 2px; + padding: 1px; width: 60px; height: 60px; } -.about-wrap ul.compact li.wp-person img.gravatar { +.about-wrap .compact .wp-person .gravatar { width: 30px; height: 30px; } -/* @todo: combine this */ -.about-wrap li.wp-person { - height: 70px; - width: 280px; - padding-bottom: 15px; +.about-wrap .wp-person .web { + margin: 6px 0 2px; + font-size: 16px; + font-weight: normal; + line-height: 2em; + text-decoration: none; } -.about-wrap ul.compact li.wp-person { - height: auto; - width: 180px; - padding-bottom: 0; - margin-bottom: 0; +.about-wrap .wp-person .title { + display: block; } .about-wrap #wp-people-group-validators + p.wp-credits-list { margin-top: 0; } -.about-wrap li.wp-person a.web { - display: block; - margin: 6px 0 2px; - font-size: 16px; - text-decoration: none; -} - .about-wrap p.wp-credits-list a { white-space: nowrap; } @@ -326,27 +420,21 @@ margin: 0.6em 0; } -/* =Media Queries --------------------------------------------------------------- */ +/*------------------------------------------------------------------------------ + 4.0 - Media Queries +------------------------------------------------------------------------------*/ @media screen and ( max-width: 782px ) { - .about-wrap .feature-section.one-col > div, - .about-wrap .feature-section.two-col > div, - .about-wrap .feature-section.three-col > div { - width: 100%; - margin: 0 0 40px; - padding: 0 0 40px; - float: none; - border-bottom: 1px solid rgba(0, 0, 0, 0.1); + .about-wrap .two-col-text { + -webkit-column-count: 1; + -moz-column-count: 1; + column-count: 1; } - .about-wrap .under-the-hood .feature-section > div, - .about-wrap .feature-section.col > div.last-feature { - margin: 0; - padding: 0; - border-bottom: none; + .about-wrap .three-col img { + display: block; + margin: 0 auto; } - } @media only screen and (max-width: 500px) { @@ -356,11 +444,11 @@ } .about-wrap h1, - .about-text { + .about-wrap .about-text { margin-left: 0; } - .about-text { + .about-wrap .about-text { margin-bottom: 0.25em; } @@ -370,19 +458,24 @@ width: 100%; } - .about-wrap .feature-section.three-col div { - width: 100%; - float: none; + .about-wrap .two-col .col, + .about-wrap .three-col .col { + width: 100% !important; + float: none !important; } - .about-wrap .three-col.about-updates .col-1 { - padding: 0; - float: none; + .about-wrap .under-the-hood.three-col .col, + .about-wrap .under-the-hood.two-col .col, + .about-wrap .under-the-hood.one-col .col { + margin-bottom: 2em; + padding-bottom: 0; } - .about-wrap .three-col.about-updates .col-2 { - margin: 0 0 20px; - width: 100%; - float: none; + .about-wrap .under-the-hood:nth-of-type(2n) { + margin-top: 0; } -} \ No newline at end of file + + .about-wrap .under-the-hood:nth-of-type(2n) h4 { + margin-top: 0; + } +} diff --git a/wp-admin/css/about-rtl.min.css b/wp-admin/css/about-rtl.min.css new file mode 100644 index 0000000..cc3ff12 --- /dev/null +++ b/wp-admin/css/about-rtl.min.css @@ -0,0 +1 @@ +.about-wrap{position:relative;margin:25px 20px 0 40px;max-width:1050px;font-size:15px}.about-wrap .notice,.about-wrap div.error,.about-wrap div.updated{display:none!important}.about-wrap hr{border:0;height:0;margin:0;border-top:1px solid rgba(0,0,0,.1)}.about-wrap img{margin:0;max-width:100%;height:auto;vertical-align:middle}.about-wrap .jetpack-video-wrapper{margin-bottom:0}.wp-badge{background:url(../images/w-logo-white.png?ver=20160308) center 25px no-repeat #0073aa;-webkit-background-size:80px 80px;background-size:80px 80px;color:#fff;font-size:14px;text-align:center;font-weight:600;margin:5px 0 0;padding-top:120px;height:40px;display:inline-block;width:140px;text-rendering:optimizeLegibility;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.2);box-shadow:0 1px 3px rgba(0,0,0,.2)}.svg .wp-badge{background-image:url(../images/wordpress-logo-white.svg?ver=20160308)}.about-wrap .wp-badge{position:absolute;top:0;left:0}.about-wrap .nav-tab{padding-left:15px;padding-right:15px;font-size:18px}.about-wrap p{line-height:1.6em;font-size:14px}.about-wrap h1{margin:.2em 0 0 200px;padding:0;color:#32373c;line-height:1.2em;font-size:2.8em;font-weight:400}.about-wrap h2{margin:50px 0 1em;font-size:1.8em;line-height:1.3;font-weight:300;text-align:center}.about-wrap .changelog h2,.about-wrap h3{margin:1.25em 0 .6em;font-size:1.25em;line-height:1.5em}.about-wrap .changelog h2{margin-top:40px;font-weight:600;text-align:right}.about-wrap h4{color:#23282d}.about-wrap .changelog h3{margin:1.33em 0;font-size:1em;line-height:inherit;color:#23282d}.about-wrap code,.about-wrap ol li p{font-size:14px;font-weight:400}.about-wrap .about-description,.about-wrap .about-text{margin-top:1.4em;font-weight:400;line-height:1.6em;font-size:19px}.about-wrap .about-text{margin:1em 0 1em 200px;min-height:60px;color:#555d66}.about-wrap [class$=col] .col{float:right;position:relative}.about-wrap .two-col .col{margin-left:4.799999999%;width:47.6%}.about-wrap .two-col img{margin-bottom:1.5em}.about-wrap .feature-section.two-col .col{display:inline-block;float:none;margin-top:1em;margin-left:4.799999999%;width:-webkit-calc(47.6% - 4px);width:calc(47.6% - 4px);vertical-align:top}.about-wrap .three-col .col{margin-left:4.999999999%;width:29.95%}.about-wrap .three-col .col:nth-of-type(3n),.about-wrap .two-col .col:nth-of-type(2n){margin-left:0}.about-wrap .under-the-hood{clear:both;overflow:hidden}.about-wrap .under-the-hood:nth-of-type(2n){margin-top:3em}.about-wrap .point-releases{margin-top:5px;border-bottom:1px solid #ddd}.about-wrap .changelog.point-releases h3{padding-top:35px}.about-wrap .changelog.point-releases h3:first-child{padding-top:7px}.about-wrap .headline-feature h2{margin:30px 0;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 .embed-container,.about-wrap .featured-image{text-align:center}.about-wrap .feature-section.two-col h3{margin-top:0}.about-wrap .feature-section h4{margin:1.4em 0 .6em;font-size:1em}.about-wrap .feature-section p{margin-top:.6em}.about-wrap .two-col-text{-webkit-column-count:2;-moz-column-count:2;column-count:2;-webkit-column-gap:40px;-moz-column-gap:40px;column-gap:40px}.about-wrap .two-col-text p:first-of-type{margin-top:0}.about-wrap .headline-feature.feature-video{position:relative;margin:40px 0;padding-bottom:56.25%;width:100%;max-width:100%;height:0;text-align:center}.about-wrap .feature-video embed{position:absolute;top:0;right:0;width:100%;height:100%}.about-wrap .feature-section{overflow:hidden;padding:0 0 40px}.about-wrap .headline-feature{margin:0 auto;max-width:80%}.about-wrap .changelog.feature-section .col,.about-wrap .feature-section .col{margin-top:40px}.about-wrap .feature-section .media-container{overflow:hidden}.about-wrap .embed-container iframe,.about-wrap .wp-embedded-content{max-width:100%}.about-wrap .changelog{margin-bottom:40px}.about-wrap .return-to-dashboard{margin:30px -5px 0 0;font-size:14px;font-weight:700}.about-wrap .return-to-dashboard a{text-decoration:none;padding:0 5px}.about-wrap h3.wp-people-group{margin:2.6em 0 1.33em;padding:0;font-size:16px;line-height:inherit}.about-wrap .wp-people-group{padding:0 5px;margin:0 -5px 0 -15px}.about-wrap .compact{margin-bottom:0}.about-wrap .wp-person{display:inline-block;vertical-align:top;margin-left:10px;padding-bottom:15px;height:70px;width:280px}.about-wrap .compact .wp-person{height:auto;width:180px;padding-bottom:0;margin-bottom:0}.about-wrap .wp-person .gravatar{float:right;margin:0 0 10px 10px;padding:1px;width:60px;height:60px}.about-wrap .compact .wp-person .gravatar{width:30px;height:30px}.about-wrap .wp-person .web{margin:6px 0 2px;font-size:16px;font-weight:400;line-height:2em;text-decoration:none}.about-wrap .wp-person .title{display:block}.about-wrap #wp-people-group-validators+p.wp-credits-list{margin-top:0}.about-wrap p.wp-credits-list a{white-space:nowrap}.freedoms-php .about-wrap ol{margin:40px 60px}.freedoms-php .about-wrap ol li{list-style-type:decimal;font-weight:700}.freedoms-php .about-wrap ol p{font-weight:400;margin:.6em 0}@media screen and (max-width:782px){.about-wrap .two-col-text{-webkit-column-count:1;-moz-column-count:1;column-count:1}.about-wrap .three-col img{display:block;margin:0 auto}}@media only screen and (max-width:500px){.about-wrap{margin-left:20px;margin-right:10px}.about-wrap .about-text,.about-wrap h1{margin-left:0}.about-wrap .about-text{margin-bottom:.25em}.about-wrap .wp-badge{position:relative;margin-bottom:1.5em;width:100%}.about-wrap .three-col .col,.about-wrap .two-col .col{width:100%!important;float:none!important}.about-wrap .under-the-hood.one-col .col,.about-wrap .under-the-hood.three-col .col,.about-wrap .under-the-hood.two-col .col{margin-bottom:2em;padding-bottom:0}.about-wrap .under-the-hood:nth-of-type(2n){margin-top:0}.about-wrap .under-the-hood:nth-of-type(2n) h4{margin-top:0}} \ No newline at end of file diff --git a/wp-admin/css/about.css b/wp-admin/css/about.css index 44c85c8..aad606f 100644 --- a/wp-admin/css/about.css +++ b/wp-admin/css/about.css @@ -1,17 +1,30 @@ /*------------------------------------------------------------------------------ 22.0 - About Pages + + 1.0 Global: About, Credits, Freedoms + 1.1 Typography + 1.2 Structure + 1.3 Point Releases + 2.0 About Page + 2.1 Typography + 2.2 Structure + 3.0 Credits & Freedoms Pages +------------------------------------------------------------------------------*/ + +/*------------------------------------------------------------------------------ + 1.0 - Global: About, Credits, Freedoms ------------------------------------------------------------------------------*/ .about-wrap { position: relative; margin: 25px 40px 0 20px; max-width: 1050px; /* readability */ - font-size: 15px; } .about-wrap div.updated, -.about-wrap div.error { +.about-wrap div.error, +.about-wrap .notice { display: none !important; } @@ -25,10 +38,54 @@ .about-wrap img { margin: 0; max-width: 100%; + height: auto; vertical-align: middle; } -/* Typography */ +.about-wrap .jetpack-video-wrapper { + margin-bottom: 0; +} + +/* WordPress Version Badge */ + +.wp-badge { + background: #0073aa url(../images/w-logo-white.png?ver=20160308) no-repeat; + background-position: center 25px; + -webkit-background-size: 80px 80px; + background-size: 80px 80px; + color: #fff; + font-size: 14px; + text-align: center; + font-weight: 600; + margin: 5px 0 0; + padding-top: 120px; + height: 40px; + display: inline-block; + width: 140px; + text-rendering: optimizeLegibility; + -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.2); + box-shadow: 0 1px 3px rgba(0,0,0,0.2); +} + +.svg .wp-badge { + background-image: url(../images/wordpress-logo-white.svg?ver=20160308); +} + +.about-wrap .wp-badge { + position: absolute; + top: 0; + right: 0; +} + +/* Tabs */ + +.about-wrap .nav-tab { + padding-right: 15px; + padding-left: 15px; + font-size: 18px; +} + +/* 1.1 - Typography */ .about-wrap p { line-height: 1.6em; @@ -37,86 +94,115 @@ .about-wrap h1 { margin: 0.2em 200px 0 0; - color: #333; + padding: 0; + color: #32373c; line-height: 1.2em; font-size: 2.8em; font-weight: 400; } +.about-wrap h2 { + margin: 50px 0 1em; + font-size: 1.8em; + line-height: 1.3; + font-weight: 300; + text-align: center; +} + +.about-wrap .changelog h2, +.about-wrap h3 { + margin: 1.25em 0 .6em; + font-size: 1.25em; + line-height: 1.5em; +} + +.about-wrap .changelog h2 { + margin-top: 40px; + font-weight: 600; + text-align: left; +} + .about-wrap h4 { - color: #222; + color: #23282d; +} + +.about-wrap .changelog h3 { + margin: 1.33em 0; + font-size: 1em; + line-height: inherit; + color: #23282d; } -.about-wrap .about-text, -.about-wrap p.about-description, -.about-wrap li.wp-person a.web { +.about-wrap code, +.about-wrap ol li p { + font-size: 14px; font-weight: normal; - line-height: 1.6em; - font-size: 19px; } -.about-description { +.about-wrap .about-description, +.about-wrap .about-text { margin-top: 1.4em; + font-weight: normal; + line-height: 1.6em; + font-size: 19px; } -.about-text { +.about-wrap .about-text { margin: 1em 200px 1em 0; min-height: 60px; - color: #777; - font-size: 24px; + color: #555d66; } -.about-wrap .changelog h2.about-headline-callout { - margin: 1.1em 0 0.2em; - font-size: 2.4em; - font-weight: 300; - line-height: 1.3; - text-align: center; -} +/* 1.2 - Structure */ -.about-wrap h3 { - margin: 1em 0 .6em; - font-size: 1.5em; - line-height: 1.5em; +.about-wrap [class$=col] .col { + float: left; + position: relative; } -.customize h3 { - margin-top: 1.75em; - text-align: center; +.about-wrap .two-col .col { + margin-right: 4.799999999%; + width: 47.6%; } -.about-wrap .feature-section h4 { - margin: 1.4em 0 0.6em 0; - font-size: 1.2em; +.about-wrap .two-col img { + margin-bottom: 1.5em; } -.about-wrap .feature-section p { - margin-top: 0.6em; +.about-wrap .feature-section.two-col .col { + display: inline-block; + float: none; + margin-top: 1em; + margin-right: 4.799999999%; + width: -webkit-calc( 47.6% - 4px ); + width: calc( 47.6% - 4px ); + vertical-align: top; } -.about-wrap code, -.about-wrap ol li p { - font-size: 14px; +.about-wrap .three-col .col { + margin-right: 4.999999999%; + width: 29.95%; } -.about-wrap .button.button-large { - padding: 8px 20px 10px !important; - height: 46px !important; - font-size: 14px; - line-height: 28px !important; +.about-wrap .two-col .col:nth-of-type(2n), +.about-wrap .three-col .col:nth-of-type(3n) { + margin-right: 0; } -/* 3.8 Images */ +.about-wrap .under-the-hood { + clear: both; + overflow: hidden; +} -.about-wrap .about-overview-img { - margin: 0; +.about-wrap .under-the-hood:nth-of-type(2n) { + margin-top: 3em; } -/* Point Releases */ +/* 1.3 - Point Releases */ .about-wrap .point-releases { margin-top: 5px; - border-bottom: 1px solid #dfdfdf; + border-bottom: 1px solid #ddd; } .about-wrap .changelog.point-releases h3 { @@ -127,110 +213,111 @@ padding-top: 7px; } -/* WordPress Version Badge */ +/*------------------------------------------------------------------------------ + 2.0 - About Page +------------------------------------------------------------------------------*/ -.wp-badge { - background: #0074a2 url(../images/w-logo-white.png?ver=20131202) no-repeat; - background: #0074a2, url(../images/wordpress-logo-white.svg?ver=20131110) no-repeat; /* multiple backgrounds are ignored by browsers that don't support SVGs */ - background-position: center 24px; - -webkit-background-size: 85px 85px; - background-size: 85px 85px; - color: #78c8e6; - font-size: 14px; +/* 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; - font-weight: 600; - margin: 5px 0 0; - padding-top: 120px; - height: 40px; - display: inline-block; - width: 150px; - text-rendering: optimizeLegibility; - -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.2); - box-shadow: 0 1px 3px rgba(0,0,0,0.2); } +.about-wrap .headline-feature h3 { + margin-top: 0; + text-align: left; +} -.about-wrap .wp-badge { - position: absolute; - top: 0; - right: 0; +.about-wrap .feature-section.two-col h3 { + margin-top: 0; } -/* Tabs */ +.about-wrap .feature-section h4 { + margin: 1.4em 0 0.6em 0; + font-size: 1em; +} -.about-wrap h2.nav-tab-wrapper { - padding-left: 6px; +.about-wrap .feature-section p { + margin-top: 0.6em; } -.about-wrap h2 .nav-tab { - padding: 4px 15px 6px; - margin: 0 3px -1px 0; - font-size: 18px; - vertical-align: top; - border-width: 1px; +.about-wrap .two-col-text { + -webkit-column-count: 2; + -moz-column-count: 2; + column-count: 2; + -webkit-column-gap: 40px; + -moz-column-gap: 40px; + column-gap: 40px; } -/* Changelog / Update screen */ +.about-wrap .two-col-text p:first-of-type { + margin-top: 0; +} -.about-overview { - margin-top: 40px; +/* 2.2 - Structure */ + +.about-wrap .headline-feature.feature-video { + position: relative; + margin: 40px 0; + padding-bottom: 56.25%; + width: 100%; + max-width: 100%; + height: 0; text-align: center; } -.about-overview .wp-video { - margin: 0 auto; +.about-wrap .feature-video embed { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; } -.changelog .wp-playlist .wp-playlist-current-item img { - height: 64px; - width: auto; - max-width: 100%; +.about-wrap .featured-image { + text-align: center; } .about-wrap .feature-section { - margin-top: 40px; - padding-bottom: 20px; + overflow: hidden; + padding: 0 0 40px; } -.about-wrap .feature-section.two-col > div { - position: relative; - width: 47.5%; - margin-right: 4.999999999%; - float: left; +.about-wrap .headline-feature { + margin: 0 auto; + max-width: 80%; } -.about-wrap .feature-section.three-col > div { - position: relative; - width: 29.95%; - margin-right: 4.999999999%; - float: left; +.about-wrap .feature-section .media-container { + overflow: hidden; } -.about-wrap .feature-section.col .last-feature { - margin-right: 0; +.about-wrap .embed-container { + text-align: center; } -.about-wrap .under-the-hood .feature-section { - margin-top: 0; +.about-wrap .embed-container iframe { + max-width: 100%; } -.about-wrap .changelog .feature-section { - overflow: hidden; +.about-wrap .wp-embedded-content { + max-width: 100%; } -.about-wrap .feature-section.two-col div p { - margin-right: 3%; +.about-wrap .feature-section .col { + margin-top: 40px; } -.about-wrap .feature-section div p img { - float: right; - margin-left: 10px; - max-width: 20%; +.about-wrap .changelog { + margin-bottom: 40px; } -.about-wrap .changelog li { - list-style-type: disc; - margin-left: 3em; +.about-wrap .changelog.feature-section .col { + margin-top: 40px; } /* Return to Dashboard Home link */ @@ -246,66 +333,73 @@ padding: 0 5px; } +/*------------------------------------------------------------------------------ + 3.0 - Credits & Freedoms Pages +------------------------------------------------------------------------------*/ + /* Credits */ -.about-wrap h4.wp-people-group { - margin-top: 2.6em; +.about-wrap h3.wp-people-group { + margin: 2.6em 0 1.33em; + padding: 0; font-size: 16px; + line-height: inherit; } -.about-wrap ul.wp-people-group { - overflow: hidden; +.about-wrap .wp-people-group { padding: 0 5px; margin: 0 -15px 0 -5px; } -.about-wrap ul.compact { +.about-wrap .compact { margin-bottom: 0 } -.about-wrap li.wp-person { - float: left; +.about-wrap .wp-person { + display: inline-block; + vertical-align: top; margin-right: 10px; + padding-bottom: 15px; + height: 70px; + width: 280px; +} + +.about-wrap .compact .wp-person { + height: auto; + width: 180px; + padding-bottom: 0; + margin-bottom: 0; } -.about-wrap li.wp-person img.gravatar { +.about-wrap .wp-person .gravatar { float: left; margin: 0 10px 10px 0; - padding: 2px; + padding: 1px; width: 60px; height: 60px; } -.about-wrap ul.compact li.wp-person img.gravatar { +.about-wrap .compact .wp-person .gravatar { width: 30px; height: 30px; } -/* @todo: combine this */ -.about-wrap li.wp-person { - height: 70px; - width: 280px; - padding-bottom: 15px; +.about-wrap .wp-person .web { + margin: 6px 0 2px; + font-size: 16px; + font-weight: normal; + line-height: 2em; + text-decoration: none; } -.about-wrap ul.compact li.wp-person { - height: auto; - width: 180px; - padding-bottom: 0; - margin-bottom: 0; +.about-wrap .wp-person .title { + display: block; } .about-wrap #wp-people-group-validators + p.wp-credits-list { margin-top: 0; } -.about-wrap li.wp-person a.web { - display: block; - margin: 6px 0 2px; - font-size: 16px; - text-decoration: none; -} - .about-wrap p.wp-credits-list a { white-space: nowrap; } @@ -326,27 +420,21 @@ margin: 0.6em 0; } -/* =Media Queries --------------------------------------------------------------- */ +/*------------------------------------------------------------------------------ + 4.0 - Media Queries +------------------------------------------------------------------------------*/ @media screen and ( max-width: 782px ) { - .about-wrap .feature-section.one-col > div, - .about-wrap .feature-section.two-col > div, - .about-wrap .feature-section.three-col > div { - width: 100%; - margin: 0 0 40px; - padding: 0 0 40px; - float: none; - border-bottom: 1px solid rgba(0, 0, 0, 0.1); + .about-wrap .two-col-text { + -webkit-column-count: 1; + -moz-column-count: 1; + column-count: 1; } - .about-wrap .under-the-hood .feature-section > div, - .about-wrap .feature-section.col > div.last-feature { - margin: 0; - padding: 0; - border-bottom: none; + .about-wrap .three-col img { + display: block; + margin: 0 auto; } - } @media only screen and (max-width: 500px) { @@ -356,11 +444,11 @@ } .about-wrap h1, - .about-text { + .about-wrap .about-text { margin-right: 0; } - .about-text { + .about-wrap .about-text { margin-bottom: 0.25em; } @@ -370,19 +458,24 @@ width: 100%; } - .about-wrap .feature-section.three-col div { - width: 100%; - float: none; + .about-wrap .two-col .col, + .about-wrap .three-col .col { + width: 100% !important; + float: none !important; } - .about-wrap .three-col.about-updates .col-1 { - padding: 0; - float: none; + .about-wrap .under-the-hood.three-col .col, + .about-wrap .under-the-hood.two-col .col, + .about-wrap .under-the-hood.one-col .col { + margin-bottom: 2em; + padding-bottom: 0; } - .about-wrap .three-col.about-updates .col-2 { - margin: 0 0 20px; - width: 100%; - float: none; + .about-wrap .under-the-hood:nth-of-type(2n) { + margin-top: 0; } -} \ No newline at end of file + + .about-wrap .under-the-hood:nth-of-type(2n) h4 { + margin-top: 0; + } +} diff --git a/wp-admin/css/about.min.css b/wp-admin/css/about.min.css new file mode 100644 index 0000000..7dca9b7 --- /dev/null +++ b/wp-admin/css/about.min.css @@ -0,0 +1 @@ +.about-wrap{position:relative;margin:25px 40px 0 20px;max-width:1050px;font-size:15px}.about-wrap .notice,.about-wrap div.error,.about-wrap div.updated{display:none!important}.about-wrap hr{border:0;height:0;margin:0;border-top:1px solid rgba(0,0,0,.1)}.about-wrap img{margin:0;max-width:100%;height:auto;vertical-align:middle}.about-wrap .jetpack-video-wrapper{margin-bottom:0}.wp-badge{background:url(../images/w-logo-white.png?ver=20160308) center 25px no-repeat #0073aa;-webkit-background-size:80px 80px;background-size:80px 80px;color:#fff;font-size:14px;text-align:center;font-weight:600;margin:5px 0 0;padding-top:120px;height:40px;display:inline-block;width:140px;text-rendering:optimizeLegibility;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.2);box-shadow:0 1px 3px rgba(0,0,0,.2)}.svg .wp-badge{background-image:url(../images/wordpress-logo-white.svg?ver=20160308)}.about-wrap .wp-badge{position:absolute;top:0;right:0}.about-wrap .nav-tab{padding-right:15px;padding-left:15px;font-size:18px}.about-wrap p{line-height:1.6em;font-size:14px}.about-wrap h1{margin:.2em 200px 0 0;padding:0;color:#32373c;line-height:1.2em;font-size:2.8em;font-weight:400}.about-wrap h2{margin:50px 0 1em;font-size:1.8em;line-height:1.3;font-weight:300;text-align:center}.about-wrap .changelog h2,.about-wrap h3{margin:1.25em 0 .6em;font-size:1.25em;line-height:1.5em}.about-wrap .changelog h2{margin-top:40px;font-weight:600;text-align:left}.about-wrap h4{color:#23282d}.about-wrap .changelog h3{margin:1.33em 0;font-size:1em;line-height:inherit;color:#23282d}.about-wrap code,.about-wrap ol li p{font-size:14px;font-weight:400}.about-wrap .about-description,.about-wrap .about-text{margin-top:1.4em;font-weight:400;line-height:1.6em;font-size:19px}.about-wrap .about-text{margin:1em 200px 1em 0;min-height:60px;color:#555d66}.about-wrap [class$=col] .col{float:left;position:relative}.about-wrap .two-col .col{margin-right:4.799999999%;width:47.6%}.about-wrap .two-col img{margin-bottom:1.5em}.about-wrap .feature-section.two-col .col{display:inline-block;float:none;margin-top:1em;margin-right:4.799999999%;width:-webkit-calc(47.6% - 4px);width:calc(47.6% - 4px);vertical-align:top}.about-wrap .three-col .col{margin-right:4.999999999%;width:29.95%}.about-wrap .three-col .col:nth-of-type(3n),.about-wrap .two-col .col:nth-of-type(2n){margin-right:0}.about-wrap .under-the-hood{clear:both;overflow:hidden}.about-wrap .under-the-hood:nth-of-type(2n){margin-top:3em}.about-wrap .point-releases{margin-top:5px;border-bottom:1px solid #ddd}.about-wrap .changelog.point-releases h3{padding-top:35px}.about-wrap .changelog.point-releases h3:first-child{padding-top:7px}.about-wrap .headline-feature h2{margin:30px 0;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 .embed-container,.about-wrap .featured-image{text-align:center}.about-wrap .feature-section.two-col h3{margin-top:0}.about-wrap .feature-section h4{margin:1.4em 0 .6em;font-size:1em}.about-wrap .feature-section p{margin-top:.6em}.about-wrap .two-col-text{-webkit-column-count:2;-moz-column-count:2;column-count:2;-webkit-column-gap:40px;-moz-column-gap:40px;column-gap:40px}.about-wrap .two-col-text p:first-of-type{margin-top:0}.about-wrap .headline-feature.feature-video{position:relative;margin:40px 0;padding-bottom:56.25%;width:100%;max-width:100%;height:0;text-align:center}.about-wrap .feature-video embed{position:absolute;top:0;left:0;width:100%;height:100%}.about-wrap .feature-section{overflow:hidden;padding:0 0 40px}.about-wrap .headline-feature{margin:0 auto;max-width:80%}.about-wrap .changelog.feature-section .col,.about-wrap .feature-section .col{margin-top:40px}.about-wrap .feature-section .media-container{overflow:hidden}.about-wrap .embed-container iframe,.about-wrap .wp-embedded-content{max-width:100%}.about-wrap .changelog{margin-bottom:40px}.about-wrap .return-to-dashboard{margin:30px 0 0 -5px;font-size:14px;font-weight:700}.about-wrap .return-to-dashboard a{text-decoration:none;padding:0 5px}.about-wrap h3.wp-people-group{margin:2.6em 0 1.33em;padding:0;font-size:16px;line-height:inherit}.about-wrap .wp-people-group{padding:0 5px;margin:0 -15px 0 -5px}.about-wrap .compact{margin-bottom:0}.about-wrap .wp-person{display:inline-block;vertical-align:top;margin-right:10px;padding-bottom:15px;height:70px;width:280px}.about-wrap .compact .wp-person{height:auto;width:180px;padding-bottom:0;margin-bottom:0}.about-wrap .wp-person .gravatar{float:left;margin:0 10px 10px 0;padding:1px;width:60px;height:60px}.about-wrap .compact .wp-person .gravatar{width:30px;height:30px}.about-wrap .wp-person .web{margin:6px 0 2px;font-size:16px;font-weight:400;line-height:2em;text-decoration:none}.about-wrap .wp-person .title{display:block}.about-wrap #wp-people-group-validators+p.wp-credits-list{margin-top:0}.about-wrap p.wp-credits-list a{white-space:nowrap}.freedoms-php .about-wrap ol{margin:40px 60px}.freedoms-php .about-wrap ol li{list-style-type:decimal;font-weight:700}.freedoms-php .about-wrap ol p{font-weight:400;margin:.6em 0}@media screen and (max-width:782px){.about-wrap .two-col-text{-webkit-column-count:1;-moz-column-count:1;column-count:1}.about-wrap .three-col img{display:block;margin:0 auto}}@media only screen and (max-width:500px){.about-wrap{margin-right:20px;margin-left:10px}.about-wrap .about-text,.about-wrap h1{margin-right:0}.about-wrap .about-text{margin-bottom:.25em}.about-wrap .wp-badge{position:relative;margin-bottom:1.5em;width:100%}.about-wrap .three-col .col,.about-wrap .two-col .col{width:100%!important;float:none!important}.about-wrap .under-the-hood.one-col .col,.about-wrap .under-the-hood.three-col .col,.about-wrap .under-the-hood.two-col .col{margin-bottom:2em;padding-bottom:0}.about-wrap .under-the-hood:nth-of-type(2n){margin-top:0}.about-wrap .under-the-hood:nth-of-type(2n) h4{margin-top:0}} \ No newline at end of file diff --git a/wp-admin/css/admin-menu-rtl.css b/wp-admin/css/admin-menu-rtl.css index 9b10663..5c951f1 100644 --- a/wp-admin/css/admin-menu-rtl.css +++ b/wp-admin/css/admin-menu-rtl.css @@ -3,19 +3,19 @@ #adminmenu, #adminmenu .wp-submenu { width: 160px; - background-color: #222; + background-color: #23282d; } #adminmenuback { - position: absolute; + position: fixed; top: 0; - bottom: 0; - z-index: -1; + bottom: -120px; + z-index: 1; /* positive z-index to avoid elastic scrolling woes in Safari */ } #adminmenu { clear: right; - margin: 12px 0 0; + margin: 12px 0; padding: 0; list-style: none; } @@ -38,8 +38,8 @@ /* New Menu icons */ .icon16:before { - color: #999; - font: normal 20px/1 'dashicons'; + color: #82878c; /* same as new icons */ + font: normal 20px/1 dashicons; speak: none; padding: 6px 0; height: 34px; @@ -52,56 +52,56 @@ } .icon16.icon-dashboard:before { - content: '\f226'; + content: "\f226"; } .icon16.icon-post:before { - content: '\f109'; + content: "\f109"; } .icon16.icon-media:before { - content: '\f104'; + content: "\f104"; } .icon16.icon-links:before { - content: '\f103'; + content: "\f103"; } .icon16.icon-page:before { - content: '\f105'; + content: "\f105"; } .icon16.icon-comments:before { - content: '\f101'; + content: "\f101"; margin-top: 1px; } .icon16.icon-appearance:before { - content: '\f100'; + content: "\f100"; } .icon16.icon-plugins:before { - content: '\f106'; + content: "\f106"; } .icon16.icon-users:before { - content: '\f110'; + content: "\f110"; } .icon16.icon-tools:before { - content: '\f107'; + content: "\f107"; } .icon16.icon-settings:before { - content: '\f108'; + content: "\f108"; } .icon16.icon-site:before { - content: '\f112' + content: "\f112"; } .icon16.icon-generic:before { - content: '\f111'; + content: "\f111"; } /* hide background-image for icons above */ @@ -141,6 +141,7 @@ #adminmenuwrap { position: relative; float: right; + z-index: 9990; } /* side admin menu */ @@ -165,7 +166,8 @@ } #adminmenu .wp-submenu a { - color: #bbb; + color: #b4b9be; + color: rgba(240,245,250,0.7); } #adminmenu .wp-submenu a:hover, @@ -177,7 +179,7 @@ #adminmenu li.menu-top > a:focus, #adminmenu .wp-submenu a:hover, #adminmenu .wp-submenu a:focus { - color: #2ea2cc; + color: #00b9eb; } #adminmenu li.menu-top { @@ -200,7 +202,7 @@ .folded #adminmenu .wp-has-current-submenu .wp-submenu { padding: 7px 0 8px; z-index: 9999; - background-color: #333; + background-color: #32373c; -webkit-box-shadow: 0 3px 5px rgba(0,0,0,0.2); box-shadow: 0 3px 5px rgba(0,0,0,0.2); } @@ -227,7 +229,7 @@ margin-top: 0; -webkit-box-shadow: none; box-shadow: none; - background-color: #333; + background-color: #32373c; } /* ensure that wp-submenu's box shadow doesn't appear on top of the focused menu item's background. */ @@ -235,7 +237,8 @@ #adminmenu li.opensub > a.menu-top, #adminmenu li > a.menu-top:focus { position: relative; - background-color: #111; + background-color: #191e23; + color: #00b9eb; } .folded #adminmenu li.menu-top:hover, @@ -251,7 +254,7 @@ #adminmenu .wp-menu-arrow, #adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head, #adminmenu .wp-menu-arrow div { - background: #0074a2; + background: #0073aa; color: #fff; } @@ -315,11 +318,15 @@ padding: 0; } -#adminmenu .wp-submenu-head, -.folded #adminmenu .wp-menu-name { +#adminmenu .wp-submenu-head { display: none; } +.folded #adminmenu .wp-menu-name { + position: absolute; + right: -999px; +} + .folded #adminmenu .wp-submenu-head { display: block; } @@ -356,26 +363,37 @@ } div.wp-menu-image:before { - color: #999; + color: #a0a5aa; + color: rgba(240,245,250,0.6); padding: 7px 0; -webkit-transition: all .1s ease-in-out; transition: all .1s ease-in-out; } #adminmenu div.wp-menu-image:before { - color: #999; + color: #a0a5aa; + color: rgba(240,245,250,0.6); } #adminmenu li.wp-has-current-submenu:hover div.wp-menu-image:before, #adminmenu .wp-has-current-submenu div.wp-menu-image:before, #adminmenu .current div.wp-menu-image:before, #adminmenu a.wp-has-current-submenu:hover div.wp-menu-image:before, -#adminmenu a.current:hover div.wp-menu-image:before { +#adminmenu a.current:hover div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before { color: #fff; } -#adminmenu li:hover div.wp-menu-image:before { - color: #2ea2cc; +#adminmenu li:hover div.wp-menu-image:before, +#adminmenu li a:focus div.wp-menu-image:before, +#adminmenu li.opensub div.wp-menu-image:before { + color: #00b9eb; +} + +/* IE8 doesn't redraw the pseudo elements unless you make a change to the content, this restore the initial color after hover */ +.ie8 #adminmenu li.opensub div.wp-menu-image:before { + color: #a0a5aa; } .folded #adminmenu div.wp-menu-image { @@ -406,7 +424,6 @@ div.wp-menu-image:before { /* Sticky admin menu */ .sticky-menu #adminmenuwrap { position: fixed; - z-index: 9999; /* Match the z-index of .wp-submenu to ensure flyout menus don't appear underneath main column elements */ } /* A new arrow */ @@ -464,7 +481,7 @@ ul#adminmenu > li.current > a.current:after { } #adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after { - border-left-color: #333; + border-left-color: #32373c; } #adminmenu li.menu-top:hover .wp-menu-image img, @@ -500,8 +517,7 @@ ul#adminmenu > li.current > a.current:after { } #adminmenu .awaiting-mod, -#adminmenu .update-plugins, -#sidemenu li a span.update-plugins { +#adminmenu .update-plugins { display: inline-block; background-color: #d54e21; color: #fff; @@ -516,20 +532,18 @@ ul#adminmenu > li.current > a.current:after { } #adminmenu li .awaiting-mod span, -#adminmenu li span.update-plugins span, -#sidemenu li a span.update-plugins span { +#adminmenu li span.update-plugins span { display: block; padding: 0 6px; } #adminmenu li.current a .awaiting-mod, #adminmenu li a.wp-has-current-submenu .update-plugins { - background-color: #2ea2cc; + background-color: #00b9eb; color: #fff; } -#adminmenu li span.count-0, -#sidemenu li a .count-0 { +#adminmenu li span.count-0 { display: none; } @@ -537,14 +551,15 @@ ul#adminmenu > li.current > a.current:after { font-size: 13px; line-height: 34px; margin-top: 10px; - color: #aaa; + color: #a0a5aa; + color: rgba(240,245,250,0.6); -webkit-transition: all .1s ease-in-out; transition: all .1s ease-in-out; } #collapse-menu:hover, #collapse-menu:hover #collapse-button div:after { - color: #2ea2cc; + color: #00b9eb; } .folded #collapse-menu span { @@ -571,13 +586,14 @@ ul#adminmenu > li.current > a.current:after { } #collapse-button div:after { - content: '\f148'; + content: "\f148"; display: block; line-height: 15px; right: -3px; top: -3px; - color: #aaa; - font: normal 20px/1 'dashicons' !important; + color: #a0a5aa; + color: rgba(240,245,250,0.6); + font: normal 20px/1 dashicons !important; speak: none; margin: 0 auto; padding: 0 !important; @@ -590,6 +606,7 @@ ul#adminmenu > li.current > a.current:after { -moz-osx-font-smoothing: grayscale; } +/* rtl:ignore */ .folded #collapse-button div:after, .rtl #collapse-button div:after { -webkit-transform: rotate(180deg); @@ -610,12 +627,17 @@ li#wp-admin-bar-menu-toggle { display: none; } +/* Hide-if-customize for items we can't add classes to */ +.customize-support #menu-appearance a[href="themes.php?page=custom-header"], +.customize-support #menu-appearance a[href="themes.php?page=custom-background"] { + display: none; +} /* Auto-folding of the admin menu */ -@media only screen and (max-width: 900px) { +@media only screen and (max-width: 960px) { .auto-fold #wpcontent, .auto-fold #wpfooter { - margin-right: 56px; + margin-right: 36px; } .auto-fold #adminmenuback, @@ -660,7 +682,8 @@ li#wp-admin-bar-menu-toggle { } .auto-fold #adminmenu .wp-menu-name { - display: none; + position: absolute; + right: -999px; } .auto-fold #adminmenu .wp-submenu-head { @@ -716,6 +739,7 @@ li#wp-admin-bar-menu-toggle { background: none; } + /* rtl:ignore */ .auto-fold #collapse-button div:after { -webkit-transform: rotate(180deg); -ms-transform: rotate(180deg); @@ -778,7 +802,7 @@ li#wp-admin-bar-menu-toggle { /* Restore the menu names */ .auto-fold #adminmenu .wp-menu-name { - display: block; + position: static; margin-right: 35px; } @@ -865,7 +889,7 @@ li#wp-admin-bar-menu-toggle { } .wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a { - background: #333; + background: #32373c; } li#wp-admin-bar-menu-toggle { @@ -877,10 +901,10 @@ li#wp-admin-bar-menu-toggle { } #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before { - content: '\f228'; + content: "\f228"; display: inline-block; float: right; - font: normal 40px/45px 'Dashicons'; + font: normal 40px/45px dashicons; vertical-align: middle; outline: none; margin: 0; @@ -896,6 +920,10 @@ li#wp-admin-bar-menu-toggle { -moz-box-sizing: border-box; box-sizing: border-box; } + + .wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before { + color: #00b9eb; + } } /* Smartphone */ @@ -914,4 +942,3 @@ li#wp-admin-bar-menu-toggle { top: 46px; } } - diff --git a/wp-admin/css/admin-menu-rtl.min.css b/wp-admin/css/admin-menu-rtl.min.css new file mode 100644 index 0000000..741d08d --- /dev/null +++ b/wp-admin/css/admin-menu-rtl.min.css @@ -0,0 +1 @@ +#adminmenu,#adminmenu .wp-submenu,#adminmenuback,#adminmenuwrap{width:160px;background-color:#23282d}#adminmenuback{position:fixed;top:0;bottom:-120px;z-index:1}#adminmenu{clear:right;margin:12px 0;padding:0;list-style:none}.folded #adminmenu,.folded #adminmenu li.menu-top,.folded #adminmenuback,.folded #adminmenuwrap{width:36px}.icon16{height:18px;width:18px;padding:6px;margin:-6px -8px 0 0;float:right}.icon16:before{color:#82878c;font:400 20px/1 dashicons;speak:none;padding:6px 0;height:34px;width:20px;display:inline-block;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}.icon16.icon-dashboard:before{content:"\f226"}.icon16.icon-post:before{content:"\f109"}.icon16.icon-media:before{content:"\f104"}.icon16.icon-links:before{content:"\f103"}.icon16.icon-page:before{content:"\f105"}.icon16.icon-comments:before{content:"\f101";margin-top:1px}.icon16.icon-appearance:before{content:"\f100"}.icon16.icon-plugins:before{content:"\f106"}.icon16.icon-users:before{content:"\f110"}.icon16.icon-tools:before{content:"\f107"}.icon16.icon-settings:before{content:"\f108"}.icon16.icon-site:before{content:"\f112"}.icon16.icon-generic:before{content:"\f111"}.icon16.icon-appearance,.icon16.icon-comments,.icon16.icon-dashboard,.icon16.icon-generic,.icon16.icon-links,.icon16.icon-media,.icon16.icon-page,.icon16.icon-plugins,.icon16.icon-post,.icon16.icon-settings,.icon16.icon-site,.icon16.icon-tools,.icon16.icon-users,.menu-icon-appearance div.wp-menu-image,.menu-icon-comments div.wp-menu-image,.menu-icon-dashboard div.wp-menu-image,.menu-icon-generic div.wp-menu-image,.menu-icon-links div.wp-menu-image,.menu-icon-media div.wp-menu-image,.menu-icon-page div.wp-menu-image,.menu-icon-plugins div.wp-menu-image,.menu-icon-post div.wp-menu-image,.menu-icon-settings div.wp-menu-image,.menu-icon-site div.wp-menu-image,.menu-icon-tools div.wp-menu-image,.menu-icon-users div.wp-menu-image{background-image:none!important}#adminmenuwrap{position:relative;float:right;z-index:9990}#adminmenu *{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}#adminmenu li{margin:0;padding:0;cursor:pointer}#adminmenu a{display:block;line-height:18px;padding:2px 5px;color:#eee}#adminmenu .wp-submenu a{color:#b4b9be;color:rgba(240,245,250,.7)}#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover{background:0 0}#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a:hover,#adminmenu li.menu-top>a:focus{color:#00b9eb}#adminmenu li.menu-top{border:none;min-height:34px;position:relative}#adminmenu .wp-submenu{list-style:none;position:absolute;top:-1000em;right:160px;overflow:visible;word-wrap:break-word}#adminmenu .wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu,.folded #adminmenu a.wp-has-current-submenu:focus+.wp-submenu{padding:7px 0 8px;z-index:9999;background-color:#32373c;-webkit-box-shadow:0 3px 5px rgba(0,0,0,.2);box-shadow:0 3px 5px rgba(0,0,0,.2)}#adminmenu a.menu-top:focus+.wp-submenu,.js #adminmenu .opensub .wp-submenu,.js #adminmenu .sub-open,.no-js li.wp-has-submenu:hover .wp-submenu{top:-1px}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu .wp-submenu.sub-open,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.no-js li.wp-has-current-submenu:hover .wp-submenu{position:relative;z-index:3;top:auto;right:auto;left:auto;bottom:auto;border:0;margin-top:0;-webkit-box-shadow:none;box-shadow:none;background-color:#32373c}#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{position:relative;background-color:#191e23;color:#00b9eb}.folded #adminmenu li.menu-top:hover,.folded #adminmenu li.opensub>a.menu-top,.folded #adminmenu li>a.menu-top:focus{z-index:10000}#adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu .wp-menu-arrow,#adminmenu .wp-menu-arrow div,#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top,.folded #adminmenu li.wp-has-current-submenu{background:#0073aa;color:#fff}.folded #adminmenu .opensub .wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu.sub-open,.folded #adminmenu .wp-has-current-submenu a.menu-top:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu.opensub .wp-submenu,.folded #adminmenu .wp-submenu.sub-open,.folded #adminmenu a.menu-top:focus+.wp-submenu,.no-js.folded #adminmenu .wp-has-submenu:hover .wp-submenu{top:0;right:36px}.folded #adminmenu .wp-has-current-submenu .wp-submenu,.folded #adminmenu a.wp-has-current-submenu:focus+.wp-submenu{position:absolute;top:-1000em}#adminmenu .wp-not-current-submenu .wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{min-width:160px;width:auto}#adminmenu .wp-submenu a{font-size:13px;line-height:1.2;margin:0;padding:6px 0}#adminmenu .opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current,#adminmenu .wp-submenu li.current a,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-not-current-submenu li>a,.folded #adminmenu .wp-has-current-submenu li>a{padding-left:16px;padding-right:14px;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}#adminmenu .wp-has-current-submenu ul>li>a,.folded #adminmenu li.menu-top .wp-submenu>li>a{padding:6px 12px}#adminmenu .wp-submenu-head,#adminmenu a.menu-top{font-size:14px;font-weight:400;line-height:18px;padding:0}#adminmenu .wp-submenu-head{display:none}.folded #adminmenu .wp-menu-name{position:absolute;right:-999px}.folded #adminmenu .wp-submenu-head{display:block}#adminmenu .wp-submenu li{padding:0;margin:0;overflow:hidden}#adminmenu .wp-menu-image img{padding:9px 0 0;opacity:.6;filter:alpha(opacity=60)}#adminmenu div.wp-menu-name{padding:8px 0}#adminmenu div.wp-menu-image{float:right;width:36px;height:34px;margin:0;text-align:center}#adminmenu div.wp-menu-image.svg{background-repeat:no-repeat;background-position:center;-webkit-background-size:20px auto;background-size:20px auto}div.wp-menu-image:before{color:#a0a5aa;color:rgba(240,245,250,.6);padding:7px 0;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}#adminmenu div.wp-menu-image:before{color:#a0a5aa;color:rgba(240,245,250,.6)}#adminmenu .current div.wp-menu-image:before,#adminmenu .wp-has-current-submenu div.wp-menu-image:before,#adminmenu a.current:hover div.wp-menu-image:before,#adminmenu a.wp-has-current-submenu:hover div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu:hover div.wp-menu-image:before{color:#fff}#adminmenu li a:focus div.wp-menu-image:before,#adminmenu li.opensub div.wp-menu-image:before,#adminmenu li:hover div.wp-menu-image:before{color:#00b9eb}.ie8 #adminmenu li.opensub div.wp-menu-image:before{color:#a0a5aa}.folded #adminmenu div.wp-menu-image{width:35px;height:30px;position:absolute;z-index:25}.folded #adminmenu a.menu-top{height:34px}.no-font-face #adminmenu .wp-menu-image{display:none}.no-font-face #adminmenu div.wp-menu-name{padding:8px 12px}.no-font-face.auto-fold #adminmenu .wp-menu-name{margin-right:0}.sticky-menu #adminmenuwrap{position:fixed}.wp-menu-arrow{display:none!important}ul#adminmenu a.wp-has-current-submenu{position:relative}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{left:0;border:8px solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none;border-left-color:#f1f1f1;top:50%;margin-top:-8px}.folded ul#adminmenu li:hover a.wp-has-current-submenu:after{display:none}.folded ul#adminmenu a.wp-has-current-submenu:after,.folded ul#adminmenu>li a.current:after{border-width:4px;margin-top:-4px}#adminmenu li.wp-has-submenu.wp-not-current-submenu:hover:after{left:0;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none;border-width:8px;top:10px;z-index:10000}.folded ul#adminmenu li.wp-has-submenu.wp-not-current-submenu:hover:after{border-width:4px;margin-top:-4px;top:18px}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-left-color:#32373c}#adminmenu li.menu-top:hover .wp-menu-image img,#adminmenu li.wp-has-current-submenu .wp-menu-image img{opacity:1;filter:alpha(opacity=100)}#adminmenu li.wp-menu-separator{height:5px;padding:0;margin:0 0 6px;cursor:inherit}#adminmenu div.separator{height:2px;padding:0}#collapse-button,#collapse-button div{height:15px;width:15px}#adminmenu .wp-submenu .wp-submenu-head{color:#fff;font-weight:400;font-size:14px;padding:8px 11px 8px 4px;margin:-7px 0 4px}#adminmenu li.current,.folded #adminmenu li.wp-menu-open{border:0}#adminmenu .awaiting-mod,#adminmenu .update-plugins{display:inline-block;background-color:#d54e21;color:#fff;font-size:9px;line-height:17px;font-weight:600;margin:1px 2px 0 0;vertical-align:top;-webkit-border-radius:10px;border-radius:10px;z-index:26}#adminmenu li .awaiting-mod span,#adminmenu li span.update-plugins span{display:block;padding:0 6px}#adminmenu li span.count-0,.folded #collapse-menu span{display:none}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod{background-color:#00b9eb;color:#fff}#collapse-menu{font-size:13px;line-height:34px;margin-top:10px;color:#a0a5aa;color:rgba(240,245,250,.6);-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}#collapse-menu:hover,#collapse-menu:hover #collapse-button div:after{color:#00b9eb}#collapse-button{float:right;margin:10px 11px 10px 8px;-webkit-border-radius:10px;border-radius:10px}#wpwrap #collapse-button div{padding:0}#collapse-button div:after{content:"\f148";display:block;line-height:15px;right:-3px;top:-3px;color:#a0a5aa;color:rgba(240,245,250,.6);font:400 20px/1 dashicons!important;speak:none;margin:0 auto;padding:0!important;position:relative;text-align:center;width:20px;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.folded #collapse-button div:after,.rtl #collapse-button div:after{-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.rtl.folded #collapse-button div:after{-webkit-transform:none;-ms-transform:none;transform:none}.customize-support #menu-appearance a[href="themes.php?page=custom-header"],.customize-support #menu-appearance a[href="themes.php?page=custom-background"],li#wp-admin-bar-menu-toggle{display:none}@media only screen and (max-width:960px){.auto-fold #wpcontent,.auto-fold #wpfooter{margin-right:36px}.auto-fold #adminmenu,.auto-fold #adminmenu li.menu-top,.auto-fold #adminmenuback,.auto-fold #adminmenuwrap{width:36px}.auto-fold #adminmenu .opensub .wp-submenu,.auto-fold #adminmenu .wp-has-current-submenu .wp-submenu.sub-open,.auto-fold #adminmenu .wp-has-current-submenu a.menu-top:focus+.wp-submenu,.auto-fold #adminmenu .wp-has-current-submenu.opensub .wp-submenu,.auto-fold #adminmenu .wp-submenu.sub-open,.auto-fold #adminmenu a.menu-top:focus+.wp-submenu{top:0;right:36px}.auto-fold #adminmenu .wp-has-current-submenu .wp-submenu,.auto-fold #adminmenu a.wp-has-current-submenu:focus+.wp-submenu{position:absolute;top:-1000em;margin-left:-1px;padding:7px 0 8px;z-index:9999}.auto-fold #adminmenu .wp-has-current-submenu .wp-submenu{min-width:150px;width:auto}.auto-fold #adminmenu .wp-has-current-submenu li>a{padding-left:16px;padding-right:14px}.auto-fold #adminmenu li.menu-top .wp-submenu>li>a{padding-right:12px}.auto-fold #adminmenu .wp-menu-name{position:absolute;right:-999px}.auto-fold #adminmenu .wp-submenu-head{display:block}.auto-fold #adminmenu div.wp-menu-image{height:30px;width:34px;position:absolute;z-index:25}.auto-fold #adminmenu a.menu-top{height:34px}.auto-fold #adminmenu li.wp-menu-open{border:0}.auto-fold #adminmenu .wp-has-current-submenu.menu-top-last{margin-bottom:0}.auto-fold ul#adminmenu li:hover a.wp-has-current-submenu:after{display:none}.auto-fold ul#adminmenu li.wp-has-submenu.wp-not-current-submenu:hover:after{border-width:4px;margin-top:-4px;top:16px}.auto-fold ul#adminmenu a.wp-has-current-submenu:after,.auto-fold ul#adminmenu>li a.current:after{border-width:4px;margin-top:-4px}.auto-fold #adminmenu li.menu-top:hover,.auto-fold #adminmenu li.opensub>a.menu-top,.auto-fold #adminmenu li>a.menu-top:focus{z-index:10000}.auto-fold #collapse-menu span{display:none}.auto-fold #collapse-button div{background:0 0}.auto-fold #collapse-button div:after{-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.rtl.auto-fold #collapse-button div:after{-webkit-transform:none;-ms-transform:none;transform:none}}@media screen and (max-width:782px){.auto-fold #wpcontent{position:relative;margin-right:0;padding-right:10px}.sticky-menu #adminmenuwrap{position:relative;z-index:auto;top:0}.auto-fold #adminmenu,.auto-fold #adminmenuback,.auto-fold #adminmenuwrap{position:absolute;width:190px;z-index:100}.auto-fold #adminmenuback,.auto-fold #adminmenuwrap{display:none}.auto-fold .wp-responsive-open #adminmenuback,.auto-fold .wp-responsive-open #adminmenuwrap{display:block}.auto-fold #adminmenu li.menu-top{width:100%}.auto-fold #adminmenu li a{font-size:16px;padding:5px}.auto-fold #adminmenu li.menu-top .wp-submenu>li>a{padding:10px 20px 10px 10px}.auto-fold #adminmenu .wp-menu-name{position:static;margin-right:35px}.auto-fold ul#adminmenu a.wp-has-current-submenu:after,.auto-fold ul#adminmenu>li.current>a.current:after{border-width:8px;margin-top:-8px}.auto-fold ul#adminmenu li.wp-has-submenu.wp-not-current-submenu:hover:after{display:none}#adminmenu .wp-submenu{position:relative;display:none}.auto-fold #adminmenu .selected .wp-submenu,.auto-fold #adminmenu .wp-menu-open .wp-submenu{position:relative;display:block;top:0;right:-1px;-webkit-box-shadow:none;box-shadow:none}.auto-fold #adminmenu .selected .wp-submenu:after,.auto-fold #adminmenu .wp-menu-open .wp-submenu:after{display:none}.auto-fold #adminmenu .opensub .wp-submenu{display:none}.auto-fold #adminmenu .selected .wp-submenu{display:block}.auto-fold ul#adminmenu li:hover a.wp-has-current-submenu:after{display:block}.auto-fold #adminmenu .wp-has-current-submenu a.menu-top:focus+.wp-submenu,.auto-fold #adminmenu a.menu-top:focus+.wp-submenu{position:relative;right:-1px;left:0;top:0}#adminmenu .wp-submenu .wp-submenu-head{display:none}#wp-responsive-toggle{position:fixed;top:5px;right:4px;padding-left:10px;z-index:99999;border:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#wpadminbar #wp-admin-bar-menu-toggle a{display:block;padding:0;overflow:hidden;outline:0;text-decoration:none;border:1px solid transparent;background:0 0;height:44px;margin-right:-1px}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#32373c}li#wp-admin-bar-menu-toggle{display:block}#wpadminbar #wp-admin-bar-menu-toggle a:hover{border:1px solid transparent}#wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before{content:"\f228";display:inline-block;float:right;font:400 40px/45px dashicons;vertical-align:middle;outline:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;height:44px;width:50px;padding:0;border:none;text-align:center;text-decoration:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before{color:#00b9eb}}@media screen and (max-width:600px){#adminmenuback,#adminmenuwrap{display:none}.wp-responsive-open #adminmenuback,.wp-responsive-open #adminmenuwrap{display:block}.auto-fold #adminmenu{top:46px}} \ No newline at end of file diff --git a/wp-admin/css/admin-menu.css b/wp-admin/css/admin-menu.css index a0a9f21..337cde0 100644 --- a/wp-admin/css/admin-menu.css +++ b/wp-admin/css/admin-menu.css @@ -3,19 +3,19 @@ #adminmenu, #adminmenu .wp-submenu { width: 160px; - background-color: #222; + background-color: #23282d; } #adminmenuback { - position: absolute; + position: fixed; top: 0; - bottom: 0; - z-index: -1; + bottom: -120px; + z-index: 1; /* positive z-index to avoid elastic scrolling woes in Safari */ } #adminmenu { clear: left; - margin: 12px 0 0; + margin: 12px 0; padding: 0; list-style: none; } @@ -38,8 +38,8 @@ /* New Menu icons */ .icon16:before { - color: #999; - font: normal 20px/1 'dashicons'; + color: #82878c; /* same as new icons */ + font: normal 20px/1 dashicons; speak: none; padding: 6px 0; height: 34px; @@ -52,56 +52,56 @@ } .icon16.icon-dashboard:before { - content: '\f226'; + content: "\f226"; } .icon16.icon-post:before { - content: '\f109'; + content: "\f109"; } .icon16.icon-media:before { - content: '\f104'; + content: "\f104"; } .icon16.icon-links:before { - content: '\f103'; + content: "\f103"; } .icon16.icon-page:before { - content: '\f105'; + content: "\f105"; } .icon16.icon-comments:before { - content: '\f101'; + content: "\f101"; margin-top: 1px; } .icon16.icon-appearance:before { - content: '\f100'; + content: "\f100"; } .icon16.icon-plugins:before { - content: '\f106'; + content: "\f106"; } .icon16.icon-users:before { - content: '\f110'; + content: "\f110"; } .icon16.icon-tools:before { - content: '\f107'; + content: "\f107"; } .icon16.icon-settings:before { - content: '\f108'; + content: "\f108"; } .icon16.icon-site:before { - content: '\f112' + content: "\f112"; } .icon16.icon-generic:before { - content: '\f111'; + content: "\f111"; } /* hide background-image for icons above */ @@ -141,6 +141,7 @@ #adminmenuwrap { position: relative; float: left; + z-index: 9990; } /* side admin menu */ @@ -165,7 +166,8 @@ } #adminmenu .wp-submenu a { - color: #bbb; + color: #b4b9be; + color: rgba(240,245,250,0.7); } #adminmenu .wp-submenu a:hover, @@ -177,7 +179,7 @@ #adminmenu li.menu-top > a:focus, #adminmenu .wp-submenu a:hover, #adminmenu .wp-submenu a:focus { - color: #2ea2cc; + color: #00b9eb; } #adminmenu li.menu-top { @@ -200,7 +202,7 @@ .folded #adminmenu .wp-has-current-submenu .wp-submenu { padding: 7px 0 8px; z-index: 9999; - background-color: #333; + background-color: #32373c; -webkit-box-shadow: 0 3px 5px rgba(0,0,0,0.2); box-shadow: 0 3px 5px rgba(0,0,0,0.2); } @@ -227,7 +229,7 @@ margin-top: 0; -webkit-box-shadow: none; box-shadow: none; - background-color: #333; + background-color: #32373c; } /* ensure that wp-submenu's box shadow doesn't appear on top of the focused menu item's background. */ @@ -235,7 +237,8 @@ #adminmenu li.opensub > a.menu-top, #adminmenu li > a.menu-top:focus { position: relative; - background-color: #111; + background-color: #191e23; + color: #00b9eb; } .folded #adminmenu li.menu-top:hover, @@ -251,7 +254,7 @@ #adminmenu .wp-menu-arrow, #adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head, #adminmenu .wp-menu-arrow div { - background: #0074a2; + background: #0073aa; color: #fff; } @@ -315,11 +318,15 @@ padding: 0; } -#adminmenu .wp-submenu-head, -.folded #adminmenu .wp-menu-name { +#adminmenu .wp-submenu-head { display: none; } +.folded #adminmenu .wp-menu-name { + position: absolute; + left: -999px; +} + .folded #adminmenu .wp-submenu-head { display: block; } @@ -356,26 +363,37 @@ } div.wp-menu-image:before { - color: #999; + color: #a0a5aa; + color: rgba(240,245,250,0.6); padding: 7px 0; -webkit-transition: all .1s ease-in-out; transition: all .1s ease-in-out; } #adminmenu div.wp-menu-image:before { - color: #999; + color: #a0a5aa; + color: rgba(240,245,250,0.6); } #adminmenu li.wp-has-current-submenu:hover div.wp-menu-image:before, #adminmenu .wp-has-current-submenu div.wp-menu-image:before, #adminmenu .current div.wp-menu-image:before, #adminmenu a.wp-has-current-submenu:hover div.wp-menu-image:before, -#adminmenu a.current:hover div.wp-menu-image:before { +#adminmenu a.current:hover div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before { color: #fff; } -#adminmenu li:hover div.wp-menu-image:before { - color: #2ea2cc; +#adminmenu li:hover div.wp-menu-image:before, +#adminmenu li a:focus div.wp-menu-image:before, +#adminmenu li.opensub div.wp-menu-image:before { + color: #00b9eb; +} + +/* IE8 doesn't redraw the pseudo elements unless you make a change to the content, this restore the initial color after hover */ +.ie8 #adminmenu li.opensub div.wp-menu-image:before { + color: #a0a5aa; } .folded #adminmenu div.wp-menu-image { @@ -406,7 +424,6 @@ div.wp-menu-image:before { /* Sticky admin menu */ .sticky-menu #adminmenuwrap { position: fixed; - z-index: 9999; /* Match the z-index of .wp-submenu to ensure flyout menus don't appear underneath main column elements */ } /* A new arrow */ @@ -464,7 +481,7 @@ ul#adminmenu > li.current > a.current:after { } #adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after { - border-right-color: #333; + border-right-color: #32373c; } #adminmenu li.menu-top:hover .wp-menu-image img, @@ -500,8 +517,7 @@ ul#adminmenu > li.current > a.current:after { } #adminmenu .awaiting-mod, -#adminmenu .update-plugins, -#sidemenu li a span.update-plugins { +#adminmenu .update-plugins { display: inline-block; background-color: #d54e21; color: #fff; @@ -516,20 +532,18 @@ ul#adminmenu > li.current > a.current:after { } #adminmenu li .awaiting-mod span, -#adminmenu li span.update-plugins span, -#sidemenu li a span.update-plugins span { +#adminmenu li span.update-plugins span { display: block; padding: 0 6px; } #adminmenu li.current a .awaiting-mod, #adminmenu li a.wp-has-current-submenu .update-plugins { - background-color: #2ea2cc; + background-color: #00b9eb; color: #fff; } -#adminmenu li span.count-0, -#sidemenu li a .count-0 { +#adminmenu li span.count-0 { display: none; } @@ -537,14 +551,15 @@ ul#adminmenu > li.current > a.current:after { font-size: 13px; line-height: 34px; margin-top: 10px; - color: #aaa; + color: #a0a5aa; + color: rgba(240,245,250,0.6); -webkit-transition: all .1s ease-in-out; transition: all .1s ease-in-out; } #collapse-menu:hover, #collapse-menu:hover #collapse-button div:after { - color: #2ea2cc; + color: #00b9eb; } .folded #collapse-menu span { @@ -571,13 +586,14 @@ ul#adminmenu > li.current > a.current:after { } #collapse-button div:after { - content: '\f148'; + content: "\f148"; display: block; line-height: 15px; left: -3px; top: -3px; - color: #aaa; - font: normal 20px/1 'dashicons' !important; + color: #a0a5aa; + color: rgba(240,245,250,0.6); + font: normal 20px/1 dashicons !important; speak: none; margin: 0 auto; padding: 0 !important; @@ -590,6 +606,7 @@ ul#adminmenu > li.current > a.current:after { -moz-osx-font-smoothing: grayscale; } +/* rtl:ignore */ .folded #collapse-button div:after, .rtl #collapse-button div:after { -webkit-transform: rotate(180deg); @@ -610,12 +627,17 @@ li#wp-admin-bar-menu-toggle { display: none; } +/* Hide-if-customize for items we can't add classes to */ +.customize-support #menu-appearance a[href="themes.php?page=custom-header"], +.customize-support #menu-appearance a[href="themes.php?page=custom-background"] { + display: none; +} /* Auto-folding of the admin menu */ -@media only screen and (max-width: 900px) { +@media only screen and (max-width: 960px) { .auto-fold #wpcontent, .auto-fold #wpfooter { - margin-left: 56px; + margin-left: 36px; } .auto-fold #adminmenuback, @@ -660,7 +682,8 @@ li#wp-admin-bar-menu-toggle { } .auto-fold #adminmenu .wp-menu-name { - display: none; + position: absolute; + left: -999px; } .auto-fold #adminmenu .wp-submenu-head { @@ -716,6 +739,7 @@ li#wp-admin-bar-menu-toggle { background: none; } + /* rtl:ignore */ .auto-fold #collapse-button div:after { -webkit-transform: rotate(180deg); -ms-transform: rotate(180deg); @@ -778,7 +802,7 @@ li#wp-admin-bar-menu-toggle { /* Restore the menu names */ .auto-fold #adminmenu .wp-menu-name { - display: block; + position: static; margin-left: 35px; } @@ -865,7 +889,7 @@ li#wp-admin-bar-menu-toggle { } .wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a { - background: #333; + background: #32373c; } li#wp-admin-bar-menu-toggle { @@ -877,10 +901,10 @@ li#wp-admin-bar-menu-toggle { } #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before { - content: '\f228'; + content: "\f228"; display: inline-block; float: left; - font: normal 40px/45px 'Dashicons'; + font: normal 40px/45px dashicons; vertical-align: middle; outline: none; margin: 0; @@ -896,6 +920,10 @@ li#wp-admin-bar-menu-toggle { -moz-box-sizing: border-box; box-sizing: border-box; } + + .wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before { + color: #00b9eb; + } } /* Smartphone */ @@ -914,4 +942,3 @@ li#wp-admin-bar-menu-toggle { top: 46px; } } - diff --git a/wp-admin/css/admin-menu.min.css b/wp-admin/css/admin-menu.min.css new file mode 100644 index 0000000..29dd623 --- /dev/null +++ b/wp-admin/css/admin-menu.min.css @@ -0,0 +1 @@ +#adminmenu,#adminmenu .wp-submenu,#adminmenuback,#adminmenuwrap{width:160px;background-color:#23282d}#adminmenuback{position:fixed;top:0;bottom:-120px;z-index:1}#adminmenu{clear:left;margin:12px 0;padding:0;list-style:none}.folded #adminmenu,.folded #adminmenu li.menu-top,.folded #adminmenuback,.folded #adminmenuwrap{width:36px}.icon16{height:18px;width:18px;padding:6px;margin:-6px 0 0 -8px;float:left}.icon16:before{color:#82878c;font:400 20px/1 dashicons;speak:none;padding:6px 0;height:34px;width:20px;display:inline-block;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}.icon16.icon-dashboard:before{content:"\f226"}.icon16.icon-post:before{content:"\f109"}.icon16.icon-media:before{content:"\f104"}.icon16.icon-links:before{content:"\f103"}.icon16.icon-page:before{content:"\f105"}.icon16.icon-comments:before{content:"\f101";margin-top:1px}.icon16.icon-appearance:before{content:"\f100"}.icon16.icon-plugins:before{content:"\f106"}.icon16.icon-users:before{content:"\f110"}.icon16.icon-tools:before{content:"\f107"}.icon16.icon-settings:before{content:"\f108"}.icon16.icon-site:before{content:"\f112"}.icon16.icon-generic:before{content:"\f111"}.icon16.icon-appearance,.icon16.icon-comments,.icon16.icon-dashboard,.icon16.icon-generic,.icon16.icon-links,.icon16.icon-media,.icon16.icon-page,.icon16.icon-plugins,.icon16.icon-post,.icon16.icon-settings,.icon16.icon-site,.icon16.icon-tools,.icon16.icon-users,.menu-icon-appearance div.wp-menu-image,.menu-icon-comments div.wp-menu-image,.menu-icon-dashboard div.wp-menu-image,.menu-icon-generic div.wp-menu-image,.menu-icon-links div.wp-menu-image,.menu-icon-media div.wp-menu-image,.menu-icon-page div.wp-menu-image,.menu-icon-plugins div.wp-menu-image,.menu-icon-post div.wp-menu-image,.menu-icon-settings div.wp-menu-image,.menu-icon-site div.wp-menu-image,.menu-icon-tools div.wp-menu-image,.menu-icon-users div.wp-menu-image{background-image:none!important}#adminmenuwrap{position:relative;float:left;z-index:9990}#adminmenu *{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}#adminmenu li{margin:0;padding:0;cursor:pointer}#adminmenu a{display:block;line-height:18px;padding:2px 5px;color:#eee}#adminmenu .wp-submenu a{color:#b4b9be;color:rgba(240,245,250,.7)}#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover{background:0 0}#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a:hover,#adminmenu li.menu-top>a:focus{color:#00b9eb}#adminmenu li.menu-top{border:none;min-height:34px;position:relative}#adminmenu .wp-submenu{list-style:none;position:absolute;top:-1000em;left:160px;overflow:visible;word-wrap:break-word}#adminmenu .wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu,.folded #adminmenu a.wp-has-current-submenu:focus+.wp-submenu{padding:7px 0 8px;z-index:9999;background-color:#32373c;-webkit-box-shadow:0 3px 5px rgba(0,0,0,.2);box-shadow:0 3px 5px rgba(0,0,0,.2)}#adminmenu a.menu-top:focus+.wp-submenu,.js #adminmenu .opensub .wp-submenu,.js #adminmenu .sub-open,.no-js li.wp-has-submenu:hover .wp-submenu{top:-1px}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu .wp-submenu.sub-open,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.no-js li.wp-has-current-submenu:hover .wp-submenu{position:relative;z-index:3;top:auto;left:auto;right:auto;bottom:auto;border:0;margin-top:0;-webkit-box-shadow:none;box-shadow:none;background-color:#32373c}#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{position:relative;background-color:#191e23;color:#00b9eb}.folded #adminmenu li.menu-top:hover,.folded #adminmenu li.opensub>a.menu-top,.folded #adminmenu li>a.menu-top:focus{z-index:10000}#adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu .wp-menu-arrow,#adminmenu .wp-menu-arrow div,#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top,.folded #adminmenu li.wp-has-current-submenu{background:#0073aa;color:#fff}.folded #adminmenu .opensub .wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu.sub-open,.folded #adminmenu .wp-has-current-submenu a.menu-top:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu.opensub .wp-submenu,.folded #adminmenu .wp-submenu.sub-open,.folded #adminmenu a.menu-top:focus+.wp-submenu,.no-js.folded #adminmenu .wp-has-submenu:hover .wp-submenu{top:0;left:36px}.folded #adminmenu .wp-has-current-submenu .wp-submenu,.folded #adminmenu a.wp-has-current-submenu:focus+.wp-submenu{position:absolute;top:-1000em}#adminmenu .wp-not-current-submenu .wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{min-width:160px;width:auto}#adminmenu .wp-submenu a{font-size:13px;line-height:1.2;margin:0;padding:6px 0}#adminmenu .opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current,#adminmenu .wp-submenu li.current a,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-not-current-submenu li>a,.folded #adminmenu .wp-has-current-submenu li>a{padding-right:16px;padding-left:14px;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}#adminmenu .wp-has-current-submenu ul>li>a,.folded #adminmenu li.menu-top .wp-submenu>li>a{padding:6px 12px}#adminmenu .wp-submenu-head,#adminmenu a.menu-top{font-size:14px;font-weight:400;line-height:18px;padding:0}#adminmenu .wp-submenu-head{display:none}.folded #adminmenu .wp-menu-name{position:absolute;left:-999px}.folded #adminmenu .wp-submenu-head{display:block}#adminmenu .wp-submenu li{padding:0;margin:0;overflow:hidden}#adminmenu .wp-menu-image img{padding:9px 0 0;opacity:.6;filter:alpha(opacity=60)}#adminmenu div.wp-menu-name{padding:8px 0}#adminmenu div.wp-menu-image{float:left;width:36px;height:34px;margin:0;text-align:center}#adminmenu div.wp-menu-image.svg{background-repeat:no-repeat;background-position:center;-webkit-background-size:20px auto;background-size:20px auto}div.wp-menu-image:before{color:#a0a5aa;color:rgba(240,245,250,.6);padding:7px 0;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}#adminmenu div.wp-menu-image:before{color:#a0a5aa;color:rgba(240,245,250,.6)}#adminmenu .current div.wp-menu-image:before,#adminmenu .wp-has-current-submenu div.wp-menu-image:before,#adminmenu a.current:hover div.wp-menu-image:before,#adminmenu a.wp-has-current-submenu:hover div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu:hover div.wp-menu-image:before{color:#fff}#adminmenu li a:focus div.wp-menu-image:before,#adminmenu li.opensub div.wp-menu-image:before,#adminmenu li:hover div.wp-menu-image:before{color:#00b9eb}.ie8 #adminmenu li.opensub div.wp-menu-image:before{color:#a0a5aa}.folded #adminmenu div.wp-menu-image{width:35px;height:30px;position:absolute;z-index:25}.folded #adminmenu a.menu-top{height:34px}.no-font-face #adminmenu .wp-menu-image{display:none}.no-font-face #adminmenu div.wp-menu-name{padding:8px 12px}.no-font-face.auto-fold #adminmenu .wp-menu-name{margin-left:0}.sticky-menu #adminmenuwrap{position:fixed}.wp-menu-arrow{display:none!important}ul#adminmenu a.wp-has-current-submenu{position:relative}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{right:0;border:8px solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none;border-right-color:#f1f1f1;top:50%;margin-top:-8px}.folded ul#adminmenu li:hover a.wp-has-current-submenu:after{display:none}.folded ul#adminmenu a.wp-has-current-submenu:after,.folded ul#adminmenu>li a.current:after{border-width:4px;margin-top:-4px}#adminmenu li.wp-has-submenu.wp-not-current-submenu:hover:after{right:0;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none;border-width:8px;top:10px;z-index:10000}.folded ul#adminmenu li.wp-has-submenu.wp-not-current-submenu:hover:after{border-width:4px;margin-top:-4px;top:18px}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-right-color:#32373c}#adminmenu li.menu-top:hover .wp-menu-image img,#adminmenu li.wp-has-current-submenu .wp-menu-image img{opacity:1;filter:alpha(opacity=100)}#adminmenu li.wp-menu-separator{height:5px;padding:0;margin:0 0 6px;cursor:inherit}#adminmenu div.separator{height:2px;padding:0}#collapse-button,#collapse-button div{height:15px;width:15px}#adminmenu .wp-submenu .wp-submenu-head{color:#fff;font-weight:400;font-size:14px;padding:8px 4px 8px 11px;margin:-7px 0 4px}#adminmenu li.current,.folded #adminmenu li.wp-menu-open{border:0}#adminmenu .awaiting-mod,#adminmenu .update-plugins{display:inline-block;background-color:#d54e21;color:#fff;font-size:9px;line-height:17px;font-weight:600;margin:1px 0 0 2px;vertical-align:top;-webkit-border-radius:10px;border-radius:10px;z-index:26}#adminmenu li .awaiting-mod span,#adminmenu li span.update-plugins span{display:block;padding:0 6px}#adminmenu li span.count-0,.folded #collapse-menu span{display:none}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod{background-color:#00b9eb;color:#fff}#collapse-menu{font-size:13px;line-height:34px;margin-top:10px;color:#a0a5aa;color:rgba(240,245,250,.6);-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}#collapse-menu:hover,#collapse-menu:hover #collapse-button div:after{color:#00b9eb}#collapse-button{float:left;margin:10px 8px 10px 11px;-webkit-border-radius:10px;border-radius:10px}#wpwrap #collapse-button div{padding:0}#collapse-button div:after{content:"\f148";display:block;line-height:15px;left:-3px;top:-3px;color:#a0a5aa;color:rgba(240,245,250,.6);font:400 20px/1 dashicons!important;speak:none;margin:0 auto;padding:0!important;position:relative;text-align:center;width:20px;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.folded #collapse-button div:after,.rtl #collapse-button div:after{-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.rtl.folded #collapse-button div:after{-webkit-transform:none;-ms-transform:none;transform:none}.customize-support #menu-appearance a[href="themes.php?page=custom-header"],.customize-support #menu-appearance a[href="themes.php?page=custom-background"],li#wp-admin-bar-menu-toggle{display:none}@media only screen and (max-width:960px){.auto-fold #wpcontent,.auto-fold #wpfooter{margin-left:36px}.auto-fold #adminmenu,.auto-fold #adminmenu li.menu-top,.auto-fold #adminmenuback,.auto-fold #adminmenuwrap{width:36px}.auto-fold #adminmenu .opensub .wp-submenu,.auto-fold #adminmenu .wp-has-current-submenu .wp-submenu.sub-open,.auto-fold #adminmenu .wp-has-current-submenu a.menu-top:focus+.wp-submenu,.auto-fold #adminmenu .wp-has-current-submenu.opensub .wp-submenu,.auto-fold #adminmenu .wp-submenu.sub-open,.auto-fold #adminmenu a.menu-top:focus+.wp-submenu{top:0;left:36px}.auto-fold #adminmenu .wp-has-current-submenu .wp-submenu,.auto-fold #adminmenu a.wp-has-current-submenu:focus+.wp-submenu{position:absolute;top:-1000em;margin-right:-1px;padding:7px 0 8px;z-index:9999}.auto-fold #adminmenu .wp-has-current-submenu .wp-submenu{min-width:150px;width:auto}.auto-fold #adminmenu .wp-has-current-submenu li>a{padding-right:16px;padding-left:14px}.auto-fold #adminmenu li.menu-top .wp-submenu>li>a{padding-left:12px}.auto-fold #adminmenu .wp-menu-name{position:absolute;left:-999px}.auto-fold #adminmenu .wp-submenu-head{display:block}.auto-fold #adminmenu div.wp-menu-image{height:30px;width:34px;position:absolute;z-index:25}.auto-fold #adminmenu a.menu-top{height:34px}.auto-fold #adminmenu li.wp-menu-open{border:0}.auto-fold #adminmenu .wp-has-current-submenu.menu-top-last{margin-bottom:0}.auto-fold ul#adminmenu li:hover a.wp-has-current-submenu:after{display:none}.auto-fold ul#adminmenu li.wp-has-submenu.wp-not-current-submenu:hover:after{border-width:4px;margin-top:-4px;top:16px}.auto-fold ul#adminmenu a.wp-has-current-submenu:after,.auto-fold ul#adminmenu>li a.current:after{border-width:4px;margin-top:-4px}.auto-fold #adminmenu li.menu-top:hover,.auto-fold #adminmenu li.opensub>a.menu-top,.auto-fold #adminmenu li>a.menu-top:focus{z-index:10000}.auto-fold #collapse-menu span{display:none}.auto-fold #collapse-button div{background:0 0}.auto-fold #collapse-button div:after{-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.rtl.auto-fold #collapse-button div:after{-webkit-transform:none;-ms-transform:none;transform:none}}@media screen and (max-width:782px){.auto-fold #wpcontent{position:relative;margin-left:0;padding-left:10px}.sticky-menu #adminmenuwrap{position:relative;z-index:auto;top:0}.auto-fold #adminmenu,.auto-fold #adminmenuback,.auto-fold #adminmenuwrap{position:absolute;width:190px;z-index:100}.auto-fold #adminmenuback,.auto-fold #adminmenuwrap{display:none}.auto-fold .wp-responsive-open #adminmenuback,.auto-fold .wp-responsive-open #adminmenuwrap{display:block}.auto-fold #adminmenu li.menu-top{width:100%}.auto-fold #adminmenu li a{font-size:16px;padding:5px}.auto-fold #adminmenu li.menu-top .wp-submenu>li>a{padding:10px 10px 10px 20px}.auto-fold #adminmenu .wp-menu-name{position:static;margin-left:35px}.auto-fold ul#adminmenu a.wp-has-current-submenu:after,.auto-fold ul#adminmenu>li.current>a.current:after{border-width:8px;margin-top:-8px}.auto-fold ul#adminmenu li.wp-has-submenu.wp-not-current-submenu:hover:after{display:none}#adminmenu .wp-submenu{position:relative;display:none}.auto-fold #adminmenu .selected .wp-submenu,.auto-fold #adminmenu .wp-menu-open .wp-submenu{position:relative;display:block;top:0;left:-1px;-webkit-box-shadow:none;box-shadow:none}.auto-fold #adminmenu .selected .wp-submenu:after,.auto-fold #adminmenu .wp-menu-open .wp-submenu:after{display:none}.auto-fold #adminmenu .opensub .wp-submenu{display:none}.auto-fold #adminmenu .selected .wp-submenu{display:block}.auto-fold ul#adminmenu li:hover a.wp-has-current-submenu:after{display:block}.auto-fold #adminmenu .wp-has-current-submenu a.menu-top:focus+.wp-submenu,.auto-fold #adminmenu a.menu-top:focus+.wp-submenu{position:relative;left:-1px;right:0;top:0}#adminmenu .wp-submenu .wp-submenu-head{display:none}#wp-responsive-toggle{position:fixed;top:5px;left:4px;padding-right:10px;z-index:99999;border:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#wpadminbar #wp-admin-bar-menu-toggle a{display:block;padding:0;overflow:hidden;outline:0;text-decoration:none;border:1px solid transparent;background:0 0;height:44px;margin-left:-1px}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#32373c}li#wp-admin-bar-menu-toggle{display:block}#wpadminbar #wp-admin-bar-menu-toggle a:hover{border:1px solid transparent}#wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before{content:"\f228";display:inline-block;float:left;font:400 40px/45px dashicons;vertical-align:middle;outline:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;height:44px;width:50px;padding:0;border:none;text-align:center;text-decoration:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before{color:#00b9eb}}@media screen and (max-width:600px){#adminmenuback,#adminmenuwrap{display:none}.wp-responsive-open #adminmenuback,.wp-responsive-open #adminmenuwrap{display:block}.auto-fold #adminmenu{top:46px}} \ No newline at end of file diff --git a/wp-admin/css/color-picker-rtl.css b/wp-admin/css/color-picker-rtl.css index f95cbc6..b502a0f 100644 --- a/wp-admin/css/color-picker-rtl.css +++ b/wp-admin/css/color-picker-rtl.css @@ -24,8 +24,8 @@ vertical-align: bottom; display: inline-block; padding-right: 30px; - -webkit-box-shadow: 0 1px 0 rgba(0,0,0,.08); - box-shadow: 0 1px 0 rgba(0,0,0,.08); + -webkit-box-shadow: 0 1px 0 #ccc; + box-shadow: 0 1px 0 #ccc; } .wp-color-result:after { @@ -43,19 +43,19 @@ left: 0; text-align: center; top: 0; - -webkit-box-shadow: inset 0 1px 0 #fff; - box-shadow: inset 0 1px 0 #fff; } -.wp-color-result:hover { +.wp-color-result:hover, +.wp-color-result:focus { background: #fafafa; border-color: #999; - color: #222; + color: #23282d; } -.wp-color-result:hover:after { - color: #222; - border-color: #aaa; +.wp-color-result:hover:after, +.wp-color-result:focus:after { + color: #23282d; + border-color: #a0a5aa; border-right: 1px solid #999; } @@ -73,13 +73,9 @@ } .wp-color-result:focus { - border-color: #888; - -webkit-box-shadow: 0 1px 2px rgba( 0, 0, 0, 0.2 ); - box-shadow: 0 1px 2px rgba( 0, 0, 0, 0.2 ); -} - -.wp-color-result:focus:after { - border-color: #888; + border-color: #5b9dd9; + -webkit-box-shadow: 0 0 3px rgba( 0, 115, 170, .8 ); + box-shadow: 0 0 3px rgba( 0, 115, 170, .8 ); } .wp-picker-open + .wp-picker-input-wrap { @@ -98,7 +94,7 @@ .wp-picker-container .iris-picker { -webkit-border-radius: 0; border-radius: 0; - border-color: #dfdfdf; + border-color: #ddd; margin-top: 6px; } @@ -106,17 +102,21 @@ width: 65px; font-size: 12px; font-family: monospace; - text-align: center; line-height: 16px; margin: 0; } -.wp-picker-container input[type="text"].wp-color-picker:focus::-webkit-input-placeholder { - color: transparent; +.wp-color-picker::-webkit-input-placeholder { + color: #72777c; +} + +.wp-color-picker::-moz-placeholder { + color: #72777c; + opacity: 1; } -.wp-picker-container input[type="text"].wp-color-picker:-moz-placeholder { - color: #999; +.wp-color-picker:-ms-input-placeholder { + color: #72777c; } .wp-picker-container input[type="text"].iris-error { diff --git a/wp-admin/css/color-picker-rtl.min.css b/wp-admin/css/color-picker-rtl.min.css index 023eccb..f14e240 100644 --- a/wp-admin/css/color-picker-rtl.min.css +++ b/wp-admin/css/color-picker-rtl.min.css @@ -1 +1 @@ -.wp-color-picker{width:80px}.wp-picker-container .hidden{display:none}.wp-color-result{background-color:#f7f7f7;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;cursor:pointer;height:22px;margin:0 0 6px 6px;position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;vertical-align:bottom;display:inline-block;padding-right:30px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.08);box-shadow:0 1px 0 rgba(0,0,0,.08)}.wp-color-result:after{background:#f7f7f7;-webkit-border-radius:2px 0 0 2px;border-radius:2px 0 0 2px;border-right:1px solid #ccc;color:#555;content:attr(title);display:block;font-size:11px;line-height:22px;padding:0 6px;position:relative;left:0;text-align:center;top:0;-webkit-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.wp-color-result:hover{background:#fafafa;border-color:#999;color:#222}.wp-color-result:hover:after{color:#222;border-color:#aaa;border-right:1px solid #999}.wp-color-result{top:0}.wp-color-result.wp-picker-open:after{content:attr(data-current)}.wp-picker-container,.wp-picker-container:active{display:inline-block;outline:0}.wp-color-result:focus{border-color:#888;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.2);box-shadow:0 1px 2px rgba(0,0,0,.2)}.wp-color-result:focus:after{border-color:#888}.wp-picker-open+.wp-picker-input-wrap{display:inline-block;vertical-align:top}.wp-picker-container .button{margin-right:6px}.wp-picker-container .iris-square-slider .ui-slider-handle:focus{background-color:#555}.wp-picker-container .iris-picker{-webkit-border-radius:0;border-radius:0;border-color:#dfdfdf;margin-top:6px}.wp-picker-container input[type=text].wp-color-picker{width:65px;font-size:12px;font-family:monospace;text-align:center;line-height:16px;margin:0}.wp-picker-container input[type=text].wp-color-picker:focus::-webkit-input-placeholder{color:transparent}.wp-picker-container input[type=text].wp-color-picker:-moz-placeholder{color:#999}.wp-picker-container input[type=text].iris-error{background-color:#ffebe8;border-color:#c00;color:#000} \ No newline at end of file +.wp-color-picker{width:80px}.wp-picker-container .hidden{display:none}.wp-color-result{background-color:#f7f7f7;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;cursor:pointer;height:22px;margin:0 0 6px 6px;position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;vertical-align:bottom;display:inline-block;padding-right:30px;-webkit-box-shadow:0 1px 0 #ccc;box-shadow:0 1px 0 #ccc;top:0}.wp-color-result:after{background:#f7f7f7;-webkit-border-radius:2px 0 0 2px;border-radius:2px 0 0 2px;border-right:1px solid #ccc;color:#555;content:attr(title);display:block;font-size:11px;line-height:22px;padding:0 6px;position:relative;left:0;text-align:center;top:0}.wp-color-result:focus,.wp-color-result:hover{background:#fafafa;border-color:#999;color:#23282d}.wp-color-result:focus:after,.wp-color-result:hover:after{color:#23282d;border-color:#a0a5aa;border-right:1px solid #999}.wp-color-result.wp-picker-open:after{content:attr(data-current)}.wp-picker-container,.wp-picker-container:active{display:inline-block;outline:0}.wp-color-result:focus{border-color:#5b9dd9;-webkit-box-shadow:0 0 3px rgba(0,115,170,.8);box-shadow:0 0 3px rgba(0,115,170,.8)}.wp-picker-open+.wp-picker-input-wrap{display:inline-block;vertical-align:top}.wp-picker-container .button{margin-right:6px}.wp-picker-container .iris-square-slider .ui-slider-handle:focus{background-color:#555}.wp-picker-container .iris-picker{-webkit-border-radius:0;border-radius:0;border-color:#ddd;margin-top:6px}.wp-picker-container input[type=text].wp-color-picker{width:65px;font-size:12px;font-family:monospace;line-height:16px;margin:0}.wp-color-picker::-webkit-input-placeholder{color:#72777c}.wp-color-picker::-moz-placeholder{color:#72777c;opacity:1}.wp-color-picker:-ms-input-placeholder{color:#72777c}.wp-picker-container input[type=text].iris-error{background-color:#ffebe8;border-color:#c00;color:#000} \ No newline at end of file diff --git a/wp-admin/css/color-picker.css b/wp-admin/css/color-picker.css index 1d00d96..50edbda 100644 --- a/wp-admin/css/color-picker.css +++ b/wp-admin/css/color-picker.css @@ -24,8 +24,8 @@ vertical-align: bottom; display: inline-block; padding-left: 30px; - -webkit-box-shadow: 0 1px 0 rgba(0,0,0,.08); - box-shadow: 0 1px 0 rgba(0,0,0,.08); + -webkit-box-shadow: 0 1px 0 #ccc; + box-shadow: 0 1px 0 #ccc; } .wp-color-result:after { @@ -43,19 +43,19 @@ right: 0; text-align: center; top: 0; - -webkit-box-shadow: inset 0 1px 0 #fff; - box-shadow: inset 0 1px 0 #fff; } -.wp-color-result:hover { +.wp-color-result:hover, +.wp-color-result:focus { background: #fafafa; border-color: #999; - color: #222; + color: #23282d; } -.wp-color-result:hover:after { - color: #222; - border-color: #aaa; +.wp-color-result:hover:after, +.wp-color-result:focus:after { + color: #23282d; + border-color: #a0a5aa; border-left: 1px solid #999; } @@ -73,13 +73,9 @@ } .wp-color-result:focus { - border-color: #888; - -webkit-box-shadow: 0 1px 2px rgba( 0, 0, 0, 0.2 ); - box-shadow: 0 1px 2px rgba( 0, 0, 0, 0.2 ); -} - -.wp-color-result:focus:after { - border-color: #888; + border-color: #5b9dd9; + -webkit-box-shadow: 0 0 3px rgba( 0, 115, 170, .8 ); + box-shadow: 0 0 3px rgba( 0, 115, 170, .8 ); } .wp-picker-open + .wp-picker-input-wrap { @@ -98,7 +94,7 @@ .wp-picker-container .iris-picker { -webkit-border-radius: 0; border-radius: 0; - border-color: #dfdfdf; + border-color: #ddd; margin-top: 6px; } @@ -106,17 +102,21 @@ width: 65px; font-size: 12px; font-family: monospace; - text-align: center; line-height: 16px; margin: 0; } -.wp-picker-container input[type="text"].wp-color-picker:focus::-webkit-input-placeholder { - color: transparent; +.wp-color-picker::-webkit-input-placeholder { + color: #72777c; +} + +.wp-color-picker::-moz-placeholder { + color: #72777c; + opacity: 1; } -.wp-picker-container input[type="text"].wp-color-picker:-moz-placeholder { - color: #999; +.wp-color-picker:-ms-input-placeholder { + color: #72777c; } .wp-picker-container input[type="text"].iris-error { diff --git a/wp-admin/css/color-picker.min.css b/wp-admin/css/color-picker.min.css index 8c225dd..bfbcee1 100644 --- a/wp-admin/css/color-picker.min.css +++ b/wp-admin/css/color-picker.min.css @@ -1 +1 @@ -.wp-color-picker{width:80px}.wp-picker-container .hidden{display:none}.wp-color-result{background-color:#f7f7f7;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;cursor:pointer;height:22px;margin:0 6px 6px 0;position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;vertical-align:bottom;display:inline-block;padding-left:30px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.08);box-shadow:0 1px 0 rgba(0,0,0,.08)}.wp-color-result:after{background:#f7f7f7;-webkit-border-radius:0 2px 2px 0;border-radius:0 2px 2px 0;border-left:1px solid #ccc;color:#555;content:attr(title);display:block;font-size:11px;line-height:22px;padding:0 6px;position:relative;right:0;text-align:center;top:0;-webkit-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.wp-color-result:hover{background:#fafafa;border-color:#999;color:#222}.wp-color-result:hover:after{color:#222;border-color:#aaa;border-left:1px solid #999}.wp-color-result{top:0}.wp-color-result.wp-picker-open:after{content:attr(data-current)}.wp-picker-container,.wp-picker-container:active{display:inline-block;outline:0}.wp-color-result:focus{border-color:#888;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.2);box-shadow:0 1px 2px rgba(0,0,0,.2)}.wp-color-result:focus:after{border-color:#888}.wp-picker-open+.wp-picker-input-wrap{display:inline-block;vertical-align:top}.wp-picker-container .button{margin-left:6px}.wp-picker-container .iris-square-slider .ui-slider-handle:focus{background-color:#555}.wp-picker-container .iris-picker{-webkit-border-radius:0;border-radius:0;border-color:#dfdfdf;margin-top:6px}.wp-picker-container input[type=text].wp-color-picker{width:65px;font-size:12px;font-family:monospace;text-align:center;line-height:16px;margin:0}.wp-picker-container input[type=text].wp-color-picker:focus::-webkit-input-placeholder{color:transparent}.wp-picker-container input[type=text].wp-color-picker:-moz-placeholder{color:#999}.wp-picker-container input[type=text].iris-error{background-color:#ffebe8;border-color:#c00;color:#000} \ No newline at end of file +.wp-color-picker{width:80px}.wp-picker-container .hidden{display:none}.wp-color-result{background-color:#f7f7f7;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;cursor:pointer;height:22px;margin:0 6px 6px 0;position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;vertical-align:bottom;display:inline-block;padding-left:30px;-webkit-box-shadow:0 1px 0 #ccc;box-shadow:0 1px 0 #ccc;top:0}.wp-color-result:after{background:#f7f7f7;-webkit-border-radius:0 2px 2px 0;border-radius:0 2px 2px 0;border-left:1px solid #ccc;color:#555;content:attr(title);display:block;font-size:11px;line-height:22px;padding:0 6px;position:relative;right:0;text-align:center;top:0}.wp-color-result:focus,.wp-color-result:hover{background:#fafafa;border-color:#999;color:#23282d}.wp-color-result:focus:after,.wp-color-result:hover:after{color:#23282d;border-color:#a0a5aa;border-left:1px solid #999}.wp-color-result.wp-picker-open:after{content:attr(data-current)}.wp-picker-container,.wp-picker-container:active{display:inline-block;outline:0}.wp-color-result:focus{border-color:#5b9dd9;-webkit-box-shadow:0 0 3px rgba(0,115,170,.8);box-shadow:0 0 3px rgba(0,115,170,.8)}.wp-picker-open+.wp-picker-input-wrap{display:inline-block;vertical-align:top}.wp-picker-container .button{margin-left:6px}.wp-picker-container .iris-square-slider .ui-slider-handle:focus{background-color:#555}.wp-picker-container .iris-picker{-webkit-border-radius:0;border-radius:0;border-color:#ddd;margin-top:6px}.wp-picker-container input[type=text].wp-color-picker{width:65px;font-size:12px;font-family:monospace;line-height:16px;margin:0}.wp-color-picker::-webkit-input-placeholder{color:#72777c}.wp-color-picker::-moz-placeholder{color:#72777c;opacity:1}.wp-color-picker:-ms-input-placeholder{color:#72777c}.wp-picker-container input[type=text].iris-error{background-color:#ffebe8;border-color:#c00;color:#000} \ No newline at end of file diff --git a/wp-admin/css/colors/_admin.scss b/wp-admin/css/colors/_admin.scss index 2ce8004..f03c211 100644 --- a/wp-admin/css/colors/_admin.scss +++ b/wp-admin/css/colors/_admin.scss @@ -83,8 +83,8 @@ input[type=radio]:checked:before { /* List tables */ -.wrap .add-new-h2:hover, -#add-new-comment a:hover, +.wrap .add-new-h2:hover, /* deprecated */ +.wrap .page-title-action:hover, .tablenav .tablenav-pages a:hover, .tablenav .tablenav-pages a:focus { color: $menu-text; @@ -99,21 +99,6 @@ input[type=radio]:checked:before { color: $menu-bubble-background; } -.post-com-count:hover:after { - border-top-color: $menu-background; -} -.post-com-count:hover span { - color: $menu-text; - background-color: $menu-background; -} - -strong .post-com-count:after { - border-top-color: $menu-bubble-background; -} -strong .post-com-count span { - background-color: $menu-bubble-background; -} - /* Admin Menu */ @@ -211,7 +196,14 @@ ul#adminmenu > li.current > a.current:after { background: $menu-current-background; } -#adminmenu li.wp-has-current-submenu div.wp-menu-image:before { +#adminmenu li.wp-has-current-submenu div.wp-menu-image:before, +#adminmenu a.current:hover div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before, +#adminmenu li:hover div.wp-menu-image:before, +#adminmenu li a:focus div.wp-menu-image:before, +#adminmenu li.opensub div.wp-menu-image:before, +.ie8 #adminmenu li.opensub div.wp-menu-image:before { color: $menu-current-icon; } @@ -273,26 +265,25 @@ ul#adminmenu > li.current > a.current:after { color: $menu-icon; } -#wpadminbar .ab-top-menu > li:hover > .ab-item, -#wpadminbar .ab-top-menu > li.hover > .ab-item, -#wpadminbar .ab-top-menu > li > .ab-item:focus, +#wpadminbar:not(.mobile) .ab-top-menu > li:hover > .ab-item, +#wpadminbar:not(.mobile) .ab-top-menu > li > .ab-item:focus, #wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, -#wpadminbar-nojs .ab-top-menu > li.menupop:hover > .ab-item, +#wpadminbar.nojs .ab-top-menu > li.menupop:hover > .ab-item, #wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { color: $menu-submenu-focus-text; background: $menu-submenu-background; } -#wpadminbar > #wp-toolbar li:hover span.ab-label, -#wpadminbar > #wp-toolbar li.hover span.ab-label, -#wpadminbar > #wp-toolbar a:focus span.ab-label { +#wpadminbar:not(.mobile) > #wp-toolbar li:hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar li.hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar a:focus span.ab-label { color: $menu-submenu-focus-text; } -#wpadminbar li:hover .ab-icon:before, -#wpadminbar li:hover .ab-item:before, -#wpadminbar li:hover .ab-item:after, -#wpadminbar li:hover #adminbarsearch:before { +#wpadminbar:not(.mobile) li:hover .ab-icon:before, +#wpadminbar:not(.mobile) li:hover .ab-item:before, +#wpadminbar:not(.mobile) li:hover .ab-item:after, +#wpadminbar:not(.mobile) li:hover #adminbarsearch:before { color: $menu-highlight-icon; } @@ -311,7 +302,7 @@ ul#adminmenu > li.current > a.current:after { #wpadminbar .ab-submenu .ab-item, #wpadminbar .quicklinks .menupop ul li a, #wpadminbar .quicklinks .menupop.hover ul li a, -#wpadminbar-nojs .quicklinks .menupop:hover ul li a { +#wpadminbar.nojs .quicklinks .menupop:hover ul li a { color: $menu-submenu-text; } @@ -324,6 +315,7 @@ ul#adminmenu > li.current > a.current:after { #wpadminbar .quicklinks .menupop ul li a:focus, #wpadminbar .quicklinks .menupop ul li a:hover strong, #wpadminbar .quicklinks .menupop ul li a:focus strong, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a, #wpadminbar .quicklinks .menupop.hover ul li a:hover, #wpadminbar .quicklinks .menupop.hover ul li a:focus, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, @@ -334,17 +326,25 @@ ul#adminmenu > li.current > a.current:after { #wpadminbar li .ab-item:focus:before, #wpadminbar li.hover .ab-icon:before, #wpadminbar li.hover .ab-item:before, -#wpadminbar li:hover .ab-item:after, -#wpadminbar li.hover .ab-item:after, -#wpadminbar li:hover #adminbarsearch:before { +#wpadminbar li:hover #adminbarsearch:before, +#wpadminbar li #adminbarsearch.adminbar-focused:before { color: $menu-submenu-focus-text; } #wpadminbar .quicklinks li a:hover .blavatar, -#wpadminbar .menupop .menupop > .ab-item:hover:before { +#wpadminbar .quicklinks li a:focus .blavatar, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar, +#wpadminbar .menupop .menupop > .ab-item:hover:before, +#wpadminbar.mobile .quicklinks .ab-icon:before, +#wpadminbar.mobile .quicklinks .ab-item:before { color: $menu-submenu-focus-text; } +#wpadminbar.mobile .quicklinks .hover .ab-icon:before, +#wpadminbar.mobile .quicklinks .hover .ab-item:before { + color: $menu-icon; +} + /* Admin Bar: search */ @@ -357,12 +357,6 @@ ul#adminmenu > li.current > a.current:after { background: $adminbar-input-background; } -#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder { color: $menu-text; opacity: .7; } -#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder { color: $menu-text; opacity: .7; } -#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder { color: $menu-text; opacity: .7; } -#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder { color: $menu-text; opacity: .7; } - - /* Admin Bar: my account */ #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { @@ -395,12 +389,14 @@ ul#adminmenu > li.current > a.current:after { } .wp-pointer.wp-pointer-top .wp-pointer-arrow, -.wp-pointer.wp-pointer-undefined .wp-pointer-arrow { +.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner { border-bottom-color: $highlight-color; } -/* Media Uploader */ +/* Media */ .media-item .bar, .media-progress-bar div { @@ -408,7 +404,9 @@ ul#adminmenu > li.current > a.current:after { } .details.attachment { - box-shadow: 0 0 0 1px #fff, 0 0 0 5px $highlight-color; + box-shadow: + inset 0 0 0 3px #fff, + inset 0 0 0 7px $highlight-color; } .attachment.details .check { @@ -416,40 +414,51 @@ ul#adminmenu > li.current > a.current:after { box-shadow: 0 0 0 1px #fff, 0 0 0 2px $highlight-color; } +.media-selection .attachment.selection.details .thumbnail { + -webkit-box-shadow: + 0px 0px 0px 1px #fff, + 0px 0px 0px 3px $highlight-color; + box-shadow: + 0px 0px 0px 1px #fff, + 0px 0px 0px 3px $highlight-color; +} + /* Themes */ .theme-browser .theme.active .theme-name, -.theme-browser .theme.add-new-theme:hover:after { +.theme-browser .theme.add-new-theme a:hover:after, +.theme-browser .theme.add-new-theme a:focus:after { background: $highlight-color; } -.theme-browser .theme.add-new-theme:hover span:after { +.theme-browser .theme.add-new-theme a:hover span:after, +.theme-browser .theme.add-new-theme a:focus span:after { color: $highlight-color; } -.theme-overlay .theme-header .close:hover, -.theme-overlay .theme-header .right:hover, -.theme-overlay .theme-header .left:hover { - background: $highlight-color; -} - .theme-section.current, .theme-filter.current { border-bottom-color: $menu-background; } -body.more-filters-opened .more-filters, -body.more-filters-opened .more-filters:before { +body.more-filters-opened .more-filters { color: $menu-text; background-color: $menu-background; } +body.more-filters-opened .more-filters:before { + color: $menu-text; +} + body.more-filters-opened .more-filters:hover, -body.more-filters-opened .more-filters:focus, +body.more-filters-opened .more-filters:focus { + background-color: $menu-highlight-background; + color: $menu-highlight-text; +} + body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before { - background-color: $menu-highlight-background; color: $menu-highlight-text; } @@ -472,26 +481,8 @@ body.more-filters-opened .more-filters:focus:before { color: $menu-highlight-text; } - -/* jQuery UI Slider */ - -.wp-slider .ui-slider-handle, -.wp-slider .ui-slider-handle.ui-state-hover, -.wp-slider .ui-slider-handle.focus { - background: $button-color; - border-color: darken( $button-color, 10% ); - box-shadow: inset 0 1px 0 lighten( $button-color, 15% ), 0 1px 0 rgba(0,0,0,.15); -} - -/* Thickbox: Plugin information */ - -#sidemenu a.current { - background: $body-background; - border-bottom-color: $body-background; -} - -#plugin-information .action-button { - background: $button-color; +#customize-footer-actions .devices button:focus { + border-bottom-color: $highlight-color; } /* Responsive Component */ @@ -506,10 +497,20 @@ div#wp-responsive-toggle a:before { background: $menu-highlight-background; } -.star-rating .star { - color: $highlight-color; -} - .wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a { background: $menu-submenu-background; } + +.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before { + color: $menu-icon; +} + +/* TinyMCE */ + +.mce-container.mce-menu .mce-menu-item:hover, +.mce-container.mce-menu .mce-menu-item.mce-selected, +.mce-container.mce-menu .mce-menu-item:focus, +.mce-container.mce-menu .mce-menu-item-normal.mce-active, +.mce-container.mce-menu .mce-menu-item-preview.mce-active { + background: $highlight-color; +} diff --git a/wp-admin/css/colors/_mixins.scss b/wp-admin/css/colors/_mixins.scss index 14db8a5..c8213c1 100644 --- a/wp-admin/css/colors/_mixins.scss +++ b/wp-admin/css/colors/_mixins.scss @@ -4,23 +4,31 @@ */ @mixin button( $button-color, $text-color: white ) { background: $button-color; - border-color: darken( $button-color, 10% ); + border-color: darken( $button-color, 10% ) darken( $button-color, 15% ) darken( $button-color, 15% ); color: $text-color; - box-shadow: inset 0 1px 0 lighten( $button-color, 15% ), 0 1px 0 rgba(0,0,0,.15); + box-shadow: 0 1px 0 darken( $button-color, 15% ); + text-shadow: 0 -1px 1px darken( $button-color, 15% ), + 1px 0 1px darken( $button-color, 15% ), + 0 1px 1px darken( $button-color, 15% ), + -1px 0 1px darken( $button-color, 15% ); &:hover, &:focus { - background: darken( $button-color, 5% ); + background: lighten( $button-color, 3% ); border-color: darken( $button-color, 15% ); color: $text-color; - box-shadow: inset 0 1px 0 lighten( $button-color, 10% ), 0 1px 0 rgba(0,0,0,.15); + box-shadow: 0 1px 0 darken( $button-color, 15% ); + } + + &:focus { + box-shadow: inset 0 1px 0 darken( $button-color, 10% ), + 0 0 2px 1px #33b3db; } &:active { background: darken( $button-color, 10% ); border-color: darken( $button-color, 15% ); - color: $text-color; - box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 ); + box-shadow: inset 0 2px 0 darken( $button-color, 15% ); } &[disabled], @@ -32,4 +40,12 @@ border-color: darken( $button-color, 15% ) !important; text-shadow: none !important; } + + &.button-hero { + box-shadow: 0 2px 0 darken( $button-color, 15% ) !important; + &:active { + box-shadow: inset 0 3px 0 darken( $button-color, 15% ) !important; + } + } + } diff --git a/wp-admin/css/colors/_variables.scss b/wp-admin/css/colors/_variables.scss index 05e46ba..c203f1b 100644 --- a/wp-admin/css/colors/_variables.scss +++ b/wp-admin/css/colors/_variables.scss @@ -4,9 +4,9 @@ // core variables $text-color: #fff !default; -$base-color: #222 !default; +$base-color: #23282d !default; $icon-color: hsl( hue( $base-color ), 7%, 95% ) !default; -$highlight-color: #0074a2 !default; +$highlight-color: #0073aa !default; $notification-color: #d54e21 !default; @@ -14,7 +14,7 @@ $notification-color: #d54e21 !default; $body-background: #f1f1f1 !default; -$link: #0074a2 !default; +$link: #0073aa !default; $link-focus: lighten( $link, 10% ) !default; $button-color: $highlight-color !default; diff --git a/wp-admin/css/colors/blue/colors-rtl.css b/wp-admin/css/colors/blue/colors-rtl.css index 515f2b1..dd214af 100644 --- a/wp-admin/css/colors/blue/colors-rtl.css +++ b/wp-admin/css/colors/blue/colors-rtl.css @@ -3,329 +3,524 @@ * highlights/shadows, based on a base color. */ html { - background: #f1f1f1; } + background: #f1f1f1; +} /* Links */ a { - color: #0074a2; } - a:hover, a:active, a:focus { - color: #0099d5; } + color: #0073aa; +} + +a:hover, a:active, a:focus { + color: #0096dd; +} -#media-upload a.del-link:hover, div.dashboard-widget-submit input:hover, .subsubsub a:hover, .subsubsub a.current:hover { - color: #0099d5; } +#media-upload a.del-link:hover, +div.dashboard-widget-submit input:hover, +.subsubsub a:hover, +.subsubsub a.current:hover { + color: #0096dd; +} /* Forms */ input[type=checkbox]:checked:before { - color: #096484; } + color: #096484; +} input[type=radio]:checked:before { - background: #096484; } + background: #096484; +} -.wp-core-ui input[type="reset"]:hover, .wp-core-ui input[type="reset"]:active { - color: #0099d5; } +.wp-core-ui input[type="reset"]:hover, +.wp-core-ui input[type="reset"]:active { + color: #0096dd; +} /* Core UI */ .wp-core-ui .button-primary { background: #e1a948; - border-color: #d39323; + border-color: #d39323 #bd831f #bd831f; + color: white; + -webkit-box-shadow: 0 1px 0 #bd831f; + box-shadow: 0 1px 0 #bd831f; + text-shadow: 0 -1px 1px #bd831f, -1px 0 1px #bd831f, 0 1px 1px #bd831f, 1px 0 1px #bd831f; +} + +.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { + background: #e3af55; + border-color: #bd831f; color: white; - -webkit-box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { - background: #dd9f32; - border-color: #bd831f; - color: white; - -webkit-box-shadow: inset 0 1px 0 #e8be74, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #e8be74, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:active { - background: #d39323; - border-color: #bd831f; - color: white; - -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); - box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); } - .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { - color: #d1cdc7 !important; - background: #db9825 !important; - border-color: #bd831f !important; - text-shadow: none !important; } + -webkit-box-shadow: 0 1px 0 #bd831f; + box-shadow: 0 1px 0 #bd831f; +} + +.wp-core-ui .button-primary:focus { + -webkit-box-shadow: inset 0 1px 0 #d39323, 0 0 2px 1px #33b3db; + box-shadow: inset 0 1px 0 #d39323, 0 0 2px 1px #33b3db; +} + +.wp-core-ui .button-primary:active { + background: #d39323; + border-color: #bd831f; + -webkit-box-shadow: inset 0 2px 0 #bd831f; + box-shadow: inset 0 2px 0 #bd831f; +} + +.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { + color: #d1cdc7 !important; + background: #db9925 !important; + border-color: #bd831f !important; + text-shadow: none !important; +} + +.wp-core-ui .button-primary.button-hero { + -webkit-box-shadow: 0 2px 0 #bd831f !important; + box-shadow: 0 2px 0 #bd831f !important; +} + +.wp-core-ui .button-primary.button-hero:active { + -webkit-box-shadow: inset 0 3px 0 #bd831f !important; + box-shadow: inset 0 3px 0 #bd831f !important; +} + .wp-core-ui .wp-ui-primary { color: #fff; - background-color: #52accc; } + background-color: #52accc; +} + .wp-core-ui .wp-ui-text-primary { - color: #52accc; } + color: #52accc; +} + .wp-core-ui .wp-ui-highlight { color: #fff; - background-color: #096484; } + background-color: #096484; +} + .wp-core-ui .wp-ui-text-highlight { - color: #096484; } + color: #096484; +} + .wp-core-ui .wp-ui-notification { color: #fff; - background-color: #e1a948; } + background-color: #e1a948; +} + .wp-core-ui .wp-ui-text-notification { - color: #e1a948; } + color: #e1a948; +} + .wp-core-ui .wp-ui-text-icon { - color: #e5f8ff; } + color: #e5f8ff; +} /* List tables */ -.wrap .add-new-h2:hover, #add-new-comment a:hover, .tablenav .tablenav-pages a:hover, .tablenav .tablenav-pages a:focus { +.wrap .add-new-h2:hover, +.wrap .page-title-action:hover, +.tablenav .tablenav-pages a:hover, +.tablenav .tablenav-pages a:focus { color: #fff; - background-color: #52accc; } + background-color: #52accc; +} .view-switch a.current:before { - color: #52accc; } + color: #52accc; +} .view-switch a:hover:before { - color: #e1a948; } - -.post-com-count:hover:after { - border-top-color: #52accc; } - -.post-com-count:hover span { - color: #fff; - background-color: #52accc; } - -strong .post-com-count:after { - border-top-color: #e1a948; } - -strong .post-com-count span { - background-color: #e1a948; } + color: #e1a948; +} /* Admin Menu */ -#adminmenuback, #adminmenuwrap, #adminmenu { - background: #52accc; } +#adminmenuback, +#adminmenuwrap, +#adminmenu { + background: #52accc; +} #adminmenu a { - color: #fff; } + color: #fff; +} #adminmenu div.wp-menu-image:before { - color: #e5f8ff; } + color: #e5f8ff; +} -#adminmenu a:hover, #adminmenu li.menu-top:hover, #adminmenu li.opensub > a.menu-top, #adminmenu li > a.menu-top:focus { +#adminmenu a:hover, +#adminmenu li.menu-top:hover, +#adminmenu li.opensub > a.menu-top, +#adminmenu li > a.menu-top:focus { color: #fff; - background-color: #096484; } + background-color: #096484; +} -#adminmenu li.menu-top:hover div.wp-menu-image:before, #adminmenu li.opensub > a.menu-top div.wp-menu-image:before { - color: #fff; } +#adminmenu li.menu-top:hover div.wp-menu-image:before, +#adminmenu li.opensub > a.menu-top div.wp-menu-image:before { + color: #fff; +} /* Active tabs use a bottom border color that matches the page background color. */ -.about-wrap h2 .nav-tab-active, .nav-tab-active, .nav-tab-active:hover { +.about-wrap h2 .nav-tab-active, +.nav-tab-active, +.nav-tab-active:hover { background-color: #f1f1f1; - border-bottom-color: #f1f1f1; } + border-bottom-color: #f1f1f1; +} /* Admin Menu: submenu */ -#adminmenu .wp-submenu, #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu .wp-has-current-submenu.opensub .wp-submenu, .folded #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu { - background: #4796b3; } +#adminmenu .wp-submenu, +#adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu, +.folded #adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu { + background: #4796b3; +} #adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after { - border-left-color: #4796b3; } + border-left-color: #4796b3; +} #adminmenu .wp-submenu .wp-submenu-head { - color: #e2ecf1; } - -#adminmenu .wp-submenu a, #adminmenu .wp-has-current-submenu .wp-submenu a, .folded #adminmenu .wp-has-current-submenu .wp-submenu a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a { - color: #e2ecf1; } - #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, #adminmenu .wp-has-current-submenu .wp-submenu a:focus, #adminmenu .wp-has-current-submenu .wp-submenu a:hover, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { - color: #fff; } + color: #e2ecf1; +} + +#adminmenu .wp-submenu a, +#adminmenu .wp-has-current-submenu .wp-submenu a, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a { + color: #e2ecf1; +} + +#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu .wp-submenu a:hover, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { + color: #fff; +} /* Admin Menu: current */ -#adminmenu .wp-submenu li.current a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { - color: #fff; } - #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { - color: #fff; } - -ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.current:after { - border-left-color: #f1f1f1; } +#adminmenu .wp-submenu li.current a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { + color: #fff; +} -#adminmenu li.current a.menu-top, #adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, #adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, .folded #adminmenu li.current.menu-top { +#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { color: #fff; - background: #096484; } +} -#adminmenu li.wp-has-current-submenu div.wp-menu-image:before { - color: #fff; } +ul#adminmenu a.wp-has-current-submenu:after, +ul#adminmenu > li.current > a.current:after { + border-left-color: #f1f1f1; +} + +#adminmenu li.current a.menu-top, +#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, +#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, +.folded #adminmenu li.current.menu-top { + color: #fff; + background: #096484; +} + +#adminmenu li.wp-has-current-submenu div.wp-menu-image:before, +#adminmenu a.current:hover div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before, +#adminmenu li:hover div.wp-menu-image:before, +#adminmenu li a:focus div.wp-menu-image:before, +#adminmenu li.opensub div.wp-menu-image:before, +.ie8 #adminmenu li.opensub div.wp-menu-image:before { + color: #fff; +} /* Admin Menu: bubble */ -#adminmenu .awaiting-mod, #adminmenu .update-plugins { +#adminmenu .awaiting-mod, +#adminmenu .update-plugins { color: #fff; - background: #e1a948; } + background: #e1a948; +} -#adminmenu li.current a .awaiting-mod, #adminmenu li a.wp-has-current-submenu .update-plugins, #adminmenu li:hover a .awaiting-mod, #adminmenu li.menu-top:hover > a .update-plugins { +#adminmenu li.current a .awaiting-mod, +#adminmenu li a.wp-has-current-submenu .update-plugins, +#adminmenu li:hover a .awaiting-mod, +#adminmenu li.menu-top:hover > a .update-plugins { color: #fff; - background: #4796b3; } + background: #4796b3; +} /* Admin Menu: collapse button */ #collapse-menu { - color: #e5f8ff; } + color: #e5f8ff; +} #collapse-menu:hover { - color: #fff; } + color: #fff; +} #collapse-button div:after { - color: #e5f8ff; } + color: #e5f8ff; +} #collapse-menu:hover #collapse-button div:after { - color: #fff; } + color: #fff; +} /* Admin Bar */ #wpadminbar { color: #fff; - background: #52accc; } - -#wpadminbar .ab-item, #wpadminbar a.ab-item, #wpadminbar > #wp-toolbar span.ab-label, #wpadminbar > #wp-toolbar span.noticon { - color: #fff; } - -#wpadminbar .ab-icon, #wpadminbar .ab-icon:before, #wpadminbar .ab-item:before, #wpadminbar .ab-item:after { - color: #e5f8ff; } + background: #52accc; +} -#wpadminbar .ab-top-menu > li:hover > .ab-item, #wpadminbar .ab-top-menu > li.hover > .ab-item, #wpadminbar .ab-top-menu > li > .ab-item:focus, #wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, #wpadminbar-nojs .ab-top-menu > li.menupop:hover > .ab-item, #wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { +#wpadminbar .ab-item, +#wpadminbar a.ab-item, +#wpadminbar > #wp-toolbar span.ab-label, +#wpadminbar > #wp-toolbar span.noticon { color: #fff; - background: #4796b3; } +} + +#wpadminbar .ab-icon, +#wpadminbar .ab-icon:before, +#wpadminbar .ab-item:before, +#wpadminbar .ab-item:after { + color: #e5f8ff; +} + +#wpadminbar:not(.mobile) .ab-top-menu > li:hover > .ab-item, +#wpadminbar:not(.mobile) .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojs .ab-top-menu > li.menupop:hover > .ab-item, +#wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { + color: #fff; + background: #4796b3; +} -#wpadminbar > #wp-toolbar li:hover span.ab-label, #wpadminbar > #wp-toolbar li.hover span.ab-label, #wpadminbar > #wp-toolbar a:focus span.ab-label { - color: #fff; } +#wpadminbar:not(.mobile) > #wp-toolbar li:hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar li.hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar a:focus span.ab-label { + color: #fff; +} -#wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #fff; } +#wpadminbar:not(.mobile) li:hover .ab-icon:before, +#wpadminbar:not(.mobile) li:hover .ab-item:before, +#wpadminbar:not(.mobile) li:hover .ab-item:after, +#wpadminbar:not(.mobile) li:hover #adminbarsearch:before { + color: #fff; +} /* Admin Bar: submenu */ #wpadminbar .menupop .ab-sub-wrapper { - background: #4796b3; } - -#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, #wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { - background: #74b7ce; } - -#wpadminbar .ab-submenu .ab-item, #wpadminbar .quicklinks .menupop ul li a, #wpadminbar .quicklinks .menupop.hover ul li a, #wpadminbar-nojs .quicklinks .menupop:hover ul li a { - color: #e2ecf1; } - -#wpadminbar .quicklinks li .blavatar, #wpadminbar .menupop .menupop > .ab-item:before { - color: #e5f8ff; } - -#wpadminbar .quicklinks .menupop ul li a:hover, #wpadminbar .quicklinks .menupop ul li a:focus, #wpadminbar .quicklinks .menupop ul li a:hover strong, #wpadminbar .quicklinks .menupop ul li a:focus strong, #wpadminbar .quicklinks .menupop.hover ul li a:hover, #wpadminbar .quicklinks .menupop.hover ul li a:focus, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, #wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li a:focus .ab-icon:before, #wpadminbar li .ab-item:focus:before, #wpadminbar li.hover .ab-icon:before, #wpadminbar li.hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li.hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #fff; } + background: #4796b3; +} + +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { + background: #74b6ce; +} + +#wpadminbar .ab-submenu .ab-item, +#wpadminbar .quicklinks .menupop ul li a, +#wpadminbar .quicklinks .menupop.hover ul li a, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a { + color: #e2ecf1; +} + +#wpadminbar .quicklinks li .blavatar, +#wpadminbar .menupop .menupop > .ab-item:before { + color: #e5f8ff; +} + +#wpadminbar .quicklinks .menupop ul li a:hover, +#wpadminbar .quicklinks .menupop ul li a:focus, +#wpadminbar .quicklinks .menupop ul li a:hover strong, +#wpadminbar .quicklinks .menupop ul li a:focus strong, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a, +#wpadminbar .quicklinks .menupop.hover ul li a:hover, +#wpadminbar .quicklinks .menupop.hover ul li a:focus, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, +#wpadminbar li:hover .ab-icon:before, +#wpadminbar li:hover .ab-item:before, +#wpadminbar li a:focus .ab-icon:before, +#wpadminbar li .ab-item:focus:before, +#wpadminbar li.hover .ab-icon:before, +#wpadminbar li.hover .ab-item:before, +#wpadminbar li:hover #adminbarsearch:before, +#wpadminbar li #adminbarsearch.adminbar-focused:before { + color: #fff; +} + +#wpadminbar .quicklinks li a:hover .blavatar, +#wpadminbar .quicklinks li a:focus .blavatar, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar, +#wpadminbar .menupop .menupop > .ab-item:hover:before, +#wpadminbar.mobile .quicklinks .ab-icon:before, +#wpadminbar.mobile .quicklinks .ab-item:before { + color: #fff; +} -#wpadminbar .quicklinks li a:hover .blavatar, #wpadminbar .menupop .menupop > .ab-item:hover:before { - color: #fff; } +#wpadminbar.mobile .quicklinks .hover .ab-icon:before, +#wpadminbar.mobile .quicklinks .hover .ab-item:before { + color: #e5f8ff; +} /* Admin Bar: search */ #wpadminbar #adminbarsearch:before { - color: #e5f8ff; } + color: #e5f8ff; +} #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus { color: #fff; - background: #6ebad4; } - -#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder { - color: #fff; - opacity: 0.7; } + background: #6eb9d4; +} /* Admin Bar: my account */ #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { - border-color: #6ebad4; - background-color: #6ebad4; } + border-color: #6eb9d4; + background-color: #6eb9d4; +} #wpadminbar #wp-admin-bar-user-info .display-name { - color: #fff; } + color: #fff; +} #wpadminbar #wp-admin-bar-user-info a:hover .display-name { - color: #fff; } + color: #fff; +} #wpadminbar #wp-admin-bar-user-info .username { - color: #e2ecf1; } + color: #e2ecf1; +} /* Pointers */ .wp-pointer .wp-pointer-content h3 { background-color: #096484; - border-color: #07536c; } + border-color: #07526c; +} .wp-pointer .wp-pointer-content h3:before { - color: #096484; } - -.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow { - border-bottom-color: #096484; } - -/* Media Uploader */ -.media-item .bar, .media-progress-bar div { - background-color: #096484; } + color: #096484; +} + +.wp-pointer.wp-pointer-top .wp-pointer-arrow, +.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner { + border-bottom-color: #096484; +} + +/* Media */ +.media-item .bar, +.media-progress-bar div { + background-color: #096484; +} .details.attachment { - -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #096484; - box-shadow: 0 0 0 1px #fff, 0 0 0 5px #096484; } + -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #096484; + box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #096484; +} .attachment.details .check { background-color: #096484; -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #096484; - box-shadow: 0 0 0 1px #fff, 0 0 0 2px #096484; } - -/* Themes */ -.theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after { - background: #096484; } + box-shadow: 0 0 0 1px #fff, 0 0 0 2px #096484; +} -.theme-browser .theme.add-new-theme:hover span:after { - color: #096484; } +.media-selection .attachment.selection.details .thumbnail { + -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #096484; + box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #096484; +} -.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover { - background: #096484; } - -.theme-section.current, .theme-filter.current { - border-bottom-color: #52accc; } +/* Themes */ +.theme-browser .theme.active .theme-name, +.theme-browser .theme.add-new-theme a:hover:after, +.theme-browser .theme.add-new-theme a:focus:after { + background: #096484; +} + +.theme-browser .theme.add-new-theme a:hover span:after, +.theme-browser .theme.add-new-theme a:focus span:after { + color: #096484; +} + +.theme-section.current, +.theme-filter.current { + border-bottom-color: #52accc; +} + +body.more-filters-opened .more-filters { + color: #fff; + background-color: #52accc; +} -body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before { +body.more-filters-opened .more-filters:before { color: #fff; - background-color: #52accc; } +} -body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before { +body.more-filters-opened .more-filters:hover, +body.more-filters-opened .more-filters:focus { background-color: #096484; - color: #fff; } + color: #fff; +} + +body.more-filters-opened .more-filters:hover:before, +body.more-filters-opened .more-filters:focus:before { + color: #fff; +} /* Widgets */ .widgets-chooser li.widgets-chooser-selected { background-color: #096484; - color: #fff; } + color: #fff; +} -.widgets-chooser li.widgets-chooser-selected:before, .widgets-chooser li.widgets-chooser-selected:focus:before { - color: #fff; } +.widgets-chooser li.widgets-chooser-selected:before, +.widgets-chooser li.widgets-chooser-selected:focus:before { + color: #fff; +} /* Customize */ #customize-theme-controls .widget-area-select .selected { background-color: #096484; - color: #fff; } - -/* jQuery UI Slider */ -.wp-slider .ui-slider-handle, .wp-slider .ui-slider-handle.ui-state-hover, .wp-slider .ui-slider-handle.focus { - background: #e1a948; - border-color: #d39323; - -webkit-box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15); } - -/* Thickbox: Plugin information */ -#sidemenu a.current { - background: #f1f1f1; - border-bottom-color: #f1f1f1; } + color: #fff; +} -#plugin-information .action-button { - background: #e1a948; } +#customize-footer-actions .devices button:focus { + border-bottom-color: #096484; +} /* Responsive Component */ div#wp-responsive-toggle a:before { - color: #e5f8ff; } + color: #e5f8ff; +} .wp-responsive-open div#wp-responsive-toggle a { border-color: transparent; - background: #096484; } - -.star-rating .star { - color: #096484; } + background: #096484; +} .wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a { - background: #4796b3; } + background: #4796b3; +} + +.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before { + color: #e5f8ff; +} + +/* TinyMCE */ +.mce-container.mce-menu .mce-menu-item:hover, +.mce-container.mce-menu .mce-menu-item.mce-selected, +.mce-container.mce-menu .mce-menu-item:focus, +.mce-container.mce-menu .mce-menu-item-normal.mce-active, +.mce-container.mce-menu .mce-menu-item-preview.mce-active { + background: #096484; +} diff --git a/wp-admin/css/colors/blue/colors-rtl.min.css b/wp-admin/css/colors/blue/colors-rtl.min.css index ca69e71..2bc550a 100644 --- a/wp-admin/css/colors/blue/colors-rtl.min.css +++ b/wp-admin/css/colors/blue/colors-rtl.min.css @@ -1 +1 @@ -html{background:#f1f1f1}a{color:#0074a2}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,a:active,a:focus,a:hover,div.dashboard-widget-submit input:hover{color:#0099d5}input[type=checkbox]:checked:before{color:#096484}input[type=radio]:checked:before{background:#096484}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0099d5}.wp-core-ui .button-primary{background:#e1a948;border-color:#d39323;color:#fff;-webkit-box-shadow:inset 0 1px 0 #ecc88a,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #ecc88a,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#dd9f32;border-color:#bd831f;color:#fff;-webkit-box-shadow:inset 0 1px 0 #e8be74,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #e8be74,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:active{background:#d39323;border-color:#bd831f;color:#fff;-webkit-box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5);box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5)}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#d1cdc7!important;background:#db9825!important;border-color:#bd831f!important;text-shadow:none!important}.wp-core-ui .wp-ui-primary{color:#fff;background-color:#52accc}.wp-core-ui .wp-ui-text-primary{color:#52accc}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#096484}.wp-core-ui .wp-ui-text-highlight{color:#096484}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#e1a948}.wp-core-ui .wp-ui-text-notification{color:#e1a948}.wp-core-ui .wp-ui-text-icon{color:#e5f8ff}#add-new-comment a:hover,.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover{color:#fff;background-color:#52accc}.view-switch a.current:before{color:#52accc}.view-switch a:hover:before{color:#e1a948}.post-com-count:hover:after{border-top-color:#52accc}.post-com-count:hover span{color:#fff;background-color:#52accc}strong .post-com-count:after{border-top-color:#e1a948}strong .post-com-count span{background-color:#e1a948}#adminmenu,#adminmenuback,#adminmenuwrap{background:#52accc}#adminmenu a{color:#fff}#adminmenu div.wp-menu-image:before{color:#e5f8ff}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#096484}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#fff}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f1f1f1;border-bottom-color:#f1f1f1}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#4796b3}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-left-color:#4796b3}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu .wp-submenu-head,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#e2ecf1}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu .wp-submenu li.current a,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#fff}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-left-color:#f1f1f1}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#096484}#adminmenu li.wp-has-current-submenu div.wp-menu-image:before{color:#fff}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#e1a948}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#fff;background:#4796b3}#collapse-menu{color:#e5f8ff}#collapse-menu:hover{color:#fff}#collapse-button div:after{color:#e5f8ff}#collapse-menu:hover #collapse-button div:after{color:#fff}#wpadminbar{color:#fff;background:#52accc}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#fff}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#e5f8ff}#wpadminbar .ab-top-menu>li.hover>.ab-item,#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar .ab-top-menu>li:hover>.ab-item,#wpadminbar .ab-top-menu>li>.ab-item:focus,#wpadminbar-nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus{color:#fff;background:#4796b3}#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:after,#wpadminbar li:hover .ab-item:before,#wpadminbar>#wp-toolbar a:focus span.ab-label,#wpadminbar>#wp-toolbar li.hover span.ab-label,#wpadminbar>#wp-toolbar li:hover span.ab-label{color:#fff}#wpadminbar .menupop .ab-sub-wrapper{background:#4796b3}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#74b7ce}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar-nojs .quicklinks .menupop:hover ul li a{color:#e2ecf1}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#e5f8ff}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:after,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:after,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#fff}#wpadminbar #adminbarsearch:before{color:#e5f8ff}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#fff;background:#6ebad4}#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder{color:#fff;opacity:.7}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#6ebad4;background-color:#6ebad4}#wpadminbar #wp-admin-bar-user-info .display-name,#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#fff}#wpadminbar #wp-admin-bar-user-info .username{color:#e2ecf1}.wp-pointer .wp-pointer-content h3{background-color:#096484;border-color:#07536c}.wp-pointer .wp-pointer-content h3:before{color:#096484}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow{border-bottom-color:#096484}.media-item .bar,.media-progress-bar div{background-color:#096484}.details.attachment{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 5px #096484;box-shadow:0 0 0 1px #fff,0 0 0 5px #096484}.attachment.details .check{background-color:#096484;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #096484;box-shadow:0 0 0 1px #fff,0 0 0 2px #096484}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme:hover:after{background:#096484}.theme-browser .theme.add-new-theme:hover span:after{color:#096484}.theme-overlay .theme-header .close:hover,.theme-overlay .theme-header .left:hover,.theme-overlay .theme-header .right:hover{background:#096484}.theme-filter.current,.theme-section.current{border-bottom-color:#52accc}body.more-filters-opened .more-filters,body.more-filters-opened .more-filters:before{color:#fff;background-color:#52accc}.widgets-chooser li.widgets-chooser-selected,body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover,body.more-filters-opened .more-filters:hover:before{background-color:#096484;color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-theme-controls .widget-area-select .selected{background-color:#096484;color:#fff}.wp-slider .ui-slider-handle,.wp-slider .ui-slider-handle.focus,.wp-slider .ui-slider-handle.ui-state-hover{background:#e1a948;border-color:#d39323;-webkit-box-shadow:inset 0 1px 0 #ecc88a,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #ecc88a,0 1px 0 rgba(0,0,0,.15)}#sidemenu a.current{background:#f1f1f1;border-bottom-color:#f1f1f1}#plugin-information .action-button{background:#e1a948}div#wp-responsive-toggle a:before{color:#e5f8ff}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#096484}.star-rating .star{color:#096484}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#4796b3} \ No newline at end of file +html{background:#f1f1f1}a{color:#0073aa}a:active,a:focus,a:hover{color:#0096dd}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,div.dashboard-widget-submit input:hover{color:#0096dd}input[type=checkbox]:checked:before{color:#096484}input[type=radio]:checked:before{background:#096484}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0096dd}.wp-core-ui .button-primary{background:#e1a948;border-color:#d39323 #bd831f #bd831f;color:#fff;-webkit-box-shadow:0 1px 0 #bd831f;box-shadow:0 1px 0 #bd831f;text-shadow:0 -1px 1px #bd831f,-1px 0 1px #bd831f,0 1px 1px #bd831f,1px 0 1px #bd831f}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#e3af55;border-color:#bd831f;color:#fff;-webkit-box-shadow:0 1px 0 #bd831f;box-shadow:0 1px 0 #bd831f}.wp-core-ui .button-primary:focus{-webkit-box-shadow:inset 0 1px 0 #d39323,0 0 2px 1px #33b3db;box-shadow:inset 0 1px 0 #d39323,0 0 2px 1px #33b3db}.wp-core-ui .button-primary:active{background:#d39323;border-color:#bd831f;-webkit-box-shadow:inset 0 2px 0 #bd831f;box-shadow:inset 0 2px 0 #bd831f}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#d1cdc7!important;background:#db9925!important;border-color:#bd831f!important;text-shadow:none!important}.wp-core-ui .button-primary.button-hero{-webkit-box-shadow:0 2px 0 #bd831f!important;box-shadow:0 2px 0 #bd831f!important}.wp-core-ui .button-primary.button-hero:active{-webkit-box-shadow:inset 0 3px 0 #bd831f!important;box-shadow:inset 0 3px 0 #bd831f!important}.wp-core-ui .wp-ui-primary{color:#fff;background-color:#52accc}.wp-core-ui .wp-ui-text-primary{color:#52accc}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#096484}.wp-core-ui .wp-ui-text-highlight{color:#096484}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#e1a948}.wp-core-ui .wp-ui-text-notification{color:#e1a948}.wp-core-ui .wp-ui-text-icon{color:#e5f8ff}.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover,.wrap .page-title-action:hover{color:#fff;background-color:#52accc}.view-switch a.current:before{color:#52accc}.view-switch a:hover:before{color:#e1a948}#adminmenu,#adminmenuback,#adminmenuwrap{background:#52accc}#adminmenu a{color:#fff}#adminmenu div.wp-menu-image:before{color:#e5f8ff}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#096484}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#fff}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f1f1f1;border-bottom-color:#f1f1f1}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#4796b3}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-left-color:#4796b3}#adminmenu .wp-submenu .wp-submenu-head{color:#e2ecf1}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#e2ecf1}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#fff}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#fff}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-left-color:#f1f1f1}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#096484}#adminmenu a.current:hover div.wp-menu-image:before,#adminmenu li a:focus div.wp-menu-image:before,#adminmenu li.opensub div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,#adminmenu li:hover div.wp-menu-image:before,.ie8 #adminmenu li.opensub div.wp-menu-image:before{color:#fff}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#e1a948}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#fff;background:#4796b3}#collapse-menu{color:#e5f8ff}#collapse-menu:hover{color:#fff}#collapse-button div:after{color:#e5f8ff}#collapse-menu:hover #collapse-button div:after{color:#fff}#wpadminbar{color:#fff;background:#52accc}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#fff}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#e5f8ff}#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus,#wpadminbar.nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li>.ab-item:focus{color:#fff;background:#4796b3}#wpadminbar:not(.mobile)>#wp-toolbar a:focus span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li.hover span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li:hover span.ab-label{color:#fff}#wpadminbar:not(.mobile) li:hover #adminbarsearch:before,#wpadminbar:not(.mobile) li:hover .ab-icon:before,#wpadminbar:not(.mobile) li:hover .ab-item:after,#wpadminbar:not(.mobile) li:hover .ab-item:before{color:#fff}#wpadminbar .menupop .ab-sub-wrapper{background:#4796b3}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#74b6ce}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar.nojs .quicklinks .menupop:hover ul li a{color:#e2ecf1}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#e5f8ff}#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar li #adminbarsearch.adminbar-focused:before,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#fff}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a .blavatar,#wpadminbar .quicklinks li a:focus .blavatar,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar.mobile .quicklinks .ab-icon:before,#wpadminbar.mobile .quicklinks .ab-item:before{color:#fff}#wpadminbar.mobile .quicklinks .hover .ab-icon:before,#wpadminbar.mobile .quicklinks .hover .ab-item:before{color:#e5f8ff}#wpadminbar #adminbarsearch:before{color:#e5f8ff}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#fff;background:#6eb9d4}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#6eb9d4;background-color:#6eb9d4}#wpadminbar #wp-admin-bar-user-info .display-name,#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#fff}#wpadminbar #wp-admin-bar-user-info .username{color:#e2ecf1}.wp-pointer .wp-pointer-content h3{background-color:#096484;border-color:#07526c}.wp-pointer .wp-pointer-content h3:before{color:#096484}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner{border-bottom-color:#096484}.media-item .bar,.media-progress-bar div{background-color:#096484}.details.attachment{-webkit-box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #096484;box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #096484}.attachment.details .check{background-color:#096484;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #096484;box-shadow:0 0 0 1px #fff,0 0 0 2px #096484}.media-selection .attachment.selection.details .thumbnail{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 3px #096484;box-shadow:0 0 0 1px #fff,0 0 0 3px #096484}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme a:focus:after,.theme-browser .theme.add-new-theme a:hover:after{background:#096484}.theme-browser .theme.add-new-theme a:focus span:after,.theme-browser .theme.add-new-theme a:hover span:after{color:#096484}.theme-filter.current,.theme-section.current{border-bottom-color:#52accc}body.more-filters-opened .more-filters{color:#fff;background-color:#52accc}#customize-theme-controls .widget-area-select .selected,.widgets-chooser li.widgets-chooser-selected{background-color:#096484;color:#fff}body.more-filters-opened .more-filters:before{color:#fff}body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:hover{background-color:#096484;color:#fff}body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover:before{color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-footer-actions .devices button:focus{border-bottom-color:#096484}div#wp-responsive-toggle a:before{color:#e5f8ff}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#096484}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#4796b3}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before{color:#e5f8ff}.mce-container.mce-menu .mce-menu-item-normal.mce-active,.mce-container.mce-menu .mce-menu-item-preview.mce-active,.mce-container.mce-menu .mce-menu-item.mce-selected,.mce-container.mce-menu .mce-menu-item:focus,.mce-container.mce-menu .mce-menu-item:hover{background:#096484} \ No newline at end of file diff --git a/wp-admin/css/colors/blue/colors.css b/wp-admin/css/colors/blue/colors.css index df2877c..14835f8 100644 --- a/wp-admin/css/colors/blue/colors.css +++ b/wp-admin/css/colors/blue/colors.css @@ -3,329 +3,524 @@ * highlights/shadows, based on a base color. */ html { - background: #f1f1f1; } + background: #f1f1f1; +} /* Links */ a { - color: #0074a2; } - a:hover, a:active, a:focus { - color: #0099d5; } + color: #0073aa; +} + +a:hover, a:active, a:focus { + color: #0096dd; +} -#media-upload a.del-link:hover, div.dashboard-widget-submit input:hover, .subsubsub a:hover, .subsubsub a.current:hover { - color: #0099d5; } +#media-upload a.del-link:hover, +div.dashboard-widget-submit input:hover, +.subsubsub a:hover, +.subsubsub a.current:hover { + color: #0096dd; +} /* Forms */ input[type=checkbox]:checked:before { - color: #096484; } + color: #096484; +} input[type=radio]:checked:before { - background: #096484; } + background: #096484; +} -.wp-core-ui input[type="reset"]:hover, .wp-core-ui input[type="reset"]:active { - color: #0099d5; } +.wp-core-ui input[type="reset"]:hover, +.wp-core-ui input[type="reset"]:active { + color: #0096dd; +} /* Core UI */ .wp-core-ui .button-primary { background: #e1a948; - border-color: #d39323; + border-color: #d39323 #bd831f #bd831f; + color: white; + -webkit-box-shadow: 0 1px 0 #bd831f; + box-shadow: 0 1px 0 #bd831f; + text-shadow: 0 -1px 1px #bd831f, 1px 0 1px #bd831f, 0 1px 1px #bd831f, -1px 0 1px #bd831f; +} + +.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { + background: #e3af55; + border-color: #bd831f; color: white; - -webkit-box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { - background: #dd9f32; - border-color: #bd831f; - color: white; - -webkit-box-shadow: inset 0 1px 0 #e8be74, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #e8be74, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:active { - background: #d39323; - border-color: #bd831f; - color: white; - -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); - box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); } - .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { - color: #d1cdc7 !important; - background: #db9825 !important; - border-color: #bd831f !important; - text-shadow: none !important; } + -webkit-box-shadow: 0 1px 0 #bd831f; + box-shadow: 0 1px 0 #bd831f; +} + +.wp-core-ui .button-primary:focus { + -webkit-box-shadow: inset 0 1px 0 #d39323, 0 0 2px 1px #33b3db; + box-shadow: inset 0 1px 0 #d39323, 0 0 2px 1px #33b3db; +} + +.wp-core-ui .button-primary:active { + background: #d39323; + border-color: #bd831f; + -webkit-box-shadow: inset 0 2px 0 #bd831f; + box-shadow: inset 0 2px 0 #bd831f; +} + +.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { + color: #d1cdc7 !important; + background: #db9925 !important; + border-color: #bd831f !important; + text-shadow: none !important; +} + +.wp-core-ui .button-primary.button-hero { + -webkit-box-shadow: 0 2px 0 #bd831f !important; + box-shadow: 0 2px 0 #bd831f !important; +} + +.wp-core-ui .button-primary.button-hero:active { + -webkit-box-shadow: inset 0 3px 0 #bd831f !important; + box-shadow: inset 0 3px 0 #bd831f !important; +} + .wp-core-ui .wp-ui-primary { color: #fff; - background-color: #52accc; } + background-color: #52accc; +} + .wp-core-ui .wp-ui-text-primary { - color: #52accc; } + color: #52accc; +} + .wp-core-ui .wp-ui-highlight { color: #fff; - background-color: #096484; } + background-color: #096484; +} + .wp-core-ui .wp-ui-text-highlight { - color: #096484; } + color: #096484; +} + .wp-core-ui .wp-ui-notification { color: #fff; - background-color: #e1a948; } + background-color: #e1a948; +} + .wp-core-ui .wp-ui-text-notification { - color: #e1a948; } + color: #e1a948; +} + .wp-core-ui .wp-ui-text-icon { - color: #e5f8ff; } + color: #e5f8ff; +} /* List tables */ -.wrap .add-new-h2:hover, #add-new-comment a:hover, .tablenav .tablenav-pages a:hover, .tablenav .tablenav-pages a:focus { +.wrap .add-new-h2:hover, +.wrap .page-title-action:hover, +.tablenav .tablenav-pages a:hover, +.tablenav .tablenav-pages a:focus { color: #fff; - background-color: #52accc; } + background-color: #52accc; +} .view-switch a.current:before { - color: #52accc; } + color: #52accc; +} .view-switch a:hover:before { - color: #e1a948; } - -.post-com-count:hover:after { - border-top-color: #52accc; } - -.post-com-count:hover span { - color: #fff; - background-color: #52accc; } - -strong .post-com-count:after { - border-top-color: #e1a948; } - -strong .post-com-count span { - background-color: #e1a948; } + color: #e1a948; +} /* Admin Menu */ -#adminmenuback, #adminmenuwrap, #adminmenu { - background: #52accc; } +#adminmenuback, +#adminmenuwrap, +#adminmenu { + background: #52accc; +} #adminmenu a { - color: #fff; } + color: #fff; +} #adminmenu div.wp-menu-image:before { - color: #e5f8ff; } + color: #e5f8ff; +} -#adminmenu a:hover, #adminmenu li.menu-top:hover, #adminmenu li.opensub > a.menu-top, #adminmenu li > a.menu-top:focus { +#adminmenu a:hover, +#adminmenu li.menu-top:hover, +#adminmenu li.opensub > a.menu-top, +#adminmenu li > a.menu-top:focus { color: #fff; - background-color: #096484; } + background-color: #096484; +} -#adminmenu li.menu-top:hover div.wp-menu-image:before, #adminmenu li.opensub > a.menu-top div.wp-menu-image:before { - color: #fff; } +#adminmenu li.menu-top:hover div.wp-menu-image:before, +#adminmenu li.opensub > a.menu-top div.wp-menu-image:before { + color: #fff; +} /* Active tabs use a bottom border color that matches the page background color. */ -.about-wrap h2 .nav-tab-active, .nav-tab-active, .nav-tab-active:hover { +.about-wrap h2 .nav-tab-active, +.nav-tab-active, +.nav-tab-active:hover { background-color: #f1f1f1; - border-bottom-color: #f1f1f1; } + border-bottom-color: #f1f1f1; +} /* Admin Menu: submenu */ -#adminmenu .wp-submenu, #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu .wp-has-current-submenu.opensub .wp-submenu, .folded #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu { - background: #4796b3; } +#adminmenu .wp-submenu, +#adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu, +.folded #adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu { + background: #4796b3; +} #adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after { - border-right-color: #4796b3; } + border-right-color: #4796b3; +} #adminmenu .wp-submenu .wp-submenu-head { - color: #e2ecf1; } - -#adminmenu .wp-submenu a, #adminmenu .wp-has-current-submenu .wp-submenu a, .folded #adminmenu .wp-has-current-submenu .wp-submenu a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a { - color: #e2ecf1; } - #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, #adminmenu .wp-has-current-submenu .wp-submenu a:focus, #adminmenu .wp-has-current-submenu .wp-submenu a:hover, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { - color: #fff; } + color: #e2ecf1; +} + +#adminmenu .wp-submenu a, +#adminmenu .wp-has-current-submenu .wp-submenu a, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a { + color: #e2ecf1; +} + +#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu .wp-submenu a:hover, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { + color: #fff; +} /* Admin Menu: current */ -#adminmenu .wp-submenu li.current a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { - color: #fff; } - #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { - color: #fff; } - -ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.current:after { - border-right-color: #f1f1f1; } +#adminmenu .wp-submenu li.current a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { + color: #fff; +} -#adminmenu li.current a.menu-top, #adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, #adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, .folded #adminmenu li.current.menu-top { +#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { color: #fff; - background: #096484; } +} -#adminmenu li.wp-has-current-submenu div.wp-menu-image:before { - color: #fff; } +ul#adminmenu a.wp-has-current-submenu:after, +ul#adminmenu > li.current > a.current:after { + border-right-color: #f1f1f1; +} + +#adminmenu li.current a.menu-top, +#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, +#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, +.folded #adminmenu li.current.menu-top { + color: #fff; + background: #096484; +} + +#adminmenu li.wp-has-current-submenu div.wp-menu-image:before, +#adminmenu a.current:hover div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before, +#adminmenu li:hover div.wp-menu-image:before, +#adminmenu li a:focus div.wp-menu-image:before, +#adminmenu li.opensub div.wp-menu-image:before, +.ie8 #adminmenu li.opensub div.wp-menu-image:before { + color: #fff; +} /* Admin Menu: bubble */ -#adminmenu .awaiting-mod, #adminmenu .update-plugins { +#adminmenu .awaiting-mod, +#adminmenu .update-plugins { color: #fff; - background: #e1a948; } + background: #e1a948; +} -#adminmenu li.current a .awaiting-mod, #adminmenu li a.wp-has-current-submenu .update-plugins, #adminmenu li:hover a .awaiting-mod, #adminmenu li.menu-top:hover > a .update-plugins { +#adminmenu li.current a .awaiting-mod, +#adminmenu li a.wp-has-current-submenu .update-plugins, +#adminmenu li:hover a .awaiting-mod, +#adminmenu li.menu-top:hover > a .update-plugins { color: #fff; - background: #4796b3; } + background: #4796b3; +} /* Admin Menu: collapse button */ #collapse-menu { - color: #e5f8ff; } + color: #e5f8ff; +} #collapse-menu:hover { - color: #fff; } + color: #fff; +} #collapse-button div:after { - color: #e5f8ff; } + color: #e5f8ff; +} #collapse-menu:hover #collapse-button div:after { - color: #fff; } + color: #fff; +} /* Admin Bar */ #wpadminbar { color: #fff; - background: #52accc; } - -#wpadminbar .ab-item, #wpadminbar a.ab-item, #wpadminbar > #wp-toolbar span.ab-label, #wpadminbar > #wp-toolbar span.noticon { - color: #fff; } - -#wpadminbar .ab-icon, #wpadminbar .ab-icon:before, #wpadminbar .ab-item:before, #wpadminbar .ab-item:after { - color: #e5f8ff; } + background: #52accc; +} -#wpadminbar .ab-top-menu > li:hover > .ab-item, #wpadminbar .ab-top-menu > li.hover > .ab-item, #wpadminbar .ab-top-menu > li > .ab-item:focus, #wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, #wpadminbar-nojs .ab-top-menu > li.menupop:hover > .ab-item, #wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { +#wpadminbar .ab-item, +#wpadminbar a.ab-item, +#wpadminbar > #wp-toolbar span.ab-label, +#wpadminbar > #wp-toolbar span.noticon { color: #fff; - background: #4796b3; } +} + +#wpadminbar .ab-icon, +#wpadminbar .ab-icon:before, +#wpadminbar .ab-item:before, +#wpadminbar .ab-item:after { + color: #e5f8ff; +} + +#wpadminbar:not(.mobile) .ab-top-menu > li:hover > .ab-item, +#wpadminbar:not(.mobile) .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojs .ab-top-menu > li.menupop:hover > .ab-item, +#wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { + color: #fff; + background: #4796b3; +} -#wpadminbar > #wp-toolbar li:hover span.ab-label, #wpadminbar > #wp-toolbar li.hover span.ab-label, #wpadminbar > #wp-toolbar a:focus span.ab-label { - color: #fff; } +#wpadminbar:not(.mobile) > #wp-toolbar li:hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar li.hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar a:focus span.ab-label { + color: #fff; +} -#wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #fff; } +#wpadminbar:not(.mobile) li:hover .ab-icon:before, +#wpadminbar:not(.mobile) li:hover .ab-item:before, +#wpadminbar:not(.mobile) li:hover .ab-item:after, +#wpadminbar:not(.mobile) li:hover #adminbarsearch:before { + color: #fff; +} /* Admin Bar: submenu */ #wpadminbar .menupop .ab-sub-wrapper { - background: #4796b3; } - -#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, #wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { - background: #74b7ce; } - -#wpadminbar .ab-submenu .ab-item, #wpadminbar .quicklinks .menupop ul li a, #wpadminbar .quicklinks .menupop.hover ul li a, #wpadminbar-nojs .quicklinks .menupop:hover ul li a { - color: #e2ecf1; } - -#wpadminbar .quicklinks li .blavatar, #wpadminbar .menupop .menupop > .ab-item:before { - color: #e5f8ff; } - -#wpadminbar .quicklinks .menupop ul li a:hover, #wpadminbar .quicklinks .menupop ul li a:focus, #wpadminbar .quicklinks .menupop ul li a:hover strong, #wpadminbar .quicklinks .menupop ul li a:focus strong, #wpadminbar .quicklinks .menupop.hover ul li a:hover, #wpadminbar .quicklinks .menupop.hover ul li a:focus, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, #wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li a:focus .ab-icon:before, #wpadminbar li .ab-item:focus:before, #wpadminbar li.hover .ab-icon:before, #wpadminbar li.hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li.hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #fff; } + background: #4796b3; +} + +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { + background: #74b6ce; +} + +#wpadminbar .ab-submenu .ab-item, +#wpadminbar .quicklinks .menupop ul li a, +#wpadminbar .quicklinks .menupop.hover ul li a, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a { + color: #e2ecf1; +} + +#wpadminbar .quicklinks li .blavatar, +#wpadminbar .menupop .menupop > .ab-item:before { + color: #e5f8ff; +} + +#wpadminbar .quicklinks .menupop ul li a:hover, +#wpadminbar .quicklinks .menupop ul li a:focus, +#wpadminbar .quicklinks .menupop ul li a:hover strong, +#wpadminbar .quicklinks .menupop ul li a:focus strong, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a, +#wpadminbar .quicklinks .menupop.hover ul li a:hover, +#wpadminbar .quicklinks .menupop.hover ul li a:focus, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, +#wpadminbar li:hover .ab-icon:before, +#wpadminbar li:hover .ab-item:before, +#wpadminbar li a:focus .ab-icon:before, +#wpadminbar li .ab-item:focus:before, +#wpadminbar li.hover .ab-icon:before, +#wpadminbar li.hover .ab-item:before, +#wpadminbar li:hover #adminbarsearch:before, +#wpadminbar li #adminbarsearch.adminbar-focused:before { + color: #fff; +} + +#wpadminbar .quicklinks li a:hover .blavatar, +#wpadminbar .quicklinks li a:focus .blavatar, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar, +#wpadminbar .menupop .menupop > .ab-item:hover:before, +#wpadminbar.mobile .quicklinks .ab-icon:before, +#wpadminbar.mobile .quicklinks .ab-item:before { + color: #fff; +} -#wpadminbar .quicklinks li a:hover .blavatar, #wpadminbar .menupop .menupop > .ab-item:hover:before { - color: #fff; } +#wpadminbar.mobile .quicklinks .hover .ab-icon:before, +#wpadminbar.mobile .quicklinks .hover .ab-item:before { + color: #e5f8ff; +} /* Admin Bar: search */ #wpadminbar #adminbarsearch:before { - color: #e5f8ff; } + color: #e5f8ff; +} #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus { color: #fff; - background: #6ebad4; } - -#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder { - color: #fff; - opacity: 0.7; } + background: #6eb9d4; +} /* Admin Bar: my account */ #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { - border-color: #6ebad4; - background-color: #6ebad4; } + border-color: #6eb9d4; + background-color: #6eb9d4; +} #wpadminbar #wp-admin-bar-user-info .display-name { - color: #fff; } + color: #fff; +} #wpadminbar #wp-admin-bar-user-info a:hover .display-name { - color: #fff; } + color: #fff; +} #wpadminbar #wp-admin-bar-user-info .username { - color: #e2ecf1; } + color: #e2ecf1; +} /* Pointers */ .wp-pointer .wp-pointer-content h3 { background-color: #096484; - border-color: #07536c; } + border-color: #07526c; +} .wp-pointer .wp-pointer-content h3:before { - color: #096484; } - -.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow { - border-bottom-color: #096484; } - -/* Media Uploader */ -.media-item .bar, .media-progress-bar div { - background-color: #096484; } + color: #096484; +} + +.wp-pointer.wp-pointer-top .wp-pointer-arrow, +.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner { + border-bottom-color: #096484; +} + +/* Media */ +.media-item .bar, +.media-progress-bar div { + background-color: #096484; +} .details.attachment { - -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #096484; - box-shadow: 0 0 0 1px #fff, 0 0 0 5px #096484; } + -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #096484; + box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #096484; +} .attachment.details .check { background-color: #096484; -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #096484; - box-shadow: 0 0 0 1px #fff, 0 0 0 2px #096484; } - -/* Themes */ -.theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after { - background: #096484; } + box-shadow: 0 0 0 1px #fff, 0 0 0 2px #096484; +} -.theme-browser .theme.add-new-theme:hover span:after { - color: #096484; } +.media-selection .attachment.selection.details .thumbnail { + -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #096484; + box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #096484; +} -.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover { - background: #096484; } - -.theme-section.current, .theme-filter.current { - border-bottom-color: #52accc; } +/* Themes */ +.theme-browser .theme.active .theme-name, +.theme-browser .theme.add-new-theme a:hover:after, +.theme-browser .theme.add-new-theme a:focus:after { + background: #096484; +} + +.theme-browser .theme.add-new-theme a:hover span:after, +.theme-browser .theme.add-new-theme a:focus span:after { + color: #096484; +} + +.theme-section.current, +.theme-filter.current { + border-bottom-color: #52accc; +} + +body.more-filters-opened .more-filters { + color: #fff; + background-color: #52accc; +} -body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before { +body.more-filters-opened .more-filters:before { color: #fff; - background-color: #52accc; } +} -body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before { +body.more-filters-opened .more-filters:hover, +body.more-filters-opened .more-filters:focus { background-color: #096484; - color: #fff; } + color: #fff; +} + +body.more-filters-opened .more-filters:hover:before, +body.more-filters-opened .more-filters:focus:before { + color: #fff; +} /* Widgets */ .widgets-chooser li.widgets-chooser-selected { background-color: #096484; - color: #fff; } + color: #fff; +} -.widgets-chooser li.widgets-chooser-selected:before, .widgets-chooser li.widgets-chooser-selected:focus:before { - color: #fff; } +.widgets-chooser li.widgets-chooser-selected:before, +.widgets-chooser li.widgets-chooser-selected:focus:before { + color: #fff; +} /* Customize */ #customize-theme-controls .widget-area-select .selected { background-color: #096484; - color: #fff; } - -/* jQuery UI Slider */ -.wp-slider .ui-slider-handle, .wp-slider .ui-slider-handle.ui-state-hover, .wp-slider .ui-slider-handle.focus { - background: #e1a948; - border-color: #d39323; - -webkit-box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15); } - -/* Thickbox: Plugin information */ -#sidemenu a.current { - background: #f1f1f1; - border-bottom-color: #f1f1f1; } + color: #fff; +} -#plugin-information .action-button { - background: #e1a948; } +#customize-footer-actions .devices button:focus { + border-bottom-color: #096484; +} /* Responsive Component */ div#wp-responsive-toggle a:before { - color: #e5f8ff; } + color: #e5f8ff; +} .wp-responsive-open div#wp-responsive-toggle a { border-color: transparent; - background: #096484; } - -.star-rating .star { - color: #096484; } + background: #096484; +} .wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a { - background: #4796b3; } + background: #4796b3; +} + +.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before { + color: #e5f8ff; +} + +/* TinyMCE */ +.mce-container.mce-menu .mce-menu-item:hover, +.mce-container.mce-menu .mce-menu-item.mce-selected, +.mce-container.mce-menu .mce-menu-item:focus, +.mce-container.mce-menu .mce-menu-item-normal.mce-active, +.mce-container.mce-menu .mce-menu-item-preview.mce-active { + background: #096484; +} diff --git a/wp-admin/css/colors/blue/colors.min.css b/wp-admin/css/colors/blue/colors.min.css index 6907e37..45d54da 100644 --- a/wp-admin/css/colors/blue/colors.min.css +++ b/wp-admin/css/colors/blue/colors.min.css @@ -1 +1 @@ -html{background:#f1f1f1}a{color:#0074a2}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,a:active,a:focus,a:hover,div.dashboard-widget-submit input:hover{color:#0099d5}input[type=checkbox]:checked:before{color:#096484}input[type=radio]:checked:before{background:#096484}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0099d5}.wp-core-ui .button-primary{background:#e1a948;border-color:#d39323;color:#fff;-webkit-box-shadow:inset 0 1px 0 #ecc88a,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #ecc88a,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#dd9f32;border-color:#bd831f;color:#fff;-webkit-box-shadow:inset 0 1px 0 #e8be74,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #e8be74,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:active{background:#d39323;border-color:#bd831f;color:#fff;-webkit-box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5);box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5)}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#d1cdc7!important;background:#db9825!important;border-color:#bd831f!important;text-shadow:none!important}.wp-core-ui .wp-ui-primary{color:#fff;background-color:#52accc}.wp-core-ui .wp-ui-text-primary{color:#52accc}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#096484}.wp-core-ui .wp-ui-text-highlight{color:#096484}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#e1a948}.wp-core-ui .wp-ui-text-notification{color:#e1a948}.wp-core-ui .wp-ui-text-icon{color:#e5f8ff}#add-new-comment a:hover,.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover{color:#fff;background-color:#52accc}.view-switch a.current:before{color:#52accc}.view-switch a:hover:before{color:#e1a948}.post-com-count:hover:after{border-top-color:#52accc}.post-com-count:hover span{color:#fff;background-color:#52accc}strong .post-com-count:after{border-top-color:#e1a948}strong .post-com-count span{background-color:#e1a948}#adminmenu,#adminmenuback,#adminmenuwrap{background:#52accc}#adminmenu a{color:#fff}#adminmenu div.wp-menu-image:before{color:#e5f8ff}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#096484}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#fff}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f1f1f1;border-bottom-color:#f1f1f1}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#4796b3}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-right-color:#4796b3}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu .wp-submenu-head,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#e2ecf1}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu .wp-submenu li.current a,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#fff}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-right-color:#f1f1f1}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#096484}#adminmenu li.wp-has-current-submenu div.wp-menu-image:before{color:#fff}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#e1a948}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#fff;background:#4796b3}#collapse-menu{color:#e5f8ff}#collapse-menu:hover{color:#fff}#collapse-button div:after{color:#e5f8ff}#collapse-menu:hover #collapse-button div:after{color:#fff}#wpadminbar{color:#fff;background:#52accc}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#fff}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#e5f8ff}#wpadminbar .ab-top-menu>li.hover>.ab-item,#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar .ab-top-menu>li:hover>.ab-item,#wpadminbar .ab-top-menu>li>.ab-item:focus,#wpadminbar-nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus{color:#fff;background:#4796b3}#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:after,#wpadminbar li:hover .ab-item:before,#wpadminbar>#wp-toolbar a:focus span.ab-label,#wpadminbar>#wp-toolbar li.hover span.ab-label,#wpadminbar>#wp-toolbar li:hover span.ab-label{color:#fff}#wpadminbar .menupop .ab-sub-wrapper{background:#4796b3}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#74b7ce}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar-nojs .quicklinks .menupop:hover ul li a{color:#e2ecf1}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#e5f8ff}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:after,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:after,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#fff}#wpadminbar #adminbarsearch:before{color:#e5f8ff}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#fff;background:#6ebad4}#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder{color:#fff;opacity:.7}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#6ebad4;background-color:#6ebad4}#wpadminbar #wp-admin-bar-user-info .display-name,#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#fff}#wpadminbar #wp-admin-bar-user-info .username{color:#e2ecf1}.wp-pointer .wp-pointer-content h3{background-color:#096484;border-color:#07536c}.wp-pointer .wp-pointer-content h3:before{color:#096484}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow{border-bottom-color:#096484}.media-item .bar,.media-progress-bar div{background-color:#096484}.details.attachment{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 5px #096484;box-shadow:0 0 0 1px #fff,0 0 0 5px #096484}.attachment.details .check{background-color:#096484;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #096484;box-shadow:0 0 0 1px #fff,0 0 0 2px #096484}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme:hover:after{background:#096484}.theme-browser .theme.add-new-theme:hover span:after{color:#096484}.theme-overlay .theme-header .close:hover,.theme-overlay .theme-header .left:hover,.theme-overlay .theme-header .right:hover{background:#096484}.theme-filter.current,.theme-section.current{border-bottom-color:#52accc}body.more-filters-opened .more-filters,body.more-filters-opened .more-filters:before{color:#fff;background-color:#52accc}.widgets-chooser li.widgets-chooser-selected,body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover,body.more-filters-opened .more-filters:hover:before{background-color:#096484;color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-theme-controls .widget-area-select .selected{background-color:#096484;color:#fff}.wp-slider .ui-slider-handle,.wp-slider .ui-slider-handle.focus,.wp-slider .ui-slider-handle.ui-state-hover{background:#e1a948;border-color:#d39323;-webkit-box-shadow:inset 0 1px 0 #ecc88a,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #ecc88a,0 1px 0 rgba(0,0,0,.15)}#sidemenu a.current{background:#f1f1f1;border-bottom-color:#f1f1f1}#plugin-information .action-button{background:#e1a948}div#wp-responsive-toggle a:before{color:#e5f8ff}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#096484}.star-rating .star{color:#096484}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#4796b3} \ No newline at end of file +html{background:#f1f1f1}a{color:#0073aa}a:active,a:focus,a:hover{color:#0096dd}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,div.dashboard-widget-submit input:hover{color:#0096dd}input[type=checkbox]:checked:before{color:#096484}input[type=radio]:checked:before{background:#096484}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0096dd}.wp-core-ui .button-primary{background:#e1a948;border-color:#d39323 #bd831f #bd831f;color:#fff;-webkit-box-shadow:0 1px 0 #bd831f;box-shadow:0 1px 0 #bd831f;text-shadow:0 -1px 1px #bd831f,1px 0 1px #bd831f,0 1px 1px #bd831f,-1px 0 1px #bd831f}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#e3af55;border-color:#bd831f;color:#fff;-webkit-box-shadow:0 1px 0 #bd831f;box-shadow:0 1px 0 #bd831f}.wp-core-ui .button-primary:focus{-webkit-box-shadow:inset 0 1px 0 #d39323,0 0 2px 1px #33b3db;box-shadow:inset 0 1px 0 #d39323,0 0 2px 1px #33b3db}.wp-core-ui .button-primary:active{background:#d39323;border-color:#bd831f;-webkit-box-shadow:inset 0 2px 0 #bd831f;box-shadow:inset 0 2px 0 #bd831f}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#d1cdc7!important;background:#db9925!important;border-color:#bd831f!important;text-shadow:none!important}.wp-core-ui .button-primary.button-hero{-webkit-box-shadow:0 2px 0 #bd831f!important;box-shadow:0 2px 0 #bd831f!important}.wp-core-ui .button-primary.button-hero:active{-webkit-box-shadow:inset 0 3px 0 #bd831f!important;box-shadow:inset 0 3px 0 #bd831f!important}.wp-core-ui .wp-ui-primary{color:#fff;background-color:#52accc}.wp-core-ui .wp-ui-text-primary{color:#52accc}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#096484}.wp-core-ui .wp-ui-text-highlight{color:#096484}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#e1a948}.wp-core-ui .wp-ui-text-notification{color:#e1a948}.wp-core-ui .wp-ui-text-icon{color:#e5f8ff}.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover,.wrap .page-title-action:hover{color:#fff;background-color:#52accc}.view-switch a.current:before{color:#52accc}.view-switch a:hover:before{color:#e1a948}#adminmenu,#adminmenuback,#adminmenuwrap{background:#52accc}#adminmenu a{color:#fff}#adminmenu div.wp-menu-image:before{color:#e5f8ff}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#096484}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#fff}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f1f1f1;border-bottom-color:#f1f1f1}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#4796b3}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-right-color:#4796b3}#adminmenu .wp-submenu .wp-submenu-head{color:#e2ecf1}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#e2ecf1}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#fff}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#fff}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-right-color:#f1f1f1}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#096484}#adminmenu a.current:hover div.wp-menu-image:before,#adminmenu li a:focus div.wp-menu-image:before,#adminmenu li.opensub div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,#adminmenu li:hover div.wp-menu-image:before,.ie8 #adminmenu li.opensub div.wp-menu-image:before{color:#fff}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#e1a948}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#fff;background:#4796b3}#collapse-menu{color:#e5f8ff}#collapse-menu:hover{color:#fff}#collapse-button div:after{color:#e5f8ff}#collapse-menu:hover #collapse-button div:after{color:#fff}#wpadminbar{color:#fff;background:#52accc}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#fff}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#e5f8ff}#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus,#wpadminbar.nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li>.ab-item:focus{color:#fff;background:#4796b3}#wpadminbar:not(.mobile)>#wp-toolbar a:focus span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li.hover span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li:hover span.ab-label{color:#fff}#wpadminbar:not(.mobile) li:hover #adminbarsearch:before,#wpadminbar:not(.mobile) li:hover .ab-icon:before,#wpadminbar:not(.mobile) li:hover .ab-item:after,#wpadminbar:not(.mobile) li:hover .ab-item:before{color:#fff}#wpadminbar .menupop .ab-sub-wrapper{background:#4796b3}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#74b6ce}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar.nojs .quicklinks .menupop:hover ul li a{color:#e2ecf1}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#e5f8ff}#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar li #adminbarsearch.adminbar-focused:before,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#fff}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a .blavatar,#wpadminbar .quicklinks li a:focus .blavatar,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar.mobile .quicklinks .ab-icon:before,#wpadminbar.mobile .quicklinks .ab-item:before{color:#fff}#wpadminbar.mobile .quicklinks .hover .ab-icon:before,#wpadminbar.mobile .quicklinks .hover .ab-item:before{color:#e5f8ff}#wpadminbar #adminbarsearch:before{color:#e5f8ff}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#fff;background:#6eb9d4}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#6eb9d4;background-color:#6eb9d4}#wpadminbar #wp-admin-bar-user-info .display-name,#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#fff}#wpadminbar #wp-admin-bar-user-info .username{color:#e2ecf1}.wp-pointer .wp-pointer-content h3{background-color:#096484;border-color:#07526c}.wp-pointer .wp-pointer-content h3:before{color:#096484}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner{border-bottom-color:#096484}.media-item .bar,.media-progress-bar div{background-color:#096484}.details.attachment{-webkit-box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #096484;box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #096484}.attachment.details .check{background-color:#096484;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #096484;box-shadow:0 0 0 1px #fff,0 0 0 2px #096484}.media-selection .attachment.selection.details .thumbnail{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 3px #096484;box-shadow:0 0 0 1px #fff,0 0 0 3px #096484}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme a:focus:after,.theme-browser .theme.add-new-theme a:hover:after{background:#096484}.theme-browser .theme.add-new-theme a:focus span:after,.theme-browser .theme.add-new-theme a:hover span:after{color:#096484}.theme-filter.current,.theme-section.current{border-bottom-color:#52accc}body.more-filters-opened .more-filters{color:#fff;background-color:#52accc}#customize-theme-controls .widget-area-select .selected,.widgets-chooser li.widgets-chooser-selected{background-color:#096484;color:#fff}body.more-filters-opened .more-filters:before{color:#fff}body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:hover{background-color:#096484;color:#fff}body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover:before{color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-footer-actions .devices button:focus{border-bottom-color:#096484}div#wp-responsive-toggle a:before{color:#e5f8ff}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#096484}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#4796b3}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before{color:#e5f8ff}.mce-container.mce-menu .mce-menu-item-normal.mce-active,.mce-container.mce-menu .mce-menu-item-preview.mce-active,.mce-container.mce-menu .mce-menu-item.mce-selected,.mce-container.mce-menu .mce-menu-item:focus,.mce-container.mce-menu .mce-menu-item:hover{background:#096484} \ No newline at end of file diff --git a/wp-admin/css/colors/coffee/colors-rtl.css b/wp-admin/css/colors/coffee/colors-rtl.css index a54579d..d82f7af 100644 --- a/wp-admin/css/colors/coffee/colors-rtl.css +++ b/wp-admin/css/colors/coffee/colors-rtl.css @@ -3,329 +3,524 @@ * highlights/shadows, based on a base color. */ html { - background: #f1f1f1; } + background: #f1f1f1; +} /* Links */ a { - color: #0074a2; } - a:hover, a:active, a:focus { - color: #0099d5; } + color: #0073aa; +} + +a:hover, a:active, a:focus { + color: #0096dd; +} -#media-upload a.del-link:hover, div.dashboard-widget-submit input:hover, .subsubsub a:hover, .subsubsub a.current:hover { - color: #0099d5; } +#media-upload a.del-link:hover, +div.dashboard-widget-submit input:hover, +.subsubsub a:hover, +.subsubsub a.current:hover { + color: #0096dd; +} /* Forms */ input[type=checkbox]:checked:before { - color: #59524c; } + color: #59524c; +} input[type=radio]:checked:before { - background: #59524c; } + background: #59524c; +} -.wp-core-ui input[type="reset"]:hover, .wp-core-ui input[type="reset"]:active { - color: #0099d5; } +.wp-core-ui input[type="reset"]:hover, +.wp-core-ui input[type="reset"]:active { + color: #0096dd; +} /* Core UI */ .wp-core-ui .button-primary { background: #c7a589; - border-color: #b78a66; + border-color: #b78b66 #ae7d55 #ae7d55; + color: white; + -webkit-box-shadow: 0 1px 0 #ae7d55; + box-shadow: 0 1px 0 #ae7d55; + text-shadow: 0 -1px 1px #ae7d55, -1px 0 1px #ae7d55, 0 1px 1px #ae7d55, 1px 0 1px #ae7d55; +} + +.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { + background: #ccad93; + border-color: #ae7d55; color: white; - -webkit-box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { - background: #bf9878; - border-color: #ae7d55; - color: white; - -webkit-box-shadow: inset 0 1px 0 #d7bfac, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #d7bfac, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:active { - background: #b78a66; - border-color: #ae7d55; - color: white; - -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); - box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); } - .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { - color: #d1cbc7 !important; - background: #ba906d !important; - border-color: #ae7d55 !important; - text-shadow: none !important; } + -webkit-box-shadow: 0 1px 0 #ae7d55; + box-shadow: 0 1px 0 #ae7d55; +} + +.wp-core-ui .button-primary:focus { + -webkit-box-shadow: inset 0 1px 0 #b78b66, 0 0 2px 1px #33b3db; + box-shadow: inset 0 1px 0 #b78b66, 0 0 2px 1px #33b3db; +} + +.wp-core-ui .button-primary:active { + background: #b78b66; + border-color: #ae7d55; + -webkit-box-shadow: inset 0 2px 0 #ae7d55; + box-shadow: inset 0 2px 0 #ae7d55; +} + +.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { + color: #d1ccc7 !important; + background: #ba906d !important; + border-color: #ae7d55 !important; + text-shadow: none !important; +} + +.wp-core-ui .button-primary.button-hero { + -webkit-box-shadow: 0 2px 0 #ae7d55 !important; + box-shadow: 0 2px 0 #ae7d55 !important; +} + +.wp-core-ui .button-primary.button-hero:active { + -webkit-box-shadow: inset 0 3px 0 #ae7d55 !important; + box-shadow: inset 0 3px 0 #ae7d55 !important; +} + .wp-core-ui .wp-ui-primary { color: #fff; - background-color: #59524c; } + background-color: #59524c; +} + .wp-core-ui .wp-ui-text-primary { - color: #59524c; } + color: #59524c; +} + .wp-core-ui .wp-ui-highlight { color: #fff; - background-color: #c7a589; } + background-color: #c7a589; +} + .wp-core-ui .wp-ui-text-highlight { - color: #c7a589; } + color: #c7a589; +} + .wp-core-ui .wp-ui-notification { color: #fff; - background-color: #9ea476; } + background-color: #9ea476; +} + .wp-core-ui .wp-ui-text-notification { - color: #9ea476; } + color: #9ea476; +} + .wp-core-ui .wp-ui-text-icon { - color: #f3f2f1; } + color: #f3f2f1; +} /* List tables */ -.wrap .add-new-h2:hover, #add-new-comment a:hover, .tablenav .tablenav-pages a:hover, .tablenav .tablenav-pages a:focus { +.wrap .add-new-h2:hover, +.wrap .page-title-action:hover, +.tablenav .tablenav-pages a:hover, +.tablenav .tablenav-pages a:focus { color: #fff; - background-color: #59524c; } + background-color: #59524c; +} .view-switch a.current:before { - color: #59524c; } + color: #59524c; +} .view-switch a:hover:before { - color: #9ea476; } - -.post-com-count:hover:after { - border-top-color: #59524c; } - -.post-com-count:hover span { - color: #fff; - background-color: #59524c; } - -strong .post-com-count:after { - border-top-color: #9ea476; } - -strong .post-com-count span { - background-color: #9ea476; } + color: #9ea476; +} /* Admin Menu */ -#adminmenuback, #adminmenuwrap, #adminmenu { - background: #59524c; } +#adminmenuback, +#adminmenuwrap, +#adminmenu { + background: #59524c; +} #adminmenu a { - color: #fff; } + color: #fff; +} #adminmenu div.wp-menu-image:before { - color: #f3f2f1; } + color: #f3f2f1; +} -#adminmenu a:hover, #adminmenu li.menu-top:hover, #adminmenu li.opensub > a.menu-top, #adminmenu li > a.menu-top:focus { +#adminmenu a:hover, +#adminmenu li.menu-top:hover, +#adminmenu li.opensub > a.menu-top, +#adminmenu li > a.menu-top:focus { color: #fff; - background-color: #c7a589; } + background-color: #c7a589; +} -#adminmenu li.menu-top:hover div.wp-menu-image:before, #adminmenu li.opensub > a.menu-top div.wp-menu-image:before { - color: #fff; } +#adminmenu li.menu-top:hover div.wp-menu-image:before, +#adminmenu li.opensub > a.menu-top div.wp-menu-image:before { + color: #fff; +} /* Active tabs use a bottom border color that matches the page background color. */ -.about-wrap h2 .nav-tab-active, .nav-tab-active, .nav-tab-active:hover { +.about-wrap h2 .nav-tab-active, +.nav-tab-active, +.nav-tab-active:hover { background-color: #f1f1f1; - border-bottom-color: #f1f1f1; } + border-bottom-color: #f1f1f1; +} /* Admin Menu: submenu */ -#adminmenu .wp-submenu, #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu .wp-has-current-submenu.opensub .wp-submenu, .folded #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu { - background: #46403c; } +#adminmenu .wp-submenu, +#adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu, +.folded #adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu { + background: #46403c; +} #adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after { - border-left-color: #46403c; } + border-left-color: #46403c; +} #adminmenu .wp-submenu .wp-submenu-head { - color: #cdcbc9; } - -#adminmenu .wp-submenu a, #adminmenu .wp-has-current-submenu .wp-submenu a, .folded #adminmenu .wp-has-current-submenu .wp-submenu a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a { - color: #cdcbc9; } - #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, #adminmenu .wp-has-current-submenu .wp-submenu a:focus, #adminmenu .wp-has-current-submenu .wp-submenu a:hover, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { - color: #c7a589; } + color: #cdcbc9; +} + +#adminmenu .wp-submenu a, +#adminmenu .wp-has-current-submenu .wp-submenu a, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a { + color: #cdcbc9; +} + +#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu .wp-submenu a:hover, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { + color: #c7a589; +} /* Admin Menu: current */ -#adminmenu .wp-submenu li.current a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { - color: #fff; } - #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { - color: #c7a589; } +#adminmenu .wp-submenu li.current a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { + color: #fff; +} -ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.current:after { - border-left-color: #f1f1f1; } +#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { + color: #c7a589; +} -#adminmenu li.current a.menu-top, #adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, #adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, .folded #adminmenu li.current.menu-top { - color: #fff; - background: #c7a589; } +ul#adminmenu a.wp-has-current-submenu:after, +ul#adminmenu > li.current > a.current:after { + border-left-color: #f1f1f1; +} -#adminmenu li.wp-has-current-submenu div.wp-menu-image:before { - color: #fff; } +#adminmenu li.current a.menu-top, +#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, +#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, +.folded #adminmenu li.current.menu-top { + color: #fff; + background: #c7a589; +} + +#adminmenu li.wp-has-current-submenu div.wp-menu-image:before, +#adminmenu a.current:hover div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before, +#adminmenu li:hover div.wp-menu-image:before, +#adminmenu li a:focus div.wp-menu-image:before, +#adminmenu li.opensub div.wp-menu-image:before, +.ie8 #adminmenu li.opensub div.wp-menu-image:before { + color: #fff; +} /* Admin Menu: bubble */ -#adminmenu .awaiting-mod, #adminmenu .update-plugins { +#adminmenu .awaiting-mod, +#adminmenu .update-plugins { color: #fff; - background: #9ea476; } + background: #9ea476; +} -#adminmenu li.current a .awaiting-mod, #adminmenu li a.wp-has-current-submenu .update-plugins, #adminmenu li:hover a .awaiting-mod, #adminmenu li.menu-top:hover > a .update-plugins { +#adminmenu li.current a .awaiting-mod, +#adminmenu li a.wp-has-current-submenu .update-plugins, +#adminmenu li:hover a .awaiting-mod, +#adminmenu li.menu-top:hover > a .update-plugins { color: #fff; - background: #46403c; } + background: #46403c; +} /* Admin Menu: collapse button */ #collapse-menu { - color: #f3f2f1; } + color: #f3f2f1; +} #collapse-menu:hover { - color: #fff; } + color: #fff; +} #collapse-button div:after { - color: #f3f2f1; } + color: #f3f2f1; +} #collapse-menu:hover #collapse-button div:after { - color: #fff; } + color: #fff; +} /* Admin Bar */ #wpadminbar { color: #fff; - background: #59524c; } - -#wpadminbar .ab-item, #wpadminbar a.ab-item, #wpadminbar > #wp-toolbar span.ab-label, #wpadminbar > #wp-toolbar span.noticon { - color: #fff; } - -#wpadminbar .ab-icon, #wpadminbar .ab-icon:before, #wpadminbar .ab-item:before, #wpadminbar .ab-item:after { - color: #f3f2f1; } + background: #59524c; +} -#wpadminbar .ab-top-menu > li:hover > .ab-item, #wpadminbar .ab-top-menu > li.hover > .ab-item, #wpadminbar .ab-top-menu > li > .ab-item:focus, #wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, #wpadminbar-nojs .ab-top-menu > li.menupop:hover > .ab-item, #wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { +#wpadminbar .ab-item, +#wpadminbar a.ab-item, +#wpadminbar > #wp-toolbar span.ab-label, +#wpadminbar > #wp-toolbar span.noticon { + color: #fff; +} + +#wpadminbar .ab-icon, +#wpadminbar .ab-icon:before, +#wpadminbar .ab-item:before, +#wpadminbar .ab-item:after { + color: #f3f2f1; +} + +#wpadminbar:not(.mobile) .ab-top-menu > li:hover > .ab-item, +#wpadminbar:not(.mobile) .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojs .ab-top-menu > li.menupop:hover > .ab-item, +#wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { color: #c7a589; - background: #46403c; } + background: #46403c; +} -#wpadminbar > #wp-toolbar li:hover span.ab-label, #wpadminbar > #wp-toolbar li.hover span.ab-label, #wpadminbar > #wp-toolbar a:focus span.ab-label { - color: #c7a589; } +#wpadminbar:not(.mobile) > #wp-toolbar li:hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar li.hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar a:focus span.ab-label { + color: #c7a589; +} -#wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #fff; } +#wpadminbar:not(.mobile) li:hover .ab-icon:before, +#wpadminbar:not(.mobile) li:hover .ab-item:before, +#wpadminbar:not(.mobile) li:hover .ab-item:after, +#wpadminbar:not(.mobile) li:hover #adminbarsearch:before { + color: #fff; +} /* Admin Bar: submenu */ #wpadminbar .menupop .ab-sub-wrapper { - background: #46403c; } - -#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, #wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { - background: #656463; } - -#wpadminbar .ab-submenu .ab-item, #wpadminbar .quicklinks .menupop ul li a, #wpadminbar .quicklinks .menupop.hover ul li a, #wpadminbar-nojs .quicklinks .menupop:hover ul li a { - color: #cdcbc9; } - -#wpadminbar .quicklinks li .blavatar, #wpadminbar .menupop .menupop > .ab-item:before { - color: #f3f2f1; } - -#wpadminbar .quicklinks .menupop ul li a:hover, #wpadminbar .quicklinks .menupop ul li a:focus, #wpadminbar .quicklinks .menupop ul li a:hover strong, #wpadminbar .quicklinks .menupop ul li a:focus strong, #wpadminbar .quicklinks .menupop.hover ul li a:hover, #wpadminbar .quicklinks .menupop.hover ul li a:focus, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, #wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li a:focus .ab-icon:before, #wpadminbar li .ab-item:focus:before, #wpadminbar li.hover .ab-icon:before, #wpadminbar li.hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li.hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #c7a589; } + background: #46403c; +} + +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { + background: #656463; +} + +#wpadminbar .ab-submenu .ab-item, +#wpadminbar .quicklinks .menupop ul li a, +#wpadminbar .quicklinks .menupop.hover ul li a, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a { + color: #cdcbc9; +} + +#wpadminbar .quicklinks li .blavatar, +#wpadminbar .menupop .menupop > .ab-item:before { + color: #f3f2f1; +} + +#wpadminbar .quicklinks .menupop ul li a:hover, +#wpadminbar .quicklinks .menupop ul li a:focus, +#wpadminbar .quicklinks .menupop ul li a:hover strong, +#wpadminbar .quicklinks .menupop ul li a:focus strong, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a, +#wpadminbar .quicklinks .menupop.hover ul li a:hover, +#wpadminbar .quicklinks .menupop.hover ul li a:focus, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, +#wpadminbar li:hover .ab-icon:before, +#wpadminbar li:hover .ab-item:before, +#wpadminbar li a:focus .ab-icon:before, +#wpadminbar li .ab-item:focus:before, +#wpadminbar li.hover .ab-icon:before, +#wpadminbar li.hover .ab-item:before, +#wpadminbar li:hover #adminbarsearch:before, +#wpadminbar li #adminbarsearch.adminbar-focused:before { + color: #c7a589; +} + +#wpadminbar .quicklinks li a:hover .blavatar, +#wpadminbar .quicklinks li a:focus .blavatar, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar, +#wpadminbar .menupop .menupop > .ab-item:hover:before, +#wpadminbar.mobile .quicklinks .ab-icon:before, +#wpadminbar.mobile .quicklinks .ab-item:before { + color: #c7a589; +} -#wpadminbar .quicklinks li a:hover .blavatar, #wpadminbar .menupop .menupop > .ab-item:hover:before { - color: #c7a589; } +#wpadminbar.mobile .quicklinks .hover .ab-icon:before, +#wpadminbar.mobile .quicklinks .hover .ab-item:before { + color: #f3f2f1; +} /* Admin Bar: search */ #wpadminbar #adminbarsearch:before { - color: #f3f2f1; } + color: #f3f2f1; +} #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus { color: #fff; - background: #6c645c; } - -#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder { - color: #fff; - opacity: 0.7; } + background: #6c645c; +} /* Admin Bar: my account */ #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { border-color: #6c645c; - background-color: #6c645c; } + background-color: #6c645c; +} #wpadminbar #wp-admin-bar-user-info .display-name { - color: #fff; } + color: #fff; +} #wpadminbar #wp-admin-bar-user-info a:hover .display-name { - color: #c7a589; } + color: #c7a589; +} #wpadminbar #wp-admin-bar-user-info .username { - color: #cdcbc9; } + color: #cdcbc9; +} /* Pointers */ .wp-pointer .wp-pointer-content h3 { background-color: #c7a589; - border-color: #bf9878; } + border-color: #bf9878; +} .wp-pointer .wp-pointer-content h3:before { - color: #c7a589; } - -.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow { - border-bottom-color: #c7a589; } - -/* Media Uploader */ -.media-item .bar, .media-progress-bar div { - background-color: #c7a589; } + color: #c7a589; +} + +.wp-pointer.wp-pointer-top .wp-pointer-arrow, +.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner { + border-bottom-color: #c7a589; +} + +/* Media */ +.media-item .bar, +.media-progress-bar div { + background-color: #c7a589; +} .details.attachment { - -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #c7a589; - box-shadow: 0 0 0 1px #fff, 0 0 0 5px #c7a589; } + -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #c7a589; + box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #c7a589; +} .attachment.details .check { background-color: #c7a589; -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #c7a589; - box-shadow: 0 0 0 1px #fff, 0 0 0 2px #c7a589; } + box-shadow: 0 0 0 1px #fff, 0 0 0 2px #c7a589; +} + +.media-selection .attachment.selection.details .thumbnail { + -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #c7a589; + box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #c7a589; +} /* Themes */ -.theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after { - background: #c7a589; } +.theme-browser .theme.active .theme-name, +.theme-browser .theme.add-new-theme a:hover:after, +.theme-browser .theme.add-new-theme a:focus:after { + background: #c7a589; +} -.theme-browser .theme.add-new-theme:hover span:after { - color: #c7a589; } +.theme-browser .theme.add-new-theme a:hover span:after, +.theme-browser .theme.add-new-theme a:focus span:after { + color: #c7a589; +} -.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover { - background: #c7a589; } +.theme-section.current, +.theme-filter.current { + border-bottom-color: #59524c; +} -.theme-section.current, .theme-filter.current { - border-bottom-color: #59524c; } +body.more-filters-opened .more-filters { + color: #fff; + background-color: #59524c; +} -body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before { +body.more-filters-opened .more-filters:before { color: #fff; - background-color: #59524c; } +} -body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before { +body.more-filters-opened .more-filters:hover, +body.more-filters-opened .more-filters:focus { background-color: #c7a589; - color: #fff; } + color: #fff; +} + +body.more-filters-opened .more-filters:hover:before, +body.more-filters-opened .more-filters:focus:before { + color: #fff; +} /* Widgets */ .widgets-chooser li.widgets-chooser-selected { background-color: #c7a589; - color: #fff; } + color: #fff; +} -.widgets-chooser li.widgets-chooser-selected:before, .widgets-chooser li.widgets-chooser-selected:focus:before { - color: #fff; } +.widgets-chooser li.widgets-chooser-selected:before, +.widgets-chooser li.widgets-chooser-selected:focus:before { + color: #fff; +} /* Customize */ #customize-theme-controls .widget-area-select .selected { background-color: #c7a589; - color: #fff; } - -/* jQuery UI Slider */ -.wp-slider .ui-slider-handle, .wp-slider .ui-slider-handle.ui-state-hover, .wp-slider .ui-slider-handle.focus { - background: #c7a589; - border-color: #b78a66; - -webkit-box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15); } - -/* Thickbox: Plugin information */ -#sidemenu a.current { - background: #f1f1f1; - border-bottom-color: #f1f1f1; } + color: #fff; +} -#plugin-information .action-button { - background: #c7a589; } +#customize-footer-actions .devices button:focus { + border-bottom-color: #c7a589; +} /* Responsive Component */ div#wp-responsive-toggle a:before { - color: #f3f2f1; } + color: #f3f2f1; +} .wp-responsive-open div#wp-responsive-toggle a { border-color: transparent; - background: #c7a589; } - -.star-rating .star { - color: #c7a589; } + background: #c7a589; +} .wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a { - background: #46403c; } + background: #46403c; +} + +.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before { + color: #f3f2f1; +} + +/* TinyMCE */ +.mce-container.mce-menu .mce-menu-item:hover, +.mce-container.mce-menu .mce-menu-item.mce-selected, +.mce-container.mce-menu .mce-menu-item:focus, +.mce-container.mce-menu .mce-menu-item-normal.mce-active, +.mce-container.mce-menu .mce-menu-item-preview.mce-active { + background: #c7a589; +} diff --git a/wp-admin/css/colors/coffee/colors-rtl.min.css b/wp-admin/css/colors/coffee/colors-rtl.min.css index ed81cb7..4530597 100644 --- a/wp-admin/css/colors/coffee/colors-rtl.min.css +++ b/wp-admin/css/colors/coffee/colors-rtl.min.css @@ -1 +1 @@ -html{background:#f1f1f1}a{color:#0074a2}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,a:active,a:focus,a:hover,div.dashboard-widget-submit input:hover{color:#0099d5}input[type=checkbox]:checked:before{color:#59524c}input[type=radio]:checked:before{background:#59524c}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0099d5}.wp-core-ui .button-primary{background:#c7a589;border-color:#b78a66;color:#fff;-webkit-box-shadow:inset 0 1px 0 #e0cdbd,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #e0cdbd,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#bf9878;border-color:#ae7d55;color:#fff;-webkit-box-shadow:inset 0 1px 0 #d7bfac,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #d7bfac,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:active{background:#b78a66;border-color:#ae7d55;color:#fff;-webkit-box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5);box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5)}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#d1cbc7!important;background:#ba906d!important;border-color:#ae7d55!important;text-shadow:none!important}.wp-core-ui .wp-ui-primary{color:#fff;background-color:#59524c}.wp-core-ui .wp-ui-text-primary{color:#59524c}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#c7a589}.wp-core-ui .wp-ui-text-highlight{color:#c7a589}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#9ea476}.wp-core-ui .wp-ui-text-notification{color:#9ea476}.wp-core-ui .wp-ui-text-icon{color:#f3f2f1}#add-new-comment a:hover,.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover{color:#fff;background-color:#59524c}.view-switch a.current:before{color:#59524c}.view-switch a:hover:before{color:#9ea476}.post-com-count:hover:after{border-top-color:#59524c}.post-com-count:hover span{color:#fff;background-color:#59524c}strong .post-com-count:after{border-top-color:#9ea476}strong .post-com-count span{background-color:#9ea476}#adminmenu,#adminmenuback,#adminmenuwrap{background:#59524c}#adminmenu a{color:#fff}#adminmenu div.wp-menu-image:before{color:#f3f2f1}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#c7a589}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#fff}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f1f1f1;border-bottom-color:#f1f1f1}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#46403c}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-left-color:#46403c}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu .wp-submenu-head,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#cdcbc9}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#c7a589}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#c7a589}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-left-color:#f1f1f1}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#c7a589}#adminmenu li.wp-has-current-submenu div.wp-menu-image:before{color:#fff}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#9ea476}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#fff;background:#46403c}#collapse-menu{color:#f3f2f1}#collapse-menu:hover{color:#fff}#collapse-button div:after{color:#f3f2f1}#collapse-menu:hover #collapse-button div:after{color:#fff}#wpadminbar{color:#fff;background:#59524c}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#fff}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#f3f2f1}#wpadminbar .ab-top-menu>li.hover>.ab-item,#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar .ab-top-menu>li:hover>.ab-item,#wpadminbar .ab-top-menu>li>.ab-item:focus,#wpadminbar-nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus{color:#c7a589;background:#46403c}#wpadminbar>#wp-toolbar a:focus span.ab-label,#wpadminbar>#wp-toolbar li.hover span.ab-label,#wpadminbar>#wp-toolbar li:hover span.ab-label{color:#c7a589}#wpadminbar .menupop .ab-sub-wrapper{background:#46403c}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#656463}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar-nojs .quicklinks .menupop:hover ul li a{color:#cdcbc9}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#f3f2f1}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:after,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:after,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#c7a589}#wpadminbar #adminbarsearch:before{color:#f3f2f1}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#fff;background:#6c645c}#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder{color:#fff;opacity:.7}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#6c645c;background-color:#6c645c}#wpadminbar #wp-admin-bar-user-info .display-name{color:#fff}#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#c7a589}#wpadminbar #wp-admin-bar-user-info .username{color:#cdcbc9}.wp-pointer .wp-pointer-content h3{background-color:#c7a589;border-color:#bf9878}.wp-pointer .wp-pointer-content h3:before{color:#c7a589}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow{border-bottom-color:#c7a589}.media-item .bar,.media-progress-bar div{background-color:#c7a589}.details.attachment{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 5px #c7a589;box-shadow:0 0 0 1px #fff,0 0 0 5px #c7a589}.attachment.details .check{background-color:#c7a589;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #c7a589;box-shadow:0 0 0 1px #fff,0 0 0 2px #c7a589}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme:hover:after{background:#c7a589}.theme-browser .theme.add-new-theme:hover span:after{color:#c7a589}.theme-overlay .theme-header .close:hover,.theme-overlay .theme-header .left:hover,.theme-overlay .theme-header .right:hover{background:#c7a589}.theme-filter.current,.theme-section.current{border-bottom-color:#59524c}body.more-filters-opened .more-filters,body.more-filters-opened .more-filters:before{color:#fff;background-color:#59524c}.widgets-chooser li.widgets-chooser-selected,body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover,body.more-filters-opened .more-filters:hover:before{background-color:#c7a589;color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-theme-controls .widget-area-select .selected{background-color:#c7a589;color:#fff}.wp-slider .ui-slider-handle,.wp-slider .ui-slider-handle.focus,.wp-slider .ui-slider-handle.ui-state-hover{background:#c7a589;border-color:#b78a66;-webkit-box-shadow:inset 0 1px 0 #e0cdbd,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #e0cdbd,0 1px 0 rgba(0,0,0,.15)}#sidemenu a.current{background:#f1f1f1;border-bottom-color:#f1f1f1}#plugin-information .action-button{background:#c7a589}div#wp-responsive-toggle a:before{color:#f3f2f1}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#c7a589}.star-rating .star{color:#c7a589}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#46403c} \ No newline at end of file +html{background:#f1f1f1}a{color:#0073aa}a:active,a:focus,a:hover{color:#0096dd}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,div.dashboard-widget-submit input:hover{color:#0096dd}input[type=checkbox]:checked:before{color:#59524c}input[type=radio]:checked:before{background:#59524c}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0096dd}.wp-core-ui .button-primary{background:#c7a589;border-color:#b78b66 #ae7d55 #ae7d55;color:#fff;-webkit-box-shadow:0 1px 0 #ae7d55;box-shadow:0 1px 0 #ae7d55;text-shadow:0 -1px 1px #ae7d55,-1px 0 1px #ae7d55,0 1px 1px #ae7d55,1px 0 1px #ae7d55}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#ccad93;border-color:#ae7d55;color:#fff;-webkit-box-shadow:0 1px 0 #ae7d55;box-shadow:0 1px 0 #ae7d55}.wp-core-ui .button-primary:focus{-webkit-box-shadow:inset 0 1px 0 #b78b66,0 0 2px 1px #33b3db;box-shadow:inset 0 1px 0 #b78b66,0 0 2px 1px #33b3db}.wp-core-ui .button-primary:active{background:#b78b66;border-color:#ae7d55;-webkit-box-shadow:inset 0 2px 0 #ae7d55;box-shadow:inset 0 2px 0 #ae7d55}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#d1ccc7!important;background:#ba906d!important;border-color:#ae7d55!important;text-shadow:none!important}.wp-core-ui .button-primary.button-hero{-webkit-box-shadow:0 2px 0 #ae7d55!important;box-shadow:0 2px 0 #ae7d55!important}.wp-core-ui .button-primary.button-hero:active{-webkit-box-shadow:inset 0 3px 0 #ae7d55!important;box-shadow:inset 0 3px 0 #ae7d55!important}.wp-core-ui .wp-ui-primary{color:#fff;background-color:#59524c}.wp-core-ui .wp-ui-text-primary{color:#59524c}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#c7a589}.wp-core-ui .wp-ui-text-highlight{color:#c7a589}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#9ea476}.wp-core-ui .wp-ui-text-notification{color:#9ea476}.wp-core-ui .wp-ui-text-icon{color:#f3f2f1}.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover,.wrap .page-title-action:hover{color:#fff;background-color:#59524c}.view-switch a.current:before{color:#59524c}.view-switch a:hover:before{color:#9ea476}#adminmenu,#adminmenuback,#adminmenuwrap{background:#59524c}#adminmenu a{color:#fff}#adminmenu div.wp-menu-image:before{color:#f3f2f1}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#c7a589}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#fff}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f1f1f1;border-bottom-color:#f1f1f1}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#46403c}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-left-color:#46403c}#adminmenu .wp-submenu .wp-submenu-head{color:#cdcbc9}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#cdcbc9}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#c7a589}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#c7a589}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-left-color:#f1f1f1}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#c7a589}#adminmenu a.current:hover div.wp-menu-image:before,#adminmenu li a:focus div.wp-menu-image:before,#adminmenu li.opensub div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,#adminmenu li:hover div.wp-menu-image:before,.ie8 #adminmenu li.opensub div.wp-menu-image:before{color:#fff}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#9ea476}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#fff;background:#46403c}#collapse-menu{color:#f3f2f1}#collapse-menu:hover{color:#fff}#collapse-button div:after{color:#f3f2f1}#collapse-menu:hover #collapse-button div:after{color:#fff}#wpadminbar{color:#fff;background:#59524c}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#fff}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#f3f2f1}#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus,#wpadminbar.nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li>.ab-item:focus{color:#c7a589;background:#46403c}#wpadminbar:not(.mobile)>#wp-toolbar a:focus span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li.hover span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li:hover span.ab-label{color:#c7a589}#wpadminbar:not(.mobile) li:hover #adminbarsearch:before,#wpadminbar:not(.mobile) li:hover .ab-icon:before,#wpadminbar:not(.mobile) li:hover .ab-item:after,#wpadminbar:not(.mobile) li:hover .ab-item:before{color:#fff}#wpadminbar .menupop .ab-sub-wrapper{background:#46403c}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#656463}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar.nojs .quicklinks .menupop:hover ul li a{color:#cdcbc9}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#f3f2f1}#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar li #adminbarsearch.adminbar-focused:before,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#c7a589}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a .blavatar,#wpadminbar .quicklinks li a:focus .blavatar,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar.mobile .quicklinks .ab-icon:before,#wpadminbar.mobile .quicklinks .ab-item:before{color:#c7a589}#wpadminbar.mobile .quicklinks .hover .ab-icon:before,#wpadminbar.mobile .quicklinks .hover .ab-item:before{color:#f3f2f1}#wpadminbar #adminbarsearch:before{color:#f3f2f1}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#fff;background:#6c645c}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#6c645c;background-color:#6c645c}#wpadminbar #wp-admin-bar-user-info .display-name{color:#fff}#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#c7a589}#wpadminbar #wp-admin-bar-user-info .username{color:#cdcbc9}.wp-pointer .wp-pointer-content h3{background-color:#c7a589;border-color:#bf9878}.wp-pointer .wp-pointer-content h3:before{color:#c7a589}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner{border-bottom-color:#c7a589}.media-item .bar,.media-progress-bar div{background-color:#c7a589}.details.attachment{-webkit-box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #c7a589;box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #c7a589}.attachment.details .check{background-color:#c7a589;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #c7a589;box-shadow:0 0 0 1px #fff,0 0 0 2px #c7a589}.media-selection .attachment.selection.details .thumbnail{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 3px #c7a589;box-shadow:0 0 0 1px #fff,0 0 0 3px #c7a589}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme a:focus:after,.theme-browser .theme.add-new-theme a:hover:after{background:#c7a589}.theme-browser .theme.add-new-theme a:focus span:after,.theme-browser .theme.add-new-theme a:hover span:after{color:#c7a589}.theme-filter.current,.theme-section.current{border-bottom-color:#59524c}body.more-filters-opened .more-filters{color:#fff;background-color:#59524c}#customize-theme-controls .widget-area-select .selected,.widgets-chooser li.widgets-chooser-selected{background-color:#c7a589;color:#fff}body.more-filters-opened .more-filters:before{color:#fff}body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:hover{background-color:#c7a589;color:#fff}body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover:before{color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-footer-actions .devices button:focus{border-bottom-color:#c7a589}div#wp-responsive-toggle a:before{color:#f3f2f1}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#c7a589}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#46403c}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before{color:#f3f2f1}.mce-container.mce-menu .mce-menu-item-normal.mce-active,.mce-container.mce-menu .mce-menu-item-preview.mce-active,.mce-container.mce-menu .mce-menu-item.mce-selected,.mce-container.mce-menu .mce-menu-item:focus,.mce-container.mce-menu .mce-menu-item:hover{background:#c7a589} \ No newline at end of file diff --git a/wp-admin/css/colors/coffee/colors.css b/wp-admin/css/colors/coffee/colors.css index 281a17e..7f3a63d 100644 --- a/wp-admin/css/colors/coffee/colors.css +++ b/wp-admin/css/colors/coffee/colors.css @@ -3,329 +3,524 @@ * highlights/shadows, based on a base color. */ html { - background: #f1f1f1; } + background: #f1f1f1; +} /* Links */ a { - color: #0074a2; } - a:hover, a:active, a:focus { - color: #0099d5; } + color: #0073aa; +} + +a:hover, a:active, a:focus { + color: #0096dd; +} -#media-upload a.del-link:hover, div.dashboard-widget-submit input:hover, .subsubsub a:hover, .subsubsub a.current:hover { - color: #0099d5; } +#media-upload a.del-link:hover, +div.dashboard-widget-submit input:hover, +.subsubsub a:hover, +.subsubsub a.current:hover { + color: #0096dd; +} /* Forms */ input[type=checkbox]:checked:before { - color: #59524c; } + color: #59524c; +} input[type=radio]:checked:before { - background: #59524c; } + background: #59524c; +} -.wp-core-ui input[type="reset"]:hover, .wp-core-ui input[type="reset"]:active { - color: #0099d5; } +.wp-core-ui input[type="reset"]:hover, +.wp-core-ui input[type="reset"]:active { + color: #0096dd; +} /* Core UI */ .wp-core-ui .button-primary { background: #c7a589; - border-color: #b78a66; + border-color: #b78b66 #ae7d55 #ae7d55; + color: white; + -webkit-box-shadow: 0 1px 0 #ae7d55; + box-shadow: 0 1px 0 #ae7d55; + text-shadow: 0 -1px 1px #ae7d55, 1px 0 1px #ae7d55, 0 1px 1px #ae7d55, -1px 0 1px #ae7d55; +} + +.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { + background: #ccad93; + border-color: #ae7d55; color: white; - -webkit-box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { - background: #bf9878; - border-color: #ae7d55; - color: white; - -webkit-box-shadow: inset 0 1px 0 #d7bfac, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #d7bfac, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:active { - background: #b78a66; - border-color: #ae7d55; - color: white; - -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); - box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); } - .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { - color: #d1cbc7 !important; - background: #ba906d !important; - border-color: #ae7d55 !important; - text-shadow: none !important; } + -webkit-box-shadow: 0 1px 0 #ae7d55; + box-shadow: 0 1px 0 #ae7d55; +} + +.wp-core-ui .button-primary:focus { + -webkit-box-shadow: inset 0 1px 0 #b78b66, 0 0 2px 1px #33b3db; + box-shadow: inset 0 1px 0 #b78b66, 0 0 2px 1px #33b3db; +} + +.wp-core-ui .button-primary:active { + background: #b78b66; + border-color: #ae7d55; + -webkit-box-shadow: inset 0 2px 0 #ae7d55; + box-shadow: inset 0 2px 0 #ae7d55; +} + +.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { + color: #d1ccc7 !important; + background: #ba906d !important; + border-color: #ae7d55 !important; + text-shadow: none !important; +} + +.wp-core-ui .button-primary.button-hero { + -webkit-box-shadow: 0 2px 0 #ae7d55 !important; + box-shadow: 0 2px 0 #ae7d55 !important; +} + +.wp-core-ui .button-primary.button-hero:active { + -webkit-box-shadow: inset 0 3px 0 #ae7d55 !important; + box-shadow: inset 0 3px 0 #ae7d55 !important; +} + .wp-core-ui .wp-ui-primary { color: #fff; - background-color: #59524c; } + background-color: #59524c; +} + .wp-core-ui .wp-ui-text-primary { - color: #59524c; } + color: #59524c; +} + .wp-core-ui .wp-ui-highlight { color: #fff; - background-color: #c7a589; } + background-color: #c7a589; +} + .wp-core-ui .wp-ui-text-highlight { - color: #c7a589; } + color: #c7a589; +} + .wp-core-ui .wp-ui-notification { color: #fff; - background-color: #9ea476; } + background-color: #9ea476; +} + .wp-core-ui .wp-ui-text-notification { - color: #9ea476; } + color: #9ea476; +} + .wp-core-ui .wp-ui-text-icon { - color: #f3f2f1; } + color: #f3f2f1; +} /* List tables */ -.wrap .add-new-h2:hover, #add-new-comment a:hover, .tablenav .tablenav-pages a:hover, .tablenav .tablenav-pages a:focus { +.wrap .add-new-h2:hover, +.wrap .page-title-action:hover, +.tablenav .tablenav-pages a:hover, +.tablenav .tablenav-pages a:focus { color: #fff; - background-color: #59524c; } + background-color: #59524c; +} .view-switch a.current:before { - color: #59524c; } + color: #59524c; +} .view-switch a:hover:before { - color: #9ea476; } - -.post-com-count:hover:after { - border-top-color: #59524c; } - -.post-com-count:hover span { - color: #fff; - background-color: #59524c; } - -strong .post-com-count:after { - border-top-color: #9ea476; } - -strong .post-com-count span { - background-color: #9ea476; } + color: #9ea476; +} /* Admin Menu */ -#adminmenuback, #adminmenuwrap, #adminmenu { - background: #59524c; } +#adminmenuback, +#adminmenuwrap, +#adminmenu { + background: #59524c; +} #adminmenu a { - color: #fff; } + color: #fff; +} #adminmenu div.wp-menu-image:before { - color: #f3f2f1; } + color: #f3f2f1; +} -#adminmenu a:hover, #adminmenu li.menu-top:hover, #adminmenu li.opensub > a.menu-top, #adminmenu li > a.menu-top:focus { +#adminmenu a:hover, +#adminmenu li.menu-top:hover, +#adminmenu li.opensub > a.menu-top, +#adminmenu li > a.menu-top:focus { color: #fff; - background-color: #c7a589; } + background-color: #c7a589; +} -#adminmenu li.menu-top:hover div.wp-menu-image:before, #adminmenu li.opensub > a.menu-top div.wp-menu-image:before { - color: #fff; } +#adminmenu li.menu-top:hover div.wp-menu-image:before, +#adminmenu li.opensub > a.menu-top div.wp-menu-image:before { + color: #fff; +} /* Active tabs use a bottom border color that matches the page background color. */ -.about-wrap h2 .nav-tab-active, .nav-tab-active, .nav-tab-active:hover { +.about-wrap h2 .nav-tab-active, +.nav-tab-active, +.nav-tab-active:hover { background-color: #f1f1f1; - border-bottom-color: #f1f1f1; } + border-bottom-color: #f1f1f1; +} /* Admin Menu: submenu */ -#adminmenu .wp-submenu, #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu .wp-has-current-submenu.opensub .wp-submenu, .folded #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu { - background: #46403c; } +#adminmenu .wp-submenu, +#adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu, +.folded #adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu { + background: #46403c; +} #adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after { - border-right-color: #46403c; } + border-right-color: #46403c; +} #adminmenu .wp-submenu .wp-submenu-head { - color: #cdcbc9; } - -#adminmenu .wp-submenu a, #adminmenu .wp-has-current-submenu .wp-submenu a, .folded #adminmenu .wp-has-current-submenu .wp-submenu a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a { - color: #cdcbc9; } - #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, #adminmenu .wp-has-current-submenu .wp-submenu a:focus, #adminmenu .wp-has-current-submenu .wp-submenu a:hover, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { - color: #c7a589; } + color: #cdcbc9; +} + +#adminmenu .wp-submenu a, +#adminmenu .wp-has-current-submenu .wp-submenu a, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a { + color: #cdcbc9; +} + +#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu .wp-submenu a:hover, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { + color: #c7a589; +} /* Admin Menu: current */ -#adminmenu .wp-submenu li.current a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { - color: #fff; } - #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { - color: #c7a589; } +#adminmenu .wp-submenu li.current a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { + color: #fff; +} -ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.current:after { - border-right-color: #f1f1f1; } +#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { + color: #c7a589; +} -#adminmenu li.current a.menu-top, #adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, #adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, .folded #adminmenu li.current.menu-top { - color: #fff; - background: #c7a589; } +ul#adminmenu a.wp-has-current-submenu:after, +ul#adminmenu > li.current > a.current:after { + border-right-color: #f1f1f1; +} -#adminmenu li.wp-has-current-submenu div.wp-menu-image:before { - color: #fff; } +#adminmenu li.current a.menu-top, +#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, +#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, +.folded #adminmenu li.current.menu-top { + color: #fff; + background: #c7a589; +} + +#adminmenu li.wp-has-current-submenu div.wp-menu-image:before, +#adminmenu a.current:hover div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before, +#adminmenu li:hover div.wp-menu-image:before, +#adminmenu li a:focus div.wp-menu-image:before, +#adminmenu li.opensub div.wp-menu-image:before, +.ie8 #adminmenu li.opensub div.wp-menu-image:before { + color: #fff; +} /* Admin Menu: bubble */ -#adminmenu .awaiting-mod, #adminmenu .update-plugins { +#adminmenu .awaiting-mod, +#adminmenu .update-plugins { color: #fff; - background: #9ea476; } + background: #9ea476; +} -#adminmenu li.current a .awaiting-mod, #adminmenu li a.wp-has-current-submenu .update-plugins, #adminmenu li:hover a .awaiting-mod, #adminmenu li.menu-top:hover > a .update-plugins { +#adminmenu li.current a .awaiting-mod, +#adminmenu li a.wp-has-current-submenu .update-plugins, +#adminmenu li:hover a .awaiting-mod, +#adminmenu li.menu-top:hover > a .update-plugins { color: #fff; - background: #46403c; } + background: #46403c; +} /* Admin Menu: collapse button */ #collapse-menu { - color: #f3f2f1; } + color: #f3f2f1; +} #collapse-menu:hover { - color: #fff; } + color: #fff; +} #collapse-button div:after { - color: #f3f2f1; } + color: #f3f2f1; +} #collapse-menu:hover #collapse-button div:after { - color: #fff; } + color: #fff; +} /* Admin Bar */ #wpadminbar { color: #fff; - background: #59524c; } - -#wpadminbar .ab-item, #wpadminbar a.ab-item, #wpadminbar > #wp-toolbar span.ab-label, #wpadminbar > #wp-toolbar span.noticon { - color: #fff; } - -#wpadminbar .ab-icon, #wpadminbar .ab-icon:before, #wpadminbar .ab-item:before, #wpadminbar .ab-item:after { - color: #f3f2f1; } + background: #59524c; +} -#wpadminbar .ab-top-menu > li:hover > .ab-item, #wpadminbar .ab-top-menu > li.hover > .ab-item, #wpadminbar .ab-top-menu > li > .ab-item:focus, #wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, #wpadminbar-nojs .ab-top-menu > li.menupop:hover > .ab-item, #wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { +#wpadminbar .ab-item, +#wpadminbar a.ab-item, +#wpadminbar > #wp-toolbar span.ab-label, +#wpadminbar > #wp-toolbar span.noticon { + color: #fff; +} + +#wpadminbar .ab-icon, +#wpadminbar .ab-icon:before, +#wpadminbar .ab-item:before, +#wpadminbar .ab-item:after { + color: #f3f2f1; +} + +#wpadminbar:not(.mobile) .ab-top-menu > li:hover > .ab-item, +#wpadminbar:not(.mobile) .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojs .ab-top-menu > li.menupop:hover > .ab-item, +#wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { color: #c7a589; - background: #46403c; } + background: #46403c; +} -#wpadminbar > #wp-toolbar li:hover span.ab-label, #wpadminbar > #wp-toolbar li.hover span.ab-label, #wpadminbar > #wp-toolbar a:focus span.ab-label { - color: #c7a589; } +#wpadminbar:not(.mobile) > #wp-toolbar li:hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar li.hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar a:focus span.ab-label { + color: #c7a589; +} -#wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #fff; } +#wpadminbar:not(.mobile) li:hover .ab-icon:before, +#wpadminbar:not(.mobile) li:hover .ab-item:before, +#wpadminbar:not(.mobile) li:hover .ab-item:after, +#wpadminbar:not(.mobile) li:hover #adminbarsearch:before { + color: #fff; +} /* Admin Bar: submenu */ #wpadminbar .menupop .ab-sub-wrapper { - background: #46403c; } - -#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, #wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { - background: #656463; } - -#wpadminbar .ab-submenu .ab-item, #wpadminbar .quicklinks .menupop ul li a, #wpadminbar .quicklinks .menupop.hover ul li a, #wpadminbar-nojs .quicklinks .menupop:hover ul li a { - color: #cdcbc9; } - -#wpadminbar .quicklinks li .blavatar, #wpadminbar .menupop .menupop > .ab-item:before { - color: #f3f2f1; } - -#wpadminbar .quicklinks .menupop ul li a:hover, #wpadminbar .quicklinks .menupop ul li a:focus, #wpadminbar .quicklinks .menupop ul li a:hover strong, #wpadminbar .quicklinks .menupop ul li a:focus strong, #wpadminbar .quicklinks .menupop.hover ul li a:hover, #wpadminbar .quicklinks .menupop.hover ul li a:focus, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, #wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li a:focus .ab-icon:before, #wpadminbar li .ab-item:focus:before, #wpadminbar li.hover .ab-icon:before, #wpadminbar li.hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li.hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #c7a589; } + background: #46403c; +} + +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { + background: #656463; +} + +#wpadminbar .ab-submenu .ab-item, +#wpadminbar .quicklinks .menupop ul li a, +#wpadminbar .quicklinks .menupop.hover ul li a, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a { + color: #cdcbc9; +} + +#wpadminbar .quicklinks li .blavatar, +#wpadminbar .menupop .menupop > .ab-item:before { + color: #f3f2f1; +} + +#wpadminbar .quicklinks .menupop ul li a:hover, +#wpadminbar .quicklinks .menupop ul li a:focus, +#wpadminbar .quicklinks .menupop ul li a:hover strong, +#wpadminbar .quicklinks .menupop ul li a:focus strong, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a, +#wpadminbar .quicklinks .menupop.hover ul li a:hover, +#wpadminbar .quicklinks .menupop.hover ul li a:focus, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, +#wpadminbar li:hover .ab-icon:before, +#wpadminbar li:hover .ab-item:before, +#wpadminbar li a:focus .ab-icon:before, +#wpadminbar li .ab-item:focus:before, +#wpadminbar li.hover .ab-icon:before, +#wpadminbar li.hover .ab-item:before, +#wpadminbar li:hover #adminbarsearch:before, +#wpadminbar li #adminbarsearch.adminbar-focused:before { + color: #c7a589; +} + +#wpadminbar .quicklinks li a:hover .blavatar, +#wpadminbar .quicklinks li a:focus .blavatar, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar, +#wpadminbar .menupop .menupop > .ab-item:hover:before, +#wpadminbar.mobile .quicklinks .ab-icon:before, +#wpadminbar.mobile .quicklinks .ab-item:before { + color: #c7a589; +} -#wpadminbar .quicklinks li a:hover .blavatar, #wpadminbar .menupop .menupop > .ab-item:hover:before { - color: #c7a589; } +#wpadminbar.mobile .quicklinks .hover .ab-icon:before, +#wpadminbar.mobile .quicklinks .hover .ab-item:before { + color: #f3f2f1; +} /* Admin Bar: search */ #wpadminbar #adminbarsearch:before { - color: #f3f2f1; } + color: #f3f2f1; +} #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus { color: #fff; - background: #6c645c; } - -#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder { - color: #fff; - opacity: 0.7; } + background: #6c645c; +} /* Admin Bar: my account */ #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { border-color: #6c645c; - background-color: #6c645c; } + background-color: #6c645c; +} #wpadminbar #wp-admin-bar-user-info .display-name { - color: #fff; } + color: #fff; +} #wpadminbar #wp-admin-bar-user-info a:hover .display-name { - color: #c7a589; } + color: #c7a589; +} #wpadminbar #wp-admin-bar-user-info .username { - color: #cdcbc9; } + color: #cdcbc9; +} /* Pointers */ .wp-pointer .wp-pointer-content h3 { background-color: #c7a589; - border-color: #bf9878; } + border-color: #bf9878; +} .wp-pointer .wp-pointer-content h3:before { - color: #c7a589; } - -.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow { - border-bottom-color: #c7a589; } - -/* Media Uploader */ -.media-item .bar, .media-progress-bar div { - background-color: #c7a589; } + color: #c7a589; +} + +.wp-pointer.wp-pointer-top .wp-pointer-arrow, +.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner { + border-bottom-color: #c7a589; +} + +/* Media */ +.media-item .bar, +.media-progress-bar div { + background-color: #c7a589; +} .details.attachment { - -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #c7a589; - box-shadow: 0 0 0 1px #fff, 0 0 0 5px #c7a589; } + -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #c7a589; + box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #c7a589; +} .attachment.details .check { background-color: #c7a589; -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #c7a589; - box-shadow: 0 0 0 1px #fff, 0 0 0 2px #c7a589; } + box-shadow: 0 0 0 1px #fff, 0 0 0 2px #c7a589; +} + +.media-selection .attachment.selection.details .thumbnail { + -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #c7a589; + box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #c7a589; +} /* Themes */ -.theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after { - background: #c7a589; } +.theme-browser .theme.active .theme-name, +.theme-browser .theme.add-new-theme a:hover:after, +.theme-browser .theme.add-new-theme a:focus:after { + background: #c7a589; +} -.theme-browser .theme.add-new-theme:hover span:after { - color: #c7a589; } +.theme-browser .theme.add-new-theme a:hover span:after, +.theme-browser .theme.add-new-theme a:focus span:after { + color: #c7a589; +} -.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover { - background: #c7a589; } +.theme-section.current, +.theme-filter.current { + border-bottom-color: #59524c; +} -.theme-section.current, .theme-filter.current { - border-bottom-color: #59524c; } +body.more-filters-opened .more-filters { + color: #fff; + background-color: #59524c; +} -body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before { +body.more-filters-opened .more-filters:before { color: #fff; - background-color: #59524c; } +} -body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before { +body.more-filters-opened .more-filters:hover, +body.more-filters-opened .more-filters:focus { background-color: #c7a589; - color: #fff; } + color: #fff; +} + +body.more-filters-opened .more-filters:hover:before, +body.more-filters-opened .more-filters:focus:before { + color: #fff; +} /* Widgets */ .widgets-chooser li.widgets-chooser-selected { background-color: #c7a589; - color: #fff; } + color: #fff; +} -.widgets-chooser li.widgets-chooser-selected:before, .widgets-chooser li.widgets-chooser-selected:focus:before { - color: #fff; } +.widgets-chooser li.widgets-chooser-selected:before, +.widgets-chooser li.widgets-chooser-selected:focus:before { + color: #fff; +} /* Customize */ #customize-theme-controls .widget-area-select .selected { background-color: #c7a589; - color: #fff; } - -/* jQuery UI Slider */ -.wp-slider .ui-slider-handle, .wp-slider .ui-slider-handle.ui-state-hover, .wp-slider .ui-slider-handle.focus { - background: #c7a589; - border-color: #b78a66; - -webkit-box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15); } - -/* Thickbox: Plugin information */ -#sidemenu a.current { - background: #f1f1f1; - border-bottom-color: #f1f1f1; } + color: #fff; +} -#plugin-information .action-button { - background: #c7a589; } +#customize-footer-actions .devices button:focus { + border-bottom-color: #c7a589; +} /* Responsive Component */ div#wp-responsive-toggle a:before { - color: #f3f2f1; } + color: #f3f2f1; +} .wp-responsive-open div#wp-responsive-toggle a { border-color: transparent; - background: #c7a589; } - -.star-rating .star { - color: #c7a589; } + background: #c7a589; +} .wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a { - background: #46403c; } + background: #46403c; +} + +.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before { + color: #f3f2f1; +} + +/* TinyMCE */ +.mce-container.mce-menu .mce-menu-item:hover, +.mce-container.mce-menu .mce-menu-item.mce-selected, +.mce-container.mce-menu .mce-menu-item:focus, +.mce-container.mce-menu .mce-menu-item-normal.mce-active, +.mce-container.mce-menu .mce-menu-item-preview.mce-active { + background: #c7a589; +} diff --git a/wp-admin/css/colors/coffee/colors.min.css b/wp-admin/css/colors/coffee/colors.min.css index bd3ef54..9770f53 100644 --- a/wp-admin/css/colors/coffee/colors.min.css +++ b/wp-admin/css/colors/coffee/colors.min.css @@ -1 +1 @@ -html{background:#f1f1f1}a{color:#0074a2}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,a:active,a:focus,a:hover,div.dashboard-widget-submit input:hover{color:#0099d5}input[type=checkbox]:checked:before{color:#59524c}input[type=radio]:checked:before{background:#59524c}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0099d5}.wp-core-ui .button-primary{background:#c7a589;border-color:#b78a66;color:#fff;-webkit-box-shadow:inset 0 1px 0 #e0cdbd,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #e0cdbd,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#bf9878;border-color:#ae7d55;color:#fff;-webkit-box-shadow:inset 0 1px 0 #d7bfac,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #d7bfac,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:active{background:#b78a66;border-color:#ae7d55;color:#fff;-webkit-box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5);box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5)}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#d1cbc7!important;background:#ba906d!important;border-color:#ae7d55!important;text-shadow:none!important}.wp-core-ui .wp-ui-primary{color:#fff;background-color:#59524c}.wp-core-ui .wp-ui-text-primary{color:#59524c}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#c7a589}.wp-core-ui .wp-ui-text-highlight{color:#c7a589}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#9ea476}.wp-core-ui .wp-ui-text-notification{color:#9ea476}.wp-core-ui .wp-ui-text-icon{color:#f3f2f1}#add-new-comment a:hover,.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover{color:#fff;background-color:#59524c}.view-switch a.current:before{color:#59524c}.view-switch a:hover:before{color:#9ea476}.post-com-count:hover:after{border-top-color:#59524c}.post-com-count:hover span{color:#fff;background-color:#59524c}strong .post-com-count:after{border-top-color:#9ea476}strong .post-com-count span{background-color:#9ea476}#adminmenu,#adminmenuback,#adminmenuwrap{background:#59524c}#adminmenu a{color:#fff}#adminmenu div.wp-menu-image:before{color:#f3f2f1}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#c7a589}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#fff}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f1f1f1;border-bottom-color:#f1f1f1}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#46403c}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-right-color:#46403c}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu .wp-submenu-head,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#cdcbc9}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#c7a589}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#c7a589}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-right-color:#f1f1f1}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#c7a589}#adminmenu li.wp-has-current-submenu div.wp-menu-image:before{color:#fff}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#9ea476}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#fff;background:#46403c}#collapse-menu{color:#f3f2f1}#collapse-menu:hover{color:#fff}#collapse-button div:after{color:#f3f2f1}#collapse-menu:hover #collapse-button div:after{color:#fff}#wpadminbar{color:#fff;background:#59524c}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#fff}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#f3f2f1}#wpadminbar .ab-top-menu>li.hover>.ab-item,#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar .ab-top-menu>li:hover>.ab-item,#wpadminbar .ab-top-menu>li>.ab-item:focus,#wpadminbar-nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus{color:#c7a589;background:#46403c}#wpadminbar>#wp-toolbar a:focus span.ab-label,#wpadminbar>#wp-toolbar li.hover span.ab-label,#wpadminbar>#wp-toolbar li:hover span.ab-label{color:#c7a589}#wpadminbar .menupop .ab-sub-wrapper{background:#46403c}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#656463}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar-nojs .quicklinks .menupop:hover ul li a{color:#cdcbc9}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#f3f2f1}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:after,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:after,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#c7a589}#wpadminbar #adminbarsearch:before{color:#f3f2f1}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#fff;background:#6c645c}#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder{color:#fff;opacity:.7}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#6c645c;background-color:#6c645c}#wpadminbar #wp-admin-bar-user-info .display-name{color:#fff}#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#c7a589}#wpadminbar #wp-admin-bar-user-info .username{color:#cdcbc9}.wp-pointer .wp-pointer-content h3{background-color:#c7a589;border-color:#bf9878}.wp-pointer .wp-pointer-content h3:before{color:#c7a589}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow{border-bottom-color:#c7a589}.media-item .bar,.media-progress-bar div{background-color:#c7a589}.details.attachment{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 5px #c7a589;box-shadow:0 0 0 1px #fff,0 0 0 5px #c7a589}.attachment.details .check{background-color:#c7a589;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #c7a589;box-shadow:0 0 0 1px #fff,0 0 0 2px #c7a589}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme:hover:after{background:#c7a589}.theme-browser .theme.add-new-theme:hover span:after{color:#c7a589}.theme-overlay .theme-header .close:hover,.theme-overlay .theme-header .left:hover,.theme-overlay .theme-header .right:hover{background:#c7a589}.theme-filter.current,.theme-section.current{border-bottom-color:#59524c}body.more-filters-opened .more-filters,body.more-filters-opened .more-filters:before{color:#fff;background-color:#59524c}.widgets-chooser li.widgets-chooser-selected,body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover,body.more-filters-opened .more-filters:hover:before{background-color:#c7a589;color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-theme-controls .widget-area-select .selected{background-color:#c7a589;color:#fff}.wp-slider .ui-slider-handle,.wp-slider .ui-slider-handle.focus,.wp-slider .ui-slider-handle.ui-state-hover{background:#c7a589;border-color:#b78a66;-webkit-box-shadow:inset 0 1px 0 #e0cdbd,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #e0cdbd,0 1px 0 rgba(0,0,0,.15)}#sidemenu a.current{background:#f1f1f1;border-bottom-color:#f1f1f1}#plugin-information .action-button{background:#c7a589}div#wp-responsive-toggle a:before{color:#f3f2f1}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#c7a589}.star-rating .star{color:#c7a589}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#46403c} \ No newline at end of file +html{background:#f1f1f1}a{color:#0073aa}a:active,a:focus,a:hover{color:#0096dd}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,div.dashboard-widget-submit input:hover{color:#0096dd}input[type=checkbox]:checked:before{color:#59524c}input[type=radio]:checked:before{background:#59524c}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0096dd}.wp-core-ui .button-primary{background:#c7a589;border-color:#b78b66 #ae7d55 #ae7d55;color:#fff;-webkit-box-shadow:0 1px 0 #ae7d55;box-shadow:0 1px 0 #ae7d55;text-shadow:0 -1px 1px #ae7d55,1px 0 1px #ae7d55,0 1px 1px #ae7d55,-1px 0 1px #ae7d55}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#ccad93;border-color:#ae7d55;color:#fff;-webkit-box-shadow:0 1px 0 #ae7d55;box-shadow:0 1px 0 #ae7d55}.wp-core-ui .button-primary:focus{-webkit-box-shadow:inset 0 1px 0 #b78b66,0 0 2px 1px #33b3db;box-shadow:inset 0 1px 0 #b78b66,0 0 2px 1px #33b3db}.wp-core-ui .button-primary:active{background:#b78b66;border-color:#ae7d55;-webkit-box-shadow:inset 0 2px 0 #ae7d55;box-shadow:inset 0 2px 0 #ae7d55}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#d1ccc7!important;background:#ba906d!important;border-color:#ae7d55!important;text-shadow:none!important}.wp-core-ui .button-primary.button-hero{-webkit-box-shadow:0 2px 0 #ae7d55!important;box-shadow:0 2px 0 #ae7d55!important}.wp-core-ui .button-primary.button-hero:active{-webkit-box-shadow:inset 0 3px 0 #ae7d55!important;box-shadow:inset 0 3px 0 #ae7d55!important}.wp-core-ui .wp-ui-primary{color:#fff;background-color:#59524c}.wp-core-ui .wp-ui-text-primary{color:#59524c}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#c7a589}.wp-core-ui .wp-ui-text-highlight{color:#c7a589}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#9ea476}.wp-core-ui .wp-ui-text-notification{color:#9ea476}.wp-core-ui .wp-ui-text-icon{color:#f3f2f1}.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover,.wrap .page-title-action:hover{color:#fff;background-color:#59524c}.view-switch a.current:before{color:#59524c}.view-switch a:hover:before{color:#9ea476}#adminmenu,#adminmenuback,#adminmenuwrap{background:#59524c}#adminmenu a{color:#fff}#adminmenu div.wp-menu-image:before{color:#f3f2f1}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#c7a589}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#fff}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f1f1f1;border-bottom-color:#f1f1f1}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#46403c}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-right-color:#46403c}#adminmenu .wp-submenu .wp-submenu-head{color:#cdcbc9}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#cdcbc9}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#c7a589}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#c7a589}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-right-color:#f1f1f1}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#c7a589}#adminmenu a.current:hover div.wp-menu-image:before,#adminmenu li a:focus div.wp-menu-image:before,#adminmenu li.opensub div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,#adminmenu li:hover div.wp-menu-image:before,.ie8 #adminmenu li.opensub div.wp-menu-image:before{color:#fff}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#9ea476}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#fff;background:#46403c}#collapse-menu{color:#f3f2f1}#collapse-menu:hover{color:#fff}#collapse-button div:after{color:#f3f2f1}#collapse-menu:hover #collapse-button div:after{color:#fff}#wpadminbar{color:#fff;background:#59524c}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#fff}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#f3f2f1}#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus,#wpadminbar.nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li>.ab-item:focus{color:#c7a589;background:#46403c}#wpadminbar:not(.mobile)>#wp-toolbar a:focus span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li.hover span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li:hover span.ab-label{color:#c7a589}#wpadminbar:not(.mobile) li:hover #adminbarsearch:before,#wpadminbar:not(.mobile) li:hover .ab-icon:before,#wpadminbar:not(.mobile) li:hover .ab-item:after,#wpadminbar:not(.mobile) li:hover .ab-item:before{color:#fff}#wpadminbar .menupop .ab-sub-wrapper{background:#46403c}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#656463}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar.nojs .quicklinks .menupop:hover ul li a{color:#cdcbc9}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#f3f2f1}#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar li #adminbarsearch.adminbar-focused:before,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#c7a589}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a .blavatar,#wpadminbar .quicklinks li a:focus .blavatar,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar.mobile .quicklinks .ab-icon:before,#wpadminbar.mobile .quicklinks .ab-item:before{color:#c7a589}#wpadminbar.mobile .quicklinks .hover .ab-icon:before,#wpadminbar.mobile .quicklinks .hover .ab-item:before{color:#f3f2f1}#wpadminbar #adminbarsearch:before{color:#f3f2f1}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#fff;background:#6c645c}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#6c645c;background-color:#6c645c}#wpadminbar #wp-admin-bar-user-info .display-name{color:#fff}#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#c7a589}#wpadminbar #wp-admin-bar-user-info .username{color:#cdcbc9}.wp-pointer .wp-pointer-content h3{background-color:#c7a589;border-color:#bf9878}.wp-pointer .wp-pointer-content h3:before{color:#c7a589}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner{border-bottom-color:#c7a589}.media-item .bar,.media-progress-bar div{background-color:#c7a589}.details.attachment{-webkit-box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #c7a589;box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #c7a589}.attachment.details .check{background-color:#c7a589;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #c7a589;box-shadow:0 0 0 1px #fff,0 0 0 2px #c7a589}.media-selection .attachment.selection.details .thumbnail{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 3px #c7a589;box-shadow:0 0 0 1px #fff,0 0 0 3px #c7a589}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme a:focus:after,.theme-browser .theme.add-new-theme a:hover:after{background:#c7a589}.theme-browser .theme.add-new-theme a:focus span:after,.theme-browser .theme.add-new-theme a:hover span:after{color:#c7a589}.theme-filter.current,.theme-section.current{border-bottom-color:#59524c}body.more-filters-opened .more-filters{color:#fff;background-color:#59524c}#customize-theme-controls .widget-area-select .selected,.widgets-chooser li.widgets-chooser-selected{background-color:#c7a589;color:#fff}body.more-filters-opened .more-filters:before{color:#fff}body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:hover{background-color:#c7a589;color:#fff}body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover:before{color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-footer-actions .devices button:focus{border-bottom-color:#c7a589}div#wp-responsive-toggle a:before{color:#f3f2f1}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#c7a589}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#46403c}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before{color:#f3f2f1}.mce-container.mce-menu .mce-menu-item-normal.mce-active,.mce-container.mce-menu .mce-menu-item-preview.mce-active,.mce-container.mce-menu .mce-menu-item.mce-selected,.mce-container.mce-menu .mce-menu-item:focus,.mce-container.mce-menu .mce-menu-item:hover{background:#c7a589} \ No newline at end of file diff --git a/wp-admin/css/colors/ectoplasm/colors-rtl.css b/wp-admin/css/colors/ectoplasm/colors-rtl.css index 73eb510..17d5a42 100644 --- a/wp-admin/css/colors/ectoplasm/colors-rtl.css +++ b/wp-admin/css/colors/ectoplasm/colors-rtl.css @@ -3,329 +3,524 @@ * highlights/shadows, based on a base color. */ html { - background: #f1f1f1; } + background: #f1f1f1; +} /* Links */ a { - color: #0074a2; } - a:hover, a:active, a:focus { - color: #0099d5; } + color: #0073aa; +} + +a:hover, a:active, a:focus { + color: #0096dd; +} -#media-upload a.del-link:hover, div.dashboard-widget-submit input:hover, .subsubsub a:hover, .subsubsub a.current:hover { - color: #0099d5; } +#media-upload a.del-link:hover, +div.dashboard-widget-submit input:hover, +.subsubsub a:hover, +.subsubsub a.current:hover { + color: #0096dd; +} /* Forms */ input[type=checkbox]:checked:before { - color: #523f6d; } + color: #523f6d; +} input[type=radio]:checked:before { - background: #523f6d; } + background: #523f6d; +} -.wp-core-ui input[type="reset"]:hover, .wp-core-ui input[type="reset"]:active { - color: #0099d5; } +.wp-core-ui input[type="reset"]:hover, +.wp-core-ui input[type="reset"]:active { + color: #0096dd; +} /* Core UI */ .wp-core-ui .button-primary { background: #a3b745; - border-color: #839237; + border-color: #829237 #727f30 #727f30; + color: white; + -webkit-box-shadow: 0 1px 0 #727f30; + box-shadow: 0 1px 0 #727f30; + text-shadow: 0 -1px 1px #727f30, -1px 0 1px #727f30, 0 1px 1px #727f30, 1px 0 1px #727f30; +} + +.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { + background: #a9bd4f; + border-color: #727f30; color: white; - -webkit-box-shadow: inset 0 1px 0 #c0cd7b, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #c0cd7b, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { - background: #93a43e; - border-color: #727f30; - color: white; - -webkit-box-shadow: inset 0 1px 0 #b7c669, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #b7c669, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:active { - background: #839237; - border-color: #727f30; - color: white; - -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); - box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); } - .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { - color: #cfd1c7 !important; - background: #89993a !important; - border-color: #727f30 !important; - text-shadow: none !important; } + -webkit-box-shadow: 0 1px 0 #727f30; + box-shadow: 0 1px 0 #727f30; +} + +.wp-core-ui .button-primary:focus { + -webkit-box-shadow: inset 0 1px 0 #829237, 0 0 2px 1px #33b3db; + box-shadow: inset 0 1px 0 #829237, 0 0 2px 1px #33b3db; +} + +.wp-core-ui .button-primary:active { + background: #829237; + border-color: #727f30; + -webkit-box-shadow: inset 0 2px 0 #727f30; + box-shadow: inset 0 2px 0 #727f30; +} + +.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { + color: #cfd1c7 !important; + background: #89993a !important; + border-color: #727f30 !important; + text-shadow: none !important; +} + +.wp-core-ui .button-primary.button-hero { + -webkit-box-shadow: 0 2px 0 #727f30 !important; + box-shadow: 0 2px 0 #727f30 !important; +} + +.wp-core-ui .button-primary.button-hero:active { + -webkit-box-shadow: inset 0 3px 0 #727f30 !important; + box-shadow: inset 0 3px 0 #727f30 !important; +} + .wp-core-ui .wp-ui-primary { color: #fff; - background-color: #523f6d; } + background-color: #523f6d; +} + .wp-core-ui .wp-ui-text-primary { - color: #523f6d; } + color: #523f6d; +} + .wp-core-ui .wp-ui-highlight { color: #fff; - background-color: #a3b745; } + background-color: #a3b745; +} + .wp-core-ui .wp-ui-text-highlight { - color: #a3b745; } + color: #a3b745; +} + .wp-core-ui .wp-ui-notification { color: #fff; - background-color: #d46f15; } + background-color: #d46f15; +} + .wp-core-ui .wp-ui-text-notification { - color: #d46f15; } + color: #d46f15; +} + .wp-core-ui .wp-ui-text-icon { - color: #ece6f6; } + color: #ece6f6; +} /* List tables */ -.wrap .add-new-h2:hover, #add-new-comment a:hover, .tablenav .tablenav-pages a:hover, .tablenav .tablenav-pages a:focus { +.wrap .add-new-h2:hover, +.wrap .page-title-action:hover, +.tablenav .tablenav-pages a:hover, +.tablenav .tablenav-pages a:focus { color: #fff; - background-color: #523f6d; } + background-color: #523f6d; +} .view-switch a.current:before { - color: #523f6d; } + color: #523f6d; +} .view-switch a:hover:before { - color: #d46f15; } - -.post-com-count:hover:after { - border-top-color: #523f6d; } - -.post-com-count:hover span { - color: #fff; - background-color: #523f6d; } - -strong .post-com-count:after { - border-top-color: #d46f15; } - -strong .post-com-count span { - background-color: #d46f15; } + color: #d46f15; +} /* Admin Menu */ -#adminmenuback, #adminmenuwrap, #adminmenu { - background: #523f6d; } +#adminmenuback, +#adminmenuwrap, +#adminmenu { + background: #523f6d; +} #adminmenu a { - color: #fff; } + color: #fff; +} #adminmenu div.wp-menu-image:before { - color: #ece6f6; } + color: #ece6f6; +} -#adminmenu a:hover, #adminmenu li.menu-top:hover, #adminmenu li.opensub > a.menu-top, #adminmenu li > a.menu-top:focus { +#adminmenu a:hover, +#adminmenu li.menu-top:hover, +#adminmenu li.opensub > a.menu-top, +#adminmenu li > a.menu-top:focus { color: #fff; - background-color: #a3b745; } + background-color: #a3b745; +} -#adminmenu li.menu-top:hover div.wp-menu-image:before, #adminmenu li.opensub > a.menu-top div.wp-menu-image:before { - color: #fff; } +#adminmenu li.menu-top:hover div.wp-menu-image:before, +#adminmenu li.opensub > a.menu-top div.wp-menu-image:before { + color: #fff; +} /* Active tabs use a bottom border color that matches the page background color. */ -.about-wrap h2 .nav-tab-active, .nav-tab-active, .nav-tab-active:hover { +.about-wrap h2 .nav-tab-active, +.nav-tab-active, +.nav-tab-active:hover { background-color: #f1f1f1; - border-bottom-color: #f1f1f1; } + border-bottom-color: #f1f1f1; +} /* Admin Menu: submenu */ -#adminmenu .wp-submenu, #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu .wp-has-current-submenu.opensub .wp-submenu, .folded #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu { - background: #413256; } +#adminmenu .wp-submenu, +#adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu, +.folded #adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu { + background: #413256; +} #adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after { - border-left-color: #413256; } + border-left-color: #413256; +} #adminmenu .wp-submenu .wp-submenu-head { - color: #cbc5d3; } - -#adminmenu .wp-submenu a, #adminmenu .wp-has-current-submenu .wp-submenu a, .folded #adminmenu .wp-has-current-submenu .wp-submenu a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a { - color: #cbc5d3; } - #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, #adminmenu .wp-has-current-submenu .wp-submenu a:focus, #adminmenu .wp-has-current-submenu .wp-submenu a:hover, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { - color: #a3b745; } + color: #cbc5d3; +} + +#adminmenu .wp-submenu a, +#adminmenu .wp-has-current-submenu .wp-submenu a, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a { + color: #cbc5d3; +} + +#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu .wp-submenu a:hover, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { + color: #a3b745; +} /* Admin Menu: current */ -#adminmenu .wp-submenu li.current a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { - color: #fff; } - #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { - color: #a3b745; } +#adminmenu .wp-submenu li.current a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { + color: #fff; +} -ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.current:after { - border-left-color: #f1f1f1; } +#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { + color: #a3b745; +} -#adminmenu li.current a.menu-top, #adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, #adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, .folded #adminmenu li.current.menu-top { - color: #fff; - background: #a3b745; } +ul#adminmenu a.wp-has-current-submenu:after, +ul#adminmenu > li.current > a.current:after { + border-left-color: #f1f1f1; +} -#adminmenu li.wp-has-current-submenu div.wp-menu-image:before { - color: #fff; } +#adminmenu li.current a.menu-top, +#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, +#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, +.folded #adminmenu li.current.menu-top { + color: #fff; + background: #a3b745; +} + +#adminmenu li.wp-has-current-submenu div.wp-menu-image:before, +#adminmenu a.current:hover div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before, +#adminmenu li:hover div.wp-menu-image:before, +#adminmenu li a:focus div.wp-menu-image:before, +#adminmenu li.opensub div.wp-menu-image:before, +.ie8 #adminmenu li.opensub div.wp-menu-image:before { + color: #fff; +} /* Admin Menu: bubble */ -#adminmenu .awaiting-mod, #adminmenu .update-plugins { +#adminmenu .awaiting-mod, +#adminmenu .update-plugins { color: #fff; - background: #d46f15; } + background: #d46f15; +} -#adminmenu li.current a .awaiting-mod, #adminmenu li a.wp-has-current-submenu .update-plugins, #adminmenu li:hover a .awaiting-mod, #adminmenu li.menu-top:hover > a .update-plugins { +#adminmenu li.current a .awaiting-mod, +#adminmenu li a.wp-has-current-submenu .update-plugins, +#adminmenu li:hover a .awaiting-mod, +#adminmenu li.menu-top:hover > a .update-plugins { color: #fff; - background: #413256; } + background: #413256; +} /* Admin Menu: collapse button */ #collapse-menu { - color: #ece6f6; } + color: #ece6f6; +} #collapse-menu:hover { - color: #fff; } + color: #fff; +} #collapse-button div:after { - color: #ece6f6; } + color: #ece6f6; +} #collapse-menu:hover #collapse-button div:after { - color: #fff; } + color: #fff; +} /* Admin Bar */ #wpadminbar { color: #fff; - background: #523f6d; } - -#wpadminbar .ab-item, #wpadminbar a.ab-item, #wpadminbar > #wp-toolbar span.ab-label, #wpadminbar > #wp-toolbar span.noticon { - color: #fff; } - -#wpadminbar .ab-icon, #wpadminbar .ab-icon:before, #wpadminbar .ab-item:before, #wpadminbar .ab-item:after { - color: #ece6f6; } + background: #523f6d; +} -#wpadminbar .ab-top-menu > li:hover > .ab-item, #wpadminbar .ab-top-menu > li.hover > .ab-item, #wpadminbar .ab-top-menu > li > .ab-item:focus, #wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, #wpadminbar-nojs .ab-top-menu > li.menupop:hover > .ab-item, #wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { +#wpadminbar .ab-item, +#wpadminbar a.ab-item, +#wpadminbar > #wp-toolbar span.ab-label, +#wpadminbar > #wp-toolbar span.noticon { + color: #fff; +} + +#wpadminbar .ab-icon, +#wpadminbar .ab-icon:before, +#wpadminbar .ab-item:before, +#wpadminbar .ab-item:after { + color: #ece6f6; +} + +#wpadminbar:not(.mobile) .ab-top-menu > li:hover > .ab-item, +#wpadminbar:not(.mobile) .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojs .ab-top-menu > li.menupop:hover > .ab-item, +#wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { color: #a3b745; - background: #413256; } + background: #413256; +} -#wpadminbar > #wp-toolbar li:hover span.ab-label, #wpadminbar > #wp-toolbar li.hover span.ab-label, #wpadminbar > #wp-toolbar a:focus span.ab-label { - color: #a3b745; } +#wpadminbar:not(.mobile) > #wp-toolbar li:hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar li.hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar a:focus span.ab-label { + color: #a3b745; +} -#wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #fff; } +#wpadminbar:not(.mobile) li:hover .ab-icon:before, +#wpadminbar:not(.mobile) li:hover .ab-item:before, +#wpadminbar:not(.mobile) li:hover .ab-item:after, +#wpadminbar:not(.mobile) li:hover #adminbarsearch:before { + color: #fff; +} /* Admin Bar: submenu */ #wpadminbar .menupop .ab-sub-wrapper { - background: #413256; } - -#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, #wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { - background: #64537c; } - -#wpadminbar .ab-submenu .ab-item, #wpadminbar .quicklinks .menupop ul li a, #wpadminbar .quicklinks .menupop.hover ul li a, #wpadminbar-nojs .quicklinks .menupop:hover ul li a { - color: #cbc5d3; } - -#wpadminbar .quicklinks li .blavatar, #wpadminbar .menupop .menupop > .ab-item:before { - color: #ece6f6; } - -#wpadminbar .quicklinks .menupop ul li a:hover, #wpadminbar .quicklinks .menupop ul li a:focus, #wpadminbar .quicklinks .menupop ul li a:hover strong, #wpadminbar .quicklinks .menupop ul li a:focus strong, #wpadminbar .quicklinks .menupop.hover ul li a:hover, #wpadminbar .quicklinks .menupop.hover ul li a:focus, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, #wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li a:focus .ab-icon:before, #wpadminbar li .ab-item:focus:before, #wpadminbar li.hover .ab-icon:before, #wpadminbar li.hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li.hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #a3b745; } + background: #413256; +} + +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { + background: #64537c; +} + +#wpadminbar .ab-submenu .ab-item, +#wpadminbar .quicklinks .menupop ul li a, +#wpadminbar .quicklinks .menupop.hover ul li a, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a { + color: #cbc5d3; +} + +#wpadminbar .quicklinks li .blavatar, +#wpadminbar .menupop .menupop > .ab-item:before { + color: #ece6f6; +} + +#wpadminbar .quicklinks .menupop ul li a:hover, +#wpadminbar .quicklinks .menupop ul li a:focus, +#wpadminbar .quicklinks .menupop ul li a:hover strong, +#wpadminbar .quicklinks .menupop ul li a:focus strong, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a, +#wpadminbar .quicklinks .menupop.hover ul li a:hover, +#wpadminbar .quicklinks .menupop.hover ul li a:focus, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, +#wpadminbar li:hover .ab-icon:before, +#wpadminbar li:hover .ab-item:before, +#wpadminbar li a:focus .ab-icon:before, +#wpadminbar li .ab-item:focus:before, +#wpadminbar li.hover .ab-icon:before, +#wpadminbar li.hover .ab-item:before, +#wpadminbar li:hover #adminbarsearch:before, +#wpadminbar li #adminbarsearch.adminbar-focused:before { + color: #a3b745; +} + +#wpadminbar .quicklinks li a:hover .blavatar, +#wpadminbar .quicklinks li a:focus .blavatar, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar, +#wpadminbar .menupop .menupop > .ab-item:hover:before, +#wpadminbar.mobile .quicklinks .ab-icon:before, +#wpadminbar.mobile .quicklinks .ab-item:before { + color: #a3b745; +} -#wpadminbar .quicklinks li a:hover .blavatar, #wpadminbar .menupop .menupop > .ab-item:hover:before { - color: #a3b745; } +#wpadminbar.mobile .quicklinks .hover .ab-icon:before, +#wpadminbar.mobile .quicklinks .hover .ab-item:before { + color: #ece6f6; +} /* Admin Bar: search */ #wpadminbar #adminbarsearch:before { - color: #ece6f6; } + color: #ece6f6; +} #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus { color: #fff; - background: #624c84; } - -#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder { - color: #fff; - opacity: 0.7; } + background: #634c84; +} /* Admin Bar: my account */ #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { - border-color: #624c84; - background-color: #624c84; } + border-color: #634c84; + background-color: #634c84; +} #wpadminbar #wp-admin-bar-user-info .display-name { - color: #fff; } + color: #fff; +} #wpadminbar #wp-admin-bar-user-info a:hover .display-name { - color: #a3b745; } + color: #a3b745; +} #wpadminbar #wp-admin-bar-user-info .username { - color: #cbc5d3; } + color: #cbc5d3; +} /* Pointers */ .wp-pointer .wp-pointer-content h3 { background-color: #a3b745; - border-color: #93a43e; } + border-color: #93a43e; +} .wp-pointer .wp-pointer-content h3:before { - color: #a3b745; } - -.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow { - border-bottom-color: #a3b745; } - -/* Media Uploader */ -.media-item .bar, .media-progress-bar div { - background-color: #a3b745; } + color: #a3b745; +} + +.wp-pointer.wp-pointer-top .wp-pointer-arrow, +.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner { + border-bottom-color: #a3b745; +} + +/* Media */ +.media-item .bar, +.media-progress-bar div { + background-color: #a3b745; +} .details.attachment { - -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #a3b745; - box-shadow: 0 0 0 1px #fff, 0 0 0 5px #a3b745; } + -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #a3b745; + box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #a3b745; +} .attachment.details .check { background-color: #a3b745; -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #a3b745; - box-shadow: 0 0 0 1px #fff, 0 0 0 2px #a3b745; } + box-shadow: 0 0 0 1px #fff, 0 0 0 2px #a3b745; +} + +.media-selection .attachment.selection.details .thumbnail { + -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #a3b745; + box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #a3b745; +} /* Themes */ -.theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after { - background: #a3b745; } +.theme-browser .theme.active .theme-name, +.theme-browser .theme.add-new-theme a:hover:after, +.theme-browser .theme.add-new-theme a:focus:after { + background: #a3b745; +} -.theme-browser .theme.add-new-theme:hover span:after { - color: #a3b745; } +.theme-browser .theme.add-new-theme a:hover span:after, +.theme-browser .theme.add-new-theme a:focus span:after { + color: #a3b745; +} -.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover { - background: #a3b745; } +.theme-section.current, +.theme-filter.current { + border-bottom-color: #523f6d; +} -.theme-section.current, .theme-filter.current { - border-bottom-color: #523f6d; } +body.more-filters-opened .more-filters { + color: #fff; + background-color: #523f6d; +} -body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before { +body.more-filters-opened .more-filters:before { color: #fff; - background-color: #523f6d; } +} -body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before { +body.more-filters-opened .more-filters:hover, +body.more-filters-opened .more-filters:focus { background-color: #a3b745; - color: #fff; } + color: #fff; +} + +body.more-filters-opened .more-filters:hover:before, +body.more-filters-opened .more-filters:focus:before { + color: #fff; +} /* Widgets */ .widgets-chooser li.widgets-chooser-selected { background-color: #a3b745; - color: #fff; } + color: #fff; +} -.widgets-chooser li.widgets-chooser-selected:before, .widgets-chooser li.widgets-chooser-selected:focus:before { - color: #fff; } +.widgets-chooser li.widgets-chooser-selected:before, +.widgets-chooser li.widgets-chooser-selected:focus:before { + color: #fff; +} /* Customize */ #customize-theme-controls .widget-area-select .selected { background-color: #a3b745; - color: #fff; } - -/* jQuery UI Slider */ -.wp-slider .ui-slider-handle, .wp-slider .ui-slider-handle.ui-state-hover, .wp-slider .ui-slider-handle.focus { - background: #a3b745; - border-color: #839237; - -webkit-box-shadow: inset 0 1px 0 #c0cd7b, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #c0cd7b, 0 1px 0 rgba(0, 0, 0, 0.15); } - -/* Thickbox: Plugin information */ -#sidemenu a.current { - background: #f1f1f1; - border-bottom-color: #f1f1f1; } + color: #fff; +} -#plugin-information .action-button { - background: #a3b745; } +#customize-footer-actions .devices button:focus { + border-bottom-color: #a3b745; +} /* Responsive Component */ div#wp-responsive-toggle a:before { - color: #ece6f6; } + color: #ece6f6; +} .wp-responsive-open div#wp-responsive-toggle a { border-color: transparent; - background: #a3b745; } - -.star-rating .star { - color: #a3b745; } + background: #a3b745; +} .wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a { - background: #413256; } + background: #413256; +} + +.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before { + color: #ece6f6; +} + +/* TinyMCE */ +.mce-container.mce-menu .mce-menu-item:hover, +.mce-container.mce-menu .mce-menu-item.mce-selected, +.mce-container.mce-menu .mce-menu-item:focus, +.mce-container.mce-menu .mce-menu-item-normal.mce-active, +.mce-container.mce-menu .mce-menu-item-preview.mce-active { + background: #a3b745; +} diff --git a/wp-admin/css/colors/ectoplasm/colors-rtl.min.css b/wp-admin/css/colors/ectoplasm/colors-rtl.min.css index 2f6433e..2ab769b 100644 --- a/wp-admin/css/colors/ectoplasm/colors-rtl.min.css +++ b/wp-admin/css/colors/ectoplasm/colors-rtl.min.css @@ -1 +1 @@ -html{background:#f1f1f1}a{color:#0074a2}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,a:active,a:focus,a:hover,div.dashboard-widget-submit input:hover{color:#0099d5}input[type=checkbox]:checked:before{color:#523f6d}input[type=radio]:checked:before{background:#523f6d}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0099d5}.wp-core-ui .button-primary{background:#a3b745;border-color:#839237;color:#fff;-webkit-box-shadow:inset 0 1px 0 #c0cd7b,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #c0cd7b,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#93a43e;border-color:#727f30;color:#fff;-webkit-box-shadow:inset 0 1px 0 #b7c669,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #b7c669,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:active{background:#839237;border-color:#727f30;color:#fff;-webkit-box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5);box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5)}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#cfd1c7!important;background:#89993a!important;border-color:#727f30!important;text-shadow:none!important}.wp-core-ui .wp-ui-primary{color:#fff;background-color:#523f6d}.wp-core-ui .wp-ui-text-primary{color:#523f6d}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#a3b745}.wp-core-ui .wp-ui-text-highlight{color:#a3b745}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#d46f15}.wp-core-ui .wp-ui-text-notification{color:#d46f15}.wp-core-ui .wp-ui-text-icon{color:#ece6f6}#add-new-comment a:hover,.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover{color:#fff;background-color:#523f6d}.view-switch a.current:before{color:#523f6d}.view-switch a:hover:before{color:#d46f15}.post-com-count:hover:after{border-top-color:#523f6d}.post-com-count:hover span{color:#fff;background-color:#523f6d}strong .post-com-count:after{border-top-color:#d46f15}strong .post-com-count span{background-color:#d46f15}#adminmenu,#adminmenuback,#adminmenuwrap{background:#523f6d}#adminmenu a{color:#fff}#adminmenu div.wp-menu-image:before{color:#ece6f6}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#a3b745}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#fff}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f1f1f1;border-bottom-color:#f1f1f1}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#413256}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-left-color:#413256}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu .wp-submenu-head,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#cbc5d3}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#a3b745}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#a3b745}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-left-color:#f1f1f1}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#a3b745}#adminmenu li.wp-has-current-submenu div.wp-menu-image:before{color:#fff}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#d46f15}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#fff;background:#413256}#collapse-menu{color:#ece6f6}#collapse-menu:hover{color:#fff}#collapse-button div:after{color:#ece6f6}#collapse-menu:hover #collapse-button div:after{color:#fff}#wpadminbar{color:#fff;background:#523f6d}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#fff}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#ece6f6}#wpadminbar .ab-top-menu>li.hover>.ab-item,#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar .ab-top-menu>li:hover>.ab-item,#wpadminbar .ab-top-menu>li>.ab-item:focus,#wpadminbar-nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus{color:#a3b745;background:#413256}#wpadminbar>#wp-toolbar a:focus span.ab-label,#wpadminbar>#wp-toolbar li.hover span.ab-label,#wpadminbar>#wp-toolbar li:hover span.ab-label{color:#a3b745}#wpadminbar .menupop .ab-sub-wrapper{background:#413256}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#64537c}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar-nojs .quicklinks .menupop:hover ul li a{color:#cbc5d3}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#ece6f6}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:after,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:after,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#a3b745}#wpadminbar #adminbarsearch:before{color:#ece6f6}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#fff;background:#624c84}#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder{color:#fff;opacity:.7}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#624c84;background-color:#624c84}#wpadminbar #wp-admin-bar-user-info .display-name{color:#fff}#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#a3b745}#wpadminbar #wp-admin-bar-user-info .username{color:#cbc5d3}.wp-pointer .wp-pointer-content h3{background-color:#a3b745;border-color:#93a43e}.wp-pointer .wp-pointer-content h3:before{color:#a3b745}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow{border-bottom-color:#a3b745}.media-item .bar,.media-progress-bar div{background-color:#a3b745}.details.attachment{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 5px #a3b745;box-shadow:0 0 0 1px #fff,0 0 0 5px #a3b745}.attachment.details .check{background-color:#a3b745;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #a3b745;box-shadow:0 0 0 1px #fff,0 0 0 2px #a3b745}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme:hover:after{background:#a3b745}.theme-browser .theme.add-new-theme:hover span:after{color:#a3b745}.theme-overlay .theme-header .close:hover,.theme-overlay .theme-header .left:hover,.theme-overlay .theme-header .right:hover{background:#a3b745}.theme-filter.current,.theme-section.current{border-bottom-color:#523f6d}body.more-filters-opened .more-filters,body.more-filters-opened .more-filters:before{color:#fff;background-color:#523f6d}.widgets-chooser li.widgets-chooser-selected,body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover,body.more-filters-opened .more-filters:hover:before{background-color:#a3b745;color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-theme-controls .widget-area-select .selected{background-color:#a3b745;color:#fff}.wp-slider .ui-slider-handle,.wp-slider .ui-slider-handle.focus,.wp-slider .ui-slider-handle.ui-state-hover{background:#a3b745;border-color:#839237;-webkit-box-shadow:inset 0 1px 0 #c0cd7b,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #c0cd7b,0 1px 0 rgba(0,0,0,.15)}#sidemenu a.current{background:#f1f1f1;border-bottom-color:#f1f1f1}#plugin-information .action-button{background:#a3b745}div#wp-responsive-toggle a:before{color:#ece6f6}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#a3b745}.star-rating .star{color:#a3b745}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#413256} \ No newline at end of file +html{background:#f1f1f1}a{color:#0073aa}a:active,a:focus,a:hover{color:#0096dd}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,div.dashboard-widget-submit input:hover{color:#0096dd}input[type=checkbox]:checked:before{color:#523f6d}input[type=radio]:checked:before{background:#523f6d}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0096dd}.wp-core-ui .button-primary{background:#a3b745;border-color:#829237 #727f30 #727f30;color:#fff;-webkit-box-shadow:0 1px 0 #727f30;box-shadow:0 1px 0 #727f30;text-shadow:0 -1px 1px #727f30,-1px 0 1px #727f30,0 1px 1px #727f30,1px 0 1px #727f30}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#a9bd4f;border-color:#727f30;color:#fff;-webkit-box-shadow:0 1px 0 #727f30;box-shadow:0 1px 0 #727f30}.wp-core-ui .button-primary:focus{-webkit-box-shadow:inset 0 1px 0 #829237,0 0 2px 1px #33b3db;box-shadow:inset 0 1px 0 #829237,0 0 2px 1px #33b3db}.wp-core-ui .button-primary:active{background:#829237;border-color:#727f30;-webkit-box-shadow:inset 0 2px 0 #727f30;box-shadow:inset 0 2px 0 #727f30}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#cfd1c7!important;background:#89993a!important;border-color:#727f30!important;text-shadow:none!important}.wp-core-ui .button-primary.button-hero{-webkit-box-shadow:0 2px 0 #727f30!important;box-shadow:0 2px 0 #727f30!important}.wp-core-ui .button-primary.button-hero:active{-webkit-box-shadow:inset 0 3px 0 #727f30!important;box-shadow:inset 0 3px 0 #727f30!important}.wp-core-ui .wp-ui-primary{color:#fff;background-color:#523f6d}.wp-core-ui .wp-ui-text-primary{color:#523f6d}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#a3b745}.wp-core-ui .wp-ui-text-highlight{color:#a3b745}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#d46f15}.wp-core-ui .wp-ui-text-notification{color:#d46f15}.wp-core-ui .wp-ui-text-icon{color:#ece6f6}.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover,.wrap .page-title-action:hover{color:#fff;background-color:#523f6d}.view-switch a.current:before{color:#523f6d}.view-switch a:hover:before{color:#d46f15}#adminmenu,#adminmenuback,#adminmenuwrap{background:#523f6d}#adminmenu a{color:#fff}#adminmenu div.wp-menu-image:before{color:#ece6f6}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#a3b745}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#fff}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f1f1f1;border-bottom-color:#f1f1f1}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#413256}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-left-color:#413256}#adminmenu .wp-submenu .wp-submenu-head{color:#cbc5d3}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#cbc5d3}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#a3b745}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#a3b745}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-left-color:#f1f1f1}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#a3b745}#adminmenu a.current:hover div.wp-menu-image:before,#adminmenu li a:focus div.wp-menu-image:before,#adminmenu li.opensub div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,#adminmenu li:hover div.wp-menu-image:before,.ie8 #adminmenu li.opensub div.wp-menu-image:before{color:#fff}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#d46f15}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#fff;background:#413256}#collapse-menu{color:#ece6f6}#collapse-menu:hover{color:#fff}#collapse-button div:after{color:#ece6f6}#collapse-menu:hover #collapse-button div:after{color:#fff}#wpadminbar{color:#fff;background:#523f6d}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#fff}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#ece6f6}#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus,#wpadminbar.nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li>.ab-item:focus{color:#a3b745;background:#413256}#wpadminbar:not(.mobile)>#wp-toolbar a:focus span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li.hover span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li:hover span.ab-label{color:#a3b745}#wpadminbar:not(.mobile) li:hover #adminbarsearch:before,#wpadminbar:not(.mobile) li:hover .ab-icon:before,#wpadminbar:not(.mobile) li:hover .ab-item:after,#wpadminbar:not(.mobile) li:hover .ab-item:before{color:#fff}#wpadminbar .menupop .ab-sub-wrapper{background:#413256}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#64537c}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar.nojs .quicklinks .menupop:hover ul li a{color:#cbc5d3}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#ece6f6}#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar li #adminbarsearch.adminbar-focused:before,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#a3b745}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a .blavatar,#wpadminbar .quicklinks li a:focus .blavatar,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar.mobile .quicklinks .ab-icon:before,#wpadminbar.mobile .quicklinks .ab-item:before{color:#a3b745}#wpadminbar.mobile .quicklinks .hover .ab-icon:before,#wpadminbar.mobile .quicklinks .hover .ab-item:before{color:#ece6f6}#wpadminbar #adminbarsearch:before{color:#ece6f6}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#fff;background:#634c84}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#634c84;background-color:#634c84}#wpadminbar #wp-admin-bar-user-info .display-name{color:#fff}#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#a3b745}#wpadminbar #wp-admin-bar-user-info .username{color:#cbc5d3}.wp-pointer .wp-pointer-content h3{background-color:#a3b745;border-color:#93a43e}.wp-pointer .wp-pointer-content h3:before{color:#a3b745}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner{border-bottom-color:#a3b745}.media-item .bar,.media-progress-bar div{background-color:#a3b745}.details.attachment{-webkit-box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #a3b745;box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #a3b745}.attachment.details .check{background-color:#a3b745;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #a3b745;box-shadow:0 0 0 1px #fff,0 0 0 2px #a3b745}.media-selection .attachment.selection.details .thumbnail{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 3px #a3b745;box-shadow:0 0 0 1px #fff,0 0 0 3px #a3b745}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme a:focus:after,.theme-browser .theme.add-new-theme a:hover:after{background:#a3b745}.theme-browser .theme.add-new-theme a:focus span:after,.theme-browser .theme.add-new-theme a:hover span:after{color:#a3b745}.theme-filter.current,.theme-section.current{border-bottom-color:#523f6d}body.more-filters-opened .more-filters{color:#fff;background-color:#523f6d}#customize-theme-controls .widget-area-select .selected,.widgets-chooser li.widgets-chooser-selected{background-color:#a3b745;color:#fff}body.more-filters-opened .more-filters:before{color:#fff}body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:hover{background-color:#a3b745;color:#fff}body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover:before{color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-footer-actions .devices button:focus{border-bottom-color:#a3b745}div#wp-responsive-toggle a:before{color:#ece6f6}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#a3b745}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#413256}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before{color:#ece6f6}.mce-container.mce-menu .mce-menu-item-normal.mce-active,.mce-container.mce-menu .mce-menu-item-preview.mce-active,.mce-container.mce-menu .mce-menu-item.mce-selected,.mce-container.mce-menu .mce-menu-item:focus,.mce-container.mce-menu .mce-menu-item:hover{background:#a3b745} \ No newline at end of file diff --git a/wp-admin/css/colors/ectoplasm/colors.css b/wp-admin/css/colors/ectoplasm/colors.css index cc319a8..980a0c3 100644 --- a/wp-admin/css/colors/ectoplasm/colors.css +++ b/wp-admin/css/colors/ectoplasm/colors.css @@ -3,329 +3,524 @@ * highlights/shadows, based on a base color. */ html { - background: #f1f1f1; } + background: #f1f1f1; +} /* Links */ a { - color: #0074a2; } - a:hover, a:active, a:focus { - color: #0099d5; } + color: #0073aa; +} + +a:hover, a:active, a:focus { + color: #0096dd; +} -#media-upload a.del-link:hover, div.dashboard-widget-submit input:hover, .subsubsub a:hover, .subsubsub a.current:hover { - color: #0099d5; } +#media-upload a.del-link:hover, +div.dashboard-widget-submit input:hover, +.subsubsub a:hover, +.subsubsub a.current:hover { + color: #0096dd; +} /* Forms */ input[type=checkbox]:checked:before { - color: #523f6d; } + color: #523f6d; +} input[type=radio]:checked:before { - background: #523f6d; } + background: #523f6d; +} -.wp-core-ui input[type="reset"]:hover, .wp-core-ui input[type="reset"]:active { - color: #0099d5; } +.wp-core-ui input[type="reset"]:hover, +.wp-core-ui input[type="reset"]:active { + color: #0096dd; +} /* Core UI */ .wp-core-ui .button-primary { background: #a3b745; - border-color: #839237; + border-color: #829237 #727f30 #727f30; + color: white; + -webkit-box-shadow: 0 1px 0 #727f30; + box-shadow: 0 1px 0 #727f30; + text-shadow: 0 -1px 1px #727f30, 1px 0 1px #727f30, 0 1px 1px #727f30, -1px 0 1px #727f30; +} + +.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { + background: #a9bd4f; + border-color: #727f30; color: white; - -webkit-box-shadow: inset 0 1px 0 #c0cd7b, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #c0cd7b, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { - background: #93a43e; - border-color: #727f30; - color: white; - -webkit-box-shadow: inset 0 1px 0 #b7c669, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #b7c669, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:active { - background: #839237; - border-color: #727f30; - color: white; - -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); - box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); } - .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { - color: #cfd1c7 !important; - background: #89993a !important; - border-color: #727f30 !important; - text-shadow: none !important; } + -webkit-box-shadow: 0 1px 0 #727f30; + box-shadow: 0 1px 0 #727f30; +} + +.wp-core-ui .button-primary:focus { + -webkit-box-shadow: inset 0 1px 0 #829237, 0 0 2px 1px #33b3db; + box-shadow: inset 0 1px 0 #829237, 0 0 2px 1px #33b3db; +} + +.wp-core-ui .button-primary:active { + background: #829237; + border-color: #727f30; + -webkit-box-shadow: inset 0 2px 0 #727f30; + box-shadow: inset 0 2px 0 #727f30; +} + +.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { + color: #cfd1c7 !important; + background: #89993a !important; + border-color: #727f30 !important; + text-shadow: none !important; +} + +.wp-core-ui .button-primary.button-hero { + -webkit-box-shadow: 0 2px 0 #727f30 !important; + box-shadow: 0 2px 0 #727f30 !important; +} + +.wp-core-ui .button-primary.button-hero:active { + -webkit-box-shadow: inset 0 3px 0 #727f30 !important; + box-shadow: inset 0 3px 0 #727f30 !important; +} + .wp-core-ui .wp-ui-primary { color: #fff; - background-color: #523f6d; } + background-color: #523f6d; +} + .wp-core-ui .wp-ui-text-primary { - color: #523f6d; } + color: #523f6d; +} + .wp-core-ui .wp-ui-highlight { color: #fff; - background-color: #a3b745; } + background-color: #a3b745; +} + .wp-core-ui .wp-ui-text-highlight { - color: #a3b745; } + color: #a3b745; +} + .wp-core-ui .wp-ui-notification { color: #fff; - background-color: #d46f15; } + background-color: #d46f15; +} + .wp-core-ui .wp-ui-text-notification { - color: #d46f15; } + color: #d46f15; +} + .wp-core-ui .wp-ui-text-icon { - color: #ece6f6; } + color: #ece6f6; +} /* List tables */ -.wrap .add-new-h2:hover, #add-new-comment a:hover, .tablenav .tablenav-pages a:hover, .tablenav .tablenav-pages a:focus { +.wrap .add-new-h2:hover, +.wrap .page-title-action:hover, +.tablenav .tablenav-pages a:hover, +.tablenav .tablenav-pages a:focus { color: #fff; - background-color: #523f6d; } + background-color: #523f6d; +} .view-switch a.current:before { - color: #523f6d; } + color: #523f6d; +} .view-switch a:hover:before { - color: #d46f15; } - -.post-com-count:hover:after { - border-top-color: #523f6d; } - -.post-com-count:hover span { - color: #fff; - background-color: #523f6d; } - -strong .post-com-count:after { - border-top-color: #d46f15; } - -strong .post-com-count span { - background-color: #d46f15; } + color: #d46f15; +} /* Admin Menu */ -#adminmenuback, #adminmenuwrap, #adminmenu { - background: #523f6d; } +#adminmenuback, +#adminmenuwrap, +#adminmenu { + background: #523f6d; +} #adminmenu a { - color: #fff; } + color: #fff; +} #adminmenu div.wp-menu-image:before { - color: #ece6f6; } + color: #ece6f6; +} -#adminmenu a:hover, #adminmenu li.menu-top:hover, #adminmenu li.opensub > a.menu-top, #adminmenu li > a.menu-top:focus { +#adminmenu a:hover, +#adminmenu li.menu-top:hover, +#adminmenu li.opensub > a.menu-top, +#adminmenu li > a.menu-top:focus { color: #fff; - background-color: #a3b745; } + background-color: #a3b745; +} -#adminmenu li.menu-top:hover div.wp-menu-image:before, #adminmenu li.opensub > a.menu-top div.wp-menu-image:before { - color: #fff; } +#adminmenu li.menu-top:hover div.wp-menu-image:before, +#adminmenu li.opensub > a.menu-top div.wp-menu-image:before { + color: #fff; +} /* Active tabs use a bottom border color that matches the page background color. */ -.about-wrap h2 .nav-tab-active, .nav-tab-active, .nav-tab-active:hover { +.about-wrap h2 .nav-tab-active, +.nav-tab-active, +.nav-tab-active:hover { background-color: #f1f1f1; - border-bottom-color: #f1f1f1; } + border-bottom-color: #f1f1f1; +} /* Admin Menu: submenu */ -#adminmenu .wp-submenu, #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu .wp-has-current-submenu.opensub .wp-submenu, .folded #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu { - background: #413256; } +#adminmenu .wp-submenu, +#adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu, +.folded #adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu { + background: #413256; +} #adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after { - border-right-color: #413256; } + border-right-color: #413256; +} #adminmenu .wp-submenu .wp-submenu-head { - color: #cbc5d3; } - -#adminmenu .wp-submenu a, #adminmenu .wp-has-current-submenu .wp-submenu a, .folded #adminmenu .wp-has-current-submenu .wp-submenu a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a { - color: #cbc5d3; } - #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, #adminmenu .wp-has-current-submenu .wp-submenu a:focus, #adminmenu .wp-has-current-submenu .wp-submenu a:hover, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { - color: #a3b745; } + color: #cbc5d3; +} + +#adminmenu .wp-submenu a, +#adminmenu .wp-has-current-submenu .wp-submenu a, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a { + color: #cbc5d3; +} + +#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu .wp-submenu a:hover, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { + color: #a3b745; +} /* Admin Menu: current */ -#adminmenu .wp-submenu li.current a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { - color: #fff; } - #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { - color: #a3b745; } +#adminmenu .wp-submenu li.current a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { + color: #fff; +} -ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.current:after { - border-right-color: #f1f1f1; } +#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { + color: #a3b745; +} -#adminmenu li.current a.menu-top, #adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, #adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, .folded #adminmenu li.current.menu-top { - color: #fff; - background: #a3b745; } +ul#adminmenu a.wp-has-current-submenu:after, +ul#adminmenu > li.current > a.current:after { + border-right-color: #f1f1f1; +} -#adminmenu li.wp-has-current-submenu div.wp-menu-image:before { - color: #fff; } +#adminmenu li.current a.menu-top, +#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, +#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, +.folded #adminmenu li.current.menu-top { + color: #fff; + background: #a3b745; +} + +#adminmenu li.wp-has-current-submenu div.wp-menu-image:before, +#adminmenu a.current:hover div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before, +#adminmenu li:hover div.wp-menu-image:before, +#adminmenu li a:focus div.wp-menu-image:before, +#adminmenu li.opensub div.wp-menu-image:before, +.ie8 #adminmenu li.opensub div.wp-menu-image:before { + color: #fff; +} /* Admin Menu: bubble */ -#adminmenu .awaiting-mod, #adminmenu .update-plugins { +#adminmenu .awaiting-mod, +#adminmenu .update-plugins { color: #fff; - background: #d46f15; } + background: #d46f15; +} -#adminmenu li.current a .awaiting-mod, #adminmenu li a.wp-has-current-submenu .update-plugins, #adminmenu li:hover a .awaiting-mod, #adminmenu li.menu-top:hover > a .update-plugins { +#adminmenu li.current a .awaiting-mod, +#adminmenu li a.wp-has-current-submenu .update-plugins, +#adminmenu li:hover a .awaiting-mod, +#adminmenu li.menu-top:hover > a .update-plugins { color: #fff; - background: #413256; } + background: #413256; +} /* Admin Menu: collapse button */ #collapse-menu { - color: #ece6f6; } + color: #ece6f6; +} #collapse-menu:hover { - color: #fff; } + color: #fff; +} #collapse-button div:after { - color: #ece6f6; } + color: #ece6f6; +} #collapse-menu:hover #collapse-button div:after { - color: #fff; } + color: #fff; +} /* Admin Bar */ #wpadminbar { color: #fff; - background: #523f6d; } - -#wpadminbar .ab-item, #wpadminbar a.ab-item, #wpadminbar > #wp-toolbar span.ab-label, #wpadminbar > #wp-toolbar span.noticon { - color: #fff; } - -#wpadminbar .ab-icon, #wpadminbar .ab-icon:before, #wpadminbar .ab-item:before, #wpadminbar .ab-item:after { - color: #ece6f6; } + background: #523f6d; +} -#wpadminbar .ab-top-menu > li:hover > .ab-item, #wpadminbar .ab-top-menu > li.hover > .ab-item, #wpadminbar .ab-top-menu > li > .ab-item:focus, #wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, #wpadminbar-nojs .ab-top-menu > li.menupop:hover > .ab-item, #wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { +#wpadminbar .ab-item, +#wpadminbar a.ab-item, +#wpadminbar > #wp-toolbar span.ab-label, +#wpadminbar > #wp-toolbar span.noticon { + color: #fff; +} + +#wpadminbar .ab-icon, +#wpadminbar .ab-icon:before, +#wpadminbar .ab-item:before, +#wpadminbar .ab-item:after { + color: #ece6f6; +} + +#wpadminbar:not(.mobile) .ab-top-menu > li:hover > .ab-item, +#wpadminbar:not(.mobile) .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojs .ab-top-menu > li.menupop:hover > .ab-item, +#wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { color: #a3b745; - background: #413256; } + background: #413256; +} -#wpadminbar > #wp-toolbar li:hover span.ab-label, #wpadminbar > #wp-toolbar li.hover span.ab-label, #wpadminbar > #wp-toolbar a:focus span.ab-label { - color: #a3b745; } +#wpadminbar:not(.mobile) > #wp-toolbar li:hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar li.hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar a:focus span.ab-label { + color: #a3b745; +} -#wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #fff; } +#wpadminbar:not(.mobile) li:hover .ab-icon:before, +#wpadminbar:not(.mobile) li:hover .ab-item:before, +#wpadminbar:not(.mobile) li:hover .ab-item:after, +#wpadminbar:not(.mobile) li:hover #adminbarsearch:before { + color: #fff; +} /* Admin Bar: submenu */ #wpadminbar .menupop .ab-sub-wrapper { - background: #413256; } - -#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, #wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { - background: #64537c; } - -#wpadminbar .ab-submenu .ab-item, #wpadminbar .quicklinks .menupop ul li a, #wpadminbar .quicklinks .menupop.hover ul li a, #wpadminbar-nojs .quicklinks .menupop:hover ul li a { - color: #cbc5d3; } - -#wpadminbar .quicklinks li .blavatar, #wpadminbar .menupop .menupop > .ab-item:before { - color: #ece6f6; } - -#wpadminbar .quicklinks .menupop ul li a:hover, #wpadminbar .quicklinks .menupop ul li a:focus, #wpadminbar .quicklinks .menupop ul li a:hover strong, #wpadminbar .quicklinks .menupop ul li a:focus strong, #wpadminbar .quicklinks .menupop.hover ul li a:hover, #wpadminbar .quicklinks .menupop.hover ul li a:focus, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, #wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li a:focus .ab-icon:before, #wpadminbar li .ab-item:focus:before, #wpadminbar li.hover .ab-icon:before, #wpadminbar li.hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li.hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #a3b745; } + background: #413256; +} + +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { + background: #64537c; +} + +#wpadminbar .ab-submenu .ab-item, +#wpadminbar .quicklinks .menupop ul li a, +#wpadminbar .quicklinks .menupop.hover ul li a, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a { + color: #cbc5d3; +} + +#wpadminbar .quicklinks li .blavatar, +#wpadminbar .menupop .menupop > .ab-item:before { + color: #ece6f6; +} + +#wpadminbar .quicklinks .menupop ul li a:hover, +#wpadminbar .quicklinks .menupop ul li a:focus, +#wpadminbar .quicklinks .menupop ul li a:hover strong, +#wpadminbar .quicklinks .menupop ul li a:focus strong, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a, +#wpadminbar .quicklinks .menupop.hover ul li a:hover, +#wpadminbar .quicklinks .menupop.hover ul li a:focus, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, +#wpadminbar li:hover .ab-icon:before, +#wpadminbar li:hover .ab-item:before, +#wpadminbar li a:focus .ab-icon:before, +#wpadminbar li .ab-item:focus:before, +#wpadminbar li.hover .ab-icon:before, +#wpadminbar li.hover .ab-item:before, +#wpadminbar li:hover #adminbarsearch:before, +#wpadminbar li #adminbarsearch.adminbar-focused:before { + color: #a3b745; +} + +#wpadminbar .quicklinks li a:hover .blavatar, +#wpadminbar .quicklinks li a:focus .blavatar, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar, +#wpadminbar .menupop .menupop > .ab-item:hover:before, +#wpadminbar.mobile .quicklinks .ab-icon:before, +#wpadminbar.mobile .quicklinks .ab-item:before { + color: #a3b745; +} -#wpadminbar .quicklinks li a:hover .blavatar, #wpadminbar .menupop .menupop > .ab-item:hover:before { - color: #a3b745; } +#wpadminbar.mobile .quicklinks .hover .ab-icon:before, +#wpadminbar.mobile .quicklinks .hover .ab-item:before { + color: #ece6f6; +} /* Admin Bar: search */ #wpadminbar #adminbarsearch:before { - color: #ece6f6; } + color: #ece6f6; +} #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus { color: #fff; - background: #624c84; } - -#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder { - color: #fff; - opacity: 0.7; } + background: #634c84; +} /* Admin Bar: my account */ #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { - border-color: #624c84; - background-color: #624c84; } + border-color: #634c84; + background-color: #634c84; +} #wpadminbar #wp-admin-bar-user-info .display-name { - color: #fff; } + color: #fff; +} #wpadminbar #wp-admin-bar-user-info a:hover .display-name { - color: #a3b745; } + color: #a3b745; +} #wpadminbar #wp-admin-bar-user-info .username { - color: #cbc5d3; } + color: #cbc5d3; +} /* Pointers */ .wp-pointer .wp-pointer-content h3 { background-color: #a3b745; - border-color: #93a43e; } + border-color: #93a43e; +} .wp-pointer .wp-pointer-content h3:before { - color: #a3b745; } - -.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow { - border-bottom-color: #a3b745; } - -/* Media Uploader */ -.media-item .bar, .media-progress-bar div { - background-color: #a3b745; } + color: #a3b745; +} + +.wp-pointer.wp-pointer-top .wp-pointer-arrow, +.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner { + border-bottom-color: #a3b745; +} + +/* Media */ +.media-item .bar, +.media-progress-bar div { + background-color: #a3b745; +} .details.attachment { - -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #a3b745; - box-shadow: 0 0 0 1px #fff, 0 0 0 5px #a3b745; } + -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #a3b745; + box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #a3b745; +} .attachment.details .check { background-color: #a3b745; -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #a3b745; - box-shadow: 0 0 0 1px #fff, 0 0 0 2px #a3b745; } + box-shadow: 0 0 0 1px #fff, 0 0 0 2px #a3b745; +} + +.media-selection .attachment.selection.details .thumbnail { + -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #a3b745; + box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #a3b745; +} /* Themes */ -.theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after { - background: #a3b745; } +.theme-browser .theme.active .theme-name, +.theme-browser .theme.add-new-theme a:hover:after, +.theme-browser .theme.add-new-theme a:focus:after { + background: #a3b745; +} -.theme-browser .theme.add-new-theme:hover span:after { - color: #a3b745; } +.theme-browser .theme.add-new-theme a:hover span:after, +.theme-browser .theme.add-new-theme a:focus span:after { + color: #a3b745; +} -.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover { - background: #a3b745; } +.theme-section.current, +.theme-filter.current { + border-bottom-color: #523f6d; +} -.theme-section.current, .theme-filter.current { - border-bottom-color: #523f6d; } +body.more-filters-opened .more-filters { + color: #fff; + background-color: #523f6d; +} -body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before { +body.more-filters-opened .more-filters:before { color: #fff; - background-color: #523f6d; } +} -body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before { +body.more-filters-opened .more-filters:hover, +body.more-filters-opened .more-filters:focus { background-color: #a3b745; - color: #fff; } + color: #fff; +} + +body.more-filters-opened .more-filters:hover:before, +body.more-filters-opened .more-filters:focus:before { + color: #fff; +} /* Widgets */ .widgets-chooser li.widgets-chooser-selected { background-color: #a3b745; - color: #fff; } + color: #fff; +} -.widgets-chooser li.widgets-chooser-selected:before, .widgets-chooser li.widgets-chooser-selected:focus:before { - color: #fff; } +.widgets-chooser li.widgets-chooser-selected:before, +.widgets-chooser li.widgets-chooser-selected:focus:before { + color: #fff; +} /* Customize */ #customize-theme-controls .widget-area-select .selected { background-color: #a3b745; - color: #fff; } - -/* jQuery UI Slider */ -.wp-slider .ui-slider-handle, .wp-slider .ui-slider-handle.ui-state-hover, .wp-slider .ui-slider-handle.focus { - background: #a3b745; - border-color: #839237; - -webkit-box-shadow: inset 0 1px 0 #c0cd7b, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #c0cd7b, 0 1px 0 rgba(0, 0, 0, 0.15); } - -/* Thickbox: Plugin information */ -#sidemenu a.current { - background: #f1f1f1; - border-bottom-color: #f1f1f1; } + color: #fff; +} -#plugin-information .action-button { - background: #a3b745; } +#customize-footer-actions .devices button:focus { + border-bottom-color: #a3b745; +} /* Responsive Component */ div#wp-responsive-toggle a:before { - color: #ece6f6; } + color: #ece6f6; +} .wp-responsive-open div#wp-responsive-toggle a { border-color: transparent; - background: #a3b745; } - -.star-rating .star { - color: #a3b745; } + background: #a3b745; +} .wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a { - background: #413256; } + background: #413256; +} + +.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before { + color: #ece6f6; +} + +/* TinyMCE */ +.mce-container.mce-menu .mce-menu-item:hover, +.mce-container.mce-menu .mce-menu-item.mce-selected, +.mce-container.mce-menu .mce-menu-item:focus, +.mce-container.mce-menu .mce-menu-item-normal.mce-active, +.mce-container.mce-menu .mce-menu-item-preview.mce-active { + background: #a3b745; +} diff --git a/wp-admin/css/colors/ectoplasm/colors.min.css b/wp-admin/css/colors/ectoplasm/colors.min.css index f99f871..afbf5d0 100644 --- a/wp-admin/css/colors/ectoplasm/colors.min.css +++ b/wp-admin/css/colors/ectoplasm/colors.min.css @@ -1 +1 @@ -html{background:#f1f1f1}a{color:#0074a2}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,a:active,a:focus,a:hover,div.dashboard-widget-submit input:hover{color:#0099d5}input[type=checkbox]:checked:before{color:#523f6d}input[type=radio]:checked:before{background:#523f6d}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0099d5}.wp-core-ui .button-primary{background:#a3b745;border-color:#839237;color:#fff;-webkit-box-shadow:inset 0 1px 0 #c0cd7b,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #c0cd7b,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#93a43e;border-color:#727f30;color:#fff;-webkit-box-shadow:inset 0 1px 0 #b7c669,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #b7c669,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:active{background:#839237;border-color:#727f30;color:#fff;-webkit-box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5);box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5)}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#cfd1c7!important;background:#89993a!important;border-color:#727f30!important;text-shadow:none!important}.wp-core-ui .wp-ui-primary{color:#fff;background-color:#523f6d}.wp-core-ui .wp-ui-text-primary{color:#523f6d}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#a3b745}.wp-core-ui .wp-ui-text-highlight{color:#a3b745}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#d46f15}.wp-core-ui .wp-ui-text-notification{color:#d46f15}.wp-core-ui .wp-ui-text-icon{color:#ece6f6}#add-new-comment a:hover,.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover{color:#fff;background-color:#523f6d}.view-switch a.current:before{color:#523f6d}.view-switch a:hover:before{color:#d46f15}.post-com-count:hover:after{border-top-color:#523f6d}.post-com-count:hover span{color:#fff;background-color:#523f6d}strong .post-com-count:after{border-top-color:#d46f15}strong .post-com-count span{background-color:#d46f15}#adminmenu,#adminmenuback,#adminmenuwrap{background:#523f6d}#adminmenu a{color:#fff}#adminmenu div.wp-menu-image:before{color:#ece6f6}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#a3b745}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#fff}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f1f1f1;border-bottom-color:#f1f1f1}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#413256}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-right-color:#413256}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu .wp-submenu-head,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#cbc5d3}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#a3b745}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#a3b745}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-right-color:#f1f1f1}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#a3b745}#adminmenu li.wp-has-current-submenu div.wp-menu-image:before{color:#fff}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#d46f15}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#fff;background:#413256}#collapse-menu{color:#ece6f6}#collapse-menu:hover{color:#fff}#collapse-button div:after{color:#ece6f6}#collapse-menu:hover #collapse-button div:after{color:#fff}#wpadminbar{color:#fff;background:#523f6d}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#fff}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#ece6f6}#wpadminbar .ab-top-menu>li.hover>.ab-item,#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar .ab-top-menu>li:hover>.ab-item,#wpadminbar .ab-top-menu>li>.ab-item:focus,#wpadminbar-nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus{color:#a3b745;background:#413256}#wpadminbar>#wp-toolbar a:focus span.ab-label,#wpadminbar>#wp-toolbar li.hover span.ab-label,#wpadminbar>#wp-toolbar li:hover span.ab-label{color:#a3b745}#wpadminbar .menupop .ab-sub-wrapper{background:#413256}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#64537c}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar-nojs .quicklinks .menupop:hover ul li a{color:#cbc5d3}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#ece6f6}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:after,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:after,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#a3b745}#wpadminbar #adminbarsearch:before{color:#ece6f6}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#fff;background:#624c84}#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder{color:#fff;opacity:.7}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#624c84;background-color:#624c84}#wpadminbar #wp-admin-bar-user-info .display-name{color:#fff}#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#a3b745}#wpadminbar #wp-admin-bar-user-info .username{color:#cbc5d3}.wp-pointer .wp-pointer-content h3{background-color:#a3b745;border-color:#93a43e}.wp-pointer .wp-pointer-content h3:before{color:#a3b745}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow{border-bottom-color:#a3b745}.media-item .bar,.media-progress-bar div{background-color:#a3b745}.details.attachment{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 5px #a3b745;box-shadow:0 0 0 1px #fff,0 0 0 5px #a3b745}.attachment.details .check{background-color:#a3b745;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #a3b745;box-shadow:0 0 0 1px #fff,0 0 0 2px #a3b745}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme:hover:after{background:#a3b745}.theme-browser .theme.add-new-theme:hover span:after{color:#a3b745}.theme-overlay .theme-header .close:hover,.theme-overlay .theme-header .left:hover,.theme-overlay .theme-header .right:hover{background:#a3b745}.theme-filter.current,.theme-section.current{border-bottom-color:#523f6d}body.more-filters-opened .more-filters,body.more-filters-opened .more-filters:before{color:#fff;background-color:#523f6d}.widgets-chooser li.widgets-chooser-selected,body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover,body.more-filters-opened .more-filters:hover:before{background-color:#a3b745;color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-theme-controls .widget-area-select .selected{background-color:#a3b745;color:#fff}.wp-slider .ui-slider-handle,.wp-slider .ui-slider-handle.focus,.wp-slider .ui-slider-handle.ui-state-hover{background:#a3b745;border-color:#839237;-webkit-box-shadow:inset 0 1px 0 #c0cd7b,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #c0cd7b,0 1px 0 rgba(0,0,0,.15)}#sidemenu a.current{background:#f1f1f1;border-bottom-color:#f1f1f1}#plugin-information .action-button{background:#a3b745}div#wp-responsive-toggle a:before{color:#ece6f6}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#a3b745}.star-rating .star{color:#a3b745}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#413256} \ No newline at end of file +html{background:#f1f1f1}a{color:#0073aa}a:active,a:focus,a:hover{color:#0096dd}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,div.dashboard-widget-submit input:hover{color:#0096dd}input[type=checkbox]:checked:before{color:#523f6d}input[type=radio]:checked:before{background:#523f6d}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0096dd}.wp-core-ui .button-primary{background:#a3b745;border-color:#829237 #727f30 #727f30;color:#fff;-webkit-box-shadow:0 1px 0 #727f30;box-shadow:0 1px 0 #727f30;text-shadow:0 -1px 1px #727f30,1px 0 1px #727f30,0 1px 1px #727f30,-1px 0 1px #727f30}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#a9bd4f;border-color:#727f30;color:#fff;-webkit-box-shadow:0 1px 0 #727f30;box-shadow:0 1px 0 #727f30}.wp-core-ui .button-primary:focus{-webkit-box-shadow:inset 0 1px 0 #829237,0 0 2px 1px #33b3db;box-shadow:inset 0 1px 0 #829237,0 0 2px 1px #33b3db}.wp-core-ui .button-primary:active{background:#829237;border-color:#727f30;-webkit-box-shadow:inset 0 2px 0 #727f30;box-shadow:inset 0 2px 0 #727f30}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#cfd1c7!important;background:#89993a!important;border-color:#727f30!important;text-shadow:none!important}.wp-core-ui .button-primary.button-hero{-webkit-box-shadow:0 2px 0 #727f30!important;box-shadow:0 2px 0 #727f30!important}.wp-core-ui .button-primary.button-hero:active{-webkit-box-shadow:inset 0 3px 0 #727f30!important;box-shadow:inset 0 3px 0 #727f30!important}.wp-core-ui .wp-ui-primary{color:#fff;background-color:#523f6d}.wp-core-ui .wp-ui-text-primary{color:#523f6d}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#a3b745}.wp-core-ui .wp-ui-text-highlight{color:#a3b745}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#d46f15}.wp-core-ui .wp-ui-text-notification{color:#d46f15}.wp-core-ui .wp-ui-text-icon{color:#ece6f6}.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover,.wrap .page-title-action:hover{color:#fff;background-color:#523f6d}.view-switch a.current:before{color:#523f6d}.view-switch a:hover:before{color:#d46f15}#adminmenu,#adminmenuback,#adminmenuwrap{background:#523f6d}#adminmenu a{color:#fff}#adminmenu div.wp-menu-image:before{color:#ece6f6}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#a3b745}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#fff}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f1f1f1;border-bottom-color:#f1f1f1}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#413256}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-right-color:#413256}#adminmenu .wp-submenu .wp-submenu-head{color:#cbc5d3}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#cbc5d3}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#a3b745}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#a3b745}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-right-color:#f1f1f1}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#a3b745}#adminmenu a.current:hover div.wp-menu-image:before,#adminmenu li a:focus div.wp-menu-image:before,#adminmenu li.opensub div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,#adminmenu li:hover div.wp-menu-image:before,.ie8 #adminmenu li.opensub div.wp-menu-image:before{color:#fff}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#d46f15}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#fff;background:#413256}#collapse-menu{color:#ece6f6}#collapse-menu:hover{color:#fff}#collapse-button div:after{color:#ece6f6}#collapse-menu:hover #collapse-button div:after{color:#fff}#wpadminbar{color:#fff;background:#523f6d}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#fff}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#ece6f6}#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus,#wpadminbar.nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li>.ab-item:focus{color:#a3b745;background:#413256}#wpadminbar:not(.mobile)>#wp-toolbar a:focus span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li.hover span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li:hover span.ab-label{color:#a3b745}#wpadminbar:not(.mobile) li:hover #adminbarsearch:before,#wpadminbar:not(.mobile) li:hover .ab-icon:before,#wpadminbar:not(.mobile) li:hover .ab-item:after,#wpadminbar:not(.mobile) li:hover .ab-item:before{color:#fff}#wpadminbar .menupop .ab-sub-wrapper{background:#413256}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#64537c}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar.nojs .quicklinks .menupop:hover ul li a{color:#cbc5d3}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#ece6f6}#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar li #adminbarsearch.adminbar-focused:before,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#a3b745}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a .blavatar,#wpadminbar .quicklinks li a:focus .blavatar,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar.mobile .quicklinks .ab-icon:before,#wpadminbar.mobile .quicklinks .ab-item:before{color:#a3b745}#wpadminbar.mobile .quicklinks .hover .ab-icon:before,#wpadminbar.mobile .quicklinks .hover .ab-item:before{color:#ece6f6}#wpadminbar #adminbarsearch:before{color:#ece6f6}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#fff;background:#634c84}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#634c84;background-color:#634c84}#wpadminbar #wp-admin-bar-user-info .display-name{color:#fff}#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#a3b745}#wpadminbar #wp-admin-bar-user-info .username{color:#cbc5d3}.wp-pointer .wp-pointer-content h3{background-color:#a3b745;border-color:#93a43e}.wp-pointer .wp-pointer-content h3:before{color:#a3b745}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner{border-bottom-color:#a3b745}.media-item .bar,.media-progress-bar div{background-color:#a3b745}.details.attachment{-webkit-box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #a3b745;box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #a3b745}.attachment.details .check{background-color:#a3b745;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #a3b745;box-shadow:0 0 0 1px #fff,0 0 0 2px #a3b745}.media-selection .attachment.selection.details .thumbnail{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 3px #a3b745;box-shadow:0 0 0 1px #fff,0 0 0 3px #a3b745}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme a:focus:after,.theme-browser .theme.add-new-theme a:hover:after{background:#a3b745}.theme-browser .theme.add-new-theme a:focus span:after,.theme-browser .theme.add-new-theme a:hover span:after{color:#a3b745}.theme-filter.current,.theme-section.current{border-bottom-color:#523f6d}body.more-filters-opened .more-filters{color:#fff;background-color:#523f6d}#customize-theme-controls .widget-area-select .selected,.widgets-chooser li.widgets-chooser-selected{background-color:#a3b745;color:#fff}body.more-filters-opened .more-filters:before{color:#fff}body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:hover{background-color:#a3b745;color:#fff}body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover:before{color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-footer-actions .devices button:focus{border-bottom-color:#a3b745}div#wp-responsive-toggle a:before{color:#ece6f6}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#a3b745}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#413256}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before{color:#ece6f6}.mce-container.mce-menu .mce-menu-item-normal.mce-active,.mce-container.mce-menu .mce-menu-item-preview.mce-active,.mce-container.mce-menu .mce-menu-item.mce-selected,.mce-container.mce-menu .mce-menu-item:focus,.mce-container.mce-menu .mce-menu-item:hover{background:#a3b745} \ No newline at end of file diff --git a/wp-admin/css/colors/light/colors-rtl.css b/wp-admin/css/colors/light/colors-rtl.css index bdb778d..5822584 100644 --- a/wp-admin/css/colors/light/colors-rtl.css +++ b/wp-admin/css/colors/light/colors-rtl.css @@ -3,337 +3,542 @@ * highlights/shadows, based on a base color. */ html { - background: #f5f5f5; } + background: #f5f5f5; +} /* Links */ a { - color: #0074a2; } - a:hover, a:active, a:focus { - color: #0099d5; } + color: #0073aa; +} + +a:hover, a:active, a:focus { + color: #0096dd; +} -#media-upload a.del-link:hover, div.dashboard-widget-submit input:hover, .subsubsub a:hover, .subsubsub a.current:hover { - color: #0099d5; } +#media-upload a.del-link:hover, +div.dashboard-widget-submit input:hover, +.subsubsub a:hover, +.subsubsub a.current:hover { + color: #0096dd; +} /* Forms */ input[type=checkbox]:checked:before { - color: #04a4cc; } + color: #04a4cc; +} input[type=radio]:checked:before { - background: #04a4cc; } + background: #04a4cc; +} -.wp-core-ui input[type="reset"]:hover, .wp-core-ui input[type="reset"]:active { - color: #0099d5; } +.wp-core-ui input[type="reset"]:hover, +.wp-core-ui input[type="reset"]:active { + color: #0096dd; +} /* Core UI */ .wp-core-ui .button-primary { background: #04a4cc; - border-color: #037c9a; + border-color: #037c9a #036881 #036881; + color: white; + -webkit-box-shadow: 0 1px 0 #036881; + box-shadow: 0 1px 0 #036881; + text-shadow: 0 -1px 1px #036881, -1px 0 1px #036881, 0 1px 1px #036881, 1px 0 1px #036881; +} + +.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { + background: #04b0db; + border-color: #036881; color: white; - -webkit-box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { - background: #0490b3; - border-color: #036881; - color: white; - -webkit-box-shadow: inset 0 1px 0 #09cafa, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #09cafa, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:active { - background: #037c9a; - border-color: #036881; - color: white; - -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); - box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); } - .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { - color: #c7cfd1 !important; - background: #0384a4 !important; - border-color: #036881 !important; - text-shadow: none !important; } + -webkit-box-shadow: 0 1px 0 #036881; + box-shadow: 0 1px 0 #036881; +} + +.wp-core-ui .button-primary:focus { + -webkit-box-shadow: inset 0 1px 0 #037c9a, 0 0 2px 1px #33b3db; + box-shadow: inset 0 1px 0 #037c9a, 0 0 2px 1px #33b3db; +} + +.wp-core-ui .button-primary:active { + background: #037c9a; + border-color: #036881; + -webkit-box-shadow: inset 0 2px 0 #036881; + box-shadow: inset 0 2px 0 #036881; +} + +.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { + color: #c7cfd1 !important; + background: #0384a4 !important; + border-color: #036881 !important; + text-shadow: none !important; +} + +.wp-core-ui .button-primary.button-hero { + -webkit-box-shadow: 0 2px 0 #036881 !important; + box-shadow: 0 2px 0 #036881 !important; +} + +.wp-core-ui .button-primary.button-hero:active { + -webkit-box-shadow: inset 0 3px 0 #036881 !important; + box-shadow: inset 0 3px 0 #036881 !important; +} + .wp-core-ui .wp-ui-primary { color: #333; - background-color: #e5e5e5; } + background-color: #e5e5e5; +} + .wp-core-ui .wp-ui-text-primary { - color: #e5e5e5; } + color: #e5e5e5; +} + .wp-core-ui .wp-ui-highlight { color: #fff; - background-color: #888; } + background-color: #888; +} + .wp-core-ui .wp-ui-text-highlight { - color: #888; } + color: #888; +} + .wp-core-ui .wp-ui-notification { color: #fff; - background-color: #d64e07; } + background-color: #d64e07; +} + .wp-core-ui .wp-ui-text-notification { - color: #d64e07; } + color: #d64e07; +} + .wp-core-ui .wp-ui-text-icon { - color: #999; } + color: #999; +} /* List tables */ -.wrap .add-new-h2:hover, #add-new-comment a:hover, .tablenav .tablenav-pages a:hover, .tablenav .tablenav-pages a:focus { +.wrap .add-new-h2:hover, +.wrap .page-title-action:hover, +.tablenav .tablenav-pages a:hover, +.tablenav .tablenav-pages a:focus { color: #333; - background-color: #e5e5e5; } + background-color: #e5e5e5; +} .view-switch a.current:before { - color: #e5e5e5; } + color: #e5e5e5; +} .view-switch a:hover:before { - color: #d64e07; } - -.post-com-count:hover:after { - border-top-color: #e5e5e5; } - -.post-com-count:hover span { - color: #333; - background-color: #e5e5e5; } - -strong .post-com-count:after { - border-top-color: #d64e07; } - -strong .post-com-count span { - background-color: #d64e07; } + color: #d64e07; +} /* Admin Menu */ -#adminmenuback, #adminmenuwrap, #adminmenu { - background: #e5e5e5; } +#adminmenuback, +#adminmenuwrap, +#adminmenu { + background: #e5e5e5; +} #adminmenu a { - color: #333; } + color: #333; +} #adminmenu div.wp-menu-image:before { - color: #999; } + color: #999; +} -#adminmenu a:hover, #adminmenu li.menu-top:hover, #adminmenu li.opensub > a.menu-top, #adminmenu li > a.menu-top:focus { +#adminmenu a:hover, +#adminmenu li.menu-top:hover, +#adminmenu li.opensub > a.menu-top, +#adminmenu li > a.menu-top:focus { color: #fff; - background-color: #888; } + background-color: #888; +} -#adminmenu li.menu-top:hover div.wp-menu-image:before, #adminmenu li.opensub > a.menu-top div.wp-menu-image:before { - color: #ccc; } +#adminmenu li.menu-top:hover div.wp-menu-image:before, +#adminmenu li.opensub > a.menu-top div.wp-menu-image:before { + color: #ccc; +} /* Active tabs use a bottom border color that matches the page background color. */ -.about-wrap h2 .nav-tab-active, .nav-tab-active, .nav-tab-active:hover { +.about-wrap h2 .nav-tab-active, +.nav-tab-active, +.nav-tab-active:hover { background-color: #f5f5f5; - border-bottom-color: #f5f5f5; } + border-bottom-color: #f5f5f5; +} /* Admin Menu: submenu */ -#adminmenu .wp-submenu, #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu .wp-has-current-submenu.opensub .wp-submenu, .folded #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu { - background: #fff; } +#adminmenu .wp-submenu, +#adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu, +.folded #adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu { + background: #fff; +} #adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after { - border-left-color: #fff; } + border-left-color: #fff; +} #adminmenu .wp-submenu .wp-submenu-head { - color: #686868; } - -#adminmenu .wp-submenu a, #adminmenu .wp-has-current-submenu .wp-submenu a, .folded #adminmenu .wp-has-current-submenu .wp-submenu a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a { - color: #686868; } - #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, #adminmenu .wp-has-current-submenu .wp-submenu a:focus, #adminmenu .wp-has-current-submenu .wp-submenu a:hover, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { - color: #04a4cc; } + color: #686868; +} + +#adminmenu .wp-submenu a, +#adminmenu .wp-has-current-submenu .wp-submenu a, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a { + color: #686868; +} + +#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu .wp-submenu a:hover, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { + color: #04a4cc; +} /* Admin Menu: current */ -#adminmenu .wp-submenu li.current a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { - color: #333; } - #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { - color: #04a4cc; } +#adminmenu .wp-submenu li.current a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { + color: #333; +} + +#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { + color: #04a4cc; +} -ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.current:after { - border-left-color: #f5f5f5; } +ul#adminmenu a.wp-has-current-submenu:after, +ul#adminmenu > li.current > a.current:after { + border-left-color: #f5f5f5; +} -#adminmenu li.current a.menu-top, #adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, #adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, .folded #adminmenu li.current.menu-top { +#adminmenu li.current a.menu-top, +#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, +#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, +.folded #adminmenu li.current.menu-top { color: #fff; - background: #888; } - -#adminmenu li.wp-has-current-submenu div.wp-menu-image:before { - color: #ccc; } + background: #888; +} + +#adminmenu li.wp-has-current-submenu div.wp-menu-image:before, +#adminmenu a.current:hover div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before, +#adminmenu li:hover div.wp-menu-image:before, +#adminmenu li a:focus div.wp-menu-image:before, +#adminmenu li.opensub div.wp-menu-image:before, +.ie8 #adminmenu li.opensub div.wp-menu-image:before { + color: #ccc; +} /* Admin Menu: bubble */ -#adminmenu .awaiting-mod, #adminmenu .update-plugins { +#adminmenu .awaiting-mod, +#adminmenu .update-plugins { color: #fff; - background: #d64e07; } + background: #d64e07; +} -#adminmenu li.current a .awaiting-mod, #adminmenu li a.wp-has-current-submenu .update-plugins, #adminmenu li:hover a .awaiting-mod, #adminmenu li.menu-top:hover > a .update-plugins { +#adminmenu li.current a .awaiting-mod, +#adminmenu li a.wp-has-current-submenu .update-plugins, +#adminmenu li:hover a .awaiting-mod, +#adminmenu li.menu-top:hover > a .update-plugins { color: #333; - background: #fff; } + background: #fff; +} /* Admin Menu: collapse button */ #collapse-menu { - color: #777; } + color: #777; +} #collapse-menu:hover { - color: #333; } + color: #333; +} #collapse-button div:after { - color: #999; } + color: #999; +} #collapse-menu:hover #collapse-button div:after { - color: #555; } + color: #555; +} /* Admin Bar */ #wpadminbar { color: #333; - background: #e5e5e5; } - -#wpadminbar .ab-item, #wpadminbar a.ab-item, #wpadminbar > #wp-toolbar span.ab-label, #wpadminbar > #wp-toolbar span.noticon { - color: #333; } + background: #e5e5e5; +} -#wpadminbar .ab-icon, #wpadminbar .ab-icon:before, #wpadminbar .ab-item:before, #wpadminbar .ab-item:after { - color: #999; } - -#wpadminbar .ab-top-menu > li:hover > .ab-item, #wpadminbar .ab-top-menu > li.hover > .ab-item, #wpadminbar .ab-top-menu > li > .ab-item:focus, #wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, #wpadminbar-nojs .ab-top-menu > li.menupop:hover > .ab-item, #wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { +#wpadminbar .ab-item, +#wpadminbar a.ab-item, +#wpadminbar > #wp-toolbar span.ab-label, +#wpadminbar > #wp-toolbar span.noticon { + color: #333; +} + +#wpadminbar .ab-icon, +#wpadminbar .ab-icon:before, +#wpadminbar .ab-item:before, +#wpadminbar .ab-item:after { + color: #999; +} + +#wpadminbar:not(.mobile) .ab-top-menu > li:hover > .ab-item, +#wpadminbar:not(.mobile) .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojs .ab-top-menu > li.menupop:hover > .ab-item, +#wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { color: #04a4cc; - background: #fff; } + background: #fff; +} -#wpadminbar > #wp-toolbar li:hover span.ab-label, #wpadminbar > #wp-toolbar li.hover span.ab-label, #wpadminbar > #wp-toolbar a:focus span.ab-label { - color: #04a4cc; } +#wpadminbar:not(.mobile) > #wp-toolbar li:hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar li.hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar a:focus span.ab-label { + color: #04a4cc; +} -#wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #ccc; } +#wpadminbar:not(.mobile) li:hover .ab-icon:before, +#wpadminbar:not(.mobile) li:hover .ab-item:before, +#wpadminbar:not(.mobile) li:hover .ab-item:after, +#wpadminbar:not(.mobile) li:hover #adminbarsearch:before { + color: #ccc; +} /* Admin Bar: submenu */ #wpadminbar .menupop .ab-sub-wrapper { - background: #fff; } - -#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, #wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { - background: #f6f7f7; } - -#wpadminbar .ab-submenu .ab-item, #wpadminbar .quicklinks .menupop ul li a, #wpadminbar .quicklinks .menupop.hover ul li a, #wpadminbar-nojs .quicklinks .menupop:hover ul li a { - color: #686868; } - -#wpadminbar .quicklinks li .blavatar, #wpadminbar .menupop .menupop > .ab-item:before { - color: #999; } - -#wpadminbar .quicklinks .menupop ul li a:hover, #wpadminbar .quicklinks .menupop ul li a:focus, #wpadminbar .quicklinks .menupop ul li a:hover strong, #wpadminbar .quicklinks .menupop ul li a:focus strong, #wpadminbar .quicklinks .menupop.hover ul li a:hover, #wpadminbar .quicklinks .menupop.hover ul li a:focus, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, #wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li a:focus .ab-icon:before, #wpadminbar li .ab-item:focus:before, #wpadminbar li.hover .ab-icon:before, #wpadminbar li.hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li.hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #04a4cc; } + background: #fff; +} + +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { + background: #f7f7f7; +} + +#wpadminbar .ab-submenu .ab-item, +#wpadminbar .quicklinks .menupop ul li a, +#wpadminbar .quicklinks .menupop.hover ul li a, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a { + color: #686868; +} + +#wpadminbar .quicklinks li .blavatar, +#wpadminbar .menupop .menupop > .ab-item:before { + color: #999; +} + +#wpadminbar .quicklinks .menupop ul li a:hover, +#wpadminbar .quicklinks .menupop ul li a:focus, +#wpadminbar .quicklinks .menupop ul li a:hover strong, +#wpadminbar .quicklinks .menupop ul li a:focus strong, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a, +#wpadminbar .quicklinks .menupop.hover ul li a:hover, +#wpadminbar .quicklinks .menupop.hover ul li a:focus, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, +#wpadminbar li:hover .ab-icon:before, +#wpadminbar li:hover .ab-item:before, +#wpadminbar li a:focus .ab-icon:before, +#wpadminbar li .ab-item:focus:before, +#wpadminbar li.hover .ab-icon:before, +#wpadminbar li.hover .ab-item:before, +#wpadminbar li:hover #adminbarsearch:before, +#wpadminbar li #adminbarsearch.adminbar-focused:before { + color: #04a4cc; +} + +#wpadminbar .quicklinks li a:hover .blavatar, +#wpadminbar .quicklinks li a:focus .blavatar, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar, +#wpadminbar .menupop .menupop > .ab-item:hover:before, +#wpadminbar.mobile .quicklinks .ab-icon:before, +#wpadminbar.mobile .quicklinks .ab-item:before { + color: #04a4cc; +} -#wpadminbar .quicklinks li a:hover .blavatar, #wpadminbar .menupop .menupop > .ab-item:hover:before { - color: #04a4cc; } +#wpadminbar.mobile .quicklinks .hover .ab-icon:before, +#wpadminbar.mobile .quicklinks .hover .ab-item:before { + color: #999; +} /* Admin Bar: search */ #wpadminbar #adminbarsearch:before { - color: #999; } + color: #999; +} #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus { color: #333; - background: #f7f7f7; } - -#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder { - color: #333; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder { - color: #333; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder { - color: #333; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder { - color: #333; - opacity: 0.7; } + background: #f7f7f7; +} /* Admin Bar: my account */ #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { border-color: #f7f7f7; - background-color: #f7f7f7; } + background-color: #f7f7f7; +} #wpadminbar #wp-admin-bar-user-info .display-name { - color: #333; } + color: #333; +} #wpadminbar #wp-admin-bar-user-info a:hover .display-name { - color: #04a4cc; } + color: #04a4cc; +} #wpadminbar #wp-admin-bar-user-info .username { - color: #686868; } + color: #686868; +} /* Pointers */ .wp-pointer .wp-pointer-content h3 { background-color: #04a4cc; - border-color: #0490b3; } + border-color: #0490b3; +} .wp-pointer .wp-pointer-content h3:before { - color: #04a4cc; } - -.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow { - border-bottom-color: #04a4cc; } - -/* Media Uploader */ -.media-item .bar, .media-progress-bar div { - background-color: #04a4cc; } + color: #04a4cc; +} + +.wp-pointer.wp-pointer-top .wp-pointer-arrow, +.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner { + border-bottom-color: #04a4cc; +} + +/* Media */ +.media-item .bar, +.media-progress-bar div { + background-color: #04a4cc; +} .details.attachment { - -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #04a4cc; - box-shadow: 0 0 0 1px #fff, 0 0 0 5px #04a4cc; } + -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #04a4cc; + box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #04a4cc; +} .attachment.details .check { background-color: #04a4cc; -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #04a4cc; - box-shadow: 0 0 0 1px #fff, 0 0 0 2px #04a4cc; } + box-shadow: 0 0 0 1px #fff, 0 0 0 2px #04a4cc; +} + +.media-selection .attachment.selection.details .thumbnail { + -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #04a4cc; + box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #04a4cc; +} /* Themes */ -.theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after { - background: #04a4cc; } +.theme-browser .theme.active .theme-name, +.theme-browser .theme.add-new-theme a:hover:after, +.theme-browser .theme.add-new-theme a:focus:after { + background: #04a4cc; +} -.theme-browser .theme.add-new-theme:hover span:after { - color: #04a4cc; } +.theme-browser .theme.add-new-theme a:hover span:after, +.theme-browser .theme.add-new-theme a:focus span:after { + color: #04a4cc; +} -.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover { - background: #04a4cc; } +.theme-section.current, +.theme-filter.current { + border-bottom-color: #e5e5e5; +} -.theme-section.current, .theme-filter.current { - border-bottom-color: #e5e5e5; } +body.more-filters-opened .more-filters { + color: #333; + background-color: #e5e5e5; +} -body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before { +body.more-filters-opened .more-filters:before { color: #333; - background-color: #e5e5e5; } +} -body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before { +body.more-filters-opened .more-filters:hover, +body.more-filters-opened .more-filters:focus { background-color: #888; - color: #fff; } + color: #fff; +} + +body.more-filters-opened .more-filters:hover:before, +body.more-filters-opened .more-filters:focus:before { + color: #fff; +} /* Widgets */ .widgets-chooser li.widgets-chooser-selected { background-color: #888; - color: #fff; } + color: #fff; +} -.widgets-chooser li.widgets-chooser-selected:before, .widgets-chooser li.widgets-chooser-selected:focus:before { - color: #fff; } +.widgets-chooser li.widgets-chooser-selected:before, +.widgets-chooser li.widgets-chooser-selected:focus:before { + color: #fff; +} /* Customize */ #customize-theme-controls .widget-area-select .selected { background-color: #888; - color: #fff; } - -/* jQuery UI Slider */ -.wp-slider .ui-slider-handle, .wp-slider .ui-slider-handle.ui-state-hover, .wp-slider .ui-slider-handle.focus { - background: #04a4cc; - border-color: #037c9a; - -webkit-box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15); } - -/* Thickbox: Plugin information */ -#sidemenu a.current { - background: #f5f5f5; - border-bottom-color: #f5f5f5; } + color: #fff; +} -#plugin-information .action-button { - background: #04a4cc; } +#customize-footer-actions .devices button:focus { + border-bottom-color: #04a4cc; +} /* Responsive Component */ div#wp-responsive-toggle a:before { - color: #999; } + color: #999; +} .wp-responsive-open div#wp-responsive-toggle a { border-color: transparent; - background: #888; } - -.star-rating .star { - color: #04a4cc; } + background: #888; +} .wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a { - background: #fff; } + background: #fff; +} + +.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before { + color: #999; +} + +/* TinyMCE */ +.mce-container.mce-menu .mce-menu-item:hover, +.mce-container.mce-menu .mce-menu-item.mce-selected, +.mce-container.mce-menu .mce-menu-item:focus, +.mce-container.mce-menu .mce-menu-item-normal.mce-active, +.mce-container.mce-menu .mce-menu-item-preview.mce-active { + background: #04a4cc; +} /* temporary fix for admin-bar hover color */ -#wpadminbar .ab-top-menu > li:hover > .ab-item, #wpadminbar .ab-top-menu > li.hover > .ab-item, #wpadminbar > #wp-toolbar > #wp-admin-bar-root-default li:hover span.ab-label, #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary li.hover span.ab-label, #wpadminbar .ab-top-menu > li > .ab-item:focus, #wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, #wpadminbar-nojs .ab-top-menu > li.menupop:hover > .ab-item, #wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { - color: #333; } +#wpadminbar .ab-top-menu > li:hover > .ab-item, +#wpadminbar .ab-top-menu > li.hover > .ab-item, +#wpadminbar > #wp-toolbar > #wp-admin-bar-root-default li:hover span.ab-label, +#wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary li.hover span.ab-label, +#wpadminbar .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojs .ab-top-menu > li.menupop:hover > .ab-item, +#wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { + color: #333; +} /* Override the theme filter highlight color for this scheme */ -.theme-section.current, .theme-filter.current { - border-bottom-color: #04a4cc; } +.theme-section.current, +.theme-filter.current { + border-bottom-color: #04a4cc; +} diff --git a/wp-admin/css/colors/light/colors-rtl.min.css b/wp-admin/css/colors/light/colors-rtl.min.css index b0519d1..d0f6603 100644 --- a/wp-admin/css/colors/light/colors-rtl.min.css +++ b/wp-admin/css/colors/light/colors-rtl.min.css @@ -1 +1 @@ -html{background:#f5f5f5}a{color:#0074a2}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,a:active,a:focus,a:hover,div.dashboard-widget-submit input:hover{color:#0099d5}input[type=checkbox]:checked:before{color:#04a4cc}input[type=radio]:checked:before{background:#04a4cc}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0099d5}.wp-core-ui .button-primary{background:#04a4cc;border-color:#037c9a;color:#fff;-webkit-box-shadow:inset 0 1px 0 #22cffb,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #22cffb,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#0490b3;border-color:#036881;color:#fff;-webkit-box-shadow:inset 0 1px 0 #09cafa,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #09cafa,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:active{background:#037c9a;border-color:#036881;color:#fff;-webkit-box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5);box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5)}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#c7cfd1!important;background:#0384a4!important;border-color:#036881!important;text-shadow:none!important}.wp-core-ui .wp-ui-primary{color:#333;background-color:#e5e5e5}.wp-core-ui .wp-ui-text-primary{color:#e5e5e5}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#888}.wp-core-ui .wp-ui-text-highlight{color:#888}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#d64e07}.wp-core-ui .wp-ui-text-notification{color:#d64e07}.wp-core-ui .wp-ui-text-icon{color:#999}#add-new-comment a:hover,.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover{color:#333;background-color:#e5e5e5}.view-switch a.current:before{color:#e5e5e5}.view-switch a:hover:before{color:#d64e07}.post-com-count:hover:after{border-top-color:#e5e5e5}.post-com-count:hover span{color:#333;background-color:#e5e5e5}strong .post-com-count:after{border-top-color:#d64e07}strong .post-com-count span{background-color:#d64e07}#adminmenu,#adminmenuback,#adminmenuwrap{background:#e5e5e5}#adminmenu a{color:#333}#adminmenu div.wp-menu-image:before{color:#999}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#888}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#ccc}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f5f5f5;border-bottom-color:#f5f5f5}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#fff}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-left-color:#fff}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu .wp-submenu-head,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#686868}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#04a4cc}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#333}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#04a4cc}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-left-color:#f5f5f5}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#888}#adminmenu li.wp-has-current-submenu div.wp-menu-image:before{color:#ccc}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#d64e07}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#333;background:#fff}#collapse-menu{color:#777}#collapse-menu:hover{color:#333}#collapse-button div:after{color:#999}#collapse-menu:hover #collapse-button div:after{color:#555}#wpadminbar{color:#333;background:#e5e5e5}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#333}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#999}#wpadminbar .ab-top-menu>li.hover>.ab-item,#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar .ab-top-menu>li:hover>.ab-item,#wpadminbar .ab-top-menu>li>.ab-item:focus,#wpadminbar-nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus{background:#fff}#wpadminbar>#wp-toolbar a:focus span.ab-label,#wpadminbar>#wp-toolbar li.hover span.ab-label,#wpadminbar>#wp-toolbar li:hover span.ab-label{color:#04a4cc}#wpadminbar .menupop .ab-sub-wrapper{background:#fff}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#f6f7f7}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar-nojs .quicklinks .menupop:hover ul li a{color:#686868}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#999}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:after,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:after,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#04a4cc}#wpadminbar #adminbarsearch:before{color:#999}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#333;background:#f7f7f7}#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder{color:#333;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder{color:#333;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder{color:#333;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder{color:#333;opacity:.7}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#f7f7f7;background-color:#f7f7f7}#wpadminbar #wp-admin-bar-user-info .display-name{color:#333}#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#04a4cc}#wpadminbar #wp-admin-bar-user-info .username{color:#686868}.wp-pointer .wp-pointer-content h3{background-color:#04a4cc;border-color:#0490b3}.wp-pointer .wp-pointer-content h3:before{color:#04a4cc}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow{border-bottom-color:#04a4cc}.media-item .bar,.media-progress-bar div{background-color:#04a4cc}.details.attachment{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 5px #04a4cc;box-shadow:0 0 0 1px #fff,0 0 0 5px #04a4cc}.attachment.details .check{background-color:#04a4cc;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #04a4cc;box-shadow:0 0 0 1px #fff,0 0 0 2px #04a4cc}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme:hover:after{background:#04a4cc}.theme-browser .theme.add-new-theme:hover span:after{color:#04a4cc}.theme-overlay .theme-header .close:hover,.theme-overlay .theme-header .left:hover,.theme-overlay .theme-header .right:hover{background:#04a4cc}body.more-filters-opened .more-filters,body.more-filters-opened .more-filters:before{color:#333;background-color:#e5e5e5}.widgets-chooser li.widgets-chooser-selected,body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover,body.more-filters-opened .more-filters:hover:before{background-color:#888;color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-theme-controls .widget-area-select .selected{background-color:#888;color:#fff}.wp-slider .ui-slider-handle,.wp-slider .ui-slider-handle.focus,.wp-slider .ui-slider-handle.ui-state-hover{background:#04a4cc;border-color:#037c9a;-webkit-box-shadow:inset 0 1px 0 #22cffb,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #22cffb,0 1px 0 rgba(0,0,0,.15)}#sidemenu a.current{background:#f5f5f5;border-bottom-color:#f5f5f5}#plugin-information .action-button{background:#04a4cc}div#wp-responsive-toggle a:before{color:#999}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#888}.star-rating .star{color:#04a4cc}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#fff}#wpadminbar .ab-top-menu>li.hover>.ab-item,#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar .ab-top-menu>li:hover>.ab-item,#wpadminbar .ab-top-menu>li>.ab-item:focus,#wpadminbar-nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus,#wpadminbar>#wp-toolbar>#wp-admin-bar-root-default li:hover span.ab-label,#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary li.hover span.ab-label{color:#333}.theme-filter.current,.theme-section.current{border-bottom-color:#04a4cc} \ No newline at end of file +html{background:#f5f5f5}a{color:#0073aa}a:active,a:focus,a:hover{color:#0096dd}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,div.dashboard-widget-submit input:hover{color:#0096dd}input[type=checkbox]:checked:before{color:#04a4cc}input[type=radio]:checked:before{background:#04a4cc}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0096dd}.wp-core-ui .button-primary{background:#04a4cc;border-color:#037c9a #036881 #036881;color:#fff;-webkit-box-shadow:0 1px 0 #036881;box-shadow:0 1px 0 #036881;text-shadow:0 -1px 1px #036881,-1px 0 1px #036881,0 1px 1px #036881,1px 0 1px #036881}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#04b0db;border-color:#036881;color:#fff;-webkit-box-shadow:0 1px 0 #036881;box-shadow:0 1px 0 #036881}.wp-core-ui .button-primary:focus{-webkit-box-shadow:inset 0 1px 0 #037c9a,0 0 2px 1px #33b3db;box-shadow:inset 0 1px 0 #037c9a,0 0 2px 1px #33b3db}.wp-core-ui .button-primary:active{background:#037c9a;border-color:#036881;-webkit-box-shadow:inset 0 2px 0 #036881;box-shadow:inset 0 2px 0 #036881}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#c7cfd1!important;background:#0384a4!important;border-color:#036881!important;text-shadow:none!important}.wp-core-ui .button-primary.button-hero{-webkit-box-shadow:0 2px 0 #036881!important;box-shadow:0 2px 0 #036881!important}.wp-core-ui .button-primary.button-hero:active{-webkit-box-shadow:inset 0 3px 0 #036881!important;box-shadow:inset 0 3px 0 #036881!important}.wp-core-ui .wp-ui-primary{color:#333;background-color:#e5e5e5}.wp-core-ui .wp-ui-text-primary{color:#e5e5e5}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#888}.wp-core-ui .wp-ui-text-highlight{color:#888}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#d64e07}.wp-core-ui .wp-ui-text-notification{color:#d64e07}.wp-core-ui .wp-ui-text-icon{color:#999}.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover,.wrap .page-title-action:hover{color:#333;background-color:#e5e5e5}.view-switch a.current:before{color:#e5e5e5}.view-switch a:hover:before{color:#d64e07}#adminmenu,#adminmenuback,#adminmenuwrap{background:#e5e5e5}#adminmenu a{color:#333}#adminmenu div.wp-menu-image:before{color:#999}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#888}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#ccc}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f5f5f5;border-bottom-color:#f5f5f5}.theme-filter.current,.theme-section.current,.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner{border-bottom-color:#04a4cc}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#fff}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-left-color:#fff}#adminmenu .wp-submenu .wp-submenu-head{color:#686868}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#686868}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#04a4cc}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#333}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#04a4cc}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-left-color:#f5f5f5}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#888}#adminmenu a.current:hover div.wp-menu-image:before,#adminmenu li a:focus div.wp-menu-image:before,#adminmenu li.opensub div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,#adminmenu li:hover div.wp-menu-image:before,.ie8 #adminmenu li.opensub div.wp-menu-image:before{color:#ccc}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#d64e07}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#333;background:#fff}#collapse-menu{color:#777}#collapse-menu:hover,#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#333}#collapse-button div:after{color:#999}#collapse-menu:hover #collapse-button div:after{color:#555}#wpadminbar{color:#333;background:#e5e5e5}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#999}#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus,#wpadminbar.nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li>.ab-item:focus{color:#04a4cc;background:#fff}#wpadminbar:not(.mobile)>#wp-toolbar a:focus span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li.hover span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li:hover span.ab-label{color:#04a4cc}#wpadminbar:not(.mobile) li:hover #adminbarsearch:before,#wpadminbar:not(.mobile) li:hover .ab-icon:before,#wpadminbar:not(.mobile) li:hover .ab-item:after,#wpadminbar:not(.mobile) li:hover .ab-item:before{color:#ccc}#wpadminbar .menupop .ab-sub-wrapper{background:#fff}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#f7f7f7}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar.nojs .quicklinks .menupop:hover ul li a{color:#686868}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#999}#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar li #adminbarsearch.adminbar-focused:before,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#04a4cc}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a .blavatar,#wpadminbar .quicklinks li a:focus .blavatar,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar.mobile .quicklinks .ab-icon:before,#wpadminbar.mobile .quicklinks .ab-item:before{color:#04a4cc}#wpadminbar.mobile .quicklinks .hover .ab-icon:before,#wpadminbar.mobile .quicklinks .hover .ab-item:before{color:#999}#wpadminbar #adminbarsearch:before{color:#999}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#333;background:#f7f7f7}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#f7f7f7;background-color:#f7f7f7}#wpadminbar #wp-admin-bar-user-info .display-name{color:#333}#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#04a4cc}#wpadminbar #wp-admin-bar-user-info .username{color:#686868}.wp-pointer .wp-pointer-content h3{background-color:#04a4cc;border-color:#0490b3}.wp-pointer .wp-pointer-content h3:before{color:#04a4cc}.media-item .bar,.media-progress-bar div{background-color:#04a4cc}.details.attachment{-webkit-box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #04a4cc;box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #04a4cc}.attachment.details .check{background-color:#04a4cc;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #04a4cc;box-shadow:0 0 0 1px #fff,0 0 0 2px #04a4cc}.media-selection .attachment.selection.details .thumbnail{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 3px #04a4cc;box-shadow:0 0 0 1px #fff,0 0 0 3px #04a4cc}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme a:focus:after,.theme-browser .theme.add-new-theme a:hover:after{background:#04a4cc}.theme-browser .theme.add-new-theme a:focus span:after,.theme-browser .theme.add-new-theme a:hover span:after{color:#04a4cc}body.more-filters-opened .more-filters{color:#333;background-color:#e5e5e5}body.more-filters-opened .more-filters:before{color:#333}#customize-theme-controls .widget-area-select .selected,.widgets-chooser li.widgets-chooser-selected{background-color:#888;color:#fff}body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:hover{background-color:#888;color:#fff}body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover:before{color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-footer-actions .devices button:focus{border-bottom-color:#04a4cc}div#wp-responsive-toggle a:before{color:#999}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#888}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#fff}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before{color:#999}.mce-container.mce-menu .mce-menu-item-normal.mce-active,.mce-container.mce-menu .mce-menu-item-preview.mce-active,.mce-container.mce-menu .mce-menu-item.mce-selected,.mce-container.mce-menu .mce-menu-item:focus,.mce-container.mce-menu .mce-menu-item:hover{background:#04a4cc}#wpadminbar .ab-top-menu>li.hover>.ab-item,#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar .ab-top-menu>li:hover>.ab-item,#wpadminbar .ab-top-menu>li>.ab-item:focus,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus,#wpadminbar.nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar>#wp-toolbar>#wp-admin-bar-root-default li:hover span.ab-label,#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary li.hover span.ab-label{color:#333} \ No newline at end of file diff --git a/wp-admin/css/colors/light/colors.css b/wp-admin/css/colors/light/colors.css index ca83d94..d1b05dd 100644 --- a/wp-admin/css/colors/light/colors.css +++ b/wp-admin/css/colors/light/colors.css @@ -3,337 +3,542 @@ * highlights/shadows, based on a base color. */ html { - background: #f5f5f5; } + background: #f5f5f5; +} /* Links */ a { - color: #0074a2; } - a:hover, a:active, a:focus { - color: #0099d5; } + color: #0073aa; +} + +a:hover, a:active, a:focus { + color: #0096dd; +} -#media-upload a.del-link:hover, div.dashboard-widget-submit input:hover, .subsubsub a:hover, .subsubsub a.current:hover { - color: #0099d5; } +#media-upload a.del-link:hover, +div.dashboard-widget-submit input:hover, +.subsubsub a:hover, +.subsubsub a.current:hover { + color: #0096dd; +} /* Forms */ input[type=checkbox]:checked:before { - color: #04a4cc; } + color: #04a4cc; +} input[type=radio]:checked:before { - background: #04a4cc; } + background: #04a4cc; +} -.wp-core-ui input[type="reset"]:hover, .wp-core-ui input[type="reset"]:active { - color: #0099d5; } +.wp-core-ui input[type="reset"]:hover, +.wp-core-ui input[type="reset"]:active { + color: #0096dd; +} /* Core UI */ .wp-core-ui .button-primary { background: #04a4cc; - border-color: #037c9a; + border-color: #037c9a #036881 #036881; + color: white; + -webkit-box-shadow: 0 1px 0 #036881; + box-shadow: 0 1px 0 #036881; + text-shadow: 0 -1px 1px #036881, 1px 0 1px #036881, 0 1px 1px #036881, -1px 0 1px #036881; +} + +.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { + background: #04b0db; + border-color: #036881; color: white; - -webkit-box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { - background: #0490b3; - border-color: #036881; - color: white; - -webkit-box-shadow: inset 0 1px 0 #09cafa, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #09cafa, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:active { - background: #037c9a; - border-color: #036881; - color: white; - -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); - box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); } - .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { - color: #c7cfd1 !important; - background: #0384a4 !important; - border-color: #036881 !important; - text-shadow: none !important; } + -webkit-box-shadow: 0 1px 0 #036881; + box-shadow: 0 1px 0 #036881; +} + +.wp-core-ui .button-primary:focus { + -webkit-box-shadow: inset 0 1px 0 #037c9a, 0 0 2px 1px #33b3db; + box-shadow: inset 0 1px 0 #037c9a, 0 0 2px 1px #33b3db; +} + +.wp-core-ui .button-primary:active { + background: #037c9a; + border-color: #036881; + -webkit-box-shadow: inset 0 2px 0 #036881; + box-shadow: inset 0 2px 0 #036881; +} + +.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { + color: #c7cfd1 !important; + background: #0384a4 !important; + border-color: #036881 !important; + text-shadow: none !important; +} + +.wp-core-ui .button-primary.button-hero { + -webkit-box-shadow: 0 2px 0 #036881 !important; + box-shadow: 0 2px 0 #036881 !important; +} + +.wp-core-ui .button-primary.button-hero:active { + -webkit-box-shadow: inset 0 3px 0 #036881 !important; + box-shadow: inset 0 3px 0 #036881 !important; +} + .wp-core-ui .wp-ui-primary { color: #333; - background-color: #e5e5e5; } + background-color: #e5e5e5; +} + .wp-core-ui .wp-ui-text-primary { - color: #e5e5e5; } + color: #e5e5e5; +} + .wp-core-ui .wp-ui-highlight { color: #fff; - background-color: #888; } + background-color: #888; +} + .wp-core-ui .wp-ui-text-highlight { - color: #888; } + color: #888; +} + .wp-core-ui .wp-ui-notification { color: #fff; - background-color: #d64e07; } + background-color: #d64e07; +} + .wp-core-ui .wp-ui-text-notification { - color: #d64e07; } + color: #d64e07; +} + .wp-core-ui .wp-ui-text-icon { - color: #999; } + color: #999; +} /* List tables */ -.wrap .add-new-h2:hover, #add-new-comment a:hover, .tablenav .tablenav-pages a:hover, .tablenav .tablenav-pages a:focus { +.wrap .add-new-h2:hover, +.wrap .page-title-action:hover, +.tablenav .tablenav-pages a:hover, +.tablenav .tablenav-pages a:focus { color: #333; - background-color: #e5e5e5; } + background-color: #e5e5e5; +} .view-switch a.current:before { - color: #e5e5e5; } + color: #e5e5e5; +} .view-switch a:hover:before { - color: #d64e07; } - -.post-com-count:hover:after { - border-top-color: #e5e5e5; } - -.post-com-count:hover span { - color: #333; - background-color: #e5e5e5; } - -strong .post-com-count:after { - border-top-color: #d64e07; } - -strong .post-com-count span { - background-color: #d64e07; } + color: #d64e07; +} /* Admin Menu */ -#adminmenuback, #adminmenuwrap, #adminmenu { - background: #e5e5e5; } +#adminmenuback, +#adminmenuwrap, +#adminmenu { + background: #e5e5e5; +} #adminmenu a { - color: #333; } + color: #333; +} #adminmenu div.wp-menu-image:before { - color: #999; } + color: #999; +} -#adminmenu a:hover, #adminmenu li.menu-top:hover, #adminmenu li.opensub > a.menu-top, #adminmenu li > a.menu-top:focus { +#adminmenu a:hover, +#adminmenu li.menu-top:hover, +#adminmenu li.opensub > a.menu-top, +#adminmenu li > a.menu-top:focus { color: #fff; - background-color: #888; } + background-color: #888; +} -#adminmenu li.menu-top:hover div.wp-menu-image:before, #adminmenu li.opensub > a.menu-top div.wp-menu-image:before { - color: #ccc; } +#adminmenu li.menu-top:hover div.wp-menu-image:before, +#adminmenu li.opensub > a.menu-top div.wp-menu-image:before { + color: #ccc; +} /* Active tabs use a bottom border color that matches the page background color. */ -.about-wrap h2 .nav-tab-active, .nav-tab-active, .nav-tab-active:hover { +.about-wrap h2 .nav-tab-active, +.nav-tab-active, +.nav-tab-active:hover { background-color: #f5f5f5; - border-bottom-color: #f5f5f5; } + border-bottom-color: #f5f5f5; +} /* Admin Menu: submenu */ -#adminmenu .wp-submenu, #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu .wp-has-current-submenu.opensub .wp-submenu, .folded #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu { - background: #fff; } +#adminmenu .wp-submenu, +#adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu, +.folded #adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu { + background: #fff; +} #adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after { - border-right-color: #fff; } + border-right-color: #fff; +} #adminmenu .wp-submenu .wp-submenu-head { - color: #686868; } - -#adminmenu .wp-submenu a, #adminmenu .wp-has-current-submenu .wp-submenu a, .folded #adminmenu .wp-has-current-submenu .wp-submenu a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a { - color: #686868; } - #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, #adminmenu .wp-has-current-submenu .wp-submenu a:focus, #adminmenu .wp-has-current-submenu .wp-submenu a:hover, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { - color: #04a4cc; } + color: #686868; +} + +#adminmenu .wp-submenu a, +#adminmenu .wp-has-current-submenu .wp-submenu a, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a { + color: #686868; +} + +#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu .wp-submenu a:hover, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { + color: #04a4cc; +} /* Admin Menu: current */ -#adminmenu .wp-submenu li.current a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { - color: #333; } - #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { - color: #04a4cc; } +#adminmenu .wp-submenu li.current a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { + color: #333; +} + +#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { + color: #04a4cc; +} -ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.current:after { - border-right-color: #f5f5f5; } +ul#adminmenu a.wp-has-current-submenu:after, +ul#adminmenu > li.current > a.current:after { + border-right-color: #f5f5f5; +} -#adminmenu li.current a.menu-top, #adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, #adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, .folded #adminmenu li.current.menu-top { +#adminmenu li.current a.menu-top, +#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, +#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, +.folded #adminmenu li.current.menu-top { color: #fff; - background: #888; } - -#adminmenu li.wp-has-current-submenu div.wp-menu-image:before { - color: #ccc; } + background: #888; +} + +#adminmenu li.wp-has-current-submenu div.wp-menu-image:before, +#adminmenu a.current:hover div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before, +#adminmenu li:hover div.wp-menu-image:before, +#adminmenu li a:focus div.wp-menu-image:before, +#adminmenu li.opensub div.wp-menu-image:before, +.ie8 #adminmenu li.opensub div.wp-menu-image:before { + color: #ccc; +} /* Admin Menu: bubble */ -#adminmenu .awaiting-mod, #adminmenu .update-plugins { +#adminmenu .awaiting-mod, +#adminmenu .update-plugins { color: #fff; - background: #d64e07; } + background: #d64e07; +} -#adminmenu li.current a .awaiting-mod, #adminmenu li a.wp-has-current-submenu .update-plugins, #adminmenu li:hover a .awaiting-mod, #adminmenu li.menu-top:hover > a .update-plugins { +#adminmenu li.current a .awaiting-mod, +#adminmenu li a.wp-has-current-submenu .update-plugins, +#adminmenu li:hover a .awaiting-mod, +#adminmenu li.menu-top:hover > a .update-plugins { color: #333; - background: #fff; } + background: #fff; +} /* Admin Menu: collapse button */ #collapse-menu { - color: #777; } + color: #777; +} #collapse-menu:hover { - color: #333; } + color: #333; +} #collapse-button div:after { - color: #999; } + color: #999; +} #collapse-menu:hover #collapse-button div:after { - color: #555; } + color: #555; +} /* Admin Bar */ #wpadminbar { color: #333; - background: #e5e5e5; } - -#wpadminbar .ab-item, #wpadminbar a.ab-item, #wpadminbar > #wp-toolbar span.ab-label, #wpadminbar > #wp-toolbar span.noticon { - color: #333; } + background: #e5e5e5; +} -#wpadminbar .ab-icon, #wpadminbar .ab-icon:before, #wpadminbar .ab-item:before, #wpadminbar .ab-item:after { - color: #999; } - -#wpadminbar .ab-top-menu > li:hover > .ab-item, #wpadminbar .ab-top-menu > li.hover > .ab-item, #wpadminbar .ab-top-menu > li > .ab-item:focus, #wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, #wpadminbar-nojs .ab-top-menu > li.menupop:hover > .ab-item, #wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { +#wpadminbar .ab-item, +#wpadminbar a.ab-item, +#wpadminbar > #wp-toolbar span.ab-label, +#wpadminbar > #wp-toolbar span.noticon { + color: #333; +} + +#wpadminbar .ab-icon, +#wpadminbar .ab-icon:before, +#wpadminbar .ab-item:before, +#wpadminbar .ab-item:after { + color: #999; +} + +#wpadminbar:not(.mobile) .ab-top-menu > li:hover > .ab-item, +#wpadminbar:not(.mobile) .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojs .ab-top-menu > li.menupop:hover > .ab-item, +#wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { color: #04a4cc; - background: #fff; } + background: #fff; +} -#wpadminbar > #wp-toolbar li:hover span.ab-label, #wpadminbar > #wp-toolbar li.hover span.ab-label, #wpadminbar > #wp-toolbar a:focus span.ab-label { - color: #04a4cc; } +#wpadminbar:not(.mobile) > #wp-toolbar li:hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar li.hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar a:focus span.ab-label { + color: #04a4cc; +} -#wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #ccc; } +#wpadminbar:not(.mobile) li:hover .ab-icon:before, +#wpadminbar:not(.mobile) li:hover .ab-item:before, +#wpadminbar:not(.mobile) li:hover .ab-item:after, +#wpadminbar:not(.mobile) li:hover #adminbarsearch:before { + color: #ccc; +} /* Admin Bar: submenu */ #wpadminbar .menupop .ab-sub-wrapper { - background: #fff; } - -#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, #wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { - background: #f6f7f7; } - -#wpadminbar .ab-submenu .ab-item, #wpadminbar .quicklinks .menupop ul li a, #wpadminbar .quicklinks .menupop.hover ul li a, #wpadminbar-nojs .quicklinks .menupop:hover ul li a { - color: #686868; } - -#wpadminbar .quicklinks li .blavatar, #wpadminbar .menupop .menupop > .ab-item:before { - color: #999; } - -#wpadminbar .quicklinks .menupop ul li a:hover, #wpadminbar .quicklinks .menupop ul li a:focus, #wpadminbar .quicklinks .menupop ul li a:hover strong, #wpadminbar .quicklinks .menupop ul li a:focus strong, #wpadminbar .quicklinks .menupop.hover ul li a:hover, #wpadminbar .quicklinks .menupop.hover ul li a:focus, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, #wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li a:focus .ab-icon:before, #wpadminbar li .ab-item:focus:before, #wpadminbar li.hover .ab-icon:before, #wpadminbar li.hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li.hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #04a4cc; } + background: #fff; +} + +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { + background: #f7f7f7; +} + +#wpadminbar .ab-submenu .ab-item, +#wpadminbar .quicklinks .menupop ul li a, +#wpadminbar .quicklinks .menupop.hover ul li a, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a { + color: #686868; +} + +#wpadminbar .quicklinks li .blavatar, +#wpadminbar .menupop .menupop > .ab-item:before { + color: #999; +} + +#wpadminbar .quicklinks .menupop ul li a:hover, +#wpadminbar .quicklinks .menupop ul li a:focus, +#wpadminbar .quicklinks .menupop ul li a:hover strong, +#wpadminbar .quicklinks .menupop ul li a:focus strong, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a, +#wpadminbar .quicklinks .menupop.hover ul li a:hover, +#wpadminbar .quicklinks .menupop.hover ul li a:focus, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, +#wpadminbar li:hover .ab-icon:before, +#wpadminbar li:hover .ab-item:before, +#wpadminbar li a:focus .ab-icon:before, +#wpadminbar li .ab-item:focus:before, +#wpadminbar li.hover .ab-icon:before, +#wpadminbar li.hover .ab-item:before, +#wpadminbar li:hover #adminbarsearch:before, +#wpadminbar li #adminbarsearch.adminbar-focused:before { + color: #04a4cc; +} + +#wpadminbar .quicklinks li a:hover .blavatar, +#wpadminbar .quicklinks li a:focus .blavatar, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar, +#wpadminbar .menupop .menupop > .ab-item:hover:before, +#wpadminbar.mobile .quicklinks .ab-icon:before, +#wpadminbar.mobile .quicklinks .ab-item:before { + color: #04a4cc; +} -#wpadminbar .quicklinks li a:hover .blavatar, #wpadminbar .menupop .menupop > .ab-item:hover:before { - color: #04a4cc; } +#wpadminbar.mobile .quicklinks .hover .ab-icon:before, +#wpadminbar.mobile .quicklinks .hover .ab-item:before { + color: #999; +} /* Admin Bar: search */ #wpadminbar #adminbarsearch:before { - color: #999; } + color: #999; +} #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus { color: #333; - background: #f7f7f7; } - -#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder { - color: #333; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder { - color: #333; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder { - color: #333; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder { - color: #333; - opacity: 0.7; } + background: #f7f7f7; +} /* Admin Bar: my account */ #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { border-color: #f7f7f7; - background-color: #f7f7f7; } + background-color: #f7f7f7; +} #wpadminbar #wp-admin-bar-user-info .display-name { - color: #333; } + color: #333; +} #wpadminbar #wp-admin-bar-user-info a:hover .display-name { - color: #04a4cc; } + color: #04a4cc; +} #wpadminbar #wp-admin-bar-user-info .username { - color: #686868; } + color: #686868; +} /* Pointers */ .wp-pointer .wp-pointer-content h3 { background-color: #04a4cc; - border-color: #0490b3; } + border-color: #0490b3; +} .wp-pointer .wp-pointer-content h3:before { - color: #04a4cc; } - -.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow { - border-bottom-color: #04a4cc; } - -/* Media Uploader */ -.media-item .bar, .media-progress-bar div { - background-color: #04a4cc; } + color: #04a4cc; +} + +.wp-pointer.wp-pointer-top .wp-pointer-arrow, +.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner { + border-bottom-color: #04a4cc; +} + +/* Media */ +.media-item .bar, +.media-progress-bar div { + background-color: #04a4cc; +} .details.attachment { - -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #04a4cc; - box-shadow: 0 0 0 1px #fff, 0 0 0 5px #04a4cc; } + -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #04a4cc; + box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #04a4cc; +} .attachment.details .check { background-color: #04a4cc; -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #04a4cc; - box-shadow: 0 0 0 1px #fff, 0 0 0 2px #04a4cc; } + box-shadow: 0 0 0 1px #fff, 0 0 0 2px #04a4cc; +} + +.media-selection .attachment.selection.details .thumbnail { + -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #04a4cc; + box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #04a4cc; +} /* Themes */ -.theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after { - background: #04a4cc; } +.theme-browser .theme.active .theme-name, +.theme-browser .theme.add-new-theme a:hover:after, +.theme-browser .theme.add-new-theme a:focus:after { + background: #04a4cc; +} -.theme-browser .theme.add-new-theme:hover span:after { - color: #04a4cc; } +.theme-browser .theme.add-new-theme a:hover span:after, +.theme-browser .theme.add-new-theme a:focus span:after { + color: #04a4cc; +} -.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover { - background: #04a4cc; } +.theme-section.current, +.theme-filter.current { + border-bottom-color: #e5e5e5; +} -.theme-section.current, .theme-filter.current { - border-bottom-color: #e5e5e5; } +body.more-filters-opened .more-filters { + color: #333; + background-color: #e5e5e5; +} -body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before { +body.more-filters-opened .more-filters:before { color: #333; - background-color: #e5e5e5; } +} -body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before { +body.more-filters-opened .more-filters:hover, +body.more-filters-opened .more-filters:focus { background-color: #888; - color: #fff; } + color: #fff; +} + +body.more-filters-opened .more-filters:hover:before, +body.more-filters-opened .more-filters:focus:before { + color: #fff; +} /* Widgets */ .widgets-chooser li.widgets-chooser-selected { background-color: #888; - color: #fff; } + color: #fff; +} -.widgets-chooser li.widgets-chooser-selected:before, .widgets-chooser li.widgets-chooser-selected:focus:before { - color: #fff; } +.widgets-chooser li.widgets-chooser-selected:before, +.widgets-chooser li.widgets-chooser-selected:focus:before { + color: #fff; +} /* Customize */ #customize-theme-controls .widget-area-select .selected { background-color: #888; - color: #fff; } - -/* jQuery UI Slider */ -.wp-slider .ui-slider-handle, .wp-slider .ui-slider-handle.ui-state-hover, .wp-slider .ui-slider-handle.focus { - background: #04a4cc; - border-color: #037c9a; - -webkit-box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15); } - -/* Thickbox: Plugin information */ -#sidemenu a.current { - background: #f5f5f5; - border-bottom-color: #f5f5f5; } + color: #fff; +} -#plugin-information .action-button { - background: #04a4cc; } +#customize-footer-actions .devices button:focus { + border-bottom-color: #04a4cc; +} /* Responsive Component */ div#wp-responsive-toggle a:before { - color: #999; } + color: #999; +} .wp-responsive-open div#wp-responsive-toggle a { border-color: transparent; - background: #888; } - -.star-rating .star { - color: #04a4cc; } + background: #888; +} .wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a { - background: #fff; } + background: #fff; +} + +.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before { + color: #999; +} + +/* TinyMCE */ +.mce-container.mce-menu .mce-menu-item:hover, +.mce-container.mce-menu .mce-menu-item.mce-selected, +.mce-container.mce-menu .mce-menu-item:focus, +.mce-container.mce-menu .mce-menu-item-normal.mce-active, +.mce-container.mce-menu .mce-menu-item-preview.mce-active { + background: #04a4cc; +} /* temporary fix for admin-bar hover color */ -#wpadminbar .ab-top-menu > li:hover > .ab-item, #wpadminbar .ab-top-menu > li.hover > .ab-item, #wpadminbar > #wp-toolbar > #wp-admin-bar-root-default li:hover span.ab-label, #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary li.hover span.ab-label, #wpadminbar .ab-top-menu > li > .ab-item:focus, #wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, #wpadminbar-nojs .ab-top-menu > li.menupop:hover > .ab-item, #wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { - color: #333; } +#wpadminbar .ab-top-menu > li:hover > .ab-item, +#wpadminbar .ab-top-menu > li.hover > .ab-item, +#wpadminbar > #wp-toolbar > #wp-admin-bar-root-default li:hover span.ab-label, +#wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary li.hover span.ab-label, +#wpadminbar .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojs .ab-top-menu > li.menupop:hover > .ab-item, +#wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { + color: #333; +} /* Override the theme filter highlight color for this scheme */ -.theme-section.current, .theme-filter.current { - border-bottom-color: #04a4cc; } +.theme-section.current, +.theme-filter.current { + border-bottom-color: #04a4cc; +} diff --git a/wp-admin/css/colors/light/colors.min.css b/wp-admin/css/colors/light/colors.min.css index daaa6ea..108d1a3 100644 --- a/wp-admin/css/colors/light/colors.min.css +++ b/wp-admin/css/colors/light/colors.min.css @@ -1 +1 @@ -html{background:#f5f5f5}a{color:#0074a2}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,a:active,a:focus,a:hover,div.dashboard-widget-submit input:hover{color:#0099d5}input[type=checkbox]:checked:before{color:#04a4cc}input[type=radio]:checked:before{background:#04a4cc}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0099d5}.wp-core-ui .button-primary{background:#04a4cc;border-color:#037c9a;color:#fff;-webkit-box-shadow:inset 0 1px 0 #22cffb,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #22cffb,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#0490b3;border-color:#036881;color:#fff;-webkit-box-shadow:inset 0 1px 0 #09cafa,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #09cafa,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:active{background:#037c9a;border-color:#036881;color:#fff;-webkit-box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5);box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5)}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#c7cfd1!important;background:#0384a4!important;border-color:#036881!important;text-shadow:none!important}.wp-core-ui .wp-ui-primary{color:#333;background-color:#e5e5e5}.wp-core-ui .wp-ui-text-primary{color:#e5e5e5}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#888}.wp-core-ui .wp-ui-text-highlight{color:#888}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#d64e07}.wp-core-ui .wp-ui-text-notification{color:#d64e07}.wp-core-ui .wp-ui-text-icon{color:#999}#add-new-comment a:hover,.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover{color:#333;background-color:#e5e5e5}.view-switch a.current:before{color:#e5e5e5}.view-switch a:hover:before{color:#d64e07}.post-com-count:hover:after{border-top-color:#e5e5e5}.post-com-count:hover span{color:#333;background-color:#e5e5e5}strong .post-com-count:after{border-top-color:#d64e07}strong .post-com-count span{background-color:#d64e07}#adminmenu,#adminmenuback,#adminmenuwrap{background:#e5e5e5}#adminmenu a{color:#333}#adminmenu div.wp-menu-image:before{color:#999}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#888}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#ccc}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f5f5f5;border-bottom-color:#f5f5f5}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#fff}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-right-color:#fff}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu .wp-submenu-head,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#686868}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#04a4cc}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#333}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#04a4cc}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-right-color:#f5f5f5}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#888}#adminmenu li.wp-has-current-submenu div.wp-menu-image:before{color:#ccc}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#d64e07}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#333;background:#fff}#collapse-menu{color:#777}#collapse-menu:hover{color:#333}#collapse-button div:after{color:#999}#collapse-menu:hover #collapse-button div:after{color:#555}#wpadminbar{color:#333;background:#e5e5e5}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#333}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#999}#wpadminbar .ab-top-menu>li.hover>.ab-item,#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar .ab-top-menu>li:hover>.ab-item,#wpadminbar .ab-top-menu>li>.ab-item:focus,#wpadminbar-nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus{background:#fff}#wpadminbar>#wp-toolbar a:focus span.ab-label,#wpadminbar>#wp-toolbar li.hover span.ab-label,#wpadminbar>#wp-toolbar li:hover span.ab-label{color:#04a4cc}#wpadminbar .menupop .ab-sub-wrapper{background:#fff}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#f6f7f7}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar-nojs .quicklinks .menupop:hover ul li a{color:#686868}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#999}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:after,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:after,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#04a4cc}#wpadminbar #adminbarsearch:before{color:#999}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#333;background:#f7f7f7}#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder{color:#333;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder{color:#333;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder{color:#333;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder{color:#333;opacity:.7}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#f7f7f7;background-color:#f7f7f7}#wpadminbar #wp-admin-bar-user-info .display-name{color:#333}#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#04a4cc}#wpadminbar #wp-admin-bar-user-info .username{color:#686868}.wp-pointer .wp-pointer-content h3{background-color:#04a4cc;border-color:#0490b3}.wp-pointer .wp-pointer-content h3:before{color:#04a4cc}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow{border-bottom-color:#04a4cc}.media-item .bar,.media-progress-bar div{background-color:#04a4cc}.details.attachment{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 5px #04a4cc;box-shadow:0 0 0 1px #fff,0 0 0 5px #04a4cc}.attachment.details .check{background-color:#04a4cc;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #04a4cc;box-shadow:0 0 0 1px #fff,0 0 0 2px #04a4cc}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme:hover:after{background:#04a4cc}.theme-browser .theme.add-new-theme:hover span:after{color:#04a4cc}.theme-overlay .theme-header .close:hover,.theme-overlay .theme-header .left:hover,.theme-overlay .theme-header .right:hover{background:#04a4cc}body.more-filters-opened .more-filters,body.more-filters-opened .more-filters:before{color:#333;background-color:#e5e5e5}.widgets-chooser li.widgets-chooser-selected,body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover,body.more-filters-opened .more-filters:hover:before{background-color:#888;color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-theme-controls .widget-area-select .selected{background-color:#888;color:#fff}.wp-slider .ui-slider-handle,.wp-slider .ui-slider-handle.focus,.wp-slider .ui-slider-handle.ui-state-hover{background:#04a4cc;border-color:#037c9a;-webkit-box-shadow:inset 0 1px 0 #22cffb,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #22cffb,0 1px 0 rgba(0,0,0,.15)}#sidemenu a.current{background:#f5f5f5;border-bottom-color:#f5f5f5}#plugin-information .action-button{background:#04a4cc}div#wp-responsive-toggle a:before{color:#999}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#888}.star-rating .star{color:#04a4cc}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#fff}#wpadminbar .ab-top-menu>li.hover>.ab-item,#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar .ab-top-menu>li:hover>.ab-item,#wpadminbar .ab-top-menu>li>.ab-item:focus,#wpadminbar-nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus,#wpadminbar>#wp-toolbar>#wp-admin-bar-root-default li:hover span.ab-label,#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary li.hover span.ab-label{color:#333}.theme-filter.current,.theme-section.current{border-bottom-color:#04a4cc} \ No newline at end of file +html{background:#f5f5f5}a{color:#0073aa}a:active,a:focus,a:hover{color:#0096dd}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,div.dashboard-widget-submit input:hover{color:#0096dd}input[type=checkbox]:checked:before{color:#04a4cc}input[type=radio]:checked:before{background:#04a4cc}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0096dd}.wp-core-ui .button-primary{background:#04a4cc;border-color:#037c9a #036881 #036881;color:#fff;-webkit-box-shadow:0 1px 0 #036881;box-shadow:0 1px 0 #036881;text-shadow:0 -1px 1px #036881,1px 0 1px #036881,0 1px 1px #036881,-1px 0 1px #036881}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#04b0db;border-color:#036881;color:#fff;-webkit-box-shadow:0 1px 0 #036881;box-shadow:0 1px 0 #036881}.wp-core-ui .button-primary:focus{-webkit-box-shadow:inset 0 1px 0 #037c9a,0 0 2px 1px #33b3db;box-shadow:inset 0 1px 0 #037c9a,0 0 2px 1px #33b3db}.wp-core-ui .button-primary:active{background:#037c9a;border-color:#036881;-webkit-box-shadow:inset 0 2px 0 #036881;box-shadow:inset 0 2px 0 #036881}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#c7cfd1!important;background:#0384a4!important;border-color:#036881!important;text-shadow:none!important}.wp-core-ui .button-primary.button-hero{-webkit-box-shadow:0 2px 0 #036881!important;box-shadow:0 2px 0 #036881!important}.wp-core-ui .button-primary.button-hero:active{-webkit-box-shadow:inset 0 3px 0 #036881!important;box-shadow:inset 0 3px 0 #036881!important}.wp-core-ui .wp-ui-primary{color:#333;background-color:#e5e5e5}.wp-core-ui .wp-ui-text-primary{color:#e5e5e5}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#888}.wp-core-ui .wp-ui-text-highlight{color:#888}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#d64e07}.wp-core-ui .wp-ui-text-notification{color:#d64e07}.wp-core-ui .wp-ui-text-icon{color:#999}.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover,.wrap .page-title-action:hover{color:#333;background-color:#e5e5e5}.view-switch a.current:before{color:#e5e5e5}.view-switch a:hover:before{color:#d64e07}#adminmenu,#adminmenuback,#adminmenuwrap{background:#e5e5e5}#adminmenu a{color:#333}#adminmenu div.wp-menu-image:before{color:#999}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#888}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#ccc}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f5f5f5;border-bottom-color:#f5f5f5}.theme-filter.current,.theme-section.current,.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner{border-bottom-color:#04a4cc}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#fff}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-right-color:#fff}#adminmenu .wp-submenu .wp-submenu-head{color:#686868}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#686868}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#04a4cc}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#333}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#04a4cc}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-right-color:#f5f5f5}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#888}#adminmenu a.current:hover div.wp-menu-image:before,#adminmenu li a:focus div.wp-menu-image:before,#adminmenu li.opensub div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,#adminmenu li:hover div.wp-menu-image:before,.ie8 #adminmenu li.opensub div.wp-menu-image:before{color:#ccc}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#d64e07}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#333;background:#fff}#collapse-menu{color:#777}#collapse-menu:hover,#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#333}#collapse-button div:after{color:#999}#collapse-menu:hover #collapse-button div:after{color:#555}#wpadminbar{color:#333;background:#e5e5e5}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#999}#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus,#wpadminbar.nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li>.ab-item:focus{color:#04a4cc;background:#fff}#wpadminbar:not(.mobile)>#wp-toolbar a:focus span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li.hover span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li:hover span.ab-label{color:#04a4cc}#wpadminbar:not(.mobile) li:hover #adminbarsearch:before,#wpadminbar:not(.mobile) li:hover .ab-icon:before,#wpadminbar:not(.mobile) li:hover .ab-item:after,#wpadminbar:not(.mobile) li:hover .ab-item:before{color:#ccc}#wpadminbar .menupop .ab-sub-wrapper{background:#fff}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#f7f7f7}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar.nojs .quicklinks .menupop:hover ul li a{color:#686868}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#999}#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar li #adminbarsearch.adminbar-focused:before,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#04a4cc}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a .blavatar,#wpadminbar .quicklinks li a:focus .blavatar,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar.mobile .quicklinks .ab-icon:before,#wpadminbar.mobile .quicklinks .ab-item:before{color:#04a4cc}#wpadminbar.mobile .quicklinks .hover .ab-icon:before,#wpadminbar.mobile .quicklinks .hover .ab-item:before{color:#999}#wpadminbar #adminbarsearch:before{color:#999}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#333;background:#f7f7f7}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#f7f7f7;background-color:#f7f7f7}#wpadminbar #wp-admin-bar-user-info .display-name{color:#333}#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#04a4cc}#wpadminbar #wp-admin-bar-user-info .username{color:#686868}.wp-pointer .wp-pointer-content h3{background-color:#04a4cc;border-color:#0490b3}.wp-pointer .wp-pointer-content h3:before{color:#04a4cc}.media-item .bar,.media-progress-bar div{background-color:#04a4cc}.details.attachment{-webkit-box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #04a4cc;box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #04a4cc}.attachment.details .check{background-color:#04a4cc;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #04a4cc;box-shadow:0 0 0 1px #fff,0 0 0 2px #04a4cc}.media-selection .attachment.selection.details .thumbnail{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 3px #04a4cc;box-shadow:0 0 0 1px #fff,0 0 0 3px #04a4cc}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme a:focus:after,.theme-browser .theme.add-new-theme a:hover:after{background:#04a4cc}.theme-browser .theme.add-new-theme a:focus span:after,.theme-browser .theme.add-new-theme a:hover span:after{color:#04a4cc}body.more-filters-opened .more-filters{color:#333;background-color:#e5e5e5}body.more-filters-opened .more-filters:before{color:#333}#customize-theme-controls .widget-area-select .selected,.widgets-chooser li.widgets-chooser-selected{background-color:#888;color:#fff}body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:hover{background-color:#888;color:#fff}body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover:before{color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-footer-actions .devices button:focus{border-bottom-color:#04a4cc}div#wp-responsive-toggle a:before{color:#999}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#888}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#fff}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before{color:#999}.mce-container.mce-menu .mce-menu-item-normal.mce-active,.mce-container.mce-menu .mce-menu-item-preview.mce-active,.mce-container.mce-menu .mce-menu-item.mce-selected,.mce-container.mce-menu .mce-menu-item:focus,.mce-container.mce-menu .mce-menu-item:hover{background:#04a4cc}#wpadminbar .ab-top-menu>li.hover>.ab-item,#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar .ab-top-menu>li:hover>.ab-item,#wpadminbar .ab-top-menu>li>.ab-item:focus,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus,#wpadminbar.nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar>#wp-toolbar>#wp-admin-bar-root-default li:hover span.ab-label,#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary li.hover span.ab-label{color:#333} \ No newline at end of file diff --git a/wp-admin/css/colors/light/colors.scss b/wp-admin/css/colors/light/colors.scss index b12774c..ab4230b 100644 --- a/wp-admin/css/colors/light/colors.scss +++ b/wp-admin/css/colors/light/colors.scss @@ -26,7 +26,7 @@ $menu-collapse-focus-icon: #555; #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary li.hover span.ab-label, #wpadminbar .ab-top-menu > li > .ab-item:focus, #wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, -#wpadminbar-nojs .ab-top-menu > li.menupop:hover > .ab-item, +#wpadminbar.nojs .ab-top-menu > li.menupop:hover > .ab-item, #wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { color: $text-color; } diff --git a/wp-admin/css/colors/midnight/colors-rtl.css b/wp-admin/css/colors/midnight/colors-rtl.css index 2dc30e5..2e4990f 100644 --- a/wp-admin/css/colors/midnight/colors-rtl.css +++ b/wp-admin/css/colors/midnight/colors-rtl.css @@ -3,329 +3,524 @@ * highlights/shadows, based on a base color. */ html { - background: #f1f1f1; } + background: #f1f1f1; +} /* Links */ a { - color: #0074a2; } - a:hover, a:active, a:focus { - color: #0099d5; } + color: #0073aa; +} + +a:hover, a:active, a:focus { + color: #0096dd; +} -#media-upload a.del-link:hover, div.dashboard-widget-submit input:hover, .subsubsub a:hover, .subsubsub a.current:hover { - color: #0099d5; } +#media-upload a.del-link:hover, +div.dashboard-widget-submit input:hover, +.subsubsub a:hover, +.subsubsub a.current:hover { + color: #0096dd; +} /* Forms */ input[type=checkbox]:checked:before { - color: #e14d43; } + color: #e14d43; +} input[type=radio]:checked:before { - background: #e14d43; } + background: #e14d43; +} -.wp-core-ui input[type="reset"]:hover, .wp-core-ui input[type="reset"]:active { - color: #0099d5; } +.wp-core-ui input[type="reset"]:hover, +.wp-core-ui input[type="reset"]:active { + color: #0096dd; +} /* Core UI */ .wp-core-ui .button-primary { background: #e14d43; - border-color: #d02a21; + border-color: #d02c21 #ba281e #ba281e; + color: white; + -webkit-box-shadow: 0 1px 0 #ba281e; + box-shadow: 0 1px 0 #ba281e; + text-shadow: 0 -1px 1px #ba281e, -1px 0 1px #ba281e, 0 1px 1px #ba281e, 1px 0 1px #ba281e; +} + +.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { + background: #e35950; + border-color: #ba281e; color: white; - -webkit-box-shadow: inset 0 1px 0 #ec8a85, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #ec8a85, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { - background: #dd362d; - border-color: #ba251e; - color: white; - -webkit-box-shadow: inset 0 1px 0 #e8756f, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #e8756f, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:active { - background: #d02a21; - border-color: #ba251e; - color: white; - -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); - box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); } - .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { - color: #d1c7c7 !important; - background: #d92c23 !important; - border-color: #ba251e !important; - text-shadow: none !important; } + -webkit-box-shadow: 0 1px 0 #ba281e; + box-shadow: 0 1px 0 #ba281e; +} + +.wp-core-ui .button-primary:focus { + -webkit-box-shadow: inset 0 1px 0 #d02c21, 0 0 2px 1px #33b3db; + box-shadow: inset 0 1px 0 #d02c21, 0 0 2px 1px #33b3db; +} + +.wp-core-ui .button-primary:active { + background: #d02c21; + border-color: #ba281e; + -webkit-box-shadow: inset 0 2px 0 #ba281e; + box-shadow: inset 0 2px 0 #ba281e; +} + +.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { + color: #d1c8c7 !important; + background: #d92e23 !important; + border-color: #ba281e !important; + text-shadow: none !important; +} + +.wp-core-ui .button-primary.button-hero { + -webkit-box-shadow: 0 2px 0 #ba281e !important; + box-shadow: 0 2px 0 #ba281e !important; +} + +.wp-core-ui .button-primary.button-hero:active { + -webkit-box-shadow: inset 0 3px 0 #ba281e !important; + box-shadow: inset 0 3px 0 #ba281e !important; +} + .wp-core-ui .wp-ui-primary { color: #fff; - background-color: #363b3f; } + background-color: #363b3f; +} + .wp-core-ui .wp-ui-text-primary { - color: #363b3f; } + color: #363b3f; +} + .wp-core-ui .wp-ui-highlight { color: #fff; - background-color: #e14d43; } + background-color: #e14d43; +} + .wp-core-ui .wp-ui-text-highlight { - color: #e14d43; } + color: #e14d43; +} + .wp-core-ui .wp-ui-notification { color: #fff; - background-color: #69a8bb; } + background-color: #69a8bb; +} + .wp-core-ui .wp-ui-text-notification { - color: #69a8bb; } + color: #69a8bb; +} + .wp-core-ui .wp-ui-text-icon { - color: #f1f2f3; } + color: #f1f2f3; +} /* List tables */ -.wrap .add-new-h2:hover, #add-new-comment a:hover, .tablenav .tablenav-pages a:hover, .tablenav .tablenav-pages a:focus { +.wrap .add-new-h2:hover, +.wrap .page-title-action:hover, +.tablenav .tablenav-pages a:hover, +.tablenav .tablenav-pages a:focus { color: #fff; - background-color: #363b3f; } + background-color: #363b3f; +} .view-switch a.current:before { - color: #363b3f; } + color: #363b3f; +} .view-switch a:hover:before { - color: #69a8bb; } - -.post-com-count:hover:after { - border-top-color: #363b3f; } - -.post-com-count:hover span { - color: #fff; - background-color: #363b3f; } - -strong .post-com-count:after { - border-top-color: #69a8bb; } - -strong .post-com-count span { - background-color: #69a8bb; } + color: #69a8bb; +} /* Admin Menu */ -#adminmenuback, #adminmenuwrap, #adminmenu { - background: #363b3f; } +#adminmenuback, +#adminmenuwrap, +#adminmenu { + background: #363b3f; +} #adminmenu a { - color: #fff; } + color: #fff; +} #adminmenu div.wp-menu-image:before { - color: #f1f2f3; } + color: #f1f2f3; +} -#adminmenu a:hover, #adminmenu li.menu-top:hover, #adminmenu li.opensub > a.menu-top, #adminmenu li > a.menu-top:focus { +#adminmenu a:hover, +#adminmenu li.menu-top:hover, +#adminmenu li.opensub > a.menu-top, +#adminmenu li > a.menu-top:focus { color: #fff; - background-color: #e14d43; } + background-color: #e14d43; +} -#adminmenu li.menu-top:hover div.wp-menu-image:before, #adminmenu li.opensub > a.menu-top div.wp-menu-image:before { - color: #fff; } +#adminmenu li.menu-top:hover div.wp-menu-image:before, +#adminmenu li.opensub > a.menu-top div.wp-menu-image:before { + color: #fff; +} /* Active tabs use a bottom border color that matches the page background color. */ -.about-wrap h2 .nav-tab-active, .nav-tab-active, .nav-tab-active:hover { +.about-wrap h2 .nav-tab-active, +.nav-tab-active, +.nav-tab-active:hover { background-color: #f1f1f1; - border-bottom-color: #f1f1f1; } + border-bottom-color: #f1f1f1; +} /* Admin Menu: submenu */ -#adminmenu .wp-submenu, #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu .wp-has-current-submenu.opensub .wp-submenu, .folded #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu { - background: #26292c; } +#adminmenu .wp-submenu, +#adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu, +.folded #adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu { + background: #26292c; +} #adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after { - border-left-color: #26292c; } + border-left-color: #26292c; +} #adminmenu .wp-submenu .wp-submenu-head { - color: #c2c4c5; } - -#adminmenu .wp-submenu a, #adminmenu .wp-has-current-submenu .wp-submenu a, .folded #adminmenu .wp-has-current-submenu .wp-submenu a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a { - color: #c2c4c5; } - #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, #adminmenu .wp-has-current-submenu .wp-submenu a:focus, #adminmenu .wp-has-current-submenu .wp-submenu a:hover, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { - color: #e14d43; } + color: #c3c4c5; +} + +#adminmenu .wp-submenu a, +#adminmenu .wp-has-current-submenu .wp-submenu a, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a { + color: #c3c4c5; +} + +#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu .wp-submenu a:hover, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { + color: #e14d43; +} /* Admin Menu: current */ -#adminmenu .wp-submenu li.current a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { - color: #fff; } - #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { - color: #e14d43; } +#adminmenu .wp-submenu li.current a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { + color: #fff; +} + +#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { + color: #e14d43; +} -ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.current:after { - border-left-color: #f1f1f1; } +ul#adminmenu a.wp-has-current-submenu:after, +ul#adminmenu > li.current > a.current:after { + border-left-color: #f1f1f1; +} -#adminmenu li.current a.menu-top, #adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, #adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, .folded #adminmenu li.current.menu-top { +#adminmenu li.current a.menu-top, +#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, +#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, +.folded #adminmenu li.current.menu-top { color: #fff; - background: #e14d43; } - -#adminmenu li.wp-has-current-submenu div.wp-menu-image:before { - color: #fff; } + background: #e14d43; +} + +#adminmenu li.wp-has-current-submenu div.wp-menu-image:before, +#adminmenu a.current:hover div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before, +#adminmenu li:hover div.wp-menu-image:before, +#adminmenu li a:focus div.wp-menu-image:before, +#adminmenu li.opensub div.wp-menu-image:before, +.ie8 #adminmenu li.opensub div.wp-menu-image:before { + color: #fff; +} /* Admin Menu: bubble */ -#adminmenu .awaiting-mod, #adminmenu .update-plugins { +#adminmenu .awaiting-mod, +#adminmenu .update-plugins { color: #fff; - background: #69a8bb; } + background: #69a8bb; +} -#adminmenu li.current a .awaiting-mod, #adminmenu li a.wp-has-current-submenu .update-plugins, #adminmenu li:hover a .awaiting-mod, #adminmenu li.menu-top:hover > a .update-plugins { +#adminmenu li.current a .awaiting-mod, +#adminmenu li a.wp-has-current-submenu .update-plugins, +#adminmenu li:hover a .awaiting-mod, +#adminmenu li.menu-top:hover > a .update-plugins { color: #fff; - background: #26292c; } + background: #26292c; +} /* Admin Menu: collapse button */ #collapse-menu { - color: #f1f2f3; } + color: #f1f2f3; +} #collapse-menu:hover { - color: #fff; } + color: #fff; +} #collapse-button div:after { - color: #f1f2f3; } + color: #f1f2f3; +} #collapse-menu:hover #collapse-button div:after { - color: #fff; } + color: #fff; +} /* Admin Bar */ #wpadminbar { color: #fff; - background: #363b3f; } - -#wpadminbar .ab-item, #wpadminbar a.ab-item, #wpadminbar > #wp-toolbar span.ab-label, #wpadminbar > #wp-toolbar span.noticon { - color: #fff; } + background: #363b3f; +} -#wpadminbar .ab-icon, #wpadminbar .ab-icon:before, #wpadminbar .ab-item:before, #wpadminbar .ab-item:after { - color: #f1f2f3; } - -#wpadminbar .ab-top-menu > li:hover > .ab-item, #wpadminbar .ab-top-menu > li.hover > .ab-item, #wpadminbar .ab-top-menu > li > .ab-item:focus, #wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, #wpadminbar-nojs .ab-top-menu > li.menupop:hover > .ab-item, #wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { +#wpadminbar .ab-item, +#wpadminbar a.ab-item, +#wpadminbar > #wp-toolbar span.ab-label, +#wpadminbar > #wp-toolbar span.noticon { + color: #fff; +} + +#wpadminbar .ab-icon, +#wpadminbar .ab-icon:before, +#wpadminbar .ab-item:before, +#wpadminbar .ab-item:after { + color: #f1f2f3; +} + +#wpadminbar:not(.mobile) .ab-top-menu > li:hover > .ab-item, +#wpadminbar:not(.mobile) .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojs .ab-top-menu > li.menupop:hover > .ab-item, +#wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { color: #e14d43; - background: #26292c; } + background: #26292c; +} -#wpadminbar > #wp-toolbar li:hover span.ab-label, #wpadminbar > #wp-toolbar li.hover span.ab-label, #wpadminbar > #wp-toolbar a:focus span.ab-label { - color: #e14d43; } +#wpadminbar:not(.mobile) > #wp-toolbar li:hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar li.hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar a:focus span.ab-label { + color: #e14d43; +} -#wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #fff; } +#wpadminbar:not(.mobile) li:hover .ab-icon:before, +#wpadminbar:not(.mobile) li:hover .ab-item:before, +#wpadminbar:not(.mobile) li:hover .ab-item:after, +#wpadminbar:not(.mobile) li:hover #adminbarsearch:before { + color: #fff; +} /* Admin Bar: submenu */ #wpadminbar .menupop .ab-sub-wrapper { - background: #26292c; } - -#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, #wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { - background: #4c4c4d; } - -#wpadminbar .ab-submenu .ab-item, #wpadminbar .quicklinks .menupop ul li a, #wpadminbar .quicklinks .menupop.hover ul li a, #wpadminbar-nojs .quicklinks .menupop:hover ul li a { - color: #c2c4c5; } - -#wpadminbar .quicklinks li .blavatar, #wpadminbar .menupop .menupop > .ab-item:before { - color: #f1f2f3; } - -#wpadminbar .quicklinks .menupop ul li a:hover, #wpadminbar .quicklinks .menupop ul li a:focus, #wpadminbar .quicklinks .menupop ul li a:hover strong, #wpadminbar .quicklinks .menupop ul li a:focus strong, #wpadminbar .quicklinks .menupop.hover ul li a:hover, #wpadminbar .quicklinks .menupop.hover ul li a:focus, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, #wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li a:focus .ab-icon:before, #wpadminbar li .ab-item:focus:before, #wpadminbar li.hover .ab-icon:before, #wpadminbar li.hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li.hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #e14d43; } + background: #26292c; +} + +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { + background: #4c4c4d; +} + +#wpadminbar .ab-submenu .ab-item, +#wpadminbar .quicklinks .menupop ul li a, +#wpadminbar .quicklinks .menupop.hover ul li a, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a { + color: #c3c4c5; +} + +#wpadminbar .quicklinks li .blavatar, +#wpadminbar .menupop .menupop > .ab-item:before { + color: #f1f2f3; +} + +#wpadminbar .quicklinks .menupop ul li a:hover, +#wpadminbar .quicklinks .menupop ul li a:focus, +#wpadminbar .quicklinks .menupop ul li a:hover strong, +#wpadminbar .quicklinks .menupop ul li a:focus strong, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a, +#wpadminbar .quicklinks .menupop.hover ul li a:hover, +#wpadminbar .quicklinks .menupop.hover ul li a:focus, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, +#wpadminbar li:hover .ab-icon:before, +#wpadminbar li:hover .ab-item:before, +#wpadminbar li a:focus .ab-icon:before, +#wpadminbar li .ab-item:focus:before, +#wpadminbar li.hover .ab-icon:before, +#wpadminbar li.hover .ab-item:before, +#wpadminbar li:hover #adminbarsearch:before, +#wpadminbar li #adminbarsearch.adminbar-focused:before { + color: #e14d43; +} + +#wpadminbar .quicklinks li a:hover .blavatar, +#wpadminbar .quicklinks li a:focus .blavatar, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar, +#wpadminbar .menupop .menupop > .ab-item:hover:before, +#wpadminbar.mobile .quicklinks .ab-icon:before, +#wpadminbar.mobile .quicklinks .ab-item:before { + color: #e14d43; +} -#wpadminbar .quicklinks li a:hover .blavatar, #wpadminbar .menupop .menupop > .ab-item:hover:before { - color: #e14d43; } +#wpadminbar.mobile .quicklinks .hover .ab-icon:before, +#wpadminbar.mobile .quicklinks .hover .ab-item:before { + color: #f1f2f3; +} /* Admin Bar: search */ #wpadminbar #adminbarsearch:before { - color: #f1f2f3; } + color: #f1f2f3; +} #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus { color: #fff; - background: #464d52; } - -#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder { - color: #fff; - opacity: 0.7; } + background: #464d52; +} /* Admin Bar: my account */ #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { border-color: #464d52; - background-color: #464d52; } + background-color: #464d52; +} #wpadminbar #wp-admin-bar-user-info .display-name { - color: #fff; } + color: #fff; +} #wpadminbar #wp-admin-bar-user-info a:hover .display-name { - color: #e14d43; } + color: #e14d43; +} #wpadminbar #wp-admin-bar-user-info .username { - color: #c2c4c5; } + color: #c3c4c5; +} /* Pointers */ .wp-pointer .wp-pointer-content h3 { background-color: #e14d43; - border-color: #dd362d; } + border-color: #dd382d; +} .wp-pointer .wp-pointer-content h3:before { - color: #e14d43; } - -.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow { - border-bottom-color: #e14d43; } - -/* Media Uploader */ -.media-item .bar, .media-progress-bar div { - background-color: #e14d43; } + color: #e14d43; +} + +.wp-pointer.wp-pointer-top .wp-pointer-arrow, +.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner { + border-bottom-color: #e14d43; +} + +/* Media */ +.media-item .bar, +.media-progress-bar div { + background-color: #e14d43; +} .details.attachment { - -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #e14d43; - box-shadow: 0 0 0 1px #fff, 0 0 0 5px #e14d43; } + -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #e14d43; + box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #e14d43; +} .attachment.details .check { background-color: #e14d43; -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #e14d43; - box-shadow: 0 0 0 1px #fff, 0 0 0 2px #e14d43; } + box-shadow: 0 0 0 1px #fff, 0 0 0 2px #e14d43; +} + +.media-selection .attachment.selection.details .thumbnail { + -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #e14d43; + box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #e14d43; +} /* Themes */ -.theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after { - background: #e14d43; } +.theme-browser .theme.active .theme-name, +.theme-browser .theme.add-new-theme a:hover:after, +.theme-browser .theme.add-new-theme a:focus:after { + background: #e14d43; +} -.theme-browser .theme.add-new-theme:hover span:after { - color: #e14d43; } +.theme-browser .theme.add-new-theme a:hover span:after, +.theme-browser .theme.add-new-theme a:focus span:after { + color: #e14d43; +} -.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover { - background: #e14d43; } +.theme-section.current, +.theme-filter.current { + border-bottom-color: #363b3f; +} -.theme-section.current, .theme-filter.current { - border-bottom-color: #363b3f; } +body.more-filters-opened .more-filters { + color: #fff; + background-color: #363b3f; +} -body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before { +body.more-filters-opened .more-filters:before { color: #fff; - background-color: #363b3f; } +} -body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before { +body.more-filters-opened .more-filters:hover, +body.more-filters-opened .more-filters:focus { background-color: #e14d43; - color: #fff; } + color: #fff; +} + +body.more-filters-opened .more-filters:hover:before, +body.more-filters-opened .more-filters:focus:before { + color: #fff; +} /* Widgets */ .widgets-chooser li.widgets-chooser-selected { background-color: #e14d43; - color: #fff; } + color: #fff; +} -.widgets-chooser li.widgets-chooser-selected:before, .widgets-chooser li.widgets-chooser-selected:focus:before { - color: #fff; } +.widgets-chooser li.widgets-chooser-selected:before, +.widgets-chooser li.widgets-chooser-selected:focus:before { + color: #fff; +} /* Customize */ #customize-theme-controls .widget-area-select .selected { background-color: #e14d43; - color: #fff; } - -/* jQuery UI Slider */ -.wp-slider .ui-slider-handle, .wp-slider .ui-slider-handle.ui-state-hover, .wp-slider .ui-slider-handle.focus { - background: #e14d43; - border-color: #d02a21; - -webkit-box-shadow: inset 0 1px 0 #ec8a85, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #ec8a85, 0 1px 0 rgba(0, 0, 0, 0.15); } - -/* Thickbox: Plugin information */ -#sidemenu a.current { - background: #f1f1f1; - border-bottom-color: #f1f1f1; } + color: #fff; +} -#plugin-information .action-button { - background: #e14d43; } +#customize-footer-actions .devices button:focus { + border-bottom-color: #e14d43; +} /* Responsive Component */ div#wp-responsive-toggle a:before { - color: #f1f2f3; } + color: #f1f2f3; +} .wp-responsive-open div#wp-responsive-toggle a { border-color: transparent; - background: #e14d43; } - -.star-rating .star { - color: #e14d43; } + background: #e14d43; +} .wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a { - background: #26292c; } + background: #26292c; +} + +.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before { + color: #f1f2f3; +} + +/* TinyMCE */ +.mce-container.mce-menu .mce-menu-item:hover, +.mce-container.mce-menu .mce-menu-item.mce-selected, +.mce-container.mce-menu .mce-menu-item:focus, +.mce-container.mce-menu .mce-menu-item-normal.mce-active, +.mce-container.mce-menu .mce-menu-item-preview.mce-active { + background: #e14d43; +} diff --git a/wp-admin/css/colors/midnight/colors-rtl.min.css b/wp-admin/css/colors/midnight/colors-rtl.min.css index 930461b..fb38143 100644 --- a/wp-admin/css/colors/midnight/colors-rtl.min.css +++ b/wp-admin/css/colors/midnight/colors-rtl.min.css @@ -1 +1 @@ -html{background:#f1f1f1}a{color:#0074a2}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,a:active,a:focus,a:hover,div.dashboard-widget-submit input:hover{color:#0099d5}input[type=checkbox]:checked:before{color:#e14d43}input[type=radio]:checked:before{background:#e14d43}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0099d5}.wp-core-ui .button-primary{background:#e14d43;border-color:#d02a21;color:#fff;-webkit-box-shadow:inset 0 1px 0 #ec8a85,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #ec8a85,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#dd362d;border-color:#ba251e;color:#fff;-webkit-box-shadow:inset 0 1px 0 #e8756f,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #e8756f,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:active{background:#d02a21;border-color:#ba251e;color:#fff;-webkit-box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5);box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5)}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#d1c7c7!important;background:#d92c23!important;border-color:#ba251e!important;text-shadow:none!important}.wp-core-ui .wp-ui-primary{color:#fff;background-color:#363b3f}.wp-core-ui .wp-ui-text-primary{color:#363b3f}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#e14d43}.wp-core-ui .wp-ui-text-highlight{color:#e14d43}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#69a8bb}.wp-core-ui .wp-ui-text-notification{color:#69a8bb}.wp-core-ui .wp-ui-text-icon{color:#f1f2f3}#add-new-comment a:hover,.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover{color:#fff;background-color:#363b3f}.view-switch a.current:before{color:#363b3f}.view-switch a:hover:before{color:#69a8bb}.post-com-count:hover:after{border-top-color:#363b3f}.post-com-count:hover span{color:#fff;background-color:#363b3f}strong .post-com-count:after{border-top-color:#69a8bb}strong .post-com-count span{background-color:#69a8bb}#adminmenu,#adminmenuback,#adminmenuwrap{background:#363b3f}#adminmenu a{color:#fff}#adminmenu div.wp-menu-image:before{color:#f1f2f3}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#e14d43}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#fff}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f1f1f1;border-bottom-color:#f1f1f1}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#26292c}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-left-color:#26292c}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu .wp-submenu-head,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#c2c4c5}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#e14d43}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#e14d43}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-left-color:#f1f1f1}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#e14d43}#adminmenu li.wp-has-current-submenu div.wp-menu-image:before{color:#fff}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#69a8bb}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#fff;background:#26292c}#collapse-menu{color:#f1f2f3}#collapse-menu:hover{color:#fff}#collapse-button div:after{color:#f1f2f3}#collapse-menu:hover #collapse-button div:after{color:#fff}#wpadminbar{color:#fff;background:#363b3f}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#fff}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#f1f2f3}#wpadminbar .ab-top-menu>li.hover>.ab-item,#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar .ab-top-menu>li:hover>.ab-item,#wpadminbar .ab-top-menu>li>.ab-item:focus,#wpadminbar-nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus{color:#e14d43;background:#26292c}#wpadminbar>#wp-toolbar a:focus span.ab-label,#wpadminbar>#wp-toolbar li.hover span.ab-label,#wpadminbar>#wp-toolbar li:hover span.ab-label{color:#e14d43}#wpadminbar .menupop .ab-sub-wrapper{background:#26292c}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#4c4c4d}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar-nojs .quicklinks .menupop:hover ul li a{color:#c2c4c5}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#f1f2f3}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:after,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:after,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#e14d43}#wpadminbar #adminbarsearch:before{color:#f1f2f3}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#fff;background:#464d52}#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder{color:#fff;opacity:.7}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#464d52;background-color:#464d52}#wpadminbar #wp-admin-bar-user-info .display-name{color:#fff}#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#e14d43}#wpadminbar #wp-admin-bar-user-info .username{color:#c2c4c5}.wp-pointer .wp-pointer-content h3{background-color:#e14d43;border-color:#dd362d}.wp-pointer .wp-pointer-content h3:before{color:#e14d43}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow{border-bottom-color:#e14d43}.media-item .bar,.media-progress-bar div{background-color:#e14d43}.details.attachment{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 5px #e14d43;box-shadow:0 0 0 1px #fff,0 0 0 5px #e14d43}.attachment.details .check{background-color:#e14d43;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #e14d43;box-shadow:0 0 0 1px #fff,0 0 0 2px #e14d43}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme:hover:after{background:#e14d43}.theme-browser .theme.add-new-theme:hover span:after{color:#e14d43}.theme-overlay .theme-header .close:hover,.theme-overlay .theme-header .left:hover,.theme-overlay .theme-header .right:hover{background:#e14d43}.theme-filter.current,.theme-section.current{border-bottom-color:#363b3f}body.more-filters-opened .more-filters,body.more-filters-opened .more-filters:before{color:#fff;background-color:#363b3f}.widgets-chooser li.widgets-chooser-selected,body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover,body.more-filters-opened .more-filters:hover:before{background-color:#e14d43;color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-theme-controls .widget-area-select .selected{background-color:#e14d43;color:#fff}.wp-slider .ui-slider-handle,.wp-slider .ui-slider-handle.focus,.wp-slider .ui-slider-handle.ui-state-hover{background:#e14d43;border-color:#d02a21;-webkit-box-shadow:inset 0 1px 0 #ec8a85,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #ec8a85,0 1px 0 rgba(0,0,0,.15)}#sidemenu a.current{background:#f1f1f1;border-bottom-color:#f1f1f1}#plugin-information .action-button{background:#e14d43}div#wp-responsive-toggle a:before{color:#f1f2f3}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#e14d43}.star-rating .star{color:#e14d43}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#26292c} \ No newline at end of file +html{background:#f1f1f1}a{color:#0073aa}a:active,a:focus,a:hover{color:#0096dd}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,div.dashboard-widget-submit input:hover{color:#0096dd}input[type=checkbox]:checked:before{color:#e14d43}input[type=radio]:checked:before{background:#e14d43}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0096dd}.wp-core-ui .button-primary{background:#e14d43;border-color:#d02c21 #ba281e #ba281e;color:#fff;-webkit-box-shadow:0 1px 0 #ba281e;box-shadow:0 1px 0 #ba281e;text-shadow:0 -1px 1px #ba281e,-1px 0 1px #ba281e,0 1px 1px #ba281e,1px 0 1px #ba281e}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#e35950;border-color:#ba281e;color:#fff;-webkit-box-shadow:0 1px 0 #ba281e;box-shadow:0 1px 0 #ba281e}.wp-core-ui .button-primary:focus{-webkit-box-shadow:inset 0 1px 0 #d02c21,0 0 2px 1px #33b3db;box-shadow:inset 0 1px 0 #d02c21,0 0 2px 1px #33b3db}.wp-core-ui .button-primary:active{background:#d02c21;border-color:#ba281e;-webkit-box-shadow:inset 0 2px 0 #ba281e;box-shadow:inset 0 2px 0 #ba281e}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#d1c8c7!important;background:#d92e23!important;border-color:#ba281e!important;text-shadow:none!important}.wp-core-ui .button-primary.button-hero{-webkit-box-shadow:0 2px 0 #ba281e!important;box-shadow:0 2px 0 #ba281e!important}.wp-core-ui .button-primary.button-hero:active{-webkit-box-shadow:inset 0 3px 0 #ba281e!important;box-shadow:inset 0 3px 0 #ba281e!important}.wp-core-ui .wp-ui-primary{color:#fff;background-color:#363b3f}.wp-core-ui .wp-ui-text-primary{color:#363b3f}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#e14d43}.wp-core-ui .wp-ui-text-highlight{color:#e14d43}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#69a8bb}.wp-core-ui .wp-ui-text-notification{color:#69a8bb}.wp-core-ui .wp-ui-text-icon{color:#f1f2f3}.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover,.wrap .page-title-action:hover{color:#fff;background-color:#363b3f}.view-switch a.current:before{color:#363b3f}.view-switch a:hover:before{color:#69a8bb}#adminmenu,#adminmenuback,#adminmenuwrap{background:#363b3f}#adminmenu a{color:#fff}#adminmenu div.wp-menu-image:before{color:#f1f2f3}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#e14d43}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#fff}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f1f1f1;border-bottom-color:#f1f1f1}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#26292c}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-left-color:#26292c}#adminmenu .wp-submenu .wp-submenu-head{color:#c3c4c5}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#c3c4c5}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#e14d43}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#e14d43}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-left-color:#f1f1f1}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#e14d43}#adminmenu a.current:hover div.wp-menu-image:before,#adminmenu li a:focus div.wp-menu-image:before,#adminmenu li.opensub div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,#adminmenu li:hover div.wp-menu-image:before,.ie8 #adminmenu li.opensub div.wp-menu-image:before{color:#fff}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#69a8bb}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#fff;background:#26292c}#collapse-menu{color:#f1f2f3}#collapse-menu:hover{color:#fff}#collapse-button div:after{color:#f1f2f3}#collapse-menu:hover #collapse-button div:after{color:#fff}#wpadminbar{color:#fff;background:#363b3f}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#fff}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#f1f2f3}#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus,#wpadminbar.nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li>.ab-item:focus{color:#e14d43;background:#26292c}#wpadminbar:not(.mobile)>#wp-toolbar a:focus span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li.hover span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li:hover span.ab-label{color:#e14d43}#wpadminbar:not(.mobile) li:hover #adminbarsearch:before,#wpadminbar:not(.mobile) li:hover .ab-icon:before,#wpadminbar:not(.mobile) li:hover .ab-item:after,#wpadminbar:not(.mobile) li:hover .ab-item:before{color:#fff}#wpadminbar .menupop .ab-sub-wrapper{background:#26292c}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#4c4c4d}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar.nojs .quicklinks .menupop:hover ul li a{color:#c3c4c5}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#f1f2f3}#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar li #adminbarsearch.adminbar-focused:before,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#e14d43}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a .blavatar,#wpadminbar .quicklinks li a:focus .blavatar,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar.mobile .quicklinks .ab-icon:before,#wpadminbar.mobile .quicklinks .ab-item:before{color:#e14d43}#wpadminbar.mobile .quicklinks .hover .ab-icon:before,#wpadminbar.mobile .quicklinks .hover .ab-item:before{color:#f1f2f3}#wpadminbar #adminbarsearch:before{color:#f1f2f3}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#fff;background:#464d52}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#464d52;background-color:#464d52}#wpadminbar #wp-admin-bar-user-info .display-name{color:#fff}#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#e14d43}#wpadminbar #wp-admin-bar-user-info .username{color:#c3c4c5}.wp-pointer .wp-pointer-content h3{background-color:#e14d43;border-color:#dd382d}.wp-pointer .wp-pointer-content h3:before{color:#e14d43}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner{border-bottom-color:#e14d43}.media-item .bar,.media-progress-bar div{background-color:#e14d43}.details.attachment{-webkit-box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #e14d43;box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #e14d43}.attachment.details .check{background-color:#e14d43;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #e14d43;box-shadow:0 0 0 1px #fff,0 0 0 2px #e14d43}.media-selection .attachment.selection.details .thumbnail{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 3px #e14d43;box-shadow:0 0 0 1px #fff,0 0 0 3px #e14d43}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme a:focus:after,.theme-browser .theme.add-new-theme a:hover:after{background:#e14d43}.theme-browser .theme.add-new-theme a:focus span:after,.theme-browser .theme.add-new-theme a:hover span:after{color:#e14d43}.theme-filter.current,.theme-section.current{border-bottom-color:#363b3f}body.more-filters-opened .more-filters{color:#fff;background-color:#363b3f}#customize-theme-controls .widget-area-select .selected,.widgets-chooser li.widgets-chooser-selected{background-color:#e14d43;color:#fff}body.more-filters-opened .more-filters:before{color:#fff}body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:hover{background-color:#e14d43;color:#fff}body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover:before{color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-footer-actions .devices button:focus{border-bottom-color:#e14d43}div#wp-responsive-toggle a:before{color:#f1f2f3}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#e14d43}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#26292c}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before{color:#f1f2f3}.mce-container.mce-menu .mce-menu-item-normal.mce-active,.mce-container.mce-menu .mce-menu-item-preview.mce-active,.mce-container.mce-menu .mce-menu-item.mce-selected,.mce-container.mce-menu .mce-menu-item:focus,.mce-container.mce-menu .mce-menu-item:hover{background:#e14d43} \ No newline at end of file diff --git a/wp-admin/css/colors/midnight/colors.css b/wp-admin/css/colors/midnight/colors.css index b1a11fe..a94d472 100644 --- a/wp-admin/css/colors/midnight/colors.css +++ b/wp-admin/css/colors/midnight/colors.css @@ -3,329 +3,524 @@ * highlights/shadows, based on a base color. */ html { - background: #f1f1f1; } + background: #f1f1f1; +} /* Links */ a { - color: #0074a2; } - a:hover, a:active, a:focus { - color: #0099d5; } + color: #0073aa; +} + +a:hover, a:active, a:focus { + color: #0096dd; +} -#media-upload a.del-link:hover, div.dashboard-widget-submit input:hover, .subsubsub a:hover, .subsubsub a.current:hover { - color: #0099d5; } +#media-upload a.del-link:hover, +div.dashboard-widget-submit input:hover, +.subsubsub a:hover, +.subsubsub a.current:hover { + color: #0096dd; +} /* Forms */ input[type=checkbox]:checked:before { - color: #e14d43; } + color: #e14d43; +} input[type=radio]:checked:before { - background: #e14d43; } + background: #e14d43; +} -.wp-core-ui input[type="reset"]:hover, .wp-core-ui input[type="reset"]:active { - color: #0099d5; } +.wp-core-ui input[type="reset"]:hover, +.wp-core-ui input[type="reset"]:active { + color: #0096dd; +} /* Core UI */ .wp-core-ui .button-primary { background: #e14d43; - border-color: #d02a21; + border-color: #d02c21 #ba281e #ba281e; + color: white; + -webkit-box-shadow: 0 1px 0 #ba281e; + box-shadow: 0 1px 0 #ba281e; + text-shadow: 0 -1px 1px #ba281e, 1px 0 1px #ba281e, 0 1px 1px #ba281e, -1px 0 1px #ba281e; +} + +.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { + background: #e35950; + border-color: #ba281e; color: white; - -webkit-box-shadow: inset 0 1px 0 #ec8a85, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #ec8a85, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { - background: #dd362d; - border-color: #ba251e; - color: white; - -webkit-box-shadow: inset 0 1px 0 #e8756f, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #e8756f, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:active { - background: #d02a21; - border-color: #ba251e; - color: white; - -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); - box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); } - .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { - color: #d1c7c7 !important; - background: #d92c23 !important; - border-color: #ba251e !important; - text-shadow: none !important; } + -webkit-box-shadow: 0 1px 0 #ba281e; + box-shadow: 0 1px 0 #ba281e; +} + +.wp-core-ui .button-primary:focus { + -webkit-box-shadow: inset 0 1px 0 #d02c21, 0 0 2px 1px #33b3db; + box-shadow: inset 0 1px 0 #d02c21, 0 0 2px 1px #33b3db; +} + +.wp-core-ui .button-primary:active { + background: #d02c21; + border-color: #ba281e; + -webkit-box-shadow: inset 0 2px 0 #ba281e; + box-shadow: inset 0 2px 0 #ba281e; +} + +.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { + color: #d1c8c7 !important; + background: #d92e23 !important; + border-color: #ba281e !important; + text-shadow: none !important; +} + +.wp-core-ui .button-primary.button-hero { + -webkit-box-shadow: 0 2px 0 #ba281e !important; + box-shadow: 0 2px 0 #ba281e !important; +} + +.wp-core-ui .button-primary.button-hero:active { + -webkit-box-shadow: inset 0 3px 0 #ba281e !important; + box-shadow: inset 0 3px 0 #ba281e !important; +} + .wp-core-ui .wp-ui-primary { color: #fff; - background-color: #363b3f; } + background-color: #363b3f; +} + .wp-core-ui .wp-ui-text-primary { - color: #363b3f; } + color: #363b3f; +} + .wp-core-ui .wp-ui-highlight { color: #fff; - background-color: #e14d43; } + background-color: #e14d43; +} + .wp-core-ui .wp-ui-text-highlight { - color: #e14d43; } + color: #e14d43; +} + .wp-core-ui .wp-ui-notification { color: #fff; - background-color: #69a8bb; } + background-color: #69a8bb; +} + .wp-core-ui .wp-ui-text-notification { - color: #69a8bb; } + color: #69a8bb; +} + .wp-core-ui .wp-ui-text-icon { - color: #f1f2f3; } + color: #f1f2f3; +} /* List tables */ -.wrap .add-new-h2:hover, #add-new-comment a:hover, .tablenav .tablenav-pages a:hover, .tablenav .tablenav-pages a:focus { +.wrap .add-new-h2:hover, +.wrap .page-title-action:hover, +.tablenav .tablenav-pages a:hover, +.tablenav .tablenav-pages a:focus { color: #fff; - background-color: #363b3f; } + background-color: #363b3f; +} .view-switch a.current:before { - color: #363b3f; } + color: #363b3f; +} .view-switch a:hover:before { - color: #69a8bb; } - -.post-com-count:hover:after { - border-top-color: #363b3f; } - -.post-com-count:hover span { - color: #fff; - background-color: #363b3f; } - -strong .post-com-count:after { - border-top-color: #69a8bb; } - -strong .post-com-count span { - background-color: #69a8bb; } + color: #69a8bb; +} /* Admin Menu */ -#adminmenuback, #adminmenuwrap, #adminmenu { - background: #363b3f; } +#adminmenuback, +#adminmenuwrap, +#adminmenu { + background: #363b3f; +} #adminmenu a { - color: #fff; } + color: #fff; +} #adminmenu div.wp-menu-image:before { - color: #f1f2f3; } + color: #f1f2f3; +} -#adminmenu a:hover, #adminmenu li.menu-top:hover, #adminmenu li.opensub > a.menu-top, #adminmenu li > a.menu-top:focus { +#adminmenu a:hover, +#adminmenu li.menu-top:hover, +#adminmenu li.opensub > a.menu-top, +#adminmenu li > a.menu-top:focus { color: #fff; - background-color: #e14d43; } + background-color: #e14d43; +} -#adminmenu li.menu-top:hover div.wp-menu-image:before, #adminmenu li.opensub > a.menu-top div.wp-menu-image:before { - color: #fff; } +#adminmenu li.menu-top:hover div.wp-menu-image:before, +#adminmenu li.opensub > a.menu-top div.wp-menu-image:before { + color: #fff; +} /* Active tabs use a bottom border color that matches the page background color. */ -.about-wrap h2 .nav-tab-active, .nav-tab-active, .nav-tab-active:hover { +.about-wrap h2 .nav-tab-active, +.nav-tab-active, +.nav-tab-active:hover { background-color: #f1f1f1; - border-bottom-color: #f1f1f1; } + border-bottom-color: #f1f1f1; +} /* Admin Menu: submenu */ -#adminmenu .wp-submenu, #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu .wp-has-current-submenu.opensub .wp-submenu, .folded #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu { - background: #26292c; } +#adminmenu .wp-submenu, +#adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu, +.folded #adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu { + background: #26292c; +} #adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after { - border-right-color: #26292c; } + border-right-color: #26292c; +} #adminmenu .wp-submenu .wp-submenu-head { - color: #c2c4c5; } - -#adminmenu .wp-submenu a, #adminmenu .wp-has-current-submenu .wp-submenu a, .folded #adminmenu .wp-has-current-submenu .wp-submenu a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a { - color: #c2c4c5; } - #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, #adminmenu .wp-has-current-submenu .wp-submenu a:focus, #adminmenu .wp-has-current-submenu .wp-submenu a:hover, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { - color: #e14d43; } + color: #c3c4c5; +} + +#adminmenu .wp-submenu a, +#adminmenu .wp-has-current-submenu .wp-submenu a, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a { + color: #c3c4c5; +} + +#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu .wp-submenu a:hover, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { + color: #e14d43; +} /* Admin Menu: current */ -#adminmenu .wp-submenu li.current a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { - color: #fff; } - #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { - color: #e14d43; } +#adminmenu .wp-submenu li.current a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { + color: #fff; +} + +#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { + color: #e14d43; +} -ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.current:after { - border-right-color: #f1f1f1; } +ul#adminmenu a.wp-has-current-submenu:after, +ul#adminmenu > li.current > a.current:after { + border-right-color: #f1f1f1; +} -#adminmenu li.current a.menu-top, #adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, #adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, .folded #adminmenu li.current.menu-top { +#adminmenu li.current a.menu-top, +#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, +#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, +.folded #adminmenu li.current.menu-top { color: #fff; - background: #e14d43; } - -#adminmenu li.wp-has-current-submenu div.wp-menu-image:before { - color: #fff; } + background: #e14d43; +} + +#adminmenu li.wp-has-current-submenu div.wp-menu-image:before, +#adminmenu a.current:hover div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before, +#adminmenu li:hover div.wp-menu-image:before, +#adminmenu li a:focus div.wp-menu-image:before, +#adminmenu li.opensub div.wp-menu-image:before, +.ie8 #adminmenu li.opensub div.wp-menu-image:before { + color: #fff; +} /* Admin Menu: bubble */ -#adminmenu .awaiting-mod, #adminmenu .update-plugins { +#adminmenu .awaiting-mod, +#adminmenu .update-plugins { color: #fff; - background: #69a8bb; } + background: #69a8bb; +} -#adminmenu li.current a .awaiting-mod, #adminmenu li a.wp-has-current-submenu .update-plugins, #adminmenu li:hover a .awaiting-mod, #adminmenu li.menu-top:hover > a .update-plugins { +#adminmenu li.current a .awaiting-mod, +#adminmenu li a.wp-has-current-submenu .update-plugins, +#adminmenu li:hover a .awaiting-mod, +#adminmenu li.menu-top:hover > a .update-plugins { color: #fff; - background: #26292c; } + background: #26292c; +} /* Admin Menu: collapse button */ #collapse-menu { - color: #f1f2f3; } + color: #f1f2f3; +} #collapse-menu:hover { - color: #fff; } + color: #fff; +} #collapse-button div:after { - color: #f1f2f3; } + color: #f1f2f3; +} #collapse-menu:hover #collapse-button div:after { - color: #fff; } + color: #fff; +} /* Admin Bar */ #wpadminbar { color: #fff; - background: #363b3f; } - -#wpadminbar .ab-item, #wpadminbar a.ab-item, #wpadminbar > #wp-toolbar span.ab-label, #wpadminbar > #wp-toolbar span.noticon { - color: #fff; } + background: #363b3f; +} -#wpadminbar .ab-icon, #wpadminbar .ab-icon:before, #wpadminbar .ab-item:before, #wpadminbar .ab-item:after { - color: #f1f2f3; } - -#wpadminbar .ab-top-menu > li:hover > .ab-item, #wpadminbar .ab-top-menu > li.hover > .ab-item, #wpadminbar .ab-top-menu > li > .ab-item:focus, #wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, #wpadminbar-nojs .ab-top-menu > li.menupop:hover > .ab-item, #wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { +#wpadminbar .ab-item, +#wpadminbar a.ab-item, +#wpadminbar > #wp-toolbar span.ab-label, +#wpadminbar > #wp-toolbar span.noticon { + color: #fff; +} + +#wpadminbar .ab-icon, +#wpadminbar .ab-icon:before, +#wpadminbar .ab-item:before, +#wpadminbar .ab-item:after { + color: #f1f2f3; +} + +#wpadminbar:not(.mobile) .ab-top-menu > li:hover > .ab-item, +#wpadminbar:not(.mobile) .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojs .ab-top-menu > li.menupop:hover > .ab-item, +#wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { color: #e14d43; - background: #26292c; } + background: #26292c; +} -#wpadminbar > #wp-toolbar li:hover span.ab-label, #wpadminbar > #wp-toolbar li.hover span.ab-label, #wpadminbar > #wp-toolbar a:focus span.ab-label { - color: #e14d43; } +#wpadminbar:not(.mobile) > #wp-toolbar li:hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar li.hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar a:focus span.ab-label { + color: #e14d43; +} -#wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #fff; } +#wpadminbar:not(.mobile) li:hover .ab-icon:before, +#wpadminbar:not(.mobile) li:hover .ab-item:before, +#wpadminbar:not(.mobile) li:hover .ab-item:after, +#wpadminbar:not(.mobile) li:hover #adminbarsearch:before { + color: #fff; +} /* Admin Bar: submenu */ #wpadminbar .menupop .ab-sub-wrapper { - background: #26292c; } - -#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, #wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { - background: #4c4c4d; } - -#wpadminbar .ab-submenu .ab-item, #wpadminbar .quicklinks .menupop ul li a, #wpadminbar .quicklinks .menupop.hover ul li a, #wpadminbar-nojs .quicklinks .menupop:hover ul li a { - color: #c2c4c5; } - -#wpadminbar .quicklinks li .blavatar, #wpadminbar .menupop .menupop > .ab-item:before { - color: #f1f2f3; } - -#wpadminbar .quicklinks .menupop ul li a:hover, #wpadminbar .quicklinks .menupop ul li a:focus, #wpadminbar .quicklinks .menupop ul li a:hover strong, #wpadminbar .quicklinks .menupop ul li a:focus strong, #wpadminbar .quicklinks .menupop.hover ul li a:hover, #wpadminbar .quicklinks .menupop.hover ul li a:focus, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, #wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li a:focus .ab-icon:before, #wpadminbar li .ab-item:focus:before, #wpadminbar li.hover .ab-icon:before, #wpadminbar li.hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li.hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #e14d43; } + background: #26292c; +} + +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { + background: #4c4c4d; +} + +#wpadminbar .ab-submenu .ab-item, +#wpadminbar .quicklinks .menupop ul li a, +#wpadminbar .quicklinks .menupop.hover ul li a, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a { + color: #c3c4c5; +} + +#wpadminbar .quicklinks li .blavatar, +#wpadminbar .menupop .menupop > .ab-item:before { + color: #f1f2f3; +} + +#wpadminbar .quicklinks .menupop ul li a:hover, +#wpadminbar .quicklinks .menupop ul li a:focus, +#wpadminbar .quicklinks .menupop ul li a:hover strong, +#wpadminbar .quicklinks .menupop ul li a:focus strong, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a, +#wpadminbar .quicklinks .menupop.hover ul li a:hover, +#wpadminbar .quicklinks .menupop.hover ul li a:focus, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, +#wpadminbar li:hover .ab-icon:before, +#wpadminbar li:hover .ab-item:before, +#wpadminbar li a:focus .ab-icon:before, +#wpadminbar li .ab-item:focus:before, +#wpadminbar li.hover .ab-icon:before, +#wpadminbar li.hover .ab-item:before, +#wpadminbar li:hover #adminbarsearch:before, +#wpadminbar li #adminbarsearch.adminbar-focused:before { + color: #e14d43; +} + +#wpadminbar .quicklinks li a:hover .blavatar, +#wpadminbar .quicklinks li a:focus .blavatar, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar, +#wpadminbar .menupop .menupop > .ab-item:hover:before, +#wpadminbar.mobile .quicklinks .ab-icon:before, +#wpadminbar.mobile .quicklinks .ab-item:before { + color: #e14d43; +} -#wpadminbar .quicklinks li a:hover .blavatar, #wpadminbar .menupop .menupop > .ab-item:hover:before { - color: #e14d43; } +#wpadminbar.mobile .quicklinks .hover .ab-icon:before, +#wpadminbar.mobile .quicklinks .hover .ab-item:before { + color: #f1f2f3; +} /* Admin Bar: search */ #wpadminbar #adminbarsearch:before { - color: #f1f2f3; } + color: #f1f2f3; +} #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus { color: #fff; - background: #464d52; } - -#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder { - color: #fff; - opacity: 0.7; } + background: #464d52; +} /* Admin Bar: my account */ #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { border-color: #464d52; - background-color: #464d52; } + background-color: #464d52; +} #wpadminbar #wp-admin-bar-user-info .display-name { - color: #fff; } + color: #fff; +} #wpadminbar #wp-admin-bar-user-info a:hover .display-name { - color: #e14d43; } + color: #e14d43; +} #wpadminbar #wp-admin-bar-user-info .username { - color: #c2c4c5; } + color: #c3c4c5; +} /* Pointers */ .wp-pointer .wp-pointer-content h3 { background-color: #e14d43; - border-color: #dd362d; } + border-color: #dd382d; +} .wp-pointer .wp-pointer-content h3:before { - color: #e14d43; } - -.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow { - border-bottom-color: #e14d43; } - -/* Media Uploader */ -.media-item .bar, .media-progress-bar div { - background-color: #e14d43; } + color: #e14d43; +} + +.wp-pointer.wp-pointer-top .wp-pointer-arrow, +.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner { + border-bottom-color: #e14d43; +} + +/* Media */ +.media-item .bar, +.media-progress-bar div { + background-color: #e14d43; +} .details.attachment { - -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #e14d43; - box-shadow: 0 0 0 1px #fff, 0 0 0 5px #e14d43; } + -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #e14d43; + box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #e14d43; +} .attachment.details .check { background-color: #e14d43; -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #e14d43; - box-shadow: 0 0 0 1px #fff, 0 0 0 2px #e14d43; } + box-shadow: 0 0 0 1px #fff, 0 0 0 2px #e14d43; +} + +.media-selection .attachment.selection.details .thumbnail { + -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #e14d43; + box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #e14d43; +} /* Themes */ -.theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after { - background: #e14d43; } +.theme-browser .theme.active .theme-name, +.theme-browser .theme.add-new-theme a:hover:after, +.theme-browser .theme.add-new-theme a:focus:after { + background: #e14d43; +} -.theme-browser .theme.add-new-theme:hover span:after { - color: #e14d43; } +.theme-browser .theme.add-new-theme a:hover span:after, +.theme-browser .theme.add-new-theme a:focus span:after { + color: #e14d43; +} -.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover { - background: #e14d43; } +.theme-section.current, +.theme-filter.current { + border-bottom-color: #363b3f; +} -.theme-section.current, .theme-filter.current { - border-bottom-color: #363b3f; } +body.more-filters-opened .more-filters { + color: #fff; + background-color: #363b3f; +} -body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before { +body.more-filters-opened .more-filters:before { color: #fff; - background-color: #363b3f; } +} -body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before { +body.more-filters-opened .more-filters:hover, +body.more-filters-opened .more-filters:focus { background-color: #e14d43; - color: #fff; } + color: #fff; +} + +body.more-filters-opened .more-filters:hover:before, +body.more-filters-opened .more-filters:focus:before { + color: #fff; +} /* Widgets */ .widgets-chooser li.widgets-chooser-selected { background-color: #e14d43; - color: #fff; } + color: #fff; +} -.widgets-chooser li.widgets-chooser-selected:before, .widgets-chooser li.widgets-chooser-selected:focus:before { - color: #fff; } +.widgets-chooser li.widgets-chooser-selected:before, +.widgets-chooser li.widgets-chooser-selected:focus:before { + color: #fff; +} /* Customize */ #customize-theme-controls .widget-area-select .selected { background-color: #e14d43; - color: #fff; } - -/* jQuery UI Slider */ -.wp-slider .ui-slider-handle, .wp-slider .ui-slider-handle.ui-state-hover, .wp-slider .ui-slider-handle.focus { - background: #e14d43; - border-color: #d02a21; - -webkit-box-shadow: inset 0 1px 0 #ec8a85, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #ec8a85, 0 1px 0 rgba(0, 0, 0, 0.15); } - -/* Thickbox: Plugin information */ -#sidemenu a.current { - background: #f1f1f1; - border-bottom-color: #f1f1f1; } + color: #fff; +} -#plugin-information .action-button { - background: #e14d43; } +#customize-footer-actions .devices button:focus { + border-bottom-color: #e14d43; +} /* Responsive Component */ div#wp-responsive-toggle a:before { - color: #f1f2f3; } + color: #f1f2f3; +} .wp-responsive-open div#wp-responsive-toggle a { border-color: transparent; - background: #e14d43; } - -.star-rating .star { - color: #e14d43; } + background: #e14d43; +} .wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a { - background: #26292c; } + background: #26292c; +} + +.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before { + color: #f1f2f3; +} + +/* TinyMCE */ +.mce-container.mce-menu .mce-menu-item:hover, +.mce-container.mce-menu .mce-menu-item.mce-selected, +.mce-container.mce-menu .mce-menu-item:focus, +.mce-container.mce-menu .mce-menu-item-normal.mce-active, +.mce-container.mce-menu .mce-menu-item-preview.mce-active { + background: #e14d43; +} diff --git a/wp-admin/css/colors/midnight/colors.min.css b/wp-admin/css/colors/midnight/colors.min.css index e4f464f..ca119d2 100644 --- a/wp-admin/css/colors/midnight/colors.min.css +++ b/wp-admin/css/colors/midnight/colors.min.css @@ -1 +1 @@ -html{background:#f1f1f1}a{color:#0074a2}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,a:active,a:focus,a:hover,div.dashboard-widget-submit input:hover{color:#0099d5}input[type=checkbox]:checked:before{color:#e14d43}input[type=radio]:checked:before{background:#e14d43}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0099d5}.wp-core-ui .button-primary{background:#e14d43;border-color:#d02a21;color:#fff;-webkit-box-shadow:inset 0 1px 0 #ec8a85,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #ec8a85,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#dd362d;border-color:#ba251e;color:#fff;-webkit-box-shadow:inset 0 1px 0 #e8756f,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #e8756f,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:active{background:#d02a21;border-color:#ba251e;color:#fff;-webkit-box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5);box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5)}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#d1c7c7!important;background:#d92c23!important;border-color:#ba251e!important;text-shadow:none!important}.wp-core-ui .wp-ui-primary{color:#fff;background-color:#363b3f}.wp-core-ui .wp-ui-text-primary{color:#363b3f}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#e14d43}.wp-core-ui .wp-ui-text-highlight{color:#e14d43}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#69a8bb}.wp-core-ui .wp-ui-text-notification{color:#69a8bb}.wp-core-ui .wp-ui-text-icon{color:#f1f2f3}#add-new-comment a:hover,.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover{color:#fff;background-color:#363b3f}.view-switch a.current:before{color:#363b3f}.view-switch a:hover:before{color:#69a8bb}.post-com-count:hover:after{border-top-color:#363b3f}.post-com-count:hover span{color:#fff;background-color:#363b3f}strong .post-com-count:after{border-top-color:#69a8bb}strong .post-com-count span{background-color:#69a8bb}#adminmenu,#adminmenuback,#adminmenuwrap{background:#363b3f}#adminmenu a{color:#fff}#adminmenu div.wp-menu-image:before{color:#f1f2f3}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#e14d43}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#fff}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f1f1f1;border-bottom-color:#f1f1f1}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#26292c}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-right-color:#26292c}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu .wp-submenu-head,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#c2c4c5}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#e14d43}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#e14d43}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-right-color:#f1f1f1}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#e14d43}#adminmenu li.wp-has-current-submenu div.wp-menu-image:before{color:#fff}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#69a8bb}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#fff;background:#26292c}#collapse-menu{color:#f1f2f3}#collapse-menu:hover{color:#fff}#collapse-button div:after{color:#f1f2f3}#collapse-menu:hover #collapse-button div:after{color:#fff}#wpadminbar{color:#fff;background:#363b3f}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#fff}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#f1f2f3}#wpadminbar .ab-top-menu>li.hover>.ab-item,#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar .ab-top-menu>li:hover>.ab-item,#wpadminbar .ab-top-menu>li>.ab-item:focus,#wpadminbar-nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus{color:#e14d43;background:#26292c}#wpadminbar>#wp-toolbar a:focus span.ab-label,#wpadminbar>#wp-toolbar li.hover span.ab-label,#wpadminbar>#wp-toolbar li:hover span.ab-label{color:#e14d43}#wpadminbar .menupop .ab-sub-wrapper{background:#26292c}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#4c4c4d}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar-nojs .quicklinks .menupop:hover ul li a{color:#c2c4c5}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#f1f2f3}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:after,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:after,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#e14d43}#wpadminbar #adminbarsearch:before{color:#f1f2f3}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#fff;background:#464d52}#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder{color:#fff;opacity:.7}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#464d52;background-color:#464d52}#wpadminbar #wp-admin-bar-user-info .display-name{color:#fff}#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#e14d43}#wpadminbar #wp-admin-bar-user-info .username{color:#c2c4c5}.wp-pointer .wp-pointer-content h3{background-color:#e14d43;border-color:#dd362d}.wp-pointer .wp-pointer-content h3:before{color:#e14d43}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow{border-bottom-color:#e14d43}.media-item .bar,.media-progress-bar div{background-color:#e14d43}.details.attachment{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 5px #e14d43;box-shadow:0 0 0 1px #fff,0 0 0 5px #e14d43}.attachment.details .check{background-color:#e14d43;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #e14d43;box-shadow:0 0 0 1px #fff,0 0 0 2px #e14d43}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme:hover:after{background:#e14d43}.theme-browser .theme.add-new-theme:hover span:after{color:#e14d43}.theme-overlay .theme-header .close:hover,.theme-overlay .theme-header .left:hover,.theme-overlay .theme-header .right:hover{background:#e14d43}.theme-filter.current,.theme-section.current{border-bottom-color:#363b3f}body.more-filters-opened .more-filters,body.more-filters-opened .more-filters:before{color:#fff;background-color:#363b3f}.widgets-chooser li.widgets-chooser-selected,body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover,body.more-filters-opened .more-filters:hover:before{background-color:#e14d43;color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-theme-controls .widget-area-select .selected{background-color:#e14d43;color:#fff}.wp-slider .ui-slider-handle,.wp-slider .ui-slider-handle.focus,.wp-slider .ui-slider-handle.ui-state-hover{background:#e14d43;border-color:#d02a21;-webkit-box-shadow:inset 0 1px 0 #ec8a85,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #ec8a85,0 1px 0 rgba(0,0,0,.15)}#sidemenu a.current{background:#f1f1f1;border-bottom-color:#f1f1f1}#plugin-information .action-button{background:#e14d43}div#wp-responsive-toggle a:before{color:#f1f2f3}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#e14d43}.star-rating .star{color:#e14d43}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#26292c} \ No newline at end of file +html{background:#f1f1f1}a{color:#0073aa}a:active,a:focus,a:hover{color:#0096dd}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,div.dashboard-widget-submit input:hover{color:#0096dd}input[type=checkbox]:checked:before{color:#e14d43}input[type=radio]:checked:before{background:#e14d43}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0096dd}.wp-core-ui .button-primary{background:#e14d43;border-color:#d02c21 #ba281e #ba281e;color:#fff;-webkit-box-shadow:0 1px 0 #ba281e;box-shadow:0 1px 0 #ba281e;text-shadow:0 -1px 1px #ba281e,1px 0 1px #ba281e,0 1px 1px #ba281e,-1px 0 1px #ba281e}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#e35950;border-color:#ba281e;color:#fff;-webkit-box-shadow:0 1px 0 #ba281e;box-shadow:0 1px 0 #ba281e}.wp-core-ui .button-primary:focus{-webkit-box-shadow:inset 0 1px 0 #d02c21,0 0 2px 1px #33b3db;box-shadow:inset 0 1px 0 #d02c21,0 0 2px 1px #33b3db}.wp-core-ui .button-primary:active{background:#d02c21;border-color:#ba281e;-webkit-box-shadow:inset 0 2px 0 #ba281e;box-shadow:inset 0 2px 0 #ba281e}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#d1c8c7!important;background:#d92e23!important;border-color:#ba281e!important;text-shadow:none!important}.wp-core-ui .button-primary.button-hero{-webkit-box-shadow:0 2px 0 #ba281e!important;box-shadow:0 2px 0 #ba281e!important}.wp-core-ui .button-primary.button-hero:active{-webkit-box-shadow:inset 0 3px 0 #ba281e!important;box-shadow:inset 0 3px 0 #ba281e!important}.wp-core-ui .wp-ui-primary{color:#fff;background-color:#363b3f}.wp-core-ui .wp-ui-text-primary{color:#363b3f}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#e14d43}.wp-core-ui .wp-ui-text-highlight{color:#e14d43}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#69a8bb}.wp-core-ui .wp-ui-text-notification{color:#69a8bb}.wp-core-ui .wp-ui-text-icon{color:#f1f2f3}.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover,.wrap .page-title-action:hover{color:#fff;background-color:#363b3f}.view-switch a.current:before{color:#363b3f}.view-switch a:hover:before{color:#69a8bb}#adminmenu,#adminmenuback,#adminmenuwrap{background:#363b3f}#adminmenu a{color:#fff}#adminmenu div.wp-menu-image:before{color:#f1f2f3}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#e14d43}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#fff}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f1f1f1;border-bottom-color:#f1f1f1}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#26292c}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-right-color:#26292c}#adminmenu .wp-submenu .wp-submenu-head{color:#c3c4c5}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#c3c4c5}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#e14d43}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#e14d43}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-right-color:#f1f1f1}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#e14d43}#adminmenu a.current:hover div.wp-menu-image:before,#adminmenu li a:focus div.wp-menu-image:before,#adminmenu li.opensub div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,#adminmenu li:hover div.wp-menu-image:before,.ie8 #adminmenu li.opensub div.wp-menu-image:before{color:#fff}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#69a8bb}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#fff;background:#26292c}#collapse-menu{color:#f1f2f3}#collapse-menu:hover{color:#fff}#collapse-button div:after{color:#f1f2f3}#collapse-menu:hover #collapse-button div:after{color:#fff}#wpadminbar{color:#fff;background:#363b3f}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#fff}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#f1f2f3}#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus,#wpadminbar.nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li>.ab-item:focus{color:#e14d43;background:#26292c}#wpadminbar:not(.mobile)>#wp-toolbar a:focus span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li.hover span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li:hover span.ab-label{color:#e14d43}#wpadminbar:not(.mobile) li:hover #adminbarsearch:before,#wpadminbar:not(.mobile) li:hover .ab-icon:before,#wpadminbar:not(.mobile) li:hover .ab-item:after,#wpadminbar:not(.mobile) li:hover .ab-item:before{color:#fff}#wpadminbar .menupop .ab-sub-wrapper{background:#26292c}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#4c4c4d}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar.nojs .quicklinks .menupop:hover ul li a{color:#c3c4c5}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#f1f2f3}#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar li #adminbarsearch.adminbar-focused:before,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#e14d43}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a .blavatar,#wpadminbar .quicklinks li a:focus .blavatar,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar.mobile .quicklinks .ab-icon:before,#wpadminbar.mobile .quicklinks .ab-item:before{color:#e14d43}#wpadminbar.mobile .quicklinks .hover .ab-icon:before,#wpadminbar.mobile .quicklinks .hover .ab-item:before{color:#f1f2f3}#wpadminbar #adminbarsearch:before{color:#f1f2f3}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#fff;background:#464d52}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#464d52;background-color:#464d52}#wpadminbar #wp-admin-bar-user-info .display-name{color:#fff}#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#e14d43}#wpadminbar #wp-admin-bar-user-info .username{color:#c3c4c5}.wp-pointer .wp-pointer-content h3{background-color:#e14d43;border-color:#dd382d}.wp-pointer .wp-pointer-content h3:before{color:#e14d43}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner{border-bottom-color:#e14d43}.media-item .bar,.media-progress-bar div{background-color:#e14d43}.details.attachment{-webkit-box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #e14d43;box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #e14d43}.attachment.details .check{background-color:#e14d43;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #e14d43;box-shadow:0 0 0 1px #fff,0 0 0 2px #e14d43}.media-selection .attachment.selection.details .thumbnail{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 3px #e14d43;box-shadow:0 0 0 1px #fff,0 0 0 3px #e14d43}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme a:focus:after,.theme-browser .theme.add-new-theme a:hover:after{background:#e14d43}.theme-browser .theme.add-new-theme a:focus span:after,.theme-browser .theme.add-new-theme a:hover span:after{color:#e14d43}.theme-filter.current,.theme-section.current{border-bottom-color:#363b3f}body.more-filters-opened .more-filters{color:#fff;background-color:#363b3f}#customize-theme-controls .widget-area-select .selected,.widgets-chooser li.widgets-chooser-selected{background-color:#e14d43;color:#fff}body.more-filters-opened .more-filters:before{color:#fff}body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:hover{background-color:#e14d43;color:#fff}body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover:before{color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-footer-actions .devices button:focus{border-bottom-color:#e14d43}div#wp-responsive-toggle a:before{color:#f1f2f3}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#e14d43}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#26292c}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before{color:#f1f2f3}.mce-container.mce-menu .mce-menu-item-normal.mce-active,.mce-container.mce-menu .mce-menu-item-preview.mce-active,.mce-container.mce-menu .mce-menu-item.mce-selected,.mce-container.mce-menu .mce-menu-item:focus,.mce-container.mce-menu .mce-menu-item:hover{background:#e14d43} \ No newline at end of file diff --git a/wp-admin/css/colors/ocean/colors-rtl.css b/wp-admin/css/colors/ocean/colors-rtl.css index 665efad..65c0ead 100644 --- a/wp-admin/css/colors/ocean/colors-rtl.css +++ b/wp-admin/css/colors/ocean/colors-rtl.css @@ -3,329 +3,524 @@ * highlights/shadows, based on a base color. */ html { - background: #f1f1f1; } + background: #f1f1f1; +} /* Links */ a { - color: #0074a2; } - a:hover, a:active, a:focus { - color: #0099d5; } + color: #0073aa; +} + +a:hover, a:active, a:focus { + color: #0096dd; +} -#media-upload a.del-link:hover, div.dashboard-widget-submit input:hover, .subsubsub a:hover, .subsubsub a.current:hover { - color: #0099d5; } +#media-upload a.del-link:hover, +div.dashboard-widget-submit input:hover, +.subsubsub a:hover, +.subsubsub a.current:hover { + color: #0096dd; +} /* Forms */ input[type=checkbox]:checked:before { - color: #738e96; } + color: #738e96; +} input[type=radio]:checked:before { - background: #738e96; } + background: #738e96; +} -.wp-core-ui input[type="reset"]:hover, .wp-core-ui input[type="reset"]:active { - color: #0099d5; } +.wp-core-ui input[type="reset"]:hover, +.wp-core-ui input[type="reset"]:active { + color: #0096dd; +} /* Core UI */ .wp-core-ui .button-primary { background: #9ebaa0; - border-color: #80a583; + border-color: #80a583 #719a74 #719a74; + color: white; + -webkit-box-shadow: 0 1px 0 #719a74; + box-shadow: 0 1px 0 #719a74; + text-shadow: 0 -1px 1px #719a74, -1px 0 1px #719a74, 0 1px 1px #719a74, 1px 0 1px #719a74; +} + +.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { + background: #a7c0a9; + border-color: #719a74; color: white; - -webkit-box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { - background: #8faf91; - border-color: #719a74; - color: white; - -webkit-box-shadow: inset 0 1px 0 #bccfbd, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #bccfbd, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:active { - background: #80a583; - border-color: #719a74; - color: white; - -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); - box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); } - .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { - color: #c7d1c8 !important; - background: #86a988 !important; - border-color: #719a74 !important; - text-shadow: none !important; } + -webkit-box-shadow: 0 1px 0 #719a74; + box-shadow: 0 1px 0 #719a74; +} + +.wp-core-ui .button-primary:focus { + -webkit-box-shadow: inset 0 1px 0 #80a583, 0 0 2px 1px #33b3db; + box-shadow: inset 0 1px 0 #80a583, 0 0 2px 1px #33b3db; +} + +.wp-core-ui .button-primary:active { + background: #80a583; + border-color: #719a74; + -webkit-box-shadow: inset 0 2px 0 #719a74; + box-shadow: inset 0 2px 0 #719a74; +} + +.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { + color: #c7d1c8 !important; + background: #86a989 !important; + border-color: #719a74 !important; + text-shadow: none !important; +} + +.wp-core-ui .button-primary.button-hero { + -webkit-box-shadow: 0 2px 0 #719a74 !important; + box-shadow: 0 2px 0 #719a74 !important; +} + +.wp-core-ui .button-primary.button-hero:active { + -webkit-box-shadow: inset 0 3px 0 #719a74 !important; + box-shadow: inset 0 3px 0 #719a74 !important; +} + .wp-core-ui .wp-ui-primary { color: #fff; - background-color: #738e96; } + background-color: #738e96; +} + .wp-core-ui .wp-ui-text-primary { - color: #738e96; } + color: #738e96; +} + .wp-core-ui .wp-ui-highlight { color: #fff; - background-color: #9ebaa0; } + background-color: #9ebaa0; +} + .wp-core-ui .wp-ui-text-highlight { - color: #9ebaa0; } + color: #9ebaa0; +} + .wp-core-ui .wp-ui-notification { color: #fff; - background-color: #aa9d88; } + background-color: #aa9d88; +} + .wp-core-ui .wp-ui-text-notification { - color: #aa9d88; } + color: #aa9d88; +} + .wp-core-ui .wp-ui-text-icon { - color: #f2fcff; } + color: #f2fcff; +} /* List tables */ -.wrap .add-new-h2:hover, #add-new-comment a:hover, .tablenav .tablenav-pages a:hover, .tablenav .tablenav-pages a:focus { +.wrap .add-new-h2:hover, +.wrap .page-title-action:hover, +.tablenav .tablenav-pages a:hover, +.tablenav .tablenav-pages a:focus { color: #fff; - background-color: #738e96; } + background-color: #738e96; +} .view-switch a.current:before { - color: #738e96; } + color: #738e96; +} .view-switch a:hover:before { - color: #aa9d88; } - -.post-com-count:hover:after { - border-top-color: #738e96; } - -.post-com-count:hover span { - color: #fff; - background-color: #738e96; } - -strong .post-com-count:after { - border-top-color: #aa9d88; } - -strong .post-com-count span { - background-color: #aa9d88; } + color: #aa9d88; +} /* Admin Menu */ -#adminmenuback, #adminmenuwrap, #adminmenu { - background: #738e96; } +#adminmenuback, +#adminmenuwrap, +#adminmenu { + background: #738e96; +} #adminmenu a { - color: #fff; } + color: #fff; +} #adminmenu div.wp-menu-image:before { - color: #f2fcff; } + color: #f2fcff; +} -#adminmenu a:hover, #adminmenu li.menu-top:hover, #adminmenu li.opensub > a.menu-top, #adminmenu li > a.menu-top:focus { +#adminmenu a:hover, +#adminmenu li.menu-top:hover, +#adminmenu li.opensub > a.menu-top, +#adminmenu li > a.menu-top:focus { color: #fff; - background-color: #9ebaa0; } + background-color: #9ebaa0; +} -#adminmenu li.menu-top:hover div.wp-menu-image:before, #adminmenu li.opensub > a.menu-top div.wp-menu-image:before { - color: #fff; } +#adminmenu li.menu-top:hover div.wp-menu-image:before, +#adminmenu li.opensub > a.menu-top div.wp-menu-image:before { + color: #fff; +} /* Active tabs use a bottom border color that matches the page background color. */ -.about-wrap h2 .nav-tab-active, .nav-tab-active, .nav-tab-active:hover { +.about-wrap h2 .nav-tab-active, +.nav-tab-active, +.nav-tab-active:hover { background-color: #f1f1f1; - border-bottom-color: #f1f1f1; } + border-bottom-color: #f1f1f1; +} /* Admin Menu: submenu */ -#adminmenu .wp-submenu, #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu .wp-has-current-submenu.opensub .wp-submenu, .folded #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu { - background: #627c83; } +#adminmenu .wp-submenu, +#adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu, +.folded #adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu { + background: #627c83; +} #adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after { - border-left-color: #627c83; } + border-left-color: #627c83; +} #adminmenu .wp-submenu .wp-submenu-head { - color: #d5dddf; } - -#adminmenu .wp-submenu a, #adminmenu .wp-has-current-submenu .wp-submenu a, .folded #adminmenu .wp-has-current-submenu .wp-submenu a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a { - color: #d5dddf; } - #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, #adminmenu .wp-has-current-submenu .wp-submenu a:focus, #adminmenu .wp-has-current-submenu .wp-submenu a:hover, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { - color: #9ebaa0; } + color: #d5dde0; +} + +#adminmenu .wp-submenu a, +#adminmenu .wp-has-current-submenu .wp-submenu a, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a { + color: #d5dde0; +} + +#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu .wp-submenu a:hover, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { + color: #9ebaa0; +} /* Admin Menu: current */ -#adminmenu .wp-submenu li.current a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { - color: #fff; } - #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { - color: #9ebaa0; } +#adminmenu .wp-submenu li.current a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { + color: #fff; +} -ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.current:after { - border-left-color: #f1f1f1; } +#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { + color: #9ebaa0; +} -#adminmenu li.current a.menu-top, #adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, #adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, .folded #adminmenu li.current.menu-top { - color: #fff; - background: #9ebaa0; } +ul#adminmenu a.wp-has-current-submenu:after, +ul#adminmenu > li.current > a.current:after { + border-left-color: #f1f1f1; +} -#adminmenu li.wp-has-current-submenu div.wp-menu-image:before { - color: #fff; } +#adminmenu li.current a.menu-top, +#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, +#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, +.folded #adminmenu li.current.menu-top { + color: #fff; + background: #9ebaa0; +} + +#adminmenu li.wp-has-current-submenu div.wp-menu-image:before, +#adminmenu a.current:hover div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before, +#adminmenu li:hover div.wp-menu-image:before, +#adminmenu li a:focus div.wp-menu-image:before, +#adminmenu li.opensub div.wp-menu-image:before, +.ie8 #adminmenu li.opensub div.wp-menu-image:before { + color: #fff; +} /* Admin Menu: bubble */ -#adminmenu .awaiting-mod, #adminmenu .update-plugins { +#adminmenu .awaiting-mod, +#adminmenu .update-plugins { color: #fff; - background: #aa9d88; } + background: #aa9d88; +} -#adminmenu li.current a .awaiting-mod, #adminmenu li a.wp-has-current-submenu .update-plugins, #adminmenu li:hover a .awaiting-mod, #adminmenu li.menu-top:hover > a .update-plugins { +#adminmenu li.current a .awaiting-mod, +#adminmenu li a.wp-has-current-submenu .update-plugins, +#adminmenu li:hover a .awaiting-mod, +#adminmenu li.menu-top:hover > a .update-plugins { color: #fff; - background: #627c83; } + background: #627c83; +} /* Admin Menu: collapse button */ #collapse-menu { - color: #f2fcff; } + color: #f2fcff; +} #collapse-menu:hover { - color: #fff; } + color: #fff; +} #collapse-button div:after { - color: #f2fcff; } + color: #f2fcff; +} #collapse-menu:hover #collapse-button div:after { - color: #fff; } + color: #fff; +} /* Admin Bar */ #wpadminbar { color: #fff; - background: #738e96; } - -#wpadminbar .ab-item, #wpadminbar a.ab-item, #wpadminbar > #wp-toolbar span.ab-label, #wpadminbar > #wp-toolbar span.noticon { - color: #fff; } - -#wpadminbar .ab-icon, #wpadminbar .ab-icon:before, #wpadminbar .ab-item:before, #wpadminbar .ab-item:after { - color: #f2fcff; } + background: #738e96; +} -#wpadminbar .ab-top-menu > li:hover > .ab-item, #wpadminbar .ab-top-menu > li.hover > .ab-item, #wpadminbar .ab-top-menu > li > .ab-item:focus, #wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, #wpadminbar-nojs .ab-top-menu > li.menupop:hover > .ab-item, #wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { +#wpadminbar .ab-item, +#wpadminbar a.ab-item, +#wpadminbar > #wp-toolbar span.ab-label, +#wpadminbar > #wp-toolbar span.noticon { + color: #fff; +} + +#wpadminbar .ab-icon, +#wpadminbar .ab-icon:before, +#wpadminbar .ab-item:before, +#wpadminbar .ab-item:after { + color: #f2fcff; +} + +#wpadminbar:not(.mobile) .ab-top-menu > li:hover > .ab-item, +#wpadminbar:not(.mobile) .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojs .ab-top-menu > li.menupop:hover > .ab-item, +#wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { color: #9ebaa0; - background: #627c83; } + background: #627c83; +} -#wpadminbar > #wp-toolbar li:hover span.ab-label, #wpadminbar > #wp-toolbar li.hover span.ab-label, #wpadminbar > #wp-toolbar a:focus span.ab-label { - color: #9ebaa0; } +#wpadminbar:not(.mobile) > #wp-toolbar li:hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar li.hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar a:focus span.ab-label { + color: #9ebaa0; +} -#wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #fff; } +#wpadminbar:not(.mobile) li:hover .ab-icon:before, +#wpadminbar:not(.mobile) li:hover .ab-item:before, +#wpadminbar:not(.mobile) li:hover .ab-item:after, +#wpadminbar:not(.mobile) li:hover #adminbarsearch:before { + color: #fff; +} /* Admin Bar: submenu */ #wpadminbar .menupop .ab-sub-wrapper { - background: #627c83; } - -#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, #wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { - background: #8f9b9e; } - -#wpadminbar .ab-submenu .ab-item, #wpadminbar .quicklinks .menupop ul li a, #wpadminbar .quicklinks .menupop.hover ul li a, #wpadminbar-nojs .quicklinks .menupop:hover ul li a { - color: #d5dddf; } - -#wpadminbar .quicklinks li .blavatar, #wpadminbar .menupop .menupop > .ab-item:before { - color: #f2fcff; } - -#wpadminbar .quicklinks .menupop ul li a:hover, #wpadminbar .quicklinks .menupop ul li a:focus, #wpadminbar .quicklinks .menupop ul li a:hover strong, #wpadminbar .quicklinks .menupop ul li a:focus strong, #wpadminbar .quicklinks .menupop.hover ul li a:hover, #wpadminbar .quicklinks .menupop.hover ul li a:focus, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, #wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li a:focus .ab-icon:before, #wpadminbar li .ab-item:focus:before, #wpadminbar li.hover .ab-icon:before, #wpadminbar li.hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li.hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #9ebaa0; } + background: #627c83; +} + +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { + background: #8f9a9e; +} + +#wpadminbar .ab-submenu .ab-item, +#wpadminbar .quicklinks .menupop ul li a, +#wpadminbar .quicklinks .menupop.hover ul li a, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a { + color: #d5dde0; +} + +#wpadminbar .quicklinks li .blavatar, +#wpadminbar .menupop .menupop > .ab-item:before { + color: #f2fcff; +} + +#wpadminbar .quicklinks .menupop ul li a:hover, +#wpadminbar .quicklinks .menupop ul li a:focus, +#wpadminbar .quicklinks .menupop ul li a:hover strong, +#wpadminbar .quicklinks .menupop ul li a:focus strong, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a, +#wpadminbar .quicklinks .menupop.hover ul li a:hover, +#wpadminbar .quicklinks .menupop.hover ul li a:focus, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, +#wpadminbar li:hover .ab-icon:before, +#wpadminbar li:hover .ab-item:before, +#wpadminbar li a:focus .ab-icon:before, +#wpadminbar li .ab-item:focus:before, +#wpadminbar li.hover .ab-icon:before, +#wpadminbar li.hover .ab-item:before, +#wpadminbar li:hover #adminbarsearch:before, +#wpadminbar li #adminbarsearch.adminbar-focused:before { + color: #9ebaa0; +} + +#wpadminbar .quicklinks li a:hover .blavatar, +#wpadminbar .quicklinks li a:focus .blavatar, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar, +#wpadminbar .menupop .menupop > .ab-item:hover:before, +#wpadminbar.mobile .quicklinks .ab-icon:before, +#wpadminbar.mobile .quicklinks .ab-item:before { + color: #9ebaa0; +} -#wpadminbar .quicklinks li a:hover .blavatar, #wpadminbar .menupop .menupop > .ab-item:hover:before { - color: #9ebaa0; } +#wpadminbar.mobile .quicklinks .hover .ab-icon:before, +#wpadminbar.mobile .quicklinks .hover .ab-item:before { + color: #f2fcff; +} /* Admin Bar: search */ #wpadminbar #adminbarsearch:before { - color: #f2fcff; } + color: #f2fcff; +} #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus { color: #fff; - background: #879fa5; } - -#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder { - color: #fff; - opacity: 0.7; } + background: #879ea5; +} /* Admin Bar: my account */ #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { - border-color: #879fa5; - background-color: #879fa5; } + border-color: #879ea5; + background-color: #879ea5; +} #wpadminbar #wp-admin-bar-user-info .display-name { - color: #fff; } + color: #fff; +} #wpadminbar #wp-admin-bar-user-info a:hover .display-name { - color: #9ebaa0; } + color: #9ebaa0; +} #wpadminbar #wp-admin-bar-user-info .username { - color: #d5dddf; } + color: #d5dde0; +} /* Pointers */ .wp-pointer .wp-pointer-content h3 { background-color: #9ebaa0; - border-color: #8faf91; } + border-color: #8faf91; +} .wp-pointer .wp-pointer-content h3:before { - color: #9ebaa0; } - -.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow { - border-bottom-color: #9ebaa0; } - -/* Media Uploader */ -.media-item .bar, .media-progress-bar div { - background-color: #9ebaa0; } + color: #9ebaa0; +} + +.wp-pointer.wp-pointer-top .wp-pointer-arrow, +.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner { + border-bottom-color: #9ebaa0; +} + +/* Media */ +.media-item .bar, +.media-progress-bar div { + background-color: #9ebaa0; +} .details.attachment { - -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #9ebaa0; - box-shadow: 0 0 0 1px #fff, 0 0 0 5px #9ebaa0; } + -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #9ebaa0; + box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #9ebaa0; +} .attachment.details .check { background-color: #9ebaa0; -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #9ebaa0; - box-shadow: 0 0 0 1px #fff, 0 0 0 2px #9ebaa0; } + box-shadow: 0 0 0 1px #fff, 0 0 0 2px #9ebaa0; +} + +.media-selection .attachment.selection.details .thumbnail { + -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #9ebaa0; + box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #9ebaa0; +} /* Themes */ -.theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after { - background: #9ebaa0; } +.theme-browser .theme.active .theme-name, +.theme-browser .theme.add-new-theme a:hover:after, +.theme-browser .theme.add-new-theme a:focus:after { + background: #9ebaa0; +} -.theme-browser .theme.add-new-theme:hover span:after { - color: #9ebaa0; } +.theme-browser .theme.add-new-theme a:hover span:after, +.theme-browser .theme.add-new-theme a:focus span:after { + color: #9ebaa0; +} -.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover { - background: #9ebaa0; } +.theme-section.current, +.theme-filter.current { + border-bottom-color: #738e96; +} -.theme-section.current, .theme-filter.current { - border-bottom-color: #738e96; } +body.more-filters-opened .more-filters { + color: #fff; + background-color: #738e96; +} -body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before { +body.more-filters-opened .more-filters:before { color: #fff; - background-color: #738e96; } +} -body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before { +body.more-filters-opened .more-filters:hover, +body.more-filters-opened .more-filters:focus { background-color: #9ebaa0; - color: #fff; } + color: #fff; +} + +body.more-filters-opened .more-filters:hover:before, +body.more-filters-opened .more-filters:focus:before { + color: #fff; +} /* Widgets */ .widgets-chooser li.widgets-chooser-selected { background-color: #9ebaa0; - color: #fff; } + color: #fff; +} -.widgets-chooser li.widgets-chooser-selected:before, .widgets-chooser li.widgets-chooser-selected:focus:before { - color: #fff; } +.widgets-chooser li.widgets-chooser-selected:before, +.widgets-chooser li.widgets-chooser-selected:focus:before { + color: #fff; +} /* Customize */ #customize-theme-controls .widget-area-select .selected { background-color: #9ebaa0; - color: #fff; } - -/* jQuery UI Slider */ -.wp-slider .ui-slider-handle, .wp-slider .ui-slider-handle.ui-state-hover, .wp-slider .ui-slider-handle.focus { - background: #9ebaa0; - border-color: #80a583; - -webkit-box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15); } - -/* Thickbox: Plugin information */ -#sidemenu a.current { - background: #f1f1f1; - border-bottom-color: #f1f1f1; } + color: #fff; +} -#plugin-information .action-button { - background: #9ebaa0; } +#customize-footer-actions .devices button:focus { + border-bottom-color: #9ebaa0; +} /* Responsive Component */ div#wp-responsive-toggle a:before { - color: #f2fcff; } + color: #f2fcff; +} .wp-responsive-open div#wp-responsive-toggle a { border-color: transparent; - background: #9ebaa0; } - -.star-rating .star { - color: #9ebaa0; } + background: #9ebaa0; +} .wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a { - background: #627c83; } + background: #627c83; +} + +.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before { + color: #f2fcff; +} + +/* TinyMCE */ +.mce-container.mce-menu .mce-menu-item:hover, +.mce-container.mce-menu .mce-menu-item.mce-selected, +.mce-container.mce-menu .mce-menu-item:focus, +.mce-container.mce-menu .mce-menu-item-normal.mce-active, +.mce-container.mce-menu .mce-menu-item-preview.mce-active { + background: #9ebaa0; +} diff --git a/wp-admin/css/colors/ocean/colors-rtl.min.css b/wp-admin/css/colors/ocean/colors-rtl.min.css index 45143c6..52506fc 100644 --- a/wp-admin/css/colors/ocean/colors-rtl.min.css +++ b/wp-admin/css/colors/ocean/colors-rtl.min.css @@ -1 +1 @@ -html{background:#f1f1f1}a{color:#0074a2}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,a:active,a:focus,a:hover,div.dashboard-widget-submit input:hover{color:#0099d5}input[type=checkbox]:checked:before{color:#738e96}input[type=radio]:checked:before{background:#738e96}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0099d5}.wp-core-ui .button-primary{background:#9ebaa0;border-color:#80a583;color:#fff;-webkit-box-shadow:inset 0 1px 0 #cbdacc,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #cbdacc,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#8faf91;border-color:#719a74;color:#fff;-webkit-box-shadow:inset 0 1px 0 #bccfbd,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #bccfbd,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:active{background:#80a583;border-color:#719a74;color:#fff;-webkit-box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5);box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5)}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#c7d1c8!important;background:#86a988!important;border-color:#719a74!important;text-shadow:none!important}.wp-core-ui .wp-ui-primary{color:#fff;background-color:#738e96}.wp-core-ui .wp-ui-text-primary{color:#738e96}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#9ebaa0}.wp-core-ui .wp-ui-text-highlight{color:#9ebaa0}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#aa9d88}.wp-core-ui .wp-ui-text-notification{color:#aa9d88}.wp-core-ui .wp-ui-text-icon{color:#f2fcff}#add-new-comment a:hover,.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover{color:#fff;background-color:#738e96}.view-switch a.current:before{color:#738e96}.view-switch a:hover:before{color:#aa9d88}.post-com-count:hover:after{border-top-color:#738e96}.post-com-count:hover span{color:#fff;background-color:#738e96}strong .post-com-count:after{border-top-color:#aa9d88}strong .post-com-count span{background-color:#aa9d88}#adminmenu,#adminmenuback,#adminmenuwrap{background:#738e96}#adminmenu a{color:#fff}#adminmenu div.wp-menu-image:before{color:#f2fcff}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#9ebaa0}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#fff}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f1f1f1;border-bottom-color:#f1f1f1}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#627c83}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-left-color:#627c83}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu .wp-submenu-head,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#d5dddf}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#9ebaa0}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#9ebaa0}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-left-color:#f1f1f1}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#9ebaa0}#adminmenu li.wp-has-current-submenu div.wp-menu-image:before{color:#fff}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#aa9d88}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#fff;background:#627c83}#collapse-menu{color:#f2fcff}#collapse-menu:hover{color:#fff}#collapse-button div:after{color:#f2fcff}#collapse-menu:hover #collapse-button div:after{color:#fff}#wpadminbar{color:#fff;background:#738e96}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#fff}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#f2fcff}#wpadminbar .ab-top-menu>li.hover>.ab-item,#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar .ab-top-menu>li:hover>.ab-item,#wpadminbar .ab-top-menu>li>.ab-item:focus,#wpadminbar-nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus{color:#9ebaa0;background:#627c83}#wpadminbar>#wp-toolbar a:focus span.ab-label,#wpadminbar>#wp-toolbar li.hover span.ab-label,#wpadminbar>#wp-toolbar li:hover span.ab-label{color:#9ebaa0}#wpadminbar .menupop .ab-sub-wrapper{background:#627c83}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#8f9b9e}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar-nojs .quicklinks .menupop:hover ul li a{color:#d5dddf}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#f2fcff}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:after,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:after,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#9ebaa0}#wpadminbar #adminbarsearch:before{color:#f2fcff}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#fff;background:#879fa5}#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder{color:#fff;opacity:.7}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#879fa5;background-color:#879fa5}#wpadminbar #wp-admin-bar-user-info .display-name{color:#fff}#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#9ebaa0}#wpadminbar #wp-admin-bar-user-info .username{color:#d5dddf}.wp-pointer .wp-pointer-content h3{background-color:#9ebaa0;border-color:#8faf91}.wp-pointer .wp-pointer-content h3:before{color:#9ebaa0}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow{border-bottom-color:#9ebaa0}.media-item .bar,.media-progress-bar div{background-color:#9ebaa0}.details.attachment{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 5px #9ebaa0;box-shadow:0 0 0 1px #fff,0 0 0 5px #9ebaa0}.attachment.details .check{background-color:#9ebaa0;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #9ebaa0;box-shadow:0 0 0 1px #fff,0 0 0 2px #9ebaa0}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme:hover:after{background:#9ebaa0}.theme-browser .theme.add-new-theme:hover span:after{color:#9ebaa0}.theme-overlay .theme-header .close:hover,.theme-overlay .theme-header .left:hover,.theme-overlay .theme-header .right:hover{background:#9ebaa0}.theme-filter.current,.theme-section.current{border-bottom-color:#738e96}body.more-filters-opened .more-filters,body.more-filters-opened .more-filters:before{color:#fff;background-color:#738e96}.widgets-chooser li.widgets-chooser-selected,body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover,body.more-filters-opened .more-filters:hover:before{background-color:#9ebaa0;color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-theme-controls .widget-area-select .selected{background-color:#9ebaa0;color:#fff}.wp-slider .ui-slider-handle,.wp-slider .ui-slider-handle.focus,.wp-slider .ui-slider-handle.ui-state-hover{background:#9ebaa0;border-color:#80a583;-webkit-box-shadow:inset 0 1px 0 #cbdacc,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #cbdacc,0 1px 0 rgba(0,0,0,.15)}#sidemenu a.current{background:#f1f1f1;border-bottom-color:#f1f1f1}#plugin-information .action-button{background:#9ebaa0}div#wp-responsive-toggle a:before{color:#f2fcff}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#9ebaa0}.star-rating .star{color:#9ebaa0}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#627c83} \ No newline at end of file +html{background:#f1f1f1}a{color:#0073aa}a:active,a:focus,a:hover{color:#0096dd}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,div.dashboard-widget-submit input:hover{color:#0096dd}input[type=checkbox]:checked:before{color:#738e96}input[type=radio]:checked:before{background:#738e96}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0096dd}.wp-core-ui .button-primary{background:#9ebaa0;border-color:#80a583 #719a74 #719a74;color:#fff;-webkit-box-shadow:0 1px 0 #719a74;box-shadow:0 1px 0 #719a74;text-shadow:0 -1px 1px #719a74,-1px 0 1px #719a74,0 1px 1px #719a74,1px 0 1px #719a74}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#a7c0a9;border-color:#719a74;color:#fff;-webkit-box-shadow:0 1px 0 #719a74;box-shadow:0 1px 0 #719a74}.wp-core-ui .button-primary:focus{-webkit-box-shadow:inset 0 1px 0 #80a583,0 0 2px 1px #33b3db;box-shadow:inset 0 1px 0 #80a583,0 0 2px 1px #33b3db}.wp-core-ui .button-primary:active{background:#80a583;border-color:#719a74;-webkit-box-shadow:inset 0 2px 0 #719a74;box-shadow:inset 0 2px 0 #719a74}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#c7d1c8!important;background:#86a989!important;border-color:#719a74!important;text-shadow:none!important}.wp-core-ui .button-primary.button-hero{-webkit-box-shadow:0 2px 0 #719a74!important;box-shadow:0 2px 0 #719a74!important}.wp-core-ui .button-primary.button-hero:active{-webkit-box-shadow:inset 0 3px 0 #719a74!important;box-shadow:inset 0 3px 0 #719a74!important}.wp-core-ui .wp-ui-primary{color:#fff;background-color:#738e96}.wp-core-ui .wp-ui-text-primary{color:#738e96}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#9ebaa0}.wp-core-ui .wp-ui-text-highlight{color:#9ebaa0}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#aa9d88}.wp-core-ui .wp-ui-text-notification{color:#aa9d88}.wp-core-ui .wp-ui-text-icon{color:#f2fcff}.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover,.wrap .page-title-action:hover{color:#fff;background-color:#738e96}.view-switch a.current:before{color:#738e96}.view-switch a:hover:before{color:#aa9d88}#adminmenu,#adminmenuback,#adminmenuwrap{background:#738e96}#adminmenu a{color:#fff}#adminmenu div.wp-menu-image:before{color:#f2fcff}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#9ebaa0}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#fff}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f1f1f1;border-bottom-color:#f1f1f1}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#627c83}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-left-color:#627c83}#adminmenu .wp-submenu .wp-submenu-head{color:#d5dde0}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#d5dde0}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#9ebaa0}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#9ebaa0}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-left-color:#f1f1f1}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#9ebaa0}#adminmenu a.current:hover div.wp-menu-image:before,#adminmenu li a:focus div.wp-menu-image:before,#adminmenu li.opensub div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,#adminmenu li:hover div.wp-menu-image:before,.ie8 #adminmenu li.opensub div.wp-menu-image:before{color:#fff}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#aa9d88}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#fff;background:#627c83}#collapse-menu{color:#f2fcff}#collapse-menu:hover{color:#fff}#collapse-button div:after{color:#f2fcff}#collapse-menu:hover #collapse-button div:after{color:#fff}#wpadminbar{color:#fff;background:#738e96}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#fff}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#f2fcff}#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus,#wpadminbar.nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li>.ab-item:focus{color:#9ebaa0;background:#627c83}#wpadminbar:not(.mobile)>#wp-toolbar a:focus span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li.hover span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li:hover span.ab-label{color:#9ebaa0}#wpadminbar:not(.mobile) li:hover #adminbarsearch:before,#wpadminbar:not(.mobile) li:hover .ab-icon:before,#wpadminbar:not(.mobile) li:hover .ab-item:after,#wpadminbar:not(.mobile) li:hover .ab-item:before{color:#fff}#wpadminbar .menupop .ab-sub-wrapper{background:#627c83}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#8f9a9e}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar.nojs .quicklinks .menupop:hover ul li a{color:#d5dde0}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#f2fcff}#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar li #adminbarsearch.adminbar-focused:before,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#9ebaa0}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a .blavatar,#wpadminbar .quicklinks li a:focus .blavatar,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar.mobile .quicklinks .ab-icon:before,#wpadminbar.mobile .quicklinks .ab-item:before{color:#9ebaa0}#wpadminbar.mobile .quicklinks .hover .ab-icon:before,#wpadminbar.mobile .quicklinks .hover .ab-item:before{color:#f2fcff}#wpadminbar #adminbarsearch:before{color:#f2fcff}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#fff;background:#879ea5}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#879ea5;background-color:#879ea5}#wpadminbar #wp-admin-bar-user-info .display-name{color:#fff}#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#9ebaa0}#wpadminbar #wp-admin-bar-user-info .username{color:#d5dde0}.wp-pointer .wp-pointer-content h3{background-color:#9ebaa0;border-color:#8faf91}.wp-pointer .wp-pointer-content h3:before{color:#9ebaa0}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner{border-bottom-color:#9ebaa0}.media-item .bar,.media-progress-bar div{background-color:#9ebaa0}.details.attachment{-webkit-box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #9ebaa0;box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #9ebaa0}.attachment.details .check{background-color:#9ebaa0;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #9ebaa0;box-shadow:0 0 0 1px #fff,0 0 0 2px #9ebaa0}.media-selection .attachment.selection.details .thumbnail{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 3px #9ebaa0;box-shadow:0 0 0 1px #fff,0 0 0 3px #9ebaa0}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme a:focus:after,.theme-browser .theme.add-new-theme a:hover:after{background:#9ebaa0}.theme-browser .theme.add-new-theme a:focus span:after,.theme-browser .theme.add-new-theme a:hover span:after{color:#9ebaa0}.theme-filter.current,.theme-section.current{border-bottom-color:#738e96}body.more-filters-opened .more-filters{color:#fff;background-color:#738e96}#customize-theme-controls .widget-area-select .selected,.widgets-chooser li.widgets-chooser-selected{background-color:#9ebaa0;color:#fff}body.more-filters-opened .more-filters:before{color:#fff}body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:hover{background-color:#9ebaa0;color:#fff}body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover:before{color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-footer-actions .devices button:focus{border-bottom-color:#9ebaa0}div#wp-responsive-toggle a:before{color:#f2fcff}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#9ebaa0}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#627c83}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before{color:#f2fcff}.mce-container.mce-menu .mce-menu-item-normal.mce-active,.mce-container.mce-menu .mce-menu-item-preview.mce-active,.mce-container.mce-menu .mce-menu-item.mce-selected,.mce-container.mce-menu .mce-menu-item:focus,.mce-container.mce-menu .mce-menu-item:hover{background:#9ebaa0} \ No newline at end of file diff --git a/wp-admin/css/colors/ocean/colors.css b/wp-admin/css/colors/ocean/colors.css index 0ee3295..c98d3be 100644 --- a/wp-admin/css/colors/ocean/colors.css +++ b/wp-admin/css/colors/ocean/colors.css @@ -3,329 +3,524 @@ * highlights/shadows, based on a base color. */ html { - background: #f1f1f1; } + background: #f1f1f1; +} /* Links */ a { - color: #0074a2; } - a:hover, a:active, a:focus { - color: #0099d5; } + color: #0073aa; +} + +a:hover, a:active, a:focus { + color: #0096dd; +} -#media-upload a.del-link:hover, div.dashboard-widget-submit input:hover, .subsubsub a:hover, .subsubsub a.current:hover { - color: #0099d5; } +#media-upload a.del-link:hover, +div.dashboard-widget-submit input:hover, +.subsubsub a:hover, +.subsubsub a.current:hover { + color: #0096dd; +} /* Forms */ input[type=checkbox]:checked:before { - color: #738e96; } + color: #738e96; +} input[type=radio]:checked:before { - background: #738e96; } + background: #738e96; +} -.wp-core-ui input[type="reset"]:hover, .wp-core-ui input[type="reset"]:active { - color: #0099d5; } +.wp-core-ui input[type="reset"]:hover, +.wp-core-ui input[type="reset"]:active { + color: #0096dd; +} /* Core UI */ .wp-core-ui .button-primary { background: #9ebaa0; - border-color: #80a583; + border-color: #80a583 #719a74 #719a74; + color: white; + -webkit-box-shadow: 0 1px 0 #719a74; + box-shadow: 0 1px 0 #719a74; + text-shadow: 0 -1px 1px #719a74, 1px 0 1px #719a74, 0 1px 1px #719a74, -1px 0 1px #719a74; +} + +.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { + background: #a7c0a9; + border-color: #719a74; color: white; - -webkit-box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { - background: #8faf91; - border-color: #719a74; - color: white; - -webkit-box-shadow: inset 0 1px 0 #bccfbd, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #bccfbd, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:active { - background: #80a583; - border-color: #719a74; - color: white; - -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); - box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); } - .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { - color: #c7d1c8 !important; - background: #86a988 !important; - border-color: #719a74 !important; - text-shadow: none !important; } + -webkit-box-shadow: 0 1px 0 #719a74; + box-shadow: 0 1px 0 #719a74; +} + +.wp-core-ui .button-primary:focus { + -webkit-box-shadow: inset 0 1px 0 #80a583, 0 0 2px 1px #33b3db; + box-shadow: inset 0 1px 0 #80a583, 0 0 2px 1px #33b3db; +} + +.wp-core-ui .button-primary:active { + background: #80a583; + border-color: #719a74; + -webkit-box-shadow: inset 0 2px 0 #719a74; + box-shadow: inset 0 2px 0 #719a74; +} + +.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { + color: #c7d1c8 !important; + background: #86a989 !important; + border-color: #719a74 !important; + text-shadow: none !important; +} + +.wp-core-ui .button-primary.button-hero { + -webkit-box-shadow: 0 2px 0 #719a74 !important; + box-shadow: 0 2px 0 #719a74 !important; +} + +.wp-core-ui .button-primary.button-hero:active { + -webkit-box-shadow: inset 0 3px 0 #719a74 !important; + box-shadow: inset 0 3px 0 #719a74 !important; +} + .wp-core-ui .wp-ui-primary { color: #fff; - background-color: #738e96; } + background-color: #738e96; +} + .wp-core-ui .wp-ui-text-primary { - color: #738e96; } + color: #738e96; +} + .wp-core-ui .wp-ui-highlight { color: #fff; - background-color: #9ebaa0; } + background-color: #9ebaa0; +} + .wp-core-ui .wp-ui-text-highlight { - color: #9ebaa0; } + color: #9ebaa0; +} + .wp-core-ui .wp-ui-notification { color: #fff; - background-color: #aa9d88; } + background-color: #aa9d88; +} + .wp-core-ui .wp-ui-text-notification { - color: #aa9d88; } + color: #aa9d88; +} + .wp-core-ui .wp-ui-text-icon { - color: #f2fcff; } + color: #f2fcff; +} /* List tables */ -.wrap .add-new-h2:hover, #add-new-comment a:hover, .tablenav .tablenav-pages a:hover, .tablenav .tablenav-pages a:focus { +.wrap .add-new-h2:hover, +.wrap .page-title-action:hover, +.tablenav .tablenav-pages a:hover, +.tablenav .tablenav-pages a:focus { color: #fff; - background-color: #738e96; } + background-color: #738e96; +} .view-switch a.current:before { - color: #738e96; } + color: #738e96; +} .view-switch a:hover:before { - color: #aa9d88; } - -.post-com-count:hover:after { - border-top-color: #738e96; } - -.post-com-count:hover span { - color: #fff; - background-color: #738e96; } - -strong .post-com-count:after { - border-top-color: #aa9d88; } - -strong .post-com-count span { - background-color: #aa9d88; } + color: #aa9d88; +} /* Admin Menu */ -#adminmenuback, #adminmenuwrap, #adminmenu { - background: #738e96; } +#adminmenuback, +#adminmenuwrap, +#adminmenu { + background: #738e96; +} #adminmenu a { - color: #fff; } + color: #fff; +} #adminmenu div.wp-menu-image:before { - color: #f2fcff; } + color: #f2fcff; +} -#adminmenu a:hover, #adminmenu li.menu-top:hover, #adminmenu li.opensub > a.menu-top, #adminmenu li > a.menu-top:focus { +#adminmenu a:hover, +#adminmenu li.menu-top:hover, +#adminmenu li.opensub > a.menu-top, +#adminmenu li > a.menu-top:focus { color: #fff; - background-color: #9ebaa0; } + background-color: #9ebaa0; +} -#adminmenu li.menu-top:hover div.wp-menu-image:before, #adminmenu li.opensub > a.menu-top div.wp-menu-image:before { - color: #fff; } +#adminmenu li.menu-top:hover div.wp-menu-image:before, +#adminmenu li.opensub > a.menu-top div.wp-menu-image:before { + color: #fff; +} /* Active tabs use a bottom border color that matches the page background color. */ -.about-wrap h2 .nav-tab-active, .nav-tab-active, .nav-tab-active:hover { +.about-wrap h2 .nav-tab-active, +.nav-tab-active, +.nav-tab-active:hover { background-color: #f1f1f1; - border-bottom-color: #f1f1f1; } + border-bottom-color: #f1f1f1; +} /* Admin Menu: submenu */ -#adminmenu .wp-submenu, #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu .wp-has-current-submenu.opensub .wp-submenu, .folded #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu { - background: #627c83; } +#adminmenu .wp-submenu, +#adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu, +.folded #adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu { + background: #627c83; +} #adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after { - border-right-color: #627c83; } + border-right-color: #627c83; +} #adminmenu .wp-submenu .wp-submenu-head { - color: #d5dddf; } - -#adminmenu .wp-submenu a, #adminmenu .wp-has-current-submenu .wp-submenu a, .folded #adminmenu .wp-has-current-submenu .wp-submenu a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a { - color: #d5dddf; } - #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, #adminmenu .wp-has-current-submenu .wp-submenu a:focus, #adminmenu .wp-has-current-submenu .wp-submenu a:hover, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { - color: #9ebaa0; } + color: #d5dde0; +} + +#adminmenu .wp-submenu a, +#adminmenu .wp-has-current-submenu .wp-submenu a, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a { + color: #d5dde0; +} + +#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu .wp-submenu a:hover, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { + color: #9ebaa0; +} /* Admin Menu: current */ -#adminmenu .wp-submenu li.current a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { - color: #fff; } - #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { - color: #9ebaa0; } +#adminmenu .wp-submenu li.current a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { + color: #fff; +} -ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.current:after { - border-right-color: #f1f1f1; } +#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { + color: #9ebaa0; +} -#adminmenu li.current a.menu-top, #adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, #adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, .folded #adminmenu li.current.menu-top { - color: #fff; - background: #9ebaa0; } +ul#adminmenu a.wp-has-current-submenu:after, +ul#adminmenu > li.current > a.current:after { + border-right-color: #f1f1f1; +} -#adminmenu li.wp-has-current-submenu div.wp-menu-image:before { - color: #fff; } +#adminmenu li.current a.menu-top, +#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, +#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, +.folded #adminmenu li.current.menu-top { + color: #fff; + background: #9ebaa0; +} + +#adminmenu li.wp-has-current-submenu div.wp-menu-image:before, +#adminmenu a.current:hover div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before, +#adminmenu li:hover div.wp-menu-image:before, +#adminmenu li a:focus div.wp-menu-image:before, +#adminmenu li.opensub div.wp-menu-image:before, +.ie8 #adminmenu li.opensub div.wp-menu-image:before { + color: #fff; +} /* Admin Menu: bubble */ -#adminmenu .awaiting-mod, #adminmenu .update-plugins { +#adminmenu .awaiting-mod, +#adminmenu .update-plugins { color: #fff; - background: #aa9d88; } + background: #aa9d88; +} -#adminmenu li.current a .awaiting-mod, #adminmenu li a.wp-has-current-submenu .update-plugins, #adminmenu li:hover a .awaiting-mod, #adminmenu li.menu-top:hover > a .update-plugins { +#adminmenu li.current a .awaiting-mod, +#adminmenu li a.wp-has-current-submenu .update-plugins, +#adminmenu li:hover a .awaiting-mod, +#adminmenu li.menu-top:hover > a .update-plugins { color: #fff; - background: #627c83; } + background: #627c83; +} /* Admin Menu: collapse button */ #collapse-menu { - color: #f2fcff; } + color: #f2fcff; +} #collapse-menu:hover { - color: #fff; } + color: #fff; +} #collapse-button div:after { - color: #f2fcff; } + color: #f2fcff; +} #collapse-menu:hover #collapse-button div:after { - color: #fff; } + color: #fff; +} /* Admin Bar */ #wpadminbar { color: #fff; - background: #738e96; } - -#wpadminbar .ab-item, #wpadminbar a.ab-item, #wpadminbar > #wp-toolbar span.ab-label, #wpadminbar > #wp-toolbar span.noticon { - color: #fff; } - -#wpadminbar .ab-icon, #wpadminbar .ab-icon:before, #wpadminbar .ab-item:before, #wpadminbar .ab-item:after { - color: #f2fcff; } + background: #738e96; +} -#wpadminbar .ab-top-menu > li:hover > .ab-item, #wpadminbar .ab-top-menu > li.hover > .ab-item, #wpadminbar .ab-top-menu > li > .ab-item:focus, #wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, #wpadminbar-nojs .ab-top-menu > li.menupop:hover > .ab-item, #wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { +#wpadminbar .ab-item, +#wpadminbar a.ab-item, +#wpadminbar > #wp-toolbar span.ab-label, +#wpadminbar > #wp-toolbar span.noticon { + color: #fff; +} + +#wpadminbar .ab-icon, +#wpadminbar .ab-icon:before, +#wpadminbar .ab-item:before, +#wpadminbar .ab-item:after { + color: #f2fcff; +} + +#wpadminbar:not(.mobile) .ab-top-menu > li:hover > .ab-item, +#wpadminbar:not(.mobile) .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojs .ab-top-menu > li.menupop:hover > .ab-item, +#wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { color: #9ebaa0; - background: #627c83; } + background: #627c83; +} -#wpadminbar > #wp-toolbar li:hover span.ab-label, #wpadminbar > #wp-toolbar li.hover span.ab-label, #wpadminbar > #wp-toolbar a:focus span.ab-label { - color: #9ebaa0; } +#wpadminbar:not(.mobile) > #wp-toolbar li:hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar li.hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar a:focus span.ab-label { + color: #9ebaa0; +} -#wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #fff; } +#wpadminbar:not(.mobile) li:hover .ab-icon:before, +#wpadminbar:not(.mobile) li:hover .ab-item:before, +#wpadminbar:not(.mobile) li:hover .ab-item:after, +#wpadminbar:not(.mobile) li:hover #adminbarsearch:before { + color: #fff; +} /* Admin Bar: submenu */ #wpadminbar .menupop .ab-sub-wrapper { - background: #627c83; } - -#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, #wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { - background: #8f9b9e; } - -#wpadminbar .ab-submenu .ab-item, #wpadminbar .quicklinks .menupop ul li a, #wpadminbar .quicklinks .menupop.hover ul li a, #wpadminbar-nojs .quicklinks .menupop:hover ul li a { - color: #d5dddf; } - -#wpadminbar .quicklinks li .blavatar, #wpadminbar .menupop .menupop > .ab-item:before { - color: #f2fcff; } - -#wpadminbar .quicklinks .menupop ul li a:hover, #wpadminbar .quicklinks .menupop ul li a:focus, #wpadminbar .quicklinks .menupop ul li a:hover strong, #wpadminbar .quicklinks .menupop ul li a:focus strong, #wpadminbar .quicklinks .menupop.hover ul li a:hover, #wpadminbar .quicklinks .menupop.hover ul li a:focus, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, #wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li a:focus .ab-icon:before, #wpadminbar li .ab-item:focus:before, #wpadminbar li.hover .ab-icon:before, #wpadminbar li.hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li.hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #9ebaa0; } + background: #627c83; +} + +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { + background: #8f9a9e; +} + +#wpadminbar .ab-submenu .ab-item, +#wpadminbar .quicklinks .menupop ul li a, +#wpadminbar .quicklinks .menupop.hover ul li a, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a { + color: #d5dde0; +} + +#wpadminbar .quicklinks li .blavatar, +#wpadminbar .menupop .menupop > .ab-item:before { + color: #f2fcff; +} + +#wpadminbar .quicklinks .menupop ul li a:hover, +#wpadminbar .quicklinks .menupop ul li a:focus, +#wpadminbar .quicklinks .menupop ul li a:hover strong, +#wpadminbar .quicklinks .menupop ul li a:focus strong, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a, +#wpadminbar .quicklinks .menupop.hover ul li a:hover, +#wpadminbar .quicklinks .menupop.hover ul li a:focus, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, +#wpadminbar li:hover .ab-icon:before, +#wpadminbar li:hover .ab-item:before, +#wpadminbar li a:focus .ab-icon:before, +#wpadminbar li .ab-item:focus:before, +#wpadminbar li.hover .ab-icon:before, +#wpadminbar li.hover .ab-item:before, +#wpadminbar li:hover #adminbarsearch:before, +#wpadminbar li #adminbarsearch.adminbar-focused:before { + color: #9ebaa0; +} + +#wpadminbar .quicklinks li a:hover .blavatar, +#wpadminbar .quicklinks li a:focus .blavatar, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar, +#wpadminbar .menupop .menupop > .ab-item:hover:before, +#wpadminbar.mobile .quicklinks .ab-icon:before, +#wpadminbar.mobile .quicklinks .ab-item:before { + color: #9ebaa0; +} -#wpadminbar .quicklinks li a:hover .blavatar, #wpadminbar .menupop .menupop > .ab-item:hover:before { - color: #9ebaa0; } +#wpadminbar.mobile .quicklinks .hover .ab-icon:before, +#wpadminbar.mobile .quicklinks .hover .ab-item:before { + color: #f2fcff; +} /* Admin Bar: search */ #wpadminbar #adminbarsearch:before { - color: #f2fcff; } + color: #f2fcff; +} #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus { color: #fff; - background: #879fa5; } - -#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder { - color: #fff; - opacity: 0.7; } + background: #879ea5; +} /* Admin Bar: my account */ #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { - border-color: #879fa5; - background-color: #879fa5; } + border-color: #879ea5; + background-color: #879ea5; +} #wpadminbar #wp-admin-bar-user-info .display-name { - color: #fff; } + color: #fff; +} #wpadminbar #wp-admin-bar-user-info a:hover .display-name { - color: #9ebaa0; } + color: #9ebaa0; +} #wpadminbar #wp-admin-bar-user-info .username { - color: #d5dddf; } + color: #d5dde0; +} /* Pointers */ .wp-pointer .wp-pointer-content h3 { background-color: #9ebaa0; - border-color: #8faf91; } + border-color: #8faf91; +} .wp-pointer .wp-pointer-content h3:before { - color: #9ebaa0; } - -.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow { - border-bottom-color: #9ebaa0; } - -/* Media Uploader */ -.media-item .bar, .media-progress-bar div { - background-color: #9ebaa0; } + color: #9ebaa0; +} + +.wp-pointer.wp-pointer-top .wp-pointer-arrow, +.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner { + border-bottom-color: #9ebaa0; +} + +/* Media */ +.media-item .bar, +.media-progress-bar div { + background-color: #9ebaa0; +} .details.attachment { - -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #9ebaa0; - box-shadow: 0 0 0 1px #fff, 0 0 0 5px #9ebaa0; } + -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #9ebaa0; + box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #9ebaa0; +} .attachment.details .check { background-color: #9ebaa0; -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #9ebaa0; - box-shadow: 0 0 0 1px #fff, 0 0 0 2px #9ebaa0; } + box-shadow: 0 0 0 1px #fff, 0 0 0 2px #9ebaa0; +} + +.media-selection .attachment.selection.details .thumbnail { + -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #9ebaa0; + box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #9ebaa0; +} /* Themes */ -.theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after { - background: #9ebaa0; } +.theme-browser .theme.active .theme-name, +.theme-browser .theme.add-new-theme a:hover:after, +.theme-browser .theme.add-new-theme a:focus:after { + background: #9ebaa0; +} -.theme-browser .theme.add-new-theme:hover span:after { - color: #9ebaa0; } +.theme-browser .theme.add-new-theme a:hover span:after, +.theme-browser .theme.add-new-theme a:focus span:after { + color: #9ebaa0; +} -.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover { - background: #9ebaa0; } +.theme-section.current, +.theme-filter.current { + border-bottom-color: #738e96; +} -.theme-section.current, .theme-filter.current { - border-bottom-color: #738e96; } +body.more-filters-opened .more-filters { + color: #fff; + background-color: #738e96; +} -body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before { +body.more-filters-opened .more-filters:before { color: #fff; - background-color: #738e96; } +} -body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before { +body.more-filters-opened .more-filters:hover, +body.more-filters-opened .more-filters:focus { background-color: #9ebaa0; - color: #fff; } + color: #fff; +} + +body.more-filters-opened .more-filters:hover:before, +body.more-filters-opened .more-filters:focus:before { + color: #fff; +} /* Widgets */ .widgets-chooser li.widgets-chooser-selected { background-color: #9ebaa0; - color: #fff; } + color: #fff; +} -.widgets-chooser li.widgets-chooser-selected:before, .widgets-chooser li.widgets-chooser-selected:focus:before { - color: #fff; } +.widgets-chooser li.widgets-chooser-selected:before, +.widgets-chooser li.widgets-chooser-selected:focus:before { + color: #fff; +} /* Customize */ #customize-theme-controls .widget-area-select .selected { background-color: #9ebaa0; - color: #fff; } - -/* jQuery UI Slider */ -.wp-slider .ui-slider-handle, .wp-slider .ui-slider-handle.ui-state-hover, .wp-slider .ui-slider-handle.focus { - background: #9ebaa0; - border-color: #80a583; - -webkit-box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15); } - -/* Thickbox: Plugin information */ -#sidemenu a.current { - background: #f1f1f1; - border-bottom-color: #f1f1f1; } + color: #fff; +} -#plugin-information .action-button { - background: #9ebaa0; } +#customize-footer-actions .devices button:focus { + border-bottom-color: #9ebaa0; +} /* Responsive Component */ div#wp-responsive-toggle a:before { - color: #f2fcff; } + color: #f2fcff; +} .wp-responsive-open div#wp-responsive-toggle a { border-color: transparent; - background: #9ebaa0; } - -.star-rating .star { - color: #9ebaa0; } + background: #9ebaa0; +} .wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a { - background: #627c83; } + background: #627c83; +} + +.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before { + color: #f2fcff; +} + +/* TinyMCE */ +.mce-container.mce-menu .mce-menu-item:hover, +.mce-container.mce-menu .mce-menu-item.mce-selected, +.mce-container.mce-menu .mce-menu-item:focus, +.mce-container.mce-menu .mce-menu-item-normal.mce-active, +.mce-container.mce-menu .mce-menu-item-preview.mce-active { + background: #9ebaa0; +} diff --git a/wp-admin/css/colors/ocean/colors.min.css b/wp-admin/css/colors/ocean/colors.min.css index e10635d..4aaf1a2 100644 --- a/wp-admin/css/colors/ocean/colors.min.css +++ b/wp-admin/css/colors/ocean/colors.min.css @@ -1 +1 @@ -html{background:#f1f1f1}a{color:#0074a2}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,a:active,a:focus,a:hover,div.dashboard-widget-submit input:hover{color:#0099d5}input[type=checkbox]:checked:before{color:#738e96}input[type=radio]:checked:before{background:#738e96}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0099d5}.wp-core-ui .button-primary{background:#9ebaa0;border-color:#80a583;color:#fff;-webkit-box-shadow:inset 0 1px 0 #cbdacc,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #cbdacc,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#8faf91;border-color:#719a74;color:#fff;-webkit-box-shadow:inset 0 1px 0 #bccfbd,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #bccfbd,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:active{background:#80a583;border-color:#719a74;color:#fff;-webkit-box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5);box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5)}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#c7d1c8!important;background:#86a988!important;border-color:#719a74!important;text-shadow:none!important}.wp-core-ui .wp-ui-primary{color:#fff;background-color:#738e96}.wp-core-ui .wp-ui-text-primary{color:#738e96}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#9ebaa0}.wp-core-ui .wp-ui-text-highlight{color:#9ebaa0}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#aa9d88}.wp-core-ui .wp-ui-text-notification{color:#aa9d88}.wp-core-ui .wp-ui-text-icon{color:#f2fcff}#add-new-comment a:hover,.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover{color:#fff;background-color:#738e96}.view-switch a.current:before{color:#738e96}.view-switch a:hover:before{color:#aa9d88}.post-com-count:hover:after{border-top-color:#738e96}.post-com-count:hover span{color:#fff;background-color:#738e96}strong .post-com-count:after{border-top-color:#aa9d88}strong .post-com-count span{background-color:#aa9d88}#adminmenu,#adminmenuback,#adminmenuwrap{background:#738e96}#adminmenu a{color:#fff}#adminmenu div.wp-menu-image:before{color:#f2fcff}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#9ebaa0}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#fff}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f1f1f1;border-bottom-color:#f1f1f1}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#627c83}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-right-color:#627c83}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu .wp-submenu-head,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#d5dddf}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#9ebaa0}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#9ebaa0}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-right-color:#f1f1f1}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#9ebaa0}#adminmenu li.wp-has-current-submenu div.wp-menu-image:before{color:#fff}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#aa9d88}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#fff;background:#627c83}#collapse-menu{color:#f2fcff}#collapse-menu:hover{color:#fff}#collapse-button div:after{color:#f2fcff}#collapse-menu:hover #collapse-button div:after{color:#fff}#wpadminbar{color:#fff;background:#738e96}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#fff}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#f2fcff}#wpadminbar .ab-top-menu>li.hover>.ab-item,#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar .ab-top-menu>li:hover>.ab-item,#wpadminbar .ab-top-menu>li>.ab-item:focus,#wpadminbar-nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus{color:#9ebaa0;background:#627c83}#wpadminbar>#wp-toolbar a:focus span.ab-label,#wpadminbar>#wp-toolbar li.hover span.ab-label,#wpadminbar>#wp-toolbar li:hover span.ab-label{color:#9ebaa0}#wpadminbar .menupop .ab-sub-wrapper{background:#627c83}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#8f9b9e}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar-nojs .quicklinks .menupop:hover ul li a{color:#d5dddf}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#f2fcff}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:after,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:after,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#9ebaa0}#wpadminbar #adminbarsearch:before{color:#f2fcff}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#fff;background:#879fa5}#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder{color:#fff;opacity:.7}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#879fa5;background-color:#879fa5}#wpadminbar #wp-admin-bar-user-info .display-name{color:#fff}#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#9ebaa0}#wpadminbar #wp-admin-bar-user-info .username{color:#d5dddf}.wp-pointer .wp-pointer-content h3{background-color:#9ebaa0;border-color:#8faf91}.wp-pointer .wp-pointer-content h3:before{color:#9ebaa0}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow{border-bottom-color:#9ebaa0}.media-item .bar,.media-progress-bar div{background-color:#9ebaa0}.details.attachment{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 5px #9ebaa0;box-shadow:0 0 0 1px #fff,0 0 0 5px #9ebaa0}.attachment.details .check{background-color:#9ebaa0;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #9ebaa0;box-shadow:0 0 0 1px #fff,0 0 0 2px #9ebaa0}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme:hover:after{background:#9ebaa0}.theme-browser .theme.add-new-theme:hover span:after{color:#9ebaa0}.theme-overlay .theme-header .close:hover,.theme-overlay .theme-header .left:hover,.theme-overlay .theme-header .right:hover{background:#9ebaa0}.theme-filter.current,.theme-section.current{border-bottom-color:#738e96}body.more-filters-opened .more-filters,body.more-filters-opened .more-filters:before{color:#fff;background-color:#738e96}.widgets-chooser li.widgets-chooser-selected,body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover,body.more-filters-opened .more-filters:hover:before{background-color:#9ebaa0;color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-theme-controls .widget-area-select .selected{background-color:#9ebaa0;color:#fff}.wp-slider .ui-slider-handle,.wp-slider .ui-slider-handle.focus,.wp-slider .ui-slider-handle.ui-state-hover{background:#9ebaa0;border-color:#80a583;-webkit-box-shadow:inset 0 1px 0 #cbdacc,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #cbdacc,0 1px 0 rgba(0,0,0,.15)}#sidemenu a.current{background:#f1f1f1;border-bottom-color:#f1f1f1}#plugin-information .action-button{background:#9ebaa0}div#wp-responsive-toggle a:before{color:#f2fcff}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#9ebaa0}.star-rating .star{color:#9ebaa0}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#627c83} \ No newline at end of file +html{background:#f1f1f1}a{color:#0073aa}a:active,a:focus,a:hover{color:#0096dd}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,div.dashboard-widget-submit input:hover{color:#0096dd}input[type=checkbox]:checked:before{color:#738e96}input[type=radio]:checked:before{background:#738e96}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0096dd}.wp-core-ui .button-primary{background:#9ebaa0;border-color:#80a583 #719a74 #719a74;color:#fff;-webkit-box-shadow:0 1px 0 #719a74;box-shadow:0 1px 0 #719a74;text-shadow:0 -1px 1px #719a74,1px 0 1px #719a74,0 1px 1px #719a74,-1px 0 1px #719a74}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#a7c0a9;border-color:#719a74;color:#fff;-webkit-box-shadow:0 1px 0 #719a74;box-shadow:0 1px 0 #719a74}.wp-core-ui .button-primary:focus{-webkit-box-shadow:inset 0 1px 0 #80a583,0 0 2px 1px #33b3db;box-shadow:inset 0 1px 0 #80a583,0 0 2px 1px #33b3db}.wp-core-ui .button-primary:active{background:#80a583;border-color:#719a74;-webkit-box-shadow:inset 0 2px 0 #719a74;box-shadow:inset 0 2px 0 #719a74}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#c7d1c8!important;background:#86a989!important;border-color:#719a74!important;text-shadow:none!important}.wp-core-ui .button-primary.button-hero{-webkit-box-shadow:0 2px 0 #719a74!important;box-shadow:0 2px 0 #719a74!important}.wp-core-ui .button-primary.button-hero:active{-webkit-box-shadow:inset 0 3px 0 #719a74!important;box-shadow:inset 0 3px 0 #719a74!important}.wp-core-ui .wp-ui-primary{color:#fff;background-color:#738e96}.wp-core-ui .wp-ui-text-primary{color:#738e96}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#9ebaa0}.wp-core-ui .wp-ui-text-highlight{color:#9ebaa0}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#aa9d88}.wp-core-ui .wp-ui-text-notification{color:#aa9d88}.wp-core-ui .wp-ui-text-icon{color:#f2fcff}.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover,.wrap .page-title-action:hover{color:#fff;background-color:#738e96}.view-switch a.current:before{color:#738e96}.view-switch a:hover:before{color:#aa9d88}#adminmenu,#adminmenuback,#adminmenuwrap{background:#738e96}#adminmenu a{color:#fff}#adminmenu div.wp-menu-image:before{color:#f2fcff}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#9ebaa0}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#fff}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f1f1f1;border-bottom-color:#f1f1f1}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#627c83}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-right-color:#627c83}#adminmenu .wp-submenu .wp-submenu-head{color:#d5dde0}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#d5dde0}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#9ebaa0}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#9ebaa0}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-right-color:#f1f1f1}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#9ebaa0}#adminmenu a.current:hover div.wp-menu-image:before,#adminmenu li a:focus div.wp-menu-image:before,#adminmenu li.opensub div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,#adminmenu li:hover div.wp-menu-image:before,.ie8 #adminmenu li.opensub div.wp-menu-image:before{color:#fff}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#aa9d88}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#fff;background:#627c83}#collapse-menu{color:#f2fcff}#collapse-menu:hover{color:#fff}#collapse-button div:after{color:#f2fcff}#collapse-menu:hover #collapse-button div:after{color:#fff}#wpadminbar{color:#fff;background:#738e96}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#fff}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#f2fcff}#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus,#wpadminbar.nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li>.ab-item:focus{color:#9ebaa0;background:#627c83}#wpadminbar:not(.mobile)>#wp-toolbar a:focus span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li.hover span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li:hover span.ab-label{color:#9ebaa0}#wpadminbar:not(.mobile) li:hover #adminbarsearch:before,#wpadminbar:not(.mobile) li:hover .ab-icon:before,#wpadminbar:not(.mobile) li:hover .ab-item:after,#wpadminbar:not(.mobile) li:hover .ab-item:before{color:#fff}#wpadminbar .menupop .ab-sub-wrapper{background:#627c83}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#8f9a9e}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar.nojs .quicklinks .menupop:hover ul li a{color:#d5dde0}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#f2fcff}#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar li #adminbarsearch.adminbar-focused:before,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#9ebaa0}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a .blavatar,#wpadminbar .quicklinks li a:focus .blavatar,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar.mobile .quicklinks .ab-icon:before,#wpadminbar.mobile .quicklinks .ab-item:before{color:#9ebaa0}#wpadminbar.mobile .quicklinks .hover .ab-icon:before,#wpadminbar.mobile .quicklinks .hover .ab-item:before{color:#f2fcff}#wpadminbar #adminbarsearch:before{color:#f2fcff}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#fff;background:#879ea5}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#879ea5;background-color:#879ea5}#wpadminbar #wp-admin-bar-user-info .display-name{color:#fff}#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#9ebaa0}#wpadminbar #wp-admin-bar-user-info .username{color:#d5dde0}.wp-pointer .wp-pointer-content h3{background-color:#9ebaa0;border-color:#8faf91}.wp-pointer .wp-pointer-content h3:before{color:#9ebaa0}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner{border-bottom-color:#9ebaa0}.media-item .bar,.media-progress-bar div{background-color:#9ebaa0}.details.attachment{-webkit-box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #9ebaa0;box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #9ebaa0}.attachment.details .check{background-color:#9ebaa0;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #9ebaa0;box-shadow:0 0 0 1px #fff,0 0 0 2px #9ebaa0}.media-selection .attachment.selection.details .thumbnail{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 3px #9ebaa0;box-shadow:0 0 0 1px #fff,0 0 0 3px #9ebaa0}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme a:focus:after,.theme-browser .theme.add-new-theme a:hover:after{background:#9ebaa0}.theme-browser .theme.add-new-theme a:focus span:after,.theme-browser .theme.add-new-theme a:hover span:after{color:#9ebaa0}.theme-filter.current,.theme-section.current{border-bottom-color:#738e96}body.more-filters-opened .more-filters{color:#fff;background-color:#738e96}#customize-theme-controls .widget-area-select .selected,.widgets-chooser li.widgets-chooser-selected{background-color:#9ebaa0;color:#fff}body.more-filters-opened .more-filters:before{color:#fff}body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:hover{background-color:#9ebaa0;color:#fff}body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover:before{color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-footer-actions .devices button:focus{border-bottom-color:#9ebaa0}div#wp-responsive-toggle a:before{color:#f2fcff}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#9ebaa0}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#627c83}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before{color:#f2fcff}.mce-container.mce-menu .mce-menu-item-normal.mce-active,.mce-container.mce-menu .mce-menu-item-preview.mce-active,.mce-container.mce-menu .mce-menu-item.mce-selected,.mce-container.mce-menu .mce-menu-item:focus,.mce-container.mce-menu .mce-menu-item:hover{background:#9ebaa0} \ No newline at end of file diff --git a/wp-admin/css/colors/sunrise/colors-rtl.css b/wp-admin/css/colors/sunrise/colors-rtl.css index e80f79a..cd9e9eb 100644 --- a/wp-admin/css/colors/sunrise/colors-rtl.css +++ b/wp-admin/css/colors/sunrise/colors-rtl.css @@ -3,329 +3,524 @@ * highlights/shadows, based on a base color. */ html { - background: #f1f1f1; } + background: #f1f1f1; +} /* Links */ a { - color: #0074a2; } - a:hover, a:active, a:focus { - color: #0099d5; } + color: #0073aa; +} + +a:hover, a:active, a:focus { + color: #0096dd; +} -#media-upload a.del-link:hover, div.dashboard-widget-submit input:hover, .subsubsub a:hover, .subsubsub a.current:hover { - color: #0099d5; } +#media-upload a.del-link:hover, +div.dashboard-widget-submit input:hover, +.subsubsub a:hover, +.subsubsub a.current:hover { + color: #0096dd; +} /* Forms */ input[type=checkbox]:checked:before { - color: #dd823b; } + color: #dd823b; +} input[type=radio]:checked:before { - background: #dd823b; } + background: #dd823b; +} -.wp-core-ui input[type="reset"]:hover, .wp-core-ui input[type="reset"]:active { - color: #0099d5; } +.wp-core-ui input[type="reset"]:hover, +.wp-core-ui input[type="reset"]:active { + color: #0096dd; +} /* Core UI */ .wp-core-ui .button-primary { background: #dd823b; - border-color: #c36822; + border-color: #c36922 #ad5d1e #ad5d1e; color: white; - -webkit-box-shadow: inset 0 1px 0 #e8ab7c, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #e8ab7c, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { - background: #d97326; - border-color: #ad5c1e; - color: white; - -webkit-box-shadow: inset 0 1px 0 #e59d66, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #e59d66, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:active { - background: #c36822; - border-color: #ad5c1e; - color: white; - -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); - box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); } - .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { - color: #d1cbc7 !important; - background: #cc6c23 !important; - border-color: #ad5c1e !important; - text-shadow: none !important; } + -webkit-box-shadow: 0 1px 0 #ad5d1e; + box-shadow: 0 1px 0 #ad5d1e; + text-shadow: 0 -1px 1px #ad5d1e, -1px 0 1px #ad5d1e, 0 1px 1px #ad5d1e, 1px 0 1px #ad5d1e; +} + +.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { + background: #df8a48; + border-color: #ad5d1e; + color: white; + -webkit-box-shadow: 0 1px 0 #ad5d1e; + box-shadow: 0 1px 0 #ad5d1e; +} + +.wp-core-ui .button-primary:focus { + -webkit-box-shadow: inset 0 1px 0 #c36922, 0 0 2px 1px #33b3db; + box-shadow: inset 0 1px 0 #c36922, 0 0 2px 1px #33b3db; +} + +.wp-core-ui .button-primary:active { + background: #c36922; + border-color: #ad5d1e; + -webkit-box-shadow: inset 0 2px 0 #ad5d1e; + box-shadow: inset 0 2px 0 #ad5d1e; +} + +.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { + color: #d1cbc7 !important; + background: #cc6d23 !important; + border-color: #ad5d1e !important; + text-shadow: none !important; +} + +.wp-core-ui .button-primary.button-hero { + -webkit-box-shadow: 0 2px 0 #ad5d1e !important; + box-shadow: 0 2px 0 #ad5d1e !important; +} + +.wp-core-ui .button-primary.button-hero:active { + -webkit-box-shadow: inset 0 3px 0 #ad5d1e !important; + box-shadow: inset 0 3px 0 #ad5d1e !important; +} + .wp-core-ui .wp-ui-primary { color: #fff; - background-color: #cf4944; } + background-color: #cf4944; +} + .wp-core-ui .wp-ui-text-primary { - color: #cf4944; } + color: #cf4944; +} + .wp-core-ui .wp-ui-highlight { color: #fff; - background-color: #dd823b; } + background-color: #dd823b; +} + .wp-core-ui .wp-ui-text-highlight { - color: #dd823b; } + color: #dd823b; +} + .wp-core-ui .wp-ui-notification { color: #fff; - background-color: #ccaf0b; } + background-color: #ccaf0b; +} + .wp-core-ui .wp-ui-text-notification { - color: #ccaf0b; } + color: #ccaf0b; +} + .wp-core-ui .wp-ui-text-icon { - color: #f3f1f1; } + color: #f3f1f1; +} /* List tables */ -.wrap .add-new-h2:hover, #add-new-comment a:hover, .tablenav .tablenav-pages a:hover, .tablenav .tablenav-pages a:focus { +.wrap .add-new-h2:hover, +.wrap .page-title-action:hover, +.tablenav .tablenav-pages a:hover, +.tablenav .tablenav-pages a:focus { color: #fff; - background-color: #cf4944; } + background-color: #cf4944; +} .view-switch a.current:before { - color: #cf4944; } + color: #cf4944; +} .view-switch a:hover:before { - color: #ccaf0b; } - -.post-com-count:hover:after { - border-top-color: #cf4944; } - -.post-com-count:hover span { - color: #fff; - background-color: #cf4944; } - -strong .post-com-count:after { - border-top-color: #ccaf0b; } - -strong .post-com-count span { - background-color: #ccaf0b; } + color: #ccaf0b; +} /* Admin Menu */ -#adminmenuback, #adminmenuwrap, #adminmenu { - background: #cf4944; } +#adminmenuback, +#adminmenuwrap, +#adminmenu { + background: #cf4944; +} #adminmenu a { - color: #fff; } + color: #fff; +} #adminmenu div.wp-menu-image:before { - color: #f3f1f1; } + color: #f3f1f1; +} -#adminmenu a:hover, #adminmenu li.menu-top:hover, #adminmenu li.opensub > a.menu-top, #adminmenu li > a.menu-top:focus { +#adminmenu a:hover, +#adminmenu li.menu-top:hover, +#adminmenu li.opensub > a.menu-top, +#adminmenu li > a.menu-top:focus { color: #fff; - background-color: #dd823b; } + background-color: #dd823b; +} -#adminmenu li.menu-top:hover div.wp-menu-image:before, #adminmenu li.opensub > a.menu-top div.wp-menu-image:before { - color: #fff; } +#adminmenu li.menu-top:hover div.wp-menu-image:before, +#adminmenu li.opensub > a.menu-top div.wp-menu-image:before { + color: #fff; +} /* Active tabs use a bottom border color that matches the page background color. */ -.about-wrap h2 .nav-tab-active, .nav-tab-active, .nav-tab-active:hover { +.about-wrap h2 .nav-tab-active, +.nav-tab-active, +.nav-tab-active:hover { background-color: #f1f1f1; - border-bottom-color: #f1f1f1; } + border-bottom-color: #f1f1f1; +} /* Admin Menu: submenu */ -#adminmenu .wp-submenu, #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu .wp-has-current-submenu.opensub .wp-submenu, .folded #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu { - background: #be3631; } +#adminmenu .wp-submenu, +#adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu, +.folded #adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu { + background: #be3631; +} #adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after { - border-left-color: #be3631; } + border-left-color: #be3631; +} #adminmenu .wp-submenu .wp-submenu-head { - color: #f0c8c6; } - -#adminmenu .wp-submenu a, #adminmenu .wp-has-current-submenu .wp-submenu a, .folded #adminmenu .wp-has-current-submenu .wp-submenu a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a { - color: #f0c8c6; } - #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, #adminmenu .wp-has-current-submenu .wp-submenu a:focus, #adminmenu .wp-has-current-submenu .wp-submenu a:hover, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { - color: #f7e3d3; } + color: #f1c8c7; +} + +#adminmenu .wp-submenu a, +#adminmenu .wp-has-current-submenu .wp-submenu a, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a { + color: #f1c8c7; +} + +#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu .wp-submenu a:hover, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { + color: #f7e3d3; +} /* Admin Menu: current */ -#adminmenu .wp-submenu li.current a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { - color: #fff; } - #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { - color: #f7e3d3; } +#adminmenu .wp-submenu li.current a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { + color: #fff; +} -ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.current:after { - border-left-color: #f1f1f1; } +#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { + color: #f7e3d3; +} -#adminmenu li.current a.menu-top, #adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, #adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, .folded #adminmenu li.current.menu-top { - color: #fff; - background: #dd823b; } +ul#adminmenu a.wp-has-current-submenu:after, +ul#adminmenu > li.current > a.current:after { + border-left-color: #f1f1f1; +} -#adminmenu li.wp-has-current-submenu div.wp-menu-image:before { - color: #fff; } +#adminmenu li.current a.menu-top, +#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, +#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, +.folded #adminmenu li.current.menu-top { + color: #fff; + background: #dd823b; +} + +#adminmenu li.wp-has-current-submenu div.wp-menu-image:before, +#adminmenu a.current:hover div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before, +#adminmenu li:hover div.wp-menu-image:before, +#adminmenu li a:focus div.wp-menu-image:before, +#adminmenu li.opensub div.wp-menu-image:before, +.ie8 #adminmenu li.opensub div.wp-menu-image:before { + color: #fff; +} /* Admin Menu: bubble */ -#adminmenu .awaiting-mod, #adminmenu .update-plugins { +#adminmenu .awaiting-mod, +#adminmenu .update-plugins { color: #fff; - background: #ccaf0b; } + background: #ccaf0b; +} -#adminmenu li.current a .awaiting-mod, #adminmenu li a.wp-has-current-submenu .update-plugins, #adminmenu li:hover a .awaiting-mod, #adminmenu li.menu-top:hover > a .update-plugins { +#adminmenu li.current a .awaiting-mod, +#adminmenu li a.wp-has-current-submenu .update-plugins, +#adminmenu li:hover a .awaiting-mod, +#adminmenu li.menu-top:hover > a .update-plugins { color: #fff; - background: #be3631; } + background: #be3631; +} /* Admin Menu: collapse button */ #collapse-menu { - color: #f3f1f1; } + color: #f3f1f1; +} #collapse-menu:hover { - color: #fff; } + color: #fff; +} #collapse-button div:after { - color: #f3f1f1; } + color: #f3f1f1; +} #collapse-menu:hover #collapse-button div:after { - color: #fff; } + color: #fff; +} /* Admin Bar */ #wpadminbar { color: #fff; - background: #cf4944; } - -#wpadminbar .ab-item, #wpadminbar a.ab-item, #wpadminbar > #wp-toolbar span.ab-label, #wpadminbar > #wp-toolbar span.noticon { - color: #fff; } + background: #cf4944; +} -#wpadminbar .ab-icon, #wpadminbar .ab-icon:before, #wpadminbar .ab-item:before, #wpadminbar .ab-item:after { - color: #f3f1f1; } - -#wpadminbar .ab-top-menu > li:hover > .ab-item, #wpadminbar .ab-top-menu > li.hover > .ab-item, #wpadminbar .ab-top-menu > li > .ab-item:focus, #wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, #wpadminbar-nojs .ab-top-menu > li.menupop:hover > .ab-item, #wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { +#wpadminbar .ab-item, +#wpadminbar a.ab-item, +#wpadminbar > #wp-toolbar span.ab-label, +#wpadminbar > #wp-toolbar span.noticon { + color: #fff; +} + +#wpadminbar .ab-icon, +#wpadminbar .ab-icon:before, +#wpadminbar .ab-item:before, +#wpadminbar .ab-item:after { + color: #f3f1f1; +} + +#wpadminbar:not(.mobile) .ab-top-menu > li:hover > .ab-item, +#wpadminbar:not(.mobile) .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojs .ab-top-menu > li.menupop:hover > .ab-item, +#wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { color: #f7e3d3; - background: #be3631; } + background: #be3631; +} -#wpadminbar > #wp-toolbar li:hover span.ab-label, #wpadminbar > #wp-toolbar li.hover span.ab-label, #wpadminbar > #wp-toolbar a:focus span.ab-label { - color: #f7e3d3; } +#wpadminbar:not(.mobile) > #wp-toolbar li:hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar li.hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar a:focus span.ab-label { + color: #f7e3d3; +} -#wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #fff; } +#wpadminbar:not(.mobile) li:hover .ab-icon:before, +#wpadminbar:not(.mobile) li:hover .ab-item:before, +#wpadminbar:not(.mobile) li:hover .ab-item:after, +#wpadminbar:not(.mobile) li:hover #adminbarsearch:before { + color: #fff; +} /* Admin Bar: submenu */ #wpadminbar .menupop .ab-sub-wrapper { - background: #be3631; } - -#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, #wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { - background: #cf6b67; } - -#wpadminbar .ab-submenu .ab-item, #wpadminbar .quicklinks .menupop ul li a, #wpadminbar .quicklinks .menupop.hover ul li a, #wpadminbar-nojs .quicklinks .menupop:hover ul li a { - color: #f0c8c6; } - -#wpadminbar .quicklinks li .blavatar, #wpadminbar .menupop .menupop > .ab-item:before { - color: #f3f1f1; } - -#wpadminbar .quicklinks .menupop ul li a:hover, #wpadminbar .quicklinks .menupop ul li a:focus, #wpadminbar .quicklinks .menupop ul li a:hover strong, #wpadminbar .quicklinks .menupop ul li a:focus strong, #wpadminbar .quicklinks .menupop.hover ul li a:hover, #wpadminbar .quicklinks .menupop.hover ul li a:focus, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, #wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li a:focus .ab-icon:before, #wpadminbar li .ab-item:focus:before, #wpadminbar li.hover .ab-icon:before, #wpadminbar li.hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li.hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #f7e3d3; } + background: #be3631; +} + +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { + background: #cf6b67; +} + +#wpadminbar .ab-submenu .ab-item, +#wpadminbar .quicklinks .menupop ul li a, +#wpadminbar .quicklinks .menupop.hover ul li a, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a { + color: #f1c8c7; +} + +#wpadminbar .quicklinks li .blavatar, +#wpadminbar .menupop .menupop > .ab-item:before { + color: #f3f1f1; +} + +#wpadminbar .quicklinks .menupop ul li a:hover, +#wpadminbar .quicklinks .menupop ul li a:focus, +#wpadminbar .quicklinks .menupop ul li a:hover strong, +#wpadminbar .quicklinks .menupop ul li a:focus strong, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a, +#wpadminbar .quicklinks .menupop.hover ul li a:hover, +#wpadminbar .quicklinks .menupop.hover ul li a:focus, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, +#wpadminbar li:hover .ab-icon:before, +#wpadminbar li:hover .ab-item:before, +#wpadminbar li a:focus .ab-icon:before, +#wpadminbar li .ab-item:focus:before, +#wpadminbar li.hover .ab-icon:before, +#wpadminbar li.hover .ab-item:before, +#wpadminbar li:hover #adminbarsearch:before, +#wpadminbar li #adminbarsearch.adminbar-focused:before { + color: #f7e3d3; +} + +#wpadminbar .quicklinks li a:hover .blavatar, +#wpadminbar .quicklinks li a:focus .blavatar, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar, +#wpadminbar .menupop .menupop > .ab-item:hover:before, +#wpadminbar.mobile .quicklinks .ab-icon:before, +#wpadminbar.mobile .quicklinks .ab-item:before { + color: #f7e3d3; +} -#wpadminbar .quicklinks li a:hover .blavatar, #wpadminbar .menupop .menupop > .ab-item:hover:before { - color: #f7e3d3; } +#wpadminbar.mobile .quicklinks .hover .ab-icon:before, +#wpadminbar.mobile .quicklinks .hover .ab-item:before { + color: #f3f1f1; +} /* Admin Bar: search */ #wpadminbar #adminbarsearch:before { - color: #f3f1f1; } + color: #f3f1f1; +} #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus { color: #fff; - background: #d66460; } - -#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder { - color: #fff; - opacity: 0.7; } + background: #d66560; +} /* Admin Bar: my account */ #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { - border-color: #d66460; - background-color: #d66460; } + border-color: #d66560; + background-color: #d66560; +} #wpadminbar #wp-admin-bar-user-info .display-name { - color: #fff; } + color: #fff; +} #wpadminbar #wp-admin-bar-user-info a:hover .display-name { - color: #f7e3d3; } + color: #f7e3d3; +} #wpadminbar #wp-admin-bar-user-info .username { - color: #f0c8c6; } + color: #f1c8c7; +} /* Pointers */ .wp-pointer .wp-pointer-content h3 { background-color: #dd823b; - border-color: #d97326; } + border-color: #d97426; +} .wp-pointer .wp-pointer-content h3:before { - color: #dd823b; } - -.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow { - border-bottom-color: #dd823b; } - -/* Media Uploader */ -.media-item .bar, .media-progress-bar div { - background-color: #dd823b; } + color: #dd823b; +} + +.wp-pointer.wp-pointer-top .wp-pointer-arrow, +.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner { + border-bottom-color: #dd823b; +} + +/* Media */ +.media-item .bar, +.media-progress-bar div { + background-color: #dd823b; +} .details.attachment { - -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #dd823b; - box-shadow: 0 0 0 1px #fff, 0 0 0 5px #dd823b; } + -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #dd823b; + box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #dd823b; +} .attachment.details .check { background-color: #dd823b; -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #dd823b; - box-shadow: 0 0 0 1px #fff, 0 0 0 2px #dd823b; } + box-shadow: 0 0 0 1px #fff, 0 0 0 2px #dd823b; +} + +.media-selection .attachment.selection.details .thumbnail { + -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #dd823b; + box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #dd823b; +} /* Themes */ -.theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after { - background: #dd823b; } +.theme-browser .theme.active .theme-name, +.theme-browser .theme.add-new-theme a:hover:after, +.theme-browser .theme.add-new-theme a:focus:after { + background: #dd823b; +} -.theme-browser .theme.add-new-theme:hover span:after { - color: #dd823b; } +.theme-browser .theme.add-new-theme a:hover span:after, +.theme-browser .theme.add-new-theme a:focus span:after { + color: #dd823b; +} -.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover { - background: #dd823b; } +.theme-section.current, +.theme-filter.current { + border-bottom-color: #cf4944; +} -.theme-section.current, .theme-filter.current { - border-bottom-color: #cf4944; } +body.more-filters-opened .more-filters { + color: #fff; + background-color: #cf4944; +} -body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before { +body.more-filters-opened .more-filters:before { color: #fff; - background-color: #cf4944; } +} -body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before { +body.more-filters-opened .more-filters:hover, +body.more-filters-opened .more-filters:focus { background-color: #dd823b; - color: #fff; } + color: #fff; +} + +body.more-filters-opened .more-filters:hover:before, +body.more-filters-opened .more-filters:focus:before { + color: #fff; +} /* Widgets */ .widgets-chooser li.widgets-chooser-selected { background-color: #dd823b; - color: #fff; } + color: #fff; +} -.widgets-chooser li.widgets-chooser-selected:before, .widgets-chooser li.widgets-chooser-selected:focus:before { - color: #fff; } +.widgets-chooser li.widgets-chooser-selected:before, +.widgets-chooser li.widgets-chooser-selected:focus:before { + color: #fff; +} /* Customize */ #customize-theme-controls .widget-area-select .selected { background-color: #dd823b; - color: #fff; } - -/* jQuery UI Slider */ -.wp-slider .ui-slider-handle, .wp-slider .ui-slider-handle.ui-state-hover, .wp-slider .ui-slider-handle.focus { - background: #dd823b; - border-color: #c36822; - -webkit-box-shadow: inset 0 1px 0 #e8ab7c, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #e8ab7c, 0 1px 0 rgba(0, 0, 0, 0.15); } - -/* Thickbox: Plugin information */ -#sidemenu a.current { - background: #f1f1f1; - border-bottom-color: #f1f1f1; } + color: #fff; +} -#plugin-information .action-button { - background: #dd823b; } +#customize-footer-actions .devices button:focus { + border-bottom-color: #dd823b; +} /* Responsive Component */ div#wp-responsive-toggle a:before { - color: #f3f1f1; } + color: #f3f1f1; +} .wp-responsive-open div#wp-responsive-toggle a { border-color: transparent; - background: #dd823b; } - -.star-rating .star { - color: #dd823b; } + background: #dd823b; +} .wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a { - background: #be3631; } + background: #be3631; +} + +.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before { + color: #f3f1f1; +} + +/* TinyMCE */ +.mce-container.mce-menu .mce-menu-item:hover, +.mce-container.mce-menu .mce-menu-item.mce-selected, +.mce-container.mce-menu .mce-menu-item:focus, +.mce-container.mce-menu .mce-menu-item-normal.mce-active, +.mce-container.mce-menu .mce-menu-item-preview.mce-active { + background: #dd823b; +} diff --git a/wp-admin/css/colors/sunrise/colors-rtl.min.css b/wp-admin/css/colors/sunrise/colors-rtl.min.css index 2fbbff8..aab1253 100644 --- a/wp-admin/css/colors/sunrise/colors-rtl.min.css +++ b/wp-admin/css/colors/sunrise/colors-rtl.min.css @@ -1 +1 @@ -html{background:#f1f1f1}a{color:#0074a2}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,a:active,a:focus,a:hover,div.dashboard-widget-submit input:hover{color:#0099d5}input[type=checkbox]:checked:before{color:#dd823b}input[type=radio]:checked:before{background:#dd823b}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0099d5}.wp-core-ui .button-primary{background:#dd823b;border-color:#c36822;color:#fff;-webkit-box-shadow:inset 0 1px 0 #e8ab7c,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #e8ab7c,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#d97326;border-color:#ad5c1e;color:#fff;-webkit-box-shadow:inset 0 1px 0 #e59d66,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #e59d66,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:active{background:#c36822;border-color:#ad5c1e;color:#fff;-webkit-box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5);box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5)}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#d1cbc7!important;background:#cc6c23!important;border-color:#ad5c1e!important;text-shadow:none!important}.wp-core-ui .wp-ui-primary{color:#fff;background-color:#cf4944}.wp-core-ui .wp-ui-text-primary{color:#cf4944}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#dd823b}.wp-core-ui .wp-ui-text-highlight{color:#dd823b}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#ccaf0b}.wp-core-ui .wp-ui-text-notification{color:#ccaf0b}.wp-core-ui .wp-ui-text-icon{color:#f3f1f1}#add-new-comment a:hover,.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover{color:#fff;background-color:#cf4944}.view-switch a.current:before{color:#cf4944}.view-switch a:hover:before{color:#ccaf0b}.post-com-count:hover:after{border-top-color:#cf4944}.post-com-count:hover span{color:#fff;background-color:#cf4944}strong .post-com-count:after{border-top-color:#ccaf0b}strong .post-com-count span{background-color:#ccaf0b}#adminmenu,#adminmenuback,#adminmenuwrap{background:#cf4944}#adminmenu a{color:#fff}#adminmenu div.wp-menu-image:before{color:#f3f1f1}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#dd823b}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#fff}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f1f1f1;border-bottom-color:#f1f1f1}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#be3631}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-left-color:#be3631}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu .wp-submenu-head,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#f0c8c6}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#f7e3d3}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#f7e3d3}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-left-color:#f1f1f1}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#dd823b}#adminmenu li.wp-has-current-submenu div.wp-menu-image:before{color:#fff}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#ccaf0b}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#fff;background:#be3631}#collapse-menu{color:#f3f1f1}#collapse-menu:hover{color:#fff}#collapse-button div:after{color:#f3f1f1}#collapse-menu:hover #collapse-button div:after{color:#fff}#wpadminbar{color:#fff;background:#cf4944}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#fff}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#f3f1f1}#wpadminbar .ab-top-menu>li.hover>.ab-item,#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar .ab-top-menu>li:hover>.ab-item,#wpadminbar .ab-top-menu>li>.ab-item:focus,#wpadminbar-nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus{color:#f7e3d3;background:#be3631}#wpadminbar>#wp-toolbar a:focus span.ab-label,#wpadminbar>#wp-toolbar li.hover span.ab-label,#wpadminbar>#wp-toolbar li:hover span.ab-label{color:#f7e3d3}#wpadminbar .menupop .ab-sub-wrapper{background:#be3631}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#cf6b67}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar-nojs .quicklinks .menupop:hover ul li a{color:#f0c8c6}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#f3f1f1}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:after,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:after,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#f7e3d3}#wpadminbar #adminbarsearch:before{color:#f3f1f1}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#fff;background:#d66460}#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder{color:#fff;opacity:.7}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#d66460;background-color:#d66460}#wpadminbar #wp-admin-bar-user-info .display-name{color:#fff}#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#f7e3d3}#wpadminbar #wp-admin-bar-user-info .username{color:#f0c8c6}.wp-pointer .wp-pointer-content h3{background-color:#dd823b;border-color:#d97326}.wp-pointer .wp-pointer-content h3:before{color:#dd823b}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow{border-bottom-color:#dd823b}.media-item .bar,.media-progress-bar div{background-color:#dd823b}.details.attachment{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 5px #dd823b;box-shadow:0 0 0 1px #fff,0 0 0 5px #dd823b}.attachment.details .check{background-color:#dd823b;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #dd823b;box-shadow:0 0 0 1px #fff,0 0 0 2px #dd823b}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme:hover:after{background:#dd823b}.theme-browser .theme.add-new-theme:hover span:after{color:#dd823b}.theme-overlay .theme-header .close:hover,.theme-overlay .theme-header .left:hover,.theme-overlay .theme-header .right:hover{background:#dd823b}.theme-filter.current,.theme-section.current{border-bottom-color:#cf4944}body.more-filters-opened .more-filters,body.more-filters-opened .more-filters:before{color:#fff;background-color:#cf4944}.widgets-chooser li.widgets-chooser-selected,body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover,body.more-filters-opened .more-filters:hover:before{background-color:#dd823b;color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-theme-controls .widget-area-select .selected{background-color:#dd823b;color:#fff}.wp-slider .ui-slider-handle,.wp-slider .ui-slider-handle.focus,.wp-slider .ui-slider-handle.ui-state-hover{background:#dd823b;border-color:#c36822;-webkit-box-shadow:inset 0 1px 0 #e8ab7c,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #e8ab7c,0 1px 0 rgba(0,0,0,.15)}#sidemenu a.current{background:#f1f1f1;border-bottom-color:#f1f1f1}#plugin-information .action-button{background:#dd823b}div#wp-responsive-toggle a:before{color:#f3f1f1}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#dd823b}.star-rating .star{color:#dd823b}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#be3631} \ No newline at end of file +html{background:#f1f1f1}a{color:#0073aa}a:active,a:focus,a:hover{color:#0096dd}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,div.dashboard-widget-submit input:hover{color:#0096dd}input[type=checkbox]:checked:before{color:#dd823b}input[type=radio]:checked:before{background:#dd823b}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0096dd}.wp-core-ui .button-primary{background:#dd823b;border-color:#c36922 #ad5d1e #ad5d1e;color:#fff;-webkit-box-shadow:0 1px 0 #ad5d1e;box-shadow:0 1px 0 #ad5d1e;text-shadow:0 -1px 1px #ad5d1e,-1px 0 1px #ad5d1e,0 1px 1px #ad5d1e,1px 0 1px #ad5d1e}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#df8a48;border-color:#ad5d1e;color:#fff;-webkit-box-shadow:0 1px 0 #ad5d1e;box-shadow:0 1px 0 #ad5d1e}.wp-core-ui .button-primary:focus{-webkit-box-shadow:inset 0 1px 0 #c36922,0 0 2px 1px #33b3db;box-shadow:inset 0 1px 0 #c36922,0 0 2px 1px #33b3db}.wp-core-ui .button-primary:active{background:#c36922;border-color:#ad5d1e;-webkit-box-shadow:inset 0 2px 0 #ad5d1e;box-shadow:inset 0 2px 0 #ad5d1e}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#d1cbc7!important;background:#cc6d23!important;border-color:#ad5d1e!important;text-shadow:none!important}.wp-core-ui .button-primary.button-hero{-webkit-box-shadow:0 2px 0 #ad5d1e!important;box-shadow:0 2px 0 #ad5d1e!important}.wp-core-ui .button-primary.button-hero:active{-webkit-box-shadow:inset 0 3px 0 #ad5d1e!important;box-shadow:inset 0 3px 0 #ad5d1e!important}.wp-core-ui .wp-ui-primary{color:#fff;background-color:#cf4944}.wp-core-ui .wp-ui-text-primary{color:#cf4944}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#dd823b}.wp-core-ui .wp-ui-text-highlight{color:#dd823b}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#ccaf0b}.wp-core-ui .wp-ui-text-notification{color:#ccaf0b}.wp-core-ui .wp-ui-text-icon{color:#f3f1f1}.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover,.wrap .page-title-action:hover{color:#fff;background-color:#cf4944}.view-switch a.current:before{color:#cf4944}.view-switch a:hover:before{color:#ccaf0b}#adminmenu,#adminmenuback,#adminmenuwrap{background:#cf4944}#adminmenu a{color:#fff}#adminmenu div.wp-menu-image:before{color:#f3f1f1}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#dd823b}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#fff}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f1f1f1;border-bottom-color:#f1f1f1}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#be3631}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-left-color:#be3631}#adminmenu .wp-submenu .wp-submenu-head{color:#f1c8c7}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#f1c8c7}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#f7e3d3}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#f7e3d3}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-left-color:#f1f1f1}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#dd823b}#adminmenu a.current:hover div.wp-menu-image:before,#adminmenu li a:focus div.wp-menu-image:before,#adminmenu li.opensub div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,#adminmenu li:hover div.wp-menu-image:before,.ie8 #adminmenu li.opensub div.wp-menu-image:before{color:#fff}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#ccaf0b}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#fff;background:#be3631}#collapse-menu{color:#f3f1f1}#collapse-menu:hover{color:#fff}#collapse-button div:after{color:#f3f1f1}#collapse-menu:hover #collapse-button div:after{color:#fff}#wpadminbar{color:#fff;background:#cf4944}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#fff}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#f3f1f1}#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus,#wpadminbar.nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li>.ab-item:focus{color:#f7e3d3;background:#be3631}#wpadminbar:not(.mobile)>#wp-toolbar a:focus span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li.hover span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li:hover span.ab-label{color:#f7e3d3}#wpadminbar:not(.mobile) li:hover #adminbarsearch:before,#wpadminbar:not(.mobile) li:hover .ab-icon:before,#wpadminbar:not(.mobile) li:hover .ab-item:after,#wpadminbar:not(.mobile) li:hover .ab-item:before{color:#fff}#wpadminbar .menupop .ab-sub-wrapper{background:#be3631}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#cf6b67}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar.nojs .quicklinks .menupop:hover ul li a{color:#f1c8c7}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#f3f1f1}#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar li #adminbarsearch.adminbar-focused:before,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#f7e3d3}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a .blavatar,#wpadminbar .quicklinks li a:focus .blavatar,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar.mobile .quicklinks .ab-icon:before,#wpadminbar.mobile .quicklinks .ab-item:before{color:#f7e3d3}#wpadminbar.mobile .quicklinks .hover .ab-icon:before,#wpadminbar.mobile .quicklinks .hover .ab-item:before{color:#f3f1f1}#wpadminbar #adminbarsearch:before{color:#f3f1f1}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#fff;background:#d66560}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#d66560;background-color:#d66560}#wpadminbar #wp-admin-bar-user-info .display-name{color:#fff}#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#f7e3d3}#wpadminbar #wp-admin-bar-user-info .username{color:#f1c8c7}.wp-pointer .wp-pointer-content h3{background-color:#dd823b;border-color:#d97426}.wp-pointer .wp-pointer-content h3:before{color:#dd823b}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner{border-bottom-color:#dd823b}.media-item .bar,.media-progress-bar div{background-color:#dd823b}.details.attachment{-webkit-box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #dd823b;box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #dd823b}.attachment.details .check{background-color:#dd823b;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #dd823b;box-shadow:0 0 0 1px #fff,0 0 0 2px #dd823b}.media-selection .attachment.selection.details .thumbnail{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 3px #dd823b;box-shadow:0 0 0 1px #fff,0 0 0 3px #dd823b}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme a:focus:after,.theme-browser .theme.add-new-theme a:hover:after{background:#dd823b}.theme-browser .theme.add-new-theme a:focus span:after,.theme-browser .theme.add-new-theme a:hover span:after{color:#dd823b}.theme-filter.current,.theme-section.current{border-bottom-color:#cf4944}body.more-filters-opened .more-filters{color:#fff;background-color:#cf4944}#customize-theme-controls .widget-area-select .selected,.widgets-chooser li.widgets-chooser-selected{background-color:#dd823b;color:#fff}body.more-filters-opened .more-filters:before{color:#fff}body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:hover{background-color:#dd823b;color:#fff}body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover:before{color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-footer-actions .devices button:focus{border-bottom-color:#dd823b}div#wp-responsive-toggle a:before{color:#f3f1f1}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#dd823b}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#be3631}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before{color:#f3f1f1}.mce-container.mce-menu .mce-menu-item-normal.mce-active,.mce-container.mce-menu .mce-menu-item-preview.mce-active,.mce-container.mce-menu .mce-menu-item.mce-selected,.mce-container.mce-menu .mce-menu-item:focus,.mce-container.mce-menu .mce-menu-item:hover{background:#dd823b} \ No newline at end of file diff --git a/wp-admin/css/colors/sunrise/colors.css b/wp-admin/css/colors/sunrise/colors.css index 2a872ed..88cde53 100644 --- a/wp-admin/css/colors/sunrise/colors.css +++ b/wp-admin/css/colors/sunrise/colors.css @@ -3,329 +3,524 @@ * highlights/shadows, based on a base color. */ html { - background: #f1f1f1; } + background: #f1f1f1; +} /* Links */ a { - color: #0074a2; } - a:hover, a:active, a:focus { - color: #0099d5; } + color: #0073aa; +} + +a:hover, a:active, a:focus { + color: #0096dd; +} -#media-upload a.del-link:hover, div.dashboard-widget-submit input:hover, .subsubsub a:hover, .subsubsub a.current:hover { - color: #0099d5; } +#media-upload a.del-link:hover, +div.dashboard-widget-submit input:hover, +.subsubsub a:hover, +.subsubsub a.current:hover { + color: #0096dd; +} /* Forms */ input[type=checkbox]:checked:before { - color: #dd823b; } + color: #dd823b; +} input[type=radio]:checked:before { - background: #dd823b; } + background: #dd823b; +} -.wp-core-ui input[type="reset"]:hover, .wp-core-ui input[type="reset"]:active { - color: #0099d5; } +.wp-core-ui input[type="reset"]:hover, +.wp-core-ui input[type="reset"]:active { + color: #0096dd; +} /* Core UI */ .wp-core-ui .button-primary { background: #dd823b; - border-color: #c36822; + border-color: #c36922 #ad5d1e #ad5d1e; color: white; - -webkit-box-shadow: inset 0 1px 0 #e8ab7c, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #e8ab7c, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { - background: #d97326; - border-color: #ad5c1e; - color: white; - -webkit-box-shadow: inset 0 1px 0 #e59d66, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #e59d66, 0 1px 0 rgba(0, 0, 0, 0.15); } - .wp-core-ui .button-primary:active { - background: #c36822; - border-color: #ad5c1e; - color: white; - -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); - box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); } - .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { - color: #d1cbc7 !important; - background: #cc6c23 !important; - border-color: #ad5c1e !important; - text-shadow: none !important; } + -webkit-box-shadow: 0 1px 0 #ad5d1e; + box-shadow: 0 1px 0 #ad5d1e; + text-shadow: 0 -1px 1px #ad5d1e, 1px 0 1px #ad5d1e, 0 1px 1px #ad5d1e, -1px 0 1px #ad5d1e; +} + +.wp-core-ui .button-primary:hover, .wp-core-ui .button-primary:focus { + background: #df8a48; + border-color: #ad5d1e; + color: white; + -webkit-box-shadow: 0 1px 0 #ad5d1e; + box-shadow: 0 1px 0 #ad5d1e; +} + +.wp-core-ui .button-primary:focus { + -webkit-box-shadow: inset 0 1px 0 #c36922, 0 0 2px 1px #33b3db; + box-shadow: inset 0 1px 0 #c36922, 0 0 2px 1px #33b3db; +} + +.wp-core-ui .button-primary:active { + background: #c36922; + border-color: #ad5d1e; + -webkit-box-shadow: inset 0 2px 0 #ad5d1e; + box-shadow: inset 0 2px 0 #ad5d1e; +} + +.wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary.button-primary-disabled, .wp-core-ui .button-primary.disabled { + color: #d1cbc7 !important; + background: #cc6d23 !important; + border-color: #ad5d1e !important; + text-shadow: none !important; +} + +.wp-core-ui .button-primary.button-hero { + -webkit-box-shadow: 0 2px 0 #ad5d1e !important; + box-shadow: 0 2px 0 #ad5d1e !important; +} + +.wp-core-ui .button-primary.button-hero:active { + -webkit-box-shadow: inset 0 3px 0 #ad5d1e !important; + box-shadow: inset 0 3px 0 #ad5d1e !important; +} + .wp-core-ui .wp-ui-primary { color: #fff; - background-color: #cf4944; } + background-color: #cf4944; +} + .wp-core-ui .wp-ui-text-primary { - color: #cf4944; } + color: #cf4944; +} + .wp-core-ui .wp-ui-highlight { color: #fff; - background-color: #dd823b; } + background-color: #dd823b; +} + .wp-core-ui .wp-ui-text-highlight { - color: #dd823b; } + color: #dd823b; +} + .wp-core-ui .wp-ui-notification { color: #fff; - background-color: #ccaf0b; } + background-color: #ccaf0b; +} + .wp-core-ui .wp-ui-text-notification { - color: #ccaf0b; } + color: #ccaf0b; +} + .wp-core-ui .wp-ui-text-icon { - color: #f3f1f1; } + color: #f3f1f1; +} /* List tables */ -.wrap .add-new-h2:hover, #add-new-comment a:hover, .tablenav .tablenav-pages a:hover, .tablenav .tablenav-pages a:focus { +.wrap .add-new-h2:hover, +.wrap .page-title-action:hover, +.tablenav .tablenav-pages a:hover, +.tablenav .tablenav-pages a:focus { color: #fff; - background-color: #cf4944; } + background-color: #cf4944; +} .view-switch a.current:before { - color: #cf4944; } + color: #cf4944; +} .view-switch a:hover:before { - color: #ccaf0b; } - -.post-com-count:hover:after { - border-top-color: #cf4944; } - -.post-com-count:hover span { - color: #fff; - background-color: #cf4944; } - -strong .post-com-count:after { - border-top-color: #ccaf0b; } - -strong .post-com-count span { - background-color: #ccaf0b; } + color: #ccaf0b; +} /* Admin Menu */ -#adminmenuback, #adminmenuwrap, #adminmenu { - background: #cf4944; } +#adminmenuback, +#adminmenuwrap, +#adminmenu { + background: #cf4944; +} #adminmenu a { - color: #fff; } + color: #fff; +} #adminmenu div.wp-menu-image:before { - color: #f3f1f1; } + color: #f3f1f1; +} -#adminmenu a:hover, #adminmenu li.menu-top:hover, #adminmenu li.opensub > a.menu-top, #adminmenu li > a.menu-top:focus { +#adminmenu a:hover, +#adminmenu li.menu-top:hover, +#adminmenu li.opensub > a.menu-top, +#adminmenu li > a.menu-top:focus { color: #fff; - background-color: #dd823b; } + background-color: #dd823b; +} -#adminmenu li.menu-top:hover div.wp-menu-image:before, #adminmenu li.opensub > a.menu-top div.wp-menu-image:before { - color: #fff; } +#adminmenu li.menu-top:hover div.wp-menu-image:before, +#adminmenu li.opensub > a.menu-top div.wp-menu-image:before { + color: #fff; +} /* Active tabs use a bottom border color that matches the page background color. */ -.about-wrap h2 .nav-tab-active, .nav-tab-active, .nav-tab-active:hover { +.about-wrap h2 .nav-tab-active, +.nav-tab-active, +.nav-tab-active:hover { background-color: #f1f1f1; - border-bottom-color: #f1f1f1; } + border-bottom-color: #f1f1f1; +} /* Admin Menu: submenu */ -#adminmenu .wp-submenu, #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu .wp-has-current-submenu.opensub .wp-submenu, .folded #adminmenu .wp-has-current-submenu .wp-submenu, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu { - background: #be3631; } +#adminmenu .wp-submenu, +#adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu, +.folded #adminmenu .wp-has-current-submenu .wp-submenu, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu { + background: #be3631; +} #adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after { - border-right-color: #be3631; } + border-right-color: #be3631; +} #adminmenu .wp-submenu .wp-submenu-head { - color: #f0c8c6; } - -#adminmenu .wp-submenu a, #adminmenu .wp-has-current-submenu .wp-submenu a, .folded #adminmenu .wp-has-current-submenu .wp-submenu a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a { - color: #f0c8c6; } - #adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, #adminmenu .wp-has-current-submenu .wp-submenu a:focus, #adminmenu .wp-has-current-submenu .wp-submenu a:hover, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, .folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { - color: #f7e3d3; } + color: #f1c8c7; +} + +#adminmenu .wp-submenu a, +#adminmenu .wp-has-current-submenu .wp-submenu a, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a { + color: #f1c8c7; +} + +#adminmenu .wp-submenu a:focus, #adminmenu .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu .wp-submenu a:hover, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus, +.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover { + color: #f7e3d3; +} /* Admin Menu: current */ -#adminmenu .wp-submenu li.current a, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { - color: #fff; } - #adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, #adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, #adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { - color: #f7e3d3; } +#adminmenu .wp-submenu li.current a, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a { + color: #fff; +} -ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.current:after { - border-right-color: #f1f1f1; } +#adminmenu .wp-submenu li.current a:hover, #adminmenu .wp-submenu li.current a:focus, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:hover, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu li.current a:focus, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus { + color: #f7e3d3; +} -#adminmenu li.current a.menu-top, #adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, #adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, .folded #adminmenu li.current.menu-top { - color: #fff; - background: #dd823b; } +ul#adminmenu a.wp-has-current-submenu:after, +ul#adminmenu > li.current > a.current:after { + border-right-color: #f1f1f1; +} -#adminmenu li.wp-has-current-submenu div.wp-menu-image:before { - color: #fff; } +#adminmenu li.current a.menu-top, +#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, +#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head, +.folded #adminmenu li.current.menu-top { + color: #fff; + background: #dd823b; +} + +#adminmenu li.wp-has-current-submenu div.wp-menu-image:before, +#adminmenu a.current:hover div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before, +#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before, +#adminmenu li:hover div.wp-menu-image:before, +#adminmenu li a:focus div.wp-menu-image:before, +#adminmenu li.opensub div.wp-menu-image:before, +.ie8 #adminmenu li.opensub div.wp-menu-image:before { + color: #fff; +} /* Admin Menu: bubble */ -#adminmenu .awaiting-mod, #adminmenu .update-plugins { +#adminmenu .awaiting-mod, +#adminmenu .update-plugins { color: #fff; - background: #ccaf0b; } + background: #ccaf0b; +} -#adminmenu li.current a .awaiting-mod, #adminmenu li a.wp-has-current-submenu .update-plugins, #adminmenu li:hover a .awaiting-mod, #adminmenu li.menu-top:hover > a .update-plugins { +#adminmenu li.current a .awaiting-mod, +#adminmenu li a.wp-has-current-submenu .update-plugins, +#adminmenu li:hover a .awaiting-mod, +#adminmenu li.menu-top:hover > a .update-plugins { color: #fff; - background: #be3631; } + background: #be3631; +} /* Admin Menu: collapse button */ #collapse-menu { - color: #f3f1f1; } + color: #f3f1f1; +} #collapse-menu:hover { - color: #fff; } + color: #fff; +} #collapse-button div:after { - color: #f3f1f1; } + color: #f3f1f1; +} #collapse-menu:hover #collapse-button div:after { - color: #fff; } + color: #fff; +} /* Admin Bar */ #wpadminbar { color: #fff; - background: #cf4944; } - -#wpadminbar .ab-item, #wpadminbar a.ab-item, #wpadminbar > #wp-toolbar span.ab-label, #wpadminbar > #wp-toolbar span.noticon { - color: #fff; } + background: #cf4944; +} -#wpadminbar .ab-icon, #wpadminbar .ab-icon:before, #wpadminbar .ab-item:before, #wpadminbar .ab-item:after { - color: #f3f1f1; } - -#wpadminbar .ab-top-menu > li:hover > .ab-item, #wpadminbar .ab-top-menu > li.hover > .ab-item, #wpadminbar .ab-top-menu > li > .ab-item:focus, #wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, #wpadminbar-nojs .ab-top-menu > li.menupop:hover > .ab-item, #wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { +#wpadminbar .ab-item, +#wpadminbar a.ab-item, +#wpadminbar > #wp-toolbar span.ab-label, +#wpadminbar > #wp-toolbar span.noticon { + color: #fff; +} + +#wpadminbar .ab-icon, +#wpadminbar .ab-icon:before, +#wpadminbar .ab-item:before, +#wpadminbar .ab-item:after { + color: #f3f1f1; +} + +#wpadminbar:not(.mobile) .ab-top-menu > li:hover > .ab-item, +#wpadminbar:not(.mobile) .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojs .ab-top-menu > li.menupop:hover > .ab-item, +#wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { color: #f7e3d3; - background: #be3631; } + background: #be3631; +} -#wpadminbar > #wp-toolbar li:hover span.ab-label, #wpadminbar > #wp-toolbar li.hover span.ab-label, #wpadminbar > #wp-toolbar a:focus span.ab-label { - color: #f7e3d3; } +#wpadminbar:not(.mobile) > #wp-toolbar li:hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar li.hover span.ab-label, +#wpadminbar:not(.mobile) > #wp-toolbar a:focus span.ab-label { + color: #f7e3d3; +} -#wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #fff; } +#wpadminbar:not(.mobile) li:hover .ab-icon:before, +#wpadminbar:not(.mobile) li:hover .ab-item:before, +#wpadminbar:not(.mobile) li:hover .ab-item:after, +#wpadminbar:not(.mobile) li:hover #adminbarsearch:before { + color: #fff; +} /* Admin Bar: submenu */ #wpadminbar .menupop .ab-sub-wrapper { - background: #be3631; } - -#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, #wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { - background: #cf6b67; } - -#wpadminbar .ab-submenu .ab-item, #wpadminbar .quicklinks .menupop ul li a, #wpadminbar .quicklinks .menupop.hover ul li a, #wpadminbar-nojs .quicklinks .menupop:hover ul li a { - color: #f0c8c6; } - -#wpadminbar .quicklinks li .blavatar, #wpadminbar .menupop .menupop > .ab-item:before { - color: #f3f1f1; } - -#wpadminbar .quicklinks .menupop ul li a:hover, #wpadminbar .quicklinks .menupop ul li a:focus, #wpadminbar .quicklinks .menupop ul li a:hover strong, #wpadminbar .quicklinks .menupop ul li a:focus strong, #wpadminbar .quicklinks .menupop.hover ul li a:hover, #wpadminbar .quicklinks .menupop.hover ul li a:focus, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, #wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, #wpadminbar li:hover .ab-icon:before, #wpadminbar li:hover .ab-item:before, #wpadminbar li a:focus .ab-icon:before, #wpadminbar li .ab-item:focus:before, #wpadminbar li.hover .ab-icon:before, #wpadminbar li.hover .ab-item:before, #wpadminbar li:hover .ab-item:after, #wpadminbar li.hover .ab-item:after, #wpadminbar li:hover #adminbarsearch:before { - color: #f7e3d3; } + background: #be3631; +} + +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary, +#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu { + background: #cf6b67; +} + +#wpadminbar .ab-submenu .ab-item, +#wpadminbar .quicklinks .menupop ul li a, +#wpadminbar .quicklinks .menupop.hover ul li a, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a { + color: #f1c8c7; +} + +#wpadminbar .quicklinks li .blavatar, +#wpadminbar .menupop .menupop > .ab-item:before { + color: #f3f1f1; +} + +#wpadminbar .quicklinks .menupop ul li a:hover, +#wpadminbar .quicklinks .menupop ul li a:focus, +#wpadminbar .quicklinks .menupop ul li a:hover strong, +#wpadminbar .quicklinks .menupop ul li a:focus strong, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a, +#wpadminbar .quicklinks .menupop.hover ul li a:hover, +#wpadminbar .quicklinks .menupop.hover ul li a:focus, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, +#wpadminbar li:hover .ab-icon:before, +#wpadminbar li:hover .ab-item:before, +#wpadminbar li a:focus .ab-icon:before, +#wpadminbar li .ab-item:focus:before, +#wpadminbar li.hover .ab-icon:before, +#wpadminbar li.hover .ab-item:before, +#wpadminbar li:hover #adminbarsearch:before, +#wpadminbar li #adminbarsearch.adminbar-focused:before { + color: #f7e3d3; +} + +#wpadminbar .quicklinks li a:hover .blavatar, +#wpadminbar .quicklinks li a:focus .blavatar, +#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar, +#wpadminbar .menupop .menupop > .ab-item:hover:before, +#wpadminbar.mobile .quicklinks .ab-icon:before, +#wpadminbar.mobile .quicklinks .ab-item:before { + color: #f7e3d3; +} -#wpadminbar .quicklinks li a:hover .blavatar, #wpadminbar .menupop .menupop > .ab-item:hover:before { - color: #f7e3d3; } +#wpadminbar.mobile .quicklinks .hover .ab-icon:before, +#wpadminbar.mobile .quicklinks .hover .ab-item:before { + color: #f3f1f1; +} /* Admin Bar: search */ #wpadminbar #adminbarsearch:before { - color: #f3f1f1; } + color: #f3f1f1; +} #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus { color: #fff; - background: #d66460; } - -#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder { - color: #fff; - opacity: 0.7; } - -#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder { - color: #fff; - opacity: 0.7; } + background: #d66560; +} /* Admin Bar: my account */ #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { - border-color: #d66460; - background-color: #d66460; } + border-color: #d66560; + background-color: #d66560; +} #wpadminbar #wp-admin-bar-user-info .display-name { - color: #fff; } + color: #fff; +} #wpadminbar #wp-admin-bar-user-info a:hover .display-name { - color: #f7e3d3; } + color: #f7e3d3; +} #wpadminbar #wp-admin-bar-user-info .username { - color: #f0c8c6; } + color: #f1c8c7; +} /* Pointers */ .wp-pointer .wp-pointer-content h3 { background-color: #dd823b; - border-color: #d97326; } + border-color: #d97426; +} .wp-pointer .wp-pointer-content h3:before { - color: #dd823b; } - -.wp-pointer.wp-pointer-top .wp-pointer-arrow, .wp-pointer.wp-pointer-undefined .wp-pointer-arrow { - border-bottom-color: #dd823b; } - -/* Media Uploader */ -.media-item .bar, .media-progress-bar div { - background-color: #dd823b; } + color: #dd823b; +} + +.wp-pointer.wp-pointer-top .wp-pointer-arrow, +.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow, +.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner { + border-bottom-color: #dd823b; +} + +/* Media */ +.media-item .bar, +.media-progress-bar div { + background-color: #dd823b; +} .details.attachment { - -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 5px #dd823b; - box-shadow: 0 0 0 1px #fff, 0 0 0 5px #dd823b; } + -webkit-box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #dd823b; + box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 7px #dd823b; +} .attachment.details .check { background-color: #dd823b; -webkit-box-shadow: 0 0 0 1px #fff, 0 0 0 2px #dd823b; - box-shadow: 0 0 0 1px #fff, 0 0 0 2px #dd823b; } + box-shadow: 0 0 0 1px #fff, 0 0 0 2px #dd823b; +} + +.media-selection .attachment.selection.details .thumbnail { + -webkit-box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #dd823b; + box-shadow: 0px 0px 0px 1px #fff, 0px 0px 0px 3px #dd823b; +} /* Themes */ -.theme-browser .theme.active .theme-name, .theme-browser .theme.add-new-theme:hover:after { - background: #dd823b; } +.theme-browser .theme.active .theme-name, +.theme-browser .theme.add-new-theme a:hover:after, +.theme-browser .theme.add-new-theme a:focus:after { + background: #dd823b; +} -.theme-browser .theme.add-new-theme:hover span:after { - color: #dd823b; } +.theme-browser .theme.add-new-theme a:hover span:after, +.theme-browser .theme.add-new-theme a:focus span:after { + color: #dd823b; +} -.theme-overlay .theme-header .close:hover, .theme-overlay .theme-header .right:hover, .theme-overlay .theme-header .left:hover { - background: #dd823b; } +.theme-section.current, +.theme-filter.current { + border-bottom-color: #cf4944; +} -.theme-section.current, .theme-filter.current { - border-bottom-color: #cf4944; } +body.more-filters-opened .more-filters { + color: #fff; + background-color: #cf4944; +} -body.more-filters-opened .more-filters, body.more-filters-opened .more-filters:before { +body.more-filters-opened .more-filters:before { color: #fff; - background-color: #cf4944; } +} -body.more-filters-opened .more-filters:hover, body.more-filters-opened .more-filters:focus, body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .more-filters:focus:before { +body.more-filters-opened .more-filters:hover, +body.more-filters-opened .more-filters:focus { background-color: #dd823b; - color: #fff; } + color: #fff; +} + +body.more-filters-opened .more-filters:hover:before, +body.more-filters-opened .more-filters:focus:before { + color: #fff; +} /* Widgets */ .widgets-chooser li.widgets-chooser-selected { background-color: #dd823b; - color: #fff; } + color: #fff; +} -.widgets-chooser li.widgets-chooser-selected:before, .widgets-chooser li.widgets-chooser-selected:focus:before { - color: #fff; } +.widgets-chooser li.widgets-chooser-selected:before, +.widgets-chooser li.widgets-chooser-selected:focus:before { + color: #fff; +} /* Customize */ #customize-theme-controls .widget-area-select .selected { background-color: #dd823b; - color: #fff; } - -/* jQuery UI Slider */ -.wp-slider .ui-slider-handle, .wp-slider .ui-slider-handle.ui-state-hover, .wp-slider .ui-slider-handle.focus { - background: #dd823b; - border-color: #c36822; - -webkit-box-shadow: inset 0 1px 0 #e8ab7c, 0 1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 0 #e8ab7c, 0 1px 0 rgba(0, 0, 0, 0.15); } - -/* Thickbox: Plugin information */ -#sidemenu a.current { - background: #f1f1f1; - border-bottom-color: #f1f1f1; } + color: #fff; +} -#plugin-information .action-button { - background: #dd823b; } +#customize-footer-actions .devices button:focus { + border-bottom-color: #dd823b; +} /* Responsive Component */ div#wp-responsive-toggle a:before { - color: #f3f1f1; } + color: #f3f1f1; +} .wp-responsive-open div#wp-responsive-toggle a { border-color: transparent; - background: #dd823b; } - -.star-rating .star { - color: #dd823b; } + background: #dd823b; +} .wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a { - background: #be3631; } + background: #be3631; +} + +.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before { + color: #f3f1f1; +} + +/* TinyMCE */ +.mce-container.mce-menu .mce-menu-item:hover, +.mce-container.mce-menu .mce-menu-item.mce-selected, +.mce-container.mce-menu .mce-menu-item:focus, +.mce-container.mce-menu .mce-menu-item-normal.mce-active, +.mce-container.mce-menu .mce-menu-item-preview.mce-active { + background: #dd823b; +} diff --git a/wp-admin/css/colors/sunrise/colors.min.css b/wp-admin/css/colors/sunrise/colors.min.css index 39dd213..6ff5461 100644 --- a/wp-admin/css/colors/sunrise/colors.min.css +++ b/wp-admin/css/colors/sunrise/colors.min.css @@ -1 +1 @@ -html{background:#f1f1f1}a{color:#0074a2}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,a:active,a:focus,a:hover,div.dashboard-widget-submit input:hover{color:#0099d5}input[type=checkbox]:checked:before{color:#dd823b}input[type=radio]:checked:before{background:#dd823b}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0099d5}.wp-core-ui .button-primary{background:#dd823b;border-color:#c36822;color:#fff;-webkit-box-shadow:inset 0 1px 0 #e8ab7c,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #e8ab7c,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#d97326;border-color:#ad5c1e;color:#fff;-webkit-box-shadow:inset 0 1px 0 #e59d66,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #e59d66,0 1px 0 rgba(0,0,0,.15)}.wp-core-ui .button-primary:active{background:#c36822;border-color:#ad5c1e;color:#fff;-webkit-box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5);box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5)}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#d1cbc7!important;background:#cc6c23!important;border-color:#ad5c1e!important;text-shadow:none!important}.wp-core-ui .wp-ui-primary{color:#fff;background-color:#cf4944}.wp-core-ui .wp-ui-text-primary{color:#cf4944}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#dd823b}.wp-core-ui .wp-ui-text-highlight{color:#dd823b}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#ccaf0b}.wp-core-ui .wp-ui-text-notification{color:#ccaf0b}.wp-core-ui .wp-ui-text-icon{color:#f3f1f1}#add-new-comment a:hover,.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover{color:#fff;background-color:#cf4944}.view-switch a.current:before{color:#cf4944}.view-switch a:hover:before{color:#ccaf0b}.post-com-count:hover:after{border-top-color:#cf4944}.post-com-count:hover span{color:#fff;background-color:#cf4944}strong .post-com-count:after{border-top-color:#ccaf0b}strong .post-com-count span{background-color:#ccaf0b}#adminmenu,#adminmenuback,#adminmenuwrap{background:#cf4944}#adminmenu a{color:#fff}#adminmenu div.wp-menu-image:before{color:#f3f1f1}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#dd823b}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#fff}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f1f1f1;border-bottom-color:#f1f1f1}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#be3631}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-right-color:#be3631}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu .wp-submenu-head,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#f0c8c6}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#f7e3d3}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#f7e3d3}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-right-color:#f1f1f1}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#dd823b}#adminmenu li.wp-has-current-submenu div.wp-menu-image:before{color:#fff}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#ccaf0b}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#fff;background:#be3631}#collapse-menu{color:#f3f1f1}#collapse-menu:hover{color:#fff}#collapse-button div:after{color:#f3f1f1}#collapse-menu:hover #collapse-button div:after{color:#fff}#wpadminbar{color:#fff;background:#cf4944}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#fff}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#f3f1f1}#wpadminbar .ab-top-menu>li.hover>.ab-item,#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar .ab-top-menu>li:hover>.ab-item,#wpadminbar .ab-top-menu>li>.ab-item:focus,#wpadminbar-nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus{color:#f7e3d3;background:#be3631}#wpadminbar>#wp-toolbar a:focus span.ab-label,#wpadminbar>#wp-toolbar li.hover span.ab-label,#wpadminbar>#wp-toolbar li:hover span.ab-label{color:#f7e3d3}#wpadminbar .menupop .ab-sub-wrapper{background:#be3631}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#cf6b67}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar-nojs .quicklinks .menupop:hover ul li a{color:#f0c8c6}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#f3f1f1}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:after,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:after,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#f7e3d3}#wpadminbar #adminbarsearch:before{color:#f3f1f1}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#fff;background:#d66460}#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder{color:#fff;opacity:.7}#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder{color:#fff;opacity:.7}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#d66460;background-color:#d66460}#wpadminbar #wp-admin-bar-user-info .display-name{color:#fff}#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#f7e3d3}#wpadminbar #wp-admin-bar-user-info .username{color:#f0c8c6}.wp-pointer .wp-pointer-content h3{background-color:#dd823b;border-color:#d97326}.wp-pointer .wp-pointer-content h3:before{color:#dd823b}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow{border-bottom-color:#dd823b}.media-item .bar,.media-progress-bar div{background-color:#dd823b}.details.attachment{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 5px #dd823b;box-shadow:0 0 0 1px #fff,0 0 0 5px #dd823b}.attachment.details .check{background-color:#dd823b;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #dd823b;box-shadow:0 0 0 1px #fff,0 0 0 2px #dd823b}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme:hover:after{background:#dd823b}.theme-browser .theme.add-new-theme:hover span:after{color:#dd823b}.theme-overlay .theme-header .close:hover,.theme-overlay .theme-header .left:hover,.theme-overlay .theme-header .right:hover{background:#dd823b}.theme-filter.current,.theme-section.current{border-bottom-color:#cf4944}body.more-filters-opened .more-filters,body.more-filters-opened .more-filters:before{color:#fff;background-color:#cf4944}.widgets-chooser li.widgets-chooser-selected,body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover,body.more-filters-opened .more-filters:hover:before{background-color:#dd823b;color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-theme-controls .widget-area-select .selected{background-color:#dd823b;color:#fff}.wp-slider .ui-slider-handle,.wp-slider .ui-slider-handle.focus,.wp-slider .ui-slider-handle.ui-state-hover{background:#dd823b;border-color:#c36822;-webkit-box-shadow:inset 0 1px 0 #e8ab7c,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #e8ab7c,0 1px 0 rgba(0,0,0,.15)}#sidemenu a.current{background:#f1f1f1;border-bottom-color:#f1f1f1}#plugin-information .action-button{background:#dd823b}div#wp-responsive-toggle a:before{color:#f3f1f1}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#dd823b}.star-rating .star{color:#dd823b}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#be3631} \ No newline at end of file +html{background:#f1f1f1}a{color:#0073aa}a:active,a:focus,a:hover{color:#0096dd}#media-upload a.del-link:hover,.subsubsub a.current:hover,.subsubsub a:hover,div.dashboard-widget-submit input:hover{color:#0096dd}input[type=checkbox]:checked:before{color:#dd823b}input[type=radio]:checked:before{background:#dd823b}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#0096dd}.wp-core-ui .button-primary{background:#dd823b;border-color:#c36922 #ad5d1e #ad5d1e;color:#fff;-webkit-box-shadow:0 1px 0 #ad5d1e;box-shadow:0 1px 0 #ad5d1e;text-shadow:0 -1px 1px #ad5d1e,1px 0 1px #ad5d1e,0 1px 1px #ad5d1e,-1px 0 1px #ad5d1e}.wp-core-ui .button-primary:focus,.wp-core-ui .button-primary:hover{background:#df8a48;border-color:#ad5d1e;color:#fff;-webkit-box-shadow:0 1px 0 #ad5d1e;box-shadow:0 1px 0 #ad5d1e}.wp-core-ui .button-primary:focus{-webkit-box-shadow:inset 0 1px 0 #c36922,0 0 2px 1px #33b3db;box-shadow:inset 0 1px 0 #c36922,0 0 2px 1px #33b3db}.wp-core-ui .button-primary:active{background:#c36922;border-color:#ad5d1e;-webkit-box-shadow:inset 0 2px 0 #ad5d1e;box-shadow:inset 0 2px 0 #ad5d1e}.wp-core-ui .button-primary.button-primary-disabled,.wp-core-ui .button-primary.disabled,.wp-core-ui .button-primary:disabled,.wp-core-ui .button-primary[disabled]{color:#d1cbc7!important;background:#cc6d23!important;border-color:#ad5d1e!important;text-shadow:none!important}.wp-core-ui .button-primary.button-hero{-webkit-box-shadow:0 2px 0 #ad5d1e!important;box-shadow:0 2px 0 #ad5d1e!important}.wp-core-ui .button-primary.button-hero:active{-webkit-box-shadow:inset 0 3px 0 #ad5d1e!important;box-shadow:inset 0 3px 0 #ad5d1e!important}.wp-core-ui .wp-ui-primary{color:#fff;background-color:#cf4944}.wp-core-ui .wp-ui-text-primary{color:#cf4944}.wp-core-ui .wp-ui-highlight{color:#fff;background-color:#dd823b}.wp-core-ui .wp-ui-text-highlight{color:#dd823b}.wp-core-ui .wp-ui-notification{color:#fff;background-color:#ccaf0b}.wp-core-ui .wp-ui-text-notification{color:#ccaf0b}.wp-core-ui .wp-ui-text-icon{color:#f3f1f1}.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover,.wrap .add-new-h2:hover,.wrap .page-title-action:hover{color:#fff;background-color:#cf4944}.view-switch a.current:before{color:#cf4944}.view-switch a:hover:before{color:#ccaf0b}#adminmenu,#adminmenuback,#adminmenuwrap{background:#cf4944}#adminmenu a{color:#fff}#adminmenu div.wp-menu-image:before{color:#f3f1f1}#adminmenu a:hover,#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{color:#fff;background-color:#dd823b}#adminmenu li.menu-top:hover div.wp-menu-image:before,#adminmenu li.opensub>a.menu-top div.wp-menu-image:before{color:#fff}.about-wrap h2 .nav-tab-active,.nav-tab-active,.nav-tab-active:hover{background-color:#f1f1f1;border-bottom-color:#f1f1f1}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{background:#be3631}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-right-color:#be3631}#adminmenu .wp-submenu .wp-submenu-head{color:#f1c8c7}#adminmenu .wp-has-current-submenu .wp-submenu a,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a,#adminmenu .wp-submenu a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a,.folded #adminmenu .wp-has-current-submenu .wp-submenu a{color:#f1c8c7}#adminmenu .wp-has-current-submenu .wp-submenu a:focus,#adminmenu .wp-has-current-submenu .wp-submenu a:hover,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu a:hover,#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu a:hover,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:focus,.folded #adminmenu .wp-has-current-submenu .wp-submenu a:hover{color:#f7e3d3}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current a,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:focus,#adminmenu .wp-has-current-submenu.opensub .wp-submenu li.current a:hover,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:focus,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a:hover{color:#f7e3d3}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{border-right-color:#f1f1f1}#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top{color:#fff;background:#dd823b}#adminmenu a.current:hover div.wp-menu-image:before,#adminmenu li a:focus div.wp-menu-image:before,#adminmenu li.opensub div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,#adminmenu li:hover div.wp-menu-image:before,.ie8 #adminmenu li.opensub div.wp-menu-image:before{color:#fff}#adminmenu .awaiting-mod,#adminmenu .update-plugins{color:#fff;background:#ccaf0b}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod,#adminmenu li.menu-top:hover>a .update-plugins,#adminmenu li:hover a .awaiting-mod{color:#fff;background:#be3631}#collapse-menu{color:#f3f1f1}#collapse-menu:hover{color:#fff}#collapse-button div:after{color:#f3f1f1}#collapse-menu:hover #collapse-button div:after{color:#fff}#wpadminbar{color:#fff;background:#cf4944}#wpadminbar .ab-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label,#wpadminbar>#wp-toolbar span.noticon{color:#fff}#wpadminbar .ab-icon,#wpadminbar .ab-icon:before,#wpadminbar .ab-item:after,#wpadminbar .ab-item:before{color:#f3f1f1}#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus,#wpadminbar.nojs .ab-top-menu>li.menupop:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li>.ab-item:focus{color:#f7e3d3;background:#be3631}#wpadminbar:not(.mobile)>#wp-toolbar a:focus span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li.hover span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li:hover span.ab-label{color:#f7e3d3}#wpadminbar:not(.mobile) li:hover #adminbarsearch:before,#wpadminbar:not(.mobile) li:hover .ab-icon:before,#wpadminbar:not(.mobile) li:hover .ab-item:after,#wpadminbar:not(.mobile) li:hover .ab-item:before{color:#fff}#wpadminbar .menupop .ab-sub-wrapper{background:#be3631}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu{background:#cf6b67}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar.nojs .quicklinks .menupop:hover ul li a{color:#f1c8c7}#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar .quicklinks li .blavatar{color:#f3f1f1}#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a,#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:focus strong,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop ul li a:hover strong,#wpadminbar .quicklinks .menupop.hover ul li a:focus,#wpadminbar .quicklinks .menupop.hover ul li a:hover,#wpadminbar li #adminbarsearch.adminbar-focused:before,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li.hover .ab-icon:before,#wpadminbar li.hover .ab-item:before,#wpadminbar li:hover #adminbarsearch:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#f7e3d3}#wpadminbar .menupop .menupop>.ab-item:hover:before,#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover>a .blavatar,#wpadminbar .quicklinks li a:focus .blavatar,#wpadminbar .quicklinks li a:hover .blavatar,#wpadminbar.mobile .quicklinks .ab-icon:before,#wpadminbar.mobile .quicklinks .ab-item:before{color:#f7e3d3}#wpadminbar.mobile .quicklinks .hover .ab-icon:before,#wpadminbar.mobile .quicklinks .hover .ab-item:before{color:#f3f1f1}#wpadminbar #adminbarsearch:before{color:#f3f1f1}#wpadminbar>#wp-toolbar>#wp-admin-bar-top-secondary>#wp-admin-bar-search #adminbarsearch input.adminbar-input:focus{color:#fff;background:#d66560}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{border-color:#d66560;background-color:#d66560}#wpadminbar #wp-admin-bar-user-info .display-name{color:#fff}#wpadminbar #wp-admin-bar-user-info a:hover .display-name{color:#f7e3d3}#wpadminbar #wp-admin-bar-user-info .username{color:#f1c8c7}.wp-pointer .wp-pointer-content h3{background-color:#dd823b;border-color:#d97426}.wp-pointer .wp-pointer-content h3:before{color:#dd823b}.wp-pointer.wp-pointer-top .wp-pointer-arrow,.wp-pointer.wp-pointer-top .wp-pointer-arrow-inner,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow,.wp-pointer.wp-pointer-undefined .wp-pointer-arrow-inner{border-bottom-color:#dd823b}.media-item .bar,.media-progress-bar div{background-color:#dd823b}.details.attachment{-webkit-box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #dd823b;box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 7px #dd823b}.attachment.details .check{background-color:#dd823b;-webkit-box-shadow:0 0 0 1px #fff,0 0 0 2px #dd823b;box-shadow:0 0 0 1px #fff,0 0 0 2px #dd823b}.media-selection .attachment.selection.details .thumbnail{-webkit-box-shadow:0 0 0 1px #fff,0 0 0 3px #dd823b;box-shadow:0 0 0 1px #fff,0 0 0 3px #dd823b}.theme-browser .theme.active .theme-name,.theme-browser .theme.add-new-theme a:focus:after,.theme-browser .theme.add-new-theme a:hover:after{background:#dd823b}.theme-browser .theme.add-new-theme a:focus span:after,.theme-browser .theme.add-new-theme a:hover span:after{color:#dd823b}.theme-filter.current,.theme-section.current{border-bottom-color:#cf4944}body.more-filters-opened .more-filters{color:#fff;background-color:#cf4944}#customize-theme-controls .widget-area-select .selected,.widgets-chooser li.widgets-chooser-selected{background-color:#dd823b;color:#fff}body.more-filters-opened .more-filters:before{color:#fff}body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:hover{background-color:#dd823b;color:#fff}body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover:before{color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{color:#fff}#customize-footer-actions .devices button:focus{border-bottom-color:#dd823b}div#wp-responsive-toggle a:before{color:#f3f1f1}.wp-responsive-open div#wp-responsive-toggle a{border-color:transparent;background:#dd823b}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#be3631}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before{color:#f3f1f1}.mce-container.mce-menu .mce-menu-item-normal.mce-active,.mce-container.mce-menu .mce-menu-item-preview.mce-active,.mce-container.mce-menu .mce-menu-item.mce-selected,.mce-container.mce-menu .mce-menu-item:focus,.mce-container.mce-menu .mce-menu-item:hover{background:#dd823b} \ No newline at end of file diff --git a/wp-admin/css/common-rtl.css b/wp-admin/css/common-rtl.css index 72c6776..1af5d65 100644 --- a/wp-admin/css/common-rtl.css +++ b/wp-admin/css/common-rtl.css @@ -9,16 +9,17 @@ #wpcontent { height: 100%; + padding-right: 20px; } #wpcontent, #wpfooter { - margin-right: 180px; + margin-right: 160px; } .folded #wpcontent, .folded #wpfooter { - margin-right: 56px; + margin-right: 36px; } #wpbody-content { @@ -113,6 +114,13 @@ clear: both; } +/* modern clearfix */ +.wp-clearfix:after { + content: ""; + display: table; + clear: both; +} + /* Hide visually but not from screen readers */ .screen-reader-text, .screen-reader-text span, @@ -125,6 +133,7 @@ overflow: hidden; clip: rect(0 0 0 0); border: 0; + word-wrap: normal !important; /* many screen reader and browser combinations announce broken words as they would appear visually */ } .screen-reader-shortcut { @@ -142,7 +151,7 @@ font-weight: 600; padding: 15px 23px 14px; background: #f1f1f1; - color: #21759b; + color: #0073aa; z-index: 100000; line-height: normal; -webkit-box-shadow: 0 0 2px 2px rgba(0,0,0,.6); @@ -176,7 +185,8 @@ p.popular-tags, .wp-editor-container, .popular-tags, .feature-filter, -.imgedit-group { +.imgedit-group, +.comment-ays { border: 1px solid #e5e5e5; -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04); box-shadow: 0 1px 1px rgba(0,0,0,0.04); @@ -189,7 +199,8 @@ p.popular-tags, .widgets-holder-wrap, .popular-tags, .feature-filter, -.imgedit-group { +.imgedit-group, +.comment-ays { background: #fff; } @@ -218,6 +229,16 @@ body.iframe { padding-top: 1px; } +body.modal-open { + overflow: hidden; +} + +body.mobile.modal-open #wpwrap { + overflow: hidden; + position: fixed; + height: 100%; +} + iframe, img { border: 0; @@ -231,7 +252,7 @@ td { } a { - color: #0074a2; + color: #0073aa; -webkit-transition-property: border, background, color; transition-property: border, background, color; -webkit-transition-duration: .05s; @@ -247,21 +268,29 @@ div { a:hover, a:active { - color: #2ea2cc; + color: #00a0d2; } -a:focus { +a:focus, +a:focus .media-icon img, +.wp-person a:focus .gravatar { color: #124964; + -webkit-box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); + box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); } -a:focus, -a:active { - outline: thin dotted; +.ie8 a:focus { + outline: #5b9dd9 solid 1px; } #adminmenu a:focus, -#adminmenu a:active, .screen-reader-text:focus { + -webkit-box-shadow: none; + box-shadow: none; outline: none; } @@ -274,7 +303,7 @@ blockquote:before, blockquote:after, q:before, q:after { - content: ''; + content: ""; content: none; } @@ -304,23 +333,24 @@ h6 { } h1 { + color: #23282d; font-size: 2em; margin: .67em 0; } -h2 { - color: #222; - font-size: 1.5em; - margin: .83em 0; - font-weight: 400; -} - +h2, h3 { - color: #222; + color: #23282d; font-size: 1.3em; margin: 1em 0; } +.update-core-php h2 { + margin-top: 2em; +} + +.update-php h2, +.update-messages h2, h4 { font-size: 1em; margin: 1.33em 0; @@ -374,16 +404,17 @@ ol.ol-decimal > li { margin: 0 0 0.5em; } -/* @noflip */ +/* rtl:ignore */ .ltr { direction: ltr; } -/* @noflip */ +/* rtl:ignore */ .code, code { font-family: Consolas, Monaco, monospace; direction: ltr; + unicode-bidi: embed; } kbd, @@ -412,7 +443,7 @@ code { .subsubsub a .count, .subsubsub a.current .count { - color: #999; + color: #555d66; /* #f1f1f1 background */ font-weight: normal; } @@ -449,11 +480,13 @@ code { padding: 8px 10px; } -.widefat thead th { +.widefat thead th, +.widefat thead td { border-bottom: 1px solid #e1e1e1; } -.widefat tfoot th { +.widefat tfoot th, +.widefat tfoot td { border-top: 1px solid #e1e1e1; border-bottom: none; } @@ -474,13 +507,18 @@ code { line-height: 1.5em; } -.widefat th { +.widefat th, +.widefat thead td, +.widefat tfoot td { text-align: right; line-height: 1.3em; font-size: 14px; } -.widefat th input { +.widefat th input, +.updates-table td input, +.widefat thead td input, +.widefat tfoot td input { margin: 0 8px 0 0; padding: 0; vertical-align: text-top; @@ -492,26 +530,21 @@ code { vertical-align: top; } -.widefat th input[type=checkbox] { - margin-top: -1px; -} - .widefat tbody th.check-column { padding: 9px 0 22px; } -.widefat.media .check-column { - padding-top: 8px; -} - -.widefat thead th.check-column, +.widefat thead td.check-column, .widefat tbody th.check-column, -.widefat tfoot th.check-column { +.updates-table tbody td.check-column, +.widefat tfoot td.check-column { padding: 11px 3px 0 0; } -.widefat thead th.check-column { - padding-top: 10px; +.widefat thead td.check-column, +.widefat tfoot td.check-column { + padding-top: 4px; + vertical-align: middle; } .update-php div.updated, @@ -539,85 +572,58 @@ code { margin: 10px 2px 0 20px; } -div.updated, -div.error { - padding: 0 0.6em; - margin: 5px 15px 2px; -} - -div.updated p, -div.error p { - margin: 0.5em 0; - padding: 2px; -} - -.wrap div.updated, -.wrap div.error, -.media-upload-form div.error { - margin: 5px 0 15px; -} - -div.updated { - border-right: 4px solid #7ad03a; - padding: 1px 12px; - background-color: #fff; - -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); - box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); -} - -div.error { - border-right: 4px solid #dd3d36; - background: #fff; - -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); - box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); - padding: 1px 12px; -} - -.attention { - color: #2ea2cc; -} - -.wrap h2, -.subtitle { - font-weight: normal; - margin: 0; -} - -.wrap h2 { +.wrap > h2:first-child, /* Back-compat for pre-4.4 */ +.wrap [class$="icon32"] + h2, /* Back-compat for pre-4.4 */ +.postbox .inside h2, /* Back-compat for pre-4.4 */ +.wrap h1 { font-size: 23px; font-weight: 400; + margin: 0; padding: 9px 0 4px 15px; line-height: 29px; } .subtitle { - color: #777; - font-size: 14px; + margin: 0; padding-right: 25px; + color: #555d66; + font-size: 14px; + font-weight: normal; } -.wrap .add-new-h2, -.wrap .add-new-h2:active { +.wrap .add-new-h2, /* deprecated */ +.wrap .add-new-h2:active, /* deprecated */ +.wrap .page-title-action, +.wrap .page-title-action:active { margin-right: 4px; padding: 4px 8px; position: relative; top: -3px; text-decoration: none; border: none; + border: 1px solid #ccc; -webkit-border-radius: 2px; border-radius: 2px; - background: #e0e0e0; + background: #f7f7f7; text-shadow: none; font-weight: 600; font-size: 13px; } -.wrap .add-new-h2:hover { - background: #2ea2cc; +.wrap .add-new-h2:hover, /* deprecated */ +.wrap .page-title-action:hover { + border-color: #008EC2; + background: #00a0d2; color: #fff; } -.wrap h2.long-header { +.wrap .page-title-action:focus { + border-color: #5b9dd9; + -webkit-box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 ); + box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 ); +} + +.wrap h1.long-header { padding-left: 0; } @@ -644,8 +650,9 @@ div#widgets-right .widget-top:hover, color: #000; } -.alternate, -.alt { +.striped > tbody > :nth-child(odd), +ul.striped > :nth-child(odd), +.alternate { background-color: #f9f9f9; } @@ -654,11 +661,6 @@ div#widgets-right .widget-top:hover, border-left-color: #99d; } -.media-upload-form label.form-help, -td.help { - color: #9a9a9a; -} - /* Helper classes for plugins to leverage the active WordPress color scheme */ .highlight { @@ -668,10 +670,10 @@ td.help { .wp-ui-primary { color: #fff; - background-color: #333; + background-color: #32373c; } .wp-ui-text-primary { - color: #333; + color: #32373c; } .wp-ui-highlight { @@ -691,7 +693,21 @@ td.help { } .wp-ui-text-icon { - color: #999; + color: #82878c; /* same as new icons */ +} + +/* For emoji replacement images */ +img.emoji { + display: inline !important; + border: none !important; + height: 1em !important; + width: 1em !important; + margin: 0 .07em !important; + vertical-align: -0.1em !important; + background: none !important; + padding: 0 !important; + -webkit-box-shadow: none !important; + box-shadow: none !important; } /*------------------------------------------------------------------------------ @@ -699,12 +715,9 @@ td.help { ------------------------------------------------------------------------------*/ .widget .widget-top, -.postbox h3, -.stuffbox h3, +.postbox .hndle, +.stuffbox .hndle, .control-section .accordion-section-title, -h3.dashboard-widget-title, -h3.dashboard-widget-title span, -h3.dashboard-widget-title small, .sidebar-name, #nav-menu-header, #nav-menu-footer, @@ -713,19 +726,20 @@ h3.dashboard-widget-title small, .side-info, #your-profile #rich_editing, .widefat thead th, -.widefat tfoot th { +.widefat thead td, +.widefat tfoot th, +.widefat tfoot td { line-height: 1.4em; } .widget .widget-top, .menu-item-handle { background: #fafafa; - color: #222; + color: #23282d; } -.postbox h3, -#namediv h3, -#submitdiv h3 { +.postbox .hndle, +.stuffbox .hndle { border-bottom: 1px solid #eee; } @@ -741,23 +755,34 @@ h3.dashboard-widget-title small, } /* @todo can we combine these into a class or use an existing dashicon one? */ -#welcome-panel.welcome-panel .welcome-panel-close::before, +.welcome-panel .welcome-panel-close:before, .tagchecklist span a:before, -#bulk-titles div a:before { +#bulk-titles div a:before, +.notice-dismiss:before { background: none; - color: #bbb; - content: '\f153'; - display: block !important; - font: normal 16px/1 'dashicons'; + color: #b4b9be; + content: "\f153"; + display: block; + font: normal 16px/20px dashicons; speak: none; height: 20px; - margin: 2px 0; text-align: center; width: 20px; - -webkit-font-smoothing: antialiased !important; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.welcome-panel .welcome-panel-close:before { + margin: 0; +} + +.tagchecklist span a:before, +#bulk-titles div a:before { + margin: 1px 0; } -#welcome-panel.welcome-panel .welcome-panel-close:hover:before, +.welcome-panel .welcome-panel-close:hover:before, +.welcome-panel .welcome-panel-close:focus:before, .tagchecklist span a:hover:before, #bulk-titles div a:hover:before { color: #c00; @@ -812,6 +837,7 @@ hr { } abbr.required, +span.required, .file-error, .widget-control-remove:hover, .row-actions .delete a:hover, @@ -865,6 +891,10 @@ abbr.required, padding: 6px 10px 8px; } +.misc-pub-filename { + word-wrap: break-word; +} + #minor-publishing-actions { padding: 10px 10px 0 10px; text-align: left; @@ -882,26 +912,6 @@ abbr.required, margin-right: 18px; } -.side-info { - margin: 0; - padding: 4px; - font-size: 11px; -} - -.side-info h5 { - padding-bottom: 7px; - font-size: 14px; - margin: 12px 2px 5px; - border-bottom: 1px solid #dadada; -} - -.side-info ul { - margin: 0; - padding-right: 18px; - list-style: square; - color: #666; -} - .approve, .unapproved .unapprove { display: none; @@ -918,161 +928,630 @@ th.action-links { text-align: left; } +/* Filter bar */ +.wp-filter { + display: inline-block; + position: relative; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + margin: 12px 0 25px; + padding: 0 10px; + width: 100%; + -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04); + box-shadow: 0 1px 1px rgba(0,0,0,0.04); + border: 1px solid #e5e5e5; + background: #fff; + color: #555; + font-size: 13px; +} -/*------------------------------------------------------------------------------ - 4.0 - Notifications -------------------------------------------------------------------------------*/ +.wp-filter a { + text-decoration: none; +} -#update-nag, -.update-nag { +.filter-count { display: inline-block; - line-height: 19px; - padding: 11px 15px; + vertical-align: middle; + min-width: 4em; +} + +.title-count, +.filter-count .count { + display: inline-block; + position: relative; + top: -1px; + padding: 4px 10px; + -webkit-border-radius: 30px; + border-radius: 30px; + background: #72777c; + color: #fff; font-size: 14px; - text-align: right; - margin: 25px 2px 0 20px; - background-color: #fff; - border-right: 4px solid #ffba00; - -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); - box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); + font-weight: 600; } -.update-message { - color: #000; +/* not a part of filter bar, but derived from it, so here for now */ +.title-count { + display: inline; + top: -3px; + margin-right: 5px; + margin-left: 20px; } -ul#dismissed-updates { - display: none; +.filter-items { + float: right; } -form.upgrade { - margin-top: 8px; +.filter-links { + display: inline-block; + margin: 0; } -form.upgrade .hint { - font-style: italic; - font-size: 85%; - margin: -0.5em 0 2em 0; +.filter-links li { + display: inline-block; + margin: 0; } -.update-php .spinner { - float: none; - margin: -4px 0; +.filter-links li > a { + display: inline-block; + margin: 0 10px; + padding: 15px 0; + border-bottom: 4px solid #fff; + color: #666; + cursor: pointer; } -#ajax-loading, -.ajax-loading, -.ajax-feedback, -.imgedit-wait-spin, -.list-ajax-loading { /* deprecated */ - visibility: hidden; +.filter-links .current { + -webkit-box-shadow: none; + box-shadow: none; + border-bottom: 4px solid #666; + color: #23282d; } -#ajax-response.alignleft { - margin-right: 2em; +.filter-links li > a:hover, +.filter-links li > a:focus, +.show-filters .filter-links a.current:hover, +.show-filters .filter-links a.current:focus { + color: #00a0d2; } -/* @todo: this does not need its own section anymore */ -/*------------------------------------------------------------------------------ - 6.0 - Admin Header -------------------------------------------------------------------------------*/ -#adminmenu a, -#sidemenu a, -#taglist a, -#catlist a { - text-decoration: none; +.wp-filter .search-form { + float: left; + margin: 10px 0; } -/*------------------------------------------------------------------------------ - 6.1 - Screen Options Tabs -------------------------------------------------------------------------------*/ +.wp-filter .search-form input[type="search"] { + margin: 0; + padding: 3px 5px; + width: 280px; + max-width: 100%; + font-size: 16px; + font-weight: 300; + line-height: 1.5; +} -#screen-options-wrap, -#contextual-help-wrap { +.wp-filter .search-form select { margin: 0; - padding: 8px 20px 12px; - position: relative; + height: 32px; + vertical-align: top; } -#contextual-help-wrap { - overflow: auto; - margin-right: 0 !important; +.wp-filter .search-form.search-plugins { + display: inline-block; } -#screen-meta .screen-reader-text { - visibility: hidden; +.wp-filter .drawer-toggle { + display: inline-block; + margin: 0 10px; + padding: 4px 6px; + color: #666; + cursor: pointer; } -#screen-meta-links { - margin: 0 0 0 20px; +.wp-filter .drawer-toggle:before { + display: inline-block; + vertical-align: top; + content: "\f111"; + margin: 0 0 0 5px; + width: 16px; + height: 16px; + color: #72777c; + -webkit-transition: color .1s ease-in 0; + transition: color .1s ease-in 0; + font-family: dashicons; + font-size: 16px; + line-height: 1; + text-align: center; + text-decoration: inherit; + font-weight: normal; + font-style: normal; + -webkit-font-smoothing: antialiased; } -#screen-meta-links a { - padding: 3px 16px 3px 6px; +.wp-filter .drawer-toggle:hover, +.wp-filter .drawer-toggle:hover:before { + color: #00a0d2; } -#screen-meta-links a:focus { - outline: none; +.wp-filter .drawer-toggle.current:before { + color: #fff; } -/* screen options and help tabs revert */ -#screen-meta { +.wp-filter .favorites-form { display: none; - margin: 0 0px -1px 20px; - position: relative; - background-color: #fff; - border: 1px solid #ddd; - border-top: none; - -webkit-box-shadow: 0 1px 0 rgba(0,0,0,.025); - box-shadow: 0 1px 0 rgba(0,0,0,.025); + margin: 0 -20px; + padding: 20px; + border-top: 1px solid #eee; + background: #fafafa; + overflow: hidden; + width: 100%; } -#screen-options-link-wrap, -#contextual-help-link-wrap { - float: left; - height: 28px; - margin: 0 6px 0 0; - border: 1px solid #ddd; - border-top: none; - background: #fff; - -webkit-box-shadow: 0 1px 1px -1px rgba(0,0,0,0.1); - box-shadow: 0 1px 1px -1px rgba(0,0,0,0.1); +.show-favorites-form .wp-filter .favorites-form { + display: block; } -#screen-meta-links .screen-meta-toggle { - position: relative; - top: 0; -} +.filter-drawer { + display: none; + margin: 0 -20px; + padding: 20px; + border-top: 1px solid #eee; + background: #fafafa; +} + +.show-filters .filter-drawer { + display: block; + overflow: hidden; + width: 100%; +} -#screen-meta-links a { - color: #777; +.show-filters .wp-filter .drawer-toggle:hover, +.show-filters .wp-filter .drawer-toggle:focus { + background: rgb(46, 162, 204); } -#screen-meta-links a:hover, -#screen-meta-links a:active, -#screen-meta-links a:focus { - color: #333; +.show-filters .filter-links a.current { + border-bottom: none; +} + +.show-filters .wp-filter .drawer-toggle { + -webkit-border-radius: 2px; + border-radius: 2px; + border: none; + background: #72777c; + color: #fff; } -#screen-meta-links a:focus { - border-color: #aaa; - -webkit-box-shadow: 0 2px 3px rgba(0,0,0,0.15); - box-shadow: 0 2px 3px rgba(0,0,0,0.15); +.show-filters .wp-filter .drawer-toggle:before { + color: #fff; } -#screen-meta-links a.show-settings { +.filter-group { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + position: relative; + float: right; + margin: 0 0 0 1%; + padding: 20px 10px 10px; + width: 24%; + background: #fff; + border: 1px solid #e5e5e5; + -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04); + box-shadow: 0 1px 1px rgba(0,0,0,0.04); +} + +.filter-group legend { + position: absolute; + top: 10px; display: block; - font-size: 13px; - height: 22px; - line-height: 22px; + margin: 0; + padding: 0; + font-size: 1em; + font-weight: 600; +} + +.filter-drawer .filter-group-feature { + margin: 28px 0 0; + list-style-type: none; + font-size: 12px; +} + +.filter-drawer .filter-group-feature input, +.filter-drawer .filter-group-feature label { + display: inline-block; + margin: 7px 0 7px 4px; + line-height: 16px; +} + +.filter-drawer .buttons { + margin-bottom: 20px; +} + +.filter-drawer .buttons .button span { + display: inline-block; + opacity: 0.8; + font-size: 12px; + text-indent: 10px; +} + +.wp-filter .button.clear-filters { + display: none; + margin-right: 10px; +} + +.filtered-by { + display: none; + margin: 0; +} + +.filtered-by > span { + font-weight: 600; +} + +.filtered-by a { + margin-right: 10px; +} + +.filtered-by .tags { + display: inline; +} + +.filtered-by .tag { + margin: 0 5px; + padding: 4px 8px; + border: 1px solid #e5e5e5; + -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04); + box-shadow: 0 1px 1px rgba(0,0,0,0.04); + background: #fff; + font-size: 11px; +} + +.filters-applied .filter-group, +.filters-applied .filter-drawer .buttons, +.filters-applied .filter-drawer br { + display: none !important; +} + +.filters-applied .filtered-by { + display: block; +} + +.filters-applied .filter-drawer { + padding: 20px; +} + +.show-filters .content-filterable, +.show-filters.filters-applied.loading-content .content-filterable, +.loading-content .content-filterable, +.error .content-filterable { + display: none; +} + +.show-filters.filters-applied .content-filterable { + display: block; +} + +.loading-content .spinner { + display: block; + margin: 40px auto 0; + float: none; +} + +@media only screen and (max-width: 1120px) { + .filter-drawer { + border-bottom: 1px solid #eee; + } + + .filter-group { + margin-bottom: 0; + margin-top: 5px; + width: 100%; + } + + .filter-group li { + margin: 10px 0; + } +} + +@media only screen and (max-width: 1000px) { + .filter-items { + float: none; + } + + .wp-filter .media-toolbar-primary, + .wp-filter .media-toolbar-secondary, + .wp-filter .search-form { + float: none; /* Remove float from media-views.css */ + position: relative; + max-width: 100%; + } +} + +@media only screen and (max-width: 782px) { + .filter-group li { + padding: 0; + width: 50%; + } +} + +@media only screen and (max-width: 320px) { + .filter-count { + display: none; + } + + .wp-filter .drawer-toggle { + margin: 10px 0; + } + + .filter-group li, + .wp-filter .search-form input[type="search"] { + width: 100%; + } +} + +/*------------------------------------------------------------------------------ + 4.0 - Notifications +------------------------------------------------------------------------------*/ + +.notice, +div.updated, +div.error { + background: #fff; + border-right: 4px solid #fff; + -webkit-box-shadow: 0 1px 1px 0 rgba( 0, 0, 0, 0.1 ); + box-shadow: 0 1px 1px 0 rgba( 0, 0, 0, 0.1 ); + margin: 5px 15px 2px; + padding: 1px 12px; +} + +.notice p, +.notice-title, +div.updated p, +div.error p, +.form-table td .notice p { + margin: 0.5em 0; + padding: 2px; +} + +.error a { + text-decoration: underline; +} + +.updated a { + padding-bottom: 2px; +} + +.notice-alt { + -webkit-box-shadow: none; + box-shadow: none; +} + +.notice-large { + padding: 10px 20px; +} + +.notice-title { + display: inline-block; + color: #23282d; + font-size: 18px; +} + +.wp-core-ui .notice.is-dismissible { + padding-left: 38px; + position: relative; +} + +.notice-dismiss { + position: absolute; + top: 0; + left: 1px; + border: none; + margin: 0; + padding: 9px; + background: none; + color: #b4b9be; + cursor: pointer; +} + +.notice-dismiss:hover:before, +.notice-dismiss:active:before, +.notice-dismiss:focus:before { + color: #c00; +} + +.notice-dismiss:focus { + outline: none; + -webkit-box-shadow: 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, .8); + box-shadow: 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, .8); +} + +.ie8 .notice-dismiss:focus { + outline: 1px solid #5b9dd9; +} + +.notice-success, +div.updated { + border-right-color: #46b450; +} + +.notice-success.notice-alt { + background-color: #ecf7ed; +} + +.notice-warning { + border-right-color: #ffb900; +} + +.notice-warning.notice-alt { + background-color: #fff8e5; +} + +.notice-error, +div.error { + border-right-color: #dc3232; +} + +.notice-error.notice-alt { + background-color: #fbeaea; +} + +.notice-info { + border-right-color: #00a0d2; +} + +.notice-info.notice-alt { + background-color: #e5f5fa; +} + +.wrap .notice, +.wrap div.updated, +.wrap div.error, +.media-upload-form .notice, +.media-upload-form div.error { + margin: 5px 0 15px; +} + +#update-nag, +.update-nag { + display: inline-block; + line-height: 19px; + padding: 11px 15px; + font-size: 14px; + text-align: right; + margin: 25px 2px 0 20px; + background-color: #fff; + border-right: 4px solid #ffba00; + -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); + box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); +} + +.update-message { + color: #000; +} + +ul#dismissed-updates { + display: none; +} + +form.upgrade { + margin-top: 8px; +} + +form.upgrade .hint { + font-style: italic; + font-size: 85%; + margin: -0.5em 0 2em 0; +} + +.update-php .spinner { + float: none; + margin: -4px 0; +} + +#ajax-loading, +.ajax-loading, +.ajax-feedback, +.imgedit-wait-spin, +.list-ajax-loading { /* deprecated */ + visibility: hidden; +} + +#ajax-response.alignleft { + margin-right: 2em; +} + +/* @todo: this does not need its own section anymore */ +/*------------------------------------------------------------------------------ + 6.0 - Admin Header +------------------------------------------------------------------------------*/ +#adminmenu a, +#taglist a, +#catlist a { text-decoration: none; - z-index: 1; } -#screen-meta-links a:after { +/*------------------------------------------------------------------------------ + 6.1 - Screen Options Tabs +------------------------------------------------------------------------------*/ + +#screen-options-wrap, +#contextual-help-wrap { + margin: 0; + padding: 8px 20px 12px; + position: relative; +} + +#contextual-help-wrap { + overflow: auto; + margin-right: 0 !important; +} + +#screen-meta .screen-reader-text { + visibility: hidden; +} + +#screen-meta-links { + margin: 0 0 0 20px; +} + +/* screen options and help tabs revert */ +#screen-meta { + display: none; + margin: 0 0px -1px 20px; + position: relative; + background-color: #fff; + border: 1px solid #ddd; + border-top: none; + -webkit-box-shadow: 0 1px 0 rgba(0,0,0,.025); + box-shadow: 0 1px 0 rgba(0,0,0,.025); +} + +#screen-options-link-wrap, +#contextual-help-link-wrap { + float: left; + height: 28px; + margin: 0 6px 0 0; + border: 1px solid #ddd; + border-top: none; + background: #fff; + -webkit-box-shadow: 0 1px 1px -1px rgba(0,0,0,0.1); + box-shadow: 0 1px 1px -1px rgba(0,0,0,0.1); +} + +#screen-meta-links .screen-meta-toggle { + position: relative; + top: 0; +} + +#screen-meta-links .show-settings { + border: 0; + background: none; + -webkit-border-radius: 0; + border-radius: 0; + color: #72777c; + line-height: 1.7; + padding: 3px 16px 3px 6px; +} + +#screen-meta-links .show-settings:hover, +#screen-meta-links .show-settings:active, +#screen-meta-links .show-settings:focus { + color: #32373c; +} + +#screen-meta-links .show-settings:active { + -webkit-box-shadow: none; + box-shadow: none; + -webkit-transform: none; + -ms-transform: none; + transform: none; +} + +#screen-meta-links .show-settings:after { left: 0; - content: '\f140'; - font: normal 20px/1 'dashicons'; + content: "\f140"; + font: normal 20px/1 dashicons; speak: none; display: inline-block; padding: 0 0 0 5px; @@ -1082,21 +1561,18 @@ form.upgrade .hint { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; text-decoration: none !important; - color: #bbb; + color: #72777c; } -#screen-meta-links a.screen-meta-active:after { - content: '\f142'; +#screen-meta-links .screen-meta-active:after { + content: "\f142"; } -#screen-meta-links a.show-settings:hover { - text-decoration: none; -} /* end screen options and help tabs */ .toggle-arrow { background-repeat: no-repeat; - background-position: top right; + background-position: top left; background-color: transparent; height: 22px; line-height: 22px; @@ -1104,13 +1580,20 @@ form.upgrade .hint { } .toggle-arrow-active { - background-position: bottom right; + background-position: bottom left; } -#screen-options-wrap h5, +#screen-options-wrap h5, /* Back-compat for old plugins */ +#screen-options-wrap legend, #contextual-help-wrap h5 { - margin: 8px 0; - font-size: 13px; + margin: 0; + padding: 8px 0; + font-size: 13px; + font-weight: 600; +} + +.ie8 #screen-options-wrap legend { + color: inherit; } .metabox-prefs label { @@ -1119,23 +1602,55 @@ form.upgrade .hint { line-height: 30px; } -.metabox-prefs label input[type=checkbox] { - margin-top: -4px; +#number-of-columns { + display: inline-block; + vertical-align: middle; + line-height: 30px; +} + +.metabox-prefs input[type=checkbox] { + margin-top: 0; margin-left: 6px; } -.metabox-prefs label input { - margin: 0 2px 0 5px; +.metabox-prefs label input, +.metabox-prefs label input[type=checkbox] { + margin: -4px 0 0 5px; } .metabox-prefs .columns-prefs label input { - margin: 0 2px; + margin: -1px 0 0 2px; } .metabox-prefs label a { display: none; } +.metabox-prefs .screen-options input, +.metabox-prefs .screen-options label { + margin-top: 0; + margin-bottom: 0; + vertical-align: middle; +} + +.metabox-prefs .screen-options .screen-per-page { + margin-left: 15px; +} + +.metabox-prefs .screen-options label { + line-height: 28px; + padding-left: 0; +} + +.screen-options + .screen-options { + margin-top: 10px; +} + +.metabox-prefs .submit { + margin-top: 1em; + padding: 0; +} + /*------------------------------------------------------------------------------ 6.2 - Help Menu ------------------------------------------------------------------------------*/ @@ -1196,13 +1711,13 @@ form.upgrade .hint { } .contextual-help-tabs a:hover { - color: #333; + color: #32373c; } .contextual-help-tabs .active { padding: 0; margin: 0 0 0 -1px; - border-right: 2px solid #2ea2cc; + border-right: 2px solid #00a0d2; background: #f6fbfd; -webkit-box-shadow: 0 2px 0 rgba(0,0,0,0.02), 0 1px 0 rgba(0,0,0,0.02); box-shadow: 0 2px 0 rgba(0,0,0,0.02), 0 1px 0 rgba(0,0,0,0.02); @@ -1210,7 +1725,7 @@ form.upgrade .hint { .contextual-help-tabs .active a { border-color: #e1e1e1; - color: #333; + color: #32373c; } .contextual-help-tabs-wrap { @@ -1251,28 +1766,22 @@ html.wp-toolbar { box-sizing: border-box; } -.narrow { - width: 70%; - margin-bottom: 40px; -} - -.narrow p { - line-height: 150%; -} - .widefat th, .widefat td { - overflow: hidden; color: #555; } -.widefat th { +.widefat th, +.widefat thead td, +.widefat tfoot td { font-weight: normal; } .widefat thead tr th, -.widefat tfoot tr th { - color: #333; +.widefat thead tr td, +.widefat tfoot tr th, +.widefat tfoot tr td { + color: #32373c; } .widefat td p { @@ -1282,7 +1791,7 @@ html.wp-toolbar { .widefat p, .widefat ol, .widefat ul { - color: #333; + color: #32373c; } .widefat .column-comment p { @@ -1305,8 +1814,25 @@ html.wp-toolbar { } .metabox-holder .postbox-container .empty-container { - border: 3px dashed #bbb; + border: 3px dashed #b4b9be; height: 250px; + position: relative; +} + +.metabox-holder .postbox-container .empty-container:after { + content: attr(data-emptystring); + margin: auto; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + height: 1em; + width: 200px; + text-align: center; + color: #ccc; + font-size:18px; + display: none; } .metabox-holder.columns-1 .postbox-container .empty-container, @@ -1343,6 +1869,7 @@ html.wp-toolbar { } } +.js .widget .widget-top, .js .postbox .hndle { cursor: move; } @@ -1353,17 +1880,19 @@ html.wp-toolbar { } .postbox .handlediv { + display: none; float: left; - width: 27px; - height: 30px; + width: 36px; + height: 36px; + padding: 0; } .js .postbox .handlediv { - cursor: pointer; + display: block; } .sortable-placeholder { - border: 1px dashed #bbb; + border: 1px dashed #b4b9be; margin-bottom: 20px; } @@ -1374,20 +1903,15 @@ html.wp-toolbar { line-height: 1; } -.postbox h3, -.stuffbox h3 { - margin-top: 1px; +/* user-select is not a part of the CSS standard - may change behavior in the future */ +.postbox .hndle, +.stuffbox .hndle { -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; } -.js .widget .widget-top, -.js .postbox h3 { - cursor: move; -} - .postbox .inside, .stuffbox .inside { padding: 0 12px 12px; @@ -1425,7 +1949,7 @@ html.wp-toolbar { } .columns-prefs label { - padding: 0 5px; + padding: 0 0 0 10px; } /* @todo: what is this doing here */ @@ -1454,9 +1978,8 @@ html.wp-toolbar { bottom: 0; right: 0; left: 0; - padding: 10px 0; - margin-left: 20px; - color: #777; + padding: 10px 20px; + color: #555d66; } #wpfooter p { @@ -1482,48 +2005,76 @@ html.wp-toolbar { ------------------------------------------------------------------------------*/ .nav-tab { + float: right; border: 1px solid #ccc; border-bottom: none; - background: #e4e4e4; + margin-right: 0.5em; /* half the font size so set the font size properly */ + padding: 5px 10px; + font-size: 14px; + line-height: 24px; + font-weight: 600; + background: #e5e5e5; color: #555; + text-decoration: none; + white-space: nowrap; +} + +h3 .nav-tab, /* Back-compat for pre-4.4 */ +.nav-tab-small .nav-tab { + padding: 5px 14px; font-size: 12px; line-height: 16px; - display: inline-block; - padding: 4px 14px 6px; - text-decoration: none; - margin: -4px 0 -1px 4px; } -.nav-tab:hover { +.nav-tab:hover, +.nav-tab:focus { background-color: #fff; - color: #464646; + color: #444; +} + +.nav-tab-active, +.nav-tab:focus:active { + -webkit-box-shadow: none; + box-shadow: none; } .nav-tab-active { - color: #464646; + margin-bottom: -1px; + color: #444; } .nav-tab-active, -.nav-tab-active:hover { +.nav-tab-active:hover, +.nav-tab-active:focus, +.nav-tab-active:focus:active { border-bottom: 1px solid #f1f1f1; background: #f1f1f1; color: #000; } -h2.nav-tab-wrapper, +h1.nav-tab-wrapper, /* Back-compat for pre-4.4 */ +.wrap h2.nav-tab-wrapper, /* higher specificity to override .wrap > h2:first-child */ h3.nav-tab-wrapper { border-bottom: 1px solid #ccc; + margin: 0; + padding-top: 9px; padding-bottom: 0; - padding-right: 10px; + line-height: inherit; } -h2 .nav-tab { - padding: 6px 10px; - font-weight: bold; - font-size: 15px; - line-height: 24px; -} +/* Back-compat for plugins. Deprecated. Use .wp-clearfix instead. */ +.nav-tab-wrapper:not(.wp-clearfix):after { + content: ""; + display: table; + clear: both; + } +.ie8 .nav-tab-wrapper { + /* contain floats establishing a new block formatting context */ + display: inline-block; + width: 100%; + vertical-align: top; +} /*------------------------------------------------------------------------------ 26.0 - Misc @@ -1533,78 +2084,43 @@ h2 .nav-tab { background: url(../images/spinner.gif) no-repeat; -webkit-background-size: 20px 20px; background-size: 20px 20px; - display: none; + display: inline-block; + visibility: hidden; float: left; + vertical-align: middle; opacity: 0.7; filter: alpha(opacity=70); width: 20px; height: 20px; - margin: 2px 5px 0; + margin: 4px 10px 0; +} + +.spinner.is-active { + visibility: visible; } #template div { margin-left: 190px; } -.metabox-holder h3 { +.metabox-holder .stuffbox > h3, /* Back-compat for pre-4.4 */ +.metabox-holder .postbox > h3, /* Back-compat for pre-4.4 */ +.metabox-holder h3.hndle, /* Back-compat for pre-4.4 */ +.metabox-holder h2.hndle { font-size: 14px; padding: 8px 12px; margin: 0; line-height: 1.4; } -#templateside ul li a { - text-decoration: none; -} - -#sidemenu { - margin: -30px 315px 0 15px; - list-style: none; - position: relative; - float: left; - padding-right: 10px; - font-size: 12px; -} - -#sidemenu a { - padding: 0 7px; - display: block; - float: right; - line-height: 28px; - border-top: 1px solid #f9f9f9; - border-bottom: 1px solid #dfdfdf; - background-color: #f9f9f9; - -webkit-transition: none; - transition: none; -} - -#sidemenu li { - display: inline; - line-height: 200%; - list-style: none; - text-align: center; - white-space: nowrap; - margin: 0; - padding: 0; -} - -/* @todo: remove border radius */ -#sidemenu a.current { - font-weight: normal; - padding-right: 6px; - padding-left: 6px; - -webkit-border-top-right-radius: 3px; - border-top-right-radius: 3px; - -webkit-border-top-left-radius: 3px; - border-top-left-radius: 3px; - border: 1px solid #dfdfdf; - border-bottom-color: #f1f1f1; - background-color: #f1f1f1; - color: #000; +/* Back-compat for nav-menus screen */ +.nav-menus-php .metabox-holder h3 { + padding: 10px 14px 11px 10px; + line-height: 21px; } -#sidemenu li a .count-0 { - display: none; +#templateside ul li a { + text-decoration: none; } .plugin-install #description, @@ -1618,6 +2134,7 @@ table .column-rating { text-align: right; } +.attention, .error-message { color: red; font-weight: 600; @@ -1639,16 +2156,14 @@ body.iframe { /* - Only used once or twice in all of WP - deprecate for global style ------------------------------------------------------------------------------*/ -td.media-icon { +.media-icon { + width: 62px; /* icon + border */ text-align: center; - width: 80px; - padding-top: 8px; - padding-bottom: 8px; } -td.media-icon img { - max-width: 80px; - max-height: 60px; +.media-icon img { + border: 1px solid #e5e5e5; + border: 1px solid rgba(0, 0, 0, 0.07); } #howto { @@ -1666,11 +2181,21 @@ td.media-icon img { width: auto; } -#post-body #post-body-content #namediv h3 { +#post-body #post-body-content #namediv h3, /* Back-compat for pre-4.4 */ +#post-body #post-body-content #namediv h2 { margin-top: 0; } -#namediv h3 label { +.edit-comment-author { + font-size: 14px; + line-height: 1.4; + font-weight: 600; + color: #222; + margin: 2px 9px 0 0; +} + +#namediv h3 label, /* Back-compat for pre-4.4 */ +#namediv h2 label { vertical-align: baseline; } @@ -1739,11 +2264,11 @@ div.star-holder { position: relative; height: 17px; width: 100px; - background: url(../images/stars.png?ver=20121108) repeat-x bottom right; + background: url(../images/stars.png?ver=20121108) repeat-x bottom left; } div.star-holder .star-rating { - background: url(../images/stars.png?ver=20121108) repeat-x top right; + background: url(../images/stars.png?ver=20121108) repeat-x top left; height: 17px; float: right; } @@ -1759,7 +2284,7 @@ div.star-holder .star-rating { -webkit-font-smoothing: antialiased; font-size: 20px; line-height: 1; - font-family: 'dashicons'; + font-family: dashicons; text-decoration: inherit; font-weight: normal; font-style: normal; @@ -1767,15 +2292,15 @@ div.star-holder .star-rating { -webkit-transition: color .1s ease-in 0; transition: color .1s ease-in 0; text-align: center; - color: #0074a2; + color: #ffb900; } .star-rating .star-full:before { - content:'\f155'; + content: "\f155"; } .star-rating .star-half:before { - content:'\f459'; + content: "\f459"; } .rtl .star-rating .star-half { @@ -1785,7 +2310,7 @@ div.star-holder .star-rating { } .star-rating .star-empty:before { - content:'\f154'; + content: "\f154"; } div.action-links { @@ -1795,21 +2320,29 @@ div.action-links { /* Plugin install thickbox */ #plugin-information { - background: #fcfcfc; + background: #fff; position: fixed; top: 0; left: 0; bottom: 0; right: 0; - height: auto; + height: 100%; padding: 0; } +#plugin-information-scrollable { + overflow: auto; + -webkit-overflow-scrolling: touch; + height: 100%; +} + #plugin-information-title { - padding: 0 20px 0 76px; + padding: 0 20px; + background: #f5f5f5; font-size: 22px; font-weight: 600; line-height: 56px; + position: relative; top: 0; left: 0; right: 0; @@ -1819,20 +2352,72 @@ div.action-links { white-space: nowrap; } +#plugin-information-title.with-banner { + margin-left: 0; + height: 250px; + bottom: 250px; + -webkit-background-size: cover; + background-size: cover; +} + +#plugin-information-title h2 { + font-size: 1em; + font-weight: bold; + padding: 0; + margin: 0; + max-width: 680px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +#plugin-information-title.with-banner h2 { + font-family: "Helvetica Neue", sans-serif; + display: inline-block; + font-size: 30px; + line-height: 50px; + padding: 0 15px; + margin: 174px 10px 0 0; + color: #fff; + background: rgba( 30, 30, 30, 0.9 ); + text-shadow: 0 1px 3px rgba( 0, 0, 0, 0.4 ); + -webkit-box-shadow: 0 0 30px rgba( 255, 255, 255, 0.1 ); + box-shadow: 0 0 30px rgba( 255, 255, 255, 0.1 ); + -webkit-border-radius: 8px; + border-radius: 8px; +} + +#plugin-information-title div.vignette { + display: none; +} + +#plugin-information-title.with-banner div.vignette { + display: block; + float: left; + top: 0; + height: 250px; + width: 772px; + margin: 0 -20px; + background: transparent; + -webkit-box-shadow: inset 0 0 50px 4px rgba( 0, 0, 0, 0.2 ), inset 0 -1px 0 rgba( 0, 0, 0, 0.1 ); + box-shadow: inset 0 0 50px 4px rgba( 0, 0, 0, 0.2 ), inset 0 -1px 0 rgba( 0, 0, 0, 0.1 ); +} + #plugin-information-tabs { padding: 0 16px; - position: absolute; - top: 56px; + position: relative; left: 0; right: 0; height: 36px; z-index: 1; + border-bottom: 1px solid #ddd; + background: #f3f3f3; } #plugin-information-tabs a { position: relative; float: right; - padding: 8px 10px 9px; + padding: 9px 10px; margin: 0; height: 18px; line-height: 18px; @@ -1843,11 +2428,17 @@ div.action-links { } #plugin-information-tabs a.current { - margin: -1px -1px 0; + margin: 0 -1px 0; background: #fff; border: 1px solid #ddd; - border-bottom: none; - color: #333; + border-bottom-color: #fff; + padding-top: 8px; + color: #32373c; +} + +#plugin-information-tabs.with-banner a.current { + border-top: none; + padding-top: 9px; } #plugin-information-tabs a:active, @@ -1856,25 +2447,34 @@ div.action-links { } #plugin-information-content { + overflow: hidden; /* equal height column trick */ background: #fff; - border-top: 1px solid #ddd; - border-bottom: 1px solid #ddd; - position: absolute; - top: 90px; + position: relative; + top: 0; left: 0; - bottom: 58px; right: 0; + min-height: 100%; + /* Height of title + tabs + install now */ + min-height: -webkit-calc( 100% - 152px ); + min-height: calc( 100% - 152px ); +} + +#plugin-information-content.with-banner { + /* Height of banner + tabs + install now */ + min-height: -webkit-calc( 100% - 346px ); + min-height: calc( 100% - 346px ); } #section-holder { - margin: 0; - padding: 10px 26px; - position: absolute; + position: relative; top: 0; left: 250px; bottom: 0; right: 0; - overflow: auto; + margin-left: 250px; /* FYI box */ + padding: 10px 26px; + margin-bottom: -99939px; /* 60px less than the padding below to accommodate footer */ + padding-bottom: 99999px; /* equal height column trick */ } #section-holder .updated { @@ -1882,20 +2482,21 @@ div.action-links { } #plugin-information .fyi { - background: #f3f3f3; - border-right: 1px solid #ddd; - color: #666; - padding: 16px; - position: absolute; + float: left; + position: relative; top: 0; left: 0; - bottom: 0; + padding: 16px; + margin-bottom: -99939px; /* 60px less than the padding below to accommodate footer */ + padding-bottom: 99999px; /* equal height column trick */ width: 217px; - overflow: auto; + border-right: 1px solid #ddd; + background: #f3f3f3; + color: #666; } #plugin-information .fyi strong { - color: #464646; + color: #444; } #plugin-information .fyi h3 { @@ -1922,19 +2523,79 @@ div.action-links { margin: 0 0 10px; } +#plugin-information .fyi-description { + margin-top: 0; +} + +#plugin-information .counter-container { + margin: 3px 0; +} + +#plugin-information .counter-label { + float: right; + margin-left: 5px; + min-width: 55px; +} + +#plugin-information .counter-back { + height: 17px; + width: 92px; + background-color: #e5e5e5; + float: right; +} + +#plugin-information .counter-bar { + height: 17px; + background-color: #ffc733; /* slightly lighter than stars due to larger expanse */ + float: right; +} + +#plugin-information .counter-count { + margin-right: 5px; +} + +#plugin-information .fyi ul.contributors { + margin-top: 10px; +} + +#plugin-information .fyi ul.contributors li { + display: inline-block; + margin-left: 8px; + vertical-align: middle; +} + +#plugin-information .fyi ul.contributors li { + display: inline-block; + margin-left: 8px; + vertical-align: middle; +} + +#plugin-information .fyi ul.contributors li img { + vertical-align: middle; + margin-left: 4px; +} + #plugin-information-footer { - padding: 15px 16px; + padding: 13px 16px; position: absolute; left: 0; bottom: 0; right: 0; - height: 28px; + height: 33px; /* 33+13+13+1=60 */ + border-top: 1px solid #ddd; + background: #f3f3f3; } +/* rtl:ignore */ +#plugin-information .section { + direction: ltr; +} + +/* rtl:ignore */ #plugin-information .section ul, #plugin-information .section ol { list-style-type: disc; - margin-right: 24px; + margin-left: 24px; } #plugin-information .section, @@ -1958,9 +2619,10 @@ div.action-links { box-shadow: 0 1px 2px rgba( 0, 0, 0, 0.3 ); } +/* rtl:ignore */ #plugin-information #section-screenshots li p { font-style: italic; - padding-right: 20px; + padding-left: 20px; } #plugin-information pre { @@ -1969,25 +2631,101 @@ div.action-links { border: 1px solid #ccc; } +/* rtl:ignore */ +#plugin-information .review { + overflow: hidden; /* clearfix */ + width: 100%; + margin-bottom: 20px; + border-bottom: 1px solid #e5e5e5; +} + +#plugin-information .review-title-section { + overflow: hidden; /* clearfix */ +} + +/* rtl:ignore */ +#plugin-information .review-title-section h4 { + display: inline-block; + float: left; + margin: 0 6px 0 0; +} + +#plugin-information .reviewer-info p { + clear: both; + margin: 0; + padding-top: 2px; +} + +/* rtl:ignore */ +#plugin-information .reviewer-info .avatar { + float: left; + margin: 4px 6px 0 0; +} + +/* rtl:ignore */ +#plugin-information .reviewer-info .star-rating { + float: left; +} + +/* rtl:ignore */ +#plugin-information .review-meta { + float: left; + margin-left: 0.75em; +} + +/* rtl:ignore */ +#plugin-information .review-body { + float: left; + width: 100%; +} + .plugin-version-author-uri { font-size: 13px; } -@media screen and ( max-width: 782px ) { - #plugin-information-content { - overflow: auto; - bottom: 58px; +@media screen and ( max-width: 771px ) { + #plugin-information-title.with-banner { + height: 100px; + bottom: 100px; + } + + #plugin-information-title.with-banner h2 { + margin-top: 30px; + font-size: 20px; + line-height: 40px; + max-width: 85%; + } + + #plugin-information-title.with-banner div.vignette { + height: 100px; + bottom: 100px; + width: 800%; + } + + #plugin-information-tabs { + overflow: hidden; /* clearfix */ + padding: 0; + height: auto; /* let tabs wrap */ + } + + #plugin-information-tabs a.current { + margin-bottom: 0; + border-bottom: none; } #plugin-information .fyi { + float: none; border: 1px solid #ddd; position: static; width: auto; - margin: 26px 26px 16px; + margin: 26px 26px 0; + padding-bottom: 0; /* reset from the two column height fix */ } #section-holder { position: static; + margin: 0; + padding-bottom: 70px; /* reset from the two column height fix, plus accomodate footer */ } #plugin-information .fyi h3, @@ -2002,30 +2740,63 @@ div.action-links { } /* Thickbox for Plugin Install screen */ +body.about-php #TB_window, body.plugin-install-php #TB_window, body.import-php #TB_window, body.plugins-php #TB_window, body.update-core-php #TB_window, body.index-php #TB_window { - background: #fcfcfc url( ../images/spinner.gif ) no-repeat center; + background: #fcfcfc; +} + +/* IE 8 needs a change in the pseudo element content */ +.ie8 body.about-php #TB_window:before, +.ie8 body.plugin-install-php #TB_window:before, +.ie8 body.import-php #TB_window:before, +.ie8 body.plugins-php #TB_window:before, +.ie8 body.update-core-php #TB_window:before, +.ie8 body.index-php #TB_window:before { + content: " "; + background: none; +} + +body.about-php #TB_window.thickbox-loading:before, +body.plugin-install-php #TB_window.thickbox-loading:before, +body.import-php #TB_window.thickbox-loading:before, +body.plugins-php #TB_window.thickbox-loading:before, +body.update-core-php #TB_window.thickbox-loading:before, +body.index-php #TB_window.thickbox-loading:before { + content: ""; + display: block; + width: 20px; + height: 20px; + position: absolute; + right: 50%; + top: 50%; + z-index: -1; + margin: -10px -10px 0 0; + background: #fcfcfc url(../images/spinner.gif) no-repeat center; + -webkit-background-size: 20px 20px; + background-size: 20px 20px; + -webkit-transform: translateZ(0); + transform: translateZ(0); } @media print, - (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 120dpi) { - body.plugin-install-php #TB_window, - body.import-php #TB_window, - body.plugins-php #TB_window, - body.update-core-php #TB_window, - body.index-php #TB_window { - background: #fcfcfc url( ../images/spinner-2x.gif ) no-repeat center; - -webkit-background-size: 20px 20px; - background-size: 20px 20px; + body.about-php #TB_window.thickbox-loading:before, + body.plugin-install-php #TB_window.thickbox-loading:before, + body.import-php #TB_window.thickbox-loading:before, + body.plugins-php #TB_window.thickbox-loading:before, + body.update-core-php #TB_window.thickbox-loading:before, + body.index-php #TB_window.thickbox-loading:before { + background-image: url(../images/spinner-2x.gif); } } +body.about-php #TB_title, body.plugin-install-php #TB_title, body.import-php #TB_title, body.plugins-php #TB_title, @@ -2035,6 +2806,7 @@ body.index-php #TB_title { height: 1px; } +body.about-php #TB_ajaxWindowTitle, body.plugin-install-php #TB_ajaxWindowTitle, body.import-php #TB_ajaxWindowTitle, body.plugins-php #TB_ajaxWindowTitle, @@ -2043,22 +2815,70 @@ body.index-php #TB_ajaxWindowTitle { display: none; } +/* only on these screens */ +.about-php #TB_closeWindowButton, +.plugin-install-php #TB_closeWindowButton, +.import-php #TB_closeWindowButton, +.plugins-php #TB_closeWindowButton, +.update-core-php #TB_closeWindowButton, +.index-php #TB_closeWindowButton { + right: auto; + left: -30px; + color: #eee; +} + + +body.about-php #TB_closeWindowButton:hover, +body.about-php #TB_closeWindowButton:focus, +body.plugin-install-php #TB_closeWindowButton:hover, +body.plugin-install-php #TB_closeWindowButton:focus, +body.import-php #TB_closeWindowButton:hover, +body.import-php #TB_closeWindowButton:focus, +body.plugins-php #TB_closeWindowButton:hover, +body.plugins-php #TB_closeWindowButton:focus, +body.update-core-php #TB_closeWindowButton:hover, +body.update-core-php #TB_closeWindowButton:focus, +body.index-php #TB_closeWindowButton:hover, +body.index-php #TB_closeWindowButton:focus { + color: #00a0d2; + outline: none; + -webkit-box-shadow: none; + box-shadow: none; +} + +body.about-php .tb-close-icon, body.plugin-install-php .tb-close-icon, body.import-php .tb-close-icon, body.plugins-php .tb-close-icon, body.update-core-php .tb-close-icon, body.index-php .tb-close-icon { - line-height: 48px; - width: 48px; - height: 48px; + display: none; +} + +body.about-php #TB_closeWindowButton:after, +body.plugin-install-php #TB_closeWindowButton:after, +body.import-php #TB_closeWindowButton:after, +body.plugins-php #TB_closeWindowButton:after, +body.update-core-php #TB_closeWindowButton:after, +body.index-php #TB_closeWindowButton:after { + content: "\f335"; + font: normal 32px/29px 'dashicons'; + speak: none; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } -body.plugin-install-php .tb-close-icon:before, -body.import-php .tb-close-icon:before, -body.plugins-php .tb-close-icon:before, -body.update-core-php .tb-close-icon:before, -body.index-php .tb-close-icon:before { - line-height: 48px; +/* move plugin install close icon to top on narrow screens */ +@media screen and ( max-width: 830px ) { + body.about-php #TB_closeWindowButton, + body.plugin-install-php #TB_closeWindowButton, + body.import-php #TB_closeWindowButton, + body.plugins-php #TB_closeWindowButton, + body.update-core-php #TB_closeWindowButton, + body.index-php #TB_closeWindowButton { + left: 0; + top: -30px; + } } /* @todo: move this. */ @@ -2066,36 +2886,28 @@ img { border: none; } -/* Header */ -/* @todo: are these also specific to Press This? */ -#wphead { - border-bottom: 1px solid #dfdfdf; -} - -#wphead h1 a { - color: #464646; -} - -/* @todo: these seem misplaced */ -.js .meta-box-sortables .postbox:hover .handlediv { - margin-left: 0 !important; -} - /* Metabox collapse arrow indicators */ .js .sidebar-name .sidebar-name-arrow:before, -.js .meta-box-sortables .postbox .handlediv:before { - left: 12px; - font: normal 20px/1 'dashicons'; - speak: none; +.js .meta-box-sortables .postbox .toggle-indicator:before { + content: "\f142"; display: inline-block; - padding: 8px 10px; - top: 0; - position: relative; + font: normal 20px/1 dashicons; + speak: none; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; text-decoration: none !important; } +.js .widgets-holder-wrap.closed .sidebar-name-arrow:before, +.js .meta-box-sortables .postbox.closed .handlediv .toggle-indicator:before { + content: "\f140"; +} + +.js .sidebar-name .sidebar-name-arrow:before { + padding: 10px; + right: 0; +} + .js #widgets-left .sidebar-name .sidebar-name-arrow { display: none; } @@ -2105,24 +2917,31 @@ img { display: block; } -/* Show the arrow only on hover */ -.js .sidebar-name .sidebar-name-arrow:before, -.js .meta-box-sortables .postbox .handlediv:before { - content: '\f142'; +.js .postbox .handlediv .toggle-indicator:before { + margin-top: 4px; + width: 20px; + -webkit-border-radius: 50%; + border-radius: 50%; + text-indent: -1px; /* account for the dashicon alignment */ } -.js .widgets-holder-wrap.closed .sidebar-name-arrow:before, -.js .meta-box-sortables .postbox.closed .handlediv:before { - content: '\f140'; +.rtl.js .postbox .handlediv .toggle-indicator:before { + text-indent: 1px; /* account for the dashicon alignment */ } -.error a { - text-decoration: underline; +.js .postbox .handlediv:focus { + -webkit-box-shadow: none; + box-shadow: none; + outline: none; } -.updated a { - text-decoration: none; - padding-bottom: 2px; +.js .postbox .handlediv:focus .toggle-indicator:before { + -webkit-box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); + box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); } /* @todo: appears to be Press This only and overridden */ @@ -2131,7 +2950,7 @@ img { } /* Theme/Plugin Editor */ -.alignleft h3 { +.alignleft h2 { margin: 0; } @@ -2143,7 +2962,7 @@ img { outline: none; } -/* @noflip */ +/* rtl:ignore */ #template textarea, #docs-list { direction: ltr; @@ -2159,7 +2978,7 @@ img { word-wrap: break-word; } -#templateside h3, +#templateside h2, #postcustomstuff p.submit { margin: 0; } @@ -2178,7 +2997,7 @@ img { margin: 4px 0; } -#templateside a, +#templateside li a, .theme-editor-php .highlight { display: block; padding: 3px 12px 3px 3px; @@ -2222,10 +3041,10 @@ img { .control-section .accordion-section-title:after, .accordion-section-title:after { left: 0; - content: '\f140'; + content: "\f140"; border: none; background: none; - font: normal 20px/1 'dashicons'; + font: normal 20px/1 dashicons; speak: none; display: block; padding: 0; @@ -2237,28 +3056,43 @@ img { text-decoration: none !important; } -.widget-action, .handlediv, .item-edit, .sidebar-name-arrow, .accordion-section-title:after { - color: #aaa; + color: #72777c; +} + +.widget-action { + color: #555d66; /* #fafafa background in the Widgets screen */ } -.widget-action:hover, +.widget-top:hover .widget-action, +.widget-action:focus, .handlediv:hover, +.handlediv:focus, .item-edit:hover, +.item-edit:focus, .sidebar-name:hover .sidebar-name-arrow, .accordion-section-title:hover:after { - color: #777; + color: #23282d; } .widget-top a.widget-action:after { - padding: 12px 12px 0; + padding: 1px 0px 1px 2px; + margin-top: 10px; + margin-left: 10px; + -webkit-border-radius: 50%; + border-radius: 50%; } -.nav-menus-php .item-edit:before { - line-height: 2.1; +.widget-top a.widget-action:focus:after { + -webkit-box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30,140,190,.8); + box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30,140,190,.8); } .control-section .accordion-section-title:after, @@ -2270,35 +3104,28 @@ img { .control-section.open .accordion-section-title:after, #customize-info.open .accordion-section-title:after, -.nav-menus-php .menu-item-edit-active .item-edit:before { - content: '\f142'; -} - -/* Enable draggable on IE10 touch events until it's rolled into jQuery UI core */ -.ui-sortable, -.ui-draggable { - -ms-touch-action: none; - touch-action: none; -} - -.meta-box-sortables.ui-sortable, -.widgets-holder-wrap .ui-draggable, -.widgets-holder-wrap .ui-sortable, -.menu.ui-sortable { - -ms-touch-action: auto; - touch-action: auto; -} - -.meta-box-sortables.ui-sortable .hndle, -.menu.ui-sortable .menu-item-handle { +.nav-menus-php .menu-item-edit-active .item-edit:before, +.widget.open .widget-top a.widget-action:after { + content: "\f142"; +} + +/*! + * jQuery UI Draggable/Sortable 1.11.4 + * http://jqueryui.com + * + * Copyright jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license + */ +.ui-draggable-handle, +.ui-sortable-handle { -ms-touch-action: none; - touch-action: none; + touch-action: none; } /* Accordion */ - .accordion-section { - border-bottom: 1px solid #dfdfdf; + border-bottom: 1px solid #ddd; margin: 0; } @@ -2308,7 +3135,7 @@ img { } .accordion-section.open:hover { - border-bottom-color: #dfdfdf; + border-bottom-color: #ddd; } .accordion-section-content { @@ -2322,8 +3149,8 @@ img { margin: 0; padding: 12px 15px 15px; position: relative; - border-right: 1px solid #dfdfdf; - border-left: 1px solid #dfdfdf; + border-right: 1px solid #ddd; + border-left: 1px solid #ddd; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; @@ -2347,7 +3174,7 @@ img { .accordion-section-title:hover:after, .accordion-section-title:focus:after { - border-color: #aaa transparent; + border-color: #a0a5aa transparent; } .cannot-expand .accordion-section-title { @@ -2374,13 +3201,161 @@ img { .js .control-section .accordion-section-title:hover, .js .control-section.open .accordion-section-title, .js .control-section .accordion-section-title:focus { - color: #222; + color: #23282d; background: #f5f5f5; } .control-section.open .accordion-section-title { /* When expanded */ - border-bottom: 1px solid #dfdfdf; + border-bottom: 1px solid #ddd; +} + +/* Edit Site */ +.network-admin .edit-site-actions { + margin-top: 0; +} + +/* My Sites */ +.my-sites { + display: block; + overflow: auto; + zoom: 1; +} + +.my-sites li { + display: block; + padding: 8px 3%; + min-height: 130px; + margin: 0; +} + +@media only screen and (max-width: 599px) { + .my-sites li { + min-height: 0; + } +} + +@media only screen and (min-width: 600px) { + .my-sites.striped li { + background-color: #fff; + position: relative; + } + .my-sites.striped li:after { + content: ""; + width: 1px; + height: 100%; + position: absolute; + top: 0; + left: 0; + background: #ccc; + } + +} +@media only screen and (min-width: 600px) and (max-width: 699px) { + .my-sites li{ + float: right; + width: 44%; + } + .my-sites.striped li { + background-color: #fff; + } + .my-sites.striped li:nth-of-type(2n+1) { + clear: right; + } + .my-sites.striped li:nth-of-type(2n+2):after { + content: none; + } + .my-sites li:nth-of-type(4n+1), + .my-sites li:nth-of-type(4n+2) { + background-color: #f9f9f9; + } + +} + +@media only screen and (min-width: 700px) and (max-width: 1199px) { + .my-sites li { + float: right; + width: 27.333333%; + background-color: #fff; + } + .my-sites.striped li:nth-of-type(3n+3):after { + content: none; + } + .my-sites li:nth-of-type(6n+1), + .my-sites li:nth-of-type(6n+2), + .my-sites li:nth-of-type(6n+3) { + background-color: #f9f9f9; + } +} + +@media only screen and (min-width: 1200px) and (max-width: 1399px) { + .my-sites li { + float: right; + width: 21%; + padding: 8px 2%; + background-color: #fff; + } + .my-sites.striped li:nth-of-type(4n+1) { + clear: right; + } + .my-sites.striped li:nth-of-type(4n+4):after { + content: none; + } + .my-sites li:nth-of-type(8n+1), + .my-sites li:nth-of-type(8n+2), + .my-sites li:nth-of-type(8n+3), + .my-sites li:nth-of-type(8n+4) { + background-color: #f9f9f9; + } +} + +@media only screen and (min-width: 1400px) and (max-width: 1599px) { + .my-sites li { + float: right; + width: 16%; + padding: 8px 2%; + background-color: #fff; + } + .my-sites.striped li:nth-of-type(5n+1) { + clear: right; + } + .my-sites.striped li:nth-of-type(5n+5):after { + content: none; + } + .my-sites li:nth-of-type(10n+1), + .my-sites li:nth-of-type(10n+2), + .my-sites li:nth-of-type(10n+3), + .my-sites li:nth-of-type(10n+4), + .my-sites li:nth-of-type(10n+5) { + background-color: #f9f9f9; + } +} + +@media only screen and (min-width: 1600px) { + .my-sites li { + float: right; + width: 12.666666%; + padding: 8px 2%; + background-color: #fff; + } + .my-sites.striped li:nth-of-type(6n+1) { + clear: right; + } + .my-sites.striped li:nth-of-type(6n+6):after { + content: none; + } + .my-sites li:nth-of-type(12n+1), + .my-sites li:nth-of-type(12n+2), + .my-sites li:nth-of-type(12n+3), + .my-sites li:nth-of-type(12n+4), + .my-sites li:nth-of-type(12n+5), + .my-sites li:nth-of-type(12n+6) { + background-color: #f9f9f9; + } +} + +.my-sites li a { + text-decoration: none; } /* =Media Queries @@ -2437,13 +3412,12 @@ img { * HiDPI Displays */ @media print, - (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 120dpi) { /* Back-compat for pre-3.8 */ div.star-holder, div.star-holder .star-rating { - background: url(../images/stars-2x.png?ver=20121108) repeat-x bottom right; + background: url(../images/stars-2x.png?ver=20121108) repeat-x bottom left; -webkit-background-size: 21px 37px; background-size: 21px 37px; } @@ -2487,10 +3461,6 @@ img { -webkit-tap-highlight-color: rgba(0, 0, 0, 0) !important; } - #wpwrap { - background: #f0f0f0; - } - #wpcontent { position: relative; margin-right: 0; @@ -2518,9 +3488,13 @@ img { display: none !important; } - .wrap .add-new-h2, .wrap .add-new-h2:active { + .wrap .add-new-h2, /* deprecated */ + .wrap .add-new-h2:active, /* deprecated */ + .wrap .page-title-action, + .wrap .page-title-action:active { padding: 10px 15px; font-size: 14px; + white-space: nowrap; } .wp-color-result { @@ -2535,13 +3509,24 @@ img { } /* Feedback Messages */ - .wrap div.updated, .wrap div.error, .media-upload-form div.error { + .notice, + .wrap div.updated, + .wrap div.error, + .media-upload-form div.error { margin: 20px 0 10px 0; padding: 5px 10px; font-size: 14px; line-height: 175%; } + .wp-core-ui .notice.is-dismissible { + padding-left: 46px; + } + + .notice-dismiss { + padding: 13px; + } + .wrap .icon32 + h2 { margin-top: -2px; } @@ -2550,12 +3535,19 @@ img { left: -190px; } + code { + word-wrap: break-word; + } + /* General Metabox */ .postbox { font-size: 14px; } - .metabox-holder h3 { + .metabox-holder h3.hndle, /* Back-compat for pre-4.4 */ + .metabox-holder .stuffbox > h3, /* Back-compat for pre-4.4 */ + .metabox-holder .postbox > h3, /* Back-compat for pre-4.4 */ + .metabox-holder h2 { padding: 12px; } @@ -2612,6 +3604,15 @@ img { #comments-form .checkforspam { display: none; } + + .edit-comment-author { + margin: 2px 0 0; + } + + .filter-drawer .filter-group-feature input, + .filter-drawer .filter-group-feature label { + line-height: 25px; + } } /* Smartphone */ @@ -2634,4 +3635,26 @@ img { div#post-body.metabox-holder.columns-1 { overflow-x: hidden; } + + h1.nav-tab-wrapper, + .wrap h2.nav-tab-wrapper, + h3.nav-tab-wrapper { + border-bottom: 0; + } + + h1 .nav-tab, + h2 .nav-tab, + h3 .nav-tab { + margin: 10px 0 0 10px; + border-bottom: 1px solid #ccc; + } +} + +@media screen and (max-width: 320px) { + /* Prevent default center alignment and larger font for the Right Now widget when + the network dashboard is viewed on a small mobile device. */ + #network_dashboard_right_now .subsubsub { + font-size: 14px; + text-align: right; + } } diff --git a/wp-admin/css/common-rtl.min.css b/wp-admin/css/common-rtl.min.css new file mode 100644 index 0000000..5157b6a --- /dev/null +++ b/wp-admin/css/common-rtl.min.css @@ -0,0 +1,8 @@ +#docs-list,#plugin-information .section,#template textarea,.code,.ltr,code{direction:ltr}#wpwrap{height:auto;min-height:100%;width:100%;position:relative;-webkit-font-smoothing:subpixel-antialiased}#wpcontent{height:100%;padding-right:20px}#wpcontent,#wpfooter{margin-right:160px}.folded #wpcontent,.folded #wpfooter{margin-right:36px}#wpbody-content{padding-bottom:65px;float:right;width:100%;overflow:visible!important}.inner-sidebar{float:left;clear:left;display:none;width:281px;position:relative}.columns-2 .inner-sidebar{margin-left:auto;width:286px;display:block}.columns-2 .inner-sidebar #side-sortables,.inner-sidebar #side-sortables{min-height:300px;width:280px;padding:0}.has-right-sidebar .inner-sidebar{display:block}.has-right-sidebar #post-body{float:right;clear:right;width:100%;margin-left:-2000px}.has-right-sidebar #post-body-content{margin-left:300px;float:none;width:auto}#col-container,#col-left,#col-right{overflow:hidden;padding:0;margin:0}#col-left{width:35%}#col-right{float:left;clear:left;width:65%}.col-wrap{padding:0 7px}.alignleft{float:right}.alignright{float:left}#publishing-action .spinner,#save-post,.subsubsub{float:right}.textleft{text-align:right}.textright{text-align:left}.clear{clear:both}.wp-clearfix:after{content:"";display:table;clear:both}.screen-reader-text,.screen-reader-text span,.ui-helper-hidden-accessible{position:absolute;margin:-1px;padding:0;height:1px;width:1px;overflow:hidden;clip:rect(0 0 0 0);border:0;word-wrap:normal!important}#templateside,.misc-pub-filename,.pre,.widefat *{word-wrap:break-word}.screen-reader-shortcut{position:absolute;top:-1000em}.screen-reader-shortcut:focus{right:6px;top:-25px;height:auto;width:auto;display:block;font-size:14px;font-weight:600;padding:15px 23px 14px;background:#f1f1f1;color:#0073aa;z-index:100000;line-height:normal;-webkit-box-shadow:0 0 2px 2px rgba(0,0,0,.6);box-shadow:0 0 2px 2px rgba(0,0,0,.6);text-decoration:none;outline:0}.hidden,.js .closed .inside,.js .hide-if-js,.js .wp-core-ui .hide-if-js,.js.wp-core-ui .hide-if-js,.no-js .hide-if-no-js,.no-js .wp-core-ui .hide-if-no-js,.no-js.wp-core-ui .hide-if-no-js{display:none}#menu-management .menu-edit,#menu-settings-column .accordion-container,.comment-ays,.feature-filter,.imgedit-group,.manage-menus,.menu-item-handle,.popular-tags,.stuffbox,.widget-inside,.widget-top,.widgets-holder-wrap,.wp-editor-container,p.popular-tags,table.widefat{border:1px solid #e5e5e5;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04)}.comment-ays,.feature-filter,.imgedit-group,.popular-tags,.stuffbox,.widgets-holder-wrap,.wp-editor-container,p.popular-tags,table.widefat{background:#fff}body,html{height:100%;margin:0;padding:0}html{background:#f1f1f1}body{color:#444;font-family:"Open Sans",sans-serif;font-size:13px;line-height:1.4em;min-width:600px}body.iframe{min-width:0;padding-top:1px}body.modal-open{overflow:hidden}body.mobile.modal-open #wpwrap{overflow:hidden;position:fixed;height:100%}iframe,img{border:0}td{font-family:inherit;font-size:inherit;font-weight:inherit;line-height:inherit}a{color:#0073aa;-webkit-transition-property:border,background,color;transition-property:border,background,color;-webkit-transition-duration:.05s;transition-duration:.05s;-webkit-transition-timing-function:ease-in-out;transition-timing-function:ease-in-out}a,div{outline:0}a:active,a:hover{color:#00a0d2}.wp-person a:focus .gravatar,a:focus,a:focus .media-icon img{color:#124964;-webkit-box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}h1,h2,h3{color:#23282d}.ie8 a:focus{outline:#5b9dd9 solid 1px}#adminmenu a:focus,.screen-reader-text:focus{-webkit-box-shadow:none;box-shadow:none;outline:0}blockquote,q{quotes:none}blockquote:after,blockquote:before,q:after,q:before{content:"";content:none}p{font-size:13px;line-height:1.5;margin:1em 0}blockquote{margin:1em}dd,li{margin-bottom:6px}h1,h2,h3,h4,h5,h6{display:block;font-weight:600}h1{font-size:2em;margin:.67em 0}h2,h3{font-size:1.3em;margin:1em 0}.update-core-php h2{margin-top:2em}.update-messages h2,.update-php h2,h4{font-size:1em;margin:1.33em 0}h5{font-size:.83em;margin:1.67em 0}h6{font-size:.67em;margin:2.33em 0}ol,ul{padding:0}ul{list-style:none}ol{list-style-type:decimal;margin-right:2em}ul.ul-disc{list-style:disc}ul.ul-square{list-style:square}ol.ol-decimal{list-style:decimal}ol.ol-decimal,ul.ul-disc,ul.ul-square{margin-right:1.8em}ol.ol-decimal>li,ul.ul-disc>li,ul.ul-square>li{margin:0 0 .5em}.code,code{font-family:Consolas,Monaco,monospace;unicode-bidi:embed}code,kbd{padding:3px 5px 2px;margin:0 1px;background:#eaeaea;background:rgba(0,0,0,.07);font-size:13px}.subsubsub{list-style:none;margin:8px 0 0;padding:0;font-size:13px;color:#666}.subsubsub a{line-height:2;padding:.2em;text-decoration:none}.subsubsub a .count,.subsubsub a.current .count{color:#555d66;font-weight:400}.subsubsub a.current{font-weight:600;border:none}.subsubsub li{display:inline-block;margin:0;padding:0;white-space:nowrap}.widefat{border-spacing:0;width:100%;clear:both;margin:0}.widefat a{text-decoration:none}.widefat td,.widefat th{padding:8px 10px}.widefat thead td,.widefat thead th{border-bottom:1px solid #e1e1e1}.widefat tfoot td,.widefat tfoot th{border-top:1px solid #e1e1e1;border-bottom:none}.widefat .no-items td{border-bottom-width:0}.widefat td{vertical-align:top}.widefat td,.widefat td ol,.widefat td p,.widefat td ul{font-size:13px;line-height:1.5em}.widefat tfoot td,.widefat th,.widefat thead td{text-align:right;line-height:1.3em;font-size:14px}.updates-table td input,.widefat tfoot td input,.widefat th input,.widefat thead td input{margin:0 8px 0 0;padding:0;vertical-align:text-top}.widefat .check-column{width:2.2em;padding:6px 0 25px;vertical-align:top}.updates-table tbody td.check-column,.widefat tbody th.check-column,.widefat tfoot td.check-column,.widefat thead td.check-column{padding:11px 3px 0 0}.widefat tfoot td.check-column,.widefat thead td.check-column{padding-top:4px;vertical-align:middle}.update-php div.error,.update-php div.updated{margin-right:0}.no-js .widefat tfoot .check-column input,.no-js .widefat thead .check-column input{display:none}.column-comments,.column-links,.column-posts,.widefat .num{text-align:center}.widefat th#comments{vertical-align:middle}.wrap{margin:10px 2px 0 20px}.postbox .inside h2,.wrap [class$=icon32]+h2,.wrap h1,.wrap>h2:first-child{font-size:23px;font-weight:400;margin:0;padding:9px 0 4px 15px;line-height:29px}.subtitle{margin:0;padding-right:25px;color:#555d66;font-size:14px;font-weight:400}.wrap .add-new-h2,.wrap .add-new-h2:active,.wrap .page-title-action,.wrap .page-title-action:active{margin-right:4px;padding:4px 8px;position:relative;top:-3px;text-decoration:none;border:none;border:1px solid #ccc;-webkit-border-radius:2px;border-radius:2px;background:#f7f7f7;text-shadow:none;font-weight:600;font-size:13px}.wrap .add-new-h2:hover,.wrap .page-title-action:hover{border-color:#008EC2;background:#00a0d2;color:#fff}.ac_match,.highlight,.subsubsub a.current{color:#000}.wrap .page-title-action:focus{border-color:#5b9dd9;-webkit-box-shadow:0 0 2px rgba(30,140,190,.8);box-shadow:0 0 2px rgba(30,140,190,.8)}.wrap h1.long-header{padding-left:0}.wp-dialog{background-color:#fff}#available-widgets .widget-top:hover,#widgets-left .widget-in-question .widget-top,#widgets-left .widget-top:hover,.widgets-chooser ul,div#widgets-right .widget-top:hover{border-color:#999;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.1);box-shadow:0 1px 2px rgba(0,0,0,.1)}.sorthelper{background-color:#ccf3fa}.alternate,.striped>tbody>:nth-child(odd),ul.striped>:nth-child(odd){background-color:#f9f9f9}.bar{background-color:#e8e8e8;border-left-color:#99d}.highlight{background-color:#e4f2fd}.wp-ui-primary{color:#fff;background-color:#32373c}.wp-ui-text-primary{color:#32373c}.wp-ui-highlight{color:#fff;background-color:#1e8cbe}.wp-ui-text-highlight{color:#1e8cbe}.wp-ui-notification{color:#fff;background-color:#d54e21}.wp-ui-text-notification{color:#d54e21}.wp-ui-text-icon{color:#82878c}img.emoji{display:inline!important;border:none!important;height:1em!important;width:1em!important;margin:0 .07em!important;vertical-align:-.1em!important;background:0 0!important;padding:0!important;-webkit-box-shadow:none!important;box-shadow:none!important}.filter-group,.wp-filter{position:relative;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04)}#nav-menu-footer,#nav-menu-header,#your-profile #rich_editing,.checkbox,.control-section .accordion-section-title,.menu-item-handle,.postbox .hndle,.side-info,.sidebar-name,.stuffbox .hndle,.widefat tfoot td,.widefat tfoot th,.widefat thead td,.widefat thead th,.widget .widget-top{line-height:1.4em}.menu-item-handle,.widget .widget-top{background:#fafafa;color:#23282d}.postbox .hndle,.stuffbox .hndle{border-bottom:1px solid #eee;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.quicktags,.search{background-color:#ccc;color:#000;font-size:12px}.icon32{display:none}#bulk-titles div a:before,.notice-dismiss:before,.tagchecklist span a:before,.welcome-panel .welcome-panel-close:before{background:0 0;color:#b4b9be;content:"\f153";display:block;font:400 16px/20px dashicons;speak:none;height:20px;text-align:center;width:20px;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.welcome-panel .welcome-panel-close:before{margin:0}#bulk-titles div a:before,.tagchecklist span a:before{margin:1px 0}#bulk-titles div a:hover:before,.tagchecklist span a:hover:before,.welcome-panel .welcome-panel-close:focus:before,.welcome-panel .welcome-panel-close:hover:before{color:#c00}.key-labels label{line-height:24px}b,strong{font-weight:600}.pre{white-space:pre-wrap}#namediv td.first,#plugin-information-title,.nav-tab,.no-break,.star-rating{white-space:nowrap}.howto{color:#666;font-style:italic;display:block}p.install-help{margin:8px 0;font-style:italic}hr{border:0;border-top:1px solid #ddd;border-bottom:1px solid #fafafa}#all-plugins-table .plugins a.delete,#media-items a.delete,#media-items a.delete-permanently,#nav-menu-footer .menu-delete,#search-plugins-table .plugins a.delete,.plugins a.delete,.row-actions span.delete a,.row-actions span.spam a,.row-actions span.trash a,.submitbox .submitdelete{color:#a00}#all-plugins-table .plugins a.delete:hover,#media-items a.delete-permanently:hover,#media-items a.delete:hover,#nav-menu-footer .menu-delete:hover,#search-plugins-table .plugins a.delete:hover,.file-error,.plugins a.delete:hover,.row-actions .delete a:hover,.row-actions .spam a:hover,.row-actions .trash a:hover,.submitbox .submitdelete:hover,.widget-control-remove:hover,abbr.required,span.required{color:red;text-decoration:none;border:none}#major-publishing-actions{padding:10px;clear:both;border-top:1px solid #ddd;background:#f5f5f5}#delete-action{line-height:28px;vertical-align:middle;text-align:right;float:right}#publishing-action{text-align:left;float:left;line-height:23px}#misc-publishing-actions{padding:6px 0 0}.misc-pub-section{padding:6px 10px 8px}#minor-publishing-actions{padding:10px 10px 0;text-align:left}.preview{float:left}#sticky-span{margin-right:18px}.approve,.unapproved .unapprove{display:none}.spam .approve,.trash .approve,.unapproved .approve{display:inline}td.action-links,th.action-links{text-align:left}.wp-filter{display:inline-block;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:12px 0 25px;padding:0 10px;width:100%;box-shadow:0 1px 1px rgba(0,0,0,.04);border:1px solid #e5e5e5;background:#fff;color:#555;font-size:13px}.filter-group,html.wp-toolbar{-webkit-box-sizing:border-box;-moz-box-sizing:border-box}.wp-filter a{text-decoration:none}.filter-count{display:inline-block;vertical-align:middle;min-width:4em}.filter-count .count,.title-count{display:inline-block;position:relative;top:-1px;padding:4px 10px;-webkit-border-radius:30px;border-radius:30px;background:#72777c;color:#fff;font-size:14px;font-weight:600}.title-count{display:inline;top:-3px;margin-right:5px;margin-left:20px}.filter-items{float:right}.filter-links,.filter-links li{display:inline-block;margin:0}.filter-links li>a{display:inline-block;margin:0 10px;padding:15px 0;border-bottom:4px solid #fff;color:#666;cursor:pointer}.filter-links .current{-webkit-box-shadow:none;box-shadow:none;border-bottom:4px solid #666;color:#23282d}.filter-links li>a:focus,.filter-links li>a:hover,.show-filters .filter-links a.current:focus,.show-filters .filter-links a.current:hover{color:#00a0d2}.wp-filter .search-form{float:left;margin:10px 0}.wp-filter .search-form input[type=search]{margin:0;padding:3px 5px;width:280px;max-width:100%;font-size:16px;font-weight:300;line-height:1.5}.wp-filter .search-form select{margin:0;height:32px;vertical-align:top}.wp-filter .search-form.search-plugins{display:inline-block}.wp-filter .drawer-toggle{display:inline-block;margin:0 10px;padding:4px 6px;color:#666;cursor:pointer}.wp-filter .drawer-toggle:before{display:inline-block;vertical-align:top;content:"\f111";margin:0 0 0 5px;width:16px;height:16px;color:#72777c;-webkit-transition:color .1s ease-in 0;transition:color .1s ease-in 0;font-family:dashicons;font-size:16px;line-height:1;text-align:center;text-decoration:inherit;font-weight:400;font-style:normal;-webkit-font-smoothing:antialiased}.filter-drawer,.wp-filter .favorites-form{margin:0 -20px;padding:20px;border-top:1px solid #eee;background:#fafafa}.wp-filter .drawer-toggle:hover,.wp-filter .drawer-toggle:hover:before{color:#00a0d2}.wp-filter .drawer-toggle.current:before{color:#fff}.wp-filter .favorites-form{display:none;overflow:hidden;width:100%}.show-favorites-form .wp-filter .favorites-form{display:block}.filter-drawer{display:none}.show-filters .filter-drawer{display:block;overflow:hidden;width:100%}.show-filters .wp-filter .drawer-toggle:focus,.show-filters .wp-filter .drawer-toggle:hover{background:#2ea2cc}.show-filters .filter-links a.current{border-bottom:none}.show-filters .wp-filter .drawer-toggle{-webkit-border-radius:2px;border-radius:2px;border:none;background:#72777c;color:#fff}.filter-group,.filtered-by .tag{border:1px solid #e5e5e5;background:#fff}.show-filters .wp-filter .drawer-toggle:before{color:#fff}.filter-group{box-sizing:border-box;float:right;margin:0 0 0 1%;padding:20px 10px 10px;width:24%;box-shadow:0 1px 1px rgba(0,0,0,.04)}.filter-group legend{position:absolute;top:10px;display:block;margin:0;padding:0;font-size:1em;font-weight:600}.filter-drawer .filter-group-feature{margin:28px 0 0;list-style-type:none;font-size:12px}.filter-drawer .filter-group-feature input,.filter-drawer .filter-group-feature label{display:inline-block;margin:7px 0 7px 4px;line-height:16px}.filter-drawer .buttons{margin-bottom:20px}.filter-drawer .buttons .button span{display:inline-block;opacity:.8;font-size:12px;text-indent:10px}.wp-filter .button.clear-filters{display:none;margin-right:10px}.filtered-by{display:none;margin:0}.filtered-by>span{font-weight:600}.filtered-by a{margin-right:10px}.filtered-by .tags{display:inline}.filtered-by .tag{margin:0 5px;padding:4px 8px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04);font-size:11px}.filters-applied .filter-drawer .buttons,.filters-applied .filter-drawer br,.filters-applied .filter-group{display:none!important}.filters-applied .filtered-by{display:block}.filters-applied .filter-drawer{padding:20px}.error .content-filterable,.loading-content .content-filterable,.show-filters .content-filterable,.show-filters.filters-applied.loading-content .content-filterable{display:none}.show-filters.filters-applied .content-filterable{display:block}.loading-content .spinner{display:block;margin:40px auto 0;float:none}@media only screen and (max-width:1120px){.filter-drawer{border-bottom:1px solid #eee}.filter-group{margin-bottom:0;margin-top:5px;width:100%}.filter-group li{margin:10px 0}}@media only screen and (max-width:1000px){.filter-items{float:none}.wp-filter .media-toolbar-primary,.wp-filter .media-toolbar-secondary,.wp-filter .search-form{float:none;position:relative;max-width:100%}}@media only screen and (max-width:782px){.filter-group li{padding:0;width:50%}}@media only screen and (max-width:320px){.filter-count{display:none}.wp-filter .drawer-toggle{margin:10px 0}.filter-group li,.wp-filter .search-form input[type=search]{width:100%}}.notice,div.error,div.updated{background:#fff;border-right:4px solid #fff;-webkit-box-shadow:0 1px 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 1px 0 rgba(0,0,0,.1);margin:5px 15px 2px;padding:1px 12px}.form-table td .notice p,.notice p,.notice-title,div.error p,div.updated p{margin:.5em 0;padding:2px}.error a{text-decoration:underline}.updated a{padding-bottom:2px}.notice-alt{-webkit-box-shadow:none;box-shadow:none}.notice-large{padding:10px 20px}.notice-title{display:inline-block;color:#23282d;font-size:18px}.wp-core-ui .notice.is-dismissible{padding-left:38px;position:relative}.notice-dismiss{position:absolute;top:0;left:1px;border:none;margin:0;padding:9px;background:0 0;color:#b4b9be;cursor:pointer}.notice-dismiss:active:before,.notice-dismiss:focus:before,.notice-dismiss:hover:before{color:#c00}.notice-dismiss:focus{outline:0;-webkit-box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}.ie8 .notice-dismiss:focus{outline:#5b9dd9 solid 1px}.notice-success,div.updated{border-right-color:#46b450}.notice-success.notice-alt{background-color:#ecf7ed}.notice-warning{border-right-color:#ffb900}.notice-warning.notice-alt{background-color:#fff8e5}.notice-error,div.error{border-right-color:#dc3232}.notice-error.notice-alt{background-color:#fbeaea}.notice-info{border-right-color:#00a0d2}.notice-info.notice-alt{background-color:#e5f5fa}.media-upload-form .notice,.media-upload-form div.error,.wrap .notice,.wrap div.error,.wrap div.updated{margin:5px 0 15px}#update-nag,.update-nag{display:inline-block;line-height:19px;padding:11px 15px;font-size:14px;text-align:right;margin:25px 2px 0 20px;background-color:#fff;border-right:4px solid #ffba00;-webkit-box-shadow:0 1px 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 1px 0 rgba(0,0,0,.1)}#screen-meta,ul#dismissed-updates{display:none}.update-message{color:#000}form.upgrade{margin-top:8px}form.upgrade .hint{font-style:italic;font-size:85%;margin:-.5em 0 2em}.update-php .spinner{float:none;margin:-4px 0}#ajax-loading,.ajax-feedback,.ajax-loading,.imgedit-wait-spin,.list-ajax-loading{visibility:hidden}#ajax-response.alignleft{margin-right:2em}#adminmenu a,#catlist a,#taglist a{text-decoration:none}#contextual-help-wrap,#screen-options-wrap{margin:0;padding:8px 20px 12px;position:relative}#contextual-help-wrap{overflow:auto;margin-right:0!important}#screen-meta .screen-reader-text{visibility:hidden}#screen-meta-links{margin:0 0 0 20px}#screen-meta{margin:0 0 -1px 20px;position:relative;background-color:#fff;border:1px solid #ddd;border-top:none;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.025);box-shadow:0 1px 0 rgba(0,0,0,.025)}#contextual-help-link-wrap,#screen-options-link-wrap{float:left;height:28px;margin:0 6px 0 0;border:1px solid #ddd;border-top:none;background:#fff;-webkit-box-shadow:0 1px 1px -1px rgba(0,0,0,.1);box-shadow:0 1px 1px -1px rgba(0,0,0,.1)}#screen-meta-links .screen-meta-toggle{position:relative;top:0}#screen-meta-links .show-settings{border:0;background:0 0;-webkit-border-radius:0;border-radius:0;color:#72777c;line-height:1.7;padding:3px 16px 3px 6px}#screen-meta-links .show-settings:active,#screen-meta-links .show-settings:focus,#screen-meta-links .show-settings:hover{color:#32373c}#screen-meta-links .show-settings:active{-webkit-box-shadow:none;box-shadow:none;-webkit-transform:none;-ms-transform:none;transform:none}#screen-meta-links .show-settings:after{left:0;content:"\f140";font:400 20px/1 dashicons;speak:none;display:inline-block;padding:0 0 0 5px;bottom:2px;position:relative;vertical-align:bottom;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;color:#72777c}#templateside ul li a,#wpfooter a,.nav-tab{text-decoration:none}#screen-meta-links .screen-meta-active:after{content:"\f142"}.toggle-arrow{background-repeat:no-repeat;background-position:top left;background-color:transparent;height:22px;line-height:22px;display:block}.toggle-arrow-active{background-position:bottom left}#contextual-help-wrap h5,#screen-options-wrap h5,#screen-options-wrap legend{margin:0;padding:8px 0;font-size:13px;font-weight:600}.hndle a,.widefat tfoot td,.widefat th,.widefat thead td{font-weight:400}.ie8 #screen-options-wrap legend{color:inherit}.metabox-prefs label{display:inline-block;padding-left:15px;line-height:30px}#number-of-columns{display:inline-block;vertical-align:middle;line-height:30px}.metabox-prefs input[type=checkbox]{margin-top:0;margin-left:6px}.metabox-prefs label input,.metabox-prefs label input[type=checkbox]{margin:-4px 0 0 5px}.metabox-prefs .columns-prefs label input{margin:-1px 0 0 2px}.metabox-prefs label a{display:none}.metabox-prefs .screen-options input,.metabox-prefs .screen-options label{margin-top:0;margin-bottom:0;vertical-align:middle}.metabox-prefs .screen-options .screen-per-page{margin-left:15px}.metabox-prefs .screen-options label{line-height:28px;padding-left:0}.screen-options+.screen-options{margin-top:10px}.metabox-prefs .submit{margin-top:1em;padding:0}#contextual-help-wrap{padding:0}#contextual-help-columns{position:relative}#contextual-help-back{position:absolute;top:0;bottom:0;right:150px;left:170px;border:1px solid #e1e1e1;border-top:none;border-bottom:none;background:#f6fbfd}#contextual-help-wrap.no-sidebar #contextual-help-back{left:0;border-left-width:0;-webkit-border-bottom-left-radius:2px;border-bottom-left-radius:2px}.contextual-help-tabs{float:right;width:150px;margin:0}.contextual-help-tabs ul{margin:1em 0}.contextual-help-tabs li{margin-bottom:0;list-style-type:none;border-style:solid;border-width:0 2px 0 0;border-color:transparent}.contextual-help-tabs a{display:block;padding:5px 12px 5px 5px;line-height:18px;text-decoration:none;border:1px solid transparent;border-left:none;border-right:none}.contextual-help-tabs a:hover{color:#32373c}.contextual-help-tabs .active{padding:0;margin:0 0 0 -1px;border-right:2px solid #00a0d2;background:#f6fbfd;-webkit-box-shadow:0 2px 0 rgba(0,0,0,.02),0 1px 0 rgba(0,0,0,.02);box-shadow:0 2px 0 rgba(0,0,0,.02),0 1px 0 rgba(0,0,0,.02)}.contextual-help-tabs .active a{border-color:#e1e1e1;color:#32373c}.contextual-help-tabs-wrap{padding:0 20px;overflow:auto}.help-tab-content{display:none;margin:0 0 12px 22px;line-height:1.6em}.help-tab-content.active{display:block}.help-tab-content ul li{list-style-type:disc;margin-right:18px}.contextual-help-sidebar{width:150px;float:left;padding:0 12px 0 8px;overflow:auto}html.wp-toolbar{padding-top:32px;box-sizing:border-box}.widefat td,.widefat th{color:#555}.widefat ol,.widefat p,.widefat tfoot tr td,.widefat tfoot tr th,.widefat thead tr td,.widefat thead tr th,.widefat ul{color:#32373c}.widefat td p{margin:2px 0 .8em}.widefat .column-comment p{margin:.6em 0}.postbox-container{float:right}.postbox-container .meta-box-sortables{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#wpbody-content .metabox-holder{padding-top:10px}.metabox-holder .postbox-container .empty-container{border:3px dashed #b4b9be;height:250px;position:relative}.metabox-holder .postbox-container .empty-container:after{content:attr(data-emptystring);margin:auto;position:absolute;top:0;right:0;bottom:0;left:0;height:1em;width:200px;text-align:center;color:#ccc;font-size:18px;display:none}.columns-2 #postbox-container-3 .empty-container,.columns-2 #postbox-container-4 .empty-container,.columns-3 #postbox-container-4 .empty-container,.metabox-holder.columns-1 .postbox-container .empty-container{border:0;height:0;min-height:0}#post-body-content{width:100%;min-width:463px;float:right}#post-body.columns-2 #postbox-container-1{float:left;margin-left:-300px;width:280px}#post-body.columns-2 #side-sortables{min-height:250px}@media only screen and (max-width:799px){#wpbody-content .metabox-holder .postbox-container .empty-container{border:0;height:0;min-height:0}}.js .postbox .hndle,.js .widget .widget-top{cursor:move}.hndle a{font-size:11px}#adminmenu .wp-submenu li.current,#adminmenu .wp-submenu li.current a,#adminmenu .wp-submenu li.current a:hover,#dashboard_right_now .versions .b,#ed_reply_toolbar #ed_reply_strong,#pass-strength-result.short,#pass-strength-result.strong,#post-status-display,#post-visibility-display,.edit-comment-author,.feature-filter .feature-name,.item-controls .item-order a,.media-item .percent,.nav-tab,.plugins .name{font-weight:600}.postbox .handlediv{display:none;float:left;width:36px;height:36px;padding:0}.js .postbox .handlediv{display:block}.sortable-placeholder{border:1px dashed #b4b9be;margin-bottom:20px}.postbox,.stuffbox{margin-bottom:20px;padding:0;line-height:1}.postbox .inside,.stuffbox .inside{padding:0 12px 12px;line-height:1.4em;font-size:13px}.postbox .inside{margin:11px 0;position:relative}.postbox .inside>p:last-child,.rss-widget ul li:last-child{margin-bottom:1px!important}.postbox.closed h3{border:none;-webkit-box-shadow:none;box-shadow:none}.postbox table.form-table{margin-bottom:0}.postbox table.widefat{-webkit-box-shadow:none;box-shadow:none}.temp-border{border:1px dotted #ccc}.columns-prefs label{padding:0 0 0 10px}#wpfooter{position:absolute;bottom:0;right:0;left:0;padding:10px 20px;color:#555d66}#wpfooter p{font-size:13px;margin:0;line-height:20px}#footer-thankyou{font-style:italic}#wpfooter a:hover{text-decoration:underline}.nav-tab{float:right;border:1px solid #ccc;border-bottom:none;margin-right:.5em;padding:5px 10px;font-size:14px;line-height:24px;background:#e5e5e5;color:#555}.nav-tab-small .nav-tab,h3 .nav-tab{padding:5px 14px;font-size:12px;line-height:16px}.nav-tab:focus,.nav-tab:hover{background-color:#fff;color:#444}.nav-tab-active,.nav-tab:focus:active{-webkit-box-shadow:none;box-shadow:none}.nav-tab-active{margin-bottom:-1px;color:#444}.nav-tab-active,.nav-tab-active:focus,.nav-tab-active:focus:active,.nav-tab-active:hover{border-bottom:1px solid #f1f1f1;background:#f1f1f1;color:#000}.wrap h2.nav-tab-wrapper,h1.nav-tab-wrapper,h3.nav-tab-wrapper{border-bottom:1px solid #ccc;margin:0;padding-top:9px;padding-bottom:0;line-height:inherit}.nav-tab-wrapper:not(.wp-clearfix):after{content:"";display:table;clear:both}.ie8 .nav-tab-wrapper{display:inline-block;width:100%;vertical-align:top}.spinner{background:url(../images/spinner.gif) no-repeat;-webkit-background-size:20px 20px;background-size:20px 20px;display:inline-block;visibility:hidden;float:left;vertical-align:middle;opacity:.7;filter:alpha(opacity=70);width:20px;height:20px;margin:4px 10px 0}.spinner.is-active{visibility:visible}#template div{margin-left:190px}.metabox-holder .postbox>h3,.metabox-holder .stuffbox>h3,.metabox-holder h2.hndle,.metabox-holder h3.hndle{font-size:14px;padding:8px 12px;margin:0;line-height:1.4}.nav-menus-php .metabox-holder h3{padding:10px 14px 11px 10px;line-height:21px}.plugin-install #description,.plugin-install-network #description{width:60%}table .column-rating,table .column-visible,table .vers{text-align:right}.attention,.error-message{color:red;font-weight:600}body.iframe{height:98%}.lp-show-latest p{display:none}.lp-show-latest .lp-error p,.lp-show-latest p:last-child{display:block}.media-icon{width:62px;text-align:center}.media-icon img{border:1px solid #e5e5e5;border:1px solid rgba(0,0,0,.07)}#howto{font-size:11px;margin:0 5px;display:block}.post-categories,.post-categories li{display:inline}.importers td{padding-left:14px}.importers{font-size:16px;width:auto}#post-body #post-body-content #namediv h2,#post-body #post-body-content #namediv h3{margin-top:0}.edit-comment-author{font-size:14px;line-height:1.4;color:#222;margin:2px 9px 0 0}#namediv h2 label,#namediv h3 label{vertical-align:baseline}#namediv table{width:100%}#namediv td.first{width:10px}#namediv input{width:98%}#namediv p{margin:10px 0}#submitdiv h3{margin-bottom:0!important}.checkbox,.post-categories,.zerosize,fieldset{margin:0;padding:0}.zerosize{height:0;width:0;border:0;overflow:hidden;position:absolute}br.clear{height:2px;line-height:2px}.checkbox{border:none}fieldset{border:0}div.star-holder{position:relative;height:17px;width:100px;background:url(../images/stars.png?ver=20121108) bottom left repeat-x}div.star-holder .star-rating{background:url(../images/stars.png?ver=20121108) top left repeat-x;height:17px;float:right}.star-rating .star{display:inline-block;width:20px;height:20px;-webkit-font-smoothing:antialiased;font-size:20px;line-height:1;font-family:dashicons;text-decoration:inherit;font-weight:400;font-style:normal;vertical-align:top;-webkit-transition:color .1s ease-in 0;transition:color .1s ease-in 0;text-align:center;color:#ffb900}.star-rating .star-full:before{content:"\f155"}.star-rating .star-half:before{content:"\f459"}.rtl .star-rating .star-half{-webkit-transform:rotateY(180deg);-ms-transform:rotateY(180deg);transform:rotateY(180deg)}.star-rating .star-empty:before{content:"\f154"}div.action-links{font-weight:400;margin:6px 0 0}#plugin-information{background:#fff;position:fixed;top:0;left:0;bottom:0;right:0;height:100%;padding:0}#plugin-information-scrollable{overflow:auto;-webkit-overflow-scrolling:touch;height:100%}#plugin-information-title{padding:0 20px;background:#f5f5f5;font-size:22px;font-weight:600;line-height:56px;position:relative;top:0;left:0;right:0;height:56px;overflow:hidden;text-overflow:ellipsis}#plugin-information-title.with-banner{margin-left:0;height:250px;bottom:250px;-webkit-background-size:cover;background-size:cover}#plugin-information-title h2{font-size:1em;font-weight:700;padding:0;margin:0;max-width:680px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}#plugin-information-title.with-banner h2{font-family:"Helvetica Neue",sans-serif;display:inline-block;font-size:30px;line-height:50px;padding:0 15px;margin:174px 10px 0 0;color:#fff;background:rgba(30,30,30,.9);text-shadow:0 1px 3px rgba(0,0,0,.4);-webkit-box-shadow:0 0 30px rgba(255,255,255,.1);box-shadow:0 0 30px rgba(255,255,255,.1);-webkit-border-radius:8px;border-radius:8px}#plugin-information-title div.vignette{display:none}#plugin-information-title.with-banner div.vignette{display:block;float:left;top:0;height:250px;width:772px;margin:0 -20px;background:0 0;-webkit-box-shadow:inset 0 0 50px 4px rgba(0,0,0,.2),inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 0 50px 4px rgba(0,0,0,.2),inset 0 -1px 0 rgba(0,0,0,.1)}#plugin-information-tabs{padding:0 16px;position:relative;left:0;right:0;height:36px;z-index:1;border-bottom:1px solid #ddd;background:#f3f3f3}#plugin-information-tabs a{position:relative;float:right;padding:9px 10px;margin:0;height:18px;line-height:18px;font-size:14px;text-decoration:none;-webkit-transition:none;transition:none}#plugin-information-tabs a.current{margin:0 -1px;background:#fff;border:1px solid #ddd;border-bottom-color:#fff;padding-top:8px;color:#32373c}#plugin-information-tabs.with-banner a.current{border-top:none;padding-top:9px}#plugin-information-tabs a:active,#plugin-information-tabs a:focus{outline:0}#plugin-information-content{overflow:hidden;background:#fff;position:relative;top:0;left:0;right:0;min-height:100%;min-height:-webkit-calc(100% - 152px);min-height:calc(100% - 152px)}#plugin-information-content.with-banner{min-height:-webkit-calc(100% - 346px);min-height:calc(100% - 346px)}#section-holder{position:relative;top:0;left:250px;bottom:0;right:0;margin-left:250px;padding:10px 26px 99999px;margin-bottom:-99939px}#section-holder .updated{margin:16px 0}#plugin-information .fyi{float:left;position:relative;top:0;left:0;padding:16px 16px 99999px;margin-bottom:-99939px;width:217px;border-right:1px solid #ddd;background:#f3f3f3;color:#666}#plugin-information .fyi strong{color:#444}#plugin-information .fyi h3{font-weight:700;text-transform:uppercase;font-size:12px;color:#666;margin:24px 0 8px}#plugin-information .fyi h2{font-size:.9em;margin-bottom:0;margin-left:0}#plugin-information .fyi ul{padding:0;margin:0;list-style:none}#plugin-information .fyi li{margin:0 0 10px}#plugin-information .fyi-description{margin-top:0}#plugin-information .counter-container{margin:3px 0}#plugin-information .counter-label{float:right;margin-left:5px;min-width:55px}#plugin-information .counter-back{height:17px;width:92px;background-color:#e5e5e5;float:right}#plugin-information .counter-bar{height:17px;background-color:#ffc733;float:right}#plugin-information .counter-count{margin-right:5px}#plugin-information .fyi ul.contributors{margin-top:10px}#plugin-information .fyi ul.contributors li{display:inline-block;margin-left:8px;vertical-align:middle}#plugin-information .fyi ul.contributors li img{vertical-align:middle;margin-left:4px}#plugin-information-footer{padding:13px 16px;position:absolute;left:0;bottom:0;right:0;height:33px;border-top:1px solid #ddd;background:#f3f3f3}#plugin-information .section ol,#plugin-information .section ul{list-style-type:disc;margin-left:24px}#plugin-information .section,#plugin-information .section p{font-size:14px;line-height:1.7}#plugin-information #section-screenshots ol{list-style:none;margin:0}#plugin-information #section-screenshots li img{vertical-align:text-top;margin-top:16px;max-width:100%;width:auto;height:auto;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.3);box-shadow:0 1px 2px rgba(0,0,0,.3)}#plugin-information #section-screenshots li p{font-style:italic;padding-left:20px}#plugin-information pre{padding:7px;overflow:auto;border:1px solid #ccc}#plugin-information .review{overflow:hidden;width:100%;margin-bottom:20px;border-bottom:1px solid #e5e5e5}#plugin-information .review-title-section{overflow:hidden}#plugin-information .review-title-section h4{display:inline-block;float:left;margin:0 6px 0 0}#plugin-information .reviewer-info p{clear:both;margin:0;padding-top:2px}#plugin-information .reviewer-info .avatar{float:left;margin:4px 6px 0 0}#plugin-information .reviewer-info .star-rating{float:left}#plugin-information .review-meta{float:left;margin-left:.75em}#plugin-information .review-body{float:left;width:100%}.plugin-version-author-uri{font-size:13px}@media screen and (max-width:771px){#plugin-information-title.with-banner{height:100px;bottom:100px}#plugin-information-title.with-banner h2{margin-top:30px;font-size:20px;line-height:40px;max-width:85%}#plugin-information-title.with-banner div.vignette{height:100px;bottom:100px;width:800%}#plugin-information-tabs{overflow:hidden;padding:0;height:auto}#plugin-information-tabs a.current{margin-bottom:0;border-bottom:none}#plugin-information .fyi{float:none;border:1px solid #ddd;position:static;width:auto;margin:26px 26px 0;padding-bottom:0}#section-holder{position:static;margin:0;padding-bottom:70px}#plugin-information .fyi h3,#plugin-information .fyi small{display:none}#plugin-information-footer{padding:12px 16px 0;height:46px}}body.about-php #TB_window,body.import-php #TB_window,body.index-php #TB_window,body.plugin-install-php #TB_window,body.plugins-php #TB_window,body.update-core-php #TB_window{background:#fcfcfc}.ie8 body.about-php #TB_window:before,.ie8 body.import-php #TB_window:before,.ie8 body.index-php #TB_window:before,.ie8 body.plugin-install-php #TB_window:before,.ie8 body.plugins-php #TB_window:before,.ie8 body.update-core-php #TB_window:before{content:" ";background:0 0}body.about-php #TB_window.thickbox-loading:before,body.import-php #TB_window.thickbox-loading:before,body.index-php #TB_window.thickbox-loading:before,body.plugin-install-php #TB_window.thickbox-loading:before,body.plugins-php #TB_window.thickbox-loading:before,body.update-core-php #TB_window.thickbox-loading:before{content:"";display:block;width:20px;height:20px;position:absolute;right:50%;top:50%;z-index:-1;margin:-10px -10px 0 0;background:url(../images/spinner.gif) center no-repeat #fcfcfc;-webkit-background-size:20px 20px;background-size:20px 20px;-webkit-transform:translateZ(0);transform:translateZ(0)}body.about-php #TB_ajaxWindowTitle,body.about-php .tb-close-icon,body.import-php #TB_ajaxWindowTitle,body.import-php .tb-close-icon,body.index-php #TB_ajaxWindowTitle,body.index-php .tb-close-icon,body.plugin-install-php #TB_ajaxWindowTitle,body.plugin-install-php .tb-close-icon,body.plugins-php #TB_ajaxWindowTitle,body.plugins-php .tb-close-icon,body.update-core-php #TB_ajaxWindowTitle,body.update-core-php .tb-close-icon{display:none}@media print,(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){body.about-php #TB_window.thickbox-loading:before,body.import-php #TB_window.thickbox-loading:before,body.index-php #TB_window.thickbox-loading:before,body.plugin-install-php #TB_window.thickbox-loading:before,body.plugins-php #TB_window.thickbox-loading:before,body.update-core-php #TB_window.thickbox-loading:before{background-image:url(../images/spinner-2x.gif)}}body.about-php #TB_title,body.import-php #TB_title,body.index-php #TB_title,body.plugin-install-php #TB_title,body.plugins-php #TB_title,body.update-core-php #TB_title{float:right;height:1px}.about-php #TB_closeWindowButton,.import-php #TB_closeWindowButton,.index-php #TB_closeWindowButton,.plugin-install-php #TB_closeWindowButton,.plugins-php #TB_closeWindowButton,.update-core-php #TB_closeWindowButton{right:auto;left:-30px;color:#eee}body.about-php #TB_closeWindowButton:focus,body.about-php #TB_closeWindowButton:hover,body.import-php #TB_closeWindowButton:focus,body.import-php #TB_closeWindowButton:hover,body.index-php #TB_closeWindowButton:focus,body.index-php #TB_closeWindowButton:hover,body.plugin-install-php #TB_closeWindowButton:focus,body.plugin-install-php #TB_closeWindowButton:hover,body.plugins-php #TB_closeWindowButton:focus,body.plugins-php #TB_closeWindowButton:hover,body.update-core-php #TB_closeWindowButton:focus,body.update-core-php #TB_closeWindowButton:hover{color:#00a0d2;outline:0;-webkit-box-shadow:none;box-shadow:none}body.about-php #TB_closeWindowButton:after,body.import-php #TB_closeWindowButton:after,body.index-php #TB_closeWindowButton:after,body.plugin-install-php #TB_closeWindowButton:after,body.plugins-php #TB_closeWindowButton:after,body.update-core-php #TB_closeWindowButton:after{content:"\f335";font:400 32px/29px dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}@media screen and (max-width:830px){body.about-php #TB_closeWindowButton,body.import-php #TB_closeWindowButton,body.index-php #TB_closeWindowButton,body.plugin-install-php #TB_closeWindowButton,body.plugins-php #TB_closeWindowButton,body.update-core-php #TB_closeWindowButton{left:0;top:-30px}}img{border:none}.js .meta-box-sortables .postbox .toggle-indicator:before,.js .sidebar-name .sidebar-name-arrow:before{content:"\f142";display:inline-block;font:400 20px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important}.js .meta-box-sortables .postbox.closed .handlediv .toggle-indicator:before,.js .widgets-holder-wrap.closed .sidebar-name-arrow:before{content:"\f140"}.js .sidebar-name .sidebar-name-arrow:before{padding:10px;right:0}.js #widgets-left .sidebar-name .sidebar-name-arrow{display:none}.accordion-section.open .accordion-section-content,.js #widgets-left .sidebar-name:hover .sidebar-name-arrow,.js #widgets-left .widgets-holder-wrap.closed .sidebar-name .sidebar-name-arrow,.no-js .accordion-section .accordion-section-content{display:block}.js .postbox .handlediv .toggle-indicator:before{margin-top:4px;width:20px;-webkit-border-radius:50%;border-radius:50%;text-indent:-1px}#postcustomstuff p.submit,#templateside h2,.alignleft h2{margin:0}.rtl.js .postbox .handlediv .toggle-indicator:before{text-indent:1px}.js .postbox .handlediv:focus{-webkit-box-shadow:none;box-shadow:none;outline:0}.js .postbox .handlediv:focus .toggle-indicator:before{-webkit-box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}#photo-add-url-div input[type=text]{width:300px}#template textarea{font-family:Consolas,Monaco,monospace;font-size:13px;width:97%;background:#f9f9f9;outline:0}#template p{width:97%}#templateside{float:left;width:190px}#templateside h4{margin:1em 0 0}#templateside ol,#templateside ul{margin:.5em 0;padding:0}#templateside li{margin:4px 0}#templateside li a,.theme-editor-php .highlight{display:block;padding:3px 12px 3px 3px;text-decoration:none}.theme-editor-php .highlight{margin:-3px -12px -3px 3px}#templateside .highlight{border:none;font-weight:700}.nonessential{color:#666;font-size:11px;font-style:italic;padding-right:12px}#documentation{margin-top:10px}#documentation label{line-height:22px;vertical-align:baseline;font-weight:600}.fileedit-sub{padding:10px 0 8px;line-height:180%}.accordion-section-title:after,.control-section .accordion-section-title:after,.nav-menus-php .item-edit:before,.widget-top a.widget-action:after{left:0;content:"\f140";border:none;background:0 0;font:400 20px/1 dashicons;speak:none;display:block;padding:0;text-indent:0;text-align:center;position:relative;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important}.accordion-section-title:after,.handlediv,.item-edit,.sidebar-name-arrow{color:#72777c}.widget-action{color:#555d66}.accordion-section-title:hover:after,.handlediv:focus,.handlediv:hover,.item-edit:focus,.item-edit:hover,.sidebar-name:hover .sidebar-name-arrow,.widget-action:focus,.widget-top:hover .widget-action{color:#23282d}.widget-top a.widget-action:after{padding:1px 0 1px 2px;margin-top:10px;margin-left:10px;-webkit-border-radius:50%;border-radius:50%}.widget-top a.widget-action:focus:after{-webkit-box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}.accordion-section-title:after,.control-section .accordion-section-title:after{float:left;left:20px;top:-2px}#customize-info.open .accordion-section-title:after,.control-section.open .accordion-section-title:after,.nav-menus-php .menu-item-edit-active .item-edit:before,.widget.open .widget-top a.widget-action:after{content:"\f142"}/*! + * jQuery UI Draggable/Sortable 1.11.4 + * http://jqueryui.com + * + * Copyright jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license + */.ui-draggable-handle,.ui-sortable-handle{-ms-touch-action:none;touch-action:none}.accordion-section{border-bottom:1px solid #ddd;margin:0}.accordion-section.open:hover{border-bottom-color:#ddd}.accordion-section-content{display:none;padding:10px 20px 15px;overflow:hidden;background:#fff}.accordion-section-title{margin:0;padding:12px 15px 15px;position:relative;border-right:1px solid #ddd;border-left:1px solid #ddd;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.js .accordion-section-title{cursor:pointer}.js .accordion-section-title:after{position:absolute;top:12px;left:10px;z-index:1}.accordion-section-title:focus{outline:0}.accordion-section-title:focus:after,.accordion-section-title:hover:after{border-color:#a0a5aa transparent}.cannot-expand .accordion-section-title{cursor:auto}.cannot-expand .accordion-section-title:after{display:none}.control-section .accordion-section-title{border-right:none;border-left:none;padding:10px 14px 11px 10px;line-height:21px;background:#fff}.control-section .accordion-section-title:after{top:11px}.js .control-section .accordion-section-title:focus,.js .control-section .accordion-section-title:hover,.js .control-section.open .accordion-section-title,.js .control-section:hover .accordion-section-title{color:#23282d;background:#f5f5f5}.control-section.open .accordion-section-title{border-bottom:1px solid #ddd}.network-admin .edit-site-actions{margin-top:0}.my-sites{display:block;overflow:auto;zoom:1}.my-sites li{display:block;padding:8px 3%;min-height:130px;margin:0}@media only screen and (max-width:599px){.my-sites li{min-height:0}}@media only screen and (min-width:600px){.my-sites.striped li{background-color:#fff;position:relative}.my-sites.striped li:after{content:"";width:1px;height:100%;position:absolute;top:0;left:0;background:#ccc}}@media only screen and (min-width:600px) and (max-width:699px){.my-sites li{float:right;width:44%}.my-sites.striped li{background-color:#fff}.my-sites.striped li:nth-of-type(2n+1){clear:right}.my-sites.striped li:nth-of-type(2n+2):after{content:none}.my-sites li:nth-of-type(4n+1),.my-sites li:nth-of-type(4n+2){background-color:#f9f9f9}}@media only screen and (min-width:700px) and (max-width:1199px){.my-sites li{float:right;width:27.333333%;background-color:#fff}.my-sites.striped li:nth-of-type(3n+3):after{content:none}.my-sites li:nth-of-type(6n+1),.my-sites li:nth-of-type(6n+2),.my-sites li:nth-of-type(6n+3){background-color:#f9f9f9}}@media only screen and (min-width:1200px) and (max-width:1399px){.my-sites li{float:right;width:21%;padding:8px 2%;background-color:#fff}.my-sites.striped li:nth-of-type(4n+1){clear:right}.my-sites.striped li:nth-of-type(4n+4):after{content:none}.my-sites li:nth-of-type(8n+1),.my-sites li:nth-of-type(8n+2),.my-sites li:nth-of-type(8n+3),.my-sites li:nth-of-type(8n+4){background-color:#f9f9f9}}@media only screen and (min-width:1400px) and (max-width:1599px){.my-sites li{float:right;width:16%;padding:8px 2%;background-color:#fff}.my-sites.striped li:nth-of-type(5n+1){clear:right}.my-sites.striped li:nth-of-type(5n+5):after{content:none}.my-sites li:nth-of-type(10n+1),.my-sites li:nth-of-type(10n+2),.my-sites li:nth-of-type(10n+3),.my-sites li:nth-of-type(10n+4),.my-sites li:nth-of-type(10n+5){background-color:#f9f9f9}}@media only screen and (min-width:1600px){.my-sites li{float:right;width:12.666666%;padding:8px 2%;background-color:#fff}.my-sites.striped li:nth-of-type(6n+1){clear:right}.my-sites.striped li:nth-of-type(6n+6):after{content:none}.my-sites li:nth-of-type(12n+1),.my-sites li:nth-of-type(12n+2),.my-sites li:nth-of-type(12n+3),.my-sites li:nth-of-type(12n+4),.my-sites li:nth-of-type(12n+5),.my-sites li:nth-of-type(12n+6){background-color:#f9f9f9}}.my-sites li a{text-decoration:none}@media only screen and (min-width:769px){#col-left{width:35%}#col-right{width:65%}}@media only screen and (max-width:860px){#col-left{width:35%}#col-right{width:65%}}@media only screen and (min-width:980px){#col-left{width:35%}#col-right{width:65%}}@media only screen and (max-width:768px){#col-left,#col-right{width:100%}}@media print,(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){div.star-holder,div.star-holder .star-rating{background:url(../images/stars-2x.png?ver=20121108) bottom left repeat-x;-webkit-background-size:21px 37px;background-size:21px 37px}.spinner{background-image:url(../images/spinner-2x.gif)}#bulk-titles div a,#bulk-titles div a:hover,#screen-meta-links a.show-settings,.curtime #timestamp,.meta-box-sortables .postbox:hover .handlediv,.sidebar-name-arrow,.sidebar-name:hover .sidebar-name-arrow,.tagchecklist span a,.tagchecklist span a:hover,.widget-top a.widget-action,.widget-top a.widget-action:hover{background:0 0!important}}@-ms-viewport{width:device-width}@media screen and (max-width:782px){#template div,#templateside{float:none;width:auto}html.wp-toolbar{padding-top:46px}body{min-width:240px;overflow-x:hidden}body *{-webkit-tap-highlight-color:rgba(0,0,0,0)!important}#wpcontent{position:relative;margin-right:0;padding-right:10px}#wpbody-content{padding-bottom:100px}.wrap{margin-left:12px;margin-right:0}.col-wrap{padding:0}#collapse-menu,#screen-meta,#screen-meta-links,.post-format-select{display:none!important}.wrap .add-new-h2,.wrap .add-new-h2:active,.wrap .page-title-action,.wrap .page-title-action:active{padding:10px 15px;font-size:14px;white-space:nowrap}.wp-color-result{height:auto;padding-right:45px}.wp-color-result:after{font-size:14px;height:auto;padding:6px 14px}.media-upload-form div.error,.notice,.wrap div.error,.wrap div.updated{margin:20px 0 10px;padding:5px 10px;font-size:14px;line-height:175%}.wp-core-ui .notice.is-dismissible{padding-left:46px}.notice-dismiss{padding:13px}.wrap .icon32+h2{margin-top:-2px}.wp-responsive-open #wpbody{left:-190px}code{word-wrap:break-word}.postbox{font-size:14px}.metabox-holder .postbox>h3,.metabox-holder .stuffbox>h3,.metabox-holder h2,.metabox-holder h3.hndle{padding:12px}.postbox .handlediv{margin-top:3px}.subsubsub{font-size:16px;text-align:center;margin-bottom:15px}#templateside li{margin:0}#templateside li a{display:block;padding:5px}#templateside .highlight{padding:5px;margin-right:-5px;margin-top:-5px}#template div{margin:0}#template textarea{width:100%}.fileedit-sub .alignright{margin-top:15px}#comments-form .checkforspam,#wpfooter{display:none}.edit-comment-author{margin:2px 0 0}.filter-drawer .filter-group-feature input,.filter-drawer .filter-group-feature label{line-height:25px}}@media screen and (max-width:600px){#wpwrap.wp-responsive-open,div#post-body.metabox-holder.columns-1{overflow-x:hidden}html.wp-toolbar{padding-top:0}#wpbody{padding-top:46px}.wrap h2.nav-tab-wrapper,h1.nav-tab-wrapper,h3.nav-tab-wrapper{border-bottom:0}h1 .nav-tab,h2 .nav-tab,h3 .nav-tab{margin:10px 0 0 10px;border-bottom:1px solid #ccc}}@media screen and (max-width:320px){#network_dashboard_right_now .subsubsub{font-size:14px;text-align:right}} \ No newline at end of file diff --git a/wp-admin/css/common.css b/wp-admin/css/common.css index fbd77c2..e98e87e 100644 --- a/wp-admin/css/common.css +++ b/wp-admin/css/common.css @@ -9,16 +9,17 @@ #wpcontent { height: 100%; + padding-left: 20px; } #wpcontent, #wpfooter { - margin-left: 180px; + margin-left: 160px; } .folded #wpcontent, .folded #wpfooter { - margin-left: 56px; + margin-left: 36px; } #wpbody-content { @@ -113,6 +114,13 @@ clear: both; } +/* modern clearfix */ +.wp-clearfix:after { + content: ""; + display: table; + clear: both; +} + /* Hide visually but not from screen readers */ .screen-reader-text, .screen-reader-text span, @@ -125,6 +133,7 @@ overflow: hidden; clip: rect(0 0 0 0); border: 0; + word-wrap: normal !important; /* many screen reader and browser combinations announce broken words as they would appear visually */ } .screen-reader-shortcut { @@ -142,7 +151,7 @@ font-weight: 600; padding: 15px 23px 14px; background: #f1f1f1; - color: #21759b; + color: #0073aa; z-index: 100000; line-height: normal; -webkit-box-shadow: 0 0 2px 2px rgba(0,0,0,.6); @@ -176,7 +185,8 @@ p.popular-tags, .wp-editor-container, .popular-tags, .feature-filter, -.imgedit-group { +.imgedit-group, +.comment-ays { border: 1px solid #e5e5e5; -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04); box-shadow: 0 1px 1px rgba(0,0,0,0.04); @@ -189,7 +199,8 @@ p.popular-tags, .widgets-holder-wrap, .popular-tags, .feature-filter, -.imgedit-group { +.imgedit-group, +.comment-ays { background: #fff; } @@ -218,6 +229,16 @@ body.iframe { padding-top: 1px; } +body.modal-open { + overflow: hidden; +} + +body.mobile.modal-open #wpwrap { + overflow: hidden; + position: fixed; + height: 100%; +} + iframe, img { border: 0; @@ -231,7 +252,7 @@ td { } a { - color: #0074a2; + color: #0073aa; -webkit-transition-property: border, background, color; transition-property: border, background, color; -webkit-transition-duration: .05s; @@ -247,21 +268,29 @@ div { a:hover, a:active { - color: #2ea2cc; + color: #00a0d2; } -a:focus { +a:focus, +a:focus .media-icon img, +.wp-person a:focus .gravatar { color: #124964; + -webkit-box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); + box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); } -a:focus, -a:active { - outline: thin dotted; +.ie8 a:focus { + outline: #5b9dd9 solid 1px; } #adminmenu a:focus, -#adminmenu a:active, .screen-reader-text:focus { + -webkit-box-shadow: none; + box-shadow: none; outline: none; } @@ -274,7 +303,7 @@ blockquote:before, blockquote:after, q:before, q:after { - content: ''; + content: ""; content: none; } @@ -304,23 +333,24 @@ h6 { } h1 { + color: #23282d; font-size: 2em; margin: .67em 0; } -h2 { - color: #222; - font-size: 1.5em; - margin: .83em 0; - font-weight: 400; -} - +h2, h3 { - color: #222; + color: #23282d; font-size: 1.3em; margin: 1em 0; } +.update-core-php h2 { + margin-top: 2em; +} + +.update-php h2, +.update-messages h2, h4 { font-size: 1em; margin: 1.33em 0; @@ -374,16 +404,17 @@ ol.ol-decimal > li { margin: 0 0 0.5em; } -/* @noflip */ +/* rtl:ignore */ .ltr { direction: ltr; } -/* @noflip */ +/* rtl:ignore */ .code, code { font-family: Consolas, Monaco, monospace; direction: ltr; + unicode-bidi: embed; } kbd, @@ -412,7 +443,7 @@ code { .subsubsub a .count, .subsubsub a.current .count { - color: #999; + color: #555d66; /* #f1f1f1 background */ font-weight: normal; } @@ -449,11 +480,13 @@ code { padding: 8px 10px; } -.widefat thead th { +.widefat thead th, +.widefat thead td { border-bottom: 1px solid #e1e1e1; } -.widefat tfoot th { +.widefat tfoot th, +.widefat tfoot td { border-top: 1px solid #e1e1e1; border-bottom: none; } @@ -474,13 +507,18 @@ code { line-height: 1.5em; } -.widefat th { +.widefat th, +.widefat thead td, +.widefat tfoot td { text-align: left; line-height: 1.3em; font-size: 14px; } -.widefat th input { +.widefat th input, +.updates-table td input, +.widefat thead td input, +.widefat tfoot td input { margin: 0 0 0 8px; padding: 0; vertical-align: text-top; @@ -492,26 +530,21 @@ code { vertical-align: top; } -.widefat th input[type=checkbox] { - margin-top: -1px; -} - .widefat tbody th.check-column { padding: 9px 0 22px; } -.widefat.media .check-column { - padding-top: 8px; -} - -.widefat thead th.check-column, +.widefat thead td.check-column, .widefat tbody th.check-column, -.widefat tfoot th.check-column { +.updates-table tbody td.check-column, +.widefat tfoot td.check-column { padding: 11px 0 0 3px; } -.widefat thead th.check-column { - padding-top: 10px; +.widefat thead td.check-column, +.widefat tfoot td.check-column { + padding-top: 4px; + vertical-align: middle; } .update-php div.updated, @@ -539,85 +572,58 @@ code { margin: 10px 20px 0 2px; } -div.updated, -div.error { - padding: 0 0.6em; - margin: 5px 15px 2px; -} - -div.updated p, -div.error p { - margin: 0.5em 0; - padding: 2px; -} - -.wrap div.updated, -.wrap div.error, -.media-upload-form div.error { - margin: 5px 0 15px; -} - -div.updated { - border-left: 4px solid #7ad03a; - padding: 1px 12px; - background-color: #fff; - -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); - box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); -} - -div.error { - border-left: 4px solid #dd3d36; - background: #fff; - -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); - box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); - padding: 1px 12px; -} - -.attention { - color: #2ea2cc; -} - -.wrap h2, -.subtitle { - font-weight: normal; - margin: 0; -} - -.wrap h2 { +.wrap > h2:first-child, /* Back-compat for pre-4.4 */ +.wrap [class$="icon32"] + h2, /* Back-compat for pre-4.4 */ +.postbox .inside h2, /* Back-compat for pre-4.4 */ +.wrap h1 { font-size: 23px; font-weight: 400; + margin: 0; padding: 9px 15px 4px 0; line-height: 29px; } .subtitle { - color: #777; - font-size: 14px; + margin: 0; padding-left: 25px; + color: #555d66; + font-size: 14px; + font-weight: normal; } -.wrap .add-new-h2, -.wrap .add-new-h2:active { +.wrap .add-new-h2, /* deprecated */ +.wrap .add-new-h2:active, /* deprecated */ +.wrap .page-title-action, +.wrap .page-title-action:active { margin-left: 4px; padding: 4px 8px; position: relative; top: -3px; text-decoration: none; border: none; + border: 1px solid #ccc; -webkit-border-radius: 2px; border-radius: 2px; - background: #e0e0e0; + background: #f7f7f7; text-shadow: none; font-weight: 600; font-size: 13px; } -.wrap .add-new-h2:hover { - background: #2ea2cc; +.wrap .add-new-h2:hover, /* deprecated */ +.wrap .page-title-action:hover { + border-color: #008EC2; + background: #00a0d2; color: #fff; } -.wrap h2.long-header { +.wrap .page-title-action:focus { + border-color: #5b9dd9; + -webkit-box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 ); + box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 ); +} + +.wrap h1.long-header { padding-right: 0; } @@ -644,8 +650,9 @@ div#widgets-right .widget-top:hover, color: #000; } -.alternate, -.alt { +.striped > tbody > :nth-child(odd), +ul.striped > :nth-child(odd), +.alternate { background-color: #f9f9f9; } @@ -654,11 +661,6 @@ div#widgets-right .widget-top:hover, border-right-color: #99d; } -.media-upload-form label.form-help, -td.help { - color: #9a9a9a; -} - /* Helper classes for plugins to leverage the active WordPress color scheme */ .highlight { @@ -668,10 +670,10 @@ td.help { .wp-ui-primary { color: #fff; - background-color: #333; + background-color: #32373c; } .wp-ui-text-primary { - color: #333; + color: #32373c; } .wp-ui-highlight { @@ -691,7 +693,21 @@ td.help { } .wp-ui-text-icon { - color: #999; + color: #82878c; /* same as new icons */ +} + +/* For emoji replacement images */ +img.emoji { + display: inline !important; + border: none !important; + height: 1em !important; + width: 1em !important; + margin: 0 .07em !important; + vertical-align: -0.1em !important; + background: none !important; + padding: 0 !important; + -webkit-box-shadow: none !important; + box-shadow: none !important; } /*------------------------------------------------------------------------------ @@ -699,12 +715,9 @@ td.help { ------------------------------------------------------------------------------*/ .widget .widget-top, -.postbox h3, -.stuffbox h3, +.postbox .hndle, +.stuffbox .hndle, .control-section .accordion-section-title, -h3.dashboard-widget-title, -h3.dashboard-widget-title span, -h3.dashboard-widget-title small, .sidebar-name, #nav-menu-header, #nav-menu-footer, @@ -713,19 +726,20 @@ h3.dashboard-widget-title small, .side-info, #your-profile #rich_editing, .widefat thead th, -.widefat tfoot th { +.widefat thead td, +.widefat tfoot th, +.widefat tfoot td { line-height: 1.4em; } .widget .widget-top, .menu-item-handle { background: #fafafa; - color: #222; + color: #23282d; } -.postbox h3, -#namediv h3, -#submitdiv h3 { +.postbox .hndle, +.stuffbox .hndle { border-bottom: 1px solid #eee; } @@ -741,23 +755,34 @@ h3.dashboard-widget-title small, } /* @todo can we combine these into a class or use an existing dashicon one? */ -#welcome-panel.welcome-panel .welcome-panel-close::before, +.welcome-panel .welcome-panel-close:before, .tagchecklist span a:before, -#bulk-titles div a:before { +#bulk-titles div a:before, +.notice-dismiss:before { background: none; - color: #bbb; - content: '\f153'; - display: block !important; - font: normal 16px/1 'dashicons'; + color: #b4b9be; + content: "\f153"; + display: block; + font: normal 16px/20px dashicons; speak: none; height: 20px; - margin: 2px 0; text-align: center; width: 20px; - -webkit-font-smoothing: antialiased !important; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.welcome-panel .welcome-panel-close:before { + margin: 0; +} + +.tagchecklist span a:before, +#bulk-titles div a:before { + margin: 1px 0; } -#welcome-panel.welcome-panel .welcome-panel-close:hover:before, +.welcome-panel .welcome-panel-close:hover:before, +.welcome-panel .welcome-panel-close:focus:before, .tagchecklist span a:hover:before, #bulk-titles div a:hover:before { color: #c00; @@ -812,6 +837,7 @@ hr { } abbr.required, +span.required, .file-error, .widget-control-remove:hover, .row-actions .delete a:hover, @@ -865,6 +891,10 @@ abbr.required, padding: 6px 10px 8px; } +.misc-pub-filename { + word-wrap: break-word; +} + #minor-publishing-actions { padding: 10px 10px 0 10px; text-align: right; @@ -882,26 +912,6 @@ abbr.required, margin-left: 18px; } -.side-info { - margin: 0; - padding: 4px; - font-size: 11px; -} - -.side-info h5 { - padding-bottom: 7px; - font-size: 14px; - margin: 12px 2px 5px; - border-bottom: 1px solid #dadada; -} - -.side-info ul { - margin: 0; - padding-left: 18px; - list-style: square; - color: #666; -} - .approve, .unapproved .unapprove { display: none; @@ -918,161 +928,630 @@ th.action-links { text-align: right; } +/* Filter bar */ +.wp-filter { + display: inline-block; + position: relative; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + margin: 12px 0 25px; + padding: 0 10px; + width: 100%; + -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04); + box-shadow: 0 1px 1px rgba(0,0,0,0.04); + border: 1px solid #e5e5e5; + background: #fff; + color: #555; + font-size: 13px; +} -/*------------------------------------------------------------------------------ - 4.0 - Notifications -------------------------------------------------------------------------------*/ +.wp-filter a { + text-decoration: none; +} -#update-nag, -.update-nag { +.filter-count { display: inline-block; - line-height: 19px; - padding: 11px 15px; + vertical-align: middle; + min-width: 4em; +} + +.title-count, +.filter-count .count { + display: inline-block; + position: relative; + top: -1px; + padding: 4px 10px; + -webkit-border-radius: 30px; + border-radius: 30px; + background: #72777c; + color: #fff; font-size: 14px; - text-align: left; - margin: 25px 20px 0 2px; - background-color: #fff; - border-left: 4px solid #ffba00; - -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); - box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); + font-weight: 600; } -.update-message { - color: #000; +/* not a part of filter bar, but derived from it, so here for now */ +.title-count { + display: inline; + top: -3px; + margin-left: 5px; + margin-right: 20px; } -ul#dismissed-updates { - display: none; +.filter-items { + float: left; } -form.upgrade { - margin-top: 8px; +.filter-links { + display: inline-block; + margin: 0; } -form.upgrade .hint { - font-style: italic; - font-size: 85%; - margin: -0.5em 0 2em 0; +.filter-links li { + display: inline-block; + margin: 0; } -.update-php .spinner { - float: none; - margin: -4px 0; +.filter-links li > a { + display: inline-block; + margin: 0 10px; + padding: 15px 0; + border-bottom: 4px solid #fff; + color: #666; + cursor: pointer; } -#ajax-loading, -.ajax-loading, -.ajax-feedback, -.imgedit-wait-spin, -.list-ajax-loading { /* deprecated */ - visibility: hidden; +.filter-links .current { + -webkit-box-shadow: none; + box-shadow: none; + border-bottom: 4px solid #666; + color: #23282d; } -#ajax-response.alignleft { - margin-left: 2em; +.filter-links li > a:hover, +.filter-links li > a:focus, +.show-filters .filter-links a.current:hover, +.show-filters .filter-links a.current:focus { + color: #00a0d2; } -/* @todo: this does not need its own section anymore */ -/*------------------------------------------------------------------------------ - 6.0 - Admin Header -------------------------------------------------------------------------------*/ -#adminmenu a, -#sidemenu a, -#taglist a, -#catlist a { - text-decoration: none; +.wp-filter .search-form { + float: right; + margin: 10px 0; } -/*------------------------------------------------------------------------------ - 6.1 - Screen Options Tabs -------------------------------------------------------------------------------*/ +.wp-filter .search-form input[type="search"] { + margin: 0; + padding: 3px 5px; + width: 280px; + max-width: 100%; + font-size: 16px; + font-weight: 300; + line-height: 1.5; +} -#screen-options-wrap, -#contextual-help-wrap { +.wp-filter .search-form select { margin: 0; - padding: 8px 20px 12px; - position: relative; + height: 32px; + vertical-align: top; } -#contextual-help-wrap { - overflow: auto; - margin-left: 0 !important; +.wp-filter .search-form.search-plugins { + display: inline-block; } -#screen-meta .screen-reader-text { - visibility: hidden; +.wp-filter .drawer-toggle { + display: inline-block; + margin: 0 10px; + padding: 4px 6px; + color: #666; + cursor: pointer; } -#screen-meta-links { - margin: 0 20px 0 0; +.wp-filter .drawer-toggle:before { + display: inline-block; + vertical-align: top; + content: "\f111"; + margin: 0 5px 0 0; + width: 16px; + height: 16px; + color: #72777c; + -webkit-transition: color .1s ease-in 0; + transition: color .1s ease-in 0; + font-family: dashicons; + font-size: 16px; + line-height: 1; + text-align: center; + text-decoration: inherit; + font-weight: normal; + font-style: normal; + -webkit-font-smoothing: antialiased; } -#screen-meta-links a { - padding: 3px 6px 3px 16px; +.wp-filter .drawer-toggle:hover, +.wp-filter .drawer-toggle:hover:before { + color: #00a0d2; } -#screen-meta-links a:focus { - outline: none; +.wp-filter .drawer-toggle.current:before { + color: #fff; } -/* screen options and help tabs revert */ -#screen-meta { +.wp-filter .favorites-form { display: none; - margin: 0 20px -1px 0px; - position: relative; - background-color: #fff; - border: 1px solid #ddd; - border-top: none; - -webkit-box-shadow: 0 1px 0 rgba(0,0,0,.025); - box-shadow: 0 1px 0 rgba(0,0,0,.025); + margin: 0 -20px; + padding: 20px; + border-top: 1px solid #eee; + background: #fafafa; + overflow: hidden; + width: 100%; } -#screen-options-link-wrap, -#contextual-help-link-wrap { - float: right; - height: 28px; - margin: 0 0 0 6px; - border: 1px solid #ddd; - border-top: none; - background: #fff; - -webkit-box-shadow: 0 1px 1px -1px rgba(0,0,0,0.1); - box-shadow: 0 1px 1px -1px rgba(0,0,0,0.1); +.show-favorites-form .wp-filter .favorites-form { + display: block; } -#screen-meta-links .screen-meta-toggle { - position: relative; - top: 0; -} +.filter-drawer { + display: none; + margin: 0 -20px; + padding: 20px; + border-top: 1px solid #eee; + background: #fafafa; +} + +.show-filters .filter-drawer { + display: block; + overflow: hidden; + width: 100%; +} -#screen-meta-links a { - color: #777; +.show-filters .wp-filter .drawer-toggle:hover, +.show-filters .wp-filter .drawer-toggle:focus { + background: rgb(46, 162, 204); } -#screen-meta-links a:hover, -#screen-meta-links a:active, -#screen-meta-links a:focus { - color: #333; +.show-filters .filter-links a.current { + border-bottom: none; +} + +.show-filters .wp-filter .drawer-toggle { + -webkit-border-radius: 2px; + border-radius: 2px; + border: none; + background: #72777c; + color: #fff; } -#screen-meta-links a:focus { - border-color: #aaa; - -webkit-box-shadow: 0 2px 3px rgba(0,0,0,0.15); - box-shadow: 0 2px 3px rgba(0,0,0,0.15); +.show-filters .wp-filter .drawer-toggle:before { + color: #fff; } -#screen-meta-links a.show-settings { +.filter-group { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + position: relative; + float: left; + margin: 0 1% 0 0; + padding: 20px 10px 10px; + width: 24%; + background: #fff; + border: 1px solid #e5e5e5; + -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04); + box-shadow: 0 1px 1px rgba(0,0,0,0.04); +} + +.filter-group legend { + position: absolute; + top: 10px; display: block; - font-size: 13px; - height: 22px; - line-height: 22px; + margin: 0; + padding: 0; + font-size: 1em; + font-weight: 600; +} + +.filter-drawer .filter-group-feature { + margin: 28px 0 0; + list-style-type: none; + font-size: 12px; +} + +.filter-drawer .filter-group-feature input, +.filter-drawer .filter-group-feature label { + display: inline-block; + margin: 7px 4px 7px 0; + line-height: 16px; +} + +.filter-drawer .buttons { + margin-bottom: 20px; +} + +.filter-drawer .buttons .button span { + display: inline-block; + opacity: 0.8; + font-size: 12px; + text-indent: 10px; +} + +.wp-filter .button.clear-filters { + display: none; + margin-left: 10px; +} + +.filtered-by { + display: none; + margin: 0; +} + +.filtered-by > span { + font-weight: 600; +} + +.filtered-by a { + margin-left: 10px; +} + +.filtered-by .tags { + display: inline; +} + +.filtered-by .tag { + margin: 0 5px; + padding: 4px 8px; + border: 1px solid #e5e5e5; + -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04); + box-shadow: 0 1px 1px rgba(0,0,0,0.04); + background: #fff; + font-size: 11px; +} + +.filters-applied .filter-group, +.filters-applied .filter-drawer .buttons, +.filters-applied .filter-drawer br { + display: none !important; +} + +.filters-applied .filtered-by { + display: block; +} + +.filters-applied .filter-drawer { + padding: 20px; +} + +.show-filters .content-filterable, +.show-filters.filters-applied.loading-content .content-filterable, +.loading-content .content-filterable, +.error .content-filterable { + display: none; +} + +.show-filters.filters-applied .content-filterable { + display: block; +} + +.loading-content .spinner { + display: block; + margin: 40px auto 0; + float: none; +} + +@media only screen and (max-width: 1120px) { + .filter-drawer { + border-bottom: 1px solid #eee; + } + + .filter-group { + margin-bottom: 0; + margin-top: 5px; + width: 100%; + } + + .filter-group li { + margin: 10px 0; + } +} + +@media only screen and (max-width: 1000px) { + .filter-items { + float: none; + } + + .wp-filter .media-toolbar-primary, + .wp-filter .media-toolbar-secondary, + .wp-filter .search-form { + float: none; /* Remove float from media-views.css */ + position: relative; + max-width: 100%; + } +} + +@media only screen and (max-width: 782px) { + .filter-group li { + padding: 0; + width: 50%; + } +} + +@media only screen and (max-width: 320px) { + .filter-count { + display: none; + } + + .wp-filter .drawer-toggle { + margin: 10px 0; + } + + .filter-group li, + .wp-filter .search-form input[type="search"] { + width: 100%; + } +} + +/*------------------------------------------------------------------------------ + 4.0 - Notifications +------------------------------------------------------------------------------*/ + +.notice, +div.updated, +div.error { + background: #fff; + border-left: 4px solid #fff; + -webkit-box-shadow: 0 1px 1px 0 rgba( 0, 0, 0, 0.1 ); + box-shadow: 0 1px 1px 0 rgba( 0, 0, 0, 0.1 ); + margin: 5px 15px 2px; + padding: 1px 12px; +} + +.notice p, +.notice-title, +div.updated p, +div.error p, +.form-table td .notice p { + margin: 0.5em 0; + padding: 2px; +} + +.error a { + text-decoration: underline; +} + +.updated a { + padding-bottom: 2px; +} + +.notice-alt { + -webkit-box-shadow: none; + box-shadow: none; +} + +.notice-large { + padding: 10px 20px; +} + +.notice-title { + display: inline-block; + color: #23282d; + font-size: 18px; +} + +.wp-core-ui .notice.is-dismissible { + padding-right: 38px; + position: relative; +} + +.notice-dismiss { + position: absolute; + top: 0; + right: 1px; + border: none; + margin: 0; + padding: 9px; + background: none; + color: #b4b9be; + cursor: pointer; +} + +.notice-dismiss:hover:before, +.notice-dismiss:active:before, +.notice-dismiss:focus:before { + color: #c00; +} + +.notice-dismiss:focus { + outline: none; + -webkit-box-shadow: 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, .8); + box-shadow: 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, .8); +} + +.ie8 .notice-dismiss:focus { + outline: 1px solid #5b9dd9; +} + +.notice-success, +div.updated { + border-left-color: #46b450; +} + +.notice-success.notice-alt { + background-color: #ecf7ed; +} + +.notice-warning { + border-left-color: #ffb900; +} + +.notice-warning.notice-alt { + background-color: #fff8e5; +} + +.notice-error, +div.error { + border-left-color: #dc3232; +} + +.notice-error.notice-alt { + background-color: #fbeaea; +} + +.notice-info { + border-left-color: #00a0d2; +} + +.notice-info.notice-alt { + background-color: #e5f5fa; +} + +.wrap .notice, +.wrap div.updated, +.wrap div.error, +.media-upload-form .notice, +.media-upload-form div.error { + margin: 5px 0 15px; +} + +#update-nag, +.update-nag { + display: inline-block; + line-height: 19px; + padding: 11px 15px; + font-size: 14px; + text-align: left; + margin: 25px 20px 0 2px; + background-color: #fff; + border-left: 4px solid #ffba00; + -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); + box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); +} + +.update-message { + color: #000; +} + +ul#dismissed-updates { + display: none; +} + +form.upgrade { + margin-top: 8px; +} + +form.upgrade .hint { + font-style: italic; + font-size: 85%; + margin: -0.5em 0 2em 0; +} + +.update-php .spinner { + float: none; + margin: -4px 0; +} + +#ajax-loading, +.ajax-loading, +.ajax-feedback, +.imgedit-wait-spin, +.list-ajax-loading { /* deprecated */ + visibility: hidden; +} + +#ajax-response.alignleft { + margin-left: 2em; +} + +/* @todo: this does not need its own section anymore */ +/*------------------------------------------------------------------------------ + 6.0 - Admin Header +------------------------------------------------------------------------------*/ +#adminmenu a, +#taglist a, +#catlist a { text-decoration: none; - z-index: 1; } -#screen-meta-links a:after { +/*------------------------------------------------------------------------------ + 6.1 - Screen Options Tabs +------------------------------------------------------------------------------*/ + +#screen-options-wrap, +#contextual-help-wrap { + margin: 0; + padding: 8px 20px 12px; + position: relative; +} + +#contextual-help-wrap { + overflow: auto; + margin-left: 0 !important; +} + +#screen-meta .screen-reader-text { + visibility: hidden; +} + +#screen-meta-links { + margin: 0 20px 0 0; +} + +/* screen options and help tabs revert */ +#screen-meta { + display: none; + margin: 0 20px -1px 0px; + position: relative; + background-color: #fff; + border: 1px solid #ddd; + border-top: none; + -webkit-box-shadow: 0 1px 0 rgba(0,0,0,.025); + box-shadow: 0 1px 0 rgba(0,0,0,.025); +} + +#screen-options-link-wrap, +#contextual-help-link-wrap { + float: right; + height: 28px; + margin: 0 0 0 6px; + border: 1px solid #ddd; + border-top: none; + background: #fff; + -webkit-box-shadow: 0 1px 1px -1px rgba(0,0,0,0.1); + box-shadow: 0 1px 1px -1px rgba(0,0,0,0.1); +} + +#screen-meta-links .screen-meta-toggle { + position: relative; + top: 0; +} + +#screen-meta-links .show-settings { + border: 0; + background: none; + -webkit-border-radius: 0; + border-radius: 0; + color: #72777c; + line-height: 1.7; + padding: 3px 6px 3px 16px; +} + +#screen-meta-links .show-settings:hover, +#screen-meta-links .show-settings:active, +#screen-meta-links .show-settings:focus { + color: #32373c; +} + +#screen-meta-links .show-settings:active { + -webkit-box-shadow: none; + box-shadow: none; + -webkit-transform: none; + -ms-transform: none; + transform: none; +} + +#screen-meta-links .show-settings:after { right: 0; - content: '\f140'; - font: normal 20px/1 'dashicons'; + content: "\f140"; + font: normal 20px/1 dashicons; speak: none; display: inline-block; padding: 0 5px 0 0; @@ -1082,16 +1561,13 @@ form.upgrade .hint { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; text-decoration: none !important; - color: #bbb; + color: #72777c; } -#screen-meta-links a.screen-meta-active:after { - content: '\f142'; +#screen-meta-links .screen-meta-active:after { + content: "\f142"; } -#screen-meta-links a.show-settings:hover { - text-decoration: none; -} /* end screen options and help tabs */ .toggle-arrow { @@ -1107,10 +1583,17 @@ form.upgrade .hint { background-position: bottom left; } -#screen-options-wrap h5, +#screen-options-wrap h5, /* Back-compat for old plugins */ +#screen-options-wrap legend, #contextual-help-wrap h5 { - margin: 8px 0; - font-size: 13px; + margin: 0; + padding: 8px 0; + font-size: 13px; + font-weight: 600; +} + +.ie8 #screen-options-wrap legend { + color: inherit; } .metabox-prefs label { @@ -1119,23 +1602,55 @@ form.upgrade .hint { line-height: 30px; } -.metabox-prefs label input[type=checkbox] { - margin-top: -4px; +#number-of-columns { + display: inline-block; + vertical-align: middle; + line-height: 30px; +} + +.metabox-prefs input[type=checkbox] { + margin-top: 0; margin-right: 6px; } -.metabox-prefs label input { - margin: 0 5px 0 2px; +.metabox-prefs label input, +.metabox-prefs label input[type=checkbox] { + margin: -4px 5px 0 0; } .metabox-prefs .columns-prefs label input { - margin: 0 2px; + margin: -1px 2px 0 0; } .metabox-prefs label a { display: none; } +.metabox-prefs .screen-options input, +.metabox-prefs .screen-options label { + margin-top: 0; + margin-bottom: 0; + vertical-align: middle; +} + +.metabox-prefs .screen-options .screen-per-page { + margin-right: 15px; +} + +.metabox-prefs .screen-options label { + line-height: 28px; + padding-right: 0; +} + +.screen-options + .screen-options { + margin-top: 10px; +} + +.metabox-prefs .submit { + margin-top: 1em; + padding: 0; +} + /*------------------------------------------------------------------------------ 6.2 - Help Menu ------------------------------------------------------------------------------*/ @@ -1196,13 +1711,13 @@ form.upgrade .hint { } .contextual-help-tabs a:hover { - color: #333; + color: #32373c; } .contextual-help-tabs .active { padding: 0; margin: 0 -1px 0 0; - border-left: 2px solid #2ea2cc; + border-left: 2px solid #00a0d2; background: #f6fbfd; -webkit-box-shadow: 0 2px 0 rgba(0,0,0,0.02), 0 1px 0 rgba(0,0,0,0.02); box-shadow: 0 2px 0 rgba(0,0,0,0.02), 0 1px 0 rgba(0,0,0,0.02); @@ -1210,7 +1725,7 @@ form.upgrade .hint { .contextual-help-tabs .active a { border-color: #e1e1e1; - color: #333; + color: #32373c; } .contextual-help-tabs-wrap { @@ -1251,28 +1766,22 @@ html.wp-toolbar { box-sizing: border-box; } -.narrow { - width: 70%; - margin-bottom: 40px; -} - -.narrow p { - line-height: 150%; -} - .widefat th, .widefat td { - overflow: hidden; color: #555; } -.widefat th { +.widefat th, +.widefat thead td, +.widefat tfoot td { font-weight: normal; } .widefat thead tr th, -.widefat tfoot tr th { - color: #333; +.widefat thead tr td, +.widefat tfoot tr th, +.widefat tfoot tr td { + color: #32373c; } .widefat td p { @@ -1282,7 +1791,7 @@ html.wp-toolbar { .widefat p, .widefat ol, .widefat ul { - color: #333; + color: #32373c; } .widefat .column-comment p { @@ -1305,8 +1814,25 @@ html.wp-toolbar { } .metabox-holder .postbox-container .empty-container { - border: 3px dashed #bbb; + border: 3px dashed #b4b9be; height: 250px; + position: relative; +} + +.metabox-holder .postbox-container .empty-container:after { + content: attr(data-emptystring); + margin: auto; + position: absolute; + top: 0; + left: 0; + bottom: 0; + right: 0; + height: 1em; + width: 200px; + text-align: center; + color: #ccc; + font-size:18px; + display: none; } .metabox-holder.columns-1 .postbox-container .empty-container, @@ -1343,6 +1869,7 @@ html.wp-toolbar { } } +.js .widget .widget-top, .js .postbox .hndle { cursor: move; } @@ -1353,17 +1880,19 @@ html.wp-toolbar { } .postbox .handlediv { + display: none; float: right; - width: 27px; - height: 30px; + width: 36px; + height: 36px; + padding: 0; } .js .postbox .handlediv { - cursor: pointer; + display: block; } .sortable-placeholder { - border: 1px dashed #bbb; + border: 1px dashed #b4b9be; margin-bottom: 20px; } @@ -1374,20 +1903,15 @@ html.wp-toolbar { line-height: 1; } -.postbox h3, -.stuffbox h3 { - margin-top: 1px; +/* user-select is not a part of the CSS standard - may change behavior in the future */ +.postbox .hndle, +.stuffbox .hndle { -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; } -.js .widget .widget-top, -.js .postbox h3 { - cursor: move; -} - .postbox .inside, .stuffbox .inside { padding: 0 12px 12px; @@ -1425,7 +1949,7 @@ html.wp-toolbar { } .columns-prefs label { - padding: 0 5px; + padding: 0 10px 0 0; } /* @todo: what is this doing here */ @@ -1454,9 +1978,8 @@ html.wp-toolbar { bottom: 0; left: 0; right: 0; - padding: 10px 0; - margin-right: 20px; - color: #777; + padding: 10px 20px; + color: #555d66; } #wpfooter p { @@ -1482,48 +2005,76 @@ html.wp-toolbar { ------------------------------------------------------------------------------*/ .nav-tab { + float: left; border: 1px solid #ccc; border-bottom: none; - background: #e4e4e4; + margin-left: 0.5em; /* half the font size so set the font size properly */ + padding: 5px 10px; + font-size: 14px; + line-height: 24px; + font-weight: 600; + background: #e5e5e5; color: #555; + text-decoration: none; + white-space: nowrap; +} + +h3 .nav-tab, /* Back-compat for pre-4.4 */ +.nav-tab-small .nav-tab { + padding: 5px 14px; font-size: 12px; line-height: 16px; - display: inline-block; - padding: 4px 14px 6px; - text-decoration: none; - margin: -4px 4px -1px 0; } -.nav-tab:hover { +.nav-tab:hover, +.nav-tab:focus { background-color: #fff; - color: #464646; + color: #444; +} + +.nav-tab-active, +.nav-tab:focus:active { + -webkit-box-shadow: none; + box-shadow: none; } .nav-tab-active { - color: #464646; + margin-bottom: -1px; + color: #444; } .nav-tab-active, -.nav-tab-active:hover { +.nav-tab-active:hover, +.nav-tab-active:focus, +.nav-tab-active:focus:active { border-bottom: 1px solid #f1f1f1; background: #f1f1f1; color: #000; } -h2.nav-tab-wrapper, +h1.nav-tab-wrapper, /* Back-compat for pre-4.4 */ +.wrap h2.nav-tab-wrapper, /* higher specificity to override .wrap > h2:first-child */ h3.nav-tab-wrapper { border-bottom: 1px solid #ccc; + margin: 0; + padding-top: 9px; padding-bottom: 0; - padding-left: 10px; + line-height: inherit; } -h2 .nav-tab { - padding: 6px 10px; - font-weight: bold; - font-size: 15px; - line-height: 24px; -} +/* Back-compat for plugins. Deprecated. Use .wp-clearfix instead. */ +.nav-tab-wrapper:not(.wp-clearfix):after { + content: ""; + display: table; + clear: both; + } +.ie8 .nav-tab-wrapper { + /* contain floats establishing a new block formatting context */ + display: inline-block; + width: 100%; + vertical-align: top; +} /*------------------------------------------------------------------------------ 26.0 - Misc @@ -1533,78 +2084,43 @@ h2 .nav-tab { background: url(../images/spinner.gif) no-repeat; -webkit-background-size: 20px 20px; background-size: 20px 20px; - display: none; + display: inline-block; + visibility: hidden; float: right; + vertical-align: middle; opacity: 0.7; filter: alpha(opacity=70); width: 20px; height: 20px; - margin: 2px 5px 0; + margin: 4px 10px 0; +} + +.spinner.is-active { + visibility: visible; } #template div { margin-right: 190px; } -.metabox-holder h3 { +.metabox-holder .stuffbox > h3, /* Back-compat for pre-4.4 */ +.metabox-holder .postbox > h3, /* Back-compat for pre-4.4 */ +.metabox-holder h3.hndle, /* Back-compat for pre-4.4 */ +.metabox-holder h2.hndle { font-size: 14px; padding: 8px 12px; margin: 0; line-height: 1.4; } -#templateside ul li a { - text-decoration: none; -} - -#sidemenu { - margin: -30px 15px 0 315px; - list-style: none; - position: relative; - float: right; - padding-left: 10px; - font-size: 12px; -} - -#sidemenu a { - padding: 0 7px; - display: block; - float: left; - line-height: 28px; - border-top: 1px solid #f9f9f9; - border-bottom: 1px solid #dfdfdf; - background-color: #f9f9f9; - -webkit-transition: none; - transition: none; -} - -#sidemenu li { - display: inline; - line-height: 200%; - list-style: none; - text-align: center; - white-space: nowrap; - margin: 0; - padding: 0; -} - -/* @todo: remove border radius */ -#sidemenu a.current { - font-weight: normal; - padding-left: 6px; - padding-right: 6px; - -webkit-border-top-left-radius: 3px; - border-top-left-radius: 3px; - -webkit-border-top-right-radius: 3px; - border-top-right-radius: 3px; - border: 1px solid #dfdfdf; - border-bottom-color: #f1f1f1; - background-color: #f1f1f1; - color: #000; +/* Back-compat for nav-menus screen */ +.nav-menus-php .metabox-holder h3 { + padding: 10px 10px 11px 14px; + line-height: 21px; } -#sidemenu li a .count-0 { - display: none; +#templateside ul li a { + text-decoration: none; } .plugin-install #description, @@ -1618,6 +2134,7 @@ table .column-rating { text-align: left; } +.attention, .error-message { color: red; font-weight: 600; @@ -1639,16 +2156,14 @@ body.iframe { /* - Only used once or twice in all of WP - deprecate for global style ------------------------------------------------------------------------------*/ -td.media-icon { +.media-icon { + width: 62px; /* icon + border */ text-align: center; - width: 80px; - padding-top: 8px; - padding-bottom: 8px; } -td.media-icon img { - max-width: 80px; - max-height: 60px; +.media-icon img { + border: 1px solid #e5e5e5; + border: 1px solid rgba(0, 0, 0, 0.07); } #howto { @@ -1666,11 +2181,21 @@ td.media-icon img { width: auto; } -#post-body #post-body-content #namediv h3 { +#post-body #post-body-content #namediv h3, /* Back-compat for pre-4.4 */ +#post-body #post-body-content #namediv h2 { margin-top: 0; } -#namediv h3 label { +.edit-comment-author { + font-size: 14px; + line-height: 1.4; + font-weight: 600; + color: #222; + margin: 2px 0 0 9px; +} + +#namediv h3 label, /* Back-compat for pre-4.4 */ +#namediv h2 label { vertical-align: baseline; } @@ -1759,7 +2284,7 @@ div.star-holder .star-rating { -webkit-font-smoothing: antialiased; font-size: 20px; line-height: 1; - font-family: 'dashicons'; + font-family: dashicons; text-decoration: inherit; font-weight: normal; font-style: normal; @@ -1767,15 +2292,15 @@ div.star-holder .star-rating { -webkit-transition: color .1s ease-in 0; transition: color .1s ease-in 0; text-align: center; - color: #0074a2; + color: #ffb900; } .star-rating .star-full:before { - content:'\f155'; + content: "\f155"; } .star-rating .star-half:before { - content:'\f459'; + content: "\f459"; } .rtl .star-rating .star-half { @@ -1785,7 +2310,7 @@ div.star-holder .star-rating { } .star-rating .star-empty:before { - content:'\f154'; + content: "\f154"; } div.action-links { @@ -1795,21 +2320,29 @@ div.action-links { /* Plugin install thickbox */ #plugin-information { - background: #fcfcfc; + background: #fff; position: fixed; top: 0; right: 0; bottom: 0; left: 0; - height: auto; + height: 100%; padding: 0; } +#plugin-information-scrollable { + overflow: auto; + -webkit-overflow-scrolling: touch; + height: 100%; +} + #plugin-information-title { - padding: 0 76px 0 20px; + padding: 0 20px; + background: #f5f5f5; font-size: 22px; font-weight: 600; line-height: 56px; + position: relative; top: 0; right: 0; left: 0; @@ -1819,20 +2352,72 @@ div.action-links { white-space: nowrap; } +#plugin-information-title.with-banner { + margin-right: 0; + height: 250px; + bottom: 250px; + -webkit-background-size: cover; + background-size: cover; +} + +#plugin-information-title h2 { + font-size: 1em; + font-weight: bold; + padding: 0; + margin: 0; + max-width: 680px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +#plugin-information-title.with-banner h2 { + font-family: "Helvetica Neue", sans-serif; + display: inline-block; + font-size: 30px; + line-height: 50px; + padding: 0 15px; + margin: 174px 0 0 10px; + color: #fff; + background: rgba( 30, 30, 30, 0.9 ); + text-shadow: 0 1px 3px rgba( 0, 0, 0, 0.4 ); + -webkit-box-shadow: 0 0 30px rgba( 255, 255, 255, 0.1 ); + box-shadow: 0 0 30px rgba( 255, 255, 255, 0.1 ); + -webkit-border-radius: 8px; + border-radius: 8px; +} + +#plugin-information-title div.vignette { + display: none; +} + +#plugin-information-title.with-banner div.vignette { + display: block; + float: right; + top: 0; + height: 250px; + width: 772px; + margin: 0 -20px; + background: transparent; + -webkit-box-shadow: inset 0 0 50px 4px rgba( 0, 0, 0, 0.2 ), inset 0 -1px 0 rgba( 0, 0, 0, 0.1 ); + box-shadow: inset 0 0 50px 4px rgba( 0, 0, 0, 0.2 ), inset 0 -1px 0 rgba( 0, 0, 0, 0.1 ); +} + #plugin-information-tabs { padding: 0 16px; - position: absolute; - top: 56px; + position: relative; right: 0; left: 0; height: 36px; z-index: 1; + border-bottom: 1px solid #ddd; + background: #f3f3f3; } #plugin-information-tabs a { position: relative; float: left; - padding: 8px 10px 9px; + padding: 9px 10px; margin: 0; height: 18px; line-height: 18px; @@ -1843,11 +2428,17 @@ div.action-links { } #plugin-information-tabs a.current { - margin: -1px -1px 0; + margin: 0 -1px 0; background: #fff; border: 1px solid #ddd; - border-bottom: none; - color: #333; + border-bottom-color: #fff; + padding-top: 8px; + color: #32373c; +} + +#plugin-information-tabs.with-banner a.current { + border-top: none; + padding-top: 9px; } #plugin-information-tabs a:active, @@ -1856,25 +2447,34 @@ div.action-links { } #plugin-information-content { + overflow: hidden; /* equal height column trick */ background: #fff; - border-top: 1px solid #ddd; - border-bottom: 1px solid #ddd; - position: absolute; - top: 90px; + position: relative; + top: 0; right: 0; - bottom: 58px; left: 0; + min-height: 100%; + /* Height of title + tabs + install now */ + min-height: -webkit-calc( 100% - 152px ); + min-height: calc( 100% - 152px ); +} + +#plugin-information-content.with-banner { + /* Height of banner + tabs + install now */ + min-height: -webkit-calc( 100% - 346px ); + min-height: calc( 100% - 346px ); } #section-holder { - margin: 0; - padding: 10px 26px; - position: absolute; + position: relative; top: 0; right: 250px; bottom: 0; left: 0; - overflow: auto; + margin-right: 250px; /* FYI box */ + padding: 10px 26px; + margin-bottom: -99939px; /* 60px less than the padding below to accommodate footer */ + padding-bottom: 99999px; /* equal height column trick */ } #section-holder .updated { @@ -1882,20 +2482,21 @@ div.action-links { } #plugin-information .fyi { - background: #f3f3f3; - border-left: 1px solid #ddd; - color: #666; - padding: 16px; - position: absolute; + float: right; + position: relative; top: 0; right: 0; - bottom: 0; + padding: 16px; + margin-bottom: -99939px; /* 60px less than the padding below to accommodate footer */ + padding-bottom: 99999px; /* equal height column trick */ width: 217px; - overflow: auto; + border-left: 1px solid #ddd; + background: #f3f3f3; + color: #666; } #plugin-information .fyi strong { - color: #464646; + color: #444; } #plugin-information .fyi h3 { @@ -1922,15 +2523,75 @@ div.action-links { margin: 0 0 10px; } +#plugin-information .fyi-description { + margin-top: 0; +} + +#plugin-information .counter-container { + margin: 3px 0; +} + +#plugin-information .counter-label { + float: left; + margin-right: 5px; + min-width: 55px; +} + +#plugin-information .counter-back { + height: 17px; + width: 92px; + background-color: #e5e5e5; + float: left; +} + +#plugin-information .counter-bar { + height: 17px; + background-color: #ffc733; /* slightly lighter than stars due to larger expanse */ + float: left; +} + +#plugin-information .counter-count { + margin-left: 5px; +} + +#plugin-information .fyi ul.contributors { + margin-top: 10px; +} + +#plugin-information .fyi ul.contributors li { + display: inline-block; + margin-right: 8px; + vertical-align: middle; +} + +#plugin-information .fyi ul.contributors li { + display: inline-block; + margin-right: 8px; + vertical-align: middle; +} + +#plugin-information .fyi ul.contributors li img { + vertical-align: middle; + margin-right: 4px; +} + #plugin-information-footer { - padding: 15px 16px; + padding: 13px 16px; position: absolute; right: 0; bottom: 0; left: 0; - height: 28px; + height: 33px; /* 33+13+13+1=60 */ + border-top: 1px solid #ddd; + background: #f3f3f3; +} + +/* rtl:ignore */ +#plugin-information .section { + direction: ltr; } +/* rtl:ignore */ #plugin-information .section ul, #plugin-information .section ol { list-style-type: disc; @@ -1958,6 +2619,7 @@ div.action-links { box-shadow: 0 1px 2px rgba( 0, 0, 0, 0.3 ); } +/* rtl:ignore */ #plugin-information #section-screenshots li p { font-style: italic; padding-left: 20px; @@ -1969,25 +2631,101 @@ div.action-links { border: 1px solid #ccc; } +/* rtl:ignore */ +#plugin-information .review { + overflow: hidden; /* clearfix */ + width: 100%; + margin-bottom: 20px; + border-bottom: 1px solid #e5e5e5; +} + +#plugin-information .review-title-section { + overflow: hidden; /* clearfix */ +} + +/* rtl:ignore */ +#plugin-information .review-title-section h4 { + display: inline-block; + float: left; + margin: 0 6px 0 0; +} + +#plugin-information .reviewer-info p { + clear: both; + margin: 0; + padding-top: 2px; +} + +/* rtl:ignore */ +#plugin-information .reviewer-info .avatar { + float: left; + margin: 4px 6px 0 0; +} + +/* rtl:ignore */ +#plugin-information .reviewer-info .star-rating { + float: left; +} + +/* rtl:ignore */ +#plugin-information .review-meta { + float: left; + margin-left: 0.75em; +} + +/* rtl:ignore */ +#plugin-information .review-body { + float: left; + width: 100%; +} + .plugin-version-author-uri { font-size: 13px; } -@media screen and ( max-width: 782px ) { - #plugin-information-content { - overflow: auto; - bottom: 58px; +@media screen and ( max-width: 771px ) { + #plugin-information-title.with-banner { + height: 100px; + bottom: 100px; + } + + #plugin-information-title.with-banner h2 { + margin-top: 30px; + font-size: 20px; + line-height: 40px; + max-width: 85%; + } + + #plugin-information-title.with-banner div.vignette { + height: 100px; + bottom: 100px; + width: 800%; + } + + #plugin-information-tabs { + overflow: hidden; /* clearfix */ + padding: 0; + height: auto; /* let tabs wrap */ + } + + #plugin-information-tabs a.current { + margin-bottom: 0; + border-bottom: none; } #plugin-information .fyi { + float: none; border: 1px solid #ddd; position: static; width: auto; - margin: 26px 26px 16px; + margin: 26px 26px 0; + padding-bottom: 0; /* reset from the two column height fix */ } #section-holder { position: static; + margin: 0; + padding-bottom: 70px; /* reset from the two column height fix, plus accomodate footer */ } #plugin-information .fyi h3, @@ -2002,30 +2740,63 @@ div.action-links { } /* Thickbox for Plugin Install screen */ +body.about-php #TB_window, body.plugin-install-php #TB_window, body.import-php #TB_window, body.plugins-php #TB_window, body.update-core-php #TB_window, body.index-php #TB_window { - background: #fcfcfc url( ../images/spinner.gif ) no-repeat center; + background: #fcfcfc; +} + +/* IE 8 needs a change in the pseudo element content */ +.ie8 body.about-php #TB_window:before, +.ie8 body.plugin-install-php #TB_window:before, +.ie8 body.import-php #TB_window:before, +.ie8 body.plugins-php #TB_window:before, +.ie8 body.update-core-php #TB_window:before, +.ie8 body.index-php #TB_window:before { + content: " "; + background: none; +} + +body.about-php #TB_window.thickbox-loading:before, +body.plugin-install-php #TB_window.thickbox-loading:before, +body.import-php #TB_window.thickbox-loading:before, +body.plugins-php #TB_window.thickbox-loading:before, +body.update-core-php #TB_window.thickbox-loading:before, +body.index-php #TB_window.thickbox-loading:before { + content: ""; + display: block; + width: 20px; + height: 20px; + position: absolute; + left: 50%; + top: 50%; + z-index: -1; + margin: -10px 0 0 -10px; + background: #fcfcfc url(../images/spinner.gif) no-repeat center; + -webkit-background-size: 20px 20px; + background-size: 20px 20px; + -webkit-transform: translateZ(0); + transform: translateZ(0); } @media print, - (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 120dpi) { - body.plugin-install-php #TB_window, - body.import-php #TB_window, - body.plugins-php #TB_window, - body.update-core-php #TB_window, - body.index-php #TB_window { - background: #fcfcfc url( ../images/spinner-2x.gif ) no-repeat center; - -webkit-background-size: 20px 20px; - background-size: 20px 20px; + body.about-php #TB_window.thickbox-loading:before, + body.plugin-install-php #TB_window.thickbox-loading:before, + body.import-php #TB_window.thickbox-loading:before, + body.plugins-php #TB_window.thickbox-loading:before, + body.update-core-php #TB_window.thickbox-loading:before, + body.index-php #TB_window.thickbox-loading:before { + background-image: url(../images/spinner-2x.gif); } } +body.about-php #TB_title, body.plugin-install-php #TB_title, body.import-php #TB_title, body.plugins-php #TB_title, @@ -2035,6 +2806,7 @@ body.index-php #TB_title { height: 1px; } +body.about-php #TB_ajaxWindowTitle, body.plugin-install-php #TB_ajaxWindowTitle, body.import-php #TB_ajaxWindowTitle, body.plugins-php #TB_ajaxWindowTitle, @@ -2043,22 +2815,70 @@ body.index-php #TB_ajaxWindowTitle { display: none; } +/* only on these screens */ +.about-php #TB_closeWindowButton, +.plugin-install-php #TB_closeWindowButton, +.import-php #TB_closeWindowButton, +.plugins-php #TB_closeWindowButton, +.update-core-php #TB_closeWindowButton, +.index-php #TB_closeWindowButton { + left: auto; + right: -30px; + color: #eee; +} + + +body.about-php #TB_closeWindowButton:hover, +body.about-php #TB_closeWindowButton:focus, +body.plugin-install-php #TB_closeWindowButton:hover, +body.plugin-install-php #TB_closeWindowButton:focus, +body.import-php #TB_closeWindowButton:hover, +body.import-php #TB_closeWindowButton:focus, +body.plugins-php #TB_closeWindowButton:hover, +body.plugins-php #TB_closeWindowButton:focus, +body.update-core-php #TB_closeWindowButton:hover, +body.update-core-php #TB_closeWindowButton:focus, +body.index-php #TB_closeWindowButton:hover, +body.index-php #TB_closeWindowButton:focus { + color: #00a0d2; + outline: none; + -webkit-box-shadow: none; + box-shadow: none; +} + +body.about-php .tb-close-icon, body.plugin-install-php .tb-close-icon, body.import-php .tb-close-icon, body.plugins-php .tb-close-icon, body.update-core-php .tb-close-icon, body.index-php .tb-close-icon { - line-height: 48px; - width: 48px; - height: 48px; + display: none; +} + +body.about-php #TB_closeWindowButton:after, +body.plugin-install-php #TB_closeWindowButton:after, +body.import-php #TB_closeWindowButton:after, +body.plugins-php #TB_closeWindowButton:after, +body.update-core-php #TB_closeWindowButton:after, +body.index-php #TB_closeWindowButton:after { + content: "\f335"; + font: normal 32px/29px 'dashicons'; + speak: none; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } -body.plugin-install-php .tb-close-icon:before, -body.import-php .tb-close-icon:before, -body.plugins-php .tb-close-icon:before, -body.update-core-php .tb-close-icon:before, -body.index-php .tb-close-icon:before { - line-height: 48px; +/* move plugin install close icon to top on narrow screens */ +@media screen and ( max-width: 830px ) { + body.about-php #TB_closeWindowButton, + body.plugin-install-php #TB_closeWindowButton, + body.import-php #TB_closeWindowButton, + body.plugins-php #TB_closeWindowButton, + body.update-core-php #TB_closeWindowButton, + body.index-php #TB_closeWindowButton { + right: 0; + top: -30px; + } } /* @todo: move this. */ @@ -2066,36 +2886,28 @@ img { border: none; } -/* Header */ -/* @todo: are these also specific to Press This? */ -#wphead { - border-bottom: 1px solid #dfdfdf; -} - -#wphead h1 a { - color: #464646; -} - -/* @todo: these seem misplaced */ -.js .meta-box-sortables .postbox:hover .handlediv { - margin-right: 0 !important; -} - /* Metabox collapse arrow indicators */ .js .sidebar-name .sidebar-name-arrow:before, -.js .meta-box-sortables .postbox .handlediv:before { - right: 12px; - font: normal 20px/1 'dashicons'; - speak: none; +.js .meta-box-sortables .postbox .toggle-indicator:before { + content: "\f142"; display: inline-block; - padding: 8px 10px; - top: 0; - position: relative; + font: normal 20px/1 dashicons; + speak: none; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; text-decoration: none !important; } +.js .widgets-holder-wrap.closed .sidebar-name-arrow:before, +.js .meta-box-sortables .postbox.closed .handlediv .toggle-indicator:before { + content: "\f140"; +} + +.js .sidebar-name .sidebar-name-arrow:before { + padding: 10px; + left: 0; +} + .js #widgets-left .sidebar-name .sidebar-name-arrow { display: none; } @@ -2105,24 +2917,31 @@ img { display: block; } -/* Show the arrow only on hover */ -.js .sidebar-name .sidebar-name-arrow:before, -.js .meta-box-sortables .postbox .handlediv:before { - content: '\f142'; +.js .postbox .handlediv .toggle-indicator:before { + margin-top: 4px; + width: 20px; + -webkit-border-radius: 50%; + border-radius: 50%; + text-indent: -1px; /* account for the dashicon alignment */ } -.js .widgets-holder-wrap.closed .sidebar-name-arrow:before, -.js .meta-box-sortables .postbox.closed .handlediv:before { - content: '\f140'; +.rtl.js .postbox .handlediv .toggle-indicator:before { + text-indent: 1px; /* account for the dashicon alignment */ } -.error a { - text-decoration: underline; +.js .postbox .handlediv:focus { + -webkit-box-shadow: none; + box-shadow: none; + outline: none; } -.updated a { - text-decoration: none; - padding-bottom: 2px; +.js .postbox .handlediv:focus .toggle-indicator:before { + -webkit-box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); + box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); } /* @todo: appears to be Press This only and overridden */ @@ -2131,7 +2950,7 @@ img { } /* Theme/Plugin Editor */ -.alignleft h3 { +.alignleft h2 { margin: 0; } @@ -2143,7 +2962,7 @@ img { outline: none; } -/* @noflip */ +/* rtl:ignore */ #template textarea, #docs-list { direction: ltr; @@ -2159,7 +2978,7 @@ img { word-wrap: break-word; } -#templateside h3, +#templateside h2, #postcustomstuff p.submit { margin: 0; } @@ -2178,7 +2997,7 @@ img { margin: 4px 0; } -#templateside a, +#templateside li a, .theme-editor-php .highlight { display: block; padding: 3px 3px 3px 12px; @@ -2222,10 +3041,10 @@ img { .control-section .accordion-section-title:after, .accordion-section-title:after { right: 0; - content: '\f140'; + content: "\f140"; border: none; background: none; - font: normal 20px/1 'dashicons'; + font: normal 20px/1 dashicons; speak: none; display: block; padding: 0; @@ -2237,28 +3056,43 @@ img { text-decoration: none !important; } -.widget-action, .handlediv, .item-edit, .sidebar-name-arrow, .accordion-section-title:after { - color: #aaa; + color: #72777c; +} + +.widget-action { + color: #555d66; /* #fafafa background in the Widgets screen */ } -.widget-action:hover, +.widget-top:hover .widget-action, +.widget-action:focus, .handlediv:hover, +.handlediv:focus, .item-edit:hover, +.item-edit:focus, .sidebar-name:hover .sidebar-name-arrow, .accordion-section-title:hover:after { - color: #777; + color: #23282d; } .widget-top a.widget-action:after { - padding: 12px 12px 0; + padding: 1px 2px 1px 0px; + margin-top: 10px; + margin-right: 10px; + -webkit-border-radius: 50%; + border-radius: 50%; } -.nav-menus-php .item-edit:before { - line-height: 2.1; +.widget-top a.widget-action:focus:after { + -webkit-box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30,140,190,.8); + box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30,140,190,.8); } .control-section .accordion-section-title:after, @@ -2270,35 +3104,28 @@ img { .control-section.open .accordion-section-title:after, #customize-info.open .accordion-section-title:after, -.nav-menus-php .menu-item-edit-active .item-edit:before { - content: '\f142'; -} - -/* Enable draggable on IE10 touch events until it's rolled into jQuery UI core */ -.ui-sortable, -.ui-draggable { - -ms-touch-action: none; - touch-action: none; -} - -.meta-box-sortables.ui-sortable, -.widgets-holder-wrap .ui-draggable, -.widgets-holder-wrap .ui-sortable, -.menu.ui-sortable { - -ms-touch-action: auto; - touch-action: auto; -} - -.meta-box-sortables.ui-sortable .hndle, -.menu.ui-sortable .menu-item-handle { +.nav-menus-php .menu-item-edit-active .item-edit:before, +.widget.open .widget-top a.widget-action:after { + content: "\f142"; +} + +/*! + * jQuery UI Draggable/Sortable 1.11.4 + * http://jqueryui.com + * + * Copyright jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license + */ +.ui-draggable-handle, +.ui-sortable-handle { -ms-touch-action: none; - touch-action: none; + touch-action: none; } /* Accordion */ - .accordion-section { - border-bottom: 1px solid #dfdfdf; + border-bottom: 1px solid #ddd; margin: 0; } @@ -2308,7 +3135,7 @@ img { } .accordion-section.open:hover { - border-bottom-color: #dfdfdf; + border-bottom-color: #ddd; } .accordion-section-content { @@ -2322,8 +3149,8 @@ img { margin: 0; padding: 12px 15px 15px; position: relative; - border-left: 1px solid #dfdfdf; - border-right: 1px solid #dfdfdf; + border-left: 1px solid #ddd; + border-right: 1px solid #ddd; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; @@ -2347,7 +3174,7 @@ img { .accordion-section-title:hover:after, .accordion-section-title:focus:after { - border-color: #aaa transparent; + border-color: #a0a5aa transparent; } .cannot-expand .accordion-section-title { @@ -2374,13 +3201,161 @@ img { .js .control-section .accordion-section-title:hover, .js .control-section.open .accordion-section-title, .js .control-section .accordion-section-title:focus { - color: #222; + color: #23282d; background: #f5f5f5; } .control-section.open .accordion-section-title { /* When expanded */ - border-bottom: 1px solid #dfdfdf; + border-bottom: 1px solid #ddd; +} + +/* Edit Site */ +.network-admin .edit-site-actions { + margin-top: 0; +} + +/* My Sites */ +.my-sites { + display: block; + overflow: auto; + zoom: 1; +} + +.my-sites li { + display: block; + padding: 8px 3%; + min-height: 130px; + margin: 0; +} + +@media only screen and (max-width: 599px) { + .my-sites li { + min-height: 0; + } +} + +@media only screen and (min-width: 600px) { + .my-sites.striped li { + background-color: #fff; + position: relative; + } + .my-sites.striped li:after { + content: ""; + width: 1px; + height: 100%; + position: absolute; + top: 0; + right: 0; + background: #ccc; + } + +} +@media only screen and (min-width: 600px) and (max-width: 699px) { + .my-sites li{ + float: left; + width: 44%; + } + .my-sites.striped li { + background-color: #fff; + } + .my-sites.striped li:nth-of-type(2n+1) { + clear: left; + } + .my-sites.striped li:nth-of-type(2n+2):after { + content: none; + } + .my-sites li:nth-of-type(4n+1), + .my-sites li:nth-of-type(4n+2) { + background-color: #f9f9f9; + } + +} + +@media only screen and (min-width: 700px) and (max-width: 1199px) { + .my-sites li { + float: left; + width: 27.333333%; + background-color: #fff; + } + .my-sites.striped li:nth-of-type(3n+3):after { + content: none; + } + .my-sites li:nth-of-type(6n+1), + .my-sites li:nth-of-type(6n+2), + .my-sites li:nth-of-type(6n+3) { + background-color: #f9f9f9; + } +} + +@media only screen and (min-width: 1200px) and (max-width: 1399px) { + .my-sites li { + float: left; + width: 21%; + padding: 8px 2%; + background-color: #fff; + } + .my-sites.striped li:nth-of-type(4n+1) { + clear: left; + } + .my-sites.striped li:nth-of-type(4n+4):after { + content: none; + } + .my-sites li:nth-of-type(8n+1), + .my-sites li:nth-of-type(8n+2), + .my-sites li:nth-of-type(8n+3), + .my-sites li:nth-of-type(8n+4) { + background-color: #f9f9f9; + } +} + +@media only screen and (min-width: 1400px) and (max-width: 1599px) { + .my-sites li { + float: left; + width: 16%; + padding: 8px 2%; + background-color: #fff; + } + .my-sites.striped li:nth-of-type(5n+1) { + clear: left; + } + .my-sites.striped li:nth-of-type(5n+5):after { + content: none; + } + .my-sites li:nth-of-type(10n+1), + .my-sites li:nth-of-type(10n+2), + .my-sites li:nth-of-type(10n+3), + .my-sites li:nth-of-type(10n+4), + .my-sites li:nth-of-type(10n+5) { + background-color: #f9f9f9; + } +} + +@media only screen and (min-width: 1600px) { + .my-sites li { + float: left; + width: 12.666666%; + padding: 8px 2%; + background-color: #fff; + } + .my-sites.striped li:nth-of-type(6n+1) { + clear: left; + } + .my-sites.striped li:nth-of-type(6n+6):after { + content: none; + } + .my-sites li:nth-of-type(12n+1), + .my-sites li:nth-of-type(12n+2), + .my-sites li:nth-of-type(12n+3), + .my-sites li:nth-of-type(12n+4), + .my-sites li:nth-of-type(12n+5), + .my-sites li:nth-of-type(12n+6) { + background-color: #f9f9f9; + } +} + +.my-sites li a { + text-decoration: none; } /* =Media Queries @@ -2437,7 +3412,6 @@ img { * HiDPI Displays */ @media print, - (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 120dpi) { /* Back-compat for pre-3.8 */ @@ -2487,10 +3461,6 @@ img { -webkit-tap-highlight-color: rgba(0, 0, 0, 0) !important; } - #wpwrap { - background: #f0f0f0; - } - #wpcontent { position: relative; margin-left: 0; @@ -2518,9 +3488,13 @@ img { display: none !important; } - .wrap .add-new-h2, .wrap .add-new-h2:active { + .wrap .add-new-h2, /* deprecated */ + .wrap .add-new-h2:active, /* deprecated */ + .wrap .page-title-action, + .wrap .page-title-action:active { padding: 10px 15px; font-size: 14px; + white-space: nowrap; } .wp-color-result { @@ -2535,13 +3509,24 @@ img { } /* Feedback Messages */ - .wrap div.updated, .wrap div.error, .media-upload-form div.error { + .notice, + .wrap div.updated, + .wrap div.error, + .media-upload-form div.error { margin: 20px 0 10px 0; padding: 5px 10px; font-size: 14px; line-height: 175%; } + .wp-core-ui .notice.is-dismissible { + padding-right: 46px; + } + + .notice-dismiss { + padding: 13px; + } + .wrap .icon32 + h2 { margin-top: -2px; } @@ -2550,12 +3535,19 @@ img { right: -190px; } + code { + word-wrap: break-word; + } + /* General Metabox */ .postbox { font-size: 14px; } - .metabox-holder h3 { + .metabox-holder h3.hndle, /* Back-compat for pre-4.4 */ + .metabox-holder .stuffbox > h3, /* Back-compat for pre-4.4 */ + .metabox-holder .postbox > h3, /* Back-compat for pre-4.4 */ + .metabox-holder h2 { padding: 12px; } @@ -2612,6 +3604,15 @@ img { #comments-form .checkforspam { display: none; } + + .edit-comment-author { + margin: 2px 0 0; + } + + .filter-drawer .filter-group-feature input, + .filter-drawer .filter-group-feature label { + line-height: 25px; + } } /* Smartphone */ @@ -2634,4 +3635,26 @@ img { div#post-body.metabox-holder.columns-1 { overflow-x: hidden; } + + h1.nav-tab-wrapper, + .wrap h2.nav-tab-wrapper, + h3.nav-tab-wrapper { + border-bottom: 0; + } + + h1 .nav-tab, + h2 .nav-tab, + h3 .nav-tab { + margin: 10px 10px 0 0; + border-bottom: 1px solid #ccc; + } +} + +@media screen and (max-width: 320px) { + /* Prevent default center alignment and larger font for the Right Now widget when + the network dashboard is viewed on a small mobile device. */ + #network_dashboard_right_now .subsubsub { + font-size: 14px; + text-align: left; + } } diff --git a/wp-admin/css/common.min.css b/wp-admin/css/common.min.css new file mode 100644 index 0000000..046b4b6 --- /dev/null +++ b/wp-admin/css/common.min.css @@ -0,0 +1,8 @@ +#docs-list,#plugin-information .section,#template textarea,.code,.ltr,code{direction:ltr}#wpwrap{height:auto;min-height:100%;width:100%;position:relative;-webkit-font-smoothing:subpixel-antialiased}#wpcontent{height:100%;padding-left:20px}#wpcontent,#wpfooter{margin-left:160px}.folded #wpcontent,.folded #wpfooter{margin-left:36px}#wpbody-content{padding-bottom:65px;float:left;width:100%;overflow:visible!important}.inner-sidebar{float:right;clear:right;display:none;width:281px;position:relative}.columns-2 .inner-sidebar{margin-right:auto;width:286px;display:block}.columns-2 .inner-sidebar #side-sortables,.inner-sidebar #side-sortables{min-height:300px;width:280px;padding:0}.has-right-sidebar .inner-sidebar{display:block}.has-right-sidebar #post-body{float:left;clear:left;width:100%;margin-right:-2000px}.has-right-sidebar #post-body-content{margin-right:300px;float:none;width:auto}#col-container,#col-left,#col-right{overflow:hidden;padding:0;margin:0}#col-left{width:35%}#col-right{float:right;clear:right;width:65%}.col-wrap{padding:0 7px}.alignleft{float:left}.alignright{float:right}#publishing-action .spinner,#save-post,.subsubsub{float:left}.textleft{text-align:left}.textright{text-align:right}.clear{clear:both}.wp-clearfix:after{content:"";display:table;clear:both}.screen-reader-text,.screen-reader-text span,.ui-helper-hidden-accessible{position:absolute;margin:-1px;padding:0;height:1px;width:1px;overflow:hidden;clip:rect(0 0 0 0);border:0;word-wrap:normal!important}#templateside,.misc-pub-filename,.pre,.widefat *{word-wrap:break-word}.screen-reader-shortcut{position:absolute;top:-1000em}.screen-reader-shortcut:focus{left:6px;top:-25px;height:auto;width:auto;display:block;font-size:14px;font-weight:600;padding:15px 23px 14px;background:#f1f1f1;color:#0073aa;z-index:100000;line-height:normal;-webkit-box-shadow:0 0 2px 2px rgba(0,0,0,.6);box-shadow:0 0 2px 2px rgba(0,0,0,.6);text-decoration:none;outline:0}.hidden,.js .closed .inside,.js .hide-if-js,.js .wp-core-ui .hide-if-js,.js.wp-core-ui .hide-if-js,.no-js .hide-if-no-js,.no-js .wp-core-ui .hide-if-no-js,.no-js.wp-core-ui .hide-if-no-js{display:none}#menu-management .menu-edit,#menu-settings-column .accordion-container,.comment-ays,.feature-filter,.imgedit-group,.manage-menus,.menu-item-handle,.popular-tags,.stuffbox,.widget-inside,.widget-top,.widgets-holder-wrap,.wp-editor-container,p.popular-tags,table.widefat{border:1px solid #e5e5e5;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04)}.comment-ays,.feature-filter,.imgedit-group,.popular-tags,.stuffbox,.widgets-holder-wrap,.wp-editor-container,p.popular-tags,table.widefat{background:#fff}body,html{height:100%;margin:0;padding:0}html{background:#f1f1f1}body{color:#444;font-family:"Open Sans",sans-serif;font-size:13px;line-height:1.4em;min-width:600px}body.iframe{min-width:0;padding-top:1px}body.modal-open{overflow:hidden}body.mobile.modal-open #wpwrap{overflow:hidden;position:fixed;height:100%}iframe,img{border:0}td{font-family:inherit;font-size:inherit;font-weight:inherit;line-height:inherit}a{color:#0073aa;-webkit-transition-property:border,background,color;transition-property:border,background,color;-webkit-transition-duration:.05s;transition-duration:.05s;-webkit-transition-timing-function:ease-in-out;transition-timing-function:ease-in-out}a,div{outline:0}a:active,a:hover{color:#00a0d2}.wp-person a:focus .gravatar,a:focus,a:focus .media-icon img{color:#124964;-webkit-box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}h1,h2,h3{color:#23282d}.ie8 a:focus{outline:#5b9dd9 solid 1px}#adminmenu a:focus,.screen-reader-text:focus{-webkit-box-shadow:none;box-shadow:none;outline:0}blockquote,q{quotes:none}blockquote:after,blockquote:before,q:after,q:before{content:"";content:none}p{font-size:13px;line-height:1.5;margin:1em 0}blockquote{margin:1em}dd,li{margin-bottom:6px}h1,h2,h3,h4,h5,h6{display:block;font-weight:600}h1{font-size:2em;margin:.67em 0}h2,h3{font-size:1.3em;margin:1em 0}.update-core-php h2{margin-top:2em}.update-messages h2,.update-php h2,h4{font-size:1em;margin:1.33em 0}h5{font-size:.83em;margin:1.67em 0}h6{font-size:.67em;margin:2.33em 0}ol,ul{padding:0}ul{list-style:none}ol{list-style-type:decimal;margin-left:2em}ul.ul-disc{list-style:disc}ul.ul-square{list-style:square}ol.ol-decimal{list-style:decimal}ol.ol-decimal,ul.ul-disc,ul.ul-square{margin-left:1.8em}ol.ol-decimal>li,ul.ul-disc>li,ul.ul-square>li{margin:0 0 .5em}.code,code{font-family:Consolas,Monaco,monospace;unicode-bidi:embed}code,kbd{padding:3px 5px 2px;margin:0 1px;background:#eaeaea;background:rgba(0,0,0,.07);font-size:13px}.subsubsub{list-style:none;margin:8px 0 0;padding:0;font-size:13px;color:#666}.subsubsub a{line-height:2;padding:.2em;text-decoration:none}.subsubsub a .count,.subsubsub a.current .count{color:#555d66;font-weight:400}.subsubsub a.current{font-weight:600;border:none}.subsubsub li{display:inline-block;margin:0;padding:0;white-space:nowrap}.widefat{border-spacing:0;width:100%;clear:both;margin:0}.widefat a{text-decoration:none}.widefat td,.widefat th{padding:8px 10px}.widefat thead td,.widefat thead th{border-bottom:1px solid #e1e1e1}.widefat tfoot td,.widefat tfoot th{border-top:1px solid #e1e1e1;border-bottom:none}.widefat .no-items td{border-bottom-width:0}.widefat td{vertical-align:top}.widefat td,.widefat td ol,.widefat td p,.widefat td ul{font-size:13px;line-height:1.5em}.widefat tfoot td,.widefat th,.widefat thead td{text-align:left;line-height:1.3em;font-size:14px}.updates-table td input,.widefat tfoot td input,.widefat th input,.widefat thead td input{margin:0 0 0 8px;padding:0;vertical-align:text-top}.widefat .check-column{width:2.2em;padding:6px 0 25px;vertical-align:top}.updates-table tbody td.check-column,.widefat tbody th.check-column,.widefat tfoot td.check-column,.widefat thead td.check-column{padding:11px 0 0 3px}.widefat tfoot td.check-column,.widefat thead td.check-column{padding-top:4px;vertical-align:middle}.update-php div.error,.update-php div.updated{margin-left:0}.no-js .widefat tfoot .check-column input,.no-js .widefat thead .check-column input{display:none}.column-comments,.column-links,.column-posts,.widefat .num{text-align:center}.widefat th#comments{vertical-align:middle}.wrap{margin:10px 20px 0 2px}.postbox .inside h2,.wrap [class$=icon32]+h2,.wrap h1,.wrap>h2:first-child{font-size:23px;font-weight:400;margin:0;padding:9px 15px 4px 0;line-height:29px}.subtitle{margin:0;padding-left:25px;color:#555d66;font-size:14px;font-weight:400}.wrap .add-new-h2,.wrap .add-new-h2:active,.wrap .page-title-action,.wrap .page-title-action:active{margin-left:4px;padding:4px 8px;position:relative;top:-3px;text-decoration:none;border:none;border:1px solid #ccc;-webkit-border-radius:2px;border-radius:2px;background:#f7f7f7;text-shadow:none;font-weight:600;font-size:13px}.wrap .add-new-h2:hover,.wrap .page-title-action:hover{border-color:#008EC2;background:#00a0d2;color:#fff}.ac_match,.highlight,.subsubsub a.current{color:#000}.wrap .page-title-action:focus{border-color:#5b9dd9;-webkit-box-shadow:0 0 2px rgba(30,140,190,.8);box-shadow:0 0 2px rgba(30,140,190,.8)}.wrap h1.long-header{padding-right:0}.wp-dialog{background-color:#fff}#available-widgets .widget-top:hover,#widgets-left .widget-in-question .widget-top,#widgets-left .widget-top:hover,.widgets-chooser ul,div#widgets-right .widget-top:hover{border-color:#999;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.1);box-shadow:0 1px 2px rgba(0,0,0,.1)}.sorthelper{background-color:#ccf3fa}.alternate,.striped>tbody>:nth-child(odd),ul.striped>:nth-child(odd){background-color:#f9f9f9}.bar{background-color:#e8e8e8;border-right-color:#99d}.highlight{background-color:#e4f2fd}.wp-ui-primary{color:#fff;background-color:#32373c}.wp-ui-text-primary{color:#32373c}.wp-ui-highlight{color:#fff;background-color:#1e8cbe}.wp-ui-text-highlight{color:#1e8cbe}.wp-ui-notification{color:#fff;background-color:#d54e21}.wp-ui-text-notification{color:#d54e21}.wp-ui-text-icon{color:#82878c}img.emoji{display:inline!important;border:none!important;height:1em!important;width:1em!important;margin:0 .07em!important;vertical-align:-.1em!important;background:0 0!important;padding:0!important;-webkit-box-shadow:none!important;box-shadow:none!important}.filter-group,.wp-filter{position:relative;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04)}#nav-menu-footer,#nav-menu-header,#your-profile #rich_editing,.checkbox,.control-section .accordion-section-title,.menu-item-handle,.postbox .hndle,.side-info,.sidebar-name,.stuffbox .hndle,.widefat tfoot td,.widefat tfoot th,.widefat thead td,.widefat thead th,.widget .widget-top{line-height:1.4em}.menu-item-handle,.widget .widget-top{background:#fafafa;color:#23282d}.postbox .hndle,.stuffbox .hndle{border-bottom:1px solid #eee;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.quicktags,.search{background-color:#ccc;color:#000;font-size:12px}.icon32{display:none}#bulk-titles div a:before,.notice-dismiss:before,.tagchecklist span a:before,.welcome-panel .welcome-panel-close:before{background:0 0;color:#b4b9be;content:"\f153";display:block;font:400 16px/20px dashicons;speak:none;height:20px;text-align:center;width:20px;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.welcome-panel .welcome-panel-close:before{margin:0}#bulk-titles div a:before,.tagchecklist span a:before{margin:1px 0}#bulk-titles div a:hover:before,.tagchecklist span a:hover:before,.welcome-panel .welcome-panel-close:focus:before,.welcome-panel .welcome-panel-close:hover:before{color:#c00}.key-labels label{line-height:24px}b,strong{font-weight:600}.pre{white-space:pre-wrap}#namediv td.first,#plugin-information-title,.nav-tab,.no-break,.star-rating{white-space:nowrap}.howto{color:#666;font-style:italic;display:block}p.install-help{margin:8px 0;font-style:italic}hr{border:0;border-top:1px solid #ddd;border-bottom:1px solid #fafafa}#all-plugins-table .plugins a.delete,#media-items a.delete,#media-items a.delete-permanently,#nav-menu-footer .menu-delete,#search-plugins-table .plugins a.delete,.plugins a.delete,.row-actions span.delete a,.row-actions span.spam a,.row-actions span.trash a,.submitbox .submitdelete{color:#a00}#all-plugins-table .plugins a.delete:hover,#media-items a.delete-permanently:hover,#media-items a.delete:hover,#nav-menu-footer .menu-delete:hover,#search-plugins-table .plugins a.delete:hover,.file-error,.plugins a.delete:hover,.row-actions .delete a:hover,.row-actions .spam a:hover,.row-actions .trash a:hover,.submitbox .submitdelete:hover,.widget-control-remove:hover,abbr.required,span.required{color:red;text-decoration:none;border:none}#major-publishing-actions{padding:10px;clear:both;border-top:1px solid #ddd;background:#f5f5f5}#delete-action{line-height:28px;vertical-align:middle;text-align:left;float:left}#publishing-action{text-align:right;float:right;line-height:23px}#misc-publishing-actions{padding:6px 0 0}.misc-pub-section{padding:6px 10px 8px}#minor-publishing-actions{padding:10px 10px 0;text-align:right}.preview{float:right}#sticky-span{margin-left:18px}.approve,.unapproved .unapprove{display:none}.spam .approve,.trash .approve,.unapproved .approve{display:inline}td.action-links,th.action-links{text-align:right}.wp-filter{display:inline-block;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:12px 0 25px;padding:0 10px;width:100%;box-shadow:0 1px 1px rgba(0,0,0,.04);border:1px solid #e5e5e5;background:#fff;color:#555;font-size:13px}.filter-group,html.wp-toolbar{-webkit-box-sizing:border-box;-moz-box-sizing:border-box}.wp-filter a{text-decoration:none}.filter-count{display:inline-block;vertical-align:middle;min-width:4em}.filter-count .count,.title-count{display:inline-block;position:relative;top:-1px;padding:4px 10px;-webkit-border-radius:30px;border-radius:30px;background:#72777c;color:#fff;font-size:14px;font-weight:600}.title-count{display:inline;top:-3px;margin-left:5px;margin-right:20px}.filter-items{float:left}.filter-links,.filter-links li{display:inline-block;margin:0}.filter-links li>a{display:inline-block;margin:0 10px;padding:15px 0;border-bottom:4px solid #fff;color:#666;cursor:pointer}.filter-links .current{-webkit-box-shadow:none;box-shadow:none;border-bottom:4px solid #666;color:#23282d}.filter-links li>a:focus,.filter-links li>a:hover,.show-filters .filter-links a.current:focus,.show-filters .filter-links a.current:hover{color:#00a0d2}.wp-filter .search-form{float:right;margin:10px 0}.wp-filter .search-form input[type=search]{margin:0;padding:3px 5px;width:280px;max-width:100%;font-size:16px;font-weight:300;line-height:1.5}.wp-filter .search-form select{margin:0;height:32px;vertical-align:top}.wp-filter .search-form.search-plugins{display:inline-block}.wp-filter .drawer-toggle{display:inline-block;margin:0 10px;padding:4px 6px;color:#666;cursor:pointer}.wp-filter .drawer-toggle:before{display:inline-block;vertical-align:top;content:"\f111";margin:0 5px 0 0;width:16px;height:16px;color:#72777c;-webkit-transition:color .1s ease-in 0;transition:color .1s ease-in 0;font-family:dashicons;font-size:16px;line-height:1;text-align:center;text-decoration:inherit;font-weight:400;font-style:normal;-webkit-font-smoothing:antialiased}.filter-drawer,.wp-filter .favorites-form{margin:0 -20px;padding:20px;border-top:1px solid #eee;background:#fafafa}.wp-filter .drawer-toggle:hover,.wp-filter .drawer-toggle:hover:before{color:#00a0d2}.wp-filter .drawer-toggle.current:before{color:#fff}.wp-filter .favorites-form{display:none;overflow:hidden;width:100%}.show-favorites-form .wp-filter .favorites-form{display:block}.filter-drawer{display:none}.show-filters .filter-drawer{display:block;overflow:hidden;width:100%}.show-filters .wp-filter .drawer-toggle:focus,.show-filters .wp-filter .drawer-toggle:hover{background:#2ea2cc}.show-filters .filter-links a.current{border-bottom:none}.show-filters .wp-filter .drawer-toggle{-webkit-border-radius:2px;border-radius:2px;border:none;background:#72777c;color:#fff}.filter-group,.filtered-by .tag{border:1px solid #e5e5e5;background:#fff}.show-filters .wp-filter .drawer-toggle:before{color:#fff}.filter-group{box-sizing:border-box;float:left;margin:0 1% 0 0;padding:20px 10px 10px;width:24%;box-shadow:0 1px 1px rgba(0,0,0,.04)}.filter-group legend{position:absolute;top:10px;display:block;margin:0;padding:0;font-size:1em;font-weight:600}.filter-drawer .filter-group-feature{margin:28px 0 0;list-style-type:none;font-size:12px}.filter-drawer .filter-group-feature input,.filter-drawer .filter-group-feature label{display:inline-block;margin:7px 4px 7px 0;line-height:16px}.filter-drawer .buttons{margin-bottom:20px}.filter-drawer .buttons .button span{display:inline-block;opacity:.8;font-size:12px;text-indent:10px}.wp-filter .button.clear-filters{display:none;margin-left:10px}.filtered-by{display:none;margin:0}.filtered-by>span{font-weight:600}.filtered-by a{margin-left:10px}.filtered-by .tags{display:inline}.filtered-by .tag{margin:0 5px;padding:4px 8px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04);font-size:11px}.filters-applied .filter-drawer .buttons,.filters-applied .filter-drawer br,.filters-applied .filter-group{display:none!important}.filters-applied .filtered-by{display:block}.filters-applied .filter-drawer{padding:20px}.error .content-filterable,.loading-content .content-filterable,.show-filters .content-filterable,.show-filters.filters-applied.loading-content .content-filterable{display:none}.show-filters.filters-applied .content-filterable{display:block}.loading-content .spinner{display:block;margin:40px auto 0;float:none}@media only screen and (max-width:1120px){.filter-drawer{border-bottom:1px solid #eee}.filter-group{margin-bottom:0;margin-top:5px;width:100%}.filter-group li{margin:10px 0}}@media only screen and (max-width:1000px){.filter-items{float:none}.wp-filter .media-toolbar-primary,.wp-filter .media-toolbar-secondary,.wp-filter .search-form{float:none;position:relative;max-width:100%}}@media only screen and (max-width:782px){.filter-group li{padding:0;width:50%}}@media only screen and (max-width:320px){.filter-count{display:none}.wp-filter .drawer-toggle{margin:10px 0}.filter-group li,.wp-filter .search-form input[type=search]{width:100%}}.notice,div.error,div.updated{background:#fff;border-left:4px solid #fff;-webkit-box-shadow:0 1px 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 1px 0 rgba(0,0,0,.1);margin:5px 15px 2px;padding:1px 12px}.form-table td .notice p,.notice p,.notice-title,div.error p,div.updated p{margin:.5em 0;padding:2px}.error a{text-decoration:underline}.updated a{padding-bottom:2px}.notice-alt{-webkit-box-shadow:none;box-shadow:none}.notice-large{padding:10px 20px}.notice-title{display:inline-block;color:#23282d;font-size:18px}.wp-core-ui .notice.is-dismissible{padding-right:38px;position:relative}.notice-dismiss{position:absolute;top:0;right:1px;border:none;margin:0;padding:9px;background:0 0;color:#b4b9be;cursor:pointer}.notice-dismiss:active:before,.notice-dismiss:focus:before,.notice-dismiss:hover:before{color:#c00}.notice-dismiss:focus{outline:0;-webkit-box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}.ie8 .notice-dismiss:focus{outline:#5b9dd9 solid 1px}.notice-success,div.updated{border-left-color:#46b450}.notice-success.notice-alt{background-color:#ecf7ed}.notice-warning{border-left-color:#ffb900}.notice-warning.notice-alt{background-color:#fff8e5}.notice-error,div.error{border-left-color:#dc3232}.notice-error.notice-alt{background-color:#fbeaea}.notice-info{border-left-color:#00a0d2}.notice-info.notice-alt{background-color:#e5f5fa}.media-upload-form .notice,.media-upload-form div.error,.wrap .notice,.wrap div.error,.wrap div.updated{margin:5px 0 15px}#update-nag,.update-nag{display:inline-block;line-height:19px;padding:11px 15px;font-size:14px;text-align:left;margin:25px 20px 0 2px;background-color:#fff;border-left:4px solid #ffba00;-webkit-box-shadow:0 1px 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 1px 0 rgba(0,0,0,.1)}#screen-meta,ul#dismissed-updates{display:none}.update-message{color:#000}form.upgrade{margin-top:8px}form.upgrade .hint{font-style:italic;font-size:85%;margin:-.5em 0 2em}.update-php .spinner{float:none;margin:-4px 0}#ajax-loading,.ajax-feedback,.ajax-loading,.imgedit-wait-spin,.list-ajax-loading{visibility:hidden}#ajax-response.alignleft{margin-left:2em}#adminmenu a,#catlist a,#taglist a{text-decoration:none}#contextual-help-wrap,#screen-options-wrap{margin:0;padding:8px 20px 12px;position:relative}#contextual-help-wrap{overflow:auto;margin-left:0!important}#screen-meta .screen-reader-text{visibility:hidden}#screen-meta-links{margin:0 20px 0 0}#screen-meta{margin:0 20px -1px 0;position:relative;background-color:#fff;border:1px solid #ddd;border-top:none;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.025);box-shadow:0 1px 0 rgba(0,0,0,.025)}#contextual-help-link-wrap,#screen-options-link-wrap{float:right;height:28px;margin:0 0 0 6px;border:1px solid #ddd;border-top:none;background:#fff;-webkit-box-shadow:0 1px 1px -1px rgba(0,0,0,.1);box-shadow:0 1px 1px -1px rgba(0,0,0,.1)}#screen-meta-links .screen-meta-toggle{position:relative;top:0}#screen-meta-links .show-settings{border:0;background:0 0;-webkit-border-radius:0;border-radius:0;color:#72777c;line-height:1.7;padding:3px 6px 3px 16px}#screen-meta-links .show-settings:active,#screen-meta-links .show-settings:focus,#screen-meta-links .show-settings:hover{color:#32373c}#screen-meta-links .show-settings:active{-webkit-box-shadow:none;box-shadow:none;-webkit-transform:none;-ms-transform:none;transform:none}#screen-meta-links .show-settings:after{right:0;content:"\f140";font:400 20px/1 dashicons;speak:none;display:inline-block;padding:0 5px 0 0;bottom:2px;position:relative;vertical-align:bottom;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;color:#72777c}#templateside ul li a,#wpfooter a,.nav-tab{text-decoration:none}#screen-meta-links .screen-meta-active:after{content:"\f142"}.toggle-arrow{background-repeat:no-repeat;background-position:top left;background-color:transparent;height:22px;line-height:22px;display:block}.toggle-arrow-active{background-position:bottom left}#contextual-help-wrap h5,#screen-options-wrap h5,#screen-options-wrap legend{margin:0;padding:8px 0;font-size:13px;font-weight:600}.hndle a,.widefat tfoot td,.widefat th,.widefat thead td{font-weight:400}.ie8 #screen-options-wrap legend{color:inherit}.metabox-prefs label{display:inline-block;padding-right:15px;line-height:30px}#number-of-columns{display:inline-block;vertical-align:middle;line-height:30px}.metabox-prefs input[type=checkbox]{margin-top:0;margin-right:6px}.metabox-prefs label input,.metabox-prefs label input[type=checkbox]{margin:-4px 5px 0 0}.metabox-prefs .columns-prefs label input{margin:-1px 2px 0 0}.metabox-prefs label a{display:none}.metabox-prefs .screen-options input,.metabox-prefs .screen-options label{margin-top:0;margin-bottom:0;vertical-align:middle}.metabox-prefs .screen-options .screen-per-page{margin-right:15px}.metabox-prefs .screen-options label{line-height:28px;padding-right:0}.screen-options+.screen-options{margin-top:10px}.metabox-prefs .submit{margin-top:1em;padding:0}#contextual-help-wrap{padding:0}#contextual-help-columns{position:relative}#contextual-help-back{position:absolute;top:0;bottom:0;left:150px;right:170px;border:1px solid #e1e1e1;border-top:none;border-bottom:none;background:#f6fbfd}#contextual-help-wrap.no-sidebar #contextual-help-back{right:0;border-right-width:0;-webkit-border-bottom-right-radius:2px;border-bottom-right-radius:2px}.contextual-help-tabs{float:left;width:150px;margin:0}.contextual-help-tabs ul{margin:1em 0}.contextual-help-tabs li{margin-bottom:0;list-style-type:none;border-style:solid;border-width:0 0 0 2px;border-color:transparent}.contextual-help-tabs a{display:block;padding:5px 5px 5px 12px;line-height:18px;text-decoration:none;border:1px solid transparent;border-right:none;border-left:none}.contextual-help-tabs a:hover{color:#32373c}.contextual-help-tabs .active{padding:0;margin:0 -1px 0 0;border-left:2px solid #00a0d2;background:#f6fbfd;-webkit-box-shadow:0 2px 0 rgba(0,0,0,.02),0 1px 0 rgba(0,0,0,.02);box-shadow:0 2px 0 rgba(0,0,0,.02),0 1px 0 rgba(0,0,0,.02)}.contextual-help-tabs .active a{border-color:#e1e1e1;color:#32373c}.contextual-help-tabs-wrap{padding:0 20px;overflow:auto}.help-tab-content{display:none;margin:0 22px 12px 0;line-height:1.6em}.help-tab-content.active{display:block}.help-tab-content ul li{list-style-type:disc;margin-left:18px}.contextual-help-sidebar{width:150px;float:right;padding:0 8px 0 12px;overflow:auto}html.wp-toolbar{padding-top:32px;box-sizing:border-box}.widefat td,.widefat th{color:#555}.widefat ol,.widefat p,.widefat tfoot tr td,.widefat tfoot tr th,.widefat thead tr td,.widefat thead tr th,.widefat ul{color:#32373c}.widefat td p{margin:2px 0 .8em}.widefat .column-comment p{margin:.6em 0}.postbox-container{float:left}.postbox-container .meta-box-sortables{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#wpbody-content .metabox-holder{padding-top:10px}.metabox-holder .postbox-container .empty-container{border:3px dashed #b4b9be;height:250px;position:relative}.metabox-holder .postbox-container .empty-container:after{content:attr(data-emptystring);margin:auto;position:absolute;top:0;left:0;bottom:0;right:0;height:1em;width:200px;text-align:center;color:#ccc;font-size:18px;display:none}.columns-2 #postbox-container-3 .empty-container,.columns-2 #postbox-container-4 .empty-container,.columns-3 #postbox-container-4 .empty-container,.metabox-holder.columns-1 .postbox-container .empty-container{border:0;height:0;min-height:0}#post-body-content{width:100%;min-width:463px;float:left}#post-body.columns-2 #postbox-container-1{float:right;margin-right:-300px;width:280px}#post-body.columns-2 #side-sortables{min-height:250px}@media only screen and (max-width:799px){#wpbody-content .metabox-holder .postbox-container .empty-container{border:0;height:0;min-height:0}}.js .postbox .hndle,.js .widget .widget-top{cursor:move}.hndle a{font-size:11px}#adminmenu .wp-submenu li.current,#adminmenu .wp-submenu li.current a,#adminmenu .wp-submenu li.current a:hover,#dashboard_right_now .versions .b,#ed_reply_toolbar #ed_reply_strong,#pass-strength-result.short,#pass-strength-result.strong,#post-status-display,#post-visibility-display,.edit-comment-author,.feature-filter .feature-name,.item-controls .item-order a,.media-item .percent,.nav-tab,.plugins .name{font-weight:600}.postbox .handlediv{display:none;float:right;width:36px;height:36px;padding:0}.js .postbox .handlediv{display:block}.sortable-placeholder{border:1px dashed #b4b9be;margin-bottom:20px}.postbox,.stuffbox{margin-bottom:20px;padding:0;line-height:1}.postbox .inside,.stuffbox .inside{padding:0 12px 12px;line-height:1.4em;font-size:13px}.postbox .inside{margin:11px 0;position:relative}.postbox .inside>p:last-child,.rss-widget ul li:last-child{margin-bottom:1px!important}.postbox.closed h3{border:none;-webkit-box-shadow:none;box-shadow:none}.postbox table.form-table{margin-bottom:0}.postbox table.widefat{-webkit-box-shadow:none;box-shadow:none}.temp-border{border:1px dotted #ccc}.columns-prefs label{padding:0 10px 0 0}#wpfooter{position:absolute;bottom:0;left:0;right:0;padding:10px 20px;color:#555d66}#wpfooter p{font-size:13px;margin:0;line-height:20px}#footer-thankyou{font-style:italic}#wpfooter a:hover{text-decoration:underline}.nav-tab{float:left;border:1px solid #ccc;border-bottom:none;margin-left:.5em;padding:5px 10px;font-size:14px;line-height:24px;background:#e5e5e5;color:#555}.nav-tab-small .nav-tab,h3 .nav-tab{padding:5px 14px;font-size:12px;line-height:16px}.nav-tab:focus,.nav-tab:hover{background-color:#fff;color:#444}.nav-tab-active,.nav-tab:focus:active{-webkit-box-shadow:none;box-shadow:none}.nav-tab-active{margin-bottom:-1px;color:#444}.nav-tab-active,.nav-tab-active:focus,.nav-tab-active:focus:active,.nav-tab-active:hover{border-bottom:1px solid #f1f1f1;background:#f1f1f1;color:#000}.wrap h2.nav-tab-wrapper,h1.nav-tab-wrapper,h3.nav-tab-wrapper{border-bottom:1px solid #ccc;margin:0;padding-top:9px;padding-bottom:0;line-height:inherit}.nav-tab-wrapper:not(.wp-clearfix):after{content:"";display:table;clear:both}.ie8 .nav-tab-wrapper{display:inline-block;width:100%;vertical-align:top}.spinner{background:url(../images/spinner.gif) no-repeat;-webkit-background-size:20px 20px;background-size:20px 20px;display:inline-block;visibility:hidden;float:right;vertical-align:middle;opacity:.7;filter:alpha(opacity=70);width:20px;height:20px;margin:4px 10px 0}.spinner.is-active{visibility:visible}#template div{margin-right:190px}.metabox-holder .postbox>h3,.metabox-holder .stuffbox>h3,.metabox-holder h2.hndle,.metabox-holder h3.hndle{font-size:14px;padding:8px 12px;margin:0;line-height:1.4}.nav-menus-php .metabox-holder h3{padding:10px 10px 11px 14px;line-height:21px}.plugin-install #description,.plugin-install-network #description{width:60%}table .column-rating,table .column-visible,table .vers{text-align:left}.attention,.error-message{color:red;font-weight:600}body.iframe{height:98%}.lp-show-latest p{display:none}.lp-show-latest .lp-error p,.lp-show-latest p:last-child{display:block}.media-icon{width:62px;text-align:center}.media-icon img{border:1px solid #e5e5e5;border:1px solid rgba(0,0,0,.07)}#howto{font-size:11px;margin:0 5px;display:block}.post-categories,.post-categories li{display:inline}.importers td{padding-right:14px}.importers{font-size:16px;width:auto}#post-body #post-body-content #namediv h2,#post-body #post-body-content #namediv h3{margin-top:0}.edit-comment-author{font-size:14px;line-height:1.4;color:#222;margin:2px 0 0 9px}#namediv h2 label,#namediv h3 label{vertical-align:baseline}#namediv table{width:100%}#namediv td.first{width:10px}#namediv input{width:98%}#namediv p{margin:10px 0}#submitdiv h3{margin-bottom:0!important}.checkbox,.post-categories,.zerosize,fieldset{margin:0;padding:0}.zerosize{height:0;width:0;border:0;overflow:hidden;position:absolute}br.clear{height:2px;line-height:2px}.checkbox{border:none}fieldset{border:0}div.star-holder{position:relative;height:17px;width:100px;background:url(../images/stars.png?ver=20121108) bottom left repeat-x}div.star-holder .star-rating{background:url(../images/stars.png?ver=20121108) top left repeat-x;height:17px;float:left}.star-rating .star{display:inline-block;width:20px;height:20px;-webkit-font-smoothing:antialiased;font-size:20px;line-height:1;font-family:dashicons;text-decoration:inherit;font-weight:400;font-style:normal;vertical-align:top;-webkit-transition:color .1s ease-in 0;transition:color .1s ease-in 0;text-align:center;color:#ffb900}.star-rating .star-full:before{content:"\f155"}.star-rating .star-half:before{content:"\f459"}.rtl .star-rating .star-half{-webkit-transform:rotateY(180deg);-ms-transform:rotateY(180deg);transform:rotateY(180deg)}.star-rating .star-empty:before{content:"\f154"}div.action-links{font-weight:400;margin:6px 0 0}#plugin-information{background:#fff;position:fixed;top:0;right:0;bottom:0;left:0;height:100%;padding:0}#plugin-information-scrollable{overflow:auto;-webkit-overflow-scrolling:touch;height:100%}#plugin-information-title{padding:0 20px;background:#f5f5f5;font-size:22px;font-weight:600;line-height:56px;position:relative;top:0;right:0;left:0;height:56px;overflow:hidden;text-overflow:ellipsis}#plugin-information-title.with-banner{margin-right:0;height:250px;bottom:250px;-webkit-background-size:cover;background-size:cover}#plugin-information-title h2{font-size:1em;font-weight:700;padding:0;margin:0;max-width:680px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}#plugin-information-title.with-banner h2{font-family:"Helvetica Neue",sans-serif;display:inline-block;font-size:30px;line-height:50px;padding:0 15px;margin:174px 0 0 10px;color:#fff;background:rgba(30,30,30,.9);text-shadow:0 1px 3px rgba(0,0,0,.4);-webkit-box-shadow:0 0 30px rgba(255,255,255,.1);box-shadow:0 0 30px rgba(255,255,255,.1);-webkit-border-radius:8px;border-radius:8px}#plugin-information-title div.vignette{display:none}#plugin-information-title.with-banner div.vignette{display:block;float:right;top:0;height:250px;width:772px;margin:0 -20px;background:0 0;-webkit-box-shadow:inset 0 0 50px 4px rgba(0,0,0,.2),inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 0 50px 4px rgba(0,0,0,.2),inset 0 -1px 0 rgba(0,0,0,.1)}#plugin-information-tabs{padding:0 16px;position:relative;right:0;left:0;height:36px;z-index:1;border-bottom:1px solid #ddd;background:#f3f3f3}#plugin-information-tabs a{position:relative;float:left;padding:9px 10px;margin:0;height:18px;line-height:18px;font-size:14px;text-decoration:none;-webkit-transition:none;transition:none}#plugin-information-tabs a.current{margin:0 -1px;background:#fff;border:1px solid #ddd;border-bottom-color:#fff;padding-top:8px;color:#32373c}#plugin-information-tabs.with-banner a.current{border-top:none;padding-top:9px}#plugin-information-tabs a:active,#plugin-information-tabs a:focus{outline:0}#plugin-information-content{overflow:hidden;background:#fff;position:relative;top:0;right:0;left:0;min-height:100%;min-height:-webkit-calc(100% - 152px);min-height:calc(100% - 152px)}#plugin-information-content.with-banner{min-height:-webkit-calc(100% - 346px);min-height:calc(100% - 346px)}#section-holder{position:relative;top:0;right:250px;bottom:0;left:0;margin-right:250px;padding:10px 26px 99999px;margin-bottom:-99939px}#section-holder .updated{margin:16px 0}#plugin-information .fyi{float:right;position:relative;top:0;right:0;padding:16px 16px 99999px;margin-bottom:-99939px;width:217px;border-left:1px solid #ddd;background:#f3f3f3;color:#666}#plugin-information .fyi strong{color:#444}#plugin-information .fyi h3{font-weight:700;text-transform:uppercase;font-size:12px;color:#666;margin:24px 0 8px}#plugin-information .fyi h2{font-size:.9em;margin-bottom:0;margin-right:0}#plugin-information .fyi ul{padding:0;margin:0;list-style:none}#plugin-information .fyi li{margin:0 0 10px}#plugin-information .fyi-description{margin-top:0}#plugin-information .counter-container{margin:3px 0}#plugin-information .counter-label{float:left;margin-right:5px;min-width:55px}#plugin-information .counter-back{height:17px;width:92px;background-color:#e5e5e5;float:left}#plugin-information .counter-bar{height:17px;background-color:#ffc733;float:left}#plugin-information .counter-count{margin-left:5px}#plugin-information .fyi ul.contributors{margin-top:10px}#plugin-information .fyi ul.contributors li{display:inline-block;margin-right:8px;vertical-align:middle}#plugin-information .fyi ul.contributors li img{vertical-align:middle;margin-right:4px}#plugin-information-footer{padding:13px 16px;position:absolute;right:0;bottom:0;left:0;height:33px;border-top:1px solid #ddd;background:#f3f3f3}#plugin-information .section ol,#plugin-information .section ul{list-style-type:disc;margin-left:24px}#plugin-information .section,#plugin-information .section p{font-size:14px;line-height:1.7}#plugin-information #section-screenshots ol{list-style:none;margin:0}#plugin-information #section-screenshots li img{vertical-align:text-top;margin-top:16px;max-width:100%;width:auto;height:auto;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.3);box-shadow:0 1px 2px rgba(0,0,0,.3)}#plugin-information #section-screenshots li p{font-style:italic;padding-left:20px}#plugin-information pre{padding:7px;overflow:auto;border:1px solid #ccc}#plugin-information .review{overflow:hidden;width:100%;margin-bottom:20px;border-bottom:1px solid #e5e5e5}#plugin-information .review-title-section{overflow:hidden}#plugin-information .review-title-section h4{display:inline-block;float:left;margin:0 6px 0 0}#plugin-information .reviewer-info p{clear:both;margin:0;padding-top:2px}#plugin-information .reviewer-info .avatar{float:left;margin:4px 6px 0 0}#plugin-information .reviewer-info .star-rating{float:left}#plugin-information .review-meta{float:left;margin-left:.75em}#plugin-information .review-body{float:left;width:100%}.plugin-version-author-uri{font-size:13px}@media screen and (max-width:771px){#plugin-information-title.with-banner{height:100px;bottom:100px}#plugin-information-title.with-banner h2{margin-top:30px;font-size:20px;line-height:40px;max-width:85%}#plugin-information-title.with-banner div.vignette{height:100px;bottom:100px;width:800%}#plugin-information-tabs{overflow:hidden;padding:0;height:auto}#plugin-information-tabs a.current{margin-bottom:0;border-bottom:none}#plugin-information .fyi{float:none;border:1px solid #ddd;position:static;width:auto;margin:26px 26px 0;padding-bottom:0}#section-holder{position:static;margin:0;padding-bottom:70px}#plugin-information .fyi h3,#plugin-information .fyi small{display:none}#plugin-information-footer{padding:12px 16px 0;height:46px}}body.about-php #TB_window,body.import-php #TB_window,body.index-php #TB_window,body.plugin-install-php #TB_window,body.plugins-php #TB_window,body.update-core-php #TB_window{background:#fcfcfc}.ie8 body.about-php #TB_window:before,.ie8 body.import-php #TB_window:before,.ie8 body.index-php #TB_window:before,.ie8 body.plugin-install-php #TB_window:before,.ie8 body.plugins-php #TB_window:before,.ie8 body.update-core-php #TB_window:before{content:" ";background:0 0}body.about-php #TB_window.thickbox-loading:before,body.import-php #TB_window.thickbox-loading:before,body.index-php #TB_window.thickbox-loading:before,body.plugin-install-php #TB_window.thickbox-loading:before,body.plugins-php #TB_window.thickbox-loading:before,body.update-core-php #TB_window.thickbox-loading:before{content:"";display:block;width:20px;height:20px;position:absolute;left:50%;top:50%;z-index:-1;margin:-10px 0 0 -10px;background:url(../images/spinner.gif) center no-repeat #fcfcfc;-webkit-background-size:20px 20px;background-size:20px 20px;-webkit-transform:translateZ(0);transform:translateZ(0)}body.about-php #TB_ajaxWindowTitle,body.about-php .tb-close-icon,body.import-php #TB_ajaxWindowTitle,body.import-php .tb-close-icon,body.index-php #TB_ajaxWindowTitle,body.index-php .tb-close-icon,body.plugin-install-php #TB_ajaxWindowTitle,body.plugin-install-php .tb-close-icon,body.plugins-php #TB_ajaxWindowTitle,body.plugins-php .tb-close-icon,body.update-core-php #TB_ajaxWindowTitle,body.update-core-php .tb-close-icon{display:none}@media print,(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){body.about-php #TB_window.thickbox-loading:before,body.import-php #TB_window.thickbox-loading:before,body.index-php #TB_window.thickbox-loading:before,body.plugin-install-php #TB_window.thickbox-loading:before,body.plugins-php #TB_window.thickbox-loading:before,body.update-core-php #TB_window.thickbox-loading:before{background-image:url(../images/spinner-2x.gif)}}body.about-php #TB_title,body.import-php #TB_title,body.index-php #TB_title,body.plugin-install-php #TB_title,body.plugins-php #TB_title,body.update-core-php #TB_title{float:left;height:1px}.about-php #TB_closeWindowButton,.import-php #TB_closeWindowButton,.index-php #TB_closeWindowButton,.plugin-install-php #TB_closeWindowButton,.plugins-php #TB_closeWindowButton,.update-core-php #TB_closeWindowButton{left:auto;right:-30px;color:#eee}body.about-php #TB_closeWindowButton:focus,body.about-php #TB_closeWindowButton:hover,body.import-php #TB_closeWindowButton:focus,body.import-php #TB_closeWindowButton:hover,body.index-php #TB_closeWindowButton:focus,body.index-php #TB_closeWindowButton:hover,body.plugin-install-php #TB_closeWindowButton:focus,body.plugin-install-php #TB_closeWindowButton:hover,body.plugins-php #TB_closeWindowButton:focus,body.plugins-php #TB_closeWindowButton:hover,body.update-core-php #TB_closeWindowButton:focus,body.update-core-php #TB_closeWindowButton:hover{color:#00a0d2;outline:0;-webkit-box-shadow:none;box-shadow:none}body.about-php #TB_closeWindowButton:after,body.import-php #TB_closeWindowButton:after,body.index-php #TB_closeWindowButton:after,body.plugin-install-php #TB_closeWindowButton:after,body.plugins-php #TB_closeWindowButton:after,body.update-core-php #TB_closeWindowButton:after{content:"\f335";font:400 32px/29px dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}@media screen and (max-width:830px){body.about-php #TB_closeWindowButton,body.import-php #TB_closeWindowButton,body.index-php #TB_closeWindowButton,body.plugin-install-php #TB_closeWindowButton,body.plugins-php #TB_closeWindowButton,body.update-core-php #TB_closeWindowButton{right:0;top:-30px}}img{border:none}.js .meta-box-sortables .postbox .toggle-indicator:before,.js .sidebar-name .sidebar-name-arrow:before{content:"\f142";display:inline-block;font:400 20px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important}.js .meta-box-sortables .postbox.closed .handlediv .toggle-indicator:before,.js .widgets-holder-wrap.closed .sidebar-name-arrow:before{content:"\f140"}.js .sidebar-name .sidebar-name-arrow:before{padding:10px;left:0}.js #widgets-left .sidebar-name .sidebar-name-arrow{display:none}.accordion-section.open .accordion-section-content,.js #widgets-left .sidebar-name:hover .sidebar-name-arrow,.js #widgets-left .widgets-holder-wrap.closed .sidebar-name .sidebar-name-arrow,.no-js .accordion-section .accordion-section-content{display:block}.js .postbox .handlediv .toggle-indicator:before{margin-top:4px;width:20px;-webkit-border-radius:50%;border-radius:50%;text-indent:-1px}#postcustomstuff p.submit,#templateside h2,.alignleft h2{margin:0}.rtl.js .postbox .handlediv .toggle-indicator:before{text-indent:1px}.js .postbox .handlediv:focus{-webkit-box-shadow:none;box-shadow:none;outline:0}.js .postbox .handlediv:focus .toggle-indicator:before{-webkit-box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}#photo-add-url-div input[type=text]{width:300px}#template textarea{font-family:Consolas,Monaco,monospace;font-size:13px;width:97%;background:#f9f9f9;outline:0}#template p{width:97%}#templateside{float:right;width:190px}#templateside h4{margin:1em 0 0}#templateside ol,#templateside ul{margin:.5em 0;padding:0}#templateside li{margin:4px 0}#templateside li a,.theme-editor-php .highlight{display:block;padding:3px 3px 3px 12px;text-decoration:none}.theme-editor-php .highlight{margin:-3px 3px -3px -12px}#templateside .highlight{border:none;font-weight:700}.nonessential{color:#666;font-size:11px;font-style:italic;padding-left:12px}#documentation{margin-top:10px}#documentation label{line-height:22px;vertical-align:baseline;font-weight:600}.fileedit-sub{padding:10px 0 8px;line-height:180%}.accordion-section-title:after,.control-section .accordion-section-title:after,.nav-menus-php .item-edit:before,.widget-top a.widget-action:after{right:0;content:"\f140";border:none;background:0 0;font:400 20px/1 dashicons;speak:none;display:block;padding:0;text-indent:0;text-align:center;position:relative;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important}.accordion-section-title:after,.handlediv,.item-edit,.sidebar-name-arrow{color:#72777c}.widget-action{color:#555d66}.accordion-section-title:hover:after,.handlediv:focus,.handlediv:hover,.item-edit:focus,.item-edit:hover,.sidebar-name:hover .sidebar-name-arrow,.widget-action:focus,.widget-top:hover .widget-action{color:#23282d}.widget-top a.widget-action:after{padding:1px 2px 1px 0;margin-top:10px;margin-right:10px;-webkit-border-radius:50%;border-radius:50%}.widget-top a.widget-action:focus:after{-webkit-box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}.accordion-section-title:after,.control-section .accordion-section-title:after{float:right;right:20px;top:-2px}#customize-info.open .accordion-section-title:after,.control-section.open .accordion-section-title:after,.nav-menus-php .menu-item-edit-active .item-edit:before,.widget.open .widget-top a.widget-action:after{content:"\f142"}/*! + * jQuery UI Draggable/Sortable 1.11.4 + * http://jqueryui.com + * + * Copyright jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license + */.ui-draggable-handle,.ui-sortable-handle{-ms-touch-action:none;touch-action:none}.accordion-section{border-bottom:1px solid #ddd;margin:0}.accordion-section.open:hover{border-bottom-color:#ddd}.accordion-section-content{display:none;padding:10px 20px 15px;overflow:hidden;background:#fff}.accordion-section-title{margin:0;padding:12px 15px 15px;position:relative;border-left:1px solid #ddd;border-right:1px solid #ddd;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.js .accordion-section-title{cursor:pointer}.js .accordion-section-title:after{position:absolute;top:12px;right:10px;z-index:1}.accordion-section-title:focus{outline:0}.accordion-section-title:focus:after,.accordion-section-title:hover:after{border-color:#a0a5aa transparent}.cannot-expand .accordion-section-title{cursor:auto}.cannot-expand .accordion-section-title:after{display:none}.control-section .accordion-section-title{border-left:none;border-right:none;padding:10px 10px 11px 14px;line-height:21px;background:#fff}.control-section .accordion-section-title:after{top:11px}.js .control-section .accordion-section-title:focus,.js .control-section .accordion-section-title:hover,.js .control-section.open .accordion-section-title,.js .control-section:hover .accordion-section-title{color:#23282d;background:#f5f5f5}.control-section.open .accordion-section-title{border-bottom:1px solid #ddd}.network-admin .edit-site-actions{margin-top:0}.my-sites{display:block;overflow:auto;zoom:1}.my-sites li{display:block;padding:8px 3%;min-height:130px;margin:0}@media only screen and (max-width:599px){.my-sites li{min-height:0}}@media only screen and (min-width:600px){.my-sites.striped li{background-color:#fff;position:relative}.my-sites.striped li:after{content:"";width:1px;height:100%;position:absolute;top:0;right:0;background:#ccc}}@media only screen and (min-width:600px) and (max-width:699px){.my-sites li{float:left;width:44%}.my-sites.striped li{background-color:#fff}.my-sites.striped li:nth-of-type(2n+1){clear:left}.my-sites.striped li:nth-of-type(2n+2):after{content:none}.my-sites li:nth-of-type(4n+1),.my-sites li:nth-of-type(4n+2){background-color:#f9f9f9}}@media only screen and (min-width:700px) and (max-width:1199px){.my-sites li{float:left;width:27.333333%;background-color:#fff}.my-sites.striped li:nth-of-type(3n+3):after{content:none}.my-sites li:nth-of-type(6n+1),.my-sites li:nth-of-type(6n+2),.my-sites li:nth-of-type(6n+3){background-color:#f9f9f9}}@media only screen and (min-width:1200px) and (max-width:1399px){.my-sites li{float:left;width:21%;padding:8px 2%;background-color:#fff}.my-sites.striped li:nth-of-type(4n+1){clear:left}.my-sites.striped li:nth-of-type(4n+4):after{content:none}.my-sites li:nth-of-type(8n+1),.my-sites li:nth-of-type(8n+2),.my-sites li:nth-of-type(8n+3),.my-sites li:nth-of-type(8n+4){background-color:#f9f9f9}}@media only screen and (min-width:1400px) and (max-width:1599px){.my-sites li{float:left;width:16%;padding:8px 2%;background-color:#fff}.my-sites.striped li:nth-of-type(5n+1){clear:left}.my-sites.striped li:nth-of-type(5n+5):after{content:none}.my-sites li:nth-of-type(10n+1),.my-sites li:nth-of-type(10n+2),.my-sites li:nth-of-type(10n+3),.my-sites li:nth-of-type(10n+4),.my-sites li:nth-of-type(10n+5){background-color:#f9f9f9}}@media only screen and (min-width:1600px){.my-sites li{float:left;width:12.666666%;padding:8px 2%;background-color:#fff}.my-sites.striped li:nth-of-type(6n+1){clear:left}.my-sites.striped li:nth-of-type(6n+6):after{content:none}.my-sites li:nth-of-type(12n+1),.my-sites li:nth-of-type(12n+2),.my-sites li:nth-of-type(12n+3),.my-sites li:nth-of-type(12n+4),.my-sites li:nth-of-type(12n+5),.my-sites li:nth-of-type(12n+6){background-color:#f9f9f9}}.my-sites li a{text-decoration:none}@media only screen and (min-width:769px){#col-left{width:35%}#col-right{width:65%}}@media only screen and (max-width:860px){#col-left{width:35%}#col-right{width:65%}}@media only screen and (min-width:980px){#col-left{width:35%}#col-right{width:65%}}@media only screen and (max-width:768px){#col-left,#col-right{width:100%}}@media print,(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){div.star-holder,div.star-holder .star-rating{background:url(../images/stars-2x.png?ver=20121108) bottom left repeat-x;-webkit-background-size:21px 37px;background-size:21px 37px}.spinner{background-image:url(../images/spinner-2x.gif)}#bulk-titles div a,#bulk-titles div a:hover,#screen-meta-links a.show-settings,.curtime #timestamp,.meta-box-sortables .postbox:hover .handlediv,.sidebar-name-arrow,.sidebar-name:hover .sidebar-name-arrow,.tagchecklist span a,.tagchecklist span a:hover,.widget-top a.widget-action,.widget-top a.widget-action:hover{background:0 0!important}}@-ms-viewport{width:device-width}@media screen and (max-width:782px){#template div,#templateside{float:none;width:auto}html.wp-toolbar{padding-top:46px}body{min-width:240px;overflow-x:hidden}body *{-webkit-tap-highlight-color:rgba(0,0,0,0)!important}#wpcontent{position:relative;margin-left:0;padding-left:10px}#wpbody-content{padding-bottom:100px}.wrap{margin-right:12px;margin-left:0}.col-wrap{padding:0}#collapse-menu,#screen-meta,#screen-meta-links,.post-format-select{display:none!important}.wrap .add-new-h2,.wrap .add-new-h2:active,.wrap .page-title-action,.wrap .page-title-action:active{padding:10px 15px;font-size:14px;white-space:nowrap}.wp-color-result{height:auto;padding-left:45px}.wp-color-result:after{font-size:14px;height:auto;padding:6px 14px}.media-upload-form div.error,.notice,.wrap div.error,.wrap div.updated{margin:20px 0 10px;padding:5px 10px;font-size:14px;line-height:175%}.wp-core-ui .notice.is-dismissible{padding-right:46px}.notice-dismiss{padding:13px}.wrap .icon32+h2{margin-top:-2px}.wp-responsive-open #wpbody{right:-190px}code{word-wrap:break-word}.postbox{font-size:14px}.metabox-holder .postbox>h3,.metabox-holder .stuffbox>h3,.metabox-holder h2,.metabox-holder h3.hndle{padding:12px}.postbox .handlediv{margin-top:3px}.subsubsub{font-size:16px;text-align:center;margin-bottom:15px}#templateside li{margin:0}#templateside li a{display:block;padding:5px}#templateside .highlight{padding:5px;margin-left:-5px;margin-top:-5px}#template div{margin:0}#template textarea{width:100%}.fileedit-sub .alignright{margin-top:15px}#comments-form .checkforspam,#wpfooter{display:none}.edit-comment-author{margin:2px 0 0}.filter-drawer .filter-group-feature input,.filter-drawer .filter-group-feature label{line-height:25px}}@media screen and (max-width:600px){#wpwrap.wp-responsive-open,div#post-body.metabox-holder.columns-1{overflow-x:hidden}html.wp-toolbar{padding-top:0}#wpbody{padding-top:46px}.wrap h2.nav-tab-wrapper,h1.nav-tab-wrapper,h3.nav-tab-wrapper{border-bottom:0}h1 .nav-tab,h2 .nav-tab,h3 .nav-tab{margin:10px 10px 0 0;border-bottom:1px solid #ccc}}@media screen and (max-width:320px){#network_dashboard_right_now .subsubsub{font-size:14px;text-align:left}} \ No newline at end of file diff --git a/wp-admin/css/customize-controls-rtl.css b/wp-admin/css/customize-controls-rtl.css index f3108a3..b9de740 100644 --- a/wp-admin/css/customize-controls-rtl.css +++ b/wp-admin/css/customize-controls-rtl.css @@ -1,5 +1,6 @@ body { overflow: hidden; + -webkit-text-size-adjust: 100%; } #customize-controls a { @@ -10,12 +11,16 @@ body { font-size: 14px; } +#customize-controls img { + max-width: 100%; +} + #customize-controls .submit { text-align: center; } #customize-controls .description { - color: #666666; + color: #555; } #customize-header-actions .button-primary { @@ -24,68 +29,122 @@ body { } #customize-header-actions .spinner { - margin-top: 16px; + margin-top: 13px; margin-left: 4px; } .saving #customize-header-actions .spinner { - display: block; + visibility: visible; +} + +#customize-header-actions { + border-bottom: 1px solid #ddd; +} + +#customize-controls .wp-full-overlay-sidebar-content { + overflow-y: auto; + overflow-x: hidden; } -#customize-info { +#customize-controls .customize-info { border: none; border-top: 1px solid #ddd; + border-bottom: 1px solid #ddd; + margin-bottom: 15px; } -#customize-info .accordion-section-title { - background-color: #fff; - color: #666666; +#customize-controls .customize-info .accordion-section-title { + background: #fff; + color: #555; border-right: none; border-left: none; - border-bottom: 1px solid #eeeeee; -} - -#customize-info.open .accordion-section-title, -#customize-info .accordion-section-title:hover, -#customize-info .accordion-section-title:focus { - color: #555555; + border-bottom: none; + cursor: default; } -#customize-info.open .accordion-section-title:after, -#customize-info .accordion-section-title:hover:after, -#customize-info .accordion-section-title:focus:after { - color: #555555; +#customize-controls .customize-info.open .accordion-section-title:after, +#customize-controls .customize-info .accordion-section-title:hover:after, +#customize-controls .customize-info .accordion-section-title:focus:after { + color: #333; } -#customize-info.open .accordion-section-title { - border-color: transparent; +#customize-controls .customize-info .accordion-section-title:after { + display: none; } -#customize-info .preview-notice { +#customize-controls .customize-info .preview-notice { font-size: 13px; line-height: 24px; } -#customize-info .theme-name { +#customize-controls .control-section .customize-section-title h3, +#customize-controls .control-section h3.customize-section-title, +#customize-controls .customize-info .panel-title { font-size: 20px; font-weight: 200; - line-height: 24px; + line-height: 26px; display: block; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } -#customize-info .theme-screenshot { - width: 258px; +#customize-controls .customize-section-title span.customize-action { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } -#customize-info .theme-description { - margin-top: 1em; - color: #666666; - line-height: 20px; +#customize-controls .customize-info .customize-help-toggle { + position: absolute; + top: 4px; + left: 1px; + padding: 20px 10px 10px 20px; + width: 20px; + height: 20px; + cursor: pointer; + -webkit-box-shadow: none; + box-shadow: none; + -webkit-appearance: none; + background: transparent; + color: #555; + border: none; } -#customize-theme-controls { - -webkit-box-shadow: 0 1px 1px -1px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 1px -1px rgba(0, 0, 0, 0.1); +#customize-controls .customize-info .customize-help-toggle:before { + position: absolute; + top: 5px; + right: 6px; +} + +#customize-controls .customize-info.open .customize-help-toggle, +#customize-controls .customize-info .customize-help-toggle:focus, +#customize-controls .customize-info .customize-help-toggle:hover { + color: #0073aa; +} + +#customize-controls .customize-info .customize-panel-description, +#customize-controls .no-widget-areas-rendered-notice { + color: #555; + display: none; + background: #fff; + padding: 12px 15px; + border-top: 1px solid #ddd; +} +#customize-controls .customize-info .customize-panel-description.open + .no-widget-areas-rendered-notice { + border-top: none; +} + +#customize-controls .customize-info .customize-panel-description p:first-child { + margin-top: 0; +} + +#customize-controls .customize-info .customize-panel-description p:last-child { + margin-bottom: 0; +} + +#customize-controls .current-panel .control-section > h3.accordion-section-title { + padding-left: 30px; } #customize-theme-controls .control-section { @@ -93,21 +152,26 @@ body { } #customize-theme-controls .accordion-section-title { - color: #555555; + color: #555; background-color: #fff; - border-bottom: 1px solid #eeeeee; + border-bottom: 1px solid #eee; +} + +#customize-theme-controls .accordion-section-title:after { + content: "\f341"; + color: #a0a5aa; } #customize-theme-controls .accordion-section-content { - color: #555555; - background: white; + color: #555; + background: transparent; } -#customize-theme-controls .control-section:hover .accordion-section-title, -#customize-theme-controls .control-section .accordion-section-title:hover, -#customize-theme-controls .control-section.open .accordion-section-title, -#customize-theme-controls .control-section .accordion-section-title:focus { - color: #555555; +#customize-controls .control-section:hover > .accordion-section-title, +#customize-controls .control-section .accordion-section-title:hover, +#customize-controls .control-section.open .accordion-section-title, +#customize-controls .control-section .accordion-section-title:focus { + color: #23282d; background: #f5f5f5; } @@ -118,51 +182,332 @@ body { background: #f5f5f5; } -#customize-theme-controls .control-section:hover .accordion-section-title::after, -#customize-theme-controls .control-section .accordion-section-title:hover::after, -#customize-theme-controls .control-section.open .accordion-section-title::after, -#customize-theme-controls .control-section .accordion-section-title:focus::after { - color: #555555; +#customize-theme-controls .control-section:hover > .accordion-section-title:after, +#customize-theme-controls .control-section .accordion-section-title:hover:after, +#customize-theme-controls .control-section.open .accordion-section-title:after, +#customize-theme-controls .control-section .accordion-section-title:focus:after { + color: #23282d; } #customize-theme-controls .control-section.open { - border-bottom: 1px solid #eeeeee; + border-bottom: 1px solid #eee; } #customize-theme-controls .control-section.open .accordion-section-title { - border-bottom-color: #eeeeee !important; + border-bottom-color: #eee !important; } #customize-theme-controls .control-section:last-of-type.open, -#customize-theme-controls .control-section:last-of-type .accordion-section-title { +#customize-theme-controls .control-section:last-of-type > .accordion-section-title { border-bottom-color: #ddd; } -#customize-theme-controls > ul, +#customize-theme-controls > ul { + margin: 0; +} + #customize-theme-controls .accordion-section-content { + position: absolute; + top: 0; + right: 100%; + width: 100%; + margin: 0; + padding: 12px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + +.customize-section-description-container { + margin-bottom: 15px; +} + +.customize-section-title { + margin: -12px -12px 0 -12px; + border-bottom: 1px solid #ddd; + background: #fff; +} + +div.customize-section-description { + margin-top: 22px; +} + +div.customize-section-description p:first-child { + margin-top: 0; +} + +div.customize-section-description p:last-child { + margin-bottom: 0; +} + +#customize-theme-controls .customize-themes-panel h3.customize-section-title:first-child { + border-bottom: 1px solid #ddd; + padding: 12px 12px 12px 12px; +} + +.ios #customize-theme-controls .customize-themes-panel h3.customize-section-title:first-child { + padding: 12px 12px 13px 12px; +} + +.customize-section-title h3, +h3.customize-section-title { + padding: 10px 14px 12px 10px; + margin: 0; + line-height: 21px; + color: #555; +} + +#customize-theme-controls { + position: relative; + right: 0; + -webkit-transition: .18s right ease-in-out; + transition: .18s right ease-in-out; +} + +.ios #customize-theme-controls { + -webkit-transition: right 0s; + transition: right 0s; +} + +.section-open #customize-info, +.section-open #customize-theme-controls { + right: -100%; +} + +.accordion-sub-container.control-panel-content { + display: none; + position: absolute; + right: 300px; + top: 0; + width: 300px; + -webkit-transition: right ease-in-out .18s; + transition: right ease-in-out .18s; +} + +.ios .accordion-sub-container.control-panel-content { + -webkit-transition: right 0s; + transition: right 0s; +} + +.accordion-sub-container.control-panel-content.animating { + display: block; +} + +.current-panel .accordion-sub-container.control-panel-content { + width: 100%; +} + +.customize-controls-close { + display: block; + position: absolute; + top: 0; + right: 0; + width: 45px; + height: 45px; + padding: 0 0 0 2px; + background: #eee; + border: none; + border-left: 1px solid #ddd; + color: #444; + text-align: right; + cursor: pointer; + -webkit-transition: color .1s ease-in-out, background .1s ease-in-out; + transition: color .1s ease-in-out, background .1s ease-in-out; + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} + +.customize-panel-back, +.customize-section-back { + display: block; + float: right; + width: 48px; + height: 71px; + padding: 0 0 0 24px; margin: 0; + background: #fff; + border: none; + border-left: 1px solid #ddd; + -webkit-box-shadow: none; + box-shadow: none; + cursor: pointer; + -webkit-transition: right .18s ease-in-out, color .1s ease-in-out, background .1s ease-in-out; + transition: right .18s ease-in-out, color .1s ease-in-out, background .1s ease-in-out; +} + +.customize-section-back { + height: 74px; +} + +.ios .customize-panel-back, +.ios .customize-section-back { + -webkit-transition: right 0s; + transition: right 0s; +} + +.ios .customize-panel-back { + display: none; +} + +.ios .expanded.in-sub-panel .customize-panel-back { + display: block; +} + +.panel-meta.customize-info .accordion-section-title { + margin-right: 48px; +} + +#customize-controls .panel-meta.customize-info .accordion-section-title:hover { + background: #fff; + color: #555; +} + +.customize-controls-close:focus, +.customize-controls-close:hover, +.customize-controls-preview-toggle:focus, +.customize-controls-preview-toggle:hover { + background: #ddd; + border-color: #ccc; + color: #000; + outline: none; + -webkit-box-shadow: none; + box-shadow: none; +} + +.customize-panel-back:hover, +.customize-panel-back:focus, +.customize-section-back:hover, +.customize-section-back:focus { + color: #23282d; + background: #f5f5f5; + outline: none; + -webkit-box-shadow: none; + box-shadow: none; +} + +.customize-controls-close:before { + font: normal 22px/45px dashicons; + content: "\f335"; + position: relative; + top: 1px; + right: 13px; +} + +.customize-panel-back:before, +.customize-section-back:before { + font: normal 20px/72px dashicons; + content: "\f345"; + position: relative; + right: 13px; +} + +.wp-full-overlay-sidebar .wp-full-overlay-header { + -webkit-transition: padding ease-in-out .18s; + transition: padding ease-in-out .18s; +} + +.in-sub-panel .wp-full-overlay-sidebar .wp-full-overlay-header { + padding-right: 62px; +} + +#customize-info, +#customize-theme-controls > ul > .accordion-section { + position: relative; + right: 0; + -webkit-transition: right ease-in-out .18s; + transition: right ease-in-out .18s; +} + +.ios #customize-info, +.ios #customize-theme-controls > ul > .accordion-section { + -webkit-transition: right 0s; + transition: right 0s; +} + +.in-sub-panel #customize-info, +.in-sub-panel #customize-theme-controls > ul > .accordion-section { + right: -300px; + width: 300px; +} + +.in-sub-panel #customize-theme-controls .accordion-section.current-panel { + width: 100%; +} + +#customize-theme-controls .control-section.current-panel { + padding: 0; +} + +#customize-theme-controls .control-section > h3.accordion-section-title { + position: relative; + right: 0; +} + +#customize-theme-controls .control-section.current-panel > h3.accordion-section-title { + right: -354px; + -webkit-transition: right ease-in-out .18s; + transition: right ease-in-out .18s; +} + +.ios #customize-theme-controls .control-section.current-panel > h3.accordion-section-title { + -webkit-transition: right 0s; + transition: right 0s; +} + +.wp-full-overlay.section-open #customize-controls .wp-full-overlay-sidebar-content { + visibility: hidden; + overflow-y: hidden; +} + +.wp-full-overlay.section-open .wp-full-overlay-sidebar-content .accordion-section.open { + visibility: visible; +} + +.wp-full-overlay.section-open .wp-full-overlay-sidebar-content .accordion-section.open .accordion-section-content { + overflow-y: auto; +} + +p.customize-section-description { + font-style: normal; + margin-top: 22px; + margin-bottom: 0; } .customize-control { width: 100%; float: right; clear: both; - margin-bottom: 8px; + margin-bottom: 12px; } .customize-control select, -.customize-control input[type="text"], .customize-control input[type="radio"], .customize-control input[type="checkbox"] { line-height: 28px; } -.customize-control input[type="text"] { +.customize-control input[type="text"], +.customize-control input[type="password"], +.customize-control input[type="email"], +.customize-control input[type="number"], +.customize-control input[type="search"], +.customize-control input[type="tel"], +.customize-control input[type="url"] { width: 98%; line-height: 18px; margin: 0; } +.customize-control-hidden { + margin: 0; +} + +.customize-control-textarea textarea { + width: 100%; + resize: vertical; +} + .customize-control select { min-width: 50%; max-width: 100%; @@ -182,14 +527,33 @@ body { margin-bottom: 5px; } +.customize-control-description { + display: block; + font-style: italic; + line-height: 18px; + margin-bottom: 5px; +} + .customize-control-color .color-picker, -.customize-control-checkbox label, .customize-control-upload div { line-height: 28px; } -.customize-control-checkbox input { - margin-left: 5px; +.customize-control-radio label, +.customize-control-checkbox label, +.customize-control-nav_menu_auto_add label { + line-height: 20px; + display: block; + margin-right: 24px; + padding-top: 6px; + padding-bottom: 6px; +} + +.customize-control-radio input, +.customize-control-checkbox input, +.customize-control-nav_menu_auto_add input { + margin-left: 4px; + margin-right: -24px; } .customize-control-radio { @@ -201,49 +565,69 @@ body { line-height: 22px; } -.customize-control-radio label { - line-height: 32px; +.customize-control-radio .customize-control-title + .customize-control-description { + margin-top: 7px; } -.customize-control-radio input { - margin-left: 5px; +.customize-control .attachment-thumb.type-icon { + float: right; + margin: 10px; + width: auto; } -#customize-preview iframe { - width: 100%; - height: 100%; +.customize-control .attachment-title { + font-weight: bold; + margin: 0; + padding: 5px 10px; } -.wp-full-overlay-sidebar { - background: #eeeeee; - border-left: 1px solid #ddd; +.customize-control .attachment-meta { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + margin: 0; + padding: 0 10px; +} + +.customize-control .attachment-meta-title { + padding-top: 7px; } -.collapse-sidebar { - background-color: transparent !important; - border: none !important; - -webkit-box-shadow: none !important; - box-shadow: none !important; - -webkit-border-radius: !important 0; - border-radius: !important 0; +.customize-control .thumbnail-image { + line-height: 0; } +.customize-control .thumbnail-image img { + cursor: pointer; +} + +#customize-controls .thumbnail-audio .thumbnail { + max-width: 64px; + max-height: 64px; + margin: 10px; + float: right; +} -.collapse-sidebar:active, -.collapse-sidebar:active .collapse-sidebar-label, -.collapse-sidebar:active .collapse-sidebar-arrow:before { - text-shadow: none; +#customize-preview iframe { + width: 100%; + height: 100%; + position: absolute; +} +#customize-preview iframe + iframe { + visibility: hidden; } -.collapsed .collapse-sidebar-arrow:before { - color: #888; +.wp-full-overlay-sidebar { + background: #eee; + border-left: 1px solid #ddd; } /* Style for custom settings */ -/* +/** * Dropdowns */ + .accordion-section .dropdown { float: right; display: block; @@ -259,25 +643,26 @@ body { line-height: 16px; margin-left: 16px; padding: 4px 5px; - border: 2px solid #eeeeee; + border: 2px solid #eee; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; } +/* @todo maybe no more used? */ .customize-control .dropdown-arrow { position: absolute; top: 0; bottom: 0; left: 0; width: 20px; - background: #eeeeee; + background: #eee; } .customize-control .dropdown-arrow:after { content: "\f140"; - font: normal 20px/1 'dashicons'; + font: normal 20px/1 dashicons; speak: none; display: block; padding: 0; @@ -287,12 +672,12 @@ body { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; text-decoration: none !important; - color: #333; + color: #32373c; } .customize-control .dropdown-status { - color: #333; - background: #eeeeee; + color: #32373c; + background: #eee; display: none; max-width: 112px; } @@ -312,7 +697,7 @@ body { } .customize-control-color .dropdown .dropdown-content { - background-color: #555555; + background-color: #555; border: 1px solid rgba(0, 0, 0, 0.15); } @@ -320,157 +705,37 @@ body { border-color: rgba(0, 0, 0, 0.25); } -/* - * Image Picker +/** + * iOS can't scroll iframes, + * instead it expands the iframe size to match the size of the content */ -.customize-control-image .library, -.customize-control-image .actions { - display: none; - float: right; - width: 100%; + +.ios .wp-full-overlay { + position: relative; } -.customize-control-image.open .library, -.customize-control-image.open .actions { - display: block; +.ios #customize-controls .wp-full-overlay-sidebar-content { + -webkit-overflow-scrolling: touch; } -.accordion-section .customize-control-image .dropdown-content { - height: auto; - min-height: 24px; - min-width: 40px; - padding: 0; +/* Media controls */ + +.customize-control-media .current, +.customize-control-upload .current, +.customize-control-image .current, +.customize-control-background .current, +.customize-control-cropped_image .current, +.customize-control-site_icon .current, +.customize-control-header .current { + margin-bottom: 8px; } -.accordion-section .customize-control-image .dropdown-status { - padding: 4px 5px; +.customize-control-header .uploaded { + margin-bottom: 18px; } -.accordion-section .customize-control-image .preview-thumbnail img { - display: block; - width: 100%; - max-width: 122px; - max-height: 98px; - margin: 0 auto; -} - -.accordion-section .customize-control-image .actions { - text-align: left; -} - -.accordion-section .customize-control-image .library ul { - border-bottom: 1px solid #ddd; - float: right; - width: 100%; - margin: 10px 0 0; -} - -.accordion-section .customize-control-image .library li { - color: #ccc; - float: right; - padding: 3px 15px; - margin: 0; - border: 1px solid transparent; -} - -.accordion-section .customize-control-image .library li.library-selected { - margin-bottom: -1px; - padding-bottom: 4px; - color: #666666; - border-color: #ddd; - border-bottom-color: #fff; -} - -.accordion-section .customize-control-image .library .thumbnail { - display: block; - width: 100%; -} - -.accordion-section .customize-control-image .library .thumbnail img { - display: block; - max-width: 90%; - max-height: 80px; - margin: 5px auto; - padding: 2px; - background: #666666; -} - -.accordion-section .customize-control-image .library .thumbnail:hover img { - background-color: #2ea2cc; -} - -.accordion-section .customize-control-image .library-content { - display: none; - width: 100%; - float: right; - padding: 10px 0; -} - -.accordion-section .customize-control-image .library-content.library-selected { - display: block; -} - -.accordion-section .customize-control-upload .upload-fallback, -.accordion-section .customize-control-image .upload-fallback { - display: none; -} - -.accordion-section .customize-control-upload .upload-dropzone, -.accordion-section .customize-control-image .upload-dropzone { - display: none; - padding: 15px 10px; - border: 3px dashed #dfdfdf; - margin: 5px auto; - text-align: center; - position: relative; - cursor: default; -} - -.accordion-section .customize-control-upload .upload-dropzone.supports-drag-drop, -.accordion-section .customize-control-image .upload-dropzone.supports-drag-drop { - display: block; - -webkit-transition: border-color 0.1s; - transition: border-color 0.1s; -} - -.accordion-section .customize-control-upload .library ul li, -.accordion-section .customize-control-image .library ul li { - cursor: pointer; -} - -.accordion-section .customize-control-upload .upload-dropzone.supports-drag-drop.drag-over, -.accordion-section .customize-control-image .upload-dropzone.supports-drag-drop.drag-over { - border-color: #83b4d8; -} - -/** - * iOS can't scroll iframes, - * instead it expands the iframe size to match the size of the content - */ -.ios .wp-full-overlay { - position: relative; -} - -.ios #customize-preview { - position: relative; -} - -.ios #customize-controls .wp-full-overlay-sidebar-content { - -webkit-overflow-scrolling: touch; -} - -/** Header control **/ - -#customize-control-header_image .current { - margin-bottom: 8px; -} - -#customize-control-header_image .uploaded { - margin-bottom: 18px; -} - -#customize-control-header_image .uploaded button:not(.random), -#customize-control-header_image .default button:not(.random) { +.customize-control-header .uploaded button:not(.random), +.customize-control-header .default button:not(.random) { width: 100%; padding: 0; margin: 0; @@ -480,21 +745,42 @@ body { cursor: pointer; } -#customize-control-header_image button img { +.customize-control-header button img { display: block; } -#customize-control-header_image button.new, -#customize-control-header_image button.remove { +.customize-control-media .remove-button, +.customize-control-media .default-button, +.customize-control-media .upload-button, +.customize-control-upload .remove-button, +.customize-control-upload .default-button, +.customize-control-upload .upload-button, +.customize-control-image .remove-button, +.customize-control-image .default-button, +.customize-control-image .upload-button, +.customize-control-background .remove-button, +.customize-control-background .default-button, +.customize-control-background .upload-button, +.customize-control-cropped_image .remove-button, +.customize-control-cropped_image .default-button, +.customize-control-cropped_image .upload-button, +.customize-control-site_icon .remove-button, +.customize-control-site_icon .default-button, +.customize-control-site_icon .upload-button, +.customize-control-header button.new, +.customize-control-header button.remove { white-space: normal; width: 48%; height: auto; } - -/* Header control: current image container */ - -#customize-control-header_image .current .container { +.customize-control-media .current .container, +.customize-control-upload .current .container, +.customize-control-image .current .container, +.customize-control-background .current .container, +.customize-control-cropped_image .current .container, +.customize-control-site_icon .current .container, +.customize-control-header .current .container { overflow: hidden; -webkit-border-radius: 2px; border: 1px solid #eee; @@ -502,14 +788,40 @@ body { border-radius: 2px; } -#customize-control-header_image .placeholder { +.customize-control-media .current .container, +.customize-control-upload .current .container, +.customize-control-background .current .container, +.customize-control-cropped_image .current .container, +.customize-control-site_icon .current .container, +.customize-control-image .current .container { + min-height: 40px; +} + +.customize-control-media .placeholder, +.customize-control-upload .placeholder, +.customize-control-image .placeholder, +.customize-control-background .placeholder, +.customize-control-cropped_image .placeholder, +.customize-control-site_icon .placeholder, +.customize-control-header .placeholder { width: 100%; position: relative; text-align: center; cursor: default; + border: 1px dashed #b4b9be; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + min-height: 40px; } -#customize-control-header_image .inner { +.customize-control-media .inner, +.customize-control-upload .inner, +.customize-control-image .inner, +.customize-control-background .inner, +.customize-control-cropped_image .inner, +.customize-control-site_icon .inner, +.customize-control-header .inner { display: none; position: absolute; width: 100%; @@ -519,95 +831,104 @@ body { overflow: hidden; } -#customize-control-header_image .inner, -#customize-control-header_image .inner .dashicons { +.customize-control-media .inner, +.customize-control-upload .inner, +.customize-control-background .inner, +.customize-control-cropped_image .inner, +.customize-control-site_icon .inner, +.customize-control-image .inner { + display: block; + min-height: 40px; +} + +.customize-control-media .inner, +.customize-control-upload .inner, +.customize-control-image .inner, +.customize-control-background .inner, +.customize-control-cropped_image .inner, +.customize-control-site_icon .inner, +.customize-control-header .inner, +.customize-control-header .inner .dashicons { line-height: 20px; - top: 10px; + top: 8px; } -#customize-control-header_image .list .inner, -#customize-control-header_image .list .inner .dashicons { + +.customize-control-header .list .inner, +.customize-control-header .list .inner .dashicons { top: 9px; } -#customize-control-header_image .header-view { +.customize-control-header .header-view { position: relative; width: 100%; margin-bottom: 5px; } -#customize-control-header_image .header-view:last-child { +.customize-control-header .header-view:last-child { margin-bottom: 0px; } /* Convoluted, but 'outline' support isn't good enough yet */ -#customize-control-header_image .header-view:after { +.customize-control-header .header-view:after { border: 0; } -#customize-control-header_image .header-view.selected:after { +.customize-control-header .header-view.selected:after { content: ''; position: absolute; height: auto; top: 0; right: 0; bottom: 0; left: 0; - border: 4px solid #2ea2cc; + border: 4px solid #00a0d2; -webkit-border-radius: 2px; border-radius: 2px; } -#customize-control-header_image .header-view.button.selected { +.customize-control-header .header-view.button.selected { border: 0; } /* Header control: overlay "close" button */ -#customize-control-header_image .uploaded .header-view .close { - font-size: 2em; - color: grey; +.customize-control-header .uploaded .header-view .close { + font-size: 20px; + color: #fff; + background: #555; + background: rgba(0, 0, 0, 0.5); position: absolute; - visibility: hidden; top: 10px; - left: 10px; + left: -999px; z-index: 1; - width: 20px; - height: 20px; + width: 26px; + height: 26px; cursor: pointer; } -#customize-control-header_image .uploaded .header-view .close:hover { - color: black; - text-shadow: - -1px -1px 0 #fff, - 1px -1px 0 #fff, - -1px 1px 0 #fff, - 1px 1px 0 #fff; -} - -#customize-control-header_image .header-view:hover .close { - visibility: visible; +.customize-control-header .header-view:hover .close, +.customize-control-header .header-view .close:focus { + left: 10px; } /* Header control: randomiz(s)er */ -#customize-control-header_image .random.placeholder { +.customize-control-header .random.placeholder { cursor: pointer; -webkit-border-radius: 2px; border-radius: 2px; height: 40px; } -#customize-control-header_image button.random { +.customize-control-header button.random { width: 100%; height: auto; min-height: 40px; white-space: normal; } -#customize-control-header_image button.random .dice { +.customize-control-header button.random .dice { margin-top: 4px; } -#customize-control-header_image .placeholder:hover .dice, -#customize-control-header_image .header-view:hover > button.random .dice { +.customize-control-header .placeholder:hover .dice, +.customize-control-header .header-view:hover > button.random .dice { -webkit-animation: dice-color-change 3s infinite; - -ms-animation: dice-color-change 3s infinite; animation: dice-color-change 3s infinite; } @@ -618,13 +939,6 @@ body { 100% { color: #d4b146; } } -@-ms-keyframes dice-color-change { - 0% { color: #d4b146; } - 50% { color: #ef54b0; } - 75% { color: #7190d3; } - 100% { color: #d4b146; } -} - @keyframes dice-color-change { 0% { color: #d4b146; } 50% { color: #ef54b0; } @@ -632,39 +946,263 @@ body { 100% { color: #d4b146; } } -/* Header control: actions and choices */ - -#customize-control-header_image .actions { - margin-bottom: 32px; -} - -#customize-control-header_image .choice { +.customize-control-header .choice { position: relative; display: block; margin-bottom: 9px; } -#customize-control-header_image .uploaded div:last-child > .choice { +.customize-control-header .uploaded div:last-child > .choice { margin-bottom: 0; } -#customize-control-header_image img { +.customize-control-media img, +.customize-control-upload img, +.customize-control-image img, +.customize-control-background img, +.customize-control-cropped_image img, +.customize-control-header img { width: 100%; -webkit-border-radius: 2px; border-radius: 2px; } -#customize-control-header_image .remove { +.customize-control-media .remove-button, +.customize-control-media .default-button, +.customize-control-upload .remove-button, +.customize-control-upload .default-button, +.customize-control-image .remove-button, +.customize-control-image .default-button, +.customize-control-background .remove-button, +.customize-control-background .default-button, +.customize-control-cropped_image .remove-button, +.customize-control-cropped_image .default-button, +.customize-control-site_icon .remove-button, +.customize-control-site_icon .default-button, +.customize-control-header .remove { float: right; margin-left: 3px; } -#customize-control-header_image .new { +.customize-control-media .upload-button, +.customize-control-upload .upload-button, +.customize-control-image .upload-button, +.customize-control-background .upload-button, +.customize-control-cropped_image .upload-button, +.customize-control-site_icon .upload-button, +.customize-control-header .new { float: left; } +/** + * Themes + */ + +@-webkit-keyframes customize-reload { + 0% { opacity: 0; } + 100% { opacity: 1; } +} + +@keyframes customize-reload { + 0% { opacity: 0; } + 100% { opacity: 1; } +} + +/* #customize-container is reused from customize-loader.js, hence the naming. */ +.wp-customizer .customize-loading #customize-container { + display: block; + -webkit-animation: customize-reload .75s; /* Can't use `transition` because `display` changes here. */ + animation: customize-reload .75s; +} + +.control-section-themes .accordion-section-title { + cursor: default; +} + +#customize-theme-controls .control-section-themes .accordion-section-title:hover, +#customize-theme-controls .control-section-themes .accordion-section-title:focus { + color: #555; + background-color: #fff; +} + +.control-section-themes .accordion-section-title { + margin: 15px 0; +} + +.customize-themes-panel .accordion-section-title { + margin: 15px -8px; +} + +.control-section-themes .accordion-section-title { + padding-left: 100px; /* Space for the button */ +} + +.control-section-themes .accordion-section-title span.customize-action, +#customize-controls .customize-section-title span.customize-action { + font-size: 13px; + display: block; + font-weight: 400; +} + +.control-section-themes .accordion-section-title .change-theme, +.control-section-themes .accordion-section-title .customize-theme { + position: absolute; + left: 10px; + top: 50%; + margin-top: -14px; + font-weight: normal; +} + +.control-section-themes .accordion-section-title:before { + display: none; +} + +.customize-themes-panel { + display: none; + padding: 0 8px; + background: #f1f1f1; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + +.customize-themes-panel .accordion-section-title:first-child { + margin-top: 0; +} + +#customize-controls .customize-themes-panel .accordion-section-title:nth-child(2) { + font-size: 14px; + font-weight: 600; +} + +.customize-themes-panel > h2 { + padding: 15px 8px 0 8px; +} + +.control-section.open .customize-themes-panel { + display: block; +} + +#customize-theme-controls .customize-themes-panel .accordion-section-content { + background: transparent; + display: block; +} -/** Handle cheaters. */ +.customize-control.customize-control-theme { + margin-bottom: 8px; +} + +#customize-theme-controls .themes.accordion-section-content { + position: relative; + right: 0; + padding: 0; + width: 100%; +} + +.wp-customizer .theme-browser .themes { + padding-bottom: 8px; +} + +.wp-customizer .theme-browser .theme { + margin: 0; + width: 100%; +} + +.wp-customizer .theme-browser .theme .theme-actions { + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; + opacity: 1; +} + +#customize-controls h3.theme-name { + font-size: 15px; +} + +#customize-controls .theme-overlay .theme-name { + font-size: 32px; +} + +.wp-customizer #themes-filter { + font-size: 16px; + font-weight: 300; + line-height: 1.5; + width: 100%; +} + +#accordion-section-themes .accordion-section-title:after { + display: none; +} + +#customize-theme-controls .control-section-themes.current-panel > h3.accordion-section-title { + right: 0; +} + +.customize-themes-panel.control-panel-content { + position: absolute; + right: -100%; + top: 0; + width: 100%; + border-top: 1px solid #ddd; +} + +.in-themes-panel #customize-info, +.in-themes-panel #customize-theme-controls > ul > .accordion-section { + right: 100%; +} + +/* Details View */ +.wp-customizer .theme-overlay { + display: none; +} + +.wp-customizer.modal-open .theme-overlay { + position: fixed; + right: 0; + top: 0; + left: 0; + bottom: 0; + z-index: 109; +} + +.wp-customizer .theme-overlay .theme-backdrop { + background: rgba( 238, 238, 238, 0.75 ); + position: fixed; + z-index: 110; +} + +.wp-customizer .theme-overlay .theme-wrap { + right: 90px; + left: 90px; + top: 45px; + bottom: 45px; + z-index: 120; + max-width: 1740px; /* To ensure that theme screenshots are not displayed larger than 880px wide. */ +} + +.wp-customizer .theme-overlay .theme-actions { + text-align: left; /* Because there's only one action, match the pattern of media modals and right-align the action. */ +} + +.modal-open .in-themes-panel #customize-controls .wp-full-overlay-sidebar-content { + overflow: visible; /* Prevent the top-level Customizer controls from becoming visible when elements on the right of the details modal are focused. */ +} + +.ie8 .wp-customizer .theme-overlay .theme-header, +.ie8 .wp-customizer .theme-overlay .theme-about, +.ie8 .wp-customizer .theme-overlay .theme-actions { + position: static; +} + +/* Small Screens */ +@media (max-width:850px), (max-height:472px) { + .wp-customizer .theme-overlay .theme-wrap { + right: 0; + left: 0; + top: 0; + bottom: 0; + } +} + +/* Handle cheaters. */ body.cheatin { font-size: medium; height: auto; @@ -677,8 +1215,453 @@ body.cheatin { box-shadow: 0 1px 3px rgba(0,0,0,0.13); } +body.cheatin h1 { + border-bottom: 1px solid #ddd; + clear: both; + color: #666; + font: 24px "Open Sans", sans-serif; + margin: 30px 0 0 0; + padding: 0; + padding-bottom: 7px; +} + body.cheatin p { font-size: 14px; line-height: 1.5; margin: 25px 0 20px; } + +/** + * Widgets and Menus common styles + */ + +/* higher specificity than .wp-core-ui .button-secondary */ +#customize-theme-controls .add-new-widget, +#customize-theme-controls .add-new-menu-item { + cursor: pointer; + float: left; + margin-right: 10px; + -webkit-transition: all 0.2s; + transition: all 0.2s; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + outline: none; +} + +.reordering .add-new-widget, +.reordering .add-new-menu-item { + opacity: 0.2; + pointer-events: none; + cursor: not-allowed; /* doesn't work in conjunction with pointer-events */ +} + +.add-new-widget:before, +.add-new-menu-item:before { + content: "\f132"; + display: inline-block; + position: relative; + right: -2px; + top: -1px; + font: normal 20px/1 dashicons; + vertical-align: middle; + -webkit-transition: all 0.2s; + transition: all 0.2s; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +/* Reordering */ +.reorder-toggle { + color: #0073aa; + float: left; + padding: 5px 8px; + text-decoration: none; + cursor: pointer; + outline: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} + +.reorder-toggle:hover { + color: #00a0d2; +} + +.reorder-toggle:focus { + outline: 1px dotted; +} + +.reorder, +.reordering .reorder-done { + display: block; + padding: 5px 8px; +} + +.reorder-done, +.reordering .reorder { + display: none; + color: #0073aa; +} + +.reorder-toggle:hover .reorder-done, +.reorder-toggle:active .reorder-done, +.reorder-toggle:focus .reorder-done { + color: #00a0d2; +} + +.widget-reorder-nav span, +.menu-item-reorder-nav button { + position: relative; + overflow: hidden; + float: right; + display: block; + width: 33px; /* was 42px for mobile */ + height: 43px; + color: #82878c; + text-indent: -9999px; + cursor: pointer; + outline: none; +} + +.menu-item-reorder-nav button { + width: 30px; + height: 40px; + background: transparent; + border: none; + -webkit-box-shadow: none; + box-shadow: none; +} + +.widget-reorder-nav span:before, +.menu-item-reorder-nav button:before { + display: inline-block; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + font: normal 20px/43px dashicons; + text-align: center; + text-indent: 0; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.widget-reorder-nav span:hover, +.widget-reorder-nav span:focus, +.menu-item-reorder-nav button:hover, +.menu-item-reorder-nav button:focus { + color: #191e23; + background: #eee; +} + +.move-widget-down:before, +.menus-move-down:before { + content: "\f347"; +} + +.move-widget-up:before, +.menus-move-up:before { + content: "\f343"; +} + +#customize-theme-controls .first-widget .move-widget-up, +#customize-theme-controls .last-widget .move-widget-down, +.move-up-disabled .menus-move-up, +.move-down-disabled .menus-move-down, +.move-right-disabled .menus-move-right, +.move-left-disabled .menus-move-left { + color: #d5d5d5; + background-color: #fff; + cursor: default; + pointer-events: none; +} + +/** + * New widget and Add-menu-items modes and panels + */ + +.wp-full-overlay-main { + left: auto; /* this overrides a right: 0; which causes the preview to resize, I'd rather have it go off screen at the normal size. */ + width: 100%; +} + +body.adding-widget .add-new-widget, +body.adding-widget .add-new-widget:hover, +.adding-menu-items .add-new-menu-item, +.adding-menu-items .add-new-menu-item:hover, +.add-menu-toggle.open, +.add-menu-toggle.open:hover { + background: #eee; + border-color: #929793; + color: #32373c; + -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); + box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); +} + +body.adding-widget .add-new-widget:before, +.adding-menu-items .add-new-menu-item:before, +#accordion-section-add_menu .add-new-menu-item.open:before { + -webkit-transform: rotate(-45deg); + -ms-transform: rotate(-45deg); + transform: rotate(-45deg); +} + +#available-widgets, +#available-menu-items { + position: absolute; + top: 0; + bottom: 0; + right: -301px; + visibility: hidden; + overflow-x: hidden; + overflow-y: auto; + width: 300px; + margin: 0; + z-index: 4; + background: #eee; + -webkit-transition: right .18s; + transition: right .18s; + border-left: 1px solid #ddd; +} + +#available-widgets .customize-section-title, +#available-menu-items .customize-section-title { + display: none; +} + +#available-widgets-list { + top: 60px; + position: absolute; + overflow: auto; + bottom: 0; + width: 100%; +} + +#available-widgets-filter { + position: fixed; + top: 0; + z-index: 1; + width: 300px; + background: #eee; + border-bottom: 1px solid #e5e5e5; +} + +/* search field container */ +#available-widgets-filter, +#available-menu-items-search .accordion-section-title { + padding: 12px 15px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + +#available-widgets-filter input, +#available-menu-items-search input { + padding: 6px 10px; + width: 100%; +} + +#available-widgets .widget-top, +#available-widgets .widget-top:hover, +#available-menu-items .item-top, +#available-menu-items .item-top:hover { + border: none; + background: transparent; + -webkit-box-shadow: none; + box-shadow: none; +} + +#available-widgets .widget-tpl, +#available-menu-items .item-tpl { + position: relative; + padding: 20px 60px 20px 15px; + background: #fff; + border-bottom: 1px solid #e5e5e5; + cursor: pointer; + display: none; +} + +#available-widgets .widget, +#available-menu-items .item { + position: static; +} + + +/* Responsive */ +.customize-controls-preview-toggle { + display: none; +} + +@media only screen and (max-width: 782px) { + .wp-customizer .theme:not(.active):hover .theme-actions, + .wp-customizer .theme:not(.active):focus .theme-actions { + display: block; + } + + .wp-customizer .theme-browser .theme.active .theme-name span { + display: inline; + } + + .customize-control-radio label, + .customize-control-checkbox label, + .customize-control-nav_menu_auto_add label { + margin-right: 32px; + } + + .customize-control-radio input, + .customize-control-checkbox input, + .customize-control-nav_menu_auto_add input { + margin-right: -32px; + } + + .customize-control input[type="radio"] + label, + .customize-control input[type="checkbox"] + label { + line-height: 32px; + } +} + +@media screen and ( max-width: 640px ) { + #customize-controls { + width: 100%; + } + + .wp-full-overlay.expanded { + margin-right: 0; + } + + /* when the sidebar is collapsed and switching to responsive view, + bring it back see ticket #35220 */ + .wp-full-overlay.collapsed #customize-controls { + margin-right: 0; + } + + .wp-full-overlay-sidebar .wp-full-overlay-sidebar-content { + bottom: 0; + } + + .customize-controls-preview-toggle { + display: block; + position: absolute; + top: 0; + right: 48px; + line-height: 45px; + font-size: 14px; + padding: 0 12px 0 12px; + margin: 0; + height: 45px; + background: #eee; + border-left: 1px solid #ddd; + color: #444; + cursor: pointer; + -webkit-transition: color .1s ease-in-out, background .1s ease-in-out; + transition: color .1s ease-in-out, background .1s ease-in-out; + } + + #customize-footer-actions, + #customize-preview, + .customize-controls-preview-toggle .controls, + .preview-only .wp-full-overlay-sidebar-content, + .preview-only .customize-controls-preview-toggle .preview { + display: none; + } + + .customize-controls-preview-toggle .preview:before, + .customize-controls-preview-toggle .controls:before { + font: normal 20px/1 dashicons; + content: "\f177"; + position: relative; + top: 4px; + margin-left: 6px; + } + + .customize-controls-preview-toggle .controls:before { + content: "\f540"; + } + + .preview-only #customize-controls { + height: 45px; + } + + .preview-only #customize-preview, + .preview-only .customize-controls-preview-toggle .controls { + display: block; + } + + #customize-preview { + top: 45px; + bottom: 0; + height: auto; + } + + .wp-core-ui.wp-customizer .button { + padding: 6px 14px; + line-height: normal; + font-size: 14px; + vertical-align: middle; + height: auto; + margin-bottom: 4px; + } + + #customize-header-actions .button-primary { + margin-top: 6px; + } + + body.adding-widget div#available-widgets, + body.adding-menu-items div#available-menu-items { + top: 46px; + right: 0; + z-index: 10; + width: 100%; + } + + #available-widgets .customize-section-title, + #available-menu-items .customize-section-title { + display: block; + margin: 0; + } + + #available-widgets .customize-section-back, + #available-menu-items .customize-section-back { + height: 69px; + } + + #available-widgets .customize-section-title h3, + #available-menu-items .customize-section-title h3 { + font-size: 20px; + font-weight: 200; + padding: 9px 14px 12px 10px; + margin: 0; + line-height: 24px; + color: #555; + display: block; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + + #available-widgets .customize-section-title .customize-action, + #available-menu-items .customize-section-title .customize-action { + font-size: 13px; + display: block; + font-weight: 400; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + + #available-widgets-filter { + position: relative; + width: 100%; + background: #fff; + height: auto; + padding: 10px 15px; + } + + #available-widgets-list { + top: 140px; + } +} diff --git a/wp-admin/css/customize-controls-rtl.min.css b/wp-admin/css/customize-controls-rtl.min.css index 9f672b9..a8af689 100644 --- a/wp-admin/css/customize-controls-rtl.min.css +++ b/wp-admin/css/customize-controls-rtl.min.css @@ -1 +1 @@ -body{overflow:hidden}#customize-controls a{text-decoration:none}#customize-controls h3{font-size:14px}#customize-controls .submit{text-align:center}#customize-controls .description{color:#666}#customize-header-actions .button-primary{float:left;margin-top:9px}#customize-header-actions .spinner{margin-top:16px;margin-left:4px}.saving #customize-header-actions .spinner{display:block}#customize-info{border:0;border-top:1px solid #ddd}#customize-info .accordion-section-title{background-color:#fff;color:#666;border-right:0;border-left:0;border-bottom:1px solid #eee}#customize-info .accordion-section-title:focus,#customize-info .accordion-section-title:focus:after,#customize-info .accordion-section-title:hover,#customize-info .accordion-section-title:hover:after,#customize-info.open .accordion-section-title,#customize-info.open .accordion-section-title:after{color:#555}#customize-info.open .accordion-section-title{border-color:transparent}#customize-info .preview-notice{font-size:13px;line-height:24px}#customize-info .theme-name{font-size:20px;font-weight:200;line-height:24px;display:block}#customize-info .theme-screenshot{width:258px}#customize-info .theme-description{margin-top:1em;color:#666;line-height:20px}#customize-theme-controls{-webkit-box-shadow:0 1px 1px -1px rgba(0,0,0,.1);box-shadow:0 1px 1px -1px rgba(0,0,0,.1)}#customize-theme-controls .control-section{border:0}#customize-theme-controls .accordion-section-title{color:#555;background-color:#fff;border-bottom:1px solid #eee}#customize-theme-controls .accordion-section-content{color:#555;background:#fff}#customize-theme-controls .control-section .accordion-section-title:focus,#customize-theme-controls .control-section .accordion-section-title:hover,#customize-theme-controls .control-section.open .accordion-section-title,#customize-theme-controls .control-section:hover .accordion-section-title{color:#555;background:#f5f5f5}.js .control-section .accordion-section-title:focus,.js .control-section .accordion-section-title:hover,.js .control-section.open .accordion-section-title,.js .control-section:hover .accordion-section-title{background:#f5f5f5}#customize-theme-controls .control-section .accordion-section-title:focus::after,#customize-theme-controls .control-section .accordion-section-title:hover::after,#customize-theme-controls .control-section.open .accordion-section-title::after,#customize-theme-controls .control-section:hover .accordion-section-title::after{color:#555}#customize-theme-controls .control-section.open{border-bottom:1px solid #eee}#customize-theme-controls .control-section.open .accordion-section-title{border-bottom-color:#eee!important}#customize-theme-controls .control-section:last-of-type .accordion-section-title,#customize-theme-controls .control-section:last-of-type.open{border-bottom-color:#ddd}#customize-theme-controls .accordion-section-content,#customize-theme-controls>ul{margin:0}.customize-control{width:100%;float:right;clear:both;margin-bottom:8px}.customize-control input[type=checkbox],.customize-control input[type=radio],.customize-control input[type=text],.customize-control select{line-height:28px}.customize-control input[type=text]{width:98%;line-height:18px;margin:0}.customize-control select{min-width:50%;max-width:100%;height:28px;line-height:28px}.customize-control select[multiple]{height:auto}.customize-control-title{display:block;font-size:14px;line-height:24px;font-weight:600;margin-bottom:5px}.customize-control-checkbox label,.customize-control-color .color-picker,.customize-control-upload div{line-height:28px}.customize-control-checkbox input{margin-left:5px}.customize-control-radio{padding:5px 0 10px}.customize-control-radio .customize-control-title{margin-bottom:0;line-height:22px}.customize-control-radio label{line-height:32px}.customize-control-radio input{margin-left:5px}#customize-preview iframe{width:100%;height:100%}.wp-full-overlay-sidebar{background:#eee;border-left:1px solid #ddd}.collapse-sidebar{background-color:transparent!important;border:0!important;-webkit-box-shadow:none!important;box-shadow:none!important;-webkit-border-radius:!important 0;border-radius:!important 0}.collapse-sidebar:active,.collapse-sidebar:active .collapse-sidebar-arrow:before,.collapse-sidebar:active .collapse-sidebar-label{text-shadow:none}.collapsed .collapse-sidebar-arrow:before{color:#888}.accordion-section .dropdown{float:right;display:block;position:relative;cursor:pointer}.accordion-section .dropdown-content{overflow:hidden;float:right;min-width:30px;height:16px;line-height:16px;margin-left:16px;padding:4px 5px;border:2px solid #eee;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.customize-control .dropdown-arrow{position:absolute;top:0;bottom:0;left:0;width:20px;background:#eee}.customize-control .dropdown-arrow:after{content:"\f140";font:400 20px/1 dashicons;speak:none;display:block;padding:0;text-indent:0;text-align:center;position:relative;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;color:#333}.customize-control .dropdown-status{color:#333;background:#eee;display:none;max-width:112px}.customize-control-color .color-picker-hex{display:none}.customize-control-color.open .color-picker-hex{display:block}.customize-control-color .dropdown{margin-left:5px;margin-bottom:5px}.customize-control-color .dropdown .dropdown-content{background-color:#555;border:1px solid rgba(0,0,0,.15)}.customize-control-color .dropdown:hover .dropdown-content{border-color:rgba(0,0,0,.25)}.customize-control-image .actions,.customize-control-image .library{display:none;float:right;width:100%}.customize-control-image.open .actions,.customize-control-image.open .library{display:block}.accordion-section .customize-control-image .dropdown-content{height:auto;min-height:24px;min-width:40px;padding:0}.accordion-section .customize-control-image .dropdown-status{padding:4px 5px}.accordion-section .customize-control-image .preview-thumbnail img{display:block;width:100%;max-width:122px;max-height:98px;margin:0 auto}.accordion-section .customize-control-image .actions{text-align:left}.accordion-section .customize-control-image .library ul{border-bottom:1px solid #ddd;float:right;width:100%;margin:10px 0 0}.accordion-section .customize-control-image .library li{color:#ccc;float:right;padding:3px 15px;margin:0;border:1px solid transparent}.accordion-section .customize-control-image .library li.library-selected{margin-bottom:-1px;padding-bottom:4px;color:#666;border-color:#ddd;border-bottom-color:#fff}.accordion-section .customize-control-image .library .thumbnail{display:block;width:100%}.accordion-section .customize-control-image .library .thumbnail img{display:block;max-width:90%;max-height:80px;margin:5px auto;padding:2px;background:#666}.accordion-section .customize-control-image .library .thumbnail:hover img{background-color:#2ea2cc}.accordion-section .customize-control-image .library-content{display:none;width:100%;float:right;padding:10px 0}.accordion-section .customize-control-image .library-content.library-selected{display:block}.accordion-section .customize-control-image .upload-fallback,.accordion-section .customize-control-upload .upload-fallback{display:none}.accordion-section .customize-control-image .upload-dropzone,.accordion-section .customize-control-upload .upload-dropzone{display:none;padding:15px 10px;border:3px dashed #dfdfdf;margin:5px auto;text-align:center;position:relative;cursor:default}.accordion-section .customize-control-image .upload-dropzone.supports-drag-drop,.accordion-section .customize-control-upload .upload-dropzone.supports-drag-drop{display:block;-webkit-transition:border-color .1s;transition:border-color .1s}.accordion-section .customize-control-image .library ul li,.accordion-section .customize-control-upload .library ul li{cursor:pointer}.accordion-section .customize-control-image .upload-dropzone.supports-drag-drop.drag-over,.accordion-section .customize-control-upload .upload-dropzone.supports-drag-drop.drag-over{border-color:#83b4d8}.ios #customize-preview,.ios .wp-full-overlay{position:relative}.ios #customize-controls .wp-full-overlay-sidebar-content{-webkit-overflow-scrolling:touch}#customize-control-header_image .current{margin-bottom:8px}#customize-control-header_image .uploaded{margin-bottom:18px}#customize-control-header_image .default button:not(.random),#customize-control-header_image .uploaded button:not(.random){width:100%;padding:0;margin:0;background:0 0;border:0;color:inherit;cursor:pointer}#customize-control-header_image button img{display:block}#customize-control-header_image button.new,#customize-control-header_image button.remove{white-space:normal;width:48%;height:auto}#customize-control-header_image .current .container{overflow:hidden;border:1px solid #eee;-webkit-border-radius:2px;border-radius:2px}#customize-control-header_image .placeholder{width:100%;position:relative;text-align:center;cursor:default}#customize-control-header_image .inner{display:none;position:absolute;width:100%;color:#555;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}#customize-control-header_image .inner,#customize-control-header_image .inner .dashicons{line-height:20px;top:10px}#customize-control-header_image .list .inner,#customize-control-header_image .list .inner .dashicons{top:9px}#customize-control-header_image .header-view{position:relative;width:100%;margin-bottom:5px}#customize-control-header_image .header-view:last-child{margin-bottom:0}#customize-control-header_image .header-view:after{border:0}#customize-control-header_image .header-view.selected:after{content:'';position:absolute;height:auto;top:0;right:0;bottom:0;left:0;border:4px solid #2ea2cc;-webkit-border-radius:2px;border-radius:2px}#customize-control-header_image .header-view.button.selected{border:0}#customize-control-header_image .uploaded .header-view .close{font-size:2em;color:grey;position:absolute;visibility:hidden;top:10px;left:10px;z-index:1;width:20px;height:20px;cursor:pointer}#customize-control-header_image .uploaded .header-view .close:hover{color:#000;text-shadow:-1px -1px 0 #fff,1px -1px 0 #fff,-1px 1px 0 #fff,1px 1px 0 #fff}#customize-control-header_image .header-view:hover .close{visibility:visible}#customize-control-header_image .random.placeholder{cursor:pointer;-webkit-border-radius:2px;border-radius:2px;height:40px}#customize-control-header_image button.random{width:100%;height:auto;min-height:40px;white-space:normal}#customize-control-header_image button.random .dice{margin-top:4px}#customize-control-header_image .header-view:hover>button.random .dice,#customize-control-header_image .placeholder:hover .dice{-webkit-animation:dice-color-change 3s infinite;-ms-animation:dice-color-change 3s infinite;animation:dice-color-change 3s infinite}@-webkit-keyframes dice-color-change{0%{color:#d4b146}50%{color:#ef54b0}75%{color:#7190d3}100%{color:#d4b146}}@-ms-keyframes dice-color-change{0%{color:#d4b146}50%{color:#ef54b0}75%{color:#7190d3}100%{color:#d4b146}}@keyframes dice-color-change{0%{color:#d4b146}50%{color:#ef54b0}75%{color:#7190d3}100%{color:#d4b146}}#customize-control-header_image .actions{margin-bottom:32px}#customize-control-header_image .choice{position:relative;display:block;margin-bottom:9px}#customize-control-header_image .uploaded div:last-child>.choice{margin-bottom:0}#customize-control-header_image img{width:100%;-webkit-border-radius:2px;border-radius:2px}#customize-control-header_image .remove{float:right;margin-left:3px}#customize-control-header_image .new{float:left}body.cheatin{font-size:medium;height:auto;background:#fff;margin:50px auto 2em;padding:1em 2em;max-width:700px;min-width:0;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.13);box-shadow:0 1px 3px rgba(0,0,0,.13)}body.cheatin p{font-size:14px;line-height:1.5;margin:25px 0 20px} \ No newline at end of file +body{overflow:hidden;-webkit-text-size-adjust:100%}#customize-controls a{text-decoration:none}#customize-controls h3{font-size:14px}#customize-controls img{max-width:100%}#customize-controls .submit{text-align:center}#customize-controls .description{color:#555}#customize-header-actions .button-primary{float:left;margin-top:9px}#customize-header-actions .spinner{margin-top:13px;margin-left:4px}.saving #customize-header-actions .spinner{visibility:visible}#customize-header-actions{border-bottom:1px solid #ddd}#customize-controls .wp-full-overlay-sidebar-content{overflow-y:auto;overflow-x:hidden}#customize-controls .customize-info{border:none;border-top:1px solid #ddd;border-bottom:1px solid #ddd;margin-bottom:15px}#customize-controls .customize-info .accordion-section-title{background:#fff;color:#555;border-right:none;border-left:none;border-bottom:none;cursor:default}#customize-controls .customize-info .accordion-section-title:focus:after,#customize-controls .customize-info .accordion-section-title:hover:after,#customize-controls .customize-info.open .accordion-section-title:after{color:#333}#customize-controls .customize-info .accordion-section-title:after{display:none}#customize-controls .customize-info .preview-notice{font-size:13px;line-height:24px}#customize-controls .control-section .customize-section-title h3,#customize-controls .control-section h3.customize-section-title,#customize-controls .customize-info .panel-title{font-size:20px;font-weight:200;line-height:26px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}#customize-controls .customize-section-title span.customize-action{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}#customize-controls .customize-info .customize-help-toggle{position:absolute;top:4px;left:1px;padding:20px 10px 10px 20px;width:20px;height:20px;cursor:pointer;-webkit-box-shadow:none;box-shadow:none;-webkit-appearance:none;background:0 0;color:#555;border:none}#customize-controls .customize-info .customize-help-toggle:before{position:absolute;top:5px;right:6px}#customize-controls .customize-info .customize-help-toggle:focus,#customize-controls .customize-info .customize-help-toggle:hover,#customize-controls .customize-info.open .customize-help-toggle{color:#0073aa}#customize-controls .customize-info .customize-panel-description,#customize-controls .no-widget-areas-rendered-notice{color:#555;display:none;background:#fff;padding:12px 15px;border-top:1px solid #ddd}#customize-controls .customize-info .customize-panel-description.open+.no-widget-areas-rendered-notice{border-top:none}#customize-controls .customize-info .customize-panel-description p:first-child{margin-top:0}#customize-controls .customize-info .customize-panel-description p:last-child{margin-bottom:0}#customize-controls .current-panel .control-section>h3.accordion-section-title{padding-left:30px}#customize-theme-controls .control-section{border:none}#customize-theme-controls .accordion-section-title{color:#555;background-color:#fff;border-bottom:1px solid #eee}#customize-theme-controls .accordion-section-title:after{content:"\f341";color:#a0a5aa}#customize-theme-controls .accordion-section-content{color:#555;background:0 0;position:absolute;top:0;right:100%;width:100%;margin:0;padding:12px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#customize-controls .control-section .accordion-section-title:focus,#customize-controls .control-section .accordion-section-title:hover,#customize-controls .control-section.open .accordion-section-title,#customize-controls .control-section:hover>.accordion-section-title{color:#23282d;background:#f5f5f5}.js .control-section .accordion-section-title:focus,.js .control-section .accordion-section-title:hover,.js .control-section.open .accordion-section-title,.js .control-section:hover .accordion-section-title{background:#f5f5f5}#customize-theme-controls .control-section .accordion-section-title:focus:after,#customize-theme-controls .control-section .accordion-section-title:hover:after,#customize-theme-controls .control-section.open .accordion-section-title:after,#customize-theme-controls .control-section:hover>.accordion-section-title:after{color:#23282d}#customize-theme-controls .control-section.open{border-bottom:1px solid #eee}#customize-theme-controls .control-section.open .accordion-section-title{border-bottom-color:#eee!important}#customize-theme-controls .control-section:last-of-type.open,#customize-theme-controls .control-section:last-of-type>.accordion-section-title{border-bottom-color:#ddd}#customize-theme-controls>ul{margin:0}.customize-section-description-container{margin-bottom:15px}.customize-section-title{margin:-12px -12px 0;border-bottom:1px solid #ddd;background:#fff}div.customize-section-description{margin-top:22px}div.customize-section-description p:first-child{margin-top:0}div.customize-section-description p:last-child{margin-bottom:0}#customize-theme-controls .customize-themes-panel h3.customize-section-title:first-child{border-bottom:1px solid #ddd;padding:12px}.ios #customize-theme-controls .customize-themes-panel h3.customize-section-title:first-child{padding:12px 12px 13px}.customize-section-title h3,h3.customize-section-title{padding:10px 14px 12px 10px;margin:0;line-height:21px;color:#555}#customize-theme-controls{position:relative;right:0;-webkit-transition:.18s right ease-in-out;transition:.18s right ease-in-out}.ios #customize-theme-controls{-webkit-transition:right 0s;transition:right 0s}.section-open #customize-info,.section-open #customize-theme-controls{right:-100%}.accordion-sub-container.control-panel-content{display:none;position:absolute;right:300px;top:0;width:300px;-webkit-transition:right ease-in-out .18s;transition:right ease-in-out .18s}.ios .accordion-sub-container.control-panel-content{-webkit-transition:right 0s;transition:right 0s}.accordion-sub-container.control-panel-content.animating{display:block}.current-panel .accordion-sub-container.control-panel-content{width:100%}.customize-controls-close{display:block;position:absolute;top:0;right:0;width:45px;height:45px;padding:0 0 0 2px;background:#eee;border:none;border-left:1px solid #ddd;color:#444;text-align:right;cursor:pointer;-webkit-transition:color .1s ease-in-out,background .1s ease-in-out;transition:color .1s ease-in-out,background .1s ease-in-out;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.customize-panel-back,.customize-section-back{display:block;float:right;width:48px;height:71px;padding:0 0 0 24px;margin:0;background:#fff;border:none;border-left:1px solid #ddd;-webkit-box-shadow:none;box-shadow:none;cursor:pointer;-webkit-transition:right .18s ease-in-out,color .1s ease-in-out,background .1s ease-in-out;transition:right .18s ease-in-out,color .1s ease-in-out,background .1s ease-in-out}.customize-section-back{height:74px}.ios .customize-panel-back,.ios .customize-section-back{-webkit-transition:right 0s;transition:right 0s}.ios .customize-panel-back{display:none}.ios .expanded.in-sub-panel .customize-panel-back{display:block}.panel-meta.customize-info .accordion-section-title{margin-right:48px}#customize-controls .panel-meta.customize-info .accordion-section-title:hover{background:#fff;color:#555}.customize-controls-close:focus,.customize-controls-close:hover,.customize-controls-preview-toggle:focus,.customize-controls-preview-toggle:hover{background:#ddd;border-color:#ccc;color:#000;outline:0;-webkit-box-shadow:none;box-shadow:none}.customize-panel-back:focus,.customize-panel-back:hover,.customize-section-back:focus,.customize-section-back:hover{color:#23282d;background:#f5f5f5;outline:0;-webkit-box-shadow:none;box-shadow:none}.customize-controls-close:before{font:400 22px/45px dashicons;content:"\f335";position:relative;top:1px;right:13px}.customize-panel-back:before,.customize-section-back:before{font:400 20px/72px dashicons;content:"\f345";position:relative;right:13px}.wp-full-overlay-sidebar .wp-full-overlay-header{-webkit-transition:padding ease-in-out .18s;transition:padding ease-in-out .18s}.in-sub-panel .wp-full-overlay-sidebar .wp-full-overlay-header{padding-right:62px}#customize-info,#customize-theme-controls>ul>.accordion-section{position:relative;right:0;-webkit-transition:right ease-in-out .18s;transition:right ease-in-out .18s}.ios #customize-info,.ios #customize-theme-controls>ul>.accordion-section{-webkit-transition:right 0s;transition:right 0s}.in-sub-panel #customize-info,.in-sub-panel #customize-theme-controls>ul>.accordion-section{right:-300px;width:300px}.in-sub-panel #customize-theme-controls .accordion-section.current-panel{width:100%}#customize-theme-controls .control-section.current-panel{padding:0}#customize-theme-controls .control-section>h3.accordion-section-title{position:relative;right:0}#customize-theme-controls .control-section.current-panel>h3.accordion-section-title{right:-354px;-webkit-transition:right ease-in-out .18s;transition:right ease-in-out .18s}.ios #customize-theme-controls .control-section.current-panel>h3.accordion-section-title{-webkit-transition:right 0s;transition:right 0s}.wp-full-overlay.section-open #customize-controls .wp-full-overlay-sidebar-content{visibility:hidden;overflow-y:hidden}.wp-full-overlay.section-open .wp-full-overlay-sidebar-content .accordion-section.open{visibility:visible}.wp-full-overlay.section-open .wp-full-overlay-sidebar-content .accordion-section.open .accordion-section-content{overflow-y:auto}p.customize-section-description{font-style:normal;margin-top:22px;margin-bottom:0}.customize-control{width:100%;float:right;clear:both;margin-bottom:12px}.customize-control input[type=radio],.customize-control input[type=checkbox],.customize-control select{line-height:28px}.customize-control input[type=tel],.customize-control input[type=url],.customize-control input[type=text],.customize-control input[type=password],.customize-control input[type=email],.customize-control input[type=number],.customize-control input[type=search]{width:98%;line-height:18px;margin:0}.customize-control-hidden{margin:0}.customize-control-textarea textarea{width:100%;resize:vertical}.customize-control select{min-width:50%;max-width:100%;height:28px;line-height:28px}.customize-control select[multiple]{height:auto}.customize-control-title{display:block;font-size:14px;line-height:24px;font-weight:600;margin-bottom:5px}.customize-control-description{display:block;font-style:italic;line-height:18px;margin-bottom:5px}.customize-control-color .color-picker,.customize-control-upload div{line-height:28px}.customize-control-checkbox label,.customize-control-nav_menu_auto_add label,.customize-control-radio label{line-height:20px;display:block;margin-right:24px;padding-top:6px;padding-bottom:6px}.customize-control-checkbox input,.customize-control-nav_menu_auto_add input,.customize-control-radio input{margin-left:4px;margin-right:-24px}.customize-control-radio{padding:5px 0 10px}.customize-control-radio .customize-control-title{margin-bottom:0;line-height:22px}.customize-control-radio .customize-control-title+.customize-control-description{margin-top:7px}.customize-control .attachment-thumb.type-icon{float:right;margin:10px;width:auto}.customize-control .attachment-title{font-weight:700;margin:0;padding:5px 10px}.customize-control .attachment-meta{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;margin:0;padding:0 10px}.customize-control .attachment-meta-title{padding-top:7px}.customize-control .thumbnail-image{line-height:0}.customize-control .thumbnail-image img{cursor:pointer}#customize-controls .thumbnail-audio .thumbnail{max-width:64px;max-height:64px;margin:10px;float:right}#customize-preview iframe{width:100%;height:100%;position:absolute}#customize-preview iframe+iframe{visibility:hidden}.wp-full-overlay-sidebar{background:#eee;border-left:1px solid #ddd}.accordion-section .dropdown{float:right;display:block;position:relative;cursor:pointer}.accordion-section .dropdown-content{overflow:hidden;float:right;min-width:30px;height:16px;line-height:16px;margin-left:16px;padding:4px 5px;border:2px solid #eee;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.customize-control .dropdown-arrow{position:absolute;top:0;bottom:0;left:0;width:20px;background:#eee}.customize-control .dropdown-arrow:after{content:"\f140";font:400 20px/1 dashicons;speak:none;display:block;padding:0;text-indent:0;text-align:center;position:relative;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;color:#32373c}.customize-control .dropdown-status{color:#32373c;background:#eee;display:none;max-width:112px}.customize-control-color .color-picker-hex{display:none}.customize-control-color.open .color-picker-hex,.customize-control-header button img{display:block}.customize-control-color .dropdown{margin-left:5px;margin-bottom:5px}.customize-control-color .dropdown .dropdown-content{background-color:#555;border:1px solid rgba(0,0,0,.15)}.customize-control-color .dropdown:hover .dropdown-content{border-color:rgba(0,0,0,.25)}.ios .wp-full-overlay{position:relative}.ios #customize-controls .wp-full-overlay-sidebar-content{-webkit-overflow-scrolling:touch}.customize-control-background .current,.customize-control-cropped_image .current,.customize-control-header .current,.customize-control-image .current,.customize-control-media .current,.customize-control-site_icon .current,.customize-control-upload .current{margin-bottom:8px}.customize-control-header .uploaded{margin-bottom:18px}.customize-control-header .default button:not(.random),.customize-control-header .uploaded button:not(.random){width:100%;padding:0;margin:0;background:0 0;border:none;color:inherit;cursor:pointer}.customize-control-background .default-button,.customize-control-background .remove-button,.customize-control-background .upload-button,.customize-control-cropped_image .default-button,.customize-control-cropped_image .remove-button,.customize-control-cropped_image .upload-button,.customize-control-header button.new,.customize-control-header button.remove,.customize-control-image .default-button,.customize-control-image .remove-button,.customize-control-image .upload-button,.customize-control-media .default-button,.customize-control-media .remove-button,.customize-control-media .upload-button,.customize-control-site_icon .default-button,.customize-control-site_icon .remove-button,.customize-control-site_icon .upload-button,.customize-control-upload .default-button,.customize-control-upload .remove-button,.customize-control-upload .upload-button{white-space:normal;width:48%;height:auto}.customize-control-background .current .container,.customize-control-cropped_image .current .container,.customize-control-header .current .container,.customize-control-image .current .container,.customize-control-media .current .container,.customize-control-site_icon .current .container,.customize-control-upload .current .container{overflow:hidden;border:1px solid #eee;-webkit-border-radius:2px;border-radius:2px}.customize-control-background .current .container,.customize-control-cropped_image .current .container,.customize-control-image .current .container,.customize-control-media .current .container,.customize-control-site_icon .current .container,.customize-control-upload .current .container{min-height:40px}.customize-control-background .placeholder,.customize-control-cropped_image .placeholder,.customize-control-header .placeholder,.customize-control-image .placeholder,.customize-control-media .placeholder,.customize-control-site_icon .placeholder,.customize-control-upload .placeholder{width:100%;position:relative;text-align:center;cursor:default;border:1px dashed #b4b9be;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;min-height:40px}.customize-control-background .inner,.customize-control-cropped_image .inner,.customize-control-header .inner,.customize-control-image .inner,.customize-control-media .inner,.customize-control-site_icon .inner,.customize-control-upload .inner{display:none;position:absolute;width:100%;color:#555;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.customize-control-background .inner,.customize-control-cropped_image .inner,.customize-control-image .inner,.customize-control-media .inner,.customize-control-site_icon .inner,.customize-control-upload .inner{display:block;min-height:40px}.customize-control-background .inner,.customize-control-cropped_image .inner,.customize-control-header .inner,.customize-control-header .inner .dashicons,.customize-control-image .inner,.customize-control-media .inner,.customize-control-site_icon .inner,.customize-control-upload .inner{line-height:20px;top:8px}.customize-control-header .list .inner,.customize-control-header .list .inner .dashicons{top:9px}.customize-control-header .header-view{position:relative;width:100%;margin-bottom:5px}.customize-control-header .header-view:last-child{margin-bottom:0}.customize-control-header .header-view:after{border:0}.customize-control-header .header-view.selected:after{content:'';position:absolute;height:auto;top:0;right:0;bottom:0;left:0;border:4px solid #00a0d2;-webkit-border-radius:2px;border-radius:2px}.customize-control-header .header-view.button.selected{border:0}.customize-control-header .uploaded .header-view .close{font-size:20px;color:#fff;background:#555;background:rgba(0,0,0,.5);position:absolute;top:10px;left:-999px;z-index:1;width:26px;height:26px;cursor:pointer}.customize-control-header .header-view .close:focus,.customize-control-header .header-view:hover .close{left:10px}.customize-control-header .random.placeholder{cursor:pointer;-webkit-border-radius:2px;border-radius:2px;height:40px}.customize-control-header button.random{width:100%;height:auto;min-height:40px;white-space:normal}.customize-control-header button.random .dice{margin-top:4px}.customize-control-header .header-view:hover>button.random .dice,.customize-control-header .placeholder:hover .dice{-webkit-animation:dice-color-change 3s infinite;animation:dice-color-change 3s infinite}@-webkit-keyframes dice-color-change{0%,100%{color:#d4b146}50%{color:#ef54b0}75%{color:#7190d3}}@keyframes dice-color-change{0%,100%{color:#d4b146}50%{color:#ef54b0}75%{color:#7190d3}}.customize-control-header .choice{position:relative;display:block;margin-bottom:9px}.customize-control-header .uploaded div:last-child>.choice{margin-bottom:0}.customize-control-background img,.customize-control-cropped_image img,.customize-control-header img,.customize-control-image img,.customize-control-media img,.customize-control-upload img{width:100%;-webkit-border-radius:2px;border-radius:2px}.customize-control-background .default-button,.customize-control-background .remove-button,.customize-control-cropped_image .default-button,.customize-control-cropped_image .remove-button,.customize-control-header .remove,.customize-control-image .default-button,.customize-control-image .remove-button,.customize-control-media .default-button,.customize-control-media .remove-button,.customize-control-site_icon .default-button,.customize-control-site_icon .remove-button,.customize-control-upload .default-button,.customize-control-upload .remove-button{float:right;margin-left:3px}.customize-control-background .upload-button,.customize-control-cropped_image .upload-button,.customize-control-header .new,.customize-control-image .upload-button,.customize-control-media .upload-button,.customize-control-site_icon .upload-button,.customize-control-upload .upload-button{float:left}@-webkit-keyframes customize-reload{0%{opacity:0}100%{opacity:1}}@keyframes customize-reload{0%{opacity:0}100%{opacity:1}}.wp-customizer .customize-loading #customize-container{display:block;-webkit-animation:customize-reload .75s;animation:customize-reload .75s}.control-section-themes .accordion-section-title{cursor:default;margin:15px 0;padding-left:100px}#customize-theme-controls .control-section-themes .accordion-section-title:focus,#customize-theme-controls .control-section-themes .accordion-section-title:hover{color:#555;background-color:#fff}.customize-themes-panel .accordion-section-title{margin:15px -8px}#customize-controls .customize-section-title span.customize-action,.control-section-themes .accordion-section-title span.customize-action{font-size:13px;display:block;font-weight:400}.control-section-themes .accordion-section-title .change-theme,.control-section-themes .accordion-section-title .customize-theme{position:absolute;left:10px;top:50%;margin-top:-14px;font-weight:400}.control-section-themes .accordion-section-title:before{display:none}.customize-themes-panel{display:none;padding:0 8px;background:#f1f1f1;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.customize-themes-panel .accordion-section-title:first-child{margin-top:0}#customize-controls .customize-themes-panel .accordion-section-title:nth-child(2){font-size:14px;font-weight:600}.customize-themes-panel>h2{padding:15px 8px 0}.control-section.open .customize-themes-panel{display:block}#customize-theme-controls .customize-themes-panel .accordion-section-content{background:0 0;display:block}.customize-control.customize-control-theme{margin-bottom:8px}#customize-theme-controls .themes.accordion-section-content{position:relative;right:0;padding:0;width:100%}.wp-customizer .theme-browser .themes{padding-bottom:8px}.wp-customizer .theme-browser .theme{margin:0;width:100%}.wp-customizer .theme-browser .theme .theme-actions{-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";opacity:1}#customize-controls h3.theme-name{font-size:15px}#customize-controls .theme-overlay .theme-name{font-size:32px}.wp-customizer #themes-filter{font-size:16px;font-weight:300;line-height:1.5;width:100%}#accordion-section-themes .accordion-section-title:after{display:none}#customize-theme-controls .control-section-themes.current-panel>h3.accordion-section-title{right:0}.customize-themes-panel.control-panel-content{position:absolute;right:-100%;top:0;width:100%;border-top:1px solid #ddd}.in-themes-panel #customize-info,.in-themes-panel #customize-theme-controls>ul>.accordion-section{right:100%}.wp-customizer .theme-overlay{display:none}.wp-customizer.modal-open .theme-overlay{position:fixed;right:0;top:0;left:0;bottom:0;z-index:109}.wp-customizer .theme-overlay .theme-backdrop{background:rgba(238,238,238,.75);position:fixed;z-index:110}.wp-customizer .theme-overlay .theme-wrap{right:90px;left:90px;top:45px;bottom:45px;z-index:120;max-width:1740px}.wp-customizer .theme-overlay .theme-actions{text-align:left}.modal-open .in-themes-panel #customize-controls .wp-full-overlay-sidebar-content{overflow:visible}.ie8 .wp-customizer .theme-overlay .theme-about,.ie8 .wp-customizer .theme-overlay .theme-actions,.ie8 .wp-customizer .theme-overlay .theme-header{position:static}@media (max-width:850px),(max-height:472px){.wp-customizer .theme-overlay .theme-wrap{right:0;left:0;top:0;bottom:0}}body.cheatin{font-size:medium;height:auto;background:#fff;margin:50px auto 2em;padding:1em 2em;max-width:700px;min-width:0;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.13);box-shadow:0 1px 3px rgba(0,0,0,.13)}body.cheatin h1{border-bottom:1px solid #ddd;clear:both;color:#666;font:24px "Open Sans",sans-serif;margin:30px 0 0;padding:0 0 7px}body.cheatin p{font-size:14px;line-height:1.5;margin:25px 0 20px}#customize-theme-controls .add-new-menu-item,#customize-theme-controls .add-new-widget{cursor:pointer;float:left;margin-right:10px;-webkit-transition:all .2s;transition:all .2s;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;outline:0}.reordering .add-new-menu-item,.reordering .add-new-widget{opacity:.2;pointer-events:none;cursor:not-allowed}.add-new-menu-item:before,.add-new-widget:before{content:"\f132";display:inline-block;position:relative;right:-2px;top:-1px;font:400 20px/1 dashicons;vertical-align:middle;-webkit-transition:all .2s;transition:all .2s;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.reorder-toggle{color:#0073aa;float:left;padding:5px 8px;text-decoration:none;cursor:pointer;outline:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.reorder-toggle:hover{color:#00a0d2}.reorder-toggle:focus{outline:dotted 1px}.reorder,.reordering .reorder-done{display:block;padding:5px 8px}.reorder-done,.reordering .reorder{display:none;color:#0073aa}.reorder-toggle:active .reorder-done,.reorder-toggle:focus .reorder-done,.reorder-toggle:hover .reorder-done{color:#00a0d2}.menu-item-reorder-nav button,.widget-reorder-nav span{position:relative;overflow:hidden;float:right;display:block;width:33px;height:43px;color:#82878c;text-indent:-9999px;cursor:pointer;outline:0}.menu-item-reorder-nav button{width:30px;height:40px;background:0 0;border:none;-webkit-box-shadow:none;box-shadow:none}.menu-item-reorder-nav button:before,.widget-reorder-nav span:before{display:inline-block;position:absolute;top:0;left:0;width:100%;height:100%;font:400 20px/43px dashicons;text-align:center;text-indent:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#available-menu-items .customize-section-title,#available-widgets .customize-section-title,.customize-controls-preview-toggle{display:none}.menu-item-reorder-nav button:focus,.menu-item-reorder-nav button:hover,.widget-reorder-nav span:focus,.widget-reorder-nav span:hover{color:#191e23;background:#eee}.menus-move-down:before,.move-widget-down:before{content:"\f347"}.menus-move-up:before,.move-widget-up:before{content:"\f343"}#customize-theme-controls .first-widget .move-widget-up,#customize-theme-controls .last-widget .move-widget-down,.move-down-disabled .menus-move-down,.move-left-disabled .menus-move-left,.move-right-disabled .menus-move-right,.move-up-disabled .menus-move-up{color:#d5d5d5;background-color:#fff;cursor:default;pointer-events:none}.wp-full-overlay-main{left:auto;width:100%}.add-menu-toggle.open,.add-menu-toggle.open:hover,.adding-menu-items .add-new-menu-item,.adding-menu-items .add-new-menu-item:hover,body.adding-widget .add-new-widget,body.adding-widget .add-new-widget:hover{background:#eee;border-color:#929793;color:#32373c;-webkit-box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5);box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5)}#accordion-section-add_menu .add-new-menu-item.open:before,.adding-menu-items .add-new-menu-item:before,body.adding-widget .add-new-widget:before{-webkit-transform:rotate(-45deg);-ms-transform:rotate(-45deg);transform:rotate(-45deg)}#available-menu-items,#available-widgets{position:absolute;top:0;bottom:0;right:-301px;visibility:hidden;overflow-x:hidden;overflow-y:auto;width:300px;margin:0;z-index:4;background:#eee;-webkit-transition:right .18s;transition:right .18s;border-left:1px solid #ddd}#available-widgets-list{top:60px;position:absolute;overflow:auto;bottom:0;width:100%}#available-widgets-filter{position:fixed;top:0;z-index:1;width:300px;background:#eee;border-bottom:1px solid #e5e5e5}#available-menu-items-search .accordion-section-title,#available-widgets-filter{padding:12px 15px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#available-menu-items-search input,#available-widgets-filter input{padding:6px 10px;width:100%}#available-menu-items .item-top,#available-menu-items .item-top:hover,#available-widgets .widget-top,#available-widgets .widget-top:hover{border:none;background:0 0;-webkit-box-shadow:none;box-shadow:none}#available-menu-items .item-tpl,#available-widgets .widget-tpl{position:relative;padding:20px 60px 20px 15px;background:#fff;border-bottom:1px solid #e5e5e5;cursor:pointer;display:none}#available-menu-items .item,#available-widgets .widget{position:static}@media only screen and (max-width:782px){.wp-customizer .theme:not(.active):focus .theme-actions,.wp-customizer .theme:not(.active):hover .theme-actions{display:block}.wp-customizer .theme-browser .theme.active .theme-name span{display:inline}.customize-control-checkbox label,.customize-control-nav_menu_auto_add label,.customize-control-radio label{margin-right:32px}.customize-control-checkbox input,.customize-control-nav_menu_auto_add input,.customize-control-radio input{margin-right:-32px}.customize-control input[type=radio]+label,.customize-control input[type=checkbox]+label{line-height:32px}}@media screen and (max-width:640px){#customize-controls{width:100%}.wp-full-overlay.collapsed #customize-controls,.wp-full-overlay.expanded{margin-right:0}.wp-full-overlay-sidebar .wp-full-overlay-sidebar-content{bottom:0}.customize-controls-preview-toggle{display:block;position:absolute;top:0;right:48px;line-height:45px;font-size:14px;padding:0 12px;margin:0;height:45px;background:#eee;border-left:1px solid #ddd;color:#444;cursor:pointer;-webkit-transition:color .1s ease-in-out,background .1s ease-in-out;transition:color .1s ease-in-out,background .1s ease-in-out}#customize-footer-actions,#customize-preview,.customize-controls-preview-toggle .controls,.preview-only .customize-controls-preview-toggle .preview,.preview-only .wp-full-overlay-sidebar-content{display:none}.customize-controls-preview-toggle .controls:before,.customize-controls-preview-toggle .preview:before{font:400 20px/1 dashicons;content:"\f177";position:relative;top:4px;margin-left:6px}.customize-controls-preview-toggle .controls:before{content:"\f540"}.preview-only #customize-controls{height:45px}.preview-only #customize-preview,.preview-only .customize-controls-preview-toggle .controls{display:block}#customize-preview{top:45px;bottom:0;height:auto}.wp-core-ui.wp-customizer .button{padding:6px 14px;line-height:normal;font-size:14px;vertical-align:middle;height:auto;margin-bottom:4px}#customize-header-actions .button-primary{margin-top:6px}body.adding-menu-items div#available-menu-items,body.adding-widget div#available-widgets{top:46px;right:0;z-index:10;width:100%}#available-menu-items .customize-section-title,#available-widgets .customize-section-title{display:block;margin:0}#available-menu-items .customize-section-back,#available-widgets .customize-section-back{height:69px}#available-menu-items .customize-section-title h3,#available-widgets .customize-section-title h3{font-size:20px;font-weight:200;padding:9px 14px 12px 10px;margin:0;line-height:24px;color:#555;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}#available-menu-items .customize-section-title .customize-action,#available-widgets .customize-section-title .customize-action{font-size:13px;display:block;font-weight:400;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}#available-widgets-filter{position:relative;width:100%;background:#fff;height:auto;padding:10px 15px}#available-widgets-list{top:140px}} \ No newline at end of file diff --git a/wp-admin/css/customize-controls.css b/wp-admin/css/customize-controls.css index f966114..36e512a 100644 --- a/wp-admin/css/customize-controls.css +++ b/wp-admin/css/customize-controls.css @@ -1,5 +1,6 @@ body { overflow: hidden; + -webkit-text-size-adjust: 100%; } #customize-controls a { @@ -10,12 +11,16 @@ body { font-size: 14px; } +#customize-controls img { + max-width: 100%; +} + #customize-controls .submit { text-align: center; } #customize-controls .description { - color: #666666; + color: #555; } #customize-header-actions .button-primary { @@ -24,68 +29,122 @@ body { } #customize-header-actions .spinner { - margin-top: 16px; + margin-top: 13px; margin-right: 4px; } .saving #customize-header-actions .spinner { - display: block; + visibility: visible; +} + +#customize-header-actions { + border-bottom: 1px solid #ddd; +} + +#customize-controls .wp-full-overlay-sidebar-content { + overflow-y: auto; + overflow-x: hidden; } -#customize-info { +#customize-controls .customize-info { border: none; border-top: 1px solid #ddd; + border-bottom: 1px solid #ddd; + margin-bottom: 15px; } -#customize-info .accordion-section-title { - background-color: #fff; - color: #666666; +#customize-controls .customize-info .accordion-section-title { + background: #fff; + color: #555; border-left: none; border-right: none; - border-bottom: 1px solid #eeeeee; -} - -#customize-info.open .accordion-section-title, -#customize-info .accordion-section-title:hover, -#customize-info .accordion-section-title:focus { - color: #555555; + border-bottom: none; + cursor: default; } -#customize-info.open .accordion-section-title:after, -#customize-info .accordion-section-title:hover:after, -#customize-info .accordion-section-title:focus:after { - color: #555555; +#customize-controls .customize-info.open .accordion-section-title:after, +#customize-controls .customize-info .accordion-section-title:hover:after, +#customize-controls .customize-info .accordion-section-title:focus:after { + color: #333; } -#customize-info.open .accordion-section-title { - border-color: transparent; +#customize-controls .customize-info .accordion-section-title:after { + display: none; } -#customize-info .preview-notice { +#customize-controls .customize-info .preview-notice { font-size: 13px; line-height: 24px; } -#customize-info .theme-name { +#customize-controls .control-section .customize-section-title h3, +#customize-controls .control-section h3.customize-section-title, +#customize-controls .customize-info .panel-title { font-size: 20px; font-weight: 200; - line-height: 24px; + line-height: 26px; display: block; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } -#customize-info .theme-screenshot { - width: 258px; +#customize-controls .customize-section-title span.customize-action { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } -#customize-info .theme-description { - margin-top: 1em; - color: #666666; - line-height: 20px; +#customize-controls .customize-info .customize-help-toggle { + position: absolute; + top: 4px; + right: 1px; + padding: 20px 20px 10px 10px; + width: 20px; + height: 20px; + cursor: pointer; + -webkit-box-shadow: none; + box-shadow: none; + -webkit-appearance: none; + background: transparent; + color: #555; + border: none; } -#customize-theme-controls { - -webkit-box-shadow: 0 1px 1px -1px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 1px -1px rgba(0, 0, 0, 0.1); +#customize-controls .customize-info .customize-help-toggle:before { + position: absolute; + top: 5px; + left: 6px; +} + +#customize-controls .customize-info.open .customize-help-toggle, +#customize-controls .customize-info .customize-help-toggle:focus, +#customize-controls .customize-info .customize-help-toggle:hover { + color: #0073aa; +} + +#customize-controls .customize-info .customize-panel-description, +#customize-controls .no-widget-areas-rendered-notice { + color: #555; + display: none; + background: #fff; + padding: 12px 15px; + border-top: 1px solid #ddd; +} +#customize-controls .customize-info .customize-panel-description.open + .no-widget-areas-rendered-notice { + border-top: none; +} + +#customize-controls .customize-info .customize-panel-description p:first-child { + margin-top: 0; +} + +#customize-controls .customize-info .customize-panel-description p:last-child { + margin-bottom: 0; +} + +#customize-controls .current-panel .control-section > h3.accordion-section-title { + padding-right: 30px; } #customize-theme-controls .control-section { @@ -93,21 +152,26 @@ body { } #customize-theme-controls .accordion-section-title { - color: #555555; + color: #555; background-color: #fff; - border-bottom: 1px solid #eeeeee; + border-bottom: 1px solid #eee; +} + +#customize-theme-controls .accordion-section-title:after { + content: "\f345"; + color: #a0a5aa; } #customize-theme-controls .accordion-section-content { - color: #555555; - background: white; + color: #555; + background: transparent; } -#customize-theme-controls .control-section:hover .accordion-section-title, -#customize-theme-controls .control-section .accordion-section-title:hover, -#customize-theme-controls .control-section.open .accordion-section-title, -#customize-theme-controls .control-section .accordion-section-title:focus { - color: #555555; +#customize-controls .control-section:hover > .accordion-section-title, +#customize-controls .control-section .accordion-section-title:hover, +#customize-controls .control-section.open .accordion-section-title, +#customize-controls .control-section .accordion-section-title:focus { + color: #23282d; background: #f5f5f5; } @@ -118,51 +182,332 @@ body { background: #f5f5f5; } -#customize-theme-controls .control-section:hover .accordion-section-title::after, -#customize-theme-controls .control-section .accordion-section-title:hover::after, -#customize-theme-controls .control-section.open .accordion-section-title::after, -#customize-theme-controls .control-section .accordion-section-title:focus::after { - color: #555555; +#customize-theme-controls .control-section:hover > .accordion-section-title:after, +#customize-theme-controls .control-section .accordion-section-title:hover:after, +#customize-theme-controls .control-section.open .accordion-section-title:after, +#customize-theme-controls .control-section .accordion-section-title:focus:after { + color: #23282d; } #customize-theme-controls .control-section.open { - border-bottom: 1px solid #eeeeee; + border-bottom: 1px solid #eee; } #customize-theme-controls .control-section.open .accordion-section-title { - border-bottom-color: #eeeeee !important; + border-bottom-color: #eee !important; } #customize-theme-controls .control-section:last-of-type.open, -#customize-theme-controls .control-section:last-of-type .accordion-section-title { +#customize-theme-controls .control-section:last-of-type > .accordion-section-title { border-bottom-color: #ddd; } -#customize-theme-controls > ul, +#customize-theme-controls > ul { + margin: 0; +} + #customize-theme-controls .accordion-section-content { + position: absolute; + top: 0; + left: 100%; + width: 100%; + margin: 0; + padding: 12px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + +.customize-section-description-container { + margin-bottom: 15px; +} + +.customize-section-title { + margin: -12px -12px 0 -12px; + border-bottom: 1px solid #ddd; + background: #fff; +} + +div.customize-section-description { + margin-top: 22px; +} + +div.customize-section-description p:first-child { + margin-top: 0; +} + +div.customize-section-description p:last-child { + margin-bottom: 0; +} + +#customize-theme-controls .customize-themes-panel h3.customize-section-title:first-child { + border-bottom: 1px solid #ddd; + padding: 12px 12px 12px 12px; +} + +.ios #customize-theme-controls .customize-themes-panel h3.customize-section-title:first-child { + padding: 12px 12px 13px 12px; +} + +.customize-section-title h3, +h3.customize-section-title { + padding: 10px 10px 12px 14px; + margin: 0; + line-height: 21px; + color: #555; +} + +#customize-theme-controls { + position: relative; + left: 0; + -webkit-transition: .18s left ease-in-out; + transition: .18s left ease-in-out; +} + +.ios #customize-theme-controls { + -webkit-transition: left 0s; + transition: left 0s; +} + +.section-open #customize-info, +.section-open #customize-theme-controls { + left: -100%; +} + +.accordion-sub-container.control-panel-content { + display: none; + position: absolute; + left: 300px; + top: 0; + width: 300px; + -webkit-transition: left ease-in-out .18s; + transition: left ease-in-out .18s; +} + +.ios .accordion-sub-container.control-panel-content { + -webkit-transition: left 0s; + transition: left 0s; +} + +.accordion-sub-container.control-panel-content.animating { + display: block; +} + +.current-panel .accordion-sub-container.control-panel-content { + width: 100%; +} + +.customize-controls-close { + display: block; + position: absolute; + top: 0; + left: 0; + width: 45px; + height: 45px; + padding: 0 2px 0 0; + background: #eee; + border: none; + border-right: 1px solid #ddd; + color: #444; + text-align: left; + cursor: pointer; + -webkit-transition: color .1s ease-in-out, background .1s ease-in-out; + transition: color .1s ease-in-out, background .1s ease-in-out; + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} + +.customize-panel-back, +.customize-section-back { + display: block; + float: left; + width: 48px; + height: 71px; + padding: 0 24px 0 0; margin: 0; + background: #fff; + border: none; + border-right: 1px solid #ddd; + -webkit-box-shadow: none; + box-shadow: none; + cursor: pointer; + -webkit-transition: left .18s ease-in-out, color .1s ease-in-out, background .1s ease-in-out; + transition: left .18s ease-in-out, color .1s ease-in-out, background .1s ease-in-out; +} + +.customize-section-back { + height: 74px; +} + +.ios .customize-panel-back, +.ios .customize-section-back { + -webkit-transition: left 0s; + transition: left 0s; +} + +.ios .customize-panel-back { + display: none; +} + +.ios .expanded.in-sub-panel .customize-panel-back { + display: block; +} + +.panel-meta.customize-info .accordion-section-title { + margin-left: 48px; +} + +#customize-controls .panel-meta.customize-info .accordion-section-title:hover { + background: #fff; + color: #555; +} + +.customize-controls-close:focus, +.customize-controls-close:hover, +.customize-controls-preview-toggle:focus, +.customize-controls-preview-toggle:hover { + background: #ddd; + border-color: #ccc; + color: #000; + outline: none; + -webkit-box-shadow: none; + box-shadow: none; +} + +.customize-panel-back:hover, +.customize-panel-back:focus, +.customize-section-back:hover, +.customize-section-back:focus { + color: #23282d; + background: #f5f5f5; + outline: none; + -webkit-box-shadow: none; + box-shadow: none; +} + +.customize-controls-close:before { + font: normal 22px/45px dashicons; + content: "\f335"; + position: relative; + top: 1px; + left: 13px; +} + +.customize-panel-back:before, +.customize-section-back:before { + font: normal 20px/72px dashicons; + content: "\f341"; + position: relative; + left: 13px; +} + +.wp-full-overlay-sidebar .wp-full-overlay-header { + -webkit-transition: padding ease-in-out .18s; + transition: padding ease-in-out .18s; +} + +.in-sub-panel .wp-full-overlay-sidebar .wp-full-overlay-header { + padding-left: 62px; +} + +#customize-info, +#customize-theme-controls > ul > .accordion-section { + position: relative; + left: 0; + -webkit-transition: left ease-in-out .18s; + transition: left ease-in-out .18s; +} + +.ios #customize-info, +.ios #customize-theme-controls > ul > .accordion-section { + -webkit-transition: left 0s; + transition: left 0s; +} + +.in-sub-panel #customize-info, +.in-sub-panel #customize-theme-controls > ul > .accordion-section { + left: -300px; + width: 300px; +} + +.in-sub-panel #customize-theme-controls .accordion-section.current-panel { + width: 100%; +} + +#customize-theme-controls .control-section.current-panel { + padding: 0; +} + +#customize-theme-controls .control-section > h3.accordion-section-title { + position: relative; + left: 0; +} + +#customize-theme-controls .control-section.current-panel > h3.accordion-section-title { + left: -354px; + -webkit-transition: left ease-in-out .18s; + transition: left ease-in-out .18s; +} + +.ios #customize-theme-controls .control-section.current-panel > h3.accordion-section-title { + -webkit-transition: left 0s; + transition: left 0s; +} + +.wp-full-overlay.section-open #customize-controls .wp-full-overlay-sidebar-content { + visibility: hidden; + overflow-y: hidden; +} + +.wp-full-overlay.section-open .wp-full-overlay-sidebar-content .accordion-section.open { + visibility: visible; +} + +.wp-full-overlay.section-open .wp-full-overlay-sidebar-content .accordion-section.open .accordion-section-content { + overflow-y: auto; +} + +p.customize-section-description { + font-style: normal; + margin-top: 22px; + margin-bottom: 0; } .customize-control { width: 100%; float: left; clear: both; - margin-bottom: 8px; + margin-bottom: 12px; } .customize-control select, -.customize-control input[type="text"], .customize-control input[type="radio"], .customize-control input[type="checkbox"] { line-height: 28px; } -.customize-control input[type="text"] { +.customize-control input[type="text"], +.customize-control input[type="password"], +.customize-control input[type="email"], +.customize-control input[type="number"], +.customize-control input[type="search"], +.customize-control input[type="tel"], +.customize-control input[type="url"] { width: 98%; line-height: 18px; margin: 0; } +.customize-control-hidden { + margin: 0; +} + +.customize-control-textarea textarea { + width: 100%; + resize: vertical; +} + .customize-control select { min-width: 50%; max-width: 100%; @@ -182,14 +527,33 @@ body { margin-bottom: 5px; } +.customize-control-description { + display: block; + font-style: italic; + line-height: 18px; + margin-bottom: 5px; +} + .customize-control-color .color-picker, -.customize-control-checkbox label, .customize-control-upload div { line-height: 28px; } -.customize-control-checkbox input { - margin-right: 5px; +.customize-control-radio label, +.customize-control-checkbox label, +.customize-control-nav_menu_auto_add label { + line-height: 20px; + display: block; + margin-left: 24px; + padding-top: 6px; + padding-bottom: 6px; +} + +.customize-control-radio input, +.customize-control-checkbox input, +.customize-control-nav_menu_auto_add input { + margin-right: 4px; + margin-left: -24px; } .customize-control-radio { @@ -201,49 +565,69 @@ body { line-height: 22px; } -.customize-control-radio label { - line-height: 32px; +.customize-control-radio .customize-control-title + .customize-control-description { + margin-top: 7px; } -.customize-control-radio input { - margin-right: 5px; +.customize-control .attachment-thumb.type-icon { + float: left; + margin: 10px; + width: auto; } -#customize-preview iframe { - width: 100%; - height: 100%; +.customize-control .attachment-title { + font-weight: bold; + margin: 0; + padding: 5px 10px; } -.wp-full-overlay-sidebar { - background: #eeeeee; - border-right: 1px solid #ddd; +.customize-control .attachment-meta { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + margin: 0; + padding: 0 10px; +} + +.customize-control .attachment-meta-title { + padding-top: 7px; } -.collapse-sidebar { - background-color: transparent !important; - border: none !important; - -webkit-box-shadow: none !important; - box-shadow: none !important; - -webkit-border-radius: 0 !important; - border-radius: 0 !important; +.customize-control .thumbnail-image { + line-height: 0; } +.customize-control .thumbnail-image img { + cursor: pointer; +} + +#customize-controls .thumbnail-audio .thumbnail { + max-width: 64px; + max-height: 64px; + margin: 10px; + float: left; +} -.collapse-sidebar:active, -.collapse-sidebar:active .collapse-sidebar-label, -.collapse-sidebar:active .collapse-sidebar-arrow:before { - text-shadow: none; +#customize-preview iframe { + width: 100%; + height: 100%; + position: absolute; +} +#customize-preview iframe + iframe { + visibility: hidden; } -.collapsed .collapse-sidebar-arrow:before { - color: #888; +.wp-full-overlay-sidebar { + background: #eee; + border-right: 1px solid #ddd; } /* Style for custom settings */ -/* +/** * Dropdowns */ + .accordion-section .dropdown { float: left; display: block; @@ -259,25 +643,26 @@ body { line-height: 16px; margin-right: 16px; padding: 4px 5px; - border: 2px solid #eeeeee; + border: 2px solid #eee; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; } +/* @todo maybe no more used? */ .customize-control .dropdown-arrow { position: absolute; top: 0; bottom: 0; right: 0; width: 20px; - background: #eeeeee; + background: #eee; } .customize-control .dropdown-arrow:after { content: "\f140"; - font: normal 20px/1 'dashicons'; + font: normal 20px/1 dashicons; speak: none; display: block; padding: 0; @@ -287,12 +672,12 @@ body { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; text-decoration: none !important; - color: #333; + color: #32373c; } .customize-control .dropdown-status { - color: #333; - background: #eeeeee; + color: #32373c; + background: #eee; display: none; max-width: 112px; } @@ -312,7 +697,7 @@ body { } .customize-control-color .dropdown .dropdown-content { - background-color: #555555; + background-color: #555; border: 1px solid rgba(0, 0, 0, 0.15); } @@ -320,157 +705,37 @@ body { border-color: rgba(0, 0, 0, 0.25); } -/* - * Image Picker +/** + * iOS can't scroll iframes, + * instead it expands the iframe size to match the size of the content */ -.customize-control-image .library, -.customize-control-image .actions { - display: none; - float: left; - width: 100%; + +.ios .wp-full-overlay { + position: relative; } -.customize-control-image.open .library, -.customize-control-image.open .actions { - display: block; +.ios #customize-controls .wp-full-overlay-sidebar-content { + -webkit-overflow-scrolling: touch; } -.accordion-section .customize-control-image .dropdown-content { - height: auto; - min-height: 24px; - min-width: 40px; - padding: 0; +/* Media controls */ + +.customize-control-media .current, +.customize-control-upload .current, +.customize-control-image .current, +.customize-control-background .current, +.customize-control-cropped_image .current, +.customize-control-site_icon .current, +.customize-control-header .current { + margin-bottom: 8px; } -.accordion-section .customize-control-image .dropdown-status { - padding: 4px 5px; +.customize-control-header .uploaded { + margin-bottom: 18px; } -.accordion-section .customize-control-image .preview-thumbnail img { - display: block; - width: 100%; - max-width: 122px; - max-height: 98px; - margin: 0 auto; -} - -.accordion-section .customize-control-image .actions { - text-align: right; -} - -.accordion-section .customize-control-image .library ul { - border-bottom: 1px solid #ddd; - float: left; - width: 100%; - margin: 10px 0 0; -} - -.accordion-section .customize-control-image .library li { - color: #ccc; - float: left; - padding: 3px 15px; - margin: 0; - border: 1px solid transparent; -} - -.accordion-section .customize-control-image .library li.library-selected { - margin-bottom: -1px; - padding-bottom: 4px; - color: #666666; - border-color: #ddd; - border-bottom-color: #fff; -} - -.accordion-section .customize-control-image .library .thumbnail { - display: block; - width: 100%; -} - -.accordion-section .customize-control-image .library .thumbnail img { - display: block; - max-width: 90%; - max-height: 80px; - margin: 5px auto; - padding: 2px; - background: #666666; -} - -.accordion-section .customize-control-image .library .thumbnail:hover img { - background-color: #2ea2cc; -} - -.accordion-section .customize-control-image .library-content { - display: none; - width: 100%; - float: left; - padding: 10px 0; -} - -.accordion-section .customize-control-image .library-content.library-selected { - display: block; -} - -.accordion-section .customize-control-upload .upload-fallback, -.accordion-section .customize-control-image .upload-fallback { - display: none; -} - -.accordion-section .customize-control-upload .upload-dropzone, -.accordion-section .customize-control-image .upload-dropzone { - display: none; - padding: 15px 10px; - border: 3px dashed #dfdfdf; - margin: 5px auto; - text-align: center; - position: relative; - cursor: default; -} - -.accordion-section .customize-control-upload .upload-dropzone.supports-drag-drop, -.accordion-section .customize-control-image .upload-dropzone.supports-drag-drop { - display: block; - -webkit-transition: border-color 0.1s; - transition: border-color 0.1s; -} - -.accordion-section .customize-control-upload .library ul li, -.accordion-section .customize-control-image .library ul li { - cursor: pointer; -} - -.accordion-section .customize-control-upload .upload-dropzone.supports-drag-drop.drag-over, -.accordion-section .customize-control-image .upload-dropzone.supports-drag-drop.drag-over { - border-color: #83b4d8; -} - -/** - * iOS can't scroll iframes, - * instead it expands the iframe size to match the size of the content - */ -.ios .wp-full-overlay { - position: relative; -} - -.ios #customize-preview { - position: relative; -} - -.ios #customize-controls .wp-full-overlay-sidebar-content { - -webkit-overflow-scrolling: touch; -} - -/** Header control **/ - -#customize-control-header_image .current { - margin-bottom: 8px; -} - -#customize-control-header_image .uploaded { - margin-bottom: 18px; -} - -#customize-control-header_image .uploaded button:not(.random), -#customize-control-header_image .default button:not(.random) { +.customize-control-header .uploaded button:not(.random), +.customize-control-header .default button:not(.random) { width: 100%; padding: 0; margin: 0; @@ -480,21 +745,42 @@ body { cursor: pointer; } -#customize-control-header_image button img { +.customize-control-header button img { display: block; } -#customize-control-header_image button.new, -#customize-control-header_image button.remove { +.customize-control-media .remove-button, +.customize-control-media .default-button, +.customize-control-media .upload-button, +.customize-control-upload .remove-button, +.customize-control-upload .default-button, +.customize-control-upload .upload-button, +.customize-control-image .remove-button, +.customize-control-image .default-button, +.customize-control-image .upload-button, +.customize-control-background .remove-button, +.customize-control-background .default-button, +.customize-control-background .upload-button, +.customize-control-cropped_image .remove-button, +.customize-control-cropped_image .default-button, +.customize-control-cropped_image .upload-button, +.customize-control-site_icon .remove-button, +.customize-control-site_icon .default-button, +.customize-control-site_icon .upload-button, +.customize-control-header button.new, +.customize-control-header button.remove { white-space: normal; width: 48%; height: auto; } - -/* Header control: current image container */ - -#customize-control-header_image .current .container { +.customize-control-media .current .container, +.customize-control-upload .current .container, +.customize-control-image .current .container, +.customize-control-background .current .container, +.customize-control-cropped_image .current .container, +.customize-control-site_icon .current .container, +.customize-control-header .current .container { overflow: hidden; -webkit-border-radius: 2px; border: 1px solid #eee; @@ -502,14 +788,40 @@ body { border-radius: 2px; } -#customize-control-header_image .placeholder { +.customize-control-media .current .container, +.customize-control-upload .current .container, +.customize-control-background .current .container, +.customize-control-cropped_image .current .container, +.customize-control-site_icon .current .container, +.customize-control-image .current .container { + min-height: 40px; +} + +.customize-control-media .placeholder, +.customize-control-upload .placeholder, +.customize-control-image .placeholder, +.customize-control-background .placeholder, +.customize-control-cropped_image .placeholder, +.customize-control-site_icon .placeholder, +.customize-control-header .placeholder { width: 100%; position: relative; text-align: center; cursor: default; + border: 1px dashed #b4b9be; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + min-height: 40px; } -#customize-control-header_image .inner { +.customize-control-media .inner, +.customize-control-upload .inner, +.customize-control-image .inner, +.customize-control-background .inner, +.customize-control-cropped_image .inner, +.customize-control-site_icon .inner, +.customize-control-header .inner { display: none; position: absolute; width: 100%; @@ -519,95 +831,104 @@ body { overflow: hidden; } -#customize-control-header_image .inner, -#customize-control-header_image .inner .dashicons { +.customize-control-media .inner, +.customize-control-upload .inner, +.customize-control-background .inner, +.customize-control-cropped_image .inner, +.customize-control-site_icon .inner, +.customize-control-image .inner { + display: block; + min-height: 40px; +} + +.customize-control-media .inner, +.customize-control-upload .inner, +.customize-control-image .inner, +.customize-control-background .inner, +.customize-control-cropped_image .inner, +.customize-control-site_icon .inner, +.customize-control-header .inner, +.customize-control-header .inner .dashicons { line-height: 20px; - top: 10px; + top: 8px; } -#customize-control-header_image .list .inner, -#customize-control-header_image .list .inner .dashicons { + +.customize-control-header .list .inner, +.customize-control-header .list .inner .dashicons { top: 9px; } -#customize-control-header_image .header-view { +.customize-control-header .header-view { position: relative; width: 100%; margin-bottom: 5px; } -#customize-control-header_image .header-view:last-child { +.customize-control-header .header-view:last-child { margin-bottom: 0px; } /* Convoluted, but 'outline' support isn't good enough yet */ -#customize-control-header_image .header-view:after { +.customize-control-header .header-view:after { border: 0; } -#customize-control-header_image .header-view.selected:after { +.customize-control-header .header-view.selected:after { content: ''; position: absolute; height: auto; top: 0; left: 0; bottom: 0; right: 0; - border: 4px solid #2ea2cc; + border: 4px solid #00a0d2; -webkit-border-radius: 2px; border-radius: 2px; } -#customize-control-header_image .header-view.button.selected { +.customize-control-header .header-view.button.selected { border: 0; } /* Header control: overlay "close" button */ -#customize-control-header_image .uploaded .header-view .close { - font-size: 2em; - color: grey; +.customize-control-header .uploaded .header-view .close { + font-size: 20px; + color: #fff; + background: #555; + background: rgba(0, 0, 0, 0.5); position: absolute; - visibility: hidden; top: 10px; - right: 10px; + right: -999px; z-index: 1; - width: 20px; - height: 20px; + width: 26px; + height: 26px; cursor: pointer; } -#customize-control-header_image .uploaded .header-view .close:hover { - color: black; - text-shadow: - -1px -1px 0 #fff, - 1px -1px 0 #fff, - -1px 1px 0 #fff, - 1px 1px 0 #fff; -} - -#customize-control-header_image .header-view:hover .close { - visibility: visible; +.customize-control-header .header-view:hover .close, +.customize-control-header .header-view .close:focus { + right: 10px; } /* Header control: randomiz(s)er */ -#customize-control-header_image .random.placeholder { +.customize-control-header .random.placeholder { cursor: pointer; -webkit-border-radius: 2px; border-radius: 2px; height: 40px; } -#customize-control-header_image button.random { +.customize-control-header button.random { width: 100%; height: auto; min-height: 40px; white-space: normal; } -#customize-control-header_image button.random .dice { +.customize-control-header button.random .dice { margin-top: 4px; } -#customize-control-header_image .placeholder:hover .dice, -#customize-control-header_image .header-view:hover > button.random .dice { +.customize-control-header .placeholder:hover .dice, +.customize-control-header .header-view:hover > button.random .dice { -webkit-animation: dice-color-change 3s infinite; - -ms-animation: dice-color-change 3s infinite; animation: dice-color-change 3s infinite; } @@ -618,13 +939,6 @@ body { 100% { color: #d4b146; } } -@-ms-keyframes dice-color-change { - 0% { color: #d4b146; } - 50% { color: #ef54b0; } - 75% { color: #7190d3; } - 100% { color: #d4b146; } -} - @keyframes dice-color-change { 0% { color: #d4b146; } 50% { color: #ef54b0; } @@ -632,39 +946,263 @@ body { 100% { color: #d4b146; } } -/* Header control: actions and choices */ - -#customize-control-header_image .actions { - margin-bottom: 32px; -} - -#customize-control-header_image .choice { +.customize-control-header .choice { position: relative; display: block; margin-bottom: 9px; } -#customize-control-header_image .uploaded div:last-child > .choice { +.customize-control-header .uploaded div:last-child > .choice { margin-bottom: 0; } -#customize-control-header_image img { +.customize-control-media img, +.customize-control-upload img, +.customize-control-image img, +.customize-control-background img, +.customize-control-cropped_image img, +.customize-control-header img { width: 100%; -webkit-border-radius: 2px; border-radius: 2px; } -#customize-control-header_image .remove { +.customize-control-media .remove-button, +.customize-control-media .default-button, +.customize-control-upload .remove-button, +.customize-control-upload .default-button, +.customize-control-image .remove-button, +.customize-control-image .default-button, +.customize-control-background .remove-button, +.customize-control-background .default-button, +.customize-control-cropped_image .remove-button, +.customize-control-cropped_image .default-button, +.customize-control-site_icon .remove-button, +.customize-control-site_icon .default-button, +.customize-control-header .remove { float: left; margin-right: 3px; } -#customize-control-header_image .new { +.customize-control-media .upload-button, +.customize-control-upload .upload-button, +.customize-control-image .upload-button, +.customize-control-background .upload-button, +.customize-control-cropped_image .upload-button, +.customize-control-site_icon .upload-button, +.customize-control-header .new { float: right; } +/** + * Themes + */ + +@-webkit-keyframes customize-reload { + 0% { opacity: 0; } + 100% { opacity: 1; } +} + +@keyframes customize-reload { + 0% { opacity: 0; } + 100% { opacity: 1; } +} + +/* #customize-container is reused from customize-loader.js, hence the naming. */ +.wp-customizer .customize-loading #customize-container { + display: block; + -webkit-animation: customize-reload .75s; /* Can't use `transition` because `display` changes here. */ + animation: customize-reload .75s; +} + +.control-section-themes .accordion-section-title { + cursor: default; +} + +#customize-theme-controls .control-section-themes .accordion-section-title:hover, +#customize-theme-controls .control-section-themes .accordion-section-title:focus { + color: #555; + background-color: #fff; +} + +.control-section-themes .accordion-section-title { + margin: 15px 0; +} + +.customize-themes-panel .accordion-section-title { + margin: 15px -8px; +} + +.control-section-themes .accordion-section-title { + padding-right: 100px; /* Space for the button */ +} + +.control-section-themes .accordion-section-title span.customize-action, +#customize-controls .customize-section-title span.customize-action { + font-size: 13px; + display: block; + font-weight: 400; +} + +.control-section-themes .accordion-section-title .change-theme, +.control-section-themes .accordion-section-title .customize-theme { + position: absolute; + right: 10px; + top: 50%; + margin-top: -14px; + font-weight: normal; +} + +.control-section-themes .accordion-section-title:before { + display: none; +} + +.customize-themes-panel { + display: none; + padding: 0 8px; + background: #f1f1f1; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + +.customize-themes-panel .accordion-section-title:first-child { + margin-top: 0; +} + +#customize-controls .customize-themes-panel .accordion-section-title:nth-child(2) { + font-size: 14px; + font-weight: 600; +} + +.customize-themes-panel > h2 { + padding: 15px 8px 0 8px; +} + +.control-section.open .customize-themes-panel { + display: block; +} + +#customize-theme-controls .customize-themes-panel .accordion-section-content { + background: transparent; + display: block; +} -/** Handle cheaters. */ +.customize-control.customize-control-theme { + margin-bottom: 8px; +} + +#customize-theme-controls .themes.accordion-section-content { + position: relative; + left: 0; + padding: 0; + width: 100%; +} + +.wp-customizer .theme-browser .themes { + padding-bottom: 8px; +} + +.wp-customizer .theme-browser .theme { + margin: 0; + width: 100%; +} + +.wp-customizer .theme-browser .theme .theme-actions { + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; + opacity: 1; +} + +#customize-controls h3.theme-name { + font-size: 15px; +} + +#customize-controls .theme-overlay .theme-name { + font-size: 32px; +} + +.wp-customizer #themes-filter { + font-size: 16px; + font-weight: 300; + line-height: 1.5; + width: 100%; +} + +#accordion-section-themes .accordion-section-title:after { + display: none; +} + +#customize-theme-controls .control-section-themes.current-panel > h3.accordion-section-title { + left: 0; +} + +.customize-themes-panel.control-panel-content { + position: absolute; + left: -100%; + top: 0; + width: 100%; + border-top: 1px solid #ddd; +} + +.in-themes-panel #customize-info, +.in-themes-panel #customize-theme-controls > ul > .accordion-section { + left: 100%; +} + +/* Details View */ +.wp-customizer .theme-overlay { + display: none; +} + +.wp-customizer.modal-open .theme-overlay { + position: fixed; + left: 0; + top: 0; + right: 0; + bottom: 0; + z-index: 109; +} + +.wp-customizer .theme-overlay .theme-backdrop { + background: rgba( 238, 238, 238, 0.75 ); + position: fixed; + z-index: 110; +} + +.wp-customizer .theme-overlay .theme-wrap { + left: 90px; + right: 90px; + top: 45px; + bottom: 45px; + z-index: 120; + max-width: 1740px; /* To ensure that theme screenshots are not displayed larger than 880px wide. */ +} + +.wp-customizer .theme-overlay .theme-actions { + text-align: right; /* Because there's only one action, match the pattern of media modals and right-align the action. */ +} + +.modal-open .in-themes-panel #customize-controls .wp-full-overlay-sidebar-content { + overflow: visible; /* Prevent the top-level Customizer controls from becoming visible when elements on the right of the details modal are focused. */ +} + +.ie8 .wp-customizer .theme-overlay .theme-header, +.ie8 .wp-customizer .theme-overlay .theme-about, +.ie8 .wp-customizer .theme-overlay .theme-actions { + position: static; +} + +/* Small Screens */ +@media (max-width:850px), (max-height:472px) { + .wp-customizer .theme-overlay .theme-wrap { + left: 0; + right: 0; + top: 0; + bottom: 0; + } +} + +/* Handle cheaters. */ body.cheatin { font-size: medium; height: auto; @@ -677,8 +1215,453 @@ body.cheatin { box-shadow: 0 1px 3px rgba(0,0,0,0.13); } +body.cheatin h1 { + border-bottom: 1px solid #ddd; + clear: both; + color: #666; + font: 24px "Open Sans", sans-serif; + margin: 30px 0 0 0; + padding: 0; + padding-bottom: 7px; +} + body.cheatin p { font-size: 14px; line-height: 1.5; margin: 25px 0 20px; } + +/** + * Widgets and Menus common styles + */ + +/* higher specificity than .wp-core-ui .button-secondary */ +#customize-theme-controls .add-new-widget, +#customize-theme-controls .add-new-menu-item { + cursor: pointer; + float: right; + margin-left: 10px; + -webkit-transition: all 0.2s; + transition: all 0.2s; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + outline: none; +} + +.reordering .add-new-widget, +.reordering .add-new-menu-item { + opacity: 0.2; + pointer-events: none; + cursor: not-allowed; /* doesn't work in conjunction with pointer-events */ +} + +.add-new-widget:before, +.add-new-menu-item:before { + content: "\f132"; + display: inline-block; + position: relative; + left: -2px; + top: -1px; + font: normal 20px/1 dashicons; + vertical-align: middle; + -webkit-transition: all 0.2s; + transition: all 0.2s; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +/* Reordering */ +.reorder-toggle { + color: #0073aa; + float: right; + padding: 5px 8px; + text-decoration: none; + cursor: pointer; + outline: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} + +.reorder-toggle:hover { + color: #00a0d2; +} + +.reorder-toggle:focus { + outline: 1px dotted; +} + +.reorder, +.reordering .reorder-done { + display: block; + padding: 5px 8px; +} + +.reorder-done, +.reordering .reorder { + display: none; + color: #0073aa; +} + +.reorder-toggle:hover .reorder-done, +.reorder-toggle:active .reorder-done, +.reorder-toggle:focus .reorder-done { + color: #00a0d2; +} + +.widget-reorder-nav span, +.menu-item-reorder-nav button { + position: relative; + overflow: hidden; + float: left; + display: block; + width: 33px; /* was 42px for mobile */ + height: 43px; + color: #82878c; + text-indent: -9999px; + cursor: pointer; + outline: none; +} + +.menu-item-reorder-nav button { + width: 30px; + height: 40px; + background: transparent; + border: none; + -webkit-box-shadow: none; + box-shadow: none; +} + +.widget-reorder-nav span:before, +.menu-item-reorder-nav button:before { + display: inline-block; + position: absolute; + top: 0; + right: 0; + width: 100%; + height: 100%; + font: normal 20px/43px dashicons; + text-align: center; + text-indent: 0; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.widget-reorder-nav span:hover, +.widget-reorder-nav span:focus, +.menu-item-reorder-nav button:hover, +.menu-item-reorder-nav button:focus { + color: #191e23; + background: #eee; +} + +.move-widget-down:before, +.menus-move-down:before { + content: "\f347"; +} + +.move-widget-up:before, +.menus-move-up:before { + content: "\f343"; +} + +#customize-theme-controls .first-widget .move-widget-up, +#customize-theme-controls .last-widget .move-widget-down, +.move-up-disabled .menus-move-up, +.move-down-disabled .menus-move-down, +.move-right-disabled .menus-move-right, +.move-left-disabled .menus-move-left { + color: #d5d5d5; + background-color: #fff; + cursor: default; + pointer-events: none; +} + +/** + * New widget and Add-menu-items modes and panels + */ + +.wp-full-overlay-main { + right: auto; /* this overrides a right: 0; which causes the preview to resize, I'd rather have it go off screen at the normal size. */ + width: 100%; +} + +body.adding-widget .add-new-widget, +body.adding-widget .add-new-widget:hover, +.adding-menu-items .add-new-menu-item, +.adding-menu-items .add-new-menu-item:hover, +.add-menu-toggle.open, +.add-menu-toggle.open:hover { + background: #eee; + border-color: #929793; + color: #32373c; + -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); + box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); +} + +body.adding-widget .add-new-widget:before, +.adding-menu-items .add-new-menu-item:before, +#accordion-section-add_menu .add-new-menu-item.open:before { + -webkit-transform: rotate(45deg); + -ms-transform: rotate(45deg); + transform: rotate(45deg); +} + +#available-widgets, +#available-menu-items { + position: absolute; + top: 0; + bottom: 0; + left: -301px; + visibility: hidden; + overflow-x: hidden; + overflow-y: auto; + width: 300px; + margin: 0; + z-index: 4; + background: #eee; + -webkit-transition: left .18s; + transition: left .18s; + border-right: 1px solid #ddd; +} + +#available-widgets .customize-section-title, +#available-menu-items .customize-section-title { + display: none; +} + +#available-widgets-list { + top: 60px; + position: absolute; + overflow: auto; + bottom: 0; + width: 100%; +} + +#available-widgets-filter { + position: fixed; + top: 0; + z-index: 1; + width: 300px; + background: #eee; + border-bottom: 1px solid #e5e5e5; +} + +/* search field container */ +#available-widgets-filter, +#available-menu-items-search .accordion-section-title { + padding: 12px 15px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + +#available-widgets-filter input, +#available-menu-items-search input { + padding: 6px 10px; + width: 100%; +} + +#available-widgets .widget-top, +#available-widgets .widget-top:hover, +#available-menu-items .item-top, +#available-menu-items .item-top:hover { + border: none; + background: transparent; + -webkit-box-shadow: none; + box-shadow: none; +} + +#available-widgets .widget-tpl, +#available-menu-items .item-tpl { + position: relative; + padding: 20px 15px 20px 60px; + background: #fff; + border-bottom: 1px solid #e5e5e5; + cursor: pointer; + display: none; +} + +#available-widgets .widget, +#available-menu-items .item { + position: static; +} + + +/* Responsive */ +.customize-controls-preview-toggle { + display: none; +} + +@media only screen and (max-width: 782px) { + .wp-customizer .theme:not(.active):hover .theme-actions, + .wp-customizer .theme:not(.active):focus .theme-actions { + display: block; + } + + .wp-customizer .theme-browser .theme.active .theme-name span { + display: inline; + } + + .customize-control-radio label, + .customize-control-checkbox label, + .customize-control-nav_menu_auto_add label { + margin-left: 32px; + } + + .customize-control-radio input, + .customize-control-checkbox input, + .customize-control-nav_menu_auto_add input { + margin-left: -32px; + } + + .customize-control input[type="radio"] + label, + .customize-control input[type="checkbox"] + label { + line-height: 32px; + } +} + +@media screen and ( max-width: 640px ) { + #customize-controls { + width: 100%; + } + + .wp-full-overlay.expanded { + margin-left: 0; + } + + /* when the sidebar is collapsed and switching to responsive view, + bring it back see ticket #35220 */ + .wp-full-overlay.collapsed #customize-controls { + margin-left: 0; + } + + .wp-full-overlay-sidebar .wp-full-overlay-sidebar-content { + bottom: 0; + } + + .customize-controls-preview-toggle { + display: block; + position: absolute; + top: 0; + left: 48px; + line-height: 45px; + font-size: 14px; + padding: 0 12px 0 12px; + margin: 0; + height: 45px; + background: #eee; + border-right: 1px solid #ddd; + color: #444; + cursor: pointer; + -webkit-transition: color .1s ease-in-out, background .1s ease-in-out; + transition: color .1s ease-in-out, background .1s ease-in-out; + } + + #customize-footer-actions, + #customize-preview, + .customize-controls-preview-toggle .controls, + .preview-only .wp-full-overlay-sidebar-content, + .preview-only .customize-controls-preview-toggle .preview { + display: none; + } + + .customize-controls-preview-toggle .preview:before, + .customize-controls-preview-toggle .controls:before { + font: normal 20px/1 dashicons; + content: "\f177"; + position: relative; + top: 4px; + margin-right: 6px; + } + + .customize-controls-preview-toggle .controls:before { + content: "\f540"; + } + + .preview-only #customize-controls { + height: 45px; + } + + .preview-only #customize-preview, + .preview-only .customize-controls-preview-toggle .controls { + display: block; + } + + #customize-preview { + top: 45px; + bottom: 0; + height: auto; + } + + .wp-core-ui.wp-customizer .button { + padding: 6px 14px; + line-height: normal; + font-size: 14px; + vertical-align: middle; + height: auto; + margin-bottom: 4px; + } + + #customize-header-actions .button-primary { + margin-top: 6px; + } + + body.adding-widget div#available-widgets, + body.adding-menu-items div#available-menu-items { + top: 46px; + left: 0; + z-index: 10; + width: 100%; + } + + #available-widgets .customize-section-title, + #available-menu-items .customize-section-title { + display: block; + margin: 0; + } + + #available-widgets .customize-section-back, + #available-menu-items .customize-section-back { + height: 69px; + } + + #available-widgets .customize-section-title h3, + #available-menu-items .customize-section-title h3 { + font-size: 20px; + font-weight: 200; + padding: 9px 10px 12px 14px; + margin: 0; + line-height: 24px; + color: #555; + display: block; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + + #available-widgets .customize-section-title .customize-action, + #available-menu-items .customize-section-title .customize-action { + font-size: 13px; + display: block; + font-weight: 400; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + + #available-widgets-filter { + position: relative; + width: 100%; + background: #fff; + height: auto; + padding: 10px 15px; + } + + #available-widgets-list { + top: 140px; + } +} diff --git a/wp-admin/css/customize-controls.min.css b/wp-admin/css/customize-controls.min.css index 99b3ab5..6b81290 100644 --- a/wp-admin/css/customize-controls.min.css +++ b/wp-admin/css/customize-controls.min.css @@ -1 +1 @@ -body{overflow:hidden}#customize-controls a{text-decoration:none}#customize-controls h3{font-size:14px}#customize-controls .submit{text-align:center}#customize-controls .description{color:#666}#customize-header-actions .button-primary{float:right;margin-top:9px}#customize-header-actions .spinner{margin-top:16px;margin-right:4px}.saving #customize-header-actions .spinner{display:block}#customize-info{border:0;border-top:1px solid #ddd}#customize-info .accordion-section-title{background-color:#fff;color:#666;border-left:0;border-right:0;border-bottom:1px solid #eee}#customize-info .accordion-section-title:focus,#customize-info .accordion-section-title:focus:after,#customize-info .accordion-section-title:hover,#customize-info .accordion-section-title:hover:after,#customize-info.open .accordion-section-title,#customize-info.open .accordion-section-title:after{color:#555}#customize-info.open .accordion-section-title{border-color:transparent}#customize-info .preview-notice{font-size:13px;line-height:24px}#customize-info .theme-name{font-size:20px;font-weight:200;line-height:24px;display:block}#customize-info .theme-screenshot{width:258px}#customize-info .theme-description{margin-top:1em;color:#666;line-height:20px}#customize-theme-controls{-webkit-box-shadow:0 1px 1px -1px rgba(0,0,0,.1);box-shadow:0 1px 1px -1px rgba(0,0,0,.1)}#customize-theme-controls .control-section{border:0}#customize-theme-controls .accordion-section-title{color:#555;background-color:#fff;border-bottom:1px solid #eee}#customize-theme-controls .accordion-section-content{color:#555;background:#fff}#customize-theme-controls .control-section .accordion-section-title:focus,#customize-theme-controls .control-section .accordion-section-title:hover,#customize-theme-controls .control-section.open .accordion-section-title,#customize-theme-controls .control-section:hover .accordion-section-title{color:#555;background:#f5f5f5}.js .control-section .accordion-section-title:focus,.js .control-section .accordion-section-title:hover,.js .control-section.open .accordion-section-title,.js .control-section:hover .accordion-section-title{background:#f5f5f5}#customize-theme-controls .control-section .accordion-section-title:focus::after,#customize-theme-controls .control-section .accordion-section-title:hover::after,#customize-theme-controls .control-section.open .accordion-section-title::after,#customize-theme-controls .control-section:hover .accordion-section-title::after{color:#555}#customize-theme-controls .control-section.open{border-bottom:1px solid #eee}#customize-theme-controls .control-section.open .accordion-section-title{border-bottom-color:#eee!important}#customize-theme-controls .control-section:last-of-type .accordion-section-title,#customize-theme-controls .control-section:last-of-type.open{border-bottom-color:#ddd}#customize-theme-controls .accordion-section-content,#customize-theme-controls>ul{margin:0}.customize-control{width:100%;float:left;clear:both;margin-bottom:8px}.customize-control input[type=checkbox],.customize-control input[type=radio],.customize-control input[type=text],.customize-control select{line-height:28px}.customize-control input[type=text]{width:98%;line-height:18px;margin:0}.customize-control select{min-width:50%;max-width:100%;height:28px;line-height:28px}.customize-control select[multiple]{height:auto}.customize-control-title{display:block;font-size:14px;line-height:24px;font-weight:600;margin-bottom:5px}.customize-control-checkbox label,.customize-control-color .color-picker,.customize-control-upload div{line-height:28px}.customize-control-checkbox input{margin-right:5px}.customize-control-radio{padding:5px 0 10px}.customize-control-radio .customize-control-title{margin-bottom:0;line-height:22px}.customize-control-radio label{line-height:32px}.customize-control-radio input{margin-right:5px}#customize-preview iframe{width:100%;height:100%}.wp-full-overlay-sidebar{background:#eee;border-right:1px solid #ddd}.collapse-sidebar{background-color:transparent!important;border:0!important;-webkit-box-shadow:none!important;box-shadow:none!important;-webkit-border-radius:0!important;border-radius:0!important}.collapse-sidebar:active,.collapse-sidebar:active .collapse-sidebar-arrow:before,.collapse-sidebar:active .collapse-sidebar-label{text-shadow:none}.collapsed .collapse-sidebar-arrow:before{color:#888}.accordion-section .dropdown{float:left;display:block;position:relative;cursor:pointer}.accordion-section .dropdown-content{overflow:hidden;float:left;min-width:30px;height:16px;line-height:16px;margin-right:16px;padding:4px 5px;border:2px solid #eee;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.customize-control .dropdown-arrow{position:absolute;top:0;bottom:0;right:0;width:20px;background:#eee}.customize-control .dropdown-arrow:after{content:"\f140";font:400 20px/1 dashicons;speak:none;display:block;padding:0;text-indent:0;text-align:center;position:relative;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;color:#333}.customize-control .dropdown-status{color:#333;background:#eee;display:none;max-width:112px}.customize-control-color .color-picker-hex{display:none}.customize-control-color.open .color-picker-hex{display:block}.customize-control-color .dropdown{margin-right:5px;margin-bottom:5px}.customize-control-color .dropdown .dropdown-content{background-color:#555;border:1px solid rgba(0,0,0,.15)}.customize-control-color .dropdown:hover .dropdown-content{border-color:rgba(0,0,0,.25)}.customize-control-image .actions,.customize-control-image .library{display:none;float:left;width:100%}.customize-control-image.open .actions,.customize-control-image.open .library{display:block}.accordion-section .customize-control-image .dropdown-content{height:auto;min-height:24px;min-width:40px;padding:0}.accordion-section .customize-control-image .dropdown-status{padding:4px 5px}.accordion-section .customize-control-image .preview-thumbnail img{display:block;width:100%;max-width:122px;max-height:98px;margin:0 auto}.accordion-section .customize-control-image .actions{text-align:right}.accordion-section .customize-control-image .library ul{border-bottom:1px solid #ddd;float:left;width:100%;margin:10px 0 0}.accordion-section .customize-control-image .library li{color:#ccc;float:left;padding:3px 15px;margin:0;border:1px solid transparent}.accordion-section .customize-control-image .library li.library-selected{margin-bottom:-1px;padding-bottom:4px;color:#666;border-color:#ddd;border-bottom-color:#fff}.accordion-section .customize-control-image .library .thumbnail{display:block;width:100%}.accordion-section .customize-control-image .library .thumbnail img{display:block;max-width:90%;max-height:80px;margin:5px auto;padding:2px;background:#666}.accordion-section .customize-control-image .library .thumbnail:hover img{background-color:#2ea2cc}.accordion-section .customize-control-image .library-content{display:none;width:100%;float:left;padding:10px 0}.accordion-section .customize-control-image .library-content.library-selected{display:block}.accordion-section .customize-control-image .upload-fallback,.accordion-section .customize-control-upload .upload-fallback{display:none}.accordion-section .customize-control-image .upload-dropzone,.accordion-section .customize-control-upload .upload-dropzone{display:none;padding:15px 10px;border:3px dashed #dfdfdf;margin:5px auto;text-align:center;position:relative;cursor:default}.accordion-section .customize-control-image .upload-dropzone.supports-drag-drop,.accordion-section .customize-control-upload .upload-dropzone.supports-drag-drop{display:block;-webkit-transition:border-color .1s;transition:border-color .1s}.accordion-section .customize-control-image .library ul li,.accordion-section .customize-control-upload .library ul li{cursor:pointer}.accordion-section .customize-control-image .upload-dropzone.supports-drag-drop.drag-over,.accordion-section .customize-control-upload .upload-dropzone.supports-drag-drop.drag-over{border-color:#83b4d8}.ios #customize-preview,.ios .wp-full-overlay{position:relative}.ios #customize-controls .wp-full-overlay-sidebar-content{-webkit-overflow-scrolling:touch}#customize-control-header_image .current{margin-bottom:8px}#customize-control-header_image .uploaded{margin-bottom:18px}#customize-control-header_image .default button:not(.random),#customize-control-header_image .uploaded button:not(.random){width:100%;padding:0;margin:0;background:0 0;border:0;color:inherit;cursor:pointer}#customize-control-header_image button img{display:block}#customize-control-header_image button.new,#customize-control-header_image button.remove{white-space:normal;width:48%;height:auto}#customize-control-header_image .current .container{overflow:hidden;border:1px solid #eee;-webkit-border-radius:2px;border-radius:2px}#customize-control-header_image .placeholder{width:100%;position:relative;text-align:center;cursor:default}#customize-control-header_image .inner{display:none;position:absolute;width:100%;color:#555;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}#customize-control-header_image .inner,#customize-control-header_image .inner .dashicons{line-height:20px;top:10px}#customize-control-header_image .list .inner,#customize-control-header_image .list .inner .dashicons{top:9px}#customize-control-header_image .header-view{position:relative;width:100%;margin-bottom:5px}#customize-control-header_image .header-view:last-child{margin-bottom:0}#customize-control-header_image .header-view:after{border:0}#customize-control-header_image .header-view.selected:after{content:'';position:absolute;height:auto;top:0;left:0;bottom:0;right:0;border:4px solid #2ea2cc;-webkit-border-radius:2px;border-radius:2px}#customize-control-header_image .header-view.button.selected{border:0}#customize-control-header_image .uploaded .header-view .close{font-size:2em;color:grey;position:absolute;visibility:hidden;top:10px;right:10px;z-index:1;width:20px;height:20px;cursor:pointer}#customize-control-header_image .uploaded .header-view .close:hover{color:#000;text-shadow:-1px -1px 0 #fff,1px -1px 0 #fff,-1px 1px 0 #fff,1px 1px 0 #fff}#customize-control-header_image .header-view:hover .close{visibility:visible}#customize-control-header_image .random.placeholder{cursor:pointer;-webkit-border-radius:2px;border-radius:2px;height:40px}#customize-control-header_image button.random{width:100%;height:auto;min-height:40px;white-space:normal}#customize-control-header_image button.random .dice{margin-top:4px}#customize-control-header_image .header-view:hover>button.random .dice,#customize-control-header_image .placeholder:hover .dice{-webkit-animation:dice-color-change 3s infinite;-ms-animation:dice-color-change 3s infinite;animation:dice-color-change 3s infinite}@-webkit-keyframes dice-color-change{0%{color:#d4b146}50%{color:#ef54b0}75%{color:#7190d3}100%{color:#d4b146}}@-ms-keyframes dice-color-change{0%{color:#d4b146}50%{color:#ef54b0}75%{color:#7190d3}100%{color:#d4b146}}@keyframes dice-color-change{0%{color:#d4b146}50%{color:#ef54b0}75%{color:#7190d3}100%{color:#d4b146}}#customize-control-header_image .actions{margin-bottom:32px}#customize-control-header_image .choice{position:relative;display:block;margin-bottom:9px}#customize-control-header_image .uploaded div:last-child>.choice{margin-bottom:0}#customize-control-header_image img{width:100%;-webkit-border-radius:2px;border-radius:2px}#customize-control-header_image .remove{float:left;margin-right:3px}#customize-control-header_image .new{float:right}body.cheatin{font-size:medium;height:auto;background:#fff;margin:50px auto 2em;padding:1em 2em;max-width:700px;min-width:0;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.13);box-shadow:0 1px 3px rgba(0,0,0,.13)}body.cheatin p{font-size:14px;line-height:1.5;margin:25px 0 20px} \ No newline at end of file +body{overflow:hidden;-webkit-text-size-adjust:100%}#customize-controls a{text-decoration:none}#customize-controls h3{font-size:14px}#customize-controls img{max-width:100%}#customize-controls .submit{text-align:center}#customize-controls .description{color:#555}#customize-header-actions .button-primary{float:right;margin-top:9px}#customize-header-actions .spinner{margin-top:13px;margin-right:4px}.saving #customize-header-actions .spinner{visibility:visible}#customize-header-actions{border-bottom:1px solid #ddd}#customize-controls .wp-full-overlay-sidebar-content{overflow-y:auto;overflow-x:hidden}#customize-controls .customize-info{border:none;border-top:1px solid #ddd;border-bottom:1px solid #ddd;margin-bottom:15px}#customize-controls .customize-info .accordion-section-title{background:#fff;color:#555;border-left:none;border-right:none;border-bottom:none;cursor:default}#customize-controls .customize-info .accordion-section-title:focus:after,#customize-controls .customize-info .accordion-section-title:hover:after,#customize-controls .customize-info.open .accordion-section-title:after{color:#333}#customize-controls .customize-info .accordion-section-title:after{display:none}#customize-controls .customize-info .preview-notice{font-size:13px;line-height:24px}#customize-controls .control-section .customize-section-title h3,#customize-controls .control-section h3.customize-section-title,#customize-controls .customize-info .panel-title{font-size:20px;font-weight:200;line-height:26px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}#customize-controls .customize-section-title span.customize-action{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}#customize-controls .customize-info .customize-help-toggle{position:absolute;top:4px;right:1px;padding:20px 20px 10px 10px;width:20px;height:20px;cursor:pointer;-webkit-box-shadow:none;box-shadow:none;-webkit-appearance:none;background:0 0;color:#555;border:none}#customize-controls .customize-info .customize-help-toggle:before{position:absolute;top:5px;left:6px}#customize-controls .customize-info .customize-help-toggle:focus,#customize-controls .customize-info .customize-help-toggle:hover,#customize-controls .customize-info.open .customize-help-toggle{color:#0073aa}#customize-controls .customize-info .customize-panel-description,#customize-controls .no-widget-areas-rendered-notice{color:#555;display:none;background:#fff;padding:12px 15px;border-top:1px solid #ddd}#customize-controls .customize-info .customize-panel-description.open+.no-widget-areas-rendered-notice{border-top:none}#customize-controls .customize-info .customize-panel-description p:first-child{margin-top:0}#customize-controls .customize-info .customize-panel-description p:last-child{margin-bottom:0}#customize-controls .current-panel .control-section>h3.accordion-section-title{padding-right:30px}#customize-theme-controls .control-section{border:none}#customize-theme-controls .accordion-section-title{color:#555;background-color:#fff;border-bottom:1px solid #eee}#customize-theme-controls .accordion-section-title:after{content:"\f345";color:#a0a5aa}#customize-theme-controls .accordion-section-content{color:#555;background:0 0;position:absolute;top:0;left:100%;width:100%;margin:0;padding:12px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#customize-controls .control-section .accordion-section-title:focus,#customize-controls .control-section .accordion-section-title:hover,#customize-controls .control-section.open .accordion-section-title,#customize-controls .control-section:hover>.accordion-section-title{color:#23282d;background:#f5f5f5}.js .control-section .accordion-section-title:focus,.js .control-section .accordion-section-title:hover,.js .control-section.open .accordion-section-title,.js .control-section:hover .accordion-section-title{background:#f5f5f5}#customize-theme-controls .control-section .accordion-section-title:focus:after,#customize-theme-controls .control-section .accordion-section-title:hover:after,#customize-theme-controls .control-section.open .accordion-section-title:after,#customize-theme-controls .control-section:hover>.accordion-section-title:after{color:#23282d}#customize-theme-controls .control-section.open{border-bottom:1px solid #eee}#customize-theme-controls .control-section.open .accordion-section-title{border-bottom-color:#eee!important}#customize-theme-controls .control-section:last-of-type.open,#customize-theme-controls .control-section:last-of-type>.accordion-section-title{border-bottom-color:#ddd}#customize-theme-controls>ul{margin:0}.customize-section-description-container{margin-bottom:15px}.customize-section-title{margin:-12px -12px 0;border-bottom:1px solid #ddd;background:#fff}div.customize-section-description{margin-top:22px}div.customize-section-description p:first-child{margin-top:0}div.customize-section-description p:last-child{margin-bottom:0}#customize-theme-controls .customize-themes-panel h3.customize-section-title:first-child{border-bottom:1px solid #ddd;padding:12px}.ios #customize-theme-controls .customize-themes-panel h3.customize-section-title:first-child{padding:12px 12px 13px}.customize-section-title h3,h3.customize-section-title{padding:10px 10px 12px 14px;margin:0;line-height:21px;color:#555}#customize-theme-controls{position:relative;left:0;-webkit-transition:.18s left ease-in-out;transition:.18s left ease-in-out}.ios #customize-theme-controls{-webkit-transition:left 0s;transition:left 0s}.section-open #customize-info,.section-open #customize-theme-controls{left:-100%}.accordion-sub-container.control-panel-content{display:none;position:absolute;left:300px;top:0;width:300px;-webkit-transition:left ease-in-out .18s;transition:left ease-in-out .18s}.ios .accordion-sub-container.control-panel-content{-webkit-transition:left 0s;transition:left 0s}.accordion-sub-container.control-panel-content.animating{display:block}.current-panel .accordion-sub-container.control-panel-content{width:100%}.customize-controls-close{display:block;position:absolute;top:0;left:0;width:45px;height:45px;padding:0 2px 0 0;background:#eee;border:none;border-right:1px solid #ddd;color:#444;text-align:left;cursor:pointer;-webkit-transition:color .1s ease-in-out,background .1s ease-in-out;transition:color .1s ease-in-out,background .1s ease-in-out;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.customize-panel-back,.customize-section-back{display:block;float:left;width:48px;height:71px;padding:0 24px 0 0;margin:0;background:#fff;border:none;border-right:1px solid #ddd;-webkit-box-shadow:none;box-shadow:none;cursor:pointer;-webkit-transition:left .18s ease-in-out,color .1s ease-in-out,background .1s ease-in-out;transition:left .18s ease-in-out,color .1s ease-in-out,background .1s ease-in-out}.customize-section-back{height:74px}.ios .customize-panel-back,.ios .customize-section-back{-webkit-transition:left 0s;transition:left 0s}.ios .customize-panel-back{display:none}.ios .expanded.in-sub-panel .customize-panel-back{display:block}.panel-meta.customize-info .accordion-section-title{margin-left:48px}#customize-controls .panel-meta.customize-info .accordion-section-title:hover{background:#fff;color:#555}.customize-controls-close:focus,.customize-controls-close:hover,.customize-controls-preview-toggle:focus,.customize-controls-preview-toggle:hover{background:#ddd;border-color:#ccc;color:#000;outline:0;-webkit-box-shadow:none;box-shadow:none}.customize-panel-back:focus,.customize-panel-back:hover,.customize-section-back:focus,.customize-section-back:hover{color:#23282d;background:#f5f5f5;outline:0;-webkit-box-shadow:none;box-shadow:none}.customize-controls-close:before{font:400 22px/45px dashicons;content:"\f335";position:relative;top:1px;left:13px}.customize-panel-back:before,.customize-section-back:before{font:400 20px/72px dashicons;content:"\f341";position:relative;left:13px}.wp-full-overlay-sidebar .wp-full-overlay-header{-webkit-transition:padding ease-in-out .18s;transition:padding ease-in-out .18s}.in-sub-panel .wp-full-overlay-sidebar .wp-full-overlay-header{padding-left:62px}#customize-info,#customize-theme-controls>ul>.accordion-section{position:relative;left:0;-webkit-transition:left ease-in-out .18s;transition:left ease-in-out .18s}.ios #customize-info,.ios #customize-theme-controls>ul>.accordion-section{-webkit-transition:left 0s;transition:left 0s}.in-sub-panel #customize-info,.in-sub-panel #customize-theme-controls>ul>.accordion-section{left:-300px;width:300px}.in-sub-panel #customize-theme-controls .accordion-section.current-panel{width:100%}#customize-theme-controls .control-section.current-panel{padding:0}#customize-theme-controls .control-section>h3.accordion-section-title{position:relative;left:0}#customize-theme-controls .control-section.current-panel>h3.accordion-section-title{left:-354px;-webkit-transition:left ease-in-out .18s;transition:left ease-in-out .18s}.ios #customize-theme-controls .control-section.current-panel>h3.accordion-section-title{-webkit-transition:left 0s;transition:left 0s}.wp-full-overlay.section-open #customize-controls .wp-full-overlay-sidebar-content{visibility:hidden;overflow-y:hidden}.wp-full-overlay.section-open .wp-full-overlay-sidebar-content .accordion-section.open{visibility:visible}.wp-full-overlay.section-open .wp-full-overlay-sidebar-content .accordion-section.open .accordion-section-content{overflow-y:auto}p.customize-section-description{font-style:normal;margin-top:22px;margin-bottom:0}.customize-control{width:100%;float:left;clear:both;margin-bottom:12px}.customize-control input[type=radio],.customize-control input[type=checkbox],.customize-control select{line-height:28px}.customize-control input[type=tel],.customize-control input[type=url],.customize-control input[type=text],.customize-control input[type=password],.customize-control input[type=email],.customize-control input[type=number],.customize-control input[type=search]{width:98%;line-height:18px;margin:0}.customize-control-hidden{margin:0}.customize-control-textarea textarea{width:100%;resize:vertical}.customize-control select{min-width:50%;max-width:100%;height:28px;line-height:28px}.customize-control select[multiple]{height:auto}.customize-control-title{display:block;font-size:14px;line-height:24px;font-weight:600;margin-bottom:5px}.customize-control-description{display:block;font-style:italic;line-height:18px;margin-bottom:5px}.customize-control-color .color-picker,.customize-control-upload div{line-height:28px}.customize-control-checkbox label,.customize-control-nav_menu_auto_add label,.customize-control-radio label{line-height:20px;display:block;margin-left:24px;padding-top:6px;padding-bottom:6px}.customize-control-checkbox input,.customize-control-nav_menu_auto_add input,.customize-control-radio input{margin-right:4px;margin-left:-24px}.customize-control-radio{padding:5px 0 10px}.customize-control-radio .customize-control-title{margin-bottom:0;line-height:22px}.customize-control-radio .customize-control-title+.customize-control-description{margin-top:7px}.customize-control .attachment-thumb.type-icon{float:left;margin:10px;width:auto}.customize-control .attachment-title{font-weight:700;margin:0;padding:5px 10px}.customize-control .attachment-meta{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;margin:0;padding:0 10px}.customize-control .attachment-meta-title{padding-top:7px}.customize-control .thumbnail-image{line-height:0}.customize-control .thumbnail-image img{cursor:pointer}#customize-controls .thumbnail-audio .thumbnail{max-width:64px;max-height:64px;margin:10px;float:left}#customize-preview iframe{width:100%;height:100%;position:absolute}#customize-preview iframe+iframe{visibility:hidden}.wp-full-overlay-sidebar{background:#eee;border-right:1px solid #ddd}.accordion-section .dropdown{float:left;display:block;position:relative;cursor:pointer}.accordion-section .dropdown-content{overflow:hidden;float:left;min-width:30px;height:16px;line-height:16px;margin-right:16px;padding:4px 5px;border:2px solid #eee;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.customize-control .dropdown-arrow{position:absolute;top:0;bottom:0;right:0;width:20px;background:#eee}.customize-control .dropdown-arrow:after{content:"\f140";font:400 20px/1 dashicons;speak:none;display:block;padding:0;text-indent:0;text-align:center;position:relative;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;color:#32373c}.customize-control .dropdown-status{color:#32373c;background:#eee;display:none;max-width:112px}.customize-control-color .color-picker-hex{display:none}.customize-control-color.open .color-picker-hex,.customize-control-header button img{display:block}.customize-control-color .dropdown{margin-right:5px;margin-bottom:5px}.customize-control-color .dropdown .dropdown-content{background-color:#555;border:1px solid rgba(0,0,0,.15)}.customize-control-color .dropdown:hover .dropdown-content{border-color:rgba(0,0,0,.25)}.ios .wp-full-overlay{position:relative}.ios #customize-controls .wp-full-overlay-sidebar-content{-webkit-overflow-scrolling:touch}.customize-control-background .current,.customize-control-cropped_image .current,.customize-control-header .current,.customize-control-image .current,.customize-control-media .current,.customize-control-site_icon .current,.customize-control-upload .current{margin-bottom:8px}.customize-control-header .uploaded{margin-bottom:18px}.customize-control-header .default button:not(.random),.customize-control-header .uploaded button:not(.random){width:100%;padding:0;margin:0;background:0 0;border:none;color:inherit;cursor:pointer}.customize-control-background .default-button,.customize-control-background .remove-button,.customize-control-background .upload-button,.customize-control-cropped_image .default-button,.customize-control-cropped_image .remove-button,.customize-control-cropped_image .upload-button,.customize-control-header button.new,.customize-control-header button.remove,.customize-control-image .default-button,.customize-control-image .remove-button,.customize-control-image .upload-button,.customize-control-media .default-button,.customize-control-media .remove-button,.customize-control-media .upload-button,.customize-control-site_icon .default-button,.customize-control-site_icon .remove-button,.customize-control-site_icon .upload-button,.customize-control-upload .default-button,.customize-control-upload .remove-button,.customize-control-upload .upload-button{white-space:normal;width:48%;height:auto}.customize-control-background .current .container,.customize-control-cropped_image .current .container,.customize-control-header .current .container,.customize-control-image .current .container,.customize-control-media .current .container,.customize-control-site_icon .current .container,.customize-control-upload .current .container{overflow:hidden;border:1px solid #eee;-webkit-border-radius:2px;border-radius:2px}.customize-control-background .current .container,.customize-control-cropped_image .current .container,.customize-control-image .current .container,.customize-control-media .current .container,.customize-control-site_icon .current .container,.customize-control-upload .current .container{min-height:40px}.customize-control-background .placeholder,.customize-control-cropped_image .placeholder,.customize-control-header .placeholder,.customize-control-image .placeholder,.customize-control-media .placeholder,.customize-control-site_icon .placeholder,.customize-control-upload .placeholder{width:100%;position:relative;text-align:center;cursor:default;border:1px dashed #b4b9be;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;min-height:40px}.customize-control-background .inner,.customize-control-cropped_image .inner,.customize-control-header .inner,.customize-control-image .inner,.customize-control-media .inner,.customize-control-site_icon .inner,.customize-control-upload .inner{display:none;position:absolute;width:100%;color:#555;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.customize-control-background .inner,.customize-control-cropped_image .inner,.customize-control-image .inner,.customize-control-media .inner,.customize-control-site_icon .inner,.customize-control-upload .inner{display:block;min-height:40px}.customize-control-background .inner,.customize-control-cropped_image .inner,.customize-control-header .inner,.customize-control-header .inner .dashicons,.customize-control-image .inner,.customize-control-media .inner,.customize-control-site_icon .inner,.customize-control-upload .inner{line-height:20px;top:8px}.customize-control-header .list .inner,.customize-control-header .list .inner .dashicons{top:9px}.customize-control-header .header-view{position:relative;width:100%;margin-bottom:5px}.customize-control-header .header-view:last-child{margin-bottom:0}.customize-control-header .header-view:after{border:0}.customize-control-header .header-view.selected:after{content:'';position:absolute;height:auto;top:0;left:0;bottom:0;right:0;border:4px solid #00a0d2;-webkit-border-radius:2px;border-radius:2px}.customize-control-header .header-view.button.selected{border:0}.customize-control-header .uploaded .header-view .close{font-size:20px;color:#fff;background:#555;background:rgba(0,0,0,.5);position:absolute;top:10px;right:-999px;z-index:1;width:26px;height:26px;cursor:pointer}.customize-control-header .header-view .close:focus,.customize-control-header .header-view:hover .close{right:10px}.customize-control-header .random.placeholder{cursor:pointer;-webkit-border-radius:2px;border-radius:2px;height:40px}.customize-control-header button.random{width:100%;height:auto;min-height:40px;white-space:normal}.customize-control-header button.random .dice{margin-top:4px}.customize-control-header .header-view:hover>button.random .dice,.customize-control-header .placeholder:hover .dice{-webkit-animation:dice-color-change 3s infinite;animation:dice-color-change 3s infinite}@-webkit-keyframes dice-color-change{0%,100%{color:#d4b146}50%{color:#ef54b0}75%{color:#7190d3}}@keyframes dice-color-change{0%,100%{color:#d4b146}50%{color:#ef54b0}75%{color:#7190d3}}.customize-control-header .choice{position:relative;display:block;margin-bottom:9px}.customize-control-header .uploaded div:last-child>.choice{margin-bottom:0}.customize-control-background img,.customize-control-cropped_image img,.customize-control-header img,.customize-control-image img,.customize-control-media img,.customize-control-upload img{width:100%;-webkit-border-radius:2px;border-radius:2px}.customize-control-background .default-button,.customize-control-background .remove-button,.customize-control-cropped_image .default-button,.customize-control-cropped_image .remove-button,.customize-control-header .remove,.customize-control-image .default-button,.customize-control-image .remove-button,.customize-control-media .default-button,.customize-control-media .remove-button,.customize-control-site_icon .default-button,.customize-control-site_icon .remove-button,.customize-control-upload .default-button,.customize-control-upload .remove-button{float:left;margin-right:3px}.customize-control-background .upload-button,.customize-control-cropped_image .upload-button,.customize-control-header .new,.customize-control-image .upload-button,.customize-control-media .upload-button,.customize-control-site_icon .upload-button,.customize-control-upload .upload-button{float:right}@-webkit-keyframes customize-reload{0%{opacity:0}100%{opacity:1}}@keyframes customize-reload{0%{opacity:0}100%{opacity:1}}.wp-customizer .customize-loading #customize-container{display:block;-webkit-animation:customize-reload .75s;animation:customize-reload .75s}.control-section-themes .accordion-section-title{cursor:default;margin:15px 0;padding-right:100px}#customize-theme-controls .control-section-themes .accordion-section-title:focus,#customize-theme-controls .control-section-themes .accordion-section-title:hover{color:#555;background-color:#fff}.customize-themes-panel .accordion-section-title{margin:15px -8px}#customize-controls .customize-section-title span.customize-action,.control-section-themes .accordion-section-title span.customize-action{font-size:13px;display:block;font-weight:400}.control-section-themes .accordion-section-title .change-theme,.control-section-themes .accordion-section-title .customize-theme{position:absolute;right:10px;top:50%;margin-top:-14px;font-weight:400}.control-section-themes .accordion-section-title:before{display:none}.customize-themes-panel{display:none;padding:0 8px;background:#f1f1f1;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.customize-themes-panel .accordion-section-title:first-child{margin-top:0}#customize-controls .customize-themes-panel .accordion-section-title:nth-child(2){font-size:14px;font-weight:600}.customize-themes-panel>h2{padding:15px 8px 0}.control-section.open .customize-themes-panel{display:block}#customize-theme-controls .customize-themes-panel .accordion-section-content{background:0 0;display:block}.customize-control.customize-control-theme{margin-bottom:8px}#customize-theme-controls .themes.accordion-section-content{position:relative;left:0;padding:0;width:100%}.wp-customizer .theme-browser .themes{padding-bottom:8px}.wp-customizer .theme-browser .theme{margin:0;width:100%}.wp-customizer .theme-browser .theme .theme-actions{-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";opacity:1}#customize-controls h3.theme-name{font-size:15px}#customize-controls .theme-overlay .theme-name{font-size:32px}.wp-customizer #themes-filter{font-size:16px;font-weight:300;line-height:1.5;width:100%}#accordion-section-themes .accordion-section-title:after{display:none}#customize-theme-controls .control-section-themes.current-panel>h3.accordion-section-title{left:0}.customize-themes-panel.control-panel-content{position:absolute;left:-100%;top:0;width:100%;border-top:1px solid #ddd}.in-themes-panel #customize-info,.in-themes-panel #customize-theme-controls>ul>.accordion-section{left:100%}.wp-customizer .theme-overlay{display:none}.wp-customizer.modal-open .theme-overlay{position:fixed;left:0;top:0;right:0;bottom:0;z-index:109}.wp-customizer .theme-overlay .theme-backdrop{background:rgba(238,238,238,.75);position:fixed;z-index:110}.wp-customizer .theme-overlay .theme-wrap{left:90px;right:90px;top:45px;bottom:45px;z-index:120;max-width:1740px}.wp-customizer .theme-overlay .theme-actions{text-align:right}.modal-open .in-themes-panel #customize-controls .wp-full-overlay-sidebar-content{overflow:visible}.ie8 .wp-customizer .theme-overlay .theme-about,.ie8 .wp-customizer .theme-overlay .theme-actions,.ie8 .wp-customizer .theme-overlay .theme-header{position:static}@media (max-width:850px),(max-height:472px){.wp-customizer .theme-overlay .theme-wrap{left:0;right:0;top:0;bottom:0}}body.cheatin{font-size:medium;height:auto;background:#fff;margin:50px auto 2em;padding:1em 2em;max-width:700px;min-width:0;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.13);box-shadow:0 1px 3px rgba(0,0,0,.13)}body.cheatin h1{border-bottom:1px solid #ddd;clear:both;color:#666;font:24px "Open Sans",sans-serif;margin:30px 0 0;padding:0 0 7px}body.cheatin p{font-size:14px;line-height:1.5;margin:25px 0 20px}#customize-theme-controls .add-new-menu-item,#customize-theme-controls .add-new-widget{cursor:pointer;float:right;margin-left:10px;-webkit-transition:all .2s;transition:all .2s;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;outline:0}.reordering .add-new-menu-item,.reordering .add-new-widget{opacity:.2;pointer-events:none;cursor:not-allowed}.add-new-menu-item:before,.add-new-widget:before{content:"\f132";display:inline-block;position:relative;left:-2px;top:-1px;font:400 20px/1 dashicons;vertical-align:middle;-webkit-transition:all .2s;transition:all .2s;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.reorder-toggle{color:#0073aa;float:right;padding:5px 8px;text-decoration:none;cursor:pointer;outline:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.reorder-toggle:hover{color:#00a0d2}.reorder-toggle:focus{outline:dotted 1px}.reorder,.reordering .reorder-done{display:block;padding:5px 8px}.reorder-done,.reordering .reorder{display:none;color:#0073aa}.reorder-toggle:active .reorder-done,.reorder-toggle:focus .reorder-done,.reorder-toggle:hover .reorder-done{color:#00a0d2}.menu-item-reorder-nav button,.widget-reorder-nav span{position:relative;overflow:hidden;float:left;display:block;width:33px;height:43px;color:#82878c;text-indent:-9999px;cursor:pointer;outline:0}.menu-item-reorder-nav button{width:30px;height:40px;background:0 0;border:none;-webkit-box-shadow:none;box-shadow:none}.menu-item-reorder-nav button:before,.widget-reorder-nav span:before{display:inline-block;position:absolute;top:0;right:0;width:100%;height:100%;font:400 20px/43px dashicons;text-align:center;text-indent:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#available-menu-items .customize-section-title,#available-widgets .customize-section-title,.customize-controls-preview-toggle{display:none}.menu-item-reorder-nav button:focus,.menu-item-reorder-nav button:hover,.widget-reorder-nav span:focus,.widget-reorder-nav span:hover{color:#191e23;background:#eee}.menus-move-down:before,.move-widget-down:before{content:"\f347"}.menus-move-up:before,.move-widget-up:before{content:"\f343"}#customize-theme-controls .first-widget .move-widget-up,#customize-theme-controls .last-widget .move-widget-down,.move-down-disabled .menus-move-down,.move-left-disabled .menus-move-left,.move-right-disabled .menus-move-right,.move-up-disabled .menus-move-up{color:#d5d5d5;background-color:#fff;cursor:default;pointer-events:none}.wp-full-overlay-main{right:auto;width:100%}.add-menu-toggle.open,.add-menu-toggle.open:hover,.adding-menu-items .add-new-menu-item,.adding-menu-items .add-new-menu-item:hover,body.adding-widget .add-new-widget,body.adding-widget .add-new-widget:hover{background:#eee;border-color:#929793;color:#32373c;-webkit-box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5);box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5)}#accordion-section-add_menu .add-new-menu-item.open:before,.adding-menu-items .add-new-menu-item:before,body.adding-widget .add-new-widget:before{-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg)}#available-menu-items,#available-widgets{position:absolute;top:0;bottom:0;left:-301px;visibility:hidden;overflow-x:hidden;overflow-y:auto;width:300px;margin:0;z-index:4;background:#eee;-webkit-transition:left .18s;transition:left .18s;border-right:1px solid #ddd}#available-widgets-list{top:60px;position:absolute;overflow:auto;bottom:0;width:100%}#available-widgets-filter{position:fixed;top:0;z-index:1;width:300px;background:#eee;border-bottom:1px solid #e5e5e5}#available-menu-items-search .accordion-section-title,#available-widgets-filter{padding:12px 15px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#available-menu-items-search input,#available-widgets-filter input{padding:6px 10px;width:100%}#available-menu-items .item-top,#available-menu-items .item-top:hover,#available-widgets .widget-top,#available-widgets .widget-top:hover{border:none;background:0 0;-webkit-box-shadow:none;box-shadow:none}#available-menu-items .item-tpl,#available-widgets .widget-tpl{position:relative;padding:20px 15px 20px 60px;background:#fff;border-bottom:1px solid #e5e5e5;cursor:pointer;display:none}#available-menu-items .item,#available-widgets .widget{position:static}@media only screen and (max-width:782px){.wp-customizer .theme:not(.active):focus .theme-actions,.wp-customizer .theme:not(.active):hover .theme-actions{display:block}.wp-customizer .theme-browser .theme.active .theme-name span{display:inline}.customize-control-checkbox label,.customize-control-nav_menu_auto_add label,.customize-control-radio label{margin-left:32px}.customize-control-checkbox input,.customize-control-nav_menu_auto_add input,.customize-control-radio input{margin-left:-32px}.customize-control input[type=radio]+label,.customize-control input[type=checkbox]+label{line-height:32px}}@media screen and (max-width:640px){#customize-controls{width:100%}.wp-full-overlay.collapsed #customize-controls,.wp-full-overlay.expanded{margin-left:0}.wp-full-overlay-sidebar .wp-full-overlay-sidebar-content{bottom:0}.customize-controls-preview-toggle{display:block;position:absolute;top:0;left:48px;line-height:45px;font-size:14px;padding:0 12px;margin:0;height:45px;background:#eee;border-right:1px solid #ddd;color:#444;cursor:pointer;-webkit-transition:color .1s ease-in-out,background .1s ease-in-out;transition:color .1s ease-in-out,background .1s ease-in-out}#customize-footer-actions,#customize-preview,.customize-controls-preview-toggle .controls,.preview-only .customize-controls-preview-toggle .preview,.preview-only .wp-full-overlay-sidebar-content{display:none}.customize-controls-preview-toggle .controls:before,.customize-controls-preview-toggle .preview:before{font:400 20px/1 dashicons;content:"\f177";position:relative;top:4px;margin-right:6px}.customize-controls-preview-toggle .controls:before{content:"\f540"}.preview-only #customize-controls{height:45px}.preview-only #customize-preview,.preview-only .customize-controls-preview-toggle .controls{display:block}#customize-preview{top:45px;bottom:0;height:auto}.wp-core-ui.wp-customizer .button{padding:6px 14px;line-height:normal;font-size:14px;vertical-align:middle;height:auto;margin-bottom:4px}#customize-header-actions .button-primary{margin-top:6px}body.adding-menu-items div#available-menu-items,body.adding-widget div#available-widgets{top:46px;left:0;z-index:10;width:100%}#available-menu-items .customize-section-title,#available-widgets .customize-section-title{display:block;margin:0}#available-menu-items .customize-section-back,#available-widgets .customize-section-back{height:69px}#available-menu-items .customize-section-title h3,#available-widgets .customize-section-title h3{font-size:20px;font-weight:200;padding:9px 10px 12px 14px;margin:0;line-height:24px;color:#555;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}#available-menu-items .customize-section-title .customize-action,#available-widgets .customize-section-title .customize-action{font-size:13px;display:block;font-weight:400;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}#available-widgets-filter{position:relative;width:100%;background:#fff;height:auto;padding:10px 15px}#available-widgets-list{top:140px}} \ No newline at end of file diff --git a/wp-admin/css/customize-nav-menus-rtl.css b/wp-admin/css/customize-nav-menus-rtl.css new file mode 100644 index 0000000..8653e36 --- /dev/null +++ b/wp-admin/css/customize-nav-menus-rtl.css @@ -0,0 +1,849 @@ +#accordion-section-menu_locations { + position: relative; + margin-bottom: 15px; +} + +.menu-in-location, +.menu-in-locations { + display: block; + font-weight: 600; + font-size: 10px; +} + +#customize-controls .theme-location-set, +#customize-controls .control-section .accordion-section-title:focus .menu-in-location, +#customize-controls .control-section .accordion-section-title:hover .menu-in-location { + color: #555; +} + +.wp-customizer .menu-item-bar .menu-item-handle, +.wp-customizer .menu-item-settings, +.wp-customizer .menu-item-settings .description-thin { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + +.wp-customizer .menu-item-bar { + margin: 0; +} + +.wp-customizer .menu-item-bar .menu-item-handle { + width: 100%; + background: #fff; +} + +.wp-customizer .menu-item-handle .item-title { + margin-left: 0; +} + +.wp-customizer .menu-item-handle .item-type { + padding: 1px 5px 0 21px; + float: left; + text-align: left; +} + +.wp-customizer .menu-item-settings { + max-width: 100%; + overflow: hidden; + padding: 10px; + background: #eee; + border: 1px solid #999; + border-top: none; +} + +.wp-customizer .menu-item-settings .description-thin { + width: 100%; + height: auto; + margin: 0 0 8px 0; +} + +.wp-customizer .menu-item-settings input[type="text"] { + width: 100%; +} + +.wp-customizer .menu-item-settings .submitbox { + margin: 0; + padding: 0; +} + +.wp-customizer .menu-item-settings .link-to-original { + padding: 5px 0; + border: none; + font-style: normal; + margin: 0; + width: 100%; +} + +.wp-customizer .menu-item .submitbox .submitdelete { + float: right; + margin: 6px 0 0; + padding: 0; + cursor: pointer; +} + + +/** + * Menu items reordering styles + */ + +.menu-item-reorder-nav { + display: none; + background-color: #fff; + position: absolute; + top: 0; + left: 0; +} + +.menus-move-left:before { + content: "\f345"; +} + +.menus-move-right:before { + content: "\f341"; +} + +.reordering .menu-item .item-controls, +.reordering .menu-item .item-type { + display: none; +} + +.reordering .menu-item-reorder-nav { + display: block; +} + +.customize-control input.menu-name-field { + width: 100%; /* Override the 98% default for customizer inputs, to align with the size of menu items. */ + margin: 12px 0; +} + +.wp-customizer .menu-item .item-edit { + position: absolute; + left: -19px; + top: 2px; + display: block; + width: 30px; + height: 38px; + margin-left: 0 !important; + -webkit-box-shadow: none; + box-shadow: none; + outline: none; + overflow: hidden; + cursor: pointer; +} + +.wp-customizer .menu-item.menu-item-edit-active .item-edit .toggle-indicator:after { + content: "\f142"; +} + +.wp-customizer .menu-item-settings p.description { + font-style: normal; +} + +.wp-customizer .menu-settings dl { + margin: 12px 0 0 0; + padding: 0; +} + +.wp-customizer .menu-settings .checkbox-input { + margin-top: 8px; +} + +.wp-customizer .menu-settings .menu-theme-locations { + border-top: 1px solid #ccc; +} + +.wp-customizer .menu-settings { + margin-top: 36px; + border-top: none; +} + +.menu-settings .customize-control-checkbox label { + line-height: 1; +} + +/* @todo update selector or potentially remove */ +.menu-settings .customize-control.customize-control-checkbox { + margin-bottom: 8px; /* Override collapsing at smaller viewports. */ +} + +.customize-control-menu { + margin-top: 4px; +} + +#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle { + color: #555; +} + +/* Screen Options */ +.customize-screen-options-toggle { + background: none; + border: none; + color: #555; + cursor: pointer; + margin: 0; + padding: 20px; + position: absolute; + left: 0; + top: 30px; +} + +#customize-controls .customize-info .customize-help-toggle { + padding: 20px; +} + +#customize-controls .customize-info .customize-help-toggle:before { + padding: 4px; +} + +.customize-screen-options-toggle:hover, +.customize-screen-options-toggle:active, +.customize-screen-options-toggle:focus, +.active-menu-screen-options .customize-screen-options-toggle, +#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:hover, +#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:active, +#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:focus { + color: #0073aa; +} + +.customize-screen-options-toggle:focus, +#customize-controls .customize-info .customize-help-toggle:focus { + outline: none; +} + +.customize-screen-options-toggle:before { + -moz-osx-font-smoothing: grayscale; + border: none; + content: "\f111"; + display: block; + font: 18px/1 dashicons; + padding: 5px; + text-align: center; + text-decoration: none !important; + text-indent: 0; + right: 6px; + position: absolute; + top: 6px; +} + +.customize-screen-options-toggle:focus:before, +#customize-controls .customize-info .customize-help-toggle:focus:before { + -webkit-border-radius: 100%; + border-radius: 100%; +} + +.wp-customizer #screen-options-wrap { + display: none; + background: #fff; + border-top: 1px solid #ddd; + padding: 4px 15px 15px; +} + +.wp-customizer .metabox-prefs label { + display: block; + padding-left: 0; + line-height: 30px; +} + +/* rework the arrow indicator implementation for NVDA bug same as #32715 */ +.wp-customizer .toggle-indicator { + display: inline-block; + font-size: 20px; + line-height: 1; + text-indent: -1px; /* account for the dashicon alignment */ +} + +.rtl .wp-customizer .toggle-indicator { + text-indent: 1px; /* account for the dashicon alignment */ +} + +.wp-customizer .toggle-indicator:after { + content: "\f140"; + speak: none; + vertical-align: top; + -webkit-border-radius: 50%; + border-radius: 50%; + color: #72777c; + font: normal 20px/1 dashicons; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + text-decoration: none !important; +} + +#accordion-panel-nav_menus .field-link-target, +#accordion-panel-nav_menus .field-title-attribute, +#accordion-panel-nav_menus .field-css-classes, +#accordion-panel-nav_menus .field-xfn, +#accordion-panel-nav_menus .field-description { + display: none; +} + +#accordion-panel-nav_menus.field-link-target-active .field-link-target, +#accordion-panel-nav_menus.field-title-attribute-active .field-title-attribute, +#accordion-panel-nav_menus.field-css-classes-active .field-css-classes, +#accordion-panel-nav_menus.field-xfn-active .field-xfn, +#accordion-panel-nav_menus.field-description-active .field-description { + display: block; +} + +/* WARNING: The 20px factor is hard-coded in JS. */ +.menu-item-depth-0 { margin-right: 0; } +.menu-item-depth-1 { margin-right: 20px; } +.menu-item-depth-2 { margin-right: 40px; } +.menu-item-depth-3 { margin-right: 60px; } +.menu-item-depth-4 { margin-right: 80px; } +.menu-item-depth-5 { margin-right: 100px; } +.menu-item-depth-6 { margin-right: 120px; } +.menu-item-depth-7 { margin-right: 140px; } +.menu-item-depth-8 { margin-right: 160px; } /* Not likely to be used or useful beyond this depth */ +.menu-item-depth-9 { margin-right: 180px; } +.menu-item-depth-10 { margin-right: 200px; } +.menu-item-depth-11 { margin-right: 220px; } + +/* @todo handle .menu-item-settings width */ +.menu-item-depth-0 > .menu-item-bar { margin-left: 0; } +.menu-item-depth-1 > .menu-item-bar { margin-left: 20px; } +.menu-item-depth-2 > .menu-item-bar { margin-left: 40px; } +.menu-item-depth-3 > .menu-item-bar { margin-left: 60px; } +.menu-item-depth-4 > .menu-item-bar { margin-left: 80px; } +.menu-item-depth-5 > .menu-item-bar { margin-left: 100px; } +.menu-item-depth-6 > .menu-item-bar { margin-left: 120px; } +.menu-item-depth-7 > .menu-item-bar { margin-left: 140px; } +.menu-item-depth-8 > .menu-item-bar { margin-left: 160px; } +.menu-item-depth-9 > .menu-item-bar { margin-left: 180px; } +.menu-item-depth-10 > .menu-item-bar { margin-left: 200px; } +.menu-item-depth-11 > .menu-item-bar { margin-left: 220px; } + +/* Submenu left margin. */ +.menu-item-depth-0 .menu-item-transport { margin-right: 0; } +.menu-item-depth-1 .menu-item-transport { margin-right: -20px; } +.menu-item-depth-3 .menu-item-transport { margin-right: -60px; } +.menu-item-depth-4 .menu-item-transport { margin-right: -80px; } +.menu-item-depth-2 .menu-item-transport { margin-right: -40px; } +.menu-item-depth-5 .menu-item-transport { margin-right: -100px; } +.menu-item-depth-6 .menu-item-transport { margin-right: -120px; } +.menu-item-depth-7 .menu-item-transport { margin-right: -140px; } +.menu-item-depth-8 .menu-item-transport { margin-right: -160px; } +.menu-item-depth-9 .menu-item-transport { margin-right: -180px; } +.menu-item-depth-10 .menu-item-transport { margin-right: -200px; } +.menu-item-depth-11 .menu-item-transport { margin-right: -220px; } + +/* WARNING: The 20px factor is hard-coded in JS. */ +.reordering .menu-item-depth-0 { margin-right: 0; } +.reordering .menu-item-depth-1 { margin-right: 15px; } +.reordering .menu-item-depth-2 { margin-right: 30px; } +.reordering .menu-item-depth-3 { margin-right: 45px; } +.reordering .menu-item-depth-4 { margin-right: 60px; } +.reordering .menu-item-depth-5 { margin-right: 75px; } +.reordering .menu-item-depth-6 { margin-right: 90px; } +.reordering .menu-item-depth-7 { margin-right: 105px; } +.reordering .menu-item-depth-8 { margin-right: 120px; } /* Not likely to be used or useful beyond this depth */ +.reordering .menu-item-depth-9 { margin-right: 135px; } +.reordering .menu-item-depth-10 { margin-right: 150px; } +.reordering .menu-item-depth-11 { margin-right: 165px; } + +.reordering .menu-item-depth-0 > .menu-item-bar { margin-left: 0; } +.reordering .menu-item-depth-1 > .menu-item-bar { margin-left: 15px; } +.reordering .menu-item-depth-2 > .menu-item-bar { margin-left: 30px; } +.reordering .menu-item-depth-3 > .menu-item-bar { margin-left: 45px; } +.reordering .menu-item-depth-4 > .menu-item-bar { margin-left: 60px; } +.reordering .menu-item-depth-5 > .menu-item-bar { margin-left: 75px; } +.reordering .menu-item-depth-6 > .menu-item-bar { margin-left: 90px; } +.reordering .menu-item-depth-7 > .menu-item-bar { margin-left: 105px; } +.reordering .menu-item-depth-8 > .menu-item-bar { margin-left: 120px; } +.reordering .menu-item-depth-9 > .menu-item-bar { margin-left: 135px; } +.reordering .menu-item-depth-10 > .menu-item-bar { margin-left: 150px; } +.reordering .menu-item-depth-11 > .menu-item-bar { margin-left: 165px; } + +.control-section-nav_menu .menu .menu-item-edit-active { + margin-right: 0; +} + +.control-section-nav_menu .menu .menu-item-edit-active .menu-item-bar { + margin-left: 0; +} + +.control-section-nav_menu .menu .sortable-placeholder { + margin-top: 0; + margin-bottom: 1px; + max-width: -webkit-calc(100% - 2px); + max-width: calc(100% - 2px); + float: right; + display: list-item; + border-color: #a0a5aa; +} + +.menu-item-transport li.customize-control { + float: none; +} + +.control-section-nav_menu .menu ul.menu-item-transport .menu-item-bar { + margin-top: 0; +} + +/** + * Add-menu-items mode + */ + +.adding-menu-items .control-section { + opacity: .4; +} + +.adding-menu-items .control-panel.control-section, +.adding-menu-items .control-section.open { + opacity: 1; +} + +.menu-item-bar .item-delete { + color: #a00; + position: absolute; + top: 2px; + left: -19px; + width: 30px; + height: 38px; + cursor: pointer; + display: none; +} + +.menu-item-bar .item-delete:before { + content: "\f335"; + position: absolute; + top: 9px; + right: 5px; + -webkit-border-radius: 50%; + border-radius: 50%; + font: normal 20px/1 dashicons; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.ie8 .menu-item-bar .item-delete:before { + top: -10px; +} + +.menu-item-bar .item-delete:hover, +.menu-item-bar .item-delete:focus { + -webkit-box-shadow: none; + box-shadow: none; + outline: none; + color: #f00; +} + +.adding-menu-items .menu-item-bar .item-edit { + display: none; +} + +.adding-menu-items .menu-item-bar .item-delete { + display: block; +} + +/** + * Styles for menu-item addition panel + */ + +#available-menu-items.opening { + overflow-y: hidden; /* avoid scrollbar jitter with animating heights */ +} + +#available-menu-items #available-menu-items-search.open { + height: 100%; + border-bottom: none; +} + +#available-menu-items .accordion-section-title { + border-right: none; + border-left: none; + background: #fff; + -webkit-transition: background-color 0.15s; + transition: background-color 0.15s; +} + +#available-menu-items .open .accordion-section-title, +#available-menu-items #available-menu-items-search .accordion-section-title { + background: #eee; +} + +/* rework the arrow indicator implementation for NVDA bug see #32715 */ +#available-menu-items .accordion-section-title:after { + content: none !important; +} + +#available-menu-items .accordion-section-title:hover .toggle-indicator:after, +#available-menu-items .button-link:hover .toggle-indicator:after, +#available-menu-items .button-link:focus .toggle-indicator:after { + color: #23282d; +} + +#available-menu-items .open .accordion-section-title .toggle-indicator:after { + content: "\f142"; + color: #23282d; +} + +#available-menu-items .accordion-section-content { + overflow-y: auto; + max-height: 200px; /* This gets set in JS to fit the screen size, and based on # of sections. */ + background: transparent; +} + +#available-menu-items .accordion-section-title button { + display: block; + width: 28px; + height: 35px; + position: absolute; + top: 5px; + left: 5px; + -webkit-box-shadow: none; + box-shadow: none; + outline: none; + cursor: pointer; +} + +#available-menu-items .accordion-section-title .no-items, +#available-menu-items .cannot-expand .accordion-section-title .spinner, +#available-menu-items .cannot-expand .accordion-section-title > button { + display: none; +} + +#available-menu-items-search.cannot-expand .accordion-section-title .spinner { + display: block; +} + +#available-menu-items .cannot-expand .accordion-section-title .no-items { + float: left; + color: #555d66; + font-weight: normal; + margin-right: 5px; +} + +#available-menu-items .accordion-section-content { + padding: 1px 15px 15px 15px; + margin: 0; + max-height: 290px; +} + +#available-menu-items .menu-item-tpl { + margin: 0; +} + +#custom-menu-item-name.invalid, +#custom-menu-item-url.invalid, +.menu-name-field.invalid, +.menu-name-field.invalid:focus { + border: 1px solid #f00; +} + +#available-menu-items .menu-item-handle .item-type { + padding-left: 0; +} + +#available-menu-items .menu-item-handle .item-title { + padding-right: 20px; +} + +#available-menu-items .menu-item-handle { + cursor: pointer; +} + +#available-menu-items .menu-item-handle { + -webkit-box-shadow: none; + box-shadow: none; + margin-top: -1px; +} + +#available-menu-items .menu-item-handle:hover { + z-index: 1; +} + +#available-menu-items .item-title h4 { + padding: 0 0 5px; + font-size: 14px; +} + +#available-menu-items .item-add { + position: absolute; + top: 1px; + right: 1px; + color: #82878c; + width: 30px; + height: 38px; + -webkit-box-shadow: none; + box-shadow: none; + outline: none; + cursor: pointer; +} + +#available-menu-items .menu-item-handle .item-add:focus { + color: #23282d; +} + +#available-menu-items .item-add:before { + content: "\f543"; + position: relative; + right: 2px; + top: 3px; + display: inline-block; + height: 20px; + -webkit-border-radius: 50%; + border-radius: 50%; + font: normal 20px/1.05 dashicons; /* line height is to account for the dashicon's vertical alignment */ +} + +#available-menu-items .menu-item-handle.item-added .item-type, +#available-menu-items .menu-item-handle.item-added .item-title, +#available-menu-items .menu-item-handle.item-added:hover .item-add, +#available-menu-items .menu-item-handle.item-added .item-add:focus { + color: #82878c; +} + +#available-menu-items .menu-item-handle.item-added .item-add:before { + content: "\f147"; +} + +#available-menu-items .accordion-section-title.loading .spinner, +#available-menu-items-search.loading .accordion-section-title .spinner { + visibility: visible; + margin: 0 20px; +} + +#available-menu-items-search .clear-results { + position: absolute; + top: 20px; + left: 20px; + width: 20px; + height: 20px; + cursor: pointer; + color: #a00; + text-decoration: none; +} + +#available-menu-items-search .clear-results, +#available-menu-items-search.loading .clear-results.is-visible { + display: none; +} + +#available-menu-items-search .clear-results.is-visible { + display: block; +} + +#available-menu-items-search .clear-results:before { + content: "\f335"; + font: normal 20px/1 dashicons; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +#available-menu-items-search .clear-results:hover, +#available-menu-items-search .clear-results:focus { + color: #f00; +} + +#available-menu-items-search .spinner { + position: absolute; + top: 20px; + margin: 0 !important; + left: 20px; +} + +/* search results list */ +#available-menu-items #available-menu-items-search .accordion-section-content { + position: absolute; + right: 1px; + top: 60px; /* below title div / search input */ + bottom: 0px; /* 100% height that still triggers lazy load */ + max-height: none; + width: 100%; + padding: 1px 15px 15px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + +#available-menu-items-search .accordion-section-title:after { + display: none; +} + +#available-menu-items-search .accordion-section-content:empty { + min-height: 0; + padding: 0; +} + +#available-menu-items-search.loading .accordion-section-content div { + opacity: .5; +} + +#available-menu-items-search.loading.loading-more .accordion-section-content div { + opacity: 1; +} + +#customize-preview { + -webkit-transition: all 0.2s; + transition: all 0.2s; +} + +body.adding-menu-items #available-menu-items { + right: 0; + visibility: visible; +} + +body.adding-menu-items .wp-full-overlay-main { + right: 300px; +} + +body.adding-menu-items #customize-preview { + opacity: 0.4; +} + +.menu-item-handle .spinner { + display: none; + float: right; + margin: 0 0 0 8px; +} + +.nav-menu-inserted-item-loading .spinner { + display: block; +} + +.nav-menu-inserted-item-loading .menu-item-handle .item-type { + padding: 0 8px 0 0; +} + +.nav-menu-inserted-item-loading .menu-item-handle, +.added-menu-item .menu-item-handle.loading { + padding: 10px 8px 10px 15px; + cursor: default; + opacity: .5; + background: #fff; + color: #727773; +} + +.added-menu-item .menu-item-handle { + -webkit-transition-property: opacity, background, color; + transition-property: opacity, background, color; + -webkit-transition-duration: 1.25s; + transition-duration: 1.25s; + -webkit-transition-timing-function: cubic-bezier( .25, -2.5, .75, 8 ); + transition-timing-function: cubic-bezier( .25, -2.5, .75, 8 ); /* Replacement for .hide().fadeIn('slow') in JS to add emphasis when it's loaded. */ +} + +/* Add/delete Menus */ + +/* @todo update selector */ +#accordion-section-add_menu { + margin: 15px 12px; +} + +.new-menu-section-content { + display: none; + padding: 15px 0 0 0; + clear: both; +} + +/* @todo update selector */ +#accordion-section-add_menu .accordion-section-title { + padding-right: 45px; +} + +/* @todo update selector */ +#accordion-section-add_menu .accordion-section-title:before { + font: normal 20px/1 dashicons; + position: absolute; + top: 12px; + right: 14px; + content: "\f132"; +} + +#create-new-menu-submit { + float: left; + margin: 0 0 12px 0; +} + +.menu-delete-item { + float: right; + padding: 1em 0; + width: 100%; +} + +li.assigned-to-menu-location .menu-delete-item { + display: none; +} + +li.assigned-to-menu-location .add-new-menu-item { + margin-bottom: 1em; +} + +.menu-delete { + color: #a00; + cursor: pointer; + text-decoration: underline; +} + +.menu-delete:hover, +.menu-delete:focus { + color: #f00; + text-decoration: none; +} + +.menu-item-handle { + margin-top: -1px; +} +.ui-sortable-disabled .menu-item-handle { + cursor: default; +} + +.menu-item-handle:hover { + position: relative; + z-index: 10; + color: #0073aa; +} + +.menu-item-handle:hover .item-type, +.menu-item-handle:hover .item-edit, +#available-menu-items .menu-item-handle:hover .item-add { + color: #0073aa; +} + +.menu-item-edit-active .menu-item-handle { + border-color: #999; + border-bottom: none; +} + +.customize-control-nav_menu_item { + margin-bottom: 0; +} + +.customize-control-nav_menu { + margin-top: 12px; +} + +/** + * box-shadows + */ + +.wp-customizer .menu-item .submitbox .submitdelete:focus, +.customize-screen-options-toggle:focus:before, +#customize-controls .customize-info .customize-help-toggle:focus:before, +.wp-customizer button:focus .toggle-indicator:after, +#available-menu-items-search .clear-results:focus, +.menu-delete:focus, +.menu-item-bar .item-delete:focus:before, +#available-menu-items .item-add:focus:before { + -webkit-box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); + box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); +} + + +@media screen and ( max-width: 782px ) { + #available-menu-items #available-menu-items-search .accordion-section-content { + top: 63px; + } +} + +@media screen and ( max-width: 640px ) { + #available-menu-items #available-menu-items-search .accordion-section-content { + top: 133px; + } +} diff --git a/wp-admin/css/customize-nav-menus-rtl.min.css b/wp-admin/css/customize-nav-menus-rtl.min.css new file mode 100644 index 0000000..3f71b25 --- /dev/null +++ b/wp-admin/css/customize-nav-menus-rtl.min.css @@ -0,0 +1 @@ +#accordion-section-menu_locations{position:relative;margin-bottom:15px}.menu-in-location,.menu-in-locations{display:block;font-weight:600;font-size:10px}#customize-controls .control-section .accordion-section-title:focus .menu-in-location,#customize-controls .control-section .accordion-section-title:hover .menu-in-location,#customize-controls .theme-location-set{color:#555}.wp-customizer .menu-item-bar .menu-item-handle,.wp-customizer .menu-item-settings,.wp-customizer .menu-item-settings .description-thin{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.wp-customizer .menu-item-bar{margin:0}.wp-customizer .menu-item-bar .menu-item-handle{width:100%;background:#fff}.wp-customizer .menu-item-handle .item-title{margin-left:0}.wp-customizer .menu-item-handle .item-type{padding:1px 5px 0 21px;float:left;text-align:left}.wp-customizer .menu-item-settings{max-width:100%;overflow:hidden;padding:10px;background:#eee;border:1px solid #999;border-top:none}.wp-customizer .menu-item-settings .description-thin{width:100%;height:auto;margin:0 0 8px}.wp-customizer .menu-item-settings input[type=text]{width:100%}.wp-customizer .menu-item-settings .submitbox{margin:0;padding:0}.wp-customizer .menu-item-settings .link-to-original{padding:5px 0;border:none;font-style:normal;margin:0;width:100%}.wp-customizer .menu-item .submitbox .submitdelete{float:right;margin:6px 0 0;padding:0;cursor:pointer}.menu-item-reorder-nav{display:none;background-color:#fff;position:absolute;top:0;left:0}.menus-move-left:before{content:"\f345"}.menus-move-right:before{content:"\f341"}.reordering .menu-item .item-controls,.reordering .menu-item .item-type{display:none}.reordering .menu-item-reorder-nav{display:block}.customize-control input.menu-name-field{width:100%;margin:12px 0}.wp-customizer .menu-item .item-edit{position:absolute;left:-19px;top:2px;display:block;width:30px;height:38px;margin-left:0!important;-webkit-box-shadow:none;box-shadow:none;outline:0;overflow:hidden;cursor:pointer}.wp-customizer .menu-item.menu-item-edit-active .item-edit .toggle-indicator:after{content:"\f142"}.wp-customizer .menu-item-settings p.description{font-style:normal}.wp-customizer .menu-settings dl{margin:12px 0 0;padding:0}.wp-customizer .menu-settings .checkbox-input{margin-top:8px}.wp-customizer .menu-settings .menu-theme-locations{border-top:1px solid #ccc}.wp-customizer .menu-settings{margin-top:36px;border-top:none}.menu-settings .customize-control-checkbox label{line-height:1}.menu-settings .customize-control.customize-control-checkbox{margin-bottom:8px}.customize-control-menu{margin-top:4px}#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle{color:#555}.customize-screen-options-toggle{background:0 0;border:none;color:#555;cursor:pointer;margin:0;padding:20px;position:absolute;left:0;top:30px}#customize-controls .customize-info .customize-help-toggle{padding:20px}#customize-controls .customize-info .customize-help-toggle:before{padding:4px}#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:active,#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:focus,#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:hover,.active-menu-screen-options .customize-screen-options-toggle,.customize-screen-options-toggle:active,.customize-screen-options-toggle:focus,.customize-screen-options-toggle:hover{color:#0073aa}#customize-controls .customize-info .customize-help-toggle:focus,.customize-screen-options-toggle:focus{outline:0}.customize-screen-options-toggle:before{-moz-osx-font-smoothing:grayscale;border:none;content:"\f111";display:block;font:18px/1 dashicons;padding:5px;text-align:center;text-decoration:none!important;text-indent:0;right:6px;position:absolute;top:6px}#customize-controls .customize-info .customize-help-toggle:focus:before,.customize-screen-options-toggle:focus:before{-webkit-border-radius:100%;border-radius:100%}.wp-customizer #screen-options-wrap{display:none;background:#fff;border-top:1px solid #ddd;padding:4px 15px 15px}.wp-customizer .metabox-prefs label{display:block;padding-left:0;line-height:30px}.wp-customizer .toggle-indicator{display:inline-block;font-size:20px;line-height:1;text-indent:-1px}.rtl .wp-customizer .toggle-indicator{text-indent:1px}.wp-customizer .toggle-indicator:after{content:"\f140";speak:none;vertical-align:top;-webkit-border-radius:50%;border-radius:50%;color:#72777c;font:400 20px/1 dashicons;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important}#accordion-panel-nav_menus .field-css-classes,#accordion-panel-nav_menus .field-description,#accordion-panel-nav_menus .field-link-target,#accordion-panel-nav_menus .field-title-attribute,#accordion-panel-nav_menus .field-xfn{display:none}#accordion-panel-nav_menus.field-css-classes-active .field-css-classes,#accordion-panel-nav_menus.field-description-active .field-description,#accordion-panel-nav_menus.field-link-target-active .field-link-target,#accordion-panel-nav_menus.field-title-attribute-active .field-title-attribute,#accordion-panel-nav_menus.field-xfn-active .field-xfn{display:block}.menu-item-depth-0{margin-right:0}.menu-item-depth-1{margin-right:20px}.menu-item-depth-2{margin-right:40px}.menu-item-depth-3{margin-right:60px}.menu-item-depth-4{margin-right:80px}.menu-item-depth-5{margin-right:100px}.menu-item-depth-6{margin-right:120px}.menu-item-depth-7{margin-right:140px}.menu-item-depth-8{margin-right:160px}.menu-item-depth-9{margin-right:180px}.menu-item-depth-10{margin-right:200px}.menu-item-depth-11{margin-right:220px}.menu-item-depth-0>.menu-item-bar{margin-left:0}.menu-item-depth-1>.menu-item-bar{margin-left:20px}.menu-item-depth-2>.menu-item-bar{margin-left:40px}.menu-item-depth-3>.menu-item-bar{margin-left:60px}.menu-item-depth-4>.menu-item-bar{margin-left:80px}.menu-item-depth-5>.menu-item-bar{margin-left:100px}.menu-item-depth-6>.menu-item-bar{margin-left:120px}.menu-item-depth-7>.menu-item-bar{margin-left:140px}.menu-item-depth-8>.menu-item-bar{margin-left:160px}.menu-item-depth-9>.menu-item-bar{margin-left:180px}.menu-item-depth-10>.menu-item-bar{margin-left:200px}.menu-item-depth-11>.menu-item-bar{margin-left:220px}.menu-item-depth-0 .menu-item-transport{margin-right:0}.menu-item-depth-1 .menu-item-transport{margin-right:-20px}.menu-item-depth-3 .menu-item-transport{margin-right:-60px}.menu-item-depth-4 .menu-item-transport{margin-right:-80px}.menu-item-depth-2 .menu-item-transport{margin-right:-40px}.menu-item-depth-5 .menu-item-transport{margin-right:-100px}.menu-item-depth-6 .menu-item-transport{margin-right:-120px}.menu-item-depth-7 .menu-item-transport{margin-right:-140px}.menu-item-depth-8 .menu-item-transport{margin-right:-160px}.menu-item-depth-9 .menu-item-transport{margin-right:-180px}.menu-item-depth-10 .menu-item-transport{margin-right:-200px}.menu-item-depth-11 .menu-item-transport{margin-right:-220px}.reordering .menu-item-depth-0{margin-right:0}.reordering .menu-item-depth-1{margin-right:15px}.reordering .menu-item-depth-2{margin-right:30px}.reordering .menu-item-depth-3{margin-right:45px}.reordering .menu-item-depth-4{margin-right:60px}.reordering .menu-item-depth-5{margin-right:75px}.reordering .menu-item-depth-6{margin-right:90px}.reordering .menu-item-depth-7{margin-right:105px}.reordering .menu-item-depth-8{margin-right:120px}.reordering .menu-item-depth-9{margin-right:135px}.reordering .menu-item-depth-10{margin-right:150px}.reordering .menu-item-depth-11{margin-right:165px}.reordering .menu-item-depth-0>.menu-item-bar{margin-left:0}.reordering .menu-item-depth-1>.menu-item-bar{margin-left:15px}.reordering .menu-item-depth-2>.menu-item-bar{margin-left:30px}.reordering .menu-item-depth-3>.menu-item-bar{margin-left:45px}.reordering .menu-item-depth-4>.menu-item-bar{margin-left:60px}.reordering .menu-item-depth-5>.menu-item-bar{margin-left:75px}.reordering .menu-item-depth-6>.menu-item-bar{margin-left:90px}.reordering .menu-item-depth-7>.menu-item-bar{margin-left:105px}.reordering .menu-item-depth-8>.menu-item-bar{margin-left:120px}.reordering .menu-item-depth-9>.menu-item-bar{margin-left:135px}.reordering .menu-item-depth-10>.menu-item-bar{margin-left:150px}.reordering .menu-item-depth-11>.menu-item-bar{margin-left:165px}.control-section-nav_menu .menu .menu-item-edit-active{margin-right:0}.control-section-nav_menu .menu .menu-item-edit-active .menu-item-bar{margin-left:0}.control-section-nav_menu .menu .sortable-placeholder{margin-top:0;margin-bottom:1px;max-width:-webkit-calc(100% - 2px);max-width:calc(100% - 2px);float:right;display:list-item;border-color:#a0a5aa}.menu-item-transport li.customize-control{float:none}.control-section-nav_menu .menu ul.menu-item-transport .menu-item-bar{margin-top:0}.adding-menu-items .control-section{opacity:.4}.adding-menu-items .control-panel.control-section,.adding-menu-items .control-section.open{opacity:1}.menu-item-bar .item-delete{color:#a00;position:absolute;top:2px;left:-19px;width:30px;height:38px;cursor:pointer;display:none}.menu-item-bar .item-delete:before{content:"\f335";position:absolute;top:9px;right:5px;-webkit-border-radius:50%;border-radius:50%;font:400 20px/1 dashicons;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.ie8 .menu-item-bar .item-delete:before{top:-10px}.menu-item-bar .item-delete:focus,.menu-item-bar .item-delete:hover{-webkit-box-shadow:none;box-shadow:none;outline:0;color:red}.adding-menu-items .menu-item-bar .item-edit{display:none}.adding-menu-items .menu-item-bar .item-delete{display:block}#available-menu-items.opening{overflow-y:hidden}#available-menu-items #available-menu-items-search.open{height:100%;border-bottom:none}#available-menu-items .accordion-section-title{border-right:none;border-left:none;background:#fff;-webkit-transition:background-color .15s;transition:background-color .15s}#available-menu-items #available-menu-items-search .accordion-section-title,#available-menu-items .open .accordion-section-title{background:#eee}#available-menu-items .accordion-section-title:after{content:none!important}#available-menu-items .accordion-section-title:hover .toggle-indicator:after,#available-menu-items .button-link:focus .toggle-indicator:after,#available-menu-items .button-link:hover .toggle-indicator:after{color:#23282d}#available-menu-items .open .accordion-section-title .toggle-indicator:after{content:"\f142";color:#23282d}#available-menu-items .accordion-section-title button{display:block;width:28px;height:35px;position:absolute;top:5px;left:5px;-webkit-box-shadow:none;box-shadow:none;outline:0;cursor:pointer}#available-menu-items .accordion-section-title .no-items,#available-menu-items .cannot-expand .accordion-section-title .spinner,#available-menu-items .cannot-expand .accordion-section-title>button{display:none}#available-menu-items-search.cannot-expand .accordion-section-title .spinner{display:block}#available-menu-items .cannot-expand .accordion-section-title .no-items{float:left;color:#555d66;font-weight:400;margin-right:5px}#available-menu-items .accordion-section-content{overflow-y:auto;background:0 0;padding:1px 15px 15px;margin:0;max-height:290px}#available-menu-items .menu-item-tpl{margin:0}#custom-menu-item-name.invalid,#custom-menu-item-url.invalid,.menu-name-field.invalid,.menu-name-field.invalid:focus{border:1px solid red}#available-menu-items .menu-item-handle .item-type{padding-left:0}#available-menu-items .menu-item-handle .item-title{padding-right:20px}#available-menu-items .menu-item-handle{cursor:pointer;-webkit-box-shadow:none;box-shadow:none;margin-top:-1px}#available-menu-items .menu-item-handle:hover{z-index:1}#available-menu-items .item-title h4{padding:0 0 5px;font-size:14px}#available-menu-items .item-add{position:absolute;top:1px;right:1px;color:#82878c;width:30px;height:38px;-webkit-box-shadow:none;box-shadow:none;outline:0;cursor:pointer}#available-menu-items .menu-item-handle .item-add:focus{color:#23282d}#available-menu-items .item-add:before{content:"\f543";position:relative;right:2px;top:3px;display:inline-block;height:20px;-webkit-border-radius:50%;border-radius:50%;font:400 20px/1.05 dashicons}#available-menu-items .menu-item-handle.item-added .item-add:focus,#available-menu-items .menu-item-handle.item-added .item-title,#available-menu-items .menu-item-handle.item-added .item-type,#available-menu-items .menu-item-handle.item-added:hover .item-add{color:#82878c}#available-menu-items .menu-item-handle.item-added .item-add:before{content:"\f147"}#available-menu-items .accordion-section-title.loading .spinner,#available-menu-items-search.loading .accordion-section-title .spinner{visibility:visible;margin:0 20px}#available-menu-items-search .clear-results{position:absolute;top:20px;left:20px;width:20px;height:20px;cursor:pointer;color:#a00;text-decoration:none}#available-menu-items-search .clear-results,#available-menu-items-search.loading .clear-results.is-visible{display:none}#available-menu-items-search .clear-results.is-visible{display:block}#available-menu-items-search .clear-results:before{content:"\f335";font:400 20px/1 dashicons;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#available-menu-items-search .clear-results:focus,#available-menu-items-search .clear-results:hover{color:red}#available-menu-items-search .spinner{position:absolute;top:20px;margin:0!important;left:20px}#available-menu-items #available-menu-items-search .accordion-section-content{position:absolute;right:1px;top:60px;bottom:0;max-height:none;width:100%;padding:1px 15px 15px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#available-menu-items-search .accordion-section-title:after{display:none}#available-menu-items-search .accordion-section-content:empty{min-height:0;padding:0}#available-menu-items-search.loading .accordion-section-content div{opacity:.5}#available-menu-items-search.loading.loading-more .accordion-section-content div{opacity:1}#customize-preview{-webkit-transition:all .2s;transition:all .2s}body.adding-menu-items #available-menu-items{right:0;visibility:visible}body.adding-menu-items .wp-full-overlay-main{right:300px}body.adding-menu-items #customize-preview{opacity:.4}.menu-item-handle .spinner{display:none;float:right;margin:0 0 0 8px}.nav-menu-inserted-item-loading .spinner{display:block}.nav-menu-inserted-item-loading .menu-item-handle .item-type{padding:0 8px 0 0}.added-menu-item .menu-item-handle.loading,.nav-menu-inserted-item-loading .menu-item-handle{padding:10px 8px 10px 15px;cursor:default;opacity:.5;background:#fff;color:#727773}.added-menu-item .menu-item-handle{-webkit-transition-property:opacity,background,color;transition-property:opacity,background,color;-webkit-transition-duration:1.25s;transition-duration:1.25s;-webkit-transition-timing-function:cubic-bezier(.25,-2.5,.75,8);transition-timing-function:cubic-bezier(.25,-2.5,.75,8)}#accordion-section-add_menu{margin:15px 12px}.new-menu-section-content{display:none;padding:15px 0 0;clear:both}#accordion-section-add_menu .accordion-section-title{padding-right:45px}#accordion-section-add_menu .accordion-section-title:before{font:400 20px/1 dashicons;position:absolute;top:12px;right:14px;content:"\f132"}#create-new-menu-submit{float:left;margin:0 0 12px}.menu-delete-item{float:right;padding:1em 0;width:100%}li.assigned-to-menu-location .menu-delete-item{display:none}li.assigned-to-menu-location .add-new-menu-item{margin-bottom:1em}.menu-delete{color:#a00;cursor:pointer;text-decoration:underline}.menu-delete:focus,.menu-delete:hover{color:red;text-decoration:none}.menu-item-handle{margin-top:-1px}.ui-sortable-disabled .menu-item-handle{cursor:default}.menu-item-handle:hover{position:relative;z-index:10;color:#0073aa}#available-menu-items .menu-item-handle:hover .item-add,.menu-item-handle:hover .item-edit,.menu-item-handle:hover .item-type{color:#0073aa}.menu-item-edit-active .menu-item-handle{border-color:#999;border-bottom:none}.customize-control-nav_menu_item{margin-bottom:0}.customize-control-nav_menu{margin-top:12px}#available-menu-items .item-add:focus:before,#available-menu-items-search .clear-results:focus,#customize-controls .customize-info .customize-help-toggle:focus:before,.customize-screen-options-toggle:focus:before,.menu-delete:focus,.menu-item-bar .item-delete:focus:before,.wp-customizer .menu-item .submitbox .submitdelete:focus,.wp-customizer button:focus .toggle-indicator:after{-webkit-box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}@media screen and (max-width:782px){#available-menu-items #available-menu-items-search .accordion-section-content{top:63px}}@media screen and (max-width:640px){#available-menu-items #available-menu-items-search .accordion-section-content{top:133px}} \ No newline at end of file diff --git a/wp-admin/css/customize-nav-menus.css b/wp-admin/css/customize-nav-menus.css new file mode 100644 index 0000000..cc6725e --- /dev/null +++ b/wp-admin/css/customize-nav-menus.css @@ -0,0 +1,849 @@ +#accordion-section-menu_locations { + position: relative; + margin-bottom: 15px; +} + +.menu-in-location, +.menu-in-locations { + display: block; + font-weight: 600; + font-size: 10px; +} + +#customize-controls .theme-location-set, +#customize-controls .control-section .accordion-section-title:focus .menu-in-location, +#customize-controls .control-section .accordion-section-title:hover .menu-in-location { + color: #555; +} + +.wp-customizer .menu-item-bar .menu-item-handle, +.wp-customizer .menu-item-settings, +.wp-customizer .menu-item-settings .description-thin { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + +.wp-customizer .menu-item-bar { + margin: 0; +} + +.wp-customizer .menu-item-bar .menu-item-handle { + width: 100%; + background: #fff; +} + +.wp-customizer .menu-item-handle .item-title { + margin-right: 0; +} + +.wp-customizer .menu-item-handle .item-type { + padding: 1px 21px 0 5px; + float: right; + text-align: right; +} + +.wp-customizer .menu-item-settings { + max-width: 100%; + overflow: hidden; + padding: 10px; + background: #eee; + border: 1px solid #999; + border-top: none; +} + +.wp-customizer .menu-item-settings .description-thin { + width: 100%; + height: auto; + margin: 0 0 8px 0; +} + +.wp-customizer .menu-item-settings input[type="text"] { + width: 100%; +} + +.wp-customizer .menu-item-settings .submitbox { + margin: 0; + padding: 0; +} + +.wp-customizer .menu-item-settings .link-to-original { + padding: 5px 0; + border: none; + font-style: normal; + margin: 0; + width: 100%; +} + +.wp-customizer .menu-item .submitbox .submitdelete { + float: left; + margin: 6px 0 0; + padding: 0; + cursor: pointer; +} + + +/** + * Menu items reordering styles + */ + +.menu-item-reorder-nav { + display: none; + background-color: #fff; + position: absolute; + top: 0; + right: 0; +} + +.menus-move-left:before { + content: "\f341"; +} + +.menus-move-right:before { + content: "\f345"; +} + +.reordering .menu-item .item-controls, +.reordering .menu-item .item-type { + display: none; +} + +.reordering .menu-item-reorder-nav { + display: block; +} + +.customize-control input.menu-name-field { + width: 100%; /* Override the 98% default for customizer inputs, to align with the size of menu items. */ + margin: 12px 0; +} + +.wp-customizer .menu-item .item-edit { + position: absolute; + right: -19px; + top: 2px; + display: block; + width: 30px; + height: 38px; + margin-right: 0 !important; + -webkit-box-shadow: none; + box-shadow: none; + outline: none; + overflow: hidden; + cursor: pointer; +} + +.wp-customizer .menu-item.menu-item-edit-active .item-edit .toggle-indicator:after { + content: "\f142"; +} + +.wp-customizer .menu-item-settings p.description { + font-style: normal; +} + +.wp-customizer .menu-settings dl { + margin: 12px 0 0 0; + padding: 0; +} + +.wp-customizer .menu-settings .checkbox-input { + margin-top: 8px; +} + +.wp-customizer .menu-settings .menu-theme-locations { + border-top: 1px solid #ccc; +} + +.wp-customizer .menu-settings { + margin-top: 36px; + border-top: none; +} + +.menu-settings .customize-control-checkbox label { + line-height: 1; +} + +/* @todo update selector or potentially remove */ +.menu-settings .customize-control.customize-control-checkbox { + margin-bottom: 8px; /* Override collapsing at smaller viewports. */ +} + +.customize-control-menu { + margin-top: 4px; +} + +#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle { + color: #555; +} + +/* Screen Options */ +.customize-screen-options-toggle { + background: none; + border: none; + color: #555; + cursor: pointer; + margin: 0; + padding: 20px; + position: absolute; + right: 0; + top: 30px; +} + +#customize-controls .customize-info .customize-help-toggle { + padding: 20px; +} + +#customize-controls .customize-info .customize-help-toggle:before { + padding: 4px; +} + +.customize-screen-options-toggle:hover, +.customize-screen-options-toggle:active, +.customize-screen-options-toggle:focus, +.active-menu-screen-options .customize-screen-options-toggle, +#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:hover, +#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:active, +#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:focus { + color: #0073aa; +} + +.customize-screen-options-toggle:focus, +#customize-controls .customize-info .customize-help-toggle:focus { + outline: none; +} + +.customize-screen-options-toggle:before { + -moz-osx-font-smoothing: grayscale; + border: none; + content: "\f111"; + display: block; + font: 18px/1 dashicons; + padding: 5px; + text-align: center; + text-decoration: none !important; + text-indent: 0; + left: 6px; + position: absolute; + top: 6px; +} + +.customize-screen-options-toggle:focus:before, +#customize-controls .customize-info .customize-help-toggle:focus:before { + -webkit-border-radius: 100%; + border-radius: 100%; +} + +.wp-customizer #screen-options-wrap { + display: none; + background: #fff; + border-top: 1px solid #ddd; + padding: 4px 15px 15px; +} + +.wp-customizer .metabox-prefs label { + display: block; + padding-right: 0; + line-height: 30px; +} + +/* rework the arrow indicator implementation for NVDA bug same as #32715 */ +.wp-customizer .toggle-indicator { + display: inline-block; + font-size: 20px; + line-height: 1; + text-indent: -1px; /* account for the dashicon alignment */ +} + +.rtl .wp-customizer .toggle-indicator { + text-indent: 1px; /* account for the dashicon alignment */ +} + +.wp-customizer .toggle-indicator:after { + content: "\f140"; + speak: none; + vertical-align: top; + -webkit-border-radius: 50%; + border-radius: 50%; + color: #72777c; + font: normal 20px/1 dashicons; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + text-decoration: none !important; +} + +#accordion-panel-nav_menus .field-link-target, +#accordion-panel-nav_menus .field-title-attribute, +#accordion-panel-nav_menus .field-css-classes, +#accordion-panel-nav_menus .field-xfn, +#accordion-panel-nav_menus .field-description { + display: none; +} + +#accordion-panel-nav_menus.field-link-target-active .field-link-target, +#accordion-panel-nav_menus.field-title-attribute-active .field-title-attribute, +#accordion-panel-nav_menus.field-css-classes-active .field-css-classes, +#accordion-panel-nav_menus.field-xfn-active .field-xfn, +#accordion-panel-nav_menus.field-description-active .field-description { + display: block; +} + +/* WARNING: The 20px factor is hard-coded in JS. */ +.menu-item-depth-0 { margin-left: 0; } +.menu-item-depth-1 { margin-left: 20px; } +.menu-item-depth-2 { margin-left: 40px; } +.menu-item-depth-3 { margin-left: 60px; } +.menu-item-depth-4 { margin-left: 80px; } +.menu-item-depth-5 { margin-left: 100px; } +.menu-item-depth-6 { margin-left: 120px; } +.menu-item-depth-7 { margin-left: 140px; } +.menu-item-depth-8 { margin-left: 160px; } /* Not likely to be used or useful beyond this depth */ +.menu-item-depth-9 { margin-left: 180px; } +.menu-item-depth-10 { margin-left: 200px; } +.menu-item-depth-11 { margin-left: 220px; } + +/* @todo handle .menu-item-settings width */ +.menu-item-depth-0 > .menu-item-bar { margin-right: 0; } +.menu-item-depth-1 > .menu-item-bar { margin-right: 20px; } +.menu-item-depth-2 > .menu-item-bar { margin-right: 40px; } +.menu-item-depth-3 > .menu-item-bar { margin-right: 60px; } +.menu-item-depth-4 > .menu-item-bar { margin-right: 80px; } +.menu-item-depth-5 > .menu-item-bar { margin-right: 100px; } +.menu-item-depth-6 > .menu-item-bar { margin-right: 120px; } +.menu-item-depth-7 > .menu-item-bar { margin-right: 140px; } +.menu-item-depth-8 > .menu-item-bar { margin-right: 160px; } +.menu-item-depth-9 > .menu-item-bar { margin-right: 180px; } +.menu-item-depth-10 > .menu-item-bar { margin-right: 200px; } +.menu-item-depth-11 > .menu-item-bar { margin-right: 220px; } + +/* Submenu left margin. */ +.menu-item-depth-0 .menu-item-transport { margin-left: 0; } +.menu-item-depth-1 .menu-item-transport { margin-left: -20px; } +.menu-item-depth-3 .menu-item-transport { margin-left: -60px; } +.menu-item-depth-4 .menu-item-transport { margin-left: -80px; } +.menu-item-depth-2 .menu-item-transport { margin-left: -40px; } +.menu-item-depth-5 .menu-item-transport { margin-left: -100px; } +.menu-item-depth-6 .menu-item-transport { margin-left: -120px; } +.menu-item-depth-7 .menu-item-transport { margin-left: -140px; } +.menu-item-depth-8 .menu-item-transport { margin-left: -160px; } +.menu-item-depth-9 .menu-item-transport { margin-left: -180px; } +.menu-item-depth-10 .menu-item-transport { margin-left: -200px; } +.menu-item-depth-11 .menu-item-transport { margin-left: -220px; } + +/* WARNING: The 20px factor is hard-coded in JS. */ +.reordering .menu-item-depth-0 { margin-left: 0; } +.reordering .menu-item-depth-1 { margin-left: 15px; } +.reordering .menu-item-depth-2 { margin-left: 30px; } +.reordering .menu-item-depth-3 { margin-left: 45px; } +.reordering .menu-item-depth-4 { margin-left: 60px; } +.reordering .menu-item-depth-5 { margin-left: 75px; } +.reordering .menu-item-depth-6 { margin-left: 90px; } +.reordering .menu-item-depth-7 { margin-left: 105px; } +.reordering .menu-item-depth-8 { margin-left: 120px; } /* Not likely to be used or useful beyond this depth */ +.reordering .menu-item-depth-9 { margin-left: 135px; } +.reordering .menu-item-depth-10 { margin-left: 150px; } +.reordering .menu-item-depth-11 { margin-left: 165px; } + +.reordering .menu-item-depth-0 > .menu-item-bar { margin-right: 0; } +.reordering .menu-item-depth-1 > .menu-item-bar { margin-right: 15px; } +.reordering .menu-item-depth-2 > .menu-item-bar { margin-right: 30px; } +.reordering .menu-item-depth-3 > .menu-item-bar { margin-right: 45px; } +.reordering .menu-item-depth-4 > .menu-item-bar { margin-right: 60px; } +.reordering .menu-item-depth-5 > .menu-item-bar { margin-right: 75px; } +.reordering .menu-item-depth-6 > .menu-item-bar { margin-right: 90px; } +.reordering .menu-item-depth-7 > .menu-item-bar { margin-right: 105px; } +.reordering .menu-item-depth-8 > .menu-item-bar { margin-right: 120px; } +.reordering .menu-item-depth-9 > .menu-item-bar { margin-right: 135px; } +.reordering .menu-item-depth-10 > .menu-item-bar { margin-right: 150px; } +.reordering .menu-item-depth-11 > .menu-item-bar { margin-right: 165px; } + +.control-section-nav_menu .menu .menu-item-edit-active { + margin-left: 0; +} + +.control-section-nav_menu .menu .menu-item-edit-active .menu-item-bar { + margin-right: 0; +} + +.control-section-nav_menu .menu .sortable-placeholder { + margin-top: 0; + margin-bottom: 1px; + max-width: -webkit-calc(100% - 2px); + max-width: calc(100% - 2px); + float: left; + display: list-item; + border-color: #a0a5aa; +} + +.menu-item-transport li.customize-control { + float: none; +} + +.control-section-nav_menu .menu ul.menu-item-transport .menu-item-bar { + margin-top: 0; +} + +/** + * Add-menu-items mode + */ + +.adding-menu-items .control-section { + opacity: .4; +} + +.adding-menu-items .control-panel.control-section, +.adding-menu-items .control-section.open { + opacity: 1; +} + +.menu-item-bar .item-delete { + color: #a00; + position: absolute; + top: 2px; + right: -19px; + width: 30px; + height: 38px; + cursor: pointer; + display: none; +} + +.menu-item-bar .item-delete:before { + content: "\f335"; + position: absolute; + top: 9px; + left: 5px; + -webkit-border-radius: 50%; + border-radius: 50%; + font: normal 20px/1 dashicons; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.ie8 .menu-item-bar .item-delete:before { + top: -10px; +} + +.menu-item-bar .item-delete:hover, +.menu-item-bar .item-delete:focus { + -webkit-box-shadow: none; + box-shadow: none; + outline: none; + color: #f00; +} + +.adding-menu-items .menu-item-bar .item-edit { + display: none; +} + +.adding-menu-items .menu-item-bar .item-delete { + display: block; +} + +/** + * Styles for menu-item addition panel + */ + +#available-menu-items.opening { + overflow-y: hidden; /* avoid scrollbar jitter with animating heights */ +} + +#available-menu-items #available-menu-items-search.open { + height: 100%; + border-bottom: none; +} + +#available-menu-items .accordion-section-title { + border-left: none; + border-right: none; + background: #fff; + -webkit-transition: background-color 0.15s; + transition: background-color 0.15s; +} + +#available-menu-items .open .accordion-section-title, +#available-menu-items #available-menu-items-search .accordion-section-title { + background: #eee; +} + +/* rework the arrow indicator implementation for NVDA bug see #32715 */ +#available-menu-items .accordion-section-title:after { + content: none !important; +} + +#available-menu-items .accordion-section-title:hover .toggle-indicator:after, +#available-menu-items .button-link:hover .toggle-indicator:after, +#available-menu-items .button-link:focus .toggle-indicator:after { + color: #23282d; +} + +#available-menu-items .open .accordion-section-title .toggle-indicator:after { + content: "\f142"; + color: #23282d; +} + +#available-menu-items .accordion-section-content { + overflow-y: auto; + max-height: 200px; /* This gets set in JS to fit the screen size, and based on # of sections. */ + background: transparent; +} + +#available-menu-items .accordion-section-title button { + display: block; + width: 28px; + height: 35px; + position: absolute; + top: 5px; + right: 5px; + -webkit-box-shadow: none; + box-shadow: none; + outline: none; + cursor: pointer; +} + +#available-menu-items .accordion-section-title .no-items, +#available-menu-items .cannot-expand .accordion-section-title .spinner, +#available-menu-items .cannot-expand .accordion-section-title > button { + display: none; +} + +#available-menu-items-search.cannot-expand .accordion-section-title .spinner { + display: block; +} + +#available-menu-items .cannot-expand .accordion-section-title .no-items { + float: right; + color: #555d66; + font-weight: normal; + margin-left: 5px; +} + +#available-menu-items .accordion-section-content { + padding: 1px 15px 15px 15px; + margin: 0; + max-height: 290px; +} + +#available-menu-items .menu-item-tpl { + margin: 0; +} + +#custom-menu-item-name.invalid, +#custom-menu-item-url.invalid, +.menu-name-field.invalid, +.menu-name-field.invalid:focus { + border: 1px solid #f00; +} + +#available-menu-items .menu-item-handle .item-type { + padding-right: 0; +} + +#available-menu-items .menu-item-handle .item-title { + padding-left: 20px; +} + +#available-menu-items .menu-item-handle { + cursor: pointer; +} + +#available-menu-items .menu-item-handle { + -webkit-box-shadow: none; + box-shadow: none; + margin-top: -1px; +} + +#available-menu-items .menu-item-handle:hover { + z-index: 1; +} + +#available-menu-items .item-title h4 { + padding: 0 0 5px; + font-size: 14px; +} + +#available-menu-items .item-add { + position: absolute; + top: 1px; + left: 1px; + color: #82878c; + width: 30px; + height: 38px; + -webkit-box-shadow: none; + box-shadow: none; + outline: none; + cursor: pointer; +} + +#available-menu-items .menu-item-handle .item-add:focus { + color: #23282d; +} + +#available-menu-items .item-add:before { + content: "\f543"; + position: relative; + left: 2px; + top: 3px; + display: inline-block; + height: 20px; + -webkit-border-radius: 50%; + border-radius: 50%; + font: normal 20px/1.05 dashicons; /* line height is to account for the dashicon's vertical alignment */ +} + +#available-menu-items .menu-item-handle.item-added .item-type, +#available-menu-items .menu-item-handle.item-added .item-title, +#available-menu-items .menu-item-handle.item-added:hover .item-add, +#available-menu-items .menu-item-handle.item-added .item-add:focus { + color: #82878c; +} + +#available-menu-items .menu-item-handle.item-added .item-add:before { + content: "\f147"; +} + +#available-menu-items .accordion-section-title.loading .spinner, +#available-menu-items-search.loading .accordion-section-title .spinner { + visibility: visible; + margin: 0 20px; +} + +#available-menu-items-search .clear-results { + position: absolute; + top: 20px; + right: 20px; + width: 20px; + height: 20px; + cursor: pointer; + color: #a00; + text-decoration: none; +} + +#available-menu-items-search .clear-results, +#available-menu-items-search.loading .clear-results.is-visible { + display: none; +} + +#available-menu-items-search .clear-results.is-visible { + display: block; +} + +#available-menu-items-search .clear-results:before { + content: "\f335"; + font: normal 20px/1 dashicons; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +#available-menu-items-search .clear-results:hover, +#available-menu-items-search .clear-results:focus { + color: #f00; +} + +#available-menu-items-search .spinner { + position: absolute; + top: 20px; + margin: 0 !important; + right: 20px; +} + +/* search results list */ +#available-menu-items #available-menu-items-search .accordion-section-content { + position: absolute; + left: 1px; + top: 60px; /* below title div / search input */ + bottom: 0px; /* 100% height that still triggers lazy load */ + max-height: none; + width: 100%; + padding: 1px 15px 15px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + +#available-menu-items-search .accordion-section-title:after { + display: none; +} + +#available-menu-items-search .accordion-section-content:empty { + min-height: 0; + padding: 0; +} + +#available-menu-items-search.loading .accordion-section-content div { + opacity: .5; +} + +#available-menu-items-search.loading.loading-more .accordion-section-content div { + opacity: 1; +} + +#customize-preview { + -webkit-transition: all 0.2s; + transition: all 0.2s; +} + +body.adding-menu-items #available-menu-items { + left: 0; + visibility: visible; +} + +body.adding-menu-items .wp-full-overlay-main { + left: 300px; +} + +body.adding-menu-items #customize-preview { + opacity: 0.4; +} + +.menu-item-handle .spinner { + display: none; + float: left; + margin: 0 8px 0 0; +} + +.nav-menu-inserted-item-loading .spinner { + display: block; +} + +.nav-menu-inserted-item-loading .menu-item-handle .item-type { + padding: 0 0 0 8px; +} + +.nav-menu-inserted-item-loading .menu-item-handle, +.added-menu-item .menu-item-handle.loading { + padding: 10px 15px 10px 8px; + cursor: default; + opacity: .5; + background: #fff; + color: #727773; +} + +.added-menu-item .menu-item-handle { + -webkit-transition-property: opacity, background, color; + transition-property: opacity, background, color; + -webkit-transition-duration: 1.25s; + transition-duration: 1.25s; + -webkit-transition-timing-function: cubic-bezier( .25, -2.5, .75, 8 ); + transition-timing-function: cubic-bezier( .25, -2.5, .75, 8 ); /* Replacement for .hide().fadeIn('slow') in JS to add emphasis when it's loaded. */ +} + +/* Add/delete Menus */ + +/* @todo update selector */ +#accordion-section-add_menu { + margin: 15px 12px; +} + +.new-menu-section-content { + display: none; + padding: 15px 0 0 0; + clear: both; +} + +/* @todo update selector */ +#accordion-section-add_menu .accordion-section-title { + padding-left: 45px; +} + +/* @todo update selector */ +#accordion-section-add_menu .accordion-section-title:before { + font: normal 20px/1 dashicons; + position: absolute; + top: 12px; + left: 14px; + content: "\f132"; +} + +#create-new-menu-submit { + float: right; + margin: 0 0 12px 0; +} + +.menu-delete-item { + float: left; + padding: 1em 0; + width: 100%; +} + +li.assigned-to-menu-location .menu-delete-item { + display: none; +} + +li.assigned-to-menu-location .add-new-menu-item { + margin-bottom: 1em; +} + +.menu-delete { + color: #a00; + cursor: pointer; + text-decoration: underline; +} + +.menu-delete:hover, +.menu-delete:focus { + color: #f00; + text-decoration: none; +} + +.menu-item-handle { + margin-top: -1px; +} +.ui-sortable-disabled .menu-item-handle { + cursor: default; +} + +.menu-item-handle:hover { + position: relative; + z-index: 10; + color: #0073aa; +} + +.menu-item-handle:hover .item-type, +.menu-item-handle:hover .item-edit, +#available-menu-items .menu-item-handle:hover .item-add { + color: #0073aa; +} + +.menu-item-edit-active .menu-item-handle { + border-color: #999; + border-bottom: none; +} + +.customize-control-nav_menu_item { + margin-bottom: 0; +} + +.customize-control-nav_menu { + margin-top: 12px; +} + +/** + * box-shadows + */ + +.wp-customizer .menu-item .submitbox .submitdelete:focus, +.customize-screen-options-toggle:focus:before, +#customize-controls .customize-info .customize-help-toggle:focus:before, +.wp-customizer button:focus .toggle-indicator:after, +#available-menu-items-search .clear-results:focus, +.menu-delete:focus, +.menu-item-bar .item-delete:focus:before, +#available-menu-items .item-add:focus:before { + -webkit-box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); + box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); +} + + +@media screen and ( max-width: 782px ) { + #available-menu-items #available-menu-items-search .accordion-section-content { + top: 63px; + } +} + +@media screen and ( max-width: 640px ) { + #available-menu-items #available-menu-items-search .accordion-section-content { + top: 133px; + } +} diff --git a/wp-admin/css/customize-nav-menus.min.css b/wp-admin/css/customize-nav-menus.min.css new file mode 100644 index 0000000..03226bb --- /dev/null +++ b/wp-admin/css/customize-nav-menus.min.css @@ -0,0 +1 @@ +#accordion-section-menu_locations{position:relative;margin-bottom:15px}.menu-in-location,.menu-in-locations{display:block;font-weight:600;font-size:10px}#customize-controls .control-section .accordion-section-title:focus .menu-in-location,#customize-controls .control-section .accordion-section-title:hover .menu-in-location,#customize-controls .theme-location-set{color:#555}.wp-customizer .menu-item-bar .menu-item-handle,.wp-customizer .menu-item-settings,.wp-customizer .menu-item-settings .description-thin{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.wp-customizer .menu-item-bar{margin:0}.wp-customizer .menu-item-bar .menu-item-handle{width:100%;background:#fff}.wp-customizer .menu-item-handle .item-title{margin-right:0}.wp-customizer .menu-item-handle .item-type{padding:1px 21px 0 5px;float:right;text-align:right}.wp-customizer .menu-item-settings{max-width:100%;overflow:hidden;padding:10px;background:#eee;border:1px solid #999;border-top:none}.wp-customizer .menu-item-settings .description-thin{width:100%;height:auto;margin:0 0 8px}.wp-customizer .menu-item-settings input[type=text]{width:100%}.wp-customizer .menu-item-settings .submitbox{margin:0;padding:0}.wp-customizer .menu-item-settings .link-to-original{padding:5px 0;border:none;font-style:normal;margin:0;width:100%}.wp-customizer .menu-item .submitbox .submitdelete{float:left;margin:6px 0 0;padding:0;cursor:pointer}.menu-item-reorder-nav{display:none;background-color:#fff;position:absolute;top:0;right:0}.menus-move-left:before{content:"\f341"}.menus-move-right:before{content:"\f345"}.reordering .menu-item .item-controls,.reordering .menu-item .item-type{display:none}.reordering .menu-item-reorder-nav{display:block}.customize-control input.menu-name-field{width:100%;margin:12px 0}.wp-customizer .menu-item .item-edit{position:absolute;right:-19px;top:2px;display:block;width:30px;height:38px;margin-right:0!important;-webkit-box-shadow:none;box-shadow:none;outline:0;overflow:hidden;cursor:pointer}.wp-customizer .menu-item.menu-item-edit-active .item-edit .toggle-indicator:after{content:"\f142"}.wp-customizer .menu-item-settings p.description{font-style:normal}.wp-customizer .menu-settings dl{margin:12px 0 0;padding:0}.wp-customizer .menu-settings .checkbox-input{margin-top:8px}.wp-customizer .menu-settings .menu-theme-locations{border-top:1px solid #ccc}.wp-customizer .menu-settings{margin-top:36px;border-top:none}.menu-settings .customize-control-checkbox label{line-height:1}.menu-settings .customize-control.customize-control-checkbox{margin-bottom:8px}.customize-control-menu{margin-top:4px}#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle{color:#555}.customize-screen-options-toggle{background:0 0;border:none;color:#555;cursor:pointer;margin:0;padding:20px;position:absolute;right:0;top:30px}#customize-controls .customize-info .customize-help-toggle{padding:20px}#customize-controls .customize-info .customize-help-toggle:before{padding:4px}#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:active,#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:focus,#customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:hover,.active-menu-screen-options .customize-screen-options-toggle,.customize-screen-options-toggle:active,.customize-screen-options-toggle:focus,.customize-screen-options-toggle:hover{color:#0073aa}#customize-controls .customize-info .customize-help-toggle:focus,.customize-screen-options-toggle:focus{outline:0}.customize-screen-options-toggle:before{-moz-osx-font-smoothing:grayscale;border:none;content:"\f111";display:block;font:18px/1 dashicons;padding:5px;text-align:center;text-decoration:none!important;text-indent:0;left:6px;position:absolute;top:6px}#customize-controls .customize-info .customize-help-toggle:focus:before,.customize-screen-options-toggle:focus:before{-webkit-border-radius:100%;border-radius:100%}.wp-customizer #screen-options-wrap{display:none;background:#fff;border-top:1px solid #ddd;padding:4px 15px 15px}.wp-customizer .metabox-prefs label{display:block;padding-right:0;line-height:30px}.wp-customizer .toggle-indicator{display:inline-block;font-size:20px;line-height:1;text-indent:-1px}.rtl .wp-customizer .toggle-indicator{text-indent:1px}.wp-customizer .toggle-indicator:after{content:"\f140";speak:none;vertical-align:top;-webkit-border-radius:50%;border-radius:50%;color:#72777c;font:400 20px/1 dashicons;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important}#accordion-panel-nav_menus .field-css-classes,#accordion-panel-nav_menus .field-description,#accordion-panel-nav_menus .field-link-target,#accordion-panel-nav_menus .field-title-attribute,#accordion-panel-nav_menus .field-xfn{display:none}#accordion-panel-nav_menus.field-css-classes-active .field-css-classes,#accordion-panel-nav_menus.field-description-active .field-description,#accordion-panel-nav_menus.field-link-target-active .field-link-target,#accordion-panel-nav_menus.field-title-attribute-active .field-title-attribute,#accordion-panel-nav_menus.field-xfn-active .field-xfn{display:block}.menu-item-depth-0{margin-left:0}.menu-item-depth-1{margin-left:20px}.menu-item-depth-2{margin-left:40px}.menu-item-depth-3{margin-left:60px}.menu-item-depth-4{margin-left:80px}.menu-item-depth-5{margin-left:100px}.menu-item-depth-6{margin-left:120px}.menu-item-depth-7{margin-left:140px}.menu-item-depth-8{margin-left:160px}.menu-item-depth-9{margin-left:180px}.menu-item-depth-10{margin-left:200px}.menu-item-depth-11{margin-left:220px}.menu-item-depth-0>.menu-item-bar{margin-right:0}.menu-item-depth-1>.menu-item-bar{margin-right:20px}.menu-item-depth-2>.menu-item-bar{margin-right:40px}.menu-item-depth-3>.menu-item-bar{margin-right:60px}.menu-item-depth-4>.menu-item-bar{margin-right:80px}.menu-item-depth-5>.menu-item-bar{margin-right:100px}.menu-item-depth-6>.menu-item-bar{margin-right:120px}.menu-item-depth-7>.menu-item-bar{margin-right:140px}.menu-item-depth-8>.menu-item-bar{margin-right:160px}.menu-item-depth-9>.menu-item-bar{margin-right:180px}.menu-item-depth-10>.menu-item-bar{margin-right:200px}.menu-item-depth-11>.menu-item-bar{margin-right:220px}.menu-item-depth-0 .menu-item-transport{margin-left:0}.menu-item-depth-1 .menu-item-transport{margin-left:-20px}.menu-item-depth-3 .menu-item-transport{margin-left:-60px}.menu-item-depth-4 .menu-item-transport{margin-left:-80px}.menu-item-depth-2 .menu-item-transport{margin-left:-40px}.menu-item-depth-5 .menu-item-transport{margin-left:-100px}.menu-item-depth-6 .menu-item-transport{margin-left:-120px}.menu-item-depth-7 .menu-item-transport{margin-left:-140px}.menu-item-depth-8 .menu-item-transport{margin-left:-160px}.menu-item-depth-9 .menu-item-transport{margin-left:-180px}.menu-item-depth-10 .menu-item-transport{margin-left:-200px}.menu-item-depth-11 .menu-item-transport{margin-left:-220px}.reordering .menu-item-depth-0{margin-left:0}.reordering .menu-item-depth-1{margin-left:15px}.reordering .menu-item-depth-2{margin-left:30px}.reordering .menu-item-depth-3{margin-left:45px}.reordering .menu-item-depth-4{margin-left:60px}.reordering .menu-item-depth-5{margin-left:75px}.reordering .menu-item-depth-6{margin-left:90px}.reordering .menu-item-depth-7{margin-left:105px}.reordering .menu-item-depth-8{margin-left:120px}.reordering .menu-item-depth-9{margin-left:135px}.reordering .menu-item-depth-10{margin-left:150px}.reordering .menu-item-depth-11{margin-left:165px}.reordering .menu-item-depth-0>.menu-item-bar{margin-right:0}.reordering .menu-item-depth-1>.menu-item-bar{margin-right:15px}.reordering .menu-item-depth-2>.menu-item-bar{margin-right:30px}.reordering .menu-item-depth-3>.menu-item-bar{margin-right:45px}.reordering .menu-item-depth-4>.menu-item-bar{margin-right:60px}.reordering .menu-item-depth-5>.menu-item-bar{margin-right:75px}.reordering .menu-item-depth-6>.menu-item-bar{margin-right:90px}.reordering .menu-item-depth-7>.menu-item-bar{margin-right:105px}.reordering .menu-item-depth-8>.menu-item-bar{margin-right:120px}.reordering .menu-item-depth-9>.menu-item-bar{margin-right:135px}.reordering .menu-item-depth-10>.menu-item-bar{margin-right:150px}.reordering .menu-item-depth-11>.menu-item-bar{margin-right:165px}.control-section-nav_menu .menu .menu-item-edit-active{margin-left:0}.control-section-nav_menu .menu .menu-item-edit-active .menu-item-bar{margin-right:0}.control-section-nav_menu .menu .sortable-placeholder{margin-top:0;margin-bottom:1px;max-width:-webkit-calc(100% - 2px);max-width:calc(100% - 2px);float:left;display:list-item;border-color:#a0a5aa}.menu-item-transport li.customize-control{float:none}.control-section-nav_menu .menu ul.menu-item-transport .menu-item-bar{margin-top:0}.adding-menu-items .control-section{opacity:.4}.adding-menu-items .control-panel.control-section,.adding-menu-items .control-section.open{opacity:1}.menu-item-bar .item-delete{color:#a00;position:absolute;top:2px;right:-19px;width:30px;height:38px;cursor:pointer;display:none}.menu-item-bar .item-delete:before{content:"\f335";position:absolute;top:9px;left:5px;-webkit-border-radius:50%;border-radius:50%;font:400 20px/1 dashicons;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.ie8 .menu-item-bar .item-delete:before{top:-10px}.menu-item-bar .item-delete:focus,.menu-item-bar .item-delete:hover{-webkit-box-shadow:none;box-shadow:none;outline:0;color:red}.adding-menu-items .menu-item-bar .item-edit{display:none}.adding-menu-items .menu-item-bar .item-delete{display:block}#available-menu-items.opening{overflow-y:hidden}#available-menu-items #available-menu-items-search.open{height:100%;border-bottom:none}#available-menu-items .accordion-section-title{border-left:none;border-right:none;background:#fff;-webkit-transition:background-color .15s;transition:background-color .15s}#available-menu-items #available-menu-items-search .accordion-section-title,#available-menu-items .open .accordion-section-title{background:#eee}#available-menu-items .accordion-section-title:after{content:none!important}#available-menu-items .accordion-section-title:hover .toggle-indicator:after,#available-menu-items .button-link:focus .toggle-indicator:after,#available-menu-items .button-link:hover .toggle-indicator:after{color:#23282d}#available-menu-items .open .accordion-section-title .toggle-indicator:after{content:"\f142";color:#23282d}#available-menu-items .accordion-section-title button{display:block;width:28px;height:35px;position:absolute;top:5px;right:5px;-webkit-box-shadow:none;box-shadow:none;outline:0;cursor:pointer}#available-menu-items .accordion-section-title .no-items,#available-menu-items .cannot-expand .accordion-section-title .spinner,#available-menu-items .cannot-expand .accordion-section-title>button{display:none}#available-menu-items-search.cannot-expand .accordion-section-title .spinner{display:block}#available-menu-items .cannot-expand .accordion-section-title .no-items{float:right;color:#555d66;font-weight:400;margin-left:5px}#available-menu-items .accordion-section-content{overflow-y:auto;background:0 0;padding:1px 15px 15px;margin:0;max-height:290px}#available-menu-items .menu-item-tpl{margin:0}#custom-menu-item-name.invalid,#custom-menu-item-url.invalid,.menu-name-field.invalid,.menu-name-field.invalid:focus{border:1px solid red}#available-menu-items .menu-item-handle .item-type{padding-right:0}#available-menu-items .menu-item-handle .item-title{padding-left:20px}#available-menu-items .menu-item-handle{cursor:pointer;-webkit-box-shadow:none;box-shadow:none;margin-top:-1px}#available-menu-items .menu-item-handle:hover{z-index:1}#available-menu-items .item-title h4{padding:0 0 5px;font-size:14px}#available-menu-items .item-add{position:absolute;top:1px;left:1px;color:#82878c;width:30px;height:38px;-webkit-box-shadow:none;box-shadow:none;outline:0;cursor:pointer}#available-menu-items .menu-item-handle .item-add:focus{color:#23282d}#available-menu-items .item-add:before{content:"\f543";position:relative;left:2px;top:3px;display:inline-block;height:20px;-webkit-border-radius:50%;border-radius:50%;font:400 20px/1.05 dashicons}#available-menu-items .menu-item-handle.item-added .item-add:focus,#available-menu-items .menu-item-handle.item-added .item-title,#available-menu-items .menu-item-handle.item-added .item-type,#available-menu-items .menu-item-handle.item-added:hover .item-add{color:#82878c}#available-menu-items .menu-item-handle.item-added .item-add:before{content:"\f147"}#available-menu-items .accordion-section-title.loading .spinner,#available-menu-items-search.loading .accordion-section-title .spinner{visibility:visible;margin:0 20px}#available-menu-items-search .clear-results{position:absolute;top:20px;right:20px;width:20px;height:20px;cursor:pointer;color:#a00;text-decoration:none}#available-menu-items-search .clear-results,#available-menu-items-search.loading .clear-results.is-visible{display:none}#available-menu-items-search .clear-results.is-visible{display:block}#available-menu-items-search .clear-results:before{content:"\f335";font:400 20px/1 dashicons;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#available-menu-items-search .clear-results:focus,#available-menu-items-search .clear-results:hover{color:red}#available-menu-items-search .spinner{position:absolute;top:20px;margin:0!important;right:20px}#available-menu-items #available-menu-items-search .accordion-section-content{position:absolute;left:1px;top:60px;bottom:0;max-height:none;width:100%;padding:1px 15px 15px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#available-menu-items-search .accordion-section-title:after{display:none}#available-menu-items-search .accordion-section-content:empty{min-height:0;padding:0}#available-menu-items-search.loading .accordion-section-content div{opacity:.5}#available-menu-items-search.loading.loading-more .accordion-section-content div{opacity:1}#customize-preview{-webkit-transition:all .2s;transition:all .2s}body.adding-menu-items #available-menu-items{left:0;visibility:visible}body.adding-menu-items .wp-full-overlay-main{left:300px}body.adding-menu-items #customize-preview{opacity:.4}.menu-item-handle .spinner{display:none;float:left;margin:0 8px 0 0}.nav-menu-inserted-item-loading .spinner{display:block}.nav-menu-inserted-item-loading .menu-item-handle .item-type{padding:0 0 0 8px}.added-menu-item .menu-item-handle.loading,.nav-menu-inserted-item-loading .menu-item-handle{padding:10px 15px 10px 8px;cursor:default;opacity:.5;background:#fff;color:#727773}.added-menu-item .menu-item-handle{-webkit-transition-property:opacity,background,color;transition-property:opacity,background,color;-webkit-transition-duration:1.25s;transition-duration:1.25s;-webkit-transition-timing-function:cubic-bezier(.25,-2.5,.75,8);transition-timing-function:cubic-bezier(.25,-2.5,.75,8)}#accordion-section-add_menu{margin:15px 12px}.new-menu-section-content{display:none;padding:15px 0 0;clear:both}#accordion-section-add_menu .accordion-section-title{padding-left:45px}#accordion-section-add_menu .accordion-section-title:before{font:400 20px/1 dashicons;position:absolute;top:12px;left:14px;content:"\f132"}#create-new-menu-submit{float:right;margin:0 0 12px}.menu-delete-item{float:left;padding:1em 0;width:100%}li.assigned-to-menu-location .menu-delete-item{display:none}li.assigned-to-menu-location .add-new-menu-item{margin-bottom:1em}.menu-delete{color:#a00;cursor:pointer;text-decoration:underline}.menu-delete:focus,.menu-delete:hover{color:red;text-decoration:none}.menu-item-handle{margin-top:-1px}.ui-sortable-disabled .menu-item-handle{cursor:default}.menu-item-handle:hover{position:relative;z-index:10;color:#0073aa}#available-menu-items .menu-item-handle:hover .item-add,.menu-item-handle:hover .item-edit,.menu-item-handle:hover .item-type{color:#0073aa}.menu-item-edit-active .menu-item-handle{border-color:#999;border-bottom:none}.customize-control-nav_menu_item{margin-bottom:0}.customize-control-nav_menu{margin-top:12px}#available-menu-items .item-add:focus:before,#available-menu-items-search .clear-results:focus,#customize-controls .customize-info .customize-help-toggle:focus:before,.customize-screen-options-toggle:focus:before,.menu-delete:focus,.menu-item-bar .item-delete:focus:before,.wp-customizer .menu-item .submitbox .submitdelete:focus,.wp-customizer button:focus .toggle-indicator:after{-webkit-box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}@media screen and (max-width:782px){#available-menu-items #available-menu-items-search .accordion-section-content{top:63px}}@media screen and (max-width:640px){#available-menu-items #available-menu-items-search .accordion-section-content{top:133px}} \ No newline at end of file diff --git a/wp-admin/css/customize-widgets-rtl.css b/wp-admin/css/customize-widgets-rtl.css index a26638e..767a3e2 100644 --- a/wp-admin/css/customize-widgets-rtl.css +++ b/wp-admin/css/customize-widgets-rtl.css @@ -7,29 +7,47 @@ * preview loads and we know whether the sidebars are used in the template. */ -.control-section[id^="accordion-section-sidebar-widgets-"], +.control-section.control-section-sidebar, .customize-control-sidebar_widgets label, .customize-control-sidebar_widgets .hide-if-js { /* The link in .customize-control-sidebar_widgets .hide-if-js will fail if it ever gets used. */ - display:none; + display: none; +} + +.control-section.control-section-sidebar .accordion-section-content.ui-sortable { + overflow: visible; } .customize-control-widget_form .widget-top { + background: #fff; -webkit-transition: opacity 0.5s; transition: opacity 0.5s; } +.customize-control .widget-action { + color: #72777c; +} + +.customize-control .widget-top:hover .widget-action, +.customize-control .widget-action:focus { + color: #23282d; +} + .customize-control-widget_form:not(.widget-rendered) .widget-top { opacity: 0.5; } -.customize-control-widget_form .widget-control-save, -.customize-control-widget_form .spinner { +.customize-control-widget_form .widget-control-save { display: none; } +.customize-control-widget_form .spinner { + visibility: hidden; + margin-top: 0; +} + .customize-control-widget_form.previewer-loading .spinner { - display: inline; + visibility: visible; } .customize-control-widget_form.widget-form-disabled .widget-content { @@ -71,26 +89,23 @@ line-height: 16px; } -.widget-top { - cursor: move; -} - .customize-control-widget_form.expanded a.widget-action:after { content: "\f142"; } .customize-control-widget_form.wide-widget-control a.widget-action:after { - content: "\f139"; + content: "\f141"; } .customize-control-widget_form.wide-widget-control.expanded a.widget-action:after { - content: "\f141"; + content: "\f139"; } .widget-title-action { cursor: pointer; } +.widget-top, .customize-control-widget_form .widget .customize-control-title { cursor: move; } @@ -109,39 +124,8 @@ } /** -* Widget reordering styles -**/ - -.reorder-toggle { - float: left; - padding: 5px 8px; - text-decoration: none; - cursor: pointer; - outline: none; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} -.reorder-toggle:focus { - outline: 1px dotted; -} - -.reorder-done, -.reordering .reorder { - display: none; -} - -.reordering .reorder-done { - display: block; - color: #aa0000; -} - -#customize-theme-controls .reordering .add-new-widget { - opacity: 0.2; - pointer-events: none; - cursor: not-allowed; -} + * Widget reordering styles + */ #customize-theme-controls .widget-reorder-nav { display: none; @@ -149,61 +133,14 @@ background-color: #fafafa; } -.widget-reorder-nav span { - position: relative; - overflow: hidden; - float: right; - display: block; - width: 33px; /* was 42px for mobile */ - height: 43px; - color: #888; - text-indent: -9999px; - cursor: pointer; - outline: none; -} - -.widget-reorder-nav span:before { - display: inline-block; - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - font: normal 20px/43px 'dashicons'; - text-align: center; - text-indent: 0; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -.widget-reorder-nav span:hover, -.widget-reorder-nav span:focus { - color: #444; - background: #eee; -} - .move-widget:before { - content: '\f504'; -} - -.move-widget-down:before { - content: '\f347'; -} - -.move-widget-up:before { - content: '\f343'; + content: "\f504"; } -#customize-theme-controls .first-widget .move-widget-up, -#customize-theme-controls .last-widget .move-widget-down { - color: #d5d5d5; - cursor: default; -} - -#customize-theme-controls .move-widget-area { +#customize-theme-controls .move-widget-area { display: none; background: #fff; - border: 1px solid #dedede; + border: 1px solid #ddd; border-top: none; cursor: auto; } @@ -239,11 +176,11 @@ #customize-theme-controls .widget-area-select li:before { display: none; - content: '\f147'; + content: "\f147"; position: absolute; top: 12px; right: 10px; - font: normal 20px/1 'dashicons'; + font: normal 20px/1 dashicons; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } @@ -255,7 +192,7 @@ #customize-theme-controls .widget-area-select .selected { color: #fff; text-shadow: 0 -1px 0 rgba(0,0,0,.4); - background: #2ea2cc; + background: #00a0d2; } #customize-theme-controls .widget-area-select .selected:before { @@ -275,123 +212,39 @@ display: block; } - /** * Styles for new widget addition panel */ -.wp-full-overlay-main { - left: auto; /* this overrides a right: 0; which causes the preview to resize, I'd rather have it go off screen at the normal size. */ - width: 100%; -} - -#customize-theme-controls .add-new-widget { - cursor: pointer; - float: left; - margin-right: 10px; - -webkit-transition: all 0.2s; - transition: all 0.2s; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - outline: none; -} - -.add-new-widget:before { - content: "\f132"; - display: inline-block; - position: relative; - right: -2px; - top: -1px; - font: normal 20px/1 'dashicons'; - vertical-align: middle; - -webkit-transition: all 0.2s; - transition: all 0.2s; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -body.adding-widget .add-new-widget, -body.adding-widget .add-new-widget:hover { - background: #eee; - border-color: #999; - color: #333; - -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); - box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); -} -body.adding-widget .add-new-widget:before { - -webkit-transform: rotate(45deg); - -ms-transform: rotate(45deg); - transform: rotate(45deg); -} - -#available-widgets .widget { - position: static; -} -/* override widgets admin page rules in wp-admin/css/wp-admin.css */ +/* override widgets admin page rules in wp-admin/css/widgets.css */ #widgets-left #available-widgets .widget { float: none !important; width: auto !important; } -#available-widgets { - position: absolute; - overflow: auto; - top: 0; - bottom: 0; - right: -301px; - width: 300px; - margin: 0; - z-index: 1; - background: #fff; - -webkit-transition: all 0.2s; - transition: all 0.2s; - border-left: 1px solid #dddddd; -} - -#available-widgets-filter { - padding: 8px 13px 7px 17px; - border-bottom: 1px solid #e4e4e4; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -#available-widgets-filter input { - padding: 5px 10px 2px 10px; - width: 100%; -} - -#available-widgets .widget-tpl { - position: relative; - padding: 20px 60px 20px 15px; - border-bottom: 1px solid #e4e4e4; - cursor: pointer; - display: none; +.ios #available-widgets { + -webkit-transition: right 0s; + transition: right 0s; } #available-widgets .widget-tpl:hover, #available-widgets .widget-tpl.selected { - background: #fafafa; + background: #eee; + border-bottom-color: #ccc; } -#available-widgets .widget-top, -#available-widgets .widget-top:hover { - border: none; - background: transparent; - -webkit-box-shadow: none; - box-shadow: none; +#customize-controls .widget-title h3 { + font-size: 1em; } -#available-widgets .widget-title h4 { +#available-widgets .widget-title h3 { padding: 0 0 5px; font-size: 14px; } #available-widgets .widget .widget-description { padding: 0; - color: #777; + color: #72777c; } #customize-preview { @@ -401,6 +254,7 @@ body.adding-widget .add-new-widget:before { body.adding-widget #available-widgets { right: 0; + visibility: visible; } body.adding-widget .wp-full-overlay-main { @@ -416,7 +270,8 @@ body.adding-widget #customize-preview { * Widget Icon styling * No plurals in naming. * Ordered from lowest to highest specificity. - **/ + */ + #available-widgets .widget-title { position: relative; } @@ -429,8 +284,8 @@ body.adding-widget #customize-preview { margin-left: 20px; width: 20px; height: 20px; - color: #333; - font: normal 20px/1 'dashicons'; + color: #32373c; + font: normal 20px/1 dashicons; text-align: center; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -565,9 +420,8 @@ body.adding-widget #customize-preview { #available-widgets [class*="tweet"] .widget-title:before, #available-widgets [class*="twitter"] .widget-title:before { content: "\f301"; } - @media screen and (max-height: 700px) and (min-width: 981px) { - .customize-control { + .customize-control-widget { margin-bottom: 0; } .widget-top { @@ -582,12 +436,9 @@ body.adding-widget #customize-preview { .last-widget { margin-bottom: 15px; } - .widget-title h4 { + .widget-title h3 { padding: 13px 15px; } - .widget-top a.widget-action:after { - padding-top: 9px; - } .widget-reorder-nav span { height: 39px; } diff --git a/wp-admin/css/customize-widgets-rtl.min.css b/wp-admin/css/customize-widgets-rtl.min.css index f8bd054..bfe8b97 100644 --- a/wp-admin/css/customize-widgets-rtl.min.css +++ b/wp-admin/css/customize-widgets-rtl.min.css @@ -1 +1 @@ -.wp-full-overlay-sidebar{overflow:visible}.control-section[id^=accordion-section-sidebar-widgets-],.customize-control-sidebar_widgets .hide-if-js,.customize-control-sidebar_widgets label{display:none}.customize-control-widget_form .widget-top{-webkit-transition:opacity .5s;transition:opacity .5s}.customize-control-widget_form:not(.widget-rendered) .widget-top{opacity:.5}.customize-control-widget_form .spinner,.customize-control-widget_form .widget-control-save{display:none}.customize-control-widget_form.previewer-loading .spinner{display:inline}.customize-control-widget_form.widget-form-disabled .widget-content{opacity:.7;pointer-events:none;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}.customize-control-widget_form .widget{margin-bottom:0}.customize-control-widget_form.wide-widget-control .widget-inside{position:fixed;right:299px;top:25%;border:1px solid #e5e5e5;overflow:auto}.customize-control-widget_form.wide-widget-control .widget-inside>.form{padding:20px}.customize-control-widget_form.wide-widget-control .widget-top{-webkit-transition:background-color .4s;transition:background-color .4s}.customize-control-widget_form.wide-widget-control.expanded:not(.collapsing) .widget-top,.customize-control-widget_form.wide-widget-control.expanding .widget-top{background-color:#e3e3e3}.widget-inside{padding:1px 10px 10px;border-top:0;line-height:16px}.widget-top{cursor:move}.customize-control-widget_form.expanded a.widget-action:after{content:"\f142"}.customize-control-widget_form.wide-widget-control a.widget-action:after{content:"\f139"}.customize-control-widget_form.wide-widget-control.expanded a.widget-action:after{content:"\f141"}.widget-title-action{cursor:pointer}.customize-control-widget_form .widget .customize-control-title{cursor:move}.control-section.accordion-section.highlighted>.accordion-section-title,.customize-control-widget_form.highlighted{outline:0;-webkit-box-shadow:0 0 2px rgba(30,140,190,.8);box-shadow:0 0 2px rgba(30,140,190,.8);position:relative;z-index:1}#widget-customizer-control-templates{display:none}.reorder-toggle{float:left;padding:5px 8px;text-decoration:none;cursor:pointer;outline:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.reorder-toggle:focus{outline:1px dotted}.reorder-done,.reordering .reorder{display:none}.reordering .reorder-done{display:block;color:#a00}#customize-theme-controls .reordering .add-new-widget{opacity:.2;pointer-events:none;cursor:not-allowed}#customize-theme-controls .widget-reorder-nav{display:none;float:left;background-color:#fafafa}.widget-reorder-nav span{position:relative;overflow:hidden;float:right;display:block;width:33px;height:43px;color:#888;text-indent:-9999px;cursor:pointer;outline:0}.widget-reorder-nav span:before{display:inline-block;position:absolute;top:0;left:0;width:100%;height:100%;font:400 20px/43px dashicons;text-align:center;text-indent:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.widget-reorder-nav span:focus,.widget-reorder-nav span:hover{color:#444;background:#eee}.move-widget:before{content:'\f504'}.move-widget-down:before{content:'\f347'}.move-widget-up:before{content:'\f343'}#customize-theme-controls .first-widget .move-widget-up,#customize-theme-controls .last-widget .move-widget-down{color:#d5d5d5;cursor:default}#customize-theme-controls .move-widget-area{display:none;background:#fff;border:1px solid #dedede;border-top:0;cursor:auto}#customize-theme-controls .reordering .move-widget-area.active{display:block}#customize-theme-controls .move-widget-area .description{margin:0;padding:15px 20px;font-weight:400}#customize-theme-controls .widget-area-select{margin:0;padding:0;list-style:none}#customize-theme-controls .widget-area-select li{position:relative;margin:0;padding:13px 42px 15px 15px;color:#555;border-top:1px solid #eee;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}#customize-theme-controls .widget-area-select li:before{display:none;content:'\f147';position:absolute;top:12px;right:10px;font:400 20px/1 dashicons;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#customize-theme-controls .widget-area-select li:last-child{border-bottom:1px solid #eee}#customize-theme-controls .widget-area-select .selected{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.4);background:#2ea2cc}#customize-theme-controls .widget-area-select .selected:before{display:block}#customize-theme-controls .move-widget-actions{text-align:left;padding:12px}#customize-theme-controls .reordering .widget-title-action{display:none}#customize-theme-controls .reordering .widget-reorder-nav{display:block}.wp-full-overlay-main{left:auto;width:100%}#customize-theme-controls .add-new-widget{cursor:pointer;float:left;margin-right:10px;-webkit-transition:all .2s;transition:all .2s;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;outline:0}.add-new-widget:before{content:"\f132";display:inline-block;position:relative;right:-2px;top:-1px;font:400 20px/1 dashicons;vertical-align:middle;-webkit-transition:all .2s;transition:all .2s;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}body.adding-widget .add-new-widget,body.adding-widget .add-new-widget:hover{background:#eee;border-color:#999;color:#333;-webkit-box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5);box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5)}body.adding-widget .add-new-widget:before{-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg)}#available-widgets .widget{position:static}#widgets-left #available-widgets .widget{float:none!important;width:auto!important}#available-widgets{position:absolute;overflow:auto;top:0;bottom:0;right:-301px;width:300px;margin:0;z-index:1;background:#fff;-webkit-transition:all .2s;transition:all .2s;border-left:1px solid #ddd}#available-widgets-filter{padding:8px 13px 7px 17px;border-bottom:1px solid #e4e4e4;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#available-widgets-filter input{padding:5px 10px 2px;width:100%}#available-widgets .widget-tpl{position:relative;padding:20px 60px 20px 15px;border-bottom:1px solid #e4e4e4;cursor:pointer;display:none}#available-widgets .widget-tpl.selected,#available-widgets .widget-tpl:hover{background:#fafafa}#available-widgets .widget-top,#available-widgets .widget-top:hover{border:0;background:0 0;-webkit-box-shadow:none;box-shadow:none}#available-widgets .widget-title h4{padding:0 0 5px;font-size:14px}#available-widgets .widget .widget-description{padding:0;color:#777}#customize-preview{-webkit-transition:all .2s;transition:all .2s}body.adding-widget #available-widgets{right:0}body.adding-widget .wp-full-overlay-main{right:300px}body.adding-widget #customize-preview{opacity:.4}#available-widgets .widget-title{position:relative}#available-widgets .widget-title:before{content:"\f132";position:absolute;top:-3px;left:100%;margin-left:20px;width:20px;height:20px;color:#333;font:400 20px/1 dashicons;text-align:center;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#available-widgets [class*=easy] .widget-title:before{content:"\f328";top:-4px}#available-widgets [class*=like] .widget-title:before,#available-widgets [class*=super] .widget-title:before{content:"\f155";top:-4px}#available-widgets [class*=meta] .widget-title:before{content:"\f120"}#available-widgets [class*=archives] .widget-title:before{content:"\f480";top:-4px}#available-widgets [class*=categor] .widget-title:before{content:"\f318";top:-4px}#available-widgets [class*=chat] .widget-title:before,#available-widgets [class*=comment] .widget-title:before,#available-widgets [class*=testimonial] .widget-title:before{content:"\f101"}#available-widgets [class*=post] .widget-title:before{content:"\f109"}#available-widgets [class*=page] .widget-title:before{content:"\f105"}#available-widgets [class*=text] .widget-title:before{content:"\f478"}#available-widgets [class*=link] .widget-title:before{content:"\f103"}#available-widgets [class*=search] .widget-title:before{content:"\f179"}#available-widgets [class*=menu] .widget-title:before,#available-widgets [class*=nav] .widget-title:before{content:"\f333"}#available-widgets [class*=tag] .widget-title:before{content:"\f479"}#available-widgets [class*=rss] .widget-title:before{content:"\f303";top:-6px}#available-widgets [class*=calendar] .widget-title:before,#available-widgets [class*=event] .widget-title:before{content:"\f145";top:-4px}#available-widgets [class*=image] .widget-title:before,#available-widgets [class*=instagram] .widget-title:before,#available-widgets [class*=photo] .widget-title:before,#available-widgets [class*=slide] .widget-title:before{content:"\f128"}#available-widgets [class*=album] .widget-title:before,#available-widgets [class*=galler] .widget-title:before{content:"\f161"}#available-widgets [class*=tube] .widget-title:before,#available-widgets [class*=video] .widget-title:before{content:"\f126"}#available-widgets [class*=audio] .widget-title:before,#available-widgets [class*=music] .widget-title:before,#available-widgets [class*=radio] .widget-title:before{content:"\f127"}#available-widgets [class*=avatar] .widget-title:before,#available-widgets [class*=grofile] .widget-title:before,#available-widgets [class*=login] .widget-title:before,#available-widgets [class*=member] .widget-title:before,#available-widgets [class*=profile] .widget-title:before,#available-widgets [class*=subscriber] .widget-title:before,#available-widgets [class*=user] .widget-title:before{content:"\f110"}#available-widgets [class*=cart] .widget-title:before,#available-widgets [class*=commerce] .widget-title:before,#available-widgets [class*=shop] .widget-title:before{content:"\f174";top:-4px}#available-widgets [class*=firewall] .widget-title:before,#available-widgets [class*=secur] .widget-title:before{content:"\f332"}#available-widgets [class*=analytic] .widget-title:before,#available-widgets [class*=poll] .widget-title:before,#available-widgets [class*=stat] .widget-title:before{content:"\f185"}#available-widgets [class*=form] .widget-title:before{content:"\f175"}#available-widgets [class*=contact] .widget-title:before,#available-widgets [class*=mail] .widget-title:before,#available-widgets [class*=news] .widget-title:before,#available-widgets [class*=subscribe] .widget-title:before{content:"\f466"}#available-widgets [class*=share] .widget-title:before,#available-widgets [class*=socia] .widget-title:before{content:"\f237"}#available-widgets [class*=lang] .widget-title:before,#available-widgets [class*=translat] .widget-title:before{content:"\f326"}#available-widgets [class*=locat] .widget-title:before,#available-widgets [class*=map] .widget-title:before{content:"\f231"}#available-widgets [class*=download] .widget-title:before{content:"\f316"}#available-widgets [class*=weather] .widget-title:before{content:"\f176";top:-4px}#available-widgets [class*=facebook] .widget-title:before{content:"\f304"}#available-widgets [class*=tweet] .widget-title:before,#available-widgets [class*=twitter] .widget-title:before{content:"\f301"}@media screen and (max-height:700px) and (min-width:981px){.customize-control{margin-bottom:0}.widget-top{-webkit-box-shadow:none;box-shadow:none;margin-top:-1px}.widget-top:hover{position:relative;z-index:1}.last-widget{margin-bottom:15px}.widget-title h4{padding:13px 15px}.widget-top a.widget-action:after{padding-top:9px}.widget-reorder-nav span{height:39px}.widget-reorder-nav span:before{line-height:39px}#customize-theme-controls .widget-area-select li{padding:9px 42px 11px 15px}#customize-theme-controls .widget-area-select li:before{top:8px}} \ No newline at end of file +.control-section.control-section-sidebar .accordion-section-content.ui-sortable,.wp-full-overlay-sidebar{overflow:visible}.control-section.control-section-sidebar,.customize-control-sidebar_widgets .hide-if-js,.customize-control-sidebar_widgets label{display:none}.customize-control-widget_form .widget-top{background:#fff;-webkit-transition:opacity .5s;transition:opacity .5s}.customize-control .widget-action{color:#72777c}.customize-control .widget-action:focus,.customize-control .widget-top:hover .widget-action{color:#23282d}.customize-control-widget_form:not(.widget-rendered) .widget-top{opacity:.5}.customize-control-widget_form .widget-control-save{display:none}.customize-control-widget_form .spinner{visibility:hidden;margin-top:0}.customize-control-widget_form.previewer-loading .spinner{visibility:visible}.customize-control-widget_form.widget-form-disabled .widget-content{opacity:.7;pointer-events:none;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}.customize-control-widget_form .widget{margin-bottom:0}.customize-control-widget_form.wide-widget-control .widget-inside{position:fixed;right:299px;top:25%;border:1px solid #e5e5e5;overflow:auto}.customize-control-widget_form.wide-widget-control .widget-inside>.form{padding:20px}.customize-control-widget_form.wide-widget-control .widget-top{-webkit-transition:background-color .4s;transition:background-color .4s}.customize-control-widget_form.wide-widget-control.expanded:not(.collapsing) .widget-top,.customize-control-widget_form.wide-widget-control.expanding .widget-top{background-color:#e3e3e3}.widget-inside{padding:1px 10px 10px;border-top:none;line-height:16px}.customize-control-widget_form.expanded a.widget-action:after{content:"\f142"}.customize-control-widget_form.wide-widget-control a.widget-action:after{content:"\f141"}.customize-control-widget_form.wide-widget-control.expanded a.widget-action:after{content:"\f139"}.widget-title-action{cursor:pointer}.customize-control-widget_form .widget .customize-control-title,.widget-top{cursor:move}.control-section.accordion-section.highlighted>.accordion-section-title,.customize-control-widget_form.highlighted{outline:0;-webkit-box-shadow:0 0 2px rgba(30,140,190,.8);box-shadow:0 0 2px rgba(30,140,190,.8);position:relative;z-index:1}#widget-customizer-control-templates{display:none}#customize-theme-controls .widget-reorder-nav{display:none;float:left;background-color:#fafafa}.move-widget:before{content:"\f504"}#customize-theme-controls .move-widget-area{display:none;background:#fff;border:1px solid #ddd;border-top:none;cursor:auto}#customize-theme-controls .reordering .move-widget-area.active{display:block}#customize-theme-controls .move-widget-area .description{margin:0;padding:15px 20px;font-weight:400}#customize-theme-controls .widget-area-select{margin:0;padding:0;list-style:none}#customize-theme-controls .widget-area-select li{position:relative;margin:0;padding:13px 42px 15px 15px;color:#555;border-top:1px solid #eee;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}#customize-theme-controls .widget-area-select li:before{display:none;content:"\f147";position:absolute;top:12px;right:10px;font:400 20px/1 dashicons;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#customize-theme-controls .widget-area-select li:last-child{border-bottom:1px solid #eee}#customize-theme-controls .widget-area-select .selected{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.4);background:#00a0d2}#customize-theme-controls .widget-area-select .selected:before{display:block}#customize-theme-controls .move-widget-actions{text-align:left;padding:12px}#customize-theme-controls .reordering .widget-title-action{display:none}#customize-theme-controls .reordering .widget-reorder-nav{display:block}#widgets-left #available-widgets .widget{float:none!important;width:auto!important}.ios #available-widgets{-webkit-transition:right 0s;transition:right 0s}#available-widgets .widget-tpl.selected,#available-widgets .widget-tpl:hover{background:#eee;border-bottom-color:#ccc}#customize-controls .widget-title h3{font-size:1em}#available-widgets .widget-title h3{padding:0 0 5px;font-size:14px}#available-widgets .widget .widget-description{padding:0;color:#72777c}#customize-preview{-webkit-transition:all .2s;transition:all .2s}body.adding-widget #available-widgets{right:0;visibility:visible}body.adding-widget .wp-full-overlay-main{right:300px}body.adding-widget #customize-preview{opacity:.4}#available-widgets .widget-title{position:relative}#available-widgets .widget-title:before{content:"\f132";position:absolute;top:-3px;left:100%;margin-left:20px;width:20px;height:20px;color:#32373c;font:400 20px/1 dashicons;text-align:center;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#available-widgets [class*=easy] .widget-title:before{content:"\f328";top:-4px}#available-widgets [class*=super] .widget-title:before,#available-widgets [class*=like] .widget-title:before{content:"\f155";top:-4px}#available-widgets [class*=meta] .widget-title:before{content:"\f120"}#available-widgets [class*=archives] .widget-title:before{content:"\f480";top:-4px}#available-widgets [class*=categor] .widget-title:before{content:"\f318";top:-4px}#available-widgets [class*=comment] .widget-title:before,#available-widgets [class*=testimonial] .widget-title:before,#available-widgets [class*=chat] .widget-title:before{content:"\f101"}#available-widgets [class*=post] .widget-title:before{content:"\f109"}#available-widgets [class*=page] .widget-title:before{content:"\f105"}#available-widgets [class*=text] .widget-title:before{content:"\f478"}#available-widgets [class*=link] .widget-title:before{content:"\f103"}#available-widgets [class*=search] .widget-title:before{content:"\f179"}#available-widgets [class*=menu] .widget-title:before,#available-widgets [class*=nav] .widget-title:before{content:"\f333"}#available-widgets [class*=tag] .widget-title:before{content:"\f479"}#available-widgets [class*=rss] .widget-title:before{content:"\f303";top:-6px}#available-widgets [class*=event] .widget-title:before,#available-widgets [class*=calendar] .widget-title:before{content:"\f145";top:-4px}#available-widgets [class*=image] .widget-title:before,#available-widgets [class*=photo] .widget-title:before,#available-widgets [class*=slide] .widget-title:before,#available-widgets [class*=instagram] .widget-title:before{content:"\f128"}#available-widgets [class*=album] .widget-title:before,#available-widgets [class*=galler] .widget-title:before{content:"\f161"}#available-widgets [class*=video] .widget-title:before,#available-widgets [class*=tube] .widget-title:before{content:"\f126"}#available-widgets [class*=music] .widget-title:before,#available-widgets [class*=radio] .widget-title:before,#available-widgets [class*=audio] .widget-title:before{content:"\f127"}#available-widgets [class*=login] .widget-title:before,#available-widgets [class*=user] .widget-title:before,#available-widgets [class*=member] .widget-title:before,#available-widgets [class*=avatar] .widget-title:before,#available-widgets [class*=subscriber] .widget-title:before,#available-widgets [class*=profile] .widget-title:before,#available-widgets [class*=grofile] .widget-title:before{content:"\f110"}#available-widgets [class*=commerce] .widget-title:before,#available-widgets [class*=shop] .widget-title:before,#available-widgets [class*=cart] .widget-title:before{content:"\f174";top:-4px}#available-widgets [class*=secur] .widget-title:before,#available-widgets [class*=firewall] .widget-title:before{content:"\f332"}#available-widgets [class*=analytic] .widget-title:before,#available-widgets [class*=stat] .widget-title:before,#available-widgets [class*=poll] .widget-title:before{content:"\f185"}#available-widgets [class*=form] .widget-title:before{content:"\f175"}#available-widgets [class*=subscribe] .widget-title:before,#available-widgets [class*=news] .widget-title:before,#available-widgets [class*=contact] .widget-title:before,#available-widgets [class*=mail] .widget-title:before{content:"\f466"}#available-widgets [class*=share] .widget-title:before,#available-widgets [class*=socia] .widget-title:before{content:"\f237"}#available-widgets [class*=lang] .widget-title:before,#available-widgets [class*=translat] .widget-title:before{content:"\f326"}#available-widgets [class*=locat] .widget-title:before,#available-widgets [class*=map] .widget-title:before{content:"\f231"}#available-widgets [class*=download] .widget-title:before{content:"\f316"}#available-widgets [class*=weather] .widget-title:before{content:"\f176";top:-4px}#available-widgets [class*=facebook] .widget-title:before{content:"\f304"}#available-widgets [class*=tweet] .widget-title:before,#available-widgets [class*=twitter] .widget-title:before{content:"\f301"}@media screen and (max-height:700px) and (min-width:981px){.customize-control-widget{margin-bottom:0}.widget-top{-webkit-box-shadow:none;box-shadow:none;margin-top:-1px}.widget-top:hover{position:relative;z-index:1}.last-widget{margin-bottom:15px}.widget-title h3{padding:13px 15px}.widget-reorder-nav span{height:39px}.widget-reorder-nav span:before{line-height:39px}#customize-theme-controls .widget-area-select li{padding:9px 42px 11px 15px}#customize-theme-controls .widget-area-select li:before{top:8px}} \ No newline at end of file diff --git a/wp-admin/css/customize-widgets.css b/wp-admin/css/customize-widgets.css index f025f79..a32f56e 100644 --- a/wp-admin/css/customize-widgets.css +++ b/wp-admin/css/customize-widgets.css @@ -7,29 +7,47 @@ * preview loads and we know whether the sidebars are used in the template. */ -.control-section[id^="accordion-section-sidebar-widgets-"], +.control-section.control-section-sidebar, .customize-control-sidebar_widgets label, .customize-control-sidebar_widgets .hide-if-js { /* The link in .customize-control-sidebar_widgets .hide-if-js will fail if it ever gets used. */ - display:none; + display: none; +} + +.control-section.control-section-sidebar .accordion-section-content.ui-sortable { + overflow: visible; } .customize-control-widget_form .widget-top { + background: #fff; -webkit-transition: opacity 0.5s; transition: opacity 0.5s; } +.customize-control .widget-action { + color: #72777c; +} + +.customize-control .widget-top:hover .widget-action, +.customize-control .widget-action:focus { + color: #23282d; +} + .customize-control-widget_form:not(.widget-rendered) .widget-top { opacity: 0.5; } -.customize-control-widget_form .widget-control-save, -.customize-control-widget_form .spinner { +.customize-control-widget_form .widget-control-save { display: none; } +.customize-control-widget_form .spinner { + visibility: hidden; + margin-top: 0; +} + .customize-control-widget_form.previewer-loading .spinner { - display: inline; + visibility: visible; } .customize-control-widget_form.widget-form-disabled .widget-content { @@ -71,10 +89,6 @@ line-height: 16px; } -.widget-top { - cursor: move; -} - .customize-control-widget_form.expanded a.widget-action:after { content: "\f142"; } @@ -91,6 +105,7 @@ cursor: pointer; } +.widget-top, .customize-control-widget_form .widget .customize-control-title { cursor: move; } @@ -109,39 +124,8 @@ } /** -* Widget reordering styles -**/ - -.reorder-toggle { - float: right; - padding: 5px 8px; - text-decoration: none; - cursor: pointer; - outline: none; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} -.reorder-toggle:focus { - outline: 1px dotted; -} - -.reorder-done, -.reordering .reorder { - display: none; -} - -.reordering .reorder-done { - display: block; - color: #aa0000; -} - -#customize-theme-controls .reordering .add-new-widget { - opacity: 0.2; - pointer-events: none; - cursor: not-allowed; -} + * Widget reordering styles + */ #customize-theme-controls .widget-reorder-nav { display: none; @@ -149,61 +133,14 @@ background-color: #fafafa; } -.widget-reorder-nav span { - position: relative; - overflow: hidden; - float: left; - display: block; - width: 33px; /* was 42px for mobile */ - height: 43px; - color: #888; - text-indent: -9999px; - cursor: pointer; - outline: none; -} - -.widget-reorder-nav span:before { - display: inline-block; - position: absolute; - top: 0; - right: 0; - width: 100%; - height: 100%; - font: normal 20px/43px 'dashicons'; - text-align: center; - text-indent: 0; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -.widget-reorder-nav span:hover, -.widget-reorder-nav span:focus { - color: #444; - background: #eee; -} - .move-widget:before { - content: '\f504'; -} - -.move-widget-down:before { - content: '\f347'; -} - -.move-widget-up:before { - content: '\f343'; -} - -#customize-theme-controls .first-widget .move-widget-up, -#customize-theme-controls .last-widget .move-widget-down { - color: #d5d5d5; - cursor: default; + content: "\f504"; } -#customize-theme-controls .move-widget-area { +#customize-theme-controls .move-widget-area { display: none; background: #fff; - border: 1px solid #dedede; + border: 1px solid #ddd; border-top: none; cursor: auto; } @@ -239,11 +176,11 @@ #customize-theme-controls .widget-area-select li:before { display: none; - content: '\f147'; + content: "\f147"; position: absolute; top: 12px; left: 10px; - font: normal 20px/1 'dashicons'; + font: normal 20px/1 dashicons; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } @@ -255,7 +192,7 @@ #customize-theme-controls .widget-area-select .selected { color: #fff; text-shadow: 0 -1px 0 rgba(0,0,0,.4); - background: #2ea2cc; + background: #00a0d2; } #customize-theme-controls .widget-area-select .selected:before { @@ -275,123 +212,39 @@ display: block; } - /** * Styles for new widget addition panel */ -.wp-full-overlay-main { - right: auto; /* this overrides a right: 0; which causes the preview to resize, I'd rather have it go off screen at the normal size. */ - width: 100%; -} - -#customize-theme-controls .add-new-widget { - cursor: pointer; - float: right; - margin-left: 10px; - -webkit-transition: all 0.2s; - transition: all 0.2s; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - outline: none; -} - -.add-new-widget:before { - content: "\f132"; - display: inline-block; - position: relative; - left: -2px; - top: -1px; - font: normal 20px/1 'dashicons'; - vertical-align: middle; - -webkit-transition: all 0.2s; - transition: all 0.2s; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -body.adding-widget .add-new-widget, -body.adding-widget .add-new-widget:hover { - background: #eee; - border-color: #999; - color: #333; - -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); - box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); -} -body.adding-widget .add-new-widget:before { - -webkit-transform: rotate(45deg); - -ms-transform: rotate(45deg); - transform: rotate(45deg); -} - -#available-widgets .widget { - position: static; -} -/* override widgets admin page rules in wp-admin/css/wp-admin.css */ +/* override widgets admin page rules in wp-admin/css/widgets.css */ #widgets-left #available-widgets .widget { float: none !important; width: auto !important; } -#available-widgets { - position: absolute; - overflow: auto; - top: 0; - bottom: 0; - left: -301px; - width: 300px; - margin: 0; - z-index: 1; - background: #fff; - -webkit-transition: all 0.2s; - transition: all 0.2s; - border-right: 1px solid #dddddd; -} - -#available-widgets-filter { - padding: 8px 17px 7px 13px; - border-bottom: 1px solid #e4e4e4; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -#available-widgets-filter input { - padding: 5px 10px 2px 10px; - width: 100%; -} - -#available-widgets .widget-tpl { - position: relative; - padding: 20px 15px 20px 60px; - border-bottom: 1px solid #e4e4e4; - cursor: pointer; - display: none; +.ios #available-widgets { + -webkit-transition: left 0s; + transition: left 0s; } #available-widgets .widget-tpl:hover, #available-widgets .widget-tpl.selected { - background: #fafafa; + background: #eee; + border-bottom-color: #ccc; } -#available-widgets .widget-top, -#available-widgets .widget-top:hover { - border: none; - background: transparent; - -webkit-box-shadow: none; - box-shadow: none; +#customize-controls .widget-title h3 { + font-size: 1em; } -#available-widgets .widget-title h4 { +#available-widgets .widget-title h3 { padding: 0 0 5px; font-size: 14px; } #available-widgets .widget .widget-description { padding: 0; - color: #777; + color: #72777c; } #customize-preview { @@ -401,6 +254,7 @@ body.adding-widget .add-new-widget:before { body.adding-widget #available-widgets { left: 0; + visibility: visible; } body.adding-widget .wp-full-overlay-main { @@ -416,7 +270,8 @@ body.adding-widget #customize-preview { * Widget Icon styling * No plurals in naming. * Ordered from lowest to highest specificity. - **/ + */ + #available-widgets .widget-title { position: relative; } @@ -429,8 +284,8 @@ body.adding-widget #customize-preview { margin-right: 20px; width: 20px; height: 20px; - color: #333; - font: normal 20px/1 'dashicons'; + color: #32373c; + font: normal 20px/1 dashicons; text-align: center; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -565,9 +420,8 @@ body.adding-widget #customize-preview { #available-widgets [class*="tweet"] .widget-title:before, #available-widgets [class*="twitter"] .widget-title:before { content: "\f301"; } - @media screen and (max-height: 700px) and (min-width: 981px) { - .customize-control { + .customize-control-widget { margin-bottom: 0; } .widget-top { @@ -582,12 +436,9 @@ body.adding-widget #customize-preview { .last-widget { margin-bottom: 15px; } - .widget-title h4 { + .widget-title h3 { padding: 13px 15px; } - .widget-top a.widget-action:after { - padding-top: 9px; - } .widget-reorder-nav span { height: 39px; } diff --git a/wp-admin/css/customize-widgets.min.css b/wp-admin/css/customize-widgets.min.css index cac07db..b802cdd 100644 --- a/wp-admin/css/customize-widgets.min.css +++ b/wp-admin/css/customize-widgets.min.css @@ -1 +1 @@ -.wp-full-overlay-sidebar{overflow:visible}.control-section[id^=accordion-section-sidebar-widgets-],.customize-control-sidebar_widgets .hide-if-js,.customize-control-sidebar_widgets label{display:none}.customize-control-widget_form .widget-top{-webkit-transition:opacity .5s;transition:opacity .5s}.customize-control-widget_form:not(.widget-rendered) .widget-top{opacity:.5}.customize-control-widget_form .spinner,.customize-control-widget_form .widget-control-save{display:none}.customize-control-widget_form.previewer-loading .spinner{display:inline}.customize-control-widget_form.widget-form-disabled .widget-content{opacity:.7;pointer-events:none;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}.customize-control-widget_form .widget{margin-bottom:0}.customize-control-widget_form.wide-widget-control .widget-inside{position:fixed;left:299px;top:25%;border:1px solid #e5e5e5;overflow:auto}.customize-control-widget_form.wide-widget-control .widget-inside>.form{padding:20px}.customize-control-widget_form.wide-widget-control .widget-top{-webkit-transition:background-color .4s;transition:background-color .4s}.customize-control-widget_form.wide-widget-control.expanded:not(.collapsing) .widget-top,.customize-control-widget_form.wide-widget-control.expanding .widget-top{background-color:#e3e3e3}.widget-inside{padding:1px 10px 10px;border-top:0;line-height:16px}.widget-top{cursor:move}.customize-control-widget_form.expanded a.widget-action:after{content:"\f142"}.customize-control-widget_form.wide-widget-control a.widget-action:after{content:"\f139"}.customize-control-widget_form.wide-widget-control.expanded a.widget-action:after{content:"\f141"}.widget-title-action{cursor:pointer}.customize-control-widget_form .widget .customize-control-title{cursor:move}.control-section.accordion-section.highlighted>.accordion-section-title,.customize-control-widget_form.highlighted{outline:0;-webkit-box-shadow:0 0 2px rgba(30,140,190,.8);box-shadow:0 0 2px rgba(30,140,190,.8);position:relative;z-index:1}#widget-customizer-control-templates{display:none}.reorder-toggle{float:right;padding:5px 8px;text-decoration:none;cursor:pointer;outline:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.reorder-toggle:focus{outline:1px dotted}.reorder-done,.reordering .reorder{display:none}.reordering .reorder-done{display:block;color:#a00}#customize-theme-controls .reordering .add-new-widget{opacity:.2;pointer-events:none;cursor:not-allowed}#customize-theme-controls .widget-reorder-nav{display:none;float:right;background-color:#fafafa}.widget-reorder-nav span{position:relative;overflow:hidden;float:left;display:block;width:33px;height:43px;color:#888;text-indent:-9999px;cursor:pointer;outline:0}.widget-reorder-nav span:before{display:inline-block;position:absolute;top:0;right:0;width:100%;height:100%;font:400 20px/43px dashicons;text-align:center;text-indent:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.widget-reorder-nav span:focus,.widget-reorder-nav span:hover{color:#444;background:#eee}.move-widget:before{content:'\f504'}.move-widget-down:before{content:'\f347'}.move-widget-up:before{content:'\f343'}#customize-theme-controls .first-widget .move-widget-up,#customize-theme-controls .last-widget .move-widget-down{color:#d5d5d5;cursor:default}#customize-theme-controls .move-widget-area{display:none;background:#fff;border:1px solid #dedede;border-top:0;cursor:auto}#customize-theme-controls .reordering .move-widget-area.active{display:block}#customize-theme-controls .move-widget-area .description{margin:0;padding:15px 20px;font-weight:400}#customize-theme-controls .widget-area-select{margin:0;padding:0;list-style:none}#customize-theme-controls .widget-area-select li{position:relative;margin:0;padding:13px 15px 15px 42px;color:#555;border-top:1px solid #eee;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}#customize-theme-controls .widget-area-select li:before{display:none;content:'\f147';position:absolute;top:12px;left:10px;font:400 20px/1 dashicons;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#customize-theme-controls .widget-area-select li:last-child{border-bottom:1px solid #eee}#customize-theme-controls .widget-area-select .selected{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.4);background:#2ea2cc}#customize-theme-controls .widget-area-select .selected:before{display:block}#customize-theme-controls .move-widget-actions{text-align:right;padding:12px}#customize-theme-controls .reordering .widget-title-action{display:none}#customize-theme-controls .reordering .widget-reorder-nav{display:block}.wp-full-overlay-main{right:auto;width:100%}#customize-theme-controls .add-new-widget{cursor:pointer;float:right;margin-left:10px;-webkit-transition:all .2s;transition:all .2s;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;outline:0}.add-new-widget:before{content:"\f132";display:inline-block;position:relative;left:-2px;top:-1px;font:400 20px/1 dashicons;vertical-align:middle;-webkit-transition:all .2s;transition:all .2s;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}body.adding-widget .add-new-widget,body.adding-widget .add-new-widget:hover{background:#eee;border-color:#999;color:#333;-webkit-box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5);box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5)}body.adding-widget .add-new-widget:before{-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg)}#available-widgets .widget{position:static}#widgets-left #available-widgets .widget{float:none!important;width:auto!important}#available-widgets{position:absolute;overflow:auto;top:0;bottom:0;left:-301px;width:300px;margin:0;z-index:1;background:#fff;-webkit-transition:all .2s;transition:all .2s;border-right:1px solid #ddd}#available-widgets-filter{padding:8px 17px 7px 13px;border-bottom:1px solid #e4e4e4;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#available-widgets-filter input{padding:5px 10px 2px;width:100%}#available-widgets .widget-tpl{position:relative;padding:20px 15px 20px 60px;border-bottom:1px solid #e4e4e4;cursor:pointer;display:none}#available-widgets .widget-tpl.selected,#available-widgets .widget-tpl:hover{background:#fafafa}#available-widgets .widget-top,#available-widgets .widget-top:hover{border:0;background:0 0;-webkit-box-shadow:none;box-shadow:none}#available-widgets .widget-title h4{padding:0 0 5px;font-size:14px}#available-widgets .widget .widget-description{padding:0;color:#777}#customize-preview{-webkit-transition:all .2s;transition:all .2s}body.adding-widget #available-widgets{left:0}body.adding-widget .wp-full-overlay-main{left:300px}body.adding-widget #customize-preview{opacity:.4}#available-widgets .widget-title{position:relative}#available-widgets .widget-title:before{content:"\f132";position:absolute;top:-3px;right:100%;margin-right:20px;width:20px;height:20px;color:#333;font:400 20px/1 dashicons;text-align:center;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#available-widgets [class*=easy] .widget-title:before{content:"\f328";top:-4px}#available-widgets [class*=like] .widget-title:before,#available-widgets [class*=super] .widget-title:before{content:"\f155";top:-4px}#available-widgets [class*=meta] .widget-title:before{content:"\f120"}#available-widgets [class*=archives] .widget-title:before{content:"\f480";top:-4px}#available-widgets [class*=categor] .widget-title:before{content:"\f318";top:-4px}#available-widgets [class*=chat] .widget-title:before,#available-widgets [class*=comment] .widget-title:before,#available-widgets [class*=testimonial] .widget-title:before{content:"\f101"}#available-widgets [class*=post] .widget-title:before{content:"\f109"}#available-widgets [class*=page] .widget-title:before{content:"\f105"}#available-widgets [class*=text] .widget-title:before{content:"\f478"}#available-widgets [class*=link] .widget-title:before{content:"\f103"}#available-widgets [class*=search] .widget-title:before{content:"\f179"}#available-widgets [class*=menu] .widget-title:before,#available-widgets [class*=nav] .widget-title:before{content:"\f333"}#available-widgets [class*=tag] .widget-title:before{content:"\f479"}#available-widgets [class*=rss] .widget-title:before{content:"\f303";top:-6px}#available-widgets [class*=calendar] .widget-title:before,#available-widgets [class*=event] .widget-title:before{content:"\f145";top:-4px}#available-widgets [class*=image] .widget-title:before,#available-widgets [class*=instagram] .widget-title:before,#available-widgets [class*=photo] .widget-title:before,#available-widgets [class*=slide] .widget-title:before{content:"\f128"}#available-widgets [class*=album] .widget-title:before,#available-widgets [class*=galler] .widget-title:before{content:"\f161"}#available-widgets [class*=tube] .widget-title:before,#available-widgets [class*=video] .widget-title:before{content:"\f126"}#available-widgets [class*=audio] .widget-title:before,#available-widgets [class*=music] .widget-title:before,#available-widgets [class*=radio] .widget-title:before{content:"\f127"}#available-widgets [class*=avatar] .widget-title:before,#available-widgets [class*=grofile] .widget-title:before,#available-widgets [class*=login] .widget-title:before,#available-widgets [class*=member] .widget-title:before,#available-widgets [class*=profile] .widget-title:before,#available-widgets [class*=subscriber] .widget-title:before,#available-widgets [class*=user] .widget-title:before{content:"\f110"}#available-widgets [class*=cart] .widget-title:before,#available-widgets [class*=commerce] .widget-title:before,#available-widgets [class*=shop] .widget-title:before{content:"\f174";top:-4px}#available-widgets [class*=firewall] .widget-title:before,#available-widgets [class*=secur] .widget-title:before{content:"\f332"}#available-widgets [class*=analytic] .widget-title:before,#available-widgets [class*=poll] .widget-title:before,#available-widgets [class*=stat] .widget-title:before{content:"\f185"}#available-widgets [class*=form] .widget-title:before{content:"\f175"}#available-widgets [class*=contact] .widget-title:before,#available-widgets [class*=mail] .widget-title:before,#available-widgets [class*=news] .widget-title:before,#available-widgets [class*=subscribe] .widget-title:before{content:"\f466"}#available-widgets [class*=share] .widget-title:before,#available-widgets [class*=socia] .widget-title:before{content:"\f237"}#available-widgets [class*=lang] .widget-title:before,#available-widgets [class*=translat] .widget-title:before{content:"\f326"}#available-widgets [class*=locat] .widget-title:before,#available-widgets [class*=map] .widget-title:before{content:"\f231"}#available-widgets [class*=download] .widget-title:before{content:"\f316"}#available-widgets [class*=weather] .widget-title:before{content:"\f176";top:-4px}#available-widgets [class*=facebook] .widget-title:before{content:"\f304"}#available-widgets [class*=tweet] .widget-title:before,#available-widgets [class*=twitter] .widget-title:before{content:"\f301"}@media screen and (max-height:700px) and (min-width:981px){.customize-control{margin-bottom:0}.widget-top{-webkit-box-shadow:none;box-shadow:none;margin-top:-1px}.widget-top:hover{position:relative;z-index:1}.last-widget{margin-bottom:15px}.widget-title h4{padding:13px 15px}.widget-top a.widget-action:after{padding-top:9px}.widget-reorder-nav span{height:39px}.widget-reorder-nav span:before{line-height:39px}#customize-theme-controls .widget-area-select li{padding:9px 15px 11px 42px}#customize-theme-controls .widget-area-select li:before{top:8px}} \ No newline at end of file +.control-section.control-section-sidebar .accordion-section-content.ui-sortable,.wp-full-overlay-sidebar{overflow:visible}.control-section.control-section-sidebar,.customize-control-sidebar_widgets .hide-if-js,.customize-control-sidebar_widgets label{display:none}.customize-control-widget_form .widget-top{background:#fff;-webkit-transition:opacity .5s;transition:opacity .5s}.customize-control .widget-action{color:#72777c}.customize-control .widget-action:focus,.customize-control .widget-top:hover .widget-action{color:#23282d}.customize-control-widget_form:not(.widget-rendered) .widget-top{opacity:.5}.customize-control-widget_form .widget-control-save{display:none}.customize-control-widget_form .spinner{visibility:hidden;margin-top:0}.customize-control-widget_form.previewer-loading .spinner{visibility:visible}.customize-control-widget_form.widget-form-disabled .widget-content{opacity:.7;pointer-events:none;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}.customize-control-widget_form .widget{margin-bottom:0}.customize-control-widget_form.wide-widget-control .widget-inside{position:fixed;left:299px;top:25%;border:1px solid #e5e5e5;overflow:auto}.customize-control-widget_form.wide-widget-control .widget-inside>.form{padding:20px}.customize-control-widget_form.wide-widget-control .widget-top{-webkit-transition:background-color .4s;transition:background-color .4s}.customize-control-widget_form.wide-widget-control.expanded:not(.collapsing) .widget-top,.customize-control-widget_form.wide-widget-control.expanding .widget-top{background-color:#e3e3e3}.widget-inside{padding:1px 10px 10px;border-top:none;line-height:16px}.customize-control-widget_form.expanded a.widget-action:after{content:"\f142"}.customize-control-widget_form.wide-widget-control a.widget-action:after{content:"\f139"}.customize-control-widget_form.wide-widget-control.expanded a.widget-action:after{content:"\f141"}.widget-title-action{cursor:pointer}.customize-control-widget_form .widget .customize-control-title,.widget-top{cursor:move}.control-section.accordion-section.highlighted>.accordion-section-title,.customize-control-widget_form.highlighted{outline:0;-webkit-box-shadow:0 0 2px rgba(30,140,190,.8);box-shadow:0 0 2px rgba(30,140,190,.8);position:relative;z-index:1}#widget-customizer-control-templates{display:none}#customize-theme-controls .widget-reorder-nav{display:none;float:right;background-color:#fafafa}.move-widget:before{content:"\f504"}#customize-theme-controls .move-widget-area{display:none;background:#fff;border:1px solid #ddd;border-top:none;cursor:auto}#customize-theme-controls .reordering .move-widget-area.active{display:block}#customize-theme-controls .move-widget-area .description{margin:0;padding:15px 20px;font-weight:400}#customize-theme-controls .widget-area-select{margin:0;padding:0;list-style:none}#customize-theme-controls .widget-area-select li{position:relative;margin:0;padding:13px 15px 15px 42px;color:#555;border-top:1px solid #eee;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}#customize-theme-controls .widget-area-select li:before{display:none;content:"\f147";position:absolute;top:12px;left:10px;font:400 20px/1 dashicons;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#customize-theme-controls .widget-area-select li:last-child{border-bottom:1px solid #eee}#customize-theme-controls .widget-area-select .selected{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.4);background:#00a0d2}#customize-theme-controls .widget-area-select .selected:before{display:block}#customize-theme-controls .move-widget-actions{text-align:right;padding:12px}#customize-theme-controls .reordering .widget-title-action{display:none}#customize-theme-controls .reordering .widget-reorder-nav{display:block}#widgets-left #available-widgets .widget{float:none!important;width:auto!important}.ios #available-widgets{-webkit-transition:left 0s;transition:left 0s}#available-widgets .widget-tpl.selected,#available-widgets .widget-tpl:hover{background:#eee;border-bottom-color:#ccc}#customize-controls .widget-title h3{font-size:1em}#available-widgets .widget-title h3{padding:0 0 5px;font-size:14px}#available-widgets .widget .widget-description{padding:0;color:#72777c}#customize-preview{-webkit-transition:all .2s;transition:all .2s}body.adding-widget #available-widgets{left:0;visibility:visible}body.adding-widget .wp-full-overlay-main{left:300px}body.adding-widget #customize-preview{opacity:.4}#available-widgets .widget-title{position:relative}#available-widgets .widget-title:before{content:"\f132";position:absolute;top:-3px;right:100%;margin-right:20px;width:20px;height:20px;color:#32373c;font:400 20px/1 dashicons;text-align:center;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#available-widgets [class*=easy] .widget-title:before{content:"\f328";top:-4px}#available-widgets [class*=super] .widget-title:before,#available-widgets [class*=like] .widget-title:before{content:"\f155";top:-4px}#available-widgets [class*=meta] .widget-title:before{content:"\f120"}#available-widgets [class*=archives] .widget-title:before{content:"\f480";top:-4px}#available-widgets [class*=categor] .widget-title:before{content:"\f318";top:-4px}#available-widgets [class*=comment] .widget-title:before,#available-widgets [class*=testimonial] .widget-title:before,#available-widgets [class*=chat] .widget-title:before{content:"\f101"}#available-widgets [class*=post] .widget-title:before{content:"\f109"}#available-widgets [class*=page] .widget-title:before{content:"\f105"}#available-widgets [class*=text] .widget-title:before{content:"\f478"}#available-widgets [class*=link] .widget-title:before{content:"\f103"}#available-widgets [class*=search] .widget-title:before{content:"\f179"}#available-widgets [class*=menu] .widget-title:before,#available-widgets [class*=nav] .widget-title:before{content:"\f333"}#available-widgets [class*=tag] .widget-title:before{content:"\f479"}#available-widgets [class*=rss] .widget-title:before{content:"\f303";top:-6px}#available-widgets [class*=event] .widget-title:before,#available-widgets [class*=calendar] .widget-title:before{content:"\f145";top:-4px}#available-widgets [class*=image] .widget-title:before,#available-widgets [class*=photo] .widget-title:before,#available-widgets [class*=slide] .widget-title:before,#available-widgets [class*=instagram] .widget-title:before{content:"\f128"}#available-widgets [class*=album] .widget-title:before,#available-widgets [class*=galler] .widget-title:before{content:"\f161"}#available-widgets [class*=video] .widget-title:before,#available-widgets [class*=tube] .widget-title:before{content:"\f126"}#available-widgets [class*=music] .widget-title:before,#available-widgets [class*=radio] .widget-title:before,#available-widgets [class*=audio] .widget-title:before{content:"\f127"}#available-widgets [class*=login] .widget-title:before,#available-widgets [class*=user] .widget-title:before,#available-widgets [class*=member] .widget-title:before,#available-widgets [class*=avatar] .widget-title:before,#available-widgets [class*=subscriber] .widget-title:before,#available-widgets [class*=profile] .widget-title:before,#available-widgets [class*=grofile] .widget-title:before{content:"\f110"}#available-widgets [class*=commerce] .widget-title:before,#available-widgets [class*=shop] .widget-title:before,#available-widgets [class*=cart] .widget-title:before{content:"\f174";top:-4px}#available-widgets [class*=secur] .widget-title:before,#available-widgets [class*=firewall] .widget-title:before{content:"\f332"}#available-widgets [class*=analytic] .widget-title:before,#available-widgets [class*=stat] .widget-title:before,#available-widgets [class*=poll] .widget-title:before{content:"\f185"}#available-widgets [class*=form] .widget-title:before{content:"\f175"}#available-widgets [class*=subscribe] .widget-title:before,#available-widgets [class*=news] .widget-title:before,#available-widgets [class*=contact] .widget-title:before,#available-widgets [class*=mail] .widget-title:before{content:"\f466"}#available-widgets [class*=share] .widget-title:before,#available-widgets [class*=socia] .widget-title:before{content:"\f237"}#available-widgets [class*=lang] .widget-title:before,#available-widgets [class*=translat] .widget-title:before{content:"\f326"}#available-widgets [class*=locat] .widget-title:before,#available-widgets [class*=map] .widget-title:before{content:"\f231"}#available-widgets [class*=download] .widget-title:before{content:"\f316"}#available-widgets [class*=weather] .widget-title:before{content:"\f176";top:-4px}#available-widgets [class*=facebook] .widget-title:before{content:"\f304"}#available-widgets [class*=tweet] .widget-title:before,#available-widgets [class*=twitter] .widget-title:before{content:"\f301"}@media screen and (max-height:700px) and (min-width:981px){.customize-control-widget{margin-bottom:0}.widget-top{-webkit-box-shadow:none;box-shadow:none;margin-top:-1px}.widget-top:hover{position:relative;z-index:1}.last-widget{margin-bottom:15px}.widget-title h3{padding:13px 15px}.widget-reorder-nav span{height:39px}.widget-reorder-nav span:before{line-height:39px}#customize-theme-controls .widget-area-select li{padding:9px 15px 11px 42px}#customize-theme-controls .widget-area-select li:before{top:8px}} \ No newline at end of file diff --git a/wp-admin/css/dashboard-rtl.css b/wp-admin/css/dashboard-rtl.css index f608d45..97820ad 100644 --- a/wp-admin/css/dashboard-rtl.css +++ b/wp-admin/css/dashboard-rtl.css @@ -56,10 +56,6 @@ min-height: 0; } -/*------------------------------------------------------------------------------ - 9.0 - Dashboard -------------------------------------------------------------------------------*/ - #dashboard-widgets-wrap { overflow: hidden; margin: 0 -8px; @@ -74,20 +70,6 @@ min-height: 100px; } -h3.dashboard-widget-title, -h3.dashboard-widget-title span, -h3.dashboard-widget-title small { - color: #333; -} - -h3.dashboard-widget-title small a { - color: #d7d7d7; -} - -h3.dashboard-widget-title small a:hover { - color: #fff; -} - /* @todo: this was originally in this section, but likely belongs elsewhere */ #the-comment-list td.comment p.comment-author { margin-top: 0; @@ -129,14 +111,14 @@ h3.dashboard-widget-title small a:hover { line-height: 2.1em; } -.welcome-panel h3 { +.welcome-panel h2 { margin: 0; font-size: 21px; font-weight: normal; line-height: 1.2; } -.welcome-panel h4 { +.welcome-panel h3 { margin: 1.33em 0 0; font-size: 16px; } @@ -146,7 +128,7 @@ h3.dashboard-widget-title small a:hover { } .welcome-panel p { - color: #777; + color: #72777c; } .welcome-panel a { @@ -160,24 +142,28 @@ h3.dashboard-widget-title small a:hover { .welcome-panel .welcome-panel-close { position: absolute; - top: 5px; + top: 10px; left: 10px; - padding: 20px 3px 0 15px; + padding: 10px 21px 10px 15px; font-size: 13px; + line-height: 1.23076923; /* Chrome rounding, needs to be 16px equivalent */ text-decoration: none; - line-height: 1; } -#welcome-panel.welcome-panel .welcome-panel-close::before { +.welcome-panel .welcome-panel-close:before { position: absolute; - right: -18px; - margin-top: -2px; + top: 8px; + right: 0; -webkit-transition: all .1s ease-in-out; transition: all .1s ease-in-out; } .wp-core-ui .welcome-panel .button.button-hero { - margin: 15px 0 3px; + margin: 15px 0 3px 13px; + padding: 12px 36px; + height: auto; + line-height: 1.4285714; + white-space: normal; } .welcome-panel-content { @@ -187,7 +173,6 @@ h3.dashboard-widget-title small a:hover { .welcome-panel .welcome-panel-column-container { clear: both; - overflow: hidden; position: relative; } @@ -211,22 +196,37 @@ h3.dashboard-widget-title small a:hover { .welcome-panel-column p { margin-top: 7px; - color: #464646; + color: #444; } -.welcome-panel .welcome-icon { - display: block; +.welcome-panel .welcome-widgets-menus { + line-height: 16px; +} + +.welcome-panel .welcome-panel-column ul { + margin: 0.8em 0 1em 1em; +} + +.welcome-panel .welcome-panel-column li { + line-height: 16px; + list-style-type: none; padding: 0 0 8px; +} + +.welcome-panel .welcome-icon { background: transparent !important; } -.welcome-panel .welcome-icon:before { - color: #888; - font: normal 20px/1 'dashicons'; +/* Welcome Panel and Right Now common Icons style */ + +.welcome-panel .welcome-icon:before, +#dashboard_right_now li a:before, +#dashboard_right_now li span:before { + color: #82878c; + font: normal 20px/1 dashicons; speak: none; display: inline-block; padding: 0 0 0 10px; - top: -1px; position: relative; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -234,47 +234,71 @@ h3.dashboard-widget-title small a:hover { vertical-align: top; } +/* Welcome Panel specific Icons styles */ + .welcome-panel .welcome-write-blog:before, .welcome-panel .welcome-edit-page:before { - content:'\f119'; + content: "\f119"; top: -3px; } .welcome-panel .welcome-add-page:before { - content:'\f132'; + content: "\f132"; + top: -1px; } .welcome-panel .welcome-view-site:before { - content:'\f115'; + content: "\f115"; top: -2px; } .welcome-panel .welcome-widgets-menus:before { - content:'\f116'; + content: "\f116"; top: -2px; } .welcome-panel .welcome-comments:before { - content:'\f117'; + content: "\f117"; top: -1px; } .welcome-panel .welcome-learn-more:before { - content:'\f118'; + content: "\f118"; top: -1px; } -.welcome-panel .welcome-widgets-menus { - line-height: 16px; +/* Right Now specific Icons styles */ + +#dashboard_right_now li a:before, +#dashboard_right_now li > span:before { /* get only the first level span to exclude screen-reader-text in mu-storage */ + content: "\f159"; /* generic icon for items added by CPTs ? */ + padding: 0 0 0 5px; } -.welcome-panel .welcome-panel-column ul { - margin: 0.8em 0 1em 1em; +#dashboard_right_now .page-count a:before, +#dashboard_right_now .page-count span:before { + content: "\f105"; } -.welcome-panel .welcome-panel-column li { - line-height: 16px; - list-style-type: none; +#dashboard_right_now .post-count a:before, +#dashboard_right_now .post-count span:before { + content: "\f109"; +} + +#dashboard_right_now .comment-count a:before { + content: "\f101"; +} + +#dashboard_right_now .comment-mod-count a:before { + content: "\f125"; +} + +#dashboard_right_now .storage-count a:before { + content: "\f104"; +} + +#dashboard_right_now .storage-count.warning a:before { + content: "\f153"; } /* Dashboard WordPress news */ @@ -301,17 +325,8 @@ body #dashboard-widgets .postbox form .submit { margin-top: 0; } -/* @todo: are these actually used anywhere? no non-CSS results in plugin search */ -div.dashboard-widget-error { - background-color: #c43; -} - -div.dashboard-widget-notice { - background-color: #cfe1ef; -} - .rssSummary { - color: #777; + color: #72777c; margin-top: 4px; } @@ -332,7 +347,7 @@ div.dashboard-widget-notice { #dashboard_primary .rss-widget span, #dashboard_primary .rss-widget span.rss-date { - color: #777; + color: #72777c; } #dashboard_primary .rss-widget span.rss-date { @@ -347,7 +362,9 @@ div.dashboard-widget-notice { #dashboard_right_now ul { margin: 0; - overflow: hidden; + /* contain floats but don't use overflow: hidden */ + display: inline-block; + width: 100%; } #dashboard_right_now li { @@ -357,12 +374,10 @@ div.dashboard-widget-notice { } #dashboard_right_now .inside { - overflow: hidden; padding: 0; } #dashboard_right_now .main { - overflow: hidden; padding: 0 12px 11px; } @@ -371,35 +386,33 @@ div.dashboard-widget-notice { } #dashboard_right_now #wp-version-message .button { - clear: left; float: left; position: relative; top: -5px; + margin-right: 5px; } .mu-storage { overflow: hidden; } -#dashboard-widgets h4.mu-storage { - margin-bottom: 10px; +#dashboard-widgets h3.mu-storage { + margin: 0 0 10px; + padding: 0; + font-size: 14px; + font-weight: normal; } /* Dashboard right now - Colors */ -#dashboard_right_now li a:before, -#dashboard_right_now li span:before { - color: #888; -} - #dashboard_right_now .sub { - color: #777; + color: #555d66; background: #f5f5f5; border-top: 1px solid #eee; padding: 10px 12px 6px 12px; } -#dashboard_right_now .sub h4 { +#dashboard_right_now .sub h3 { color: #555; } @@ -412,49 +425,6 @@ div.dashboard-widget-notice { color: #d54e21; } -/* Dashboard right now - Icons */ -#dashboard_right_now li a:before, -#dashboard_right_now li span:before { - content: '\f159'; - font: normal 20px/1 'dashicons'; - speak: none; - display: block; - float: right; - margin: 0 0 0 5px; - padding: 0; - text-indent: 0; - text-align: center; - position: relative; - -webkit-font-smoothing: antialiased; - text-decoration: none !important; -} - -#dashboard_right_now .page-count a:before, -#dashboard_right_now .page-count span:before { - content: '\f105'; -} - -#dashboard_right_now .post-count a:before, -#dashboard_right_now .post-count span:before { - content: '\f109'; -} - -#dashboard_right_now .comment-count a:before { - content: '\f101'; -} - -#dashboard_right_now .comment-mod-count a:before { - content: '\f125'; -} - -#dashboard_right_now .storage-count a:before { - content: '\f104'; -} - -#dashboard_right_now .storage-count.warning a:before { - content: '\f153'; -} - /* Dashboard Quick Draft */ #dashboard_quick_press .inside { @@ -469,7 +439,6 @@ div.dashboard-widget-notice { } #dashboard_quick_press form { - overflow: hidden; margin: 12px; } @@ -515,7 +484,7 @@ form.initial-form.quickpress-open input#title { #title-wrap #title-prompt-text, .textarea-wrap #content-prompt-text { - color: #777; + color: #72777c; } #title-wrap #title-prompt-text { @@ -559,11 +528,6 @@ form.initial-form.quickpress-open input#title { border: none; } -#dashboard_quick_press .drafts h4 { - margin: 0 12px 8px; - font-weight: normal; -} - #dashboard_quick_press .drafts .view-all { float: left; margin: 0 0 0 12px; @@ -581,7 +545,7 @@ form.initial-form.quickpress-open input#title { margin-bottom: 1em; } #dashboard_quick_press .drafts li time { - color: #777; + color: #72777c; } #dashboard_quick_press .drafts p { @@ -590,38 +554,42 @@ form.initial-form.quickpress-open input#title { } #dashboard_quick_press .draft-title { - overflow: hidden; + word-wrap: break-word; } #dashboard_quick_press .draft-title a, #dashboard_quick_press .draft-title time { - float: right; margin: 0 0 0 5px; } -/* Dashboard activity widget */ +/* Dashboard common styles */ -#dashboard-widgets #dashboard_activity h4 { - margin: 0 12px 8px 0; +#dashboard-widgets h4, /* Back-compat for pre-4.4 */ +#dashboard-widgets h3, +#dashboard_quick_press .drafts h2 { + margin: 0 12px 8px; + padding: 0; + font-size: 14px; font-weight: normal; + color: #23282d; } -#dashboard-widgets #dashboard_activity h4.comment-meta { - margin: 0; +#dashboard_quick_press .drafts h2 { + line-height: inherit; } -#dashboard_activity h4.comment-meta { - margin-bottom: 4px; +#dashboard-widgets .inside h4, /* Back-compat for pre-4.4 */ +#dashboard-widgets .inside h3 { + margin-right: 0; + margin-left: 0; } -#dashboard_activity ul { - padding: 0 12px; -} +/* Dashboard activity widget */ #dashboard_activity .comment-meta span.approve:before { - content: '\f227'; - font: 20px/.5 "dashicons"; - margin-right: 12px; + content: "\f227"; + font: 20px/.5 dashicons; + margin-right: 5px; vertical-align: middle; position: relative; top: -1px; @@ -629,18 +597,18 @@ form.initial-form.quickpress-open input#title { } #dashboard_activity .inside { - padding: 0; margin: 0; + padding-bottom: 0; } #dashboard_activity .no-activity { overflow: hidden; - padding: 0 12px 12px; + padding: 0 0 12px; text-align: center; } #dashboard_activity .no-activity p { - color: #999; + color: #72777c; font-size: 16px; } @@ -649,8 +617,8 @@ form.initial-form.quickpress-open input#title { } #dashboard_activity .no-activity .smiley:before { - content: '\f328'; - font: normal 120px/1 'dashicons'; + content: "\f328"; + font: normal 120px/1 dashicons; speak: none; display: block; margin: 0 0 0 5px; @@ -664,11 +632,16 @@ form.initial-form.quickpress-open input#title { #dashboard_activity .subsubsub { float: none; - border-top: 1px solid #eeeeee; - margin-top: 0; + border-top: 1px solid #eee; + margin: 0 -12px; padding: 8px 12px 4px; } +#dashboard_activity .subsubsub a .count, +#dashboard_activity .subsubsub a.current .count { + color: #72777c; /* white background on the dashboard but #f1f1f1 on list tables */ +} + #future-posts ul, #published-posts ul { clear: both; @@ -677,22 +650,21 @@ form.initial-form.quickpress-open input#title { #future-posts li, #published-posts li { - overflow: hidden; margin-bottom: 8px; } #future-posts ul span, #published-posts ul span { - color: #777; - float: right; - margin-left: 8px; + display: inline-block; + margin-left: 5px; min-width: 150px; + color: #72777c; } .activity-block { border-bottom: 1px solid #eee; - overflow: hidden; - padding: 8px 0 4px; + margin: 0 -12px; + padding: 8px 12px 4px; } .activity-block:last-child { @@ -710,11 +682,7 @@ form.initial-form.quickpress-open input#title { #activity-widget #the-comment-list div.undo { background: none; padding: 6px 0; -} - -#activity-widget #the-comment-list .alternate, -#activity-widget #the-comment-list .alt { - background: none; + margin-right: 12px; } #activity-widget #the-comment-list .comment-item { @@ -723,10 +691,9 @@ form.initial-form.quickpress-open input#title { position: relative; } -#activity-widget #the-comment-list img { +#activity-widget #the-comment-list .avatar { position: absolute; - right: 13px; - top: 13px; + top: 12px; } #activity-widget #the-comment-list .dashboard-comment-wrap { @@ -737,11 +704,6 @@ form.initial-form.quickpress-open input#title { margin: 1em 0; } -#activity-widget #the-comment-list .comment-item h4 { - font-size: 13px; - color: #999; -} - #activity-widget #the-comment-list .comment-item p.row-actions { margin: 4px 0 0 0; } @@ -767,7 +729,6 @@ form.initial-form.quickpress-open input#title { #activity-widget #the-comment-list .spam-undo-inside .avatar, #activity-widget #the-comment-list .trash-undo-inside .avatar { - margin-left: 20px; position: relative; top: 0; } @@ -778,12 +739,17 @@ form.initial-form.quickpress-open input#title { margin: 10px; } -.edit-box { +.postbox .button-link .edit-box { display: none; } -h3:hover .edit-box { - display: inline; +.edit-box { + opacity: 0; +} + +.hndle:hover .edit-box, +.edit-box:focus { + opacity: 1; } #dashboard-widgets form .input-text-wrap input { @@ -809,27 +775,13 @@ h3:hover .edit-box { text-decoration: none; } -#dashboard-widgets h3 a { +#dashboard-widgets h2 a { text-decoration: underline; } -#dashboard-widgets h3 .postbox-title-action { - position: absolute; - left: 10px; - padding: 0; - top: 5px; -} - -.js #dashboard-widgets h3 .postbox-title-action { - left: 33px; -} - -#dashboard-widgets h4 { - color: #222; - font-weight: normal; - font-size: 14px; - margin: 0 0 .2em; - padding: 0; +#dashboard-widgets .hndle .postbox-title-action { + float: left; + line-height: 1.2; } #dashboard_plugins h5 { @@ -840,9 +792,11 @@ h3:hover .edit-box { #latest-comments #the-comment-list { position: relative; + margin: 0 -12px; } -#activity-widget #the-comment-list .comment { +#activity-widget #the-comment-list .comment, +#activity-widget #the-comment-list .pingback { -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.06); box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.06); } @@ -852,7 +806,11 @@ h3:hover .edit-box { } #activity-widget #latest-comments #the-comment-list .comment-item { - padding: 1em 12px; + /* the row-actions paragraph is output only for users with 'edit_comment' capabilities, + for other users this needs a min height equal to the gravatar image */ + min-height: 50px; + margin: 0; + padding: 12px; } #latest-comments #the-comment-list .pingback { @@ -863,13 +821,13 @@ h3:hover .edit-box { border-top: none; } -#latest-comments #the-comment-list .comment-item h4 { +#latest-comments #the-comment-list .comment-meta { line-height: 1.5em; - margin-top: 0; + margin: 0; color: #666; } -#latest-comments #the-comment-list .comment-item h4 cite { +#latest-comments #the-comment-list .comment-meta cite { font-style: normal; font-weight: normal; } @@ -889,14 +847,14 @@ h3:hover .edit-box { /* QuickDraft */ -#title-wrap label { +#title-wrap label, +#description-wrap label { cursor: text; } #title-wrap #title { padding: 2px 6px; font-size: 1.3em; - line-height: 100%; outline: none; } @@ -924,7 +882,7 @@ a.rsswidget { } .rss-widget span.rss-date { - color: #999; + color: #72777c; font-size: 13px; margin-right: 3px; } @@ -937,11 +895,10 @@ a.rsswidget { } .rss-widget cite:before { - content: '\2014'; + content: "\2014"; } .dashboard-comment-wrap { - overflow: hidden; word-wrap: break-word; } @@ -977,12 +934,12 @@ a.rsswidget { box-shadow: none; } -#dashboard_browser_nag.postbox.browser-insecure h3 { +#dashboard_browser_nag.postbox.browser-insecure h2 { border-bottom-color: #cd5a5a; color: #fff; } -#dashboard_browser_nag.postbox h3 { +#dashboard_browser_nag.postbox h2 { border-bottom-color: #f6e2ac; background: transparent none; color: #fff; @@ -996,7 +953,7 @@ a.rsswidget { /* Make the browser nags easier to read with Open Sans */ -#dashboard_browser_nag h3.hndle { +#dashboard_browser_nag h2.hndle { border: none; font-weight: 600; font-size: 20px; @@ -1043,6 +1000,11 @@ a.rsswidget { min-height: 0; } + #dashboard-widgets #postbox-container-3 .empty-container:after, + #dashboard-widgets #postbox-container-4 .empty-container:after { + display: none; + } + #wpbody #wpbody-content #dashboard-widgets.columns-1 .postbox-container { width: 100%; } @@ -1063,6 +1025,10 @@ a.rsswidget { .columns-prefs .columns-prefs-4 { display: none; } + + .metabox-holder .postbox-container .empty-container:after { + display: block; + } } /* three columns on the dash */ @@ -1085,6 +1051,14 @@ a.rsswidget { height: 0; min-height: 0; } + + #dashboard-widgets #postbox-container-4 .empty-container:after { + display: none; + } + + .metabox-holder .postbox-container .empty-container:after { + display: block; + } } @media screen and (max-width: 870px) { @@ -1119,17 +1093,19 @@ a.rsswidget { /* Keep the close icon from overlapping the Welcome text. */ .welcome-panel .welcome-panel-close { overflow: hidden; - text-indent: 100%; + text-indent: 40px; white-space: nowrap; width: 20px; height: 20px; - left: 0; padding: 5px; + top: 5px; + left: 5px; } /* Make the close icon larger for tappability. */ - #welcome-panel.welcome-panel .welcome-panel-close::before { + .welcome-panel .welcome-panel-close:before { font-size: 20px; - margin: 0; + top: 5px; + right: -35px; } } diff --git a/wp-admin/css/dashboard-rtl.min.css b/wp-admin/css/dashboard-rtl.min.css new file mode 100644 index 0000000..e17f5df --- /dev/null +++ b/wp-admin/css/dashboard-rtl.min.css @@ -0,0 +1 @@ +#dashboard_quick_press .draft-title,#the-comment-list td.comment,.dashboard-comment-wrap{word-wrap:break-word}#wpbody-content #dashboard-widgets.columns-1 .postbox-container{width:100%}#wpbody-content #dashboard-widgets.columns-2 .postbox-container{width:49.5%}#wpbody-content #dashboard-widgets.columns-2 #postbox-container-2,#wpbody-content #dashboard-widgets.columns-2 #postbox-container-3,#wpbody-content #dashboard-widgets.columns-2 #postbox-container-4{float:left;width:50.5%}#wpbody-content #dashboard-widgets.columns-3 .postbox-container{width:33.5%}#wpbody-content #dashboard-widgets.columns-3 #postbox-container-1{width:33%}#wpbody-content #dashboard-widgets.columns-3 #postbox-container-3,#wpbody-content #dashboard-widgets.columns-3 #postbox-container-4{float:left}#dashboard-widgets .postbox-container,#wpbody-content #dashboard-widgets.columns-4 .postbox-container{width:25%}#dashboard-widgets-wrap .columns-3 #postbox-container-4 .empty-container{border:none!important}.ie8 #wpbody-content #dashboard-widgets .postbox-container{width:49.5%}.ie8 #wpbody-content #dashboard-widgets #postbox-container-2,.ie8 #wpbody-content #dashboard-widgets #postbox-container-3,.ie8 #wpbody-content #dashboard-widgets #postbox-container-4{float:left;width:50.5%}.ie8 #dashboard-widgets #postbox-container-3 .empty-container,.ie8 #dashboard-widgets #postbox-container-4 .empty-container{border:0;height:0;min-height:0}#dashboard-widgets-wrap{overflow:hidden;margin:0 -8px}#dashboard-widgets .postbox .inside{margin-bottom:0}#dashboard-widgets .meta-box-sortables{margin:0 8px;min-height:100px}#the-comment-list td.comment p.comment-author{margin-top:0;margin-right:0}#the-comment-list p.comment-author img{float:right;margin-left:8px}#the-comment-list p.comment-author strong a{border:none}#the-comment-list td{vertical-align:top}#the-comment-list td.comment img{max-width:100%}.welcome-panel{position:relative;overflow:auto;margin:16px 0;padding:23px 10px 0;border:1px solid #e5e5e5;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04);background:#fff;font-size:13px;line-height:2.1em}.dashboard-widget-control-form,.mu-storage{overflow:hidden}.welcome-panel h2{margin:0;font-size:21px;font-weight:400;line-height:1.2}.welcome-panel h3{margin:1.33em 0 0;font-size:16px}.welcome-panel li{font-size:14px}.welcome-panel p{color:#72777c}.welcome-panel a{text-decoration:none}.welcome-panel .about-description{font-size:16px;margin:0}.welcome-panel .welcome-panel-close{position:absolute;top:10px;left:10px;padding:10px 21px 10px 15px;font-size:13px;line-height:1.23076923;text-decoration:none}.welcome-panel .welcome-panel-close:before{position:absolute;top:8px;right:0;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}.wp-core-ui .welcome-panel .button.button-hero{margin:15px 0 3px 13px;padding:12px 36px;height:auto;line-height:1.4285714;white-space:normal}.welcome-panel-content{margin-right:13px;max-width:1500px}.welcome-panel .welcome-panel-column-container{clear:both;position:relative}.welcome-panel .welcome-panel-column{width:32%;min-width:200px;float:right}.ie8 .welcome-panel .welcome-panel-column{min-width:230px}.welcome-panel .welcome-panel-column:first-child{width:36%}.welcome-panel-column p.hide-if-no-customize{margin-top:10px}.welcome-panel-column p{margin-top:7px;color:#444}.welcome-panel .welcome-widgets-menus{line-height:16px}.welcome-panel .welcome-panel-column ul{margin:.8em 0 1em 1em}.welcome-panel .welcome-panel-column li{line-height:16px;list-style-type:none;padding:0 0 8px}.welcome-panel .welcome-icon{background:0 0!important}#dashboard_right_now li a:before,#dashboard_right_now li span:before,.welcome-panel .welcome-icon:before{color:#82878c;font:400 20px/1 dashicons;speak:none;display:inline-block;padding:0 0 0 10px;position:relative;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;vertical-align:top}#dashboard_primary .rss-widget span,#dashboard_primary .rss-widget span.rss-date,.rssSummary{color:#72777c}.welcome-panel .welcome-edit-page:before,.welcome-panel .welcome-write-blog:before{content:"\f119";top:-3px}.welcome-panel .welcome-add-page:before{content:"\f132";top:-1px}.welcome-panel .welcome-view-site:before{content:"\f115";top:-2px}.welcome-panel .welcome-widgets-menus:before{content:"\f116";top:-2px}.welcome-panel .welcome-comments:before{content:"\f117";top:-1px}.welcome-panel .welcome-learn-more:before{content:"\f118";top:-1px}#dashboard_right_now li a:before,#dashboard_right_now li>span:before{content:"\f159";padding:0 0 0 5px}#dashboard_right_now .page-count a:before,#dashboard_right_now .page-count span:before{content:"\f105"}#dashboard_right_now .post-count a:before,#dashboard_right_now .post-count span:before{content:"\f109"}#dashboard_right_now .comment-count a:before{content:"\f101"}#dashboard_right_now .comment-mod-count a:before{content:"\f125"}#dashboard_right_now .storage-count a:before{content:"\f104"}#dashboard_right_now .storage-count.warning a:before{content:"\f153"}#dashboard_primary .inside{margin:0;padding:0}#dashboard_primary .dashboard-widget-control-form,#dashboard_primary .widget-loading{padding:12px 12px 0}body #dashboard-widgets .postbox form .submit{margin:0}.dashboard-widget-control-form p{margin-top:0}.rssSummary{margin-top:4px}#dashboard_primary .rss-widget{border-bottom:1px solid #eee;font-size:13px;padding:8px 12px 10px}#dashboard_primary .rss-widget:last-child{border-bottom:none;padding-bottom:8px}#dashboard_primary .rss-widget a{font-weight:400}#dashboard_primary .rss-widget span.rss-date{margin-right:12px}#dashboard_primary .rss-widget ul li{margin-bottom:8px}#dashboard_right_now ul{margin:0;display:inline-block;width:100%}#dashboard_right_now li{width:50%;float:right;margin-bottom:10px}#dashboard_right_now .inside{padding:0}#dashboard_right_now .main{padding:0 12px 11px}#dashboard_right_now .main p{margin:0}#dashboard_right_now #wp-version-message .button{float:left;position:relative;top:-5px;margin-right:5px}#dashboard-widgets h3.mu-storage{margin:0 0 10px;padding:0;font-size:14px;font-weight:400}#dashboard_right_now .sub{color:#555d66;background:#f5f5f5;border-top:1px solid #eee;padding:10px 12px 6px}#dashboard_right_now .sub h3{color:#555}#dashboard_right_now .sub p{margin:0 0 1em}#dashboard_right_now .warning a:before,#dashboard_right_now .warning span:before{color:#d54e21}#dashboard_quick_press .drafts li time,#title-wrap #title-prompt-text,.textarea-wrap #content-prompt-text{color:#72777c}#dashboard_quick_press .inside{margin:0;padding:0}#dashboard_quick_press div.updated{margin-bottom:10px;border:1px solid #eee;border-width:1px 0 1px 1px}#dashboard_quick_press form{margin:12px}#dashboard_quick_press .drafts,#dashboard_quick_press .easy-blogging{padding:10px 0 0}input#save-post{float:right}form.initial-form.quickpress-open label.prompt{font-style:normal}form.initial-form.quickpress-open input#title{height:auto}#dashboard_quick_press input,#dashboard_quick_press textarea{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:0}#dashboard_quick_press textarea{resize:vertical}#description-wrap{margin-top:12px}.input-text-wrap,.textarea-wrap{position:relative}.input-text-wrap .prompt,.textarea-wrap .prompt{position:absolute}.textarea-wrap #content-prompt-text{font-size:1.1em;padding:7px 8px}.textarea-wrap textarea#content{margin:0 0 8px;padding:6px 7px}#quick-press textarea#content{min-height:90px;max-height:1300px;resize:none}.js #dashboard_quick_press .drafts{border-top:1px solid #eee}#dashboard_quick_press .drafts abbr{border:none}#dashboard_quick_press .drafts .view-all{float:left;margin:0 0 0 12px}#dashboard_primary a.rsswidget{font-weight:400}#dashboard_quick_press .drafts ul{margin:0 12px}#dashboard_quick_press .drafts li{margin-bottom:1em}#dashboard_quick_press .drafts p{margin:0;word-wrap:break-word}#dashboard_quick_press .draft-title a,#dashboard_quick_press .draft-title time{margin:0 0 0 5px}#dashboard-widgets h3,#dashboard-widgets h4,#dashboard_quick_press .drafts h2{margin:0 12px 8px;padding:0;font-size:14px;font-weight:400;color:#23282d}#dashboard_quick_press .drafts h2{line-height:inherit}#dashboard-widgets .inside h3,#dashboard-widgets .inside h4{margin-right:0;margin-left:0}#dashboard_activity .comment-meta span.approve:before{content:"\f227";font:20px/.5 dashicons;margin-right:5px;vertical-align:middle;position:relative;top:-1px;margin-left:2px}#dashboard_activity .inside{margin:0;padding-bottom:0}#dashboard_activity .no-activity{overflow:hidden;padding:0 0 12px;text-align:center}#dashboard_activity .no-activity p{color:#72777c;font-size:16px}#dashboard_activity .no-activity .smiley{margin-top:0}#dashboard_activity .no-activity .smiley:before{content:"\f328";font:400 120px/1 dashicons;speak:none;display:block;margin:0 0 0 5px;padding:0;text-indent:0;text-align:center;position:relative;-webkit-font-smoothing:antialiased;text-decoration:none!important}#dashboard-widgets h2 a,#dashboard_browser_nag a{text-decoration:underline}#dashboard_activity .subsubsub{float:none;border-top:1px solid #eee;margin:0 -12px;padding:8px 12px 4px}#dashboard_activity .subsubsub a .count,#dashboard_activity .subsubsub a.current .count{color:#72777c}#future-posts ul,#published-posts ul{clear:both;margin-bottom:0}#future-posts li,#published-posts li{margin-bottom:8px}#future-posts ul span,#published-posts ul span{display:inline-block;margin-left:5px;min-width:150px;color:#72777c}.activity-block{border-bottom:1px solid #eee;margin:0 -12px;padding:8px 12px 4px}.activity-block:last-child{border-bottom:none}.activity-block .subsubsub li{color:#ddd}#activity-widget #the-comment-list div.undo,#activity-widget #the-comment-list tr.undo{background:0 0;padding:6px 0;margin-right:12px}#activity-widget #the-comment-list .comment-item{background:#fafafa;padding:12px;position:relative}#activity-widget #the-comment-list .avatar{position:absolute;top:12px}#activity-widget #the-comment-list .dashboard-comment-wrap{padding-right:63px}#activity-widget #the-comment-list .dashboard-comment-wrap blockquote{margin:1em 0}#activity-widget #the-comment-list .comment-item p.row-actions{margin:4px 0 0}#activity-widget #the-comment-list .comment-item:first-child{border-top:1px solid #eee}#activity-widget #the-comment-list .unapproved{background-color:#fef7f1}#activity-widget #the-comment-list .unapproved:before{content:"";display:block;position:absolute;right:0;top:0;bottom:0;background:#d54e21;width:4px}#activity-widget #the-comment-list .spam-undo-inside .avatar,#activity-widget #the-comment-list .trash-undo-inside .avatar{position:relative;top:0}#dashboard-widgets #dashboard_browser_nag.postbox .inside{margin:10px}.postbox .button-link .edit-box{display:none}.edit-box{opacity:0}.edit-box:focus,.hndle:hover .edit-box{opacity:1}#dashboard-widgets form .input-text-wrap input,#dashboard-widgets form .textarea-wrap textarea{width:100%}#dashboard-widgets .postbox form .submit{float:none;margin:.5em 0 0;padding:0;border:none}#dashboard-widgets-wrap #dashboard-widgets .postbox form .submit #publish{min-width:0}#dashboard-widgets a{text-decoration:none}#dashboard-widgets .hndle .postbox-title-action{float:left;line-height:1.2}#dashboard_plugins h5{font-size:14px}#latest-comments #the-comment-list{position:relative;margin:0 -12px}#activity-widget #the-comment-list .comment,#activity-widget #the-comment-list .pingback{-webkit-box-shadow:inset 0 1px 0 rgba(0,0,0,.06);box-shadow:inset 0 1px 0 rgba(0,0,0,.06)}#activity-widget .comments #the-comment-list .alt{background-color:transparent}#activity-widget #latest-comments #the-comment-list .comment-item{min-height:50px;margin:0;padding:12px}#latest-comments #the-comment-list .pingback{padding-right:12px!important}#latest-comments #the-comment-list .comment-item:first-child{border-top:none}#latest-comments #the-comment-list .comment-meta{line-height:1.5em;margin:0;color:#666}#latest-comments #the-comment-list .comment-meta cite{font-style:normal;font-weight:400}#latest-comments #the-comment-list .comment-item blockquote,#latest-comments #the-comment-list .comment-item blockquote p{margin:0;padding:0;display:inline}#latest-comments #the-comment-list .comment-item p.row-actions{margin:3px 0 0;padding:0;font-size:13px}#description-wrap label,#title-wrap label{cursor:text}#title-wrap #title{padding:2px 6px;font-size:1.3em;outline:0}#title-wrap #title-prompt-text{font-size:1.1em;padding:5px 8px}.rss-widget ul{margin:0;padding:0;list-style:none}a.rsswidget{font-size:14px;font-weight:600;line-height:1.7em}.rss-widget ul li{line-height:1.5em;margin-bottom:12px}.rss-widget span.rss-date{color:#72777c;font-size:13px;margin-right:3px}.rss-widget cite{display:block;text-align:left;margin:0 0 1em;padding:0}.rss-widget cite:before{content:"\2014"}#dashboard_browser_nag a.update-browser-link{font-size:1.2em;font-weight:600}#dashboard_browser_nag a{color:#fff}#dashboard_browser_nag p.browser-update-nag.has-browser-icon{padding-left:125px}#dashboard_browser_nag .browser-icon{margin-top:-35px}#dashboard_browser_nag.postbox.browser-insecure{background-color:#ac1b1b;border-color:#ac1b1b}#dashboard_browser_nag.postbox{background-color:#e29808;background-image:none;border-color:#edc048;color:#fff;-webkit-box-shadow:none;box-shadow:none}#dashboard_browser_nag.postbox.browser-insecure h2{border-bottom-color:#cd5a5a;color:#fff}#dashboard_browser_nag.postbox h2{border-bottom-color:#f6e2ac;background:0 0;color:#fff;-webkit-box-shadow:none;box-shadow:none}#dashboard_browser_nag h2.hndle{border:none;font-weight:600;font-size:20px;padding-top:10px}.postbox#dashboard_browser_nag p a.dismiss{font-size:14px}.postbox#dashboard_browser_nag a,.postbox#dashboard_browser_nag p,.postbox#dashboard_browser_nag p.browser-update-nag{font-size:16px}@media only screen and (max-width:799px){#wpbody-content #dashboard-widgets .postbox-container{width:100%}}@media only screen and (min-width:800px) and (max-width:1499px){#dashboard-widgets #postbox-container-3 .empty-container,#dashboard-widgets #postbox-container-4 .empty-container,#wpbody #wpbody-content .metabox-holder.columns-1 .postbox-container .empty-container{border:0;height:0;min-height:0}#wpbody-content #dashboard-widgets .postbox-container{width:49.5%}#wpbody-content #dashboard-widgets #postbox-container-2,#wpbody-content #dashboard-widgets #postbox-container-3,#wpbody-content #dashboard-widgets #postbox-container-4{float:left;width:50.5%}#dashboard-widgets #postbox-container-3 .empty-container:after,#dashboard-widgets #postbox-container-4 .empty-container:after{display:none}#wpbody #wpbody-content #dashboard-widgets.columns-1 .postbox-container{width:100%}.index-php .columns-prefs,.index-php .screen-layout{display:block}.columns-prefs .columns-prefs-3,.columns-prefs .columns-prefs-4{display:none}.metabox-holder .postbox-container .empty-container:after{display:block}}@media only screen and (min-width:1500px) and (max-width:1800px){#wpbody-content #dashboard-widgets .postbox-container{width:33.5%}#wpbody-content #dashboard-widgets #postbox-container-1{width:33%}#wpbody-content #dashboard-widgets #postbox-container-3,#wpbody-content #dashboard-widgets #postbox-container-4{float:left}#dashboard-widgets #postbox-container-4 .empty-container{border:0;height:0;min-height:0}#dashboard-widgets #postbox-container-4 .empty-container:after{display:none}.metabox-holder .postbox-container .empty-container:after{display:block}}@media screen and (max-width:870px){.welcome-panel .welcome-panel-column,.welcome-panel .welcome-panel-column:first-child{display:block;float:none;width:100%}.welcome-panel .welcome-panel-column li{display:inline-block;margin-left:13px}.welcome-panel .welcome-panel-column ul{margin:.4em 0 0}}@media screen and (max-width:782px){#dashboard_recent_comments #the-comment-list .comment-item .avatar{height:30px;width:30px;margin:4px 0 5px 10px}}@media screen and (max-width:600px){.welcome-panel .welcome-panel-close{overflow:hidden;text-indent:40px;white-space:nowrap;width:20px;height:20px;padding:5px;top:5px;left:5px}.welcome-panel .welcome-panel-close:before{font-size:20px;top:5px;right:-35px}} \ No newline at end of file diff --git a/wp-admin/css/dashboard.css b/wp-admin/css/dashboard.css index bd94d96..3968a97 100644 --- a/wp-admin/css/dashboard.css +++ b/wp-admin/css/dashboard.css @@ -56,10 +56,6 @@ min-height: 0; } -/*------------------------------------------------------------------------------ - 9.0 - Dashboard -------------------------------------------------------------------------------*/ - #dashboard-widgets-wrap { overflow: hidden; margin: 0 -8px; @@ -74,20 +70,6 @@ min-height: 100px; } -h3.dashboard-widget-title, -h3.dashboard-widget-title span, -h3.dashboard-widget-title small { - color: #333; -} - -h3.dashboard-widget-title small a { - color: #d7d7d7; -} - -h3.dashboard-widget-title small a:hover { - color: #fff; -} - /* @todo: this was originally in this section, but likely belongs elsewhere */ #the-comment-list td.comment p.comment-author { margin-top: 0; @@ -129,14 +111,14 @@ h3.dashboard-widget-title small a:hover { line-height: 2.1em; } -.welcome-panel h3 { +.welcome-panel h2 { margin: 0; font-size: 21px; font-weight: normal; line-height: 1.2; } -.welcome-panel h4 { +.welcome-panel h3 { margin: 1.33em 0 0; font-size: 16px; } @@ -146,7 +128,7 @@ h3.dashboard-widget-title small a:hover { } .welcome-panel p { - color: #777; + color: #72777c; } .welcome-panel a { @@ -160,24 +142,28 @@ h3.dashboard-widget-title small a:hover { .welcome-panel .welcome-panel-close { position: absolute; - top: 5px; + top: 10px; right: 10px; - padding: 20px 15px 0 3px; + padding: 10px 15px 10px 21px; font-size: 13px; + line-height: 1.23076923; /* Chrome rounding, needs to be 16px equivalent */ text-decoration: none; - line-height: 1; } -#welcome-panel.welcome-panel .welcome-panel-close::before { +.welcome-panel .welcome-panel-close:before { position: absolute; - left: -18px; - margin-top: -2px; + top: 8px; + left: 0; -webkit-transition: all .1s ease-in-out; transition: all .1s ease-in-out; } .wp-core-ui .welcome-panel .button.button-hero { - margin: 15px 0 3px; + margin: 15px 13px 3px 0; + padding: 12px 36px; + height: auto; + line-height: 1.4285714; + white-space: normal; } .welcome-panel-content { @@ -187,7 +173,6 @@ h3.dashboard-widget-title small a:hover { .welcome-panel .welcome-panel-column-container { clear: both; - overflow: hidden; position: relative; } @@ -211,22 +196,37 @@ h3.dashboard-widget-title small a:hover { .welcome-panel-column p { margin-top: 7px; - color: #464646; + color: #444; } -.welcome-panel .welcome-icon { - display: block; +.welcome-panel .welcome-widgets-menus { + line-height: 16px; +} + +.welcome-panel .welcome-panel-column ul { + margin: 0.8em 1em 1em 0; +} + +.welcome-panel .welcome-panel-column li { + line-height: 16px; + list-style-type: none; padding: 0 0 8px; +} + +.welcome-panel .welcome-icon { background: transparent !important; } -.welcome-panel .welcome-icon:before { - color: #888; - font: normal 20px/1 'dashicons'; +/* Welcome Panel and Right Now common Icons style */ + +.welcome-panel .welcome-icon:before, +#dashboard_right_now li a:before, +#dashboard_right_now li span:before { + color: #82878c; + font: normal 20px/1 dashicons; speak: none; display: inline-block; padding: 0 10px 0 0; - top: -1px; position: relative; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -234,47 +234,71 @@ h3.dashboard-widget-title small a:hover { vertical-align: top; } +/* Welcome Panel specific Icons styles */ + .welcome-panel .welcome-write-blog:before, .welcome-panel .welcome-edit-page:before { - content:'\f119'; + content: "\f119"; top: -3px; } .welcome-panel .welcome-add-page:before { - content:'\f132'; + content: "\f132"; + top: -1px; } .welcome-panel .welcome-view-site:before { - content:'\f115'; + content: "\f115"; top: -2px; } .welcome-panel .welcome-widgets-menus:before { - content:'\f116'; + content: "\f116"; top: -2px; } .welcome-panel .welcome-comments:before { - content:'\f117'; + content: "\f117"; top: -1px; } .welcome-panel .welcome-learn-more:before { - content:'\f118'; + content: "\f118"; top: -1px; } -.welcome-panel .welcome-widgets-menus { - line-height: 16px; +/* Right Now specific Icons styles */ + +#dashboard_right_now li a:before, +#dashboard_right_now li > span:before { /* get only the first level span to exclude screen-reader-text in mu-storage */ + content: "\f159"; /* generic icon for items added by CPTs ? */ + padding: 0 5px 0 0; } -.welcome-panel .welcome-panel-column ul { - margin: 0.8em 1em 1em 0; +#dashboard_right_now .page-count a:before, +#dashboard_right_now .page-count span:before { + content: "\f105"; } -.welcome-panel .welcome-panel-column li { - line-height: 16px; - list-style-type: none; +#dashboard_right_now .post-count a:before, +#dashboard_right_now .post-count span:before { + content: "\f109"; +} + +#dashboard_right_now .comment-count a:before { + content: "\f101"; +} + +#dashboard_right_now .comment-mod-count a:before { + content: "\f125"; +} + +#dashboard_right_now .storage-count a:before { + content: "\f104"; +} + +#dashboard_right_now .storage-count.warning a:before { + content: "\f153"; } /* Dashboard WordPress news */ @@ -301,17 +325,8 @@ body #dashboard-widgets .postbox form .submit { margin-top: 0; } -/* @todo: are these actually used anywhere? no non-CSS results in plugin search */ -div.dashboard-widget-error { - background-color: #c43; -} - -div.dashboard-widget-notice { - background-color: #cfe1ef; -} - .rssSummary { - color: #777; + color: #72777c; margin-top: 4px; } @@ -332,7 +347,7 @@ div.dashboard-widget-notice { #dashboard_primary .rss-widget span, #dashboard_primary .rss-widget span.rss-date { - color: #777; + color: #72777c; } #dashboard_primary .rss-widget span.rss-date { @@ -347,7 +362,9 @@ div.dashboard-widget-notice { #dashboard_right_now ul { margin: 0; - overflow: hidden; + /* contain floats but don't use overflow: hidden */ + display: inline-block; + width: 100%; } #dashboard_right_now li { @@ -357,12 +374,10 @@ div.dashboard-widget-notice { } #dashboard_right_now .inside { - overflow: hidden; padding: 0; } #dashboard_right_now .main { - overflow: hidden; padding: 0 12px 11px; } @@ -371,35 +386,33 @@ div.dashboard-widget-notice { } #dashboard_right_now #wp-version-message .button { - clear: right; float: right; position: relative; top: -5px; + margin-left: 5px; } .mu-storage { overflow: hidden; } -#dashboard-widgets h4.mu-storage { - margin-bottom: 10px; +#dashboard-widgets h3.mu-storage { + margin: 0 0 10px; + padding: 0; + font-size: 14px; + font-weight: normal; } /* Dashboard right now - Colors */ -#dashboard_right_now li a:before, -#dashboard_right_now li span:before { - color: #888; -} - #dashboard_right_now .sub { - color: #777; + color: #555d66; background: #f5f5f5; border-top: 1px solid #eee; padding: 10px 12px 6px 12px; } -#dashboard_right_now .sub h4 { +#dashboard_right_now .sub h3 { color: #555; } @@ -412,49 +425,6 @@ div.dashboard-widget-notice { color: #d54e21; } -/* Dashboard right now - Icons */ -#dashboard_right_now li a:before, -#dashboard_right_now li span:before { - content: '\f159'; - font: normal 20px/1 'dashicons'; - speak: none; - display: block; - float: left; - margin: 0 5px 0 0; - padding: 0; - text-indent: 0; - text-align: center; - position: relative; - -webkit-font-smoothing: antialiased; - text-decoration: none !important; -} - -#dashboard_right_now .page-count a:before, -#dashboard_right_now .page-count span:before { - content: '\f105'; -} - -#dashboard_right_now .post-count a:before, -#dashboard_right_now .post-count span:before { - content: '\f109'; -} - -#dashboard_right_now .comment-count a:before { - content: '\f101'; -} - -#dashboard_right_now .comment-mod-count a:before { - content: '\f125'; -} - -#dashboard_right_now .storage-count a:before { - content: '\f104'; -} - -#dashboard_right_now .storage-count.warning a:before { - content: '\f153'; -} - /* Dashboard Quick Draft */ #dashboard_quick_press .inside { @@ -469,7 +439,6 @@ div.dashboard-widget-notice { } #dashboard_quick_press form { - overflow: hidden; margin: 12px; } @@ -515,7 +484,7 @@ form.initial-form.quickpress-open input#title { #title-wrap #title-prompt-text, .textarea-wrap #content-prompt-text { - color: #777; + color: #72777c; } #title-wrap #title-prompt-text { @@ -559,11 +528,6 @@ form.initial-form.quickpress-open input#title { border: none; } -#dashboard_quick_press .drafts h4 { - margin: 0 12px 8px; - font-weight: normal; -} - #dashboard_quick_press .drafts .view-all { float: right; margin: 0 12px 0 0; @@ -581,7 +545,7 @@ form.initial-form.quickpress-open input#title { margin-bottom: 1em; } #dashboard_quick_press .drafts li time { - color: #777; + color: #72777c; } #dashboard_quick_press .drafts p { @@ -590,38 +554,42 @@ form.initial-form.quickpress-open input#title { } #dashboard_quick_press .draft-title { - overflow: hidden; + word-wrap: break-word; } #dashboard_quick_press .draft-title a, #dashboard_quick_press .draft-title time { - float: left; margin: 0 5px 0 0; } -/* Dashboard activity widget */ +/* Dashboard common styles */ -#dashboard-widgets #dashboard_activity h4 { - margin: 0 0 8px 12px; +#dashboard-widgets h4, /* Back-compat for pre-4.4 */ +#dashboard-widgets h3, +#dashboard_quick_press .drafts h2 { + margin: 0 12px 8px; + padding: 0; + font-size: 14px; font-weight: normal; + color: #23282d; } -#dashboard-widgets #dashboard_activity h4.comment-meta { - margin: 0; +#dashboard_quick_press .drafts h2 { + line-height: inherit; } -#dashboard_activity h4.comment-meta { - margin-bottom: 4px; +#dashboard-widgets .inside h4, /* Back-compat for pre-4.4 */ +#dashboard-widgets .inside h3 { + margin-left: 0; + margin-right: 0; } -#dashboard_activity ul { - padding: 0 12px; -} +/* Dashboard activity widget */ #dashboard_activity .comment-meta span.approve:before { - content: '\f227'; - font: 20px/.5 "dashicons"; - margin-left: 12px; + content: "\f227"; + font: 20px/.5 dashicons; + margin-left: 5px; vertical-align: middle; position: relative; top: -1px; @@ -629,18 +597,18 @@ form.initial-form.quickpress-open input#title { } #dashboard_activity .inside { - padding: 0; margin: 0; + padding-bottom: 0; } #dashboard_activity .no-activity { overflow: hidden; - padding: 0 12px 12px; + padding: 0 0 12px; text-align: center; } #dashboard_activity .no-activity p { - color: #999; + color: #72777c; font-size: 16px; } @@ -649,8 +617,8 @@ form.initial-form.quickpress-open input#title { } #dashboard_activity .no-activity .smiley:before { - content: '\f328'; - font: normal 120px/1 'dashicons'; + content: "\f328"; + font: normal 120px/1 dashicons; speak: none; display: block; margin: 0 5px 0 0; @@ -664,11 +632,16 @@ form.initial-form.quickpress-open input#title { #dashboard_activity .subsubsub { float: none; - border-top: 1px solid #eeeeee; - margin-top: 0; + border-top: 1px solid #eee; + margin: 0 -12px; padding: 8px 12px 4px; } +#dashboard_activity .subsubsub a .count, +#dashboard_activity .subsubsub a.current .count { + color: #72777c; /* white background on the dashboard but #f1f1f1 on list tables */ +} + #future-posts ul, #published-posts ul { clear: both; @@ -677,22 +650,21 @@ form.initial-form.quickpress-open input#title { #future-posts li, #published-posts li { - overflow: hidden; margin-bottom: 8px; } #future-posts ul span, #published-posts ul span { - color: #777; - float: left; - margin-right: 8px; + display: inline-block; + margin-right: 5px; min-width: 150px; + color: #72777c; } .activity-block { border-bottom: 1px solid #eee; - overflow: hidden; - padding: 8px 0 4px; + margin: 0 -12px; + padding: 8px 12px 4px; } .activity-block:last-child { @@ -710,11 +682,7 @@ form.initial-form.quickpress-open input#title { #activity-widget #the-comment-list div.undo { background: none; padding: 6px 0; -} - -#activity-widget #the-comment-list .alternate, -#activity-widget #the-comment-list .alt { - background: none; + margin-left: 12px; } #activity-widget #the-comment-list .comment-item { @@ -723,10 +691,9 @@ form.initial-form.quickpress-open input#title { position: relative; } -#activity-widget #the-comment-list img { +#activity-widget #the-comment-list .avatar { position: absolute; - left: 13px; - top: 13px; + top: 12px; } #activity-widget #the-comment-list .dashboard-comment-wrap { @@ -737,11 +704,6 @@ form.initial-form.quickpress-open input#title { margin: 1em 0; } -#activity-widget #the-comment-list .comment-item h4 { - font-size: 13px; - color: #999; -} - #activity-widget #the-comment-list .comment-item p.row-actions { margin: 4px 0 0 0; } @@ -767,7 +729,6 @@ form.initial-form.quickpress-open input#title { #activity-widget #the-comment-list .spam-undo-inside .avatar, #activity-widget #the-comment-list .trash-undo-inside .avatar { - margin-right: 20px; position: relative; top: 0; } @@ -778,12 +739,17 @@ form.initial-form.quickpress-open input#title { margin: 10px; } -.edit-box { +.postbox .button-link .edit-box { display: none; } -h3:hover .edit-box { - display: inline; +.edit-box { + opacity: 0; +} + +.hndle:hover .edit-box, +.edit-box:focus { + opacity: 1; } #dashboard-widgets form .input-text-wrap input { @@ -809,27 +775,13 @@ h3:hover .edit-box { text-decoration: none; } -#dashboard-widgets h3 a { +#dashboard-widgets h2 a { text-decoration: underline; } -#dashboard-widgets h3 .postbox-title-action { - position: absolute; - right: 10px; - padding: 0; - top: 5px; -} - -.js #dashboard-widgets h3 .postbox-title-action { - right: 33px; -} - -#dashboard-widgets h4 { - color: #222; - font-weight: normal; - font-size: 14px; - margin: 0 0 .2em; - padding: 0; +#dashboard-widgets .hndle .postbox-title-action { + float: right; + line-height: 1.2; } #dashboard_plugins h5 { @@ -840,9 +792,11 @@ h3:hover .edit-box { #latest-comments #the-comment-list { position: relative; + margin: 0 -12px; } -#activity-widget #the-comment-list .comment { +#activity-widget #the-comment-list .comment, +#activity-widget #the-comment-list .pingback { -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.06); box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.06); } @@ -852,7 +806,11 @@ h3:hover .edit-box { } #activity-widget #latest-comments #the-comment-list .comment-item { - padding: 1em 12px; + /* the row-actions paragraph is output only for users with 'edit_comment' capabilities, + for other users this needs a min height equal to the gravatar image */ + min-height: 50px; + margin: 0; + padding: 12px; } #latest-comments #the-comment-list .pingback { @@ -863,13 +821,13 @@ h3:hover .edit-box { border-top: none; } -#latest-comments #the-comment-list .comment-item h4 { +#latest-comments #the-comment-list .comment-meta { line-height: 1.5em; - margin-top: 0; + margin: 0; color: #666; } -#latest-comments #the-comment-list .comment-item h4 cite { +#latest-comments #the-comment-list .comment-meta cite { font-style: normal; font-weight: normal; } @@ -889,14 +847,14 @@ h3:hover .edit-box { /* QuickDraft */ -#title-wrap label { +#title-wrap label, +#description-wrap label { cursor: text; } #title-wrap #title { padding: 2px 6px; font-size: 1.3em; - line-height: 100%; outline: none; } @@ -924,7 +882,7 @@ a.rsswidget { } .rss-widget span.rss-date { - color: #999; + color: #72777c; font-size: 13px; margin-left: 3px; } @@ -937,11 +895,10 @@ a.rsswidget { } .rss-widget cite:before { - content: '\2014'; + content: "\2014"; } .dashboard-comment-wrap { - overflow: hidden; word-wrap: break-word; } @@ -977,12 +934,12 @@ a.rsswidget { box-shadow: none; } -#dashboard_browser_nag.postbox.browser-insecure h3 { +#dashboard_browser_nag.postbox.browser-insecure h2 { border-bottom-color: #cd5a5a; color: #fff; } -#dashboard_browser_nag.postbox h3 { +#dashboard_browser_nag.postbox h2 { border-bottom-color: #f6e2ac; background: transparent none; color: #fff; @@ -996,7 +953,7 @@ a.rsswidget { /* Make the browser nags easier to read with Open Sans */ -#dashboard_browser_nag h3.hndle { +#dashboard_browser_nag h2.hndle { border: none; font-weight: 600; font-size: 20px; @@ -1043,6 +1000,11 @@ a.rsswidget { min-height: 0; } + #dashboard-widgets #postbox-container-3 .empty-container:after, + #dashboard-widgets #postbox-container-4 .empty-container:after { + display: none; + } + #wpbody #wpbody-content #dashboard-widgets.columns-1 .postbox-container { width: 100%; } @@ -1063,6 +1025,10 @@ a.rsswidget { .columns-prefs .columns-prefs-4 { display: none; } + + .metabox-holder .postbox-container .empty-container:after { + display: block; + } } /* three columns on the dash */ @@ -1085,6 +1051,14 @@ a.rsswidget { height: 0; min-height: 0; } + + #dashboard-widgets #postbox-container-4 .empty-container:after { + display: none; + } + + .metabox-holder .postbox-container .empty-container:after { + display: block; + } } @media screen and (max-width: 870px) { @@ -1119,17 +1093,19 @@ a.rsswidget { /* Keep the close icon from overlapping the Welcome text. */ .welcome-panel .welcome-panel-close { overflow: hidden; - text-indent: 100%; + text-indent: 40px; white-space: nowrap; width: 20px; height: 20px; - right: 0; padding: 5px; + top: 5px; + right: 5px; } /* Make the close icon larger for tappability. */ - #welcome-panel.welcome-panel .welcome-panel-close::before { + .welcome-panel .welcome-panel-close:before { font-size: 20px; - margin: 0; + top: 5px; + left: -35px; } } diff --git a/wp-admin/css/dashboard.min.css b/wp-admin/css/dashboard.min.css new file mode 100644 index 0000000..35efec6 --- /dev/null +++ b/wp-admin/css/dashboard.min.css @@ -0,0 +1 @@ +#dashboard_quick_press .draft-title,#the-comment-list td.comment,.dashboard-comment-wrap{word-wrap:break-word}#wpbody-content #dashboard-widgets.columns-1 .postbox-container{width:100%}#wpbody-content #dashboard-widgets.columns-2 .postbox-container{width:49.5%}#wpbody-content #dashboard-widgets.columns-2 #postbox-container-2,#wpbody-content #dashboard-widgets.columns-2 #postbox-container-3,#wpbody-content #dashboard-widgets.columns-2 #postbox-container-4{float:right;width:50.5%}#wpbody-content #dashboard-widgets.columns-3 .postbox-container{width:33.5%}#wpbody-content #dashboard-widgets.columns-3 #postbox-container-1{width:33%}#wpbody-content #dashboard-widgets.columns-3 #postbox-container-3,#wpbody-content #dashboard-widgets.columns-3 #postbox-container-4{float:right}#dashboard-widgets .postbox-container,#wpbody-content #dashboard-widgets.columns-4 .postbox-container{width:25%}#dashboard-widgets-wrap .columns-3 #postbox-container-4 .empty-container{border:none!important}.ie8 #wpbody-content #dashboard-widgets .postbox-container{width:49.5%}.ie8 #wpbody-content #dashboard-widgets #postbox-container-2,.ie8 #wpbody-content #dashboard-widgets #postbox-container-3,.ie8 #wpbody-content #dashboard-widgets #postbox-container-4{float:right;width:50.5%}.ie8 #dashboard-widgets #postbox-container-3 .empty-container,.ie8 #dashboard-widgets #postbox-container-4 .empty-container{border:0;height:0;min-height:0}#dashboard-widgets-wrap{overflow:hidden;margin:0 -8px}#dashboard-widgets .postbox .inside{margin-bottom:0}#dashboard-widgets .meta-box-sortables{margin:0 8px;min-height:100px}#the-comment-list td.comment p.comment-author{margin-top:0;margin-left:0}#the-comment-list p.comment-author img{float:left;margin-right:8px}#the-comment-list p.comment-author strong a{border:none}#the-comment-list td{vertical-align:top}#the-comment-list td.comment img{max-width:100%}.welcome-panel{position:relative;overflow:auto;margin:16px 0;padding:23px 10px 0;border:1px solid #e5e5e5;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04);background:#fff;font-size:13px;line-height:2.1em}.dashboard-widget-control-form,.mu-storage{overflow:hidden}.welcome-panel h2{margin:0;font-size:21px;font-weight:400;line-height:1.2}.welcome-panel h3{margin:1.33em 0 0;font-size:16px}.welcome-panel li{font-size:14px}.welcome-panel p{color:#72777c}.welcome-panel a{text-decoration:none}.welcome-panel .about-description{font-size:16px;margin:0}.welcome-panel .welcome-panel-close{position:absolute;top:10px;right:10px;padding:10px 15px 10px 21px;font-size:13px;line-height:1.23076923;text-decoration:none}.welcome-panel .welcome-panel-close:before{position:absolute;top:8px;left:0;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}.wp-core-ui .welcome-panel .button.button-hero{margin:15px 13px 3px 0;padding:12px 36px;height:auto;line-height:1.4285714;white-space:normal}.welcome-panel-content{margin-left:13px;max-width:1500px}.welcome-panel .welcome-panel-column-container{clear:both;position:relative}.welcome-panel .welcome-panel-column{width:32%;min-width:200px;float:left}.ie8 .welcome-panel .welcome-panel-column{min-width:230px}.welcome-panel .welcome-panel-column:first-child{width:36%}.welcome-panel-column p.hide-if-no-customize{margin-top:10px}.welcome-panel-column p{margin-top:7px;color:#444}.welcome-panel .welcome-widgets-menus{line-height:16px}.welcome-panel .welcome-panel-column ul{margin:.8em 1em 1em 0}.welcome-panel .welcome-panel-column li{line-height:16px;list-style-type:none;padding:0 0 8px}.welcome-panel .welcome-icon{background:0 0!important}#dashboard_right_now li a:before,#dashboard_right_now li span:before,.welcome-panel .welcome-icon:before{color:#82878c;font:400 20px/1 dashicons;speak:none;display:inline-block;padding:0 10px 0 0;position:relative;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;vertical-align:top}#dashboard_primary .rss-widget span,#dashboard_primary .rss-widget span.rss-date,.rssSummary{color:#72777c}.welcome-panel .welcome-edit-page:before,.welcome-panel .welcome-write-blog:before{content:"\f119";top:-3px}.welcome-panel .welcome-add-page:before{content:"\f132";top:-1px}.welcome-panel .welcome-view-site:before{content:"\f115";top:-2px}.welcome-panel .welcome-widgets-menus:before{content:"\f116";top:-2px}.welcome-panel .welcome-comments:before{content:"\f117";top:-1px}.welcome-panel .welcome-learn-more:before{content:"\f118";top:-1px}#dashboard_right_now li a:before,#dashboard_right_now li>span:before{content:"\f159";padding:0 5px 0 0}#dashboard_right_now .page-count a:before,#dashboard_right_now .page-count span:before{content:"\f105"}#dashboard_right_now .post-count a:before,#dashboard_right_now .post-count span:before{content:"\f109"}#dashboard_right_now .comment-count a:before{content:"\f101"}#dashboard_right_now .comment-mod-count a:before{content:"\f125"}#dashboard_right_now .storage-count a:before{content:"\f104"}#dashboard_right_now .storage-count.warning a:before{content:"\f153"}#dashboard_primary .inside{margin:0;padding:0}#dashboard_primary .dashboard-widget-control-form,#dashboard_primary .widget-loading{padding:12px 12px 0}body #dashboard-widgets .postbox form .submit{margin:0}.dashboard-widget-control-form p{margin-top:0}.rssSummary{margin-top:4px}#dashboard_primary .rss-widget{border-bottom:1px solid #eee;font-size:13px;padding:8px 12px 10px}#dashboard_primary .rss-widget:last-child{border-bottom:none;padding-bottom:8px}#dashboard_primary .rss-widget a{font-weight:400}#dashboard_primary .rss-widget span.rss-date{margin-left:12px}#dashboard_primary .rss-widget ul li{margin-bottom:8px}#dashboard_right_now ul{margin:0;display:inline-block;width:100%}#dashboard_right_now li{width:50%;float:left;margin-bottom:10px}#dashboard_right_now .inside{padding:0}#dashboard_right_now .main{padding:0 12px 11px}#dashboard_right_now .main p{margin:0}#dashboard_right_now #wp-version-message .button{float:right;position:relative;top:-5px;margin-left:5px}#dashboard-widgets h3.mu-storage{margin:0 0 10px;padding:0;font-size:14px;font-weight:400}#dashboard_right_now .sub{color:#555d66;background:#f5f5f5;border-top:1px solid #eee;padding:10px 12px 6px}#dashboard_right_now .sub h3{color:#555}#dashboard_right_now .sub p{margin:0 0 1em}#dashboard_right_now .warning a:before,#dashboard_right_now .warning span:before{color:#d54e21}#dashboard_quick_press .drafts li time,#title-wrap #title-prompt-text,.textarea-wrap #content-prompt-text{color:#72777c}#dashboard_quick_press .inside{margin:0;padding:0}#dashboard_quick_press div.updated{margin-bottom:10px;border:1px solid #eee;border-width:1px 1px 1px 0}#dashboard_quick_press form{margin:12px}#dashboard_quick_press .drafts,#dashboard_quick_press .easy-blogging{padding:10px 0 0}input#save-post{float:left}form.initial-form.quickpress-open label.prompt{font-style:normal}form.initial-form.quickpress-open input#title{height:auto}#dashboard_quick_press input,#dashboard_quick_press textarea{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:0}#dashboard_quick_press textarea{resize:vertical}#description-wrap{margin-top:12px}.input-text-wrap,.textarea-wrap{position:relative}.input-text-wrap .prompt,.textarea-wrap .prompt{position:absolute}.textarea-wrap #content-prompt-text{font-size:1.1em;padding:7px 8px}.textarea-wrap textarea#content{margin:0 0 8px;padding:6px 7px}#quick-press textarea#content{min-height:90px;max-height:1300px;resize:none}.js #dashboard_quick_press .drafts{border-top:1px solid #eee}#dashboard_quick_press .drafts abbr{border:none}#dashboard_quick_press .drafts .view-all{float:right;margin:0 12px 0 0}#dashboard_primary a.rsswidget{font-weight:400}#dashboard_quick_press .drafts ul{margin:0 12px}#dashboard_quick_press .drafts li{margin-bottom:1em}#dashboard_quick_press .drafts p{margin:0;word-wrap:break-word}#dashboard_quick_press .draft-title a,#dashboard_quick_press .draft-title time{margin:0 5px 0 0}#dashboard-widgets h3,#dashboard-widgets h4,#dashboard_quick_press .drafts h2{margin:0 12px 8px;padding:0;font-size:14px;font-weight:400;color:#23282d}#dashboard_quick_press .drafts h2{line-height:inherit}#dashboard-widgets .inside h3,#dashboard-widgets .inside h4{margin-left:0;margin-right:0}#dashboard_activity .comment-meta span.approve:before{content:"\f227";font:20px/.5 dashicons;margin-left:5px;vertical-align:middle;position:relative;top:-1px;margin-right:2px}#dashboard_activity .inside{margin:0;padding-bottom:0}#dashboard_activity .no-activity{overflow:hidden;padding:0 0 12px;text-align:center}#dashboard_activity .no-activity p{color:#72777c;font-size:16px}#dashboard_activity .no-activity .smiley{margin-top:0}#dashboard_activity .no-activity .smiley:before{content:"\f328";font:400 120px/1 dashicons;speak:none;display:block;margin:0 5px 0 0;padding:0;text-indent:0;text-align:center;position:relative;-webkit-font-smoothing:antialiased;text-decoration:none!important}#dashboard-widgets h2 a,#dashboard_browser_nag a{text-decoration:underline}#dashboard_activity .subsubsub{float:none;border-top:1px solid #eee;margin:0 -12px;padding:8px 12px 4px}#dashboard_activity .subsubsub a .count,#dashboard_activity .subsubsub a.current .count{color:#72777c}#future-posts ul,#published-posts ul{clear:both;margin-bottom:0}#future-posts li,#published-posts li{margin-bottom:8px}#future-posts ul span,#published-posts ul span{display:inline-block;margin-right:5px;min-width:150px;color:#72777c}.activity-block{border-bottom:1px solid #eee;margin:0 -12px;padding:8px 12px 4px}.activity-block:last-child{border-bottom:none}.activity-block .subsubsub li{color:#ddd}#activity-widget #the-comment-list div.undo,#activity-widget #the-comment-list tr.undo{background:0 0;padding:6px 0;margin-left:12px}#activity-widget #the-comment-list .comment-item{background:#fafafa;padding:12px;position:relative}#activity-widget #the-comment-list .avatar{position:absolute;top:12px}#activity-widget #the-comment-list .dashboard-comment-wrap{padding-left:63px}#activity-widget #the-comment-list .dashboard-comment-wrap blockquote{margin:1em 0}#activity-widget #the-comment-list .comment-item p.row-actions{margin:4px 0 0}#activity-widget #the-comment-list .comment-item:first-child{border-top:1px solid #eee}#activity-widget #the-comment-list .unapproved{background-color:#fef7f1}#activity-widget #the-comment-list .unapproved:before{content:"";display:block;position:absolute;left:0;top:0;bottom:0;background:#d54e21;width:4px}#activity-widget #the-comment-list .spam-undo-inside .avatar,#activity-widget #the-comment-list .trash-undo-inside .avatar{position:relative;top:0}#dashboard-widgets #dashboard_browser_nag.postbox .inside{margin:10px}.postbox .button-link .edit-box{display:none}.edit-box{opacity:0}.edit-box:focus,.hndle:hover .edit-box{opacity:1}#dashboard-widgets form .input-text-wrap input,#dashboard-widgets form .textarea-wrap textarea{width:100%}#dashboard-widgets .postbox form .submit{float:none;margin:.5em 0 0;padding:0;border:none}#dashboard-widgets-wrap #dashboard-widgets .postbox form .submit #publish{min-width:0}#dashboard-widgets a{text-decoration:none}#dashboard-widgets .hndle .postbox-title-action{float:right;line-height:1.2}#dashboard_plugins h5{font-size:14px}#latest-comments #the-comment-list{position:relative;margin:0 -12px}#activity-widget #the-comment-list .comment,#activity-widget #the-comment-list .pingback{-webkit-box-shadow:inset 0 1px 0 rgba(0,0,0,.06);box-shadow:inset 0 1px 0 rgba(0,0,0,.06)}#activity-widget .comments #the-comment-list .alt{background-color:transparent}#activity-widget #latest-comments #the-comment-list .comment-item{min-height:50px;margin:0;padding:12px}#latest-comments #the-comment-list .pingback{padding-left:12px!important}#latest-comments #the-comment-list .comment-item:first-child{border-top:none}#latest-comments #the-comment-list .comment-meta{line-height:1.5em;margin:0;color:#666}#latest-comments #the-comment-list .comment-meta cite{font-style:normal;font-weight:400}#latest-comments #the-comment-list .comment-item blockquote,#latest-comments #the-comment-list .comment-item blockquote p{margin:0;padding:0;display:inline}#latest-comments #the-comment-list .comment-item p.row-actions{margin:3px 0 0;padding:0;font-size:13px}#description-wrap label,#title-wrap label{cursor:text}#title-wrap #title{padding:2px 6px;font-size:1.3em;outline:0}#title-wrap #title-prompt-text{font-size:1.1em;padding:5px 8px}.rss-widget ul{margin:0;padding:0;list-style:none}a.rsswidget{font-size:14px;font-weight:600;line-height:1.7em}.rss-widget ul li{line-height:1.5em;margin-bottom:12px}.rss-widget span.rss-date{color:#72777c;font-size:13px;margin-left:3px}.rss-widget cite{display:block;text-align:right;margin:0 0 1em;padding:0}.rss-widget cite:before{content:"\2014"}#dashboard_browser_nag a.update-browser-link{font-size:1.2em;font-weight:600}#dashboard_browser_nag a{color:#fff}#dashboard_browser_nag p.browser-update-nag.has-browser-icon{padding-right:125px}#dashboard_browser_nag .browser-icon{margin-top:-35px}#dashboard_browser_nag.postbox.browser-insecure{background-color:#ac1b1b;border-color:#ac1b1b}#dashboard_browser_nag.postbox{background-color:#e29808;background-image:none;border-color:#edc048;color:#fff;-webkit-box-shadow:none;box-shadow:none}#dashboard_browser_nag.postbox.browser-insecure h2{border-bottom-color:#cd5a5a;color:#fff}#dashboard_browser_nag.postbox h2{border-bottom-color:#f6e2ac;background:0 0;color:#fff;-webkit-box-shadow:none;box-shadow:none}#dashboard_browser_nag h2.hndle{border:none;font-weight:600;font-size:20px;padding-top:10px}.postbox#dashboard_browser_nag p a.dismiss{font-size:14px}.postbox#dashboard_browser_nag a,.postbox#dashboard_browser_nag p,.postbox#dashboard_browser_nag p.browser-update-nag{font-size:16px}@media only screen and (max-width:799px){#wpbody-content #dashboard-widgets .postbox-container{width:100%}}@media only screen and (min-width:800px) and (max-width:1499px){#dashboard-widgets #postbox-container-3 .empty-container,#dashboard-widgets #postbox-container-4 .empty-container,#wpbody #wpbody-content .metabox-holder.columns-1 .postbox-container .empty-container{border:0;height:0;min-height:0}#wpbody-content #dashboard-widgets .postbox-container{width:49.5%}#wpbody-content #dashboard-widgets #postbox-container-2,#wpbody-content #dashboard-widgets #postbox-container-3,#wpbody-content #dashboard-widgets #postbox-container-4{float:right;width:50.5%}#dashboard-widgets #postbox-container-3 .empty-container:after,#dashboard-widgets #postbox-container-4 .empty-container:after{display:none}#wpbody #wpbody-content #dashboard-widgets.columns-1 .postbox-container{width:100%}.index-php .columns-prefs,.index-php .screen-layout{display:block}.columns-prefs .columns-prefs-3,.columns-prefs .columns-prefs-4{display:none}.metabox-holder .postbox-container .empty-container:after{display:block}}@media only screen and (min-width:1500px) and (max-width:1800px){#wpbody-content #dashboard-widgets .postbox-container{width:33.5%}#wpbody-content #dashboard-widgets #postbox-container-1{width:33%}#wpbody-content #dashboard-widgets #postbox-container-3,#wpbody-content #dashboard-widgets #postbox-container-4{float:right}#dashboard-widgets #postbox-container-4 .empty-container{border:0;height:0;min-height:0}#dashboard-widgets #postbox-container-4 .empty-container:after{display:none}.metabox-holder .postbox-container .empty-container:after{display:block}}@media screen and (max-width:870px){.welcome-panel .welcome-panel-column,.welcome-panel .welcome-panel-column:first-child{display:block;float:none;width:100%}.welcome-panel .welcome-panel-column li{display:inline-block;margin-right:13px}.welcome-panel .welcome-panel-column ul{margin:.4em 0 0}}@media screen and (max-width:782px){#dashboard_recent_comments #the-comment-list .comment-item .avatar{height:30px;width:30px;margin:4px 10px 5px 0}}@media screen and (max-width:600px){.welcome-panel .welcome-panel-close{overflow:hidden;text-indent:40px;white-space:nowrap;width:20px;height:20px;padding:5px;top:5px;right:5px}.welcome-panel .welcome-panel-close:before{font-size:20px;top:5px;left:-35px}} \ No newline at end of file diff --git a/wp-admin/css/deprecated-media-rtl.css b/wp-admin/css/deprecated-media-rtl.css index 7b69804..c6f07ea 100644 --- a/wp-admin/css/deprecated-media-rtl.css +++ b/wp-admin/css/deprecated-media-rtl.css @@ -5,17 +5,54 @@ div#media-upload-header { padding: 5px 5px 0; font-weight: bold; position: relative; - border-bottom: 1px solid #dfdfdf; + border-bottom: 1px solid #ddd; background: #f9f9f9; } -body#media-upload ul#sidemenu { - font-weight: normal; - margin: 0 5px; +#sidemenu { + overflow: hidden; + float: none; + position: relative; right: 0; bottom: -1px; - float: none; - overflow: hidden; + margin: 0 5px; + padding-right: 10px; + list-style: none; + font-size: 12px; + font-weight: normal; +} + +#sidemenu a { + padding: 0 7px; + display: block; + float: right; + line-height: 28px; + border-top: 1px solid #f9f9f9; + border-bottom: 1px solid #ddd; + background-color: #f9f9f9; + text-decoration: none; + -webkit-transition: none; + transition: none; +} + +#sidemenu li { + display: inline; + line-height: 200%; + list-style: none; + text-align: center; + white-space: nowrap; + margin: 0; + padding: 0; +} + +#sidemenu a.current { + font-weight: normal; + padding-right: 6px; + padding-left: 6px; + border: 1px solid #ddd; + border-bottom-color: #f1f1f1; + background-color: #f1f1f1; + color: #000; } #media-upload:after { /* clearfix */ @@ -24,19 +61,19 @@ body#media-upload ul#sidemenu { clear: both; } -#media-upload, -#media-upload .media-item .slidetoggle { - background: #fff; -} - #media-upload .slidetoggle { - border-top-color: #dfdfdf; + border-top-color: #ddd; } #media-upload input[type="radio"] { padding: 0; } +.media-upload-form label.form-help, +td.help { + color: #72777c; +} + form { margin: 1em; } @@ -71,19 +108,19 @@ th { /* specific to the image upload form */ .image-align-none-label { - background: url(../images/align-none.png) no-repeat center right; + background: url(../images/align-none.png) no-repeat center left; } .image-align-left-label { - background: url(../images/align-left.png) no-repeat center right; + background: url(../images/align-left.png) no-repeat center left; } .image-align-center-label { - background: url(../images/align-center.png) no-repeat center right; + background: url(../images/align-center.png) no-repeat center left; } .image-align-right-label { - background: url(../images/align-right.png) no-repeat center right; + background: url(../images/align-right.png) no-repeat center left; } tr.image-size td { @@ -115,7 +152,8 @@ thead.media-item-info tr { border: 8px solid #fff; } -abbr.required { +abbr.required, +span.required { text-decoration: none; border: none; } @@ -185,7 +223,7 @@ abbr.required { .menu_order { float: left; font-size: 11px; - margin: 10px 10px 0; + margin: 8px 10px 0; } .menu_order_input { @@ -197,7 +235,7 @@ abbr.required { .ui-sortable-helper { background-color: #fff; - border: 1px solid #aaa; + border: 1px solid #a0a5aa; opacity: 0.6; filter: alpha(opacity=60); } @@ -217,7 +255,6 @@ abbr.required { } #media-upload .widefat { - width: 626px; border-style: solid solid none; } @@ -239,7 +276,7 @@ abbr.required { clear: both; padding: 0 0 3px; font-size: 1.6em; - border-bottom: 1px solid #DADADA; + border-bottom: 1px solid #ddd; } h3.media-title { @@ -247,7 +284,7 @@ h3.media-title { } h4.media-sub-title { - border-bottom: 1px solid #DADADA; + border-bottom: 1px solid #ddd; font-size: 1.3em; margin: 12px; padding: 0 0 3px; @@ -273,9 +310,10 @@ h4.media-sub-title { #gallery-settings .describe { padding: 5px; - width: 615px; + width: 100%; clear: both; cursor: default; + background: #fff; } #gallery-settings .describe select { @@ -290,7 +328,7 @@ h4.media-sub-title { #gallery-settings label, #gallery-settings legend { font-size: 13px; - color: #464646; + color: #444; margin-left: 15px; } @@ -299,7 +337,7 @@ h4.media-sub-title { } #gallery-settings p.ml-submit { - border-top: 1px solid #dfdfdf; + border-top: 1px solid #ddd; } #gallery-settings select#columns { @@ -327,7 +365,12 @@ h4.media-sub-title { } p.media-types { - margin: 1em; + margin: 0; + padding: 1em; +} + +p.media-types-required-info { + padding-top: 0; } tr.not-image { @@ -346,7 +389,6 @@ table.not-image tr.image-only { * HiDPI Displays */ @media print, - (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 120dpi) { diff --git a/wp-admin/css/deprecated-media-rtl.min.css b/wp-admin/css/deprecated-media-rtl.min.css index a16b012..72dd148 100644 --- a/wp-admin/css/deprecated-media-rtl.min.css +++ b/wp-admin/css/deprecated-media-rtl.min.css @@ -1 +1 @@ -div#media-upload-header{margin:0;padding:5px 5px 0;font-weight:700;position:relative;border-bottom:1px solid #dfdfdf;background:#f9f9f9}body#media-upload ul#sidemenu{font-weight:400;margin:0 5px;right:0;bottom:-1px;float:none;overflow:hidden}#media-upload:after{content:"";display:table;clear:both}#media-upload,#media-upload .media-item .slidetoggle{background:#fff}#media-upload .slidetoggle{border-top-color:#dfdfdf}#media-upload input[type=radio]{padding:0}form{margin:1em}#search-filter{text-align:left}th{position:relative}.media-upload-form label.form-help,td.help{font-family:sans-serif;font-style:italic;font-weight:400}.media-upload-form p.help{margin:0;padding:0}.media-upload-form fieldset{width:100%;border:0;text-align:justify;margin:0 0 1em;padding:0}.image-align-none-label{background:url(../images/align-none.png) no-repeat center right}.image-align-left-label{background:url(../images/align-left.png) no-repeat center right}.image-align-center-label{background:url(../images/align-center.png) no-repeat center right}.image-align-right-label{background:url(../images/align-right.png) no-repeat center right}tr.image-size td{width:460px}tr.image-size div.image-size-item{margin:0 0 5px}#gallery-form .progress,#library-form .progress,.describe.startclosed,.describe.startopen,.insert-gallery{display:none}.media-item .thumbnail{max-width:128px;max-height:128px}thead.media-item-info tr{background-color:transparent}.form-table thead.media-item-info{border:8px solid #fff}abbr.required{text-decoration:none;border:0}.describe label{display:inline}.describe td.error{padding:2px 8px}.describe td.A1{width:132px}.describe input[type=text],.describe textarea{width:460px;border-width:1px;border-style:solid}#media-upload p.ml-submit{padding:1em 0}#media-upload label.help,#media-upload p.help{font-family:sans-serif;font-style:italic;font-weight:400}#media-upload .ui-sortable .media-item{cursor:move}#media-upload tr.image-size{margin-bottom:1em;height:3em}#media-upload #filter{width:623px}#media-upload #filter .subsubsub{margin:8px 0}#filter .tablenav select{border-style:solid;border-width:1px;padding:2px;vertical-align:top;width:auto}#media-upload .del-attachment{display:none;margin:5px 0}.menu_order{float:left;font-size:11px;margin:10px 10px 0}.menu_order_input{border:1px solid #ddd;font-size:10px;padding:1px;width:23px}.ui-sortable-helper{background-color:#fff;border:1px solid #aaa;opacity:.6;filter:alpha(opacity=60)}#media-upload th.order-head{width:20%;text-align:center}#media-upload th.actions-head{width:25%;text-align:center}#media-upload a.wp-post-thumbnail{margin:0 20px}#media-upload .widefat{width:626px;border-style:solid solid none}.sorthelper{height:37px;width:623px;display:block}#gallery-settings th.label{width:160px}#gallery-settings #basic th.label{padding:5px 0 5px 5px}#gallery-settings .title{clear:both;padding:0 0 3px;font-size:1.6em;border-bottom:1px solid #DADADA}h3.media-title{font-size:1.6em}h4.media-sub-title{border-bottom:1px solid #DADADA;font-size:1.3em;margin:12px;padding:0 0 3px}#gallery-settings .title,h3.media-title,h4.media-sub-title{font-family:Georgia,"Times New Roman",Times,serif;font-weight:400;color:#5A5A5A}#gallery-settings .describe td{vertical-align:middle;height:3em}#gallery-settings .describe th.label{padding-top:.5em;text-align:right}#gallery-settings .describe{padding:5px;width:615px;clear:both;cursor:default}#gallery-settings .describe select{width:15em}#gallery-settings .describe select option,#gallery-settings .describe td{padding:0}#gallery-settings label,#gallery-settings legend{font-size:13px;color:#464646;margin-left:15px}#gallery-settings .align .field label{margin:0 3px 0 1em}#gallery-settings p.ml-submit{border-top:1px solid #dfdfdf}#gallery-settings select#columns{width:6em}#sort-buttons{font-size:.8em;margin:3px 0 -8px 25px;text-align:left;max-width:625px}#sort-buttons a{text-decoration:none}#sort-buttons #asc,#sort-buttons #showall{padding-right:5px}#sort-buttons span{margin-left:25px}p.media-types{margin:1em}tr.not-image{display:none}table.not-image tr.not-image{display:table-row}table.not-image tr.image-only{display:none}@media print,(-o-min-device-pixel-ratio:5/4),(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.image-align-none-label{background-image:url(../images/align-none-2x.png?ver=20120916);-webkit-background-size:21px 15px;background-size:21px 15px}.image-align-left-label{background-image:url(../images/align-left-2x.png?ver=20120916);-webkit-background-size:22px 15px;background-size:22px 15px}.image-align-center-label{background-image:url(../images/align-center-2x.png?ver=20120916);-webkit-background-size:21px 15px;background-size:21px 15px}.image-align-right-label{background-image:url(../images/align-right-2x.png?ver=20120916);-webkit-background-size:22px 15px;background-size:22px 15px}} \ No newline at end of file +#sidemenu,th{position:relative}#sidemenu a,#sort-buttons a{text-decoration:none}div#media-upload-header{margin:0;padding:5px 5px 0;font-weight:700;position:relative;border-bottom:1px solid #ddd;background:#f9f9f9}#sidemenu{overflow:hidden;float:none;right:0;bottom:-1px;margin:0 5px;padding-right:10px;list-style:none;font-size:12px;font-weight:400}#sidemenu a{padding:0 7px;display:block;float:right;line-height:28px;border-top:1px solid #f9f9f9;border-bottom:1px solid #ddd;background-color:#f9f9f9;-webkit-transition:none;transition:none}#sidemenu li{display:inline;line-height:200%;list-style:none;text-align:center;white-space:nowrap;margin:0;padding:0}#sidemenu a.current{font-weight:400;padding-right:6px;padding-left:6px;border:1px solid #ddd;border-bottom-color:#f1f1f1;background-color:#f1f1f1;color:#000}#media-upload:after{content:"";display:table;clear:both}#media-upload .slidetoggle{border-top-color:#ddd}#media-upload input[type=radio]{padding:0}.media-upload-form label.form-help,td.help{color:#72777c;font-family:sans-serif;font-style:italic;font-weight:400}form{margin:1em}#search-filter{text-align:left}.media-upload-form p.help{margin:0;padding:0}.media-upload-form fieldset{width:100%;border:none;text-align:justify;margin:0 0 1em;padding:0}.image-align-none-label{background:url(../images/align-none.png) center left no-repeat}.image-align-left-label{background:url(../images/align-left.png) center left no-repeat}.image-align-center-label{background:url(../images/align-center.png) center left no-repeat}.image-align-right-label{background:url(../images/align-right.png) center left no-repeat}tr.image-size td{width:460px}tr.image-size div.image-size-item{margin:0 0 5px}#gallery-form .progress,#library-form .progress,.describe.startclosed,.describe.startopen,.insert-gallery{display:none}.media-item .thumbnail{max-width:128px;max-height:128px}thead.media-item-info tr{background-color:transparent}.form-table thead.media-item-info{border:8px solid #fff}abbr.required,span.required{text-decoration:none;border:none}.describe label{display:inline}.describe td.error{padding:2px 8px}.describe td.A1{width:132px}.describe input[type=text],.describe textarea{width:460px;border-width:1px;border-style:solid}#media-upload p.ml-submit{padding:1em 0}#media-upload label.help,#media-upload p.help{font-family:sans-serif;font-style:italic;font-weight:400}#media-upload .ui-sortable .media-item{cursor:move}#media-upload tr.image-size{margin-bottom:1em;height:3em}#media-upload #filter{width:623px}#media-upload #filter .subsubsub{margin:8px 0}#filter .tablenav select{border-style:solid;border-width:1px;padding:2px;vertical-align:top;width:auto}#media-upload .del-attachment{display:none;margin:5px 0}.menu_order{float:left;font-size:11px;margin:8px 10px 0}.menu_order_input{border:1px solid #ddd;font-size:10px;padding:1px;width:23px}.ui-sortable-helper{background-color:#fff;border:1px solid #a0a5aa;opacity:.6;filter:alpha(opacity=60)}#media-upload th.order-head{width:20%;text-align:center}#media-upload th.actions-head{width:25%;text-align:center}#media-upload a.wp-post-thumbnail{margin:0 20px}#media-upload .widefat{border-style:solid solid none}.sorthelper{height:37px;width:623px;display:block}#gallery-settings th.label{width:160px}#gallery-settings #basic th.label{padding:5px 0 5px 5px}#gallery-settings .title,h4.media-sub-title{border-bottom:1px solid #ddd;padding:0 0 3px}#gallery-settings .title{clear:both;font-size:1.6em}h3.media-title{font-size:1.6em}h4.media-sub-title{font-size:1.3em;margin:12px}#gallery-settings .title,h3.media-title,h4.media-sub-title{font-family:Georgia,"Times New Roman",Times,serif;font-weight:400;color:#5A5A5A}#gallery-settings .describe td{vertical-align:middle;height:3em}#gallery-settings .describe th.label{padding-top:.5em;text-align:right}#gallery-settings .describe{padding:5px;width:100%;clear:both;cursor:default;background:#fff}#gallery-settings .describe select{width:15em}#gallery-settings .describe select option,#gallery-settings .describe td{padding:0}#gallery-settings label,#gallery-settings legend{font-size:13px;color:#444;margin-left:15px}#gallery-settings .align .field label{margin:0 3px 0 1em}#gallery-settings p.ml-submit{border-top:1px solid #ddd}#gallery-settings select#columns{width:6em}#sort-buttons{font-size:.8em;margin:3px 0 -8px 25px;text-align:left;max-width:625px}#sort-buttons #asc,#sort-buttons #showall{padding-right:5px}#sort-buttons span{margin-left:25px}p.media-types{margin:0;padding:1em}p.media-types-required-info{padding-top:0}tr.not-image{display:none}table.not-image tr.not-image{display:table-row}table.not-image tr.image-only{display:none}@media print,(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.image-align-none-label{background-image:url(../images/align-none-2x.png?ver=20120916);-webkit-background-size:21px 15px;background-size:21px 15px}.image-align-left-label{background-image:url(../images/align-left-2x.png?ver=20120916);-webkit-background-size:22px 15px;background-size:22px 15px}.image-align-center-label{background-image:url(../images/align-center-2x.png?ver=20120916);-webkit-background-size:21px 15px;background-size:21px 15px}.image-align-right-label{background-image:url(../images/align-right-2x.png?ver=20120916);-webkit-background-size:22px 15px;background-size:22px 15px}} \ No newline at end of file diff --git a/wp-admin/css/deprecated-media.css b/wp-admin/css/deprecated-media.css index edd4c0b..db2a017 100644 --- a/wp-admin/css/deprecated-media.css +++ b/wp-admin/css/deprecated-media.css @@ -5,17 +5,54 @@ div#media-upload-header { padding: 5px 5px 0; font-weight: bold; position: relative; - border-bottom: 1px solid #dfdfdf; + border-bottom: 1px solid #ddd; background: #f9f9f9; } -body#media-upload ul#sidemenu { - font-weight: normal; - margin: 0 5px; +#sidemenu { + overflow: hidden; + float: none; + position: relative; left: 0; bottom: -1px; - float: none; - overflow: hidden; + margin: 0 5px; + padding-left: 10px; + list-style: none; + font-size: 12px; + font-weight: normal; +} + +#sidemenu a { + padding: 0 7px; + display: block; + float: left; + line-height: 28px; + border-top: 1px solid #f9f9f9; + border-bottom: 1px solid #ddd; + background-color: #f9f9f9; + text-decoration: none; + -webkit-transition: none; + transition: none; +} + +#sidemenu li { + display: inline; + line-height: 200%; + list-style: none; + text-align: center; + white-space: nowrap; + margin: 0; + padding: 0; +} + +#sidemenu a.current { + font-weight: normal; + padding-left: 6px; + padding-right: 6px; + border: 1px solid #ddd; + border-bottom-color: #f1f1f1; + background-color: #f1f1f1; + color: #000; } #media-upload:after { /* clearfix */ @@ -24,19 +61,19 @@ body#media-upload ul#sidemenu { clear: both; } -#media-upload, -#media-upload .media-item .slidetoggle { - background: #fff; -} - #media-upload .slidetoggle { - border-top-color: #dfdfdf; + border-top-color: #ddd; } #media-upload input[type="radio"] { padding: 0; } +.media-upload-form label.form-help, +td.help { + color: #72777c; +} + form { margin: 1em; } @@ -115,7 +152,8 @@ thead.media-item-info tr { border: 8px solid #fff; } -abbr.required { +abbr.required, +span.required { text-decoration: none; border: none; } @@ -185,7 +223,7 @@ abbr.required { .menu_order { float: right; font-size: 11px; - margin: 10px 10px 0; + margin: 8px 10px 0; } .menu_order_input { @@ -197,7 +235,7 @@ abbr.required { .ui-sortable-helper { background-color: #fff; - border: 1px solid #aaa; + border: 1px solid #a0a5aa; opacity: 0.6; filter: alpha(opacity=60); } @@ -217,7 +255,6 @@ abbr.required { } #media-upload .widefat { - width: 626px; border-style: solid solid none; } @@ -239,7 +276,7 @@ abbr.required { clear: both; padding: 0 0 3px; font-size: 1.6em; - border-bottom: 1px solid #DADADA; + border-bottom: 1px solid #ddd; } h3.media-title { @@ -247,7 +284,7 @@ h3.media-title { } h4.media-sub-title { - border-bottom: 1px solid #DADADA; + border-bottom: 1px solid #ddd; font-size: 1.3em; margin: 12px; padding: 0 0 3px; @@ -273,9 +310,10 @@ h4.media-sub-title { #gallery-settings .describe { padding: 5px; - width: 615px; + width: 100%; clear: both; cursor: default; + background: #fff; } #gallery-settings .describe select { @@ -290,7 +328,7 @@ h4.media-sub-title { #gallery-settings label, #gallery-settings legend { font-size: 13px; - color: #464646; + color: #444; margin-right: 15px; } @@ -299,7 +337,7 @@ h4.media-sub-title { } #gallery-settings p.ml-submit { - border-top: 1px solid #dfdfdf; + border-top: 1px solid #ddd; } #gallery-settings select#columns { @@ -327,7 +365,12 @@ h4.media-sub-title { } p.media-types { - margin: 1em; + margin: 0; + padding: 1em; +} + +p.media-types-required-info { + padding-top: 0; } tr.not-image { @@ -346,7 +389,6 @@ table.not-image tr.image-only { * HiDPI Displays */ @media print, - (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 120dpi) { diff --git a/wp-admin/css/deprecated-media.min.css b/wp-admin/css/deprecated-media.min.css index a6aca1d..d4ccf16 100644 --- a/wp-admin/css/deprecated-media.min.css +++ b/wp-admin/css/deprecated-media.min.css @@ -1 +1 @@ -div#media-upload-header{margin:0;padding:5px 5px 0;font-weight:700;position:relative;border-bottom:1px solid #dfdfdf;background:#f9f9f9}body#media-upload ul#sidemenu{font-weight:400;margin:0 5px;left:0;bottom:-1px;float:none;overflow:hidden}#media-upload:after{content:"";display:table;clear:both}#media-upload,#media-upload .media-item .slidetoggle{background:#fff}#media-upload .slidetoggle{border-top-color:#dfdfdf}#media-upload input[type=radio]{padding:0}form{margin:1em}#search-filter{text-align:right}th{position:relative}.media-upload-form label.form-help,td.help{font-family:sans-serif;font-style:italic;font-weight:400}.media-upload-form p.help{margin:0;padding:0}.media-upload-form fieldset{width:100%;border:0;text-align:justify;margin:0 0 1em;padding:0}.image-align-none-label{background:url(../images/align-none.png) no-repeat center left}.image-align-left-label{background:url(../images/align-left.png) no-repeat center left}.image-align-center-label{background:url(../images/align-center.png) no-repeat center left}.image-align-right-label{background:url(../images/align-right.png) no-repeat center left}tr.image-size td{width:460px}tr.image-size div.image-size-item{margin:0 0 5px}#gallery-form .progress,#library-form .progress,.describe.startclosed,.describe.startopen,.insert-gallery{display:none}.media-item .thumbnail{max-width:128px;max-height:128px}thead.media-item-info tr{background-color:transparent}.form-table thead.media-item-info{border:8px solid #fff}abbr.required{text-decoration:none;border:0}.describe label{display:inline}.describe td.error{padding:2px 8px}.describe td.A1{width:132px}.describe input[type=text],.describe textarea{width:460px;border-width:1px;border-style:solid}#media-upload p.ml-submit{padding:1em 0}#media-upload label.help,#media-upload p.help{font-family:sans-serif;font-style:italic;font-weight:400}#media-upload .ui-sortable .media-item{cursor:move}#media-upload tr.image-size{margin-bottom:1em;height:3em}#media-upload #filter{width:623px}#media-upload #filter .subsubsub{margin:8px 0}#filter .tablenav select{border-style:solid;border-width:1px;padding:2px;vertical-align:top;width:auto}#media-upload .del-attachment{display:none;margin:5px 0}.menu_order{float:right;font-size:11px;margin:10px 10px 0}.menu_order_input{border:1px solid #ddd;font-size:10px;padding:1px;width:23px}.ui-sortable-helper{background-color:#fff;border:1px solid #aaa;opacity:.6;filter:alpha(opacity=60)}#media-upload th.order-head{width:20%;text-align:center}#media-upload th.actions-head{width:25%;text-align:center}#media-upload a.wp-post-thumbnail{margin:0 20px}#media-upload .widefat{width:626px;border-style:solid solid none}.sorthelper{height:37px;width:623px;display:block}#gallery-settings th.label{width:160px}#gallery-settings #basic th.label{padding:5px 5px 5px 0}#gallery-settings .title{clear:both;padding:0 0 3px;font-size:1.6em;border-bottom:1px solid #DADADA}h3.media-title{font-size:1.6em}h4.media-sub-title{border-bottom:1px solid #DADADA;font-size:1.3em;margin:12px;padding:0 0 3px}#gallery-settings .title,h3.media-title,h4.media-sub-title{font-family:Georgia,"Times New Roman",Times,serif;font-weight:400;color:#5A5A5A}#gallery-settings .describe td{vertical-align:middle;height:3em}#gallery-settings .describe th.label{padding-top:.5em;text-align:left}#gallery-settings .describe{padding:5px;width:615px;clear:both;cursor:default}#gallery-settings .describe select{width:15em}#gallery-settings .describe select option,#gallery-settings .describe td{padding:0}#gallery-settings label,#gallery-settings legend{font-size:13px;color:#464646;margin-right:15px}#gallery-settings .align .field label{margin:0 1em 0 3px}#gallery-settings p.ml-submit{border-top:1px solid #dfdfdf}#gallery-settings select#columns{width:6em}#sort-buttons{font-size:.8em;margin:3px 25px -8px 0;text-align:right;max-width:625px}#sort-buttons a{text-decoration:none}#sort-buttons #asc,#sort-buttons #showall{padding-left:5px}#sort-buttons span{margin-right:25px}p.media-types{margin:1em}tr.not-image{display:none}table.not-image tr.not-image{display:table-row}table.not-image tr.image-only{display:none}@media print,(-o-min-device-pixel-ratio:5/4),(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.image-align-none-label{background-image:url(../images/align-none-2x.png?ver=20120916);-webkit-background-size:21px 15px;background-size:21px 15px}.image-align-left-label{background-image:url(../images/align-left-2x.png?ver=20120916);-webkit-background-size:22px 15px;background-size:22px 15px}.image-align-center-label{background-image:url(../images/align-center-2x.png?ver=20120916);-webkit-background-size:21px 15px;background-size:21px 15px}.image-align-right-label{background-image:url(../images/align-right-2x.png?ver=20120916);-webkit-background-size:22px 15px;background-size:22px 15px}} \ No newline at end of file +#sidemenu,th{position:relative}#sidemenu a,#sort-buttons a{text-decoration:none}div#media-upload-header{margin:0;padding:5px 5px 0;font-weight:700;position:relative;border-bottom:1px solid #ddd;background:#f9f9f9}#sidemenu{overflow:hidden;float:none;left:0;bottom:-1px;margin:0 5px;padding-left:10px;list-style:none;font-size:12px;font-weight:400}#sidemenu a{padding:0 7px;display:block;float:left;line-height:28px;border-top:1px solid #f9f9f9;border-bottom:1px solid #ddd;background-color:#f9f9f9;-webkit-transition:none;transition:none}#sidemenu li{display:inline;line-height:200%;list-style:none;text-align:center;white-space:nowrap;margin:0;padding:0}#sidemenu a.current{font-weight:400;padding-left:6px;padding-right:6px;border:1px solid #ddd;border-bottom-color:#f1f1f1;background-color:#f1f1f1;color:#000}#media-upload:after{content:"";display:table;clear:both}#media-upload .slidetoggle{border-top-color:#ddd}#media-upload input[type=radio]{padding:0}.media-upload-form label.form-help,td.help{color:#72777c;font-family:sans-serif;font-style:italic;font-weight:400}form{margin:1em}#search-filter{text-align:right}.media-upload-form p.help{margin:0;padding:0}.media-upload-form fieldset{width:100%;border:none;text-align:justify;margin:0 0 1em;padding:0}.image-align-none-label{background:url(../images/align-none.png) center left no-repeat}.image-align-left-label{background:url(../images/align-left.png) center left no-repeat}.image-align-center-label{background:url(../images/align-center.png) center left no-repeat}.image-align-right-label{background:url(../images/align-right.png) center left no-repeat}tr.image-size td{width:460px}tr.image-size div.image-size-item{margin:0 0 5px}#gallery-form .progress,#library-form .progress,.describe.startclosed,.describe.startopen,.insert-gallery{display:none}.media-item .thumbnail{max-width:128px;max-height:128px}thead.media-item-info tr{background-color:transparent}.form-table thead.media-item-info{border:8px solid #fff}abbr.required,span.required{text-decoration:none;border:none}.describe label{display:inline}.describe td.error{padding:2px 8px}.describe td.A1{width:132px}.describe input[type=text],.describe textarea{width:460px;border-width:1px;border-style:solid}#media-upload p.ml-submit{padding:1em 0}#media-upload label.help,#media-upload p.help{font-family:sans-serif;font-style:italic;font-weight:400}#media-upload .ui-sortable .media-item{cursor:move}#media-upload tr.image-size{margin-bottom:1em;height:3em}#media-upload #filter{width:623px}#media-upload #filter .subsubsub{margin:8px 0}#filter .tablenav select{border-style:solid;border-width:1px;padding:2px;vertical-align:top;width:auto}#media-upload .del-attachment{display:none;margin:5px 0}.menu_order{float:right;font-size:11px;margin:8px 10px 0}.menu_order_input{border:1px solid #ddd;font-size:10px;padding:1px;width:23px}.ui-sortable-helper{background-color:#fff;border:1px solid #a0a5aa;opacity:.6;filter:alpha(opacity=60)}#media-upload th.order-head{width:20%;text-align:center}#media-upload th.actions-head{width:25%;text-align:center}#media-upload a.wp-post-thumbnail{margin:0 20px}#media-upload .widefat{border-style:solid solid none}.sorthelper{height:37px;width:623px;display:block}#gallery-settings th.label{width:160px}#gallery-settings #basic th.label{padding:5px 5px 5px 0}#gallery-settings .title,h4.media-sub-title{border-bottom:1px solid #ddd;padding:0 0 3px}#gallery-settings .title{clear:both;font-size:1.6em}h3.media-title{font-size:1.6em}h4.media-sub-title{font-size:1.3em;margin:12px}#gallery-settings .title,h3.media-title,h4.media-sub-title{font-family:Georgia,"Times New Roman",Times,serif;font-weight:400;color:#5A5A5A}#gallery-settings .describe td{vertical-align:middle;height:3em}#gallery-settings .describe th.label{padding-top:.5em;text-align:left}#gallery-settings .describe{padding:5px;width:100%;clear:both;cursor:default;background:#fff}#gallery-settings .describe select{width:15em}#gallery-settings .describe select option,#gallery-settings .describe td{padding:0}#gallery-settings label,#gallery-settings legend{font-size:13px;color:#444;margin-right:15px}#gallery-settings .align .field label{margin:0 1em 0 3px}#gallery-settings p.ml-submit{border-top:1px solid #ddd}#gallery-settings select#columns{width:6em}#sort-buttons{font-size:.8em;margin:3px 25px -8px 0;text-align:right;max-width:625px}#sort-buttons #asc,#sort-buttons #showall{padding-left:5px}#sort-buttons span{margin-right:25px}p.media-types{margin:0;padding:1em}p.media-types-required-info{padding-top:0}tr.not-image{display:none}table.not-image tr.not-image{display:table-row}table.not-image tr.image-only{display:none}@media print,(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.image-align-none-label{background-image:url(../images/align-none-2x.png?ver=20120916);-webkit-background-size:21px 15px;background-size:21px 15px}.image-align-left-label{background-image:url(../images/align-left-2x.png?ver=20120916);-webkit-background-size:22px 15px;background-size:22px 15px}.image-align-center-label{background-image:url(../images/align-center-2x.png?ver=20120916);-webkit-background-size:21px 15px;background-size:21px 15px}.image-align-right-label{background-image:url(../images/align-right-2x.png?ver=20120916);-webkit-background-size:22px 15px;background-size:22px 15px}} \ No newline at end of file diff --git a/wp-admin/css/edit-rtl.css b/wp-admin/css/edit-rtl.css index 2bb6650..03ee7f2 100644 --- a/wp-admin/css/edit-rtl.css +++ b/wp-admin/css/edit-rtl.css @@ -24,20 +24,23 @@ } #save-action .spinner, -#show-comments a, -#show-comments .spinner { +#show-comments a { float: right; } +#show-comments .spinner { + float: none; + margin-top: 0; +} + #lost-connection-notice .spinner { - display: block; + visibility: visible; float: right; margin: 0 0 0 5px; } #titlediv { position: relative; - margin-bottom: 10px; } #titlediv label { @@ -60,43 +63,32 @@ height: 1.7em; width: 100%; outline: none; - margin: 0; + margin: 0 0 3px; background-color: #fff; } #titlediv #title-prompt-text { - color: #777; + color: #72777c; position: absolute; font-size: 1.7em; padding: 11px 10px; } -#wp-fullscreen-save .fs-saved { - color: #999; - float: left; - margin-top: 4px; -} - -#poststuff .inside-submitbox, -#side-sortables .inside-submitbox { - margin: 0 3px; - font-size: 11px; -} - input#link_description, input#link_url { width: 98%; } #pending { - background: 0 none; + background: 100% none; border: 0 none; padding: 0; font-size: 11px; margin-top: -1px; } -#edit-slug-box { +#edit-slug-box, +#comment-link-box { line-height: 24px; min-height: 25px; /* Yes, line-height + 1 */ margin-top: 5px; @@ -106,7 +98,15 @@ input#link_url { #edit-slug-box .cancel { margin-left: 10px; + padding: 0; font-size: 11px; + text-decoration: underline; + color: #0073aa; +} + +#comment-link-box { + margin: 5px 0; + padding: 0 5px; } #editable-post-name-full { @@ -114,11 +114,12 @@ input#link_url { } #editable-post-name { - background-color: #fffbcc; + font-weight: bold; } #editable-post-name input { font-size: 13px; + font-weight: normal; height: 22px; margin: 0; width: 16em; @@ -128,19 +129,15 @@ input#link_url { float: right; } -.submitbox .submit { - text-align: right; - padding: 12px 10px 10px; - font-size: 11px; - background-color: #464646; - color: #ccc; -} - .submitbox .submitdelete { text-decoration: none; padding: 1px 2px; } +body.post-new-php .submitbox .submitdelete { + display: none; +} + /* @todo: do we really need this? word on the street is we don't and this stray rule may actually be compensated for elsewhere. */ #normal-sortables .submitbox .submitdelete:hover { @@ -159,10 +156,6 @@ stray rule may actually be compensated for elsewhere. */ padding: 6px; } -.inside-submitbox #post_status { - margin: 2px -2px 2px 0; -} - #post-status-select { margin-top: 3px; } @@ -228,15 +221,22 @@ ul.category-tabs li, .wp-tab-bar .wp-tab-active a, #post-body ul.category-tabs li.tabs a, #post-body ul.add-menu-item-tabs li.tabs a { - color: #333; + color: #32373c; } .category-tabs { margin: 8px 0 5px; } +/* Back-compat for pre-4.4 */ #category-adder h4 { + margin: 0; +} + +.taxonomy-add-new { + display: inline-block; margin: 10px 0; + font-weight: 600; } #side-sortables .add-menu-item-tabs, @@ -247,7 +247,8 @@ ul.category-tabs li, #normal-sortables .postbox #replyrow .submit { float: none; margin: 0; - padding: 0 7px 5px; + padding: 5px 7px 10px; + overflow: hidden; } #side-sortables .submitbox .submit input, @@ -256,11 +257,6 @@ ul.category-tabs li, border: 0 none; } -#side-sortables .inside-submitbox .insidebox, -.stuffbox .insidebox { - margin: 11px 0; -} - /* @todo: make this a more generic class */ ul.category-tabs, ul.add-menu-item-tabs, @@ -277,7 +273,7 @@ ul.add-menu-item-tabs li { ul.category-tabs li.tabs, ul.add-menu-item-tabs li.tabs, .wp-tab-active { - border: 1px solid #dfdfdf; + border: 1px solid #ddd; border-bottom-color: #fdfdfd; background-color: #fdfdfd; } @@ -288,28 +284,27 @@ ul.wp-tab-bar li { padding: 3px 5px 5px; } +#set-post-thumbnail { + display: inline-block; + max-width: 100%; +} + #postimagediv .inside img { max-width: 100%; height: auto; + width: auto; + vertical-align: top; + background-image: -webkit-linear-gradient(-45deg, #c4c4c4 25%, transparent 25%, transparent 75%, #c4c4c4 75%, #c4c4c4), -webkit-linear-gradient(-45deg, #c4c4c4 25%, transparent 25%, transparent 75%, #c4c4c4 75%, #c4c4c4); + background-image: linear-gradient(-45deg, #c4c4c4 25%, transparent 25%, transparent 75%, #c4c4c4 75%, #c4c4c4), linear-gradient(-45deg, #c4c4c4 25%, transparent 25%, transparent 75%, #c4c4c4 75%, #c4c4c4); + background-position: 100% 0, 10px 10px; + -webkit-background-size: 20px 20px; + background-size: 20px 20px; } form#tags-filter { position: relative; } -/* Edit posts */ -td.post-title strong, -td.plugin-title strong { - display: block; - margin-bottom: .2em; - font-size: 14px; -} - -td.post-title p, -td.plugin-title p { - margin: 6px 0; -} - /* Global classes */ .wp-hidden-children .wp-hidden-child, .ui-tabs-hide { @@ -337,6 +332,7 @@ td.plugin-title p { background-color: #f7f7f7; -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04); box-shadow: 0 1px 1px rgba(0,0,0,0.04); + z-index: 999; } #post-status-info td { @@ -344,7 +340,7 @@ td.plugin-title p { } .autosave-info { - padding: 2px; + padding: 2px 10px; text-align: left; } @@ -353,13 +349,23 @@ td.plugin-title p { } #content-resize-handle { - background: transparent url(../images/resize.gif) no-repeat scroll left bottom; + background: transparent url(../images/resize.gif) no-repeat scroll right bottom; width: 12px; cursor: row-resize; } +/*rtl:ignore*/ .rtl #content-resize-handle { - background: transparent url(../images/resize-rtl.gif) no-repeat scroll right bottom; + background-image: url(../images/resize-rtl.gif); + background-position: left bottom; +} + +.wp-editor-expand #content-resize-handle { + display: none; +} + +#postdivrich #content { + resize: none; } #wp-word-count { @@ -367,6 +373,80 @@ td.plugin-title p { padding: 2px 10px; } +#wp-content-editor-container { + position: relative; +} + +#content-textarea-clone { + z-index: -1; + position: absolute; + top: 0; + visibility: hidden; + overflow: hidden; + max-width: 100%; + border: 1px solid transparent; +} + +.wp-editor-expand #wp-content-editor-tools { + z-index: 1000; + border-bottom: 1px solid #e5e5e5; +} + +.wp-editor-expand #wp-content-editor-container { + -webkit-box-shadow: none; + box-shadow: none; + margin-top: -1px; +} + +.wp-editor-expand #wp-content-editor-container { + border-bottom: 0 none; +} + +.wp-editor-expand div.mce-statusbar { + z-index: 1; +} + +.wp-editor-expand #post-status-info { + border-top: 1px solid #e5e5e5; +} + +.wp-editor-expand div.mce-toolbar-grp { + z-index: 999; +} + +/* TinyMCE native fullscreen mode override */ +.mce-fullscreen #wp-content-wrap .mce-menubar, +.mce-fullscreen #wp-content-wrap .mce-toolbar-grp, +.mce-fullscreen #wp-content-wrap .mce-edit-area, +.mce-fullscreen #wp-content-wrap .mce-statusbar { + position: static !important; + width: auto !important; + padding: 0 !important; +} + +.mce-fullscreen #wp-content-wrap .mce-statusbar { + visibility: visible !important; +} + +.mce-fullscreen #wp-content-wrap .mce-tinymce .mce-wp-dfw { + display: none; +} + +.post-php.mce-fullscreen #wpadminbar, +.mce-fullscreen #wp-content-wrap .mce-wp-dfw { + display: none; +} +/* End TinyMCE native fullscreen mode override */ + +#wp-content-editor-tools { + background-color: #f1f1f1; + padding-top: 20px; +} + +#poststuff #post-body.columns-2 #side-sortables { + width: 280px; +} + #timestampdiv select { height: 21px; line-height: 14px; @@ -399,13 +479,13 @@ td.plugin-title p { .curtime #timestamp:before, #post-body .misc-pub-revisions:before, span.wp-media-buttons-icon:before { - color: #888; + color: #82878c; } #post-body #visibility:before, .curtime #timestamp:before, #post-body .misc-pub-revisions:before { - font: normal 20px/1 'dashicons'; + font: normal 20px/1 dashicons; speak: none; display: inline-block; padding: 0 0 0 2px; @@ -419,16 +499,16 @@ span.wp-media-buttons-icon:before { } #post-body #visibility:before { - content: '\f177'; + content: "\f177"; } .curtime #timestamp:before { - content: '\f145'; + content: "\f145"; top: -1px; } #post-body .misc-pub-revisions:before { - content: '\f321'; + content: "\f321"; } #timestampdiv { @@ -448,6 +528,7 @@ span.wp-media-buttons-icon:before { .notification-dialog { position: fixed; top: 30%; + max-height: 70%; right: 50%; width: 450px; margin-right: -225px; @@ -456,6 +537,7 @@ span.wp-media-buttons-icon:before { box-shadow: 0 3px 6px rgba( 0, 0, 0, 0.3 ); line-height: 1.5; z-index: 1000005; + overflow-y: auto; } .notification-dialog-background { @@ -498,11 +580,11 @@ span.wp-media-buttons-icon:before { display: inline; } -#excerpt, -.attachmentlinks { - margin: 0; +#excerpt { + display: block; + margin: 12px 0 0; height: 4em; - width: 98%; + width: 100%; } .tagchecklist { @@ -526,8 +608,10 @@ span.wp-media-buttons-icon:before { float: right; font-size: 13px; line-height: 1.8em; - white-space: nowrap; cursor: default; + max-width: 100%; + overflow: hidden; + text-overflow: ellipsis; } .tagchecklist span a { @@ -542,15 +626,9 @@ span.wp-media-buttons-icon:before { position: absolute; } +#poststuff h3.hndle, /* Back-compat for pre-4.4 */ +#poststuff .stuffbox > h3, /* Back-compat for pre-4.4 */ #poststuff h2 { - margin-top: 20px; - font-size: 1.5em; - margin-bottom: 15px; - padding: 0 0 3px; - clear: right; -} - -#poststuff h3 { font-size: 14px; padding: 8px 12px; margin: 0; @@ -594,6 +672,7 @@ span.wp-media-buttons-icon:before { padding: 0; } +#post-body-content, .edit-form-section { margin-bottom: 20px; } @@ -631,7 +710,7 @@ span.wp-media-buttons-icon:before { #postcustomstuff table { margin: 0; width: 100%; - border: 1px solid #dfdfdf; + border: 1px solid #ddd; border-spacing: 0; background-color: #f9f9f9; } @@ -733,7 +812,7 @@ span.wp-media-buttons-icon:before { display: block; height: 20px; width: 20px; - font: normal 20px/1 'dashicons' !important; + font: normal 20px/1 dashicons !important; speak: none; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -748,7 +827,7 @@ span.wp-media-buttons-icon:before { a.post-state-format:hover:before, a.post-format-icon:hover:before { - color: #2ea2cc; + color: #00a0d2; } #post-formats-select { @@ -772,7 +851,7 @@ label.post-format-icon { position: relative; display: inline-block; margin-left: 7px; - font: normal 20px/1 'dashicons'; + font: normal 20px/1 dashicons; speak: none; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -781,61 +860,61 @@ label.post-format-icon { .post-state-format.post-format-standard:before, .post-format-icon.post-format-standard:before, a.post-state-format.format-standard:before { - content: '\f109'; + content: "\f109"; } .post-state-format.post-format-image:before, .post-format-icon.post-format-image:before, a.post-state-format.format-image:before { - content: '\f128'; + content: "\f128"; } .post-state-format.post-format-gallery:before, .post-format-icon.post-format-gallery:before, a.post-state-format.format-gallery:before { - content: '\f161'; + content: "\f161"; } .post-state-format.post-format-audio:before, .post-format-icon.post-format-audio:before, a.post-state-format.format-audio:before { - content: '\f127'; + content: "\f127"; } .post-state-format.post-format-video:before, .post-format-icon.post-format-video:before, a.post-state-format.format-video:before { - content: '\f126'; + content: "\f126"; } .post-state-format.post-format-chat:before, .post-format-icon.post-format-chat:before, a.post-state-format.format-chat:before { - content: '\f125'; + content: "\f125"; } .post-state-format.post-format-status:before, .post-format-icon.post-format-status:before, a.post-state-format.format-status:before { - content: '\f130'; + content: "\f130"; } .post-state-format.post-format-aside:before, .post-format-icon.post-format-aside:before, a.post-state-format.format-aside:before { - content: '\f123'; + content: "\f123"; } .post-state-format.post-format-quote:before, .post-format-icon.post-format-quote:before, a.post-state-format.format-quote:before { - content: '\f122'; + content: "\f122"; } .post-state-format.post-format-link:before, .post-format-icon.post-format-link:before, a.post-state-format.format-link:before { - content: '\f103'; + content: "\f103"; } /*------------------------------------------------------------------------------ @@ -864,7 +943,7 @@ a.post-state-format.format-link:before { max-height: 200px; overflow: auto; padding: 0 0.9em; - border: solid 1px #dfdfdf; + border: solid 1px #ddd; background-color: #fdfdfd; } @@ -913,7 +992,13 @@ ul.categorychecklist li { font-size: 12px; } -.form-field input, +.form-field input[type="text"], +.form-field input[type="password"], +.form-field input[type="email"], +.form-field input[type="number"], +.form-field input[type="search"], +.form-field input[type="tel"], +.form-field input[type="url"], .form-field textarea { border-style: solid; border-width: 1px; @@ -943,7 +1028,7 @@ span.description, max-width: 100%; } -.col-wrap h3 { +.col-wrap h2 { margin: 12px 0; font-size: 1.1em; } @@ -957,15 +1042,6 @@ span.description, 13.0 - Tags ------------------------------------------------------------------------------*/ -.tagsdiv { - margin-top: -8px; -} - -#poststuff .taghint { - color: #aaa; - margin: 15px 12px -24px 0; -} - #poststuff .tagsdiv .howto { margin: 0 0 6px 0; } @@ -990,25 +1066,9 @@ span.description, margin: 0 5px; } -/* tag hints */ -.taghint { - color: #aaa; - margin: -17px 7px 0 0; - visibility: hidden; -} - -input.newtag ~ div.taghint { - visibility: visible; -} - -input.newtag:focus ~ div.taghint { - visibility: hidden; -} - p.popular-tags { border: none; line-height: 2em; - max-width: 1000px; padding: 8px 12px 12px; text-align: justify; } @@ -1023,18 +1083,18 @@ p.popular-tags a { text-align: justify; } -.tagcloud h3 { +.tagcloud h2 { margin: 2px 0 12px; } .ac_results { + display: none; + margin: -1px 0 0; padding: 0; - margin: 0; list-style: none; position: absolute; z-index: 10000; - display: none; - border: 1px solid #808080; + border: 1px solid #5b9dd9; background-color: #fff; } @@ -1043,14 +1103,16 @@ p.popular-tags a { } .ac_results li { - padding: 2px 5px; + margin: 0; + padding: 5px 10px; white-space: nowrap; - color: #101010; text-align: right; } -.ac_over { - background-color: #f0f0b8; +.ac_results .ac_over, +.ac_over .ac_match { + background-color: #0073aa; + color: #fff; cursor: pointer; } @@ -1064,14 +1126,30 @@ p.popular-tags a { height: 200px; } -.comment-ays { - margin-bottom: 0; - border-bottom-style: solid; - border-bottom-width: 1px; +.comment-ays th, +.comment-ays td { + padding: 10px 15px; +} + +.comment-ays .comment-content a[href]:after { + content: '(' attr( href ) ')'; + display: inline-block; + padding: 0 4px; + color: #72777C; + font-size: 13px; +} + +.comment-ays .comment-content p.edit-comment { + margin-top: 10px; +} + +.comment-ays .comment-content p.edit-comment a[href]:after { + content: ''; + padding: 0; } -.comment-ays .alt { - background-color: transparent; +.comment-ays-submit .button-cancel { + margin-right: 1em; } .trash-undo-inside, @@ -1138,6 +1216,99 @@ table.links-table { max-width: 280px; } +/* DFW 2 +-------------------------------------------------------------- */ + +#wp-content-wrap .mce-wp-dfw, +#qt_content_dfw { + display: none; +} + +.wp-editor-expand #wp-content-wrap .mce-wp-dfw, +.wp-editor-expand #qt_content_dfw { + display: inline-block; +} + +.focus-on .wrap > h1, +.focus-on #wpfooter, +.focus-on .postbox-container > *, +.focus-on div.updated, +.focus-on div.error, +.focus-on div.notice, +.focus-on .update-nag, +.focus-on #wp-toolbar, +.focus-on #screen-meta-links, +.focus-on #screen-meta { + opacity: 0; + -webkit-transition-duration: 0.6s; + transition-duration: 0.6s; + -webkit-transition-property: opacity; + transition-property: opacity; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; +} + +.focus-on #wp-toolbar { + opacity: 0.3; +} + +.focus-off .wrap > h1, +.focus-off #wpfooter, +.focus-off .postbox-container > *, +.focus-off div.updated, +.focus-off div.error, +.focus-off div.notice, +.focus-off .update-nag, +.focus-off #wp-toolbar, +.focus-off #screen-meta-links, +.focus-off #screen-meta { + opacity: 1; + -webkit-transition-duration: 0.2s; + transition-duration: 0.2s; + -webkit-transition-property: opacity; + transition-property: opacity; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; +} + +.focus-off #wp-toolbar { + -webkit-transform: translate(0, 0); +} + +.focus-on #adminmenuback, +.focus-on #adminmenuwrap { + -webkit-transition-duration: 0.6s; + transition-duration: 0.6s; + -webkit-transition-property: -webkit-transform; + transition-property: -webkit-transform; + transition-property: transform; + transition-property: transform, -webkit-transform; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; +} + +.focus-on #adminmenuback, +.focus-on #adminmenuwrap { + -webkit-transform: translateX( 100% ); + -ms-transform: translateX( 100% ); + transform: translateX( 100% ); +} + +.focus-off #adminmenuback, +.focus-off #adminmenuwrap { + -webkit-transform: translateX( 0 ); + -ms-transform: translateX( 0 ); + transform: translateX( 0 ); + -webkit-transition-duration: 0.2s; + transition-duration: 0.2s; + -webkit-transition-property: -webkit-transform; + transition-property: -webkit-transform; + transition-property: transform; + transition-property: transform, -webkit-transform; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; +} + /* =Media Queries -------------------------------------------------------------- */ @@ -1145,19 +1316,20 @@ table.links-table { * HiDPI Displays */ @media print, - (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 120dpi) { #content-resize-handle, #post-body .wp_themeSkin .mceStatusbar a.mceResize { - background: transparent url(../images/resize-2x.gif) no-repeat scroll left bottom; + background: transparent url(../images/resize-2x.gif) no-repeat scroll right bottom; -webkit-background-size: 11px 11px; background-size: 11px 11px; } + /*rtl:ignore*/ .rtl #content-resize-handle, .rtl #post-body .wp_themeSkin .mceStatusbar a.mceResize { - background: transparent url(../images/resize-rtl-2x.gif) no-repeat scroll left bottom; + background-image: url(../images/resize-rtl-2x.gif); + background-position: left bottom; } } @@ -1185,6 +1357,7 @@ table.links-table { #poststuff #post-body.columns-2 #side-sortables { min-height: 0; + width: auto; } /* hide the radio buttons for column prefs */ @@ -1203,7 +1376,9 @@ table.links-table { padding: 10px 10px; } - #poststuff h3 { + #poststuff h3.hndle, /* Back-compat for pre-4.4 */ + #poststuff .stuffbox > h3, /* Back-compat for pre-4.4 */ + #poststuff h2 { padding: 12px; } @@ -1294,7 +1469,7 @@ table.links-table { .tagchecklist span { font-size: 16px; - line-height: 120%; + line-height: 1.4; } /* Discussion */ @@ -1348,17 +1523,11 @@ table.links-table { padding: 10px 20px; } - #wp-content-editor-tools { - overflow: hidden; - padding: 20px 0 1px 15px; - top: 1px; - } - - a.wp-switch-editor { + button.wp-switch-editor { font-size: 16px; line-height: 1em; - margin: 3px 7px 0 0; - padding: 12px 15px; + margin: 7px 7px 0 0; + padding: 8px 12px; } #wp-content-media-buttons a { @@ -1398,9 +1567,19 @@ table.links-table { line-height: 47px; } + #publishing-action .spinner { + float: none; + margin-top: -2px; /* Half of the Publish button's bottom margin. */ + } + /* Moderate Comment */ - .comment-ays { - border-bottom: none; + .comment-ays th, + .comment-ays td { + padding-bottom: 0; + } + + .comment-ays td { + padding-top: 6px; } /* Links */ diff --git a/wp-admin/css/edit-rtl.min.css b/wp-admin/css/edit-rtl.min.css new file mode 100644 index 0000000..b0dc269 --- /dev/null +++ b/wp-admin/css/edit-rtl.min.css @@ -0,0 +1 @@ +#pending,#poststuff #titlewrap{border:0;padding:0}#pending,#poststuff #post-body{padding:0}#editable-post-name-full,body.post-new-php .submitbox .submitdelete{display:none}#titlediv,#wp-content-editor-container,.postbox,form#tags-filter{position:relative}#poststuff{padding-top:10px;min-width:763px}#poststuff .postbox-container{width:100%}#poststuff #post-body.columns-2{margin-left:300px}#show-comments{overflow:hidden}#save-action .spinner,#show-comments a{float:right}#show-comments .spinner{float:none;margin-top:0}#lost-connection-notice .spinner{visibility:visible;float:right;margin:0 0 0 5px}#titlediv label{cursor:text}#titlediv div.inside{margin:0}#titlediv #title{padding:3px 8px;font-size:1.7em;line-height:100%;height:1.7em;width:100%;outline:0;margin:0 0 3px;background-color:#fff}#titlediv #title-prompt-text{color:#72777c;position:absolute;font-size:1.7em;padding:11px 10px}input#link_description,input#link_url{width:98%}#pending{background:100% none;font-size:11px;margin-top:-1px}#comment-link-box,#edit-slug-box{line-height:24px;min-height:25px;margin-top:5px;padding:0 10px;color:#666}#edit-slug-box .cancel{margin-left:10px;padding:0;font-size:11px;text-decoration:underline;color:#0073aa}#comment-link-box{margin:5px 0;padding:0 5px}#editable-post-name{font-weight:700}#editable-post-name input{font-size:13px;font-weight:400;height:22px;margin:0;width:16em}.postarea h3 label{float:right}.submitbox .submitdelete{text-decoration:none;padding:1px 2px}#normal-sortables .submitbox .submitdelete:hover{color:#000;background-color:red;border-bottom-color:red}.submitbox .submit a:hover{text-decoration:underline}.submitbox .submit input{margin-bottom:8px;margin-left:4px;padding:6px}#post-status-select{margin-top:3px}#post-body #normal-sortables{min-height:50px}.postbox{min-width:255px;border:1px solid #e5e5e5;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04);background:#fff}#trackback_url{width:99%}#normal-sortables .postbox .submit{background:0 0;border:0;float:left;padding:0 12px;margin:0}.category-add input[type=text],.category-add select{width:100%;max-width:260px;vertical-align:baseline}#side-sortables .category-add input[type=text],#side-sortables .category-add select{margin:0 0 1em}#side-sortables .add-menu-item-tabs li,.wp-tab-bar li,ul.category-tabs li{display:inline;line-height:1.35em}.no-js .category-tabs li.hide-if-no-js{display:none}#side-sortables .add-menu-item-tabs a,.category-tabs a,.wp-tab-bar a{text-decoration:none}#post-body ul.add-menu-item-tabs li.tabs a,#post-body ul.category-tabs li.tabs a,#side-sortables .add-menu-item-tabs .tabs a,#side-sortables .category-tabs .tabs a,.wp-tab-bar .wp-tab-active a{color:#32373c}.category-tabs{margin:8px 0 5px}#category-adder h4{margin:0}.taxonomy-add-new{display:inline-block;margin:10px 0;font-weight:600}#side-sortables .add-menu-item-tabs,.wp-tab-bar{margin-bottom:3px}#normal-sortables .postbox #replyrow .submit{float:none;margin:0;padding:5px 7px 10px;overflow:hidden}#side-sortables .submitbox .submit .preview,#side-sortables .submitbox .submit a.preview:hover,#side-sortables .submitbox .submit input{border:0}ul.add-menu-item-tabs,ul.category-tabs,ul.wp-tab-bar{margin-top:12px}ul.add-menu-item-tabs li,ul.category-tabs li{border:1px solid transparent;position:relative}.wp-tab-active,ul.add-menu-item-tabs li.tabs,ul.category-tabs li.tabs{border:1px solid #ddd;border-bottom-color:#fdfdfd;background-color:#fdfdfd}ul.add-menu-item-tabs li,ul.category-tabs li,ul.wp-tab-bar li{padding:3px 5px 5px}#set-post-thumbnail{display:inline-block;max-width:100%}.ui-tabs-hide,.wp-editor-expand #content-resize-handle,.wp-hidden-children .wp-hidden-child{display:none}#postimagediv .inside img{max-width:100%;height:auto;width:auto;vertical-align:top;background-image:-webkit-linear-gradient(-45deg,#c4c4c4 25%,transparent 25%,transparent 75%,#c4c4c4 75%,#c4c4c4),-webkit-linear-gradient(-45deg,#c4c4c4 25%,transparent 25%,transparent 75%,#c4c4c4 75%,#c4c4c4);background-image:linear-gradient(-45deg,#c4c4c4 25%,transparent 25%,transparent 75%,#c4c4c4 75%,#c4c4c4),linear-gradient(-45deg,#c4c4c4 25%,transparent 25%,transparent 75%,#c4c4c4 75%,#c4c4c4);background-position:100% 0,10px 10px;-webkit-background-size:20px 20px;background-size:20px 20px}#post-body .tagsdiv #newtag{margin-left:5px;width:16em}#side-sortables input#post_password{width:94%}#side-sortables .tagsdiv #newtag{width:68%}#post-status-info{width:100%;border-spacing:0;border:1px solid #e5e5e5;border-top:none;background-color:#f7f7f7;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04);z-index:999}#post-status-info td{font-size:12px}.autosave-info{padding:2px 10px;text-align:left}#editorcontent #post-status-info{border:none}#content-resize-handle{background:url(../images/resize.gif) right bottom no-repeat;width:12px;cursor:row-resize}.rtl #content-resize-handle{background-image:url(../images/resize-rtl.gif);background-position:left bottom}#postdivrich #content{resize:none}#wp-word-count{display:block;padding:2px 10px}#content-textarea-clone{z-index:-1;position:absolute;top:0;visibility:hidden;overflow:hidden;max-width:100%;border:1px solid transparent}.wp-editor-expand #wp-content-editor-tools{z-index:1000;border-bottom:1px solid #e5e5e5}.wp-editor-expand #wp-content-editor-container{-webkit-box-shadow:none;box-shadow:none;margin-top:-1px;border-bottom:0 none}.wp-editor-expand div.mce-statusbar{z-index:1}.wp-editor-expand #post-status-info{border-top:1px solid #e5e5e5}.wp-editor-expand div.mce-toolbar-grp{z-index:999}.mce-fullscreen #wp-content-wrap .mce-edit-area,.mce-fullscreen #wp-content-wrap .mce-menubar,.mce-fullscreen #wp-content-wrap .mce-statusbar,.mce-fullscreen #wp-content-wrap .mce-toolbar-grp{position:static!important;width:auto!important;padding:0!important}.mce-fullscreen #wp-content-wrap .mce-statusbar{visibility:visible!important}.mce-fullscreen #wp-content-wrap .mce-tinymce .mce-wp-dfw,.mce-fullscreen #wp-content-wrap .mce-wp-dfw,.post-php.mce-fullscreen #wpadminbar{display:none}#wp-content-editor-tools{background-color:#f1f1f1;padding-top:20px}#poststuff #post-body.columns-2 #side-sortables{width:280px}#timestampdiv select{height:21px;line-height:14px;padding:0;vertical-align:top;font-size:12px}#aa,#hh,#jj,#mn{padding:1px;font-size:12px}#hh,#jj,#mn{width:2em}#aa{width:3.4em}.curtime #timestamp{padding:2px 0 1px;display:inline!important;height:auto!important}#misc-publishing-actions label[for=post_status]:before,#post-body #visibility:before,#post-body .misc-pub-revisions:before,.curtime #timestamp:before,span.wp-media-buttons-icon:before{color:#82878c}#post-body #visibility:before,#post-body .misc-pub-revisions:before,.curtime #timestamp:before{font:400 20px/1 dashicons;speak:none;display:inline-block;padding:0 0 0 2px;top:0;right:-1px;position:relative;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important}#post-body #visibility:before{content:"\f177"}.curtime #timestamp:before{content:"\f145";top:-1px}#post-body .misc-pub-revisions:before{content:"\f321"}#timestampdiv{padding-top:5px;line-height:23px}#timestampdiv p{margin:8px 0 6px}#timestampdiv input{border-width:1px;border-style:solid}.notification-dialog{position:fixed;top:30%;max-height:70%;right:50%;width:450px;margin-right:-225px;background:#fff;-webkit-box-shadow:0 3px 6px rgba(0,0,0,.3);box-shadow:0 3px 6px rgba(0,0,0,.3);line-height:1.5;z-index:1000005;overflow-y:auto}.notification-dialog-background{position:fixed;top:0;right:0;left:0;bottom:0;background:#000;opacity:.7;filter:alpha(opacity=70);z-index:1000000}#post-lock-dialog .post-locked-message,#post-lock-dialog .post-taken-over{margin:25px}#post-lock-dialog .post-locked-message a.button{margin-left:10px}#post-lock-dialog .post-locked-avatar{float:right;margin:0 0 20px 20px}#post-lock-dialog .wp-tab-first{outline:0}#post-lock-dialog .locked-saving img{float:right;margin-left:3px}#post-lock-dialog.saved .locked-saved,#post-lock-dialog.saving .locked-saving{display:inline}#excerpt{display:block;margin:12px 0 0;height:4em;width:100%}.tagchecklist{margin-right:14px;font-size:12px;overflow:auto}.tagchecklist br{display:none}.tagchecklist span,.tagchecklist span a{display:block;float:right;overflow:hidden}.tagchecklist strong{margin-right:-8px;position:absolute}.tagchecklist span{margin-left:25px;font-size:13px;line-height:1.8em;cursor:default;max-width:100%;text-overflow:ellipsis}.tagchecklist span a{margin:1px -17px 0 0;cursor:pointer;width:20px;height:20px;text-indent:0;position:absolute}#poststuff .stuffbox>h3,#poststuff h2,#poststuff h3.hndle{font-size:14px;padding:8px 12px;margin:0;line-height:1.4}#poststuff .inside{margin:6px 0 0}#poststuff .inside #page_template,#poststuff .inside #parent_id{max-width:100%}#poststuff .inside label.deleted,#poststuff .inside label.spam{color:red}#poststuff .inside label.waiting{color:orange}#poststuff .inside label.approved{color:green}.ie8 #poststuff .inside #page_template,.ie8 #poststuff .inside #parent_id{width:250px}#post-visibility-select{line-height:1.5em;margin-top:3px}#poststuff #submitdiv .inside{margin:0;padding:0}#post-body-content,.edit-form-section{margin-bottom:20px}#postcustomstuff thead th{padding:5px 8px 8px;background-color:#f1f1f1}#postcustom #postcustomstuff .submit{border:0;float:none;padding:0 8px 8px}#side-sortables #postcustom #postcustomstuff .submit{margin:0;padding:0}#side-sortables #postcustom #postcustomstuff #the-list textarea{height:85px}#side-sortables #postcustom #postcustomstuff td.left input,#side-sortables #postcustom #postcustomstuff td.left select,#side-sortables #postcustomstuff #newmetaleft a{margin:3px 3px 0}#postcustomstuff table{margin:0;width:100%;border:1px solid #ddd;border-spacing:0;background-color:#f9f9f9}#postcustomstuff tr{vertical-align:top}#postcustomstuff table input,#postcustomstuff table select,#postcustomstuff table textarea{width:96%;margin:8px}#side-sortables #postcustomstuff table input,#side-sortables #postcustomstuff table select,#side-sortables #postcustomstuff table textarea{margin:3px}#postcustomstuff td.left,#postcustomstuff th.left{width:38%}#postcustomstuff .submit input{margin:0;width:auto}#postcustomstuff #newmetaleft a{display:inline-block;margin:0 8px 8px;text-decoration:none}.no-js #postcustomstuff #enternew{display:none}#post-body-content .compat-attachment-fields{margin-bottom:20px}.compat-attachment-fields th{padding-top:5px;padding-left:10px}#select-featured-image{padding:4px 0;overflow:hidden}#select-featured-image img{max-width:100%;height:auto;margin-bottom:10px}#select-featured-image a{float:right;clear:both}#select-featured-image .remove{display:none;margin-top:10px}.js #select-featured-image.has-featured-image .remove{display:inline-block}.no-js #select-featured-image .choose{display:none}.post-state-format{overflow:hidden;display:inline-block;vertical-align:middle;height:20px;width:20px;margin-left:5px;margin-top:-4px}.post-state-format:before{display:block;height:20px;width:20px;font:400 20px/1 dashicons!important;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.post-format-icon:before,.post-state-format:before{color:#ddd;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}a.post-format-icon:hover:before,a.post-state-format:hover:before{color:#00a0d2}#post-formats-select{line-height:2em}#post-formats-select .post-format-icon:before{top:5px}input.post-format{margin-top:1px}label.post-format-icon{margin-right:0;padding:2px 0}.post-format-icon:before{position:relative;display:inline-block;margin-left:7px;font:400 20px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.post-format-icon.post-format-standard:before,.post-state-format.post-format-standard:before,a.post-state-format.format-standard:before{content:"\f109"}.post-format-icon.post-format-image:before,.post-state-format.post-format-image:before,a.post-state-format.format-image:before{content:"\f128"}.post-format-icon.post-format-gallery:before,.post-state-format.post-format-gallery:before,a.post-state-format.format-gallery:before{content:"\f161"}.post-format-icon.post-format-audio:before,.post-state-format.post-format-audio:before,a.post-state-format.format-audio:before{content:"\f127"}.post-format-icon.post-format-video:before,.post-state-format.post-format-video:before,a.post-state-format.format-video:before{content:"\f126"}.post-format-icon.post-format-chat:before,.post-state-format.post-format-chat:before,a.post-state-format.format-chat:before{content:"\f125"}.post-format-icon.post-format-status:before,.post-state-format.post-format-status:before,a.post-state-format.format-status:before{content:"\f130"}.post-format-icon.post-format-aside:before,.post-state-format.post-format-aside:before,a.post-state-format.format-aside:before{content:"\f123"}.post-format-icon.post-format-quote:before,.post-state-format.post-format-quote:before,a.post-state-format.format-quote:before{content:"\f122"}.post-format-icon.post-format-link:before,.post-state-format.post-format-link:before,a.post-state-format.format-link:before{content:"\f103"}.category-adder{margin-right:120px;padding:4px 0}.category-adder h4{margin:0 0 8px}#side-sortables .category-adder{margin:0}.categorydiv div.tabs-panel,.customlinkdiv div.tabs-panel,.posttypediv div.tabs-panel,.taxonomydiv div.tabs-panel,.wp-tab-panel{min-height:42px;max-height:200px;overflow:auto;padding:0 .9em;border:1px solid #ddd;background-color:#fdfdfd}div.tabs-panel-active{display:block}div.tabs-panel-inactive{display:none}#front-page-warning,#front-static-pages ul,.categorydiv ul.categorychecklist ul,.customlinkdiv ul.categorychecklist ul,.inline-editor ul.cat-checklist ul,.posttypediv ul.categorychecklist ul,.taxonomydiv ul.categorychecklist ul,ul.export-filters{margin-right:18px}ul.categorychecklist li{margin:0;padding:0;line-height:22px;word-wrap:break-word}.categorydiv .tabs-panel,.customlinkdiv .tabs-panel,.posttypediv .tabs-panel,.taxonomydiv .tabs-panel{border-width:3px;border-style:solid}.form-wrap label{display:block;padding:2px;font-size:12px}.form-field input[type=text],.form-field input[type=password],.form-field input[type=email],.form-field input[type=number],.form-field input[type=search],.form-field input[type=tel],.form-field input[type=url],.form-field textarea{border-style:solid;border-width:1px;width:95%}.form-wrap p,p.description{margin:2px 0 5px;color:#666}.form-wrap p,p.description,p.help,span.description{font-size:13px;font-style:italic}.form-wrap .form-field{margin:0 0 10px;padding:8px 0}.form-wrap .form-field #parent{max-width:100%}.col-wrap h2{margin:12px 0;font-size:1.1em}.col-wrap p.submit{margin-top:-10px}#poststuff .tagsdiv .howto{margin:0 0 6px}.ajaxtag .newtag{position:relative}.tagsdiv .newtag{width:180px}.tagsdiv .the-tags{display:block;height:60px;margin:0 auto;overflow:auto;width:260px}#post-body-content .tagsdiv .the-tags{margin:0 5px}p.popular-tags{border:none;line-height:2em;padding:8px 12px 12px;text-align:justify}p.popular-tags a{padding:0 3px}.tagcloud{width:97%;margin:0 0 40px;text-align:justify}.tagcloud h2{margin:2px 0 12px}.ac_results{display:none;margin:-1px 0 0;padding:0;list-style:none;position:absolute;z-index:10000;border:1px solid #5b9dd9;background-color:#fff}.wp-customizer .ac_results{z-index:500000}.ac_results li{margin:0;padding:5px 10px;white-space:nowrap;text-align:right}.ac_over .ac_match,.ac_results .ac_over{background-color:#0073aa;color:#fff;cursor:pointer}.ac_match{text-decoration:underline}.comment-php .wp-editor-area{height:200px}.comment-ays td,.comment-ays th{padding:10px 15px}.comment-ays .comment-content a[href]:after{content:'(' attr(href) ')';display:inline-block;padding:0 4px;color:#72777C;font-size:13px}.comment-ays .comment-content p.edit-comment{margin-top:10px}.comment-ays .comment-content p.edit-comment a[href]:after{content:'';padding:0}#comment-status-radio label,.links-table td,.links-table th{padding:5px 0}.comment-ays-submit .button-cancel{margin-right:1em}.spam-undo-inside,.trash-undo-inside{margin:1px 0 1px 8px;line-height:16px}.spam-undo-inside .avatar,.trash-undo-inside .avatar{height:20px;width:20px;margin-left:8px;vertical-align:middle}.stuffbox .editcomment{clear:none}#comment-status-radio p{margin:3px 0 5px}#comment-status-radio input{margin:2px 0 5px 3px;vertical-align:middle}table.links-table{width:100%;border-spacing:0}.links-table th{font-weight:400;text-align:right;vertical-align:top;min-width:80px;width:20%;word-wrap:break-word}.links-table td label{margin-left:8px}.links-table td input[type=text],.links-table td textarea{width:100%}.links-table #link_rel{max-width:280px}#qt_content_dfw,#wp-content-wrap .mce-wp-dfw{display:none}.wp-editor-expand #qt_content_dfw,.wp-editor-expand #wp-content-wrap .mce-wp-dfw{display:inline-block}.focus-on #screen-meta,.focus-on #screen-meta-links,.focus-on #wp-toolbar,.focus-on #wpfooter,.focus-on .postbox-container>*,.focus-on .update-nag,.focus-on .wrap>h1,.focus-on div.error,.focus-on div.notice,.focus-on div.updated{opacity:0;-webkit-transition-duration:.6s;transition-duration:.6s;-webkit-transition-property:opacity;transition-property:opacity;-webkit-transition-timing-function:ease-in-out;transition-timing-function:ease-in-out}.focus-on #wp-toolbar{opacity:.3}.focus-off #screen-meta,.focus-off #screen-meta-links,.focus-off #wp-toolbar,.focus-off #wpfooter,.focus-off .postbox-container>*,.focus-off .update-nag,.focus-off .wrap>h1,.focus-off div.error,.focus-off div.notice,.focus-off div.updated{opacity:1;-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-property:opacity;transition-property:opacity;-webkit-transition-timing-function:ease-in-out;transition-timing-function:ease-in-out}.focus-off #wp-toolbar{-webkit-transform:translate(0,0)}.focus-on #adminmenuback,.focus-on #adminmenuwrap{-webkit-transition-duration:.6s;transition-duration:.6s;-webkit-transition-property:-webkit-transform;transition-property:-webkit-transform;transition-property:transform;transition-property:transform,-webkit-transform;-webkit-transition-timing-function:ease-in-out;transition-timing-function:ease-in-out;-webkit-transform:translateX(100%);-ms-transform:translateX(100%);transform:translateX(100%)}.focus-off #adminmenuback,.focus-off #adminmenuwrap{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0);-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-property:-webkit-transform;transition-property:-webkit-transform;transition-property:transform;transition-property:transform,-webkit-transform;-webkit-transition-timing-function:ease-in-out;transition-timing-function:ease-in-out}@media print,(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){#content-resize-handle,#post-body .wp_themeSkin .mceStatusbar a.mceResize{background:url(../images/resize-2x.gif) right bottom no-repeat;-webkit-background-size:11px 11px;background-size:11px 11px}.rtl #content-resize-handle,.rtl #post-body .wp_themeSkin .mceStatusbar a.mceResize{background-image:url(../images/resize-rtl-2x.gif);background-position:left bottom}}@media only screen and (max-width:850px){#poststuff{min-width:0}#wpbody-content #poststuff #post-body{margin:0}#wpbody-content #post-body.columns-2 #postbox-container-1{margin-left:0;width:100%}#poststuff #postbox-container-1 #side-sortables:empty,#poststuff #postbox-container-1 .empty-container{border:0;height:0;min-height:0}#poststuff #post-body.columns-2 #side-sortables{min-height:0;width:auto}.columns-prefs,.screen-layout{display:none}}@media screen and (max-width:782px){#post-body-content{min-width:0}#titlediv #title-prompt-text{padding:10px}#poststuff .stuffbox>h3,#poststuff h2,#poststuff h3.hndle{padding:12px}.post-format-options{padding-left:0}.post-format-options a{margin-left:5px;margin-bottom:5px;min-width:52px}.post-format-options .post-format-title{font-size:11px}.post-format-options a div{height:28px;width:28px}.post-format-options a div:before{font-size:26px!important}#post-visibility-select{line-height:280%}.wp-core-ui .save-post-visibility,.wp-core-ui .save-timestamp{vertical-align:middle;margin-left:15px}.timestamp-wrap select#mm{display:block;width:100%;margin-bottom:10px}.timestamp-wrap #aa,.timestamp-wrap #hh,.timestamp-wrap #jj,.timestamp-wrap #mn{padding:12px 3px;font-size:14px;margin-bottom:5px;width:auto;text-align:center}ul.category-tabs{margin:30px 0 15px}.tagsdiv .newtag,ul.categorychecklist li{margin-bottom:15px}ul.category-tabs li.tabs{padding:15px}ul.categorychecklist ul{margin-top:15px}.category-add input[type=text],.category-add select{max-width:none;margin-bottom:15px}.tagsdiv .newtag{width:100%;height:auto}.tagchecklist{margin:25px 10px}.tagchecklist span{font-size:16px;line-height:1.4}#commentstatusdiv p{line-height:2.8}.mceToolbar *{white-space:normal!important}.mceToolbar td,.mceToolbar tr{float:right!important}.wp_themeSkin a.mceButton{width:30px;height:30px}.wp_themeSkin .mceButton .mceIcon{margin-top:5px;margin-right:5px}.wp_themeSkin .mceSplitButton{margin-top:1px}.wp_themeSkin .mceSplitButton td a.mceAction{padding:6px 6px 6px 3px}.wp_themeSkin .mceSplitButton td a.mceOpen,.wp_themeSkin .mceSplitButtonEnabled:hover td a.mceOpen{padding-top:6px;padding-bottom:6px;background-position:1px 6px}.wp_themeSkin table.mceListBox{margin:5px}div.quicktags-toolbar input{padding:10px 20px}button.wp-switch-editor{font-size:16px;line-height:1em;margin:7px 7px 0 0;padding:8px 12px}#wp-content-media-buttons a{font-size:16px;line-height:37px;height:39px;padding:0 15px 0 20px}.wp-media-buttons span.jetpack-contact-form-icon,.wp-media-buttons span.wp-media-buttons-icon{width:22px!important;margin-top:-3px!important;margin-right:-5px!important}.wp-media-buttons #insert-jetpack-contact-form span.jetpack-contact-form-icon:before,.wp-media-buttons .add_media span.wp-media-buttons-icon:before{font-size:20px!important}#content_wp_fullscreen{display:none}.misc-pub-section{padding:20px 10px}.misc-pub-section>a{float:left;font-size:16px}#delete-action,#publishing-action{line-height:47px}#publishing-action .spinner{float:none;margin-top:-2px}.comment-ays td,.comment-ays th{padding-bottom:0}.comment-ays td{padding-top:6px}.links-table #link_rel{max-width:none}.links-table td,.links-table th{padding:10px 0}}@media only screen and (max-width:500px){#wp-content-media-buttons a{font-size:14px;padding:0 10px}} \ No newline at end of file diff --git a/wp-admin/css/edit.css b/wp-admin/css/edit.css index 646384e..d4108ae 100644 --- a/wp-admin/css/edit.css +++ b/wp-admin/css/edit.css @@ -24,20 +24,23 @@ } #save-action .spinner, -#show-comments a, -#show-comments .spinner { +#show-comments a { float: left; } +#show-comments .spinner { + float: none; + margin-top: 0; +} + #lost-connection-notice .spinner { - display: block; + visibility: visible; float: left; margin: 0 5px 0 0; } #titlediv { position: relative; - margin-bottom: 10px; } #titlediv label { @@ -60,29 +63,17 @@ height: 1.7em; width: 100%; outline: none; - margin: 0; + margin: 0 0 3px; background-color: #fff; } #titlediv #title-prompt-text { - color: #777; + color: #72777c; position: absolute; font-size: 1.7em; padding: 11px 10px; } -#wp-fullscreen-save .fs-saved { - color: #999; - float: right; - margin-top: 4px; -} - -#poststuff .inside-submitbox, -#side-sortables .inside-submitbox { - margin: 0 3px; - font-size: 11px; -} - input#link_description, input#link_url { width: 98%; @@ -96,7 +87,8 @@ input#link_url { margin-top: -1px; } -#edit-slug-box { +#edit-slug-box, +#comment-link-box { line-height: 24px; min-height: 25px; /* Yes, line-height + 1 */ margin-top: 5px; @@ -106,7 +98,15 @@ input#link_url { #edit-slug-box .cancel { margin-right: 10px; + padding: 0; font-size: 11px; + text-decoration: underline; + color: #0073aa; +} + +#comment-link-box { + margin: 5px 0; + padding: 0 5px; } #editable-post-name-full { @@ -114,11 +114,12 @@ input#link_url { } #editable-post-name { - background-color: #fffbcc; + font-weight: bold; } #editable-post-name input { font-size: 13px; + font-weight: normal; height: 22px; margin: 0; width: 16em; @@ -128,19 +129,15 @@ input#link_url { float: left; } -.submitbox .submit { - text-align: left; - padding: 12px 10px 10px; - font-size: 11px; - background-color: #464646; - color: #ccc; -} - .submitbox .submitdelete { text-decoration: none; padding: 1px 2px; } +body.post-new-php .submitbox .submitdelete { + display: none; +} + /* @todo: do we really need this? word on the street is we don't and this stray rule may actually be compensated for elsewhere. */ #normal-sortables .submitbox .submitdelete:hover { @@ -159,10 +156,6 @@ stray rule may actually be compensated for elsewhere. */ padding: 6px; } -.inside-submitbox #post_status { - margin: 2px 0 2px -2px; -} - #post-status-select { margin-top: 3px; } @@ -228,15 +221,22 @@ ul.category-tabs li, .wp-tab-bar .wp-tab-active a, #post-body ul.category-tabs li.tabs a, #post-body ul.add-menu-item-tabs li.tabs a { - color: #333; + color: #32373c; } .category-tabs { margin: 8px 0 5px; } +/* Back-compat for pre-4.4 */ #category-adder h4 { + margin: 0; +} + +.taxonomy-add-new { + display: inline-block; margin: 10px 0; + font-weight: 600; } #side-sortables .add-menu-item-tabs, @@ -247,7 +247,8 @@ ul.category-tabs li, #normal-sortables .postbox #replyrow .submit { float: none; margin: 0; - padding: 0 7px 5px; + padding: 5px 7px 10px; + overflow: hidden; } #side-sortables .submitbox .submit input, @@ -256,11 +257,6 @@ ul.category-tabs li, border: 0 none; } -#side-sortables .inside-submitbox .insidebox, -.stuffbox .insidebox { - margin: 11px 0; -} - /* @todo: make this a more generic class */ ul.category-tabs, ul.add-menu-item-tabs, @@ -277,7 +273,7 @@ ul.add-menu-item-tabs li { ul.category-tabs li.tabs, ul.add-menu-item-tabs li.tabs, .wp-tab-active { - border: 1px solid #dfdfdf; + border: 1px solid #ddd; border-bottom-color: #fdfdfd; background-color: #fdfdfd; } @@ -288,28 +284,27 @@ ul.wp-tab-bar li { padding: 3px 5px 5px; } +#set-post-thumbnail { + display: inline-block; + max-width: 100%; +} + #postimagediv .inside img { max-width: 100%; height: auto; + width: auto; + vertical-align: top; + background-image: -webkit-linear-gradient(45deg, #c4c4c4 25%, transparent 25%, transparent 75%, #c4c4c4 75%, #c4c4c4), -webkit-linear-gradient(45deg, #c4c4c4 25%, transparent 25%, transparent 75%, #c4c4c4 75%, #c4c4c4); + background-image: linear-gradient(45deg, #c4c4c4 25%, transparent 25%, transparent 75%, #c4c4c4 75%, #c4c4c4), linear-gradient(45deg, #c4c4c4 25%, transparent 25%, transparent 75%, #c4c4c4 75%, #c4c4c4); + background-position: 0 0, 10px 10px; + -webkit-background-size: 20px 20px; + background-size: 20px 20px; } form#tags-filter { position: relative; } -/* Edit posts */ -td.post-title strong, -td.plugin-title strong { - display: block; - margin-bottom: .2em; - font-size: 14px; -} - -td.post-title p, -td.plugin-title p { - margin: 6px 0; -} - /* Global classes */ .wp-hidden-children .wp-hidden-child, .ui-tabs-hide { @@ -337,6 +332,7 @@ td.plugin-title p { background-color: #f7f7f7; -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04); box-shadow: 0 1px 1px rgba(0,0,0,0.04); + z-index: 999; } #post-status-info td { @@ -344,7 +340,7 @@ td.plugin-title p { } .autosave-info { - padding: 2px; + padding: 2px 10px; text-align: right; } @@ -358,8 +354,18 @@ td.plugin-title p { cursor: row-resize; } +/*rtl:ignore*/ .rtl #content-resize-handle { - background: transparent url(../images/resize-rtl.gif) no-repeat scroll left bottom; + background-image: url(../images/resize-rtl.gif); + background-position: left bottom; +} + +.wp-editor-expand #content-resize-handle { + display: none; +} + +#postdivrich #content { + resize: none; } #wp-word-count { @@ -367,6 +373,80 @@ td.plugin-title p { padding: 2px 10px; } +#wp-content-editor-container { + position: relative; +} + +#content-textarea-clone { + z-index: -1; + position: absolute; + top: 0; + visibility: hidden; + overflow: hidden; + max-width: 100%; + border: 1px solid transparent; +} + +.wp-editor-expand #wp-content-editor-tools { + z-index: 1000; + border-bottom: 1px solid #e5e5e5; +} + +.wp-editor-expand #wp-content-editor-container { + -webkit-box-shadow: none; + box-shadow: none; + margin-top: -1px; +} + +.wp-editor-expand #wp-content-editor-container { + border-bottom: 0 none; +} + +.wp-editor-expand div.mce-statusbar { + z-index: 1; +} + +.wp-editor-expand #post-status-info { + border-top: 1px solid #e5e5e5; +} + +.wp-editor-expand div.mce-toolbar-grp { + z-index: 999; +} + +/* TinyMCE native fullscreen mode override */ +.mce-fullscreen #wp-content-wrap .mce-menubar, +.mce-fullscreen #wp-content-wrap .mce-toolbar-grp, +.mce-fullscreen #wp-content-wrap .mce-edit-area, +.mce-fullscreen #wp-content-wrap .mce-statusbar { + position: static !important; + width: auto !important; + padding: 0 !important; +} + +.mce-fullscreen #wp-content-wrap .mce-statusbar { + visibility: visible !important; +} + +.mce-fullscreen #wp-content-wrap .mce-tinymce .mce-wp-dfw { + display: none; +} + +.post-php.mce-fullscreen #wpadminbar, +.mce-fullscreen #wp-content-wrap .mce-wp-dfw { + display: none; +} +/* End TinyMCE native fullscreen mode override */ + +#wp-content-editor-tools { + background-color: #f1f1f1; + padding-top: 20px; +} + +#poststuff #post-body.columns-2 #side-sortables { + width: 280px; +} + #timestampdiv select { height: 21px; line-height: 14px; @@ -399,13 +479,13 @@ td.plugin-title p { .curtime #timestamp:before, #post-body .misc-pub-revisions:before, span.wp-media-buttons-icon:before { - color: #888; + color: #82878c; } #post-body #visibility:before, .curtime #timestamp:before, #post-body .misc-pub-revisions:before { - font: normal 20px/1 'dashicons'; + font: normal 20px/1 dashicons; speak: none; display: inline-block; padding: 0 2px 0 0; @@ -419,16 +499,16 @@ span.wp-media-buttons-icon:before { } #post-body #visibility:before { - content: '\f177'; + content: "\f177"; } .curtime #timestamp:before { - content: '\f145'; + content: "\f145"; top: -1px; } #post-body .misc-pub-revisions:before { - content: '\f321'; + content: "\f321"; } #timestampdiv { @@ -448,6 +528,7 @@ span.wp-media-buttons-icon:before { .notification-dialog { position: fixed; top: 30%; + max-height: 70%; left: 50%; width: 450px; margin-left: -225px; @@ -456,6 +537,7 @@ span.wp-media-buttons-icon:before { box-shadow: 0 3px 6px rgba( 0, 0, 0, 0.3 ); line-height: 1.5; z-index: 1000005; + overflow-y: auto; } .notification-dialog-background { @@ -498,11 +580,11 @@ span.wp-media-buttons-icon:before { display: inline; } -#excerpt, -.attachmentlinks { - margin: 0; +#excerpt { + display: block; + margin: 12px 0 0; height: 4em; - width: 98%; + width: 100%; } .tagchecklist { @@ -526,8 +608,10 @@ span.wp-media-buttons-icon:before { float: left; font-size: 13px; line-height: 1.8em; - white-space: nowrap; cursor: default; + max-width: 100%; + overflow: hidden; + text-overflow: ellipsis; } .tagchecklist span a { @@ -542,15 +626,9 @@ span.wp-media-buttons-icon:before { position: absolute; } +#poststuff h3.hndle, /* Back-compat for pre-4.4 */ +#poststuff .stuffbox > h3, /* Back-compat for pre-4.4 */ #poststuff h2 { - margin-top: 20px; - font-size: 1.5em; - margin-bottom: 15px; - padding: 0 0 3px; - clear: left; -} - -#poststuff h3 { font-size: 14px; padding: 8px 12px; margin: 0; @@ -594,6 +672,7 @@ span.wp-media-buttons-icon:before { padding: 0; } +#post-body-content, .edit-form-section { margin-bottom: 20px; } @@ -631,7 +710,7 @@ span.wp-media-buttons-icon:before { #postcustomstuff table { margin: 0; width: 100%; - border: 1px solid #dfdfdf; + border: 1px solid #ddd; border-spacing: 0; background-color: #f9f9f9; } @@ -733,7 +812,7 @@ span.wp-media-buttons-icon:before { display: block; height: 20px; width: 20px; - font: normal 20px/1 'dashicons' !important; + font: normal 20px/1 dashicons !important; speak: none; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -748,7 +827,7 @@ span.wp-media-buttons-icon:before { a.post-state-format:hover:before, a.post-format-icon:hover:before { - color: #2ea2cc; + color: #00a0d2; } #post-formats-select { @@ -772,7 +851,7 @@ label.post-format-icon { position: relative; display: inline-block; margin-right: 7px; - font: normal 20px/1 'dashicons'; + font: normal 20px/1 dashicons; speak: none; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -781,61 +860,61 @@ label.post-format-icon { .post-state-format.post-format-standard:before, .post-format-icon.post-format-standard:before, a.post-state-format.format-standard:before { - content: '\f109'; + content: "\f109"; } .post-state-format.post-format-image:before, .post-format-icon.post-format-image:before, a.post-state-format.format-image:before { - content: '\f128'; + content: "\f128"; } .post-state-format.post-format-gallery:before, .post-format-icon.post-format-gallery:before, a.post-state-format.format-gallery:before { - content: '\f161'; + content: "\f161"; } .post-state-format.post-format-audio:before, .post-format-icon.post-format-audio:before, a.post-state-format.format-audio:before { - content: '\f127'; + content: "\f127"; } .post-state-format.post-format-video:before, .post-format-icon.post-format-video:before, a.post-state-format.format-video:before { - content: '\f126'; + content: "\f126"; } .post-state-format.post-format-chat:before, .post-format-icon.post-format-chat:before, a.post-state-format.format-chat:before { - content: '\f125'; + content: "\f125"; } .post-state-format.post-format-status:before, .post-format-icon.post-format-status:before, a.post-state-format.format-status:before { - content: '\f130'; + content: "\f130"; } .post-state-format.post-format-aside:before, .post-format-icon.post-format-aside:before, a.post-state-format.format-aside:before { - content: '\f123'; + content: "\f123"; } .post-state-format.post-format-quote:before, .post-format-icon.post-format-quote:before, a.post-state-format.format-quote:before { - content: '\f122'; + content: "\f122"; } .post-state-format.post-format-link:before, .post-format-icon.post-format-link:before, a.post-state-format.format-link:before { - content: '\f103'; + content: "\f103"; } /*------------------------------------------------------------------------------ @@ -864,7 +943,7 @@ a.post-state-format.format-link:before { max-height: 200px; overflow: auto; padding: 0 0.9em; - border: solid 1px #dfdfdf; + border: solid 1px #ddd; background-color: #fdfdfd; } @@ -913,7 +992,13 @@ ul.categorychecklist li { font-size: 12px; } -.form-field input, +.form-field input[type="text"], +.form-field input[type="password"], +.form-field input[type="email"], +.form-field input[type="number"], +.form-field input[type="search"], +.form-field input[type="tel"], +.form-field input[type="url"], .form-field textarea { border-style: solid; border-width: 1px; @@ -943,7 +1028,7 @@ span.description, max-width: 100%; } -.col-wrap h3 { +.col-wrap h2 { margin: 12px 0; font-size: 1.1em; } @@ -957,15 +1042,6 @@ span.description, 13.0 - Tags ------------------------------------------------------------------------------*/ -.tagsdiv { - margin-top: -8px; -} - -#poststuff .taghint { - color: #aaa; - margin: 15px 0 -24px 12px; -} - #poststuff .tagsdiv .howto { margin: 0 0 6px 0; } @@ -990,25 +1066,9 @@ span.description, margin: 0 5px; } -/* tag hints */ -.taghint { - color: #aaa; - margin: -17px 0 0 7px; - visibility: hidden; -} - -input.newtag ~ div.taghint { - visibility: visible; -} - -input.newtag:focus ~ div.taghint { - visibility: hidden; -} - p.popular-tags { border: none; line-height: 2em; - max-width: 1000px; padding: 8px 12px 12px; text-align: justify; } @@ -1023,18 +1083,18 @@ p.popular-tags a { text-align: justify; } -.tagcloud h3 { +.tagcloud h2 { margin: 2px 0 12px; } .ac_results { + display: none; + margin: -1px 0 0; padding: 0; - margin: 0; list-style: none; position: absolute; z-index: 10000; - display: none; - border: 1px solid #808080; + border: 1px solid #5b9dd9; background-color: #fff; } @@ -1043,14 +1103,16 @@ p.popular-tags a { } .ac_results li { - padding: 2px 5px; + margin: 0; + padding: 5px 10px; white-space: nowrap; - color: #101010; text-align: left; } -.ac_over { - background-color: #f0f0b8; +.ac_results .ac_over, +.ac_over .ac_match { + background-color: #0073aa; + color: #fff; cursor: pointer; } @@ -1064,14 +1126,30 @@ p.popular-tags a { height: 200px; } -.comment-ays { - margin-bottom: 0; - border-bottom-style: solid; - border-bottom-width: 1px; +.comment-ays th, +.comment-ays td { + padding: 10px 15px; +} + +.comment-ays .comment-content a[href]:after { + content: '(' attr( href ) ')'; + display: inline-block; + padding: 0 4px; + color: #72777C; + font-size: 13px; +} + +.comment-ays .comment-content p.edit-comment { + margin-top: 10px; +} + +.comment-ays .comment-content p.edit-comment a[href]:after { + content: ''; + padding: 0; } -.comment-ays .alt { - background-color: transparent; +.comment-ays-submit .button-cancel { + margin-left: 1em; } .trash-undo-inside, @@ -1138,6 +1216,99 @@ table.links-table { max-width: 280px; } +/* DFW 2 +-------------------------------------------------------------- */ + +#wp-content-wrap .mce-wp-dfw, +#qt_content_dfw { + display: none; +} + +.wp-editor-expand #wp-content-wrap .mce-wp-dfw, +.wp-editor-expand #qt_content_dfw { + display: inline-block; +} + +.focus-on .wrap > h1, +.focus-on #wpfooter, +.focus-on .postbox-container > *, +.focus-on div.updated, +.focus-on div.error, +.focus-on div.notice, +.focus-on .update-nag, +.focus-on #wp-toolbar, +.focus-on #screen-meta-links, +.focus-on #screen-meta { + opacity: 0; + -webkit-transition-duration: 0.6s; + transition-duration: 0.6s; + -webkit-transition-property: opacity; + transition-property: opacity; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; +} + +.focus-on #wp-toolbar { + opacity: 0.3; +} + +.focus-off .wrap > h1, +.focus-off #wpfooter, +.focus-off .postbox-container > *, +.focus-off div.updated, +.focus-off div.error, +.focus-off div.notice, +.focus-off .update-nag, +.focus-off #wp-toolbar, +.focus-off #screen-meta-links, +.focus-off #screen-meta { + opacity: 1; + -webkit-transition-duration: 0.2s; + transition-duration: 0.2s; + -webkit-transition-property: opacity; + transition-property: opacity; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; +} + +.focus-off #wp-toolbar { + -webkit-transform: translate(0, 0); +} + +.focus-on #adminmenuback, +.focus-on #adminmenuwrap { + -webkit-transition-duration: 0.6s; + transition-duration: 0.6s; + -webkit-transition-property: -webkit-transform; + transition-property: -webkit-transform; + transition-property: transform; + transition-property: transform, -webkit-transform; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; +} + +.focus-on #adminmenuback, +.focus-on #adminmenuwrap { + -webkit-transform: translateX( -100% ); + -ms-transform: translateX( -100% ); + transform: translateX( -100% ); +} + +.focus-off #adminmenuback, +.focus-off #adminmenuwrap { + -webkit-transform: translateX( 0 ); + -ms-transform: translateX( 0 ); + transform: translateX( 0 ); + -webkit-transition-duration: 0.2s; + transition-duration: 0.2s; + -webkit-transition-property: -webkit-transform; + transition-property: -webkit-transform; + transition-property: transform; + transition-property: transform, -webkit-transform; + -webkit-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; +} + /* =Media Queries -------------------------------------------------------------- */ @@ -1145,7 +1316,6 @@ table.links-table { * HiDPI Displays */ @media print, - (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 120dpi) { #content-resize-handle, @@ -1155,9 +1325,11 @@ table.links-table { background-size: 11px 11px; } + /*rtl:ignore*/ .rtl #content-resize-handle, .rtl #post-body .wp_themeSkin .mceStatusbar a.mceResize { - background: transparent url(../images/resize-rtl-2x.gif) no-repeat scroll right bottom; + background-image: url(../images/resize-rtl-2x.gif); + background-position: left bottom; } } @@ -1185,6 +1357,7 @@ table.links-table { #poststuff #post-body.columns-2 #side-sortables { min-height: 0; + width: auto; } /* hide the radio buttons for column prefs */ @@ -1203,7 +1376,9 @@ table.links-table { padding: 10px 10px; } - #poststuff h3 { + #poststuff h3.hndle, /* Back-compat for pre-4.4 */ + #poststuff .stuffbox > h3, /* Back-compat for pre-4.4 */ + #poststuff h2 { padding: 12px; } @@ -1294,7 +1469,7 @@ table.links-table { .tagchecklist span { font-size: 16px; - line-height: 120%; + line-height: 1.4; } /* Discussion */ @@ -1348,17 +1523,11 @@ table.links-table { padding: 10px 20px; } - #wp-content-editor-tools { - overflow: hidden; - padding: 20px 15px 1px 0; - top: 1px; - } - - a.wp-switch-editor { + button.wp-switch-editor { font-size: 16px; line-height: 1em; - margin: 3px 0 0 7px; - padding: 12px 15px; + margin: 7px 0 0 7px; + padding: 8px 12px; } #wp-content-media-buttons a { @@ -1398,9 +1567,19 @@ table.links-table { line-height: 47px; } + #publishing-action .spinner { + float: none; + margin-top: -2px; /* Half of the Publish button's bottom margin. */ + } + /* Moderate Comment */ - .comment-ays { - border-bottom: none; + .comment-ays th, + .comment-ays td { + padding-bottom: 0; + } + + .comment-ays td { + padding-top: 6px; } /* Links */ diff --git a/wp-admin/css/edit.min.css b/wp-admin/css/edit.min.css new file mode 100644 index 0000000..55f0cc7 --- /dev/null +++ b/wp-admin/css/edit.min.css @@ -0,0 +1 @@ +#pending,#poststuff #titlewrap{border:0;padding:0}#pending,#poststuff #post-body{padding:0}#editable-post-name-full,body.post-new-php .submitbox .submitdelete{display:none}#titlediv,#wp-content-editor-container,.postbox,form#tags-filter{position:relative}#poststuff{padding-top:10px;min-width:763px}#poststuff .postbox-container{width:100%}#poststuff #post-body.columns-2{margin-right:300px}#show-comments{overflow:hidden}#save-action .spinner,#show-comments a{float:left}#show-comments .spinner{float:none;margin-top:0}#lost-connection-notice .spinner{visibility:visible;float:left;margin:0 5px 0 0}#titlediv label{cursor:text}#titlediv div.inside{margin:0}#titlediv #title{padding:3px 8px;font-size:1.7em;line-height:100%;height:1.7em;width:100%;outline:0;margin:0 0 3px;background-color:#fff}#titlediv #title-prompt-text{color:#72777c;position:absolute;font-size:1.7em;padding:11px 10px}input#link_description,input#link_url{width:98%}#pending{background:0 none;font-size:11px;margin-top:-1px}#comment-link-box,#edit-slug-box{line-height:24px;min-height:25px;margin-top:5px;padding:0 10px;color:#666}#edit-slug-box .cancel{margin-right:10px;padding:0;font-size:11px;text-decoration:underline;color:#0073aa}#comment-link-box{margin:5px 0;padding:0 5px}#editable-post-name{font-weight:700}#editable-post-name input{font-size:13px;font-weight:400;height:22px;margin:0;width:16em}.postarea h3 label{float:left}.submitbox .submitdelete{text-decoration:none;padding:1px 2px}#normal-sortables .submitbox .submitdelete:hover{color:#000;background-color:red;border-bottom-color:red}.submitbox .submit a:hover{text-decoration:underline}.submitbox .submit input{margin-bottom:8px;margin-right:4px;padding:6px}#post-status-select{margin-top:3px}#post-body #normal-sortables{min-height:50px}.postbox{min-width:255px;border:1px solid #e5e5e5;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04);background:#fff}#trackback_url{width:99%}#normal-sortables .postbox .submit{background:0 0;border:0;float:right;padding:0 12px;margin:0}.category-add input[type=text],.category-add select{width:100%;max-width:260px;vertical-align:baseline}#side-sortables .category-add input[type=text],#side-sortables .category-add select{margin:0 0 1em}#side-sortables .add-menu-item-tabs li,.wp-tab-bar li,ul.category-tabs li{display:inline;line-height:1.35em}.no-js .category-tabs li.hide-if-no-js{display:none}#side-sortables .add-menu-item-tabs a,.category-tabs a,.wp-tab-bar a{text-decoration:none}#post-body ul.add-menu-item-tabs li.tabs a,#post-body ul.category-tabs li.tabs a,#side-sortables .add-menu-item-tabs .tabs a,#side-sortables .category-tabs .tabs a,.wp-tab-bar .wp-tab-active a{color:#32373c}.category-tabs{margin:8px 0 5px}#category-adder h4{margin:0}.taxonomy-add-new{display:inline-block;margin:10px 0;font-weight:600}#side-sortables .add-menu-item-tabs,.wp-tab-bar{margin-bottom:3px}#normal-sortables .postbox #replyrow .submit{float:none;margin:0;padding:5px 7px 10px;overflow:hidden}#side-sortables .submitbox .submit .preview,#side-sortables .submitbox .submit a.preview:hover,#side-sortables .submitbox .submit input{border:0}ul.add-menu-item-tabs,ul.category-tabs,ul.wp-tab-bar{margin-top:12px}ul.add-menu-item-tabs li,ul.category-tabs li{border:1px solid transparent;position:relative}.wp-tab-active,ul.add-menu-item-tabs li.tabs,ul.category-tabs li.tabs{border:1px solid #ddd;border-bottom-color:#fdfdfd;background-color:#fdfdfd}ul.add-menu-item-tabs li,ul.category-tabs li,ul.wp-tab-bar li{padding:3px 5px 5px}#set-post-thumbnail{display:inline-block;max-width:100%}.ui-tabs-hide,.wp-editor-expand #content-resize-handle,.wp-hidden-children .wp-hidden-child{display:none}#postimagediv .inside img{max-width:100%;height:auto;width:auto;vertical-align:top;background-image:-webkit-linear-gradient(45deg,#c4c4c4 25%,transparent 25%,transparent 75%,#c4c4c4 75%,#c4c4c4),-webkit-linear-gradient(45deg,#c4c4c4 25%,transparent 25%,transparent 75%,#c4c4c4 75%,#c4c4c4);background-image:linear-gradient(45deg,#c4c4c4 25%,transparent 25%,transparent 75%,#c4c4c4 75%,#c4c4c4),linear-gradient(45deg,#c4c4c4 25%,transparent 25%,transparent 75%,#c4c4c4 75%,#c4c4c4);background-position:0 0,10px 10px;-webkit-background-size:20px 20px;background-size:20px 20px}#post-body .tagsdiv #newtag{margin-right:5px;width:16em}#side-sortables input#post_password{width:94%}#side-sortables .tagsdiv #newtag{width:68%}#post-status-info{width:100%;border-spacing:0;border:1px solid #e5e5e5;border-top:none;background-color:#f7f7f7;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04);z-index:999}#post-status-info td{font-size:12px}.autosave-info{padding:2px 10px;text-align:right}#editorcontent #post-status-info{border:none}#content-resize-handle{background:url(../images/resize.gif) right bottom no-repeat;width:12px;cursor:row-resize}.rtl #content-resize-handle{background-image:url(../images/resize-rtl.gif);background-position:left bottom}#postdivrich #content{resize:none}#wp-word-count{display:block;padding:2px 10px}#content-textarea-clone{z-index:-1;position:absolute;top:0;visibility:hidden;overflow:hidden;max-width:100%;border:1px solid transparent}.wp-editor-expand #wp-content-editor-tools{z-index:1000;border-bottom:1px solid #e5e5e5}.wp-editor-expand #wp-content-editor-container{-webkit-box-shadow:none;box-shadow:none;margin-top:-1px;border-bottom:0 none}.wp-editor-expand div.mce-statusbar{z-index:1}.wp-editor-expand #post-status-info{border-top:1px solid #e5e5e5}.wp-editor-expand div.mce-toolbar-grp{z-index:999}.mce-fullscreen #wp-content-wrap .mce-edit-area,.mce-fullscreen #wp-content-wrap .mce-menubar,.mce-fullscreen #wp-content-wrap .mce-statusbar,.mce-fullscreen #wp-content-wrap .mce-toolbar-grp{position:static!important;width:auto!important;padding:0!important}.mce-fullscreen #wp-content-wrap .mce-statusbar{visibility:visible!important}.mce-fullscreen #wp-content-wrap .mce-tinymce .mce-wp-dfw,.mce-fullscreen #wp-content-wrap .mce-wp-dfw,.post-php.mce-fullscreen #wpadminbar{display:none}#wp-content-editor-tools{background-color:#f1f1f1;padding-top:20px}#poststuff #post-body.columns-2 #side-sortables{width:280px}#timestampdiv select{height:21px;line-height:14px;padding:0;vertical-align:top;font-size:12px}#aa,#hh,#jj,#mn{padding:1px;font-size:12px}#hh,#jj,#mn{width:2em}#aa{width:3.4em}.curtime #timestamp{padding:2px 0 1px;display:inline!important;height:auto!important}#misc-publishing-actions label[for=post_status]:before,#post-body #visibility:before,#post-body .misc-pub-revisions:before,.curtime #timestamp:before,span.wp-media-buttons-icon:before{color:#82878c}#post-body #visibility:before,#post-body .misc-pub-revisions:before,.curtime #timestamp:before{font:400 20px/1 dashicons;speak:none;display:inline-block;padding:0 2px 0 0;top:0;left:-1px;position:relative;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important}#post-body #visibility:before{content:"\f177"}.curtime #timestamp:before{content:"\f145";top:-1px}#post-body .misc-pub-revisions:before{content:"\f321"}#timestampdiv{padding-top:5px;line-height:23px}#timestampdiv p{margin:8px 0 6px}#timestampdiv input{border-width:1px;border-style:solid}.notification-dialog{position:fixed;top:30%;max-height:70%;left:50%;width:450px;margin-left:-225px;background:#fff;-webkit-box-shadow:0 3px 6px rgba(0,0,0,.3);box-shadow:0 3px 6px rgba(0,0,0,.3);line-height:1.5;z-index:1000005;overflow-y:auto}.notification-dialog-background{position:fixed;top:0;left:0;right:0;bottom:0;background:#000;opacity:.7;filter:alpha(opacity=70);z-index:1000000}#post-lock-dialog .post-locked-message,#post-lock-dialog .post-taken-over{margin:25px}#post-lock-dialog .post-locked-message a.button{margin-right:10px}#post-lock-dialog .post-locked-avatar{float:left;margin:0 20px 20px 0}#post-lock-dialog .wp-tab-first{outline:0}#post-lock-dialog .locked-saving img{float:left;margin-right:3px}#post-lock-dialog.saved .locked-saved,#post-lock-dialog.saving .locked-saving{display:inline}#excerpt{display:block;margin:12px 0 0;height:4em;width:100%}.tagchecklist{margin-left:14px;font-size:12px;overflow:auto}.tagchecklist br{display:none}.tagchecklist span,.tagchecklist span a{display:block;float:left;overflow:hidden}.tagchecklist strong{margin-left:-8px;position:absolute}.tagchecklist span{margin-right:25px;font-size:13px;line-height:1.8em;cursor:default;max-width:100%;text-overflow:ellipsis}.tagchecklist span a{margin:1px 0 0 -17px;cursor:pointer;width:20px;height:20px;text-indent:0;position:absolute}#poststuff .stuffbox>h3,#poststuff h2,#poststuff h3.hndle{font-size:14px;padding:8px 12px;margin:0;line-height:1.4}#poststuff .inside{margin:6px 0 0}#poststuff .inside #page_template,#poststuff .inside #parent_id{max-width:100%}#poststuff .inside label.deleted,#poststuff .inside label.spam{color:red}#poststuff .inside label.waiting{color:orange}#poststuff .inside label.approved{color:green}.ie8 #poststuff .inside #page_template,.ie8 #poststuff .inside #parent_id{width:250px}#post-visibility-select{line-height:1.5em;margin-top:3px}#poststuff #submitdiv .inside{margin:0;padding:0}#post-body-content,.edit-form-section{margin-bottom:20px}#postcustomstuff thead th{padding:5px 8px 8px;background-color:#f1f1f1}#postcustom #postcustomstuff .submit{border:0;float:none;padding:0 8px 8px}#side-sortables #postcustom #postcustomstuff .submit{margin:0;padding:0}#side-sortables #postcustom #postcustomstuff #the-list textarea{height:85px}#side-sortables #postcustom #postcustomstuff td.left input,#side-sortables #postcustom #postcustomstuff td.left select,#side-sortables #postcustomstuff #newmetaleft a{margin:3px 3px 0}#postcustomstuff table{margin:0;width:100%;border:1px solid #ddd;border-spacing:0;background-color:#f9f9f9}#postcustomstuff tr{vertical-align:top}#postcustomstuff table input,#postcustomstuff table select,#postcustomstuff table textarea{width:96%;margin:8px}#side-sortables #postcustomstuff table input,#side-sortables #postcustomstuff table select,#side-sortables #postcustomstuff table textarea{margin:3px}#postcustomstuff td.left,#postcustomstuff th.left{width:38%}#postcustomstuff .submit input{margin:0;width:auto}#postcustomstuff #newmetaleft a{display:inline-block;margin:0 8px 8px;text-decoration:none}.no-js #postcustomstuff #enternew{display:none}#post-body-content .compat-attachment-fields{margin-bottom:20px}.compat-attachment-fields th{padding-top:5px;padding-right:10px}#select-featured-image{padding:4px 0;overflow:hidden}#select-featured-image img{max-width:100%;height:auto;margin-bottom:10px}#select-featured-image a{float:left;clear:both}#select-featured-image .remove{display:none;margin-top:10px}.js #select-featured-image.has-featured-image .remove{display:inline-block}.no-js #select-featured-image .choose{display:none}.post-state-format{overflow:hidden;display:inline-block;vertical-align:middle;height:20px;width:20px;margin-right:5px;margin-top:-4px}.post-state-format:before{display:block;height:20px;width:20px;font:400 20px/1 dashicons!important;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.post-format-icon:before,.post-state-format:before{color:#ddd;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}a.post-format-icon:hover:before,a.post-state-format:hover:before{color:#00a0d2}#post-formats-select{line-height:2em}#post-formats-select .post-format-icon:before{top:5px}input.post-format{margin-top:1px}label.post-format-icon{margin-left:0;padding:2px 0}.post-format-icon:before{position:relative;display:inline-block;margin-right:7px;font:400 20px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.post-format-icon.post-format-standard:before,.post-state-format.post-format-standard:before,a.post-state-format.format-standard:before{content:"\f109"}.post-format-icon.post-format-image:before,.post-state-format.post-format-image:before,a.post-state-format.format-image:before{content:"\f128"}.post-format-icon.post-format-gallery:before,.post-state-format.post-format-gallery:before,a.post-state-format.format-gallery:before{content:"\f161"}.post-format-icon.post-format-audio:before,.post-state-format.post-format-audio:before,a.post-state-format.format-audio:before{content:"\f127"}.post-format-icon.post-format-video:before,.post-state-format.post-format-video:before,a.post-state-format.format-video:before{content:"\f126"}.post-format-icon.post-format-chat:before,.post-state-format.post-format-chat:before,a.post-state-format.format-chat:before{content:"\f125"}.post-format-icon.post-format-status:before,.post-state-format.post-format-status:before,a.post-state-format.format-status:before{content:"\f130"}.post-format-icon.post-format-aside:before,.post-state-format.post-format-aside:before,a.post-state-format.format-aside:before{content:"\f123"}.post-format-icon.post-format-quote:before,.post-state-format.post-format-quote:before,a.post-state-format.format-quote:before{content:"\f122"}.post-format-icon.post-format-link:before,.post-state-format.post-format-link:before,a.post-state-format.format-link:before{content:"\f103"}.category-adder{margin-left:120px;padding:4px 0}.category-adder h4{margin:0 0 8px}#side-sortables .category-adder{margin:0}.categorydiv div.tabs-panel,.customlinkdiv div.tabs-panel,.posttypediv div.tabs-panel,.taxonomydiv div.tabs-panel,.wp-tab-panel{min-height:42px;max-height:200px;overflow:auto;padding:0 .9em;border:1px solid #ddd;background-color:#fdfdfd}div.tabs-panel-active{display:block}div.tabs-panel-inactive{display:none}#front-page-warning,#front-static-pages ul,.categorydiv ul.categorychecklist ul,.customlinkdiv ul.categorychecklist ul,.inline-editor ul.cat-checklist ul,.posttypediv ul.categorychecklist ul,.taxonomydiv ul.categorychecklist ul,ul.export-filters{margin-left:18px}ul.categorychecklist li{margin:0;padding:0;line-height:22px;word-wrap:break-word}.categorydiv .tabs-panel,.customlinkdiv .tabs-panel,.posttypediv .tabs-panel,.taxonomydiv .tabs-panel{border-width:3px;border-style:solid}.form-wrap label{display:block;padding:2px;font-size:12px}.form-field input[type=text],.form-field input[type=password],.form-field input[type=email],.form-field input[type=number],.form-field input[type=search],.form-field input[type=tel],.form-field input[type=url],.form-field textarea{border-style:solid;border-width:1px;width:95%}.form-wrap p,p.description{margin:2px 0 5px;color:#666}.form-wrap p,p.description,p.help,span.description{font-size:13px;font-style:italic}.form-wrap .form-field{margin:0 0 10px;padding:8px 0}.form-wrap .form-field #parent{max-width:100%}.col-wrap h2{margin:12px 0;font-size:1.1em}.col-wrap p.submit{margin-top:-10px}#poststuff .tagsdiv .howto{margin:0 0 6px}.ajaxtag .newtag{position:relative}.tagsdiv .newtag{width:180px}.tagsdiv .the-tags{display:block;height:60px;margin:0 auto;overflow:auto;width:260px}#post-body-content .tagsdiv .the-tags{margin:0 5px}p.popular-tags{border:none;line-height:2em;padding:8px 12px 12px;text-align:justify}p.popular-tags a{padding:0 3px}.tagcloud{width:97%;margin:0 0 40px;text-align:justify}.tagcloud h2{margin:2px 0 12px}.ac_results{display:none;margin:-1px 0 0;padding:0;list-style:none;position:absolute;z-index:10000;border:1px solid #5b9dd9;background-color:#fff}.wp-customizer .ac_results{z-index:500000}.ac_results li{margin:0;padding:5px 10px;white-space:nowrap;text-align:left}.ac_over .ac_match,.ac_results .ac_over{background-color:#0073aa;color:#fff;cursor:pointer}.ac_match{text-decoration:underline}.comment-php .wp-editor-area{height:200px}.comment-ays td,.comment-ays th{padding:10px 15px}.comment-ays .comment-content a[href]:after{content:'(' attr(href) ')';display:inline-block;padding:0 4px;color:#72777C;font-size:13px}.comment-ays .comment-content p.edit-comment{margin-top:10px}.comment-ays .comment-content p.edit-comment a[href]:after{content:'';padding:0}#comment-status-radio label,.links-table td,.links-table th{padding:5px 0}.comment-ays-submit .button-cancel{margin-left:1em}.spam-undo-inside,.trash-undo-inside{margin:1px 8px 1px 0;line-height:16px}.spam-undo-inside .avatar,.trash-undo-inside .avatar{height:20px;width:20px;margin-right:8px;vertical-align:middle}.stuffbox .editcomment{clear:none}#comment-status-radio p{margin:3px 0 5px}#comment-status-radio input{margin:2px 3px 5px 0;vertical-align:middle}table.links-table{width:100%;border-spacing:0}.links-table th{font-weight:400;text-align:left;vertical-align:top;min-width:80px;width:20%;word-wrap:break-word}.links-table td label{margin-right:8px}.links-table td input[type=text],.links-table td textarea{width:100%}.links-table #link_rel{max-width:280px}#qt_content_dfw,#wp-content-wrap .mce-wp-dfw{display:none}.wp-editor-expand #qt_content_dfw,.wp-editor-expand #wp-content-wrap .mce-wp-dfw{display:inline-block}.focus-on #screen-meta,.focus-on #screen-meta-links,.focus-on #wp-toolbar,.focus-on #wpfooter,.focus-on .postbox-container>*,.focus-on .update-nag,.focus-on .wrap>h1,.focus-on div.error,.focus-on div.notice,.focus-on div.updated{opacity:0;-webkit-transition-duration:.6s;transition-duration:.6s;-webkit-transition-property:opacity;transition-property:opacity;-webkit-transition-timing-function:ease-in-out;transition-timing-function:ease-in-out}.focus-on #wp-toolbar{opacity:.3}.focus-off #screen-meta,.focus-off #screen-meta-links,.focus-off #wp-toolbar,.focus-off #wpfooter,.focus-off .postbox-container>*,.focus-off .update-nag,.focus-off .wrap>h1,.focus-off div.error,.focus-off div.notice,.focus-off div.updated{opacity:1;-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-property:opacity;transition-property:opacity;-webkit-transition-timing-function:ease-in-out;transition-timing-function:ease-in-out}.focus-off #wp-toolbar{-webkit-transform:translate(0,0)}.focus-on #adminmenuback,.focus-on #adminmenuwrap{-webkit-transition-duration:.6s;transition-duration:.6s;-webkit-transition-property:-webkit-transform;transition-property:-webkit-transform;transition-property:transform;transition-property:transform,-webkit-transform;-webkit-transition-timing-function:ease-in-out;transition-timing-function:ease-in-out;-webkit-transform:translateX(-100%);-ms-transform:translateX(-100%);transform:translateX(-100%)}.focus-off #adminmenuback,.focus-off #adminmenuwrap{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0);-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-property:-webkit-transform;transition-property:-webkit-transform;transition-property:transform;transition-property:transform,-webkit-transform;-webkit-transition-timing-function:ease-in-out;transition-timing-function:ease-in-out}@media print,(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){#content-resize-handle,#post-body .wp_themeSkin .mceStatusbar a.mceResize{background:url(../images/resize-2x.gif) right bottom no-repeat;-webkit-background-size:11px 11px;background-size:11px 11px}.rtl #content-resize-handle,.rtl #post-body .wp_themeSkin .mceStatusbar a.mceResize{background-image:url(../images/resize-rtl-2x.gif);background-position:left bottom}}@media only screen and (max-width:850px){#poststuff{min-width:0}#wpbody-content #poststuff #post-body{margin:0}#wpbody-content #post-body.columns-2 #postbox-container-1{margin-right:0;width:100%}#poststuff #postbox-container-1 #side-sortables:empty,#poststuff #postbox-container-1 .empty-container{border:0;height:0;min-height:0}#poststuff #post-body.columns-2 #side-sortables{min-height:0;width:auto}.columns-prefs,.screen-layout{display:none}}@media screen and (max-width:782px){#post-body-content{min-width:0}#titlediv #title-prompt-text{padding:10px}#poststuff .stuffbox>h3,#poststuff h2,#poststuff h3.hndle{padding:12px}.post-format-options{padding-right:0}.post-format-options a{margin-right:5px;margin-bottom:5px;min-width:52px}.post-format-options .post-format-title{font-size:11px}.post-format-options a div{height:28px;width:28px}.post-format-options a div:before{font-size:26px!important}#post-visibility-select{line-height:280%}.wp-core-ui .save-post-visibility,.wp-core-ui .save-timestamp{vertical-align:middle;margin-right:15px}.timestamp-wrap select#mm{display:block;width:100%;margin-bottom:10px}.timestamp-wrap #aa,.timestamp-wrap #hh,.timestamp-wrap #jj,.timestamp-wrap #mn{padding:12px 3px;font-size:14px;margin-bottom:5px;width:auto;text-align:center}ul.category-tabs{margin:30px 0 15px}.tagsdiv .newtag,ul.categorychecklist li{margin-bottom:15px}ul.category-tabs li.tabs{padding:15px}ul.categorychecklist ul{margin-top:15px}.category-add input[type=text],.category-add select{max-width:none;margin-bottom:15px}.tagsdiv .newtag{width:100%;height:auto}.tagchecklist{margin:25px 10px}.tagchecklist span{font-size:16px;line-height:1.4}#commentstatusdiv p{line-height:2.8}.mceToolbar *{white-space:normal!important}.mceToolbar td,.mceToolbar tr{float:left!important}.wp_themeSkin a.mceButton{width:30px;height:30px}.wp_themeSkin .mceButton .mceIcon{margin-top:5px;margin-left:5px}.wp_themeSkin .mceSplitButton{margin-top:1px}.wp_themeSkin .mceSplitButton td a.mceAction{padding:6px 3px 6px 6px}.wp_themeSkin .mceSplitButton td a.mceOpen,.wp_themeSkin .mceSplitButtonEnabled:hover td a.mceOpen{padding-top:6px;padding-bottom:6px;background-position:1px 6px}.wp_themeSkin table.mceListBox{margin:5px}div.quicktags-toolbar input{padding:10px 20px}button.wp-switch-editor{font-size:16px;line-height:1em;margin:7px 0 0 7px;padding:8px 12px}#wp-content-media-buttons a{font-size:16px;line-height:37px;height:39px;padding:0 20px 0 15px}.wp-media-buttons span.jetpack-contact-form-icon,.wp-media-buttons span.wp-media-buttons-icon{width:22px!important;margin-top:-3px!important;margin-left:-5px!important}.wp-media-buttons #insert-jetpack-contact-form span.jetpack-contact-form-icon:before,.wp-media-buttons .add_media span.wp-media-buttons-icon:before{font-size:20px!important}#content_wp_fullscreen{display:none}.misc-pub-section{padding:20px 10px}.misc-pub-section>a{float:right;font-size:16px}#delete-action,#publishing-action{line-height:47px}#publishing-action .spinner{float:none;margin-top:-2px}.comment-ays td,.comment-ays th{padding-bottom:0}.comment-ays td{padding-top:6px}.links-table #link_rel{max-width:none}.links-table td,.links-table th{padding:10px 0}}@media only screen and (max-width:500px){#wp-content-media-buttons a{font-size:14px;padding:0 10px}} \ No newline at end of file diff --git a/wp-admin/css/farbtastic-rtl.min.css b/wp-admin/css/farbtastic-rtl.min.css new file mode 100644 index 0000000..3a942b2 --- /dev/null +++ b/wp-admin/css/farbtastic-rtl.min.css @@ -0,0 +1 @@ +.farbtastic{position:relative}.farbtastic *{position:absolute;cursor:crosshair}.farbtastic,.farbtastic .wheel{width:195px;height:195px}.farbtastic .color,.farbtastic .overlay{top:47px;right:47px;width:101px;height:101px}.farbtastic .wheel{background:url(../images/wheel.png) no-repeat;width:195px;height:195px}.farbtastic .overlay{background:url(../images/mask.png) no-repeat}.farbtastic .marker{width:17px;height:17px;margin:-8px -8px 0 0;overflow:hidden;background:url(../images/marker.png) no-repeat} \ No newline at end of file diff --git a/wp-admin/css/farbtastic.min.css b/wp-admin/css/farbtastic.min.css new file mode 100644 index 0000000..69aad06 --- /dev/null +++ b/wp-admin/css/farbtastic.min.css @@ -0,0 +1 @@ +.farbtastic{position:relative}.farbtastic *{position:absolute;cursor:crosshair}.farbtastic,.farbtastic .wheel{width:195px;height:195px}.farbtastic .color,.farbtastic .overlay{top:47px;left:47px;width:101px;height:101px}.farbtastic .wheel{background:url(../images/wheel.png) no-repeat;width:195px;height:195px}.farbtastic .overlay{background:url(../images/mask.png) no-repeat}.farbtastic .marker{width:17px;height:17px;margin:-8px 0 0 -8px;overflow:hidden;background:url(../images/marker.png) no-repeat} \ No newline at end of file diff --git a/wp-admin/css/forms-rtl.css b/wp-admin/css/forms-rtl.css index 9014537..5ecb8c8 100644 --- a/wp-admin/css/forms-rtl.css +++ b/wp-admin/css/forms-rtl.css @@ -1,26 +1,81 @@ -/* include margin and padding in the width calculation of input and textarea */ +/* Include margin and padding in the width calculation of input and textarea. */ input, +textarea { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + input[type="text"], input[type="password"], +input[type="checkbox"], +input[type="color"], +input[type="date"], +input[type="datetime"], +input[type="datetime-local"], +input[type="email"], +input[type="month"], input[type="number"], +input[type="password"], input[type="search"], -input[type="email"], +input[type="radio"], +input[type="tel"], +input[type="text"], +input[type="time"], input[type="url"], +input[type="week"], +select, textarea { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + border: 1px solid #ddd; + -webkit-box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.07 ); + box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.07 ); + background-color: #fff; + color: #32373c; + outline: none; + -webkit-transition: 0.05s border-color ease-in-out; + transition: 0.05s border-color ease-in-out; } -/* @noflip */ +input[type="text"]:focus, +input[type="password"]:focus, +input[type="color"]:focus, +input[type="date"]:focus, +input[type="datetime"]:focus, +input[type="datetime-local"]:focus, +input[type="email"]:focus, +input[type="month"]:focus, +input[type="number"]:focus, +input[type="password"]:focus, +input[type="search"]:focus, +input[type="tel"]:focus, +input[type="text"]:focus, +input[type="time"]:focus, +input[type="url"]:focus, +input[type="week"]:focus, +input[type="checkbox"]:focus, +input[type="radio"]:focus, +select:focus, +textarea:focus { + border-color: #5b9dd9; + -webkit-box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 ); + box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 ); +} + +/* rtl:ignore */ input[type="email"], input[type="url"] { direction: ltr; } +/* Vertically align the number selector with the input. */ +input[type="number"] { + height: 28px; + line-height: inherit; +} + input[type="checkbox"], input[type="radio"] { - border: 1px solid #bbb; + border: 1px solid #b4b9be; background: #fff; color: #555; clear: none; @@ -36,65 +91,62 @@ input[type="radio"] { width: 16px; min-width: 16px; -webkit-appearance: none; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1); - box-shadow: inset 0 1px 2px rgba(0,0,0,0.1); + -webkit-box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.1 ); + box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.1 ); -webkit-transition: .05s border-color ease-in-out; transition: .05s border-color ease-in-out; } input[type="radio"]:checked + label:before { - color: #888; + color: #82878c; } .wp-core-ui input[type="reset"]:hover, .wp-core-ui input[type="reset"]:active { - color: #2ea2cc; + color: #00a0d2; } td > input[type="checkbox"], -.wp-admin p input[type=checkbox], -.wp-admin p input[type=radio] { +.wp-admin p input[type="checkbox"], +.wp-admin p input[type="radio"] { margin-top: 0; } -.wp-admin p label input[type=checkbox] { +.wp-admin p label input[type="checkbox"] { margin-top: -4px; } -.wp-admin p label input[type=radio] { +.wp-admin p label input[type="radio"] { margin-top: -2px; } -input[type=radio] { +input[type="radio"] { -webkit-border-radius: 50%; border-radius: 50%; margin-left: 4px; line-height: 10px; } -input[type=checkbox]:checked:before, -input[type=radio]:checked:before { +input[type="checkbox"]:checked:before, +input[type="radio"]:checked:before { float: right; display: inline-block; vertical-align: middle; width: 16px; - font: normal 21px/1 'dashicons'; + font: normal 21px/1 dashicons; speak: none; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } -input[type=checkbox]:checked:before { - content: '\f147'; +input[type="checkbox"]:checked:before { + content: "\f147"; margin: -3px -4px 0 0; color: #1e8cbe; } -input[type=radio]:checked:before { - content: '\2022'; +input[type="radio"]:checked:before { + content: "\2022"; text-indent: -9999px; -webkit-border-radius: 50px; border-radius: 50px; @@ -106,13 +158,9 @@ input[type=radio]:checked:before { background-color: #1e8cbe; } -input.readonly, textarea.readonly { - background-color: #ddd; -} - @-moz-document url-prefix() { - input[type=checkbox], - input[type=radio], + input[type="checkbox"], + input[type="radio"], .form-table input.tog { margin-bottom: -1px; } @@ -145,7 +193,6 @@ input, select { font-size: 14px; padding: 3px 5px; - line-height: 15px; -webkit-border-radius: 0; border-radius: 0; /* Reset mobile webkit's default element styling */ } @@ -154,17 +201,7 @@ textarea { overflow: auto; padding: 2px 6px; line-height: 1.4; -} - -input[type="text"], -input[type="password"], -input[type="number"], -input[type="search"], -input[type="email"], -input[type="url"], -textarea, -select { - outline: 0; + resize: vertical; } .wp-admin input[type="file"] { @@ -190,60 +227,52 @@ textarea.code { padding: 4px 6px 1px 6px; } -textarea, -input[type="text"], -input[type="password"], -input[type="email"], -input[type="number"], -input[type="search"], -input[type="tel"], -input[type="url"], -select { - border: 1px solid #ddd; - -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.07); - box-shadow: inset 0 1px 2px rgba(0,0,0,0.07); - background-color: #fff; - color: #333; - -webkit-transition: .05s border-color ease-in-out; - transition: .05s border-color ease-in-out; +input.readonly, +input[readonly], +textarea.readonly, +textarea[readonly] { + background-color: #eee; } -select[disabled] { - color: #7f7f7f; +::-webkit-input-placeholder { + color: #72777c; } -textarea:focus, -input[type="text"]:focus, -input[type="password"]:focus, -input[type="email"]:focus, -input[type="number"]:focus, -input[type="search"]:focus, -input[type="tel"]:focus, -input[type="url"]:focus, -input[type="checkbox"]:focus, -input[type="radio"]:focus, -select:focus { - border-color: #5b9dd9; - -webkit-box-shadow: 0 0 2px rgba(30,140,190,0.8); - box-shadow: 0 0 2px rgba(30,140,190,0.8); +::-moz-placeholder { + color: #72777c; + opacity: 1; } -input[readonly] { - background-color: #eee; +:-ms-input-placeholder { + color: #72777c; } -:-moz-placeholder, -.wp-core-ui :-moz-placeholder { - color: #a9a9a9; +.form-invalid input, .form-invalid input:focus, +.form-invalid select, .form-invalid select:focus { + border-color: #dc3232 !important; + -webkit-box-shadow: 0 0 2px rgba( 204, 0, 0, 0.8 ); + box-shadow: 0 0 2px rgba( 204, 0, 0, 0.8 ); } -.form-invalid { - background-color: #ffebe8 !important; +.form-table .form-required.form-invalid td:after { + content: "\f534"; + font: normal 20px/1 dashicons; + color: #dc3232; + margin-right: -25px; + vertical-align: middle; +} + +/* Adjust error indicator for password layout */ +.form-table .form-required.user-pass1-wrap.form-invalid td:after { + content: ''; } -.form-invalid input, -.form-invalid select { - border-color: #c00 !important; +.form-table .form-required.user-pass1-wrap.form-invalid .password-input-wrapper:after { + content: '\f534'; + font: normal 20px/1 dashicons; + color: #dc3232; + margin: 0 -29px 0 6px; + vertical-align: middle; } .form-input-tip { @@ -252,19 +281,34 @@ input[readonly] { input:disabled, input.disabled, +select:disabled, +select.disabled, textarea:disabled, textarea.disabled { - -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.04); - box-shadow: inset 0 1px 2px rgba(0,0,0,0.04); - border-color: rgba(222, 222, 222, .75); - background: rgba(255, 255, 255, .5); - color: rgba(51, 51, 51, .5); -} - -input[type=checkbox]:disabled, -input[type=radio]:disabled, -input[type=checkbox]:disabled:checked:before, -input[type=radio]:disabled:checked:before { + background: rgba( 255, 255, 255, 0.5 ); + border-color: rgba( 222, 222, 222, 0.75 ); + -webkit-box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.04 ); + box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.04 ); + color: rgba( 51, 51, 51, 0.5 ); +} + +input[type="file"]:disabled, +input[type="file"].disabled, +input[type="range"]:disabled, +input[type="range"].disabled { + background: none; + -webkit-box-shadow: none; + box-shadow: none; +} + +input[type="checkbox"]:disabled, +input[type="checkbox"].disabled, +input[type="radio"]:disabled, +input[type="radio"].disabled, +input[type="checkbox"]:disabled:checked:before, +input[type="checkbox"].disabled:checked:before, +input[type="radio"]:disabled:checked:before, +input[type="radio"].disabled:checked:before { opacity: 0.7; } @@ -342,8 +386,7 @@ textarea.large-text { width: 99%; } -input.regular-text, -#adduser .form-field input { +input.regular-text { width: 25em; } @@ -356,6 +399,14 @@ input[type="number"].small-text { width: 65px; } +input.tiny-text { + width: 35px; +} + +input[type="number"].tiny-text { + width: 45px; +} + #doaction, #doaction2, #post-query-submit { @@ -364,7 +415,8 @@ input[type="number"].small-text { .tablenav #changeit, .tablenav #delete_all, -.tablenav #clear-recent-list { +.tablenav #clear-recent-list, +.wp-filter #delete_all { margin-top: 1px; } @@ -386,8 +438,9 @@ input[type="number"].small-text { margin-right: 1em; } -#upload-form label { - color: #777; +button.wp-hide-pw > .dashicons { + position: relative; + top: 3px; } label, @@ -406,9 +459,9 @@ fieldset label, } #misc-publishing-actions label[for="post_status"]:before { - content: '\f173'; + content: "\f173"; display: inline-block; - font: normal 20px/1 'dashicons'; + font: normal 20px/1 dashicons; speak: none; right: -1px; padding: 0 0 0 5px; @@ -423,38 +476,79 @@ fieldset label, #pass-strength-result { background-color: #eee; border: 1px solid #ddd; - float: right; - margin: 13px 1px 5px 5px; + color: #23282d; + margin: -2px 1px 5px 5px; padding: 3px 5px; text-align: center; - width: 200px; - display: none; + width: 25em; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + opacity: 0; } #pass-strength-result.short { - background-color: #ffa0a0; - border-color: #f04040; + background-color: #f1adad; + border-color: #e35b5b; + opacity: 1; } #pass-strength-result.bad { - background-color: #ffb78c; - border-color: #ff853c; + background-color: #fbc5a9; + border-color: #f78b53; + opacity: 1; } #pass-strength-result.good { - background-color: #ffec8b; - border-color: #fc0; + background-color: #ffe399; + border-color: #ffc733; + opacity: 1; } #pass-strength-result.strong { - background-color: #c3ff88; - border-color: #8dff1c; + background-color: #c1e1b9; + border-color: #83c373; + opacity: 1; +} + +#pass1.short, #pass1-text.short { + border-color: #e35b5b; +} + +#pass1.bad, #pass1-text.bad { + border-color: #f78b53; +} + +#pass1.good, #pass1-text.good { + border-color: #ffc733; +} + +#pass1.strong, #pass1-text.strong { + border-color: #83c373; +} + +.pw-weak { + display:none; } .indicator-hint { padding-top: 8px; } +#pass1-text, +.show-password #pass1 { + display: none; +} + +.show-password #pass1-text +{ + display: inline-block; +} + +.form-table span.description.important { + font-size: 12px; +} + p.search-box { float: left; margin: 0; @@ -465,27 +559,27 @@ p.search-box { } .search-box input[name="s"], -#search-plugins input[name="s"], +.tablenav .search-plugins input[name="s"], .tagsdiv .newtag { float: right; height: 28px; margin: 0 0 0 4px; } -input[type="text"].ui-autocomplete-loading { - background: transparent url(../images/loading.gif) no-repeat left center; +input[type="text"].ui-autocomplete-loading, +input[type="email"].ui-autocomplete-loading { + background-image: url(../images/loading.gif); + background-repeat: no-repeat; + background-position: left center; visibility: visible; } -ul#add-to-blog-users { - margin: 0 14px 0 0; +input.ui-autocomplete-input.open { + border-bottom-color: transparent; } -.ui-autocomplete-input.open { - -webkit-border-bottom-left-radius: 0; - border-bottom-left-radius: 0; - -webkit-border-bottom-right-radius: 0; - border-bottom-right-radius: 0; +ul#add-to-blog-users { + margin: 0 14px 0 0; } .ui-autocomplete { @@ -494,28 +588,20 @@ ul#add-to-blog-users { list-style: none; position: absolute; z-index: 10000; - -webkit-border-bottom-left-radius: 3px; - border-bottom-left-radius: 3px; - -webkit-border-bottom-right-radius: 3px; - border-bottom-right-radius: 3px; - border: 1px solid #aaa; - background-color: #efefef; + border: 1px solid #5b9dd9; + -webkit-box-shadow: 0 1px 2px rgba( 30, 140, 190, 0.8 ); + box-shadow: 0 1px 2px rgba( 30, 140, 190, 0.8 ); + background-color: #fff; } .ui-autocomplete li { margin-bottom: 0; + padding: 4px 10px; white-space: nowrap; text-align: right; } -.ui-autocomplete li a { - display: block; - height: 100%; - padding: 4px 10px; - color: #444; -} - -.ui-autocomplete li a.ui-state-focus { +.ui-autocomplete li.ui-state-focus { background-color: #ddd; cursor: pointer; } @@ -548,7 +634,7 @@ ul#add-to-blog-users { .form-table th, .form-wrap label { - color: #222; + color: #23282d; font-weight: normal; text-shadow: none; vertical-align: baseline; @@ -573,6 +659,14 @@ ul#add-to-blog-users { margin-bottom: 0; } +.form-table .date-time-doc { + margin-top: 1em; +} + +.form-table p.timezone-info { + margin: 1em 0; +} + .form-table td fieldset label { margin: 0.25em 0 0.5em !important; display: inline-block; @@ -585,7 +679,7 @@ ul#add-to-blog-users { } .form-table input.tog, -.form-table input[type=radio] { +.form-table input[type="radio"] { margin-top: -4px; margin-left: 4px; float: none; @@ -600,6 +694,11 @@ table.form-table td .updated { font-size: 13px; } +table.form-table td .updated p { + font-size: 13px; + margin: 0.3em 0; +} + /*------------------------------------------------------------------------------ 18.0 - Users ------------------------------------------------------------------------------*/ @@ -621,6 +720,7 @@ table.form-table td .updated { width: 15em; } +#adduser .form-field input, #createuser .form-field input { width: 25em; } @@ -666,79 +766,142 @@ table.form-table td .updated { line-height: 24px; } -.pressthis { - margin: 20px 0; +.label-responsive { + vertical-align: middle; +} + +#export-filters p { + margin: 0 0 1em; +} + +#export-filters p.submit { + margin: 7px 0 5px; } -.pressthis a, -.pressthis a:hover, -.pressthis a:focus, -.pressthis a:active { +/* Card styles */ + +.card { + position: relative; + margin-top: 20px; + padding: 0.7em 2em 1em; + min-width: 255px; + max-width: 520px; + border: 1px solid #e5e5e5; + -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04); + box-shadow: 0 1px 1px rgba(0,0,0,0.04); + background: #fff; +} + +/* Press this styles */ + +.pressthis h4 { + margin: 2em 0 1em; +} + +.pressthis textarea { + width: 100%; + font-size: 1em; +} + +#pressthis-code-wrap { + overflow: auto; +} + +.pressthis-bookmarklet-wrapper { + margin: 20px 0 8px; + vertical-align: top; + position: relative; + z-index: 1; +} + +.pressthis-bookmarklet, +.pressthis-bookmarklet:hover, +.pressthis-bookmarklet:focus, +.pressthis-bookmarklet:active { display: inline-block; position: relative; cursor: move; - color: #333; - background: #e6e6e6; + color: #32373c; + background: #e5e5e5; -webkit-border-radius: 5px; border-radius: 5px; - border: 1px solid #b4b4b4; + border: 1px solid #b4b9be; font-style: normal; line-height: 16px; font-size: 14px; text-decoration: none; } -.pressthis a:active { +.pressthis-bookmarklet:active { outline: none; } -.pressthis a:hover:after { - -webkit-transform: skew(20deg) rotate(9deg); - -ms-transform: skew(20deg) rotate(9deg); - transform: skew(20deg) rotate(9deg); +.pressthis-bookmarklet:after { + content: ""; + width: 70%; + height: 55%; + z-index: -1; + position: absolute; + left: 10px; + bottom: 9px; + background: transparent; + -webkit-transform: skew(-20deg) rotate(-6deg); + -ms-transform: skew(-20deg) rotate(-6deg); + transform: skew(-20deg) rotate(-6deg); + -webkit-box-shadow: 0 10px 8px rgba(0, 0, 0, 0.6); + box-shadow: 0 10px 8px rgba(0, 0, 0, 0.6); +} + +.pressthis-bookmarklet:hover:after { + -webkit-transform: skew(-20deg) rotate(-9deg); + -ms-transform: skew(-20deg) rotate(-9deg); + transform: skew(-20deg) rotate(-9deg); -webkit-box-shadow: 0 10px 8px rgba(0, 0, 0, 0.7); box-shadow: 0 10px 8px rgba(0, 0, 0, 0.7); } -.pressthis a span { +.pressthis-bookmarklet span { display: inline-block; margin: 0px 0 0; padding: 0px 9px 8px 12px; } -.pressthis a span:before { - color: #777; - font: normal 20px/1 'dashicons'; - content:'\f157'; +.pressthis-bookmarklet span:before { + color: #72777c; + font: normal 20px/1 dashicons; + content: "\f157"; position: relative; display: inline-block; top: 4px; margin-left: 4px; } -.pressthis a:after { - content: ''; - width: 70%; - height: 55%; - z-index: -1; - position: absolute; - left: 10px; - bottom: 9px; - background: transparent; - -webkit-transform: skew(20deg) rotate(6deg); - -ms-transform: skew(20deg) rotate(6deg); - transform: skew(20deg) rotate(6deg); - -webkit-box-shadow: 0 10px 8px rgba(0, 0, 0, 0.6); - box-shadow: 0 10px 8px rgba(0, 0, 0, 0.6); +.pressthis-js-toggle { + margin-right: 10px; + padding: 0; + height: auto; + vertical-align: top; +} + +/* to override the button class being applied */ +.pressthis-js-toggle.button.button { + margin-right: 10px; + padding: 0; + height: auto; + vertical-align: top; +} + +.pressthis-js-toggle .dashicons { + margin: 5px 7px 6px 8px; + color: #555d66; } /*------------------------------------------------------------------------------ 20.0 - Settings ------------------------------------------------------------------------------*/ -#utc-time, #local-time { - padding-right: 25px; - font-style: italic; +.timezone-info code { + white-space: nowrap; } .defaultavatarpicker .avatar { @@ -746,11 +909,141 @@ table.form-table td .updated { vertical-align: middle; } +.options-general-php .date-time-text { + display: inline-block; + min-width: 10em; +} + +.options-general-php input.small-text { + width: 56px; +} + .options-general-php .spinner { float: none; - margin: -3px 3px; + margin: 0 3px; +} + +.settings-php .language-install-spinner, +.options-general-php .language-install-spinner { + display: inline-block; + float: none; + margin: -3px 5px 0; + vertical-align: middle; +} + +/*------------------------------------------------------------------------------ + 21.0 - Network Admin +------------------------------------------------------------------------------*/ + +.setup-php textarea { + max-width: 100%; +} + +.form-field #site-address { + max-width: 25em; +} + +.form-field #domain { + max-width: 22em; +} + +.form-field #site-title, +.form-field #admin-email, +.form-field #path, +.form-field #blog_registered, +.form-field #blog_last_updated { + max-width: 25em; +} + +.form-field #path { + margin-bottom: 5px; +} + +#search-users, +#search-sites { + max-width: 100%; +} + +/*------------------------------------------------------------------------------ + Credentials check dialog for Install and Updates +------------------------------------------------------------------------------*/ + +.request-filesystem-credentials-dialog { + display: none; +} + +.request-filesystem-credentials-dialog .notification-dialog { + top: 15%; + max-height: 85%; +} + +.request-filesystem-credentials-dialog-content { + margin: 25px; +} + +#request-filesystem-credentials-title { + font-size: 1.3em; + margin: 1em 0; } +.request-filesystem-credentials-form legend { + font-size: 1em; + padding: 1.33em 0; + font-weight: 600; +} + +.request-filesystem-credentials-form input[type="text"], +.request-filesystem-credentials-form input[type="password"] { + display: block; +} + +.request-filesystem-credentials-dialog input[type="text"], +.request-filesystem-credentials-dialog input[type="password"] { + width: 100%; +} + +.request-filesystem-credentials-form .field-title { + font-weight: 600; +} + +.request-filesystem-credentials-dialog label[for="hostname"], +.request-filesystem-credentials-dialog label[for="public_key"], +.request-filesystem-credentials-dialog label[for="private_key"] { + display: block; + margin-bottom: 1em; +} + +.request-filesystem-credentials-dialog .ftp-username, +.request-filesystem-credentials-dialog .ftp-password { + float: right; + width: 48%; +} + +.request-filesystem-credentials-dialog .ftp-password { + margin-right: 4%; +} + +.request-filesystem-credentials-dialog .request-filesystem-credentials-action-buttons { + text-align: left; +} + +.request-filesystem-credentials-dialog label[for="ftp"] { + margin-left: 10px; +} + +#request-filesystem-credentials-dialog .button:not(:last-child) { + margin-left: 10px; +} + +#request-filesystem-credentials-form .cancel-button { + display: none; +} + +#request-filesystem-credentials-dialog .cancel-button { + display: inline; +} + + /* =Media Queries -------------------------------------------------------------- */ @@ -760,43 +1053,58 @@ table.form-table td .updated { -webkit-appearance: none; } - input[type=text], input[type=search], - input[type=password], input[type=number] { + input[type="text"], + input[type="email"], + input[type="search"], + input[type="password"], + input[type="number"] { -webkit-appearance: none; padding: 6px 10px; } + input[type="number"] { + height: 40px; + } + input.code { padding-bottom: 5px; padding-top: 10px; } - input[type=checkbox], .widefat th input[type=checkbox] { + input[type="checkbox"], + .widefat th input[type="checkbox"], + .widefat thead td input[type="checkbox"], + .widefat tfoot td input[type="checkbox"] { -webkit-appearance: none; padding: 10px; } - .widefat th input[type=checkbox] { + .widefat th input[type="checkbox"], + .widefat thead td input[type="checkbox"], + .widefat tfoot td input[type="checkbox"] { margin-bottom: 8px; } - input[type=checkbox]:checked:before, .widefat th input[type=checkbox]:before { - font: normal 30px/1 'Dashicons'; + input[type="checkbox"]:checked:before, + .widefat th input[type="checkbox"]:before, + .widefat thead td input[type="checkbox"]:before, + .widefat tfoot td input[type="checkbox"]:before { + font: normal 30px/1 dashicons; margin: -3px -5px; } - input[type=radio], - input[type=checkbox] { + input[type="radio"], + input[type="checkbox"] { height: 25px; width: 25px; } - .wp-admin p input[type=checkbox], - .wp-admin p input[type=radio] { + .wp-admin p input[type="checkbox"], + .wp-admin p input[type="radio"] { margin-top: -3px; } - input[type=radio]:checked:before { + input[type="radio"]:checked:before { vertical-align: middle; width: 9px; height: 9px; @@ -804,7 +1112,7 @@ table.form-table td .updated { line-height: 16px; } - .wp-upload-form input[type=submit] { + .wp-upload-form input[type="submit"] { margin-top: 10px; } @@ -818,6 +1126,7 @@ table.form-table td .updated { font-size: 14px; } + #adduser .form-field input, #createuser .form-field input { width: 100%; } @@ -829,12 +1138,21 @@ table.form-table td .updated { } .form-table th, - .form-table td { + .form-table td, + .label-responsive { display: block; width: auto; vertical-align: middle; } + .label-responsive { + margin: 0.5em 0; + } + + .export-filters li { + margin-bottom: 0; + } + .form-table .color-palette td { display: table-cell; width: 15px; @@ -850,6 +1168,7 @@ table.form-table td .updated { } .form-table td input[type="text"], + .form-table td input[type="email"], .form-table td input[type="password"], .form-table td select, .form-table td textarea, @@ -866,12 +1185,21 @@ table.form-table td .updated { box-sizing: border-box; } - input[type=text].small-text, - input[type=search].small-text, - input[type=password].small-text, - input[type=number].small-text, + .form-table .form-required.form-invalid td:after { + float: left; + margin: -30px 0 0 3px; + } + + #wpbody .form-table td select { + height: 40px; + } + + input[type="text"].small-text, + input[type="search"].small-text, + input[type="password"].small-text, input[type="number"].small-text, - .form-table input[type=text].small-text { + input[type="number"].small-text, + .form-table input[type="text"].small-text { width: auto; max-width: 55px; display: inline; @@ -910,8 +1238,10 @@ table.form-table td .updated { } .form-table span.description { + display: inline; padding: 4px 0 0; line-height: 1.4em; + font-size: 14px; } .form-table th { @@ -921,10 +1251,22 @@ table.form-table td .updated { } .form-table td { - padding-top: 8px; + margin-bottom: 0; + padding-bottom: 6px; + padding-top: 4px; padding-right: 0; } + .form-table.permalink-structure td code { + margin-right: 32px; + } + + .form-table.permalink-structure td input[type="text"] { + margin-right: 32px; + margin-top: 4px; + width: 96%; + } + .form-table input.regular-text { width: 100%; } @@ -937,21 +1279,61 @@ table.form-table td .updated { display: block; } - #utc-time { - margin-top: 10px; - } - #utc-time, #local-time { display: block; float: none; - padding: 0; + margin-top: 0.5em; + } + + .form-field #domain { + max-width: none; + } + + /* New Password */ + .wp-pwd { + position: relative; + } + + .wp-pwd [type="text"], + .wp-pwd [type="password"] { + padding-left: 40px; + } + + .wp-pwd button.button { + background: transparent; + border: none; + -webkit-box-shadow: none; + box-shadow: none; line-height: 2; + margin: 0; + padding: 5px 10px; + position: absolute; + left: 0; + top: 0; + } + + .wp-pwd button.button:hover, + .wp-pwd button.button:focus, + .wp-pwd button.button:active { + background: transparent; + } + + .wp-pwd .button .text { + display: none; + } + + .options-general-php input[type="text"].small-text { + max-width: 60px; + margin: 0; } } @media only screen and (max-width: 768px) { - .form-field input, + .form-field input[type="text"], + .form-field input[type="email"], + .form-field input[type="password"], + .form-field select, .form-field textarea { width: 99%; } @@ -967,6 +1349,19 @@ table.form-table td .updated { } } +@media only screen and (max-height: 480px) { + /* Request Credentials */ + .request-filesystem-credentials-dialog .notification-dialog{ + width: 100%; + height: 100%; + max-height: 100%; + position: fixed; + top: 0; + margin: 0; + right: 0; + } +} + /* Smartphone */ @media screen and (max-width: 600px) { /* Color Picker Options */ @@ -975,3 +1370,9 @@ table.form-table td .updated { } } +@media only screen and (max-width: 320px) { + .options-general-php .date-time-text.date-time-custom-text { + min-width: 0; + margin-left: 0.5em; + } +} diff --git a/wp-admin/css/forms-rtl.min.css b/wp-admin/css/forms-rtl.min.css new file mode 100644 index 0000000..8e956e2 --- /dev/null +++ b/wp-admin/css/forms-rtl.min.css @@ -0,0 +1 @@ +#pass-strength-result,input,textarea{-webkit-box-sizing:border-box;-moz-box-sizing:border-box}.meta-box-sortables select,p.submit{max-width:100%}#your-profile label+a,.wp-admin select,fieldset label,label{vertical-align:middle}#pressthis-code-wrap,textarea{overflow:auto}input,textarea{box-sizing:border-box}input[type=text],input[type=search],input[type=radio],input[type=tel],input[type=time],input[type=url],input[type=week],input[type=password],input[type=checkbox],input[type=color],input[type=date],input[type=datetime],input[type=datetime-local],input[type=email],input[type=month],input[type=number],select,textarea{border:1px solid #ddd;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.07);box-shadow:inset 0 1px 2px rgba(0,0,0,.07);background-color:#fff;color:#32373c;outline:0;-webkit-transition:50ms border-color ease-in-out;transition:50ms border-color ease-in-out}input[type=text]:focus,input[type=search]:focus,input[type=radio]:focus,input[type=tel]:focus,input[type=time]:focus,input[type=url]:focus,input[type=week]:focus,input[type=password]:focus,input[type=checkbox]:focus,input[type=color]:focus,input[type=date]:focus,input[type=datetime]:focus,input[type=datetime-local]:focus,input[type=email]:focus,input[type=month]:focus,input[type=number]:focus,select:focus,textarea:focus{border-color:#5b9dd9;-webkit-box-shadow:0 0 2px rgba(30,140,190,.8);box-shadow:0 0 2px rgba(30,140,190,.8)}input[type=url],input[type=email]{direction:ltr}input[type=number]{height:28px;line-height:inherit}input[type=radio],input[type=checkbox]{border:1px solid #b4b9be;background:#fff;color:#555;clear:none;cursor:pointer;display:inline-block;line-height:0;height:16px;margin:-4px 0 0 4px;outline:0;padding:0!important;text-align:center;vertical-align:middle;width:16px;min-width:16px;-webkit-appearance:none;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1);-webkit-transition:.05s border-color ease-in-out;transition:.05s border-color ease-in-out}input[type=radio]:checked+label:before{color:#82878c}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#00a0d2}.wp-admin p input[type=radio],.wp-admin p input[type=checkbox],td>input[type=checkbox]{margin-top:0}.wp-admin p label input[type=checkbox]{margin-top:-4px}.wp-admin p label input[type=radio]{margin-top:-2px}input[type=radio]{-webkit-border-radius:50%;border-radius:50%;margin-left:4px;line-height:10px}input[type=radio]:checked:before,input[type=checkbox]:checked:before{float:right;display:inline-block;vertical-align:middle;width:16px;font:400 21px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}input[type=checkbox]:checked:before{content:"\f147";margin:-3px -4px 0 0;color:#1e8cbe}input[type=radio]:checked:before{content:"\2022";text-indent:-9999px;-webkit-border-radius:50px;border-radius:50px;font-size:24px;width:6px;height:6px;margin:4px;line-height:16px;background-color:#1e8cbe}@-moz-document url-prefix(){.form-table input.tog,input[type=radio],input[type=checkbox]{margin-bottom:-1px}}input[type=search]{-webkit-appearance:textfield}input[type=search]::-webkit-search-decoration{display:none}.ie8 input[type=password]{font-family:sans-serif}button,input,select,textarea{font-family:inherit;font-size:inherit;font-weight:inherit}input,select,textarea{font-size:14px;-webkit-border-radius:0;border-radius:0}textarea{padding:2px 6px;line-height:1.4;resize:vertical}.wp-admin input[type=file]{padding:3px 0}label{cursor:pointer}input,select{margin:1px;padding:3px 5px}input.code{padding-top:6px}textarea.code{line-height:1.4;padding:4px 6px 1px}input.readonly,input[readonly],textarea.readonly,textarea[readonly]{background-color:#eee}::-webkit-input-placeholder{color:#72777c}::-moz-placeholder{color:#72777c;opacity:1}:-ms-input-placeholder{color:#72777c}.form-invalid input,.form-invalid input:focus,.form-invalid select,.form-invalid select:focus{border-color:#dc3232!important;-webkit-box-shadow:0 0 2px rgba(204,0,0,.8);box-shadow:0 0 2px rgba(204,0,0,.8)}.form-table .form-required.form-invalid td:after{content:"\f534";font:400 20px/1 dashicons;color:#dc3232;margin-right:-25px;vertical-align:middle}.form-table .form-required.user-pass1-wrap.form-invalid td:after{content:''}.form-table .form-required.user-pass1-wrap.form-invalid .password-input-wrapper:after{content:'\f534';font:400 20px/1 dashicons;color:#dc3232;margin:0 -29px 0 6px;vertical-align:middle}.form-input-tip{color:#666}input.disabled,input:disabled,select.disabled,select:disabled,textarea.disabled,textarea:disabled{background:rgba(255,255,255,.5);border-color:rgba(222,222,222,.75);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.04);box-shadow:inset 0 1px 2px rgba(0,0,0,.04);color:rgba(51,51,51,.5)}input[type=file].disabled,input[type=file]:disabled,input[type=range].disabled,input[type=range]:disabled{background:0 0;-webkit-box-shadow:none;box-shadow:none}input[type=radio].disabled,input[type=radio].disabled:checked:before,input[type=radio]:disabled,input[type=radio]:disabled:checked:before,input[type=checkbox].disabled,input[type=checkbox].disabled:checked:before,input[type=checkbox]:disabled,input[type=checkbox]:disabled:checked:before{opacity:.7}.wp-admin select{padding:2px;line-height:28px;height:28px}.wp-admin .button-cancel{padding:0 5px;line-height:2}.wp-admin select[multiple]{height:auto}.submit{padding:1.5em 0;margin:5px 0;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;border:none}form p.submit a.cancel:hover{text-decoration:none}p.submit{text-align:right;margin-top:20px;padding-top:10px}.textright p.submit{border:none;text-align:left}table.form-table+input+input+p.submit,table.form-table+input+p.submit,table.form-table+p.submit{border-top:none;padding-top:0}#major-publishing-actions input,#minor-publishing-actions .preview,#minor-publishing-actions input{text-align:center}input.all-options,textarea.all-options{width:250px}input.large-text,textarea.large-text{width:99%}input.regular-text{width:25em}input.small-text{width:50px;padding:1px 6px}input[type=number].small-text{width:65px}input.tiny-text{width:35px}input[type=number].tiny-text{width:45px}#doaction,#doaction2,#post-query-submit{margin:1px 0 0 8px}.tablenav #changeit,.tablenav #clear-recent-list,.tablenav #delete_all,.wp-filter #delete_all{margin-top:1px}.tablenav .actions select{float:right;margin-left:6px;max-width:200px}.ie8 .tablenav .actions select{width:155px}.ie8 .tablenav .actions select#cat{width:200px}#timezone_string option{margin-right:1em}button.wp-hide-pw>.dashicons{position:relative;top:3px}#misc-publishing-actions label,.options-media-php label[for*="_size_"]{vertical-align:baseline}#misc-publishing-actions label[for=post_status]:before{content:"\f173";display:inline-block;font:400 20px/1 dashicons;speak:none;right:-1px;padding:0 0 0 5px;position:relative;top:0;text-decoration:none!important;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#pass1-text,.pw-weak,.show-password #pass1{display:none}#pass-strength-result{background-color:#eee;border:1px solid #ddd;color:#23282d;margin:-2px 1px 5px 5px;padding:3px 5px;text-align:center;width:25em;box-sizing:border-box;opacity:0}#pass-strength-result.short{background-color:#f1adad;border-color:#e35b5b;opacity:1}#pass-strength-result.bad{background-color:#fbc5a9;border-color:#f78b53;opacity:1}#pass-strength-result.good{background-color:#ffe399;border-color:#ffc733;opacity:1}#pass-strength-result.strong{background-color:#c1e1b9;border-color:#83c373;opacity:1}#pass1-text.short,#pass1.short{border-color:#e35b5b}#pass1-text.bad,#pass1.bad{border-color:#f78b53}#pass1-text.good,#pass1.good{border-color:#ffc733}#pass1-text.strong,#pass1.strong{border-color:#83c373}.indicator-hint{padding-top:8px}.show-password #pass1-text{display:inline-block}.form-table span.description.important{font-size:12px}p.search-box{float:left;margin:0}.network-admin.themes-php p.search-box{clear:right}.search-box input[name="s"],.tablenav .search-plugins input[name="s"],.tagsdiv .newtag{float:right;height:28px;margin:0 0 0 4px}input[type=text].ui-autocomplete-loading,input[type=email].ui-autocomplete-loading{background-image:url(../images/loading.gif);background-repeat:no-repeat;background-position:left center;visibility:visible}input.ui-autocomplete-input.open{border-bottom-color:transparent}ul#add-to-blog-users{margin:0 14px 0 0}.ui-autocomplete{padding:0;margin:0;list-style:none;position:absolute;z-index:10000;border:1px solid #5b9dd9;-webkit-box-shadow:0 1px 2px rgba(30,140,190,.8);box-shadow:0 1px 2px rgba(30,140,190,.8);background-color:#fff}.ui-autocomplete li{margin-bottom:0;padding:4px 10px;white-space:nowrap;text-align:right}.ui-autocomplete li.ui-state-focus{background-color:#ddd;cursor:pointer}.form-table{border-collapse:collapse;margin-top:.5em;width:100%;clear:both}.form-table,.form-table td,.form-table td p,.form-table th,.form-wrap label{font-size:14px}.form-table td{margin-bottom:9px;padding:15px 10px;line-height:1.3;vertical-align:middle}.form-table th,.form-wrap label{color:#23282d;font-weight:400;text-shadow:none;vertical-align:baseline}.form-table th{vertical-align:top;text-align:right;padding:20px 0 20px 10px;width:200px;line-height:1.3;font-weight:600}.form-table th.th-full{width:auto;font-weight:400}.form-table td p{margin-top:4px;margin-bottom:0}.form-table .date-time-doc{margin-top:1em}.form-table p.timezone-info{margin:1em 0}.form-table td fieldset label{margin:.25em 0 .5em!important;display:inline-block}.form-table td fieldset label,.form-table td fieldset li,.form-table td fieldset p{line-height:1.4em}.form-table input.tog,.form-table input[type=radio]{margin-top:-4px;margin-left:4px;float:none}.form-table .pre{padding:8px;margin:0}table.form-table td .updated{font-size:13px}table.form-table td .updated p{font-size:13px;margin:.3em 0}#profile-page .form-table textarea{width:500px;margin-bottom:6px}#profile-page .form-table #rich_editing{margin-left:5px}#your-profile legend{font-size:22px}#display_name{width:15em}#adduser .form-field input,#createuser .form-field input{width:25em}.color-option{display:inline-block;width:24%;padding:5px 15px 15px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin-bottom:3px;cursor:pointer}.color-option.selected,.color-option:hover{background:#ddd}.color-palette{width:100%;border-spacing:0;border-collapse:collapse}.color-palette td{height:20px;padding:0;border:none}.tool-box .title{margin:8px 0;font-size:18px;font-weight:400;line-height:24px}.label-responsive{vertical-align:middle}#export-filters p{margin:0 0 1em}#export-filters p.submit{margin:7px 0 5px}.card{position:relative;margin-top:20px;padding:.7em 2em 1em;min-width:255px;max-width:520px;border:1px solid #e5e5e5;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04);background:#fff}.pressthis h4{margin:2em 0 1em}.pressthis textarea{width:100%;font-size:1em}.pressthis-bookmarklet-wrapper{margin:20px 0 8px;vertical-align:top;position:relative;z-index:1}.pressthis-bookmarklet,.pressthis-bookmarklet:active,.pressthis-bookmarklet:focus,.pressthis-bookmarklet:hover{display:inline-block;position:relative;cursor:move;color:#32373c;background:#e5e5e5;-webkit-border-radius:5px;border-radius:5px;border:1px solid #b4b9be;font-style:normal;line-height:16px;font-size:14px;text-decoration:none}.pressthis-bookmarklet:active{outline:0}.pressthis-bookmarklet:after{content:"";width:70%;height:55%;z-index:-1;position:absolute;left:10px;bottom:9px;background:0 0;-webkit-transform:skew(-20deg) rotate(-6deg);-ms-transform:skew(-20deg) rotate(-6deg);transform:skew(-20deg) rotate(-6deg);-webkit-box-shadow:0 10px 8px rgba(0,0,0,.6);box-shadow:0 10px 8px rgba(0,0,0,.6)}.pressthis-bookmarklet:hover:after{-webkit-transform:skew(-20deg) rotate(-9deg);-ms-transform:skew(-20deg) rotate(-9deg);transform:skew(-20deg) rotate(-9deg);-webkit-box-shadow:0 10px 8px rgba(0,0,0,.7);box-shadow:0 10px 8px rgba(0,0,0,.7)}.pressthis-bookmarklet span{display:inline-block;margin:0;padding:0 9px 8px 12px}.pressthis-bookmarklet span:before{color:#72777c;font:400 20px/1 dashicons;content:"\f157";position:relative;display:inline-block;top:4px;margin-left:4px}.pressthis-js-toggle,.pressthis-js-toggle.button.button{margin-right:10px;padding:0;height:auto;vertical-align:top}.pressthis-js-toggle .dashicons{margin:5px 7px 6px 8px;color:#555d66}.timezone-info code{white-space:nowrap}.defaultavatarpicker .avatar{margin:2px 0;vertical-align:middle}.options-general-php .date-time-text{display:inline-block;min-width:10em}.options-general-php input.small-text{width:56px}.options-general-php .spinner{float:none;margin:0 3px}.options-general-php .language-install-spinner,.settings-php .language-install-spinner{display:inline-block;float:none;margin:-3px 5px 0;vertical-align:middle}.setup-php textarea{max-width:100%}.form-field #site-address{max-width:25em}.form-field #domain{max-width:22em}.form-field #admin-email,.form-field #blog_last_updated,.form-field #blog_registered,.form-field #path,.form-field #site-title{max-width:25em}.form-field #path{margin-bottom:5px}#search-sites,#search-users{max-width:100%}.request-filesystem-credentials-dialog{display:none}.request-filesystem-credentials-dialog .notification-dialog{top:15%;max-height:85%}.request-filesystem-credentials-dialog-content{margin:25px}#request-filesystem-credentials-title{font-size:1.3em;margin:1em 0}.request-filesystem-credentials-form legend{font-size:1em;padding:1.33em 0;font-weight:600}.request-filesystem-credentials-form input[type=text],.request-filesystem-credentials-form input[type=password]{display:block}.request-filesystem-credentials-dialog input[type=text],.request-filesystem-credentials-dialog input[type=password]{width:100%}.request-filesystem-credentials-form .field-title{font-weight:600}.request-filesystem-credentials-dialog label[for=hostname],.request-filesystem-credentials-dialog label[for=public_key],.request-filesystem-credentials-dialog label[for=private_key]{display:block;margin-bottom:1em}.request-filesystem-credentials-dialog .ftp-password,.request-filesystem-credentials-dialog .ftp-username{float:right;width:48%}.request-filesystem-credentials-dialog .ftp-password{margin-right:4%}.request-filesystem-credentials-dialog .request-filesystem-credentials-action-buttons{text-align:left}.request-filesystem-credentials-dialog label[for=ftp]{margin-left:10px}#request-filesystem-credentials-dialog .button:not(:last-child){margin-left:10px}#request-filesystem-credentials-form .cancel-button{display:none}#request-filesystem-credentials-dialog .cancel-button{display:inline}@media screen and (max-width:782px){textarea{-webkit-appearance:none}input[type=text],input[type=search],input[type=password],input[type=email],input[type=number]{-webkit-appearance:none;padding:6px 10px}input[type=number]{height:40px}input.code{padding-bottom:5px;padding-top:10px}.widefat tfoot td input[type=checkbox],.widefat th input[type=checkbox],.widefat thead td input[type=checkbox],input[type=checkbox]{-webkit-appearance:none;padding:10px}.widefat tfoot td input[type=checkbox],.widefat th input[type=checkbox],.widefat thead td input[type=checkbox]{margin-bottom:8px}.widefat tfoot td input[type=checkbox]:before,.widefat th input[type=checkbox]:before,.widefat thead td input[type=checkbox]:before,input[type=checkbox]:checked:before{font:400 30px/1 dashicons;margin:-3px -5px}input[type=radio],input[type=checkbox]{height:25px;width:25px}.wp-admin p input[type=radio],.wp-admin p input[type=checkbox]{margin-top:-3px}input[type=radio]:checked:before{vertical-align:middle;width:9px;height:9px;margin:7px;line-height:16px}.wp-upload-form input[type=submit]{margin-top:10px}#wpbody select{height:36px;font-size:16px}.wp-admin .button-cancel{padding:0;font-size:14px}#adduser .form-field input,#createuser .form-field input{width:100%}.form-table{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.form-table td,.form-table th,.label-responsive{display:block;width:auto;vertical-align:middle}.label-responsive{margin:.5em 0}.export-filters li{margin-bottom:0}.form-table .color-palette td{display:table-cell;width:15px}.form-table table.color-palette{margin-left:10px}input,textarea{font-size:16px}#profile-page .form-table textarea,.form-table span.description,.form-table td input[type=text],.form-table td input[type=password],.form-table td input[type=email],.form-table td select,.form-table td textarea{width:100%;font-size:16px;line-height:1.5;padding:7px 10px;display:block;max-width:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.form-table .form-required.form-invalid td:after{float:left;margin:-30px 0 0 3px}#wpbody .form-table td select{height:40px}.form-table input[type=text].small-text,input[type=text].small-text,input[type=search].small-text,input[type=password].small-text,input[type=number].small-text{width:auto;max-width:55px;display:inline;padding:3px 6px;margin:0 3px}#pass-strength-result{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:8px}p.search-box{float:none;position:absolute;bottom:0;width:98%;height:90px;margin-bottom:20px}p.search-box input[name="s"]{height:auto;float:none;width:100%;margin-bottom:10px;vertical-align:middle;-webkit-appearance:none}p.search-box input[type=submit]{margin-bottom:10px}.form-table span.description{display:inline;padding:4px 0 0;line-height:1.4em;font-size:14px}.form-table th{padding-top:10px;padding-bottom:0;border-bottom:0}.form-table td{margin-bottom:0;padding-bottom:6px;padding-top:4px;padding-right:0}.form-table.permalink-structure td code{margin-right:32px}.form-table.permalink-structure td input[type=text]{margin-right:32px;margin-top:4px;width:96%}.form-table input.regular-text{width:100%}.form-table label{font-size:14px}.form-table fieldset label{display:block}#local-time,#utc-time{display:block;float:none;margin-top:.5em}.form-field #domain{max-width:none}.wp-pwd{position:relative}.wp-pwd [type=text],.wp-pwd [type=password]{padding-left:40px}.wp-pwd button.button{background:0 0;border:none;-webkit-box-shadow:none;box-shadow:none;line-height:2;margin:0;padding:5px 10px;position:absolute;left:0;top:0}.wp-pwd button.button:active,.wp-pwd button.button:focus,.wp-pwd button.button:hover{background:0 0}.wp-pwd .button .text{display:none}.options-general-php input[type=text].small-text{max-width:60px;margin:0}}@media only screen and (max-width:768px){.form-field input[type=text],.form-field input[type=password],.form-field input[type=email],.form-field select,.form-field textarea{width:99%}.form-wrap .form-field{padding:0}#profile-page .form-table textarea{max-width:400px;width:auto}}@media only screen and (max-height:480px){.request-filesystem-credentials-dialog .notification-dialog{width:100%;height:100%;max-height:100%;position:fixed;top:0;margin:0;right:0}}@media screen and (max-width:600px){.color-option{width:49%}}@media only screen and (max-width:320px){.options-general-php .date-time-text.date-time-custom-text{min-width:0;margin-left:.5em}} \ No newline at end of file diff --git a/wp-admin/css/forms.css b/wp-admin/css/forms.css index 14cfe85..73aa005 100644 --- a/wp-admin/css/forms.css +++ b/wp-admin/css/forms.css @@ -1,26 +1,81 @@ -/* include margin and padding in the width calculation of input and textarea */ +/* Include margin and padding in the width calculation of input and textarea. */ input, +textarea { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + input[type="text"], input[type="password"], +input[type="checkbox"], +input[type="color"], +input[type="date"], +input[type="datetime"], +input[type="datetime-local"], +input[type="email"], +input[type="month"], input[type="number"], +input[type="password"], input[type="search"], -input[type="email"], +input[type="radio"], +input[type="tel"], +input[type="text"], +input[type="time"], input[type="url"], +input[type="week"], +select, textarea { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + border: 1px solid #ddd; + -webkit-box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.07 ); + box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.07 ); + background-color: #fff; + color: #32373c; + outline: none; + -webkit-transition: 0.05s border-color ease-in-out; + transition: 0.05s border-color ease-in-out; +} + +input[type="text"]:focus, +input[type="password"]:focus, +input[type="color"]:focus, +input[type="date"]:focus, +input[type="datetime"]:focus, +input[type="datetime-local"]:focus, +input[type="email"]:focus, +input[type="month"]:focus, +input[type="number"]:focus, +input[type="password"]:focus, +input[type="search"]:focus, +input[type="tel"]:focus, +input[type="text"]:focus, +input[type="time"]:focus, +input[type="url"]:focus, +input[type="week"]:focus, +input[type="checkbox"]:focus, +input[type="radio"]:focus, +select:focus, +textarea:focus { + border-color: #5b9dd9; + -webkit-box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 ); + box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 ); } -/* @noflip */ +/* rtl:ignore */ input[type="email"], input[type="url"] { direction: ltr; } +/* Vertically align the number selector with the input. */ +input[type="number"] { + height: 28px; + line-height: inherit; +} + input[type="checkbox"], input[type="radio"] { - border: 1px solid #bbb; + border: 1px solid #b4b9be; background: #fff; color: #555; clear: none; @@ -36,65 +91,62 @@ input[type="radio"] { width: 16px; min-width: 16px; -webkit-appearance: none; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1); - box-shadow: inset 0 1px 2px rgba(0,0,0,0.1); + -webkit-box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.1 ); + box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.1 ); -webkit-transition: .05s border-color ease-in-out; transition: .05s border-color ease-in-out; } input[type="radio"]:checked + label:before { - color: #888; + color: #82878c; } .wp-core-ui input[type="reset"]:hover, .wp-core-ui input[type="reset"]:active { - color: #2ea2cc; + color: #00a0d2; } td > input[type="checkbox"], -.wp-admin p input[type=checkbox], -.wp-admin p input[type=radio] { +.wp-admin p input[type="checkbox"], +.wp-admin p input[type="radio"] { margin-top: 0; } -.wp-admin p label input[type=checkbox] { +.wp-admin p label input[type="checkbox"] { margin-top: -4px; } -.wp-admin p label input[type=radio] { +.wp-admin p label input[type="radio"] { margin-top: -2px; } -input[type=radio] { +input[type="radio"] { -webkit-border-radius: 50%; border-radius: 50%; margin-right: 4px; line-height: 10px; } -input[type=checkbox]:checked:before, -input[type=radio]:checked:before { +input[type="checkbox"]:checked:before, +input[type="radio"]:checked:before { float: left; display: inline-block; vertical-align: middle; width: 16px; - font: normal 21px/1 'dashicons'; + font: normal 21px/1 dashicons; speak: none; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } -input[type=checkbox]:checked:before { - content: '\f147'; +input[type="checkbox"]:checked:before { + content: "\f147"; margin: -3px 0 0 -4px; color: #1e8cbe; } -input[type=radio]:checked:before { - content: '\2022'; +input[type="radio"]:checked:before { + content: "\2022"; text-indent: -9999px; -webkit-border-radius: 50px; border-radius: 50px; @@ -106,13 +158,9 @@ input[type=radio]:checked:before { background-color: #1e8cbe; } -input.readonly, textarea.readonly { - background-color: #ddd; -} - @-moz-document url-prefix() { - input[type=checkbox], - input[type=radio], + input[type="checkbox"], + input[type="radio"], .form-table input.tog { margin-bottom: -1px; } @@ -145,7 +193,6 @@ input, select { font-size: 14px; padding: 3px 5px; - line-height: 15px; -webkit-border-radius: 0; border-radius: 0; /* Reset mobile webkit's default element styling */ } @@ -154,17 +201,7 @@ textarea { overflow: auto; padding: 2px 6px; line-height: 1.4; -} - -input[type="text"], -input[type="password"], -input[type="number"], -input[type="search"], -input[type="email"], -input[type="url"], -textarea, -select { - outline: 0; + resize: vertical; } .wp-admin input[type="file"] { @@ -190,60 +227,52 @@ textarea.code { padding: 4px 6px 1px 6px; } -textarea, -input[type="text"], -input[type="password"], -input[type="email"], -input[type="number"], -input[type="search"], -input[type="tel"], -input[type="url"], -select { - border: 1px solid #ddd; - -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.07); - box-shadow: inset 0 1px 2px rgba(0,0,0,0.07); - background-color: #fff; - color: #333; - -webkit-transition: .05s border-color ease-in-out; - transition: .05s border-color ease-in-out; +input.readonly, +input[readonly], +textarea.readonly, +textarea[readonly] { + background-color: #eee; } -select[disabled] { - color: #7f7f7f; +::-webkit-input-placeholder { + color: #72777c; } -textarea:focus, -input[type="text"]:focus, -input[type="password"]:focus, -input[type="email"]:focus, -input[type="number"]:focus, -input[type="search"]:focus, -input[type="tel"]:focus, -input[type="url"]:focus, -input[type="checkbox"]:focus, -input[type="radio"]:focus, -select:focus { - border-color: #5b9dd9; - -webkit-box-shadow: 0 0 2px rgba(30,140,190,0.8); - box-shadow: 0 0 2px rgba(30,140,190,0.8); +::-moz-placeholder { + color: #72777c; + opacity: 1; } -input[readonly] { - background-color: #eee; +:-ms-input-placeholder { + color: #72777c; } -:-moz-placeholder, -.wp-core-ui :-moz-placeholder { - color: #a9a9a9; +.form-invalid input, .form-invalid input:focus, +.form-invalid select, .form-invalid select:focus { + border-color: #dc3232 !important; + -webkit-box-shadow: 0 0 2px rgba( 204, 0, 0, 0.8 ); + box-shadow: 0 0 2px rgba( 204, 0, 0, 0.8 ); } -.form-invalid { - background-color: #ffebe8 !important; +.form-table .form-required.form-invalid td:after { + content: "\f534"; + font: normal 20px/1 dashicons; + color: #dc3232; + margin-left: -25px; + vertical-align: middle; } -.form-invalid input, -.form-invalid select { - border-color: #c00 !important; +/* Adjust error indicator for password layout */ +.form-table .form-required.user-pass1-wrap.form-invalid td:after { + content: ''; +} + +.form-table .form-required.user-pass1-wrap.form-invalid .password-input-wrapper:after { + content: '\f534'; + font: normal 20px/1 dashicons; + color: #dc3232; + margin: 0 6px 0 -29px; + vertical-align: middle; } .form-input-tip { @@ -252,19 +281,34 @@ input[readonly] { input:disabled, input.disabled, +select:disabled, +select.disabled, textarea:disabled, textarea.disabled { - -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.04); - box-shadow: inset 0 1px 2px rgba(0,0,0,0.04); - border-color: rgba(222, 222, 222, .75); - background: rgba(255, 255, 255, .5); - color: rgba(51, 51, 51, .5); -} - -input[type=checkbox]:disabled, -input[type=radio]:disabled, -input[type=checkbox]:disabled:checked:before, -input[type=radio]:disabled:checked:before { + background: rgba( 255, 255, 255, 0.5 ); + border-color: rgba( 222, 222, 222, 0.75 ); + -webkit-box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.04 ); + box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.04 ); + color: rgba( 51, 51, 51, 0.5 ); +} + +input[type="file"]:disabled, +input[type="file"].disabled, +input[type="range"]:disabled, +input[type="range"].disabled { + background: none; + -webkit-box-shadow: none; + box-shadow: none; +} + +input[type="checkbox"]:disabled, +input[type="checkbox"].disabled, +input[type="radio"]:disabled, +input[type="radio"].disabled, +input[type="checkbox"]:disabled:checked:before, +input[type="checkbox"].disabled:checked:before, +input[type="radio"]:disabled:checked:before, +input[type="radio"].disabled:checked:before { opacity: 0.7; } @@ -342,8 +386,7 @@ textarea.large-text { width: 99%; } -input.regular-text, -#adduser .form-field input { +input.regular-text { width: 25em; } @@ -356,6 +399,14 @@ input[type="number"].small-text { width: 65px; } +input.tiny-text { + width: 35px; +} + +input[type="number"].tiny-text { + width: 45px; +} + #doaction, #doaction2, #post-query-submit { @@ -364,7 +415,8 @@ input[type="number"].small-text { .tablenav #changeit, .tablenav #delete_all, -.tablenav #clear-recent-list { +.tablenav #clear-recent-list, +.wp-filter #delete_all { margin-top: 1px; } @@ -386,8 +438,9 @@ input[type="number"].small-text { margin-left: 1em; } -#upload-form label { - color: #777; +button.wp-hide-pw > .dashicons { + position: relative; + top: 3px; } label, @@ -406,9 +459,9 @@ fieldset label, } #misc-publishing-actions label[for="post_status"]:before { - content: '\f173'; + content: "\f173"; display: inline-block; - font: normal 20px/1 'dashicons'; + font: normal 20px/1 dashicons; speak: none; left: -1px; padding: 0 5px 0 0; @@ -423,38 +476,79 @@ fieldset label, #pass-strength-result { background-color: #eee; border: 1px solid #ddd; - float: left; - margin: 13px 5px 5px 1px; + color: #23282d; + margin: -2px 5px 5px 1px; padding: 3px 5px; text-align: center; - width: 200px; - display: none; + width: 25em; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + opacity: 0; } #pass-strength-result.short { - background-color: #ffa0a0; - border-color: #f04040; + background-color: #f1adad; + border-color: #e35b5b; + opacity: 1; } #pass-strength-result.bad { - background-color: #ffb78c; - border-color: #ff853c; + background-color: #fbc5a9; + border-color: #f78b53; + opacity: 1; } #pass-strength-result.good { - background-color: #ffec8b; - border-color: #fc0; + background-color: #ffe399; + border-color: #ffc733; + opacity: 1; } #pass-strength-result.strong { - background-color: #c3ff88; - border-color: #8dff1c; + background-color: #c1e1b9; + border-color: #83c373; + opacity: 1; +} + +#pass1.short, #pass1-text.short { + border-color: #e35b5b; +} + +#pass1.bad, #pass1-text.bad { + border-color: #f78b53; +} + +#pass1.good, #pass1-text.good { + border-color: #ffc733; +} + +#pass1.strong, #pass1-text.strong { + border-color: #83c373; +} + +.pw-weak { + display:none; } .indicator-hint { padding-top: 8px; } +#pass1-text, +.show-password #pass1 { + display: none; +} + +.show-password #pass1-text +{ + display: inline-block; +} + +.form-table span.description.important { + font-size: 12px; +} + p.search-box { float: right; margin: 0; @@ -465,27 +559,27 @@ p.search-box { } .search-box input[name="s"], -#search-plugins input[name="s"], +.tablenav .search-plugins input[name="s"], .tagsdiv .newtag { float: left; height: 28px; margin: 0 4px 0 0; } -input[type="text"].ui-autocomplete-loading { - background: transparent url(../images/loading.gif) no-repeat right center; +input[type="text"].ui-autocomplete-loading, +input[type="email"].ui-autocomplete-loading { + background-image: url(../images/loading.gif); + background-repeat: no-repeat; + background-position: right center; visibility: visible; } -ul#add-to-blog-users { - margin: 0 0 0 14px; +input.ui-autocomplete-input.open { + border-bottom-color: transparent; } -.ui-autocomplete-input.open { - -webkit-border-bottom-right-radius: 0; - border-bottom-right-radius: 0; - -webkit-border-bottom-left-radius: 0; - border-bottom-left-radius: 0; +ul#add-to-blog-users { + margin: 0 0 0 14px; } .ui-autocomplete { @@ -494,28 +588,20 @@ ul#add-to-blog-users { list-style: none; position: absolute; z-index: 10000; - -webkit-border-bottom-right-radius: 3px; - border-bottom-right-radius: 3px; - -webkit-border-bottom-left-radius: 3px; - border-bottom-left-radius: 3px; - border: 1px solid #aaa; - background-color: #efefef; + border: 1px solid #5b9dd9; + -webkit-box-shadow: 0 1px 2px rgba( 30, 140, 190, 0.8 ); + box-shadow: 0 1px 2px rgba( 30, 140, 190, 0.8 ); + background-color: #fff; } .ui-autocomplete li { margin-bottom: 0; + padding: 4px 10px; white-space: nowrap; text-align: left; } -.ui-autocomplete li a { - display: block; - height: 100%; - padding: 4px 10px; - color: #444; -} - -.ui-autocomplete li a.ui-state-focus { +.ui-autocomplete li.ui-state-focus { background-color: #ddd; cursor: pointer; } @@ -548,7 +634,7 @@ ul#add-to-blog-users { .form-table th, .form-wrap label { - color: #222; + color: #23282d; font-weight: normal; text-shadow: none; vertical-align: baseline; @@ -573,6 +659,14 @@ ul#add-to-blog-users { margin-bottom: 0; } +.form-table .date-time-doc { + margin-top: 1em; +} + +.form-table p.timezone-info { + margin: 1em 0; +} + .form-table td fieldset label { margin: 0.25em 0 0.5em !important; display: inline-block; @@ -585,7 +679,7 @@ ul#add-to-blog-users { } .form-table input.tog, -.form-table input[type=radio] { +.form-table input[type="radio"] { margin-top: -4px; margin-right: 4px; float: none; @@ -600,6 +694,11 @@ table.form-table td .updated { font-size: 13px; } +table.form-table td .updated p { + font-size: 13px; + margin: 0.3em 0; +} + /*------------------------------------------------------------------------------ 18.0 - Users ------------------------------------------------------------------------------*/ @@ -621,6 +720,7 @@ table.form-table td .updated { width: 15em; } +#adduser .form-field input, #createuser .form-field input { width: 25em; } @@ -666,33 +766,93 @@ table.form-table td .updated { line-height: 24px; } -.pressthis { - margin: 20px 0; +.label-responsive { + vertical-align: middle; } -.pressthis a, -.pressthis a:hover, -.pressthis a:focus, -.pressthis a:active { +#export-filters p { + margin: 0 0 1em; +} + +#export-filters p.submit { + margin: 7px 0 5px; +} + +/* Card styles */ + +.card { + position: relative; + margin-top: 20px; + padding: 0.7em 2em 1em; + min-width: 255px; + max-width: 520px; + border: 1px solid #e5e5e5; + -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04); + box-shadow: 0 1px 1px rgba(0,0,0,0.04); + background: #fff; +} + +/* Press this styles */ + +.pressthis h4 { + margin: 2em 0 1em; +} + +.pressthis textarea { + width: 100%; + font-size: 1em; +} + +#pressthis-code-wrap { + overflow: auto; +} + +.pressthis-bookmarklet-wrapper { + margin: 20px 0 8px; + vertical-align: top; + position: relative; + z-index: 1; +} + +.pressthis-bookmarklet, +.pressthis-bookmarklet:hover, +.pressthis-bookmarklet:focus, +.pressthis-bookmarklet:active { display: inline-block; position: relative; cursor: move; - color: #333; - background: #e6e6e6; + color: #32373c; + background: #e5e5e5; -webkit-border-radius: 5px; border-radius: 5px; - border: 1px solid #b4b4b4; + border: 1px solid #b4b9be; font-style: normal; line-height: 16px; font-size: 14px; text-decoration: none; } -.pressthis a:active { +.pressthis-bookmarklet:active { outline: none; } -.pressthis a:hover:after { +.pressthis-bookmarklet:after { + content: ""; + width: 70%; + height: 55%; + z-index: -1; + position: absolute; + right: 10px; + bottom: 9px; + background: transparent; + -webkit-transform: skew(20deg) rotate(6deg); + -ms-transform: skew(20deg) rotate(6deg); + transform: skew(20deg) rotate(6deg); + -webkit-box-shadow: 0 10px 8px rgba(0, 0, 0, 0.6); + box-shadow: 0 10px 8px rgba(0, 0, 0, 0.6); +} + +.pressthis-bookmarklet:hover:after { -webkit-transform: skew(20deg) rotate(9deg); -ms-transform: skew(20deg) rotate(9deg); transform: skew(20deg) rotate(9deg); @@ -700,45 +860,48 @@ table.form-table td .updated { box-shadow: 0 10px 8px rgba(0, 0, 0, 0.7); } -.pressthis a span { +.pressthis-bookmarklet span { display: inline-block; margin: 0px 0 0; padding: 0px 12px 8px 9px; } -.pressthis a span:before { - color: #777; - font: normal 20px/1 'dashicons'; - content:'\f157'; +.pressthis-bookmarklet span:before { + color: #72777c; + font: normal 20px/1 dashicons; + content: "\f157"; position: relative; display: inline-block; top: 4px; margin-right: 4px; } -.pressthis a:after { - content: ''; - width: 70%; - height: 55%; - z-index: -1; - position: absolute; - right: 10px; - bottom: 9px; - background: transparent; - -webkit-transform: skew(20deg) rotate(6deg); - -ms-transform: skew(20deg) rotate(6deg); - transform: skew(20deg) rotate(6deg); - -webkit-box-shadow: 0 10px 8px rgba(0, 0, 0, 0.6); - box-shadow: 0 10px 8px rgba(0, 0, 0, 0.6); +.pressthis-js-toggle { + margin-left: 10px; + padding: 0; + height: auto; + vertical-align: top; +} + +/* to override the button class being applied */ +.pressthis-js-toggle.button.button { + margin-left: 10px; + padding: 0; + height: auto; + vertical-align: top; +} + +.pressthis-js-toggle .dashicons { + margin: 5px 8px 6px 7px; + color: #555d66; } /*------------------------------------------------------------------------------ 20.0 - Settings ------------------------------------------------------------------------------*/ -#utc-time, #local-time { - padding-left: 25px; - font-style: italic; +.timezone-info code { + white-space: nowrap; } .defaultavatarpicker .avatar { @@ -746,11 +909,141 @@ table.form-table td .updated { vertical-align: middle; } +.options-general-php .date-time-text { + display: inline-block; + min-width: 10em; +} + +.options-general-php input.small-text { + width: 56px; +} + .options-general-php .spinner { float: none; - margin: -3px 3px; + margin: 0 3px; +} + +.settings-php .language-install-spinner, +.options-general-php .language-install-spinner { + display: inline-block; + float: none; + margin: -3px 5px 0; + vertical-align: middle; +} + +/*------------------------------------------------------------------------------ + 21.0 - Network Admin +------------------------------------------------------------------------------*/ + +.setup-php textarea { + max-width: 100%; } +.form-field #site-address { + max-width: 25em; +} + +.form-field #domain { + max-width: 22em; +} + +.form-field #site-title, +.form-field #admin-email, +.form-field #path, +.form-field #blog_registered, +.form-field #blog_last_updated { + max-width: 25em; +} + +.form-field #path { + margin-bottom: 5px; +} + +#search-users, +#search-sites { + max-width: 100%; +} + +/*------------------------------------------------------------------------------ + Credentials check dialog for Install and Updates +------------------------------------------------------------------------------*/ + +.request-filesystem-credentials-dialog { + display: none; +} + +.request-filesystem-credentials-dialog .notification-dialog { + top: 15%; + max-height: 85%; +} + +.request-filesystem-credentials-dialog-content { + margin: 25px; +} + +#request-filesystem-credentials-title { + font-size: 1.3em; + margin: 1em 0; +} + +.request-filesystem-credentials-form legend { + font-size: 1em; + padding: 1.33em 0; + font-weight: 600; +} + +.request-filesystem-credentials-form input[type="text"], +.request-filesystem-credentials-form input[type="password"] { + display: block; +} + +.request-filesystem-credentials-dialog input[type="text"], +.request-filesystem-credentials-dialog input[type="password"] { + width: 100%; +} + +.request-filesystem-credentials-form .field-title { + font-weight: 600; +} + +.request-filesystem-credentials-dialog label[for="hostname"], +.request-filesystem-credentials-dialog label[for="public_key"], +.request-filesystem-credentials-dialog label[for="private_key"] { + display: block; + margin-bottom: 1em; +} + +.request-filesystem-credentials-dialog .ftp-username, +.request-filesystem-credentials-dialog .ftp-password { + float: left; + width: 48%; +} + +.request-filesystem-credentials-dialog .ftp-password { + margin-left: 4%; +} + +.request-filesystem-credentials-dialog .request-filesystem-credentials-action-buttons { + text-align: right; +} + +.request-filesystem-credentials-dialog label[for="ftp"] { + margin-right: 10px; +} + +#request-filesystem-credentials-dialog .button:not(:last-child) { + margin-right: 10px; +} + +#request-filesystem-credentials-form .cancel-button { + display: none; +} + +#request-filesystem-credentials-dialog .cancel-button { + display: inline; +} + + /* =Media Queries -------------------------------------------------------------- */ @@ -760,43 +1053,58 @@ table.form-table td .updated { -webkit-appearance: none; } - input[type=text], input[type=search], - input[type=password], input[type=number] { + input[type="text"], + input[type="email"], + input[type="search"], + input[type="password"], + input[type="number"] { -webkit-appearance: none; padding: 6px 10px; } + input[type="number"] { + height: 40px; + } + input.code { padding-bottom: 5px; padding-top: 10px; } - input[type=checkbox], .widefat th input[type=checkbox] { + input[type="checkbox"], + .widefat th input[type="checkbox"], + .widefat thead td input[type="checkbox"], + .widefat tfoot td input[type="checkbox"] { -webkit-appearance: none; padding: 10px; } - .widefat th input[type=checkbox] { + .widefat th input[type="checkbox"], + .widefat thead td input[type="checkbox"], + .widefat tfoot td input[type="checkbox"] { margin-bottom: 8px; } - input[type=checkbox]:checked:before, .widefat th input[type=checkbox]:before { - font: normal 30px/1 'Dashicons'; + input[type="checkbox"]:checked:before, + .widefat th input[type="checkbox"]:before, + .widefat thead td input[type="checkbox"]:before, + .widefat tfoot td input[type="checkbox"]:before { + font: normal 30px/1 dashicons; margin: -3px -5px; } - input[type=radio], - input[type=checkbox] { + input[type="radio"], + input[type="checkbox"] { height: 25px; width: 25px; } - .wp-admin p input[type=checkbox], - .wp-admin p input[type=radio] { + .wp-admin p input[type="checkbox"], + .wp-admin p input[type="radio"] { margin-top: -3px; } - input[type=radio]:checked:before { + input[type="radio"]:checked:before { vertical-align: middle; width: 9px; height: 9px; @@ -804,7 +1112,7 @@ table.form-table td .updated { line-height: 16px; } - .wp-upload-form input[type=submit] { + .wp-upload-form input[type="submit"] { margin-top: 10px; } @@ -818,6 +1126,7 @@ table.form-table td .updated { font-size: 14px; } + #adduser .form-field input, #createuser .form-field input { width: 100%; } @@ -829,12 +1138,21 @@ table.form-table td .updated { } .form-table th, - .form-table td { + .form-table td, + .label-responsive { display: block; width: auto; vertical-align: middle; } + .label-responsive { + margin: 0.5em 0; + } + + .export-filters li { + margin-bottom: 0; + } + .form-table .color-palette td { display: table-cell; width: 15px; @@ -850,6 +1168,7 @@ table.form-table td .updated { } .form-table td input[type="text"], + .form-table td input[type="email"], .form-table td input[type="password"], .form-table td select, .form-table td textarea, @@ -866,12 +1185,21 @@ table.form-table td .updated { box-sizing: border-box; } - input[type=text].small-text, - input[type=search].small-text, - input[type=password].small-text, - input[type=number].small-text, + .form-table .form-required.form-invalid td:after { + float: right; + margin: -30px 3px 0 0; + } + + #wpbody .form-table td select { + height: 40px; + } + + input[type="text"].small-text, + input[type="search"].small-text, + input[type="password"].small-text, + input[type="number"].small-text, input[type="number"].small-text, - .form-table input[type=text].small-text { + .form-table input[type="text"].small-text { width: auto; max-width: 55px; display: inline; @@ -910,8 +1238,10 @@ table.form-table td .updated { } .form-table span.description { + display: inline; padding: 4px 0 0; line-height: 1.4em; + font-size: 14px; } .form-table th { @@ -921,10 +1251,22 @@ table.form-table td .updated { } .form-table td { - padding-top: 8px; + margin-bottom: 0; + padding-bottom: 6px; + padding-top: 4px; padding-left: 0; } + .form-table.permalink-structure td code { + margin-left: 32px; + } + + .form-table.permalink-structure td input[type="text"] { + margin-left: 32px; + margin-top: 4px; + width: 96%; + } + .form-table input.regular-text { width: 100%; } @@ -937,21 +1279,61 @@ table.form-table td .updated { display: block; } - #utc-time { - margin-top: 10px; - } - #utc-time, #local-time { display: block; float: none; - padding: 0; + margin-top: 0.5em; + } + + .form-field #domain { + max-width: none; + } + + /* New Password */ + .wp-pwd { + position: relative; + } + + .wp-pwd [type="text"], + .wp-pwd [type="password"] { + padding-right: 40px; + } + + .wp-pwd button.button { + background: transparent; + border: none; + -webkit-box-shadow: none; + box-shadow: none; line-height: 2; + margin: 0; + padding: 5px 10px; + position: absolute; + right: 0; + top: 0; + } + + .wp-pwd button.button:hover, + .wp-pwd button.button:focus, + .wp-pwd button.button:active { + background: transparent; + } + + .wp-pwd .button .text { + display: none; + } + + .options-general-php input[type="text"].small-text { + max-width: 60px; + margin: 0; } } @media only screen and (max-width: 768px) { - .form-field input, + .form-field input[type="text"], + .form-field input[type="email"], + .form-field input[type="password"], + .form-field select, .form-field textarea { width: 99%; } @@ -967,6 +1349,19 @@ table.form-table td .updated { } } +@media only screen and (max-height: 480px) { + /* Request Credentials */ + .request-filesystem-credentials-dialog .notification-dialog{ + width: 100%; + height: 100%; + max-height: 100%; + position: fixed; + top: 0; + margin: 0; + left: 0; + } +} + /* Smartphone */ @media screen and (max-width: 600px) { /* Color Picker Options */ @@ -975,3 +1370,9 @@ table.form-table td .updated { } } +@media only screen and (max-width: 320px) { + .options-general-php .date-time-text.date-time-custom-text { + min-width: 0; + margin-right: 0.5em; + } +} diff --git a/wp-admin/css/forms.min.css b/wp-admin/css/forms.min.css new file mode 100644 index 0000000..2b3b0f6 --- /dev/null +++ b/wp-admin/css/forms.min.css @@ -0,0 +1 @@ +#pass-strength-result,input,textarea{-webkit-box-sizing:border-box;-moz-box-sizing:border-box}.meta-box-sortables select,p.submit{max-width:100%}#your-profile label+a,.wp-admin select,fieldset label,label{vertical-align:middle}#pressthis-code-wrap,textarea{overflow:auto}input,textarea{box-sizing:border-box}input[type=text],input[type=search],input[type=radio],input[type=tel],input[type=time],input[type=url],input[type=week],input[type=password],input[type=checkbox],input[type=color],input[type=date],input[type=datetime],input[type=datetime-local],input[type=email],input[type=month],input[type=number],select,textarea{border:1px solid #ddd;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.07);box-shadow:inset 0 1px 2px rgba(0,0,0,.07);background-color:#fff;color:#32373c;outline:0;-webkit-transition:50ms border-color ease-in-out;transition:50ms border-color ease-in-out}input[type=text]:focus,input[type=search]:focus,input[type=radio]:focus,input[type=tel]:focus,input[type=time]:focus,input[type=url]:focus,input[type=week]:focus,input[type=password]:focus,input[type=checkbox]:focus,input[type=color]:focus,input[type=date]:focus,input[type=datetime]:focus,input[type=datetime-local]:focus,input[type=email]:focus,input[type=month]:focus,input[type=number]:focus,select:focus,textarea:focus{border-color:#5b9dd9;-webkit-box-shadow:0 0 2px rgba(30,140,190,.8);box-shadow:0 0 2px rgba(30,140,190,.8)}input[type=url],input[type=email]{direction:ltr}input[type=number]{height:28px;line-height:inherit}input[type=radio],input[type=checkbox]{border:1px solid #b4b9be;background:#fff;color:#555;clear:none;cursor:pointer;display:inline-block;line-height:0;height:16px;margin:-4px 4px 0 0;outline:0;padding:0!important;text-align:center;vertical-align:middle;width:16px;min-width:16px;-webkit-appearance:none;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1);-webkit-transition:.05s border-color ease-in-out;transition:.05s border-color ease-in-out}input[type=radio]:checked+label:before{color:#82878c}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#00a0d2}.wp-admin p input[type=radio],.wp-admin p input[type=checkbox],td>input[type=checkbox]{margin-top:0}.wp-admin p label input[type=checkbox]{margin-top:-4px}.wp-admin p label input[type=radio]{margin-top:-2px}input[type=radio]{-webkit-border-radius:50%;border-radius:50%;margin-right:4px;line-height:10px}input[type=radio]:checked:before,input[type=checkbox]:checked:before{float:left;display:inline-block;vertical-align:middle;width:16px;font:400 21px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}input[type=checkbox]:checked:before{content:"\f147";margin:-3px 0 0 -4px;color:#1e8cbe}input[type=radio]:checked:before{content:"\2022";text-indent:-9999px;-webkit-border-radius:50px;border-radius:50px;font-size:24px;width:6px;height:6px;margin:4px;line-height:16px;background-color:#1e8cbe}@-moz-document url-prefix(){.form-table input.tog,input[type=radio],input[type=checkbox]{margin-bottom:-1px}}input[type=search]{-webkit-appearance:textfield}input[type=search]::-webkit-search-decoration{display:none}.ie8 input[type=password]{font-family:sans-serif}button,input,select,textarea{font-family:inherit;font-size:inherit;font-weight:inherit}input,select,textarea{font-size:14px;-webkit-border-radius:0;border-radius:0}textarea{padding:2px 6px;line-height:1.4;resize:vertical}.wp-admin input[type=file]{padding:3px 0}label{cursor:pointer}input,select{margin:1px;padding:3px 5px}input.code{padding-top:6px}textarea.code{line-height:1.4;padding:4px 6px 1px}input.readonly,input[readonly],textarea.readonly,textarea[readonly]{background-color:#eee}::-webkit-input-placeholder{color:#72777c}::-moz-placeholder{color:#72777c;opacity:1}:-ms-input-placeholder{color:#72777c}.form-invalid input,.form-invalid input:focus,.form-invalid select,.form-invalid select:focus{border-color:#dc3232!important;-webkit-box-shadow:0 0 2px rgba(204,0,0,.8);box-shadow:0 0 2px rgba(204,0,0,.8)}.form-table .form-required.form-invalid td:after{content:"\f534";font:400 20px/1 dashicons;color:#dc3232;margin-left:-25px;vertical-align:middle}.form-table .form-required.user-pass1-wrap.form-invalid td:after{content:''}.form-table .form-required.user-pass1-wrap.form-invalid .password-input-wrapper:after{content:'\f534';font:400 20px/1 dashicons;color:#dc3232;margin:0 6px 0 -29px;vertical-align:middle}.form-input-tip{color:#666}input.disabled,input:disabled,select.disabled,select:disabled,textarea.disabled,textarea:disabled{background:rgba(255,255,255,.5);border-color:rgba(222,222,222,.75);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.04);box-shadow:inset 0 1px 2px rgba(0,0,0,.04);color:rgba(51,51,51,.5)}input[type=file].disabled,input[type=file]:disabled,input[type=range].disabled,input[type=range]:disabled{background:0 0;-webkit-box-shadow:none;box-shadow:none}input[type=radio].disabled,input[type=radio].disabled:checked:before,input[type=radio]:disabled,input[type=radio]:disabled:checked:before,input[type=checkbox].disabled,input[type=checkbox].disabled:checked:before,input[type=checkbox]:disabled,input[type=checkbox]:disabled:checked:before{opacity:.7}.wp-admin select{padding:2px;line-height:28px;height:28px}.wp-admin .button-cancel{padding:0 5px;line-height:2}.wp-admin select[multiple]{height:auto}.submit{padding:1.5em 0;margin:5px 0;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;border:none}form p.submit a.cancel:hover{text-decoration:none}p.submit{text-align:left;margin-top:20px;padding-top:10px}.textright p.submit{border:none;text-align:right}table.form-table+input+input+p.submit,table.form-table+input+p.submit,table.form-table+p.submit{border-top:none;padding-top:0}#major-publishing-actions input,#minor-publishing-actions .preview,#minor-publishing-actions input{text-align:center}input.all-options,textarea.all-options{width:250px}input.large-text,textarea.large-text{width:99%}input.regular-text{width:25em}input.small-text{width:50px;padding:1px 6px}input[type=number].small-text{width:65px}input.tiny-text{width:35px}input[type=number].tiny-text{width:45px}#doaction,#doaction2,#post-query-submit{margin:1px 8px 0 0}.tablenav #changeit,.tablenav #clear-recent-list,.tablenav #delete_all,.wp-filter #delete_all{margin-top:1px}.tablenav .actions select{float:left;margin-right:6px;max-width:200px}.ie8 .tablenav .actions select{width:155px}.ie8 .tablenav .actions select#cat{width:200px}#timezone_string option{margin-left:1em}button.wp-hide-pw>.dashicons{position:relative;top:3px}#misc-publishing-actions label,.options-media-php label[for*="_size_"]{vertical-align:baseline}#misc-publishing-actions label[for=post_status]:before{content:"\f173";display:inline-block;font:400 20px/1 dashicons;speak:none;left:-1px;padding:0 5px 0 0;position:relative;top:0;text-decoration:none!important;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#pass1-text,.pw-weak,.show-password #pass1{display:none}#pass-strength-result{background-color:#eee;border:1px solid #ddd;color:#23282d;margin:-2px 5px 5px 1px;padding:3px 5px;text-align:center;width:25em;box-sizing:border-box;opacity:0}#pass-strength-result.short{background-color:#f1adad;border-color:#e35b5b;opacity:1}#pass-strength-result.bad{background-color:#fbc5a9;border-color:#f78b53;opacity:1}#pass-strength-result.good{background-color:#ffe399;border-color:#ffc733;opacity:1}#pass-strength-result.strong{background-color:#c1e1b9;border-color:#83c373;opacity:1}#pass1-text.short,#pass1.short{border-color:#e35b5b}#pass1-text.bad,#pass1.bad{border-color:#f78b53}#pass1-text.good,#pass1.good{border-color:#ffc733}#pass1-text.strong,#pass1.strong{border-color:#83c373}.indicator-hint{padding-top:8px}.show-password #pass1-text{display:inline-block}.form-table span.description.important{font-size:12px}p.search-box{float:right;margin:0}.network-admin.themes-php p.search-box{clear:left}.search-box input[name="s"],.tablenav .search-plugins input[name="s"],.tagsdiv .newtag{float:left;height:28px;margin:0 4px 0 0}input[type=text].ui-autocomplete-loading,input[type=email].ui-autocomplete-loading{background-image:url(../images/loading.gif);background-repeat:no-repeat;background-position:right center;visibility:visible}input.ui-autocomplete-input.open{border-bottom-color:transparent}ul#add-to-blog-users{margin:0 0 0 14px}.ui-autocomplete{padding:0;margin:0;list-style:none;position:absolute;z-index:10000;border:1px solid #5b9dd9;-webkit-box-shadow:0 1px 2px rgba(30,140,190,.8);box-shadow:0 1px 2px rgba(30,140,190,.8);background-color:#fff}.ui-autocomplete li{margin-bottom:0;padding:4px 10px;white-space:nowrap;text-align:left}.ui-autocomplete li.ui-state-focus{background-color:#ddd;cursor:pointer}.form-table{border-collapse:collapse;margin-top:.5em;width:100%;clear:both}.form-table,.form-table td,.form-table td p,.form-table th,.form-wrap label{font-size:14px}.form-table td{margin-bottom:9px;padding:15px 10px;line-height:1.3;vertical-align:middle}.form-table th,.form-wrap label{color:#23282d;font-weight:400;text-shadow:none;vertical-align:baseline}.form-table th{vertical-align:top;text-align:left;padding:20px 10px 20px 0;width:200px;line-height:1.3;font-weight:600}.form-table th.th-full{width:auto;font-weight:400}.form-table td p{margin-top:4px;margin-bottom:0}.form-table .date-time-doc{margin-top:1em}.form-table p.timezone-info{margin:1em 0}.form-table td fieldset label{margin:.25em 0 .5em!important;display:inline-block}.form-table td fieldset label,.form-table td fieldset li,.form-table td fieldset p{line-height:1.4em}.form-table input.tog,.form-table input[type=radio]{margin-top:-4px;margin-right:4px;float:none}.form-table .pre{padding:8px;margin:0}table.form-table td .updated{font-size:13px}table.form-table td .updated p{font-size:13px;margin:.3em 0}#profile-page .form-table textarea{width:500px;margin-bottom:6px}#profile-page .form-table #rich_editing{margin-right:5px}#your-profile legend{font-size:22px}#display_name{width:15em}#adduser .form-field input,#createuser .form-field input{width:25em}.color-option{display:inline-block;width:24%;padding:5px 15px 15px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin-bottom:3px;cursor:pointer}.color-option.selected,.color-option:hover{background:#ddd}.color-palette{width:100%;border-spacing:0;border-collapse:collapse}.color-palette td{height:20px;padding:0;border:none}.tool-box .title{margin:8px 0;font-size:18px;font-weight:400;line-height:24px}.label-responsive{vertical-align:middle}#export-filters p{margin:0 0 1em}#export-filters p.submit{margin:7px 0 5px}.card{position:relative;margin-top:20px;padding:.7em 2em 1em;min-width:255px;max-width:520px;border:1px solid #e5e5e5;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04);background:#fff}.pressthis h4{margin:2em 0 1em}.pressthis textarea{width:100%;font-size:1em}.pressthis-bookmarklet-wrapper{margin:20px 0 8px;vertical-align:top;position:relative;z-index:1}.pressthis-bookmarklet,.pressthis-bookmarklet:active,.pressthis-bookmarklet:focus,.pressthis-bookmarklet:hover{display:inline-block;position:relative;cursor:move;color:#32373c;background:#e5e5e5;-webkit-border-radius:5px;border-radius:5px;border:1px solid #b4b9be;font-style:normal;line-height:16px;font-size:14px;text-decoration:none}.pressthis-bookmarklet:active{outline:0}.pressthis-bookmarklet:after{content:"";width:70%;height:55%;z-index:-1;position:absolute;right:10px;bottom:9px;background:0 0;-webkit-transform:skew(20deg) rotate(6deg);-ms-transform:skew(20deg) rotate(6deg);transform:skew(20deg) rotate(6deg);-webkit-box-shadow:0 10px 8px rgba(0,0,0,.6);box-shadow:0 10px 8px rgba(0,0,0,.6)}.pressthis-bookmarklet:hover:after{-webkit-transform:skew(20deg) rotate(9deg);-ms-transform:skew(20deg) rotate(9deg);transform:skew(20deg) rotate(9deg);-webkit-box-shadow:0 10px 8px rgba(0,0,0,.7);box-shadow:0 10px 8px rgba(0,0,0,.7)}.pressthis-bookmarklet span{display:inline-block;margin:0;padding:0 12px 8px 9px}.pressthis-bookmarklet span:before{color:#72777c;font:400 20px/1 dashicons;content:"\f157";position:relative;display:inline-block;top:4px;margin-right:4px}.pressthis-js-toggle,.pressthis-js-toggle.button.button{margin-left:10px;padding:0;height:auto;vertical-align:top}.pressthis-js-toggle .dashicons{margin:5px 8px 6px 7px;color:#555d66}.timezone-info code{white-space:nowrap}.defaultavatarpicker .avatar{margin:2px 0;vertical-align:middle}.options-general-php .date-time-text{display:inline-block;min-width:10em}.options-general-php input.small-text{width:56px}.options-general-php .spinner{float:none;margin:0 3px}.options-general-php .language-install-spinner,.settings-php .language-install-spinner{display:inline-block;float:none;margin:-3px 5px 0;vertical-align:middle}.setup-php textarea{max-width:100%}.form-field #site-address{max-width:25em}.form-field #domain{max-width:22em}.form-field #admin-email,.form-field #blog_last_updated,.form-field #blog_registered,.form-field #path,.form-field #site-title{max-width:25em}.form-field #path{margin-bottom:5px}#search-sites,#search-users{max-width:100%}.request-filesystem-credentials-dialog{display:none}.request-filesystem-credentials-dialog .notification-dialog{top:15%;max-height:85%}.request-filesystem-credentials-dialog-content{margin:25px}#request-filesystem-credentials-title{font-size:1.3em;margin:1em 0}.request-filesystem-credentials-form legend{font-size:1em;padding:1.33em 0;font-weight:600}.request-filesystem-credentials-form input[type=text],.request-filesystem-credentials-form input[type=password]{display:block}.request-filesystem-credentials-dialog input[type=text],.request-filesystem-credentials-dialog input[type=password]{width:100%}.request-filesystem-credentials-form .field-title{font-weight:600}.request-filesystem-credentials-dialog label[for=hostname],.request-filesystem-credentials-dialog label[for=public_key],.request-filesystem-credentials-dialog label[for=private_key]{display:block;margin-bottom:1em}.request-filesystem-credentials-dialog .ftp-password,.request-filesystem-credentials-dialog .ftp-username{float:left;width:48%}.request-filesystem-credentials-dialog .ftp-password{margin-left:4%}.request-filesystem-credentials-dialog .request-filesystem-credentials-action-buttons{text-align:right}.request-filesystem-credentials-dialog label[for=ftp]{margin-right:10px}#request-filesystem-credentials-dialog .button:not(:last-child){margin-right:10px}#request-filesystem-credentials-form .cancel-button{display:none}#request-filesystem-credentials-dialog .cancel-button{display:inline}@media screen and (max-width:782px){textarea{-webkit-appearance:none}input[type=text],input[type=search],input[type=password],input[type=email],input[type=number]{-webkit-appearance:none;padding:6px 10px}input[type=number]{height:40px}input.code{padding-bottom:5px;padding-top:10px}.widefat tfoot td input[type=checkbox],.widefat th input[type=checkbox],.widefat thead td input[type=checkbox],input[type=checkbox]{-webkit-appearance:none;padding:10px}.widefat tfoot td input[type=checkbox],.widefat th input[type=checkbox],.widefat thead td input[type=checkbox]{margin-bottom:8px}.widefat tfoot td input[type=checkbox]:before,.widefat th input[type=checkbox]:before,.widefat thead td input[type=checkbox]:before,input[type=checkbox]:checked:before{font:400 30px/1 dashicons;margin:-3px -5px}input[type=radio],input[type=checkbox]{height:25px;width:25px}.wp-admin p input[type=radio],.wp-admin p input[type=checkbox]{margin-top:-3px}input[type=radio]:checked:before{vertical-align:middle;width:9px;height:9px;margin:7px;line-height:16px}.wp-upload-form input[type=submit]{margin-top:10px}#wpbody select{height:36px;font-size:16px}.wp-admin .button-cancel{padding:0;font-size:14px}#adduser .form-field input,#createuser .form-field input{width:100%}.form-table{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.form-table td,.form-table th,.label-responsive{display:block;width:auto;vertical-align:middle}.label-responsive{margin:.5em 0}.export-filters li{margin-bottom:0}.form-table .color-palette td{display:table-cell;width:15px}.form-table table.color-palette{margin-right:10px}input,textarea{font-size:16px}#profile-page .form-table textarea,.form-table span.description,.form-table td input[type=text],.form-table td input[type=password],.form-table td input[type=email],.form-table td select,.form-table td textarea{width:100%;font-size:16px;line-height:1.5;padding:7px 10px;display:block;max-width:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.form-table .form-required.form-invalid td:after{float:right;margin:-30px 3px 0 0}#wpbody .form-table td select{height:40px}.form-table input[type=text].small-text,input[type=text].small-text,input[type=search].small-text,input[type=password].small-text,input[type=number].small-text{width:auto;max-width:55px;display:inline;padding:3px 6px;margin:0 3px}#pass-strength-result{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:8px}p.search-box{float:none;position:absolute;bottom:0;width:98%;height:90px;margin-bottom:20px}p.search-box input[name="s"]{height:auto;float:none;width:100%;margin-bottom:10px;vertical-align:middle;-webkit-appearance:none}p.search-box input[type=submit]{margin-bottom:10px}.form-table span.description{display:inline;padding:4px 0 0;line-height:1.4em;font-size:14px}.form-table th{padding-top:10px;padding-bottom:0;border-bottom:0}.form-table td{margin-bottom:0;padding-bottom:6px;padding-top:4px;padding-left:0}.form-table.permalink-structure td code{margin-left:32px}.form-table.permalink-structure td input[type=text]{margin-left:32px;margin-top:4px;width:96%}.form-table input.regular-text{width:100%}.form-table label{font-size:14px}.form-table fieldset label{display:block}#local-time,#utc-time{display:block;float:none;margin-top:.5em}.form-field #domain{max-width:none}.wp-pwd{position:relative}.wp-pwd [type=text],.wp-pwd [type=password]{padding-right:40px}.wp-pwd button.button{background:0 0;border:none;-webkit-box-shadow:none;box-shadow:none;line-height:2;margin:0;padding:5px 10px;position:absolute;right:0;top:0}.wp-pwd button.button:active,.wp-pwd button.button:focus,.wp-pwd button.button:hover{background:0 0}.wp-pwd .button .text{display:none}.options-general-php input[type=text].small-text{max-width:60px;margin:0}}@media only screen and (max-width:768px){.form-field input[type=text],.form-field input[type=password],.form-field input[type=email],.form-field select,.form-field textarea{width:99%}.form-wrap .form-field{padding:0}#profile-page .form-table textarea{max-width:400px;width:auto}}@media only screen and (max-height:480px){.request-filesystem-credentials-dialog .notification-dialog{width:100%;height:100%;max-height:100%;position:fixed;top:0;margin:0;left:0}}@media screen and (max-width:600px){.color-option{width:49%}}@media only screen and (max-width:320px){.options-general-php .date-time-text.date-time-custom-text{min-width:0;margin-right:.5em}} \ No newline at end of file diff --git a/wp-admin/css/ie-rtl.css b/wp-admin/css/ie-rtl.css index 4783f2f..8e922ee 100644 --- a/wp-admin/css/ie-rtl.css +++ b/wp-admin/css/ie-rtl.css @@ -50,19 +50,6 @@ width: 35%; } -.wp-fullscreen-title { - width: 97%; -} - -#wp_mce_fullscreen_ifr { - background-color: #f9f9f9; -} - -#wp-fullscreen-tagline { - color: #888; - font-size: 14px; -} - #adminmenuback { right: 0; background-image: none; @@ -257,10 +244,10 @@ table.fixed td { } #wpbody-content .postbox { - border: 1px solid #dfdfdf; + border: 1px solid #ddd; } -#wpbody-content .postbox h3 { +#wpbody-content .postbox .hndle { margin-bottom: -1px; } @@ -409,15 +396,10 @@ p.search-box { margin: -3px 0 4px; } -#widget-list .widget, -.feature-filter .feature-group li { +#widget-list .widget { display: inline; } -.feature-filter .feature-group li input { - vertical-align: middle; -} - #editorcontainer #content { overflow: auto; margin: auto; @@ -497,12 +479,16 @@ table.ie-fixed { } .widefat tr, -.widefat th { +.widefat th, +.widefat thead td, +.widefat tfoot td { margin-bottom: 0; border-spacing: 0; } -.widefat th input { +.widefat th input, +.widefat thead td input, +.widefat tfoot td input { margin: 0 5px 0 0; } @@ -670,7 +656,7 @@ input[type="password"], } .mce-btn i.mce-i-wp_adv { - background-color: #aaa; + background-color: #a0a5aa; } .mce-btn i.mce-i-help, @@ -684,7 +670,7 @@ input[type="password"], visibility: visible; } -* html div.widget-liquid-right, +* html div.widget-liquid-left, * html div.widget-liquid-right { display: block; position: relative; @@ -701,11 +687,7 @@ input[type="password"], * html .stuffbox, * html .stuffbox input, * html .stuffbox textarea { - border: 1px solid #DFDFDF; -} - -* html .feature-filter .feature-group li { - width: 145px; + border: 1px solid #ddd; } * html div.widget-liquid-left { @@ -739,7 +721,7 @@ input[type="password"], } * html input { - border: 1px solid #dfdfdf; + border: 1px solid #ddd; } * html .edit-box { diff --git a/wp-admin/css/ie-rtl.min.css b/wp-admin/css/ie-rtl.min.css index f8c6f3b..d96fbaa 100644 --- a/wp-admin/css/ie-rtl.min.css +++ b/wp-admin/css/ie-rtl.min.css @@ -1 +1 @@ -#dashboard-widgets form .input-text-wrap input,#dashboard-widgets form .textarea-wrap textarea{width:99%}#dashboard-widgets form #title{width:98%}#wpbody-content #dashboard-widgets .postbox-container{width:49.5%}#wpbody-content #dashboard-widgets #postbox-container-2,#wpbody-content #dashboard-widgets #postbox-container-3,#wpbody-content #dashboard-widgets #postbox-container-4{float:left;width:50.5%}#dashboard-widgets #postbox-container-3 .empty-container,#dashboard-widgets #postbox-container-4 .empty-container{border:0 none;height:0;min-height:0}.wp-editor-wrap .wp-editor-container,.wp-editor-wrap .wp-editor-tabs,.wp-editor-wrap .wp-editor-tools,.wp-editor-wrap .wp-switch-editor{zoom:100%}.wp-editor-wrap .wp-editor-container textarea.wp-editor-area{width:97%}#post-body.columns-2 #postbox-container-1{padding-right:19px}.welcome-panel .wp-badge{position:absolute}.welcome-panel .welcome-panel-column:first-child{width:35%}.wp-fullscreen-title{width:97%}#wp_mce_fullscreen_ifr{background-color:#f9f9f9}#wp-fullscreen-tagline{color:#888;font-size:14px}#adminmenuback{right:0;background-image:none}#adminmenuwrap{position:static}#adminmenu{position:relative}#adminmenu,#adminmenu a{cursor:pointer}#adminmenu li.wp-menu-separator,#adminmenu li.wp-menu-separator-last{font-size:1px;line-height:1}#adminmenu a.menu-top{border-bottom:0 none;border-top:1px solid #ddd}#adminmenu .separator{font-size:1px;line-height:1px}#adminmenu .wp-submenu{right:110px}#adminmenu .wp-submenu ul{margin:0}.folded #wpcontent,.folded #wpfooter{margin-right:170px}.folded #adminmenu,.folded #adminmenu li.menu-top,.folded #adminmenuback,.folded #adminmenuwrap{width:150px}.folded #adminmenu .wp-submenu{border-top-color:transparent}.folded #adminmenu .wp-menu-name{display:block}.folded #adminmenu .opensub .wp-submenu,.folded #adminmenu .wp-submenu.sub-open{right:110px}.folded #adminmenu .wp-has-current-submenu .wp-submenu,.folded #adminmenu a.wp-has-current-submenu:focus+.wp-submenu{top:-1px;position:relative}.folded #adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head{background-color:transparent}#adminmenu .wp-submenu .wp-submenu-head{border-top-color:#ddd}.folded #adminmenu .wp-submenu ul{margin-right:5px}#adminmenu li.menu-top{margin-bottom:-2px}#adminmenu .wp-menu-arrow{display:none!important}.js.folded #adminmenu li.menu-top{display:block;zoom:100%}ul#adminmenu{z-index:99}#adminmenu li.menu-top a.menu-top{min-width:auto;width:auto}#wpcontent #adminmenu li.wp-has-current-submenu a.wp-has-submenu{font-style:normal}#wpcontent #adminmenu .wp-submenu li{padding:0}#adminmenu li.wp-has-current-submenu .wp-submenu{right:-40px}#adminmenu .wp-menu-image{display:none!important}#adminmenu a.menu-top .wp-menu-name{padding-right:8px}#collapse-menu{line-height:23px}#wpadminbar .ab-comments-icon{padding-top:7px}.theme-browser .theme{width:30%;margin:0 0 4% 3%;cursor:auto}.theme-browser .theme:focus,.theme-browser .theme:hover{cursor:auto}.theme-browser .theme .theme-screenshot{height:180px}.theme-browser .theme .theme-actions{position:static;background-color:#e8e8e8}.theme-browser .theme .more-details{display:none}.plugins td,.plugins th,table.fixed td,table.fixed th{border-top:1px solid #ddd}#wpbody-content input.button,#wpbody-content input.button-primary,#wpbody-content input.button-secondary{overflow:visible}#dashboard-widgets h3 a{height:14px;line-height:14px}#dashboard_browser_nag{color:#fff}#dashboard_browser_nag .browser-icon{position:relative}.tablenav-pages .current-page{vertical-align:middle}#wpbody-content .postbox{border:1px solid #dfdfdf}#wpbody-content .postbox h3{margin-bottom:-1px}#addcat,#editcat,#template,#template div,.major-publishing-actions,.wp-submenu,.wp-submenu li{zoom:100%}.wp-menu-arrow{height:28px}.submitbox{margin-top:10px}#wpbody-content .quick-edit-row-post .inline-edit-col-left{width:39%}#wpbody-content .inline-edit-row-post .inline-edit-col-center{width:19%}#wpbody-content .quick-edit-row-page .inline-edit-col-left{width:49%}#wpbody-content .bulk-edit-row .inline-edit-col-left{width:29%}.inline-edit-row p.submit{zoom:100%}.inline-edit-row fieldset label span.title{display:block;float:right;width:5em}.inline-edit-row fieldset label span.input-text-wrap{margin-right:0;zoom:100%}#wpbody-content .inline-edit-row fieldset label span.input-text-wrap input{line-height:130%}#wpbody-content .inline-edit-row .input-text-wrap input{width:95%}#wpbody-content .inline-edit-row .input-text-wrap input.inline-edit-password-input{width:8em}#titlediv #title{width:98%}.button,input[type=button],input[type=reset],input[type=submit]{padding:0 8px;line-height:20px;height:auto}.button.button-large,input[type=button].button-large,input[type=reset].button-large,input[type=submit].button-large{padding:0 10px;line-height:24px;height:auto}.button.button-small,input[type=button].button-small,input[type=reset].button-small,input[type=submit].button-small{padding:0 6px;line-height:16px;height:auto}a.button{margin:1px;padding:1px 9px 2px}a.button.button-large{padding:1px 11px 2px}a.button.button-small{padding:1px 7px 2px}#screen-options-wrap{overflow:hidden}#col-container,#col-left,#col-right,#dragHelper,#editorcontainer,#post-body,#post-status-info,#postdiv,#postdivrich,#poststuff,#the-comment-list .comment-item,#titlediv,#widgets-left,#wpwrap,#wrap,.fileedit-sub,.metabox-holder,.tablenav,.tagchecklist,.widget .widget-top,.widget-control-actions,.widget-liquid-left,.widget-liquid-right,.widgets-sortables{display:block;zoom:100%}p.search-box{position:static;float:left;margin:-3px 0 4px}#widget-list .widget,.feature-filter .feature-group li{display:inline}.feature-filter .feature-group li input{vertical-align:middle}#editorcontainer #content{overflow:auto;margin:auto;width:98%}form#template div{width:100%}.wp-editor-container .quicktags-toolbar input{overflow:visible;padding:0 4px}#poststuff h2{font-size:1.6em}#poststuff .inside #page_template,#poststuff .inside #parent_id,.inline-edit-row #post_parent,.inline-edit-row select[name=page_template]{width:250px}#submitdiv a.button,#submitdiv input,#submitdiv select{position:relative}#bh{margin:7px 0 0 10px;float:left}div#dashboard-widgets{padding-left:1px}.tagchecklist span,.tagchecklist span a{display:inline-block;display:block}.nav .button-secondary,.tablenav .button-secondary{padding-top:2px;padding-bottom:2px}.tablenav select{font-size:13px;display:inline-block;vertical-align:top;margin-top:2px}.tablenav .actions select{width:155px}.subsubsub li{display:inline}a.post-state-format{text-indent:0;line-height:0;font-size:0}table.ie-fixed{table-layout:fixed}.widefat th,.widefat tr{margin-bottom:0;border-spacing:0}.widefat th input{margin:0 5px 0 0}.widefat tfoot .check-column,.widefat thead .check-column{padding-top:6px}.media.widefat tbody th.check-column,.widefat tbody th.check-column{padding:4px 0 0}.widefat{empty-cells:show;border-collapse:collapse}.tablenav a.button-secondary{display:inline-block;padding:2px 5px}.inactive-sidebar .widgets-sortables{padding-bottom:8px}#available-widgets .widget-holder{padding-bottom:65px}#widgets-left .inactive{padding-bottom:10px}.inactive-sidebar .widget,.widget-liquid-right .widget{position:relative}.inactive-sidebar .widget{display:block;float:right}#wpcontent .button-primary-disabled{color:#9FD0D5;background:#298CBA}#the-comment-list .unapproved td,#the-comment-list .unapproved tr{background-color:#ffffe0}.imgedit-submit{width:300px}#nav-menus-frame,#wpbody,.menu li{zoom:100%}#update-nav-menu #post-body{overflow:hidden}.menu li{min-width:100%}.menu li.sortable-placeholder{min-width:400px}.available-theme{display:inline}.available-theme ul{margin:0}.available-theme .action-links li{padding-left:7px;margin-left:7px}.about-wrap .three-col.about-updates .col-2{width:15%}.about-wrap .about-password-meter input{width:98%}.revisions-tickmarks,.revisions-tooltip{display:none!important}.revisions.pinned .revisions-controls{position:relative}.login form .input,input[type=password]{font-family:sans-serif}.mce-btn i.mce-i-aligncenter,.mce-btn i.mce-i-alignjustify,.mce-btn i.mce-i-alignleft,.mce-btn i.mce-i-alignright,.mce-btn i.mce-i-blockquote,.mce-btn i.mce-i-bold,.mce-btn i.mce-i-bullist,.mce-btn i.mce-i-charmap,.mce-btn i.mce-i-forecolor,.mce-btn i.mce-i-fullscreen,.mce-btn i.mce-i-help,.mce-btn i.mce-i-hr,.mce-btn i.mce-i-indent,.mce-btn i.mce-i-italic,.mce-btn i.mce-i-link,.mce-btn i.mce-i-ltr,.mce-btn i.mce-i-numlist,.mce-btn i.mce-i-outdent,.mce-btn i.mce-i-pastetext,.mce-btn i.mce-i-pasteword,.mce-btn i.mce-i-redo,.mce-btn i.mce-i-removeformat,.mce-btn i.mce-i-spellchecker,.mce-btn i.mce-i-strikethrough,.mce-btn i.mce-i-underline,.mce-btn i.mce-i-undo,.mce-btn i.mce-i-unlink,.mce-btn i.mce-i-wp-media-library,.mce-btn i.mce-i-wp_adv,.mce-btn i.mce-i-wp_fullscreen,.mce-btn i.mce-i-wp_help,.mce-btn i.mce-i-wp_more,.mce-btn i.mce-i-wp_page,.mce-close{font-family:tinymce,Arial;font-style:normal;font-weight:400;font-variant:normal;font-size:16px;margin-right:0;padding-left:0}.mce-btn i.mce-i-wp_fullscreen,.qt-fullscreen{-ie7-icon:'\e023'}.mce-btn i.mce-i-wp_more,.mce-btn i.mce-i-wp_page{-ie7-icon:'\e027'}.mce-btn i.mce-i-wp_adv{background-color:#aaa}.mce-btn i.mce-i-help,.mce-btn i.mce-i-wp_help{-ie7-icon:'\e016'}* html .row-actions{visibility:visible}* html div.widget-liquid-right{display:block;position:relative}* html #editorcontainer{padding:0}* html #poststuff h2{margin-right:0}* html .stuffbox,* html .stuffbox input,* html .stuffbox textarea{border:1px solid #DFDFDF}* html .feature-filter .feature-group li{width:145px}* html div.widget-liquid-left{width:99%}* html .widgets-sortables{height:50px}* html a#content_resize{left:-2px}* html .widget-title h4{width:205px}* html #removing-widget .in-widget-title{display:none}* html .media-item .pinkynail{height:32px;width:40px}* html .describe .field input.text,* html .describe .field textarea{width:440px}* html input{border:1px solid #dfdfdf}* html .edit-box{display:inline}* html .postbox-container .meta-box-sortables{height:300px}* html #wpbody-content #screen-options-link-wrap{display:inline-block;width:150px;text-align:center}* html #wpbody-content #contextual-help-link-wrap{display:inline-block;width:100px;text-align:center}* html #adminmenu{margin-right:-80px}* html .folded #adminmenu{margin-right:-22px}* html #wpcontent #adminmenu li.menu-top{display:inline;padding:0;margin:0}* html #wpfooter{margin:0}* html #adminmenu div.wp-menu-image{height:29px} \ No newline at end of file +#dashboard-widgets form .input-text-wrap input,#dashboard-widgets form .textarea-wrap textarea{width:99%}#dashboard-widgets form #title{width:98%}#wpbody-content #dashboard-widgets .postbox-container{width:49.5%}#wpbody-content #dashboard-widgets #postbox-container-2,#wpbody-content #dashboard-widgets #postbox-container-3,#wpbody-content #dashboard-widgets #postbox-container-4{float:left;width:50.5%}#dashboard-widgets #postbox-container-3 .empty-container,#dashboard-widgets #postbox-container-4 .empty-container{border:0;height:0;min-height:0}.wp-editor-wrap .wp-editor-container,.wp-editor-wrap .wp-editor-tabs,.wp-editor-wrap .wp-editor-tools,.wp-editor-wrap .wp-switch-editor{zoom:100%}.wp-editor-wrap .wp-editor-container textarea.wp-editor-area{width:97%}#post-body.columns-2 #postbox-container-1{padding-right:19px}.welcome-panel .wp-badge{position:absolute}.welcome-panel .welcome-panel-column:first-child{width:35%}#adminmenuback{right:0;background-image:none}#adminmenu .wp-submenu,.folded #adminmenu .opensub .wp-submenu,.folded #adminmenu .wp-submenu.sub-open{right:110px}#adminmenuwrap{position:static}#adminmenu{position:relative}#adminmenu,#adminmenu a{cursor:pointer}#adminmenu li.wp-menu-separator,#adminmenu li.wp-menu-separator-last{font-size:1px;line-height:1}#adminmenu a.menu-top{border-bottom:0 none;border-top:1px solid #ddd}#adminmenu .separator{font-size:1px;line-height:1px}#adminmenu .wp-submenu ul{margin:0}.folded #wpcontent,.folded #wpfooter{margin-right:170px}.folded #adminmenu,.folded #adminmenu li.menu-top,.folded #adminmenuback,.folded #adminmenuwrap{width:150px}.folded #adminmenu .wp-submenu{border-top-color:transparent}.folded #adminmenu .wp-menu-name{display:block}.folded #adminmenu .wp-has-current-submenu .wp-submenu,.folded #adminmenu a.wp-has-current-submenu:focus+.wp-submenu{top:-1px;position:relative}.folded #adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head{background-color:transparent}#adminmenu .wp-submenu .wp-submenu-head{border-top-color:#ddd}#wpbody-content .postbox,* html .stuffbox,* html .stuffbox input,* html .stuffbox textarea,* html input{border:1px solid #ddd}.folded #adminmenu .wp-submenu ul{margin-right:5px}#adminmenu li.menu-top{margin-bottom:-2px}#adminmenu .wp-menu-arrow{display:none!important}.js.folded #adminmenu li.menu-top{display:block;zoom:100%}ul#adminmenu{z-index:99}#adminmenu li.menu-top a.menu-top{min-width:auto;width:auto}#wpcontent #adminmenu li.wp-has-current-submenu a.wp-has-submenu{font-style:normal}#wpcontent #adminmenu .wp-submenu li{padding:0}#adminmenu li.wp-has-current-submenu .wp-submenu{right:-40px}#adminmenu .wp-menu-image{display:none!important}#adminmenu a.menu-top .wp-menu-name{padding-right:8px}#collapse-menu{line-height:23px}#wpadminbar .ab-comments-icon{padding-top:7px}.theme-browser .theme{width:30%;margin:0 0 4% 3%;cursor:auto}.theme-browser .theme:focus,.theme-browser .theme:hover{cursor:auto}.theme-browser .theme .theme-screenshot{height:180px}.theme-browser .theme .theme-actions{position:static;background-color:#e8e8e8}.theme-browser .theme .more-details{display:none}.plugins td,.plugins th,table.fixed td,table.fixed th{border-top:1px solid #ddd}#wpbody-content input.button,#wpbody-content input.button-primary,#wpbody-content input.button-secondary{overflow:visible}#dashboard-widgets h3 a{height:14px;line-height:14px}#dashboard_browser_nag{color:#fff}#dashboard_browser_nag .browser-icon{position:relative}.tablenav-pages .current-page{vertical-align:middle}#wpbody-content .postbox .hndle{margin-bottom:-1px}#addcat,#editcat,#template,#template div,.major-publishing-actions,.wp-submenu,.wp-submenu li{zoom:100%}.wp-menu-arrow{height:28px}.submitbox{margin-top:10px}#wpbody-content .quick-edit-row-post .inline-edit-col-left{width:39%}#wpbody-content .inline-edit-row-post .inline-edit-col-center{width:19%}#wpbody-content .quick-edit-row-page .inline-edit-col-left{width:49%}#wpbody-content .bulk-edit-row .inline-edit-col-left{width:29%}.inline-edit-row p.submit{zoom:100%}.inline-edit-row fieldset label span.title{display:block;float:right;width:5em}.inline-edit-row fieldset label span.input-text-wrap{margin-right:0;zoom:100%}#wpbody-content .inline-edit-row fieldset label span.input-text-wrap input{line-height:130%}#wpbody-content .inline-edit-row .input-text-wrap input{width:95%}#wpbody-content .inline-edit-row .input-text-wrap input.inline-edit-password-input{width:8em}#titlediv #title{width:98%}.button,input[type=reset],input[type=button],input[type=submit]{padding:0 8px;line-height:20px;height:auto}.button.button-large,input[type=reset].button-large,input[type=button].button-large,input[type=submit].button-large{padding:0 10px;line-height:24px;height:auto}.button.button-small,input[type=reset].button-small,input[type=button].button-small,input[type=submit].button-small{padding:0 6px;line-height:16px;height:auto}a.button{margin:1px;padding:1px 9px 2px}a.button.button-large{padding:1px 11px 2px}a.button.button-small{padding:1px 7px 2px}#screen-options-wrap{overflow:hidden}#col-container,#col-left,#col-right,#dragHelper,#editorcontainer,#post-body,#post-status-info,#postdiv,#postdivrich,#poststuff,#the-comment-list .comment-item,#titlediv,#widgets-left,#wpwrap,#wrap,.fileedit-sub,.metabox-holder,.tablenav,.tagchecklist,.widget .widget-top,.widget-control-actions,.widget-liquid-left,.widget-liquid-right,.widgets-sortables{display:block;zoom:100%}p.search-box{position:static;float:left;margin:-3px 0 4px}#submitdiv a.button,#submitdiv input,#submitdiv select,.inactive-sidebar .widget,.revisions.pinned .revisions-controls,.widget-liquid-right .widget{position:relative}#widget-list .widget{display:inline}#editorcontainer #content{overflow:auto;margin:auto;width:98%}form#template div{width:100%}.wp-editor-container .quicktags-toolbar input{overflow:visible;padding:0 4px}#poststuff h2{font-size:1.6em}#poststuff .inside #page_template,#poststuff .inside #parent_id,.inline-edit-row #post_parent,.inline-edit-row select[name=page_template]{width:250px}#bh{margin:7px 0 0 10px;float:left}div#dashboard-widgets{padding-left:1px}.tagchecklist span,.tagchecklist span a{display:inline-block;display:block}.nav .button-secondary,.tablenav .button-secondary{padding-top:2px;padding-bottom:2px}.tablenav select{font-size:13px;display:inline-block;vertical-align:top;margin-top:2px}.tablenav .actions select{width:155px}.subsubsub li{display:inline}a.post-state-format{text-indent:0;line-height:0;font-size:0}table.ie-fixed{table-layout:fixed}.widefat tfoot td,.widefat th,.widefat thead td,.widefat tr{margin-bottom:0;border-spacing:0}.widefat tfoot td input,.widefat th input,.widefat thead td input{margin:0 5px 0 0}.widefat tfoot .check-column,.widefat thead .check-column{padding-top:6px}.media.widefat tbody th.check-column,.widefat tbody th.check-column{padding:4px 0 0}.widefat{empty-cells:show;border-collapse:collapse}.tablenav a.button-secondary{display:inline-block;padding:2px 5px}.inactive-sidebar .widgets-sortables{padding-bottom:8px}#available-widgets .widget-holder{padding-bottom:65px}#widgets-left .inactive{padding-bottom:10px}.inactive-sidebar .widget{display:block;float:right}#wpcontent .button-primary-disabled{color:#9FD0D5;background:#298CBA}#the-comment-list .unapproved td,#the-comment-list .unapproved tr{background-color:#ffffe0}.imgedit-submit{width:300px}#nav-menus-frame,#wpbody,.menu li{zoom:100%}#update-nav-menu #post-body{overflow:hidden}.menu li{min-width:100%}.menu li.sortable-placeholder{min-width:400px}.available-theme{display:inline}.available-theme ul{margin:0}.available-theme .action-links li{padding-left:7px;margin-left:7px}.about-wrap .three-col.about-updates .col-2{width:15%}.about-wrap .about-password-meter input{width:98%}.revisions-tickmarks,.revisions-tooltip{display:none!important}.login form .input,input[type=password]{font-family:sans-serif}.mce-btn i.mce-i-aligncenter,.mce-btn i.mce-i-alignjustify,.mce-btn i.mce-i-alignleft,.mce-btn i.mce-i-alignright,.mce-btn i.mce-i-blockquote,.mce-btn i.mce-i-bold,.mce-btn i.mce-i-bullist,.mce-btn i.mce-i-charmap,.mce-btn i.mce-i-forecolor,.mce-btn i.mce-i-fullscreen,.mce-btn i.mce-i-help,.mce-btn i.mce-i-hr,.mce-btn i.mce-i-indent,.mce-btn i.mce-i-italic,.mce-btn i.mce-i-link,.mce-btn i.mce-i-ltr,.mce-btn i.mce-i-numlist,.mce-btn i.mce-i-outdent,.mce-btn i.mce-i-pastetext,.mce-btn i.mce-i-pasteword,.mce-btn i.mce-i-redo,.mce-btn i.mce-i-removeformat,.mce-btn i.mce-i-spellchecker,.mce-btn i.mce-i-strikethrough,.mce-btn i.mce-i-underline,.mce-btn i.mce-i-undo,.mce-btn i.mce-i-unlink,.mce-btn i.mce-i-wp-media-library,.mce-btn i.mce-i-wp_adv,.mce-btn i.mce-i-wp_fullscreen,.mce-btn i.mce-i-wp_help,.mce-btn i.mce-i-wp_more,.mce-btn i.mce-i-wp_page,.mce-close{font-family:tinymce,Arial;font-style:normal;font-weight:400;font-variant:normal;font-size:16px;margin-right:0;padding-left:0}.mce-btn i.mce-i-wp_fullscreen,.qt-fullscreen{-ie7-icon:'\e023'}.mce-btn i.mce-i-wp_more,.mce-btn i.mce-i-wp_page{-ie7-icon:'\e027'}.mce-btn i.mce-i-wp_adv{background-color:#a0a5aa}.mce-btn i.mce-i-help,.mce-btn i.mce-i-wp_help{-ie7-icon:'\e016'}* html .row-actions{visibility:visible}* html div.widget-liquid-left,* html div.widget-liquid-right{display:block;position:relative}* html #editorcontainer{padding:0}* html #poststuff h2{margin-right:0}* html div.widget-liquid-left{width:99%}* html .widgets-sortables{height:50px}* html a#content_resize{left:-2px}* html .widget-title h4{width:205px}* html #removing-widget .in-widget-title{display:none}* html .media-item .pinkynail{height:32px;width:40px}* html .describe .field input.text,* html .describe .field textarea{width:440px}* html .edit-box{display:inline}* html .postbox-container .meta-box-sortables{height:300px}* html #wpbody-content #screen-options-link-wrap{display:inline-block;width:150px;text-align:center}* html #wpbody-content #contextual-help-link-wrap{display:inline-block;width:100px;text-align:center}* html #adminmenu{margin-right:-80px}* html .folded #adminmenu{margin-right:-22px}* html #wpcontent #adminmenu li.menu-top{display:inline;padding:0;margin:0}* html #wpfooter{margin:0}* html #adminmenu div.wp-menu-image{height:29px} \ No newline at end of file diff --git a/wp-admin/css/ie.css b/wp-admin/css/ie.css index 967fae2..fe9bc43 100644 --- a/wp-admin/css/ie.css +++ b/wp-admin/css/ie.css @@ -50,19 +50,6 @@ width: 35%; } -.wp-fullscreen-title { - width: 97%; -} - -#wp_mce_fullscreen_ifr { - background-color: #f9f9f9; -} - -#wp-fullscreen-tagline { - color: #888; - font-size: 14px; -} - #adminmenuback { left: 0; background-image: none; @@ -257,10 +244,10 @@ table.fixed td { } #wpbody-content .postbox { - border: 1px solid #dfdfdf; + border: 1px solid #ddd; } -#wpbody-content .postbox h3 { +#wpbody-content .postbox .hndle { margin-bottom: -1px; } @@ -409,15 +396,10 @@ p.search-box { margin: -3px 0 4px; } -#widget-list .widget, -.feature-filter .feature-group li { +#widget-list .widget { display: inline; } -.feature-filter .feature-group li input { - vertical-align: middle; -} - #editorcontainer #content { overflow: auto; margin: auto; @@ -497,12 +479,16 @@ table.ie-fixed { } .widefat tr, -.widefat th { +.widefat th, +.widefat thead td, +.widefat tfoot td { margin-bottom: 0; border-spacing: 0; } -.widefat th input { +.widefat th input, +.widefat thead td input, +.widefat tfoot td input { margin: 0 0 0 5px; } @@ -670,7 +656,7 @@ input[type="password"], } .mce-btn i.mce-i-wp_adv { - background-color: #aaa; + background-color: #a0a5aa; } .mce-btn i.mce-i-help, @@ -701,11 +687,7 @@ input[type="password"], * html .stuffbox, * html .stuffbox input, * html .stuffbox textarea { - border: 1px solid #DFDFDF; -} - -* html .feature-filter .feature-group li { - width: 145px; + border: 1px solid #ddd; } * html div.widget-liquid-left { @@ -739,7 +721,7 @@ input[type="password"], } * html input { - border: 1px solid #dfdfdf; + border: 1px solid #ddd; } * html .edit-box { diff --git a/wp-admin/css/ie.min.css b/wp-admin/css/ie.min.css index 849f4d1..486502d 100644 --- a/wp-admin/css/ie.min.css +++ b/wp-admin/css/ie.min.css @@ -1 +1 @@ -#dashboard-widgets form .input-text-wrap input,#dashboard-widgets form .textarea-wrap textarea{width:99%}#dashboard-widgets form #title{width:98%}#wpbody-content #dashboard-widgets .postbox-container{width:49.5%}#wpbody-content #dashboard-widgets #postbox-container-2,#wpbody-content #dashboard-widgets #postbox-container-3,#wpbody-content #dashboard-widgets #postbox-container-4{float:right;width:50.5%}#dashboard-widgets #postbox-container-3 .empty-container,#dashboard-widgets #postbox-container-4 .empty-container{border:0 none;height:0;min-height:0}.wp-editor-wrap .wp-editor-container,.wp-editor-wrap .wp-editor-tabs,.wp-editor-wrap .wp-editor-tools,.wp-editor-wrap .wp-switch-editor{zoom:100%}.wp-editor-wrap .wp-editor-container textarea.wp-editor-area{width:97%}#post-body.columns-2 #postbox-container-1{padding-left:19px}.welcome-panel .wp-badge{position:absolute}.welcome-panel .welcome-panel-column:first-child{width:35%}.wp-fullscreen-title{width:97%}#wp_mce_fullscreen_ifr{background-color:#f9f9f9}#wp-fullscreen-tagline{color:#888;font-size:14px}#adminmenuback{left:0;background-image:none}#adminmenuwrap{position:static}#adminmenu{position:relative}#adminmenu,#adminmenu a{cursor:pointer}#adminmenu li.wp-menu-separator,#adminmenu li.wp-menu-separator-last{font-size:1px;line-height:1}#adminmenu a.menu-top{border-bottom:0 none;border-top:1px solid #ddd}#adminmenu .separator{font-size:1px;line-height:1px}#adminmenu .wp-submenu{left:110px}#adminmenu .wp-submenu ul{margin:0}.folded #wpcontent,.folded #wpfooter{margin-left:170px}.folded #adminmenu,.folded #adminmenu li.menu-top,.folded #adminmenuback,.folded #adminmenuwrap{width:150px}.folded #adminmenu .wp-submenu{border-top-color:transparent}.folded #adminmenu .wp-menu-name{display:block}.folded #adminmenu .opensub .wp-submenu,.folded #adminmenu .wp-submenu.sub-open{left:110px}.folded #adminmenu .wp-has-current-submenu .wp-submenu,.folded #adminmenu a.wp-has-current-submenu:focus+.wp-submenu{top:-1px;position:relative}.folded #adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head{background-color:transparent}#adminmenu .wp-submenu .wp-submenu-head{border-top-color:#ddd}.folded #adminmenu .wp-submenu ul{margin-left:5px}#adminmenu li.menu-top{margin-bottom:-2px}#adminmenu .wp-menu-arrow{display:none!important}.js.folded #adminmenu li.menu-top{display:block;zoom:100%}ul#adminmenu{z-index:99}#adminmenu li.menu-top a.menu-top{min-width:auto;width:auto}#wpcontent #adminmenu li.wp-has-current-submenu a.wp-has-submenu{font-style:normal}#wpcontent #adminmenu .wp-submenu li{padding:0}#adminmenu li.wp-has-current-submenu .wp-submenu{left:-40px}#adminmenu .wp-menu-image{display:none!important}#adminmenu a.menu-top .wp-menu-name{padding-left:8px}#collapse-menu{line-height:23px}#wpadminbar .ab-comments-icon{padding-top:7px}.theme-browser .theme{width:30%;margin:0 3% 4% 0;cursor:auto}.theme-browser .theme:focus,.theme-browser .theme:hover{cursor:auto}.theme-browser .theme .theme-screenshot{height:180px}.theme-browser .theme .theme-actions{position:static;background-color:#e8e8e8}.theme-browser .theme .more-details{display:none}.plugins td,.plugins th,table.fixed td,table.fixed th{border-top:1px solid #ddd}#wpbody-content input.button,#wpbody-content input.button-primary,#wpbody-content input.button-secondary{overflow:visible}#dashboard-widgets h3 a{height:14px;line-height:14px}#dashboard_browser_nag{color:#fff}#dashboard_browser_nag .browser-icon{position:relative}.tablenav-pages .current-page{vertical-align:middle}#wpbody-content .postbox{border:1px solid #dfdfdf}#wpbody-content .postbox h3{margin-bottom:-1px}#addcat,#editcat,#template,#template div,.major-publishing-actions,.wp-submenu,.wp-submenu li{zoom:100%}.wp-menu-arrow{height:28px}.submitbox{margin-top:10px}#wpbody-content .quick-edit-row-post .inline-edit-col-left{width:39%}#wpbody-content .inline-edit-row-post .inline-edit-col-center{width:19%}#wpbody-content .quick-edit-row-page .inline-edit-col-left{width:49%}#wpbody-content .bulk-edit-row .inline-edit-col-left{width:29%}.inline-edit-row p.submit{zoom:100%}.inline-edit-row fieldset label span.title{display:block;float:left;width:5em}.inline-edit-row fieldset label span.input-text-wrap{margin-left:0;zoom:100%}#wpbody-content .inline-edit-row fieldset label span.input-text-wrap input{line-height:130%}#wpbody-content .inline-edit-row .input-text-wrap input{width:95%}#wpbody-content .inline-edit-row .input-text-wrap input.inline-edit-password-input{width:8em}#titlediv #title{width:98%}.button,input[type=button],input[type=reset],input[type=submit]{padding:0 8px;line-height:20px;height:auto}.button.button-large,input[type=button].button-large,input[type=reset].button-large,input[type=submit].button-large{padding:0 10px;line-height:24px;height:auto}.button.button-small,input[type=button].button-small,input[type=reset].button-small,input[type=submit].button-small{padding:0 6px;line-height:16px;height:auto}a.button{margin:1px;padding:1px 9px 2px}a.button.button-large{padding:1px 11px 2px}a.button.button-small{padding:1px 7px 2px}#screen-options-wrap{overflow:hidden}#col-container,#col-left,#col-right,#dragHelper,#editorcontainer,#post-body,#post-status-info,#postdiv,#postdivrich,#poststuff,#the-comment-list .comment-item,#titlediv,#widgets-left,#wpwrap,#wrap,.fileedit-sub,.metabox-holder,.tablenav,.tagchecklist,.widget .widget-top,.widget-control-actions,.widget-liquid-left,.widget-liquid-right,.widgets-sortables{display:block;zoom:100%}p.search-box{position:static;float:right;margin:-3px 0 4px}#widget-list .widget,.feature-filter .feature-group li{display:inline}.feature-filter .feature-group li input{vertical-align:middle}#editorcontainer #content{overflow:auto;margin:auto;width:98%}form#template div{width:100%}.wp-editor-container .quicktags-toolbar input{overflow:visible;padding:0 4px}#poststuff h2{font-size:1.6em}#poststuff .inside #page_template,#poststuff .inside #parent_id,.inline-edit-row #post_parent,.inline-edit-row select[name=page_template]{width:250px}#submitdiv a.button,#submitdiv input,#submitdiv select{position:relative}#bh{margin:7px 10px 0 0;float:right}div#dashboard-widgets{padding-right:1px}.tagchecklist span,.tagchecklist span a{display:inline-block;display:block}.nav .button-secondary,.tablenav .button-secondary{padding-top:2px;padding-bottom:2px}.tablenav select{font-size:13px;display:inline-block;vertical-align:top;margin-top:2px}.tablenav .actions select{width:155px}.subsubsub li{display:inline}a.post-state-format{text-indent:0;line-height:0;font-size:0}table.ie-fixed{table-layout:fixed}.widefat th,.widefat tr{margin-bottom:0;border-spacing:0}.widefat th input{margin:0 0 0 5px}.widefat tfoot .check-column,.widefat thead .check-column{padding-top:6px}.media.widefat tbody th.check-column,.widefat tbody th.check-column{padding:4px 0 0}.widefat{empty-cells:show;border-collapse:collapse}.tablenav a.button-secondary{display:inline-block;padding:2px 5px}.inactive-sidebar .widgets-sortables{padding-bottom:8px}#available-widgets .widget-holder{padding-bottom:65px}#widgets-left .inactive{padding-bottom:10px}.inactive-sidebar .widget,.widget-liquid-right .widget{position:relative}.inactive-sidebar .widget{display:block;float:left}#wpcontent .button-primary-disabled{color:#9FD0D5;background:#298CBA}#the-comment-list .unapproved td,#the-comment-list .unapproved tr{background-color:#ffffe0}.imgedit-submit{width:300px}#nav-menus-frame,#wpbody,.menu li{zoom:100%}#update-nav-menu #post-body{overflow:hidden}.menu li{min-width:100%}.menu li.sortable-placeholder{min-width:400px}.available-theme{display:inline}.available-theme ul{margin:0}.available-theme .action-links li{padding-right:7px;margin-right:7px}.about-wrap .three-col.about-updates .col-2{width:15%}.about-wrap .about-password-meter input{width:98%}.revisions-tickmarks,.revisions-tooltip{display:none!important}.revisions.pinned .revisions-controls{position:relative}.login form .input,input[type=password]{font-family:sans-serif}.mce-btn i.mce-i-aligncenter,.mce-btn i.mce-i-alignjustify,.mce-btn i.mce-i-alignleft,.mce-btn i.mce-i-alignright,.mce-btn i.mce-i-blockquote,.mce-btn i.mce-i-bold,.mce-btn i.mce-i-bullist,.mce-btn i.mce-i-charmap,.mce-btn i.mce-i-forecolor,.mce-btn i.mce-i-fullscreen,.mce-btn i.mce-i-help,.mce-btn i.mce-i-hr,.mce-btn i.mce-i-indent,.mce-btn i.mce-i-italic,.mce-btn i.mce-i-link,.mce-btn i.mce-i-ltr,.mce-btn i.mce-i-numlist,.mce-btn i.mce-i-outdent,.mce-btn i.mce-i-pastetext,.mce-btn i.mce-i-pasteword,.mce-btn i.mce-i-redo,.mce-btn i.mce-i-removeformat,.mce-btn i.mce-i-spellchecker,.mce-btn i.mce-i-strikethrough,.mce-btn i.mce-i-underline,.mce-btn i.mce-i-undo,.mce-btn i.mce-i-unlink,.mce-btn i.mce-i-wp-media-library,.mce-btn i.mce-i-wp_adv,.mce-btn i.mce-i-wp_fullscreen,.mce-btn i.mce-i-wp_help,.mce-btn i.mce-i-wp_more,.mce-btn i.mce-i-wp_page,.mce-close{font-family:tinymce,Arial;font-style:normal;font-weight:400;font-variant:normal;font-size:16px;margin-left:0;padding-right:0}.mce-btn i.mce-i-wp_fullscreen,.qt-fullscreen{-ie7-icon:'\e023'}.mce-btn i.mce-i-wp_more,.mce-btn i.mce-i-wp_page{-ie7-icon:'\e027'}.mce-btn i.mce-i-wp_adv{background-color:#aaa}.mce-btn i.mce-i-help,.mce-btn i.mce-i-wp_help{-ie7-icon:'\e016'}* html .row-actions{visibility:visible}* html div.widget-liquid-left,* html div.widget-liquid-right{display:block;position:relative}* html #editorcontainer{padding:0}* html #poststuff h2{margin-left:0}* html .stuffbox,* html .stuffbox input,* html .stuffbox textarea{border:1px solid #DFDFDF}* html .feature-filter .feature-group li{width:145px}* html div.widget-liquid-left{width:99%}* html .widgets-sortables{height:50px}* html a#content_resize{right:-2px}* html .widget-title h4{width:205px}* html #removing-widget .in-widget-title{display:none}* html .media-item .pinkynail{height:32px;width:40px}* html .describe .field input.text,* html .describe .field textarea{width:440px}* html input{border:1px solid #dfdfdf}* html .edit-box{display:inline}* html .postbox-container .meta-box-sortables{height:300px}* html #wpbody-content #screen-options-link-wrap{display:inline-block;width:150px;text-align:center}* html #wpbody-content #contextual-help-link-wrap{display:inline-block;width:100px;text-align:center}* html #adminmenu{margin-left:-80px}* html .folded #adminmenu{margin-left:-22px}* html #wpcontent #adminmenu li.menu-top{display:inline;padding:0;margin:0}* html #wpfooter{margin:0}* html #adminmenu div.wp-menu-image{height:29px} \ No newline at end of file +#dashboard-widgets form .input-text-wrap input,#dashboard-widgets form .textarea-wrap textarea{width:99%}#dashboard-widgets form #title{width:98%}#wpbody-content #dashboard-widgets .postbox-container{width:49.5%}#wpbody-content #dashboard-widgets #postbox-container-2,#wpbody-content #dashboard-widgets #postbox-container-3,#wpbody-content #dashboard-widgets #postbox-container-4{float:right;width:50.5%}#dashboard-widgets #postbox-container-3 .empty-container,#dashboard-widgets #postbox-container-4 .empty-container{border:0;height:0;min-height:0}.wp-editor-wrap .wp-editor-container,.wp-editor-wrap .wp-editor-tabs,.wp-editor-wrap .wp-editor-tools,.wp-editor-wrap .wp-switch-editor{zoom:100%}.wp-editor-wrap .wp-editor-container textarea.wp-editor-area{width:97%}#post-body.columns-2 #postbox-container-1{padding-left:19px}.welcome-panel .wp-badge{position:absolute}.welcome-panel .welcome-panel-column:first-child{width:35%}#adminmenuback{left:0;background-image:none}#adminmenu .wp-submenu,.folded #adminmenu .opensub .wp-submenu,.folded #adminmenu .wp-submenu.sub-open{left:110px}#adminmenuwrap{position:static}#adminmenu{position:relative}#adminmenu,#adminmenu a{cursor:pointer}#adminmenu li.wp-menu-separator,#adminmenu li.wp-menu-separator-last{font-size:1px;line-height:1}#adminmenu a.menu-top{border-bottom:0 none;border-top:1px solid #ddd}#adminmenu .separator{font-size:1px;line-height:1px}#adminmenu .wp-submenu ul{margin:0}.folded #wpcontent,.folded #wpfooter{margin-left:170px}.folded #adminmenu,.folded #adminmenu li.menu-top,.folded #adminmenuback,.folded #adminmenuwrap{width:150px}.folded #adminmenu .wp-submenu{border-top-color:transparent}.folded #adminmenu .wp-menu-name{display:block}.folded #adminmenu .wp-has-current-submenu .wp-submenu,.folded #adminmenu a.wp-has-current-submenu:focus+.wp-submenu{top:-1px;position:relative}.folded #adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head{background-color:transparent}#adminmenu .wp-submenu .wp-submenu-head{border-top-color:#ddd}#wpbody-content .postbox,* html .stuffbox,* html .stuffbox input,* html .stuffbox textarea,* html input{border:1px solid #ddd}.folded #adminmenu .wp-submenu ul{margin-left:5px}#adminmenu li.menu-top{margin-bottom:-2px}#adminmenu .wp-menu-arrow{display:none!important}.js.folded #adminmenu li.menu-top{display:block;zoom:100%}ul#adminmenu{z-index:99}#adminmenu li.menu-top a.menu-top{min-width:auto;width:auto}#wpcontent #adminmenu li.wp-has-current-submenu a.wp-has-submenu{font-style:normal}#wpcontent #adminmenu .wp-submenu li{padding:0}#adminmenu li.wp-has-current-submenu .wp-submenu{left:-40px}#adminmenu .wp-menu-image{display:none!important}#adminmenu a.menu-top .wp-menu-name{padding-left:8px}#collapse-menu{line-height:23px}#wpadminbar .ab-comments-icon{padding-top:7px}.theme-browser .theme{width:30%;margin:0 3% 4% 0;cursor:auto}.theme-browser .theme:focus,.theme-browser .theme:hover{cursor:auto}.theme-browser .theme .theme-screenshot{height:180px}.theme-browser .theme .theme-actions{position:static;background-color:#e8e8e8}.theme-browser .theme .more-details{display:none}.plugins td,.plugins th,table.fixed td,table.fixed th{border-top:1px solid #ddd}#wpbody-content input.button,#wpbody-content input.button-primary,#wpbody-content input.button-secondary{overflow:visible}#dashboard-widgets h3 a{height:14px;line-height:14px}#dashboard_browser_nag{color:#fff}#dashboard_browser_nag .browser-icon{position:relative}.tablenav-pages .current-page{vertical-align:middle}#wpbody-content .postbox .hndle{margin-bottom:-1px}#addcat,#editcat,#template,#template div,.major-publishing-actions,.wp-submenu,.wp-submenu li{zoom:100%}.wp-menu-arrow{height:28px}.submitbox{margin-top:10px}#wpbody-content .quick-edit-row-post .inline-edit-col-left{width:39%}#wpbody-content .inline-edit-row-post .inline-edit-col-center{width:19%}#wpbody-content .quick-edit-row-page .inline-edit-col-left{width:49%}#wpbody-content .bulk-edit-row .inline-edit-col-left{width:29%}.inline-edit-row p.submit{zoom:100%}.inline-edit-row fieldset label span.title{display:block;float:left;width:5em}.inline-edit-row fieldset label span.input-text-wrap{margin-left:0;zoom:100%}#wpbody-content .inline-edit-row fieldset label span.input-text-wrap input{line-height:130%}#wpbody-content .inline-edit-row .input-text-wrap input{width:95%}#wpbody-content .inline-edit-row .input-text-wrap input.inline-edit-password-input{width:8em}#titlediv #title{width:98%}.button,input[type=reset],input[type=button],input[type=submit]{padding:0 8px;line-height:20px;height:auto}.button.button-large,input[type=reset].button-large,input[type=button].button-large,input[type=submit].button-large{padding:0 10px;line-height:24px;height:auto}.button.button-small,input[type=reset].button-small,input[type=button].button-small,input[type=submit].button-small{padding:0 6px;line-height:16px;height:auto}a.button{margin:1px;padding:1px 9px 2px}a.button.button-large{padding:1px 11px 2px}a.button.button-small{padding:1px 7px 2px}#screen-options-wrap{overflow:hidden}#col-container,#col-left,#col-right,#dragHelper,#editorcontainer,#post-body,#post-status-info,#postdiv,#postdivrich,#poststuff,#the-comment-list .comment-item,#titlediv,#widgets-left,#wpwrap,#wrap,.fileedit-sub,.metabox-holder,.tablenav,.tagchecklist,.widget .widget-top,.widget-control-actions,.widget-liquid-left,.widget-liquid-right,.widgets-sortables{display:block;zoom:100%}p.search-box{position:static;float:right;margin:-3px 0 4px}#submitdiv a.button,#submitdiv input,#submitdiv select,.inactive-sidebar .widget,.revisions.pinned .revisions-controls,.widget-liquid-right .widget{position:relative}#widget-list .widget{display:inline}#editorcontainer #content{overflow:auto;margin:auto;width:98%}form#template div{width:100%}.wp-editor-container .quicktags-toolbar input{overflow:visible;padding:0 4px}#poststuff h2{font-size:1.6em}#poststuff .inside #page_template,#poststuff .inside #parent_id,.inline-edit-row #post_parent,.inline-edit-row select[name=page_template]{width:250px}#bh{margin:7px 10px 0 0;float:right}div#dashboard-widgets{padding-right:1px}.tagchecklist span,.tagchecklist span a{display:inline-block;display:block}.nav .button-secondary,.tablenav .button-secondary{padding-top:2px;padding-bottom:2px}.tablenav select{font-size:13px;display:inline-block;vertical-align:top;margin-top:2px}.tablenav .actions select{width:155px}.subsubsub li{display:inline}a.post-state-format{text-indent:0;line-height:0;font-size:0}table.ie-fixed{table-layout:fixed}.widefat tfoot td,.widefat th,.widefat thead td,.widefat tr{margin-bottom:0;border-spacing:0}.widefat tfoot td input,.widefat th input,.widefat thead td input{margin:0 0 0 5px}.widefat tfoot .check-column,.widefat thead .check-column{padding-top:6px}.media.widefat tbody th.check-column,.widefat tbody th.check-column{padding:4px 0 0}.widefat{empty-cells:show;border-collapse:collapse}.tablenav a.button-secondary{display:inline-block;padding:2px 5px}.inactive-sidebar .widgets-sortables{padding-bottom:8px}#available-widgets .widget-holder{padding-bottom:65px}#widgets-left .inactive{padding-bottom:10px}.inactive-sidebar .widget{display:block;float:left}#wpcontent .button-primary-disabled{color:#9FD0D5;background:#298CBA}#the-comment-list .unapproved td,#the-comment-list .unapproved tr{background-color:#ffffe0}.imgedit-submit{width:300px}#nav-menus-frame,#wpbody,.menu li{zoom:100%}#update-nav-menu #post-body{overflow:hidden}.menu li{min-width:100%}.menu li.sortable-placeholder{min-width:400px}.available-theme{display:inline}.available-theme ul{margin:0}.available-theme .action-links li{padding-right:7px;margin-right:7px}.about-wrap .three-col.about-updates .col-2{width:15%}.about-wrap .about-password-meter input{width:98%}.revisions-tickmarks,.revisions-tooltip{display:none!important}.login form .input,input[type=password]{font-family:sans-serif}.mce-btn i.mce-i-aligncenter,.mce-btn i.mce-i-alignjustify,.mce-btn i.mce-i-alignleft,.mce-btn i.mce-i-alignright,.mce-btn i.mce-i-blockquote,.mce-btn i.mce-i-bold,.mce-btn i.mce-i-bullist,.mce-btn i.mce-i-charmap,.mce-btn i.mce-i-forecolor,.mce-btn i.mce-i-fullscreen,.mce-btn i.mce-i-help,.mce-btn i.mce-i-hr,.mce-btn i.mce-i-indent,.mce-btn i.mce-i-italic,.mce-btn i.mce-i-link,.mce-btn i.mce-i-ltr,.mce-btn i.mce-i-numlist,.mce-btn i.mce-i-outdent,.mce-btn i.mce-i-pastetext,.mce-btn i.mce-i-pasteword,.mce-btn i.mce-i-redo,.mce-btn i.mce-i-removeformat,.mce-btn i.mce-i-spellchecker,.mce-btn i.mce-i-strikethrough,.mce-btn i.mce-i-underline,.mce-btn i.mce-i-undo,.mce-btn i.mce-i-unlink,.mce-btn i.mce-i-wp-media-library,.mce-btn i.mce-i-wp_adv,.mce-btn i.mce-i-wp_fullscreen,.mce-btn i.mce-i-wp_help,.mce-btn i.mce-i-wp_more,.mce-btn i.mce-i-wp_page,.mce-close{font-family:tinymce,Arial;font-style:normal;font-weight:400;font-variant:normal;font-size:16px;margin-left:0;padding-right:0}.mce-btn i.mce-i-wp_fullscreen,.qt-fullscreen{-ie7-icon:'\e023'}.mce-btn i.mce-i-wp_more,.mce-btn i.mce-i-wp_page{-ie7-icon:'\e027'}.mce-btn i.mce-i-wp_adv{background-color:#a0a5aa}.mce-btn i.mce-i-help,.mce-btn i.mce-i-wp_help{-ie7-icon:'\e016'}* html .row-actions{visibility:visible}* html div.widget-liquid-left,* html div.widget-liquid-right{display:block;position:relative}* html #editorcontainer{padding:0}* html #poststuff h2{margin-left:0}* html div.widget-liquid-left{width:99%}* html .widgets-sortables{height:50px}* html a#content_resize{right:-2px}* html .widget-title h4{width:205px}* html #removing-widget .in-widget-title{display:none}* html .media-item .pinkynail{height:32px;width:40px}* html .describe .field input.text,* html .describe .field textarea{width:440px}* html .edit-box{display:inline}* html .postbox-container .meta-box-sortables{height:300px}* html #wpbody-content #screen-options-link-wrap{display:inline-block;width:150px;text-align:center}* html #wpbody-content #contextual-help-link-wrap{display:inline-block;width:100px;text-align:center}* html #adminmenu{margin-left:-80px}* html .folded #adminmenu{margin-left:-22px}* html #wpcontent #adminmenu li.menu-top{display:inline;padding:0;margin:0}* html #wpfooter{margin:0}* html #adminmenu div.wp-menu-image{height:29px} \ No newline at end of file diff --git a/wp-admin/css/install-rtl.css b/wp-admin/css/install-rtl.css index b73329e..5e1ced9 100644 --- a/wp-admin/css/install-rtl.css +++ b/wp-admin/css/install-rtl.css @@ -16,26 +16,39 @@ body { } a { - color: #0074a2; - text-decoration: none; + color: #0073aa; +} + +a:hover, +a:active { + color: #00a0d2; +} + +a:focus { + color: #124964; + -webkit-box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); + box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); } -a:hover { - color: #2ea2cc; +.ie8 a:focus { + outline: #5b9dd9 solid 1px; } -h1 { - border-bottom: 1px solid #dedede; +h1, h2 { + border-bottom: 1px solid #ddd; clear: both; color: #666; font-size: 24px; - margin: 30px 0; padding: 0; padding-bottom: 7px; font-weight: normal; } -h2 { +h3 { font-size: 16px; } @@ -60,32 +73,50 @@ abbr { border: 0; font-variant: normal; } + +fieldset { + border: 0; + padding: 0; + margin: 0; +} + +label { + cursor: pointer; +} + #logo { margin: 6px 0 14px 0; + padding: 0 0 7px 0; border-bottom: none; text-align:center } #logo a { background-image: url(../images/w-logo-blue.png?ver=20131202); background-image: none, url(../images/wordpress-logo.svg?ver=20131107); - -webkit-background-size: 80px 80px; - background-size: 80px 80px; + -webkit-background-size: 84px; + background-size: 84px; background-position: center top; background-repeat: no-repeat; - color: #999; - height: 80px; + color: #444; /* same as login.css */ + height: 84px; font-size: 20px; font-weight: normal; line-height: 1.3em; margin: -130px auto 25px; padding: 0; text-decoration: none; - width: 80px; + width: 84px; text-indent: -9999px; outline: none; overflow: hidden; display: block; } + +#logo a:focus { + -webkit-box-shadow: none; + box-shadow: none; +} + .step { margin: 20px 0 15px; } @@ -93,11 +124,14 @@ abbr { text-align: right; padding: 0; } -.step .button-large { +.language-chooser.wp-core-ui .step .button.button-large { + height: 36px; font-size: 14px; + line-height: 33px; + vertical-align: middle; } textarea { - border: 1px solid #dfdfdf; + border: 1px solid #ddd; font-family: "Open Sans", sans-serif; width: 100%; -webkit-box-sizing: border-box; @@ -114,7 +148,6 @@ textarea { .form-table td { margin-bottom: 9px; padding: 10px 0 10px 20px; - border-bottom: 8px solid #fff; font-size: 14px; vertical-align: top } @@ -122,7 +155,7 @@ textarea { .form-table th { font-size: 14px; text-align: right; - padding: 16px 0 10px 20px; + padding: 10px 0 10px 20px; width: 140px; vertical-align: top; } @@ -152,6 +185,8 @@ submit { } .form-table input[type=text], +.form-table input[type=email], +.form-table input[type=url], .form-table input[type=password] { width: 206px; } @@ -160,9 +195,10 @@ submit { font-weight: normal; } +.form-table.install-success th, .form-table.install-success td { vertical-align: middle; - padding: 16px 0 10px 20px; + padding: 16px 0 16px 20px; } .form-table.install-success td p { @@ -189,46 +225,75 @@ submit { font-family: Consolas, Monaco, monospace; } +.wp-hide-pw > .dashicons { + line-height: inherit; +} + #pass-strength-result { background-color: #eee; - border-color: #ddd !important; - border-style: solid; - border-width: 1px; - margin: 5px 0 5px 5px; - padding: 5px; + border: 1px solid #ddd; + color: #23282d; + margin: -2px 0px 5px 5px; + padding: 3px 5px; text-align: center; - width: 200px; - display: none; + width: 218px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + opacity: 0; +} + +#pass-strength-result.short { + background-color: #f1adad; + border-color: #e35b5b; + opacity: 1; } #pass-strength-result.bad { - background-color: #ffb78c; - border-color: #ff853c !important; + background-color: #fbc5a9; + border-color: #f78b53; + opacity: 1; } #pass-strength-result.good { - background-color: #ffec8b; - border-color: #ffcc00 !important; + background-color: #ffe399; + border-color: #ffc733; + opacity: 1; } -#pass-strength-result.short { - background-color: #ffa0a0; - border-color: #f04040 !important; +#pass-strength-result.strong { + background-color: #c1e1b9; + border-color: #83c373; + opacity: 1; } -#pass-strength-result.strong { - background-color: #c3ff88; - border-color: #8dff1c !important; +#pass1.short, #pass1-text.short { + border-color: #e35b5b; +} + +#pass1.bad, #pass1-text.bad { + border-color: #f78b53; +} + +#pass1.good, #pass1-text.good { + border-color: #ffc733; +} + +#pass1.strong, #pass1-text.strong { + border-color: #83c373; +} + +.pw-weak { + display: none; } .message { - border: 1px solid #c00; - padding: 0.5em 0.7em; - margin: 5px 0 15px; - background-color: #ffebe8; + border-right: 4px solid #dc3232; + padding: .7em .6em; + background-color: #fbeaea; } -/* @noflip */ +/* rtl:ignore */ #dbname, #uname, #pwd, @@ -241,6 +306,20 @@ submit { direction: ltr; } +#pass1-text, +.show-password #pass1 { + display: none; +} + +.show-password #pass1-text +{ + display: inline-block; +} + +.form-table span.description.important { + font-size: 12px; +} + /* localization */ body.rtl, @@ -295,6 +374,8 @@ body.rtl, } .form-table td input[type="text"], + .form-table td input[type="email"], + .form-table td input[type="url"], .form-table td input[type="password"], .form-table td select, .form-table td textarea, @@ -311,3 +392,71 @@ body.rtl, } } + +body.language-chooser { + max-width: 300px; +} + +.language-chooser select { + padding: 8px; + width: 100%; + display: block; + border: 1px solid #ddd; + background-color: #fff; + color: #32373c; + font-size: 16px; + font-family: Arial, sans-serif; + font-weight: normal; +} + +.language-chooser p { + text-align: left; +} + +.screen-reader-input, +.screen-reader-text { + position: absolute; + margin: -1px; + padding: 0; + height: 1px; + width: 1px; + overflow: hidden; + clip: rect(0 0 0 0); + border: 0; +} + +.spinner { + background: url(../images/spinner.gif) no-repeat; + -webkit-background-size: 20px 20px; + background-size: 20px 20px; + visibility: hidden; + opacity: 0.7; + filter: alpha(opacity=70); + width: 20px; + height: 20px; + margin: 2px 5px 0; +} + +.step .spinner { + display: inline-block; + vertical-align: middle; + margin-left: 15px; +} + +.button-secondary.hide-if-no-js, +.hide-if-no-js { + display: none; +} + +/** + * HiDPI Displays + */ +@media print, + (-webkit-min-device-pixel-ratio: 1.25), + (min-resolution: 120dpi) { + + .spinner { + background-image: url(../images/spinner-2x.gif); + } + +} diff --git a/wp-admin/css/install-rtl.min.css b/wp-admin/css/install-rtl.min.css index 6b112f7..3c62858 100644 --- a/wp-admin/css/install-rtl.min.css +++ b/wp-admin/css/install-rtl.min.css @@ -1 +1 @@ -html{background:#f1f1f1;margin:0 20px}body{background:#fff;color:#444;font-family:"Open Sans",sans-serif;margin:140px auto 25px;padding:20px 20px 10px;max-width:700px;-webkit-font-smoothing:subpixel-antialiased;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.13);box-shadow:0 1px 3px rgba(0,0,0,.13)}a{color:#0074a2;text-decoration:none}a:hover{color:#2ea2cc}h1{border-bottom:1px solid #dedede;clear:both;color:#666;font-size:24px;margin:30px 0;padding:0;padding-bottom:7px;font-weight:400}h2{font-size:16px}dd,dt,li,p{padding-bottom:2px;font-size:14px;line-height:1.5}.code,code{font-family:Consolas,Monaco,monospace}dl,ol,ul{padding:5px 22px 5px 5px}a img{border:0}abbr{border:0;font-variant:normal}#logo{margin:6px 0 14px;border-bottom:0;text-align:center}#logo a{background-image:url(../images/w-logo-blue.png?ver=20131202);background-image:none,url(../images/wordpress-logo.svg?ver=20131107);-webkit-background-size:80px 80px;background-size:80px 80px;background-position:center top;background-repeat:no-repeat;color:#999;height:80px;font-size:20px;font-weight:400;line-height:1.3em;margin:-130px auto 25px;padding:0;text-decoration:none;width:80px;text-indent:-9999px;outline:0;overflow:hidden;display:block}.step{margin:20px 0 15px}.step,th{text-align:right;padding:0}.step .button-large{font-size:14px}textarea{border:1px solid #dfdfdf;font-family:"Open Sans",sans-serif;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.form-table{border-collapse:collapse;margin-top:1em;width:100%}.form-table td{margin-bottom:9px;padding:10px 0 10px 20px;border-bottom:8px solid #fff;font-size:14px;vertical-align:top}.form-table th{font-size:14px;text-align:right;padding:16px 0 10px 20px;width:140px;vertical-align:top}.form-table code{line-height:18px;font-size:14px}.form-table p{margin:4px 0 0;font-size:11px}.form-table input{line-height:20px;font-size:15px;padding:3px 5px;border:1px solid #ddd;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.07);box-shadow:inset 0 1px 2px rgba(0,0,0,.07)}input,submit{font-family:"Open Sans",sans-serif}.form-table input[type=password],.form-table input[type=text]{width:206px}.form-table th p{font-weight:400}.form-table.install-success td{vertical-align:middle;padding:16px 0 10px 20px}.form-table.install-success td p{margin:0;font-size:14px}.form-table.install-success td code{margin:0;font-size:18px}#error-page{margin-top:50px}#error-page p{font-size:14px;line-height:18px;margin:25px 0 20px}#error-page code,.code{font-family:Consolas,Monaco,monospace}#pass-strength-result{background-color:#eee;border-color:#ddd!important;border-style:solid;border-width:1px;margin:5px 0 5px 5px;padding:5px;text-align:center;width:200px;display:none}#pass-strength-result.bad{background-color:#ffb78c;border-color:#ff853c!important}#pass-strength-result.good{background-color:#ffec8b;border-color:#fc0!important}#pass-strength-result.short{background-color:#ffa0a0;border-color:#f04040!important}#pass-strength-result.strong{background-color:#c3ff88;border-color:#8dff1c!important}.message{border:1px solid #c00;padding:.5em .7em;margin:5px 0 15px;background-color:#ffebe8}#admin_email,#dbhost,#dbname,#pass1,#pass2,#prefix,#pwd,#uname,#user_login{direction:ltr}.rtl input,.rtl submit,.rtl textarea,body.rtl{font-family:Tahoma,sans-serif}:lang(he-il) .rtl input,:lang(he-il) .rtl submit,:lang(he-il) .rtl textarea,:lang(he-il) body.rtl{font-family:Arial,sans-serif}@media only screen and (max-width:799px){body{margin-top:115px}#logo a{margin:-125px auto 30px}}@media screen and (max-width:782px){.form-table{margin-top:0}.form-table td,.form-table th{display:block;width:auto;vertical-align:middle}.form-table th{padding:20px 0 0}.form-table td{padding:5px 0;border:0;margin:0}input,textarea{font-size:16px}.form-table span.description,.form-table td input[type=password],.form-table td input[type=text],.form-table td select,.form-table td textarea{width:100%;font-size:16px;line-height:1.5;padding:7px 10px;display:block;max-width:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}} \ No newline at end of file +a img,abbr,fieldset{border:0}#logo,h1,h2{padding:0 0 7px}#logo a,.form-table th p,h1,h2{font-weight:400}html{background:#f1f1f1;margin:0 20px}body{background:#fff;color:#444;font-family:"Open Sans",sans-serif;margin:140px auto 25px;padding:20px 20px 10px;max-width:700px;-webkit-font-smoothing:subpixel-antialiased;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.13);box-shadow:0 1px 3px rgba(0,0,0,.13)}a{color:#0073aa}a:active,a:hover{color:#00a0d2}a:focus{color:#124964;-webkit-box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}.ie8 a:focus{outline:#5b9dd9 solid 1px}h1,h2{border-bottom:1px solid #ddd;clear:both;color:#666;font-size:24px}h3{font-size:16px}dd,dt,li,p{padding-bottom:2px;font-size:14px;line-height:1.5}.code,code{font-family:Consolas,Monaco,monospace}input,submit,textarea{font-family:"Open Sans",sans-serif}dl,ol,ul{padding:5px 22px 5px 5px}abbr{font-variant:normal}fieldset{padding:0;margin:0}label{cursor:pointer}#logo{margin:6px 0 14px;border-bottom:none;text-align:center}#logo a{background-image:url(../images/w-logo-blue.png?ver=20131202);background-image:none,url(../images/wordpress-logo.svg?ver=20131107);-webkit-background-size:84px;background-size:84px;background-position:center top;background-repeat:no-repeat;color:#444;height:84px;font-size:20px;line-height:1.3em;margin:-130px auto 25px;padding:0;text-decoration:none;width:84px;text-indent:-9999px;outline:0;overflow:hidden;display:block}#pass1-text,.pw-weak,.show-password #pass1{display:none}#logo a:focus{-webkit-box-shadow:none;box-shadow:none}.step{margin:20px 0 15px}.step,th{text-align:right;padding:0}.language-chooser.wp-core-ui .step .button.button-large{height:36px;font-size:14px;line-height:33px;vertical-align:middle}.form-table td,.form-table th{padding:10px 0 10px 20px;vertical-align:top;font-size:14px}textarea{border:1px solid #ddd;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.form-table{border-collapse:collapse;margin-top:1em;width:100%}.form-table td{margin-bottom:9px}.form-table th{text-align:right;width:140px}.form-table code{line-height:18px;font-size:14px}.form-table p{margin:4px 0 0;font-size:11px}.form-table input{line-height:20px;font-size:15px;padding:3px 5px;border:1px solid #ddd;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.07);box-shadow:inset 0 1px 2px rgba(0,0,0,.07)}.form-table input[type=email],.form-table input[type=password],.form-table input[type=text],.form-table input[type=url]{width:206px}.form-table.install-success td,.form-table.install-success th{vertical-align:middle;padding:16px 0 16px 20px}.form-table.install-success td p{margin:0;font-size:14px}.form-table.install-success td code{margin:0;font-size:18px}#error-page{margin-top:50px}#error-page p{font-size:14px;line-height:18px;margin:25px 0 20px}#error-page code,.code{font-family:Consolas,Monaco,monospace}.wp-hide-pw>.dashicons{line-height:inherit}#pass-strength-result{background-color:#eee;border:1px solid #ddd;color:#23282d;margin:-2px 0 5px 5px;padding:3px 5px;text-align:center;width:218px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;opacity:0}#pass-strength-result.short{background-color:#f1adad;border-color:#e35b5b;opacity:1}#pass-strength-result.bad{background-color:#fbc5a9;border-color:#f78b53;opacity:1}#pass-strength-result.good{background-color:#ffe399;border-color:#ffc733;opacity:1}#pass-strength-result.strong{background-color:#c1e1b9;border-color:#83c373;opacity:1}#pass1-text.short,#pass1.short{border-color:#e35b5b}#pass1-text.bad,#pass1.bad{border-color:#f78b53}#pass1-text.good,#pass1.good{border-color:#ffc733}#pass1-text.strong,#pass1.strong{border-color:#83c373}.message{border-right:4px solid #dc3232;padding:.7em .6em;background-color:#fbeaea}#admin_email,#dbhost,#dbname,#pass1,#pass2,#prefix,#pwd,#uname,#user_login{direction:ltr}.show-password #pass1-text{display:inline-block}.form-table span.description.important{font-size:12px}.rtl input,.rtl submit,.rtl textarea,body.rtl{font-family:Tahoma,sans-serif}.language-chooser select,:lang(he-il) .rtl input,:lang(he-il) .rtl submit,:lang(he-il) .rtl textarea,:lang(he-il) body.rtl{font-family:Arial,sans-serif}@media only screen and (max-width:799px){body{margin-top:115px}#logo a{margin:-125px auto 30px}}@media screen and (max-width:782px){.form-table{margin-top:0}.form-table td,.form-table th{display:block;width:auto;vertical-align:middle}.form-table th{padding:20px 0 0}.form-table td{padding:5px 0;border:0;margin:0}input,textarea{font-size:16px}.form-table span.description,.form-table td input[type=text],.form-table td input[type=email],.form-table td input[type=url],.form-table td input[type=password],.form-table td select,.form-table td textarea{width:100%;font-size:16px;line-height:1.5;padding:7px 10px;display:block;max-width:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}}body.language-chooser{max-width:300px}.language-chooser select{padding:8px;width:100%;display:block;border:1px solid #ddd;background-color:#fff;color:#32373c;font-size:16px;font-weight:400}.language-chooser p{text-align:left}.screen-reader-input,.screen-reader-text{position:absolute;margin:-1px;padding:0;height:1px;width:1px;overflow:hidden;clip:rect(0 0 0 0);border:0}.spinner{background:url(../images/spinner.gif) no-repeat;-webkit-background-size:20px 20px;background-size:20px 20px;visibility:hidden;opacity:.7;filter:alpha(opacity=70);width:20px;height:20px;margin:2px 5px 0}.step .spinner{display:inline-block;vertical-align:middle;margin-left:15px}.button-secondary.hide-if-no-js,.hide-if-no-js{display:none}@media print,(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.spinner{background-image:url(../images/spinner-2x.gif)}} \ No newline at end of file diff --git a/wp-admin/css/install.css b/wp-admin/css/install.css index a2e19a1..55fbe54 100644 --- a/wp-admin/css/install.css +++ b/wp-admin/css/install.css @@ -16,26 +16,39 @@ body { } a { - color: #0074a2; - text-decoration: none; + color: #0073aa; +} + +a:hover, +a:active { + color: #00a0d2; +} + +a:focus { + color: #124964; + -webkit-box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); + box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); } -a:hover { - color: #2ea2cc; +.ie8 a:focus { + outline: #5b9dd9 solid 1px; } -h1 { - border-bottom: 1px solid #dedede; +h1, h2 { + border-bottom: 1px solid #ddd; clear: both; color: #666; font-size: 24px; - margin: 30px 0; padding: 0; padding-bottom: 7px; font-weight: normal; } -h2 { +h3 { font-size: 16px; } @@ -60,32 +73,50 @@ abbr { border: 0; font-variant: normal; } + +fieldset { + border: 0; + padding: 0; + margin: 0; +} + +label { + cursor: pointer; +} + #logo { margin: 6px 0 14px 0; + padding: 0 0 7px 0; border-bottom: none; text-align:center } #logo a { background-image: url(../images/w-logo-blue.png?ver=20131202); background-image: none, url(../images/wordpress-logo.svg?ver=20131107); - -webkit-background-size: 80px 80px; - background-size: 80px 80px; + -webkit-background-size: 84px; + background-size: 84px; background-position: center top; background-repeat: no-repeat; - color: #999; - height: 80px; + color: #444; /* same as login.css */ + height: 84px; font-size: 20px; font-weight: normal; line-height: 1.3em; margin: -130px auto 25px; padding: 0; text-decoration: none; - width: 80px; + width: 84px; text-indent: -9999px; outline: none; overflow: hidden; display: block; } + +#logo a:focus { + -webkit-box-shadow: none; + box-shadow: none; +} + .step { margin: 20px 0 15px; } @@ -93,11 +124,14 @@ abbr { text-align: left; padding: 0; } -.step .button-large { +.language-chooser.wp-core-ui .step .button.button-large { + height: 36px; font-size: 14px; + line-height: 33px; + vertical-align: middle; } textarea { - border: 1px solid #dfdfdf; + border: 1px solid #ddd; font-family: "Open Sans", sans-serif; width: 100%; -webkit-box-sizing: border-box; @@ -114,7 +148,6 @@ textarea { .form-table td { margin-bottom: 9px; padding: 10px 20px 10px 0; - border-bottom: 8px solid #fff; font-size: 14px; vertical-align: top } @@ -122,7 +155,7 @@ textarea { .form-table th { font-size: 14px; text-align: left; - padding: 16px 20px 10px 0; + padding: 10px 20px 10px 0; width: 140px; vertical-align: top; } @@ -152,6 +185,8 @@ submit { } .form-table input[type=text], +.form-table input[type=email], +.form-table input[type=url], .form-table input[type=password] { width: 206px; } @@ -160,9 +195,10 @@ submit { font-weight: normal; } +.form-table.install-success th, .form-table.install-success td { vertical-align: middle; - padding: 16px 20px 10px 0; + padding: 16px 20px 16px 0; } .form-table.install-success td p { @@ -189,46 +225,75 @@ submit { font-family: Consolas, Monaco, monospace; } +.wp-hide-pw > .dashicons { + line-height: inherit; +} + #pass-strength-result { background-color: #eee; - border-color: #ddd !important; - border-style: solid; - border-width: 1px; - margin: 5px 5px 5px 0; - padding: 5px; + border: 1px solid #ddd; + color: #23282d; + margin: -2px 5px 5px 0px; + padding: 3px 5px; text-align: center; - width: 200px; - display: none; + width: 218px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + opacity: 0; +} + +#pass-strength-result.short { + background-color: #f1adad; + border-color: #e35b5b; + opacity: 1; } #pass-strength-result.bad { - background-color: #ffb78c; - border-color: #ff853c !important; + background-color: #fbc5a9; + border-color: #f78b53; + opacity: 1; } #pass-strength-result.good { - background-color: #ffec8b; - border-color: #ffcc00 !important; + background-color: #ffe399; + border-color: #ffc733; + opacity: 1; } -#pass-strength-result.short { - background-color: #ffa0a0; - border-color: #f04040 !important; +#pass-strength-result.strong { + background-color: #c1e1b9; + border-color: #83c373; + opacity: 1; } -#pass-strength-result.strong { - background-color: #c3ff88; - border-color: #8dff1c !important; +#pass1.short, #pass1-text.short { + border-color: #e35b5b; +} + +#pass1.bad, #pass1-text.bad { + border-color: #f78b53; +} + +#pass1.good, #pass1-text.good { + border-color: #ffc733; +} + +#pass1.strong, #pass1-text.strong { + border-color: #83c373; +} + +.pw-weak { + display: none; } .message { - border: 1px solid #c00; - padding: 0.5em 0.7em; - margin: 5px 0 15px; - background-color: #ffebe8; + border-left: 4px solid #dc3232; + padding: .7em .6em; + background-color: #fbeaea; } -/* @noflip */ +/* rtl:ignore */ #dbname, #uname, #pwd, @@ -241,6 +306,20 @@ submit { direction: ltr; } +#pass1-text, +.show-password #pass1 { + display: none; +} + +.show-password #pass1-text +{ + display: inline-block; +} + +.form-table span.description.important { + font-size: 12px; +} + /* localization */ body.rtl, @@ -295,6 +374,8 @@ body.rtl, } .form-table td input[type="text"], + .form-table td input[type="email"], + .form-table td input[type="url"], .form-table td input[type="password"], .form-table td select, .form-table td textarea, @@ -311,3 +392,71 @@ body.rtl, } } + +body.language-chooser { + max-width: 300px; +} + +.language-chooser select { + padding: 8px; + width: 100%; + display: block; + border: 1px solid #ddd; + background-color: #fff; + color: #32373c; + font-size: 16px; + font-family: Arial, sans-serif; + font-weight: normal; +} + +.language-chooser p { + text-align: right; +} + +.screen-reader-input, +.screen-reader-text { + position: absolute; + margin: -1px; + padding: 0; + height: 1px; + width: 1px; + overflow: hidden; + clip: rect(0 0 0 0); + border: 0; +} + +.spinner { + background: url(../images/spinner.gif) no-repeat; + -webkit-background-size: 20px 20px; + background-size: 20px 20px; + visibility: hidden; + opacity: 0.7; + filter: alpha(opacity=70); + width: 20px; + height: 20px; + margin: 2px 5px 0; +} + +.step .spinner { + display: inline-block; + vertical-align: middle; + margin-right: 15px; +} + +.button-secondary.hide-if-no-js, +.hide-if-no-js { + display: none; +} + +/** + * HiDPI Displays + */ +@media print, + (-webkit-min-device-pixel-ratio: 1.25), + (min-resolution: 120dpi) { + + .spinner { + background-image: url(../images/spinner-2x.gif); + } + +} diff --git a/wp-admin/css/install.min.css b/wp-admin/css/install.min.css index 1a712e8..d82bb1e 100644 --- a/wp-admin/css/install.min.css +++ b/wp-admin/css/install.min.css @@ -1 +1 @@ -html{background:#f1f1f1;margin:0 20px}body{background:#fff;color:#444;font-family:"Open Sans",sans-serif;margin:140px auto 25px;padding:20px 20px 10px;max-width:700px;-webkit-font-smoothing:subpixel-antialiased;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.13);box-shadow:0 1px 3px rgba(0,0,0,.13)}a{color:#0074a2;text-decoration:none}a:hover{color:#2ea2cc}h1{border-bottom:1px solid #dedede;clear:both;color:#666;font-size:24px;margin:30px 0;padding:0;padding-bottom:7px;font-weight:400}h2{font-size:16px}dd,dt,li,p{padding-bottom:2px;font-size:14px;line-height:1.5}.code,code{font-family:Consolas,Monaco,monospace}dl,ol,ul{padding:5px 5px 5px 22px}a img{border:0}abbr{border:0;font-variant:normal}#logo{margin:6px 0 14px;border-bottom:0;text-align:center}#logo a{background-image:url(../images/w-logo-blue.png?ver=20131202);background-image:none,url(../images/wordpress-logo.svg?ver=20131107);-webkit-background-size:80px 80px;background-size:80px 80px;background-position:center top;background-repeat:no-repeat;color:#999;height:80px;font-size:20px;font-weight:400;line-height:1.3em;margin:-130px auto 25px;padding:0;text-decoration:none;width:80px;text-indent:-9999px;outline:0;overflow:hidden;display:block}.step{margin:20px 0 15px}.step,th{text-align:left;padding:0}.step .button-large{font-size:14px}textarea{border:1px solid #dfdfdf;font-family:"Open Sans",sans-serif;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.form-table{border-collapse:collapse;margin-top:1em;width:100%}.form-table td{margin-bottom:9px;padding:10px 20px 10px 0;border-bottom:8px solid #fff;font-size:14px;vertical-align:top}.form-table th{font-size:14px;text-align:left;padding:16px 20px 10px 0;width:140px;vertical-align:top}.form-table code{line-height:18px;font-size:14px}.form-table p{margin:4px 0 0;font-size:11px}.form-table input{line-height:20px;font-size:15px;padding:3px 5px;border:1px solid #ddd;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.07);box-shadow:inset 0 1px 2px rgba(0,0,0,.07)}input,submit{font-family:"Open Sans",sans-serif}.form-table input[type=password],.form-table input[type=text]{width:206px}.form-table th p{font-weight:400}.form-table.install-success td{vertical-align:middle;padding:16px 20px 10px 0}.form-table.install-success td p{margin:0;font-size:14px}.form-table.install-success td code{margin:0;font-size:18px}#error-page{margin-top:50px}#error-page p{font-size:14px;line-height:18px;margin:25px 0 20px}#error-page code,.code{font-family:Consolas,Monaco,monospace}#pass-strength-result{background-color:#eee;border-color:#ddd!important;border-style:solid;border-width:1px;margin:5px 5px 5px 0;padding:5px;text-align:center;width:200px;display:none}#pass-strength-result.bad{background-color:#ffb78c;border-color:#ff853c!important}#pass-strength-result.good{background-color:#ffec8b;border-color:#fc0!important}#pass-strength-result.short{background-color:#ffa0a0;border-color:#f04040!important}#pass-strength-result.strong{background-color:#c3ff88;border-color:#8dff1c!important}.message{border:1px solid #c00;padding:.5em .7em;margin:5px 0 15px;background-color:#ffebe8}#admin_email,#dbhost,#dbname,#pass1,#pass2,#prefix,#pwd,#uname,#user_login{direction:ltr}.rtl input,.rtl submit,.rtl textarea,body.rtl{font-family:Tahoma,sans-serif}:lang(he-il) .rtl input,:lang(he-il) .rtl submit,:lang(he-il) .rtl textarea,:lang(he-il) body.rtl{font-family:Arial,sans-serif}@media only screen and (max-width:799px){body{margin-top:115px}#logo a{margin:-125px auto 30px}}@media screen and (max-width:782px){.form-table{margin-top:0}.form-table td,.form-table th{display:block;width:auto;vertical-align:middle}.form-table th{padding:20px 0 0}.form-table td{padding:5px 0;border:0;margin:0}input,textarea{font-size:16px}.form-table span.description,.form-table td input[type=password],.form-table td input[type=text],.form-table td select,.form-table td textarea{width:100%;font-size:16px;line-height:1.5;padding:7px 10px;display:block;max-width:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}} \ No newline at end of file +a img,abbr,fieldset{border:0}#logo,h1,h2{padding:0 0 7px}#logo a,.form-table th p,h1,h2{font-weight:400}html{background:#f1f1f1;margin:0 20px}body{background:#fff;color:#444;font-family:"Open Sans",sans-serif;margin:140px auto 25px;padding:20px 20px 10px;max-width:700px;-webkit-font-smoothing:subpixel-antialiased;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.13);box-shadow:0 1px 3px rgba(0,0,0,.13)}a{color:#0073aa}a:active,a:hover{color:#00a0d2}a:focus{color:#124964;-webkit-box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}.ie8 a:focus{outline:#5b9dd9 solid 1px}h1,h2{border-bottom:1px solid #ddd;clear:both;color:#666;font-size:24px}h3{font-size:16px}dd,dt,li,p{padding-bottom:2px;font-size:14px;line-height:1.5}.code,code{font-family:Consolas,Monaco,monospace}input,submit,textarea{font-family:"Open Sans",sans-serif}dl,ol,ul{padding:5px 5px 5px 22px}abbr{font-variant:normal}fieldset{padding:0;margin:0}label{cursor:pointer}#logo{margin:6px 0 14px;border-bottom:none;text-align:center}#logo a{background-image:url(../images/w-logo-blue.png?ver=20131202);background-image:none,url(../images/wordpress-logo.svg?ver=20131107);-webkit-background-size:84px;background-size:84px;background-position:center top;background-repeat:no-repeat;color:#444;height:84px;font-size:20px;line-height:1.3em;margin:-130px auto 25px;padding:0;text-decoration:none;width:84px;text-indent:-9999px;outline:0;overflow:hidden;display:block}#pass1-text,.pw-weak,.show-password #pass1{display:none}#logo a:focus{-webkit-box-shadow:none;box-shadow:none}.step{margin:20px 0 15px}.step,th{text-align:left;padding:0}.language-chooser.wp-core-ui .step .button.button-large{height:36px;font-size:14px;line-height:33px;vertical-align:middle}.form-table td,.form-table th{padding:10px 20px 10px 0;vertical-align:top;font-size:14px}textarea{border:1px solid #ddd;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.form-table{border-collapse:collapse;margin-top:1em;width:100%}.form-table td{margin-bottom:9px}.form-table th{text-align:left;width:140px}.form-table code{line-height:18px;font-size:14px}.form-table p{margin:4px 0 0;font-size:11px}.form-table input{line-height:20px;font-size:15px;padding:3px 5px;border:1px solid #ddd;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.07);box-shadow:inset 0 1px 2px rgba(0,0,0,.07)}.form-table input[type=email],.form-table input[type=password],.form-table input[type=text],.form-table input[type=url]{width:206px}.form-table.install-success td,.form-table.install-success th{vertical-align:middle;padding:16px 20px 16px 0}.form-table.install-success td p{margin:0;font-size:14px}.form-table.install-success td code{margin:0;font-size:18px}#error-page{margin-top:50px}#error-page p{font-size:14px;line-height:18px;margin:25px 0 20px}#error-page code,.code{font-family:Consolas,Monaco,monospace}.wp-hide-pw>.dashicons{line-height:inherit}#pass-strength-result{background-color:#eee;border:1px solid #ddd;color:#23282d;margin:-2px 5px 5px 0;padding:3px 5px;text-align:center;width:218px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;opacity:0}#pass-strength-result.short{background-color:#f1adad;border-color:#e35b5b;opacity:1}#pass-strength-result.bad{background-color:#fbc5a9;border-color:#f78b53;opacity:1}#pass-strength-result.good{background-color:#ffe399;border-color:#ffc733;opacity:1}#pass-strength-result.strong{background-color:#c1e1b9;border-color:#83c373;opacity:1}#pass1-text.short,#pass1.short{border-color:#e35b5b}#pass1-text.bad,#pass1.bad{border-color:#f78b53}#pass1-text.good,#pass1.good{border-color:#ffc733}#pass1-text.strong,#pass1.strong{border-color:#83c373}.message{border-left:4px solid #dc3232;padding:.7em .6em;background-color:#fbeaea}#admin_email,#dbhost,#dbname,#pass1,#pass2,#prefix,#pwd,#uname,#user_login{direction:ltr}.show-password #pass1-text{display:inline-block}.form-table span.description.important{font-size:12px}.rtl input,.rtl submit,.rtl textarea,body.rtl{font-family:Tahoma,sans-serif}.language-chooser select,:lang(he-il) .rtl input,:lang(he-il) .rtl submit,:lang(he-il) .rtl textarea,:lang(he-il) body.rtl{font-family:Arial,sans-serif}@media only screen and (max-width:799px){body{margin-top:115px}#logo a{margin:-125px auto 30px}}@media screen and (max-width:782px){.form-table{margin-top:0}.form-table td,.form-table th{display:block;width:auto;vertical-align:middle}.form-table th{padding:20px 0 0}.form-table td{padding:5px 0;border:0;margin:0}input,textarea{font-size:16px}.form-table span.description,.form-table td input[type=text],.form-table td input[type=email],.form-table td input[type=url],.form-table td input[type=password],.form-table td select,.form-table td textarea{width:100%;font-size:16px;line-height:1.5;padding:7px 10px;display:block;max-width:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}}body.language-chooser{max-width:300px}.language-chooser select{padding:8px;width:100%;display:block;border:1px solid #ddd;background-color:#fff;color:#32373c;font-size:16px;font-weight:400}.language-chooser p{text-align:right}.screen-reader-input,.screen-reader-text{position:absolute;margin:-1px;padding:0;height:1px;width:1px;overflow:hidden;clip:rect(0 0 0 0);border:0}.spinner{background:url(../images/spinner.gif) no-repeat;-webkit-background-size:20px 20px;background-size:20px 20px;visibility:hidden;opacity:.7;filter:alpha(opacity=70);width:20px;height:20px;margin:2px 5px 0}.step .spinner{display:inline-block;vertical-align:middle;margin-right:15px}.button-secondary.hide-if-no-js,.hide-if-no-js{display:none}@media print,(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.spinner{background-image:url(../images/spinner-2x.gif)}} \ No newline at end of file diff --git a/wp-admin/css/l10n-rtl.css b/wp-admin/css/l10n-rtl.css index 5590f1d..0da51c4 100644 --- a/wp-admin/css/l10n-rtl.css +++ b/wp-admin/css/l10n-rtl.css @@ -8,6 +8,16 @@ body.rtl .press-this a.wp-switch-editor { font-family: Tahoma, Arial, sans-serif; } +/* Arial is best for RTL headings. */ +.rtl h1, +.rtl h2, +.rtl h3, +.rtl h4, +.rtl h5, +.rtl h6 { + font-family: Arial, sans-serif; + font-weight: bold; +} /* he_IL: Remove Tahoma from the font stack. Arial is best for Hebrew. */ body.locale-he-il, @@ -44,38 +54,37 @@ body.locale-he-il .press-this a.wp-switch-editor { /* zn_CH: Enlarge font size, set font-size: normal */ .locale-zh-cn form.upgrade .hint { font-style: normal; font-size: 100%; } -/* Zn_CH: Distraction free writing. - * More beautiful font for "Just write." - * Larger text for HTML/Visual mode. - */ -.locale-zh-cn #wp-fullscreen-tagline { font-family: KaiTi, "æ¥·ä½", sans-serif; } -.locale-zh-cn #wp-fullscreen-modes a { font-size: 12px; } - /* zh_CN: Enlarge font-size. */ .locale-zh-cn #sort-buttons { font-size: 1em !important; } /* de_DE: Text needs more space for translation */ -.locale-de-de .inline-edit-row fieldset label span.title { - width: 7em; /* default 5em */ -} -.locale-de-de .inline-edit-row fieldset label span.input-text-wrap { - margin-right: 7em; /* default 5em */ -} -.locale-de-de #customize-header-actions .button { +.locale-de-de #customize-header-actions .button, +.locale-de-de-formal #customize-header-actions .button { padding: 0 5px 1px; /* default 0 10px 1px */ } -.locale-de-de #customize-header-actions .spinner { +.locale-de-de #customize-header-actions .spinner, +.locale-de-de-formal #customize-header-actions .spinner { margin: 16px 3px 0; /* default 16px 4px 0 5px */ } /* ru_RU: Text needs more room to breathe. */ -.locale-ru-ru .inline-edit-row fieldset label span.title { - width: 8em; /* default 5em */ +.locale-ru-ru #adminmenu { + width: inherit; /* back-compat for pre-3.2 */ +} +.locale-ru-ru #adminmenu, +.locale-ru-ru #wpbody { + margin-right: 0; /* back-compat for pre-3.2 */ +} +.locale-ru-ru .inline-edit-row fieldset label span.title, +.locale-ru-ru .inline-edit-row fieldset.inline-edit-date legend { + width: 8em; /* default 6em */ } -.locale-ru-ru .inline-edit-row fieldset label span.input-text-wrap { - margin-right: 8em; /* default 5em */ +.locale-ru-ru .inline-edit-row fieldset label span.input-text-wrap, +.locale-ru-ru .inline-edit-row fieldset .timestamp-wrap { + margin-right: 8em; /* default 6em */ } -.locale-ru-ru.post-php .tagsdiv .newtag { +.locale-ru-ru.post-php .tagsdiv .newtag, +.locale-ru-ru.post-new-php .tagsdiv .newtag { width: 165px; /* default 180px - 15px */ } .locale-ru-ru.press-this .posting { @@ -92,9 +101,20 @@ body.locale-he-il .press-this a.wp-switch-editor { } /* lt_LT: QuickEdit */ -.locale-lt-lt .inline-edit-row fieldset label span.title { - width: 8em; +.locale-lt-lt .inline-edit-row fieldset label span.title, +.locale-lt-lt .inline-edit-row fieldset.inline-edit-date legend { + width: 8em; /* default 6em */ } -.locale-lt-lt .inline-edit-row fieldset label span.input-text-wrap { - margin-right: 8em; +.locale-lt-lt .inline-edit-row fieldset label span.input-text-wrap, +.locale-lt-lt .inline-edit-row fieldset .timestamp-wrap { + margin-right: 8em; /* default 6em */ +} + +@media screen and (max-width: 782px) { + .locale-ru-ru .inline-edit-row fieldset label span.input-text-wrap, + .locale-ru-ru .inline-edit-row fieldset .timestamp-wrap, + .locale-lt-lt .inline-edit-row fieldset label span.input-text-wrap, + .locale-lt-lt .inline-edit-row fieldset .timestamp-wrap { + margin-right: 0; + } } diff --git a/wp-admin/css/l10n-rtl.min.css b/wp-admin/css/l10n-rtl.min.css new file mode 100644 index 0000000..37bd513 --- /dev/null +++ b/wp-admin/css/l10n-rtl.min.css @@ -0,0 +1 @@ +.locale-he-il em,.locale-zh-cn #local-time,.locale-zh-cn #utc-time,.locale-zh-cn .form-wrap p,.locale-zh-cn .howto,.locale-zh-cn .inline-edit-row fieldset span.checkbox-title,.locale-zh-cn .inline-edit-row fieldset span.title,.locale-zh-cn .js .input-with-default-title,.locale-zh-cn .link-to-original,.locale-zh-cn .tablenav .displaying-num,.locale-zh-cn p.description,.locale-zh-cn p.help,.locale-zh-cn p.install-help,.locale-zh-cn span.description{font-style:normal}.locale-de-de #customize-header-actions .button,.locale-de-de-formal #customize-header-actions .button,.locale-ru-ru #customize-header-actions .button{padding:0 5px 1px}body.rtl,body.rtl .press-this a.wp-switch-editor{font-family:Tahoma,Arial,sans-serif}.rtl h1,.rtl h2,.rtl h3,.rtl h4,.rtl h5,.rtl h6{font-family:Arial,sans-serif;font-weight:700}body.locale-he-il,body.locale-he-il .press-this a.wp-switch-editor{font-family:Arial,sans-serif}.locale-he-il em{font-weight:700}.locale-zh-cn .hdnle a{font-size:12px}.locale-zh-cn form.upgrade .hint{font-style:normal;font-size:100%}.locale-zh-cn #sort-buttons{font-size:1em!important}.locale-de-de #customize-header-actions .spinner,.locale-de-de-formal #customize-header-actions .spinner{margin:16px 3px 0}.locale-ru-ru #adminmenu{width:inherit}.locale-ru-ru #adminmenu,.locale-ru-ru #wpbody{margin-right:0}.locale-ru-ru .inline-edit-row fieldset label span.title,.locale-ru-ru .inline-edit-row fieldset.inline-edit-date legend{width:8em}.locale-ru-ru .inline-edit-row fieldset .timestamp-wrap,.locale-ru-ru .inline-edit-row fieldset label span.input-text-wrap{margin-right:8em}.locale-ru-ru.post-new-php .tagsdiv .newtag,.locale-ru-ru.post-php .tagsdiv .newtag{width:165px}.locale-ru-ru.press-this .posting{margin-left:277px}.locale-ru-ru .press-this-sidebar{width:265px}.locale-ru-ru #customize-header-actions .spinner{margin:16px 3px 0}.locale-lt-lt .inline-edit-row fieldset label span.title,.locale-lt-lt .inline-edit-row fieldset.inline-edit-date legend{width:8em}.locale-lt-lt .inline-edit-row fieldset .timestamp-wrap,.locale-lt-lt .inline-edit-row fieldset label span.input-text-wrap{margin-right:8em}@media screen and (max-width:782px){.locale-lt-lt .inline-edit-row fieldset .timestamp-wrap,.locale-lt-lt .inline-edit-row fieldset label span.input-text-wrap,.locale-ru-ru .inline-edit-row fieldset .timestamp-wrap,.locale-ru-ru .inline-edit-row fieldset label span.input-text-wrap{margin-right:0}} \ No newline at end of file diff --git a/wp-admin/css/l10n.css b/wp-admin/css/l10n.css index 3b056d6..6c603bf 100644 --- a/wp-admin/css/l10n.css +++ b/wp-admin/css/l10n.css @@ -8,6 +8,16 @@ body.rtl .press-this a.wp-switch-editor { font-family: Tahoma, Arial, sans-serif; } +/* Arial is best for RTL headings. */ +.rtl h1, +.rtl h2, +.rtl h3, +.rtl h4, +.rtl h5, +.rtl h6 { + font-family: Arial, sans-serif; + font-weight: bold; +} /* he_IL: Remove Tahoma from the font stack. Arial is best for Hebrew. */ body.locale-he-il, @@ -44,38 +54,37 @@ body.locale-he-il .press-this a.wp-switch-editor { /* zn_CH: Enlarge font size, set font-size: normal */ .locale-zh-cn form.upgrade .hint { font-style: normal; font-size: 100%; } -/* Zn_CH: Distraction free writing. - * More beautiful font for "Just write." - * Larger text for HTML/Visual mode. - */ -.locale-zh-cn #wp-fullscreen-tagline { font-family: KaiTi, "æ¥·ä½", sans-serif; } -.locale-zh-cn #wp-fullscreen-modes a { font-size: 12px; } - /* zh_CN: Enlarge font-size. */ .locale-zh-cn #sort-buttons { font-size: 1em !important; } /* de_DE: Text needs more space for translation */ -.locale-de-de .inline-edit-row fieldset label span.title { - width: 7em; /* default 5em */ -} -.locale-de-de .inline-edit-row fieldset label span.input-text-wrap { - margin-left: 7em; /* default 5em */ -} -.locale-de-de #customize-header-actions .button { +.locale-de-de #customize-header-actions .button, +.locale-de-de-formal #customize-header-actions .button { padding: 0 5px 1px; /* default 0 10px 1px */ } -.locale-de-de #customize-header-actions .spinner { +.locale-de-de #customize-header-actions .spinner, +.locale-de-de-formal #customize-header-actions .spinner { margin: 16px 3px 0; /* default 16px 4px 0 5px */ } /* ru_RU: Text needs more room to breathe. */ -.locale-ru-ru .inline-edit-row fieldset label span.title { - width: 8em; /* default 5em */ +.locale-ru-ru #adminmenu { + width: inherit; /* back-compat for pre-3.2 */ +} +.locale-ru-ru #adminmenu, +.locale-ru-ru #wpbody { + margin-left: 0; /* back-compat for pre-3.2 */ +} +.locale-ru-ru .inline-edit-row fieldset label span.title, +.locale-ru-ru .inline-edit-row fieldset.inline-edit-date legend { + width: 8em; /* default 6em */ } -.locale-ru-ru .inline-edit-row fieldset label span.input-text-wrap { - margin-left: 8em; /* default 5em */ +.locale-ru-ru .inline-edit-row fieldset label span.input-text-wrap, +.locale-ru-ru .inline-edit-row fieldset .timestamp-wrap { + margin-left: 8em; /* default 6em */ } -.locale-ru-ru.post-php .tagsdiv .newtag { +.locale-ru-ru.post-php .tagsdiv .newtag, +.locale-ru-ru.post-new-php .tagsdiv .newtag { width: 165px; /* default 180px - 15px */ } .locale-ru-ru.press-this .posting { @@ -92,9 +101,20 @@ body.locale-he-il .press-this a.wp-switch-editor { } /* lt_LT: QuickEdit */ -.locale-lt-lt .inline-edit-row fieldset label span.title { - width: 8em; +.locale-lt-lt .inline-edit-row fieldset label span.title, +.locale-lt-lt .inline-edit-row fieldset.inline-edit-date legend { + width: 8em; /* default 6em */ } -.locale-lt-lt .inline-edit-row fieldset label span.input-text-wrap { - margin-left: 8em; +.locale-lt-lt .inline-edit-row fieldset label span.input-text-wrap, +.locale-lt-lt .inline-edit-row fieldset .timestamp-wrap { + margin-left: 8em; /* default 6em */ +} + +@media screen and (max-width: 782px) { + .locale-ru-ru .inline-edit-row fieldset label span.input-text-wrap, + .locale-ru-ru .inline-edit-row fieldset .timestamp-wrap, + .locale-lt-lt .inline-edit-row fieldset label span.input-text-wrap, + .locale-lt-lt .inline-edit-row fieldset .timestamp-wrap { + margin-left: 0; + } } diff --git a/wp-admin/css/l10n.min.css b/wp-admin/css/l10n.min.css new file mode 100644 index 0000000..50e6de6 --- /dev/null +++ b/wp-admin/css/l10n.min.css @@ -0,0 +1 @@ +.locale-he-il em,.locale-zh-cn #local-time,.locale-zh-cn #utc-time,.locale-zh-cn .form-wrap p,.locale-zh-cn .howto,.locale-zh-cn .inline-edit-row fieldset span.checkbox-title,.locale-zh-cn .inline-edit-row fieldset span.title,.locale-zh-cn .js .input-with-default-title,.locale-zh-cn .link-to-original,.locale-zh-cn .tablenav .displaying-num,.locale-zh-cn p.description,.locale-zh-cn p.help,.locale-zh-cn p.install-help,.locale-zh-cn span.description{font-style:normal}.locale-de-de #customize-header-actions .button,.locale-de-de-formal #customize-header-actions .button,.locale-ru-ru #customize-header-actions .button{padding:0 5px 1px}body.rtl,body.rtl .press-this a.wp-switch-editor{font-family:Tahoma,Arial,sans-serif}.rtl h1,.rtl h2,.rtl h3,.rtl h4,.rtl h5,.rtl h6{font-family:Arial,sans-serif;font-weight:700}body.locale-he-il,body.locale-he-il .press-this a.wp-switch-editor{font-family:Arial,sans-serif}.locale-he-il em{font-weight:700}.locale-zh-cn .hdnle a{font-size:12px}.locale-zh-cn form.upgrade .hint{font-style:normal;font-size:100%}.locale-zh-cn #sort-buttons{font-size:1em!important}.locale-de-de #customize-header-actions .spinner,.locale-de-de-formal #customize-header-actions .spinner{margin:16px 3px 0}.locale-ru-ru #adminmenu{width:inherit}.locale-ru-ru #adminmenu,.locale-ru-ru #wpbody{margin-left:0}.locale-ru-ru .inline-edit-row fieldset label span.title,.locale-ru-ru .inline-edit-row fieldset.inline-edit-date legend{width:8em}.locale-ru-ru .inline-edit-row fieldset .timestamp-wrap,.locale-ru-ru .inline-edit-row fieldset label span.input-text-wrap{margin-left:8em}.locale-ru-ru.post-new-php .tagsdiv .newtag,.locale-ru-ru.post-php .tagsdiv .newtag{width:165px}.locale-ru-ru.press-this .posting{margin-right:277px}.locale-ru-ru .press-this-sidebar{width:265px}.locale-ru-ru #customize-header-actions .spinner{margin:16px 3px 0}.locale-lt-lt .inline-edit-row fieldset label span.title,.locale-lt-lt .inline-edit-row fieldset.inline-edit-date legend{width:8em}.locale-lt-lt .inline-edit-row fieldset .timestamp-wrap,.locale-lt-lt .inline-edit-row fieldset label span.input-text-wrap{margin-left:8em}@media screen and (max-width:782px){.locale-lt-lt .inline-edit-row fieldset .timestamp-wrap,.locale-lt-lt .inline-edit-row fieldset label span.input-text-wrap,.locale-ru-ru .inline-edit-row fieldset .timestamp-wrap,.locale-ru-ru .inline-edit-row fieldset label span.input-text-wrap{margin-left:0}} \ No newline at end of file diff --git a/wp-admin/css/list-tables-rtl.css b/wp-admin/css/list-tables-rtl.css index 6f36c9e..1df80f7 100644 --- a/wp-admin/css/list-tables-rtl.css +++ b/wp-admin/css/list-tables-rtl.css @@ -1,77 +1,125 @@ -/* List table styles */ -.post-com-count-wrapper { - min-width: 22px; -} - -.post-com-count { - background: none; - height: 1.3em; - line-height: 1.1em; +.response-links { display: block; - text-decoration: none; - padding: 0 0 6px; - cursor: pointer; - background-position: center -80px; - background-repeat: no-repeat; - color: #fff; + margin-bottom: 1em; } -.post-com-count:after { /* draw bubble connector using CSS! */ - content: ""; +.response-links a { display: block; - width: 0; - height: 0; - margin-right: 8px; - border-top: 5px solid #bbb; - border-left: 5px solid transparent; } -.post-com-count span { - font-size: 11px; +.response-links a.comments-edit-item-link { font-weight: 600; - height: 1.4em; - line-height: 1.4em; - min-width: 0.7em; - padding: 0 6px; +} + +.response-links a.comments-view-item-link { + font-size: 12px; +} + +.post-com-count-wrapper strong { + font-weight: 400; +} + +.comments-view-item-link { display: inline-block; - -webkit-border-radius: 5px; - border-radius: 5px; - background-color: #bbb; - color: #fff; + clear: both; } -.post-com-count:hover { - background-position: center -3px; +.column-response .post-com-count-wrapper, +.column-comments .post-com-count-wrapper { + white-space: nowrap; + word-wrap: normal; } -.post-com-count:hover span { - background-color: #2ea2cc; +/* comments bubble common */ +.column-response .post-com-count, +.column-comments .post-com-count { + display: inline-block; + vertical-align: top; } -.post-com-count:hover:after { - border-top: 5px solid #2ea2cc; +/* comments bubble approved */ +.column-response .post-com-count-no-comments, +.column-response .post-com-count-approved, +.column-comments .post-com-count-no-comments, +.column-comments .post-com-count-approved { + margin-top: 5px; } -strong .post-com-count { - background-position: center -55px; +.column-response .comment-count-no-comments, +.column-response .comment-count-approved, +.column-comments .comment-count-no-comments, +.column-comments .comment-count-approved { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + display: block; + padding: 0 8px; + min-width: 24px; + height: 2em; + -webkit-border-radius: 5px; + border-radius: 5px; + background-color: #72777c; + color: #fff; + font-size: 11px; + line-height: 21px; + text-align: center; } -strong .post-com-count span { - background-color: #0074a2; +.ie8 .column-response .comment-count-no-comments, +.ie8 .column-response .comment-count-approved, +.ie8 .column-comments .comment-count-no-comments, +.ie8 .column-comments .comment-count-approved { + min-width: 0; } -strong .post-com-count:after { - border-top: 5px solid #0074a2; +.column-response .post-com-count-no-comments:after, +.column-response .post-com-count-approved:after, +.column-comments .post-com-count-no-comments:after, +.column-comments .post-com-count-approved:after { + content: ""; + display: block; + margin-right: 8px; + width: 0; + height: 0; + border-top: 5px solid #72777c; + border-left: 5px solid transparent; } -.column-response .post-com-count { - float: right; - margin-left: 5px; +.column-response .post-com-count-approved:hover .comment-count-approved, +.column-response .post-com-count-approved:focus .comment-count-approved, +.column-comments .post-com-count-approved:hover .comment-count-approved, +.column-comments .post-com-count-approved:focus .comment-count-approved { + background: #0073aa; +} + +.column-response .post-com-count-approved:hover:after, +.column-response .post-com-count-approved:focus:after, +.column-comments .post-com-count-approved:hover:after, +.column-comments .post-com-count-approved:focus:after { + border-top-color: #0073aa; +} + +/* comments bubble pending */ +.column-response .post-com-count-pending, +.column-comments .post-com-count-pending { + position: relative; + right: -3px; + padding: 0 5px; + min-width: 7px; + height: 17px; + border: 2px solid #fff; + -webkit-border-radius: 11px; + border-radius: 11px; + background: #ca4a1f; + color: #fff; + font-size: 9px; + line-height: 17px; text-align: center; } -.response-links { - float: right; +.column-response .post-com-count-no-pending, +.column-comments .post-com-count-no-pending { + display: none; } /* comments */ @@ -94,7 +142,7 @@ strong .post-com-count:after { #submitted-on, .submitted-on { - color: #777; + color: #555d66; } /* reply to comments */ @@ -104,16 +152,11 @@ strong .post-com-count:after { #replysubmit { margin: 0; - padding: 0 5px 3px; + padding: 5px 7px 10px; + overflow: hidden; text-align: center; } -#replysubmit .spinner { - padding: 2px 0 0; - vertical-align: top; - float: left; -} - #replysubmit .button { margin-left: 5px; } @@ -124,14 +167,27 @@ strong .post-com-count:after { text-align: center; } -#replyrow h5 { - margin: .2em 0 0; - padding: 0 5px; - line-height: 1.4em; - font-size: 1em; +#replyrow.inline-edit-row fieldset.comment-reply { + font-size: inherit; + line-height: inherit; +} + +#replyrow legend { + margin: 0; + padding: .2em 5px 0; + font-size: 13px; + line-height: 1.4; + font-weight: 600; +} + +#replyrow.inline-edit-row label { + display: inline; + vertical-align: baseline; + line-height: inherit; } -#edithead .inside { +#edithead .inside, +#commentsdiv #edithead .inside { float: right; padding: 3px 5px 2px 0; margin: 0; @@ -166,13 +222,9 @@ strong .post-com-count:after { vertical-align: text-top; } -#the-comment-list .attachment-80x60 { - padding: 4px 8px; -} - #the-comment-list tr.undo, #the-comment-list div.undo { - background-color: #f4f4f4; + background-color: #f5f5f5; } #the-comment-list .unapproved th, @@ -226,8 +278,8 @@ th .comment-grey-bubble { } th .comment-grey-bubble:before { - content: '\f101'; - font: normal 20px/.5 'dashicons'; + content: "\f101"; + font: normal 20px/.5 dashicons; speak: none; display: inline-block; padding: 0; @@ -263,6 +315,10 @@ table.fixed { width: 10%; } +.fixed .column-posts { + width: 74px; +} + .fixed .column-comment .comment-author { display: none; } @@ -284,7 +340,7 @@ table.fixed { } .fixed .column-comments { - width: 4em; + width: 5.5em; padding: 8px 0; text-align: right; } @@ -293,12 +349,37 @@ table.fixed { padding-right: 3px; } -.fixed .column-comments a { +td.column-title strong, +td.plugin-title strong { + display: block; + margin-bottom: .2em; + font-size: 14px; +} + +td.column-title p, +td.plugin-title p { + margin: 6px 0; +} + +/* Media file column */ +table.media .column-title .media-icon { float: right; + min-height: 60px; + margin: 0 0 0 9px; } -.fixed .column-icon { - width: 80px; +table.media .column-title .media-icon img { + max-width: 60px; + height: auto; + vertical-align: top; /* Remove descender white-space. */ +} + +table.media .column-title .has-media-icon ~ .row-actions { + margin-right: 70px; /* 60px image + margin */ +} + +table.media .column-title .filename { + margin-bottom: 0.2em; } /* @todo: pick a consistent list table selector */ @@ -318,6 +399,10 @@ table.fixed { width: 20%; } +#comments-form .fixed .column-date { + width: 14%; +} + #commentsdiv.postbox .inside { margin: 0; padding: 0; @@ -349,7 +434,8 @@ table.fixed { border: 0 none; } -#commentsdiv .comments-box thead th { +#commentsdiv .comments-box thead th, +#commentsdiv .comments-box thead td { background: transparent; padding: 0 7px 4px; font-style: italic; @@ -359,12 +445,13 @@ table.fixed { border-bottom: 0 none; } -#commentsdiv .spinner { - padding-right: 5px; +#commentsdiv #edithead .inside input { + width: 160px; } .sorting-indicator { - display: none; + display: block; + visibility: hidden; width: 10px; height: 4px; margin-top: 8px; @@ -372,9 +459,8 @@ table.fixed { } .sorting-indicator:before { - background: none; - content: '\f142'; - font: normal 20px/1 'dashicons'; + content: "\f142"; + font: normal 20px/1 dashicons; speak: none; display: inline-block; padding: 0; @@ -396,13 +482,71 @@ table.fixed { } th.sorted.asc .sorting-indicator:before, -th.desc:hover span.sorting-indicator:before { - content: '\f142'; +th.desc:hover span.sorting-indicator:before, +th.desc a:focus span.sorting-indicator:before { + content: "\f142"; } th.sorted.desc .sorting-indicator:before, -th.asc:hover span.sorting-indicator:before { - content: '\f140'; +th.asc:hover span.sorting-indicator:before, +th.asc a:focus span.sorting-indicator:before { + content: "\f140"; +} + +.wp-list-table .toggle-row { + position: absolute; + left: 8px; + top: 10px; + display: none; + padding: 0; + width: 40px; + height: 40px; + border: none; + outline: none; + background: transparent; +} + +.wp-list-table .toggle-row:hover { + cursor: pointer; +} + +.wp-list-table .toggle-row:focus:before { + -webkit-box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); + box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); +} + +.ie8 .wp-list-table .toggle-row:focus:before { + outline: #5b9dd9 solid 1px; +} + +.wp-list-table .toggle-row:active { + -webkit-box-shadow: none; + box-shadow: none; +} + +.wp-list-table .toggle-row:before { + position: absolute; + top: -5px; + right: 10px; + -webkit-border-radius: 50%; + border-radius: 50%; + display: block; + padding: 1px 0 1px 2px; + color: #444; /* same as table headers sort arrows */ + content: "\f140"; + font: normal 20px/1 dashicons; + line-height: 1; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + speak: none; +} + +.wp-list-table .is-expanded .toggle-row:before { + content: "\f142"; } tr.wp-locked .locked-indicator { @@ -412,11 +556,11 @@ tr.wp-locked .locked-indicator { } tr.wp-locked .locked-indicator:before { - color: #888; - content: '\f160'; + color: #82878c; + content: "\f160"; display: inline-block; float: right; - font: normal 20px/1 'dashicons'; + font: normal 20px/1 dashicons; speak: none; vertical-align: middle; margin-right: 0; @@ -468,18 +612,7 @@ th.sortable a, th.sorted a { display: block; overflow: hidden; - padding: 7px 10px 8px 7px; -} - -th.manage-column a, -th.sortable a:hover, -th.sortable a:active, -th.sortable a:focus { - color: #333; -} - -th.sortable a:focus { - background: #e1e1e1; + padding: 8px; } .fixed .column-comments.sortable a, @@ -493,29 +626,33 @@ th.sorted a span { cursor: pointer; } -th.sorted.asc .sorting-indicator, -th.desc:hover span.sorting-indicator { - display: block; - background-position: 0 0; -} - -th.sorted.desc .sorting-indicator, -th.asc:hover span.sorting-indicator { - display: block; - background-position: -7px 0; +th.sorted .sorting-indicator, +th.desc:hover span.sorting-indicator, +th.desc a:focus span.sorting-indicator, +th.asc:hover span.sorting-indicator, +th.asc a:focus span.sorting-indicator { + visibility: visible; } /* Bulk Actions */ -.tablenav-pages a { +.tablenav-pages a, +.tablenav-pages-navspan { font-weight: 600; - margin-left: 1px; padding: 0 2px; } + .tablenav-pages .current-page { - padding-top: 0; + margin: 0 0 0 2px; + padding-bottom: 5px; + font-size: 13px; text-align: center; } -.tablenav-pages .next-page { + +.tablenav .total-pages { + margin-left: 2px; +} + +.tablenav #table-paging { margin-right: 2px; } @@ -537,12 +674,10 @@ th.asc:hover span.sorting-indicator { .tablenav .tablenav-pages { float: left; - display: block; + height: 28px; + margin-top: 3px; cursor: default; - height: 30px; color: #555; - line-height: 30px; - font-size: 12px; } .tablenav .no-pages, @@ -556,34 +691,44 @@ th.asc:hover span.sorting-indicator { padding: 3px 6px; } -.tablenav .tablenav-pages a { - padding: 0 10px 3px; - background: #eee; - background: rgba( 0, 0, 0, 0.05 ); +.tablenav .tablenav-pages a, +.tablenav-pages-navspan { + display: inline-block; + min-width: 17px; + border: 1px solid #ccc; /* same color as buttons border */ + padding: 3px 5px 7px; + background: #e5e5e5; font-size: 16px; + line-height: 1; font-weight: normal; + text-align: center; +} + +.tablenav-pages-navspan { + height: 16px; + border-color: #ddd; /* same as disabled buttons */ + background: #f7f7f7; /* same as disabled buttons */ + color: #a0a5aa; /* same as disabled buttons */ } .tablenav .tablenav-pages a:hover, .tablenav .tablenav-pages a:focus { + border-color: #5b9dd9; color: #fff; - background: #2ea2cc; + background: #00a0d2; + -webkit-box-shadow: none; + box-shadow: none; + outline: none; /* IE8 */ } -.tablenav .tablenav-pages a.disabled, -.tablenav .tablenav-pages a.disabled:hover, -.tablenav .tablenav-pages a.disabled:focus, -.tablenav .tablenav-pages a.disabled:active { - color: #aaa; - background: #eee; - background: rgba( 0, 0, 0, 0.05 ); +.tablenav .displaying-num { + margin-left: 7px; } -.tablenav .displaying-num { - margin-left: 2px; - color: #777; - font-size: 12px; - font-style: italic; +.tablenav .one-page .displaying-num { + display: inline-block; + margin-top: 5px; + margin-left: 0; } .tablenav .actions { @@ -591,6 +736,11 @@ th.asc:hover span.sorting-indicator { padding: 2px 0 0 8px; } +.wp-filter .actions { + display: inline-block; + vertical-align: middle; +} + .tablenav .delete { margin-left: 20px; } @@ -604,58 +754,70 @@ classes exist in paginate_links() but not seen in list table output. */ .tablenav .next, .tablenav .prev { border-color: transparent; - color: #0074a2; + color: #0073aa; } .tablenav .next:hover, .tablenav .prev:hover { border-color: transparent; - color: #2ea2cc; + color: #00a0d2; } -.view-switch { +.tablenav .view-switch { float: left; - margin: 5px 8px 0 16px; + margin: 0 5px; + padding-top: 3px; } -.view-switch img { - display: none; +.wp-filter .view-switch { + display: inline-block; + vertical-align: middle; + padding: 12px 0; + margin: 0 2px 0 8px; } -.view-switch a { - text-decoration: none; +.media-toolbar.wp-filter .view-switch { + margin: 0 2px 0 12px; } -.view-switch > a { - display: inline-block; - width: 18px; - height: 18px; +.view-switch a { + float: right; + width: 28px; + height: 28px; + text-align: center; + line-height: 24px; + text-decoration: none; } -.view-switch > a:before { - color: #bbb; - content: '\f163'; +.view-switch a:before { + color: #b4b9be; display: inline-block; - float: right; - font: normal 20px/1 'dashicons'; + font: normal 20px/1 dashicons; speak: none; vertical-align: middle; - margin-right: 0; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } -.view-switch a:hover:before { +.view-switch a:hover:before, +.view-switch a:focus:before { color: #727272; } .view-switch a.current:before { - color: #0074a2; + color: #0073aa; +} + +.view-switch .view-list:before { + content: "\f163"; } -.view-switch > a + a:before { - margin-right: 5px; - content: '\f164'; +.view-switch .view-excerpt:before { + content: "\f164"; +} + +.view-switch .view-grid:before { + content: "\f509"; } .filter { @@ -671,6 +833,10 @@ classes exist in paginate_links() but not seen in list table output. */ width: 4em; } +#posts-filter .wp-filter { + margin-bottom: 0; +} + #posts-filter fieldset { float: right; margin: 0 0 1em 1.5ex; @@ -711,15 +877,27 @@ p.pagenav { .row-actions { color: #ddd; font-size: 13px; - visibility: hidden; padding: 2px 0 0; + position: relative; + right: -9999em; +} + +/* ticket #34150 */ +.rtl .row-actions a { + display: inline-block; } +.row-actions .network_only, +.row-actions .network_active { + color: #000; +} + +.no-js .row-actions, tr:hover .row-actions, .mobile .row-actions, .row-actions.visible, -div.comment-item:hover .row-actions { - visibility: visible; +.comment-item:hover .row-actions { + position: static; } /* deprecated */ @@ -753,11 +931,6 @@ tr.inline-edit-row td, padding: 0 0.5em; } -#wpbody-content .quick-edit-row-page fieldset.inline-edit-col-right .inline-edit-col { - border-width: 0 1px 0 0; - border-style: none none none solid; -} - #wpbody-content .quick-edit-row-post .inline-edit-col-left { width: 40%; } @@ -798,14 +971,7 @@ tr.inline-edit-row td, .inline-edit-row fieldset .inline-edit-group { clear: both; -} - -.inline-edit-row fieldset .inline-edit-group:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; + line-height: 2.5; } .inline-edit-row p.submit { @@ -821,22 +987,37 @@ tr.inline-edit-row td, } /* Positioning */ -.inline-edit-row h4 { - margin: .2em 0; - padding: 0; - line-height: 23px; + +/* Needs higher specificity for the padding */ +#the-list .inline-edit-row .inline-edit-legend { + margin: 0; + padding: 0.2em 0.5em 0; + line-height: 2.5; + font-weight: 600; +} + +#the-list #bulk-edit.inline-edit-row .inline-edit-legend { + padding: 0.2em 0.5em; } + .inline-edit-row fieldset span.title, .inline-edit-row fieldset span.checkbox-title { margin: 0; padding: 0; - line-height: 27px; } .inline-edit-row fieldset label, .inline-edit-row fieldset span.inline-edit-categories-label { display: block; margin: .2em 0; + line-height: 2.5; +} + +.inline-edit-row fieldset.inline-edit-date label { + display: inline-block; + margin: 0; + line-height: 1.5; + vertical-align: baseline; } .inline-edit-row fieldset label.inline-edit-tags { @@ -848,15 +1029,27 @@ tr.inline-edit-row td, width: auto; } -.inline-edit-row fieldset label span.title { +.inline-edit-row fieldset label span.title, +.inline-edit-row fieldset.inline-edit-date legend { display: block; float: right; - width: 5em; + width: 6em; + line-height: 2.5; +} + +#posts-filter fieldset.inline-edit-date legend { + padding: 0; } -.inline-edit-row fieldset label span.input-text-wrap { +.inline-edit-row fieldset.inline-edit-date select { + margin: 1px; + line-height: 28px; +} + +.inline-edit-row fieldset label span.input-text-wrap, +.inline-edit-row fieldset .timestamp-wrap { display: block; - margin-right: 5em; + margin-right: 6em; } .quick-edit-row-post fieldset.inline-edit-col-right label span.title { @@ -864,17 +1057,23 @@ tr.inline-edit-row td, padding-left: 0.5em; } +.inline-edit-row .inline-edit-or { + margin: .2em 0 .2em 6px; + line-height: 2.5; +} + .inline-edit-row .input-text-wrap input[type=text] { width: 100%; } .inline-edit-row fieldset label input[type=checkbox] { - vertical-align: text-bottom; + vertical-align: middle; } .inline-edit-row fieldset label textarea { width: 100%; height: 4em; + vertical-align: top; } #wpbody-content .bulk-edit-row fieldset .inline-edit-group label { @@ -889,21 +1088,14 @@ tr.inline-edit-row td, width: 6em; } -.inline-edit-save .spinner { - padding: 4px 10px 0; - vertical-align: top; - float: left; -} - /* Styling */ -.inline-edit-row h4 { +.inline-edit-row .inline-edit-legend { text-transform: uppercase; } .inline-edit-row fieldset span.title, .inline-edit-row fieldset span.checkbox-title { font-style: italic; - line-height: 1.8em; } /* Specific Elements */ @@ -915,7 +1107,7 @@ tr.inline-edit-row td, .inline-edit-row fieldset input[name=hh], .inline-edit-row fieldset input[name=mn] { font-size: 12px; - width: 2.1em; + width: 2.3em; } .inline-edit-row fieldset input[name=aa] { @@ -1015,25 +1207,16 @@ ul.cat-checklist { margin-top: 4px; } -#update-plugins-table tbody td p { +.updates-table .plugin-title p { margin-top: 0; } -#update-plugins-table tbody td p strong { - font-size: 14px; -} - -.plugins thead th.check-column, -.plugins tfoot th.check-column, +.plugins thead td.check-column, +.plugins tfoot td.check-column, .plugins .inactive th.check-column { padding-right: 6px; } -#update-plugins-table thead th.check-column, -#update-plugins-table tfoot th.check-column { - padding-top: 11px; -} - .plugins, .plugins th, .plugins td { @@ -1117,7 +1300,11 @@ ul.cat-checklist { .upgrade .plugins tr:last-of-type td, .upgrade .plugins tr:last-of-type th, .plugins tr.active + tr.inactive.update th, -.plugins tr.active + tr.inactive.update td { +.plugins tr.active + tr.inactive.update td, +.plugins .updated td, +.plugins .updated th, +.plugins tr.active + tr.inactive.updated th, +.plugins tr.active + tr.inactive.updated td { -webkit-box-shadow: none; box-shadow: none; } @@ -1128,8 +1315,9 @@ tr.active.update + tr.plugin-update-tr .plugin-update { background-color: #fef7f1; } -.plugins .active th.check-column { - border-right: 4px solid #2ea2cc; +.plugins .active th.check-column, +.plugin-update-tr.active td { + border-right: 4px solid #00a0d2; } .plugins .active.update th.check-column, @@ -1143,6 +1331,11 @@ tr.active.update + tr.plugin-update-tr .plugin-update { white-space:nowrap; } +.updates-table-screenshot { + float:right; + padding: 0 0 5px 10px; +} + .plugins .inactive .plugin-title strong { font-weight: 400; } @@ -1153,7 +1346,9 @@ tr.active.update + tr.plugin-update-tr .plugin-update { } .plugins .update .second, -.plugins .update .row-actions { +.plugins .update .row-actions, +.plugins .updated .second, +.plugins .updated .row-actions { padding-bottom: 0; } @@ -1166,28 +1361,76 @@ tr.active.update + tr.plugin-update-tr .plugin-update { .plugin-update-tr .update-message { font-size: 13px; font-weight: normal; - margin: 6px 12px 12px; - padding: 6px 12px; margin: 0 31px 8px 10px; + padding: 6px 40px 8px 12px; background-color: #f7f7f7; background-color: rgba(0,0,0,0.03); } -.plugin-update-tr .update-message:before { +.plugin-update-tr .update-message:before, +.plugin-card .update-now:before, +.plugin-card .install-now:before { color: #d54e21; - content: '\f463'; display: inline-block; - font: normal 20px/1 'dashicons'; + font: normal 20px/1 dashicons; speak: none; - margin: 0 -2px 0 8px; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; vertical-align: top; } -.plugins .plugin-update { +.plugin-update-tr .update-message:before, +.plugin-card .update-now:before { + content: "\f463"; +} + +.plugin-update-tr .update-message:before { + margin: 0 -30px 0 10px; +} + +.plugin-card .update-now:before, +.plugin-card .install-now:before { + margin: 3px -2px 0 5px; +} + +.plugin-update-tr .updating-message:before, +.plugin-card .updating-message:before { + content: "\f463"; + -webkit-animation: rotation 2s infinite linear; + animation: rotation 2s infinite linear; +} + +@-webkit-keyframes rotation { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(-359deg); + transform: rotate(-359deg); + } +} + +@keyframes rotation { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(-359deg); + transform: rotate(-359deg); + } +} + +.plugin-update-tr .updated-message:before, +.plugin-card .updated-message:before { + color: #79ba49; + content: "\f147"; +} + +.wp-list-table.plugins tbody tr.plugin-update-tr td.plugin-update { + overflow: hidden; /* clearfix */ padding: 0; - border: none; -webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1); box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1); } @@ -1197,35 +1440,283 @@ tr.active + tr.plugin-update-tr .plugin-update { background-color: #f7fcfe; } -tr.active + tr.plugin-update-tr .plugin-update .update-message { +tr.active + tr.plugin-update-tr:not(.updated) .plugin-update .update-message { background-color: #fcf3ef; } -.plugin-install-php h4 { +.plugin-install-php h2 { + clear: both; +} + +.plugin-install-php h3 { margin: 2.5em 0 8px; } +.plugin-install-php .wp-filter { + margin-bottom: 0; +} + +/* Plugin card table view */ +.plugin-group { + overflow: hidden; /* clearfix */ + margin-top: 1.5em; +} + +.plugin-group h3 { + margin-top: 0; +} + +.plugin-card { + float: right; + margin: 0 8px 16px; + width: 48.5%; + width: -webkit-calc( 50% - 8px ); + width: calc( 50% - 8px ); + background-color: #fff; + border: 1px solid #ddd; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + +.plugin-card:nth-child(odd) { + clear: both; + margin-right: 0; +} + +.plugin-card:nth-child(even) { + margin-left: 0; +} + +@media screen and ( min-width: 1600px ) { + .plugin-card { + width: 30%; + width: -webkit-calc( 33.1% - 8px ); + width: calc( 33.1% - 8px ); + } + + .plugin-card:nth-child(odd) { + clear: none; + margin-right: 8px; + } + + .plugin-card:nth-child(even) { + margin-left: 8px; + } + + .plugin-card:nth-child(3n+1) { + clear: both; + margin-right: 0; + } + + .plugin-card:nth-child(3n) { + margin-left: 0; + } +} + +.plugin-card-top { + position: relative; + padding: 20px 20px 10px; + min-height: 135px; +} + +div.action-links, +.plugin-action-buttons { + margin: 0; /* Override existing margins */ +} + +.plugin-card h3 { + margin: 0 0 12px; + font-size: 18px; + line-height: 1.3; +} + +.plugin-card .name, +.plugin-card .desc { + margin-right: 148px; /* icon + margin */ + margin-left: 120px; /* action links */ +} + +.plugin-card .action-links { + position: absolute; + top: 20px; + left: 20px; + width: 120px; +} + +.plugin-action-buttons { + clear: left; + float: left; + margin-right: 2em; + margin-bottom: 1em; + text-align: left; +} + +.plugin-action-buttons li { + margin-bottom: 10px; +} + +.plugin-card-bottom { + clear: both; + padding: 12px 20px; + background-color: #fafafa; + border-top: 1px solid #ddd; + overflow: hidden; +} + +.plugin-card-bottom .star-rating { + display: inline; +} + +.plugin-card-update-failed .update-now { + font-weight: 600; +} + +.plugin-card-update-failed .notice-error { + margin: 0; + padding-right: 16px; + -webkit-box-shadow: 0 -1px 0 #ddd; + box-shadow: 0 -1px 0 #ddd; +} + +.plugin-card-update-failed .plugin-card-bottom { + display: none; +} + +.plugin-card .column-rating { + line-height: 23px; +} + +.plugin-card .column-rating, +.plugin-card .column-updated { + margin-bottom: 4px; +} + +.plugin-card .column-rating, +.plugin-card .column-downloaded { + float: right; + clear: right; + max-width: 180px; +} + +.plugin-card .column-updated, +.plugin-card .column-compatibility { + text-align: left; + float: left; + clear: left; + width: 65%; + width: -webkit-calc( 100% - 180px ); + width: calc( 100% - 180px ); +} + +.plugin-card .column-compatibility span:before { + font: normal 20px/.5 dashicons; + speak: none; + display: inline-block; + padding: 0; + top: 4px; + right: -2px; + position: relative; + vertical-align: top; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + text-decoration: none !important; + color: #444; +} + +.plugin-card .compatibility-incompatible:before { + content: "\f158"; +} + +.plugin-card .compatibility-compatible:before { + content: "\f147"; +} + +.plugin-icon { + position: absolute; + top: 20px; + right: 20px; + width: 128px; + height: 128px; + margin: 0 0 20px 20px; +} + +.no-plugin-results { + color: #666; /* same as no themes and no media */ + font-size: 18px; + font-style: normal; + margin: 0; + padding: 100px 0 0; + text-align: center; +} + /* ms */ /* Background Color for Site Status */ -.wp-list-table .site-deleted { +.wp-list-table .site-deleted, +.wp-list-table tr.site-deleted { background: #ff8573; } -.wp-list-table .site-spammed { +.wp-list-table .site-spammed, +.wp-list-table tr.site-spammed { background: #faafaa; } -.wp-list-table .site-archived { +.wp-list-table .site-archived, +.wp-list-table tr.site-archived { background: #ffebe8; } -.wp-list-table .site-mature { +.wp-list-table .site-mature, +.wp-list-table tr.site-mature { background: #fecac2; } +.sites.fixed .column-lastupdated, +.sites.fixed .column-registered { + width: 20%; +} + +.sites.fixed .column-users { + width: 80px; +} + /* =Media Queries -------------------------------------------------------------- */ -/** - * HiDPI Displays - */ +@media screen and ( max-width: 1100px ) and ( min-width: 782px ), ( max-width: 480px ) { + .plugin-card .action-links { + position: static; + margin-right: 148px; + width: auto; + } + + .plugin-action-buttons { + float: none; + margin: 1em 0 0; + text-align: right; + } + + .plugin-action-buttons li { + display: inline-block; + vertical-align: middle; + } + + .plugin-action-buttons li .button { + margin-left: 20px; + } + + .plugin-card .name, + .plugin-card .desc { + margin-left: 0; + } + + .plugin-card .desc p:first-of-type { + margin-top: 0; + } + + .fixed .column-date { + width: 14%; + } +} + @media screen and ( max-width: 782px ) { /* WP List Table Options & Filters */ .tablenav { @@ -1233,7 +1724,7 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message { } .tablenav.top { - margin: 0; + margin: 20px 0 5px 0; } .tablenav.bottom { @@ -1249,10 +1740,17 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message { display: block; } - .tablenav.top .actions, .view-switch { + .tablenav.top .actions, + .tablenav .view-switch { display: none; } + .view-switch a { + width: 36px; + height: 36px; + line-height: 33px; + } + /* Pagination */ .tablenav.top .displaying-num { display: none; @@ -1261,12 +1759,14 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message { .tablenav.bottom .displaying-num { position: absolute; left: 0; - top: 10px; + top: 11px; + margin: 0; font-size: 14px; } - .tablenav-pages { + .tablenav .tablenav-pages { width: 100%; + height: auto; text-align: center; margin: 0 0 25px; } @@ -1284,19 +1784,23 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message { height: 0; } - .tablenav-pages .pagination-links .paging-input { - font-size: 18px; + .tablenav-pages .pagination-links { + font-size: 16px; } - .tablenav-pages .pagination-links a { - padding: 8px 20px 11px; + .tablenav-pages .pagination-links a, + .tablenav-pages-navspan { + padding: 9px 11px 12px; font-size: 18px; - background: rgba(0, 0, 0, 0.05); + } + + .tablenav-pages-navspan { + height: 18px; } .tablenav-pages .pagination-links .current-page { - padding: 10px; - font-size: 14px; + padding: 8px 9px 9px; + font-size: 16px; } /* WP List Table Adjustments: General */ @@ -1308,35 +1812,143 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message { font-size: 14px; } - /* Columns to hide */ - .fixed .column-date, - .fixed .column-author, - .column-categories, - .column-tags, - .tags .column-description, - .media .column-parent, - .users .column-email, - .users .column-name, - .sites .column-registered, - .sites .column-users { + .wp-list-table th.column-primary ~ th, + .wp-list-table tr:not(.inline-edit-row):not(.no-items) td.column-primary ~ td:not(.check-column) { display: none; } + .wp-list-table thead th.column-primary { + width: 100%; + } + + /* Checkboxes need to show */ + .wp-list-table tr th.check-column { + display: table-cell; + width: 35px; + } + + .wp-list-table .column-primary .toggle-row { + display: block; + } + + .wp-list-table tr:not(.inline-edit-row):not(.no-items) td:not(.check-column) { + position: relative; + clear: both; + display: block; + width: auto !important; /* needs to override some columns that are more specifically targeted */ + } + + .wp-list-table td.column-primary { + padding-left: 50px; /* space for toggle button */ + } + + .wp-list-table tr:not(.inline-edit-row):not(.no-items) td.column-primary ~ td:not(.check-column) { + padding: 3px 35% 3px 8px; + } + + .wp-list-table tr:not(.inline-edit-row):not(.no-items) td:not(.column-primary)::before { + position: absolute; + right: 10px; /* match padding of regular table cell */ + display: block; + overflow: hidden; + width: 32%; /* leave a little space for a gutter */ + content: attr(data-colname); + white-space: nowrap; + text-overflow: ellipsis; + } + + .wp-list-table .is-expanded td:not(.hidden) { + display: block !important; + overflow: hidden; /* clearfix */ + } + + /* Special cases */ + .widefat .num, + .column-posts { + text-align: right; + } + + #comments-form .fixed .column-author, + #commentsdiv .fixed .column-author { + display: none !important; + } + .fixed .column-comment .comment-author { display: block; } - /* Posts */ - .column-title { - width: 85%; + #the-comment-list .is-expanded td { + -webkit-box-shadow: none; + box-shadow: none; + } + + #the-comment-list .is-expanded td:last-child { + -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1); + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1); + } + + /* Show comment bubble as text instead */ + .post-com-count .screen-reader-text { + position: static; + width: auto; + height: auto; + margin: 0; + } + + .column-response .post-com-count-no-comments:after, + .column-response .post-com-count-approved:after, + .column-comments .post-com-count-no-comments:after, + .column-comments .post-com-count-approved:after { + content: none; + } + + .column-response .post-com-count [aria-hidden="true"], + .column-comments .post-com-count [aria-hidden="true"] { + display: none; + } + + .column-response .post-com-count-wrapper, + .column-comments .post-com-count-wrapper { + white-space: normal; + } + + .column-response .post-com-count-wrapper > a, + .column-comments .post-com-count-wrapper > a { + display: block; + } + + .column-response .post-com-count-no-comments, + .column-response .post-com-count-approved, + .column-comments .post-com-count-no-comments, + .column-comments .post-com-count-approved { + margin-top: 0; + margin-left: 0.5em; + } + + .column-response .post-com-count-pending, + .column-comments .post-com-count-pending { + position: static; + height: auto; + min-width: 0; + padding: 0; + border: none; + -webkit-border-radius: 0; + border-radius: 0; + background: none; + color: #bb2a2a; + font-size: inherit; + line-height: inherit; + text-align: right; } - .fixed .column-comments, .widefat .check-column { - width: 35px + .column-response .post-com-count-pending:hover, + .column-comments .post-com-count-pending:hover { + color: #dc3232; } - .widefat thead .check-column, .widefat tfoot .check-column { - padding: 10px 0 10px; + .widefat thead td.check-column, + .widefat tfoot td.check-column { + padding-top: 10px; } .widefat * { @@ -1380,7 +1992,8 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message { font-size: 16px; } - .inline-edit-row fieldset label span.title { + .inline-edit-row fieldset label span.title, + .inline-edit-row fieldset.inline-edit-date legend { float: none; } @@ -1392,7 +2005,8 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message { padding: 0; } - .inline-edit-row fieldset label span.input-text-wrap { + .inline-edit-row fieldset label span.input-text-wrap, + .inline-edit-row fieldset .timestamp-wrap { margin-right: 0; } @@ -1406,41 +2020,38 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message { width: 4.5em; } - #bulk-titles div { - margin: 0.8em 0.3em; - } - - #bulk-titles div a { - height: 22px; + .inline-edit-row .inline-edit-or { + margin: 0 0 0 6px; } - /* Taxonomies */ - .tags .column-posts { - width: 50px; + #edithead .inside, + #commentsdiv #edithead .inside { + float: none; + text-align: right; + padding: 3px 5px; } - .tags .column-slug { - width: 30%; + #commentsdiv #edithead .inside input, + #edithead .inside input { + width: 100%; } - /* Comments */ - .comments .column-response { - width: 35%; + #edithead label { + display: block; } - /* Users */ - .users .column-role { - width: 35%; + #bulk-titles div { + margin: 0.8em 0.3em; } - /* Network admin sites */ - .sites .column-blogname { - width: 55%; + #bulk-titles div a { + height: 22px; } /* Updates */ - #wpbody-content #update-themes-table .plugin-title { + #wpbody-content .updates-table .plugin-title { width: auto; + white-space: normal; } /* Links */ @@ -1452,49 +2063,27 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message { overflow: hidden; } - /* Plugin/Theme Management Page */ - .wp-list-table.plugins { - position: relative; - margin-top: 35px; - margin-bottom: 50px; - } - - .wp-list-table.plugins thead .column-description, - #wpbody-content .wp-list-table.plugins tfoot .column-description, - .wp-list-table.plugins th#description { + /* List tables that don't toggle rows */ + .comments-box .toggle-row, + .wp-list-table.plugins .toggle-row { display: none; } - #wpbody-content .wp-list-table.plugins, - #wpbody-content .wp-list-table.plugins thead, - #wpbody-content .wp-list-table.plugins tbody, - #wpbody-content .wp-list-table.plugins tr, - #wpbody-content .wp-list-table.plugins .column-description, - #wpbody-content .wp-list-table.plugins .plugin-title, - #wpbody-content .wp-list-table.plugins .theme-title, - #wpbody-content .wp-list-table.plugins .plugin-update, - #wpbody-content .wp-list-table.plugins .manage-column.column-name { + /* Plugin/Theme Management */ + #wpbody-content .wp-list-table.plugins td { display: block; width: auto; + padding: 10px 9px; /* reset from other list tables that have a label at this width */ } - .wp-list-table.plugins thead, - .wp-list-table.plugins tfoot { - position: absolute; - top: -35px; - right: 0; - left: 0; - width: auto; - height: 35px; - } - - .wp-list-table.plugins tfoot { - bottom: -35px; - top: auto; + #wpbody-content .wp-list-table.plugins .column-description { + padding-top: 2px; } - .active, .inactive { - padding-top: 0; + #wpbody-content .wp-list-table.plugins .plugin-title, + #wpbody-content .wp-list-table.plugins .theme-title { + padding-left: 12px; + white-space: normal; } .wp-list-table.plugins .plugin-title, @@ -1503,20 +2092,26 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message { padding-bottom: 4px; } - .plugins tr.active + tr.inactive th.check-column, - .plugins tr.active + tr.inactive td, - .wp-list-table.plugins .plugin-title, - .wp-list-table.plugins .theme-title, - .wp-list-table.plugins tbody th { + .plugins #the-list tr > td:not(:last-child), + .plugins #the-list .update th, + .plugins #the-list .update td, + .wp-list-table.plugins #the-list .theme-title { -webkit-box-shadow: none; box-shadow: none; + border-top: none; + } + + .plugins #the-list tr td { + border-top: none; } .plugins tbody { padding: 1px 0 0; } - .plugins tr.active + tr.inactive td.column-description { + .plugins tr.active + tr.inactive th.check-column, + .plugins tr.active + tr.inactive td.column-description, + .plugins .plugin-update-tr:before { -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1); } @@ -1526,63 +2121,29 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message { border-top: none; } - .wp-list-table.plugins .column-description { - padding-top: 0; - } - - .wp-list-table.plugins .manage-column.column-name, - .wp-list-table.plugins .column-description, - .wp-list-table.plugins .plugin-title, - .wp-list-table.plugins .theme-title { - padding-left: 12px; - padding-right: 46px; - } - - .wp-list-table.plugins tr { - position: relative; - } - - .wp-list-table.plugins th.check-column, - .wp-list-table.plugins tr.update th.check-column { - position: absolute; - height: auto; - top: 0; - bottom: 0; - right: 0; - padding-right: 2px; - padding-top: 18px; - } - - .wp-list-table.plugins thead th.check-column, - .wp-list-table.plugins tfoot th.check-column { - padding-right: 3px; - padding-top: 11px; - background: none; - } - - .widefat tbody th.check-column input[type="checkbox"] { - margin-top: -3px; - margin-right: 8px; + /* mimic the checkbox th */ + .plugins .plugin-update-tr:before { + content: ""; + display: table-cell; } - .wp-list-table.plugins .active .check-column input, - .wp-list-table.plugins .update .check-column input { - margin-right: 5px; + .plugins .active.update + .plugin-update-tr:before { + border-right: 4px solid #d54e21; + background-color: #fef7f1; } - .wp-list-table.plugins thead .check-column input, - .wp-list-table.plugins tfoot .check-column input { - margin-top: -6px; + .plugins #the-list .plugin-update-tr .plugin-update { + border-right: none; } - .wp-list-table.plugins .active th.check-column { - background: none; + .plugin-update-tr .update-message { + margin-right: 0; } .wp-list-table.plugins .plugin-title strong, .wp-list-table.plugins .theme-title strong { font-size: 1.4em; - line-height: 1.6em; + line-height: 1.5; } /* Add New plugins page */ @@ -1616,4 +2177,10 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message { -webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1); box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1); } + + .plugin-card { + margin-right: 0; + margin-left: 0; + width: 100%; + } } diff --git a/wp-admin/css/list-tables-rtl.min.css b/wp-admin/css/list-tables-rtl.min.css new file mode 100644 index 0000000..90e3cef --- /dev/null +++ b/wp-admin/css/list-tables-rtl.min.css @@ -0,0 +1 @@ +.response-links{display:block;margin-bottom:1em}.response-links a{display:block}.response-links a.comments-edit-item-link{font-weight:600}.response-links a.comments-view-item-link{font-size:12px}.post-com-count-wrapper strong{font-weight:400}.comments-view-item-link{display:inline-block;clear:both}.column-comments .post-com-count-wrapper,.column-response .post-com-count-wrapper{white-space:nowrap;word-wrap:normal}.column-comments .post-com-count,.column-response .post-com-count{display:inline-block;vertical-align:top}.column-comments .post-com-count-approved,.column-comments .post-com-count-no-comments,.column-response .post-com-count-approved,.column-response .post-com-count-no-comments{margin-top:5px}.column-comments .comment-count-approved,.column-comments .comment-count-no-comments,.column-response .comment-count-approved,.column-response .comment-count-no-comments{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;padding:0 8px;min-width:24px;height:2em;-webkit-border-radius:5px;border-radius:5px;background-color:#72777c;color:#fff;font-size:11px;line-height:21px;text-align:center}.ie8 .column-comments .comment-count-approved,.ie8 .column-comments .comment-count-no-comments,.ie8 .column-response .comment-count-approved,.ie8 .column-response .comment-count-no-comments{min-width:0}.column-comments .post-com-count-approved:after,.column-comments .post-com-count-no-comments:after,.column-response .post-com-count-approved:after,.column-response .post-com-count-no-comments:after{content:"";display:block;margin-right:8px;width:0;height:0;border-top:5px solid #72777c;border-left:5px solid transparent}.column-comments .post-com-count-approved:focus .comment-count-approved,.column-comments .post-com-count-approved:hover .comment-count-approved,.column-response .post-com-count-approved:focus .comment-count-approved,.column-response .post-com-count-approved:hover .comment-count-approved{background:#0073aa}.column-comments .post-com-count-approved:focus:after,.column-comments .post-com-count-approved:hover:after,.column-response .post-com-count-approved:focus:after,.column-response .post-com-count-approved:hover:after{border-top-color:#0073aa}.column-comments .post-com-count-pending,.column-response .post-com-count-pending{position:relative;right:-3px;padding:0 5px;min-width:7px;height:17px;border:2px solid #fff;-webkit-border-radius:11px;border-radius:11px;background:#ca4a1f;color:#fff;font-size:9px;line-height:17px;text-align:center}.column-comments .post-com-count-no-pending,.column-response .post-com-count-no-pending{display:none}.commentlist li{padding:1em 1em .2em;margin:0;border-bottom:1px solid #ccc}.commentlist li li{border-bottom:0;padding:0}.commentlist p{padding:0;margin:0 0 .8em}#submitted-on,.submitted-on{color:#555d66}#replyrow td{padding:2px}#replysubmit{margin:0;padding:5px 7px 10px;overflow:hidden;text-align:center}#replysubmit .button{margin-left:5px}#replysubmit .error{color:red;line-height:21px;text-align:center}#replyrow.inline-edit-row fieldset.comment-reply{font-size:inherit;line-height:inherit}#replyrow legend{margin:0;padding:.2em 5px 0;font-size:13px;line-height:1.4;font-weight:600}#replyrow.inline-edit-row label{display:inline;vertical-align:baseline;line-height:inherit}#commentsdiv #edithead .inside,#edithead .inside{float:right;padding:3px 5px 2px 0;margin:0;text-align:center}#edithead .inside input{width:180px}#edithead label{padding:2px 0}#replycontainer{padding:5px}#replycontent{height:120px;-webkit-box-shadow:none;box-shadow:none}#replyerror{border-color:#ddd;background-color:#f9f9f9}.commentlist .avatar{vertical-align:text-top}#the-comment-list div.undo,#the-comment-list tr.undo{background-color:#f5f5f5}#the-comment-list .unapproved td,#the-comment-list .unapproved th{background-color:#fef7f1}#the-comment-list .unapproved th.check-column{border-right:4px solid #d54e21}#the-comment-list .unapproved th.check-column input{margin-right:4px}#the-comment-list .approve a{color:#006505}#the-comment-list .unapprove a{color:#d98500}#the-comment-list td,#the-comment-list th{-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 -1px 0 rgba(0,0,0,.1)}#the-comment-list tr:last-child td,#the-comment-list tr:last-child th{-webkit-box-shadow:none;box-shadow:none}#the-comment-list tr.unapproved+tr.approved td,#the-comment-list tr.unapproved+tr.approved th{border-top:1px solid rgba(0,0,0,.03)}.vim-current,.vim-current td,.vim-current th{background-color:#e4f2fd!important}th .comment-grey-bubble{height:16px;width:16px}th .comment-grey-bubble:before{content:"\f101";font:400 20px/.5 dashicons;speak:none;display:inline-block;padding:0;top:4px;right:-4px;position:relative;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;color:#444}table.fixed{table-layout:fixed}.fixed .column-rating,.fixed .column-visible{width:8%}.fixed .column-author,.fixed .column-date,.fixed .column-format,.fixed .column-links,.fixed .column-parent,.fixed .column-posts{width:10%}.fixed .column-posts{width:74px}.fixed .column-comment .comment-author{display:none}.fixed .column-categories,.fixed .column-rel,.fixed .column-response,.fixed .column-role,.fixed .column-tags{width:15%}.fixed .column-slug{width:25%}.fixed .column-locations{width:35%}.fixed .column-comments{width:5.5em;padding:8px 0;text-align:right}.fixed .column-comments .vers{padding-right:3px}td.column-title strong,td.plugin-title strong{display:block;margin-bottom:.2em;font-size:14px}td.column-title p,td.plugin-title p{margin:6px 0}table.media .column-title .media-icon{float:right;min-height:60px;margin:0 0 0 9px}table.media .column-title .media-icon img{max-width:60px;height:auto;vertical-align:top}table.media .column-title .has-media-icon~.row-actions{margin-right:70px}table.media .column-title .filename{margin-bottom:.2em}.wp-list-table a{-webkit-transition:none;transition:none}#the-list tr:last-child td,#the-list tr:last-child th{border-bottom:none!important;-webkit-box-shadow:none;box-shadow:none}#comments-form .fixed .column-author{width:20%}#comments-form .fixed .column-date{width:14%}#commentsdiv.postbox .inside{margin:0;padding:0}#commentsdiv .inside .row-actions{line-height:18px}#commentsdiv .inside .column-author{width:25%}#commentsdiv .column-comment p{margin:.6em 0;padding:0}#commentsdiv #replyrow td{padding:0}#commentsdiv p{padding:8px 10px;margin:0}#commentsdiv .comments-box{border:0}#commentsdiv .comments-box thead td,#commentsdiv .comments-box thead th{background:0 0;padding:0 7px 4px;font-style:italic}#commentsdiv .comments-box tr:last-child td{border-bottom:0 none}#commentsdiv #edithead .inside input{width:160px}.sorting-indicator{display:block;visibility:hidden;width:10px;height:4px;margin-top:8px;margin-right:7px}.sorting-indicator:before{content:"\f142";font:400 20px/1 dashicons;speak:none;display:inline-block;padding:0;top:-4px;right:-8px;line-height:10px;position:relative;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;color:#444}.column-comments .sorting-indicator:before{top:0;right:-10px}th.desc a:focus span.sorting-indicator:before,th.desc:hover span.sorting-indicator:before,th.sorted.asc .sorting-indicator:before{content:"\f142"}th.asc a:focus span.sorting-indicator:before,th.asc:hover span.sorting-indicator:before,th.sorted.desc .sorting-indicator:before{content:"\f140"}.wp-list-table .toggle-row{position:absolute;left:8px;top:10px;display:none;padding:0;width:40px;height:40px;border:none;outline:0;background:0 0}.wp-list-table .toggle-row:hover{cursor:pointer}.wp-list-table .toggle-row:focus:before{-webkit-box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}.ie8 .wp-list-table .toggle-row:focus:before{outline:#5b9dd9 solid 1px}.wp-list-table .toggle-row:active{-webkit-box-shadow:none;box-shadow:none}.wp-list-table .toggle-row:before{position:absolute;top:-5px;right:10px;-webkit-border-radius:50%;border-radius:50%;display:block;padding:1px 0 1px 2px;color:#444;content:"\f140";font:400 20px/1 dashicons;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;speak:none}.wp-list-table .is-expanded .toggle-row:before{content:"\f142"}tr.wp-locked .locked-indicator{margin-right:6px;height:20px;width:16px}tr.wp-locked .locked-indicator:before{color:#82878c;content:"\f160";display:inline-block;float:right;font:400 20px/1 dashicons;speak:none;vertical-align:middle;margin-right:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}tr.wp-locked .check-column input[type=checkbox],tr.wp-locked .check-column label,tr.wp-locked .row-actions .inline,tr.wp-locked .row-actions .trash{display:none}tr .locked-info{height:0;opacity:0}tr.wp-locked .locked-info{margin-top:8px;height:auto;opacity:1}.locked-text{vertical-align:top}tr.locked-info,tr.wp-locked .locked-info{-webkit-transition:height 1s,opacity .5s;transition:height 1s,opacity .5s}.fixed .column-comments .sorting-indicator{margin-top:3px}#menu-locations-wrap .widefat{width:60%}.widefat th.sortable,.widefat th.sorted{padding:0}th.sortable a,th.sorted a{display:block;overflow:hidden;padding:8px}.fixed .column-comments.sortable a,.fixed .column-comments.sorted a{padding:8px 0}th.sortable a span,th.sorted a span{float:right;cursor:pointer}th.asc a:focus span.sorting-indicator,th.asc:hover span.sorting-indicator,th.desc a:focus span.sorting-indicator,th.desc:hover span.sorting-indicator,th.sorted .sorting-indicator{visibility:visible}.tablenav-pages a,.tablenav-pages-navspan{font-weight:600;padding:0 2px}.tablenav-pages .current-page{margin:0 0 0 2px;padding-bottom:5px;font-size:13px;text-align:center}.tablenav .total-pages{margin-left:2px}.tablenav #table-paging{margin-right:2px}.tablenav a.button-secondary{display:block;margin:3px 0 0 8px}.tablenav{clear:both;height:30px;margin:6px 0 4px;vertical-align:middle}.tablenav.themes{max-width:98%}.tablenav .tablenav-pages{float:left;height:28px;margin-top:3px;cursor:default;color:#555}.tablenav .no-pages,.tablenav .one-page .pagination-links{display:none}.tablenav .tablenav-pages a,.tablenav-pages span.current{text-decoration:none;padding:3px 6px}.tablenav .tablenav-pages a,.tablenav-pages-navspan{display:inline-block;min-width:17px;border:1px solid #ccc;padding:3px 5px 7px;background:#e5e5e5;font-size:16px;line-height:1;font-weight:400;text-align:center}.tablenav-pages-navspan{height:16px;border-color:#ddd;background:#f7f7f7;color:#a0a5aa}.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover{border-color:#5b9dd9;color:#fff;background:#00a0d2;-webkit-box-shadow:none;box-shadow:none;outline:0}.tablenav .displaying-num{margin-left:7px}.tablenav .one-page .displaying-num{display:inline-block;margin-top:5px;margin-left:0}.tablenav .actions{overflow:hidden;padding:2px 0 0 8px}.wp-filter .actions{display:inline-block;vertical-align:middle}.tablenav .delete{margin-left:20px}.tablenav .dots{border-color:transparent}.tablenav .next,.tablenav .prev{border-color:transparent;color:#0073aa}.tablenav .next:hover,.tablenav .prev:hover{border-color:transparent;color:#00a0d2}.tablenav .view-switch{float:left;margin:0 5px;padding-top:3px}.wp-filter .view-switch{display:inline-block;vertical-align:middle;padding:12px 0;margin:0 2px 0 8px}.media-toolbar.wp-filter .view-switch{margin:0 2px 0 12px}.view-switch a{float:right;width:28px;height:28px;text-align:center;line-height:24px;text-decoration:none}.view-switch a:before{color:#b4b9be;display:inline-block;font:400 20px/1 dashicons;speak:none;vertical-align:middle;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.view-switch a:focus:before,.view-switch a:hover:before{color:#727272}.view-switch a.current:before{color:#0073aa}.view-switch .view-list:before{content:"\f163"}.view-switch .view-excerpt:before{content:"\f164"}.view-switch .view-grid:before{content:"\f509"}.filter{float:right;margin:-5px 10px 0 0}.filter .subsubsub{margin-right:-10px;margin-top:13px}.screen-per-page{width:4em}#posts-filter .wp-filter{margin-bottom:0}#posts-filter fieldset{float:right;margin:0 0 1em 1.5ex;padding:0}#posts-filter fieldset legend{padding:0 1px .2em 0}.row-actions,.row-actions-visible{padding:2px 0 0}p.pagenav{margin:0;display:inline}.pagenav span{font-weight:600;margin:0 6px}.row-title{font-size:14px!important;font-weight:600}.column-comment .comment-author{margin-bottom:.6em}.column-author img,.column-comment .comment-author img,.column-username img{float:right;margin-left:10px;margin-top:1px}.row-actions{color:#ddd;font-size:13px;position:relative;right:-9999em}.plugins,.plugins td,.plugins th,.row-actions .network_active,.row-actions .network_only{color:#000}.rtl .row-actions a{display:inline-block}.comment-item:hover .row-actions,.mobile .row-actions,.no-js .row-actions,.row-actions.visible,tr:hover .row-actions{position:static}#wpbody-content .inline-edit-row fieldset{font-size:12px;float:right;margin:0;padding:0;width:100%}#wpbody-content .inline-edit-row fieldset .inline-edit-col,tr.inline-edit-row td{padding:0 .5em}#wpbody-content .quick-edit-row-post .inline-edit-col-left{width:40%}#wpbody-content .quick-edit-row-post .inline-edit-col-right{width:39%}#wpbody-content .inline-edit-row-post .inline-edit-col-center{width:20%}#wpbody-content .quick-edit-row-page .inline-edit-col-left{width:50%}#wpbody-content .bulk-edit-row-post .inline-edit-col-right,#wpbody-content .quick-edit-row-page .inline-edit-col-right{width:49%}#wpbody-content .bulk-edit-row .inline-edit-col-left{width:30%}#wpbody-content .bulk-edit-row-page .inline-edit-col-right{width:69%}#wpbody-content .bulk-edit-row .inline-edit-col-bottom{float:left;width:69%}#wpbody-content .inline-edit-row-page .inline-edit-col-right{margin-top:27px}.inline-edit-row fieldset .inline-edit-group{clear:both;line-height:2.5}.inline-edit-row p.submit{clear:both;padding:.5em;margin:.5em 0 0}.inline-edit-row span.error{line-height:22px;margin:0 15px;padding:3px 5px}#the-list .inline-edit-row .inline-edit-legend{margin:0;padding:.2em .5em 0;line-height:2.5;font-weight:600}#the-list #bulk-edit.inline-edit-row .inline-edit-legend{padding:.2em .5em}.inline-edit-row fieldset span.checkbox-title,.inline-edit-row fieldset span.title{margin:0;padding:0;font-style:italic}.inline-edit-row fieldset label,.inline-edit-row fieldset span.inline-edit-categories-label{display:block;margin:.2em 0;line-height:2.5}.inline-edit-row fieldset.inline-edit-date label{display:inline-block;margin:0;line-height:1.5;vertical-align:baseline}.inline-edit-row fieldset label.inline-edit-tags{margin-top:0}.inline-edit-row fieldset label.inline-edit-tags span.title{margin:.2em 0;width:auto}.inline-edit-row fieldset label span.title,.inline-edit-row fieldset.inline-edit-date legend{display:block;float:right;width:6em;line-height:2.5}#posts-filter fieldset.inline-edit-date legend{padding:0}.inline-edit-row fieldset.inline-edit-date select{margin:1px;line-height:28px}.inline-edit-row fieldset .timestamp-wrap,.inline-edit-row fieldset label span.input-text-wrap{display:block;margin-right:6em}.quick-edit-row-post fieldset.inline-edit-col-right label span.title{width:auto;padding-left:.5em}.inline-edit-row .inline-edit-or{margin:.2em 0 .2em 6px;line-height:2.5}.inline-edit-row .input-text-wrap input[type=text]{width:100%}.inline-edit-row fieldset label input[type=checkbox]{vertical-align:middle}.inline-edit-row fieldset label textarea{width:100%;height:4em;vertical-align:top}#bulk-titles,ul.cat-checklist{height:12em;border:1px solid #ddd;overflow-y:scroll;padding:0 5px}#wpbody-content .bulk-edit-row fieldset .inline-edit-group label{max-width:50%}#wpbody-content .quick-edit-row fieldset .inline-edit-group label.alignleft:first-child{margin-left:.5em}.inline-edit-col-right .input-text-wrap input.inline-edit-menu-order-input{width:6em}.inline-edit-row .inline-edit-legend{text-transform:uppercase}.inline-edit-row fieldset .inline-edit-date{float:right}.inline-edit-row fieldset input[name=hh],.inline-edit-row fieldset input[name=jj],.inline-edit-row fieldset input[name=mn]{font-size:12px;width:2.3em}.inline-edit-row fieldset input[name=aa]{font-size:12px;width:3.5em}.inline-edit-row fieldset label input.inline-edit-password-input{width:8em}ul.cat-checklist{margin:0;background-color:#fff}#bulk-titles{display:block;margin:0 0 5px;line-height:140%}.inline-edit-row fieldset ul.cat-checklist input,.inline-edit-row fieldset ul.cat-checklist li{margin:0;position:relative}.inline-edit-row #bulk-titles div,.inline-edit-row fieldset ul.cat-checklist label{font-style:normal;font-size:11px}.inline-edit-row fieldset label input.inline-edit-menu-order-input{width:3em}.inline-edit-row fieldset label input.inline-edit-slug-input{width:75%}.inline-edit-row #post_parent,.inline-edit-row select[name=page_template]{max-width:80%}.ie8 .inline-edit-row #post_parent,.ie8 .inline-edit-row select[name=page_template]{width:250px}.quick-edit-row-post fieldset label.inline-edit-status{float:right}#bulk-titles div{margin:.2em .3em}#bulk-titles div a{cursor:pointer;display:block;float:right;height:18px;margin:0 -2px 0 3px;overflow:hidden;position:relative;width:20px}#bulk-titles div a:before{position:relative;top:-3px}.plugins tbody,.plugins tbody th.check-column{padding:8px 2px 0 0}.plugins tbody th.check-column input[type=checkbox]{margin-top:4px}.updates-table .plugin-title p{margin-top:0}.plugins .inactive th.check-column,.plugins tfoot td.check-column,.plugins thead td.check-column{padding-right:6px}.plugins tr{background:#fff}.plugins p{margin:0 4px;padding:0}.plugins .desc p{margin:0 0 8px}.plugins td.desc{line-height:1.5em}.plugins .desc ol,.plugins .desc ul{margin:0 2em 0 0}.plugins .desc ul{list-style-type:disc}.plugins .row-actions{font-size:13px}.plugins .active td,.plugins .active th,.plugins .inactive td,.plugins .inactive th{padding:10px 9px}.plugins .active td,.plugins .active th{background-color:#f7fcfe}.plugins .update td,.plugins .update th{border-bottom:0}.plugin-update-tr td{border-top:0}.plugin-install #the-list td,.plugins .active td,.plugins .active th,.plugins .inactive td,.plugins .inactive th,.upgrade .plugins td,.upgrade .plugins th{-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 -1px 0 rgba(0,0,0,.1)}.plugins tr.active+tr.inactive td,.plugins tr.active+tr.inactive th,.plugins tr.active.plugin-update-tr+tr.inactive td,.plugins tr.active.plugin-update-tr+tr.inactive th{border-top:1px solid rgba(0,0,0,.03);-webkit-box-shadow:inset 0 1px 0 rgba(0,0,0,.02),inset 0 -1px 0 #e1e1e1;box-shadow:inset 0 1px 0 rgba(0,0,0,.02),inset 0 -1px 0 #e1e1e1}.plugins .update td,.plugins .update th,.plugins .updated td,.plugins .updated th,.plugins tr.active+tr.inactive.update td,.plugins tr.active+tr.inactive.update th,.plugins tr.active+tr.inactive.updated td,.plugins tr.active+tr.inactive.updated th,.upgrade .plugins tr:last-of-type td,.upgrade .plugins tr:last-of-type th{-webkit-box-shadow:none;box-shadow:none}.plugins .active.update td,.plugins .active.update th,tr.active.update+tr.plugin-update-tr .plugin-update{background-color:#fef7f1}.plugin-update-tr.active td,.plugins .active th.check-column{border-right:4px solid #00a0d2}.plugins .active.update th.check-column,.plugins .active.update+.plugin-update-tr .plugin-update{border-right:4px solid #d54e21}#wpbody-content .plugins .plugin-title,#wpbody-content .plugins .theme-title{padding-left:12px;white-space:nowrap}.updates-table-screenshot{float:right;padding:0 0 5px 10px}.plugins .inactive .plugin-title strong{font-weight:400}.plugins .row-actions,.plugins .second{padding:0 0 5px}.plugins .update .row-actions,.plugins .update .second,.plugins .updated .row-actions,.plugins .updated .second{padding-bottom:0}.plugins-php .widefat tfoot td,.plugins-php .widefat tfoot th{border-top-style:solid;border-top-width:1px}.plugin-update-tr .update-message{font-size:13px;font-weight:400;margin:0 31px 8px 10px;padding:6px 40px 8px 12px;background-color:#f7f7f7;background-color:rgba(0,0,0,.03)}.plugin-card .install-now:before,.plugin-card .update-now:before,.plugin-update-tr .update-message:before{color:#d54e21;display:inline-block;font:400 20px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;vertical-align:top}.plugin-card .update-now:before,.plugin-update-tr .update-message:before{content:"\f463"}.plugin-update-tr .update-message:before{margin:0 -30px 0 10px}.plugin-card .install-now:before,.plugin-card .update-now:before{margin:3px -2px 0 5px}.plugin-card .updating-message:before,.plugin-update-tr .updating-message:before{content:"\f463";-webkit-animation:rotation 2s infinite linear;animation:rotation 2s infinite linear}@-webkit-keyframes rotation{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(-359deg);transform:rotate(-359deg)}}@keyframes rotation{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(-359deg);transform:rotate(-359deg)}}.plugin-card .updated-message:before,.plugin-update-tr .updated-message:before{color:#79ba49;content:"\f147"}.wp-list-table.plugins tbody tr.plugin-update-tr td.plugin-update{overflow:hidden;padding:0;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 -1px 0 rgba(0,0,0,.1)}tr.active+tr.plugin-update-tr .plugin-update{background-color:#f7fcfe}tr.active+tr.plugin-update-tr:not(.updated) .plugin-update .update-message{background-color:#fcf3ef}.plugin-install-php h2{clear:both}.plugin-install-php h3{margin:2.5em 0 8px}.plugin-install-php .wp-filter{margin-bottom:0}.plugin-group{overflow:hidden;margin-top:1.5em}.plugin-group h3{margin-top:0}.plugin-card{float:right;margin:0 8px 16px;width:48.5%;width:-webkit-calc(50% - 8px);width:calc(50% - 8px);background-color:#fff;border:1px solid #ddd;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.plugin-card:nth-child(odd){clear:both;margin-right:0}.plugin-card:nth-child(even){margin-left:0}@media screen and (min-width:1600px){.plugin-card{width:30%;width:-webkit-calc(33.1% - 8px);width:calc(33.1% - 8px)}.plugin-card:nth-child(odd){clear:none;margin-right:8px}.plugin-card:nth-child(even){margin-left:8px}.plugin-card:nth-child(3n+1){clear:both;margin-right:0}.plugin-card:nth-child(3n){margin-left:0}}.plugin-card-top{position:relative;padding:20px 20px 10px;min-height:135px}.plugin-action-buttons,div.action-links{margin:0}.plugin-card h3{margin:0 0 12px;font-size:18px;line-height:1.3}.plugin-card .desc,.plugin-card .name{margin-right:148px;margin-left:120px}.plugin-card .action-links{position:absolute;top:20px;left:20px;width:120px}.plugin-action-buttons{clear:left;float:left;margin-right:2em;margin-bottom:1em;text-align:left}.plugin-action-buttons li{margin-bottom:10px}.plugin-card-bottom{clear:both;padding:12px 20px;background-color:#fafafa;border-top:1px solid #ddd;overflow:hidden}.plugin-card-bottom .star-rating{display:inline}.plugin-card-update-failed .update-now{font-weight:600}.plugin-card-update-failed .notice-error{margin:0;padding-right:16px;-webkit-box-shadow:0 -1px 0 #ddd;box-shadow:0 -1px 0 #ddd}.plugin-card-update-failed .plugin-card-bottom{display:none}.plugin-card .column-rating{line-height:23px}.plugin-card .column-rating,.plugin-card .column-updated{margin-bottom:4px}.plugin-card .column-downloaded,.plugin-card .column-rating{float:right;clear:right;max-width:180px}.plugin-card .column-compatibility,.plugin-card .column-updated{text-align:left;float:left;clear:left;width:65%;width:-webkit-calc(100% - 180px);width:calc(100% - 180px)}.plugin-card .column-compatibility span:before{font:400 20px/.5 dashicons;speak:none;display:inline-block;padding:0;top:4px;right:-2px;position:relative;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;color:#444}.plugin-card .compatibility-incompatible:before{content:"\f158"}.plugin-card .compatibility-compatible:before{content:"\f147"}.plugin-icon{position:absolute;top:20px;right:20px;width:128px;height:128px;margin:0 0 20px 20px}.no-plugin-results{color:#666;font-size:18px;font-style:normal;margin:0;padding:100px 0 0;text-align:center}.wp-list-table .site-deleted,.wp-list-table tr.site-deleted{background:#ff8573}.wp-list-table .site-spammed,.wp-list-table tr.site-spammed{background:#faafaa}.wp-list-table .site-archived,.wp-list-table tr.site-archived{background:#ffebe8}.wp-list-table .site-mature,.wp-list-table tr.site-mature{background:#fecac2}.sites.fixed .column-lastupdated,.sites.fixed .column-registered{width:20%}.sites.fixed .column-users{width:80px}@media screen and (max-width:1100px) and (min-width:782px),(max-width:480px){.plugin-card .action-links{position:static;margin-right:148px;width:auto}.plugin-action-buttons{float:none;margin:1em 0 0;text-align:right}.plugin-action-buttons li{display:inline-block;vertical-align:middle}.plugin-action-buttons li .button{margin-left:20px}.plugin-card .desc,.plugin-card .name{margin-left:0}.plugin-card .desc p:first-of-type{margin-top:0}.fixed .column-date{width:14%}}@media screen and (max-width:782px){.plugins #the-list tr td,.plugins tr.active+tr.inactive td,.plugins tr.active+tr.inactive th.check-column{border-top:none}.tablenav{height:auto}.tablenav.top{margin:20px 0 5px}.tablenav.bottom{position:relative;margin-top:15px}.tablenav br{display:none}.tablenav br.clear{display:block}.form-wrap>p,.tablenav .view-switch,.tablenav.top .actions,.tablenav.top .displaying-num,.tablenav.top .tablenav-pages.one-page{display:none}.view-switch a{width:36px;height:36px;line-height:33px}.tablenav.bottom .displaying-num{position:absolute;left:0;top:11px;margin:0;font-size:14px}.tablenav .tablenav-pages{width:100%;height:auto;text-align:center;margin:0 0 25px}.tablenav.bottom .tablenav-pages{margin-top:25px}.tablenav.bottom .tablenav-pages.one-page{margin:15px 0 0;height:0}.tablenav-pages .pagination-links{font-size:16px}.tablenav-pages .pagination-links a,.tablenav-pages-navspan{padding:9px 11px 12px;font-size:18px}.tablenav-pages-navspan{height:18px}.tablenav-pages .pagination-links .current-page{padding:8px 9px 9px;font-size:16px}.comment-count{font-size:14px}.wp-list-table th.column-primary~th,.wp-list-table tr:not(.inline-edit-row):not(.no-items) td.column-primary~td:not(.check-column){display:none}.wp-list-table thead th.column-primary{width:100%}.wp-list-table tr th.check-column{display:table-cell;width:35px}.wp-list-table .column-primary .toggle-row{display:block}.wp-list-table tr:not(.inline-edit-row):not(.no-items) td:not(.check-column){position:relative;clear:both;display:block;width:auto!important}.wp-list-table td.column-primary{padding-left:50px}.wp-list-table tr:not(.inline-edit-row):not(.no-items) td.column-primary~td:not(.check-column){padding:3px 35% 3px 8px}.wp-list-table tr:not(.inline-edit-row):not(.no-items) td:not(.column-primary)::before{position:absolute;right:10px;display:block;overflow:hidden;width:32%;content:attr(data-colname);white-space:nowrap;text-overflow:ellipsis}.wp-list-table .is-expanded td:not(.hidden){display:block!important;overflow:hidden}.column-posts,.widefat .num{text-align:right}#comments-form .fixed .column-author,#commentsdiv .fixed .column-author{display:none!important}.fixed .column-comment .comment-author{display:block}#the-comment-list .is-expanded td{-webkit-box-shadow:none;box-shadow:none}#the-comment-list .is-expanded td:last-child{-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 -1px 0 rgba(0,0,0,.1)}.post-com-count .screen-reader-text{position:static;width:auto;height:auto;margin:0}.column-comments .post-com-count-approved:after,.column-comments .post-com-count-no-comments:after,.column-response .post-com-count-approved:after,.column-response .post-com-count-no-comments:after{content:none}.column-comments .post-com-count [aria-hidden=true],.column-response .post-com-count [aria-hidden=true]{display:none}#edithead label,.column-comments .post-com-count-wrapper>a,.column-response .post-com-count-wrapper>a{display:block}.column-comments .post-com-count-wrapper,.column-response .post-com-count-wrapper{white-space:normal}.column-comments .post-com-count-approved,.column-comments .post-com-count-no-comments,.column-response .post-com-count-approved,.column-response .post-com-count-no-comments{margin-top:0;margin-left:.5em}.column-comments .post-com-count-pending,.column-response .post-com-count-pending{position:static;height:auto;min-width:0;padding:0;border:none;-webkit-border-radius:0;border-radius:0;background:0 0;color:#bb2a2a;font-size:inherit;line-height:inherit;text-align:right}.column-comments .post-com-count-pending:hover,.column-response .post-com-count-pending:hover{color:#dc3232}.widefat tfoot td.check-column,.widefat thead td.check-column{padding-top:10px}.widefat *{word-wrap:normal}#wpbody-content .bulk-edit-row .inline-edit-col-bottom,#wpbody-content .bulk-edit-row .inline-edit-col-left,#wpbody-content .bulk-edit-row-page .inline-edit-col-right,#wpbody-content .bulk-edit-row-post .inline-edit-col-right,#wpbody-content .inline-edit-row-post .inline-edit-col-center,#wpbody-content .quick-edit-row-page .inline-edit-col-left,#wpbody-content .quick-edit-row-page .inline-edit-col-right,#wpbody-content .quick-edit-row-post .inline-edit-col-left,#wpbody-content .quick-edit-row-post .inline-edit-col-right{float:none;width:100%}#wpbody-content .bulk-edit-row fieldset .inline-edit-col label,#wpbody-content .bulk-edit-row fieldset .inline-edit-group label,#wpbody-content .quick-edit-row fieldset .inline-edit-col label,#wpbody-content .quick-edit-row fieldset .inline-edit-group label{max-width:none;float:none;margin-bottom:5px}#wpbody .bulk-edit-row fieldset select{display:block;width:100%;max-width:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.inline-edit-row #bulk-titles div,.inline-edit-row fieldset ul.cat-checklist label{font-size:16px}.inline-edit-row fieldset label span.title,.inline-edit-row fieldset.inline-edit-date legend{float:none}.inline-edit-row fieldset label.inline-edit-tags{padding:0 .5em}.inline-edit-row fieldset .inline-edit-col label.inline-edit-tags{padding:0}.inline-edit-row fieldset .timestamp-wrap,.inline-edit-row fieldset label span.input-text-wrap{margin-right:0}.inline-edit-row fieldset input[name=hh],.inline-edit-row fieldset input[name=jj],.inline-edit-row fieldset input[name=mn]{width:3em}.inline-edit-row fieldset input[name=aa]{width:4.5em}.inline-edit-row .inline-edit-or{margin:0 0 0 6px}#commentsdiv #edithead .inside,#edithead .inside{float:none;text-align:right;padding:3px 5px}#commentsdiv #edithead .inside input,#edithead .inside input{width:100%}#bulk-titles div{margin:.8em .3em}.plugin-card,.plugin-update-tr .update-message{margin-right:0}#bulk-titles div a{height:22px}#wpbody-content .updates-table .plugin-title{width:auto;white-space:normal}.link-manager-php #posts-filter{margin-top:25px}.link-manager-php .tablenav.bottom{overflow:hidden}.comments-box .toggle-row,.wp-list-table.plugins .toggle-row{display:none}#wpbody-content .wp-list-table.plugins td{display:block;width:auto;padding:10px 9px}#wpbody-content .wp-list-table.plugins .column-description{padding-top:2px}#wpbody-content .wp-list-table.plugins .plugin-title,#wpbody-content .wp-list-table.plugins .theme-title{padding-left:12px;white-space:normal}.wp-list-table.plugins .plugin-title,.wp-list-table.plugins .theme-title{padding-top:13px;padding-bottom:4px}.plugins #the-list .update td,.plugins #the-list .update th,.plugins #the-list tr>td:not(:last-child),.wp-list-table.plugins #the-list .theme-title{-webkit-box-shadow:none;box-shadow:none;border-top:none}.plugins tbody{padding:1px 0 0}.plugins .plugin-update-tr:before,.plugins tr.active+tr.inactive td.column-description,.plugins tr.active+tr.inactive th.check-column{-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 -1px 0 rgba(0,0,0,.1)}.plugins .plugin-update-tr:before{content:"";display:table-cell}.plugins .active.update+.plugin-update-tr:before{border-right:4px solid #d54e21;background-color:#fef7f1}.plugins #the-list .plugin-update-tr .plugin-update{border-right:none}.wp-list-table.plugins .plugin-title strong,.wp-list-table.plugins .theme-title strong{font-size:1.4em;line-height:1.5}table.plugin-install .column-description,table.plugin-install .column-name,table.plugin-install .column-rating,table.plugin-install .column-version{display:block;width:auto}table.plugin-install th.column-description,table.plugin-install th.column-name,table.plugin-install th.column-rating,table.plugin-install th.column-version{display:none}table.plugin-install td.column-name strong{font-size:1.4em;line-height:1.6em}table.plugin-install #the-list td{-webkit-box-shadow:none;box-shadow:none}table.plugin-install #the-list tr{display:block;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 -1px 0 rgba(0,0,0,.1)}.plugin-card{margin-left:0;width:100%}} \ No newline at end of file diff --git a/wp-admin/css/list-tables.css b/wp-admin/css/list-tables.css index 0b4115d..d9d2d45 100644 --- a/wp-admin/css/list-tables.css +++ b/wp-admin/css/list-tables.css @@ -1,77 +1,125 @@ -/* List table styles */ -.post-com-count-wrapper { - min-width: 22px; -} - -.post-com-count { - background: none; - height: 1.3em; - line-height: 1.1em; +.response-links { display: block; - text-decoration: none; - padding: 0 0 6px; - cursor: pointer; - background-position: center -80px; - background-repeat: no-repeat; - color: #fff; + margin-bottom: 1em; } -.post-com-count:after { /* draw bubble connector using CSS! */ - content: ""; +.response-links a { display: block; - width: 0; - height: 0; - margin-left: 8px; - border-top: 5px solid #bbb; - border-right: 5px solid transparent; } -.post-com-count span { - font-size: 11px; +.response-links a.comments-edit-item-link { font-weight: 600; - height: 1.4em; - line-height: 1.4em; - min-width: 0.7em; - padding: 0 6px; +} + +.response-links a.comments-view-item-link { + font-size: 12px; +} + +.post-com-count-wrapper strong { + font-weight: 400; +} + +.comments-view-item-link { display: inline-block; - -webkit-border-radius: 5px; - border-radius: 5px; - background-color: #bbb; - color: #fff; + clear: both; } -.post-com-count:hover { - background-position: center -3px; +.column-response .post-com-count-wrapper, +.column-comments .post-com-count-wrapper { + white-space: nowrap; + word-wrap: normal; } -.post-com-count:hover span { - background-color: #2ea2cc; +/* comments bubble common */ +.column-response .post-com-count, +.column-comments .post-com-count { + display: inline-block; + vertical-align: top; } -.post-com-count:hover:after { - border-top: 5px solid #2ea2cc; +/* comments bubble approved */ +.column-response .post-com-count-no-comments, +.column-response .post-com-count-approved, +.column-comments .post-com-count-no-comments, +.column-comments .post-com-count-approved { + margin-top: 5px; } -strong .post-com-count { - background-position: center -55px; +.column-response .comment-count-no-comments, +.column-response .comment-count-approved, +.column-comments .comment-count-no-comments, +.column-comments .comment-count-approved { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + display: block; + padding: 0 8px; + min-width: 24px; + height: 2em; + -webkit-border-radius: 5px; + border-radius: 5px; + background-color: #72777c; + color: #fff; + font-size: 11px; + line-height: 21px; + text-align: center; } -strong .post-com-count span { - background-color: #0074a2; +.ie8 .column-response .comment-count-no-comments, +.ie8 .column-response .comment-count-approved, +.ie8 .column-comments .comment-count-no-comments, +.ie8 .column-comments .comment-count-approved { + min-width: 0; } -strong .post-com-count:after { - border-top: 5px solid #0074a2; +.column-response .post-com-count-no-comments:after, +.column-response .post-com-count-approved:after, +.column-comments .post-com-count-no-comments:after, +.column-comments .post-com-count-approved:after { + content: ""; + display: block; + margin-left: 8px; + width: 0; + height: 0; + border-top: 5px solid #72777c; + border-right: 5px solid transparent; } -.column-response .post-com-count { - float: left; - margin-right: 5px; +.column-response .post-com-count-approved:hover .comment-count-approved, +.column-response .post-com-count-approved:focus .comment-count-approved, +.column-comments .post-com-count-approved:hover .comment-count-approved, +.column-comments .post-com-count-approved:focus .comment-count-approved { + background: #0073aa; +} + +.column-response .post-com-count-approved:hover:after, +.column-response .post-com-count-approved:focus:after, +.column-comments .post-com-count-approved:hover:after, +.column-comments .post-com-count-approved:focus:after { + border-top-color: #0073aa; +} + +/* comments bubble pending */ +.column-response .post-com-count-pending, +.column-comments .post-com-count-pending { + position: relative; + left: -3px; + padding: 0 5px; + min-width: 7px; + height: 17px; + border: 2px solid #fff; + -webkit-border-radius: 11px; + border-radius: 11px; + background: #ca4a1f; + color: #fff; + font-size: 9px; + line-height: 17px; text-align: center; } -.response-links { - float: left; +.column-response .post-com-count-no-pending, +.column-comments .post-com-count-no-pending { + display: none; } /* comments */ @@ -94,7 +142,7 @@ strong .post-com-count:after { #submitted-on, .submitted-on { - color: #777; + color: #555d66; } /* reply to comments */ @@ -104,16 +152,11 @@ strong .post-com-count:after { #replysubmit { margin: 0; - padding: 0 5px 3px; + padding: 5px 7px 10px; + overflow: hidden; text-align: center; } -#replysubmit .spinner { - padding: 2px 0 0; - vertical-align: top; - float: right; -} - #replysubmit .button { margin-right: 5px; } @@ -124,14 +167,27 @@ strong .post-com-count:after { text-align: center; } -#replyrow h5 { - margin: .2em 0 0; - padding: 0 5px; - line-height: 1.4em; - font-size: 1em; +#replyrow.inline-edit-row fieldset.comment-reply { + font-size: inherit; + line-height: inherit; +} + +#replyrow legend { + margin: 0; + padding: .2em 5px 0; + font-size: 13px; + line-height: 1.4; + font-weight: 600; +} + +#replyrow.inline-edit-row label { + display: inline; + vertical-align: baseline; + line-height: inherit; } -#edithead .inside { +#edithead .inside, +#commentsdiv #edithead .inside { float: left; padding: 3px 0 2px 5px; margin: 0; @@ -166,13 +222,9 @@ strong .post-com-count:after { vertical-align: text-top; } -#the-comment-list .attachment-80x60 { - padding: 4px 8px; -} - #the-comment-list tr.undo, #the-comment-list div.undo { - background-color: #f4f4f4; + background-color: #f5f5f5; } #the-comment-list .unapproved th, @@ -226,8 +278,8 @@ th .comment-grey-bubble { } th .comment-grey-bubble:before { - content: '\f101'; - font: normal 20px/.5 'dashicons'; + content: "\f101"; + font: normal 20px/.5 dashicons; speak: none; display: inline-block; padding: 0; @@ -263,6 +315,10 @@ table.fixed { width: 10%; } +.fixed .column-posts { + width: 74px; +} + .fixed .column-comment .comment-author { display: none; } @@ -284,7 +340,7 @@ table.fixed { } .fixed .column-comments { - width: 4em; + width: 5.5em; padding: 8px 0; text-align: left; } @@ -293,12 +349,37 @@ table.fixed { padding-left: 3px; } -.fixed .column-comments a { +td.column-title strong, +td.plugin-title strong { + display: block; + margin-bottom: .2em; + font-size: 14px; +} + +td.column-title p, +td.plugin-title p { + margin: 6px 0; +} + +/* Media file column */ +table.media .column-title .media-icon { float: left; + min-height: 60px; + margin: 0 9px 0 0; } -.fixed .column-icon { - width: 80px; +table.media .column-title .media-icon img { + max-width: 60px; + height: auto; + vertical-align: top; /* Remove descender white-space. */ +} + +table.media .column-title .has-media-icon ~ .row-actions { + margin-left: 70px; /* 60px image + margin */ +} + +table.media .column-title .filename { + margin-bottom: 0.2em; } /* @todo: pick a consistent list table selector */ @@ -318,6 +399,10 @@ table.fixed { width: 20%; } +#comments-form .fixed .column-date { + width: 14%; +} + #commentsdiv.postbox .inside { margin: 0; padding: 0; @@ -349,7 +434,8 @@ table.fixed { border: 0 none; } -#commentsdiv .comments-box thead th { +#commentsdiv .comments-box thead th, +#commentsdiv .comments-box thead td { background: transparent; padding: 0 7px 4px; font-style: italic; @@ -359,12 +445,13 @@ table.fixed { border-bottom: 0 none; } -#commentsdiv .spinner { - padding-left: 5px; +#commentsdiv #edithead .inside input { + width: 160px; } .sorting-indicator { - display: none; + display: block; + visibility: hidden; width: 10px; height: 4px; margin-top: 8px; @@ -372,9 +459,8 @@ table.fixed { } .sorting-indicator:before { - background: none; - content: '\f142'; - font: normal 20px/1 'dashicons'; + content: "\f142"; + font: normal 20px/1 dashicons; speak: none; display: inline-block; padding: 0; @@ -396,13 +482,71 @@ table.fixed { } th.sorted.asc .sorting-indicator:before, -th.desc:hover span.sorting-indicator:before { - content: '\f142'; +th.desc:hover span.sorting-indicator:before, +th.desc a:focus span.sorting-indicator:before { + content: "\f142"; } th.sorted.desc .sorting-indicator:before, -th.asc:hover span.sorting-indicator:before { - content: '\f140'; +th.asc:hover span.sorting-indicator:before, +th.asc a:focus span.sorting-indicator:before { + content: "\f140"; +} + +.wp-list-table .toggle-row { + position: absolute; + right: 8px; + top: 10px; + display: none; + padding: 0; + width: 40px; + height: 40px; + border: none; + outline: none; + background: transparent; +} + +.wp-list-table .toggle-row:hover { + cursor: pointer; +} + +.wp-list-table .toggle-row:focus:before { + -webkit-box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); + box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); +} + +.ie8 .wp-list-table .toggle-row:focus:before { + outline: #5b9dd9 solid 1px; +} + +.wp-list-table .toggle-row:active { + -webkit-box-shadow: none; + box-shadow: none; +} + +.wp-list-table .toggle-row:before { + position: absolute; + top: -5px; + left: 10px; + -webkit-border-radius: 50%; + border-radius: 50%; + display: block; + padding: 1px 2px 1px 0; + color: #444; /* same as table headers sort arrows */ + content: "\f140"; + font: normal 20px/1 dashicons; + line-height: 1; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + speak: none; +} + +.wp-list-table .is-expanded .toggle-row:before { + content: "\f142"; } tr.wp-locked .locked-indicator { @@ -412,11 +556,11 @@ tr.wp-locked .locked-indicator { } tr.wp-locked .locked-indicator:before { - color: #888; - content: '\f160'; + color: #82878c; + content: "\f160"; display: inline-block; float: left; - font: normal 20px/1 'dashicons'; + font: normal 20px/1 dashicons; speak: none; vertical-align: middle; margin-left: 0; @@ -468,18 +612,7 @@ th.sortable a, th.sorted a { display: block; overflow: hidden; - padding: 7px 7px 8px 10px; -} - -th.manage-column a, -th.sortable a:hover, -th.sortable a:active, -th.sortable a:focus { - color: #333; -} - -th.sortable a:focus { - background: #e1e1e1; + padding: 8px; } .fixed .column-comments.sortable a, @@ -493,29 +626,33 @@ th.sorted a span { cursor: pointer; } -th.sorted.asc .sorting-indicator, -th.desc:hover span.sorting-indicator { - display: block; - background-position: 0 0; -} - -th.sorted.desc .sorting-indicator, -th.asc:hover span.sorting-indicator { - display: block; - background-position: -7px 0; +th.sorted .sorting-indicator, +th.desc:hover span.sorting-indicator, +th.desc a:focus span.sorting-indicator, +th.asc:hover span.sorting-indicator, +th.asc a:focus span.sorting-indicator { + visibility: visible; } /* Bulk Actions */ -.tablenav-pages a { +.tablenav-pages a, +.tablenav-pages-navspan { font-weight: 600; - margin-right: 1px; padding: 0 2px; } + .tablenav-pages .current-page { - padding-top: 0; + margin: 0 2px 0 0; + padding-bottom: 5px; + font-size: 13px; text-align: center; } -.tablenav-pages .next-page { + +.tablenav .total-pages { + margin-right: 2px; +} + +.tablenav #table-paging { margin-left: 2px; } @@ -537,12 +674,10 @@ th.asc:hover span.sorting-indicator { .tablenav .tablenav-pages { float: right; - display: block; + height: 28px; + margin-top: 3px; cursor: default; - height: 30px; color: #555; - line-height: 30px; - font-size: 12px; } .tablenav .no-pages, @@ -556,34 +691,44 @@ th.asc:hover span.sorting-indicator { padding: 3px 6px; } -.tablenav .tablenav-pages a { - padding: 0 10px 3px; - background: #eee; - background: rgba( 0, 0, 0, 0.05 ); +.tablenav .tablenav-pages a, +.tablenav-pages-navspan { + display: inline-block; + min-width: 17px; + border: 1px solid #ccc; /* same color as buttons border */ + padding: 3px 5px 7px; + background: #e5e5e5; font-size: 16px; + line-height: 1; font-weight: normal; + text-align: center; +} + +.tablenav-pages-navspan { + height: 16px; + border-color: #ddd; /* same as disabled buttons */ + background: #f7f7f7; /* same as disabled buttons */ + color: #a0a5aa; /* same as disabled buttons */ } .tablenav .tablenav-pages a:hover, .tablenav .tablenav-pages a:focus { + border-color: #5b9dd9; color: #fff; - background: #2ea2cc; + background: #00a0d2; + -webkit-box-shadow: none; + box-shadow: none; + outline: none; /* IE8 */ } -.tablenav .tablenav-pages a.disabled, -.tablenav .tablenav-pages a.disabled:hover, -.tablenav .tablenav-pages a.disabled:focus, -.tablenav .tablenav-pages a.disabled:active { - color: #aaa; - background: #eee; - background: rgba( 0, 0, 0, 0.05 ); +.tablenav .displaying-num { + margin-right: 7px; } -.tablenav .displaying-num { - margin-right: 2px; - color: #777; - font-size: 12px; - font-style: italic; +.tablenav .one-page .displaying-num { + display: inline-block; + margin-top: 5px; + margin-right: 0; } .tablenav .actions { @@ -591,6 +736,11 @@ th.asc:hover span.sorting-indicator { padding: 2px 8px 0 0; } +.wp-filter .actions { + display: inline-block; + vertical-align: middle; +} + .tablenav .delete { margin-right: 20px; } @@ -604,58 +754,70 @@ classes exist in paginate_links() but not seen in list table output. */ .tablenav .next, .tablenav .prev { border-color: transparent; - color: #0074a2; + color: #0073aa; } .tablenav .next:hover, .tablenav .prev:hover { border-color: transparent; - color: #2ea2cc; + color: #00a0d2; } -.view-switch { +.tablenav .view-switch { float: right; - margin: 5px 16px 0 8px; + margin: 0 5px; + padding-top: 3px; } -.view-switch img { - display: none; +.wp-filter .view-switch { + display: inline-block; + vertical-align: middle; + padding: 12px 0; + margin: 0 8px 0 2px; } -.view-switch a { - text-decoration: none; +.media-toolbar.wp-filter .view-switch { + margin: 0 12px 0 2px; } -.view-switch > a { - display: inline-block; - width: 18px; - height: 18px; +.view-switch a { + float: left; + width: 28px; + height: 28px; + text-align: center; + line-height: 24px; + text-decoration: none; } -.view-switch > a:before { - color: #bbb; - content: '\f163'; +.view-switch a:before { + color: #b4b9be; display: inline-block; - float: left; - font: normal 20px/1 'dashicons'; + font: normal 20px/1 dashicons; speak: none; vertical-align: middle; - margin-left: 0; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } -.view-switch a:hover:before { +.view-switch a:hover:before, +.view-switch a:focus:before { color: #727272; } .view-switch a.current:before { - color: #0074a2; + color: #0073aa; +} + +.view-switch .view-list:before { + content: "\f163"; } -.view-switch > a + a:before { - margin-left: 5px; - content: '\f164'; +.view-switch .view-excerpt:before { + content: "\f164"; +} + +.view-switch .view-grid:before { + content: "\f509"; } .filter { @@ -671,6 +833,10 @@ classes exist in paginate_links() but not seen in list table output. */ width: 4em; } +#posts-filter .wp-filter { + margin-bottom: 0; +} + #posts-filter fieldset { float: left; margin: 0 1.5ex 1em 0; @@ -711,15 +877,27 @@ p.pagenav { .row-actions { color: #ddd; font-size: 13px; - visibility: hidden; padding: 2px 0 0; + position: relative; + left: -9999em; +} + +/* ticket #34150 */ +.rtl .row-actions a { + display: inline-block; } +.row-actions .network_only, +.row-actions .network_active { + color: #000; +} + +.no-js .row-actions, tr:hover .row-actions, .mobile .row-actions, .row-actions.visible, -div.comment-item:hover .row-actions { - visibility: visible; +.comment-item:hover .row-actions { + position: static; } /* deprecated */ @@ -753,11 +931,6 @@ tr.inline-edit-row td, padding: 0 0.5em; } -#wpbody-content .quick-edit-row-page fieldset.inline-edit-col-right .inline-edit-col { - border-width: 0 0 0 1px; - border-style: none none none solid; -} - #wpbody-content .quick-edit-row-post .inline-edit-col-left { width: 40%; } @@ -798,14 +971,7 @@ tr.inline-edit-row td, .inline-edit-row fieldset .inline-edit-group { clear: both; -} - -.inline-edit-row fieldset .inline-edit-group:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; + line-height: 2.5; } .inline-edit-row p.submit { @@ -821,22 +987,37 @@ tr.inline-edit-row td, } /* Positioning */ -.inline-edit-row h4 { - margin: .2em 0; - padding: 0; - line-height: 23px; + +/* Needs higher specificity for the padding */ +#the-list .inline-edit-row .inline-edit-legend { + margin: 0; + padding: 0.2em 0.5em 0; + line-height: 2.5; + font-weight: 600; +} + +#the-list #bulk-edit.inline-edit-row .inline-edit-legend { + padding: 0.2em 0.5em; } + .inline-edit-row fieldset span.title, .inline-edit-row fieldset span.checkbox-title { margin: 0; padding: 0; - line-height: 27px; } .inline-edit-row fieldset label, .inline-edit-row fieldset span.inline-edit-categories-label { display: block; margin: .2em 0; + line-height: 2.5; +} + +.inline-edit-row fieldset.inline-edit-date label { + display: inline-block; + margin: 0; + line-height: 1.5; + vertical-align: baseline; } .inline-edit-row fieldset label.inline-edit-tags { @@ -848,15 +1029,27 @@ tr.inline-edit-row td, width: auto; } -.inline-edit-row fieldset label span.title { +.inline-edit-row fieldset label span.title, +.inline-edit-row fieldset.inline-edit-date legend { display: block; float: left; - width: 5em; + width: 6em; + line-height: 2.5; +} + +#posts-filter fieldset.inline-edit-date legend { + padding: 0; } -.inline-edit-row fieldset label span.input-text-wrap { +.inline-edit-row fieldset.inline-edit-date select { + margin: 1px; + line-height: 28px; +} + +.inline-edit-row fieldset label span.input-text-wrap, +.inline-edit-row fieldset .timestamp-wrap { display: block; - margin-left: 5em; + margin-left: 6em; } .quick-edit-row-post fieldset.inline-edit-col-right label span.title { @@ -864,17 +1057,23 @@ tr.inline-edit-row td, padding-right: 0.5em; } +.inline-edit-row .inline-edit-or { + margin: .2em 6px .2em 0; + line-height: 2.5; +} + .inline-edit-row .input-text-wrap input[type=text] { width: 100%; } .inline-edit-row fieldset label input[type=checkbox] { - vertical-align: text-bottom; + vertical-align: middle; } .inline-edit-row fieldset label textarea { width: 100%; height: 4em; + vertical-align: top; } #wpbody-content .bulk-edit-row fieldset .inline-edit-group label { @@ -889,21 +1088,14 @@ tr.inline-edit-row td, width: 6em; } -.inline-edit-save .spinner { - padding: 4px 10px 0; - vertical-align: top; - float: right; -} - /* Styling */ -.inline-edit-row h4 { +.inline-edit-row .inline-edit-legend { text-transform: uppercase; } .inline-edit-row fieldset span.title, .inline-edit-row fieldset span.checkbox-title { font-style: italic; - line-height: 1.8em; } /* Specific Elements */ @@ -915,7 +1107,7 @@ tr.inline-edit-row td, .inline-edit-row fieldset input[name=hh], .inline-edit-row fieldset input[name=mn] { font-size: 12px; - width: 2.1em; + width: 2.3em; } .inline-edit-row fieldset input[name=aa] { @@ -1015,25 +1207,16 @@ ul.cat-checklist { margin-top: 4px; } -#update-plugins-table tbody td p { +.updates-table .plugin-title p { margin-top: 0; } -#update-plugins-table tbody td p strong { - font-size: 14px; -} - -.plugins thead th.check-column, -.plugins tfoot th.check-column, +.plugins thead td.check-column, +.plugins tfoot td.check-column, .plugins .inactive th.check-column { padding-left: 6px; } -#update-plugins-table thead th.check-column, -#update-plugins-table tfoot th.check-column { - padding-top: 11px; -} - .plugins, .plugins th, .plugins td { @@ -1117,7 +1300,11 @@ ul.cat-checklist { .upgrade .plugins tr:last-of-type td, .upgrade .plugins tr:last-of-type th, .plugins tr.active + tr.inactive.update th, -.plugins tr.active + tr.inactive.update td { +.plugins tr.active + tr.inactive.update td, +.plugins .updated td, +.plugins .updated th, +.plugins tr.active + tr.inactive.updated th, +.plugins tr.active + tr.inactive.updated td { -webkit-box-shadow: none; box-shadow: none; } @@ -1128,8 +1315,9 @@ tr.active.update + tr.plugin-update-tr .plugin-update { background-color: #fef7f1; } -.plugins .active th.check-column { - border-left: 4px solid #2ea2cc; +.plugins .active th.check-column, +.plugin-update-tr.active td { + border-left: 4px solid #00a0d2; } .plugins .active.update th.check-column, @@ -1143,6 +1331,11 @@ tr.active.update + tr.plugin-update-tr .plugin-update { white-space:nowrap; } +.updates-table-screenshot { + float:left; + padding: 0 10px 5px 0; +} + .plugins .inactive .plugin-title strong { font-weight: 400; } @@ -1153,7 +1346,9 @@ tr.active.update + tr.plugin-update-tr .plugin-update { } .plugins .update .second, -.plugins .update .row-actions { +.plugins .update .row-actions, +.plugins .updated .second, +.plugins .updated .row-actions { padding-bottom: 0; } @@ -1166,28 +1361,76 @@ tr.active.update + tr.plugin-update-tr .plugin-update { .plugin-update-tr .update-message { font-size: 13px; font-weight: normal; - margin: 6px 12px 12px; - padding: 6px 12px; margin: 0 10px 8px 31px; + padding: 6px 12px 8px 40px; background-color: #f7f7f7; background-color: rgba(0,0,0,0.03); } -.plugin-update-tr .update-message:before { +.plugin-update-tr .update-message:before, +.plugin-card .update-now:before, +.plugin-card .install-now:before { color: #d54e21; - content: '\f463'; display: inline-block; - font: normal 20px/1 'dashicons'; + font: normal 20px/1 dashicons; speak: none; - margin: 0 8px 0 -2px; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; vertical-align: top; } -.plugins .plugin-update { +.plugin-update-tr .update-message:before, +.plugin-card .update-now:before { + content: "\f463"; +} + +.plugin-update-tr .update-message:before { + margin: 0 10px 0 -30px; +} + +.plugin-card .update-now:before, +.plugin-card .install-now:before { + margin: 3px 5px 0 -2px; +} + +.plugin-update-tr .updating-message:before, +.plugin-card .updating-message:before { + content: "\f463"; + -webkit-animation: rotation 2s infinite linear; + animation: rotation 2s infinite linear; +} + +@-webkit-keyframes rotation { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} + +@keyframes rotation { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} + +.plugin-update-tr .updated-message:before, +.plugin-card .updated-message:before { + color: #79ba49; + content: "\f147"; +} + +.wp-list-table.plugins tbody tr.plugin-update-tr td.plugin-update { + overflow: hidden; /* clearfix */ padding: 0; - border: none; -webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1); box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1); } @@ -1197,35 +1440,283 @@ tr.active + tr.plugin-update-tr .plugin-update { background-color: #f7fcfe; } -tr.active + tr.plugin-update-tr .plugin-update .update-message { +tr.active + tr.plugin-update-tr:not(.updated) .plugin-update .update-message { background-color: #fcf3ef; } -.plugin-install-php h4 { +.plugin-install-php h2 { + clear: both; +} + +.plugin-install-php h3 { margin: 2.5em 0 8px; } +.plugin-install-php .wp-filter { + margin-bottom: 0; +} + +/* Plugin card table view */ +.plugin-group { + overflow: hidden; /* clearfix */ + margin-top: 1.5em; +} + +.plugin-group h3 { + margin-top: 0; +} + +.plugin-card { + float: left; + margin: 0 8px 16px; + width: 48.5%; + width: -webkit-calc( 50% - 8px ); + width: calc( 50% - 8px ); + background-color: #fff; + border: 1px solid #ddd; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + +.plugin-card:nth-child(odd) { + clear: both; + margin-left: 0; +} + +.plugin-card:nth-child(even) { + margin-right: 0; +} + +@media screen and ( min-width: 1600px ) { + .plugin-card { + width: 30%; + width: -webkit-calc( 33.1% - 8px ); + width: calc( 33.1% - 8px ); + } + + .plugin-card:nth-child(odd) { + clear: none; + margin-left: 8px; + } + + .plugin-card:nth-child(even) { + margin-right: 8px; + } + + .plugin-card:nth-child(3n+1) { + clear: both; + margin-left: 0; + } + + .plugin-card:nth-child(3n) { + margin-right: 0; + } +} + +.plugin-card-top { + position: relative; + padding: 20px 20px 10px; + min-height: 135px; +} + +div.action-links, +.plugin-action-buttons { + margin: 0; /* Override existing margins */ +} + +.plugin-card h3 { + margin: 0 0 12px; + font-size: 18px; + line-height: 1.3; +} + +.plugin-card .name, +.plugin-card .desc { + margin-left: 148px; /* icon + margin */ + margin-right: 120px; /* action links */ +} + +.plugin-card .action-links { + position: absolute; + top: 20px; + right: 20px; + width: 120px; +} + +.plugin-action-buttons { + clear: right; + float: right; + margin-left: 2em; + margin-bottom: 1em; + text-align: right; +} + +.plugin-action-buttons li { + margin-bottom: 10px; +} + +.plugin-card-bottom { + clear: both; + padding: 12px 20px; + background-color: #fafafa; + border-top: 1px solid #ddd; + overflow: hidden; +} + +.plugin-card-bottom .star-rating { + display: inline; +} + +.plugin-card-update-failed .update-now { + font-weight: 600; +} + +.plugin-card-update-failed .notice-error { + margin: 0; + padding-left: 16px; + -webkit-box-shadow: 0 -1px 0 #ddd; + box-shadow: 0 -1px 0 #ddd; +} + +.plugin-card-update-failed .plugin-card-bottom { + display: none; +} + +.plugin-card .column-rating { + line-height: 23px; +} + +.plugin-card .column-rating, +.plugin-card .column-updated { + margin-bottom: 4px; +} + +.plugin-card .column-rating, +.plugin-card .column-downloaded { + float: left; + clear: left; + max-width: 180px; +} + +.plugin-card .column-updated, +.plugin-card .column-compatibility { + text-align: right; + float: right; + clear: right; + width: 65%; + width: -webkit-calc( 100% - 180px ); + width: calc( 100% - 180px ); +} + +.plugin-card .column-compatibility span:before { + font: normal 20px/.5 dashicons; + speak: none; + display: inline-block; + padding: 0; + top: 4px; + left: -2px; + position: relative; + vertical-align: top; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + text-decoration: none !important; + color: #444; +} + +.plugin-card .compatibility-incompatible:before { + content: "\f158"; +} + +.plugin-card .compatibility-compatible:before { + content: "\f147"; +} + +.plugin-icon { + position: absolute; + top: 20px; + left: 20px; + width: 128px; + height: 128px; + margin: 0 20px 20px 0; +} + +.no-plugin-results { + color: #666; /* same as no themes and no media */ + font-size: 18px; + font-style: normal; + margin: 0; + padding: 100px 0 0; + text-align: center; +} + /* ms */ /* Background Color for Site Status */ -.wp-list-table .site-deleted { +.wp-list-table .site-deleted, +.wp-list-table tr.site-deleted { background: #ff8573; } -.wp-list-table .site-spammed { +.wp-list-table .site-spammed, +.wp-list-table tr.site-spammed { background: #faafaa; } -.wp-list-table .site-archived { +.wp-list-table .site-archived, +.wp-list-table tr.site-archived { background: #ffebe8; } -.wp-list-table .site-mature { +.wp-list-table .site-mature, +.wp-list-table tr.site-mature { background: #fecac2; } +.sites.fixed .column-lastupdated, +.sites.fixed .column-registered { + width: 20%; +} + +.sites.fixed .column-users { + width: 80px; +} + /* =Media Queries -------------------------------------------------------------- */ -/** - * HiDPI Displays - */ +@media screen and ( max-width: 1100px ) and ( min-width: 782px ), ( max-width: 480px ) { + .plugin-card .action-links { + position: static; + margin-left: 148px; + width: auto; + } + + .plugin-action-buttons { + float: none; + margin: 1em 0 0; + text-align: left; + } + + .plugin-action-buttons li { + display: inline-block; + vertical-align: middle; + } + + .plugin-action-buttons li .button { + margin-right: 20px; + } + + .plugin-card .name, + .plugin-card .desc { + margin-right: 0; + } + + .plugin-card .desc p:first-of-type { + margin-top: 0; + } + + .fixed .column-date { + width: 14%; + } +} + @media screen and ( max-width: 782px ) { /* WP List Table Options & Filters */ .tablenav { @@ -1233,7 +1724,7 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message { } .tablenav.top { - margin: 0; + margin: 20px 0 5px 0; } .tablenav.bottom { @@ -1249,10 +1740,17 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message { display: block; } - .tablenav.top .actions, .view-switch { + .tablenav.top .actions, + .tablenav .view-switch { display: none; } + .view-switch a { + width: 36px; + height: 36px; + line-height: 33px; + } + /* Pagination */ .tablenav.top .displaying-num { display: none; @@ -1261,12 +1759,14 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message { .tablenav.bottom .displaying-num { position: absolute; right: 0; - top: 10px; + top: 11px; + margin: 0; font-size: 14px; } - .tablenav-pages { + .tablenav .tablenav-pages { width: 100%; + height: auto; text-align: center; margin: 0 0 25px; } @@ -1284,19 +1784,23 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message { height: 0; } - .tablenav-pages .pagination-links .paging-input { - font-size: 18px; + .tablenav-pages .pagination-links { + font-size: 16px; } - .tablenav-pages .pagination-links a { - padding: 8px 20px 11px; + .tablenav-pages .pagination-links a, + .tablenav-pages-navspan { + padding: 9px 11px 12px; font-size: 18px; - background: rgba(0, 0, 0, 0.05); + } + + .tablenav-pages-navspan { + height: 18px; } .tablenav-pages .pagination-links .current-page { - padding: 10px; - font-size: 14px; + padding: 8px 9px 9px; + font-size: 16px; } /* WP List Table Adjustments: General */ @@ -1308,35 +1812,143 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message { font-size: 14px; } - /* Columns to hide */ - .fixed .column-date, - .fixed .column-author, - .column-categories, - .column-tags, - .tags .column-description, - .media .column-parent, - .users .column-email, - .users .column-name, - .sites .column-registered, - .sites .column-users { + .wp-list-table th.column-primary ~ th, + .wp-list-table tr:not(.inline-edit-row):not(.no-items) td.column-primary ~ td:not(.check-column) { display: none; } + .wp-list-table thead th.column-primary { + width: 100%; + } + + /* Checkboxes need to show */ + .wp-list-table tr th.check-column { + display: table-cell; + width: 35px; + } + + .wp-list-table .column-primary .toggle-row { + display: block; + } + + .wp-list-table tr:not(.inline-edit-row):not(.no-items) td:not(.check-column) { + position: relative; + clear: both; + display: block; + width: auto !important; /* needs to override some columns that are more specifically targeted */ + } + + .wp-list-table td.column-primary { + padding-right: 50px; /* space for toggle button */ + } + + .wp-list-table tr:not(.inline-edit-row):not(.no-items) td.column-primary ~ td:not(.check-column) { + padding: 3px 8px 3px 35%; + } + + .wp-list-table tr:not(.inline-edit-row):not(.no-items) td:not(.column-primary)::before { + position: absolute; + left: 10px; /* match padding of regular table cell */ + display: block; + overflow: hidden; + width: 32%; /* leave a little space for a gutter */ + content: attr(data-colname); + white-space: nowrap; + text-overflow: ellipsis; + } + + .wp-list-table .is-expanded td:not(.hidden) { + display: block !important; + overflow: hidden; /* clearfix */ + } + + /* Special cases */ + .widefat .num, + .column-posts { + text-align: left; + } + + #comments-form .fixed .column-author, + #commentsdiv .fixed .column-author { + display: none !important; + } + .fixed .column-comment .comment-author { display: block; } - /* Posts */ - .column-title { - width: 85%; + #the-comment-list .is-expanded td { + -webkit-box-shadow: none; + box-shadow: none; + } + + #the-comment-list .is-expanded td:last-child { + -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1); + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1); + } + + /* Show comment bubble as text instead */ + .post-com-count .screen-reader-text { + position: static; + width: auto; + height: auto; + margin: 0; + } + + .column-response .post-com-count-no-comments:after, + .column-response .post-com-count-approved:after, + .column-comments .post-com-count-no-comments:after, + .column-comments .post-com-count-approved:after { + content: none; + } + + .column-response .post-com-count [aria-hidden="true"], + .column-comments .post-com-count [aria-hidden="true"] { + display: none; + } + + .column-response .post-com-count-wrapper, + .column-comments .post-com-count-wrapper { + white-space: normal; + } + + .column-response .post-com-count-wrapper > a, + .column-comments .post-com-count-wrapper > a { + display: block; + } + + .column-response .post-com-count-no-comments, + .column-response .post-com-count-approved, + .column-comments .post-com-count-no-comments, + .column-comments .post-com-count-approved { + margin-top: 0; + margin-right: 0.5em; + } + + .column-response .post-com-count-pending, + .column-comments .post-com-count-pending { + position: static; + height: auto; + min-width: 0; + padding: 0; + border: none; + -webkit-border-radius: 0; + border-radius: 0; + background: none; + color: #bb2a2a; + font-size: inherit; + line-height: inherit; + text-align: left; } - .fixed .column-comments, .widefat .check-column { - width: 35px + .column-response .post-com-count-pending:hover, + .column-comments .post-com-count-pending:hover { + color: #dc3232; } - .widefat thead .check-column, .widefat tfoot .check-column { - padding: 10px 0 10px; + .widefat thead td.check-column, + .widefat tfoot td.check-column { + padding-top: 10px; } .widefat * { @@ -1380,7 +1992,8 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message { font-size: 16px; } - .inline-edit-row fieldset label span.title { + .inline-edit-row fieldset label span.title, + .inline-edit-row fieldset.inline-edit-date legend { float: none; } @@ -1392,7 +2005,8 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message { padding: 0; } - .inline-edit-row fieldset label span.input-text-wrap { + .inline-edit-row fieldset label span.input-text-wrap, + .inline-edit-row fieldset .timestamp-wrap { margin-left: 0; } @@ -1406,41 +2020,38 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message { width: 4.5em; } - #bulk-titles div { - margin: 0.8em 0.3em; - } - - #bulk-titles div a { - height: 22px; + .inline-edit-row .inline-edit-or { + margin: 0 6px 0 0; } - /* Taxonomies */ - .tags .column-posts { - width: 50px; + #edithead .inside, + #commentsdiv #edithead .inside { + float: none; + text-align: left; + padding: 3px 5px; } - .tags .column-slug { - width: 30%; + #commentsdiv #edithead .inside input, + #edithead .inside input { + width: 100%; } - /* Comments */ - .comments .column-response { - width: 35%; + #edithead label { + display: block; } - /* Users */ - .users .column-role { - width: 35%; + #bulk-titles div { + margin: 0.8em 0.3em; } - /* Network admin sites */ - .sites .column-blogname { - width: 55%; + #bulk-titles div a { + height: 22px; } /* Updates */ - #wpbody-content #update-themes-table .plugin-title { + #wpbody-content .updates-table .plugin-title { width: auto; + white-space: normal; } /* Links */ @@ -1452,49 +2063,27 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message { overflow: hidden; } - /* Plugin/Theme Management Page */ - .wp-list-table.plugins { - position: relative; - margin-top: 35px; - margin-bottom: 50px; - } - - .wp-list-table.plugins thead .column-description, - #wpbody-content .wp-list-table.plugins tfoot .column-description, - .wp-list-table.plugins th#description { + /* List tables that don't toggle rows */ + .comments-box .toggle-row, + .wp-list-table.plugins .toggle-row { display: none; } - #wpbody-content .wp-list-table.plugins, - #wpbody-content .wp-list-table.plugins thead, - #wpbody-content .wp-list-table.plugins tbody, - #wpbody-content .wp-list-table.plugins tr, - #wpbody-content .wp-list-table.plugins .column-description, - #wpbody-content .wp-list-table.plugins .plugin-title, - #wpbody-content .wp-list-table.plugins .theme-title, - #wpbody-content .wp-list-table.plugins .plugin-update, - #wpbody-content .wp-list-table.plugins .manage-column.column-name { + /* Plugin/Theme Management */ + #wpbody-content .wp-list-table.plugins td { display: block; width: auto; + padding: 10px 9px; /* reset from other list tables that have a label at this width */ } - .wp-list-table.plugins thead, - .wp-list-table.plugins tfoot { - position: absolute; - top: -35px; - left: 0; - right: 0; - width: auto; - height: 35px; - } - - .wp-list-table.plugins tfoot { - bottom: -35px; - top: auto; + #wpbody-content .wp-list-table.plugins .column-description { + padding-top: 2px; } - .active, .inactive { - padding-top: 0; + #wpbody-content .wp-list-table.plugins .plugin-title, + #wpbody-content .wp-list-table.plugins .theme-title { + padding-right: 12px; + white-space: normal; } .wp-list-table.plugins .plugin-title, @@ -1503,20 +2092,26 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message { padding-bottom: 4px; } - .plugins tr.active + tr.inactive th.check-column, - .plugins tr.active + tr.inactive td, - .wp-list-table.plugins .plugin-title, - .wp-list-table.plugins .theme-title, - .wp-list-table.plugins tbody th { + .plugins #the-list tr > td:not(:last-child), + .plugins #the-list .update th, + .plugins #the-list .update td, + .wp-list-table.plugins #the-list .theme-title { -webkit-box-shadow: none; box-shadow: none; + border-top: none; + } + + .plugins #the-list tr td { + border-top: none; } .plugins tbody { padding: 1px 0 0; } - .plugins tr.active + tr.inactive td.column-description { + .plugins tr.active + tr.inactive th.check-column, + .plugins tr.active + tr.inactive td.column-description, + .plugins .plugin-update-tr:before { -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1); } @@ -1526,63 +2121,29 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message { border-top: none; } - .wp-list-table.plugins .column-description { - padding-top: 0; - } - - .wp-list-table.plugins .manage-column.column-name, - .wp-list-table.plugins .column-description, - .wp-list-table.plugins .plugin-title, - .wp-list-table.plugins .theme-title { - padding-right: 12px; - padding-left: 46px; - } - - .wp-list-table.plugins tr { - position: relative; - } - - .wp-list-table.plugins th.check-column, - .wp-list-table.plugins tr.update th.check-column { - position: absolute; - height: auto; - top: 0; - bottom: 0; - left: 0; - padding-left: 2px; - padding-top: 18px; - } - - .wp-list-table.plugins thead th.check-column, - .wp-list-table.plugins tfoot th.check-column { - padding-left: 3px; - padding-top: 11px; - background: none; - } - - .widefat tbody th.check-column input[type="checkbox"] { - margin-top: -3px; - margin-left: 8px; + /* mimic the checkbox th */ + .plugins .plugin-update-tr:before { + content: ""; + display: table-cell; } - .wp-list-table.plugins .active .check-column input, - .wp-list-table.plugins .update .check-column input { - margin-left: 5px; + .plugins .active.update + .plugin-update-tr:before { + border-left: 4px solid #d54e21; + background-color: #fef7f1; } - .wp-list-table.plugins thead .check-column input, - .wp-list-table.plugins tfoot .check-column input { - margin-top: -6px; + .plugins #the-list .plugin-update-tr .plugin-update { + border-left: none; } - .wp-list-table.plugins .active th.check-column { - background: none; + .plugin-update-tr .update-message { + margin-left: 0; } .wp-list-table.plugins .plugin-title strong, .wp-list-table.plugins .theme-title strong { font-size: 1.4em; - line-height: 1.6em; + line-height: 1.5; } /* Add New plugins page */ @@ -1616,4 +2177,10 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message { -webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1); box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1); } + + .plugin-card { + margin-left: 0; + margin-right: 0; + width: 100%; + } } diff --git a/wp-admin/css/list-tables.min.css b/wp-admin/css/list-tables.min.css new file mode 100644 index 0000000..dab2c99 --- /dev/null +++ b/wp-admin/css/list-tables.min.css @@ -0,0 +1 @@ +.response-links{display:block;margin-bottom:1em}.response-links a{display:block}.response-links a.comments-edit-item-link{font-weight:600}.response-links a.comments-view-item-link{font-size:12px}.post-com-count-wrapper strong{font-weight:400}.comments-view-item-link{display:inline-block;clear:both}.column-comments .post-com-count-wrapper,.column-response .post-com-count-wrapper{white-space:nowrap;word-wrap:normal}.column-comments .post-com-count,.column-response .post-com-count{display:inline-block;vertical-align:top}.column-comments .post-com-count-approved,.column-comments .post-com-count-no-comments,.column-response .post-com-count-approved,.column-response .post-com-count-no-comments{margin-top:5px}.column-comments .comment-count-approved,.column-comments .comment-count-no-comments,.column-response .comment-count-approved,.column-response .comment-count-no-comments{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;padding:0 8px;min-width:24px;height:2em;-webkit-border-radius:5px;border-radius:5px;background-color:#72777c;color:#fff;font-size:11px;line-height:21px;text-align:center}.ie8 .column-comments .comment-count-approved,.ie8 .column-comments .comment-count-no-comments,.ie8 .column-response .comment-count-approved,.ie8 .column-response .comment-count-no-comments{min-width:0}.column-comments .post-com-count-approved:after,.column-comments .post-com-count-no-comments:after,.column-response .post-com-count-approved:after,.column-response .post-com-count-no-comments:after{content:"";display:block;margin-left:8px;width:0;height:0;border-top:5px solid #72777c;border-right:5px solid transparent}.column-comments .post-com-count-approved:focus .comment-count-approved,.column-comments .post-com-count-approved:hover .comment-count-approved,.column-response .post-com-count-approved:focus .comment-count-approved,.column-response .post-com-count-approved:hover .comment-count-approved{background:#0073aa}.column-comments .post-com-count-approved:focus:after,.column-comments .post-com-count-approved:hover:after,.column-response .post-com-count-approved:focus:after,.column-response .post-com-count-approved:hover:after{border-top-color:#0073aa}.column-comments .post-com-count-pending,.column-response .post-com-count-pending{position:relative;left:-3px;padding:0 5px;min-width:7px;height:17px;border:2px solid #fff;-webkit-border-radius:11px;border-radius:11px;background:#ca4a1f;color:#fff;font-size:9px;line-height:17px;text-align:center}.column-comments .post-com-count-no-pending,.column-response .post-com-count-no-pending{display:none}.commentlist li{padding:1em 1em .2em;margin:0;border-bottom:1px solid #ccc}.commentlist li li{border-bottom:0;padding:0}.commentlist p{padding:0;margin:0 0 .8em}#submitted-on,.submitted-on{color:#555d66}#replyrow td{padding:2px}#replysubmit{margin:0;padding:5px 7px 10px;overflow:hidden;text-align:center}#replysubmit .button{margin-right:5px}#replysubmit .error{color:red;line-height:21px;text-align:center}#replyrow.inline-edit-row fieldset.comment-reply{font-size:inherit;line-height:inherit}#replyrow legend{margin:0;padding:.2em 5px 0;font-size:13px;line-height:1.4;font-weight:600}#replyrow.inline-edit-row label{display:inline;vertical-align:baseline;line-height:inherit}#commentsdiv #edithead .inside,#edithead .inside{float:left;padding:3px 0 2px 5px;margin:0;text-align:center}#edithead .inside input{width:180px}#edithead label{padding:2px 0}#replycontainer{padding:5px}#replycontent{height:120px;-webkit-box-shadow:none;box-shadow:none}#replyerror{border-color:#ddd;background-color:#f9f9f9}.commentlist .avatar{vertical-align:text-top}#the-comment-list div.undo,#the-comment-list tr.undo{background-color:#f5f5f5}#the-comment-list .unapproved td,#the-comment-list .unapproved th{background-color:#fef7f1}#the-comment-list .unapproved th.check-column{border-left:4px solid #d54e21}#the-comment-list .unapproved th.check-column input{margin-left:4px}#the-comment-list .approve a{color:#006505}#the-comment-list .unapprove a{color:#d98500}#the-comment-list td,#the-comment-list th{-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 -1px 0 rgba(0,0,0,.1)}#the-comment-list tr:last-child td,#the-comment-list tr:last-child th{-webkit-box-shadow:none;box-shadow:none}#the-comment-list tr.unapproved+tr.approved td,#the-comment-list tr.unapproved+tr.approved th{border-top:1px solid rgba(0,0,0,.03)}.vim-current,.vim-current td,.vim-current th{background-color:#e4f2fd!important}th .comment-grey-bubble{height:16px;width:16px}th .comment-grey-bubble:before{content:"\f101";font:400 20px/.5 dashicons;speak:none;display:inline-block;padding:0;top:4px;left:-4px;position:relative;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;color:#444}table.fixed{table-layout:fixed}.fixed .column-rating,.fixed .column-visible{width:8%}.fixed .column-author,.fixed .column-date,.fixed .column-format,.fixed .column-links,.fixed .column-parent,.fixed .column-posts{width:10%}.fixed .column-posts{width:74px}.fixed .column-comment .comment-author{display:none}.fixed .column-categories,.fixed .column-rel,.fixed .column-response,.fixed .column-role,.fixed .column-tags{width:15%}.fixed .column-slug{width:25%}.fixed .column-locations{width:35%}.fixed .column-comments{width:5.5em;padding:8px 0;text-align:left}.fixed .column-comments .vers{padding-left:3px}td.column-title strong,td.plugin-title strong{display:block;margin-bottom:.2em;font-size:14px}td.column-title p,td.plugin-title p{margin:6px 0}table.media .column-title .media-icon{float:left;min-height:60px;margin:0 9px 0 0}table.media .column-title .media-icon img{max-width:60px;height:auto;vertical-align:top}table.media .column-title .has-media-icon~.row-actions{margin-left:70px}table.media .column-title .filename{margin-bottom:.2em}.wp-list-table a{-webkit-transition:none;transition:none}#the-list tr:last-child td,#the-list tr:last-child th{border-bottom:none!important;-webkit-box-shadow:none;box-shadow:none}#comments-form .fixed .column-author{width:20%}#comments-form .fixed .column-date{width:14%}#commentsdiv.postbox .inside{margin:0;padding:0}#commentsdiv .inside .row-actions{line-height:18px}#commentsdiv .inside .column-author{width:25%}#commentsdiv .column-comment p{margin:.6em 0;padding:0}#commentsdiv #replyrow td{padding:0}#commentsdiv p{padding:8px 10px;margin:0}#commentsdiv .comments-box{border:0}#commentsdiv .comments-box thead td,#commentsdiv .comments-box thead th{background:0 0;padding:0 7px 4px;font-style:italic}#commentsdiv .comments-box tr:last-child td{border-bottom:0 none}#commentsdiv #edithead .inside input{width:160px}.sorting-indicator{display:block;visibility:hidden;width:10px;height:4px;margin-top:8px;margin-left:7px}.sorting-indicator:before{content:"\f142";font:400 20px/1 dashicons;speak:none;display:inline-block;padding:0;top:-4px;left:-8px;line-height:10px;position:relative;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;color:#444}.column-comments .sorting-indicator:before{top:0;left:-10px}th.desc a:focus span.sorting-indicator:before,th.desc:hover span.sorting-indicator:before,th.sorted.asc .sorting-indicator:before{content:"\f142"}th.asc a:focus span.sorting-indicator:before,th.asc:hover span.sorting-indicator:before,th.sorted.desc .sorting-indicator:before{content:"\f140"}.wp-list-table .toggle-row{position:absolute;right:8px;top:10px;display:none;padding:0;width:40px;height:40px;border:none;outline:0;background:0 0}.wp-list-table .toggle-row:hover{cursor:pointer}.wp-list-table .toggle-row:focus:before{-webkit-box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}.ie8 .wp-list-table .toggle-row:focus:before{outline:#5b9dd9 solid 1px}.wp-list-table .toggle-row:active{-webkit-box-shadow:none;box-shadow:none}.wp-list-table .toggle-row:before{position:absolute;top:-5px;left:10px;-webkit-border-radius:50%;border-radius:50%;display:block;padding:1px 2px 1px 0;color:#444;content:"\f140";font:400 20px/1 dashicons;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;speak:none}.wp-list-table .is-expanded .toggle-row:before{content:"\f142"}tr.wp-locked .locked-indicator{margin-left:6px;height:20px;width:16px}tr.wp-locked .locked-indicator:before{color:#82878c;content:"\f160";display:inline-block;float:left;font:400 20px/1 dashicons;speak:none;vertical-align:middle;margin-left:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}tr.wp-locked .check-column input[type=checkbox],tr.wp-locked .check-column label,tr.wp-locked .row-actions .inline,tr.wp-locked .row-actions .trash{display:none}tr .locked-info{height:0;opacity:0}tr.wp-locked .locked-info{margin-top:8px;height:auto;opacity:1}.locked-text{vertical-align:top}tr.locked-info,tr.wp-locked .locked-info{-webkit-transition:height 1s,opacity .5s;transition:height 1s,opacity .5s}.fixed .column-comments .sorting-indicator{margin-top:3px}#menu-locations-wrap .widefat{width:60%}.widefat th.sortable,.widefat th.sorted{padding:0}th.sortable a,th.sorted a{display:block;overflow:hidden;padding:8px}.fixed .column-comments.sortable a,.fixed .column-comments.sorted a{padding:8px 0}th.sortable a span,th.sorted a span{float:left;cursor:pointer}th.asc a:focus span.sorting-indicator,th.asc:hover span.sorting-indicator,th.desc a:focus span.sorting-indicator,th.desc:hover span.sorting-indicator,th.sorted .sorting-indicator{visibility:visible}.tablenav-pages a,.tablenav-pages-navspan{font-weight:600;padding:0 2px}.tablenav-pages .current-page{margin:0 2px 0 0;padding-bottom:5px;font-size:13px;text-align:center}.tablenav .total-pages{margin-right:2px}.tablenav #table-paging{margin-left:2px}.tablenav a.button-secondary{display:block;margin:3px 8px 0 0}.tablenav{clear:both;height:30px;margin:6px 0 4px;vertical-align:middle}.tablenav.themes{max-width:98%}.tablenav .tablenav-pages{float:right;height:28px;margin-top:3px;cursor:default;color:#555}.tablenav .no-pages,.tablenav .one-page .pagination-links{display:none}.tablenav .tablenav-pages a,.tablenav-pages span.current{text-decoration:none;padding:3px 6px}.tablenav .tablenav-pages a,.tablenav-pages-navspan{display:inline-block;min-width:17px;border:1px solid #ccc;padding:3px 5px 7px;background:#e5e5e5;font-size:16px;line-height:1;font-weight:400;text-align:center}.tablenav-pages-navspan{height:16px;border-color:#ddd;background:#f7f7f7;color:#a0a5aa}.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover{border-color:#5b9dd9;color:#fff;background:#00a0d2;-webkit-box-shadow:none;box-shadow:none;outline:0}.tablenav .displaying-num{margin-right:7px}.tablenav .one-page .displaying-num{display:inline-block;margin-top:5px;margin-right:0}.tablenav .actions{overflow:hidden;padding:2px 8px 0 0}.wp-filter .actions{display:inline-block;vertical-align:middle}.tablenav .delete{margin-right:20px}.tablenav .dots{border-color:transparent}.tablenav .next,.tablenav .prev{border-color:transparent;color:#0073aa}.tablenav .next:hover,.tablenav .prev:hover{border-color:transparent;color:#00a0d2}.tablenav .view-switch{float:right;margin:0 5px;padding-top:3px}.wp-filter .view-switch{display:inline-block;vertical-align:middle;padding:12px 0;margin:0 8px 0 2px}.media-toolbar.wp-filter .view-switch{margin:0 12px 0 2px}.view-switch a{float:left;width:28px;height:28px;text-align:center;line-height:24px;text-decoration:none}.view-switch a:before{color:#b4b9be;display:inline-block;font:400 20px/1 dashicons;speak:none;vertical-align:middle;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.view-switch a:focus:before,.view-switch a:hover:before{color:#727272}.view-switch a.current:before{color:#0073aa}.view-switch .view-list:before{content:"\f163"}.view-switch .view-excerpt:before{content:"\f164"}.view-switch .view-grid:before{content:"\f509"}.filter{float:left;margin:-5px 0 0 10px}.filter .subsubsub{margin-left:-10px;margin-top:13px}.screen-per-page{width:4em}#posts-filter .wp-filter{margin-bottom:0}#posts-filter fieldset{float:left;margin:0 1.5ex 1em 0;padding:0}#posts-filter fieldset legend{padding:0 0 .2em 1px}.row-actions,.row-actions-visible{padding:2px 0 0}p.pagenav{margin:0;display:inline}.pagenav span{font-weight:600;margin:0 6px}.row-title{font-size:14px!important;font-weight:600}.column-comment .comment-author{margin-bottom:.6em}.column-author img,.column-comment .comment-author img,.column-username img{float:left;margin-right:10px;margin-top:1px}.row-actions{color:#ddd;font-size:13px;position:relative;left:-9999em}.plugins,.plugins td,.plugins th,.row-actions .network_active,.row-actions .network_only{color:#000}.rtl .row-actions a{display:inline-block}.comment-item:hover .row-actions,.mobile .row-actions,.no-js .row-actions,.row-actions.visible,tr:hover .row-actions{position:static}#wpbody-content .inline-edit-row fieldset{font-size:12px;float:left;margin:0;padding:0;width:100%}#wpbody-content .inline-edit-row fieldset .inline-edit-col,tr.inline-edit-row td{padding:0 .5em}#wpbody-content .quick-edit-row-post .inline-edit-col-left{width:40%}#wpbody-content .quick-edit-row-post .inline-edit-col-right{width:39%}#wpbody-content .inline-edit-row-post .inline-edit-col-center{width:20%}#wpbody-content .quick-edit-row-page .inline-edit-col-left{width:50%}#wpbody-content .bulk-edit-row-post .inline-edit-col-right,#wpbody-content .quick-edit-row-page .inline-edit-col-right{width:49%}#wpbody-content .bulk-edit-row .inline-edit-col-left{width:30%}#wpbody-content .bulk-edit-row-page .inline-edit-col-right{width:69%}#wpbody-content .bulk-edit-row .inline-edit-col-bottom{float:right;width:69%}#wpbody-content .inline-edit-row-page .inline-edit-col-right{margin-top:27px}.inline-edit-row fieldset .inline-edit-group{clear:both;line-height:2.5}.inline-edit-row p.submit{clear:both;padding:.5em;margin:.5em 0 0}.inline-edit-row span.error{line-height:22px;margin:0 15px;padding:3px 5px}#the-list .inline-edit-row .inline-edit-legend{margin:0;padding:.2em .5em 0;line-height:2.5;font-weight:600}#the-list #bulk-edit.inline-edit-row .inline-edit-legend{padding:.2em .5em}.inline-edit-row fieldset span.checkbox-title,.inline-edit-row fieldset span.title{margin:0;padding:0;font-style:italic}.inline-edit-row fieldset label,.inline-edit-row fieldset span.inline-edit-categories-label{display:block;margin:.2em 0;line-height:2.5}.inline-edit-row fieldset.inline-edit-date label{display:inline-block;margin:0;line-height:1.5;vertical-align:baseline}.inline-edit-row fieldset label.inline-edit-tags{margin-top:0}.inline-edit-row fieldset label.inline-edit-tags span.title{margin:.2em 0;width:auto}.inline-edit-row fieldset label span.title,.inline-edit-row fieldset.inline-edit-date legend{display:block;float:left;width:6em;line-height:2.5}#posts-filter fieldset.inline-edit-date legend{padding:0}.inline-edit-row fieldset.inline-edit-date select{margin:1px;line-height:28px}.inline-edit-row fieldset .timestamp-wrap,.inline-edit-row fieldset label span.input-text-wrap{display:block;margin-left:6em}.quick-edit-row-post fieldset.inline-edit-col-right label span.title{width:auto;padding-right:.5em}.inline-edit-row .inline-edit-or{margin:.2em 6px .2em 0;line-height:2.5}.inline-edit-row .input-text-wrap input[type=text]{width:100%}.inline-edit-row fieldset label input[type=checkbox]{vertical-align:middle}.inline-edit-row fieldset label textarea{width:100%;height:4em;vertical-align:top}#bulk-titles,ul.cat-checklist{height:12em;border:1px solid #ddd;overflow-y:scroll;padding:0 5px}#wpbody-content .bulk-edit-row fieldset .inline-edit-group label{max-width:50%}#wpbody-content .quick-edit-row fieldset .inline-edit-group label.alignleft:first-child{margin-right:.5em}.inline-edit-col-right .input-text-wrap input.inline-edit-menu-order-input{width:6em}.inline-edit-row .inline-edit-legend{text-transform:uppercase}.inline-edit-row fieldset .inline-edit-date{float:left}.inline-edit-row fieldset input[name=hh],.inline-edit-row fieldset input[name=jj],.inline-edit-row fieldset input[name=mn]{font-size:12px;width:2.3em}.inline-edit-row fieldset input[name=aa]{font-size:12px;width:3.5em}.inline-edit-row fieldset label input.inline-edit-password-input{width:8em}ul.cat-checklist{margin:0;background-color:#fff}#bulk-titles{display:block;margin:0 0 5px;line-height:140%}.inline-edit-row fieldset ul.cat-checklist input,.inline-edit-row fieldset ul.cat-checklist li{margin:0;position:relative}.inline-edit-row #bulk-titles div,.inline-edit-row fieldset ul.cat-checklist label{font-style:normal;font-size:11px}.inline-edit-row fieldset label input.inline-edit-menu-order-input{width:3em}.inline-edit-row fieldset label input.inline-edit-slug-input{width:75%}.inline-edit-row #post_parent,.inline-edit-row select[name=page_template]{max-width:80%}.ie8 .inline-edit-row #post_parent,.ie8 .inline-edit-row select[name=page_template]{width:250px}.quick-edit-row-post fieldset label.inline-edit-status{float:left}#bulk-titles div{margin:.2em .3em}#bulk-titles div a{cursor:pointer;display:block;float:left;height:18px;margin:0 3px 0 -2px;overflow:hidden;position:relative;width:20px}#bulk-titles div a:before{position:relative;top:-3px}.plugins tbody,.plugins tbody th.check-column{padding:8px 0 0 2px}.plugins tbody th.check-column input[type=checkbox]{margin-top:4px}.updates-table .plugin-title p{margin-top:0}.plugins .inactive th.check-column,.plugins tfoot td.check-column,.plugins thead td.check-column{padding-left:6px}.plugins tr{background:#fff}.plugins p{margin:0 4px;padding:0}.plugins .desc p{margin:0 0 8px}.plugins td.desc{line-height:1.5em}.plugins .desc ol,.plugins .desc ul{margin:0 0 0 2em}.plugins .desc ul{list-style-type:disc}.plugins .row-actions{font-size:13px}.plugins .active td,.plugins .active th,.plugins .inactive td,.plugins .inactive th{padding:10px 9px}.plugins .active td,.plugins .active th{background-color:#f7fcfe}.plugins .update td,.plugins .update th{border-bottom:0}.plugin-update-tr td{border-top:0}.plugin-install #the-list td,.plugins .active td,.plugins .active th,.plugins .inactive td,.plugins .inactive th,.upgrade .plugins td,.upgrade .plugins th{-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 -1px 0 rgba(0,0,0,.1)}.plugins tr.active+tr.inactive td,.plugins tr.active+tr.inactive th,.plugins tr.active.plugin-update-tr+tr.inactive td,.plugins tr.active.plugin-update-tr+tr.inactive th{border-top:1px solid rgba(0,0,0,.03);-webkit-box-shadow:inset 0 1px 0 rgba(0,0,0,.02),inset 0 -1px 0 #e1e1e1;box-shadow:inset 0 1px 0 rgba(0,0,0,.02),inset 0 -1px 0 #e1e1e1}.plugins .update td,.plugins .update th,.plugins .updated td,.plugins .updated th,.plugins tr.active+tr.inactive.update td,.plugins tr.active+tr.inactive.update th,.plugins tr.active+tr.inactive.updated td,.plugins tr.active+tr.inactive.updated th,.upgrade .plugins tr:last-of-type td,.upgrade .plugins tr:last-of-type th{-webkit-box-shadow:none;box-shadow:none}.plugins .active.update td,.plugins .active.update th,tr.active.update+tr.plugin-update-tr .plugin-update{background-color:#fef7f1}.plugin-update-tr.active td,.plugins .active th.check-column{border-left:4px solid #00a0d2}.plugins .active.update th.check-column,.plugins .active.update+.plugin-update-tr .plugin-update{border-left:4px solid #d54e21}#wpbody-content .plugins .plugin-title,#wpbody-content .plugins .theme-title{padding-right:12px;white-space:nowrap}.updates-table-screenshot{float:left;padding:0 10px 5px 0}.plugins .inactive .plugin-title strong{font-weight:400}.plugins .row-actions,.plugins .second{padding:0 0 5px}.plugins .update .row-actions,.plugins .update .second,.plugins .updated .row-actions,.plugins .updated .second{padding-bottom:0}.plugins-php .widefat tfoot td,.plugins-php .widefat tfoot th{border-top-style:solid;border-top-width:1px}.plugin-update-tr .update-message{font-size:13px;font-weight:400;margin:0 10px 8px 31px;padding:6px 12px 8px 40px;background-color:#f7f7f7;background-color:rgba(0,0,0,.03)}.plugin-card .install-now:before,.plugin-card .update-now:before,.plugin-update-tr .update-message:before{color:#d54e21;display:inline-block;font:400 20px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;vertical-align:top}.plugin-card .update-now:before,.plugin-update-tr .update-message:before{content:"\f463"}.plugin-update-tr .update-message:before{margin:0 10px 0 -30px}.plugin-card .install-now:before,.plugin-card .update-now:before{margin:3px 5px 0 -2px}.plugin-card .updating-message:before,.plugin-update-tr .updating-message:before{content:"\f463";-webkit-animation:rotation 2s infinite linear;animation:rotation 2s infinite linear}@-webkit-keyframes rotation{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes rotation{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.plugin-card .updated-message:before,.plugin-update-tr .updated-message:before{color:#79ba49;content:"\f147"}.wp-list-table.plugins tbody tr.plugin-update-tr td.plugin-update{overflow:hidden;padding:0;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 -1px 0 rgba(0,0,0,.1)}tr.active+tr.plugin-update-tr .plugin-update{background-color:#f7fcfe}tr.active+tr.plugin-update-tr:not(.updated) .plugin-update .update-message{background-color:#fcf3ef}.plugin-install-php h2{clear:both}.plugin-install-php h3{margin:2.5em 0 8px}.plugin-install-php .wp-filter{margin-bottom:0}.plugin-group{overflow:hidden;margin-top:1.5em}.plugin-group h3{margin-top:0}.plugin-card{float:left;margin:0 8px 16px;width:48.5%;width:-webkit-calc(50% - 8px);width:calc(50% - 8px);background-color:#fff;border:1px solid #ddd;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.plugin-card:nth-child(odd){clear:both;margin-left:0}.plugin-card:nth-child(even){margin-right:0}@media screen and (min-width:1600px){.plugin-card{width:30%;width:-webkit-calc(33.1% - 8px);width:calc(33.1% - 8px)}.plugin-card:nth-child(odd){clear:none;margin-left:8px}.plugin-card:nth-child(even){margin-right:8px}.plugin-card:nth-child(3n+1){clear:both;margin-left:0}.plugin-card:nth-child(3n){margin-right:0}}.plugin-card-top{position:relative;padding:20px 20px 10px;min-height:135px}.plugin-action-buttons,div.action-links{margin:0}.plugin-card h3{margin:0 0 12px;font-size:18px;line-height:1.3}.plugin-card .desc,.plugin-card .name{margin-left:148px;margin-right:120px}.plugin-card .action-links{position:absolute;top:20px;right:20px;width:120px}.plugin-action-buttons{clear:right;float:right;margin-left:2em;margin-bottom:1em;text-align:right}.plugin-action-buttons li{margin-bottom:10px}.plugin-card-bottom{clear:both;padding:12px 20px;background-color:#fafafa;border-top:1px solid #ddd;overflow:hidden}.plugin-card-bottom .star-rating{display:inline}.plugin-card-update-failed .update-now{font-weight:600}.plugin-card-update-failed .notice-error{margin:0;padding-left:16px;-webkit-box-shadow:0 -1px 0 #ddd;box-shadow:0 -1px 0 #ddd}.plugin-card-update-failed .plugin-card-bottom{display:none}.plugin-card .column-rating{line-height:23px}.plugin-card .column-rating,.plugin-card .column-updated{margin-bottom:4px}.plugin-card .column-downloaded,.plugin-card .column-rating{float:left;clear:left;max-width:180px}.plugin-card .column-compatibility,.plugin-card .column-updated{text-align:right;float:right;clear:right;width:65%;width:-webkit-calc(100% - 180px);width:calc(100% - 180px)}.plugin-card .column-compatibility span:before{font:400 20px/.5 dashicons;speak:none;display:inline-block;padding:0;top:4px;left:-2px;position:relative;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;color:#444}.plugin-card .compatibility-incompatible:before{content:"\f158"}.plugin-card .compatibility-compatible:before{content:"\f147"}.plugin-icon{position:absolute;top:20px;left:20px;width:128px;height:128px;margin:0 20px 20px 0}.no-plugin-results{color:#666;font-size:18px;font-style:normal;margin:0;padding:100px 0 0;text-align:center}.wp-list-table .site-deleted,.wp-list-table tr.site-deleted{background:#ff8573}.wp-list-table .site-spammed,.wp-list-table tr.site-spammed{background:#faafaa}.wp-list-table .site-archived,.wp-list-table tr.site-archived{background:#ffebe8}.wp-list-table .site-mature,.wp-list-table tr.site-mature{background:#fecac2}.sites.fixed .column-lastupdated,.sites.fixed .column-registered{width:20%}.sites.fixed .column-users{width:80px}@media screen and (max-width:1100px) and (min-width:782px),(max-width:480px){.plugin-card .action-links{position:static;margin-left:148px;width:auto}.plugin-action-buttons{float:none;margin:1em 0 0;text-align:left}.plugin-action-buttons li{display:inline-block;vertical-align:middle}.plugin-action-buttons li .button{margin-right:20px}.plugin-card .desc,.plugin-card .name{margin-right:0}.plugin-card .desc p:first-of-type{margin-top:0}.fixed .column-date{width:14%}}@media screen and (max-width:782px){.plugins #the-list tr td,.plugins tr.active+tr.inactive td,.plugins tr.active+tr.inactive th.check-column{border-top:none}.tablenav{height:auto}.tablenav.top{margin:20px 0 5px}.tablenav.bottom{position:relative;margin-top:15px}.tablenav br{display:none}.tablenav br.clear{display:block}.form-wrap>p,.tablenav .view-switch,.tablenav.top .actions,.tablenav.top .displaying-num,.tablenav.top .tablenav-pages.one-page{display:none}.view-switch a{width:36px;height:36px;line-height:33px}.tablenav.bottom .displaying-num{position:absolute;right:0;top:11px;margin:0;font-size:14px}.tablenav .tablenav-pages{width:100%;height:auto;text-align:center;margin:0 0 25px}.tablenav.bottom .tablenav-pages{margin-top:25px}.tablenav.bottom .tablenav-pages.one-page{margin:15px 0 0;height:0}.tablenav-pages .pagination-links{font-size:16px}.tablenav-pages .pagination-links a,.tablenav-pages-navspan{padding:9px 11px 12px;font-size:18px}.tablenav-pages-navspan{height:18px}.tablenav-pages .pagination-links .current-page{padding:8px 9px 9px;font-size:16px}.comment-count{font-size:14px}.wp-list-table th.column-primary~th,.wp-list-table tr:not(.inline-edit-row):not(.no-items) td.column-primary~td:not(.check-column){display:none}.wp-list-table thead th.column-primary{width:100%}.wp-list-table tr th.check-column{display:table-cell;width:35px}.wp-list-table .column-primary .toggle-row{display:block}.wp-list-table tr:not(.inline-edit-row):not(.no-items) td:not(.check-column){position:relative;clear:both;display:block;width:auto!important}.wp-list-table td.column-primary{padding-right:50px}.wp-list-table tr:not(.inline-edit-row):not(.no-items) td.column-primary~td:not(.check-column){padding:3px 8px 3px 35%}.wp-list-table tr:not(.inline-edit-row):not(.no-items) td:not(.column-primary)::before{position:absolute;left:10px;display:block;overflow:hidden;width:32%;content:attr(data-colname);white-space:nowrap;text-overflow:ellipsis}.wp-list-table .is-expanded td:not(.hidden){display:block!important;overflow:hidden}.column-posts,.widefat .num{text-align:left}#comments-form .fixed .column-author,#commentsdiv .fixed .column-author{display:none!important}.fixed .column-comment .comment-author{display:block}#the-comment-list .is-expanded td{-webkit-box-shadow:none;box-shadow:none}#the-comment-list .is-expanded td:last-child{-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 -1px 0 rgba(0,0,0,.1)}.post-com-count .screen-reader-text{position:static;width:auto;height:auto;margin:0}.column-comments .post-com-count-approved:after,.column-comments .post-com-count-no-comments:after,.column-response .post-com-count-approved:after,.column-response .post-com-count-no-comments:after{content:none}.column-comments .post-com-count [aria-hidden=true],.column-response .post-com-count [aria-hidden=true]{display:none}#edithead label,.column-comments .post-com-count-wrapper>a,.column-response .post-com-count-wrapper>a{display:block}.column-comments .post-com-count-wrapper,.column-response .post-com-count-wrapper{white-space:normal}.column-comments .post-com-count-approved,.column-comments .post-com-count-no-comments,.column-response .post-com-count-approved,.column-response .post-com-count-no-comments{margin-top:0;margin-right:.5em}.column-comments .post-com-count-pending,.column-response .post-com-count-pending{position:static;height:auto;min-width:0;padding:0;border:none;-webkit-border-radius:0;border-radius:0;background:0 0;color:#bb2a2a;font-size:inherit;line-height:inherit;text-align:left}.column-comments .post-com-count-pending:hover,.column-response .post-com-count-pending:hover{color:#dc3232}.widefat tfoot td.check-column,.widefat thead td.check-column{padding-top:10px}.widefat *{word-wrap:normal}#wpbody-content .bulk-edit-row .inline-edit-col-bottom,#wpbody-content .bulk-edit-row .inline-edit-col-left,#wpbody-content .bulk-edit-row-page .inline-edit-col-right,#wpbody-content .bulk-edit-row-post .inline-edit-col-right,#wpbody-content .inline-edit-row-post .inline-edit-col-center,#wpbody-content .quick-edit-row-page .inline-edit-col-left,#wpbody-content .quick-edit-row-page .inline-edit-col-right,#wpbody-content .quick-edit-row-post .inline-edit-col-left,#wpbody-content .quick-edit-row-post .inline-edit-col-right{float:none;width:100%}#wpbody-content .bulk-edit-row fieldset .inline-edit-col label,#wpbody-content .bulk-edit-row fieldset .inline-edit-group label,#wpbody-content .quick-edit-row fieldset .inline-edit-col label,#wpbody-content .quick-edit-row fieldset .inline-edit-group label{max-width:none;float:none;margin-bottom:5px}#wpbody .bulk-edit-row fieldset select{display:block;width:100%;max-width:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.inline-edit-row #bulk-titles div,.inline-edit-row fieldset ul.cat-checklist label{font-size:16px}.inline-edit-row fieldset label span.title,.inline-edit-row fieldset.inline-edit-date legend{float:none}.inline-edit-row fieldset label.inline-edit-tags{padding:0 .5em}.inline-edit-row fieldset .inline-edit-col label.inline-edit-tags{padding:0}.inline-edit-row fieldset .timestamp-wrap,.inline-edit-row fieldset label span.input-text-wrap{margin-left:0}.inline-edit-row fieldset input[name=hh],.inline-edit-row fieldset input[name=jj],.inline-edit-row fieldset input[name=mn]{width:3em}.inline-edit-row fieldset input[name=aa]{width:4.5em}.inline-edit-row .inline-edit-or{margin:0 6px 0 0}#commentsdiv #edithead .inside,#edithead .inside{float:none;text-align:left;padding:3px 5px}#commentsdiv #edithead .inside input,#edithead .inside input{width:100%}#bulk-titles div{margin:.8em .3em}.plugin-card,.plugin-update-tr .update-message{margin-left:0}#bulk-titles div a{height:22px}#wpbody-content .updates-table .plugin-title{width:auto;white-space:normal}.link-manager-php #posts-filter{margin-top:25px}.link-manager-php .tablenav.bottom{overflow:hidden}.comments-box .toggle-row,.wp-list-table.plugins .toggle-row{display:none}#wpbody-content .wp-list-table.plugins td{display:block;width:auto;padding:10px 9px}#wpbody-content .wp-list-table.plugins .column-description{padding-top:2px}#wpbody-content .wp-list-table.plugins .plugin-title,#wpbody-content .wp-list-table.plugins .theme-title{padding-right:12px;white-space:normal}.wp-list-table.plugins .plugin-title,.wp-list-table.plugins .theme-title{padding-top:13px;padding-bottom:4px}.plugins #the-list .update td,.plugins #the-list .update th,.plugins #the-list tr>td:not(:last-child),.wp-list-table.plugins #the-list .theme-title{-webkit-box-shadow:none;box-shadow:none;border-top:none}.plugins tbody{padding:1px 0 0}.plugins .plugin-update-tr:before,.plugins tr.active+tr.inactive td.column-description,.plugins tr.active+tr.inactive th.check-column{-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 -1px 0 rgba(0,0,0,.1)}.plugins .plugin-update-tr:before{content:"";display:table-cell}.plugins .active.update+.plugin-update-tr:before{border-left:4px solid #d54e21;background-color:#fef7f1}.plugins #the-list .plugin-update-tr .plugin-update{border-left:none}.wp-list-table.plugins .plugin-title strong,.wp-list-table.plugins .theme-title strong{font-size:1.4em;line-height:1.5}table.plugin-install .column-description,table.plugin-install .column-name,table.plugin-install .column-rating,table.plugin-install .column-version{display:block;width:auto}table.plugin-install th.column-description,table.plugin-install th.column-name,table.plugin-install th.column-rating,table.plugin-install th.column-version{display:none}table.plugin-install td.column-name strong{font-size:1.4em;line-height:1.6em}table.plugin-install #the-list td{-webkit-box-shadow:none;box-shadow:none}table.plugin-install #the-list tr{display:block;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 -1px 0 rgba(0,0,0,.1)}.plugin-card{margin-right:0;width:100%}} \ No newline at end of file diff --git a/wp-admin/css/login-rtl.css b/wp-admin/css/login-rtl.css index a3c7bed..b28acaf 100644 --- a/wp-admin/css/login-rtl.css +++ b/wp-admin/css/login-rtl.css @@ -1,5 +1,5 @@ -@import url(forms.css); -@import url(l10n.css); +@import url(forms-rtl.css); +@import url(l10n-rtl.css); html, body { @@ -22,7 +22,7 @@ body { } a { - color: #0074a2; + color: #0073aa; -webkit-transition-property: border, background, color; transition-property: border, background, color; -webkit-transition-duration: .05s; @@ -37,35 +37,39 @@ a { a:hover, a:active { - color: #2ea2cc; + color: #00a0d2; } a:focus { color: #124964; + -webkit-box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); + box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); } -a:focus, -a:active { - outline: thin dotted; +.ie8 a:focus { + outline: #5b9dd9 solid 1px; } p { line-height: 1.5; } -.login .message { - border-right: 4px solid #7ad03a; - padding: 1px 12px; +.login .message, +.login #login_error { + border-right: 4px solid #00a0d2; + padding: 12px; + margin-right: 0; background-color: #fff; -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); } .login #login_error { - border-right: 4px solid #dd3d36; - background: #fff; - -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); - box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); + border-right-color: #dc3232; } #loginform p.submit, @@ -110,7 +114,7 @@ p { } .login label { - color: #777; + color: #72777c; font-size: 14px; } @@ -126,19 +130,19 @@ p { .login h1 a { background-image: url(../images/w-logo-blue.png?ver=20131202); background-image: none, url(../images/wordpress-logo.svg?ver=20131107); - -webkit-background-size: 80px 80px; - background-size: 80px 80px; + -webkit-background-size: 84px; + background-size: 84px; background-position: center top; background-repeat: no-repeat; - color: #999; - height: 80px; + color: #444; + height: 84px; font-size: 20px; font-weight: normal; line-height: 1.3em; margin: 0 auto 25px; padding: 0; text-decoration: none; - width: 80px; + width: 84px; text-indent: -9999px; outline: none; overflow: hidden; @@ -151,12 +155,6 @@ p { margin: auto; } -#login_error, -.login .message { - margin-right: 0; - padding: 12px; -} - .login #nav, .login #backtoblog { font-size: 13px; @@ -168,25 +166,30 @@ p { } #backtoblog { - margin: 16px 0 0 0; + margin: 16px 0; } .login #nav a, .login #backtoblog a { text-decoration: none; - color: #999; + color: #555d66; } .login #nav a:hover, .login #backtoblog a:hover, .login h1 a:hover { - color: #2ea2cc; + color: #00a0d2; +} + +.login #nav a:focus, +.login #backtoblog a:focus, +.login h1 a:focus { + color: #124964; } .login form .input, .login input[type="text"] { font-size: 24px; - line-height: 1; width: 100%; padding: 3px; margin: 2px 0 16px 6px; @@ -203,21 +206,25 @@ p { font-family: sans-serif; } +.login-action-rp input[type="text"] { + -webkit-box-shadow: none; + box-shadow: none; + margin: 0; +} + .login #pass-strength-result { - width: 250px; font-weight: 600; - margin: 12px 0 6px; + margin: -1px 0 16px 5px; padding: 6px 5px; text-align: center; + width: 100%; } .mobile #login { padding: 20px 0; } -.mobile #login form, -.mobile #login .message, -.mobile #login_error { +.mobile #login form { margin-right: 0; } @@ -226,10 +233,6 @@ p { margin-right: 8px; } -.mobile #login h1 a { - width: auto; -} - body.interim-login { height: auto; } @@ -264,7 +267,7 @@ body.interim-login { .interim-login input[type=checkbox]:checked:before { width: 16px; - font: normal 21px/1 'dashicons'; + font: normal 21px/1 dashicons; margin: -3px -4px 0 0; } -} \ No newline at end of file +} diff --git a/wp-admin/css/login-rtl.min.css b/wp-admin/css/login-rtl.min.css index 52197f3..876f94e 100644 --- a/wp-admin/css/login-rtl.min.css +++ b/wp-admin/css/login-rtl.min.css @@ -1 +1 @@ -input,input[type=email],input[type=number],input[type=password],input[type=search],input[type=text],input[type=url],textarea{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=email],input[type=url]{direction:ltr}input[type=checkbox],input[type=radio]{border:1px solid #bbb;background:#fff;color:#555;clear:none;cursor:pointer;display:inline-block;line-height:0;height:16px;margin:-4px 4px 0 0;outline:0;padding:0!important;text-align:center;vertical-align:middle;width:16px;min-width:16px;-webkit-appearance:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1);-webkit-transition:.05s border-color ease-in-out;transition:.05s border-color ease-in-out}input[type=radio]:checked+label:before{color:#888}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#2ea2cc}.wp-admin p input[type=checkbox],.wp-admin p input[type=radio],td>input[type=checkbox]{margin-top:0}.wp-admin p label input[type=checkbox]{margin-top:-4px}.wp-admin p label input[type=radio]{margin-top:-2px}input[type=radio]{-webkit-border-radius:50%;border-radius:50%;margin-right:4px;line-height:10px}input[type=checkbox]:checked:before,input[type=radio]:checked:before{float:left;display:inline-block;vertical-align:middle;width:16px;font:400 21px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}input[type=checkbox]:checked:before{content:'\f147';margin:-3px 0 0 -4px;color:#1e8cbe}input[type=radio]:checked:before{content:'\2022';text-indent:-9999px;-webkit-border-radius:50px;border-radius:50px;font-size:24px;width:6px;height:6px;margin:4px;line-height:16px;background-color:#1e8cbe}input.readonly,textarea.readonly{background-color:#ddd}@-moz-document url-prefix(){.form-table input.tog,input[type=checkbox],input[type=radio]{margin-bottom:-1px}}input[type=search]{-webkit-appearance:textfield}input[type=search]::-webkit-search-decoration{display:none}.ie8 input[type=password]{font-family:sans-serif}button,input,select,textarea{font-family:inherit;font-size:inherit;font-weight:inherit}input,select,textarea{font-size:14px;padding:3px 5px;line-height:15px;-webkit-border-radius:0;border-radius:0}textarea{overflow:auto;padding:2px 6px;line-height:1.4}input[type=email],input[type=number],input[type=password],input[type=search],input[type=text],input[type=url],select,textarea{outline:0}.wp-admin input[type=file]{padding:3px 0}label{cursor:pointer}input,select{margin:1px;padding:3px 5px}input.code{padding-top:6px}textarea.code{line-height:1.4;padding:4px 6px 1px}input[type=email],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=url],select,textarea{border:1px solid #ddd;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.07);box-shadow:inset 0 1px 2px rgba(0,0,0,.07);background-color:#fff;color:#333;-webkit-transition:.05s border-color ease-in-out;transition:.05s border-color ease-in-out}select[disabled]{color:#7f7f7f}input[type=checkbox]:focus,input[type=email]:focus,input[type=number]:focus,input[type=password]:focus,input[type=radio]:focus,input[type=search]:focus,input[type=tel]:focus,input[type=text]:focus,input[type=url]:focus,select:focus,textarea:focus{border-color:#5b9dd9;-webkit-box-shadow:0 0 2px rgba(30,140,190,.8);box-shadow:0 0 2px rgba(30,140,190,.8)}input[readonly]{background-color:#eee}.wp-core-ui :-moz-placeholder,:-moz-placeholder{color:#a9a9a9}.form-invalid{background-color:#ffebe8!important}.form-invalid input,.form-invalid select{border-color:#c00!important}.form-input-tip{color:#666}input.disabled,input:disabled,textarea.disabled,textarea:disabled{-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.04);box-shadow:inset 0 1px 2px rgba(0,0,0,.04);border-color:rgba(222,222,222,.75);background:rgba(255,255,255,.5);color:rgba(51,51,51,.5)}input[type=checkbox]:disabled,input[type=checkbox]:disabled:checked:before,input[type=radio]:disabled,input[type=radio]:disabled:checked:before{opacity:.7}.wp-admin select{padding:2px;line-height:28px;height:28px;vertical-align:middle}.wp-admin .button-cancel{padding:0 5px;line-height:2}.meta-box-sortables select{max-width:100%}.wp-admin select[multiple]{height:auto}.submit{padding:1.5em 0;margin:5px 0;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;border:0}form p.submit a.cancel:hover{text-decoration:none}p.submit{text-align:left;max-width:100%;margin-top:20px;padding-top:10px}.textright p.submit{border:0;text-align:right}table.form-table+input+input+p.submit,table.form-table+input+p.submit,table.form-table+p.submit{border-top:0;padding-top:0}#major-publishing-actions input,#minor-publishing-actions .preview,#minor-publishing-actions input{text-align:center}input.all-options,textarea.all-options{width:250px}input.large-text,textarea.large-text{width:99%}#adduser .form-field input,input.regular-text{width:25em}input.small-text{width:50px;padding:1px 6px}input[type=number].small-text{width:65px}#doaction,#doaction2,#post-query-submit{margin:1px 8px 0 0}.tablenav #changeit,.tablenav #clear-recent-list,.tablenav #delete_all{margin-top:1px}.tablenav .actions select{float:left;margin-right:6px;max-width:200px}.ie8 .tablenav .actions select{width:155px}.ie8 .tablenav .actions select#cat{width:200px}#timezone_string option{margin-left:1em}#upload-form label{color:#777}#your-profile label+a,fieldset label,label{vertical-align:middle}#misc-publishing-actions label,.options-media-php label[for*="_size_"]{vertical-align:baseline}#misc-publishing-actions label[for=post_status]:before{content:'\f173';display:inline-block;font:400 20px/1 dashicons;speak:none;left:-1px;padding:0 5px 0 0;position:relative;top:0;text-decoration:none!important;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#pass-strength-result{background-color:#eee;border:1px solid #ddd;float:left;margin:13px 5px 5px 1px;padding:3px 5px;text-align:center;width:200px;display:none}#pass-strength-result.short{background-color:#ffa0a0;border-color:#f04040}#pass-strength-result.bad{background-color:#ffb78c;border-color:#ff853c}#pass-strength-result.good{background-color:#ffec8b;border-color:#fc0}#pass-strength-result.strong{background-color:#c3ff88;border-color:#8dff1c}.indicator-hint{padding-top:8px}p.search-box{float:right;margin:0}.network-admin.themes-php p.search-box{clear:left}#search-plugins input[name="s"],.search-box input[name="s"],.tagsdiv .newtag{float:left;height:28px;margin:0 4px 0 0}input[type=text].ui-autocomplete-loading{background:transparent url(../images/loading.gif) no-repeat right center;visibility:visible}ul#add-to-blog-users{margin:0 0 0 14px}.ui-autocomplete-input.open{-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0}.ui-autocomplete{padding:0;margin:0;list-style:none;position:absolute;z-index:10000;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;border:1px solid #aaa;background-color:#efefef}.ui-autocomplete li{margin-bottom:0;white-space:nowrap;text-align:left}.ui-autocomplete li a{display:block;height:100%;padding:4px 10px;color:#444}.ui-autocomplete li a.ui-state-focus{background-color:#ddd;cursor:pointer}.form-table{border-collapse:collapse;margin-top:.5em;width:100%;clear:both}.form-table,.form-table td,.form-table td p,.form-table th,.form-wrap label{font-size:14px}.form-table td{margin-bottom:9px;padding:15px 10px;line-height:1.3;vertical-align:middle}.form-table th,.form-wrap label{color:#222;font-weight:400;text-shadow:none;vertical-align:baseline}.form-table th{vertical-align:top;text-align:left;padding:20px 10px 20px 0;width:200px;line-height:1.3;font-weight:600}.form-table th.th-full{width:auto;font-weight:400}.form-table td p{margin-top:4px;margin-bottom:0}.form-table td fieldset label{margin:.25em 0 .5em!important;display:inline-block}.form-table td fieldset label,.form-table td fieldset li,.form-table td fieldset p{line-height:1.4em}.form-table input.tog,.form-table input[type=radio]{margin-top:-4px;margin-right:4px;float:none}.form-table .pre{padding:8px;margin:0}table.form-table td .updated{font-size:13px}#profile-page .form-table textarea{width:500px;margin-bottom:6px}#profile-page .form-table #rich_editing{margin-right:5px}#your-profile legend{font-size:22px}#display_name{width:15em}#createuser .form-field input{width:25em}.color-option{display:inline-block;width:24%;padding:5px 15px 15px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin-bottom:3px}.color-option.selected,.color-option:hover{background:#ddd}.color-palette{width:100%;border-spacing:0;border-collapse:collapse}.color-palette td{height:20px;padding:0;border:0}.color-option{cursor:pointer}.tool-box .title{margin:8px 0;font-size:18px;font-weight:400;line-height:24px}.pressthis{margin:20px 0}.pressthis a,.pressthis a:active,.pressthis a:focus,.pressthis a:hover{display:inline-block;position:relative;cursor:move;color:#333;background:#e6e6e6;-webkit-border-radius:5px;border-radius:5px;border:1px solid #b4b4b4;font-style:normal;line-height:16px;font-size:14px;text-decoration:none}.pressthis a:active{outline:0}.pressthis a:hover:after{-webkit-transform:skew(20deg) rotate(9deg);-ms-transform:skew(20deg) rotate(9deg);transform:skew(20deg) rotate(9deg);-webkit-box-shadow:0 10px 8px rgba(0,0,0,.7);box-shadow:0 10px 8px rgba(0,0,0,.7)}.pressthis a span{display:inline-block;margin:0;padding:0 12px 8px 9px}.pressthis a span:before{color:#777;font:400 20px/1 dashicons;content:'\f157';position:relative;display:inline-block;top:4px;margin-right:4px}.pressthis a:after{content:'';width:70%;height:55%;z-index:-1;position:absolute;right:10px;bottom:9px;background:0 0;-webkit-transform:skew(20deg) rotate(6deg);-ms-transform:skew(20deg) rotate(6deg);transform:skew(20deg) rotate(6deg);-webkit-box-shadow:0 10px 8px rgba(0,0,0,.6);box-shadow:0 10px 8px rgba(0,0,0,.6)}#local-time,#utc-time{padding-left:25px;font-style:italic}.defaultavatarpicker .avatar{margin:2px 0;vertical-align:middle}.options-general-php .spinner{float:none;margin:-3px 3px}@media screen and (max-width:782px){textarea{-webkit-appearance:none}input[type=number],input[type=password],input[type=search],input[type=text]{-webkit-appearance:none;padding:6px 10px}input.code{padding-bottom:5px;padding-top:10px}.widefat th input[type=checkbox],input[type=checkbox]{-webkit-appearance:none;padding:10px}.widefat th input[type=checkbox]{margin-bottom:8px}.widefat th input[type=checkbox]:before,input[type=checkbox]:checked:before{font:400 30px/1 Dashicons;margin:-3px -5px}input[type=checkbox],input[type=radio]{height:25px;width:25px}.wp-admin p input[type=checkbox],.wp-admin p input[type=radio]{margin-top:-3px}input[type=radio]:checked:before{vertical-align:middle;width:9px;height:9px;margin:7px;line-height:16px}.wp-upload-form input[type=submit]{margin-top:10px}#wpbody select{height:36px;font-size:16px}.wp-admin .button-cancel{padding:0;font-size:14px}#createuser .form-field input{width:100%}.form-table{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.form-table td,.form-table th{display:block;width:auto;vertical-align:middle}.form-table .color-palette td{display:table-cell;width:15px}.form-table table.color-palette{margin-right:10px}input,textarea{font-size:16px}#profile-page .form-table textarea,.form-table span.description,.form-table td input[type=password],.form-table td input[type=text],.form-table td select,.form-table td textarea{width:100%;font-size:16px;line-height:1.5;padding:7px 10px;display:block;max-width:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.form-table input[type=text].small-text,input[type=number].small-text,input[type=password].small-text,input[type=search].small-text,input[type=text].small-text{width:auto;max-width:55px;display:inline;padding:3px 6px;margin:0 3px}#pass-strength-result{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:8px}p.search-box{float:none;position:absolute;bottom:0;width:98%;height:90px;margin-bottom:20px}p.search-box input[name="s"]{height:auto;float:none;width:100%;margin-bottom:10px;vertical-align:middle;-webkit-appearance:none}p.search-box input[type=submit]{margin-bottom:10px}.form-table span.description{padding:4px 0 0;line-height:1.4em}.form-table th{padding-top:10px;padding-bottom:0;border-bottom:0}.form-table td{padding-top:8px;padding-left:0}.form-table input.regular-text{width:100%}.form-table label{font-size:14px}.form-table fieldset label{display:block}#utc-time{margin-top:10px}#local-time,#utc-time{display:block;float:none;padding:0;line-height:2}}@media only screen and (max-width:768px){.form-field input,.form-field textarea{width:99%}.form-wrap .form-field{padding:0}#profile-page .form-table textarea{max-width:400px;width:auto}}@media screen and (max-width:600px){.color-option{width:49%}}body.rtl,body.rtl .press-this a.wp-switch-editor{font-family:Tahoma,Arial,sans-serif}body.locale-he-il,body.locale-he-il .press-this a.wp-switch-editor{font-family:Arial,sans-serif}.locale-he-il em{font-style:normal;font-weight:700}.locale-zh-cn #local-time,.locale-zh-cn #utc-time,.locale-zh-cn .form-wrap p,.locale-zh-cn .howto,.locale-zh-cn .inline-edit-row fieldset span.checkbox-title,.locale-zh-cn .inline-edit-row fieldset span.title,.locale-zh-cn .js .input-with-default-title,.locale-zh-cn .link-to-original,.locale-zh-cn .tablenav .displaying-num,.locale-zh-cn p.description,.locale-zh-cn p.help,.locale-zh-cn p.install-help,.locale-zh-cn span.description{font-style:normal}.locale-zh-cn .hdnle a{font-size:12px}.locale-zh-cn form.upgrade .hint{font-style:normal;font-size:100%}.locale-zh-cn #wp-fullscreen-tagline{font-family:KaiTi,"æ¥·ä½",sans-serif}.locale-zh-cn #wp-fullscreen-modes a{font-size:12px}.locale-zh-cn #sort-buttons{font-size:1em!important}.locale-de-de .inline-edit-row fieldset label span.title{width:7em}.locale-de-de .inline-edit-row fieldset label span.input-text-wrap{margin-left:7em}.locale-de-de #customize-header-actions .button{padding:0 5px 1px}.locale-de-de #customize-header-actions .spinner{margin:16px 3px 0}.locale-ru-ru .inline-edit-row fieldset label span.title{width:8em}.locale-ru-ru .inline-edit-row fieldset label span.input-text-wrap{margin-left:8em}.locale-ru-ru.post-php .tagsdiv .newtag{width:165px}.locale-ru-ru.press-this .posting{margin-right:277px}.locale-ru-ru .press-this-sidebar{width:265px}.locale-ru-ru #customize-header-actions .button{padding:0 5px 1px}.locale-ru-ru #customize-header-actions .spinner{margin:16px 3px 0}.locale-lt-lt .inline-edit-row fieldset label span.title{width:8em}.locale-lt-lt .inline-edit-row fieldset label span.input-text-wrap{margin-left:8em}body,html{height:100%;margin:0;padding:0}html{background:#f1f1f1}body{background:#f1f1f1;min-width:0;color:#444;font-family:"Open Sans",sans-serif;font-size:13px;line-height:1.4em}a{color:#0074a2;-webkit-transition-property:border,background,color;transition-property:border,background,color;-webkit-transition-duration:.05s;transition-duration:.05s;-webkit-transition-timing-function:ease-in-out;transition-timing-function:ease-in-out;outline:0}a:active,a:hover{color:#2ea2cc}a:focus{color:#124964}a:active,a:focus{outline:thin dotted}p{line-height:1.5}.login .message{border-right:4px solid #7ad03a;background-color:#fff;-webkit-box-shadow:0 1px 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 1px 0 rgba(0,0,0,.1)}.login #login_error{border-right:4px solid #dd3d36;background:#fff;-webkit-box-shadow:0 1px 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 1px 0 rgba(0,0,0,.1)}#loginform p.submit,.login-action-lostpassword p.submit{border:0;margin:-10px 0 20px}.login *{margin:0;padding:0}.login form{margin-top:20px;margin-right:0;padding:26px 24px 46px;font-weight:400;overflow:hidden;background:#fff;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.13);box-shadow:0 1px 3px rgba(0,0,0,.13)}.login form .forgetmenot{font-weight:400;float:right;margin-bottom:0}.login .button-primary{float:left}#login form p{margin-bottom:0}#login form p.submit{margin:0;padding:0}.login label{color:#777;font-size:14px}.login form .forgetmenot label{font-size:12px;line-height:19px}.login h1{text-align:center}.login h1 a{background-image:url(../images/w-logo-blue.png?ver=20131202);background-image:none,url(../images/wordpress-logo.svg?ver=20131107);-webkit-background-size:80px 80px;background-size:80px 80px;background-position:center top;background-repeat:no-repeat;color:#999;height:80px;font-size:20px;font-weight:400;line-height:1.3em;margin:0 auto 25px;padding:0;text-decoration:none;width:80px;text-indent:-9999px;outline:0;overflow:hidden;display:block}#login{width:320px;padding:8% 0 0;margin:auto}#login_error,.login .message{margin-right:0;padding:12px}.login #backtoblog,.login #nav{font-size:13px;padding:0 24px}.login #nav{margin:24px 0 0}#backtoblog{margin:16px 0 0}.login #backtoblog a,.login #nav a{text-decoration:none;color:#999}.login #backtoblog a:hover,.login #nav a:hover,.login h1 a:hover{color:#2ea2cc}.login form .input,.login input[type=text]{font-size:24px;line-height:1;width:100%;padding:3px;margin:2px 0 16px 6px}.login form .input,.login form input[type=checkbox],.login input[type=text]{background:#fbfbfb}.ie7 .login form .input,.ie8 .login form .input{font-family:sans-serif}.login #pass-strength-result{width:250px;font-weight:600;margin:12px 0 6px;padding:6px 5px;text-align:center}.mobile #login{padding:20px 0}.mobile #login .message,.mobile #login form,.mobile #login_error{margin-right:0}.mobile #login #backtoblog,.mobile #login #nav{margin-right:8px}.mobile #login h1 a{width:auto}body.interim-login{height:auto}.interim-login #login{padding:0;margin:5px auto 20px}.interim-login.login h1 a{width:auto}.interim-login #login_error,.interim-login.login .message{margin:0 0 16px}.interim-login.login form{margin:0}@-ms-viewport{width:device-width}@media screen and (max-width:782px){.interim-login input[type=checkbox]{height:16px;width:16px}.interim-login input[type=checkbox]:checked:before{width:16px;font:400 21px/1 dashicons;margin:-3px -4px 0 0}} \ No newline at end of file +#pass-strength-result,input,textarea{-webkit-box-sizing:border-box;-moz-box-sizing:border-box}.meta-box-sortables select,p.submit{max-width:100%}#your-profile label+a,.wp-admin select,fieldset label,label{vertical-align:middle}#pressthis-code-wrap,textarea{overflow:auto}input,textarea{box-sizing:border-box}input[type=text],input[type=search],input[type=radio],input[type=tel],input[type=time],input[type=url],input[type=week],input[type=password],input[type=checkbox],input[type=color],input[type=date],input[type=datetime],input[type=datetime-local],input[type=email],input[type=month],input[type=number],select,textarea{border:1px solid #ddd;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.07);box-shadow:inset 0 1px 2px rgba(0,0,0,.07);background-color:#fff;color:#32373c;outline:0;-webkit-transition:50ms border-color ease-in-out;transition:50ms border-color ease-in-out}input[type=text]:focus,input[type=search]:focus,input[type=radio]:focus,input[type=tel]:focus,input[type=time]:focus,input[type=url]:focus,input[type=week]:focus,input[type=password]:focus,input[type=checkbox]:focus,input[type=color]:focus,input[type=date]:focus,input[type=datetime]:focus,input[type=datetime-local]:focus,input[type=email]:focus,input[type=month]:focus,input[type=number]:focus,select:focus,textarea:focus{border-color:#5b9dd9;-webkit-box-shadow:0 0 2px rgba(30,140,190,.8);box-shadow:0 0 2px rgba(30,140,190,.8)}input[type=url],input[type=email]{direction:ltr}input[type=number]{height:28px;line-height:inherit}input[type=radio],input[type=checkbox]{border:1px solid #b4b9be;background:#fff;color:#555;clear:none;cursor:pointer;display:inline-block;line-height:0;height:16px;margin:-4px 0 0 4px;outline:0;padding:0!important;text-align:center;vertical-align:middle;width:16px;min-width:16px;-webkit-appearance:none;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1);-webkit-transition:.05s border-color ease-in-out;transition:.05s border-color ease-in-out}input[type=radio]:checked+label:before{color:#82878c}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#00a0d2}.wp-admin p input[type=radio],.wp-admin p input[type=checkbox],td>input[type=checkbox]{margin-top:0}.wp-admin p label input[type=checkbox]{margin-top:-4px}.wp-admin p label input[type=radio]{margin-top:-2px}input[type=radio]{-webkit-border-radius:50%;border-radius:50%;margin-left:4px;line-height:10px}input[type=radio]:checked:before,input[type=checkbox]:checked:before{float:right;display:inline-block;vertical-align:middle;width:16px;font:400 21px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}input[type=checkbox]:checked:before{content:"\f147";margin:-3px -4px 0 0;color:#1e8cbe}input[type=radio]:checked:before{content:"\2022";text-indent:-9999px;-webkit-border-radius:50px;border-radius:50px;font-size:24px;width:6px;height:6px;margin:4px;line-height:16px;background-color:#1e8cbe}@-moz-document url-prefix(){.form-table input.tog,input[type=radio],input[type=checkbox]{margin-bottom:-1px}}input[type=search]{-webkit-appearance:textfield}input[type=search]::-webkit-search-decoration{display:none}.ie8 input[type=password]{font-family:sans-serif}button,input,select,textarea{font-family:inherit;font-size:inherit;font-weight:inherit}input,select,textarea{font-size:14px;-webkit-border-radius:0;border-radius:0}textarea{padding:2px 6px;line-height:1.4;resize:vertical}.wp-admin input[type=file]{padding:3px 0}label{cursor:pointer}input,select{margin:1px;padding:3px 5px}input.code{padding-top:6px}textarea.code{line-height:1.4;padding:4px 6px 1px}input.readonly,input[readonly],textarea.readonly,textarea[readonly]{background-color:#eee}::-webkit-input-placeholder{color:#72777c}::-moz-placeholder{color:#72777c;opacity:1}:-ms-input-placeholder{color:#72777c}.form-invalid input,.form-invalid input:focus,.form-invalid select,.form-invalid select:focus{border-color:#dc3232!important;-webkit-box-shadow:0 0 2px rgba(204,0,0,.8);box-shadow:0 0 2px rgba(204,0,0,.8)}.form-table .form-required.form-invalid td:after{content:"\f534";font:400 20px/1 dashicons;color:#dc3232;margin-right:-25px;vertical-align:middle}.form-table .form-required.user-pass1-wrap.form-invalid td:after{content:''}.form-table .form-required.user-pass1-wrap.form-invalid .password-input-wrapper:after{content:'\f534';font:400 20px/1 dashicons;color:#dc3232;margin:0 -29px 0 6px;vertical-align:middle}.form-input-tip{color:#666}input.disabled,input:disabled,select.disabled,select:disabled,textarea.disabled,textarea:disabled{background:rgba(255,255,255,.5);border-color:rgba(222,222,222,.75);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.04);box-shadow:inset 0 1px 2px rgba(0,0,0,.04);color:rgba(51,51,51,.5)}input[type=file].disabled,input[type=file]:disabled,input[type=range].disabled,input[type=range]:disabled{background:0 0;-webkit-box-shadow:none;box-shadow:none}input[type=radio].disabled,input[type=radio].disabled:checked:before,input[type=radio]:disabled,input[type=radio]:disabled:checked:before,input[type=checkbox].disabled,input[type=checkbox].disabled:checked:before,input[type=checkbox]:disabled,input[type=checkbox]:disabled:checked:before{opacity:.7}.wp-admin select{padding:2px;line-height:28px;height:28px}.wp-admin .button-cancel{padding:0 5px;line-height:2}.wp-admin select[multiple]{height:auto}.submit{padding:1.5em 0;margin:5px 0;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;border:none}form p.submit a.cancel:hover{text-decoration:none}p.submit{text-align:right;margin-top:20px;padding-top:10px}.textright p.submit{border:none;text-align:left}table.form-table+input+input+p.submit,table.form-table+input+p.submit,table.form-table+p.submit{border-top:none;padding-top:0}#major-publishing-actions input,#minor-publishing-actions .preview,#minor-publishing-actions input{text-align:center}input.all-options,textarea.all-options{width:250px}input.large-text,textarea.large-text{width:99%}input.regular-text{width:25em}input.small-text{width:50px;padding:1px 6px}input[type=number].small-text{width:65px}input.tiny-text{width:35px}input[type=number].tiny-text{width:45px}#doaction,#doaction2,#post-query-submit{margin:1px 0 0 8px}.tablenav #changeit,.tablenav #clear-recent-list,.tablenav #delete_all,.wp-filter #delete_all{margin-top:1px}.tablenav .actions select{float:right;margin-left:6px;max-width:200px}.ie8 .tablenav .actions select{width:155px}.ie8 .tablenav .actions select#cat{width:200px}#timezone_string option{margin-right:1em}button.wp-hide-pw>.dashicons{position:relative;top:3px}#misc-publishing-actions label,.options-media-php label[for*="_size_"]{vertical-align:baseline}#misc-publishing-actions label[for=post_status]:before{content:"\f173";display:inline-block;font:400 20px/1 dashicons;speak:none;right:-1px;padding:0 0 0 5px;position:relative;top:0;text-decoration:none!important;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#pass1-text,.pw-weak,.show-password #pass1{display:none}#pass-strength-result{background-color:#eee;border:1px solid #ddd;color:#23282d;margin:-2px 1px 5px 5px;padding:3px 5px;text-align:center;width:25em;box-sizing:border-box;opacity:0}#pass-strength-result.short{background-color:#f1adad;border-color:#e35b5b;opacity:1}#pass-strength-result.bad{background-color:#fbc5a9;border-color:#f78b53;opacity:1}#pass-strength-result.good{background-color:#ffe399;border-color:#ffc733;opacity:1}#pass-strength-result.strong{background-color:#c1e1b9;border-color:#83c373;opacity:1}#pass1-text.short,#pass1.short{border-color:#e35b5b}#pass1-text.bad,#pass1.bad{border-color:#f78b53}#pass1-text.good,#pass1.good{border-color:#ffc733}#pass1-text.strong,#pass1.strong{border-color:#83c373}.indicator-hint{padding-top:8px}.show-password #pass1-text{display:inline-block}.form-table span.description.important{font-size:12px}p.search-box{float:left;margin:0}.network-admin.themes-php p.search-box{clear:right}.search-box input[name="s"],.tablenav .search-plugins input[name="s"],.tagsdiv .newtag{float:right;height:28px;margin:0 0 0 4px}input[type=text].ui-autocomplete-loading,input[type=email].ui-autocomplete-loading{background-image:url(../images/loading.gif);background-repeat:no-repeat;background-position:left center;visibility:visible}input.ui-autocomplete-input.open{border-bottom-color:transparent}ul#add-to-blog-users{margin:0 14px 0 0}.ui-autocomplete{padding:0;margin:0;list-style:none;position:absolute;z-index:10000;border:1px solid #5b9dd9;-webkit-box-shadow:0 1px 2px rgba(30,140,190,.8);box-shadow:0 1px 2px rgba(30,140,190,.8);background-color:#fff}.ui-autocomplete li{margin-bottom:0;padding:4px 10px;white-space:nowrap;text-align:right}.ui-autocomplete li.ui-state-focus{background-color:#ddd;cursor:pointer}.form-table{border-collapse:collapse;margin-top:.5em;width:100%;clear:both}.form-table,.form-table td,.form-table td p,.form-table th,.form-wrap label{font-size:14px}.form-table td{margin-bottom:9px;padding:15px 10px;line-height:1.3;vertical-align:middle}.form-table th,.form-wrap label{color:#23282d;font-weight:400;text-shadow:none;vertical-align:baseline}.form-table th{vertical-align:top;text-align:right;padding:20px 0 20px 10px;width:200px;line-height:1.3;font-weight:600}.form-table th.th-full{width:auto;font-weight:400}.form-table td p{margin-top:4px;margin-bottom:0}.form-table .date-time-doc{margin-top:1em}.form-table p.timezone-info{margin:1em 0}.form-table td fieldset label{margin:.25em 0 .5em!important;display:inline-block}.form-table td fieldset label,.form-table td fieldset li,.form-table td fieldset p{line-height:1.4em}.form-table input.tog,.form-table input[type=radio]{margin-top:-4px;margin-left:4px;float:none}.form-table .pre{padding:8px;margin:0}table.form-table td .updated{font-size:13px}table.form-table td .updated p{font-size:13px;margin:.3em 0}#profile-page .form-table textarea{width:500px;margin-bottom:6px}#profile-page .form-table #rich_editing{margin-left:5px}#your-profile legend{font-size:22px}#display_name{width:15em}#adduser .form-field input,#createuser .form-field input{width:25em}.color-option{display:inline-block;width:24%;padding:5px 15px 15px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin-bottom:3px;cursor:pointer}.color-option.selected,.color-option:hover{background:#ddd}.color-palette{width:100%;border-spacing:0;border-collapse:collapse}.color-palette td{height:20px;padding:0;border:none}.tool-box .title{margin:8px 0;font-size:18px;font-weight:400;line-height:24px}.label-responsive{vertical-align:middle}#export-filters p{margin:0 0 1em}#export-filters p.submit{margin:7px 0 5px}.card{position:relative;margin-top:20px;padding:.7em 2em 1em;min-width:255px;max-width:520px;border:1px solid #e5e5e5;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04);background:#fff}.pressthis h4{margin:2em 0 1em}.pressthis textarea{width:100%;font-size:1em}.login form,.login h1 a{overflow:hidden;font-weight:400}.pressthis-bookmarklet-wrapper{margin:20px 0 8px;vertical-align:top;position:relative;z-index:1}.pressthis-bookmarklet,.pressthis-bookmarklet:active,.pressthis-bookmarklet:focus,.pressthis-bookmarklet:hover{display:inline-block;position:relative;cursor:move;color:#32373c;background:#e5e5e5;-webkit-border-radius:5px;border-radius:5px;border:1px solid #b4b9be;font-style:normal;line-height:16px;font-size:14px;text-decoration:none}.pressthis-bookmarklet:active{outline:0}.pressthis-bookmarklet:after{content:"";width:70%;height:55%;z-index:-1;position:absolute;left:10px;bottom:9px;background:0 0;-webkit-transform:skew(-20deg) rotate(-6deg);-ms-transform:skew(-20deg) rotate(-6deg);transform:skew(-20deg) rotate(-6deg);-webkit-box-shadow:0 10px 8px rgba(0,0,0,.6);box-shadow:0 10px 8px rgba(0,0,0,.6)}.pressthis-bookmarklet:hover:after{-webkit-transform:skew(-20deg) rotate(-9deg);-ms-transform:skew(-20deg) rotate(-9deg);transform:skew(-20deg) rotate(-9deg);-webkit-box-shadow:0 10px 8px rgba(0,0,0,.7);box-shadow:0 10px 8px rgba(0,0,0,.7)}.pressthis-bookmarklet span{display:inline-block;margin:0;padding:0 9px 8px 12px}.pressthis-bookmarklet span:before{color:#72777c;font:400 20px/1 dashicons;content:"\f157";position:relative;display:inline-block;top:4px;margin-left:4px}.pressthis-js-toggle,.pressthis-js-toggle.button.button{margin-right:10px;padding:0;height:auto;vertical-align:top}.pressthis-js-toggle .dashicons{margin:5px 7px 6px 8px;color:#555d66}.timezone-info code{white-space:nowrap}.defaultavatarpicker .avatar{margin:2px 0;vertical-align:middle}.options-general-php .date-time-text{display:inline-block;min-width:10em}.options-general-php input.small-text{width:56px}.options-general-php .spinner{float:none;margin:0 3px}.options-general-php .language-install-spinner,.settings-php .language-install-spinner{display:inline-block;float:none;margin:-3px 5px 0;vertical-align:middle}.setup-php textarea{max-width:100%}.form-field #site-address{max-width:25em}.form-field #domain{max-width:22em}.form-field #admin-email,.form-field #blog_last_updated,.form-field #blog_registered,.form-field #path,.form-field #site-title{max-width:25em}.form-field #path{margin-bottom:5px}#search-sites,#search-users{max-width:100%}.request-filesystem-credentials-dialog{display:none}.request-filesystem-credentials-dialog .notification-dialog{top:15%;max-height:85%}.request-filesystem-credentials-dialog-content{margin:25px}#request-filesystem-credentials-title{font-size:1.3em;margin:1em 0}.request-filesystem-credentials-form legend{font-size:1em;padding:1.33em 0;font-weight:600}.request-filesystem-credentials-form input[type=text],.request-filesystem-credentials-form input[type=password]{display:block}.request-filesystem-credentials-dialog input[type=text],.request-filesystem-credentials-dialog input[type=password]{width:100%}.request-filesystem-credentials-form .field-title{font-weight:600}.request-filesystem-credentials-dialog label[for=hostname],.request-filesystem-credentials-dialog label[for=public_key],.request-filesystem-credentials-dialog label[for=private_key]{display:block;margin-bottom:1em}.request-filesystem-credentials-dialog .ftp-password,.request-filesystem-credentials-dialog .ftp-username{float:right;width:48%}.request-filesystem-credentials-dialog .ftp-password{margin-right:4%}.request-filesystem-credentials-dialog .request-filesystem-credentials-action-buttons{text-align:left}.request-filesystem-credentials-dialog label[for=ftp]{margin-left:10px}#request-filesystem-credentials-dialog .button:not(:last-child){margin-left:10px}#request-filesystem-credentials-form .cancel-button{display:none}#request-filesystem-credentials-dialog .cancel-button{display:inline}@media screen and (max-width:782px){textarea{-webkit-appearance:none}input[type=text],input[type=search],input[type=password],input[type=email],input[type=number]{-webkit-appearance:none;padding:6px 10px}input[type=number]{height:40px}input.code{padding-bottom:5px;padding-top:10px}.widefat tfoot td input[type=checkbox],.widefat th input[type=checkbox],.widefat thead td input[type=checkbox],input[type=checkbox]{-webkit-appearance:none;padding:10px}.widefat tfoot td input[type=checkbox],.widefat th input[type=checkbox],.widefat thead td input[type=checkbox]{margin-bottom:8px}.widefat tfoot td input[type=checkbox]:before,.widefat th input[type=checkbox]:before,.widefat thead td input[type=checkbox]:before,input[type=checkbox]:checked:before{font:400 30px/1 dashicons;margin:-3px -5px}input[type=radio],input[type=checkbox]{height:25px;width:25px}.wp-admin p input[type=radio],.wp-admin p input[type=checkbox]{margin-top:-3px}input[type=radio]:checked:before{vertical-align:middle;width:9px;height:9px;margin:7px;line-height:16px}.wp-upload-form input[type=submit]{margin-top:10px}#wpbody select{height:36px;font-size:16px}.wp-admin .button-cancel{padding:0;font-size:14px}#adduser .form-field input,#createuser .form-field input{width:100%}.form-table{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.form-table td,.form-table th,.label-responsive{display:block;width:auto;vertical-align:middle}.label-responsive{margin:.5em 0}.export-filters li{margin-bottom:0}.form-table .color-palette td{display:table-cell;width:15px}.form-table table.color-palette{margin-left:10px}input,textarea{font-size:16px}#profile-page .form-table textarea,.form-table span.description,.form-table td input[type=text],.form-table td input[type=password],.form-table td input[type=email],.form-table td select,.form-table td textarea{width:100%;font-size:16px;line-height:1.5;padding:7px 10px;display:block;max-width:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.form-table .form-required.form-invalid td:after{float:left;margin:-30px 0 0 3px}#wpbody .form-table td select{height:40px}.form-table input[type=text].small-text,input[type=text].small-text,input[type=search].small-text,input[type=password].small-text,input[type=number].small-text{width:auto;max-width:55px;display:inline;padding:3px 6px;margin:0 3px}#pass-strength-result{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:8px}p.search-box{float:none;position:absolute;bottom:0;width:98%;height:90px;margin-bottom:20px}p.search-box input[name="s"]{height:auto;float:none;width:100%;margin-bottom:10px;vertical-align:middle;-webkit-appearance:none}p.search-box input[type=submit]{margin-bottom:10px}.form-table span.description{display:inline;padding:4px 0 0;line-height:1.4em;font-size:14px}.form-table th{padding-top:10px;padding-bottom:0;border-bottom:0}.form-table td{margin-bottom:0;padding-bottom:6px;padding-top:4px;padding-right:0}.form-table.permalink-structure td code{margin-right:32px}.form-table.permalink-structure td input[type=text]{margin-right:32px;margin-top:4px;width:96%}.form-table input.regular-text{width:100%}.form-table label{font-size:14px}.form-table fieldset label{display:block}#local-time,#utc-time{display:block;float:none;margin-top:.5em}.form-field #domain{max-width:none}.wp-pwd{position:relative}.wp-pwd [type=text],.wp-pwd [type=password]{padding-left:40px}.wp-pwd button.button{background:0 0;border:none;-webkit-box-shadow:none;box-shadow:none;line-height:2;margin:0;padding:5px 10px;position:absolute;left:0;top:0}.wp-pwd button.button:active,.wp-pwd button.button:focus,.wp-pwd button.button:hover{background:0 0}.wp-pwd .button .text{display:none}.options-general-php input[type=text].small-text{max-width:60px;margin:0}}.locale-he-il em,.locale-zh-cn #local-time,.locale-zh-cn #utc-time,.locale-zh-cn .form-wrap p,.locale-zh-cn .howto,.locale-zh-cn .inline-edit-row fieldset span.checkbox-title,.locale-zh-cn .inline-edit-row fieldset span.title,.locale-zh-cn .js .input-with-default-title,.locale-zh-cn .link-to-original,.locale-zh-cn .tablenav .displaying-num,.locale-zh-cn p.description,.locale-zh-cn p.help,.locale-zh-cn p.install-help,.locale-zh-cn span.description{font-style:normal}body,html{background:#f1f1f1}@media only screen and (max-width:768px){.form-field input[type=text],.form-field input[type=password],.form-field input[type=email],.form-field select,.form-field textarea{width:99%}.form-wrap .form-field{padding:0}#profile-page .form-table textarea{max-width:400px;width:auto}}.locale-de-de #customize-header-actions .button,.locale-de-de-formal #customize-header-actions .button,.locale-ru-ru #customize-header-actions .button{padding:0 5px 1px}@media only screen and (max-height:480px){.request-filesystem-credentials-dialog .notification-dialog{width:100%;height:100%;max-height:100%;position:fixed;top:0;margin:0;right:0}}@media screen and (max-width:600px){.color-option{width:49%}}@media only screen and (max-width:320px){.options-general-php .date-time-text.date-time-custom-text{min-width:0;margin-left:.5em}}body.rtl,body.rtl .press-this a.wp-switch-editor{font-family:Tahoma,Arial,sans-serif}.rtl h1,.rtl h2,.rtl h3,.rtl h4,.rtl h5,.rtl h6{font-family:Arial,sans-serif;font-weight:700}body.locale-he-il,body.locale-he-il .press-this a.wp-switch-editor{font-family:Arial,sans-serif}.locale-he-il em{font-weight:700}.locale-zh-cn .hdnle a{font-size:12px}.locale-zh-cn form.upgrade .hint{font-style:normal;font-size:100%}.locale-zh-cn #sort-buttons{font-size:1em!important}.locale-de-de #customize-header-actions .spinner,.locale-de-de-formal #customize-header-actions .spinner{margin:16px 3px 0}.locale-ru-ru #adminmenu{width:inherit}.locale-ru-ru #adminmenu,.locale-ru-ru #wpbody{margin-right:0}.locale-ru-ru .inline-edit-row fieldset label span.title,.locale-ru-ru .inline-edit-row fieldset.inline-edit-date legend{width:8em}.locale-ru-ru .inline-edit-row fieldset .timestamp-wrap,.locale-ru-ru .inline-edit-row fieldset label span.input-text-wrap{margin-right:8em}.locale-ru-ru.post-new-php .tagsdiv .newtag,.locale-ru-ru.post-php .tagsdiv .newtag{width:165px}.locale-ru-ru.press-this .posting{margin-left:277px}.locale-ru-ru .press-this-sidebar{width:265px}.locale-ru-ru #customize-header-actions .spinner{margin:16px 3px 0}.locale-lt-lt .inline-edit-row fieldset label span.title,.locale-lt-lt .inline-edit-row fieldset.inline-edit-date legend{width:8em}.locale-lt-lt .inline-edit-row fieldset .timestamp-wrap,.locale-lt-lt .inline-edit-row fieldset label span.input-text-wrap{margin-right:8em}@media screen and (max-width:782px){.locale-lt-lt .inline-edit-row fieldset .timestamp-wrap,.locale-lt-lt .inline-edit-row fieldset label span.input-text-wrap,.locale-ru-ru .inline-edit-row fieldset .timestamp-wrap,.locale-ru-ru .inline-edit-row fieldset label span.input-text-wrap{margin-right:0}}body,html{height:100%;margin:0;padding:0}body{min-width:0;color:#444;font-family:"Open Sans",sans-serif;font-size:13px;line-height:1.4em}a{color:#0073aa;-webkit-transition-property:border,background,color;transition-property:border,background,color;-webkit-transition-duration:.05s;transition-duration:.05s;-webkit-transition-timing-function:ease-in-out;transition-timing-function:ease-in-out;outline:0}a:active,a:hover{color:#00a0d2}a:focus{color:#124964;-webkit-box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}.ie8 a:focus{outline:#5b9dd9 solid 1px}p{line-height:1.5}.login #login_error,.login .message{border-right:4px solid #00a0d2;padding:12px;margin-right:0;background-color:#fff;-webkit-box-shadow:0 1px 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 1px 0 rgba(0,0,0,.1)}.login #login_error{border-right-color:#dc3232}#loginform p.submit,.login-action-lostpassword p.submit{border:none;margin:-10px 0 20px}.login *{margin:0;padding:0}.login form{margin-top:20px;margin-right:0;padding:26px 24px 46px;background:#fff;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.13);box-shadow:0 1px 3px rgba(0,0,0,.13)}.login form .forgetmenot{font-weight:400;float:right;margin-bottom:0}.login .button-primary{float:left}#login form p{margin-bottom:0}#login form p.submit{margin:0;padding:0}.login label{color:#72777c;font-size:14px}.login form .forgetmenot label{font-size:12px;line-height:19px}.login h1{text-align:center}.login h1 a{background-image:url(../images/w-logo-blue.png?ver=20131202);background-image:none,url(../images/wordpress-logo.svg?ver=20131107);-webkit-background-size:84px;background-size:84px;background-position:center top;background-repeat:no-repeat;color:#444;height:84px;font-size:20px;line-height:1.3em;margin:0 auto 25px;padding:0;text-decoration:none;width:84px;text-indent:-9999px;outline:0;display:block}#login{width:320px;padding:8% 0 0;margin:auto}.login #backtoblog,.login #nav{font-size:13px;padding:0 24px}.login #nav{margin:24px 0 0}#backtoblog{margin:16px 0}.login #backtoblog a,.login #nav a{text-decoration:none;color:#555d66}.login #backtoblog a:hover,.login #nav a:hover,.login h1 a:hover{color:#00a0d2}.login #backtoblog a:focus,.login #nav a:focus,.login h1 a:focus{color:#124964}.login form .input,.login input[type=text]{font-size:24px;width:100%;padding:3px;margin:2px 0 16px 6px}.login form .input,.login form input[type=checkbox],.login input[type=text]{background:#fbfbfb}.ie7 .login form .input,.ie8 .login form .input{font-family:sans-serif}.login-action-rp input[type=text]{-webkit-box-shadow:none;box-shadow:none;margin:0}.login #pass-strength-result{font-weight:600;margin:-1px 0 16px 5px;padding:6px 5px;text-align:center;width:100%}.mobile #login{padding:20px 0}.mobile #login form{margin-right:0}.mobile #login #backtoblog,.mobile #login #nav{margin-right:8px}body.interim-login{height:auto}.interim-login #login{padding:0;margin:5px auto 20px}.interim-login.login h1 a{width:auto}.interim-login #login_error,.interim-login.login .message{margin:0 0 16px}.interim-login.login form{margin:0}@-ms-viewport{width:device-width}@media screen and (max-width:782px){.interim-login input[type=checkbox]{height:16px;width:16px}.interim-login input[type=checkbox]:checked:before{width:16px;font:400 21px/1 dashicons;margin:-3px -4px 0 0}} \ No newline at end of file diff --git a/wp-admin/css/login.css b/wp-admin/css/login.css index 679e4e7..4cb2f85 100644 --- a/wp-admin/css/login.css +++ b/wp-admin/css/login.css @@ -22,7 +22,7 @@ body { } a { - color: #0074a2; + color: #0073aa; -webkit-transition-property: border, background, color; transition-property: border, background, color; -webkit-transition-duration: .05s; @@ -37,35 +37,39 @@ a { a:hover, a:active { - color: #2ea2cc; + color: #00a0d2; } a:focus { color: #124964; + -webkit-box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); + box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); } -a:focus, -a:active { - outline: thin dotted; +.ie8 a:focus { + outline: #5b9dd9 solid 1px; } p { line-height: 1.5; } -.login .message { - border-left: 4px solid #7ad03a; - padding: 1px 12px; +.login .message, +.login #login_error { + border-left: 4px solid #00a0d2; + padding: 12px; + margin-left: 0; background-color: #fff; -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); } .login #login_error { - border-left: 4px solid #dd3d36; - background: #fff; - -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); - box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); + border-left-color: #dc3232; } #loginform p.submit, @@ -110,7 +114,7 @@ p { } .login label { - color: #777; + color: #72777c; font-size: 14px; } @@ -126,19 +130,19 @@ p { .login h1 a { background-image: url(../images/w-logo-blue.png?ver=20131202); background-image: none, url(../images/wordpress-logo.svg?ver=20131107); - -webkit-background-size: 80px 80px; - background-size: 80px 80px; + -webkit-background-size: 84px; + background-size: 84px; background-position: center top; background-repeat: no-repeat; - color: #999; - height: 80px; + color: #444; + height: 84px; font-size: 20px; font-weight: normal; line-height: 1.3em; margin: 0 auto 25px; padding: 0; text-decoration: none; - width: 80px; + width: 84px; text-indent: -9999px; outline: none; overflow: hidden; @@ -151,12 +155,6 @@ p { margin: auto; } -#login_error, -.login .message { - margin-left: 0; - padding: 12px; -} - .login #nav, .login #backtoblog { font-size: 13px; @@ -168,25 +166,30 @@ p { } #backtoblog { - margin: 16px 0 0 0; + margin: 16px 0; } .login #nav a, .login #backtoblog a { text-decoration: none; - color: #999; + color: #555d66; } .login #nav a:hover, .login #backtoblog a:hover, .login h1 a:hover { - color: #2ea2cc; + color: #00a0d2; +} + +.login #nav a:focus, +.login #backtoblog a:focus, +.login h1 a:focus { + color: #124964; } .login form .input, .login input[type="text"] { font-size: 24px; - line-height: 1; width: 100%; padding: 3px; margin: 2px 6px 16px 0; @@ -203,21 +206,25 @@ p { font-family: sans-serif; } +.login-action-rp input[type="text"] { + -webkit-box-shadow: none; + box-shadow: none; + margin: 0; +} + .login #pass-strength-result { - width: 250px; font-weight: 600; - margin: 12px 0 6px; + margin: -1px 5px 16px 0; padding: 6px 5px; text-align: center; + width: 100%; } .mobile #login { padding: 20px 0; } -.mobile #login form, -.mobile #login .message, -.mobile #login_error { +.mobile #login form { margin-left: 0; } @@ -226,10 +233,6 @@ p { margin-left: 8px; } -.mobile #login h1 a { - width: auto; -} - body.interim-login { height: auto; } @@ -264,7 +267,7 @@ body.interim-login { .interim-login input[type=checkbox]:checked:before { width: 16px; - font: normal 21px/1 'dashicons'; + font: normal 21px/1 dashicons; margin: -3px 0 0 -4px; } -} \ No newline at end of file +} diff --git a/wp-admin/css/login.min.css b/wp-admin/css/login.min.css index 86722df..284615a 100644 --- a/wp-admin/css/login.min.css +++ b/wp-admin/css/login.min.css @@ -1 +1 @@ -input,input[type=email],input[type=number],input[type=password],input[type=search],input[type=text],input[type=url],textarea{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=email],input[type=url]{direction:ltr}input[type=checkbox],input[type=radio]{border:1px solid #bbb;background:#fff;color:#555;clear:none;cursor:pointer;display:inline-block;line-height:0;height:16px;margin:-4px 4px 0 0;outline:0;padding:0!important;text-align:center;vertical-align:middle;width:16px;min-width:16px;-webkit-appearance:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1);-webkit-transition:.05s border-color ease-in-out;transition:.05s border-color ease-in-out}input[type=radio]:checked+label:before{color:#888}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#2ea2cc}.wp-admin p input[type=checkbox],.wp-admin p input[type=radio],td>input[type=checkbox]{margin-top:0}.wp-admin p label input[type=checkbox]{margin-top:-4px}.wp-admin p label input[type=radio]{margin-top:-2px}input[type=radio]{-webkit-border-radius:50%;border-radius:50%;margin-right:4px;line-height:10px}input[type=checkbox]:checked:before,input[type=radio]:checked:before{float:left;display:inline-block;vertical-align:middle;width:16px;font:400 21px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}input[type=checkbox]:checked:before{content:'\f147';margin:-3px 0 0 -4px;color:#1e8cbe}input[type=radio]:checked:before{content:'\2022';text-indent:-9999px;-webkit-border-radius:50px;border-radius:50px;font-size:24px;width:6px;height:6px;margin:4px;line-height:16px;background-color:#1e8cbe}input.readonly,textarea.readonly{background-color:#ddd}@-moz-document url-prefix(){.form-table input.tog,input[type=checkbox],input[type=radio]{margin-bottom:-1px}}input[type=search]{-webkit-appearance:textfield}input[type=search]::-webkit-search-decoration{display:none}.ie8 input[type=password]{font-family:sans-serif}button,input,select,textarea{font-family:inherit;font-size:inherit;font-weight:inherit}input,select,textarea{font-size:14px;padding:3px 5px;line-height:15px;-webkit-border-radius:0;border-radius:0}textarea{overflow:auto;padding:2px 6px;line-height:1.4}input[type=email],input[type=number],input[type=password],input[type=search],input[type=text],input[type=url],select,textarea{outline:0}.wp-admin input[type=file]{padding:3px 0}label{cursor:pointer}input,select{margin:1px;padding:3px 5px}input.code{padding-top:6px}textarea.code{line-height:1.4;padding:4px 6px 1px}input[type=email],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=url],select,textarea{border:1px solid #ddd;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.07);box-shadow:inset 0 1px 2px rgba(0,0,0,.07);background-color:#fff;color:#333;-webkit-transition:.05s border-color ease-in-out;transition:.05s border-color ease-in-out}select[disabled]{color:#7f7f7f}input[type=checkbox]:focus,input[type=email]:focus,input[type=number]:focus,input[type=password]:focus,input[type=radio]:focus,input[type=search]:focus,input[type=tel]:focus,input[type=text]:focus,input[type=url]:focus,select:focus,textarea:focus{border-color:#5b9dd9;-webkit-box-shadow:0 0 2px rgba(30,140,190,.8);box-shadow:0 0 2px rgba(30,140,190,.8)}input[readonly]{background-color:#eee}.wp-core-ui :-moz-placeholder,:-moz-placeholder{color:#a9a9a9}.form-invalid{background-color:#ffebe8!important}.form-invalid input,.form-invalid select{border-color:#c00!important}.form-input-tip{color:#666}input.disabled,input:disabled,textarea.disabled,textarea:disabled{-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.04);box-shadow:inset 0 1px 2px rgba(0,0,0,.04);border-color:rgba(222,222,222,.75);background:rgba(255,255,255,.5);color:rgba(51,51,51,.5)}input[type=checkbox]:disabled,input[type=checkbox]:disabled:checked:before,input[type=radio]:disabled,input[type=radio]:disabled:checked:before{opacity:.7}.wp-admin select{padding:2px;line-height:28px;height:28px;vertical-align:middle}.wp-admin .button-cancel{padding:0 5px;line-height:2}.meta-box-sortables select{max-width:100%}.wp-admin select[multiple]{height:auto}.submit{padding:1.5em 0;margin:5px 0;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;border:0}form p.submit a.cancel:hover{text-decoration:none}p.submit{text-align:left;max-width:100%;margin-top:20px;padding-top:10px}.textright p.submit{border:0;text-align:right}table.form-table+input+input+p.submit,table.form-table+input+p.submit,table.form-table+p.submit{border-top:0;padding-top:0}#major-publishing-actions input,#minor-publishing-actions .preview,#minor-publishing-actions input{text-align:center}input.all-options,textarea.all-options{width:250px}input.large-text,textarea.large-text{width:99%}#adduser .form-field input,input.regular-text{width:25em}input.small-text{width:50px;padding:1px 6px}input[type=number].small-text{width:65px}#doaction,#doaction2,#post-query-submit{margin:1px 8px 0 0}.tablenav #changeit,.tablenav #clear-recent-list,.tablenav #delete_all{margin-top:1px}.tablenav .actions select{float:left;margin-right:6px;max-width:200px}.ie8 .tablenav .actions select{width:155px}.ie8 .tablenav .actions select#cat{width:200px}#timezone_string option{margin-left:1em}#upload-form label{color:#777}#your-profile label+a,fieldset label,label{vertical-align:middle}#misc-publishing-actions label,.options-media-php label[for*="_size_"]{vertical-align:baseline}#misc-publishing-actions label[for=post_status]:before{content:'\f173';display:inline-block;font:400 20px/1 dashicons;speak:none;left:-1px;padding:0 5px 0 0;position:relative;top:0;text-decoration:none!important;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#pass-strength-result{background-color:#eee;border:1px solid #ddd;float:left;margin:13px 5px 5px 1px;padding:3px 5px;text-align:center;width:200px;display:none}#pass-strength-result.short{background-color:#ffa0a0;border-color:#f04040}#pass-strength-result.bad{background-color:#ffb78c;border-color:#ff853c}#pass-strength-result.good{background-color:#ffec8b;border-color:#fc0}#pass-strength-result.strong{background-color:#c3ff88;border-color:#8dff1c}.indicator-hint{padding-top:8px}p.search-box{float:right;margin:0}.network-admin.themes-php p.search-box{clear:left}#search-plugins input[name="s"],.search-box input[name="s"],.tagsdiv .newtag{float:left;height:28px;margin:0 4px 0 0}input[type=text].ui-autocomplete-loading{background:transparent url(../images/loading.gif) no-repeat right center;visibility:visible}ul#add-to-blog-users{margin:0 0 0 14px}.ui-autocomplete-input.open{-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0}.ui-autocomplete{padding:0;margin:0;list-style:none;position:absolute;z-index:10000;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;border:1px solid #aaa;background-color:#efefef}.ui-autocomplete li{margin-bottom:0;white-space:nowrap;text-align:left}.ui-autocomplete li a{display:block;height:100%;padding:4px 10px;color:#444}.ui-autocomplete li a.ui-state-focus{background-color:#ddd;cursor:pointer}.form-table{border-collapse:collapse;margin-top:.5em;width:100%;clear:both}.form-table,.form-table td,.form-table td p,.form-table th,.form-wrap label{font-size:14px}.form-table td{margin-bottom:9px;padding:15px 10px;line-height:1.3;vertical-align:middle}.form-table th,.form-wrap label{color:#222;font-weight:400;text-shadow:none;vertical-align:baseline}.form-table th{vertical-align:top;text-align:left;padding:20px 10px 20px 0;width:200px;line-height:1.3;font-weight:600}.form-table th.th-full{width:auto;font-weight:400}.form-table td p{margin-top:4px;margin-bottom:0}.form-table td fieldset label{margin:.25em 0 .5em!important;display:inline-block}.form-table td fieldset label,.form-table td fieldset li,.form-table td fieldset p{line-height:1.4em}.form-table input.tog,.form-table input[type=radio]{margin-top:-4px;margin-right:4px;float:none}.form-table .pre{padding:8px;margin:0}table.form-table td .updated{font-size:13px}#profile-page .form-table textarea{width:500px;margin-bottom:6px}#profile-page .form-table #rich_editing{margin-right:5px}#your-profile legend{font-size:22px}#display_name{width:15em}#createuser .form-field input{width:25em}.color-option{display:inline-block;width:24%;padding:5px 15px 15px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin-bottom:3px}.color-option.selected,.color-option:hover{background:#ddd}.color-palette{width:100%;border-spacing:0;border-collapse:collapse}.color-palette td{height:20px;padding:0;border:0}.color-option{cursor:pointer}.tool-box .title{margin:8px 0;font-size:18px;font-weight:400;line-height:24px}.pressthis{margin:20px 0}.pressthis a,.pressthis a:active,.pressthis a:focus,.pressthis a:hover{display:inline-block;position:relative;cursor:move;color:#333;background:#e6e6e6;-webkit-border-radius:5px;border-radius:5px;border:1px solid #b4b4b4;font-style:normal;line-height:16px;font-size:14px;text-decoration:none}.pressthis a:active{outline:0}.pressthis a:hover:after{-webkit-transform:skew(20deg) rotate(9deg);-ms-transform:skew(20deg) rotate(9deg);transform:skew(20deg) rotate(9deg);-webkit-box-shadow:0 10px 8px rgba(0,0,0,.7);box-shadow:0 10px 8px rgba(0,0,0,.7)}.pressthis a span{display:inline-block;margin:0;padding:0 12px 8px 9px}.pressthis a span:before{color:#777;font:400 20px/1 dashicons;content:'\f157';position:relative;display:inline-block;top:4px;margin-right:4px}.pressthis a:after{content:'';width:70%;height:55%;z-index:-1;position:absolute;right:10px;bottom:9px;background:0 0;-webkit-transform:skew(20deg) rotate(6deg);-ms-transform:skew(20deg) rotate(6deg);transform:skew(20deg) rotate(6deg);-webkit-box-shadow:0 10px 8px rgba(0,0,0,.6);box-shadow:0 10px 8px rgba(0,0,0,.6)}#local-time,#utc-time{padding-left:25px;font-style:italic}.defaultavatarpicker .avatar{margin:2px 0;vertical-align:middle}.options-general-php .spinner{float:none;margin:-3px 3px}@media screen and (max-width:782px){textarea{-webkit-appearance:none}input[type=number],input[type=password],input[type=search],input[type=text]{-webkit-appearance:none;padding:6px 10px}input.code{padding-bottom:5px;padding-top:10px}.widefat th input[type=checkbox],input[type=checkbox]{-webkit-appearance:none;padding:10px}.widefat th input[type=checkbox]{margin-bottom:8px}.widefat th input[type=checkbox]:before,input[type=checkbox]:checked:before{font:400 30px/1 Dashicons;margin:-3px -5px}input[type=checkbox],input[type=radio]{height:25px;width:25px}.wp-admin p input[type=checkbox],.wp-admin p input[type=radio]{margin-top:-3px}input[type=radio]:checked:before{vertical-align:middle;width:9px;height:9px;margin:7px;line-height:16px}.wp-upload-form input[type=submit]{margin-top:10px}#wpbody select{height:36px;font-size:16px}.wp-admin .button-cancel{padding:0;font-size:14px}#createuser .form-field input{width:100%}.form-table{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.form-table td,.form-table th{display:block;width:auto;vertical-align:middle}.form-table .color-palette td{display:table-cell;width:15px}.form-table table.color-palette{margin-right:10px}input,textarea{font-size:16px}#profile-page .form-table textarea,.form-table span.description,.form-table td input[type=password],.form-table td input[type=text],.form-table td select,.form-table td textarea{width:100%;font-size:16px;line-height:1.5;padding:7px 10px;display:block;max-width:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.form-table input[type=text].small-text,input[type=number].small-text,input[type=password].small-text,input[type=search].small-text,input[type=text].small-text{width:auto;max-width:55px;display:inline;padding:3px 6px;margin:0 3px}#pass-strength-result{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:8px}p.search-box{float:none;position:absolute;bottom:0;width:98%;height:90px;margin-bottom:20px}p.search-box input[name="s"]{height:auto;float:none;width:100%;margin-bottom:10px;vertical-align:middle;-webkit-appearance:none}p.search-box input[type=submit]{margin-bottom:10px}.form-table span.description{padding:4px 0 0;line-height:1.4em}.form-table th{padding-top:10px;padding-bottom:0;border-bottom:0}.form-table td{padding-top:8px;padding-left:0}.form-table input.regular-text{width:100%}.form-table label{font-size:14px}.form-table fieldset label{display:block}#utc-time{margin-top:10px}#local-time,#utc-time{display:block;float:none;padding:0;line-height:2}}@media only screen and (max-width:768px){.form-field input,.form-field textarea{width:99%}.form-wrap .form-field{padding:0}#profile-page .form-table textarea{max-width:400px;width:auto}}@media screen and (max-width:600px){.color-option{width:49%}}body.rtl,body.rtl .press-this a.wp-switch-editor{font-family:Tahoma,Arial,sans-serif}body.locale-he-il,body.locale-he-il .press-this a.wp-switch-editor{font-family:Arial,sans-serif}.locale-he-il em{font-style:normal;font-weight:700}.locale-zh-cn #local-time,.locale-zh-cn #utc-time,.locale-zh-cn .form-wrap p,.locale-zh-cn .howto,.locale-zh-cn .inline-edit-row fieldset span.checkbox-title,.locale-zh-cn .inline-edit-row fieldset span.title,.locale-zh-cn .js .input-with-default-title,.locale-zh-cn .link-to-original,.locale-zh-cn .tablenav .displaying-num,.locale-zh-cn p.description,.locale-zh-cn p.help,.locale-zh-cn p.install-help,.locale-zh-cn span.description{font-style:normal}.locale-zh-cn .hdnle a{font-size:12px}.locale-zh-cn form.upgrade .hint{font-style:normal;font-size:100%}.locale-zh-cn #wp-fullscreen-tagline{font-family:KaiTi,"æ¥·ä½",sans-serif}.locale-zh-cn #wp-fullscreen-modes a{font-size:12px}.locale-zh-cn #sort-buttons{font-size:1em!important}.locale-de-de .inline-edit-row fieldset label span.title{width:7em}.locale-de-de .inline-edit-row fieldset label span.input-text-wrap{margin-left:7em}.locale-de-de #customize-header-actions .button{padding:0 5px 1px}.locale-de-de #customize-header-actions .spinner{margin:16px 3px 0}.locale-ru-ru .inline-edit-row fieldset label span.title{width:8em}.locale-ru-ru .inline-edit-row fieldset label span.input-text-wrap{margin-left:8em}.locale-ru-ru.post-php .tagsdiv .newtag{width:165px}.locale-ru-ru.press-this .posting{margin-right:277px}.locale-ru-ru .press-this-sidebar{width:265px}.locale-ru-ru #customize-header-actions .button{padding:0 5px 1px}.locale-ru-ru #customize-header-actions .spinner{margin:16px 3px 0}.locale-lt-lt .inline-edit-row fieldset label span.title{width:8em}.locale-lt-lt .inline-edit-row fieldset label span.input-text-wrap{margin-left:8em}body,html{height:100%;margin:0;padding:0}html{background:#f1f1f1}body{background:#f1f1f1;min-width:0;color:#444;font-family:"Open Sans",sans-serif;font-size:13px;line-height:1.4em}a{color:#0074a2;-webkit-transition-property:border,background,color;transition-property:border,background,color;-webkit-transition-duration:.05s;transition-duration:.05s;-webkit-transition-timing-function:ease-in-out;transition-timing-function:ease-in-out;outline:0}a:active,a:hover{color:#2ea2cc}a:focus{color:#124964}a:active,a:focus{outline:thin dotted}p{line-height:1.5}.login .message{border-left:4px solid #7ad03a;background-color:#fff;-webkit-box-shadow:0 1px 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 1px 0 rgba(0,0,0,.1)}.login #login_error{border-left:4px solid #dd3d36;background:#fff;-webkit-box-shadow:0 1px 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 1px 0 rgba(0,0,0,.1)}#loginform p.submit,.login-action-lostpassword p.submit{border:0;margin:-10px 0 20px}.login *{margin:0;padding:0}.login form{margin-top:20px;margin-left:0;padding:26px 24px 46px;font-weight:400;overflow:hidden;background:#fff;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.13);box-shadow:0 1px 3px rgba(0,0,0,.13)}.login form .forgetmenot{font-weight:400;float:left;margin-bottom:0}.login .button-primary{float:right}#login form p{margin-bottom:0}#login form p.submit{margin:0;padding:0}.login label{color:#777;font-size:14px}.login form .forgetmenot label{font-size:12px;line-height:19px}.login h1{text-align:center}.login h1 a{background-image:url(../images/w-logo-blue.png?ver=20131202);background-image:none,url(../images/wordpress-logo.svg?ver=20131107);-webkit-background-size:80px 80px;background-size:80px 80px;background-position:center top;background-repeat:no-repeat;color:#999;height:80px;font-size:20px;font-weight:400;line-height:1.3em;margin:0 auto 25px;padding:0;text-decoration:none;width:80px;text-indent:-9999px;outline:0;overflow:hidden;display:block}#login{width:320px;padding:8% 0 0;margin:auto}#login_error,.login .message{margin-left:0;padding:12px}.login #backtoblog,.login #nav{font-size:13px;padding:0 24px}.login #nav{margin:24px 0 0}#backtoblog{margin:16px 0 0}.login #backtoblog a,.login #nav a{text-decoration:none;color:#999}.login #backtoblog a:hover,.login #nav a:hover,.login h1 a:hover{color:#2ea2cc}.login form .input,.login input[type=text]{font-size:24px;line-height:1;width:100%;padding:3px;margin:2px 6px 16px 0}.login form .input,.login form input[type=checkbox],.login input[type=text]{background:#fbfbfb}.ie7 .login form .input,.ie8 .login form .input{font-family:sans-serif}.login #pass-strength-result{width:250px;font-weight:600;margin:12px 0 6px;padding:6px 5px;text-align:center}.mobile #login{padding:20px 0}.mobile #login .message,.mobile #login form,.mobile #login_error{margin-left:0}.mobile #login #backtoblog,.mobile #login #nav{margin-left:8px}.mobile #login h1 a{width:auto}body.interim-login{height:auto}.interim-login #login{padding:0;margin:5px auto 20px}.interim-login.login h1 a{width:auto}.interim-login #login_error,.interim-login.login .message{margin:0 0 16px}.interim-login.login form{margin:0}@-ms-viewport{width:device-width}@media screen and (max-width:782px){.interim-login input[type=checkbox]{height:16px;width:16px}.interim-login input[type=checkbox]:checked:before{width:16px;font:400 21px/1 dashicons;margin:-3px 0 0 -4px}} \ No newline at end of file +#pass-strength-result,input,textarea{-webkit-box-sizing:border-box;-moz-box-sizing:border-box}.meta-box-sortables select,p.submit{max-width:100%}#your-profile label+a,.wp-admin select,fieldset label,label{vertical-align:middle}#pressthis-code-wrap,textarea{overflow:auto}input,textarea{box-sizing:border-box}input[type=text],input[type=search],input[type=radio],input[type=tel],input[type=time],input[type=url],input[type=week],input[type=password],input[type=checkbox],input[type=color],input[type=date],input[type=datetime],input[type=datetime-local],input[type=email],input[type=month],input[type=number],select,textarea{border:1px solid #ddd;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.07);box-shadow:inset 0 1px 2px rgba(0,0,0,.07);background-color:#fff;color:#32373c;outline:0;-webkit-transition:50ms border-color ease-in-out;transition:50ms border-color ease-in-out}input[type=text]:focus,input[type=search]:focus,input[type=radio]:focus,input[type=tel]:focus,input[type=time]:focus,input[type=url]:focus,input[type=week]:focus,input[type=password]:focus,input[type=checkbox]:focus,input[type=color]:focus,input[type=date]:focus,input[type=datetime]:focus,input[type=datetime-local]:focus,input[type=email]:focus,input[type=month]:focus,input[type=number]:focus,select:focus,textarea:focus{border-color:#5b9dd9;-webkit-box-shadow:0 0 2px rgba(30,140,190,.8);box-shadow:0 0 2px rgba(30,140,190,.8)}input[type=url],input[type=email]{direction:ltr}input[type=number]{height:28px;line-height:inherit}input[type=radio],input[type=checkbox]{border:1px solid #b4b9be;background:#fff;color:#555;clear:none;cursor:pointer;display:inline-block;line-height:0;height:16px;margin:-4px 4px 0 0;outline:0;padding:0!important;text-align:center;vertical-align:middle;width:16px;min-width:16px;-webkit-appearance:none;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1);-webkit-transition:.05s border-color ease-in-out;transition:.05s border-color ease-in-out}input[type=radio]:checked+label:before{color:#82878c}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#00a0d2}.wp-admin p input[type=radio],.wp-admin p input[type=checkbox],td>input[type=checkbox]{margin-top:0}.wp-admin p label input[type=checkbox]{margin-top:-4px}.wp-admin p label input[type=radio]{margin-top:-2px}input[type=radio]{-webkit-border-radius:50%;border-radius:50%;margin-right:4px;line-height:10px}input[type=radio]:checked:before,input[type=checkbox]:checked:before{float:left;display:inline-block;vertical-align:middle;width:16px;font:400 21px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}input[type=checkbox]:checked:before{content:"\f147";margin:-3px 0 0 -4px;color:#1e8cbe}input[type=radio]:checked:before{content:"\2022";text-indent:-9999px;-webkit-border-radius:50px;border-radius:50px;font-size:24px;width:6px;height:6px;margin:4px;line-height:16px;background-color:#1e8cbe}@-moz-document url-prefix(){.form-table input.tog,input[type=radio],input[type=checkbox]{margin-bottom:-1px}}input[type=search]{-webkit-appearance:textfield}input[type=search]::-webkit-search-decoration{display:none}.ie8 input[type=password]{font-family:sans-serif}button,input,select,textarea{font-family:inherit;font-size:inherit;font-weight:inherit}input,select,textarea{font-size:14px;-webkit-border-radius:0;border-radius:0}textarea{padding:2px 6px;line-height:1.4;resize:vertical}.wp-admin input[type=file]{padding:3px 0}label{cursor:pointer}input,select{margin:1px;padding:3px 5px}input.code{padding-top:6px}textarea.code{line-height:1.4;padding:4px 6px 1px}input.readonly,input[readonly],textarea.readonly,textarea[readonly]{background-color:#eee}::-webkit-input-placeholder{color:#72777c}::-moz-placeholder{color:#72777c;opacity:1}:-ms-input-placeholder{color:#72777c}.form-invalid input,.form-invalid input:focus,.form-invalid select,.form-invalid select:focus{border-color:#dc3232!important;-webkit-box-shadow:0 0 2px rgba(204,0,0,.8);box-shadow:0 0 2px rgba(204,0,0,.8)}.form-table .form-required.form-invalid td:after{content:"\f534";font:400 20px/1 dashicons;color:#dc3232;margin-left:-25px;vertical-align:middle}.form-table .form-required.user-pass1-wrap.form-invalid td:after{content:''}.form-table .form-required.user-pass1-wrap.form-invalid .password-input-wrapper:after{content:'\f534';font:400 20px/1 dashicons;color:#dc3232;margin:0 6px 0 -29px;vertical-align:middle}.form-input-tip{color:#666}input.disabled,input:disabled,select.disabled,select:disabled,textarea.disabled,textarea:disabled{background:rgba(255,255,255,.5);border-color:rgba(222,222,222,.75);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.04);box-shadow:inset 0 1px 2px rgba(0,0,0,.04);color:rgba(51,51,51,.5)}input[type=file].disabled,input[type=file]:disabled,input[type=range].disabled,input[type=range]:disabled{background:0 0;-webkit-box-shadow:none;box-shadow:none}input[type=radio].disabled,input[type=radio].disabled:checked:before,input[type=radio]:disabled,input[type=radio]:disabled:checked:before,input[type=checkbox].disabled,input[type=checkbox].disabled:checked:before,input[type=checkbox]:disabled,input[type=checkbox]:disabled:checked:before{opacity:.7}.wp-admin select{padding:2px;line-height:28px;height:28px}.wp-admin .button-cancel{padding:0 5px;line-height:2}.wp-admin select[multiple]{height:auto}.submit{padding:1.5em 0;margin:5px 0;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;border:none}form p.submit a.cancel:hover{text-decoration:none}p.submit{text-align:left;margin-top:20px;padding-top:10px}.textright p.submit{border:none;text-align:right}table.form-table+input+input+p.submit,table.form-table+input+p.submit,table.form-table+p.submit{border-top:none;padding-top:0}#major-publishing-actions input,#minor-publishing-actions .preview,#minor-publishing-actions input{text-align:center}input.all-options,textarea.all-options{width:250px}input.large-text,textarea.large-text{width:99%}input.regular-text{width:25em}input.small-text{width:50px;padding:1px 6px}input[type=number].small-text{width:65px}input.tiny-text{width:35px}input[type=number].tiny-text{width:45px}#doaction,#doaction2,#post-query-submit{margin:1px 8px 0 0}.tablenav #changeit,.tablenav #clear-recent-list,.tablenav #delete_all,.wp-filter #delete_all{margin-top:1px}.tablenav .actions select{float:left;margin-right:6px;max-width:200px}.ie8 .tablenav .actions select{width:155px}.ie8 .tablenav .actions select#cat{width:200px}#timezone_string option{margin-left:1em}button.wp-hide-pw>.dashicons{position:relative;top:3px}#misc-publishing-actions label,.options-media-php label[for*="_size_"]{vertical-align:baseline}#misc-publishing-actions label[for=post_status]:before{content:"\f173";display:inline-block;font:400 20px/1 dashicons;speak:none;left:-1px;padding:0 5px 0 0;position:relative;top:0;text-decoration:none!important;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#pass1-text,.pw-weak,.show-password #pass1{display:none}#pass-strength-result{background-color:#eee;border:1px solid #ddd;color:#23282d;margin:-2px 5px 5px 1px;padding:3px 5px;text-align:center;width:25em;box-sizing:border-box;opacity:0}#pass-strength-result.short{background-color:#f1adad;border-color:#e35b5b;opacity:1}#pass-strength-result.bad{background-color:#fbc5a9;border-color:#f78b53;opacity:1}#pass-strength-result.good{background-color:#ffe399;border-color:#ffc733;opacity:1}#pass-strength-result.strong{background-color:#c1e1b9;border-color:#83c373;opacity:1}#pass1-text.short,#pass1.short{border-color:#e35b5b}#pass1-text.bad,#pass1.bad{border-color:#f78b53}#pass1-text.good,#pass1.good{border-color:#ffc733}#pass1-text.strong,#pass1.strong{border-color:#83c373}.indicator-hint{padding-top:8px}.show-password #pass1-text{display:inline-block}.form-table span.description.important{font-size:12px}p.search-box{float:right;margin:0}.network-admin.themes-php p.search-box{clear:left}.search-box input[name="s"],.tablenav .search-plugins input[name="s"],.tagsdiv .newtag{float:left;height:28px;margin:0 4px 0 0}input[type=text].ui-autocomplete-loading,input[type=email].ui-autocomplete-loading{background-image:url(../images/loading.gif);background-repeat:no-repeat;background-position:right center;visibility:visible}input.ui-autocomplete-input.open{border-bottom-color:transparent}ul#add-to-blog-users{margin:0 0 0 14px}.ui-autocomplete{padding:0;margin:0;list-style:none;position:absolute;z-index:10000;border:1px solid #5b9dd9;-webkit-box-shadow:0 1px 2px rgba(30,140,190,.8);box-shadow:0 1px 2px rgba(30,140,190,.8);background-color:#fff}.ui-autocomplete li{margin-bottom:0;padding:4px 10px;white-space:nowrap;text-align:left}.ui-autocomplete li.ui-state-focus{background-color:#ddd;cursor:pointer}.form-table{border-collapse:collapse;margin-top:.5em;width:100%;clear:both}.form-table,.form-table td,.form-table td p,.form-table th,.form-wrap label{font-size:14px}.form-table td{margin-bottom:9px;padding:15px 10px;line-height:1.3;vertical-align:middle}.form-table th,.form-wrap label{color:#23282d;font-weight:400;text-shadow:none;vertical-align:baseline}.form-table th{vertical-align:top;text-align:left;padding:20px 10px 20px 0;width:200px;line-height:1.3;font-weight:600}.form-table th.th-full{width:auto;font-weight:400}.form-table td p{margin-top:4px;margin-bottom:0}.form-table .date-time-doc{margin-top:1em}.form-table p.timezone-info{margin:1em 0}.form-table td fieldset label{margin:.25em 0 .5em!important;display:inline-block}.form-table td fieldset label,.form-table td fieldset li,.form-table td fieldset p{line-height:1.4em}.form-table input.tog,.form-table input[type=radio]{margin-top:-4px;margin-right:4px;float:none}.form-table .pre{padding:8px;margin:0}table.form-table td .updated{font-size:13px}table.form-table td .updated p{font-size:13px;margin:.3em 0}#profile-page .form-table textarea{width:500px;margin-bottom:6px}#profile-page .form-table #rich_editing{margin-right:5px}#your-profile legend{font-size:22px}#display_name{width:15em}#adduser .form-field input,#createuser .form-field input{width:25em}.color-option{display:inline-block;width:24%;padding:5px 15px 15px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin-bottom:3px;cursor:pointer}.color-option.selected,.color-option:hover{background:#ddd}.color-palette{width:100%;border-spacing:0;border-collapse:collapse}.color-palette td{height:20px;padding:0;border:none}.tool-box .title{margin:8px 0;font-size:18px;font-weight:400;line-height:24px}.label-responsive{vertical-align:middle}#export-filters p{margin:0 0 1em}#export-filters p.submit{margin:7px 0 5px}.card{position:relative;margin-top:20px;padding:.7em 2em 1em;min-width:255px;max-width:520px;border:1px solid #e5e5e5;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04);background:#fff}.pressthis h4{margin:2em 0 1em}.pressthis textarea{width:100%;font-size:1em}.login form,.login h1 a{overflow:hidden;font-weight:400}.pressthis-bookmarklet-wrapper{margin:20px 0 8px;vertical-align:top;position:relative;z-index:1}.pressthis-bookmarklet,.pressthis-bookmarklet:active,.pressthis-bookmarklet:focus,.pressthis-bookmarklet:hover{display:inline-block;position:relative;cursor:move;color:#32373c;background:#e5e5e5;-webkit-border-radius:5px;border-radius:5px;border:1px solid #b4b9be;font-style:normal;line-height:16px;font-size:14px;text-decoration:none}.pressthis-bookmarklet:active{outline:0}.pressthis-bookmarklet:after{content:"";width:70%;height:55%;z-index:-1;position:absolute;right:10px;bottom:9px;background:0 0;-webkit-transform:skew(20deg) rotate(6deg);-ms-transform:skew(20deg) rotate(6deg);transform:skew(20deg) rotate(6deg);-webkit-box-shadow:0 10px 8px rgba(0,0,0,.6);box-shadow:0 10px 8px rgba(0,0,0,.6)}.pressthis-bookmarklet:hover:after{-webkit-transform:skew(20deg) rotate(9deg);-ms-transform:skew(20deg) rotate(9deg);transform:skew(20deg) rotate(9deg);-webkit-box-shadow:0 10px 8px rgba(0,0,0,.7);box-shadow:0 10px 8px rgba(0,0,0,.7)}.pressthis-bookmarklet span{display:inline-block;margin:0;padding:0 12px 8px 9px}.pressthis-bookmarklet span:before{color:#72777c;font:400 20px/1 dashicons;content:"\f157";position:relative;display:inline-block;top:4px;margin-right:4px}.pressthis-js-toggle,.pressthis-js-toggle.button.button{margin-left:10px;padding:0;height:auto;vertical-align:top}.pressthis-js-toggle .dashicons{margin:5px 8px 6px 7px;color:#555d66}.timezone-info code{white-space:nowrap}.defaultavatarpicker .avatar{margin:2px 0;vertical-align:middle}.options-general-php .date-time-text{display:inline-block;min-width:10em}.options-general-php input.small-text{width:56px}.options-general-php .spinner{float:none;margin:0 3px}.options-general-php .language-install-spinner,.settings-php .language-install-spinner{display:inline-block;float:none;margin:-3px 5px 0;vertical-align:middle}.setup-php textarea{max-width:100%}.form-field #site-address{max-width:25em}.form-field #domain{max-width:22em}.form-field #admin-email,.form-field #blog_last_updated,.form-field #blog_registered,.form-field #path,.form-field #site-title{max-width:25em}.form-field #path{margin-bottom:5px}#search-sites,#search-users{max-width:100%}.request-filesystem-credentials-dialog{display:none}.request-filesystem-credentials-dialog .notification-dialog{top:15%;max-height:85%}.request-filesystem-credentials-dialog-content{margin:25px}#request-filesystem-credentials-title{font-size:1.3em;margin:1em 0}.request-filesystem-credentials-form legend{font-size:1em;padding:1.33em 0;font-weight:600}.request-filesystem-credentials-form input[type=text],.request-filesystem-credentials-form input[type=password]{display:block}.request-filesystem-credentials-dialog input[type=text],.request-filesystem-credentials-dialog input[type=password]{width:100%}.request-filesystem-credentials-form .field-title{font-weight:600}.request-filesystem-credentials-dialog label[for=hostname],.request-filesystem-credentials-dialog label[for=public_key],.request-filesystem-credentials-dialog label[for=private_key]{display:block;margin-bottom:1em}.request-filesystem-credentials-dialog .ftp-password,.request-filesystem-credentials-dialog .ftp-username{float:left;width:48%}.request-filesystem-credentials-dialog .ftp-password{margin-left:4%}.request-filesystem-credentials-dialog .request-filesystem-credentials-action-buttons{text-align:right}.request-filesystem-credentials-dialog label[for=ftp]{margin-right:10px}#request-filesystem-credentials-dialog .button:not(:last-child){margin-right:10px}#request-filesystem-credentials-form .cancel-button{display:none}#request-filesystem-credentials-dialog .cancel-button{display:inline}@media screen and (max-width:782px){textarea{-webkit-appearance:none}input[type=text],input[type=search],input[type=password],input[type=email],input[type=number]{-webkit-appearance:none;padding:6px 10px}input[type=number]{height:40px}input.code{padding-bottom:5px;padding-top:10px}.widefat tfoot td input[type=checkbox],.widefat th input[type=checkbox],.widefat thead td input[type=checkbox],input[type=checkbox]{-webkit-appearance:none;padding:10px}.widefat tfoot td input[type=checkbox],.widefat th input[type=checkbox],.widefat thead td input[type=checkbox]{margin-bottom:8px}.widefat tfoot td input[type=checkbox]:before,.widefat th input[type=checkbox]:before,.widefat thead td input[type=checkbox]:before,input[type=checkbox]:checked:before{font:400 30px/1 dashicons;margin:-3px -5px}input[type=radio],input[type=checkbox]{height:25px;width:25px}.wp-admin p input[type=radio],.wp-admin p input[type=checkbox]{margin-top:-3px}input[type=radio]:checked:before{vertical-align:middle;width:9px;height:9px;margin:7px;line-height:16px}.wp-upload-form input[type=submit]{margin-top:10px}#wpbody select{height:36px;font-size:16px}.wp-admin .button-cancel{padding:0;font-size:14px}#adduser .form-field input,#createuser .form-field input{width:100%}.form-table{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.form-table td,.form-table th,.label-responsive{display:block;width:auto;vertical-align:middle}.label-responsive{margin:.5em 0}.export-filters li{margin-bottom:0}.form-table .color-palette td{display:table-cell;width:15px}.form-table table.color-palette{margin-right:10px}input,textarea{font-size:16px}#profile-page .form-table textarea,.form-table span.description,.form-table td input[type=text],.form-table td input[type=password],.form-table td input[type=email],.form-table td select,.form-table td textarea{width:100%;font-size:16px;line-height:1.5;padding:7px 10px;display:block;max-width:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.form-table .form-required.form-invalid td:after{float:right;margin:-30px 3px 0 0}#wpbody .form-table td select{height:40px}.form-table input[type=text].small-text,input[type=text].small-text,input[type=search].small-text,input[type=password].small-text,input[type=number].small-text{width:auto;max-width:55px;display:inline;padding:3px 6px;margin:0 3px}#pass-strength-result{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:8px}p.search-box{float:none;position:absolute;bottom:0;width:98%;height:90px;margin-bottom:20px}p.search-box input[name="s"]{height:auto;float:none;width:100%;margin-bottom:10px;vertical-align:middle;-webkit-appearance:none}p.search-box input[type=submit]{margin-bottom:10px}.form-table span.description{display:inline;padding:4px 0 0;line-height:1.4em;font-size:14px}.form-table th{padding-top:10px;padding-bottom:0;border-bottom:0}.form-table td{margin-bottom:0;padding-bottom:6px;padding-top:4px;padding-left:0}.form-table.permalink-structure td code{margin-left:32px}.form-table.permalink-structure td input[type=text]{margin-left:32px;margin-top:4px;width:96%}.form-table input.regular-text{width:100%}.form-table label{font-size:14px}.form-table fieldset label{display:block}#local-time,#utc-time{display:block;float:none;margin-top:.5em}.form-field #domain{max-width:none}.wp-pwd{position:relative}.wp-pwd [type=text],.wp-pwd [type=password]{padding-right:40px}.wp-pwd button.button{background:0 0;border:none;-webkit-box-shadow:none;box-shadow:none;line-height:2;margin:0;padding:5px 10px;position:absolute;right:0;top:0}.wp-pwd button.button:active,.wp-pwd button.button:focus,.wp-pwd button.button:hover{background:0 0}.wp-pwd .button .text{display:none}.options-general-php input[type=text].small-text{max-width:60px;margin:0}}.locale-he-il em,.locale-zh-cn #local-time,.locale-zh-cn #utc-time,.locale-zh-cn .form-wrap p,.locale-zh-cn .howto,.locale-zh-cn .inline-edit-row fieldset span.checkbox-title,.locale-zh-cn .inline-edit-row fieldset span.title,.locale-zh-cn .js .input-with-default-title,.locale-zh-cn .link-to-original,.locale-zh-cn .tablenav .displaying-num,.locale-zh-cn p.description,.locale-zh-cn p.help,.locale-zh-cn p.install-help,.locale-zh-cn span.description{font-style:normal}body,html{background:#f1f1f1}@media only screen and (max-width:768px){.form-field input[type=text],.form-field input[type=password],.form-field input[type=email],.form-field select,.form-field textarea{width:99%}.form-wrap .form-field{padding:0}#profile-page .form-table textarea{max-width:400px;width:auto}}.locale-de-de #customize-header-actions .button,.locale-de-de-formal #customize-header-actions .button,.locale-ru-ru #customize-header-actions .button{padding:0 5px 1px}@media only screen and (max-height:480px){.request-filesystem-credentials-dialog .notification-dialog{width:100%;height:100%;max-height:100%;position:fixed;top:0;margin:0;left:0}}@media screen and (max-width:600px){.color-option{width:49%}}@media only screen and (max-width:320px){.options-general-php .date-time-text.date-time-custom-text{min-width:0;margin-right:.5em}}body.rtl,body.rtl .press-this a.wp-switch-editor{font-family:Tahoma,Arial,sans-serif}.rtl h1,.rtl h2,.rtl h3,.rtl h4,.rtl h5,.rtl h6{font-family:Arial,sans-serif;font-weight:700}body.locale-he-il,body.locale-he-il .press-this a.wp-switch-editor{font-family:Arial,sans-serif}.locale-he-il em{font-weight:700}.locale-zh-cn .hdnle a{font-size:12px}.locale-zh-cn form.upgrade .hint{font-style:normal;font-size:100%}.locale-zh-cn #sort-buttons{font-size:1em!important}.locale-de-de #customize-header-actions .spinner,.locale-de-de-formal #customize-header-actions .spinner{margin:16px 3px 0}.locale-ru-ru #adminmenu{width:inherit}.locale-ru-ru #adminmenu,.locale-ru-ru #wpbody{margin-left:0}.locale-ru-ru .inline-edit-row fieldset label span.title,.locale-ru-ru .inline-edit-row fieldset.inline-edit-date legend{width:8em}.locale-ru-ru .inline-edit-row fieldset .timestamp-wrap,.locale-ru-ru .inline-edit-row fieldset label span.input-text-wrap{margin-left:8em}.locale-ru-ru.post-new-php .tagsdiv .newtag,.locale-ru-ru.post-php .tagsdiv .newtag{width:165px}.locale-ru-ru.press-this .posting{margin-right:277px}.locale-ru-ru .press-this-sidebar{width:265px}.locale-ru-ru #customize-header-actions .spinner{margin:16px 3px 0}.locale-lt-lt .inline-edit-row fieldset label span.title,.locale-lt-lt .inline-edit-row fieldset.inline-edit-date legend{width:8em}.locale-lt-lt .inline-edit-row fieldset .timestamp-wrap,.locale-lt-lt .inline-edit-row fieldset label span.input-text-wrap{margin-left:8em}@media screen and (max-width:782px){.locale-lt-lt .inline-edit-row fieldset .timestamp-wrap,.locale-lt-lt .inline-edit-row fieldset label span.input-text-wrap,.locale-ru-ru .inline-edit-row fieldset .timestamp-wrap,.locale-ru-ru .inline-edit-row fieldset label span.input-text-wrap{margin-left:0}}body,html{height:100%;margin:0;padding:0}body{min-width:0;color:#444;font-family:"Open Sans",sans-serif;font-size:13px;line-height:1.4em}a{color:#0073aa;-webkit-transition-property:border,background,color;transition-property:border,background,color;-webkit-transition-duration:.05s;transition-duration:.05s;-webkit-transition-timing-function:ease-in-out;transition-timing-function:ease-in-out;outline:0}a:active,a:hover{color:#00a0d2}a:focus{color:#124964;-webkit-box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}.ie8 a:focus{outline:#5b9dd9 solid 1px}p{line-height:1.5}.login #login_error,.login .message{border-left:4px solid #00a0d2;padding:12px;margin-left:0;background-color:#fff;-webkit-box-shadow:0 1px 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 1px 0 rgba(0,0,0,.1)}.login #login_error{border-left-color:#dc3232}#loginform p.submit,.login-action-lostpassword p.submit{border:none;margin:-10px 0 20px}.login *{margin:0;padding:0}.login form{margin-top:20px;margin-left:0;padding:26px 24px 46px;background:#fff;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.13);box-shadow:0 1px 3px rgba(0,0,0,.13)}.login form .forgetmenot{font-weight:400;float:left;margin-bottom:0}.login .button-primary{float:right}#login form p{margin-bottom:0}#login form p.submit{margin:0;padding:0}.login label{color:#72777c;font-size:14px}.login form .forgetmenot label{font-size:12px;line-height:19px}.login h1{text-align:center}.login h1 a{background-image:url(../images/w-logo-blue.png?ver=20131202);background-image:none,url(../images/wordpress-logo.svg?ver=20131107);-webkit-background-size:84px;background-size:84px;background-position:center top;background-repeat:no-repeat;color:#444;height:84px;font-size:20px;line-height:1.3em;margin:0 auto 25px;padding:0;text-decoration:none;width:84px;text-indent:-9999px;outline:0;display:block}#login{width:320px;padding:8% 0 0;margin:auto}.login #backtoblog,.login #nav{font-size:13px;padding:0 24px}.login #nav{margin:24px 0 0}#backtoblog{margin:16px 0}.login #backtoblog a,.login #nav a{text-decoration:none;color:#555d66}.login #backtoblog a:hover,.login #nav a:hover,.login h1 a:hover{color:#00a0d2}.login #backtoblog a:focus,.login #nav a:focus,.login h1 a:focus{color:#124964}.login form .input,.login input[type=text]{font-size:24px;width:100%;padding:3px;margin:2px 6px 16px 0}.login form .input,.login form input[type=checkbox],.login input[type=text]{background:#fbfbfb}.ie7 .login form .input,.ie8 .login form .input{font-family:sans-serif}.login-action-rp input[type=text]{-webkit-box-shadow:none;box-shadow:none;margin:0}.login #pass-strength-result{font-weight:600;margin:-1px 5px 16px 0;padding:6px 5px;text-align:center;width:100%}.mobile #login{padding:20px 0}.mobile #login form{margin-left:0}.mobile #login #backtoblog,.mobile #login #nav{margin-left:8px}body.interim-login{height:auto}.interim-login #login{padding:0;margin:5px auto 20px}.interim-login.login h1 a{width:auto}.interim-login #login_error,.interim-login.login .message{margin:0 0 16px}.interim-login.login form{margin:0}@-ms-viewport{width:device-width}@media screen and (max-width:782px){.interim-login input[type=checkbox]{height:16px;width:16px}.interim-login input[type=checkbox]:checked:before{width:16px;font:400 21px/1 dashicons;margin:-3px 0 0 -4px}} \ No newline at end of file diff --git a/wp-admin/css/media-rtl.css b/wp-admin/css/media-rtl.css index 2ad6280..43cb84a 100644 --- a/wp-admin/css/media-rtl.css +++ b/wp-admin/css/media-rtl.css @@ -5,7 +5,7 @@ .media-item .describe { border-collapse: collapse; width: 100%; - border-top: 1px solid #dfdfdf; + border-top: 1px solid #ddd; clear: both; cursor: default; } @@ -102,6 +102,7 @@ display: block; line-height: 36px; float: left; + margin-left: 10px; } .media-item .describe-toggle-off, @@ -113,19 +114,18 @@ display: block; } -#media-items .media-item { - border-bottom: 1px solid #dfdfdf; +.media-upload-form .media-item { min-height: 36px; + margin-bottom: 1px; position: relative; width: 100%; + background: #fff; } -#media-items { - width: 623px; -} - -.media-new-php #media-items { - margin: 1em 0; +.media-upload-form .media-item, +.media-upload-form .media-item .error { + -webkit-box-shadow: 0 1px 0 #ddd; + box-shadow: 0 1px 0 #ddd; } #media-items:empty { @@ -135,15 +135,12 @@ .media-item .filename { line-height: 36px; overflow: hidden; -} - -.media-item .error-div { - padding-right: 10px; + margin-right: 6px; } .media-item .pinkynail { float: right; - margin: 2px 0 0 10px; + margin: 2px 3px 0 10px; max-width: 40px; max-height: 32px; } @@ -161,17 +158,16 @@ .media-item .progress { float: left; height: 22px; - margin: 7px 0 0; + margin: 7px 6px; width: 200px; line-height: 2em; padding: 0; overflow: hidden; - margin-bottom: 2px; -webkit-border-radius: 22px; border-radius: 22px; background: #ddd; - -webkit-box-shadow: inset 0px 1px 2px rgba(0,0,0,0.1); - box-shadow: inset 0px 1px 2px rgba(0,0,0,0.1); + -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1); + box-shadow: inset 0 1px 2px rgba(0,0,0,0.1); } .media-item .bar { @@ -181,7 +177,7 @@ margin-top: -22px; -webkit-border-radius: 22px; border-radius: 22px; - background-color: #0074a2; + background-color: #0073aa; -webkit-box-shadow: inset 0 0 2px rgba(0,0,0,0.3); box-shadow: inset 0 0 2px rgba(0,0,0,0.3); } @@ -195,7 +191,7 @@ text-align: center; line-height: 22px; font-weight: 400; - text-shadow: 0px 1px 2px rgba(0,0,0,0.2); + text-shadow: 0 1px 2px rgba(0,0,0,0.2); } .upload-php .fixed .column-parent { @@ -210,22 +206,20 @@ display: block; } -.media-upload-form .media-item.error { - margin: 0; - padding: 0; +.media-upload-form .media-item.error, +.media-upload-form .media-item .error { + width: auto; + margin: 0 0 1px 0; } -.media-upload-form .media-item.error p, -.media-item .error-div { - line-height: 16px; - margin: 5px 10px; - padding: 0; +.media-upload-form .media-item .error { + padding: 10px 14px 10px 0; } .media-item .error-div a.dismiss { display: block; float: left; - margin: 5px 15px 0 4px; + margin: 0 15px 0 10px; } /*------------------------------------------------------------------------------ @@ -248,7 +242,7 @@ .find-box-head { background: #fcfcfc; - border-bottom: 1px solid #dfdfdf; + border-bottom: 1px solid #ddd; height: 36px; font-size: 18px; font-weight: 600; @@ -280,9 +274,13 @@ .find-box-search .spinner { float: none; - right: 125px; + right: 105px; position: absolute; - top: 18px; +} + +.find-box-search, +#find-posts-response { + position: relative; /* RTL fix, #WP28010 */ } #find-posts-input, @@ -313,22 +311,22 @@ } #find-posts-close:hover { - color: #2ea2cc; + color: #00a0d2; } #find-posts-close:before { - font: normal 20px/36px 'dashicons'; + font: normal 20px/36px dashicons; vertical-align: top; speak: none; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - content: '\f158'; + content: "\f158"; } .find-box-buttons { padding: 8px 16px; background: #fcfcfc; - border-top: 1px solid #dfdfdf; + border-top: 1px solid #ddd; position: absolute; bottom: 0; right: 0; @@ -386,12 +384,10 @@ form.upgrade .hint { border: 1px solid #ddd; line-height: 1.8em; word-spacing: 3px; - -webkit-border-radius: 6px; - border-radius: 6px; } .drag-drop #drag-drop-area { - border: 4px dashed #bbb; + border: 4px dashed #b4b9be; height: 200px; } @@ -401,7 +397,7 @@ form.upgrade .hint { } .drag-drop-inside p { - color: #aaa; + color: #a0a5aa; font-size: 14px; margin: 5px 0; display: none; @@ -433,6 +429,393 @@ border color while dragging a file over the uploader drop area */ position: relative; } +/** + * Media Library grid view + */ + +.media-frame.mode-grid, +.media-frame.mode-grid .media-frame-content, +.media-frame.mode-grid .attachments-browser .attachments, +.media-frame.mode-grid .uploader-inline-content { + position: static; +} + +/* Regions we don't use at all */ +.media-frame.mode-grid .media-frame-title, +.media-frame.mode-grid .media-frame-router, +.media-frame.mode-grid .media-frame-menu { + display: none; +} + +.media-frame.mode-grid .media-frame-content { + background-color: transparent; + border: none; +} + +.upload-php .mode-grid .media-sidebar { + position: relative; + width: auto; + margin-bottom: 16px; + padding: 0 16px; + border-right: 4px solid #dd3d36; + -webkit-box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1); + background-color: #fff; +} + +.upload-php .mode-grid .hide-sidebar .media-sidebar { + display: none; +} + +.upload-php .mode-grid .media-sidebar .media-uploader-status { + border-bottom: none; + padding-bottom: 0; + max-width: 100%; +} + +.upload-php .mode-grid .media-sidebar .upload-error { + margin: 12px 0; + padding: 4px 0 0; + border: none; + -webkit-box-shadow: none; + box-shadow: none; + background: none; +} + +.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors { + top: -10px; + left: -14px; + padding: 10px; +} + +.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:before { + content: "\f153"; + display: block; + font: normal 16px/1 dashicons; + color: #b4b9be; +} + +.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:focus:before, +.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:hover:before { + color: #c00; +} + +.upload-php .mode-grid .media-sidebar .media-uploader-status.errors h3, /* Back-compat for pre-4.4 */ +.upload-php .mode-grid .media-sidebar .media-uploader-status.errors h2 { + display: none; +} + +.media-frame.mode-grid .uploader-inline { + position: relative; + top: auto; + left: auto; + right: auto; + bottom: auto; + padding-top: 0; + margin-top: 0; + border: 4px dashed #b4b9be; +} + +.media-frame.mode-select .attachments-browser.fixed .attachments { + position: relative; + top: 94px; /* prevent jumping up when the toolbar becomes fixed */ + padding-bottom: 94px; /* offset for above so the bottom doesn't get cut off */ +} + +.media-frame.mode-grid .attachment:focus, +.media-frame.mode-grid .selected.attachment:focus, +.media-frame.mode-grid .attachment.details:focus { + -webkit-box-shadow: + inset 0 0 2px 3px #f1f1f1, + inset 0 0 0 7px #5b9dd9; + box-shadow: + inset 0 0 2px 3px #f1f1f1, + inset 0 0 0 7px #5b9dd9; + outline: none; +} + +.media-frame.mode-grid .selected.attachment { + -webkit-box-shadow: + inset 0 0 0 5px #f1f1f1, + inset 0 0 0 7px #ccc; + box-shadow: + inset 0 0 0 5px #f1f1f1, + inset 0 0 0 7px #ccc; +} + +.media-frame.mode-grid .attachment.details { + -webkit-box-shadow: + inset 0 0 0 3px #f1f1f1, + inset 0 0 0 7px #1e8cbe; + box-shadow: + inset 0 0 0 3px #f1f1f1, + inset 0 0 0 7px #1e8cbe; +} + +.media-frame.mode-grid.mode-select .attachment .thumbnail { + opacity: 0.65; +} + +.media-frame.mode-select .attachment.selected .thumbnail { + opacity: 1; +} + +.media-frame.mode-grid .media-toolbar { + margin-bottom: 15px; + height: auto; +} + +.media-frame.mode-grid .media-toolbar select { + margin: 0 0 0 10px; + font-size: 14px; +} + +.media-frame.mode-grid.mode-edit .media-toolbar-secondary > .select-mode-toggle-button { + margin: 0 0 0 8px; + vertical-align: middle; +} + +.media-frame.mode-grid .attachments-browser .bulk-select { + display: inline-block; + margin: 0 0 0 10px; +} + +.media-frame.mode-grid .search { + margin-top: 0; +} + +.media-frame.mode-grid .spinner { + margin-top: 16px; +} + +.attachments-browser .media-toolbar-secondary > .media-button { + margin-left: 10px; +} + +.media-frame.mode-select .attachments-browser.fixed .media-toolbar { + position: fixed; + top: 32px; + right: auto; + left: 20px; + margin-top: 0; +} + +.media-frame.mode-grid .attachments-browser { + padding: 0; +} + +.media-frame.mode-grid .attachments-browser .attachments { + padding: 2px; +} + +.media-frame.mode-grid .attachments-browser .no-media { + color: #666; /* same as no plugins and no themes */ + font-size: 18px; + font-style: normal; + margin: 0; + padding: 100px 0 0; + text-align: center; +} + +/** + * Attachment details modal + */ + +.edit-attachment-frame { + display: block; + height: 100%; + width: 100%; +} + +.edit-attachment-frame .edit-media-header { + overflow: hidden; +} + +.upload-php .media-modal-close .media-modal-icon:before { + content: "\f335"; + font-size: 22px; +} + +.upload-php .media-modal-close, +.edit-attachment-frame .edit-media-header .left, +.edit-attachment-frame .edit-media-header .right { + cursor: pointer; + color: #72777c; + background-color: transparent; + height: 50px; + width: 50px; + padding: 0; + position: absolute; + text-align: center; + border: 0; + border-right: 1px solid #ddd; + -webkit-transition: color .1s ease-in-out, background .1s ease-in-out; + transition: color .1s ease-in-out, background .1s ease-in-out; +} + +.upload-php .media-modal-close { + top: 0; + left: 0; +} + +.edit-attachment-frame .edit-media-header .left { + left: 102px; +} + +.edit-attachment-frame .edit-media-header .right { + left: 51px; +} + +.edit-attachment-frame .media-frame-title { + right: 0; + left: 150px; /* leave space for prev/next/close */ +} + +.edit-attachment-frame .edit-media-header .right:before, +.edit-attachment-frame .edit-media-header .left:before { + font: normal 20px/50px dashicons !important; + display: inline; + font-weight: 300; +} + +.upload-php .media-modal-close:hover, +.upload-php .media-modal-close:focus, +.edit-attachment-frame .edit-media-header .left:hover, +.edit-attachment-frame .edit-media-header .right:hover, +.edit-attachment-frame .edit-media-header .left:focus, +.edit-attachment-frame .edit-media-header .right:focus { + background: #ddd; + border-color: #ccc; + color: #000; + outline: none; + -webkit-box-shadow: none; + box-shadow: none; +} + +.upload-php .media-modal-close:focus .media-modal-icon:before, +.upload-php .media-modal-close:hover .media-modal-icon:before { + color: #000; +} + +.edit-attachment-frame .edit-media-header .left:before, +.rtl .edit-attachment-frame .edit-media-header .right:before { + content: "\f345"; +} + +.edit-attachment-frame .edit-media-header .right:before, +.rtl .edit-attachment-frame .edit-media-header .left:before { + content: "\f341"; +} + +.edit-attachment-frame .edit-media-header .left.disabled, +.edit-attachment-frame .edit-media-header .right.disabled, +.edit-attachment-frame .edit-media-header .left.disabled:hover, +.edit-attachment-frame .edit-media-header .right.disabled:hover { + color: #ccc; + background: inherit; + cursor: default; + pointer-events: none; +} + +.edit-attachment-frame .media-frame-content, +.edit-attachment-frame .media-frame-router { + right: 0; +} + +.edit-attachment-frame .media-frame-content { + border-bottom: none; + bottom: 0; + top: 50px; +} + +.edit-attachment-frame .attachment-details { + position: absolute; + overflow: auto; + top: 0; + bottom: 0; + left: 0; + right: 0; + -webkit-box-shadow: inset 0px 4px 4px -4px rgba(0, 0, 0, 0.1); + box-shadow: inset 0px 4px 4px -4px rgba(0, 0, 0, 0.1); +} + +.edit-attachment-frame .attachment-media-view { + float: right; + width: 65%; + height: 100%; +} + +.edit-attachment-frame .attachment-media-view .thumbnail { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + padding: 16px; + height: 100%; +} + +.edit-attachment-frame .attachment-media-view .details-image { + display: block; + margin-bottom: 16px; + max-width: 100%; + max-height: 90%; + max-height: -webkit-calc( 100% - 42px ); + max-height: calc( 100% - 42px ); /* leave space for actions underneath */ +} + +.edit-attachment-frame .wp-media-wrapper { + margin-bottom: 12px; +} + +.edit-attachment-frame input, +.edit-attachment-frame textarea { + padding: 6px 8px; + line-height: 16px; +} + +.edit-attachment-frame .attachment-info { + overflow: auto; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + margin-bottom: 0; + padding: 12px 16px 0; + width: 35%; + height: 100%; + -webkit-box-shadow: inset 0px 4px 4px -4px rgba(0, 0, 0, 0.1); + box-shadow: inset 0px 4px 4px -4px rgba(0, 0, 0, 0.1); + border-bottom: 0; + border-right: 1px solid #ddd; + background: #f3f3f3; +} + +.edit-attachment-frame .attachment-info .details, +.edit-attachment-frame .attachment-info .settings { + position: relative; /* RTL fix, #WP29352 */ + overflow: hidden; + float: none; + margin-bottom: 15px; + padding-bottom: 15px; + border-bottom: 1px solid #ddd; +} + +.edit-attachment-frame .attachment-info .filename { + font-weight: normal; + color: #666; +} + +.edit-attachment-frame .attachment-info .thumbnail { + margin-bottom: 12px; +} + +.attachment-info .actions { + margin-bottom: 16px; +} + +.attachment-info .actions a { + display: inline; + text-decoration: none; +} + /*------------------------------------------------------------------------------ 14.2 - Image Editor @@ -454,10 +837,16 @@ border color while dragging a file over the uploader drop area */ .imgedit-wrap { position: relative; + padding-top: 10px; } -.imgedit-settings p { - margin: 8px 0 0; +.imgedit-settings p, +.imgedit-settings fieldset { + margin: 8px 0; +} + +.imgedit-settings legend { + margin-bottom: 5px; } .describe .imgedit-wrap .imgedit-settings { @@ -470,13 +859,11 @@ border color while dragging a file over the uploader drop area */ .wp_attachment_holder .imgedit-wrap > div { height: auto; - overflow: hidden; } .wp_attachment_holder .imgedit-wrap .imgedit-panel-content { - padding-left: 16px; - width: auto; - overflow: hidden; + padding: 3px 0 0 16px; + float: right; } .wp_attachment_holder .imgedit-wrap .imgedit-settings { @@ -492,26 +879,41 @@ border color while dragging a file over the uploader drop area */ .imgedit-wait { position: absolute; top: 0; - background: #fff url(../images/spinner.gif) no-repeat center; - -webkit-background-size: 20px 20px; - background-size: 20px 20px; + bottom: 0; + width: 100%; + background: #fff; opacity: 0.7; filter: alpha(opacity=70); - width: 100%; - height: 500px; display: none; } +.imgedit-wait:before { + content: ""; + display: block; + width: 20px; + height: 20px; + position: absolute; + right: 50%; + top: 50%; + margin: -10px -10px 0 0; + background: transparent url(../images/spinner.gif) no-repeat center; + -webkit-background-size: 20px 20px; + background-size: 20px 20px; + -webkit-transform: translateZ(0); + transform: translateZ(0); +} + .no-float { float: none; } .media-disabled, -.imgedit-settings .disabled { - color: grey; +.imgedit-settings .disabled { + /* WCAG 1.4.3 Text or images of text that are part of an inactive user + interface component ... have no contrast requirement. */ + color: #a0a5aa; } -.wp_attachment_image, .A1B1 { overflow: hidden; } @@ -528,77 +930,73 @@ border color while dragging a file over the uploader drop area */ .wp_attachment_image .spinner, .A1B1 .spinner { float: right; - padding: 0 0 4px 0; - vertical-align: bottom; } .imgedit-menu { - margin: 0 0 12px; min-width: 300px; + margin: 0 0 12px; } -.imgedit-menu div { +.imgedit-menu .note-no-rotate { + clear: both; + margin: 0; + padding: 1em 0 0; +} + +.image-editor .imgedit-menu .button { float: right; width: 32px; - border: 1px solid #d5d5d5; - background: #f1f1f1; - margin: 0 0 0 8px; height: 32px; + margin: 0 0 0 8px; + padding: 0; + background: #f1f1f1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - text-align: center; - line-height: 28px; - color: #777; - cursor: pointer; + line-height: 16px; + color: #72777c; } -.imgedit-menu div:before { - font: normal 20px/1 'dashicons'; +.imgedit-menu .button:before { + font: normal 20px/1 dashicons; speak: none; vertical-align: middle; } -.imgedit-menu div:hover { - border-color: #c1c1c1; - background-color: #eaeaea; - color: #333; -} - -.imgedit-menu div.disabled { +.imgedit-menu .button.disabled { border-color: #ccc; background-color: #ddd; - color: #777; + color: #72777c; filter: alpha(opacity=50); opacity: 0.5; cursor: default; } .imgedit-crop:before { - content:'\f165'; + content: "\f165"; } .imgedit-rleft:before { - content:'\f166'; + content: "\f166"; } .imgedit-rright:before { - content:'\f167'; + content: "\f167"; } .imgedit-flipv:before { - content:'\f168'; + content: "\f168"; } .imgedit-fliph:before { - content:'\f169'; + content: "\f169"; } .imgedit-undo:before { - content:'\f171'; + content: "\f171"; } .imgedit-redo:before { - content:'\f172'; + content: "\f172"; } .imgedit-crop-wrap { @@ -633,25 +1031,31 @@ border color while dragging a file over the uploader drop area */ margin: 0 3px 0 8px; } -.imgedit-applyto img { - margin: 0 0 0 8px; +.imgedit-thumbnail-preview { + margin: 10px 0 0 8px; } -.imgedit-group-top { - margin: 5px 0; +.imgedit-thumbnail-preview-caption { + display: block; } -#poststuff .imgedit-group-top h3 { +#poststuff .imgedit-group-top h3, /* Back-compat for pre-4.4 */ +#poststuff .imgedit-group-top h2 { + display: inline-block; + margin: 0; padding: 0; + font-size: 14px; + line-height: 1.4; } -.imgedit-group-top h3 a { +.imgedit-group-top h3 a, /* Back-compat for pre-4.4 */ +.imgedit-group-top h2 a { text-decoration: none; } .imgedit-applyto .imgedit-label { - padding: 2px 0 0; display: block; + padding: .5em 0 0; } .imgedit-help { @@ -659,8 +1063,31 @@ border color while dragging a file over the uploader drop area */ font-style: italic; } -a.imgedit-help-toggle { - text-decoration: none; +/* higher specificity than buttons */ +.image-editor .imgedit-settings .imgedit-help-toggle, +.image-editor .imgedit-settings .imgedit-help-toggle:hover, +.image-editor .imgedit-settings .imgedit-help-toggle:active { + border: 1px solid transparent; + margin: -1px -1px 0 0; + padding: 0; + background: transparent; + color: #0074a2; + font-size: 20px; + line-height: 1; + cursor: pointer; + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; + -webkit-box-shadow: none; + box-shadow: none; +} + +.image-editor .imgedit-settings .imgedit-help-toggle:focus { + color: #0074a2; + border-color: #5b9dd9; + outline: none; + -webkit-box-shadow: 0 0 3px rgba( 0, 115, 170, .8 ); + box-shadow: 0 0 3px rgba( 0, 115, 170, .8 ); } .form-table td.imgedit-response { @@ -668,7 +1095,7 @@ a.imgedit-help-toggle { } .imgedit-submit { - margin: 8px 0; + margin: 8px 0 0; } .imgedit-submit-btn { @@ -677,6 +1104,8 @@ a.imgedit-help-toggle { .imgedit-wrap .nowrap { white-space: nowrap; + font-size: 12px; + line-height: inherit; } span.imgedit-scale-warn { @@ -687,9 +1116,34 @@ span.imgedit-scale-warn { vertical-align: middle; } +.imgedit-save-target { + margin: 8px 0; +} + .imgedit-group { margin-bottom: 8px; - padding: 2px 10px; + padding: 10px; +} + +.imgedit-settings .imgedit-scale input[type="text"], +.imgedit-settings .imgedit-crop-ratio input[type="text"], +.imgedit-settings .imgedit-crop-sel input[type="text"] { + width: 50px; + font-size: 14px; + padding: 3px 5px; +} + +.imgedit-separator { + display: inline-block; + width: 7px; + text-align: center; + vertical-align: middle; + font-size: 13px; + color: #444; +} + +.imgedit-settings .imgedit-scale .button { + margin-bottom: 0; } audio, video { @@ -699,6 +1153,7 @@ audio, video { .mejs-container { width: 100%; + max-width: 100%; } /* =Media Queries @@ -708,10 +1163,9 @@ audio, video { * HiDPI Displays */ @media print, - (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 120dpi) { - .imgedit-wait { + .imgedit-wait:before { background-image: url(../images/spinner-2x.gif); } } @@ -721,4 +1175,105 @@ audio, video { font-size: 14px; line-height: 1.5em; } + + .media-upload-form .media-item.error, + .media-upload-form .media-item .error { + font-size: 13px; + line-height: 1.5; + } + + .media-upload-form .media-item.error { + padding: 1px 10px; + } + + .media-upload-form .media-item .error { + padding: 10px 12px 10px 0; + } + + .imgedit-settings .imgedit-scale input[type="text"], + .imgedit-settings .imgedit-crop-ratio input[type="text"], + .imgedit-settings .imgedit-crop-sel input[type="text"] { + width: 60px; + font-size: 16px; + padding: 6px 10px; + } + + .imgedit-applyto .imgedit-label { + vertical-align: middle; + } +} + +/** + * Media queries for media grid. + */ + +@media only screen and (max-width: 1120px) { + /* override for media-views.css */ + #wp-media-grid .wp-filter .attachment-filters { + max-width: 100%; + } +} + +@media only screen and ( max-width: 782px ) { + .media-frame.mode-select .attachments-browser.fixed .media-toolbar { + top: 46px; + left: 10px; + } +} + +@media only screen and (max-width: 600px) { + .media-frame.mode-select .attachments-browser.fixed .media-toolbar { + top: 0; + } +} + +@media only screen and (max-width: 480px) { + .edit-attachment-frame .media-frame-title { + left: 110px; + } + + .upload-php .media-modal-close, + .edit-attachment-frame .edit-media-header .left, + .edit-attachment-frame .edit-media-header .right { + width: 40px; + height: 40px; + } + + .upload-php .media-modal-close .media-modal-icon { + margin: 9px 10px; + } + + .edit-attachment-frame .edit-media-header .right:before, + .edit-attachment-frame .edit-media-header .left:before { + line-height: 40px !important; + } + + .edit-attachment-frame .edit-media-header .left { + left: 82px; + } + + .edit-attachment-frame .edit-media-header .right { + left: 41px; + } + + .edit-attachment-frame .media-frame-content { + top: 40px; + } + + .edit-attachment-frame .attachment-media-view { + float: none; + height: auto; + width: 100%; + } + + .edit-attachment-frame .attachment-info { + height: auto; + width: 100%; + } +} + +@media only screen and (max-width: 640px), screen and (max-height: 400px) { + .upload-php .mode-grid .media-sidebar{ + max-width: 100%; + } } diff --git a/wp-admin/css/media-rtl.min.css b/wp-admin/css/media-rtl.min.css new file mode 100644 index 0000000..36c906d --- /dev/null +++ b/wp-admin/css/media-rtl.min.css @@ -0,0 +1 @@ +.imgedit-wait,.ui-find-overlay{opacity:.7;filter:alpha(opacity=70)}.media-item .describe{border-collapse:collapse;width:100%;border-top:1px solid #ddd;clear:both;cursor:default}.media-item.media-blank .describe{border:0}.media-item .describe th{vertical-align:top;text-align:right;padding:5px 10px 10px;width:140px}.media-item .describe .align th{padding-top:0}.media-item .media-item-info tr{background-color:transparent}.media-item .describe td{padding:0 0 8px 8px;vertical-align:top}.media-item thead.media-item-info td{padding:4px 10px 0}.media-item .media-item-info .A1B1{padding:0 10px 0 0}.media-item td.savesend{padding-bottom:15px}.media-item .thumbnail{max-height:128px;max-width:128px}#wpbody-content #async-upload-wrap a{display:none}.media-upload-form{margin-top:20px}.media-upload-form td label{margin-left:6px;margin-right:2px}.media-upload-form .align .field label{display:inline;padding:0 23px 0 0;margin:0 3px 0 1em;font-weight:600}.media-upload-form tr.image-size label{margin:0 5px 0 0;font-weight:600}.media-upload-form th.label label{font-weight:600;margin:.5em;font-size:13px}.media-upload-form th.label label span{padding:0 5px}.media-item .describe input[type=text],.media-item .describe textarea{width:460px}.media-item .describe p.help{margin:0;padding:0 5px 0 0}.describe-toggle-off,.describe-toggle-on,.media-item .edit-attachment{display:block;line-height:36px;float:left;margin-left:10px}.media-item .describe-toggle-off,.media-item.open .describe-toggle-on{display:none}.media-item.open .describe-toggle-off{display:block}.js .html-uploader #plupload-upload-ui,.media-item .startclosed,.media-item .startopen{display:none}.media-upload-form .media-item{min-height:36px;margin-bottom:1px;position:relative;width:100%;background:#fff}.media-upload-form .media-item,.media-upload-form .media-item .error{-webkit-box-shadow:0 1px 0 #ddd;box-shadow:0 1px 0 #ddd}#media-items:empty{border:0}.media-item .filename{line-height:36px;overflow:hidden;margin-right:6px}.media-item .pinkynail{float:right;margin:2px 3px 0 10px;max-width:40px;max-height:32px}.media-item .original{position:relative;height:34px}.media-item .progress{float:left;height:22px;margin:7px 6px;width:200px;line-height:2em;padding:0;overflow:hidden;-webkit-border-radius:22px;border-radius:22px;background:#ddd;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.media-item .bar{z-index:9;width:0;height:100%;margin-top:-22px;-webkit-border-radius:22px;border-radius:22px;background-color:#0073aa;-webkit-box-shadow:inset 0 0 2px rgba(0,0,0,.3);box-shadow:inset 0 0 2px rgba(0,0,0,.3)}.media-item .progress .percent{z-index:10;position:relative;width:200px;padding:0;color:#fff;text-align:center;line-height:22px;font-weight:400;text-shadow:0 1px 2px rgba(0,0,0,.2)}.upload-php .fixed .column-parent{width:15%}.js .html-uploader #html-upload-ui{display:block}.media-upload-form .media-item .error,.media-upload-form .media-item.error{width:auto;margin:0 0 1px}.media-upload-form .media-item .error{padding:10px 14px 10px 0}.media-item .error-div a.dismiss{display:block;float:left;margin:0 15px 0 10px}.find-box{background-color:#fff;-webkit-box-shadow:0 3px 6px rgba(0,0,0,.3);box-shadow:0 3px 6px rgba(0,0,0,.3);width:600px;overflow:hidden;margin-right:-300px;position:fixed;top:30px;bottom:30px;right:50%;z-index:100105}.find-box-head{background:#fcfcfc;border-bottom:1px solid #ddd;height:36px;font-size:18px;font-weight:600;line-height:36px;padding:0 16px 0 36px;position:absolute;top:0;right:0;left:0}.find-box-inside{overflow:auto;padding:16px;background-color:#fff;position:absolute;top:37px;bottom:45px;overflow-y:scroll;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.find-box-search{padding-bottom:16px}.find-box-search .spinner{float:none;right:105px;position:absolute}#find-posts-response,.find-box-search{position:relative}#find-posts-input,#find-posts-search{float:right}#find-posts-input{width:140px;height:28px;margin:0 0 0 4px}.widefat .found-radio{padding-left:0;width:16px}#find-posts-close{width:36px;height:36px;position:absolute;top:0;left:0;cursor:pointer;text-align:center;color:#666}#find-posts-close:hover{color:#00a0d2}#find-posts-close:before{font:400 20px/36px dashicons;vertical-align:top;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:"\f158"}.find-box-buttons{padding:8px 16px;background:#fcfcfc;border-top:1px solid #ddd;position:absolute;bottom:0;right:0;left:0}@media screen and (max-width:782px){.find-box-inside{bottom:57px}}@media screen and (max-width:660px){.find-box{top:0;bottom:0;right:0;left:0;margin:0;width:100%}}.ui-find-overlay{position:fixed;top:0;right:0;left:0;bottom:0;background:#000;z-index:100100}ul#dismissed-updates{display:none}form.upgrade{margin-top:8px}form.upgrade .hint{font-style:italic;font-size:85%;margin:-.5em 0 2em}#poststuff .inside .the-tagcloud{margin:5px 0 10px;padding:8px;border:1px solid #ddd;line-height:1.8em;word-spacing:3px}.drag-drop #drag-drop-area{border:4px dashed #b4b9be;height:200px}.drag-drop .drag-drop-inside{margin:70px auto 0;width:250px}.drag-drop-inside p{color:#a0a5aa;font-size:14px;margin:5px 0;display:none}.drag-drop .drag-drop-inside p{text-align:center}.drag-drop-inside p.drag-drop-info{font-size:20px}.drag-drop .drag-drop-inside p,.drag-drop-inside p.drag-drop-buttons{display:block}.media-frame.mode-grid .media-frame-menu,.media-frame.mode-grid .media-frame-router,.media-frame.mode-grid .media-frame-title,.upload-php .mode-grid .hide-sidebar .media-sidebar{display:none}.drag-drop.drag-over #drag-drop-area{border-color:#83b4d8}#plupload-upload-ui{position:relative}.media-frame.mode-grid,.media-frame.mode-grid .attachments-browser .attachments,.media-frame.mode-grid .media-frame-content,.media-frame.mode-grid .uploader-inline-content{position:static}.media-frame.mode-grid .media-frame-content{background-color:transparent;border:none}.upload-php .mode-grid .media-sidebar{position:relative;width:auto;margin-bottom:16px;padding:0 16px;border-right:4px solid #dd3d36;-webkit-box-shadow:0 1px 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 1px 0 rgba(0,0,0,.1);background-color:#fff}.upload-php .mode-grid .media-sidebar .media-uploader-status{border-bottom:none;padding-bottom:0;max-width:100%}.upload-php .mode-grid .media-sidebar .upload-error{margin:12px 0;padding:4px 0 0;border:none;-webkit-box-shadow:none;box-shadow:none;background:0 0}.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors{top:-10px;left:-14px;padding:10px}.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:before{content:"\f153";display:block;font:400 16px/1 dashicons;color:#b4b9be}.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:focus:before,.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:hover:before{color:#c00}.upload-php .mode-grid .media-sidebar .media-uploader-status.errors h2,.upload-php .mode-grid .media-sidebar .media-uploader-status.errors h3{display:none}.media-frame.mode-grid .uploader-inline{position:relative;top:auto;left:auto;right:auto;bottom:auto;padding-top:0;margin-top:0;border:4px dashed #b4b9be}.media-frame.mode-select .attachments-browser.fixed .attachments{position:relative;top:94px;padding-bottom:94px}.media-frame.mode-grid .attachment.details:focus,.media-frame.mode-grid .attachment:focus,.media-frame.mode-grid .selected.attachment:focus{-webkit-box-shadow:inset 0 0 2px 3px #f1f1f1,inset 0 0 0 7px #5b9dd9;box-shadow:inset 0 0 2px 3px #f1f1f1,inset 0 0 0 7px #5b9dd9;outline:0}.media-frame.mode-grid .selected.attachment{-webkit-box-shadow:inset 0 0 0 5px #f1f1f1,inset 0 0 0 7px #ccc;box-shadow:inset 0 0 0 5px #f1f1f1,inset 0 0 0 7px #ccc}.media-frame.mode-grid .attachment.details{-webkit-box-shadow:inset 0 0 0 3px #f1f1f1,inset 0 0 0 7px #1e8cbe;box-shadow:inset 0 0 0 3px #f1f1f1,inset 0 0 0 7px #1e8cbe}.media-frame.mode-grid.mode-select .attachment .thumbnail{opacity:.65}.media-frame.mode-select .attachment.selected .thumbnail{opacity:1}.media-frame.mode-grid .media-toolbar{margin-bottom:15px;height:auto}.media-frame.mode-grid .media-toolbar select{margin:0 0 0 10px;font-size:14px}.media-frame.mode-grid.mode-edit .media-toolbar-secondary>.select-mode-toggle-button{margin:0 0 0 8px;vertical-align:middle}.media-frame.mode-grid .attachments-browser .bulk-select{display:inline-block;margin:0 0 0 10px}.media-frame.mode-grid .search{margin-top:0}.media-frame.mode-grid .spinner{margin-top:16px}.attachments-browser .media-toolbar-secondary>.media-button{margin-left:10px}.media-frame.mode-select .attachments-browser.fixed .media-toolbar{position:fixed;top:32px;right:auto;left:20px;margin-top:0}.media-frame.mode-grid .attachments-browser{padding:0}.media-frame.mode-grid .attachments-browser .attachments{padding:2px}.media-frame.mode-grid .attachments-browser .no-media{color:#666;font-size:18px;font-style:normal;margin:0;padding:100px 0 0;text-align:center}.edit-attachment-frame{display:block;height:100%;width:100%}.edit-attachment-frame .edit-media-header{overflow:hidden}.upload-php .media-modal-close .media-modal-icon:before{content:"\f335";font-size:22px}.edit-attachment-frame .edit-media-header .left,.edit-attachment-frame .edit-media-header .right,.upload-php .media-modal-close{cursor:pointer;color:#72777c;background-color:transparent;height:50px;width:50px;padding:0;position:absolute;text-align:center;border:0;border-right:1px solid #ddd;-webkit-transition:color .1s ease-in-out,background .1s ease-in-out;transition:color .1s ease-in-out,background .1s ease-in-out}.upload-php .media-modal-close{top:0;left:0}.edit-attachment-frame .edit-media-header .left{left:102px}.edit-attachment-frame .edit-media-header .right{left:51px}.edit-attachment-frame .media-frame-title{right:0;left:150px}.edit-attachment-frame .edit-media-header .left:before,.edit-attachment-frame .edit-media-header .right:before{font:400 20px/50px dashicons!important;display:inline;font-weight:300}.edit-attachment-frame .edit-media-header .left:focus,.edit-attachment-frame .edit-media-header .left:hover,.edit-attachment-frame .edit-media-header .right:focus,.edit-attachment-frame .edit-media-header .right:hover,.upload-php .media-modal-close:focus,.upload-php .media-modal-close:hover{background:#ddd;border-color:#ccc;color:#000;outline:0;-webkit-box-shadow:none;box-shadow:none}.upload-php .media-modal-close:focus .media-modal-icon:before,.upload-php .media-modal-close:hover .media-modal-icon:before{color:#000}.edit-attachment-frame .edit-media-header .left:before,.rtl .edit-attachment-frame .edit-media-header .right:before{content:"\f345"}.edit-attachment-frame .edit-media-header .right:before,.rtl .edit-attachment-frame .edit-media-header .left:before{content:"\f341"}.edit-attachment-frame .edit-media-header .left.disabled,.edit-attachment-frame .edit-media-header .left.disabled:hover,.edit-attachment-frame .edit-media-header .right.disabled,.edit-attachment-frame .edit-media-header .right.disabled:hover{color:#ccc;background:inherit;cursor:default;pointer-events:none}.edit-attachment-frame .media-frame-content,.edit-attachment-frame .media-frame-router{right:0}.edit-attachment-frame .media-frame-content{border-bottom:none;bottom:0;top:50px}.edit-attachment-frame .attachment-details{position:absolute;overflow:auto;top:0;bottom:0;left:0;right:0;-webkit-box-shadow:inset 0 4px 4px -4px rgba(0,0,0,.1);box-shadow:inset 0 4px 4px -4px rgba(0,0,0,.1)}.edit-attachment-frame .attachment-media-view{float:right;width:65%;height:100%}.edit-attachment-frame .attachment-media-view .thumbnail{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:16px;height:100%}.edit-attachment-frame .attachment-media-view .details-image{display:block;margin-bottom:16px;max-width:100%;max-height:90%;max-height:-webkit-calc(100% - 42px);max-height:calc(100% - 42px)}.edit-attachment-frame .wp-media-wrapper{margin-bottom:12px}.edit-attachment-frame input,.edit-attachment-frame textarea{padding:6px 8px;line-height:16px}.edit-attachment-frame .attachment-info{overflow:auto;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin-bottom:0;padding:12px 16px 0;width:35%;height:100%;-webkit-box-shadow:inset 0 4px 4px -4px rgba(0,0,0,.1);box-shadow:inset 0 4px 4px -4px rgba(0,0,0,.1);border-bottom:0;border-right:1px solid #ddd;background:#f3f3f3}.edit-attachment-frame .attachment-info .details,.edit-attachment-frame .attachment-info .settings{position:relative;overflow:hidden;float:none;margin-bottom:15px;padding-bottom:15px;border-bottom:1px solid #ddd}.edit-attachment-frame .attachment-info .filename{font-weight:400;color:#666}.edit-attachment-frame .attachment-info .thumbnail{margin-bottom:12px}.attachment-info .actions{margin-bottom:16px}.attachment-info .actions a{display:inline;text-decoration:none}.wp_attachment_details label[for=content]{font-size:13px;line-height:1.5;margin:1em 0}.wp_attachment_details #attachment_caption{height:4em}.describe .image-editor{vertical-align:top}.imgedit-wrap{position:relative;padding-top:10px}.imgedit-settings fieldset,.imgedit-settings p{margin:8px 0}.imgedit-settings legend{margin-bottom:5px}.describe .imgedit-wrap .imgedit-settings{padding:0 5px}.wp_attachment_holder div.updated{margin-top:0}.wp_attachment_holder .imgedit-wrap>div{height:auto}.wp_attachment_holder .imgedit-wrap .imgedit-panel-content{padding:3px 0 0 16px;float:right}.wp_attachment_holder .imgedit-wrap .imgedit-settings{float:left;width:250px}.imgedit-settings input{margin-top:0;vertical-align:middle}.imgedit-wait{position:absolute;top:0;bottom:0;width:100%;background:#fff;display:none}.imgedit-wait:before{content:"";display:block;width:20px;height:20px;position:absolute;right:50%;top:50%;margin:-10px -10px 0 0;background:url(../images/spinner.gif) center no-repeat;-webkit-background-size:20px 20px;background-size:20px 20px;-webkit-transform:translateZ(0);transform:translateZ(0)}.no-float{float:none}.A1B1 .button,.A1B1 .spinner,.wp_attachment_image .button,.wp_attachment_image .spinner{float:right}.imgedit-settings .disabled,.media-disabled{color:#a0a5aa}.A1B1{overflow:hidden}.no-js .wp_attachment_image .button{display:none}.imgedit-menu{min-width:300px;margin:0 0 12px}.imgedit-menu .note-no-rotate{clear:both;margin:0;padding:1em 0 0}.image-editor .imgedit-menu .button{float:right;width:32px;height:32px;margin:0 0 0 8px;padding:0;background:#f1f1f1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;line-height:16px;color:#72777c}.imgedit-menu .button:before{font:400 20px/1 dashicons;speak:none;vertical-align:middle}.imgedit-menu .button.disabled{border-color:#ccc;background-color:#ddd;color:#72777c;filter:alpha(opacity=50);opacity:.5;cursor:default}.imgedit-crop:before{content:"\f165"}.imgedit-rleft:before{content:"\f166"}.imgedit-rright:before{content:"\f167"}.imgedit-flipv:before{content:"\f168"}.imgedit-fliph:before{content:"\f169"}.imgedit-undo:before{content:"\f171"}.imgedit-redo:before{content:"\f172"}.imgedit-crop-wrap{position:relative}.imgedit-crop{margin:0 0 0 8px}.imgedit-rleft{margin:0 3px}.imgedit-rright{margin:0 3px 0 8px}.imgedit-flipv{margin:0 3px}.imgedit-fliph{margin:0 3px 0 8px}.imgedit-undo{margin:0 3px}.imgedit-redo{margin:0 3px 0 8px}.imgedit-thumbnail-preview{margin:10px 0 0 8px}.imgedit-thumbnail-preview-caption{display:block}#poststuff .imgedit-group-top h2,#poststuff .imgedit-group-top h3{display:inline-block;margin:0;padding:0;font-size:14px;line-height:1.4}.imgedit-group-top h2 a,.imgedit-group-top h3 a{text-decoration:none}.imgedit-applyto .imgedit-label{display:block;padding:.5em 0 0}.imgedit-help{display:none;font-style:italic}.image-editor .imgedit-settings .imgedit-help-toggle,.image-editor .imgedit-settings .imgedit-help-toggle:active,.image-editor .imgedit-settings .imgedit-help-toggle:hover{border:1px solid transparent;margin:-1px -1px 0 0;padding:0;background:0 0;color:#0074a2;font-size:20px;line-height:1;cursor:pointer;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-box-shadow:none;box-shadow:none}.image-editor .imgedit-settings .imgedit-help-toggle:focus{color:#0074a2;border-color:#5b9dd9;outline:0;-webkit-box-shadow:0 0 3px rgba(0,115,170,.8);box-shadow:0 0 3px rgba(0,115,170,.8)}.form-table td.imgedit-response{padding:0}.imgedit-submit{margin:8px 0 0}.imgedit-submit-btn{margin-right:20px}.imgedit-wrap .nowrap{white-space:nowrap;font-size:12px;line-height:inherit}span.imgedit-scale-warn{color:red;font-size:20px;font-style:normal;visibility:hidden;vertical-align:middle}.imgedit-save-target{margin:8px 0}.imgedit-group{margin-bottom:8px;padding:10px}.imgedit-settings .imgedit-crop-ratio input[type=text],.imgedit-settings .imgedit-crop-sel input[type=text],.imgedit-settings .imgedit-scale input[type=text]{width:50px;font-size:14px;padding:3px 5px}.imgedit-separator{display:inline-block;width:7px;text-align:center;vertical-align:middle;font-size:13px;color:#444}.imgedit-settings .imgedit-scale .button{margin-bottom:0}audio,video{display:inline-block;max-width:100%}.mejs-container{width:100%;max-width:100%}@media print,(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.imgedit-wait:before{background-image:url(../images/spinner-2x.gif)}}@media screen and (max-width:782px){.wp_attachment_details label[for=content]{font-size:14px;line-height:1.5em}.media-upload-form .media-item .error,.media-upload-form .media-item.error{font-size:13px;line-height:1.5}.media-upload-form .media-item.error{padding:1px 10px}.media-upload-form .media-item .error{padding:10px 12px 10px 0}.imgedit-settings .imgedit-crop-ratio input[type=text],.imgedit-settings .imgedit-crop-sel input[type=text],.imgedit-settings .imgedit-scale input[type=text]{width:60px;font-size:16px;padding:6px 10px}.imgedit-applyto .imgedit-label{vertical-align:middle}}@media only screen and (max-width:1120px){#wp-media-grid .wp-filter .attachment-filters{max-width:100%}}@media only screen and (max-width:782px){.media-frame.mode-select .attachments-browser.fixed .media-toolbar{top:46px;left:10px}}@media only screen and (max-width:600px){.media-frame.mode-select .attachments-browser.fixed .media-toolbar{top:0}}@media only screen and (max-width:480px){.edit-attachment-frame .media-frame-title{left:110px}.edit-attachment-frame .edit-media-header .left,.edit-attachment-frame .edit-media-header .right,.upload-php .media-modal-close{width:40px;height:40px}.upload-php .media-modal-close .media-modal-icon{margin:9px 10px}.edit-attachment-frame .edit-media-header .left:before,.edit-attachment-frame .edit-media-header .right:before{line-height:40px!important}.edit-attachment-frame .edit-media-header .left{left:82px}.edit-attachment-frame .edit-media-header .right{left:41px}.edit-attachment-frame .media-frame-content{top:40px}.edit-attachment-frame .attachment-media-view{float:none;height:auto;width:100%}.edit-attachment-frame .attachment-info{height:auto;width:100%}}@media only screen and (max-width:640px),screen and (max-height:400px){.upload-php .mode-grid .media-sidebar{max-width:100%}} \ No newline at end of file diff --git a/wp-admin/css/media.css b/wp-admin/css/media.css index e6bbdcb..71424c9 100644 --- a/wp-admin/css/media.css +++ b/wp-admin/css/media.css @@ -5,7 +5,7 @@ .media-item .describe { border-collapse: collapse; width: 100%; - border-top: 1px solid #dfdfdf; + border-top: 1px solid #ddd; clear: both; cursor: default; } @@ -102,6 +102,7 @@ display: block; line-height: 36px; float: right; + margin-right: 10px; } .media-item .describe-toggle-off, @@ -113,19 +114,18 @@ display: block; } -#media-items .media-item { - border-bottom: 1px solid #dfdfdf; +.media-upload-form .media-item { min-height: 36px; + margin-bottom: 1px; position: relative; width: 100%; + background: #fff; } -#media-items { - width: 623px; -} - -.media-new-php #media-items { - margin: 1em 0; +.media-upload-form .media-item, +.media-upload-form .media-item .error { + -webkit-box-shadow: 0 1px 0 #ddd; + box-shadow: 0 1px 0 #ddd; } #media-items:empty { @@ -135,15 +135,12 @@ .media-item .filename { line-height: 36px; overflow: hidden; -} - -.media-item .error-div { - padding-left: 10px; + margin-left: 6px; } .media-item .pinkynail { float: left; - margin: 2px 10px 0 0; + margin: 2px 10px 0 3px; max-width: 40px; max-height: 32px; } @@ -161,17 +158,16 @@ .media-item .progress { float: right; height: 22px; - margin: 7px 0 0; + margin: 7px 6px; width: 200px; line-height: 2em; padding: 0; overflow: hidden; - margin-bottom: 2px; -webkit-border-radius: 22px; border-radius: 22px; background: #ddd; - -webkit-box-shadow: inset 0px 1px 2px rgba(0,0,0,0.1); - box-shadow: inset 0px 1px 2px rgba(0,0,0,0.1); + -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1); + box-shadow: inset 0 1px 2px rgba(0,0,0,0.1); } .media-item .bar { @@ -181,7 +177,7 @@ margin-top: -22px; -webkit-border-radius: 22px; border-radius: 22px; - background-color: #0074a2; + background-color: #0073aa; -webkit-box-shadow: inset 0 0 2px rgba(0,0,0,0.3); box-shadow: inset 0 0 2px rgba(0,0,0,0.3); } @@ -195,7 +191,7 @@ text-align: center; line-height: 22px; font-weight: 400; - text-shadow: 0px 1px 2px rgba(0,0,0,0.2); + text-shadow: 0 1px 2px rgba(0,0,0,0.2); } .upload-php .fixed .column-parent { @@ -210,22 +206,20 @@ display: block; } -.media-upload-form .media-item.error { - margin: 0; - padding: 0; +.media-upload-form .media-item.error, +.media-upload-form .media-item .error { + width: auto; + margin: 0 0 1px 0; } -.media-upload-form .media-item.error p, -.media-item .error-div { - line-height: 16px; - margin: 5px 10px; - padding: 0; +.media-upload-form .media-item .error { + padding: 10px 0 10px 14px; } .media-item .error-div a.dismiss { display: block; float: right; - margin: 5px 4px 0 15px; + margin: 0 10px 0 15px; } /*------------------------------------------------------------------------------ @@ -248,7 +242,7 @@ .find-box-head { background: #fcfcfc; - border-bottom: 1px solid #dfdfdf; + border-bottom: 1px solid #ddd; height: 36px; font-size: 18px; font-weight: 600; @@ -280,9 +274,13 @@ .find-box-search .spinner { float: none; - left: 125px; + left: 105px; position: absolute; - top: 18px; +} + +.find-box-search, +#find-posts-response { + position: relative; /* RTL fix, #WP28010 */ } #find-posts-input, @@ -313,22 +311,22 @@ } #find-posts-close:hover { - color: #2ea2cc; + color: #00a0d2; } #find-posts-close:before { - font: normal 20px/36px 'dashicons'; + font: normal 20px/36px dashicons; vertical-align: top; speak: none; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - content: '\f158'; + content: "\f158"; } .find-box-buttons { padding: 8px 16px; background: #fcfcfc; - border-top: 1px solid #dfdfdf; + border-top: 1px solid #ddd; position: absolute; bottom: 0; left: 0; @@ -386,12 +384,10 @@ form.upgrade .hint { border: 1px solid #ddd; line-height: 1.8em; word-spacing: 3px; - -webkit-border-radius: 6px; - border-radius: 6px; } .drag-drop #drag-drop-area { - border: 4px dashed #bbb; + border: 4px dashed #b4b9be; height: 200px; } @@ -401,7 +397,7 @@ form.upgrade .hint { } .drag-drop-inside p { - color: #aaa; + color: #a0a5aa; font-size: 14px; margin: 5px 0; display: none; @@ -433,6 +429,393 @@ border color while dragging a file over the uploader drop area */ position: relative; } +/** + * Media Library grid view + */ + +.media-frame.mode-grid, +.media-frame.mode-grid .media-frame-content, +.media-frame.mode-grid .attachments-browser .attachments, +.media-frame.mode-grid .uploader-inline-content { + position: static; +} + +/* Regions we don't use at all */ +.media-frame.mode-grid .media-frame-title, +.media-frame.mode-grid .media-frame-router, +.media-frame.mode-grid .media-frame-menu { + display: none; +} + +.media-frame.mode-grid .media-frame-content { + background-color: transparent; + border: none; +} + +.upload-php .mode-grid .media-sidebar { + position: relative; + width: auto; + margin-bottom: 16px; + padding: 0 16px; + border-left: 4px solid #dd3d36; + -webkit-box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1); + background-color: #fff; +} + +.upload-php .mode-grid .hide-sidebar .media-sidebar { + display: none; +} + +.upload-php .mode-grid .media-sidebar .media-uploader-status { + border-bottom: none; + padding-bottom: 0; + max-width: 100%; +} + +.upload-php .mode-grid .media-sidebar .upload-error { + margin: 12px 0; + padding: 4px 0 0; + border: none; + -webkit-box-shadow: none; + box-shadow: none; + background: none; +} + +.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors { + top: -10px; + right: -14px; + padding: 10px; +} + +.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:before { + content: "\f153"; + display: block; + font: normal 16px/1 dashicons; + color: #b4b9be; +} + +.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:focus:before, +.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:hover:before { + color: #c00; +} + +.upload-php .mode-grid .media-sidebar .media-uploader-status.errors h3, /* Back-compat for pre-4.4 */ +.upload-php .mode-grid .media-sidebar .media-uploader-status.errors h2 { + display: none; +} + +.media-frame.mode-grid .uploader-inline { + position: relative; + top: auto; + right: auto; + left: auto; + bottom: auto; + padding-top: 0; + margin-top: 0; + border: 4px dashed #b4b9be; +} + +.media-frame.mode-select .attachments-browser.fixed .attachments { + position: relative; + top: 94px; /* prevent jumping up when the toolbar becomes fixed */ + padding-bottom: 94px; /* offset for above so the bottom doesn't get cut off */ +} + +.media-frame.mode-grid .attachment:focus, +.media-frame.mode-grid .selected.attachment:focus, +.media-frame.mode-grid .attachment.details:focus { + -webkit-box-shadow: + inset 0 0 2px 3px #f1f1f1, + inset 0 0 0 7px #5b9dd9; + box-shadow: + inset 0 0 2px 3px #f1f1f1, + inset 0 0 0 7px #5b9dd9; + outline: none; +} + +.media-frame.mode-grid .selected.attachment { + -webkit-box-shadow: + inset 0 0 0 5px #f1f1f1, + inset 0 0 0 7px #ccc; + box-shadow: + inset 0 0 0 5px #f1f1f1, + inset 0 0 0 7px #ccc; +} + +.media-frame.mode-grid .attachment.details { + -webkit-box-shadow: + inset 0 0 0 3px #f1f1f1, + inset 0 0 0 7px #1e8cbe; + box-shadow: + inset 0 0 0 3px #f1f1f1, + inset 0 0 0 7px #1e8cbe; +} + +.media-frame.mode-grid.mode-select .attachment .thumbnail { + opacity: 0.65; +} + +.media-frame.mode-select .attachment.selected .thumbnail { + opacity: 1; +} + +.media-frame.mode-grid .media-toolbar { + margin-bottom: 15px; + height: auto; +} + +.media-frame.mode-grid .media-toolbar select { + margin: 0 10px 0 0; + font-size: 14px; +} + +.media-frame.mode-grid.mode-edit .media-toolbar-secondary > .select-mode-toggle-button { + margin: 0 8px 0 0; + vertical-align: middle; +} + +.media-frame.mode-grid .attachments-browser .bulk-select { + display: inline-block; + margin: 0 10px 0 0; +} + +.media-frame.mode-grid .search { + margin-top: 0; +} + +.media-frame.mode-grid .spinner { + margin-top: 16px; +} + +.attachments-browser .media-toolbar-secondary > .media-button { + margin-right: 10px; +} + +.media-frame.mode-select .attachments-browser.fixed .media-toolbar { + position: fixed; + top: 32px; + left: auto; + right: 20px; + margin-top: 0; +} + +.media-frame.mode-grid .attachments-browser { + padding: 0; +} + +.media-frame.mode-grid .attachments-browser .attachments { + padding: 2px; +} + +.media-frame.mode-grid .attachments-browser .no-media { + color: #666; /* same as no plugins and no themes */ + font-size: 18px; + font-style: normal; + margin: 0; + padding: 100px 0 0; + text-align: center; +} + +/** + * Attachment details modal + */ + +.edit-attachment-frame { + display: block; + height: 100%; + width: 100%; +} + +.edit-attachment-frame .edit-media-header { + overflow: hidden; +} + +.upload-php .media-modal-close .media-modal-icon:before { + content: "\f335"; + font-size: 22px; +} + +.upload-php .media-modal-close, +.edit-attachment-frame .edit-media-header .left, +.edit-attachment-frame .edit-media-header .right { + cursor: pointer; + color: #72777c; + background-color: transparent; + height: 50px; + width: 50px; + padding: 0; + position: absolute; + text-align: center; + border: 0; + border-left: 1px solid #ddd; + -webkit-transition: color .1s ease-in-out, background .1s ease-in-out; + transition: color .1s ease-in-out, background .1s ease-in-out; +} + +.upload-php .media-modal-close { + top: 0; + right: 0; +} + +.edit-attachment-frame .edit-media-header .left { + right: 102px; +} + +.edit-attachment-frame .edit-media-header .right { + right: 51px; +} + +.edit-attachment-frame .media-frame-title { + left: 0; + right: 150px; /* leave space for prev/next/close */ +} + +.edit-attachment-frame .edit-media-header .right:before, +.edit-attachment-frame .edit-media-header .left:before { + font: normal 20px/50px dashicons !important; + display: inline; + font-weight: 300; +} + +.upload-php .media-modal-close:hover, +.upload-php .media-modal-close:focus, +.edit-attachment-frame .edit-media-header .left:hover, +.edit-attachment-frame .edit-media-header .right:hover, +.edit-attachment-frame .edit-media-header .left:focus, +.edit-attachment-frame .edit-media-header .right:focus { + background: #ddd; + border-color: #ccc; + color: #000; + outline: none; + -webkit-box-shadow: none; + box-shadow: none; +} + +.upload-php .media-modal-close:focus .media-modal-icon:before, +.upload-php .media-modal-close:hover .media-modal-icon:before { + color: #000; +} + +.edit-attachment-frame .edit-media-header .left:before, +.rtl .edit-attachment-frame .edit-media-header .right:before { + content: "\f341"; +} + +.edit-attachment-frame .edit-media-header .right:before, +.rtl .edit-attachment-frame .edit-media-header .left:before { + content: "\f345"; +} + +.edit-attachment-frame .edit-media-header .left.disabled, +.edit-attachment-frame .edit-media-header .right.disabled, +.edit-attachment-frame .edit-media-header .left.disabled:hover, +.edit-attachment-frame .edit-media-header .right.disabled:hover { + color: #ccc; + background: inherit; + cursor: default; + pointer-events: none; +} + +.edit-attachment-frame .media-frame-content, +.edit-attachment-frame .media-frame-router { + left: 0; +} + +.edit-attachment-frame .media-frame-content { + border-bottom: none; + bottom: 0; + top: 50px; +} + +.edit-attachment-frame .attachment-details { + position: absolute; + overflow: auto; + top: 0; + bottom: 0; + right: 0; + left: 0; + -webkit-box-shadow: inset 0px 4px 4px -4px rgba(0, 0, 0, 0.1); + box-shadow: inset 0px 4px 4px -4px rgba(0, 0, 0, 0.1); +} + +.edit-attachment-frame .attachment-media-view { + float: left; + width: 65%; + height: 100%; +} + +.edit-attachment-frame .attachment-media-view .thumbnail { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + padding: 16px; + height: 100%; +} + +.edit-attachment-frame .attachment-media-view .details-image { + display: block; + margin-bottom: 16px; + max-width: 100%; + max-height: 90%; + max-height: -webkit-calc( 100% - 42px ); + max-height: calc( 100% - 42px ); /* leave space for actions underneath */ +} + +.edit-attachment-frame .wp-media-wrapper { + margin-bottom: 12px; +} + +.edit-attachment-frame input, +.edit-attachment-frame textarea { + padding: 6px 8px; + line-height: 16px; +} + +.edit-attachment-frame .attachment-info { + overflow: auto; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + margin-bottom: 0; + padding: 12px 16px 0; + width: 35%; + height: 100%; + -webkit-box-shadow: inset 0px 4px 4px -4px rgba(0, 0, 0, 0.1); + box-shadow: inset 0px 4px 4px -4px rgba(0, 0, 0, 0.1); + border-bottom: 0; + border-left: 1px solid #ddd; + background: #f3f3f3; +} + +.edit-attachment-frame .attachment-info .details, +.edit-attachment-frame .attachment-info .settings { + position: relative; /* RTL fix, #WP29352 */ + overflow: hidden; + float: none; + margin-bottom: 15px; + padding-bottom: 15px; + border-bottom: 1px solid #ddd; +} + +.edit-attachment-frame .attachment-info .filename { + font-weight: normal; + color: #666; +} + +.edit-attachment-frame .attachment-info .thumbnail { + margin-bottom: 12px; +} + +.attachment-info .actions { + margin-bottom: 16px; +} + +.attachment-info .actions a { + display: inline; + text-decoration: none; +} + /*------------------------------------------------------------------------------ 14.2 - Image Editor @@ -454,10 +837,16 @@ border color while dragging a file over the uploader drop area */ .imgedit-wrap { position: relative; + padding-top: 10px; } -.imgedit-settings p { - margin: 8px 0 0; +.imgedit-settings p, +.imgedit-settings fieldset { + margin: 8px 0; +} + +.imgedit-settings legend { + margin-bottom: 5px; } .describe .imgedit-wrap .imgedit-settings { @@ -470,13 +859,11 @@ border color while dragging a file over the uploader drop area */ .wp_attachment_holder .imgedit-wrap > div { height: auto; - overflow: hidden; } .wp_attachment_holder .imgedit-wrap .imgedit-panel-content { - padding-right: 16px; - width: auto; - overflow: hidden; + padding: 3px 16px 0 0; + float: left; } .wp_attachment_holder .imgedit-wrap .imgedit-settings { @@ -492,26 +879,41 @@ border color while dragging a file over the uploader drop area */ .imgedit-wait { position: absolute; top: 0; - background: #fff url(../images/spinner.gif) no-repeat center; - -webkit-background-size: 20px 20px; - background-size: 20px 20px; + bottom: 0; + width: 100%; + background: #fff; opacity: 0.7; filter: alpha(opacity=70); - width: 100%; - height: 500px; display: none; } +.imgedit-wait:before { + content: ""; + display: block; + width: 20px; + height: 20px; + position: absolute; + left: 50%; + top: 50%; + margin: -10px 0 0 -10px; + background: transparent url(../images/spinner.gif) no-repeat center; + -webkit-background-size: 20px 20px; + background-size: 20px 20px; + -webkit-transform: translateZ(0); + transform: translateZ(0); +} + .no-float { float: none; } .media-disabled, -.imgedit-settings .disabled { - color: grey; +.imgedit-settings .disabled { + /* WCAG 1.4.3 Text or images of text that are part of an inactive user + interface component ... have no contrast requirement. */ + color: #a0a5aa; } -.wp_attachment_image, .A1B1 { overflow: hidden; } @@ -528,77 +930,73 @@ border color while dragging a file over the uploader drop area */ .wp_attachment_image .spinner, .A1B1 .spinner { float: left; - padding: 0 0 4px 0; - vertical-align: bottom; } .imgedit-menu { - margin: 0 0 12px; min-width: 300px; + margin: 0 0 12px; } -.imgedit-menu div { +.imgedit-menu .note-no-rotate { + clear: both; + margin: 0; + padding: 1em 0 0; +} + +.image-editor .imgedit-menu .button { float: left; width: 32px; - border: 1px solid #d5d5d5; - background: #f1f1f1; - margin: 0 8px 0 0; height: 32px; + margin: 0 8px 0 0; + padding: 0; + background: #f1f1f1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - text-align: center; - line-height: 28px; - color: #777; - cursor: pointer; + line-height: 16px; + color: #72777c; } -.imgedit-menu div:before { - font: normal 20px/1 'dashicons'; +.imgedit-menu .button:before { + font: normal 20px/1 dashicons; speak: none; vertical-align: middle; } -.imgedit-menu div:hover { - border-color: #c1c1c1; - background-color: #eaeaea; - color: #333; -} - -.imgedit-menu div.disabled { +.imgedit-menu .button.disabled { border-color: #ccc; background-color: #ddd; - color: #777; + color: #72777c; filter: alpha(opacity=50); opacity: 0.5; cursor: default; } .imgedit-crop:before { - content:'\f165'; + content: "\f165"; } .imgedit-rleft:before { - content:'\f166'; + content: "\f166"; } .imgedit-rright:before { - content:'\f167'; + content: "\f167"; } .imgedit-flipv:before { - content:'\f168'; + content: "\f168"; } .imgedit-fliph:before { - content:'\f169'; + content: "\f169"; } .imgedit-undo:before { - content:'\f171'; + content: "\f171"; } .imgedit-redo:before { - content:'\f172'; + content: "\f172"; } .imgedit-crop-wrap { @@ -633,25 +1031,31 @@ border color while dragging a file over the uploader drop area */ margin: 0 8px 0 3px; } -.imgedit-applyto img { - margin: 0 8px 0 0; +.imgedit-thumbnail-preview { + margin: 10px 8px 0 0; } -.imgedit-group-top { - margin: 5px 0; +.imgedit-thumbnail-preview-caption { + display: block; } -#poststuff .imgedit-group-top h3 { +#poststuff .imgedit-group-top h3, /* Back-compat for pre-4.4 */ +#poststuff .imgedit-group-top h2 { + display: inline-block; + margin: 0; padding: 0; + font-size: 14px; + line-height: 1.4; } -.imgedit-group-top h3 a { +.imgedit-group-top h3 a, /* Back-compat for pre-4.4 */ +.imgedit-group-top h2 a { text-decoration: none; } .imgedit-applyto .imgedit-label { - padding: 2px 0 0; display: block; + padding: .5em 0 0; } .imgedit-help { @@ -659,8 +1063,31 @@ border color while dragging a file over the uploader drop area */ font-style: italic; } -a.imgedit-help-toggle { - text-decoration: none; +/* higher specificity than buttons */ +.image-editor .imgedit-settings .imgedit-help-toggle, +.image-editor .imgedit-settings .imgedit-help-toggle:hover, +.image-editor .imgedit-settings .imgedit-help-toggle:active { + border: 1px solid transparent; + margin: -1px 0 0 -1px; + padding: 0; + background: transparent; + color: #0074a2; + font-size: 20px; + line-height: 1; + cursor: pointer; + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; + -webkit-box-shadow: none; + box-shadow: none; +} + +.image-editor .imgedit-settings .imgedit-help-toggle:focus { + color: #0074a2; + border-color: #5b9dd9; + outline: none; + -webkit-box-shadow: 0 0 3px rgba( 0, 115, 170, .8 ); + box-shadow: 0 0 3px rgba( 0, 115, 170, .8 ); } .form-table td.imgedit-response { @@ -668,7 +1095,7 @@ a.imgedit-help-toggle { } .imgedit-submit { - margin: 8px 0; + margin: 8px 0 0; } .imgedit-submit-btn { @@ -677,6 +1104,8 @@ a.imgedit-help-toggle { .imgedit-wrap .nowrap { white-space: nowrap; + font-size: 12px; + line-height: inherit; } span.imgedit-scale-warn { @@ -687,9 +1116,34 @@ span.imgedit-scale-warn { vertical-align: middle; } +.imgedit-save-target { + margin: 8px 0; +} + .imgedit-group { margin-bottom: 8px; - padding: 2px 10px; + padding: 10px; +} + +.imgedit-settings .imgedit-scale input[type="text"], +.imgedit-settings .imgedit-crop-ratio input[type="text"], +.imgedit-settings .imgedit-crop-sel input[type="text"] { + width: 50px; + font-size: 14px; + padding: 3px 5px; +} + +.imgedit-separator { + display: inline-block; + width: 7px; + text-align: center; + vertical-align: middle; + font-size: 13px; + color: #444; +} + +.imgedit-settings .imgedit-scale .button { + margin-bottom: 0; } audio, video { @@ -699,6 +1153,7 @@ audio, video { .mejs-container { width: 100%; + max-width: 100%; } /* =Media Queries @@ -708,10 +1163,9 @@ audio, video { * HiDPI Displays */ @media print, - (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 120dpi) { - .imgedit-wait { + .imgedit-wait:before { background-image: url(../images/spinner-2x.gif); } } @@ -721,4 +1175,105 @@ audio, video { font-size: 14px; line-height: 1.5em; } + + .media-upload-form .media-item.error, + .media-upload-form .media-item .error { + font-size: 13px; + line-height: 1.5; + } + + .media-upload-form .media-item.error { + padding: 1px 10px; + } + + .media-upload-form .media-item .error { + padding: 10px 0 10px 12px; + } + + .imgedit-settings .imgedit-scale input[type="text"], + .imgedit-settings .imgedit-crop-ratio input[type="text"], + .imgedit-settings .imgedit-crop-sel input[type="text"] { + width: 60px; + font-size: 16px; + padding: 6px 10px; + } + + .imgedit-applyto .imgedit-label { + vertical-align: middle; + } +} + +/** + * Media queries for media grid. + */ + +@media only screen and (max-width: 1120px) { + /* override for media-views.css */ + #wp-media-grid .wp-filter .attachment-filters { + max-width: 100%; + } +} + +@media only screen and ( max-width: 782px ) { + .media-frame.mode-select .attachments-browser.fixed .media-toolbar { + top: 46px; + right: 10px; + } +} + +@media only screen and (max-width: 600px) { + .media-frame.mode-select .attachments-browser.fixed .media-toolbar { + top: 0; + } +} + +@media only screen and (max-width: 480px) { + .edit-attachment-frame .media-frame-title { + right: 110px; + } + + .upload-php .media-modal-close, + .edit-attachment-frame .edit-media-header .left, + .edit-attachment-frame .edit-media-header .right { + width: 40px; + height: 40px; + } + + .upload-php .media-modal-close .media-modal-icon { + margin: 9px 10px; + } + + .edit-attachment-frame .edit-media-header .right:before, + .edit-attachment-frame .edit-media-header .left:before { + line-height: 40px !important; + } + + .edit-attachment-frame .edit-media-header .left { + right: 82px; + } + + .edit-attachment-frame .edit-media-header .right { + right: 41px; + } + + .edit-attachment-frame .media-frame-content { + top: 40px; + } + + .edit-attachment-frame .attachment-media-view { + float: none; + height: auto; + width: 100%; + } + + .edit-attachment-frame .attachment-info { + height: auto; + width: 100%; + } +} + +@media only screen and (max-width: 640px), screen and (max-height: 400px) { + .upload-php .mode-grid .media-sidebar{ + max-width: 100%; + } } diff --git a/wp-admin/css/media.min.css b/wp-admin/css/media.min.css new file mode 100644 index 0000000..fe21fe8 --- /dev/null +++ b/wp-admin/css/media.min.css @@ -0,0 +1 @@ +.imgedit-wait,.ui-find-overlay{opacity:.7;filter:alpha(opacity=70)}.media-item .describe{border-collapse:collapse;width:100%;border-top:1px solid #ddd;clear:both;cursor:default}.media-item.media-blank .describe{border:0}.media-item .describe th{vertical-align:top;text-align:left;padding:5px 10px 10px;width:140px}.media-item .describe .align th{padding-top:0}.media-item .media-item-info tr{background-color:transparent}.media-item .describe td{padding:0 8px 8px 0;vertical-align:top}.media-item thead.media-item-info td{padding:4px 10px 0}.media-item .media-item-info .A1B1{padding:0 0 0 10px}.media-item td.savesend{padding-bottom:15px}.media-item .thumbnail{max-height:128px;max-width:128px}#wpbody-content #async-upload-wrap a{display:none}.media-upload-form{margin-top:20px}.media-upload-form td label{margin-right:6px;margin-left:2px}.media-upload-form .align .field label{display:inline;padding:0 0 0 23px;margin:0 1em 0 3px;font-weight:600}.media-upload-form tr.image-size label{margin:0 0 0 5px;font-weight:600}.media-upload-form th.label label{font-weight:600;margin:.5em;font-size:13px}.media-upload-form th.label label span{padding:0 5px}.media-item .describe input[type=text],.media-item .describe textarea{width:460px}.media-item .describe p.help{margin:0;padding:0 0 0 5px}.describe-toggle-off,.describe-toggle-on,.media-item .edit-attachment{display:block;line-height:36px;float:right;margin-right:10px}.media-item .describe-toggle-off,.media-item.open .describe-toggle-on{display:none}.media-item.open .describe-toggle-off{display:block}.js .html-uploader #plupload-upload-ui,.media-item .startclosed,.media-item .startopen{display:none}.media-upload-form .media-item{min-height:36px;margin-bottom:1px;position:relative;width:100%;background:#fff}.media-upload-form .media-item,.media-upload-form .media-item .error{-webkit-box-shadow:0 1px 0 #ddd;box-shadow:0 1px 0 #ddd}#media-items:empty{border:0}.media-item .filename{line-height:36px;overflow:hidden;margin-left:6px}.media-item .pinkynail{float:left;margin:2px 10px 0 3px;max-width:40px;max-height:32px}.media-item .original{position:relative;height:34px}.media-item .progress{float:right;height:22px;margin:7px 6px;width:200px;line-height:2em;padding:0;overflow:hidden;-webkit-border-radius:22px;border-radius:22px;background:#ddd;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.media-item .bar{z-index:9;width:0;height:100%;margin-top:-22px;-webkit-border-radius:22px;border-radius:22px;background-color:#0073aa;-webkit-box-shadow:inset 0 0 2px rgba(0,0,0,.3);box-shadow:inset 0 0 2px rgba(0,0,0,.3)}.media-item .progress .percent{z-index:10;position:relative;width:200px;padding:0;color:#fff;text-align:center;line-height:22px;font-weight:400;text-shadow:0 1px 2px rgba(0,0,0,.2)}.upload-php .fixed .column-parent{width:15%}.js .html-uploader #html-upload-ui{display:block}.media-upload-form .media-item .error,.media-upload-form .media-item.error{width:auto;margin:0 0 1px}.media-upload-form .media-item .error{padding:10px 0 10px 14px}.media-item .error-div a.dismiss{display:block;float:right;margin:0 10px 0 15px}.find-box{background-color:#fff;-webkit-box-shadow:0 3px 6px rgba(0,0,0,.3);box-shadow:0 3px 6px rgba(0,0,0,.3);width:600px;overflow:hidden;margin-left:-300px;position:fixed;top:30px;bottom:30px;left:50%;z-index:100105}.find-box-head{background:#fcfcfc;border-bottom:1px solid #ddd;height:36px;font-size:18px;font-weight:600;line-height:36px;padding:0 36px 0 16px;position:absolute;top:0;left:0;right:0}.find-box-inside{overflow:auto;padding:16px;background-color:#fff;position:absolute;top:37px;bottom:45px;overflow-y:scroll;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.find-box-search{padding-bottom:16px}.find-box-search .spinner{float:none;left:105px;position:absolute}#find-posts-response,.find-box-search{position:relative}#find-posts-input,#find-posts-search{float:left}#find-posts-input{width:140px;height:28px;margin:0 4px 0 0}.widefat .found-radio{padding-right:0;width:16px}#find-posts-close{width:36px;height:36px;position:absolute;top:0;right:0;cursor:pointer;text-align:center;color:#666}#find-posts-close:hover{color:#00a0d2}#find-posts-close:before{font:400 20px/36px dashicons;vertical-align:top;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:"\f158"}.find-box-buttons{padding:8px 16px;background:#fcfcfc;border-top:1px solid #ddd;position:absolute;bottom:0;left:0;right:0}@media screen and (max-width:782px){.find-box-inside{bottom:57px}}@media screen and (max-width:660px){.find-box{top:0;bottom:0;left:0;right:0;margin:0;width:100%}}.ui-find-overlay{position:fixed;top:0;left:0;right:0;bottom:0;background:#000;z-index:100100}ul#dismissed-updates{display:none}form.upgrade{margin-top:8px}form.upgrade .hint{font-style:italic;font-size:85%;margin:-.5em 0 2em}#poststuff .inside .the-tagcloud{margin:5px 0 10px;padding:8px;border:1px solid #ddd;line-height:1.8em;word-spacing:3px}.drag-drop #drag-drop-area{border:4px dashed #b4b9be;height:200px}.drag-drop .drag-drop-inside{margin:70px auto 0;width:250px}.drag-drop-inside p{color:#a0a5aa;font-size:14px;margin:5px 0;display:none}.drag-drop .drag-drop-inside p{text-align:center}.drag-drop-inside p.drag-drop-info{font-size:20px}.drag-drop .drag-drop-inside p,.drag-drop-inside p.drag-drop-buttons{display:block}.media-frame.mode-grid .media-frame-menu,.media-frame.mode-grid .media-frame-router,.media-frame.mode-grid .media-frame-title,.upload-php .mode-grid .hide-sidebar .media-sidebar{display:none}.drag-drop.drag-over #drag-drop-area{border-color:#83b4d8}#plupload-upload-ui{position:relative}.media-frame.mode-grid,.media-frame.mode-grid .attachments-browser .attachments,.media-frame.mode-grid .media-frame-content,.media-frame.mode-grid .uploader-inline-content{position:static}.media-frame.mode-grid .media-frame-content{background-color:transparent;border:none}.upload-php .mode-grid .media-sidebar{position:relative;width:auto;margin-bottom:16px;padding:0 16px;border-left:4px solid #dd3d36;-webkit-box-shadow:0 1px 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 1px 0 rgba(0,0,0,.1);background-color:#fff}.upload-php .mode-grid .media-sidebar .media-uploader-status{border-bottom:none;padding-bottom:0;max-width:100%}.upload-php .mode-grid .media-sidebar .upload-error{margin:12px 0;padding:4px 0 0;border:none;-webkit-box-shadow:none;box-shadow:none;background:0 0}.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors{top:-10px;right:-14px;padding:10px}.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:before{content:"\f153";display:block;font:400 16px/1 dashicons;color:#b4b9be}.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:focus:before,.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:hover:before{color:#c00}.upload-php .mode-grid .media-sidebar .media-uploader-status.errors h2,.upload-php .mode-grid .media-sidebar .media-uploader-status.errors h3{display:none}.media-frame.mode-grid .uploader-inline{position:relative;top:auto;right:auto;left:auto;bottom:auto;padding-top:0;margin-top:0;border:4px dashed #b4b9be}.media-frame.mode-select .attachments-browser.fixed .attachments{position:relative;top:94px;padding-bottom:94px}.media-frame.mode-grid .attachment.details:focus,.media-frame.mode-grid .attachment:focus,.media-frame.mode-grid .selected.attachment:focus{-webkit-box-shadow:inset 0 0 2px 3px #f1f1f1,inset 0 0 0 7px #5b9dd9;box-shadow:inset 0 0 2px 3px #f1f1f1,inset 0 0 0 7px #5b9dd9;outline:0}.media-frame.mode-grid .selected.attachment{-webkit-box-shadow:inset 0 0 0 5px #f1f1f1,inset 0 0 0 7px #ccc;box-shadow:inset 0 0 0 5px #f1f1f1,inset 0 0 0 7px #ccc}.media-frame.mode-grid .attachment.details{-webkit-box-shadow:inset 0 0 0 3px #f1f1f1,inset 0 0 0 7px #1e8cbe;box-shadow:inset 0 0 0 3px #f1f1f1,inset 0 0 0 7px #1e8cbe}.media-frame.mode-grid.mode-select .attachment .thumbnail{opacity:.65}.media-frame.mode-select .attachment.selected .thumbnail{opacity:1}.media-frame.mode-grid .media-toolbar{margin-bottom:15px;height:auto}.media-frame.mode-grid .media-toolbar select{margin:0 10px 0 0;font-size:14px}.media-frame.mode-grid.mode-edit .media-toolbar-secondary>.select-mode-toggle-button{margin:0 8px 0 0;vertical-align:middle}.media-frame.mode-grid .attachments-browser .bulk-select{display:inline-block;margin:0 10px 0 0}.media-frame.mode-grid .search{margin-top:0}.media-frame.mode-grid .spinner{margin-top:16px}.attachments-browser .media-toolbar-secondary>.media-button{margin-right:10px}.media-frame.mode-select .attachments-browser.fixed .media-toolbar{position:fixed;top:32px;left:auto;right:20px;margin-top:0}.media-frame.mode-grid .attachments-browser{padding:0}.media-frame.mode-grid .attachments-browser .attachments{padding:2px}.media-frame.mode-grid .attachments-browser .no-media{color:#666;font-size:18px;font-style:normal;margin:0;padding:100px 0 0;text-align:center}.edit-attachment-frame{display:block;height:100%;width:100%}.edit-attachment-frame .edit-media-header{overflow:hidden}.upload-php .media-modal-close .media-modal-icon:before{content:"\f335";font-size:22px}.edit-attachment-frame .edit-media-header .left,.edit-attachment-frame .edit-media-header .right,.upload-php .media-modal-close{cursor:pointer;color:#72777c;background-color:transparent;height:50px;width:50px;padding:0;position:absolute;text-align:center;border:0;border-left:1px solid #ddd;-webkit-transition:color .1s ease-in-out,background .1s ease-in-out;transition:color .1s ease-in-out,background .1s ease-in-out}.upload-php .media-modal-close{top:0;right:0}.edit-attachment-frame .edit-media-header .left{right:102px}.edit-attachment-frame .edit-media-header .right{right:51px}.edit-attachment-frame .media-frame-title{left:0;right:150px}.edit-attachment-frame .edit-media-header .left:before,.edit-attachment-frame .edit-media-header .right:before{font:400 20px/50px dashicons!important;display:inline;font-weight:300}.edit-attachment-frame .edit-media-header .left:focus,.edit-attachment-frame .edit-media-header .left:hover,.edit-attachment-frame .edit-media-header .right:focus,.edit-attachment-frame .edit-media-header .right:hover,.upload-php .media-modal-close:focus,.upload-php .media-modal-close:hover{background:#ddd;border-color:#ccc;color:#000;outline:0;-webkit-box-shadow:none;box-shadow:none}.upload-php .media-modal-close:focus .media-modal-icon:before,.upload-php .media-modal-close:hover .media-modal-icon:before{color:#000}.edit-attachment-frame .edit-media-header .left:before,.rtl .edit-attachment-frame .edit-media-header .right:before{content:"\f341"}.edit-attachment-frame .edit-media-header .right:before,.rtl .edit-attachment-frame .edit-media-header .left:before{content:"\f345"}.edit-attachment-frame .edit-media-header .left.disabled,.edit-attachment-frame .edit-media-header .left.disabled:hover,.edit-attachment-frame .edit-media-header .right.disabled,.edit-attachment-frame .edit-media-header .right.disabled:hover{color:#ccc;background:inherit;cursor:default;pointer-events:none}.edit-attachment-frame .media-frame-content,.edit-attachment-frame .media-frame-router{left:0}.edit-attachment-frame .media-frame-content{border-bottom:none;bottom:0;top:50px}.edit-attachment-frame .attachment-details{position:absolute;overflow:auto;top:0;bottom:0;right:0;left:0;-webkit-box-shadow:inset 0 4px 4px -4px rgba(0,0,0,.1);box-shadow:inset 0 4px 4px -4px rgba(0,0,0,.1)}.edit-attachment-frame .attachment-media-view{float:left;width:65%;height:100%}.edit-attachment-frame .attachment-media-view .thumbnail{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:16px;height:100%}.edit-attachment-frame .attachment-media-view .details-image{display:block;margin-bottom:16px;max-width:100%;max-height:90%;max-height:-webkit-calc(100% - 42px);max-height:calc(100% - 42px)}.edit-attachment-frame .wp-media-wrapper{margin-bottom:12px}.edit-attachment-frame input,.edit-attachment-frame textarea{padding:6px 8px;line-height:16px}.edit-attachment-frame .attachment-info{overflow:auto;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin-bottom:0;padding:12px 16px 0;width:35%;height:100%;-webkit-box-shadow:inset 0 4px 4px -4px rgba(0,0,0,.1);box-shadow:inset 0 4px 4px -4px rgba(0,0,0,.1);border-bottom:0;border-left:1px solid #ddd;background:#f3f3f3}.edit-attachment-frame .attachment-info .details,.edit-attachment-frame .attachment-info .settings{position:relative;overflow:hidden;float:none;margin-bottom:15px;padding-bottom:15px;border-bottom:1px solid #ddd}.edit-attachment-frame .attachment-info .filename{font-weight:400;color:#666}.edit-attachment-frame .attachment-info .thumbnail{margin-bottom:12px}.attachment-info .actions{margin-bottom:16px}.attachment-info .actions a{display:inline;text-decoration:none}.wp_attachment_details label[for=content]{font-size:13px;line-height:1.5;margin:1em 0}.wp_attachment_details #attachment_caption{height:4em}.describe .image-editor{vertical-align:top}.imgedit-wrap{position:relative;padding-top:10px}.imgedit-settings fieldset,.imgedit-settings p{margin:8px 0}.imgedit-settings legend{margin-bottom:5px}.describe .imgedit-wrap .imgedit-settings{padding:0 5px}.wp_attachment_holder div.updated{margin-top:0}.wp_attachment_holder .imgedit-wrap>div{height:auto}.wp_attachment_holder .imgedit-wrap .imgedit-panel-content{padding:3px 16px 0 0;float:left}.wp_attachment_holder .imgedit-wrap .imgedit-settings{float:right;width:250px}.imgedit-settings input{margin-top:0;vertical-align:middle}.imgedit-wait{position:absolute;top:0;bottom:0;width:100%;background:#fff;display:none}.imgedit-wait:before{content:"";display:block;width:20px;height:20px;position:absolute;left:50%;top:50%;margin:-10px 0 0 -10px;background:url(../images/spinner.gif) center no-repeat;-webkit-background-size:20px 20px;background-size:20px 20px;-webkit-transform:translateZ(0);transform:translateZ(0)}.no-float{float:none}.A1B1 .button,.A1B1 .spinner,.wp_attachment_image .button,.wp_attachment_image .spinner{float:left}.imgedit-settings .disabled,.media-disabled{color:#a0a5aa}.A1B1{overflow:hidden}.no-js .wp_attachment_image .button{display:none}.imgedit-menu{min-width:300px;margin:0 0 12px}.imgedit-menu .note-no-rotate{clear:both;margin:0;padding:1em 0 0}.image-editor .imgedit-menu .button{float:left;width:32px;height:32px;margin:0 8px 0 0;padding:0;background:#f1f1f1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;line-height:16px;color:#72777c}.imgedit-menu .button:before{font:400 20px/1 dashicons;speak:none;vertical-align:middle}.imgedit-menu .button.disabled{border-color:#ccc;background-color:#ddd;color:#72777c;filter:alpha(opacity=50);opacity:.5;cursor:default}.imgedit-crop:before{content:"\f165"}.imgedit-rleft:before{content:"\f166"}.imgedit-rright:before{content:"\f167"}.imgedit-flipv:before{content:"\f168"}.imgedit-fliph:before{content:"\f169"}.imgedit-undo:before{content:"\f171"}.imgedit-redo:before{content:"\f172"}.imgedit-crop-wrap{position:relative}.imgedit-crop{margin:0 8px 0 0}.imgedit-rleft{margin:0 3px}.imgedit-rright{margin:0 8px 0 3px}.imgedit-flipv{margin:0 3px}.imgedit-fliph{margin:0 8px 0 3px}.imgedit-undo{margin:0 3px}.imgedit-redo{margin:0 8px 0 3px}.imgedit-thumbnail-preview{margin:10px 8px 0 0}.imgedit-thumbnail-preview-caption{display:block}#poststuff .imgedit-group-top h2,#poststuff .imgedit-group-top h3{display:inline-block;margin:0;padding:0;font-size:14px;line-height:1.4}.imgedit-group-top h2 a,.imgedit-group-top h3 a{text-decoration:none}.imgedit-applyto .imgedit-label{display:block;padding:.5em 0 0}.imgedit-help{display:none;font-style:italic}.image-editor .imgedit-settings .imgedit-help-toggle,.image-editor .imgedit-settings .imgedit-help-toggle:active,.image-editor .imgedit-settings .imgedit-help-toggle:hover{border:1px solid transparent;margin:-1px 0 0 -1px;padding:0;background:0 0;color:#0074a2;font-size:20px;line-height:1;cursor:pointer;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-box-shadow:none;box-shadow:none}.image-editor .imgedit-settings .imgedit-help-toggle:focus{color:#0074a2;border-color:#5b9dd9;outline:0;-webkit-box-shadow:0 0 3px rgba(0,115,170,.8);box-shadow:0 0 3px rgba(0,115,170,.8)}.form-table td.imgedit-response{padding:0}.imgedit-submit{margin:8px 0 0}.imgedit-submit-btn{margin-left:20px}.imgedit-wrap .nowrap{white-space:nowrap;font-size:12px;line-height:inherit}span.imgedit-scale-warn{color:red;font-size:20px;font-style:normal;visibility:hidden;vertical-align:middle}.imgedit-save-target{margin:8px 0}.imgedit-group{margin-bottom:8px;padding:10px}.imgedit-settings .imgedit-crop-ratio input[type=text],.imgedit-settings .imgedit-crop-sel input[type=text],.imgedit-settings .imgedit-scale input[type=text]{width:50px;font-size:14px;padding:3px 5px}.imgedit-separator{display:inline-block;width:7px;text-align:center;vertical-align:middle;font-size:13px;color:#444}.imgedit-settings .imgedit-scale .button{margin-bottom:0}audio,video{display:inline-block;max-width:100%}.mejs-container{width:100%;max-width:100%}@media print,(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.imgedit-wait:before{background-image:url(../images/spinner-2x.gif)}}@media screen and (max-width:782px){.wp_attachment_details label[for=content]{font-size:14px;line-height:1.5em}.media-upload-form .media-item .error,.media-upload-form .media-item.error{font-size:13px;line-height:1.5}.media-upload-form .media-item.error{padding:1px 10px}.media-upload-form .media-item .error{padding:10px 0 10px 12px}.imgedit-settings .imgedit-crop-ratio input[type=text],.imgedit-settings .imgedit-crop-sel input[type=text],.imgedit-settings .imgedit-scale input[type=text]{width:60px;font-size:16px;padding:6px 10px}.imgedit-applyto .imgedit-label{vertical-align:middle}}@media only screen and (max-width:1120px){#wp-media-grid .wp-filter .attachment-filters{max-width:100%}}@media only screen and (max-width:782px){.media-frame.mode-select .attachments-browser.fixed .media-toolbar{top:46px;right:10px}}@media only screen and (max-width:600px){.media-frame.mode-select .attachments-browser.fixed .media-toolbar{top:0}}@media only screen and (max-width:480px){.edit-attachment-frame .media-frame-title{right:110px}.edit-attachment-frame .edit-media-header .left,.edit-attachment-frame .edit-media-header .right,.upload-php .media-modal-close{width:40px;height:40px}.upload-php .media-modal-close .media-modal-icon{margin:9px 10px}.edit-attachment-frame .edit-media-header .left:before,.edit-attachment-frame .edit-media-header .right:before{line-height:40px!important}.edit-attachment-frame .edit-media-header .left{right:82px}.edit-attachment-frame .edit-media-header .right{right:41px}.edit-attachment-frame .media-frame-content{top:40px}.edit-attachment-frame .attachment-media-view{float:none;height:auto;width:100%}.edit-attachment-frame .attachment-info{height:auto;width:100%}}@media only screen and (max-width:640px),screen and (max-height:400px){.upload-php .mode-grid .media-sidebar{max-width:100%}} \ No newline at end of file diff --git a/wp-admin/css/nav-menus-rtl.css b/wp-admin/css/nav-menus-rtl.css index 82c91e9..c2455b3 100644 --- a/wp-admin/css/nav-menus-rtl.css +++ b/wp-admin/css/nav-menus-rtl.css @@ -61,10 +61,6 @@ ul.add-menu-item-tabs li { position: relative; } -.blank-slate .menu-name { - height: 2em; -} - .blank-slate .menu-settings { border: none; margin-top: 0; @@ -73,7 +69,7 @@ ul.add-menu-item-tabs li { } .is-submenu { - color: #999; + color: #555d66; /* #fafafa background */ font-style: italic; font-weight: normal; margin-right: 4px; @@ -86,23 +82,18 @@ ul.add-menu-item-tabs li { background: #fbfbfb; } -.manage-menus select { - float: right; - margin-left: 6px; -} - -.manage-menus .selected-menu { - float: right; - margin: 5px 0 0 6px; -} - -.manage-menus .submit-btn { - float: right; - margin-top: 1px; +.manage-menus .selected-menu, +.manage-menus select, +.manage-menus .submit-btn, +.nav-menus-php .add-new-menu-action { + display: inline-block; + margin-left: 3px; + vertical-align: middle; } -.menu-edit p { - margin: .3em 0 .6em; +.manage-menus select, +.menu-location-menus select { + max-width: 100%; } .menu-edit #post-body-content h3 { @@ -143,7 +134,7 @@ ul.add-menu-item-tabs li { } .theme-location-set { - color: #999; + color: #72777c; font-size: 11px; } @@ -169,7 +160,7 @@ ul.add-menu-item-tabs li { .nav-menus-php #post-body { padding: 0 10px 10px; border-top: 1px solid #fff; - border-bottom: 1px solid #dfdfdf; + border-bottom: 1px solid #ddd; background: #fff; } @@ -179,12 +170,15 @@ ul.add-menu-item-tabs li { } #nav-menu-header { - border-bottom: 1px solid #dfdfdf; + border-bottom: 1px solid #ddd; margin-bottom: 0; } #nav-menu-header .menu-name-label { - margin-top: 4px; + display: inline-block; + vertical-align: middle; + margin-left: 7px; + font-style: italic; } .nav-menus-php #post-body div.updated, @@ -216,8 +210,12 @@ ul.add-menu-item-tabs li { margin-top: -2px; } -.widefat td.menu-location-menus { - padding-bottom: 5px; +.widefat .menu-locations .menu-location-title { + padding: 13px 10px 0; +} + +.menu-location-title label { + font-weight: bold; } .menu-location-menus select { @@ -249,27 +247,13 @@ ul.add-menu-item-tabs li { border-left: 1px solid #ccc; } -#wpbody .open-label { - display: block; - float:right; -} - -#wpbody .open-label span { - padding-left: 10px; -} - -.js .input-with-default-title { - color: #aaa; - font-style: italic; -} - #menu-management .inside { padding: 0 10px; } /* Add Menu Item Boxes */ .postbox .howto input, -.accordion-container .howto input { +.customlinkdiv .menu-item-textbox { width: 180px; float: left; } @@ -278,10 +262,6 @@ ul.add-menu-item-tabs li { margin: 0; } -.customlinkdiv .howto input { - width: 180px; -} - .customlinkdiv p { margin-top: 0 } @@ -304,12 +284,6 @@ ul.add-menu-item-tabs li { padding: 0; } -.nav-menus-php .add-new-menu-action { - float: right; - margin: 6px 6px 0 0; - line-height: 15px; -} - .nav-menus-php .meta-sep, .nav-menus-php .submitdelete, .nav-menus-php .submitcancel { @@ -345,11 +319,6 @@ ul.add-menu-item-tabs li { float: left; } -.postbox .spinner { - display: none; - vertical-align: middle; -} - .button-controls { clear:both; margin: 10px 0; @@ -367,6 +336,7 @@ ul.add-menu-item-tabs li { /* Create Menu */ #menu-name { width: 270px; + vertical-align: middle; } #manage-menu .inside { @@ -393,10 +363,10 @@ ul.add-menu-item-tabs li { width: 180px; } +.customlinkdiv label, .nav-menus-php .howto span { - margin-top: 6px; - display: block; float: right; + margin-top: 6px; } /* Menu item types */ @@ -404,6 +374,11 @@ ul.add-menu-item-tabs li { width: 190px; } +.quick-search-wrap .spinner { + float: none; + margin: -3px 0 0 -10px; +} + .nav-menus-php .list-wrap { display: none; clear: both; @@ -467,10 +442,11 @@ ul.add-menu-item-tabs li { } .menu-item-bar .menu-item-handle { - border: 1px solid #dfdfdf; + border: 1px solid #ddd; position: relative; padding: 10px 15px; height: auto; + min-height: 20px; width: 382px; line-height: 30px; overflow: hidden; @@ -507,12 +483,16 @@ ul.add-menu-item-tabs li { margin-left: 13em; } +.menu-item-handle .menu-item-title.no-title { + color: #72777c; +} + /* Sortables */ -li.menu-item.ui-sortable-helper dl { +li.menu-item.ui-sortable-helper .menu-item-bar { margin-top: 0; } -li.menu-item.ui-sortable-helper .menu-item-transport dl { +li.menu-item.ui-sortable-helper .menu-item-transport .menu-item-bar { margin-top: 13px; } @@ -522,7 +502,12 @@ li.menu-item.ui-sortable-helper .menu-item-transport dl { margin-top: 13px; } -/* WARNING: The factor of 30px is hardcoded into the nav-menus javascript. */ +/* Hide the transport list when it's empty */ +.menu-item .menu-item-transport:empty { + display: none; +} + +/* WARNING: The factor of 30px is hardcoded into the nav-menus JavaScript. */ .menu-item-depth-0 { margin-right: 0px; } .menu-item-depth-1 { margin-right: 30px; } .menu-item-depth-2 { margin-right: 60px; } @@ -564,11 +549,11 @@ body.menu-max-depth-11 { min-width: 1280px !important; } /* Menu item controls */ .item-type { - color: #777; + display: inline-block; + padding: 12px 16px; + color: #666; font-size: 12px; - padding: 12px 10px; line-height: 18px; - display: block; } .item-controls { @@ -604,6 +589,51 @@ body.menu-max-depth-11 { min-width: 1280px !important; } white-space: nowrap; } +.no-js.nav-menus-php .item-edit { + position: static; + float: left; + width: auto; + height: auto; + margin-left: -10px !important; + padding: 12px 0; + color: #0073aa; + text-decoration: underline; + font-size: 12px; + line-height: 18px; + text-indent: 0; +} + +.nav-menus-php .item-edit:before { + margin-top: 10px; + margin-right: 4px; + width: 20px; + -webkit-border-radius: 50%; + border-radius: 50%; + text-indent: -1px; /* account for the dashicon alignment */ +} + +.no-js.nav-menus-php .item-edit:before { + display: none; +} + +.rtl .nav-menus-php .item-edit:before { + text-indent: 1px; /* account for the dashicon alignment */ +} + +.nav-menus-php .item-edit:focus { + -webkit-box-shadow: none; + box-shadow: none; +} + +.nav-menus-php .item-edit:focus:before { + -webkit-box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); + box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); +} + /* Menu editing */ .menu-instructions-inactive { display: none; @@ -643,8 +673,8 @@ body.menu-max-depth-11 { min-width: 1280px !important; } display: block; margin: 0 0 10px; padding: 3px 5px 5px; - border: 1px solid #dfdfdf; - color: #777; + border: 1px solid #ddd; + color: #72777c; font-size: 12px; font-style: italic; } @@ -666,7 +696,6 @@ body.menu-max-depth-11 { min-width: 1280px !important; } .description-thin { width: 190px; - height: 40px; } .description-wide { @@ -684,14 +713,12 @@ body.menu-max-depth-11 { min-width: 1280px !important; } /* Major/minor publishing actions (classes) */ .nav-menus-php .major-publishing-actions { clear: both; - padding: 3px 0 6px; + padding: 7px 0 6px; } .nav-menus-php .major-publishing-actions .publishing-action { text-align: left; float: left; - line-height: 23px; - margin: 4px 0 1px; } .nav-menus-php .blank-slate .menu-settings { @@ -704,14 +731,14 @@ body.menu-max-depth-11 { min-width: 1280px !important; } } .nav-menus-php .submitbox .submitcancel { - border-bottom: 1px solid #0074a2; + border-bottom: 1px solid #0073aa; padding: 1px 2px; - color: #0074a2; + color: #0073aa; text-decoration: none; } .nav-menus-php .submitbox .submitcancel:hover { - background: #0074a2; + background: #0073aa; color: #fff; } @@ -720,23 +747,6 @@ body.menu-max-depth-11 { min-width: 1280px !important; } margin-right: -4px; } -/* Clearfix */ -#menu-item-name-wrap:after, -#menu-item-url-wrap:after, -#menu-name-label:after, -#menu-settings-column .inside:after, -#nav-menus-frame:after, -.nav-menus-php #post-body-content:after, -.nav-menus-php .button-controls:after, -.nav-menus-php .major-publishing-actions:after, -.nav-menus-php .menu-item-settings:after { - clear: both; - content: "."; - display: block; - height: 0; - visibility: hidden; -} - #nav-menus-frame, .button-controls, #menu-item-url-wrap, @@ -747,6 +757,24 @@ body.menu-max-depth-11 { min-width: 1280px !important; } /* =Media Queries -------------------------------------------------------------- */ +@media only screen and (min-width: 769px) and (max-width: 1000px){ + body.menu-max-depth-0 { + min-width: 0 !important; + } + + #menu-management-liquid{ + width: 100%; + } + + .nav-menus-php #post-body-content{ + min-width: 0; + } + + .menu-item-bar .menu-item-handle{ + width: 90%; + } +} + @media screen and ( max-width: 782px ) { body.nav-menus-php { min-width: 0 !important; @@ -820,13 +848,17 @@ body.menu-max-depth-11 { min-width: 1280px !important; } .menu-item-settings .description-thin, .menu-item-settings .description-wide { width: 100%; - height: auto; } .menu-item-settings input { width: 100%; } + .menu-item-settings input[type="checkbox"], + .menu-item-settings input[type="radio"] { + width: 25px; + } + .menu-settings dl { padding-right: 0; } @@ -843,6 +875,14 @@ body.menu-max-depth-11 { min-width: 1280px !important; } margin-right: 0; margin-bottom: 15px; } + + .manage-menus select { + margin: 0.5em 0; + } + + .widefat .menu-locations .menu-location-title { + padding-top: 16px; + } } @media only screen and (max-width: 768px) { diff --git a/wp-admin/css/nav-menus-rtl.min.css b/wp-admin/css/nav-menus-rtl.min.css new file mode 100644 index 0000000..a6b3290 --- /dev/null +++ b/wp-admin/css/nav-menus-rtl.min.css @@ -0,0 +1 @@ +.no-js #message{display:block}ul.add-menu-item-tabs li{padding:3px 8px 3px 5px}.accordion-section ul.add-menu-item-tabs,.accordion-section ul.category-tabs,.accordion-section ul.wp-tab-bar{margin:0}.accordion-section .categorychecklist{margin:13px 0}#nav-menu-meta .accordion-section-content{padding:18px 13px}#nav-menu-meta .button-controls{margin-bottom:0}#nav-menus-frame{margin-right:300px;margin-top:23px}#wpbody-content #menu-settings-column{display:inline;width:281px;margin-right:-300px;clear:both;float:right;padding-top:0}#menu-settings-column .inside{clear:both;margin:10px 0 0}.metabox-holder-disabled .accordion-section-content,.metabox-holder-disabled .accordion-section-title,.metabox-holder-disabled .postbox{opacity:.5;filter:alpha(opacity=50)}.metabox-holder-disabled .button-controls .select-all{display:none}#wpbody{position:relative}.blank-slate .menu-settings{border:none;margin-top:0;padding-top:0;overflow:hidden}.is-submenu{color:#555d66;font-style:italic;font-weight:400;margin-right:4px}.manage-menus{margin-top:23px;padding:10px;overflow:hidden;background:#fbfbfb}.manage-menus .selected-menu,.manage-menus .submit-btn,.manage-menus select,.nav-menus-php .add-new-menu-action{display:inline-block;margin-left:3px;vertical-align:middle}.manage-menus select,.menu-location-menus select{max-width:100%}.menu-edit #post-body-content h3{margin:1em 0 10px}.menu-settings{border-top:1px solid #eee;margin-top:2em}.menu-settings dl{margin:0 0 10px;overflow:hidden;padding-right:18%}.menu-settings dd{float:right;margin:0;width:100%}.menu-settings dt{float:right;clear:both;width:21.951%;padding:3px 0 0;margin-right:-21.951%}.menu-settings label{vertical-align:baseline}.menu-edit .checkbox-input{margin-top:4px}.theme-location-set{color:#72777c;font-size:11px}#add-custom-link .howto,#cancel-save{font-size:12px}#menu-management-liquid{float:right;min-width:100%;margin-top:3px}#menu-management{position:relative;margin-left:20px;margin-top:-3px;width:100%;background:#f5f5f5}#menu-management .menu-edit{margin-bottom:20px}.nav-menus-php #post-body{padding:0 10px 10px;border-top:1px solid #fff;border-bottom:1px solid #ddd;background:#fff}#nav-menu-footer,#nav-menu-header{padding:0 10px}#nav-menu-header{border-bottom:1px solid #ddd;margin-bottom:0}#nav-menu-header .menu-name-label{display:inline-block;vertical-align:middle;margin-left:7px;font-style:italic}.nav-menus-php #post-body div.error,.nav-menus-php #post-body div.updated{margin:0}.nav-menus-php #post-body-content{position:relative;float:none}#menu-management .menu-add-new abbr{font-weight:600}#select-nav-menu-container{text-align:left;padding:0 10px 3px;margin-bottom:5px}#select-nav-menu{width:100px;display:inline}#menu-name-label{margin-top:-2px}.widefat .menu-locations .menu-location-title{padding:13px 10px 0}.menu-location-title label{font-weight:700}.menu-location-menus select{float:right}#locations-nav-menu-wrapper{padding:5px 0}.locations-nav-menu-select select{float:right;width:160px;margin-left:5px}.locations-row-links{float:right;margin:6px 6px 0 0}.locations-add-menu-link,.locations-edit-menu-link{margin:0 3px}.locations-edit-menu-link{padding-left:3px;border-left:1px solid #ccc}#menu-management .inside{padding:0 10px}.customlinkdiv .menu-item-textbox,.postbox .howto input{width:180px;float:left}.accordion-container .outer-border{margin:0}.customlinkdiv p{margin-top:0}#nav-menu-theme-locations .howto select{width:100%}#nav-menu-theme-locations .button-controls{text-align:left}.add-menu-item-view-all{height:400px}#menu-container .submit{margin:0 0 10px;padding:0}.nav-menus-php .meta-sep,.nav-menus-php .submitcancel,.nav-menus-php .submitdelete{display:block;float:right;margin:6px 0;line-height:15px}.meta-sep{padding:0 2px}#cancel-save{text-decoration:underline;margin-right:20px;margin-top:5px}.button-primary.right,.button-secondary.right,.button.right{float:left}.list-controls{float:right;margin-top:5px}.add-to-menu{float:left}.button-controls{clear:both;margin:10px 0}.hide-all,.show-all{cursor:pointer}.hide-all{display:none}#menu-name{width:270px;vertical-align:middle}#manage-menu .inside{padding:0}#available-links dt{display:block}#add-custom-link label span{display:block;float:right;margin-top:5px;padding-left:5px}.menu-item-textbox{width:180px}.customlinkdiv label,.nav-menus-php .howto span{float:right;margin-top:6px}.quick-search{width:190px}.quick-search-wrap .spinner{float:none;margin:-3px 0 0 -10px}.nav-menus-php .list-wrap{display:none;clear:both;margin-bottom:10px}.nav-menus-php .postbox p.submit{margin-bottom:0}.nav-menus-php .list li{display:none;margin:0 0 5px}.nav-menus-php .list li .menu-item-title{cursor:pointer;display:block}.nav-menus-php .list li .menu-item-title input{margin-left:3px;margin-top:-3px}.menu-item-title input[type=checkbox]{display:inline-block;margin-top:-4px}#menu-container .inside{padding-bottom:10px}.menu{padding-top:1em}#menu-to-edit{margin:0;padding:.1em 0}.menu ul{width:100%}.menu li{margin-bottom:0;position:relative}.menu-item-bar{clear:both;line-height:1.5em;position:relative;margin:9px 0 0}.menu-item-bar .menu-item-handle{border:1px solid #ddd;position:relative;padding:10px 15px;height:auto;min-height:20px;width:382px;line-height:30px;overflow:hidden;word-wrap:break-word}.menu-item-bar .menu-item-handle:hover{border-color:#999}#menu-to-edit .menu-item-invalid .menu-item-handle{background:#f6c9cc;border-color:#f1acb1}.no-js .menu-item-edit-active .item-edit{display:none}.js .menu-item-handle{cursor:move}#cancel-save,.item-controls a:hover{cursor:pointer}.menu li.deleting .menu-item-handle{background-image:none;background-color:#f66}.menu-item-handle .item-title{font-size:13px;font-weight:600;line-height:20px;display:block;margin-left:13em}.menu-item-handle .menu-item-title.no-title{color:#72777c}li.menu-item.ui-sortable-helper .menu-item-bar{margin-top:0}li.menu-item.ui-sortable-helper .menu-item-transport .menu-item-bar{margin-top:13px}.menu .sortable-placeholder{height:35px;width:410px;margin-top:13px}.menu-item .menu-item-transport:empty{display:none}.menu-item-depth-0{margin-right:0}.menu-item-depth-1{margin-right:30px}.menu-item-depth-2{margin-right:60px}.menu-item-depth-3{margin-right:90px}.menu-item-depth-4{margin-right:120px}.menu-item-depth-5{margin-right:150px}.menu-item-depth-6{margin-right:180px}.menu-item-depth-7{margin-right:210px}.menu-item-depth-8{margin-right:240px}.menu-item-depth-9{margin-right:270px}.menu-item-depth-10{margin-right:300px}.menu-item-depth-11{margin-right:330px}.menu-item-depth-0 .menu-item-transport{margin-right:0}.menu-item-depth-1 .menu-item-transport{margin-right:-30px}.menu-item-depth-2 .menu-item-transport{margin-right:-60px}.menu-item-depth-3 .menu-item-transport{margin-right:-90px}.menu-item-depth-4 .menu-item-transport{margin-right:-120px}.menu-item-depth-5 .menu-item-transport{margin-right:-150px}.menu-item-depth-6 .menu-item-transport{margin-right:-180px}.menu-item-depth-7 .menu-item-transport{margin-right:-210px}.menu-item-depth-8 .menu-item-transport{margin-right:-240px}.menu-item-depth-9 .menu-item-transport{margin-right:-270px}.menu-item-depth-10 .menu-item-transport{margin-right:-300px}.menu-item-depth-11 .menu-item-transport{margin-right:-330px}body.menu-max-depth-0{min-width:950px!important}body.menu-max-depth-1{min-width:980px!important}body.menu-max-depth-2{min-width:1010px!important}body.menu-max-depth-3{min-width:1040px!important}body.menu-max-depth-4{min-width:1070px!important}body.menu-max-depth-5{min-width:1100px!important}body.menu-max-depth-6{min-width:1130px!important}body.menu-max-depth-7{min-width:1160px!important}body.menu-max-depth-8{min-width:1190px!important}body.menu-max-depth-9{min-width:1220px!important}body.menu-max-depth-10{min-width:1250px!important}body.menu-max-depth-11{min-width:1280px!important}.item-type{display:inline-block;padding:12px 16px;color:#666;font-size:12px;line-height:18px}.item-controls{font-size:12px;position:absolute;left:20px;top:-1px}.item-controls a{text-decoration:none}.item-controls .item-order{padding-left:10px}.nav-menus-php .item-edit{position:absolute;left:-20px;top:0;display:block;width:30px;height:40px;margin-left:0!important;text-indent:100%;outline:0;overflow:hidden;white-space:nowrap}.no-js.nav-menus-php .item-edit{position:static;float:left;width:auto;height:auto;margin-left:-10px!important;padding:12px 0;color:#0073aa;text-decoration:underline;font-size:12px;line-height:18px;text-indent:0}.nav-menus-php .item-edit:before{margin-top:10px;margin-right:4px;width:20px;-webkit-border-radius:50%;border-radius:50%;text-indent:-1px}.no-js.nav-menus-php .item-edit:before{display:none}.rtl .nav-menus-php .item-edit:before{text-indent:1px}.nav-menus-php .item-edit:focus{-webkit-box-shadow:none;box-shadow:none}.nav-menus-php .item-edit:focus:before{-webkit-box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}.menu-instructions-inactive{display:none}.menu-item-settings{display:block;width:402px;padding:10px 10px 10px 0;position:relative;z-index:10;border:1px solid #e5e5e5;border-top:none;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04)}.menu-item-settings .field-move a{display:none;margin:0 2px}.menu-item-edit-active .menu-item-settings{display:block}.menu-item-edit-inactive .menu-item-settings{display:none}.add-menu-item-pagelinks{margin:.5em auto;text-align:center}.link-to-original{display:block;margin:0 0 10px;padding:3px 5px 5px;border:1px solid #ddd;color:#72777c;font-size:12px;font-style:italic}.hidden-field,.nav-menus-php .blank-slate .menu-settings{display:none}.link-to-original a{padding-right:4px;font-style:normal}.menu-item-settings .description-thin,.menu-item-settings .description-wide{margin-left:10px;float:right}.description-thin{width:190px}.description-wide{width:390px}.menu-item-actions{padding-top:15px}.nav-menus-php .major-publishing-actions{clear:both;padding:7px 0 6px}.nav-menus-php .major-publishing-actions .publishing-action{text-align:left;float:left}.nav-menus-php .delete-action{float:right;margin-top:2px}.nav-menus-php .submitbox .submitcancel{border-bottom:1px solid #0073aa;padding:1px 2px;color:#0073aa;text-decoration:none}.nav-menus-php .submitbox .submitcancel:hover{background:#0073aa;color:#fff}.nav-menus-php .major-publishing-actions .form-invalid{padding-right:4px;margin-right:-4px}#menu-item-name-wrap,#menu-item-url-wrap,#nav-menus-frame,.button-controls{display:block}@media only screen and (min-width:769px) and (max-width:1000px){body.menu-max-depth-0{min-width:0!important}#menu-management-liquid{width:100%}.nav-menus-php #post-body-content{min-width:0}.menu-item-bar .menu-item-handle{width:90%}}@media screen and (max-width:782px){body.nav-menus-php{min-width:0!important}#nav-menus-frame{margin-right:0;float:none;width:100%}#wpbody-content #menu-settings-column{display:block;width:100%;float:none;margin-right:0}#side-sortables .add-menu-item-tabs{margin:15px 0 14px}ul.add-menu-item-tabs li.tabs{padding:13px 15px 14px}.nav-menus-php .item-controls .item-type{margin-top:2px}.nav-menus-php .customlinkdiv .howto input{width:65%}.nav-menus-php .quick-search{width:85%}#menu-management-liquid{margin-top:25px}.nav-menus-php .menu-name-label.howto span{margin-top:13px}.menu-name-label #menu-name{margin-top:4px}.nav-menus-php .major-publishing-actions .publishing-action{margin-top:6px}.nav-menus-php .delete-action{font-size:14px;line-height:50px;margin-top:12px}.description-wide,.menu-item-bar .menu-item-handle,.menu-item-settings{width:auto}.menu-item-settings{padding:10px}.menu-item-settings .description-thin,.menu-item-settings .description-wide,.menu-item-settings input{width:100%}.menu-item-settings input[type=checkbox],.menu-item-settings input[type=radio]{width:25px}.menu-settings dl{padding-right:0}.menu-settings dd{float:none;width:100%;margin-bottom:15px}.menu-settings dt{float:none;width:auto;margin-right:0;margin-bottom:15px}.manage-menus select{margin:.5em 0}.widefat .menu-locations .menu-location-title{padding-top:16px}}@media only screen and (max-width:768px){#menu-locations-wrap .widefat{width:100%}} \ No newline at end of file diff --git a/wp-admin/css/nav-menus.css b/wp-admin/css/nav-menus.css index 6466d94..a230d9d 100644 --- a/wp-admin/css/nav-menus.css +++ b/wp-admin/css/nav-menus.css @@ -61,10 +61,6 @@ ul.add-menu-item-tabs li { position: relative; } -.blank-slate .menu-name { - height: 2em; -} - .blank-slate .menu-settings { border: none; margin-top: 0; @@ -73,7 +69,7 @@ ul.add-menu-item-tabs li { } .is-submenu { - color: #999; + color: #555d66; /* #fafafa background */ font-style: italic; font-weight: normal; margin-left: 4px; @@ -86,23 +82,18 @@ ul.add-menu-item-tabs li { background: #fbfbfb; } -.manage-menus select { - float: left; - margin-right: 6px; -} - -.manage-menus .selected-menu { - float: left; - margin: 5px 6px 0 0; -} - -.manage-menus .submit-btn { - float: left; - margin-top: 1px; +.manage-menus .selected-menu, +.manage-menus select, +.manage-menus .submit-btn, +.nav-menus-php .add-new-menu-action { + display: inline-block; + margin-right: 3px; + vertical-align: middle; } -.menu-edit p { - margin: .3em 0 .6em; +.manage-menus select, +.menu-location-menus select { + max-width: 100%; } .menu-edit #post-body-content h3 { @@ -143,7 +134,7 @@ ul.add-menu-item-tabs li { } .theme-location-set { - color: #999; + color: #72777c; font-size: 11px; } @@ -169,7 +160,7 @@ ul.add-menu-item-tabs li { .nav-menus-php #post-body { padding: 0 10px 10px; border-top: 1px solid #fff; - border-bottom: 1px solid #dfdfdf; + border-bottom: 1px solid #ddd; background: #fff; } @@ -179,12 +170,15 @@ ul.add-menu-item-tabs li { } #nav-menu-header { - border-bottom: 1px solid #dfdfdf; + border-bottom: 1px solid #ddd; margin-bottom: 0; } #nav-menu-header .menu-name-label { - margin-top: 4px; + display: inline-block; + vertical-align: middle; + margin-right: 7px; + font-style: italic; } .nav-menus-php #post-body div.updated, @@ -216,8 +210,12 @@ ul.add-menu-item-tabs li { margin-top: -2px; } -.widefat td.menu-location-menus { - padding-bottom: 5px; +.widefat .menu-locations .menu-location-title { + padding: 13px 10px 0; +} + +.menu-location-title label { + font-weight: bold; } .menu-location-menus select { @@ -249,27 +247,13 @@ ul.add-menu-item-tabs li { border-right: 1px solid #ccc; } -#wpbody .open-label { - display: block; - float:left; -} - -#wpbody .open-label span { - padding-right: 10px; -} - -.js .input-with-default-title { - color: #aaa; - font-style: italic; -} - #menu-management .inside { padding: 0 10px; } /* Add Menu Item Boxes */ .postbox .howto input, -.accordion-container .howto input { +.customlinkdiv .menu-item-textbox { width: 180px; float: right; } @@ -278,10 +262,6 @@ ul.add-menu-item-tabs li { margin: 0; } -.customlinkdiv .howto input { - width: 180px; -} - .customlinkdiv p { margin-top: 0 } @@ -304,12 +284,6 @@ ul.add-menu-item-tabs li { padding: 0; } -.nav-menus-php .add-new-menu-action { - float: left; - margin: 6px 0 0 6px; - line-height: 15px; -} - .nav-menus-php .meta-sep, .nav-menus-php .submitdelete, .nav-menus-php .submitcancel { @@ -345,11 +319,6 @@ ul.add-menu-item-tabs li { float: right; } -.postbox .spinner { - display: none; - vertical-align: middle; -} - .button-controls { clear:both; margin: 10px 0; @@ -367,6 +336,7 @@ ul.add-menu-item-tabs li { /* Create Menu */ #menu-name { width: 270px; + vertical-align: middle; } #manage-menu .inside { @@ -393,10 +363,10 @@ ul.add-menu-item-tabs li { width: 180px; } +.customlinkdiv label, .nav-menus-php .howto span { - margin-top: 6px; - display: block; float: left; + margin-top: 6px; } /* Menu item types */ @@ -404,6 +374,11 @@ ul.add-menu-item-tabs li { width: 190px; } +.quick-search-wrap .spinner { + float: none; + margin: -3px -10px 0 0; +} + .nav-menus-php .list-wrap { display: none; clear: both; @@ -467,10 +442,11 @@ ul.add-menu-item-tabs li { } .menu-item-bar .menu-item-handle { - border: 1px solid #dfdfdf; + border: 1px solid #ddd; position: relative; padding: 10px 15px; height: auto; + min-height: 20px; width: 382px; line-height: 30px; overflow: hidden; @@ -507,12 +483,16 @@ ul.add-menu-item-tabs li { margin-right: 13em; } +.menu-item-handle .menu-item-title.no-title { + color: #72777c; +} + /* Sortables */ -li.menu-item.ui-sortable-helper dl { +li.menu-item.ui-sortable-helper .menu-item-bar { margin-top: 0; } -li.menu-item.ui-sortable-helper .menu-item-transport dl { +li.menu-item.ui-sortable-helper .menu-item-transport .menu-item-bar { margin-top: 13px; } @@ -522,7 +502,12 @@ li.menu-item.ui-sortable-helper .menu-item-transport dl { margin-top: 13px; } -/* WARNING: The factor of 30px is hardcoded into the nav-menus javascript. */ +/* Hide the transport list when it's empty */ +.menu-item .menu-item-transport:empty { + display: none; +} + +/* WARNING: The factor of 30px is hardcoded into the nav-menus JavaScript. */ .menu-item-depth-0 { margin-left: 0px; } .menu-item-depth-1 { margin-left: 30px; } .menu-item-depth-2 { margin-left: 60px; } @@ -564,11 +549,11 @@ body.menu-max-depth-11 { min-width: 1280px !important; } /* Menu item controls */ .item-type { - color: #777; + display: inline-block; + padding: 12px 16px; + color: #666; font-size: 12px; - padding: 12px 10px; line-height: 18px; - display: block; } .item-controls { @@ -604,6 +589,51 @@ body.menu-max-depth-11 { min-width: 1280px !important; } white-space: nowrap; } +.no-js.nav-menus-php .item-edit { + position: static; + float: right; + width: auto; + height: auto; + margin-right: -10px !important; + padding: 12px 0; + color: #0073aa; + text-decoration: underline; + font-size: 12px; + line-height: 18px; + text-indent: 0; +} + +.nav-menus-php .item-edit:before { + margin-top: 10px; + margin-left: 4px; + width: 20px; + -webkit-border-radius: 50%; + border-radius: 50%; + text-indent: -1px; /* account for the dashicon alignment */ +} + +.no-js.nav-menus-php .item-edit:before { + display: none; +} + +.rtl .nav-menus-php .item-edit:before { + text-indent: 1px; /* account for the dashicon alignment */ +} + +.nav-menus-php .item-edit:focus { + -webkit-box-shadow: none; + box-shadow: none; +} + +.nav-menus-php .item-edit:focus:before { + -webkit-box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); + box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); +} + /* Menu editing */ .menu-instructions-inactive { display: none; @@ -643,8 +673,8 @@ body.menu-max-depth-11 { min-width: 1280px !important; } display: block; margin: 0 0 10px; padding: 3px 5px 5px; - border: 1px solid #dfdfdf; - color: #777; + border: 1px solid #ddd; + color: #72777c; font-size: 12px; font-style: italic; } @@ -666,7 +696,6 @@ body.menu-max-depth-11 { min-width: 1280px !important; } .description-thin { width: 190px; - height: 40px; } .description-wide { @@ -684,14 +713,12 @@ body.menu-max-depth-11 { min-width: 1280px !important; } /* Major/minor publishing actions (classes) */ .nav-menus-php .major-publishing-actions { clear: both; - padding: 3px 0 6px; + padding: 7px 0 6px; } .nav-menus-php .major-publishing-actions .publishing-action { text-align: right; float: right; - line-height: 23px; - margin: 4px 0 1px; } .nav-menus-php .blank-slate .menu-settings { @@ -704,14 +731,14 @@ body.menu-max-depth-11 { min-width: 1280px !important; } } .nav-menus-php .submitbox .submitcancel { - border-bottom: 1px solid #0074a2; + border-bottom: 1px solid #0073aa; padding: 1px 2px; - color: #0074a2; + color: #0073aa; text-decoration: none; } .nav-menus-php .submitbox .submitcancel:hover { - background: #0074a2; + background: #0073aa; color: #fff; } @@ -720,23 +747,6 @@ body.menu-max-depth-11 { min-width: 1280px !important; } margin-left: -4px; } -/* Clearfix */ -#menu-item-name-wrap:after, -#menu-item-url-wrap:after, -#menu-name-label:after, -#menu-settings-column .inside:after, -#nav-menus-frame:after, -.nav-menus-php #post-body-content:after, -.nav-menus-php .button-controls:after, -.nav-menus-php .major-publishing-actions:after, -.nav-menus-php .menu-item-settings:after { - clear: both; - content: "."; - display: block; - height: 0; - visibility: hidden; -} - #nav-menus-frame, .button-controls, #menu-item-url-wrap, @@ -747,6 +757,24 @@ body.menu-max-depth-11 { min-width: 1280px !important; } /* =Media Queries -------------------------------------------------------------- */ +@media only screen and (min-width: 769px) and (max-width: 1000px){ + body.menu-max-depth-0 { + min-width: 0 !important; + } + + #menu-management-liquid{ + width: 100%; + } + + .nav-menus-php #post-body-content{ + min-width: 0; + } + + .menu-item-bar .menu-item-handle{ + width: 90%; + } +} + @media screen and ( max-width: 782px ) { body.nav-menus-php { min-width: 0 !important; @@ -820,13 +848,17 @@ body.menu-max-depth-11 { min-width: 1280px !important; } .menu-item-settings .description-thin, .menu-item-settings .description-wide { width: 100%; - height: auto; } .menu-item-settings input { width: 100%; } + .menu-item-settings input[type="checkbox"], + .menu-item-settings input[type="radio"] { + width: 25px; + } + .menu-settings dl { padding-left: 0; } @@ -843,6 +875,14 @@ body.menu-max-depth-11 { min-width: 1280px !important; } margin-left: 0; margin-bottom: 15px; } + + .manage-menus select { + margin: 0.5em 0; + } + + .widefat .menu-locations .menu-location-title { + padding-top: 16px; + } } @media only screen and (max-width: 768px) { diff --git a/wp-admin/css/nav-menus.min.css b/wp-admin/css/nav-menus.min.css new file mode 100644 index 0000000..de800b0 --- /dev/null +++ b/wp-admin/css/nav-menus.min.css @@ -0,0 +1 @@ +.no-js #message{display:block}ul.add-menu-item-tabs li{padding:3px 5px 3px 8px}.accordion-section ul.add-menu-item-tabs,.accordion-section ul.category-tabs,.accordion-section ul.wp-tab-bar{margin:0}.accordion-section .categorychecklist{margin:13px 0}#nav-menu-meta .accordion-section-content{padding:18px 13px}#nav-menu-meta .button-controls{margin-bottom:0}#nav-menus-frame{margin-left:300px;margin-top:23px}#wpbody-content #menu-settings-column{display:inline;width:281px;margin-left:-300px;clear:both;float:left;padding-top:0}#menu-settings-column .inside{clear:both;margin:10px 0 0}.metabox-holder-disabled .accordion-section-content,.metabox-holder-disabled .accordion-section-title,.metabox-holder-disabled .postbox{opacity:.5;filter:alpha(opacity=50)}.metabox-holder-disabled .button-controls .select-all{display:none}#wpbody{position:relative}.blank-slate .menu-settings{border:none;margin-top:0;padding-top:0;overflow:hidden}.is-submenu{color:#555d66;font-style:italic;font-weight:400;margin-left:4px}.manage-menus{margin-top:23px;padding:10px;overflow:hidden;background:#fbfbfb}.manage-menus .selected-menu,.manage-menus .submit-btn,.manage-menus select,.nav-menus-php .add-new-menu-action{display:inline-block;margin-right:3px;vertical-align:middle}.manage-menus select,.menu-location-menus select{max-width:100%}.menu-edit #post-body-content h3{margin:1em 0 10px}.menu-settings{border-top:1px solid #eee;margin-top:2em}.menu-settings dl{margin:0 0 10px;overflow:hidden;padding-left:18%}.menu-settings dd{float:left;margin:0;width:100%}.menu-settings dt{float:left;clear:both;width:21.951%;padding:3px 0 0;margin-left:-21.951%}.menu-settings label{vertical-align:baseline}.menu-edit .checkbox-input{margin-top:4px}.theme-location-set{color:#72777c;font-size:11px}#add-custom-link .howto,#cancel-save{font-size:12px}#menu-management-liquid{float:left;min-width:100%;margin-top:3px}#menu-management{position:relative;margin-right:20px;margin-top:-3px;width:100%;background:#f5f5f5}#menu-management .menu-edit{margin-bottom:20px}.nav-menus-php #post-body{padding:0 10px 10px;border-top:1px solid #fff;border-bottom:1px solid #ddd;background:#fff}#nav-menu-footer,#nav-menu-header{padding:0 10px}#nav-menu-header{border-bottom:1px solid #ddd;margin-bottom:0}#nav-menu-header .menu-name-label{display:inline-block;vertical-align:middle;margin-right:7px;font-style:italic}.nav-menus-php #post-body div.error,.nav-menus-php #post-body div.updated{margin:0}.nav-menus-php #post-body-content{position:relative;float:none}#menu-management .menu-add-new abbr{font-weight:600}#select-nav-menu-container{text-align:right;padding:0 10px 3px;margin-bottom:5px}#select-nav-menu{width:100px;display:inline}#menu-name-label{margin-top:-2px}.widefat .menu-locations .menu-location-title{padding:13px 10px 0}.menu-location-title label{font-weight:700}.menu-location-menus select{float:left}#locations-nav-menu-wrapper{padding:5px 0}.locations-nav-menu-select select{float:left;width:160px;margin-right:5px}.locations-row-links{float:left;margin:6px 0 0 6px}.locations-add-menu-link,.locations-edit-menu-link{margin:0 3px}.locations-edit-menu-link{padding-right:3px;border-right:1px solid #ccc}#menu-management .inside{padding:0 10px}.customlinkdiv .menu-item-textbox,.postbox .howto input{width:180px;float:right}.accordion-container .outer-border{margin:0}.customlinkdiv p{margin-top:0}#nav-menu-theme-locations .howto select{width:100%}#nav-menu-theme-locations .button-controls{text-align:right}.add-menu-item-view-all{height:400px}#menu-container .submit{margin:0 0 10px;padding:0}.nav-menus-php .meta-sep,.nav-menus-php .submitcancel,.nav-menus-php .submitdelete{display:block;float:left;margin:6px 0;line-height:15px}.meta-sep{padding:0 2px}#cancel-save{text-decoration:underline;margin-left:20px;margin-top:5px}.button-primary.right,.button-secondary.right,.button.right{float:right}.list-controls{float:left;margin-top:5px}.add-to-menu{float:right}.button-controls{clear:both;margin:10px 0}.hide-all,.show-all{cursor:pointer}.hide-all{display:none}#menu-name{width:270px;vertical-align:middle}#manage-menu .inside{padding:0}#available-links dt{display:block}#add-custom-link label span{display:block;float:left;margin-top:5px;padding-right:5px}.menu-item-textbox{width:180px}.customlinkdiv label,.nav-menus-php .howto span{float:left;margin-top:6px}.quick-search{width:190px}.quick-search-wrap .spinner{float:none;margin:-3px -10px 0 0}.nav-menus-php .list-wrap{display:none;clear:both;margin-bottom:10px}.nav-menus-php .postbox p.submit{margin-bottom:0}.nav-menus-php .list li{display:none;margin:0 0 5px}.nav-menus-php .list li .menu-item-title{cursor:pointer;display:block}.nav-menus-php .list li .menu-item-title input{margin-right:3px;margin-top:-3px}.menu-item-title input[type=checkbox]{display:inline-block;margin-top:-4px}#menu-container .inside{padding-bottom:10px}.menu{padding-top:1em}#menu-to-edit{margin:0;padding:.1em 0}.menu ul{width:100%}.menu li{margin-bottom:0;position:relative}.menu-item-bar{clear:both;line-height:1.5em;position:relative;margin:9px 0 0}.menu-item-bar .menu-item-handle{border:1px solid #ddd;position:relative;padding:10px 15px;height:auto;min-height:20px;width:382px;line-height:30px;overflow:hidden;word-wrap:break-word}.menu-item-bar .menu-item-handle:hover{border-color:#999}#menu-to-edit .menu-item-invalid .menu-item-handle{background:#f6c9cc;border-color:#f1acb1}.no-js .menu-item-edit-active .item-edit{display:none}.js .menu-item-handle{cursor:move}#cancel-save,.item-controls a:hover{cursor:pointer}.menu li.deleting .menu-item-handle{background-image:none;background-color:#f66}.menu-item-handle .item-title{font-size:13px;font-weight:600;line-height:20px;display:block;margin-right:13em}.menu-item-handle .menu-item-title.no-title{color:#72777c}li.menu-item.ui-sortable-helper .menu-item-bar{margin-top:0}li.menu-item.ui-sortable-helper .menu-item-transport .menu-item-bar{margin-top:13px}.menu .sortable-placeholder{height:35px;width:410px;margin-top:13px}.menu-item .menu-item-transport:empty{display:none}.menu-item-depth-0{margin-left:0}.menu-item-depth-1{margin-left:30px}.menu-item-depth-2{margin-left:60px}.menu-item-depth-3{margin-left:90px}.menu-item-depth-4{margin-left:120px}.menu-item-depth-5{margin-left:150px}.menu-item-depth-6{margin-left:180px}.menu-item-depth-7{margin-left:210px}.menu-item-depth-8{margin-left:240px}.menu-item-depth-9{margin-left:270px}.menu-item-depth-10{margin-left:300px}.menu-item-depth-11{margin-left:330px}.menu-item-depth-0 .menu-item-transport{margin-left:0}.menu-item-depth-1 .menu-item-transport{margin-left:-30px}.menu-item-depth-2 .menu-item-transport{margin-left:-60px}.menu-item-depth-3 .menu-item-transport{margin-left:-90px}.menu-item-depth-4 .menu-item-transport{margin-left:-120px}.menu-item-depth-5 .menu-item-transport{margin-left:-150px}.menu-item-depth-6 .menu-item-transport{margin-left:-180px}.menu-item-depth-7 .menu-item-transport{margin-left:-210px}.menu-item-depth-8 .menu-item-transport{margin-left:-240px}.menu-item-depth-9 .menu-item-transport{margin-left:-270px}.menu-item-depth-10 .menu-item-transport{margin-left:-300px}.menu-item-depth-11 .menu-item-transport{margin-left:-330px}body.menu-max-depth-0{min-width:950px!important}body.menu-max-depth-1{min-width:980px!important}body.menu-max-depth-2{min-width:1010px!important}body.menu-max-depth-3{min-width:1040px!important}body.menu-max-depth-4{min-width:1070px!important}body.menu-max-depth-5{min-width:1100px!important}body.menu-max-depth-6{min-width:1130px!important}body.menu-max-depth-7{min-width:1160px!important}body.menu-max-depth-8{min-width:1190px!important}body.menu-max-depth-9{min-width:1220px!important}body.menu-max-depth-10{min-width:1250px!important}body.menu-max-depth-11{min-width:1280px!important}.item-type{display:inline-block;padding:12px 16px;color:#666;font-size:12px;line-height:18px}.item-controls{font-size:12px;position:absolute;right:20px;top:-1px}.item-controls a{text-decoration:none}.item-controls .item-order{padding-right:10px}.nav-menus-php .item-edit{position:absolute;right:-20px;top:0;display:block;width:30px;height:40px;margin-right:0!important;text-indent:100%;outline:0;overflow:hidden;white-space:nowrap}.no-js.nav-menus-php .item-edit{position:static;float:right;width:auto;height:auto;margin-right:-10px!important;padding:12px 0;color:#0073aa;text-decoration:underline;font-size:12px;line-height:18px;text-indent:0}.nav-menus-php .item-edit:before{margin-top:10px;margin-left:4px;width:20px;-webkit-border-radius:50%;border-radius:50%;text-indent:-1px}.no-js.nav-menus-php .item-edit:before{display:none}.rtl .nav-menus-php .item-edit:before{text-indent:1px}.nav-menus-php .item-edit:focus{-webkit-box-shadow:none;box-shadow:none}.nav-menus-php .item-edit:focus:before{-webkit-box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}.menu-instructions-inactive{display:none}.menu-item-settings{display:block;width:402px;padding:10px 0 10px 10px;position:relative;z-index:10;border:1px solid #e5e5e5;border-top:none;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04)}.menu-item-settings .field-move a{display:none;margin:0 2px}.menu-item-edit-active .menu-item-settings{display:block}.menu-item-edit-inactive .menu-item-settings{display:none}.add-menu-item-pagelinks{margin:.5em auto;text-align:center}.link-to-original{display:block;margin:0 0 10px;padding:3px 5px 5px;border:1px solid #ddd;color:#72777c;font-size:12px;font-style:italic}.hidden-field,.nav-menus-php .blank-slate .menu-settings{display:none}.link-to-original a{padding-left:4px;font-style:normal}.menu-item-settings .description-thin,.menu-item-settings .description-wide{margin-right:10px;float:left}.description-thin{width:190px}.description-wide{width:390px}.menu-item-actions{padding-top:15px}.nav-menus-php .major-publishing-actions{clear:both;padding:7px 0 6px}.nav-menus-php .major-publishing-actions .publishing-action{text-align:right;float:right}.nav-menus-php .delete-action{float:left;margin-top:2px}.nav-menus-php .submitbox .submitcancel{border-bottom:1px solid #0073aa;padding:1px 2px;color:#0073aa;text-decoration:none}.nav-menus-php .submitbox .submitcancel:hover{background:#0073aa;color:#fff}.nav-menus-php .major-publishing-actions .form-invalid{padding-left:4px;margin-left:-4px}#menu-item-name-wrap,#menu-item-url-wrap,#nav-menus-frame,.button-controls{display:block}@media only screen and (min-width:769px) and (max-width:1000px){body.menu-max-depth-0{min-width:0!important}#menu-management-liquid{width:100%}.nav-menus-php #post-body-content{min-width:0}.menu-item-bar .menu-item-handle{width:90%}}@media screen and (max-width:782px){body.nav-menus-php{min-width:0!important}#nav-menus-frame{margin-left:0;float:none;width:100%}#wpbody-content #menu-settings-column{display:block;width:100%;float:none;margin-left:0}#side-sortables .add-menu-item-tabs{margin:15px 0 14px}ul.add-menu-item-tabs li.tabs{padding:13px 15px 14px}.nav-menus-php .item-controls .item-type{margin-top:2px}.nav-menus-php .customlinkdiv .howto input{width:65%}.nav-menus-php .quick-search{width:85%}#menu-management-liquid{margin-top:25px}.nav-menus-php .menu-name-label.howto span{margin-top:13px}.menu-name-label #menu-name{margin-top:4px}.nav-menus-php .major-publishing-actions .publishing-action{margin-top:6px}.nav-menus-php .delete-action{font-size:14px;line-height:50px;margin-top:12px}.description-wide,.menu-item-bar .menu-item-handle,.menu-item-settings{width:auto}.menu-item-settings{padding:10px}.menu-item-settings .description-thin,.menu-item-settings .description-wide,.menu-item-settings input{width:100%}.menu-item-settings input[type=checkbox],.menu-item-settings input[type=radio]{width:25px}.menu-settings dl{padding-left:0}.menu-settings dd{float:none;width:100%;margin-bottom:15px}.menu-settings dt{float:none;width:auto;margin-left:0;margin-bottom:15px}.manage-menus select{margin:.5em 0}.widefat .menu-locations .menu-location-title{padding-top:16px}}@media only screen and (max-width:768px){#menu-locations-wrap .widefat{width:100%}} \ No newline at end of file diff --git a/wp-admin/css/press-this-editor-rtl.css b/wp-admin/css/press-this-editor-rtl.css new file mode 100644 index 0000000..90d8cdc --- /dev/null +++ b/wp-admin/css/press-this-editor-rtl.css @@ -0,0 +1,122 @@ +/* +Press This TinyMCE editor styles :) +*/ + + +/** +* Links +*/ +a { + color: #0073aa; +} + +a:visited { + color: #0073aa; +} + +a:hover, +a:focus, +a:active { + color: #00a0d2; +} + + +/** +* Lists +*/ +ul, +ol { + margin: 0 3em 1.5em 0; +} + +ul { + list-style: disc; +} + +ol { + list-style: decimal; +} + +li > ul, +li > ol { + margin-bottom: 0; + margin-right: 1.5em; +} + +dt { + font-weight: 700; +} + +dd { + margin: 0 1.5em 1.5em; +} + + +/** +* Media +* +* Basic image and object styles +*/ +img { + max-width: 100%; + height: auto; +} + +/* Makes sure embeds and iframes fit inside their containers */ +embed, +iframe, +object { + max-width: 100%; +} + + +/** +* TinyMCE styles +* +* Pretty dang good. +*/ +body { + color: #404040; + font-family: "Open Sans", Helvetica, Arial, sans-serif; + font-size: 20px; + font-weight: 400; + line-height: 1.6; +} +@media (max-width: 900px) { + body#tinymce { + padding-top: 30px !important; + } +} +@media (max-width: 640px) { + body { + font-size: 16px; + } +} +@media (max-width: 320px) { + body { + margin: 0 15px; + } +} + +#tinymce b, +#tinymce strong { + /* overrides TinyMCE's !important. Woohoo. */ + font-weight: 700 !important; +} + +blockquote { + margin: 1em 1.5em; + color: #9ea7af; + font-size: em(25px); + font-style: italic; +} +@media (max-width: 900px) { + blockquote { + margin: 1.5em 1em; + } +} + +ul, +ol { + margin: 0 .75em 1.5em 0; +} diff --git a/wp-admin/css/press-this-editor-rtl.min.css b/wp-admin/css/press-this-editor-rtl.min.css new file mode 100644 index 0000000..2bb1662 --- /dev/null +++ b/wp-admin/css/press-this-editor-rtl.min.css @@ -0,0 +1 @@ +embed,iframe,img,object{max-width:100%}a,a:visited{color:#0073aa}a:active,a:focus,a:hover{color:#00a0d2}ul{list-style:disc}ol{list-style:decimal}li>ol,li>ul{margin-bottom:0;margin-right:1.5em}dt{font-weight:700}dd{margin:0 1.5em 1.5em}img{height:auto}body{color:#404040;font-family:"Open Sans",Helvetica,Arial,sans-serif;font-size:20px;font-weight:400;line-height:1.6}@media (max-width:640px){body{font-size:16px}}@media (max-width:320px){body{margin:0 15px}}#tinymce b,#tinymce strong{font-weight:700!important}blockquote{margin:1em 1.5em;color:#9ea7af;font-size:em(25px);font-style:italic}@media (max-width:900px){body#tinymce{padding-top:30px!important}blockquote{margin:1.5em 1em}}ol,ul{margin:0 .75em 1.5em 0} \ No newline at end of file diff --git a/wp-admin/css/press-this-editor.css b/wp-admin/css/press-this-editor.css new file mode 100644 index 0000000..96ff426 --- /dev/null +++ b/wp-admin/css/press-this-editor.css @@ -0,0 +1,122 @@ +/* +Press This TinyMCE editor styles :) +*/ + + +/** +* Links +*/ +a { + color: #0073aa; +} + +a:visited { + color: #0073aa; +} + +a:hover, +a:focus, +a:active { + color: #00a0d2; +} + + +/** +* Lists +*/ +ul, +ol { + margin: 0 0 1.5em 3em; +} + +ul { + list-style: disc; +} + +ol { + list-style: decimal; +} + +li > ul, +li > ol { + margin-bottom: 0; + margin-left: 1.5em; +} + +dt { + font-weight: 700; +} + +dd { + margin: 0 1.5em 1.5em; +} + + +/** +* Media +* +* Basic image and object styles +*/ +img { + max-width: 100%; + height: auto; +} + +/* Makes sure embeds and iframes fit inside their containers */ +embed, +iframe, +object { + max-width: 100%; +} + + +/** +* TinyMCE styles +* +* Pretty dang good. +*/ +body { + color: #404040; + font-family: "Open Sans", Helvetica, Arial, sans-serif; + font-size: 20px; + font-weight: 400; + line-height: 1.6; +} +@media (max-width: 900px) { + body#tinymce { + padding-top: 30px !important; + } +} +@media (max-width: 640px) { + body { + font-size: 16px; + } +} +@media (max-width: 320px) { + body { + margin: 0 15px; + } +} + +#tinymce b, +#tinymce strong { + /* overrides TinyMCE's !important. Woohoo. */ + font-weight: 700 !important; +} + +blockquote { + margin: 1em 1.5em; + color: #9ea7af; + font-size: em(25px); + font-style: italic; +} +@media (max-width: 900px) { + blockquote { + margin: 1.5em 1em; + } +} + +ul, +ol { + margin: 0 0 1.5em .75em; +} diff --git a/wp-admin/css/press-this-editor.min.css b/wp-admin/css/press-this-editor.min.css new file mode 100644 index 0000000..c840de5 --- /dev/null +++ b/wp-admin/css/press-this-editor.min.css @@ -0,0 +1 @@ +embed,iframe,img,object{max-width:100%}a,a:visited{color:#0073aa}a:active,a:focus,a:hover{color:#00a0d2}ul{list-style:disc}ol{list-style:decimal}li>ol,li>ul{margin-bottom:0;margin-left:1.5em}dt{font-weight:700}dd{margin:0 1.5em 1.5em}img{height:auto}body{color:#404040;font-family:"Open Sans",Helvetica,Arial,sans-serif;font-size:20px;font-weight:400;line-height:1.6}@media (max-width:640px){body{font-size:16px}}@media (max-width:320px){body{margin:0 15px}}#tinymce b,#tinymce strong{font-weight:700!important}blockquote{margin:1em 1.5em;color:#9ea7af;font-size:em(25px);font-style:italic}@media (max-width:900px){body#tinymce{padding-top:30px!important}blockquote{margin:1.5em 1em}}ol,ul{margin:0 0 1.5em .75em} \ No newline at end of file diff --git a/wp-admin/css/press-this-rtl.css b/wp-admin/css/press-this-rtl.css index 4773ba4..7caf0c4 100644 --- a/wp-admin/css/press-this-rtl.css +++ b/wp-admin/css/press-this-rtl.css @@ -1,458 +1,2209 @@ -.press-this #message { - border-right: 4px solid #7ad03a; - padding: 1px 12px; +/* +Press This styles :) +*/ + + +/** +* Normalize +* +* normalize.css v3.0.0 | MIT License | git.io/normalize +*/ +html { + font-family: sans-serif; + -ms-text-size-adjust: 100%; + -webkit-text-size-adjust: 100%; +} + +body { + margin: 0; +} + +*, +*:before, +*:after { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi) { + *, + *:before, + *:after { + -webkit-font-smoothing: antialiased; + } +} + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +nav, +section, +summary { + display: block; +} + +audio, +canvas, +progress, +video { + display: inline-block; + vertical-align: baseline; +} + +audio:not([controls]) { + display: none; + height: 0; +} + +[hidden], +template { + display: none; +} + +a { + background: transparent; +} + +a:active, +a:hover { + outline: 0; +} + +abbr[title] { + border-bottom: 1px dotted; +} + +b, +strong { + font-weight: bold; +} + +dfn { + font-style: italic; +} + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +mark { + background: #ff0; + color: #000; +} + +small { + font-size: 80%; +} + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + +img { + border: 0; +} + +svg:not(:root) { + overflow: hidden; +} + +figure { + margin: 1em 40px; +} + +hr { + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; +} + +pre { + overflow: auto; +} + +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; +} + +button, +input, +optgroup, +select, +textarea { + color: inherit; + font: inherit; + margin: 0; +} + +button { + overflow: visible; +} + +button, +select { + text-transform: none; +} + +button, +html input[type="button"], +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; + cursor: pointer; +} + +button[disabled], +html input[disabled] { + cursor: default; +} + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +input { + line-height: normal; +} + +input[type="checkbox"], +input[type="radio"] { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + padding: 0; +} + +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +input[type="search"] { + -webkit-appearance: textfield; + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} + +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +fieldset { + border: 0; + margin: 0; + padding: 0; +} + +legend { + border: 0; + padding: 0; +} + +textarea { + overflow: auto; +} + +optgroup { + font-weight: bold; +} + +table { + border-collapse: collapse; + border-spacing: 0; +} + +td, +th { + padding: 0; +} + +::-webkit-input-placeholder { + color: #72777c; +} + +::-moz-placeholder { + color: #72777c; + opacity: 1; +} + +:-ms-input-placeholder { + color: #72777c; +} + +.clearfix:before, +.clearfix:after { + content: ""; + display: table; +} +.clearfix:after { + clear: both; +} + +.hide-if-js { + display: none; +} + +.screen-reader-text { + position: absolute; + margin: -1px; + padding: 0; + height: 1px; + width: 1px; + overflow: hidden; + clip: rect(0 0 0 0); + border: 0; +} + + +/** +* Typography +* +* Base element typographic styles. +*/ +body, +button, +input, +select, +textarea { + color: #404040; + font-family: "Open Sans", Helvetica, Arial, sans-serif; + font-size: 20px; + font-weight: 400; + line-height: 1.6; +} + +h1, +h2, +h3, +h4, +h5, +h6 { + clear: both; +} + +p { + margin-bottom: 1.5em; +} + +b, +strong { + font-weight: 700; +} + + +/** +* Buttons +* +* Pushing buttons is what I do. +*/ + +.scan-submit { + display: inline-block; + margin: 0; + padding: 0 10px 1px; + border-width: 1px; + border-style: solid; + -webkit-border-radius: 3px; + border-radius: 3px; + font-size: 13px; + line-height: 2; + text-decoration: none; + white-space: nowrap; + cursor: pointer; + -webkit-appearance: none; +} + +.split-button { + position: relative; + display: inline-block; + vertical-align: middle; +} + +.split-button-body { + display: none; + position: absolute; + bottom: 39px; + left: 0; + border: 1px solid #ddd; + background-color: #fff; + min-width: 180px; + max-width: 100%; + margin: 0; + padding: 8px; + list-style: none; + -webkit-box-shadow: -1px 0 4px rgba( 0, 0, 0, 0.15 ); + box-shadow: -1px 0 4px rgba( 0, 0, 0, 0.15 ); +} + +.split-button-body:before, +.split-button-body:after { + position: absolute; + left: 12px; + display: block; + width: 0; + height: 0; + border-style: solid; + border-color: transparent; + content: ""; +} + +.split-button-body:before { + bottom: -18px; + border-top-color: #ccc; + border-width: 9px; + left: 11px; +} + +.split-button-body:after { + bottom: -16px; + border-top-color: #fff; + border-width: 8px; +} + +.split-button-body .split-button-option { + display: block; + padding: 5px 15px; + margin: 0; + width: 100%; + text-align: right; + line-height: 2; +} + +.is-open .split-button-body { + display: block; +} + +.split-button-primary, +.split-button-toggle { + -webkit-border-radius: 0; + border-radius: 0; + display: block; + margin: 0; + font-size: 13px; + text-decoration: none; + white-space: nowrap; + cursor: pointer; + -webkit-appearance: none; + line-height: 2; + padding: 0 10px 1px; + background: #0085ba; + border-color: #0073aa #006799 #006799; + border-width: 1px; + border-style: solid; + -webkit-box-shadow: 0 1px 0 #006799; + box-shadow: 0 1px 0 #006799; + color: #fff; + text-shadow: 0 -1px 1px #006799, + -1px 0 1px #006799, + 0 1px 1px #006799, + 1px 0 1px #006799; +} + +.split-button-primary { + -webkit-border-top-right-radius: 3px; + border-top-right-radius: 3px; + -webkit-border-bottom-right-radius: 3px; + border-bottom-right-radius: 3px; + border-left: 0 none; + float: right; +} + +.split-button-toggle { + padding: 0; + -webkit-border-top-left-radius: 3px; + border-top-left-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + border-bottom-left-radius: 3px; + border-right: 1px solid #006799; + float: left; +} + +.split-button-toggle i { + margin: 4px 0 3px 20px; + padding: 0 10px; +} + +.split-button-primary:hover, +.split-button-toggle:hover { + outline: none; + background: #008ec2; + border-color: #006799; +} + +.split-button-primary:focus, +.split-button-toggle:focus { + outline: none; + -webkit-box-shadow: 0 1px 0 #0073aa, + 0 0 2px 1px #33b3db; + box-shadow: 0 1px 0 #0073aa, + 0 0 2px 1px #33b3db; +} + +.split-button-primary:active, +.split-button-toggle:active { + background: #0073aa; + border-color: #006799; + -webkit-box-shadow: inset 0 2px 10px #006799, 0 1px 0 #0073aa; + box-shadow: inset 0 2px 10px #006799, 0 1px 0 #0073aa; +} + +/** +* Forms +* +* So many input types. +*/ +button, +input, +select, +textarea { + font-size: 100%; + margin: 0; + vertical-align: baseline; + *vertical-align: middle; +} + +[type="checkbox"], +[type="radio"] { + padding: 0; +} + +[type="search"] { + -webkit-appearance: textfield; + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} + +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +[type="text"], +[type="email"], +[type="url"], +[type="password"], +[type="search"], +textarea { + padding: 0.4em 0.75em; + color: #32373c; + border: 1px solid #ccc; +} + +[type="text"]:focus, +[type="email"]:focus, +[type="url"]:focus, +[type="password"]:focus, +[type="search"]:focus, +textarea:focus { + color: #32373c; + outline: 0; +} + +textarea { + overflow: auto; + padding-right: 3px; + vertical-align: top; +} + + +/** +* Links +*/ +a { + color: #0073aa; +} + +a:visited { + color: #0073aa; +} + +a:hover, +a:focus, +a:active { + color: #00a0d2; +} + + +/** +* Lists +*/ +ul, +ol { + margin: 0 3em 1.5em 0; +} + +ul { + list-style: disc; +} + +ol { + list-style: decimal; +} + +li > ul, +li > ol { + margin-bottom: 0; + margin-right: 1.5em; +} + +dt { + font-weight: 700; +} + +dd { + margin: 0 1.5em 1.5em; +} + + +/** +* Post formats +* +* Complete styles for post formats UI +*/ +/* TODO if we remove the <br> during merge, this can go. */ +#post-formats-select br { + display: none; +} + +.post-format { + width: 1px; + height: 1px; + position: absolute; + top: -9999px; +} + +.lt-ie9 .post-format { + margin: 17px 13px 0 12px; + width: auto; + height: auto; + position: static; + top: auto; + float: right; + width: 16px; + height: 16px; +} + +.post-format-icon { + position: relative; + display: block; + padding: 13px 13px 14px 2px; + cursor: pointer; +} + +.post-format-icon:before, +.post-format-icon:after { + content: ""; + display: inline-block; + width: 20px; + height: 20px; + margin-left: 10px; + font-size: 20px; + line-height: 1; + font-family: dashicons; + text-decoration: inherit; + color: #9ea7af; + font-weight: 400; + font-style: normal; + vertical-align: top; + text-align: center; + -webkit-transition: color .1s ease-in 0; + transition: color .1s ease-in 0; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.post-format-icon:before { + content: "\f109"; +} + +.post-format-icon:after { + display: none; + content: "\f147"; + float: left; +} + +.post-format:checked + .post-format-icon { + -webkit-box-shadow: inset -6px 0 0 #00a0d2; + box-shadow: inset -6px 0 0 #00a0d2; + background: rgba(46, 162, 204, 0.1); +} + +.post-format:checked + .post-format-icon:before, +.post-format:checked + .post-format-icon:after { + color: #32373c; +} + +.post-format:focus + .post-format-icon { + background: #00a0d2; + color: #fff; +} + +.post-format:focus + .post-format-icon:before, +.post-format:focus + .post-format-icon:after { + color: #fff; +} + +.post-format:checked + .post-format-icon:after { + display: block; +} + +.lt-ie9 .post-format-icon { + margin-right: 16px; +} + +.post-format-aside:before { + content: "\f123"; +} + +.post-format-image:before { + content: "\f128"; +} + +.post-format-video:before { + content: "\f126"; +} + +.post-format-audio:before { + content: "\f127"; +} + +.post-format-quote:before { + content: "\f122"; +} + +.post-format-link:before { + content: "\f103"; +} + +.post-format-gallery:before { + content: "\f161"; +} + + +/** +* Tags +* +* Complete styles for tags UI +*/ +.tagsdiv p { + margin: 0; +} + +.tagsdiv .ajaxtag { + position: relative; +} + +.tagsdiv .newtag { + display: block; + position: relative; + padding: 11px 16px 11px 58px; + width: 100%; + border: 0; + border-bottom: 1px solid #e5e5e5; + font-size: 16px; +} + +.tagsdiv .tagadd { + position: absolute; + top: 0; + left: 0; + bottom: 1px; + border: 0; + -webkit-border-radius: 0; + border-radius: 0; + margin: 0; + padding: 0 16px; + background: #f7f7f7; + border-right: 1px solid #f1f1f1; + -webkit-box-shadow: none; + box-shadow: none; +} + +.tagsdiv .tagadd:hover, +.tagsdiv .tagadd:active, +.tagsdiv .tagadd:focus { + outline: 0; + background: #2991b7; + border-color: #20708e; + color: #fff; + -webkit-box-shadow: none; + box-shadow: none; +} + +.tagsdiv .howto { + color: #727272; + font-style: italic; + margin: 10px 16px 6px 0; +} + + +/* Tag hint TODO needed? */ +/* Tag suggestions */ +.ac_results { + padding: 0; + margin: -1px -1px 0 0; + list-style: none; + position: absolute; + z-index: 10000; + display: none; + border: 1px solid #d8d8d8; background-color: #fff; - -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); - box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); + font-size: 14px; +} + +.ac_results li { + padding: 6px 16px; + white-space: nowrap; + text-align: right; +} + +.ac_results .ac_over { + background-color: #e5e5e5; + background-color: #00a0d2; + color: #fff; + cursor: pointer; +} + +.ac_match { + text-decoration: underline; +} + +/* Tags */ +.tagchecklist { + padding: 16px 28px 5px; +} + +.tagchecklist:before, +.tagchecklist:after { + content: ""; + display: table; +} + +.tagchecklist:after { + clear: both; +} + +.tagchecklist span { + display: block; + margin-left: 25px; + float: right; + font-size: 13px; + line-height: 1.8; + white-space: nowrap; + cursor: default; +} + +@media (max-width: 600px) { + .tagchecklist span { + margin-bottom: 15px; + font-size: 16px; + line-height: 1.3; + } +} + +.tagchecklist .ntdelbutton { + margin: 1px -17px 0 0; + cursor: pointer; + width: 20px; + height: 20px; + display: block; + float: right; + text-indent: 0; + overflow: hidden; + position: absolute; + outline: 0; +} + +.tagchecklist .ntdelbutton:before { + content: "\f153"; + display: block; + margin: 2px 0; + height: 20px; + width: 20px; + background: 100% 0; + color: #9ea7af; + font: 400 16px/1 dashicons; + text-align: center; + speak: none; + -webkit-font-smoothing: antialiased; +} + +.tagchecklist .ntdelbutton:focus:before { + color: #00a0d2; +} + + +/* THE TAG CLOUD. */ +.tagsdiv + p { + margin: 0; +} + +.press-this .tagcloud-link { + display: block; + margin: 0 16px 5px; + padding: 0; + text-decoration: none; + outline: 0; +} + +.tagcloud-link:focus { + text-decoration: underline; +} + +.popular-tags { + border: none; + line-height: 2em; + padding: 8px 12px 12px; + text-align: justify; +} + +.popular-tags a { + padding: 0 3px; +} + +.the-tagcloud { + margin: 0; + padding: 16px; +} + +.the-tagcloud a { + text-decoration: none; + outline: 0; +} + +.the-tagcloud a:focus { + text-decoration: underline; +} + +.tagcloud h3 { + margin: 2px 0 12px; +} + + +/** +* Categories +* +* Complete styles for post categories UI +*/ +input[type="search"].categories-search, +.add-category-name { + display: block; + width: 100%; + padding: 0.85714em 1.07143em; + border: 0; + -webkit-border-radius: 0; + border-radius: 0; + border-bottom: 1px solid #e5e5e5; + font-size: 14px; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; +} + +@media (max-width: 600px) { + input[type="search"].categories-search, + .add-category-name { + /* Needs to be 16px to prevent zooming on iOS. Guh. */ + font-size: 16px; + } +} + +.press-this .add-cat-toggle { + float: left; + margin-top: -45px; + line-height: 20px; + padding: 12px 10px 8px; + color: #0073aa; +} + +.press-this .add-cat-toggle:focus { + text-decoration: none; + color: #00a0d2; +} + +.press-this .add-cat-toggle.is-toggled { + padding: 10px; +} + +.press-this .add-cat-toggle.is-toggled .dashicons:before { + content: "\f179"; +} + +.add-category { + position: relative; + border-bottom: 1px solid #e5e5e5; +} + +.add-category.is-hidden { + display: none; +} + +.add-category .add-cat-submit { + position: absolute; + top: 0; + left: 0; + border: 0; + -webkit-border-radius: 0; + border-radius: 0; + padding: 12px 16px; + background: #f7f7f7; + border-right: 1px solid #f1f1f1; +} + +.add-category .add-cat-submit:hover, +.add-category .add-cat-submit:active, +.add-category .add-cat-submit:focus { + outline: 0; + background: #2991b7; + border-color: #20708e; + color: #fff; +} + +/* Parent category select */ +.postform-wrapper { + padding: 12px; +} + +.postform { + display: block; + margin: 0; + width: 100%; + height: 34px; + border: 0; + -webkit-border-radius: 0; + border-radius: 0; + border: 1px solid #e5e5e5; + background: #fff; + -webkit-background-size: 20px 20px; + background-size: 20px 20px; + overflow: hidden; + line-height: 21px; + text-overflow: ellipsis; + text-decoration: none; + vertical-align: top; + white-space: nowrap; + cursor: pointer; + outline: 0; +} + +.postform:focus { + border-color: #0073aa; + -webkit-box-shadow: 0 0 0 3px #00a0d2; + box-shadow: 0 0 0 3px #00a0d2; + outline: 0; + -moz-outline: none; + -moz-user-focus: ignore; +} + +.postform::-ms-expand { + display: none; +} + +.postform::-ms-value { + background: none; + color: #727272; +} + +.postform:-moz-focusring { + color: transparent; + text-shadow: 0 0 0 #727272; +} + +/* Category list */ +.categories-select { + margin: 0; + padding: 0; + list-style: none; +} + +.categories-select ul { + margin: 0; + padding: 0; + list-style: none; +} + +.category { + position: relative; + display: block; + padding: 13px 16px 14px 16px; + cursor: pointer; + background: #fff; +} + +.category:focus, +.category.selected:focus { + outline: 0; + background: #00a0d2; + color: #fff; +} + +.category.selected { + -webkit-box-shadow: inset -6px 0 0 #00a0d2; + box-shadow: inset -6px 0 0 #00a0d2; + background: #E9F5F9; +} + +.category.selected:after { + display: inline-block; + content: "\f147"; + position: absolute; + top: 13px; + left: 0; + width: 20px; + height: 20px; + margin-left: 10px; + font-size: 20px; + line-height: 1; + font-family: dashicons; + text-decoration: inherit; + color: #23282d; + font-weight: 400; + font-style: normal; + vertical-align: top; + text-align: center; + -webkit-transition: color .1s ease-in 0; + transition: color .1s ease-in 0; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.category.selected:focus:after { + color: #fff; +} + +.categories-select ul .category { + padding-right: 24px; +} + +.categories-select ul ul .category { + padding-right: 32px; +} + +.categories-select ul ul ul .category { + padding-right: 40px; +} + +.categories-select ul ul ul ul .category { + padding-right: 48px; +} + +.categories-select ul ul ul ul ul .category { + padding-right: 56px; +} + +.categories-select ul ul ul ul ul ul .category { + padding-right: 64px; +} + +.categories-select .is-hidden { + display: none; +} + +.categories-select .is-hidden.searched-parent { + display: block; +} + +/* Category search */ +.categories-search-wrapper { + position: relative; +} + +.categories-search-wrapper.is-hidden { + display: none; +} + +.categories-search-wrapper label { + position: absolute; + top: 50%; + left: 10px; + margin-top: -10px; + color: #9ea7af; +} + + +/** +* Main +*/ +html { + overflow: auto; +} + +body { + overflow-x: hidden; + height: 100%; +} + +html { + background: #fff; + -webkit-box-shadow: 10px 0 0 rgba(0, 0, 0, 0.3); + box-shadow: 10px 0 0 rgba(0, 0, 0, 0.3); +} + +@media (max-width: 900px) { + body { + font-size: 16px; + } +} + +@media (max-width: 320px) { + body { + font-size: 14px; + } +} + +.lt-ie9 { + overflow: visible; +} + +.adminbar { + position: relative; + width: 100%; + padding: 0 0.8em; + min-height: 3.2em; + background: #23282d; + color: #fff; + z-index: 9999; +} + +.adminbar:before, +.adminbar:after { + content: ""; + display: table; +} + +.adminbar:after { + clear: both; +} + +.adminbar .dashicons { + color: #a0a5aa; /* same as WP admin bar icons */ +} + +.press-this .adminbar button { + position: absolute; + top: 50%; + left: 6px; + margin-top: -13px; + padding: 0 10px 1px; + font-size: 13px; +} + +@media (max-width: 320px) { + .adminbar { + min-height: 45px; + } +} + +.current-site { + margin-top: 0.5625em; + font-size: 16px; + line-height: 44px; + font-weight: 400; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + +@media (max-width: 600px) { + .current-site { + margin: 3px 0 0; + } +} + +@media (max-width: 320px) { + .current-site { + margin: 0; + font-size: 14px; + } +} + +.current-site-link { + text-decoration: none; +} + +.current-site-link:focus { + outline: 0; +} + +.current-site-link:focus .current-site-name{ + text-decoration: underline; +} + +.current-site-name { + color: #ededed; +} + +@media (max-width: 320px) { + .current-site-name { + font-weight: 600; + } +} + +.current-site .dashicons-wordpress { + position: relative; + top: -1px; + margin-left: 10px; + vertical-align: middle; +} + +.options, +.options.open .on-closed, +.options.closed .on-open { + display: none; +} + +@media (max-width: 900px) { + .options { + display: block; + } } -.press-this #side-sortables .category-tabs li { - display: inline; - line-height: 1.35em; +.options-panel-back.is-hidden { + display: none; +} + +.options:focus .dashicons { + color: #fff; + text-decoration: none; } -body.press-this ul.category-tabs li.tabs a { - color: #333; +.options .dashicons { + margin-top: 3px; } -.press-this #content-resize-handle { - bottom: 2px; +.options { + color: #00a0d2; } -body.press-this { - color: #333; +.alert { + position: relative; margin: 0; - padding: 0; - min-width: 708px; - min-height: 400px; + padding: 16px 50px; + border-bottom: 1px solid #e5e5e5; + font-size: 14px; } -.press-this #titlediv #title { - font-size: 1.4em; +.alert:before { + content: ""; + position: absolute; + top: 50%; + right: 30px; + width: 8px; + height: 8px; + margin-top: -4px; + -webkit-border-radius: 50%; + border-radius: 50%; + background: #00a0d2; } -.press-this #site-heading:before { - top: 3px; - position: relative; - display: inline-block; - font: normal 18px/1 'dashicons'; - speak: none; - color: #727272; - content: '\f120'; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; +@media (max-width: 600px) { + .alert { + padding: 16px 35px; + } + .alert:before { + right: 15px; + } } -.press-this #wphead { - height: 32px; - margin-right: 0; - margin-left: 0; - margin-bottom: 5px; +.alert.is-error:before { + background: red; } -.press-this #header-logo { - float: right; - margin: 7px 7px 0; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; +.scan { + position: relative; + border-bottom: 1px solid #e5e5e5; } -.press-this #wphead h1 { - font-weight: normal; - font-size: 16px; - line-height: 32px; - margin: 0; - float: right; +@media (max-width: 900px) { + .scan form { + -webkit-transition: opacity .3s ease-in-out; + transition: opacity .3s ease-in-out; + } + .scan.is-hidden form { + opacity: .2; + pointer-events: none; + } } -.press-this #wphead h1 a { - text-decoration: none; +.scan-url { + display: block; + border: 0; + padding: 0.85714em 1.07143em; + font-size: 14px; + width: 100%; } -.press-this #wphead h1 a:hover { - text-decoration: underline; +@media (max-width: 600px) { + .scan-url { + font-size: 16px; + } } -.press-this #message { - margin: 10px 0; +.scan-submit { + position: absolute; + top: 0; + left: 0; + bottom: 0; + padding: 0 1.07143em; + background: #f7f7f7; + border-color: #ddd; + border: 0; + border-right: 1px solid #f1f1f1; + -webkit-border-radius: 0; + border-radius: 0; + color: #555; + font-size: 14px; + line-height: 1.6; } -.press-this .posting { - margin-left: 250px; +.scan-submit:hover, +.scan-submit:focus { + background: #008ec2; + border-color: #006799; + color: #fff; + outline: 0; } -.press-this-sidebar { - float: left; - width: 240px; - padding-top: 10px; +.scan-submit:active { + background: #0073aa; + border-color: #006799; + color: #fff; } -.press-this #title { - margin-right: 0; - margin-left: 0; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; +.scan-submit:visited { + color: #555; } -.press-this .tagchecklist { - margin-top: 8px; +.wrapper { + position: relative; + margin-bottom: 60px; + margin-left: 320px; } -.press-this #titlediv { - margin: 0; +.wrapper:before, +.wrapper:after { + content: ""; + display: table; } -.press-this #wp-content-wrap #wp-content-editor-tools { - padding: 0; - top: 3px; - overflow: hidden; +.wrapper:after { + clear: both; } -.press-this .wp-media-buttons { - cursor: default; - padding: 8px 8px 6px; +@media (max-width: 900px) { + .wrapper { + margin: 0; + width: 100%; + } } -.press-this #wp-content-wrap #wp-content-media-buttons a { - padding: 0; - line-height: normal; - height: auto; - font-size: 16px; +.editor-wrapper { + overflow: auto; + float: right; + width: 100%; } -.press-this #wp-content-wrap .mce-toolbar .mce-btn-group .mce-btn { - margin: 0 1px; +.editor-wrapper:before, +.editor-wrapper:after { + content: ""; + display: table; } -.press-this #wp-content-wrap .mce-toolbar .mce-btn button { - padding: 2px 3px; +.editor-wrapper:after { + clear: both; } -.press-this #wp-content-wrap div.mce-toolbar-grp, -.press-this #wp-content-wrap .quicktags-toolbar { - padding-left: 3px; +.editor { + padding: 0 1.5em 4.75em; + max-width: 700px; + margin: 0 auto; } -.press-this .howto { - margin-top: 2px; - margin-bottom: 3px; - font-size: 12px; - font-style: italic; - display: block; +.spinner { + height: 20px; + width: 20px; + display: inline-block; + visibility: hidden; + background: url(../images/spinner.gif) no-repeat center; + -webkit-background-size: 20px 20px; + background-size: 20px 20px; + opacity: 0.7; + filter: alpha(opacity=70); + line-height: 1; + vertical-align: middle; } -.press-this #wp-content-editor-container { - clear: none; +@media print, + (-webkit-min-device-pixel-ratio: 1.25), + (min-resolution: 120dpi) { + + .spinner { + background-image: url(../images/spinner-2x.gif); + } } -.press-this #poststuff .inside { - margin-top: 18px; +.spinner.is-active { + visibility: visible; } -.press-this .category-tabs { - margin-bottom: 3px; +/* Make the text inside the editor textarea white. Prevents a "flash" on loading the page */ +#pressthis { + color: #fff; } -/* Editor/Main Column */ -.press-this #poststuff { - margin: 0 8px; - padding: 0; +@media (min-width: 901px) { + .editor { + max-width: 760px; + } } -.press-this #photo-add-url-div input[type="text"] { - width: 220px; +@media (max-width: 320px) { + .editor { + padding: 0; + } } -#poststuff #editor-toolbar { - height: 30px; +.post-title, +.post-title-placeholder { + margin: 0; + padding: .83em 0; + width: 100%; + border-bottom: 1px solid #e5e5e5; + font-size: 32px; + line-height: 1.4; + font-weight: 700; +} + +.post-title:active, +.post-title:focus, +.post-title-placeholder:active, +.post-title-placeholder:focus { + outline: 0; + -webkit-box-shadow: inset 0px -3px 0 #00a0d2; + box-shadow: inset 0px -3px 0 #00a0d2; + border-color: #00a0d2; +} + +@media (max-width: 900px) { + .post-title, + .post-title-placeholder { + font-size: 24px; + } } -.posting { - margin-left: 212px; - position: relative; +@media (max-height: 400px) { + .post-title, + .post-title-placeholder { + padding: 15px 0; + font-size: 16px; + } } -.press-this .inner-sidebar { - width: 200px; +@media (max-width: 320px) { + .post-title, + .post-title-placeholder { + font-size: 16px; + font-weight: 600; + padding: 1.14286em 1.42857em; + } } -.press-this .inner-sidebar .sleeve { - padding-top: 5px; +.post-title { + /* IE8 fallback */ + background: url(data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///////wAAACH5BAEHAAIALAAAAAABAAEAAAICVAEAOw==); + background: none, none; } -.press-this #submitdiv p { - margin: 0; - padding: 6px; +.post-title:before { + /* Keeps empty container from collapsing */ + content: "\a0"; + display: inline-block; + width: 0; + speak: none; } -.press-this #submitdiv #publishing-actions { - border-bottom: 1px solid #dfdfdf; +.post-title-placeholder { + position: absolute; + border: 0; + color: #82878c; + z-index: -1; } -.press-this #publish { - float: left; +.post-title-placeholder.is-hidden { + display: none; } -.press-this #poststuff h2, -.press-this #poststuff h3 { - font-size: 14px; - line-height: 1; +/* Suggested images */ +.media-list-container { + position: relative; + padding: 2px 0; + border-bottom: 1px solid #e5e5e5; + display: none; } -.press-this #tagsdiv-post_tag h3, -.press-this #categorydiv h3 { - cursor: pointer; +.media-list-inner-container { + overflow: auto; + max-height: 150px; + max-height: 40vw; } -.press-this #submitdiv h3 { - cursor: default; +.media-list-container.has-media { + display: block; } -h3.tb { - font-weight: 600; - font-size: 12px; - margin-right: 5px; +.media-list-inner-container:before, +.media-list-inner-container:after { + content: ""; + display: table; } -.press-this .postbox, -.press-this .stuffbox { - margin-bottom: 10px; - min-width: 0; +.media-list-inner-container:after { + clear: both; } -.press-this #submitdiv:hover .handlediv { - background: none; +.media-list { + margin: 0; + padding: 0; } -.tbtitle { - font-size: 1.7em; - outline: none; - padding: 3px 4px; - border: 1px solid #dfdfdf; +@media (min-width: 321px) { + .media-list-inner-container { + max-height: 250px; + max-height: 40vw; + } } -.press-this .actions { - float: left; - margin: -19px 0 0; +@media (min-width: 601px) { + .media-list-inner-container { + max-height: 200px; + max-height: 18.75vw; + } +} + +.wppt-all-media-list { + list-style: none; + margin: 0; + padding: 0; } -.press-this #extra-fields .actions { - margin: -32px 0 0 -7px; +.suggested-media-thumbnail:focus, +.is-embed:focus { + outline: 0; + -webkit-box-shadow: inset 0 0 0 3px #00a0d2; + box-shadow: inset 0 0 0 3px #00a0d2; } -.press-this .actions li { +.suggested-media-thumbnail { + position: relative; + display: block; float: right; - list-style: none; - margin-left: 10px; + width: 16.66%; + padding: 16.66% 16.66% 0 0; + background-position: center; + background-repeat: no-repeat; + -webkit-background-size: cover; + background-size: cover; + background-color: #d8d8d8; + color: #fff; + color: rgba(255, 255, 255, 0.6); + cursor: pointer; } -#extra-fields .button { - margin-left: 5px; +.suggested-media-thumbnail:hover, +.suggested-media-thumbnail:active, +.suggested-media-thumbnail:focus { + color: #fff; } -/* Photo Styles */ -#photo_saving { - margin: 0 8px 8px; - vertical-align: middle; +.suggested-media-thumbnail:before, +.suggested-media-thumbnail:after { + display: inline-block; + position: absolute; + font-size: 20px; + line-height: 1; + font-family: dashicons; + text-decoration: inherit; + font-weight: 400; + font-style: normal; + -webkit-transition: color .1s ease-in 0; + transition: color .1s ease-in 0; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } -#img_container_container { - overflow: auto; +.suggested-media-thumbnail:before { + right: 50%; + top: 50%; + margin: -20px -20px 0 0; + font-size: 40px; } -#extra-fields { - margin-top: 10px; - position: relative; +.suggested-media-thumbnail:after { + content: "\f132"; + left: 3%; + bottom: 2%; } -#extra-fields h2 { - margin: 12px; +@media (min-width: 601px) { + .suggested-media-thumbnail { + width: 12.5%; + padding: 12.5% 12.5% 0 0; + } } -#waiting { - margin-top: 10px; - overflow: hidden; +.is-embed:before { + content: "\f104"; + color: #fff; + color: rgba(255, 255, 255, 0.9); } -#waiting span { - float: left; - margin: 0 5px 0 0; +.is-embed.is-audio:hover:before, +.is-embed.is-audio:active:before, +.is-embed.is-audio:focus:before, +.is-embed.is-tweet:hover:before, +.is-embed.is-tweet:active:before, +.is-embed.is-tweet:focus:before { + color: #fff; } -#waiting .spinner { - display: block; +.is-embed.is-video { + background-color: #23282d; } -#extra-fields .postbox { - margin-bottom: 5px; +.is-embed.is-video:hover:before, +.is-embed.is-video:active:before, +.is-embed.is-video:focus:before { + color: rgba(255, 255, 255, 0.2); } -#extra-fields .titlewrap { - padding: 0; - overflow: auto; - height: 120px; +.is-embed.is-video:before { + content: "\f236"; } -#img_container a { - display: block; - float: right; - overflow: hidden; +.is-embed.is-audio { + background-color: #ff7d44; } -#img_container img, -#img_container a { - width: 68px; - height: 68px; +.is-embed.is-audio:before { + content: "\f127"; } -#img_container img { - border: none; - background-color: #f4f4f4; - cursor: pointer; +.is-embed.is-tweet { + background-color: #55acee; } -#img_container a, -#img_container a:link, -#img_container a:visited { - border: 1px solid #ccc; - display: block; - position: relative; +.is-embed.is-tweet:before { + content: "\f301"; } -#img_container a:hover, -#img_container a:active { - border-color: #000; - z-index: 1000; - border-width: 1px; +.no-media { + margin: 0; + padding: 0; + border: 0; } -/* Video */ -#embed-code { +/* Actions bar */ +.press-this-actions { + position: fixed; + bottom: 0; + right: 0; width: 100%; - height: 98px; + background: #f1f1f1; + background: rgba(241, 241, 241, 0.9); + border-top: 1px solid #e5e5e5; +} + +@media (max-width: 900px) { + .press-this-actions { + -webkit-transform: translateY(0); + -ms-transform: translateY(0); + transform: translateY(0); + -webkit-transition: -webkit-transform .3s ease-in-out; + transition: -webkit-transform .3s ease-in-out; + transition: transform .3s ease-in-out; + transition: transform .3s ease-in-out, -webkit-transform .3s ease-in-out; + } + .press-this-actions.is-hidden { + -webkit-transform: translateY(100%); + -ms-transform: translateY(100%); + transform: translateY(100%); + } } -/* Categories */ -.press-this .categorydiv div.tabs-panel { - height: 100px; +.add-media { + float: right; + margin: 14px 30px 14px 0; + font-size: 0; } -/* Tags */ -.press-this .tagsdiv .newtag { - width: 120px; +@media (max-width: 320px) { + .add-media { + margin: 10px 10px 10px 0; + } } -.press-this #content { - margin: 5px 0; - padding: 0 5px; - border: 0 none; - height: 340px; - font-family: Consolas, Monaco, monospace; - font-size: 13px; - line-height: 19px; - background: transparent; +.insert-media { + color: #9ea7af; + float: right; + margin: 0; + padding: 0; + border: 0; + border-left: 1px solid #e5e5e5; + -webkit-border-radius: 0; + border-radius: 0; + background: none; + -webkit-box-shadow: none; + box-shadow: none; + overflow: hidden; } -/* Submit */ -.press-this #publishing-actions .spinner { - display: inline; - vertical-align: middle; +.insert-media:hover, +.insert-media:focus, +.insert-media:active { + margin: 0; + background: none; + border-color: #e5e5e5; + color: #23282d; } -/* =Media Queries --------------------------------------------------------------- */ +.insert-media:focus, +.insert-media:active { + outline: 0; + color: #00a0d2; + text-decoration: none; +} -/* Reset responsive styles in Press This */ -@media screen and ( max-width: 782px ) { - .press-this ul.category-tabs li.tabs { - padding: 3px 5px 5px; /* Reset tabs in Press This to standard size */ - } +.insert-media .dashicons { + padding: 11px; + width: 63px; + height: 58px; + font-size: 40px; +} - .press-this a.wp-switch-editor { - font: 13px/19px "Open Sans", sans-serif; - margin: 5px 5px 0 0; - padding: 3px 8px 4px; +@media (max-width: 320px) { + .insert-media .dashicons { + width: 55px; + height: 49px; + padding: 14px; + font-size: 20px; } +} - .press-this #wp-content-media-buttons a { - padding: 0; - line-height: normal; - height: auto; +.post-actions { + float: left; + margin: 14px 0 14px 30px; + font-size: 13px; +} + +@media (max-width: 320px) { + .post-actions { + margin: 10px 0 10px 10px; } +} + +.publish-button .saving-draft, +.publish-button.is-saving .publish { + display: none; +} + +.publish-button.is-saving .saving-draft { + display: inline; +} + +/* TinyMCE styles */ +.editor .wp-media-buttons { + float: none; +} + +.editor div.mce-toolbar-grp { + padding: 0.71429em 0; + background: none; + border: 0; +} - .press-this #wp-content-editor-tools { +@media (max-height: 400px), (max-width: 320px) { + .editor div.mce-toolbar-grp { padding: 0; - top: 3px; } +} - .press-this .category-tabs { - margin-top: 0; - } +.mce-stack-layout:before, +.mce-stack-layout:after { + content: ""; + display: table; +} - .press-this .tagsdiv .newtag { - width: 120px; - padding: 3px 5px; - margin-bottom: 0; - } +.mce-stack-layout:after { + clear: both; +} + +.mce-container.mce-toolbar { + float: right; +} - .press-this .tagchecklist { +.mce-container.mce-toolbar:nth-child(2) { + float: left; +} + +@media (max-width: 600px) { + .mce-first .mce-btn:nth-child(3), + .mce-first .mce-btn:nth-child(4) { + position: absolute; + margin: -1px; padding: 0; - margin-bottom: 0; + height: 1px; + width: 1px; + overflow: hidden; + clip: rect(0 0 0 0); + border: 0; } - .press-this .wp_themeSkin a.mceButton { - width: 20px; - height: 20px; + .mce-first .mce-btn:nth-child(3):focus, + .mce-first .mce-btn:nth-child(4):focus { + position: static; + margin: 1px; + padding: inherit; + height: auto; + width: auto; + overflow: visible; + clip: auto; + border: 1px solid #999; } +} - .press-this .wp_themeSkin .mceButton .mceIcon { - margin: 0; +#wp-link-wrap { + font-size: 13px; +} + +#wp-link-wrap input[type="text"] { + padding: 3px 5px; + margin: 1px; +} + +@media screen and (max-width: 782px) { + #wp-link-wrap { + font-size: 14px; } - .press-this #poststuff h3, - .press-this .metabox-holder h3 { - padding: 7px 12px; + #wp-link-wrap input[type="text"] { + padding: 6px 10px; } +} + +#wp-link-wrap .howto { + color: #666; + font-style: italic; +} - .press-this input[type=checkbox], - .press-this input[type=radio] { - height: 16px; - width: 16px; +/* Options panel (sidebar) */ +.options-panel { + position: relative; + float: left; + margin-left: -320px; + width: 320px; + border-right: 1px solid #e5e5e5; + font-size: 14px; + /* Keeps background the full height of the screen, but only visually. Clicks go through. */ + -webkit-box-shadow: -5001px 5000px 0 5000px #fff, -5000px 5000px 0 5000px #e5e5e5; + box-shadow: -5001px 5000px 0 5000px #fff, -5000px 5000px 0 5000px #e5e5e5; + outline: 0; +} + +.options-panel-back { + position: absolute; + top: 0; + left: 0; + bottom: 0; + width: 320px; + outline: 0; +} + +@media (max-width: 900px) { + .options-panel { + background: #fff; + -webkit-transform: translateX(100%); + -ms-transform: translateX(100%); + transform: translateX(100%); + -webkit-transition: -webkit-transform .3s ease-in-out; + transition: -webkit-transform .3s ease-in-out; + transition: transform .3s ease-in-out; + transition: transform .3s ease-in-out, -webkit-transform .3s ease-in-out; } - .press-this input[type=checkbox]:checked:before { - width: 16px; - font: normal 21px/1 'dashicons'; - margin: -3px -4px 0 0; + .options-panel.is-hidden { + visibility: hidden; } - .press-this input[type=radio]:checked:before { - font: normal 21px/1 'dashicons'; - width: 6px; - height: 6px; - margin: 4px; + .options-panel.is-off-screen { + -webkit-transform: translateX(0); + -ms-transform: translateX(0); + transform: translateX(0); } +} - .press-this ul.categorychecklist ul, - .press-this ul.categorychecklist li { - margin-top: 0; - margin-bottom: 0; +@media (max-width: 320px) { + .options-panel { + margin-left: -100%; + width: 100%; + border: 0; + -webkit-box-shadow: -5001px 5000px 0 5000px #fff; + box-shadow: -5001px 5000px 0 5000px #fff; } - .press-this div.quicktags-toolbar input { - padding: 2px 4px; + .options-panel-back { + width: 100%; } +} - .press-this textarea, - .press-this input { - font-size: 14px; +.post-options { + background: #fff; + position: absolute; + left: 0; + width: 100%; + overflow-x: hidden; +} + +.post-options .post-option-contents { + margin-right: 3px; + color: #32373c; +} + +.post-option-forward:before { + position: absolute; + top: 50%; + left: 8px; + margin-top: -10px; + content: "\f341" +} + +.post-option-back:before { + content: "\f345"; +} + +.lt-ie9 .options-panel, +.lt-ie9 .post-options { + border-right: 1px solid #e5e5e5; +} + +.lt-ie9 .post-options.is-off-screen { + border: 0; +} + +.post-option { + position: relative; +} + +.post-options .post-option { + display: block; + width: 100%; + padding: 13px 14px 13px 37px; + border-bottom: 1px solid #e5e5e5; + text-decoration: none; + text-align: right; + color: #9ea7af; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + -webkit-transition: -webkit-transform .3s ease-in-out; + transition: -webkit-transform .3s ease-in-out; + transition: transform .3s ease-in-out; + transition: transform .3s ease-in-out, -webkit-transform .3s ease-in-out; +} + +.post-options .post-option:focus { + outline: 0; + -webkit-box-shadow: inset -5px 0 0 #00a0d2; + box-shadow: inset -5px 0 0 #00a0d2; + border-color: #e5e5e5; +} + +.is-off-screen > .post-option { + left: 100%; +} + +.is-hidden > .post-option { + visibility: hidden; +} + +@media (min-width: 1px) { + .is-off-screen > .post-option { + left: auto; + -webkit-transform: translateX(100%); + -ms-transform: translateX(100%); + transform: translateX(100%); } +} + +.post-option-title { + display: inline-block; + margin: 0 8px 0 0; + font-size: 14px; + font-weight: normal; +} + +.setting-modal { + position: relative; + top: 0; + right: 0; + width: 100%; + overflow: hidden; + -webkit-transition: -webkit-transform .3s ease-in-out; + transition: -webkit-transform .3s ease-in-out; + transition: transform .3s ease-in-out; + transition: transform .3s ease-in-out, -webkit-transform .3s ease-in-out; +} + +.setting-modal.is-hidden { + visibility: hidden; + height: 0; +} + +.setting-modal.is-off-screen { + right: 100%; +} - .press-this .tagchecklist span { - font-size: 13px; - line-height: 1.8em; +@media (min-width: 1px) { + .setting-modal.is-off-screen { + right: 0; + -webkit-transform: translateX(-100%); + -ms-transform: translateX(-100%); + transform: translateX(-100%); } } + +.press-this .modal-close { + display: block; + width: 100%; + padding: 13px 14px; + border-bottom: 1px solid #e5e5e5; + color: #00a0d2; + text-decoration: none; + text-align: right; +} + +.press-this .modal-close:focus { + outline: 0; + -webkit-box-shadow: inset -5px 0 0 #00a0d2; + box-shadow: inset -5px 0 0 #00a0d2; + border-color: #e5e5e5; +} + +.setting-title { + position: relative; + top: -1px; + margin-right: 11px; +} + +/* Text editor */ +#pressthis { + color: #404040; + resize: none; + padding-top: 30px; + font-size: 16px; +} + +.wp-editor-wrap .quicktags-toolbar { + background: transparent; + border: none; +} + +/* Switch editor buttons */ +.wp-editor-wrap .wp-editor-tools { + z-index: 0; +} + +.wp-editor-wrap .wp-editor-tabs { + padding: 2px; +} + +.wp-editor-wrap .wp-switch-editor { + top: 0; + margin: 3px 5px 0 0; + padding: 3px 8px; + background: #f5f5f5; + color: #555; + border-color: #ccc; +} + +.wp-editor-wrap .wp-switch-editor:hover { + background: #fafafa; + border-color: #999; + color: #23282d; +} + +.wp-editor-wrap.tmce-active .switch-tmce, +.wp-editor-wrap.html-active .switch-html { + background: #fff; + border-color: #d8d8d8; +} + +/* Inline link dialog */ +.wp-link-input input { + border: 1px solid #ddd; + -webkit-box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.07 ); + box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.07 ); + background-color: #fff; + color: #32373c; + outline: none; + -webkit-transition: 0.05s border-color ease-in-out; + transition: 0.05s border-color ease-in-out; +} + +/* UI Autocomplete (for inline link and wpLink) */ +.ui-autocomplete { + padding: 0; + margin: 0; + list-style: none; + position: absolute; + z-index: 10000; + border: 1px solid #5b9dd9; + -webkit-box-shadow: 0 1px 2px rgba( 30, 140, 190, 0.8 ); + box-shadow: 0 1px 2px rgba( 30, 140, 190, 0.8 ); + background-color: #fff; +} + +.ui-autocomplete li { + margin-bottom: 0; + padding: 4px 10px; + white-space: nowrap; + text-align: right; +} + +.ui-autocomplete li.ui-state-focus { + background-color: #ddd; + cursor: pointer; +} diff --git a/wp-admin/css/press-this-rtl.min.css b/wp-admin/css/press-this-rtl.min.css new file mode 100644 index 0000000..e0b495a --- /dev/null +++ b/wp-admin/css/press-this-rtl.min.css @@ -0,0 +1 @@ +body,fieldset{margin:0}.screen-reader-text,fieldset,legend,td,th{padding:0}.current-site,.post-options .post-option,.postform{text-overflow:ellipsis;white-space:nowrap}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}*,:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-resolution:144dpi){*,:after,:before{-webkit-font-smoothing:antialiased}}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:0 0}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}fieldset,img,legend{border:0}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}::-webkit-input-placeholder{color:#72777c}::-moz-placeholder{color:#72777c;opacity:1}:-ms-input-placeholder{color:#72777c}.clearfix:after,.clearfix:before{content:"";display:table}.clearfix:after{clear:both}.hide-if-js{display:none}.screen-reader-text{position:absolute;margin:-1px;height:1px;width:1px;overflow:hidden;clip:rect(0 0 0 0);border:0}body,button,input,select,textarea{color:#404040;font-family:"Open Sans",Helvetica,Arial,sans-serif;font-size:20px;font-weight:400;line-height:1.6}b,dt,strong{font-weight:700}h1,h2,h3,h4,h5,h6{clear:both}p{margin-bottom:1.5em}.scan-submit{display:inline-block;margin:0;text-decoration:none;white-space:nowrap;cursor:pointer;-webkit-appearance:none}.split-button{position:relative;display:inline-block;vertical-align:middle}.split-button-body{display:none;position:absolute;bottom:39px;left:0;border:1px solid #ddd;background-color:#fff;min-width:180px;max-width:100%;margin:0;padding:8px;list-style:none;-webkit-box-shadow:-1px 0 4px rgba(0,0,0,.15);box-shadow:-1px 0 4px rgba(0,0,0,.15)}.split-button-body:after,.split-button-body:before{position:absolute;left:12px;display:block;width:0;height:0;border-style:solid;border-color:transparent;content:""}.split-button-body:before{bottom:-18px;border-top-color:#ccc;border-width:9px;left:11px}.split-button-body:after{bottom:-16px;border-top-color:#fff;border-width:8px}.split-button-body .split-button-option{display:block;padding:5px 15px;margin:0;width:100%;text-align:right;line-height:2}.is-open .split-button-body{display:block}.split-button-primary,.split-button-toggle{-webkit-border-radius:0;border-radius:0;display:block;margin:0;font-size:13px;text-decoration:none;white-space:nowrap;cursor:pointer;-webkit-appearance:none;line-height:2;padding:0 10px 1px;background:#0085ba;border-color:#0073aa #006799 #006799;border-width:1px;border-style:solid;-webkit-box-shadow:0 1px 0 #006799;box-shadow:0 1px 0 #006799;color:#fff;text-shadow:0 -1px 1px #006799,-1px 0 1px #006799,0 1px 1px #006799,1px 0 1px #006799}.split-button-primary{-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;border-left:0 none;float:right}.split-button-toggle{padding:0;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;border-right:1px solid #006799;float:left}.split-button-toggle i{margin:4px 0 3px 20px;padding:0 10px}.split-button-primary:hover,.split-button-toggle:hover{outline:0;background:#008ec2;border-color:#006799}.split-button-primary:focus,.split-button-toggle:focus{outline:0;-webkit-box-shadow:0 1px 0 #0073aa,0 0 2px 1px #33b3db;box-shadow:0 1px 0 #0073aa,0 0 2px 1px #33b3db}.split-button-primary:active,.split-button-toggle:active{background:#0073aa;border-color:#006799;-webkit-box-shadow:inset 0 2px 10px #006799,0 1px 0 #0073aa;box-shadow:inset 0 2px 10px #006799,0 1px 0 #0073aa}button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}.postform,textarea{vertical-align:top}[type=checkbox],[type=radio]{padding:0}[type=search]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}[type=search]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}[type=email],[type=url],[type=password],[type=search],[type=text],textarea{padding:.4em .75em;color:#32373c;border:1px solid #ccc}[type=email]:focus,[type=url]:focus,[type=password]:focus,[type=search]:focus,[type=text]:focus,textarea:focus{color:#32373c;outline:0}textarea{overflow:auto;padding-right:3px}a,a:visited{color:#0073aa}a:active,a:focus,a:hover{color:#00a0d2}ol,ul{margin:0 3em 1.5em 0}ul{list-style:disc}ol{list-style:decimal}li>ol,li>ul{margin-bottom:0;margin-right:1.5em}dd{margin:0 1.5em 1.5em}#post-formats-select br{display:none}.post-format{width:1px;height:1px;position:absolute;top:-9999px}.lt-ie9 .post-format{margin:17px 13px 0 12px;position:static;top:auto;float:right;width:16px;height:16px}.add-category,.post-format-icon,.tagsdiv .ajaxtag,.tagsdiv .newtag{position:relative}.post-format-icon{display:block;padding:13px 13px 14px 2px;cursor:pointer}.post-format-icon:after,.post-format-icon:before{content:"";display:inline-block;width:20px;height:20px;margin-left:10px;font-size:20px;line-height:1;font-family:dashicons;text-decoration:inherit;color:#9ea7af;font-weight:400;font-style:normal;vertical-align:top;text-align:center;-webkit-transition:color .1s ease-in 0;transition:color .1s ease-in 0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.post-format-icon:before{content:"\f109"}.post-format-icon:after{display:none;content:"\f147";float:left}.post-format:checked+.post-format-icon{-webkit-box-shadow:inset -6px 0 0 #00a0d2;box-shadow:inset -6px 0 0 #00a0d2;background:rgba(46,162,204,.1)}.post-format:checked+.post-format-icon:after,.post-format:checked+.post-format-icon:before{color:#32373c}.post-format:focus+.post-format-icon{background:#00a0d2;color:#fff}.post-format:focus+.post-format-icon:after,.post-format:focus+.post-format-icon:before{color:#fff}.post-format:checked+.post-format-icon:after{display:block}.lt-ie9 .post-format-icon{margin-right:16px}.post-format-aside:before{content:"\f123"}.post-format-image:before{content:"\f128"}.post-format-video:before{content:"\f126"}.post-format-audio:before{content:"\f127"}.post-format-quote:before{content:"\f122"}.post-format-link:before{content:"\f103"}.post-format-gallery:before{content:"\f161"}.tagsdiv p{margin:0}.tagsdiv .newtag{display:block;padding:11px 16px 11px 58px;width:100%;border:0;border-bottom:1px solid #e5e5e5;font-size:16px}.tagsdiv .tagadd{position:absolute;top:0;left:0;bottom:1px;border:0;-webkit-border-radius:0;border-radius:0;margin:0;padding:0 16px;background:#f7f7f7;border-right:1px solid #f1f1f1;-webkit-box-shadow:none;box-shadow:none}.tagsdiv .tagadd:active,.tagsdiv .tagadd:focus,.tagsdiv .tagadd:hover{outline:0;background:#2991b7;border-color:#20708e;color:#fff;-webkit-box-shadow:none;box-shadow:none}.tagsdiv .howto{color:#727272;font-style:italic;margin:10px 16px 6px 0}.ac_results{padding:0;margin:-1px -1px 0 0;list-style:none;position:absolute;z-index:10000;display:none;border:1px solid #d8d8d8;background-color:#fff;font-size:14px}.ac_results li{padding:6px 16px;white-space:nowrap;text-align:right}.ac_results .ac_over{background-color:#00a0d2;color:#fff;cursor:pointer}.ac_match{text-decoration:underline}.tagchecklist{padding:16px 28px 5px}.tagchecklist:after,.tagchecklist:before{content:"";display:table}.tagchecklist:after{clear:both}.tagchecklist span{display:block;margin-left:25px;float:right;font-size:13px;line-height:1.8;white-space:nowrap;cursor:default}@media (max-width:600px){.tagchecklist span{margin-bottom:15px;font-size:16px;line-height:1.3}}.tagchecklist .ntdelbutton{margin:1px -17px 0 0;cursor:pointer;width:20px;height:20px;display:block;float:right;text-indent:0;overflow:hidden;position:absolute;outline:0}.tagchecklist .ntdelbutton:before{content:"\f153";display:block;margin:2px 0;height:20px;width:20px;background:100% 0;color:#9ea7af;font:400 16px/1 dashicons;text-align:center;speak:none;-webkit-font-smoothing:antialiased}.tagchecklist .ntdelbutton:focus:before{color:#00a0d2}.tagsdiv+p{margin:0}.press-this .tagcloud-link{display:block;margin:0 16px 5px;padding:0;text-decoration:none;outline:0}.tagcloud-link:focus{text-decoration:underline}.popular-tags{border:none;line-height:2em;padding:8px 12px 12px;text-align:justify}.popular-tags a{padding:0 3px}.the-tagcloud{margin:0;padding:16px}.the-tagcloud a{text-decoration:none;outline:0}.the-tagcloud a:focus{text-decoration:underline}.tagcloud h3{margin:2px 0 12px}.add-category-name,input[type=search].categories-search{display:block;width:100%;padding:.85714em 1.07143em;border:0;-webkit-border-radius:0;border-radius:0;border-bottom:1px solid #e5e5e5;font-size:14px;-webkit-appearance:none;-moz-appearance:none;appearance:none}@media (max-width:600px){.add-category-name,input[type=search].categories-search{font-size:16px}}.press-this .add-cat-toggle{float:left;margin-top:-45px;line-height:20px;padding:12px 10px 8px;color:#0073aa}.press-this .add-cat-toggle:focus{text-decoration:none;color:#00a0d2}.press-this .add-cat-toggle.is-toggled{padding:10px}.press-this .add-cat-toggle.is-toggled .dashicons:before{content:"\f179"}.add-category{border-bottom:1px solid #e5e5e5}.add-category.is-hidden{display:none}.add-category .add-cat-submit{position:absolute;top:0;left:0;border:0;-webkit-border-radius:0;border-radius:0;padding:12px 16px;background:#f7f7f7;border-right:1px solid #f1f1f1}.add-category .add-cat-submit:active,.add-category .add-cat-submit:focus,.add-category .add-cat-submit:hover{outline:0;background:#2991b7;border-color:#20708e;color:#fff}.postform-wrapper{padding:12px}.postform{display:block;margin:0;width:100%;height:34px;-webkit-border-radius:0;border-radius:0;border:1px solid #e5e5e5;background:#fff;-webkit-background-size:20px 20px;background-size:20px 20px;overflow:hidden;line-height:21px;text-decoration:none;cursor:pointer;outline:0}.postform:focus{border-color:#0073aa;-webkit-box-shadow:0 0 0 3px #00a0d2;box-shadow:0 0 0 3px #00a0d2;outline:0;-moz-outline:none;-moz-user-focus:ignore}.alert,.scan{border-bottom:1px solid #e5e5e5}.postform::-ms-expand{display:none}.postform::-ms-value{background:0 0;color:#727272}.postform:-moz-focusring{color:transparent;text-shadow:0 0 0 #727272}.categories-select,.categories-select ul{margin:0;padding:0;list-style:none}.category{position:relative;display:block;padding:13px 16px 14px;cursor:pointer;background:#fff}.category.selected:focus,.category:focus{outline:0;background:#00a0d2;color:#fff}.category.selected{-webkit-box-shadow:inset -6px 0 0 #00a0d2;box-shadow:inset -6px 0 0 #00a0d2;background:#E9F5F9}.category.selected:after{display:inline-block;content:"\f147";position:absolute;top:13px;left:0;width:20px;height:20px;margin-left:10px;font-size:20px;line-height:1;font-family:dashicons;text-decoration:inherit;color:#23282d;font-weight:400;font-style:normal;vertical-align:top;text-align:center;-webkit-transition:color .1s ease-in 0;transition:color .1s ease-in 0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.category.selected:focus:after{color:#fff}.categories-select ul .category{padding-right:24px}.categories-select ul ul .category{padding-right:32px}.categories-select ul ul ul .category{padding-right:40px}.categories-select ul ul ul ul .category{padding-right:48px}.categories-select ul ul ul ul ul .category{padding-right:56px}.categories-select ul ul ul ul ul ul .category{padding-right:64px}.categories-select .is-hidden{display:none}.categories-select .is-hidden.searched-parent{display:block}.categories-search-wrapper{position:relative}.categories-search-wrapper.is-hidden{display:none}.categories-search-wrapper label{position:absolute;top:50%;left:10px;margin-top:-10px;color:#9ea7af}html{overflow:auto;background:#fff;-webkit-box-shadow:10px 0 0 rgba(0,0,0,.3);box-shadow:10px 0 0 rgba(0,0,0,.3)}body{overflow-x:hidden;height:100%}@media (max-width:900px){body{font-size:16px}}@media (max-width:320px){body{font-size:14px}}.lt-ie9{overflow:visible}.adminbar{position:relative;width:100%;padding:0 .8em;min-height:3.2em;background:#23282d;color:#fff;z-index:9999}.adminbar:after,.adminbar:before{content:"";display:table}.adminbar:after{clear:both}.adminbar .dashicons{color:#a0a5aa}.press-this .adminbar button{position:absolute;top:50%;left:6px;margin-top:-13px;padding:0 10px 1px;font-size:13px}.current-site{margin-top:.5625em;font-size:16px;line-height:44px;font-weight:400;overflow:hidden}@media (max-width:600px){.current-site{margin:3px 0 0}}.current-site-link{text-decoration:none}.current-site-link:focus{outline:0}.current-site-link:focus .current-site-name{text-decoration:underline}.current-site-name{color:#ededed}@media (max-width:320px){.adminbar{min-height:45px}.current-site{margin:0;font-size:14px}.current-site-name{font-weight:600}}.current-site .dashicons-wordpress{position:relative;top:-1px;margin-left:10px;vertical-align:middle}.options,.options.closed .on-open,.options.open .on-closed{display:none}@media (max-width:900px){.options{display:block}.scan form{-webkit-transition:opacity .3s ease-in-out;transition:opacity .3s ease-in-out}.scan.is-hidden form{opacity:.2;pointer-events:none}}.options-panel-back.is-hidden{display:none}.options:focus .dashicons{color:#fff;text-decoration:none}.options .dashicons{margin-top:3px}.options{color:#00a0d2}.alert{position:relative;margin:0;padding:16px 50px;font-size:14px}.alert:before{content:"";position:absolute;top:50%;right:30px;width:8px;height:8px;margin-top:-4px;-webkit-border-radius:50%;border-radius:50%;background:#00a0d2}@media (max-width:600px){.alert{padding:16px 35px}.alert:before{right:15px}}.alert.is-error:before{background:red}.scan{position:relative}.scan-url{display:block;border:0;padding:.85714em 1.07143em;font-size:14px;width:100%}@media (max-width:600px){.scan-url{font-size:16px}}.scan-submit{position:absolute;top:0;left:0;bottom:0;padding:0 1.07143em;background:#f7f7f7;border:0;border-right:1px solid #f1f1f1;-webkit-border-radius:0;border-radius:0;color:#555;font-size:14px;line-height:1.6}.scan-submit:focus,.scan-submit:hover{background:#008ec2;border-color:#006799;color:#fff;outline:0}.scan-submit:active{background:#0073aa;border-color:#006799;color:#fff}.scan-submit:visited{color:#555}.wrapper{position:relative;margin-bottom:60px;margin-left:320px}.wrapper:after,.wrapper:before{content:"";display:table}.wrapper:after{clear:both}@media (max-width:900px){.wrapper{margin:0;width:100%}}.editor-wrapper{overflow:auto;float:right;width:100%}.editor-wrapper:after,.editor-wrapper:before{content:"";display:table}.editor-wrapper:after{clear:both}.editor{padding:0 1.5em 4.75em;max-width:700px;margin:0 auto}.spinner{height:20px;width:20px;display:inline-block;visibility:hidden;background:url(../images/spinner.gif) center no-repeat;-webkit-background-size:20px 20px;background-size:20px 20px;opacity:.7;filter:alpha(opacity=70);line-height:1;vertical-align:middle}@media print,(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.spinner{background-image:url(../images/spinner-2x.gif)}}.spinner.is-active{visibility:visible}@media (min-width:901px){.editor{max-width:760px}}@media (max-width:320px){.editor{padding:0}}.post-title,.post-title-placeholder{margin:0;padding:.83em 0;width:100%;border-bottom:1px solid #e5e5e5;font-size:32px;line-height:1.4;font-weight:700}.post-title-placeholder:active,.post-title-placeholder:focus,.post-title:active,.post-title:focus{outline:0;-webkit-box-shadow:inset 0 -3px 0 #00a0d2;box-shadow:inset 0 -3px 0 #00a0d2;border-color:#00a0d2}@media (max-width:900px){.post-title,.post-title-placeholder{font-size:24px}}@media (max-height:400px){.post-title,.post-title-placeholder{padding:15px 0;font-size:16px}}@media (max-width:320px){.post-title,.post-title-placeholder{font-size:16px;font-weight:600;padding:1.14286em 1.42857em}}.post-title{background:url(data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///////wAAACH5BAEHAAIALAAAAAABAAEAAAICVAEAOw==);background:0 0,none}.post-title:before{content:"\a0";display:inline-block;width:0;speak:none}.post-title-placeholder{position:absolute;border:0;color:#82878c;z-index:-1}.post-title-placeholder.is-hidden{display:none}.media-list-container{position:relative;padding:2px 0;border-bottom:1px solid #e5e5e5;display:none}.media-list-inner-container{overflow:auto;max-height:150px;max-height:40vw}.media-list-container.has-media{display:block}.media-list-inner-container:after,.media-list-inner-container:before{content:"";display:table}.media-list-inner-container:after{clear:both}.media-list{margin:0;padding:0}@media (min-width:321px){.media-list-inner-container{max-height:250px;max-height:40vw}}.wppt-all-media-list{list-style:none;margin:0;padding:0}.is-embed:focus,.suggested-media-thumbnail:focus{outline:0;-webkit-box-shadow:inset 0 0 0 3px #00a0d2;box-shadow:inset 0 0 0 3px #00a0d2}.suggested-media-thumbnail{position:relative;display:block;float:right;width:16.66%;padding:16.66% 16.66% 0 0;background-position:center;background-repeat:no-repeat;-webkit-background-size:cover;background-size:cover;background-color:#d8d8d8;color:#fff;color:rgba(255,255,255,.6);cursor:pointer}.suggested-media-thumbnail:active,.suggested-media-thumbnail:focus,.suggested-media-thumbnail:hover{color:#fff}.suggested-media-thumbnail:after,.suggested-media-thumbnail:before{display:inline-block;position:absolute;font-size:20px;line-height:1;font-family:dashicons;text-decoration:inherit;font-weight:400;font-style:normal;-webkit-transition:color .1s ease-in 0;transition:color .1s ease-in 0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.suggested-media-thumbnail:before{right:50%;top:50%;margin:-20px -20px 0 0;font-size:40px}.suggested-media-thumbnail:after{content:"\f132";left:3%;bottom:2%}@media (min-width:601px){.media-list-inner-container{max-height:200px;max-height:18.75vw}.suggested-media-thumbnail{width:12.5%;padding:12.5% 12.5% 0 0}}.is-embed:before{content:"\f104";color:#fff;color:rgba(255,255,255,.9)}.is-embed.is-audio:active:before,.is-embed.is-audio:focus:before,.is-embed.is-audio:hover:before,.is-embed.is-tweet:active:before,.is-embed.is-tweet:focus:before,.is-embed.is-tweet:hover:before{color:#fff}.is-embed.is-video{background-color:#23282d}.is-embed.is-video:active:before,.is-embed.is-video:focus:before,.is-embed.is-video:hover:before{color:rgba(255,255,255,.2)}.is-embed.is-video:before{content:"\f236"}.is-embed.is-audio{background-color:#ff7d44}.is-embed.is-audio:before{content:"\f127"}.is-embed.is-tweet{background-color:#55acee}.is-embed.is-tweet:before{content:"\f301"}.no-media{margin:0;padding:0;border:0}.press-this-actions{position:fixed;bottom:0;right:0;width:100%;background:#f1f1f1;background:rgba(241,241,241,.9);border-top:1px solid #e5e5e5}.add-media{float:right;margin:14px 30px 14px 0;font-size:0}@media (max-width:320px){.add-media{margin:10px 10px 10px 0}}.insert-media{color:#9ea7af;float:right;margin:0;padding:0;border:0;border-left:1px solid #e5e5e5;-webkit-border-radius:0;border-radius:0;background:0 0;-webkit-box-shadow:none;box-shadow:none;overflow:hidden}.insert-media:active,.insert-media:focus,.insert-media:hover{margin:0;background:0 0;border-color:#e5e5e5;color:#23282d}.insert-media:active,.insert-media:focus{outline:0;color:#00a0d2;text-decoration:none}.insert-media .dashicons{padding:11px;width:63px;height:58px;font-size:40px}@media (max-width:320px){.insert-media .dashicons{width:55px;height:49px;padding:14px;font-size:20px}}#wp-link-wrap,.post-actions{font-size:13px}.post-actions{float:left;margin:14px 0 14px 30px}@media (max-width:320px){.post-actions{margin:10px 0 10px 10px}}.publish-button .saving-draft,.publish-button.is-saving .publish{display:none}.publish-button.is-saving .saving-draft{display:inline}.editor .wp-media-buttons{float:none}.editor div.mce-toolbar-grp{padding:.71429em 0;background:0 0;border:0}@media (max-height:400px),(max-width:320px){.editor div.mce-toolbar-grp{padding:0}}.mce-stack-layout:after,.mce-stack-layout:before{content:"";display:table}.mce-stack-layout:after{clear:both}.mce-container.mce-toolbar{float:right}.mce-container.mce-toolbar:nth-child(2){float:left}@media (max-width:600px){.mce-first .mce-btn:nth-child(3),.mce-first .mce-btn:nth-child(4){position:absolute;margin:-1px;padding:0;height:1px;width:1px;overflow:hidden;clip:rect(0 0 0 0);border:0}.mce-first .mce-btn:nth-child(3):focus,.mce-first .mce-btn:nth-child(4):focus{position:static;margin:1px;padding:inherit;height:auto;width:auto;overflow:visible;clip:auto;border:1px solid #999}}#wp-link-wrap input[type=text]{padding:3px 5px;margin:1px}@media screen and (max-width:782px){#wp-link-wrap{font-size:14px}#wp-link-wrap input[type=text]{padding:6px 10px}}#wp-link-wrap .howto{color:#666;font-style:italic}.options-panel{position:relative;float:left;margin-left:-320px;width:320px;border-right:1px solid #e5e5e5;font-size:14px;-webkit-box-shadow:-5001px 5000px 0 5000px #fff,-5000px 5000px 0 5000px #e5e5e5;box-shadow:-5001px 5000px 0 5000px #fff,-5000px 5000px 0 5000px #e5e5e5;outline:0}.options-panel-back{position:absolute;top:0;left:0;bottom:0;width:320px;outline:0}@media (max-width:900px){.press-this-actions{-webkit-transform:translateY(0);-ms-transform:translateY(0);transform:translateY(0);-webkit-transition:-webkit-transform .3s ease-in-out;transition:-webkit-transform .3s ease-in-out;transition:transform .3s ease-in-out;transition:transform .3s ease-in-out,-webkit-transform .3s ease-in-out}.press-this-actions.is-hidden{-webkit-transform:translateY(100%);-ms-transform:translateY(100%);transform:translateY(100%)}.options-panel{background:#fff;-webkit-transform:translateX(100%);-ms-transform:translateX(100%);transform:translateX(100%);-webkit-transition:-webkit-transform .3s ease-in-out;transition:-webkit-transform .3s ease-in-out;transition:transform .3s ease-in-out;transition:transform .3s ease-in-out,-webkit-transform .3s ease-in-out}.options-panel.is-hidden{visibility:hidden}.options-panel.is-off-screen{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}}@media (max-width:320px){.options-panel{margin-left:-100%;width:100%;border:0;-webkit-box-shadow:-5001px 5000px 0 5000px #fff;box-shadow:-5001px 5000px 0 5000px #fff}.options-panel-back{width:100%}}.post-options{background:#fff;position:absolute;left:0;width:100%;overflow-x:hidden}.post-options .post-option-contents{margin-right:3px;color:#32373c}.post-option-forward:before{position:absolute;top:50%;left:8px;margin-top:-10px;content:"\f341"}.post-option,.setting-modal,.setting-title{position:relative}.post-option-back:before{content:"\f345"}.lt-ie9 .options-panel,.lt-ie9 .post-options{border-right:1px solid #e5e5e5}.lt-ie9 .post-options.is-off-screen{border:0}.post-options .post-option{display:block;width:100%;padding:13px 14px 13px 37px;border-bottom:1px solid #e5e5e5;text-decoration:none;text-align:right;color:#9ea7af;overflow:hidden;-webkit-transition:-webkit-transform .3s ease-in-out;transition:-webkit-transform .3s ease-in-out;transition:transform .3s ease-in-out;transition:transform .3s ease-in-out,-webkit-transform .3s ease-in-out}.post-options .post-option:focus{outline:0;-webkit-box-shadow:inset -5px 0 0 #00a0d2;box-shadow:inset -5px 0 0 #00a0d2;border-color:#e5e5e5}.is-off-screen>.post-option{left:100%}.is-hidden>.post-option{visibility:hidden}.post-option-title{display:inline-block;margin:0 8px 0 0;font-size:14px;font-weight:400}.setting-modal{top:0;right:0;width:100%;overflow:hidden;-webkit-transition:-webkit-transform .3s ease-in-out;transition:-webkit-transform .3s ease-in-out;transition:transform .3s ease-in-out;transition:transform .3s ease-in-out,-webkit-transform .3s ease-in-out}.setting-modal.is-hidden{visibility:hidden;height:0}.setting-modal.is-off-screen{right:100%}@media (min-width:1px){.is-off-screen>.post-option{left:auto;-webkit-transform:translateX(100%);-ms-transform:translateX(100%);transform:translateX(100%)}.setting-modal.is-off-screen{right:0;-webkit-transform:translateX(-100%);-ms-transform:translateX(-100%);transform:translateX(-100%)}}.press-this .modal-close{display:block;width:100%;padding:13px 14px;border-bottom:1px solid #e5e5e5;color:#00a0d2;text-decoration:none;text-align:right}.press-this .modal-close:focus{outline:0;-webkit-box-shadow:inset -5px 0 0 #00a0d2;box-shadow:inset -5px 0 0 #00a0d2;border-color:#e5e5e5}.setting-title{top:-1px;margin-right:11px}#pressthis{color:#404040;resize:none;padding-top:30px;font-size:16px}.wp-editor-wrap .quicktags-toolbar{background:0 0;border:none}.wp-editor-wrap .wp-editor-tools{z-index:0}.wp-editor-wrap .wp-editor-tabs{padding:2px}.wp-editor-wrap .wp-switch-editor{top:0;margin:3px 5px 0 0;padding:3px 8px;background:#f5f5f5;color:#555;border-color:#ccc}.wp-editor-wrap .wp-switch-editor:hover{background:#fafafa;border-color:#999;color:#23282d}.wp-editor-wrap.html-active .switch-html,.wp-editor-wrap.tmce-active .switch-tmce{background:#fff;border-color:#d8d8d8}.wp-link-input input{border:1px solid #ddd;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.07);box-shadow:inset 0 1px 2px rgba(0,0,0,.07);background-color:#fff;color:#32373c;outline:0;-webkit-transition:50ms border-color ease-in-out;transition:50ms border-color ease-in-out}.ui-autocomplete{padding:0;margin:0;list-style:none;position:absolute;z-index:10000;border:1px solid #5b9dd9;-webkit-box-shadow:0 1px 2px rgba(30,140,190,.8);box-shadow:0 1px 2px rgba(30,140,190,.8);background-color:#fff}.ui-autocomplete li{margin-bottom:0;padding:4px 10px;white-space:nowrap;text-align:right}.ui-autocomplete li.ui-state-focus{background-color:#ddd;cursor:pointer} \ No newline at end of file diff --git a/wp-admin/css/press-this.css b/wp-admin/css/press-this.css index dbf355a..73dadce 100644 --- a/wp-admin/css/press-this.css +++ b/wp-admin/css/press-this.css @@ -1,458 +1,2209 @@ -.press-this #message { - border-left: 4px solid #7ad03a; - padding: 1px 12px; +/* +Press This styles :) +*/ + + +/** +* Normalize +* +* normalize.css v3.0.0 | MIT License | git.io/normalize +*/ +html { + font-family: sans-serif; + -ms-text-size-adjust: 100%; + -webkit-text-size-adjust: 100%; +} + +body { + margin: 0; +} + +*, +*:before, +*:after { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi) { + *, + *:before, + *:after { + -webkit-font-smoothing: antialiased; + } +} + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +nav, +section, +summary { + display: block; +} + +audio, +canvas, +progress, +video { + display: inline-block; + vertical-align: baseline; +} + +audio:not([controls]) { + display: none; + height: 0; +} + +[hidden], +template { + display: none; +} + +a { + background: transparent; +} + +a:active, +a:hover { + outline: 0; +} + +abbr[title] { + border-bottom: 1px dotted; +} + +b, +strong { + font-weight: bold; +} + +dfn { + font-style: italic; +} + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +mark { + background: #ff0; + color: #000; +} + +small { + font-size: 80%; +} + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + +img { + border: 0; +} + +svg:not(:root) { + overflow: hidden; +} + +figure { + margin: 1em 40px; +} + +hr { + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; +} + +pre { + overflow: auto; +} + +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; +} + +button, +input, +optgroup, +select, +textarea { + color: inherit; + font: inherit; + margin: 0; +} + +button { + overflow: visible; +} + +button, +select { + text-transform: none; +} + +button, +html input[type="button"], +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; + cursor: pointer; +} + +button[disabled], +html input[disabled] { + cursor: default; +} + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +input { + line-height: normal; +} + +input[type="checkbox"], +input[type="radio"] { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + padding: 0; +} + +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +input[type="search"] { + -webkit-appearance: textfield; + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} + +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +fieldset { + border: 0; + margin: 0; + padding: 0; +} + +legend { + border: 0; + padding: 0; +} + +textarea { + overflow: auto; +} + +optgroup { + font-weight: bold; +} + +table { + border-collapse: collapse; + border-spacing: 0; +} + +td, +th { + padding: 0; +} + +::-webkit-input-placeholder { + color: #72777c; +} + +::-moz-placeholder { + color: #72777c; + opacity: 1; +} + +:-ms-input-placeholder { + color: #72777c; +} + +.clearfix:before, +.clearfix:after { + content: ""; + display: table; +} +.clearfix:after { + clear: both; +} + +.hide-if-js { + display: none; +} + +.screen-reader-text { + position: absolute; + margin: -1px; + padding: 0; + height: 1px; + width: 1px; + overflow: hidden; + clip: rect(0 0 0 0); + border: 0; +} + + +/** +* Typography +* +* Base element typographic styles. +*/ +body, +button, +input, +select, +textarea { + color: #404040; + font-family: "Open Sans", Helvetica, Arial, sans-serif; + font-size: 20px; + font-weight: 400; + line-height: 1.6; +} + +h1, +h2, +h3, +h4, +h5, +h6 { + clear: both; +} + +p { + margin-bottom: 1.5em; +} + +b, +strong { + font-weight: 700; +} + + +/** +* Buttons +* +* Pushing buttons is what I do. +*/ + +.scan-submit { + display: inline-block; + margin: 0; + padding: 0 10px 1px; + border-width: 1px; + border-style: solid; + -webkit-border-radius: 3px; + border-radius: 3px; + font-size: 13px; + line-height: 2; + text-decoration: none; + white-space: nowrap; + cursor: pointer; + -webkit-appearance: none; +} + +.split-button { + position: relative; + display: inline-block; + vertical-align: middle; +} + +.split-button-body { + display: none; + position: absolute; + bottom: 39px; + right: 0; + border: 1px solid #ddd; + background-color: #fff; + min-width: 180px; + max-width: 100%; + margin: 0; + padding: 8px; + list-style: none; + -webkit-box-shadow: 1px 0 4px rgba( 0, 0, 0, 0.15 ); + box-shadow: 1px 0 4px rgba( 0, 0, 0, 0.15 ); +} + +.split-button-body:before, +.split-button-body:after { + position: absolute; + right: 12px; + display: block; + width: 0; + height: 0; + border-style: solid; + border-color: transparent; + content: ""; +} + +.split-button-body:before { + bottom: -18px; + border-top-color: #ccc; + border-width: 9px; + right: 11px; +} + +.split-button-body:after { + bottom: -16px; + border-top-color: #fff; + border-width: 8px; +} + +.split-button-body .split-button-option { + display: block; + padding: 5px 15px; + margin: 0; + width: 100%; + text-align: left; + line-height: 2; +} + +.is-open .split-button-body { + display: block; +} + +.split-button-primary, +.split-button-toggle { + -webkit-border-radius: 0; + border-radius: 0; + display: block; + margin: 0; + font-size: 13px; + text-decoration: none; + white-space: nowrap; + cursor: pointer; + -webkit-appearance: none; + line-height: 2; + padding: 0 10px 1px; + background: #0085ba; + border-color: #0073aa #006799 #006799; + border-width: 1px; + border-style: solid; + -webkit-box-shadow: 0 1px 0 #006799; + box-shadow: 0 1px 0 #006799; + color: #fff; + text-shadow: 0 -1px 1px #006799, + 1px 0 1px #006799, + 0 1px 1px #006799, + -1px 0 1px #006799; +} + +.split-button-primary { + -webkit-border-top-left-radius: 3px; + border-top-left-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + border-bottom-left-radius: 3px; + border-right: 0 none; + float: left; +} + +.split-button-toggle { + padding: 0; + -webkit-border-top-right-radius: 3px; + border-top-right-radius: 3px; + -webkit-border-bottom-right-radius: 3px; + border-bottom-right-radius: 3px; + border-left: 1px solid #006799; + float: right; +} + +.split-button-toggle i { + margin: 4px 20px 3px 0; + padding: 0 10px; +} + +.split-button-primary:hover, +.split-button-toggle:hover { + outline: none; + background: #008ec2; + border-color: #006799; +} + +.split-button-primary:focus, +.split-button-toggle:focus { + outline: none; + -webkit-box-shadow: 0 1px 0 #0073aa, + 0 0 2px 1px #33b3db; + box-shadow: 0 1px 0 #0073aa, + 0 0 2px 1px #33b3db; +} + +.split-button-primary:active, +.split-button-toggle:active { + background: #0073aa; + border-color: #006799; + -webkit-box-shadow: inset 0 2px 10px #006799, 0 1px 0 #0073aa; + box-shadow: inset 0 2px 10px #006799, 0 1px 0 #0073aa; +} + +/** +* Forms +* +* So many input types. +*/ +button, +input, +select, +textarea { + font-size: 100%; + margin: 0; + vertical-align: baseline; + *vertical-align: middle; +} + +[type="checkbox"], +[type="radio"] { + padding: 0; +} + +[type="search"] { + -webkit-appearance: textfield; + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} + +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +[type="text"], +[type="email"], +[type="url"], +[type="password"], +[type="search"], +textarea { + padding: 0.4em 0.75em; + color: #32373c; + border: 1px solid #ccc; +} + +[type="text"]:focus, +[type="email"]:focus, +[type="url"]:focus, +[type="password"]:focus, +[type="search"]:focus, +textarea:focus { + color: #32373c; + outline: 0; +} + +textarea { + overflow: auto; + padding-left: 3px; + vertical-align: top; +} + + +/** +* Links +*/ +a { + color: #0073aa; +} + +a:visited { + color: #0073aa; +} + +a:hover, +a:focus, +a:active { + color: #00a0d2; +} + + +/** +* Lists +*/ +ul, +ol { + margin: 0 0 1.5em 3em; +} + +ul { + list-style: disc; +} + +ol { + list-style: decimal; +} + +li > ul, +li > ol { + margin-bottom: 0; + margin-left: 1.5em; +} + +dt { + font-weight: 700; +} + +dd { + margin: 0 1.5em 1.5em; +} + + +/** +* Post formats +* +* Complete styles for post formats UI +*/ +/* TODO if we remove the <br> during merge, this can go. */ +#post-formats-select br { + display: none; +} + +.post-format { + width: 1px; + height: 1px; + position: absolute; + top: -9999px; +} + +.lt-ie9 .post-format { + margin: 17px 12px 0 13px; + width: auto; + height: auto; + position: static; + top: auto; + float: left; + width: 16px; + height: 16px; +} + +.post-format-icon { + position: relative; + display: block; + padding: 13px 2px 14px 13px; + cursor: pointer; +} + +.post-format-icon:before, +.post-format-icon:after { + content: ""; + display: inline-block; + width: 20px; + height: 20px; + margin-right: 10px; + font-size: 20px; + line-height: 1; + font-family: dashicons; + text-decoration: inherit; + color: #9ea7af; + font-weight: 400; + font-style: normal; + vertical-align: top; + text-align: center; + -webkit-transition: color .1s ease-in 0; + transition: color .1s ease-in 0; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.post-format-icon:before { + content: "\f109"; +} + +.post-format-icon:after { + display: none; + content: "\f147"; + float: right; +} + +.post-format:checked + .post-format-icon { + -webkit-box-shadow: inset 6px 0 0 #00a0d2; + box-shadow: inset 6px 0 0 #00a0d2; + background: rgba(46, 162, 204, 0.1); +} + +.post-format:checked + .post-format-icon:before, +.post-format:checked + .post-format-icon:after { + color: #32373c; +} + +.post-format:focus + .post-format-icon { + background: #00a0d2; + color: #fff; +} + +.post-format:focus + .post-format-icon:before, +.post-format:focus + .post-format-icon:after { + color: #fff; +} + +.post-format:checked + .post-format-icon:after { + display: block; +} + +.lt-ie9 .post-format-icon { + margin-left: 16px; +} + +.post-format-aside:before { + content: "\f123"; +} + +.post-format-image:before { + content: "\f128"; +} + +.post-format-video:before { + content: "\f126"; +} + +.post-format-audio:before { + content: "\f127"; +} + +.post-format-quote:before { + content: "\f122"; +} + +.post-format-link:before { + content: "\f103"; +} + +.post-format-gallery:before { + content: "\f161"; +} + + +/** +* Tags +* +* Complete styles for tags UI +*/ +.tagsdiv p { + margin: 0; +} + +.tagsdiv .ajaxtag { + position: relative; +} + +.tagsdiv .newtag { + display: block; + position: relative; + padding: 11px 58px 11px 16px; + width: 100%; + border: 0; + border-bottom: 1px solid #e5e5e5; + font-size: 16px; +} + +.tagsdiv .tagadd { + position: absolute; + top: 0; + right: 0; + bottom: 1px; + border: 0; + -webkit-border-radius: 0; + border-radius: 0; + margin: 0; + padding: 0 16px; + background: #f7f7f7; + border-left: 1px solid #f1f1f1; + -webkit-box-shadow: none; + box-shadow: none; +} + +.tagsdiv .tagadd:hover, +.tagsdiv .tagadd:active, +.tagsdiv .tagadd:focus { + outline: 0; + background: #2991b7; + border-color: #20708e; + color: #fff; + -webkit-box-shadow: none; + box-shadow: none; +} + +.tagsdiv .howto { + color: #727272; + font-style: italic; + margin: 10px 0 6px 16px; +} + + +/* Tag hint TODO needed? */ +/* Tag suggestions */ +.ac_results { + padding: 0; + margin: -1px 0 0 -1px; + list-style: none; + position: absolute; + z-index: 10000; + display: none; + border: 1px solid #d8d8d8; background-color: #fff; - -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); - box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); + font-size: 14px; +} + +.ac_results li { + padding: 6px 16px; + white-space: nowrap; + text-align: left; +} + +.ac_results .ac_over { + background-color: #e5e5e5; + background-color: #00a0d2; + color: #fff; + cursor: pointer; +} + +.ac_match { + text-decoration: underline; +} + +/* Tags */ +.tagchecklist { + padding: 16px 28px 5px; +} + +.tagchecklist:before, +.tagchecklist:after { + content: ""; + display: table; +} + +.tagchecklist:after { + clear: both; +} + +.tagchecklist span { + display: block; + margin-right: 25px; + float: left; + font-size: 13px; + line-height: 1.8; + white-space: nowrap; + cursor: default; +} + +@media (max-width: 600px) { + .tagchecklist span { + margin-bottom: 15px; + font-size: 16px; + line-height: 1.3; + } +} + +.tagchecklist .ntdelbutton { + margin: 1px 0 0 -17px; + cursor: pointer; + width: 20px; + height: 20px; + display: block; + float: left; + text-indent: 0; + overflow: hidden; + position: absolute; + outline: 0; +} + +.tagchecklist .ntdelbutton:before { + content: "\f153"; + display: block; + margin: 2px 0; + height: 20px; + width: 20px; + background: 0 0; + color: #9ea7af; + font: 400 16px/1 dashicons; + text-align: center; + speak: none; + -webkit-font-smoothing: antialiased; +} + +.tagchecklist .ntdelbutton:focus:before { + color: #00a0d2; +} + + +/* THE TAG CLOUD. */ +.tagsdiv + p { + margin: 0; +} + +.press-this .tagcloud-link { + display: block; + margin: 0 16px 5px; + padding: 0; + text-decoration: none; + outline: 0; +} + +.tagcloud-link:focus { + text-decoration: underline; +} + +.popular-tags { + border: none; + line-height: 2em; + padding: 8px 12px 12px; + text-align: justify; +} + +.popular-tags a { + padding: 0 3px; +} + +.the-tagcloud { + margin: 0; + padding: 16px; +} + +.the-tagcloud a { + text-decoration: none; + outline: 0; +} + +.the-tagcloud a:focus { + text-decoration: underline; +} + +.tagcloud h3 { + margin: 2px 0 12px; +} + + +/** +* Categories +* +* Complete styles for post categories UI +*/ +input[type="search"].categories-search, +.add-category-name { + display: block; + width: 100%; + padding: 0.85714em 1.07143em; + border: 0; + -webkit-border-radius: 0; + border-radius: 0; + border-bottom: 1px solid #e5e5e5; + font-size: 14px; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; +} + +@media (max-width: 600px) { + input[type="search"].categories-search, + .add-category-name { + /* Needs to be 16px to prevent zooming on iOS. Guh. */ + font-size: 16px; + } +} + +.press-this .add-cat-toggle { + float: right; + margin-top: -45px; + line-height: 20px; + padding: 12px 10px 8px; + color: #0073aa; +} + +.press-this .add-cat-toggle:focus { + text-decoration: none; + color: #00a0d2; +} + +.press-this .add-cat-toggle.is-toggled { + padding: 10px; +} + +.press-this .add-cat-toggle.is-toggled .dashicons:before { + content: "\f179"; +} + +.add-category { + position: relative; + border-bottom: 1px solid #e5e5e5; +} + +.add-category.is-hidden { + display: none; +} + +.add-category .add-cat-submit { + position: absolute; + top: 0; + right: 0; + border: 0; + -webkit-border-radius: 0; + border-radius: 0; + padding: 12px 16px; + background: #f7f7f7; + border-left: 1px solid #f1f1f1; +} + +.add-category .add-cat-submit:hover, +.add-category .add-cat-submit:active, +.add-category .add-cat-submit:focus { + outline: 0; + background: #2991b7; + border-color: #20708e; + color: #fff; +} + +/* Parent category select */ +.postform-wrapper { + padding: 12px; +} + +.postform { + display: block; + margin: 0; + width: 100%; + height: 34px; + border: 0; + -webkit-border-radius: 0; + border-radius: 0; + border: 1px solid #e5e5e5; + background: #fff; + -webkit-background-size: 20px 20px; + background-size: 20px 20px; + overflow: hidden; + line-height: 21px; + text-overflow: ellipsis; + text-decoration: none; + vertical-align: top; + white-space: nowrap; + cursor: pointer; + outline: 0; +} + +.postform:focus { + border-color: #0073aa; + -webkit-box-shadow: 0 0 0 3px #00a0d2; + box-shadow: 0 0 0 3px #00a0d2; + outline: 0; + -moz-outline: none; + -moz-user-focus: ignore; +} + +.postform::-ms-expand { + display: none; +} + +.postform::-ms-value { + background: none; + color: #727272; +} + +.postform:-moz-focusring { + color: transparent; + text-shadow: 0 0 0 #727272; +} + +/* Category list */ +.categories-select { + margin: 0; + padding: 0; + list-style: none; +} + +.categories-select ul { + margin: 0; + padding: 0; + list-style: none; +} + +.category { + position: relative; + display: block; + padding: 13px 16px 14px 16px; + cursor: pointer; + background: #fff; +} + +.category:focus, +.category.selected:focus { + outline: 0; + background: #00a0d2; + color: #fff; +} + +.category.selected { + -webkit-box-shadow: inset 6px 0 0 #00a0d2; + box-shadow: inset 6px 0 0 #00a0d2; + background: #E9F5F9; +} + +.category.selected:after { + display: inline-block; + content: "\f147"; + position: absolute; + top: 13px; + right: 0; + width: 20px; + height: 20px; + margin-right: 10px; + font-size: 20px; + line-height: 1; + font-family: dashicons; + text-decoration: inherit; + color: #23282d; + font-weight: 400; + font-style: normal; + vertical-align: top; + text-align: center; + -webkit-transition: color .1s ease-in 0; + transition: color .1s ease-in 0; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.category.selected:focus:after { + color: #fff; +} + +.categories-select ul .category { + padding-left: 24px; +} + +.categories-select ul ul .category { + padding-left: 32px; +} + +.categories-select ul ul ul .category { + padding-left: 40px; +} + +.categories-select ul ul ul ul .category { + padding-left: 48px; +} + +.categories-select ul ul ul ul ul .category { + padding-left: 56px; +} + +.categories-select ul ul ul ul ul ul .category { + padding-left: 64px; +} + +.categories-select .is-hidden { + display: none; +} + +.categories-select .is-hidden.searched-parent { + display: block; +} + +/* Category search */ +.categories-search-wrapper { + position: relative; +} + +.categories-search-wrapper.is-hidden { + display: none; +} + +.categories-search-wrapper label { + position: absolute; + top: 50%; + right: 10px; + margin-top: -10px; + color: #9ea7af; +} + + +/** +* Main +*/ +html { + overflow: auto; +} + +body { + overflow-x: hidden; + height: 100%; +} + +html { + background: #fff; + -webkit-box-shadow: -10px 0 0 rgba(0, 0, 0, 0.3); + box-shadow: -10px 0 0 rgba(0, 0, 0, 0.3); +} + +@media (max-width: 900px) { + body { + font-size: 16px; + } +} + +@media (max-width: 320px) { + body { + font-size: 14px; + } +} + +.lt-ie9 { + overflow: visible; +} + +.adminbar { + position: relative; + width: 100%; + padding: 0 0.8em; + min-height: 3.2em; + background: #23282d; + color: #fff; + z-index: 9999; +} + +.adminbar:before, +.adminbar:after { + content: ""; + display: table; +} + +.adminbar:after { + clear: both; +} + +.adminbar .dashicons { + color: #a0a5aa; /* same as WP admin bar icons */ +} + +.press-this .adminbar button { + position: absolute; + top: 50%; + right: 6px; + margin-top: -13px; + padding: 0 10px 1px; + font-size: 13px; +} + +@media (max-width: 320px) { + .adminbar { + min-height: 45px; + } +} + +.current-site { + margin-top: 0.5625em; + font-size: 16px; + line-height: 44px; + font-weight: 400; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + +@media (max-width: 600px) { + .current-site { + margin: 3px 0 0; + } +} + +@media (max-width: 320px) { + .current-site { + margin: 0; + font-size: 14px; + } +} + +.current-site-link { + text-decoration: none; +} + +.current-site-link:focus { + outline: 0; +} + +.current-site-link:focus .current-site-name{ + text-decoration: underline; +} + +.current-site-name { + color: #ededed; +} + +@media (max-width: 320px) { + .current-site-name { + font-weight: 600; + } +} + +.current-site .dashicons-wordpress { + position: relative; + top: -1px; + margin-right: 10px; + vertical-align: middle; +} + +.options, +.options.open .on-closed, +.options.closed .on-open { + display: none; +} + +@media (max-width: 900px) { + .options { + display: block; + } } -.press-this #side-sortables .category-tabs li { - display: inline; - line-height: 1.35em; +.options-panel-back.is-hidden { + display: none; +} + +.options:focus .dashicons { + color: #fff; + text-decoration: none; } -body.press-this ul.category-tabs li.tabs a { - color: #333; +.options .dashicons { + margin-top: 3px; } -.press-this #content-resize-handle { - bottom: 2px; +.options { + color: #00a0d2; } -body.press-this { - color: #333; +.alert { + position: relative; margin: 0; - padding: 0; - min-width: 708px; - min-height: 400px; + padding: 16px 50px; + border-bottom: 1px solid #e5e5e5; + font-size: 14px; } -.press-this #titlediv #title { - font-size: 1.4em; +.alert:before { + content: ""; + position: absolute; + top: 50%; + left: 30px; + width: 8px; + height: 8px; + margin-top: -4px; + -webkit-border-radius: 50%; + border-radius: 50%; + background: #00a0d2; } -.press-this #site-heading:before { - top: 3px; - position: relative; - display: inline-block; - font: normal 18px/1 'dashicons'; - speak: none; - color: #727272; - content: '\f120'; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; +@media (max-width: 600px) { + .alert { + padding: 16px 35px; + } + .alert:before { + left: 15px; + } } -.press-this #wphead { - height: 32px; - margin-left: 0; - margin-right: 0; - margin-bottom: 5px; +.alert.is-error:before { + background: red; } -.press-this #header-logo { - float: left; - margin: 7px 7px 0; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; +.scan { + position: relative; + border-bottom: 1px solid #e5e5e5; } -.press-this #wphead h1 { - font-weight: normal; - font-size: 16px; - line-height: 32px; - margin: 0; - float: left; +@media (max-width: 900px) { + .scan form { + -webkit-transition: opacity .3s ease-in-out; + transition: opacity .3s ease-in-out; + } + .scan.is-hidden form { + opacity: .2; + pointer-events: none; + } } -.press-this #wphead h1 a { - text-decoration: none; +.scan-url { + display: block; + border: 0; + padding: 0.85714em 1.07143em; + font-size: 14px; + width: 100%; } -.press-this #wphead h1 a:hover { - text-decoration: underline; +@media (max-width: 600px) { + .scan-url { + font-size: 16px; + } } -.press-this #message { - margin: 10px 0; +.scan-submit { + position: absolute; + top: 0; + right: 0; + bottom: 0; + padding: 0 1.07143em; + background: #f7f7f7; + border-color: #ddd; + border: 0; + border-left: 1px solid #f1f1f1; + -webkit-border-radius: 0; + border-radius: 0; + color: #555; + font-size: 14px; + line-height: 1.6; } -.press-this .posting { - margin-right: 250px; +.scan-submit:hover, +.scan-submit:focus { + background: #008ec2; + border-color: #006799; + color: #fff; + outline: 0; } -.press-this-sidebar { - float: right; - width: 240px; - padding-top: 10px; +.scan-submit:active { + background: #0073aa; + border-color: #006799; + color: #fff; } -.press-this #title { - margin-left: 0; - margin-right: 0; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; +.scan-submit:visited { + color: #555; } -.press-this .tagchecklist { - margin-top: 8px; +.wrapper { + position: relative; + margin-bottom: 60px; + margin-right: 320px; } -.press-this #titlediv { - margin: 0; +.wrapper:before, +.wrapper:after { + content: ""; + display: table; } -.press-this #wp-content-wrap #wp-content-editor-tools { - padding: 0; - top: 3px; - overflow: hidden; +.wrapper:after { + clear: both; } -.press-this .wp-media-buttons { - cursor: default; - padding: 8px 8px 6px; +@media (max-width: 900px) { + .wrapper { + margin: 0; + width: 100%; + } } -.press-this #wp-content-wrap #wp-content-media-buttons a { - padding: 0; - line-height: normal; - height: auto; - font-size: 16px; +.editor-wrapper { + overflow: auto; + float: left; + width: 100%; } -.press-this #wp-content-wrap .mce-toolbar .mce-btn-group .mce-btn { - margin: 0 1px; +.editor-wrapper:before, +.editor-wrapper:after { + content: ""; + display: table; } -.press-this #wp-content-wrap .mce-toolbar .mce-btn button { - padding: 2px 3px; +.editor-wrapper:after { + clear: both; } -.press-this #wp-content-wrap div.mce-toolbar-grp, -.press-this #wp-content-wrap .quicktags-toolbar { - padding-right: 3px; +.editor { + padding: 0 1.5em 4.75em; + max-width: 700px; + margin: 0 auto; } -.press-this .howto { - margin-top: 2px; - margin-bottom: 3px; - font-size: 12px; - font-style: italic; - display: block; +.spinner { + height: 20px; + width: 20px; + display: inline-block; + visibility: hidden; + background: url(../images/spinner.gif) no-repeat center; + -webkit-background-size: 20px 20px; + background-size: 20px 20px; + opacity: 0.7; + filter: alpha(opacity=70); + line-height: 1; + vertical-align: middle; } -.press-this #wp-content-editor-container { - clear: none; +@media print, + (-webkit-min-device-pixel-ratio: 1.25), + (min-resolution: 120dpi) { + + .spinner { + background-image: url(../images/spinner-2x.gif); + } } -.press-this #poststuff .inside { - margin-top: 18px; +.spinner.is-active { + visibility: visible; } -.press-this .category-tabs { - margin-bottom: 3px; +/* Make the text inside the editor textarea white. Prevents a "flash" on loading the page */ +#pressthis { + color: #fff; } -/* Editor/Main Column */ -.press-this #poststuff { - margin: 0 8px; - padding: 0; +@media (min-width: 901px) { + .editor { + max-width: 760px; + } } -.press-this #photo-add-url-div input[type="text"] { - width: 220px; +@media (max-width: 320px) { + .editor { + padding: 0; + } } -#poststuff #editor-toolbar { - height: 30px; +.post-title, +.post-title-placeholder { + margin: 0; + padding: .83em 0; + width: 100%; + border-bottom: 1px solid #e5e5e5; + font-size: 32px; + line-height: 1.4; + font-weight: 700; +} + +.post-title:active, +.post-title:focus, +.post-title-placeholder:active, +.post-title-placeholder:focus { + outline: 0; + -webkit-box-shadow: inset 0px -3px 0 #00a0d2; + box-shadow: inset 0px -3px 0 #00a0d2; + border-color: #00a0d2; +} + +@media (max-width: 900px) { + .post-title, + .post-title-placeholder { + font-size: 24px; + } } -.posting { - margin-right: 212px; - position: relative; +@media (max-height: 400px) { + .post-title, + .post-title-placeholder { + padding: 15px 0; + font-size: 16px; + } } -.press-this .inner-sidebar { - width: 200px; +@media (max-width: 320px) { + .post-title, + .post-title-placeholder { + font-size: 16px; + font-weight: 600; + padding: 1.14286em 1.42857em; + } } -.press-this .inner-sidebar .sleeve { - padding-top: 5px; +.post-title { + /* IE8 fallback */ + background: url(data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///////wAAACH5BAEHAAIALAAAAAABAAEAAAICVAEAOw==); + background: none, none; } -.press-this #submitdiv p { - margin: 0; - padding: 6px; +.post-title:before { + /* Keeps empty container from collapsing */ + content: "\a0"; + display: inline-block; + width: 0; + speak: none; } -.press-this #submitdiv #publishing-actions { - border-bottom: 1px solid #dfdfdf; +.post-title-placeholder { + position: absolute; + border: 0; + color: #82878c; + z-index: -1; } -.press-this #publish { - float: right; +.post-title-placeholder.is-hidden { + display: none; } -.press-this #poststuff h2, -.press-this #poststuff h3 { - font-size: 14px; - line-height: 1; +/* Suggested images */ +.media-list-container { + position: relative; + padding: 2px 0; + border-bottom: 1px solid #e5e5e5; + display: none; } -.press-this #tagsdiv-post_tag h3, -.press-this #categorydiv h3 { - cursor: pointer; +.media-list-inner-container { + overflow: auto; + max-height: 150px; + max-height: 40vw; } -.press-this #submitdiv h3 { - cursor: default; +.media-list-container.has-media { + display: block; } -h3.tb { - font-weight: 600; - font-size: 12px; - margin-left: 5px; +.media-list-inner-container:before, +.media-list-inner-container:after { + content: ""; + display: table; } -.press-this .postbox, -.press-this .stuffbox { - margin-bottom: 10px; - min-width: 0; +.media-list-inner-container:after { + clear: both; } -.press-this #submitdiv:hover .handlediv { - background: none; +.media-list { + margin: 0; + padding: 0; } -.tbtitle { - font-size: 1.7em; - outline: none; - padding: 3px 4px; - border: 1px solid #dfdfdf; +@media (min-width: 321px) { + .media-list-inner-container { + max-height: 250px; + max-height: 40vw; + } } -.press-this .actions { - float: right; - margin: -19px 0 0; +@media (min-width: 601px) { + .media-list-inner-container { + max-height: 200px; + max-height: 18.75vw; + } +} + +.wppt-all-media-list { + list-style: none; + margin: 0; + padding: 0; } -.press-this #extra-fields .actions { - margin: -32px -7px 0 0; +.suggested-media-thumbnail:focus, +.is-embed:focus { + outline: 0; + -webkit-box-shadow: inset 0 0 0 3px #00a0d2; + box-shadow: inset 0 0 0 3px #00a0d2; } -.press-this .actions li { +.suggested-media-thumbnail { + position: relative; + display: block; float: left; - list-style: none; - margin-right: 10px; + width: 16.66%; + padding: 16.66% 0 0 16.66%; + background-position: center; + background-repeat: no-repeat; + -webkit-background-size: cover; + background-size: cover; + background-color: #d8d8d8; + color: #fff; + color: rgba(255, 255, 255, 0.6); + cursor: pointer; } -#extra-fields .button { - margin-right: 5px; +.suggested-media-thumbnail:hover, +.suggested-media-thumbnail:active, +.suggested-media-thumbnail:focus { + color: #fff; } -/* Photo Styles */ -#photo_saving { - margin: 0 8px 8px; - vertical-align: middle; +.suggested-media-thumbnail:before, +.suggested-media-thumbnail:after { + display: inline-block; + position: absolute; + font-size: 20px; + line-height: 1; + font-family: dashicons; + text-decoration: inherit; + font-weight: 400; + font-style: normal; + -webkit-transition: color .1s ease-in 0; + transition: color .1s ease-in 0; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } -#img_container_container { - overflow: auto; +.suggested-media-thumbnail:before { + left: 50%; + top: 50%; + margin: -20px 0 0 -20px; + font-size: 40px; } -#extra-fields { - margin-top: 10px; - position: relative; +.suggested-media-thumbnail:after { + content: "\f132"; + right: 3%; + bottom: 2%; } -#extra-fields h2 { - margin: 12px; +@media (min-width: 601px) { + .suggested-media-thumbnail { + width: 12.5%; + padding: 12.5% 0 0 12.5%; + } } -#waiting { - margin-top: 10px; - overflow: hidden; +.is-embed:before { + content: "\f104"; + color: #fff; + color: rgba(255, 255, 255, 0.9); } -#waiting span { - float: right; - margin: 0 0 0 5px; +.is-embed.is-audio:hover:before, +.is-embed.is-audio:active:before, +.is-embed.is-audio:focus:before, +.is-embed.is-tweet:hover:before, +.is-embed.is-tweet:active:before, +.is-embed.is-tweet:focus:before { + color: #fff; } -#waiting .spinner { - display: block; +.is-embed.is-video { + background-color: #23282d; } -#extra-fields .postbox { - margin-bottom: 5px; +.is-embed.is-video:hover:before, +.is-embed.is-video:active:before, +.is-embed.is-video:focus:before { + color: rgba(255, 255, 255, 0.2); } -#extra-fields .titlewrap { - padding: 0; - overflow: auto; - height: 120px; +.is-embed.is-video:before { + content: "\f236"; } -#img_container a { - display: block; - float: left; - overflow: hidden; +.is-embed.is-audio { + background-color: #ff7d44; } -#img_container img, -#img_container a { - width: 68px; - height: 68px; +.is-embed.is-audio:before { + content: "\f127"; } -#img_container img { - border: none; - background-color: #f4f4f4; - cursor: pointer; +.is-embed.is-tweet { + background-color: #55acee; } -#img_container a, -#img_container a:link, -#img_container a:visited { - border: 1px solid #ccc; - display: block; - position: relative; +.is-embed.is-tweet:before { + content: "\f301"; } -#img_container a:hover, -#img_container a:active { - border-color: #000; - z-index: 1000; - border-width: 1px; +.no-media { + margin: 0; + padding: 0; + border: 0; } -/* Video */ -#embed-code { +/* Actions bar */ +.press-this-actions { + position: fixed; + bottom: 0; + left: 0; width: 100%; - height: 98px; + background: #f1f1f1; + background: rgba(241, 241, 241, 0.9); + border-top: 1px solid #e5e5e5; +} + +@media (max-width: 900px) { + .press-this-actions { + -webkit-transform: translateY(0); + -ms-transform: translateY(0); + transform: translateY(0); + -webkit-transition: -webkit-transform .3s ease-in-out; + transition: -webkit-transform .3s ease-in-out; + transition: transform .3s ease-in-out; + transition: transform .3s ease-in-out, -webkit-transform .3s ease-in-out; + } + .press-this-actions.is-hidden { + -webkit-transform: translateY(100%); + -ms-transform: translateY(100%); + transform: translateY(100%); + } } -/* Categories */ -.press-this .categorydiv div.tabs-panel { - height: 100px; +.add-media { + float: left; + margin: 14px 0 14px 30px; + font-size: 0; } -/* Tags */ -.press-this .tagsdiv .newtag { - width: 120px; +@media (max-width: 320px) { + .add-media { + margin: 10px 0 10px 10px; + } } -.press-this #content { - margin: 5px 0; - padding: 0 5px; - border: 0 none; - height: 340px; - font-family: Consolas, Monaco, monospace; - font-size: 13px; - line-height: 19px; - background: transparent; +.insert-media { + color: #9ea7af; + float: left; + margin: 0; + padding: 0; + border: 0; + border-right: 1px solid #e5e5e5; + -webkit-border-radius: 0; + border-radius: 0; + background: none; + -webkit-box-shadow: none; + box-shadow: none; + overflow: hidden; } -/* Submit */ -.press-this #publishing-actions .spinner { - display: inline; - vertical-align: middle; +.insert-media:hover, +.insert-media:focus, +.insert-media:active { + margin: 0; + background: none; + border-color: #e5e5e5; + color: #23282d; } -/* =Media Queries --------------------------------------------------------------- */ +.insert-media:focus, +.insert-media:active { + outline: 0; + color: #00a0d2; + text-decoration: none; +} -/* Reset responsive styles in Press This */ -@media screen and ( max-width: 782px ) { - .press-this ul.category-tabs li.tabs { - padding: 3px 5px 5px; /* Reset tabs in Press This to standard size */ - } +.insert-media .dashicons { + padding: 11px; + width: 63px; + height: 58px; + font-size: 40px; +} - .press-this a.wp-switch-editor { - font: 13px/19px "Open Sans", sans-serif; - margin: 5px 0 0 5px; - padding: 3px 8px 4px; +@media (max-width: 320px) { + .insert-media .dashicons { + width: 55px; + height: 49px; + padding: 14px; + font-size: 20px; } +} - .press-this #wp-content-media-buttons a { - padding: 0; - line-height: normal; - height: auto; +.post-actions { + float: right; + margin: 14px 30px 14px 0; + font-size: 13px; +} + +@media (max-width: 320px) { + .post-actions { + margin: 10px 10px 10px 0; } +} + +.publish-button .saving-draft, +.publish-button.is-saving .publish { + display: none; +} + +.publish-button.is-saving .saving-draft { + display: inline; +} + +/* TinyMCE styles */ +.editor .wp-media-buttons { + float: none; +} + +.editor div.mce-toolbar-grp { + padding: 0.71429em 0; + background: none; + border: 0; +} - .press-this #wp-content-editor-tools { +@media (max-height: 400px), (max-width: 320px) { + .editor div.mce-toolbar-grp { padding: 0; - top: 3px; } +} - .press-this .category-tabs { - margin-top: 0; - } +.mce-stack-layout:before, +.mce-stack-layout:after { + content: ""; + display: table; +} - .press-this .tagsdiv .newtag { - width: 120px; - padding: 3px 5px; - margin-bottom: 0; - } +.mce-stack-layout:after { + clear: both; +} + +.mce-container.mce-toolbar { + float: left; +} - .press-this .tagchecklist { +.mce-container.mce-toolbar:nth-child(2) { + float: right; +} + +@media (max-width: 600px) { + .mce-first .mce-btn:nth-child(3), + .mce-first .mce-btn:nth-child(4) { + position: absolute; + margin: -1px; padding: 0; - margin-bottom: 0; + height: 1px; + width: 1px; + overflow: hidden; + clip: rect(0 0 0 0); + border: 0; } - .press-this .wp_themeSkin a.mceButton { - width: 20px; - height: 20px; + .mce-first .mce-btn:nth-child(3):focus, + .mce-first .mce-btn:nth-child(4):focus { + position: static; + margin: 1px; + padding: inherit; + height: auto; + width: auto; + overflow: visible; + clip: auto; + border: 1px solid #999; } +} - .press-this .wp_themeSkin .mceButton .mceIcon { - margin: 0; +#wp-link-wrap { + font-size: 13px; +} + +#wp-link-wrap input[type="text"] { + padding: 3px 5px; + margin: 1px; +} + +@media screen and (max-width: 782px) { + #wp-link-wrap { + font-size: 14px; } - .press-this #poststuff h3, - .press-this .metabox-holder h3 { - padding: 7px 12px; + #wp-link-wrap input[type="text"] { + padding: 6px 10px; } +} + +#wp-link-wrap .howto { + color: #666; + font-style: italic; +} - .press-this input[type=checkbox], - .press-this input[type=radio] { - height: 16px; - width: 16px; +/* Options panel (sidebar) */ +.options-panel { + position: relative; + float: right; + margin-right: -320px; + width: 320px; + border-left: 1px solid #e5e5e5; + font-size: 14px; + /* Keeps background the full height of the screen, but only visually. Clicks go through. */ + -webkit-box-shadow: 5001px 5000px 0 5000px #fff, 5000px 5000px 0 5000px #e5e5e5; + box-shadow: 5001px 5000px 0 5000px #fff, 5000px 5000px 0 5000px #e5e5e5; + outline: 0; +} + +.options-panel-back { + position: absolute; + top: 0; + right: 0; + bottom: 0; + width: 320px; + outline: 0; +} + +@media (max-width: 900px) { + .options-panel { + background: #fff; + -webkit-transform: translateX(-100%); + -ms-transform: translateX(-100%); + transform: translateX(-100%); + -webkit-transition: -webkit-transform .3s ease-in-out; + transition: -webkit-transform .3s ease-in-out; + transition: transform .3s ease-in-out; + transition: transform .3s ease-in-out, -webkit-transform .3s ease-in-out; } - .press-this input[type=checkbox]:checked:before { - width: 16px; - font: normal 21px/1 'dashicons'; - margin: -3px 0 0 -4px; + .options-panel.is-hidden { + visibility: hidden; } - .press-this input[type=radio]:checked:before { - font: normal 21px/1 'dashicons'; - width: 6px; - height: 6px; - margin: 4px; + .options-panel.is-off-screen { + -webkit-transform: translateX(0); + -ms-transform: translateX(0); + transform: translateX(0); } +} - .press-this ul.categorychecklist ul, - .press-this ul.categorychecklist li { - margin-top: 0; - margin-bottom: 0; +@media (max-width: 320px) { + .options-panel { + margin-right: -100%; + width: 100%; + border: 0; + -webkit-box-shadow: 5001px 5000px 0 5000px #fff; + box-shadow: 5001px 5000px 0 5000px #fff; } - .press-this div.quicktags-toolbar input { - padding: 2px 4px; + .options-panel-back { + width: 100%; } +} - .press-this textarea, - .press-this input { - font-size: 14px; +.post-options { + background: #fff; + position: absolute; + right: 0; + width: 100%; + overflow-x: hidden; +} + +.post-options .post-option-contents { + margin-left: 3px; + color: #32373c; +} + +.post-option-forward:before { + position: absolute; + top: 50%; + right: 8px; + margin-top: -10px; + content: "\f345" +} + +.post-option-back:before { + content: "\f341"; +} + +.lt-ie9 .options-panel, +.lt-ie9 .post-options { + border-left: 1px solid #e5e5e5; +} + +.lt-ie9 .post-options.is-off-screen { + border: 0; +} + +.post-option { + position: relative; +} + +.post-options .post-option { + display: block; + width: 100%; + padding: 13px 37px 13px 14px; + border-bottom: 1px solid #e5e5e5; + text-decoration: none; + text-align: left; + color: #9ea7af; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + -webkit-transition: -webkit-transform .3s ease-in-out; + transition: -webkit-transform .3s ease-in-out; + transition: transform .3s ease-in-out; + transition: transform .3s ease-in-out, -webkit-transform .3s ease-in-out; +} + +.post-options .post-option:focus { + outline: 0; + -webkit-box-shadow: inset 5px 0 0 #00a0d2; + box-shadow: inset 5px 0 0 #00a0d2; + border-color: #e5e5e5; +} + +.is-off-screen > .post-option { + right: 100%; +} + +.is-hidden > .post-option { + visibility: hidden; +} + +@media (min-width: 1px) { + .is-off-screen > .post-option { + right: auto; + -webkit-transform: translateX(-100%); + -ms-transform: translateX(-100%); + transform: translateX(-100%); } +} + +.post-option-title { + display: inline-block; + margin: 0 0 0 8px; + font-size: 14px; + font-weight: normal; +} + +.setting-modal { + position: relative; + top: 0; + left: 0; + width: 100%; + overflow: hidden; + -webkit-transition: -webkit-transform .3s ease-in-out; + transition: -webkit-transform .3s ease-in-out; + transition: transform .3s ease-in-out; + transition: transform .3s ease-in-out, -webkit-transform .3s ease-in-out; +} + +.setting-modal.is-hidden { + visibility: hidden; + height: 0; +} + +.setting-modal.is-off-screen { + left: 100%; +} - .press-this .tagchecklist span { - font-size: 13px; - line-height: 1.8em; +@media (min-width: 1px) { + .setting-modal.is-off-screen { + left: 0; + -webkit-transform: translateX(100%); + -ms-transform: translateX(100%); + transform: translateX(100%); } } + +.press-this .modal-close { + display: block; + width: 100%; + padding: 13px 14px; + border-bottom: 1px solid #e5e5e5; + color: #00a0d2; + text-decoration: none; + text-align: left; +} + +.press-this .modal-close:focus { + outline: 0; + -webkit-box-shadow: inset 5px 0 0 #00a0d2; + box-shadow: inset 5px 0 0 #00a0d2; + border-color: #e5e5e5; +} + +.setting-title { + position: relative; + top: -1px; + margin-left: 11px; +} + +/* Text editor */ +#pressthis { + color: #404040; + resize: none; + padding-top: 30px; + font-size: 16px; +} + +.wp-editor-wrap .quicktags-toolbar { + background: transparent; + border: none; +} + +/* Switch editor buttons */ +.wp-editor-wrap .wp-editor-tools { + z-index: 0; +} + +.wp-editor-wrap .wp-editor-tabs { + padding: 2px; +} + +.wp-editor-wrap .wp-switch-editor { + top: 0; + margin: 3px 0 0 5px; + padding: 3px 8px; + background: #f5f5f5; + color: #555; + border-color: #ccc; +} + +.wp-editor-wrap .wp-switch-editor:hover { + background: #fafafa; + border-color: #999; + color: #23282d; +} + +.wp-editor-wrap.tmce-active .switch-tmce, +.wp-editor-wrap.html-active .switch-html { + background: #fff; + border-color: #d8d8d8; +} + +/* Inline link dialog */ +.wp-link-input input { + border: 1px solid #ddd; + -webkit-box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.07 ); + box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.07 ); + background-color: #fff; + color: #32373c; + outline: none; + -webkit-transition: 0.05s border-color ease-in-out; + transition: 0.05s border-color ease-in-out; +} + +/* UI Autocomplete (for inline link and wpLink) */ +.ui-autocomplete { + padding: 0; + margin: 0; + list-style: none; + position: absolute; + z-index: 10000; + border: 1px solid #5b9dd9; + -webkit-box-shadow: 0 1px 2px rgba( 30, 140, 190, 0.8 ); + box-shadow: 0 1px 2px rgba( 30, 140, 190, 0.8 ); + background-color: #fff; +} + +.ui-autocomplete li { + margin-bottom: 0; + padding: 4px 10px; + white-space: nowrap; + text-align: left; +} + +.ui-autocomplete li.ui-state-focus { + background-color: #ddd; + cursor: pointer; +} diff --git a/wp-admin/css/press-this.min.css b/wp-admin/css/press-this.min.css new file mode 100644 index 0000000..195d483 --- /dev/null +++ b/wp-admin/css/press-this.min.css @@ -0,0 +1 @@ +body,fieldset{margin:0}.screen-reader-text,fieldset,legend,td,th{padding:0}.current-site,.post-options .post-option,.postform{text-overflow:ellipsis;white-space:nowrap}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}*,:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-resolution:144dpi){*,:after,:before{-webkit-font-smoothing:antialiased}}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:0 0}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}fieldset,img,legend{border:0}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}::-webkit-input-placeholder{color:#72777c}::-moz-placeholder{color:#72777c;opacity:1}:-ms-input-placeholder{color:#72777c}.clearfix:after,.clearfix:before{content:"";display:table}.clearfix:after{clear:both}.hide-if-js{display:none}.screen-reader-text{position:absolute;margin:-1px;height:1px;width:1px;overflow:hidden;clip:rect(0 0 0 0);border:0}body,button,input,select,textarea{color:#404040;font-family:"Open Sans",Helvetica,Arial,sans-serif;font-size:20px;font-weight:400;line-height:1.6}b,dt,strong{font-weight:700}h1,h2,h3,h4,h5,h6{clear:both}p{margin-bottom:1.5em}.scan-submit{display:inline-block;margin:0;text-decoration:none;white-space:nowrap;cursor:pointer;-webkit-appearance:none}.split-button{position:relative;display:inline-block;vertical-align:middle}.split-button-body{display:none;position:absolute;bottom:39px;right:0;border:1px solid #ddd;background-color:#fff;min-width:180px;max-width:100%;margin:0;padding:8px;list-style:none;-webkit-box-shadow:1px 0 4px rgba(0,0,0,.15);box-shadow:1px 0 4px rgba(0,0,0,.15)}.split-button-body:after,.split-button-body:before{position:absolute;right:12px;display:block;width:0;height:0;border-style:solid;border-color:transparent;content:""}.split-button-body:before{bottom:-18px;border-top-color:#ccc;border-width:9px;right:11px}.split-button-body:after{bottom:-16px;border-top-color:#fff;border-width:8px}.split-button-body .split-button-option{display:block;padding:5px 15px;margin:0;width:100%;text-align:left;line-height:2}.is-open .split-button-body{display:block}.split-button-primary,.split-button-toggle{-webkit-border-radius:0;border-radius:0;display:block;margin:0;font-size:13px;text-decoration:none;white-space:nowrap;cursor:pointer;-webkit-appearance:none;line-height:2;padding:0 10px 1px;background:#0085ba;border-color:#0073aa #006799 #006799;border-width:1px;border-style:solid;-webkit-box-shadow:0 1px 0 #006799;box-shadow:0 1px 0 #006799;color:#fff;text-shadow:0 -1px 1px #006799,1px 0 1px #006799,0 1px 1px #006799,-1px 0 1px #006799}.split-button-primary{-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;border-right:0 none;float:left}.split-button-toggle{padding:0;-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;border-left:1px solid #006799;float:right}.split-button-toggle i{margin:4px 20px 3px 0;padding:0 10px}.split-button-primary:hover,.split-button-toggle:hover{outline:0;background:#008ec2;border-color:#006799}.split-button-primary:focus,.split-button-toggle:focus{outline:0;-webkit-box-shadow:0 1px 0 #0073aa,0 0 2px 1px #33b3db;box-shadow:0 1px 0 #0073aa,0 0 2px 1px #33b3db}.split-button-primary:active,.split-button-toggle:active{background:#0073aa;border-color:#006799;-webkit-box-shadow:inset 0 2px 10px #006799,0 1px 0 #0073aa;box-shadow:inset 0 2px 10px #006799,0 1px 0 #0073aa}button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}.postform,textarea{vertical-align:top}[type=checkbox],[type=radio]{padding:0}[type=search]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}[type=search]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}[type=email],[type=url],[type=password],[type=search],[type=text],textarea{padding:.4em .75em;color:#32373c;border:1px solid #ccc}[type=email]:focus,[type=url]:focus,[type=password]:focus,[type=search]:focus,[type=text]:focus,textarea:focus{color:#32373c;outline:0}textarea{overflow:auto;padding-left:3px}a,a:visited{color:#0073aa}a:active,a:focus,a:hover{color:#00a0d2}ol,ul{margin:0 0 1.5em 3em}ul{list-style:disc}ol{list-style:decimal}li>ol,li>ul{margin-bottom:0;margin-left:1.5em}dd{margin:0 1.5em 1.5em}#post-formats-select br{display:none}.post-format{width:1px;height:1px;position:absolute;top:-9999px}.lt-ie9 .post-format{margin:17px 12px 0 13px;position:static;top:auto;float:left;width:16px;height:16px}.add-category,.post-format-icon,.tagsdiv .ajaxtag,.tagsdiv .newtag{position:relative}.post-format-icon{display:block;padding:13px 2px 14px 13px;cursor:pointer}.post-format-icon:after,.post-format-icon:before{content:"";display:inline-block;width:20px;height:20px;margin-right:10px;font-size:20px;line-height:1;font-family:dashicons;text-decoration:inherit;color:#9ea7af;font-weight:400;font-style:normal;vertical-align:top;text-align:center;-webkit-transition:color .1s ease-in 0;transition:color .1s ease-in 0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.post-format-icon:before{content:"\f109"}.post-format-icon:after{display:none;content:"\f147";float:right}.post-format:checked+.post-format-icon{-webkit-box-shadow:inset 6px 0 0 #00a0d2;box-shadow:inset 6px 0 0 #00a0d2;background:rgba(46,162,204,.1)}.post-format:checked+.post-format-icon:after,.post-format:checked+.post-format-icon:before{color:#32373c}.post-format:focus+.post-format-icon{background:#00a0d2;color:#fff}.post-format:focus+.post-format-icon:after,.post-format:focus+.post-format-icon:before{color:#fff}.post-format:checked+.post-format-icon:after{display:block}.lt-ie9 .post-format-icon{margin-left:16px}.post-format-aside:before{content:"\f123"}.post-format-image:before{content:"\f128"}.post-format-video:before{content:"\f126"}.post-format-audio:before{content:"\f127"}.post-format-quote:before{content:"\f122"}.post-format-link:before{content:"\f103"}.post-format-gallery:before{content:"\f161"}.tagsdiv p{margin:0}.tagsdiv .newtag{display:block;padding:11px 58px 11px 16px;width:100%;border:0;border-bottom:1px solid #e5e5e5;font-size:16px}.tagsdiv .tagadd{position:absolute;top:0;right:0;bottom:1px;border:0;-webkit-border-radius:0;border-radius:0;margin:0;padding:0 16px;background:#f7f7f7;border-left:1px solid #f1f1f1;-webkit-box-shadow:none;box-shadow:none}.tagsdiv .tagadd:active,.tagsdiv .tagadd:focus,.tagsdiv .tagadd:hover{outline:0;background:#2991b7;border-color:#20708e;color:#fff;-webkit-box-shadow:none;box-shadow:none}.tagsdiv .howto{color:#727272;font-style:italic;margin:10px 0 6px 16px}.ac_results{padding:0;margin:-1px 0 0 -1px;list-style:none;position:absolute;z-index:10000;display:none;border:1px solid #d8d8d8;background-color:#fff;font-size:14px}.ac_results li{padding:6px 16px;white-space:nowrap;text-align:left}.ac_results .ac_over{background-color:#00a0d2;color:#fff;cursor:pointer}.ac_match{text-decoration:underline}.tagchecklist{padding:16px 28px 5px}.tagchecklist:after,.tagchecklist:before{content:"";display:table}.tagchecklist:after{clear:both}.tagchecklist span{display:block;margin-right:25px;float:left;font-size:13px;line-height:1.8;white-space:nowrap;cursor:default}@media (max-width:600px){.tagchecklist span{margin-bottom:15px;font-size:16px;line-height:1.3}}.tagchecklist .ntdelbutton{margin:1px 0 0 -17px;cursor:pointer;width:20px;height:20px;display:block;float:left;text-indent:0;overflow:hidden;position:absolute;outline:0}.tagchecklist .ntdelbutton:before{content:"\f153";display:block;margin:2px 0;height:20px;width:20px;background:0 0;color:#9ea7af;font:400 16px/1 dashicons;text-align:center;speak:none;-webkit-font-smoothing:antialiased}.tagchecklist .ntdelbutton:focus:before{color:#00a0d2}.tagsdiv+p{margin:0}.press-this .tagcloud-link{display:block;margin:0 16px 5px;padding:0;text-decoration:none;outline:0}.tagcloud-link:focus{text-decoration:underline}.popular-tags{border:none;line-height:2em;padding:8px 12px 12px;text-align:justify}.popular-tags a{padding:0 3px}.the-tagcloud{margin:0;padding:16px}.the-tagcloud a{text-decoration:none;outline:0}.the-tagcloud a:focus{text-decoration:underline}.tagcloud h3{margin:2px 0 12px}.add-category-name,input[type=search].categories-search{display:block;width:100%;padding:.85714em 1.07143em;border:0;-webkit-border-radius:0;border-radius:0;border-bottom:1px solid #e5e5e5;font-size:14px;-webkit-appearance:none;-moz-appearance:none;appearance:none}@media (max-width:600px){.add-category-name,input[type=search].categories-search{font-size:16px}}.press-this .add-cat-toggle{float:right;margin-top:-45px;line-height:20px;padding:12px 10px 8px;color:#0073aa}.press-this .add-cat-toggle:focus{text-decoration:none;color:#00a0d2}.press-this .add-cat-toggle.is-toggled{padding:10px}.press-this .add-cat-toggle.is-toggled .dashicons:before{content:"\f179"}.add-category{border-bottom:1px solid #e5e5e5}.add-category.is-hidden{display:none}.add-category .add-cat-submit{position:absolute;top:0;right:0;border:0;-webkit-border-radius:0;border-radius:0;padding:12px 16px;background:#f7f7f7;border-left:1px solid #f1f1f1}.add-category .add-cat-submit:active,.add-category .add-cat-submit:focus,.add-category .add-cat-submit:hover{outline:0;background:#2991b7;border-color:#20708e;color:#fff}.postform-wrapper{padding:12px}.postform{display:block;margin:0;width:100%;height:34px;-webkit-border-radius:0;border-radius:0;border:1px solid #e5e5e5;background:#fff;-webkit-background-size:20px 20px;background-size:20px 20px;overflow:hidden;line-height:21px;text-decoration:none;cursor:pointer;outline:0}.postform:focus{border-color:#0073aa;-webkit-box-shadow:0 0 0 3px #00a0d2;box-shadow:0 0 0 3px #00a0d2;outline:0;-moz-outline:none;-moz-user-focus:ignore}.alert,.scan{border-bottom:1px solid #e5e5e5}.postform::-ms-expand{display:none}.postform::-ms-value{background:0 0;color:#727272}.postform:-moz-focusring{color:transparent;text-shadow:0 0 0 #727272}.categories-select,.categories-select ul{margin:0;padding:0;list-style:none}.category{position:relative;display:block;padding:13px 16px 14px;cursor:pointer;background:#fff}.category.selected:focus,.category:focus{outline:0;background:#00a0d2;color:#fff}.category.selected{-webkit-box-shadow:inset 6px 0 0 #00a0d2;box-shadow:inset 6px 0 0 #00a0d2;background:#E9F5F9}.category.selected:after{display:inline-block;content:"\f147";position:absolute;top:13px;right:0;width:20px;height:20px;margin-right:10px;font-size:20px;line-height:1;font-family:dashicons;text-decoration:inherit;color:#23282d;font-weight:400;font-style:normal;vertical-align:top;text-align:center;-webkit-transition:color .1s ease-in 0;transition:color .1s ease-in 0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.category.selected:focus:after{color:#fff}.categories-select ul .category{padding-left:24px}.categories-select ul ul .category{padding-left:32px}.categories-select ul ul ul .category{padding-left:40px}.categories-select ul ul ul ul .category{padding-left:48px}.categories-select ul ul ul ul ul .category{padding-left:56px}.categories-select ul ul ul ul ul ul .category{padding-left:64px}.categories-select .is-hidden{display:none}.categories-select .is-hidden.searched-parent{display:block}.categories-search-wrapper{position:relative}.categories-search-wrapper.is-hidden{display:none}.categories-search-wrapper label{position:absolute;top:50%;right:10px;margin-top:-10px;color:#9ea7af}html{overflow:auto;background:#fff;-webkit-box-shadow:-10px 0 0 rgba(0,0,0,.3);box-shadow:-10px 0 0 rgba(0,0,0,.3)}body{overflow-x:hidden;height:100%}@media (max-width:900px){body{font-size:16px}}@media (max-width:320px){body{font-size:14px}}.lt-ie9{overflow:visible}.adminbar{position:relative;width:100%;padding:0 .8em;min-height:3.2em;background:#23282d;color:#fff;z-index:9999}.adminbar:after,.adminbar:before{content:"";display:table}.adminbar:after{clear:both}.adminbar .dashicons{color:#a0a5aa}.press-this .adminbar button{position:absolute;top:50%;right:6px;margin-top:-13px;padding:0 10px 1px;font-size:13px}.current-site{margin-top:.5625em;font-size:16px;line-height:44px;font-weight:400;overflow:hidden}@media (max-width:600px){.current-site{margin:3px 0 0}}.current-site-link{text-decoration:none}.current-site-link:focus{outline:0}.current-site-link:focus .current-site-name{text-decoration:underline}.current-site-name{color:#ededed}@media (max-width:320px){.adminbar{min-height:45px}.current-site{margin:0;font-size:14px}.current-site-name{font-weight:600}}.current-site .dashicons-wordpress{position:relative;top:-1px;margin-right:10px;vertical-align:middle}.options,.options.closed .on-open,.options.open .on-closed{display:none}@media (max-width:900px){.options{display:block}.scan form{-webkit-transition:opacity .3s ease-in-out;transition:opacity .3s ease-in-out}.scan.is-hidden form{opacity:.2;pointer-events:none}}.options-panel-back.is-hidden{display:none}.options:focus .dashicons{color:#fff;text-decoration:none}.options .dashicons{margin-top:3px}.options{color:#00a0d2}.alert{position:relative;margin:0;padding:16px 50px;font-size:14px}.alert:before{content:"";position:absolute;top:50%;left:30px;width:8px;height:8px;margin-top:-4px;-webkit-border-radius:50%;border-radius:50%;background:#00a0d2}@media (max-width:600px){.alert{padding:16px 35px}.alert:before{left:15px}}.alert.is-error:before{background:red}.scan{position:relative}.scan-url{display:block;border:0;padding:.85714em 1.07143em;font-size:14px;width:100%}@media (max-width:600px){.scan-url{font-size:16px}}.scan-submit{position:absolute;top:0;right:0;bottom:0;padding:0 1.07143em;background:#f7f7f7;border:0;border-left:1px solid #f1f1f1;-webkit-border-radius:0;border-radius:0;color:#555;font-size:14px;line-height:1.6}.scan-submit:focus,.scan-submit:hover{background:#008ec2;border-color:#006799;color:#fff;outline:0}.scan-submit:active{background:#0073aa;border-color:#006799;color:#fff}.scan-submit:visited{color:#555}.wrapper{position:relative;margin-bottom:60px;margin-right:320px}.wrapper:after,.wrapper:before{content:"";display:table}.wrapper:after{clear:both}@media (max-width:900px){.wrapper{margin:0;width:100%}}.editor-wrapper{overflow:auto;float:left;width:100%}.editor-wrapper:after,.editor-wrapper:before{content:"";display:table}.editor-wrapper:after{clear:both}.editor{padding:0 1.5em 4.75em;max-width:700px;margin:0 auto}.spinner{height:20px;width:20px;display:inline-block;visibility:hidden;background:url(../images/spinner.gif) center no-repeat;-webkit-background-size:20px 20px;background-size:20px 20px;opacity:.7;filter:alpha(opacity=70);line-height:1;vertical-align:middle}@media print,(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.spinner{background-image:url(../images/spinner-2x.gif)}}.spinner.is-active{visibility:visible}@media (min-width:901px){.editor{max-width:760px}}@media (max-width:320px){.editor{padding:0}}.post-title,.post-title-placeholder{margin:0;padding:.83em 0;width:100%;border-bottom:1px solid #e5e5e5;font-size:32px;line-height:1.4;font-weight:700}.post-title-placeholder:active,.post-title-placeholder:focus,.post-title:active,.post-title:focus{outline:0;-webkit-box-shadow:inset 0 -3px 0 #00a0d2;box-shadow:inset 0 -3px 0 #00a0d2;border-color:#00a0d2}@media (max-width:900px){.post-title,.post-title-placeholder{font-size:24px}}@media (max-height:400px){.post-title,.post-title-placeholder{padding:15px 0;font-size:16px}}@media (max-width:320px){.post-title,.post-title-placeholder{font-size:16px;font-weight:600;padding:1.14286em 1.42857em}}.post-title{background:url(data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///////wAAACH5BAEHAAIALAAAAAABAAEAAAICVAEAOw==);background:0 0,none}.post-title:before{content:"\a0";display:inline-block;width:0;speak:none}.post-title-placeholder{position:absolute;border:0;color:#82878c;z-index:-1}.post-title-placeholder.is-hidden{display:none}.media-list-container{position:relative;padding:2px 0;border-bottom:1px solid #e5e5e5;display:none}.media-list-inner-container{overflow:auto;max-height:150px;max-height:40vw}.media-list-container.has-media{display:block}.media-list-inner-container:after,.media-list-inner-container:before{content:"";display:table}.media-list-inner-container:after{clear:both}.media-list{margin:0;padding:0}@media (min-width:321px){.media-list-inner-container{max-height:250px;max-height:40vw}}.wppt-all-media-list{list-style:none;margin:0;padding:0}.is-embed:focus,.suggested-media-thumbnail:focus{outline:0;-webkit-box-shadow:inset 0 0 0 3px #00a0d2;box-shadow:inset 0 0 0 3px #00a0d2}.suggested-media-thumbnail{position:relative;display:block;float:left;width:16.66%;padding:16.66% 0 0 16.66%;background-position:center;background-repeat:no-repeat;-webkit-background-size:cover;background-size:cover;background-color:#d8d8d8;color:#fff;color:rgba(255,255,255,.6);cursor:pointer}.suggested-media-thumbnail:active,.suggested-media-thumbnail:focus,.suggested-media-thumbnail:hover{color:#fff}.suggested-media-thumbnail:after,.suggested-media-thumbnail:before{display:inline-block;position:absolute;font-size:20px;line-height:1;font-family:dashicons;text-decoration:inherit;font-weight:400;font-style:normal;-webkit-transition:color .1s ease-in 0;transition:color .1s ease-in 0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.suggested-media-thumbnail:before{left:50%;top:50%;margin:-20px 0 0 -20px;font-size:40px}.suggested-media-thumbnail:after{content:"\f132";right:3%;bottom:2%}@media (min-width:601px){.media-list-inner-container{max-height:200px;max-height:18.75vw}.suggested-media-thumbnail{width:12.5%;padding:12.5% 0 0 12.5%}}.is-embed:before{content:"\f104";color:#fff;color:rgba(255,255,255,.9)}.is-embed.is-audio:active:before,.is-embed.is-audio:focus:before,.is-embed.is-audio:hover:before,.is-embed.is-tweet:active:before,.is-embed.is-tweet:focus:before,.is-embed.is-tweet:hover:before{color:#fff}.is-embed.is-video{background-color:#23282d}.is-embed.is-video:active:before,.is-embed.is-video:focus:before,.is-embed.is-video:hover:before{color:rgba(255,255,255,.2)}.is-embed.is-video:before{content:"\f236"}.is-embed.is-audio{background-color:#ff7d44}.is-embed.is-audio:before{content:"\f127"}.is-embed.is-tweet{background-color:#55acee}.is-embed.is-tweet:before{content:"\f301"}.no-media{margin:0;padding:0;border:0}.press-this-actions{position:fixed;bottom:0;left:0;width:100%;background:#f1f1f1;background:rgba(241,241,241,.9);border-top:1px solid #e5e5e5}.add-media{float:left;margin:14px 0 14px 30px;font-size:0}@media (max-width:320px){.add-media{margin:10px 0 10px 10px}}.insert-media{color:#9ea7af;float:left;margin:0;padding:0;border:0;border-right:1px solid #e5e5e5;-webkit-border-radius:0;border-radius:0;background:0 0;-webkit-box-shadow:none;box-shadow:none;overflow:hidden}.insert-media:active,.insert-media:focus,.insert-media:hover{margin:0;background:0 0;border-color:#e5e5e5;color:#23282d}.insert-media:active,.insert-media:focus{outline:0;color:#00a0d2;text-decoration:none}.insert-media .dashicons{padding:11px;width:63px;height:58px;font-size:40px}@media (max-width:320px){.insert-media .dashicons{width:55px;height:49px;padding:14px;font-size:20px}}#wp-link-wrap,.post-actions{font-size:13px}.post-actions{float:right;margin:14px 30px 14px 0}@media (max-width:320px){.post-actions{margin:10px 10px 10px 0}}.publish-button .saving-draft,.publish-button.is-saving .publish{display:none}.publish-button.is-saving .saving-draft{display:inline}.editor .wp-media-buttons{float:none}.editor div.mce-toolbar-grp{padding:.71429em 0;background:0 0;border:0}@media (max-height:400px),(max-width:320px){.editor div.mce-toolbar-grp{padding:0}}.mce-stack-layout:after,.mce-stack-layout:before{content:"";display:table}.mce-stack-layout:after{clear:both}.mce-container.mce-toolbar{float:left}.mce-container.mce-toolbar:nth-child(2){float:right}@media (max-width:600px){.mce-first .mce-btn:nth-child(3),.mce-first .mce-btn:nth-child(4){position:absolute;margin:-1px;padding:0;height:1px;width:1px;overflow:hidden;clip:rect(0 0 0 0);border:0}.mce-first .mce-btn:nth-child(3):focus,.mce-first .mce-btn:nth-child(4):focus{position:static;margin:1px;padding:inherit;height:auto;width:auto;overflow:visible;clip:auto;border:1px solid #999}}#wp-link-wrap input[type=text]{padding:3px 5px;margin:1px}@media screen and (max-width:782px){#wp-link-wrap{font-size:14px}#wp-link-wrap input[type=text]{padding:6px 10px}}#wp-link-wrap .howto{color:#666;font-style:italic}.options-panel{position:relative;float:right;margin-right:-320px;width:320px;border-left:1px solid #e5e5e5;font-size:14px;-webkit-box-shadow:5001px 5000px 0 5000px #fff,5000px 5000px 0 5000px #e5e5e5;box-shadow:5001px 5000px 0 5000px #fff,5000px 5000px 0 5000px #e5e5e5;outline:0}.options-panel-back{position:absolute;top:0;right:0;bottom:0;width:320px;outline:0}@media (max-width:900px){.press-this-actions{-webkit-transform:translateY(0);-ms-transform:translateY(0);transform:translateY(0);-webkit-transition:-webkit-transform .3s ease-in-out;transition:-webkit-transform .3s ease-in-out;transition:transform .3s ease-in-out;transition:transform .3s ease-in-out,-webkit-transform .3s ease-in-out}.press-this-actions.is-hidden{-webkit-transform:translateY(100%);-ms-transform:translateY(100%);transform:translateY(100%)}.options-panel{background:#fff;-webkit-transform:translateX(-100%);-ms-transform:translateX(-100%);transform:translateX(-100%);-webkit-transition:-webkit-transform .3s ease-in-out;transition:-webkit-transform .3s ease-in-out;transition:transform .3s ease-in-out;transition:transform .3s ease-in-out,-webkit-transform .3s ease-in-out}.options-panel.is-hidden{visibility:hidden}.options-panel.is-off-screen{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}}@media (max-width:320px){.options-panel{margin-right:-100%;width:100%;border:0;-webkit-box-shadow:5001px 5000px 0 5000px #fff;box-shadow:5001px 5000px 0 5000px #fff}.options-panel-back{width:100%}}.post-options{background:#fff;position:absolute;right:0;width:100%;overflow-x:hidden}.post-options .post-option-contents{margin-left:3px;color:#32373c}.post-option-forward:before{position:absolute;top:50%;right:8px;margin-top:-10px;content:"\f345"}.post-option,.setting-modal,.setting-title{position:relative}.post-option-back:before{content:"\f341"}.lt-ie9 .options-panel,.lt-ie9 .post-options{border-left:1px solid #e5e5e5}.lt-ie9 .post-options.is-off-screen{border:0}.post-options .post-option{display:block;width:100%;padding:13px 37px 13px 14px;border-bottom:1px solid #e5e5e5;text-decoration:none;text-align:left;color:#9ea7af;overflow:hidden;-webkit-transition:-webkit-transform .3s ease-in-out;transition:-webkit-transform .3s ease-in-out;transition:transform .3s ease-in-out;transition:transform .3s ease-in-out,-webkit-transform .3s ease-in-out}.post-options .post-option:focus{outline:0;-webkit-box-shadow:inset 5px 0 0 #00a0d2;box-shadow:inset 5px 0 0 #00a0d2;border-color:#e5e5e5}.is-off-screen>.post-option{right:100%}.is-hidden>.post-option{visibility:hidden}.post-option-title{display:inline-block;margin:0 0 0 8px;font-size:14px;font-weight:400}.setting-modal{top:0;left:0;width:100%;overflow:hidden;-webkit-transition:-webkit-transform .3s ease-in-out;transition:-webkit-transform .3s ease-in-out;transition:transform .3s ease-in-out;transition:transform .3s ease-in-out,-webkit-transform .3s ease-in-out}.setting-modal.is-hidden{visibility:hidden;height:0}.setting-modal.is-off-screen{left:100%}@media (min-width:1px){.is-off-screen>.post-option{right:auto;-webkit-transform:translateX(-100%);-ms-transform:translateX(-100%);transform:translateX(-100%)}.setting-modal.is-off-screen{left:0;-webkit-transform:translateX(100%);-ms-transform:translateX(100%);transform:translateX(100%)}}.press-this .modal-close{display:block;width:100%;padding:13px 14px;border-bottom:1px solid #e5e5e5;color:#00a0d2;text-decoration:none;text-align:left}.press-this .modal-close:focus{outline:0;-webkit-box-shadow:inset 5px 0 0 #00a0d2;box-shadow:inset 5px 0 0 #00a0d2;border-color:#e5e5e5}.setting-title{top:-1px;margin-left:11px}#pressthis{color:#404040;resize:none;padding-top:30px;font-size:16px}.wp-editor-wrap .quicktags-toolbar{background:0 0;border:none}.wp-editor-wrap .wp-editor-tools{z-index:0}.wp-editor-wrap .wp-editor-tabs{padding:2px}.wp-editor-wrap .wp-switch-editor{top:0;margin:3px 0 0 5px;padding:3px 8px;background:#f5f5f5;color:#555;border-color:#ccc}.wp-editor-wrap .wp-switch-editor:hover{background:#fafafa;border-color:#999;color:#23282d}.wp-editor-wrap.html-active .switch-html,.wp-editor-wrap.tmce-active .switch-tmce{background:#fff;border-color:#d8d8d8}.wp-link-input input{border:1px solid #ddd;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.07);box-shadow:inset 0 1px 2px rgba(0,0,0,.07);background-color:#fff;color:#32373c;outline:0;-webkit-transition:50ms border-color ease-in-out;transition:50ms border-color ease-in-out}.ui-autocomplete{padding:0;margin:0;list-style:none;position:absolute;z-index:10000;border:1px solid #5b9dd9;-webkit-box-shadow:0 1px 2px rgba(30,140,190,.8);box-shadow:0 1px 2px rgba(30,140,190,.8);background-color:#fff}.ui-autocomplete li{margin-bottom:0;padding:4px 10px;white-space:nowrap;text-align:left}.ui-autocomplete li.ui-state-focus{background-color:#ddd;cursor:pointer} \ No newline at end of file diff --git a/wp-admin/css/revisions-rtl.css b/wp-admin/css/revisions-rtl.css index d870006..096f9a2 100644 --- a/wp-admin/css/revisions-rtl.css +++ b/wp-admin/css/revisions-rtl.css @@ -42,7 +42,7 @@ .revisions-tickmarks > div { position: absolute; height: 100%; - border-right: 1px solid #aaa; + border-right: 1px solid #a0a5aa; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; @@ -73,12 +73,15 @@ } .revisions .loading-indicator { - position: fixed; + position: absolute; vertical-align: middle; opacity: 0; width: 100%; + width: -webkit-calc( 100% - 30px ); + width: calc( 100% - 30px ); top: 50%; - margin-right: -90px; + top: -webkit-calc( 50% - 10px ); + top: calc( 50% - 10px ); -webkit-transition: opacity 0.5s; transition: opacity 0.5s; filter: alpha(opacity=0); /* ie8 and earlier */ @@ -138,7 +141,7 @@ body.folded .revisions .loading-indicator { } .revisions-controls .author-card .date { - color: #777; + color: #72777c; } .revisions-controls .author-card.autosave { @@ -364,9 +367,9 @@ table.diff .diff-addedline ins { top: -20px; width: 25px; height: 25px; - -webkit-transform: rotate(45deg); - -ms-transform: rotate(45deg); - transform: rotate(45deg); + -webkit-transform: rotate(-45deg); + -ms-transform: rotate(-45deg); + transform: rotate(-45deg); } .revisions-tooltip.flipped .revisions-tooltip-arrow > span { @@ -386,7 +389,7 @@ table.diff .diff-addedline ins { .revisions-tooltip, .revisions-tooltip-arrow > span { - border: 1px solid #d7d7d7; + border: 1px solid #ddd; background-color: #fff; } @@ -405,7 +408,7 @@ table.diff .diff-addedline ins { z-index: 10000; } -.arrow::after { +.arrow:after { z-index: 9999; background-color: #fff; -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.1); @@ -428,9 +431,9 @@ table.diff .diff-addedline ins { top: -20px; width: 25px; height: 25px; - -webkit-transform: rotate(45deg); - -ms-transform: rotate(45deg); - transform: rotate(45deg); + -webkit-transform: rotate(-45deg); + -ms-transform: rotate(-45deg); + transform: rotate(-45deg); } .revisions-tooltip, @@ -447,10 +450,10 @@ div.revisions-controls > .wp-slider > .ui-slider-handle { margin-left: -10px; } - /* jQuery UI Slider */ +/* jQuery UI Slider */ .wp-slider.ui-slider { position: relative; - border: 1px solid #d7d7d7; + border: 1px solid #ddd; text-align: right; cursor: pointer; } @@ -459,35 +462,60 @@ div.revisions-controls > .wp-slider > .ui-slider-handle { -webkit-border-radius: 50%; border-radius: 50%; height: 18px; - margin-top: -3px; + margin-top: -5px; outline: none; + padding: 2px; position: absolute; width: 18px; z-index: 2; + -ms-touch-action: none; + touch-action: none; } .wp-slider .ui-slider-handle, -.wp-slider .ui-slider-handle.ui-state-hover, .wp-slider .ui-slider-handle.focus { - background: #2ea2cc; - border: 1px solid #0074a2; - -webkit-box-shadow: inset 0 1px 0 #78c8e6, 0 1px 0 rgba(0,0,0,.15); - box-shadow: inset 0 1px 0 #78c8e6, 0 1px 0 rgba(0,0,0,.15); + background: #f7f7f7; + border: 1px solid #ccc; + -webkit-box-shadow: 0 1px 0 #cccccc; + box-shadow: 0 1px 0 #cccccc; +} + +.wp-slider .ui-slider-handle:hover, +.wp-slider .ui-slider-handle.ui-state-hover { + background: #fafafa; + border-color: #999; +} + +.wp-slider .ui-slider-handle:active, +.wp-slider .ui-slider-handle.ui-state-active { + background: #eee; + border-color: #999; + -webkit-box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 ); + box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 ); + -webkit-transform: translateY(1px); + -ms-transform: translateY(1px); + transform: translateY(1px); } + .wp-slider .ui-slider-handle:before { background: none; position: absolute; - top: 0; - right: 0; - color: #fff; + top: 2px; + right: 2px; + color: #555; content: "\f229"; - font: normal 18px/1 'dashicons'; + font: normal 18px/1 dashicons; speak: none; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } +.wp-slider .ui-slider-handle:hover:before, +.wp-slider .ui-slider-handle.ui-state-hover:before { + color: #23282d; +} + .wp-slider .ui-slider-handle.from-handle:before, .wp-slider .ui-slider-handle.to-handle:before { font-size: 20px !important; @@ -495,19 +523,19 @@ div.revisions-controls > .wp-slider > .ui-slider-handle { } .wp-slider .ui-slider-handle.from-handle:before { - content: '\f139'; + content: "\f141"; } .wp-slider .ui-slider-handle.to-handle:before { - content: '\f141'; + content: "\f139"; } .rtl .wp-slider .ui-slider-handle.from-handle:before { - content: '\f141'; + content: "\f139"; } .rtl .wp-slider .ui-slider-handle.to-handle:before { - content: '\f139'; + content: "\f141"; left: -1px; } @@ -549,7 +577,6 @@ div.revisions-controls > .wp-slider > .ui-slider-handle { * HiDPI Displays */ @media print, - (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 120dpi) { .revision-tick.completed-false { diff --git a/wp-admin/css/revisions-rtl.min.css b/wp-admin/css/revisions-rtl.min.css new file mode 100644 index 0000000..8d48393 --- /dev/null +++ b/wp-admin/css/revisions-rtl.min.css @@ -0,0 +1 @@ +.revisions-control-frame,.revisions-diff-frame{position:relative}.revisions-controls{padding-top:40px;height:100px;z-index:1}.revisions-controls input[type=checkbox]{position:relative;top:-1px;vertical-align:text-bottom}.revisions.pinned .revisions-controls{position:fixed;top:0;height:82px;background:#fff;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.1);box-shadow:0 1px 3px rgba(0,0,0,.1)}.revisions-diff,.revisions-meta{background-color:#fff;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.1)}.revisions-tickmarks{position:relative;margin:0 auto;height:.7em;top:7px;max-width:70%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;background-color:#fff}.revisions-tickmarks>div{position:absolute;height:100%;border-right:1px solid #a0a5aa;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.revisions-tickmarks>div:first-child{border-width:0}.comparing-two-revisions .revisions-controls{height:140px}.comparing-two-revisions.pinned .revisions-controls{height:124px}.revisions .diff-error{position:absolute;text-align:center;margin:0 auto;width:100%;display:none}.revisions.diff-error .diff-error{display:block}.revisions .loading-indicator{position:absolute;vertical-align:middle;opacity:0;width:100%;width:-webkit-calc(100% - 30px);width:calc(100% - 30px);top:50%;top:-webkit-calc(50% - 10px);top:calc(50% - 10px);-webkit-transition:opacity .5s;transition:opacity .5s;filter:alpha(opacity=0)}body.folded .revisions .loading-indicator{margin-right:-32px}.revisions .loading-indicator span.spinner{display:block;margin:0 auto;float:none}.revisions.loading .loading-indicator{opacity:1;filter:alpha(opacity=100)}.revisions .diff{-webkit-transition:opacity .5s;transition:opacity .5s}.revisions.loading .diff{opacity:.5;filter:alpha(opacity=50)}.revisions.diff-error .diff{visibility:hidden}.revisions-meta{margin-top:20px;box-shadow:0 1px 3px rgba(0,0,0,.1)}.revisions.pinned .revisions-meta{-webkit-box-shadow:none;box-shadow:none}.revision-toggle-compare-mode{position:absolute;top:0;left:0}.comparing-two-revisions .revisions-next,.comparing-two-revisions .revisions-previous,.revisions-meta .diff-meta-to strong{display:none}.revisions-controls .author-card .date{color:#72777c}.revisions-controls .author-card.autosave{color:#d54e21}.revisions-controls .author-card .author-name{font-weight:700}.comparing-two-revisions .diff-meta-to strong{display:block}.revisions.pinned .revisions-buttons{padding:0 11px}.revisions-next,.revisions-previous{position:relative;z-index:1}.revisions-previous{float:right}.revisions-next{float:left}.revisions-controls .wp-slider{max-width:70%;margin:0 auto;top:-3px}.revisions-diff{padding:15px;box-shadow:0 1px 3px rgba(0,0,0,.1)}.revisions-diff h3:first-child{margin-top:0}#revisions-meta-restored img,.post-revisions li img{vertical-align:middle}table.diff tbody tr td:nth-child(2){width:4%}table.diff{table-layout:fixed;width:100%;white-space:pre-wrap}table.diff col.content{width:auto}table.diff col.content.diffsplit{width:48%}table.diff col.diffsplit.middle{width:auto}table.diff col.ltype{width:30px}table.diff tr{background-color:transparent}table.diff td,table.diff th{font-family:Consolas,Monaco,monospace;font-size:14px;line-height:1.618;padding:.5em;vertical-align:top;word-wrap:break-word}table.diff td h1,table.diff td h2,table.diff td h3,table.diff td h4,table.diff td h5,table.diff td h6{margin:0}table.diff .diff-addedline ins,table.diff .diff-deletedline del{text-decoration:none}table.diff .diff-deletedline{background-color:#ffe9e9}table.diff .diff-deletedline del{background-color:#faa}table.diff .diff-addedline{background-color:#e9ffe9}table.diff .diff-addedline ins{background-color:#afa}.diff-meta{padding:5px;clear:both;min-height:32px}.diff-title strong{line-height:32px;min-width:60px;text-align:left;float:right;margin-left:5px}.revisions-controls .author-card .author-info{font-size:12px;line-height:16px}.revisions-controls .author-card .author-info,.revisions-controls .author-card .avatar{float:right;margin-right:6px;margin-left:6px}.revisions-controls .author-card .byline{display:block;font-size:12px}.revisions-controls .author-card .avatar{vertical-align:middle}.diff-meta input.restore-revision{float:left;margin-right:6px;margin-left:6px;margin-top:4px}.diff-meta-from{display:none}.comparing-two-revisions .diff-meta-from{display:block}.revisions-tooltip{position:absolute;bottom:105px;margin-left:0;margin-right:-69px;z-index:0;max-width:350px;min-width:130px;padding:8px 4px;opacity:0}.revisions-tooltip.flipped{margin-right:0;margin-left:-70px}.revisions.pinned .revisions-tooltip{display:none!important}.comparing-two-revisions .revisions-tooltip{bottom:145px}.revisions-tooltip-arrow{width:70px;height:15px;overflow:hidden;position:absolute;right:0;margin-right:35px;bottom:-15px}.revisions-tooltip.flipped .revisions-tooltip-arrow{margin-right:0;margin-left:35px;right:auto;left:0}.revisions-tooltip-arrow>span{content:"";position:absolute;right:20px;top:-20px;width:25px;height:25px;-webkit-transform:rotate(-45deg);-ms-transform:rotate(-45deg);transform:rotate(-45deg)}.revisions-tooltip.flipped .revisions-tooltip-arrow>span{right:auto;left:20px}.ie8 .revisions-tooltip-arrow>span{right:15px;top:-25px;-ms-filter:"progid:DXImageTransform.Microsoft.Matrix(SizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476)"}.ie8 .revisions-tooltip.flipped .revisions-tooltip-arrow>span{left:25px}.revisions-tooltip,.revisions-tooltip-arrow>span{border:1px solid #ddd;background-color:#fff}.revisions-tooltip{display:none}.arrow{width:70px;height:16px;overflow:hidden;position:absolute;right:0;margin-right:-35px;bottom:90px;z-index:10000}.arrow.top{top:-16px;bottom:auto}.arrow.left{right:20%}.arrow:after{z-index:9999;background-color:#fff;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.1);box-shadow:0 1px 3px rgba(0,0,0,.1);content:"";position:absolute;right:20px;top:-20px;width:25px;height:25px;-webkit-transform:rotate(-45deg);-ms-transform:rotate(-45deg);transform:rotate(-45deg)}.revisions-tooltip,.revisions-tooltip-arrow:after{border-width:1px;border-style:solid}div.revisions-controls>.wp-slider>.ui-slider-handle{margin-right:-10px}.rtl div.revisions-controls>.wp-slider>.ui-slider-handle{margin-left:-10px}.wp-slider.ui-slider{position:relative;border:1px solid #ddd;text-align:right;cursor:pointer}.wp-slider .ui-slider-handle{-webkit-border-radius:50%;border-radius:50%;height:18px;margin-top:-5px;outline:0;padding:2px;position:absolute;width:18px;z-index:2;-ms-touch-action:none;touch-action:none}.wp-slider .ui-slider-handle,.wp-slider .ui-slider-handle.focus{background:#f7f7f7;border:1px solid #ccc;-webkit-box-shadow:0 1px 0 #ccc;box-shadow:0 1px 0 #ccc}.wp-slider .ui-slider-handle.ui-state-hover,.wp-slider .ui-slider-handle:hover{background:#fafafa;border-color:#999}.wp-slider .ui-slider-handle.ui-state-active,.wp-slider .ui-slider-handle:active{background:#eee;border-color:#999;-webkit-box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5);box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5);-webkit-transform:translateY(1px);-ms-transform:translateY(1px);transform:translateY(1px)}.wp-slider .ui-slider-handle:before{background:0 0;position:absolute;top:2px;right:2px;color:#555;content:"\f229";font:400 18px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.wp-slider .ui-slider-handle.ui-state-hover:before,.wp-slider .ui-slider-handle:hover:before{color:#23282d}.wp-slider .ui-slider-handle.from-handle:before,.wp-slider .ui-slider-handle.to-handle:before{font-size:20px!important;margin:-1px -1px 0 0}.wp-slider .ui-slider-handle.from-handle:before{content:"\f141"}.wp-slider .ui-slider-handle.to-handle:before{content:"\f139"}.rtl .wp-slider .ui-slider-handle.from-handle:before{content:"\f139"}.rtl .wp-slider .ui-slider-handle.to-handle:before{content:"\f141";left:-1px}.wp-slider .ui-slider-range{position:absolute;font-size:.7em;display:block;border:0;background-color:transparent;background-image:none}.wp-slider.ui-slider-horizontal{height:.7em}.wp-slider.ui-slider-horizontal .ui-slider-handle{top:-.25em;margin-right:-.6em}.wp-slider.ui-slider-horizontal .ui-slider-range{top:0;height:100%}.wp-slider.ui-slider-horizontal .ui-slider-range-min{right:0}.wp-slider.ui-slider-horizontal .ui-slider-range-max{left:0}@media print,(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.revision-tick.completed-false{background-image:url(../images/spinner-2x.gif)}}@media screen and (max-width:782px){#diff-next-revision,#diff-previous-revision{margin-top:-1em}table.diff{-ms-word-break:break-all;word-break:break-all;word-wrap:break-word}} \ No newline at end of file diff --git a/wp-admin/css/revisions.css b/wp-admin/css/revisions.css index 0263674..8a867dc 100644 --- a/wp-admin/css/revisions.css +++ b/wp-admin/css/revisions.css @@ -42,7 +42,7 @@ .revisions-tickmarks > div { position: absolute; height: 100%; - border-left: 1px solid #aaa; + border-left: 1px solid #a0a5aa; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; @@ -73,12 +73,15 @@ } .revisions .loading-indicator { - position: fixed; + position: absolute; vertical-align: middle; opacity: 0; width: 100%; + width: -webkit-calc( 100% - 30px ); + width: calc( 100% - 30px ); top: 50%; - margin-left: -90px; + top: -webkit-calc( 50% - 10px ); + top: calc( 50% - 10px ); -webkit-transition: opacity 0.5s; transition: opacity 0.5s; filter: alpha(opacity=0); /* ie8 and earlier */ @@ -138,7 +141,7 @@ body.folded .revisions .loading-indicator { } .revisions-controls .author-card .date { - color: #777; + color: #72777c; } .revisions-controls .author-card.autosave { @@ -386,7 +389,7 @@ table.diff .diff-addedline ins { .revisions-tooltip, .revisions-tooltip-arrow > span { - border: 1px solid #d7d7d7; + border: 1px solid #ddd; background-color: #fff; } @@ -405,7 +408,7 @@ table.diff .diff-addedline ins { z-index: 10000; } -.arrow::after { +.arrow:after { z-index: 9999; background-color: #fff; -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.1); @@ -447,10 +450,10 @@ div.revisions-controls > .wp-slider > .ui-slider-handle { margin-right: -10px; } - /* jQuery UI Slider */ +/* jQuery UI Slider */ .wp-slider.ui-slider { position: relative; - border: 1px solid #d7d7d7; + border: 1px solid #ddd; text-align: left; cursor: pointer; } @@ -459,35 +462,60 @@ div.revisions-controls > .wp-slider > .ui-slider-handle { -webkit-border-radius: 50%; border-radius: 50%; height: 18px; - margin-top: -3px; + margin-top: -5px; outline: none; + padding: 2px; position: absolute; width: 18px; z-index: 2; + -ms-touch-action: none; + touch-action: none; } .wp-slider .ui-slider-handle, -.wp-slider .ui-slider-handle.ui-state-hover, .wp-slider .ui-slider-handle.focus { - background: #2ea2cc; - border: 1px solid #0074a2; - -webkit-box-shadow: inset 0 1px 0 #78c8e6, 0 1px 0 rgba(0,0,0,.15); - box-shadow: inset 0 1px 0 #78c8e6, 0 1px 0 rgba(0,0,0,.15); + background: #f7f7f7; + border: 1px solid #ccc; + -webkit-box-shadow: 0 1px 0 #cccccc; + box-shadow: 0 1px 0 #cccccc; +} + +.wp-slider .ui-slider-handle:hover, +.wp-slider .ui-slider-handle.ui-state-hover { + background: #fafafa; + border-color: #999; +} + +.wp-slider .ui-slider-handle:active, +.wp-slider .ui-slider-handle.ui-state-active { + background: #eee; + border-color: #999; + -webkit-box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 ); + box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 ); + -webkit-transform: translateY(1px); + -ms-transform: translateY(1px); + transform: translateY(1px); } + .wp-slider .ui-slider-handle:before { background: none; position: absolute; - top: 0; - left: 0; - color: #fff; + top: 2px; + left: 2px; + color: #555; content: "\f229"; - font: normal 18px/1 'dashicons'; + font: normal 18px/1 dashicons; speak: none; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } +.wp-slider .ui-slider-handle:hover:before, +.wp-slider .ui-slider-handle.ui-state-hover:before { + color: #23282d; +} + .wp-slider .ui-slider-handle.from-handle:before, .wp-slider .ui-slider-handle.to-handle:before { font-size: 20px !important; @@ -495,19 +523,19 @@ div.revisions-controls > .wp-slider > .ui-slider-handle { } .wp-slider .ui-slider-handle.from-handle:before { - content: '\f139'; + content: "\f139"; } .wp-slider .ui-slider-handle.to-handle:before { - content: '\f141'; + content: "\f141"; } .rtl .wp-slider .ui-slider-handle.from-handle:before { - content: '\f141'; + content: "\f141"; } .rtl .wp-slider .ui-slider-handle.to-handle:before { - content: '\f139'; + content: "\f139"; right: -1px; } @@ -549,7 +577,6 @@ div.revisions-controls > .wp-slider > .ui-slider-handle { * HiDPI Displays */ @media print, - (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 120dpi) { .revision-tick.completed-false { diff --git a/wp-admin/css/revisions.min.css b/wp-admin/css/revisions.min.css new file mode 100644 index 0000000..0ec0fbe --- /dev/null +++ b/wp-admin/css/revisions.min.css @@ -0,0 +1 @@ +.revisions-control-frame,.revisions-diff-frame{position:relative}.revisions-controls{padding-top:40px;height:100px;z-index:1}.revisions-controls input[type=checkbox]{position:relative;top:-1px;vertical-align:text-bottom}.revisions.pinned .revisions-controls{position:fixed;top:0;height:82px;background:#fff;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.1);box-shadow:0 1px 3px rgba(0,0,0,.1)}.revisions-diff,.revisions-meta{background-color:#fff;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.1)}.revisions-tickmarks{position:relative;margin:0 auto;height:.7em;top:7px;max-width:70%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;background-color:#fff}.revisions-tickmarks>div{position:absolute;height:100%;border-left:1px solid #a0a5aa;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.revisions-tickmarks>div:first-child{border-width:0}.comparing-two-revisions .revisions-controls{height:140px}.comparing-two-revisions.pinned .revisions-controls{height:124px}.revisions .diff-error{position:absolute;text-align:center;margin:0 auto;width:100%;display:none}.revisions.diff-error .diff-error{display:block}.revisions .loading-indicator{position:absolute;vertical-align:middle;opacity:0;width:100%;width:-webkit-calc(100% - 30px);width:calc(100% - 30px);top:50%;top:-webkit-calc(50% - 10px);top:calc(50% - 10px);-webkit-transition:opacity .5s;transition:opacity .5s;filter:alpha(opacity=0)}body.folded .revisions .loading-indicator{margin-left:-32px}.revisions .loading-indicator span.spinner{display:block;margin:0 auto;float:none}.revisions.loading .loading-indicator{opacity:1;filter:alpha(opacity=100)}.revisions .diff{-webkit-transition:opacity .5s;transition:opacity .5s}.revisions.loading .diff{opacity:.5;filter:alpha(opacity=50)}.revisions.diff-error .diff{visibility:hidden}.revisions-meta{margin-top:20px;box-shadow:0 1px 3px rgba(0,0,0,.1)}.revisions.pinned .revisions-meta{-webkit-box-shadow:none;box-shadow:none}.revision-toggle-compare-mode{position:absolute;top:0;right:0}.comparing-two-revisions .revisions-next,.comparing-two-revisions .revisions-previous,.revisions-meta .diff-meta-to strong{display:none}.revisions-controls .author-card .date{color:#72777c}.revisions-controls .author-card.autosave{color:#d54e21}.revisions-controls .author-card .author-name{font-weight:700}.comparing-two-revisions .diff-meta-to strong{display:block}.revisions.pinned .revisions-buttons{padding:0 11px}.revisions-next,.revisions-previous{position:relative;z-index:1}.revisions-previous{float:left}.revisions-next{float:right}.revisions-controls .wp-slider{max-width:70%;margin:0 auto;top:-3px}.revisions-diff{padding:15px;box-shadow:0 1px 3px rgba(0,0,0,.1)}.revisions-diff h3:first-child{margin-top:0}#revisions-meta-restored img,.post-revisions li img{vertical-align:middle}table.diff tbody tr td:nth-child(2){width:4%}table.diff{table-layout:fixed;width:100%;white-space:pre-wrap}table.diff col.content{width:auto}table.diff col.content.diffsplit{width:48%}table.diff col.diffsplit.middle{width:auto}table.diff col.ltype{width:30px}table.diff tr{background-color:transparent}table.diff td,table.diff th{font-family:Consolas,Monaco,monospace;font-size:14px;line-height:1.618;padding:.5em;vertical-align:top;word-wrap:break-word}table.diff td h1,table.diff td h2,table.diff td h3,table.diff td h4,table.diff td h5,table.diff td h6{margin:0}table.diff .diff-addedline ins,table.diff .diff-deletedline del{text-decoration:none}table.diff .diff-deletedline{background-color:#ffe9e9}table.diff .diff-deletedline del{background-color:#faa}table.diff .diff-addedline{background-color:#e9ffe9}table.diff .diff-addedline ins{background-color:#afa}.diff-meta{padding:5px;clear:both;min-height:32px}.diff-title strong{line-height:32px;min-width:60px;text-align:right;float:left;margin-right:5px}.revisions-controls .author-card .author-info{font-size:12px;line-height:16px}.revisions-controls .author-card .author-info,.revisions-controls .author-card .avatar{float:left;margin-left:6px;margin-right:6px}.revisions-controls .author-card .byline{display:block;font-size:12px}.revisions-controls .author-card .avatar{vertical-align:middle}.diff-meta input.restore-revision{float:right;margin-left:6px;margin-right:6px;margin-top:4px}.diff-meta-from{display:none}.comparing-two-revisions .diff-meta-from{display:block}.revisions-tooltip{position:absolute;bottom:105px;margin-right:0;margin-left:-69px;z-index:0;max-width:350px;min-width:130px;padding:8px 4px;opacity:0}.revisions-tooltip.flipped{margin-left:0;margin-right:-70px}.revisions.pinned .revisions-tooltip{display:none!important}.comparing-two-revisions .revisions-tooltip{bottom:145px}.revisions-tooltip-arrow{width:70px;height:15px;overflow:hidden;position:absolute;left:0;margin-left:35px;bottom:-15px}.revisions-tooltip.flipped .revisions-tooltip-arrow{margin-left:0;margin-right:35px;left:auto;right:0}.revisions-tooltip-arrow>span{content:"";position:absolute;left:20px;top:-20px;width:25px;height:25px;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg)}.revisions-tooltip.flipped .revisions-tooltip-arrow>span{left:auto;right:20px}.ie8 .revisions-tooltip-arrow>span{left:15px;top:-25px;-ms-filter:"progid:DXImageTransform.Microsoft.Matrix(SizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476)"}.ie8 .revisions-tooltip.flipped .revisions-tooltip-arrow>span{right:25px}.revisions-tooltip,.revisions-tooltip-arrow>span{border:1px solid #ddd;background-color:#fff}.revisions-tooltip{display:none}.arrow{width:70px;height:16px;overflow:hidden;position:absolute;left:0;margin-left:-35px;bottom:90px;z-index:10000}.arrow.top{top:-16px;bottom:auto}.arrow.left{left:20%}.arrow:after{z-index:9999;background-color:#fff;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.1);box-shadow:0 1px 3px rgba(0,0,0,.1);content:"";position:absolute;left:20px;top:-20px;width:25px;height:25px;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg)}.revisions-tooltip,.revisions-tooltip-arrow:after{border-width:1px;border-style:solid}div.revisions-controls>.wp-slider>.ui-slider-handle{margin-left:-10px}.rtl div.revisions-controls>.wp-slider>.ui-slider-handle{margin-right:-10px}.wp-slider.ui-slider{position:relative;border:1px solid #ddd;text-align:left;cursor:pointer}.wp-slider .ui-slider-handle{-webkit-border-radius:50%;border-radius:50%;height:18px;margin-top:-5px;outline:0;padding:2px;position:absolute;width:18px;z-index:2;-ms-touch-action:none;touch-action:none}.wp-slider .ui-slider-handle,.wp-slider .ui-slider-handle.focus{background:#f7f7f7;border:1px solid #ccc;-webkit-box-shadow:0 1px 0 #ccc;box-shadow:0 1px 0 #ccc}.wp-slider .ui-slider-handle.ui-state-hover,.wp-slider .ui-slider-handle:hover{background:#fafafa;border-color:#999}.wp-slider .ui-slider-handle.ui-state-active,.wp-slider .ui-slider-handle:active{background:#eee;border-color:#999;-webkit-box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5);box-shadow:inset 0 2px 5px -3px rgba(0,0,0,.5);-webkit-transform:translateY(1px);-ms-transform:translateY(1px);transform:translateY(1px)}.wp-slider .ui-slider-handle:before{background:0 0;position:absolute;top:2px;left:2px;color:#555;content:"\f229";font:400 18px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.wp-slider .ui-slider-handle.ui-state-hover:before,.wp-slider .ui-slider-handle:hover:before{color:#23282d}.wp-slider .ui-slider-handle.from-handle:before,.wp-slider .ui-slider-handle.to-handle:before{font-size:20px!important;margin:-1px 0 0 -1px}.wp-slider .ui-slider-handle.from-handle:before{content:"\f139"}.wp-slider .ui-slider-handle.to-handle:before{content:"\f141"}.rtl .wp-slider .ui-slider-handle.from-handle:before{content:"\f141"}.rtl .wp-slider .ui-slider-handle.to-handle:before{content:"\f139";right:-1px}.wp-slider .ui-slider-range{position:absolute;font-size:.7em;display:block;border:0;background-color:transparent;background-image:none}.wp-slider.ui-slider-horizontal{height:.7em}.wp-slider.ui-slider-horizontal .ui-slider-handle{top:-.25em;margin-left:-.6em}.wp-slider.ui-slider-horizontal .ui-slider-range{top:0;height:100%}.wp-slider.ui-slider-horizontal .ui-slider-range-min{left:0}.wp-slider.ui-slider-horizontal .ui-slider-range-max{right:0}@media print,(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.revision-tick.completed-false{background-image:url(../images/spinner-2x.gif)}}@media screen and (max-width:782px){#diff-next-revision,#diff-previous-revision{margin-top:-1em}table.diff{-ms-word-break:break-all;word-break:break-all;word-wrap:break-word}} \ No newline at end of file diff --git a/wp-admin/css/site-icon-rtl.css b/wp-admin/css/site-icon-rtl.css new file mode 100644 index 0000000..b66fda3 --- /dev/null +++ b/wp-admin/css/site-icon-rtl.css @@ -0,0 +1,49 @@ +/*------------------------------------------------------------------------------ + 28.0 - Site Icon +------------------------------------------------------------------------------*/ + +.site-icon-preview .favicon-preview { + margin: 5px 0 20px; + overflow: hidden; + position: relative; + max-width: 180px; +} + +.site-icon-preview .favicon, +.site-icon-preview .browser-title { + height: 16px; + right: 88px; + overflow: hidden; + position: absolute; + top: 16px; +} + +.site-icon-preview .favicon { + width: 16px; +} + +.site-icon-preview .browser-title { + right: 109px; + width: 72px; + white-space: nowrap; +} + +.site-icon-preview .app-icon-preview { + background-color: #000; + -webkit-border-radius: 16px; + border-radius: 16px; + height: 64px; + overflow: hidden; + width: 64px; + margin-top: 5px; +} + +.customize-control-site_icon .favicon-preview { + float: right; + margin-left: 12px; + margin-bottom: 0; +} + +.customize-control-site_icon .app-icon-preview { + margin-top: 9px; +} diff --git a/wp-admin/css/site-icon-rtl.min.css b/wp-admin/css/site-icon-rtl.min.css new file mode 100644 index 0000000..5658651 --- /dev/null +++ b/wp-admin/css/site-icon-rtl.min.css @@ -0,0 +1 @@ +.site-icon-preview .favicon-preview{margin:5px 0 20px;overflow:hidden;position:relative;max-width:180px}.site-icon-preview .browser-title,.site-icon-preview .favicon{height:16px;right:88px;overflow:hidden;position:absolute;top:16px}.site-icon-preview .favicon{width:16px}.site-icon-preview .browser-title{right:109px;width:72px;white-space:nowrap}.site-icon-preview .app-icon-preview{background-color:#000;-webkit-border-radius:16px;border-radius:16px;height:64px;overflow:hidden;width:64px;margin-top:5px}.customize-control-site_icon .favicon-preview{float:right;margin-left:12px;margin-bottom:0}.customize-control-site_icon .app-icon-preview{margin-top:9px} \ No newline at end of file diff --git a/wp-admin/css/site-icon.css b/wp-admin/css/site-icon.css new file mode 100644 index 0000000..77b8425 --- /dev/null +++ b/wp-admin/css/site-icon.css @@ -0,0 +1,49 @@ +/*------------------------------------------------------------------------------ + 28.0 - Site Icon +------------------------------------------------------------------------------*/ + +.site-icon-preview .favicon-preview { + margin: 5px 0 20px; + overflow: hidden; + position: relative; + max-width: 180px; +} + +.site-icon-preview .favicon, +.site-icon-preview .browser-title { + height: 16px; + left: 88px; + overflow: hidden; + position: absolute; + top: 16px; +} + +.site-icon-preview .favicon { + width: 16px; +} + +.site-icon-preview .browser-title { + left: 109px; + width: 72px; + white-space: nowrap; +} + +.site-icon-preview .app-icon-preview { + background-color: #000; + -webkit-border-radius: 16px; + border-radius: 16px; + height: 64px; + overflow: hidden; + width: 64px; + margin-top: 5px; +} + +.customize-control-site_icon .favicon-preview { + float: left; + margin-right: 12px; + margin-bottom: 0; +} + +.customize-control-site_icon .app-icon-preview { + margin-top: 9px; +} diff --git a/wp-admin/css/site-icon.min.css b/wp-admin/css/site-icon.min.css new file mode 100644 index 0000000..c5b9111 --- /dev/null +++ b/wp-admin/css/site-icon.min.css @@ -0,0 +1 @@ +.site-icon-preview .favicon-preview{margin:5px 0 20px;overflow:hidden;position:relative;max-width:180px}.site-icon-preview .browser-title,.site-icon-preview .favicon{height:16px;left:88px;overflow:hidden;position:absolute;top:16px}.site-icon-preview .favicon{width:16px}.site-icon-preview .browser-title{left:109px;width:72px;white-space:nowrap}.site-icon-preview .app-icon-preview{background-color:#000;-webkit-border-radius:16px;border-radius:16px;height:64px;overflow:hidden;width:64px;margin-top:5px}.customize-control-site_icon .favicon-preview{float:left;margin-right:12px;margin-bottom:0}.customize-control-site_icon .app-icon-preview{margin-top:9px} \ No newline at end of file diff --git a/wp-admin/css/themes-rtl.css b/wp-admin/css/themes-rtl.css index 5ae8f35..7f7b77b 100644 --- a/wp-admin/css/themes-rtl.css +++ b/wp-admin/css/themes-rtl.css @@ -9,52 +9,41 @@ .theme-browser .themes { clear: both; - padding: 0 0 100px; } -.themes-php .wrap h2 { +.themes-php .wrap h1 { float: right; margin-bottom: 15px; } -.network-admin.themes-php .wrap h2 { +.network-admin.themes-php .wrap h1 { margin-bottom: 0; } -.themes-php .wrap h2 .button { +.themes-php .wrap h1 .button { margin-right: 20px; } -.themes-php .wrap .theme-count, -.theme-navigation .theme-count { - color: #fff; - -webkit-border-radius: 30px; - border-radius: 30px; - background: #777; - font-size: 14px; - padding: 4px 10px; - font-weight: 600; - margin-right: 5px; - margin-left: 20px; +/* Search form */ +.themes-php .wp-filter-search { position: relative; - top: -3px; -} - -.theme-navigation a { - text-decoration:none; + top: -2px; + right: 20px; + margin: 0; + width: 280px; + font-size: 16px; + font-weight: 300; + line-height: 1.5; } /* Position admin messages */ .themes-php div.updated, -.themes-php div.error { +.themes-php div.error, +.themes-php div.notice { margin: 0 0 20px 0; clear: both; } -.themes-php div.updated a { - text-decoration: underline; -} - /** * Main theme element * (has flexible margins) @@ -65,7 +54,7 @@ margin: 0 0 4% 4%; position: relative; width: 30.6%; - border: 1px solid #dedede; + border: 1px solid #ddd; -webkit-box-shadow: 0 1px 1px -1px rgba(0,0,0,0.1); box-shadow: 0 1px 1px -1px rgba(0,0,0,0.1); -webkit-box-sizing: border-box; @@ -143,12 +132,13 @@ display: block; overflow: hidden; position: relative; + -webkit-backface-visibility: hidden; /* Prevents flicker of the screenshot on hover. */ -webkit-transition: opacity 0.2s ease-in-out; transition: opacity 0.2s ease-in-out; } .theme-browser .theme .theme-screenshot:after { - content: ''; + content: ""; display: block; padding-top: 66.66666%; /* using a 3/2 aspect ratio */ } @@ -159,8 +149,7 @@ right: 0; top: 0; width: 100%; - -webkit-transform: translateZ( 0 ); /* Prevents rendering bugs in Chrome */ - -webkit-transition: opacity 0.2s ease-in-out; /* Prevents rendering bugs in Chrome */ + -webkit-transition: opacity 0.2s ease-in-out; transition: opacity 0.2s ease-in-out; } @@ -181,7 +170,7 @@ top: 35%; left: 25%; right: 25%; - background: #222; + background: #23282d; background: rgba(0,0,0,0.7); color: #fff; font-size: 15px; @@ -195,13 +184,17 @@ -webkit-transition: opacity 0.1s ease-in-out; transition: opacity 0.1s ease-in-out; } + .theme-browser .theme:focus { - outline: 1px dotted #222; + border-color: #5b9dd9; + -webkit-box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 ); + box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 ); } .theme-browser .theme:focus .more-details { opacity: 1; } + /* Current theme needs to have its action always on view */ .theme-browser .theme.active:focus .theme-actions { display: block; @@ -238,9 +231,9 @@ .theme-browser .theme .theme-update:before, .theme-browser .theme .theme-installed:before { - content: '\f463'; + content: "\f463"; display: inline-block; - font: normal 20px/1 'dashicons'; + font: normal 20px/1 dashicons; margin: 0 0 0 6px; opacity: 0.8; position: relative; @@ -254,7 +247,7 @@ * The currently active theme */ .theme-browser .theme.active .theme-name { - background: #2f2f2f; + background: #23282d; color: #fff; padding-left: 110px; font-weight: 300; @@ -262,6 +255,10 @@ box-shadow: inset 0 1px 1px rgba(0,0,0,0.5); } +.theme-browser .customize-control .theme.active .theme-name { + padding-left: 15px; +} + .theme-browser .theme.active .theme-name span { font-weight: 600; } @@ -277,7 +274,7 @@ } .theme-browser .theme .theme-author { - background: #222; + background: #23282d; color: #eee; display: none; font-size: 14px; @@ -306,18 +303,15 @@ } .theme-browser .theme.add-new-theme a { - color: #999; text-decoration: none; display: block; position: relative; z-index: 1; } -.theme-browser .theme.add-new-theme:after { +.theme-browser .theme.add-new-theme a:after { display: block; - content: ''; - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; - opacity: 1; + content: ""; background: transparent; background: rgba(0, 0, 0, 0); position: absolute; @@ -325,12 +319,10 @@ right: 0; left: 0; bottom: 0; - padding: 10% 0 0 0; + padding: 0; text-shadow: none; border: 5px dashed #d5d2ca; border: 5px dashed rgba(0, 0, 0, 0.1); - -webkit-transition: opacity 0.2s ease-in-out; - transition: opacity 0.2s ease-in-out; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; @@ -342,9 +334,9 @@ -webkit-border-radius: 50%; border-radius: 50%; display: inline-block; - content: '\f132'; + content: "\f132"; -webkit-font-smoothing: antialiased; - font: normal 74px/115px 'dashicons'; + font: normal 74px/115px dashicons; width: 100px; height: 100px; vertical-align: middle; @@ -364,23 +356,23 @@ text-indent: 4px; } -.theme-browser .theme.add-new-theme:hover .theme-screenshot, -.theme-browser .theme.add-new-theme:focus .theme-screenshot { +.theme-browser .theme.add-new-theme a:hover .theme-screenshot, +.theme-browser .theme.add-new-theme a:focus .theme-screenshot { background: none; } -.theme-browser .theme.add-new-theme:hover span:after, -.theme-browser .theme.add-new-theme:focus span:after { +.theme-browser .theme.add-new-theme a:hover span:after, +.theme-browser .theme.add-new-theme a:focus span:after { background: #fff; - color: #0074a2; + color: #0073aa; } -.theme-browser .theme.add-new-theme:hover:after, -.theme-browser .theme.add-new-theme:focus:after { +.theme-browser .theme.add-new-theme a:hover:after, +.theme-browser .theme.add-new-theme a:focus:after { border-color: transparent; color: #fff; - background: #0074a2; - content: ''; + background: #0073aa; + content: ""; } .theme-browser .theme.add-new-theme .theme-name { @@ -391,29 +383,17 @@ font-weight: 400; position: relative; top: 0; - margin-top: -10%; - margin-bottom: 10%; + margin-top: -18px; + padding-top: 0; + padding-bottom: 48px; } -.theme-browser .theme.add-new-theme:hover .theme-name, -.theme-browser .theme.add-new-theme:focus .theme-name { +.theme-browser .theme.add-new-theme a:hover .theme-name, +.theme-browser .theme.add-new-theme a:focus .theme-name { color: #fff; z-index: 2; } -/* - * The search form - */ -.themes-php .theme-search { - position: relative; - top: -2px; - right: 20px; - font-size: 16px; - font-weight: 300; - line-height: 1.5; - width: 280px; -} - /** * Theme Overlay * Shown when clicking a theme @@ -426,11 +406,7 @@ bottom: 0; background: #f1f1f1; background: rgba( 238, 238, 238, 0.9 ); - z-index: 10; -} - -body.theme-overlay-open { - overflow: hidden; + z-index: 10000; /* Over WP Pointers. */ } .theme-overlay .theme-header { @@ -442,6 +418,10 @@ body.theme-overlay-open { border-bottom: 1px solid #ddd; } +.theme-overlay .theme-header button { + padding: 0; +} + .theme-overlay .theme-header .close { cursor: pointer; height: 48px; @@ -451,18 +431,15 @@ body.theme-overlay-open { border: 0; border-right: 1px solid #ddd; background-color: transparent; -} - -.theme-overlay .theme-header .close:hover:before, -.theme-overlay .theme-header .close:focus:before { - color: #fff; + -webkit-transition: color .1s ease-in-out, background .1s ease-in-out; + transition: color .1s ease-in-out, background .1s ease-in-out; } .theme-overlay .theme-header .close:before { - font: normal 30px/50px 'dashicons' !important; - color: #777; + font: normal 22px/50px dashicons !important; + color: #72777c; display: inline-block; - content: '\f335'; + content: "\f335"; font-weight: 300; } @@ -470,7 +447,7 @@ body.theme-overlay-open { .theme-overlay .theme-header .right, .theme-overlay .theme-header .left { cursor: pointer; - color: #777; + color: #72777c; background-color: transparent; height: 48px; width: 54px; @@ -478,16 +455,32 @@ body.theme-overlay-open { text-align: center; border: 0; border-left: 1px solid #ddd; + -webkit-transition: color .1s ease-in-out, background .1s ease-in-out; + transition: color .1s ease-in-out, background .1s ease-in-out; } +.theme-overlay .theme-header .close:focus, .theme-overlay .theme-header .close:hover, +.theme-overlay .theme-header .right:focus, .theme-overlay .theme-header .right:hover, -.theme-overlay .theme-header .left:hover, +.theme-overlay .theme-header .left:focus, +.theme-overlay .theme-header .left:hover { + background: #ddd; + border-color: #ccc; + color: #000; +} + +.theme-overlay .theme-header .close:focus:before, +.theme-overlay .theme-header .close:hover:before { + color: #000; +} + .theme-overlay .theme-header .close:focus, .theme-overlay .theme-header .right:focus, .theme-overlay .theme-header .left:focus { - background: #0074a2; - color: #fff; + -webkit-box-shadow: none; + box-shadow: none; + outline: none; } .theme-overlay .theme-header .left.disabled, @@ -501,25 +494,17 @@ body.theme-overlay-open { .theme-overlay .theme-header .right:before, .theme-overlay .theme-header .left:before { - font: normal 20px/50px 'dashicons' !important; + font: normal 20px/50px dashicons !important; display: inline; font-weight: 300; } .theme-overlay .theme-header .left:before { - content: '\f340'; + content: "\f345"; } .theme-overlay .theme-header .right:before { - content: '\f344'; -} - -.rtl .theme-overlay .theme-header .left:before { - content: '\f345'; -} - -.rtl .theme-overlay .theme-header .right:before { - content: '\f341'; + content: "\f341"; } .theme-overlay .theme-wrap { @@ -532,18 +517,11 @@ body.theme-overlay-open { background: #fff; -webkit-box-shadow: 0 1px 20px 5px rgba(0, 0, 0, 0.1); box-shadow: 0 1px 20px 5px rgba(0, 0, 0, 0.1); - z-index: 20; + z-index: 10000; /* Over WP Pointers. */ -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; -} - -.theme-overlay .theme-wrap:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; + -webkit-overflow-scrolling: touch; } body.folded .theme-overlay .theme-wrap { @@ -559,13 +537,6 @@ body.folded .theme-overlay .theme-wrap { overflow: auto; padding: 2% 4%; } -.theme-overlay .theme-about:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} .theme-overlay .theme-actions { position: absolute; @@ -591,11 +562,15 @@ body.folded .theme-overlay .theme-wrap { margin-bottom: 5px; } +/* Hide-if-customize for items we can't add classes to */ +.customize-support .theme-overlay .theme-actions a[href="themes.php?page=custom-header"], +.customize-support .theme-overlay .theme-actions a[href="themes.php?page=custom-background"] { + display: none; +} + +.broken-themes a.delete-theme, .theme-overlay .theme-actions .delete-theme { color: #a00; - position: absolute; - left: 10px; - bottom: 5px; text-decoration: none; border-color: transparent; -webkit-box-shadow: none; @@ -603,6 +578,14 @@ body.folded .theme-overlay .theme-wrap { background: transparent; } +.theme-overlay .theme-actions .delete-theme { + position: absolute; + left: 10px; + bottom: 5px; +} + +.broken-themes a.delete-theme:hover, +.broken-themes a.delete-theme:focus, .theme-overlay .theme-actions .delete-theme:hover, .theme-overlay .theme-actions .delete-theme:focus { background: #d54e21; @@ -644,7 +627,7 @@ body.folded .theme-overlay .theme-wrap { } .theme-overlay .screenshot:after { - content: ''; + content: ""; display: block; padding-top: 75%; /* using a 4/3 aspect ratio */ } @@ -679,7 +662,7 @@ body.folded .theme-overlay .theme-wrap { } .theme-overlay .screenshot.thumb:after { - content: ''; + content: ""; display: block; padding-top: 100%; /* using a 1/1 aspect ratio */ } @@ -696,7 +679,7 @@ body.folded .theme-overlay .theme-wrap { .theme-overlay .screenshot.selected { background: transparent; - border: 2px solid #2ea2cc; + border: 2px solid #00a0d2; } .theme-overlay .screenshot.selected img { @@ -718,7 +701,7 @@ body.folded .theme-overlay .theme-wrap { } .theme-overlay .current-label { - background: #333; + background: #32373c; color: #fff; font-size: 11px; display: inline-block; @@ -733,7 +716,7 @@ body.folded .theme-overlay .theme-wrap { } .theme-overlay .theme-name { - color: #222; + color: #23282d; font-size: 32px; font-weight: 100; margin: 10px 0 0; @@ -741,23 +724,20 @@ body.folded .theme-overlay .theme-wrap { } .theme-overlay .theme-version { - color: #999; + color: #72777c; font-size: 13px; font-weight: 400; float: none; display: inline-block; margin-right: 10px; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; } .theme-overlay .theme-author { - color: #686868; + margin: 15px 0 25px; + color: #72777c; font-size: 16px; font-weight: 400; - margin: 15px 0 25px; + line-height: inherit; } .theme-overlay .theme-author a { @@ -774,7 +754,7 @@ body.folded .theme-overlay .theme-wrap { .theme-overlay .theme-tags { border-top: 3px solid #eee; - color: #888; + color: #82878c; font-size: 13px; font-weight: 400; margin: 30px 0 0 0; @@ -787,28 +767,10 @@ body.folded .theme-overlay .theme-wrap { margin-left: 5px; } -/* Theme Updates info */ -.theme-overlay .theme-update-message { - background: #fef7f1; - border: 1px solid #eee; - border-right: 4px solid #d54e21; - -webkit-border-radius: 3px; - border-radius: 3px; - padding: 5px 20px 10px; -} - -.theme-overlay .theme-update { - color: #222; - font-size: 18px; - display: inline-block; - line-height: 40px; - margin: 0; -} - .theme-overlay .parent-theme { background: #f7fcfe; border: 1px solid #eee; - border-right: 4px solid #2ea2cc; + border-right: 4px solid #00a0d2; font-size: 14px; font-weight: normal; margin-top: 30px; @@ -837,6 +799,7 @@ body.folded .theme-overlay .theme-wrap { left: auto; top: auto; bottom: auto; + z-index: 10; } .single-theme .theme-overlay .theme-about { @@ -927,7 +890,7 @@ body.folded .theme-overlay .theme-wrap { right: 0; padding: 70px 20px 20px; border: none; - z-index: 500; /* should overlap #wpadminbar, which is 500 on mobile. */ + z-index: 100000; /* should overlap #wpadminbar. */ position: fixed; } @@ -1021,11 +984,7 @@ body.folded .theme-overlay .theme-wrap { font-size: 13px; } - .themes-php .wrap h2 { - width: 100%; - } - - .themes-php .theme-search { + .themes-php .wp-filter-search { float: none; clear: both; right: 0; @@ -1033,10 +992,11 @@ body.folded .theme-overlay .theme-wrap { left: 0; margin: 10px 0; width: 100%; + max-width: 280px; } .theme-browser .theme.add-new-theme span:after { - font: normal 60px/90px 'dashicons'; + font: normal 60px/90px dashicons; width: 80px; height: 80px; top: 30%; @@ -1079,30 +1039,19 @@ body.folded .theme-overlay .theme-wrap { /* Already installed theme */ .theme-browser .theme .theme-installed { - background: #0074a2; + background: #0073aa; } .theme-browser .theme .theme-installed:before { - content: '\f147'; + content: "\f147"; } .theme-browser .theme.is-installed .theme-actions .button-primary { display: none !important; } -.theme-navigation { - background: #fff; - -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,.1); - box-shadow: 0 1px 1px 0 rgba(0,0,0,.1); - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - color: #555; - display: inline-block; - font-size: 13px; - margin: 20px 0 30px; +.theme-install-php .wp-filter { padding: 0 20px; - position: relative; - width: 100%; } + .theme-install-php a.upload, .theme-install-php a.browse-themes { cursor: pointer; @@ -1114,250 +1063,69 @@ body.folded .theme-overlay .theme-wrap { .theme-install-php.show-upload-theme a.browse-themes { display: inline; } -.upload-theme { +.upload-theme, +.upload-plugin { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; display: none; - margin: 0px 0 0; + margin: 0; padding: 0; width: 100%; overflow: hidden; position: relative; top: 10px; } -body.show-upload-theme .upload-theme { +body.show-upload-theme .upload-theme, +.upload-plugin { display: block; } -.upload-theme .wp-upload-form { +.upload-theme .wp-upload-form, +.upload-plugin .wp-upload-form { background: #fafafa; border: 1px solid #e5e5e5; padding: 30px; margin: 30px auto; max-width: 380px; } -.upload-theme .install-help { - color: #999; +.upload-theme .install-help, +.upload-plugin .install-help { + color: #555d66; /* #f1f1f1 background */ font-size: 18px; font-style: normal; margin: 0; padding: 40px 0 0; text-align: center; } -body.show-upload-theme .upload-theme + .theme-navigation, -body.show-upload-theme .upload-theme + .theme-navigation + .theme-browser { +body.show-upload-theme .upload-theme + .wp-filter, +body.show-upload-theme .upload-theme + .wp-filter + .theme-browser { display: none; } -.theme-navigation .theme-count { - margin-right: 0; - position: absolute; - top: 12px; -} -.theme-count + .theme-section { - margin-right: 60px; -} -.theme-section, -.theme-filter { - border-bottom: 4px solid #fff; - color: #666; - cursor: pointer; - display: inline-block; - margin: 0 10px; - padding: 15px 0; -} -.theme-section.current, -.theme-filter.current { - border-bottom: 4px solid #666; - color: #222; -} -.theme-top-filters { - display: inline-block; -} -.theme-navigation .more-filters { - color: #666; - cursor: pointer; - display: inline-block; - margin: 0 10px; - padding: 4px 6px; -} -body.more-filters-opened .more-filters, -body.more-filters-opened .more-filters:before { - background: #777; - -webkit-border-radius: 2px; - border-radius: 2px; - border: none; - color: #fff; -} -body.more-filters-opened .more-filters:hover, -body.more-filters-opened .more-filters:focus, -body.more-filters-opened .more-filters:hover:before, -body.more-filters-opened .more-filters:focus:before { - background: rgb(46, 162, 204); -} - -.theme-install-php .theme-search { - position: absolute; - left: 10px; - top: 9px; - font-size: 16px; - font-weight: 300; - line-height: 1.5; - width: 280px; -} -.more-filters:before { - color: #777; - text-align: center; - margin: 0 0 0 5px; - content: "\f111"; - display: inline-block; - width: 16px; - height: 16px; - -webkit-font-smoothing: antialiased; - font-size: 16px; - line-height: 1; - font-family: "dashicons"; - text-decoration: inherit; - font-weight: normal; - font-style: normal; - vertical-align: top; - -webkit-transition: color .1s ease-in 0; - transition: color .1s ease-in 0; - text-align: center; -} -.more-filters.current:before { - color: #fff; -} -.more-filters-container { - display: none; - padding: 20px; - border-top: 1px solid #eee; - margin: 0 -20px; - background: #fafafa; -} -body.more-filters-opened .more-filters-container { - display: block; - overflow: hidden; -} -body.more-filters-opened .theme-section.current { - border-bottom: none; -} -body.more-filters-opened .theme-browser, -body.more-filters-opened.filters-applied.loading-themes .theme-browser { - display: none; -} -body.more-filters-opened.filters-applied .theme-browser { - display: block; -} -.more-filters-container .filters-group { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - float: right; - width: 19%; - background: #fff; - margin: 0 0 0 1%; - border: 1px solid #e5e5e5; - -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04); - box-shadow: 0 1px 1px rgba(0,0,0,0.04); - padding: 10px; -} -.more-filters-container .wide-filters-group { - width: 38%; -} -.more-filters-container .feature-name { - margin: 0; - position: relative; -} -.more-filters-container ol { - list-style-type: none; - margin: 20px 0 0; - font-size: 12px; -} -.more-filters-container li { - display: inline-block; - vertical-align: top; - list-style-type: none; - margin: 5px 0; - padding-left: 25px; - width: 160px; -} -.theme-navigation .more-filters-container .apply-filters { - margin: 0 0 20px; -} -.theme-navigation .more-filters-container .clear-filters { - display: none; - margin: 0 10px 20px 0; -} -.more-filters-container .apply-filters span { - display: inline-block; - font-size: 12px; - text-indent: 10px; - opacity: 0.8; -} -.more-filters-container .filtering-by { - display: none; - margin: 0; -} -.more-filters-container .filtering-by > span { - font-weight: 600; -} -.more-filters-container .filtering-by .tags { - display: inline; -} -.more-filters-container .filtering-by .tag { - background: #fff; - border: 1px solid #e5e5e5; - -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04); - box-shadow: 0 1px 1px rgba(0,0,0,0.04); - font-size: 11px; - margin: 0 5px; - padding: 4px 8px; -} -.more-filters-container .filtering-by a { - margin-right: 10px; -} -body.filters-applied .more-filters-container .filters-group, -body.filters-applied .more-filters-container a.button, -body.filters-applied .more-filters-container br { - display: none !important; -} -body.filters-applied .more-filters-container .filtering-by { - display: block; -} -body.filters-applied .more-filters-container { - padding: 20px; -} p.no-themes { - color: #999; + clear: both; + color: #666; font-size: 18px; font-style: normal; margin: 0; - padding: 0; + padding: 100px 0; text-align: center; display: none; } + body.no-results p.no-themes { display: block; } + body.show-upload-theme p.no-themes { display: none !important; } - .theme-install-php .add-new-theme { display: none !important; } @media only screen and (max-width: 1120px) { - .theme-install-php .theme-search { - margin: 20px 0; - position: static; - width: 100%; - } - .more-filters-container { - border-bottom: 1px solid #eee; - } .upload-theme .wp-upload-form { margin: 20px 0; max-width: 100%; @@ -1367,94 +1135,25 @@ body.show-upload-theme p.no-themes { padding: 20px 0 0; text-align: right; } - .more-filters-container .filters-group { - margin-bottom: 0; - margin-top: 5px; - width: 100%; - } - .more-filters-container .filters-group li { - margin: 10px 0; - } } -@media only screen and (max-width: 782px) { - .more-filters-container .filters-group { - width: 100%; - } - .more-filters-container .filters-group li { - width: 100%; - } +.theme-details .theme-rating { + line-height: 23px; } -.rating { - margin: 30px 0; -} -.rating span:before { - color: #e6b800; - content: "\f154"; - display: inline-block; - -webkit-font-smoothing: antialiased; - font: normal 20px/1 'dashicons'; - vertical-align: top; -} -/* Half stars */ -.rating-10 span.one:before, -.rating-30 span.two:before, -.rating-50 span.three:before, -.rating-70 span.four:before, -.rating-90 span.five:before { - content: "\f459"; -} -/* Full stars */ -.rating-20 span.one:before { - content: "\f155"; -} -.rating-30 span.one:before, -.rating-40 span.one:before, -.rating-40 span.two:before { - content: "\f155"; -} -.rating-50 span.one:before, -.rating-50 span.two:before, -.rating-60 span.one:before, -.rating-60 span.two:before, -.rating-60 span.three:before { - content: "\f155"; -} -.rating-70 span.one:before, -.rating-70 span.two:before, -.rating-70 span.three:before, -.rating-80 span.one:before, -.rating-80 span.two:before, -.rating-80 span.three:before, -.rating-80 span.four:before { - content: "\f155"; -} -.rating-90 span.one:before, -.rating-90 span.two:before, -.rating-90 span.three:before, -.rating-90 span.four:before, -.rating-100 span.one:before, -.rating-100 span.two:before, -.rating-100 span.three:before, -.rating-100 span.four:before, -.rating-100 span.five:before { - content: "\f155"; -} -.rating .ratings { +.theme-details .star-rating { display: inline; - margin-right: 10px; - line-height: 20px; - color: #999; } -.loading-themes .theme-browser, -.error .theme-browser { - display: none; + +.theme-details .num-ratings, +.theme-details .no-rating { + font-size: 11px; + color: #72777c; } -.loading-themes .spinner { + +.theme-details .no-rating { display: block; - margin: 40px auto 0; - float: none; + line-height: 20px; } /*------------------------------------------------------------------------------ @@ -1462,7 +1161,7 @@ body.show-upload-theme p.no-themes { ------------------------------------------------------------------------------*/ .appearance_page_custom-header #headimg { - border: 1px solid #DFDFDF; + border: 1px solid #ddd; overflow: hidden; width: 100%; } @@ -1498,7 +1197,7 @@ body.show-upload-theme p.no-themes { div#custom-background-image { min-height: 100px; - border: 1px solid #dfdfdf; + border: 1px solid #ddd; } div#custom-background-image img { @@ -1540,7 +1239,6 @@ body.full-overlay-active { padding: 0; margin: 0; z-index: 10; - overflow: auto; background: #eee; border-left: none; } @@ -1563,7 +1261,7 @@ body.full-overlay-active { } .wp-full-overlay-sidebar:after { - content: ''; + content: ""; display: block; position: absolute; top: 0; @@ -1617,70 +1315,152 @@ body.full-overlay-active { overflow: auto; } -/* Close Link */ -.wp-full-overlay .close-full-overlay { +/* Close & Navigation Links */ +.theme-install-overlay .wp-full-overlay-sidebar .wp-full-overlay-header { + padding: 0; +} + +.theme-install-overlay .close-full-overlay, +.theme-install-overlay .previous-theme, +.theme-install-overlay .next-theme { + display: block; + position: relative; + float: right; + width: 45px; + height: 45px; + padding-left: 2px; + background: #eee; + border-left: 1px solid #ddd; + color: #444; + cursor: pointer; text-decoration: none; + -webkit-transition: color .1s ease-in-out, background .1s ease-in-out; + transition: color .1s ease-in-out, background .1s ease-in-out; +} + +.theme-install-overlay .close-full-overlay:hover, +.theme-install-overlay .close-full-overlay:focus, +.theme-install-overlay .previous-theme:hover, +.theme-install-overlay .previous-theme:focus, +.theme-install-overlay .next-theme:hover, +.theme-install-overlay .next-theme:focus { + background: #ddd; + border-color: #ccc; + color: #000; + outline: none; + -webkit-box-shadow: none; + box-shadow: none; +} + +.theme-install-overlay .close-full-overlay:before { + font: normal 22px/1 dashicons; + content: "\f335"; + position: relative; + top: 7px; + right: 13px; +} + +.theme-install-overlay .previous-theme:before { + font: normal 20px/1 dashicons; + content: "\f345"; + position: relative; + top: 6px; + right: 14px; +} + +.theme-install-overlay .next-theme:before { + font: normal 20px/1 dashicons; + content: "\f341"; + position: relative; + top: 6px; + right: 13px; +} + +.theme-install-overlay .previous-theme.disabled, +.theme-install-overlay .next-theme.disabled, +.theme-install-overlay .previous-theme.disabled:hover, +.theme-install-overlay .previous-theme.disabled:focus, +.theme-install-overlay .next-theme.disabled:hover, +.theme-install-overlay .next-theme.disabled:focus { + color: #b4b9be; + background: #eee; + cursor: default; + pointer-events: none; } /* Collapse Button */ -.wp-full-overlay a.collapse-sidebar { - position: absolute; - bottom: 12px; - right: 0; - z-index: 50; - display: block; - width: 19px; - height: 19px; - margin-right: 15px; +.wp-core-ui .wp-full-overlay .collapse-sidebar { + position: fixed; + bottom: 8px; + right: 10px; padding: 0; + color: #656a6f; + outline: 0; + line-height: 1; + background-color: transparent !important; + border: none !important; + -webkit-box-shadow: none !important; + box-shadow: none !important; + -webkit-border-radius: 0 !important; + border-radius: 0 !important; +} + +.wp-core-ui .wp-full-overlay .collapse-sidebar:hover, +.wp-core-ui .wp-full-overlay .collapse-sidebar:focus { + color: #0073aa; +} + +.wp-full-overlay .collapse-sidebar-arrow, +.wp-full-overlay .collapse-sidebar-label { + display: inline-block; + vertical-align: middle; + line-height: 20px; +} + +.wp-full-overlay .collapse-sidebar-arrow { + width: 20px; + height: 20px; + margin: 0 2px; /* avoid the focus box-shadow to be cut-off */ -webkit-border-radius: 50%; border-radius: 50%; - color: #777; - text-decoration: none; + overflow: hidden; } -.wp-full-overlay a.collapse-sidebar:hover { - color: #0074a2; +.wp-full-overlay .collapse-sidebar:hover .collapse-sidebar-arrow, +.wp-full-overlay .collapse-sidebar:focus .collapse-sidebar-arrow { + -webkit-box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); + box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); } -.wp-full-overlay.collapsed .collapse-sidebar { - position: absolute; - right: 100%; +.wp-full-overlay .collapse-sidebar-label { + margin-right: 3px; } -.wp-full-overlay .collapse-sidebar-arrow { - position: static; - margin-top: 0; - margin-right: 0; - display: block; - width: auto; - height: auto; - background: none; +.wp-full-overlay.collapsed .collapse-sidebar-label { + display: none; } .wp-full-overlay .collapse-sidebar-arrow:before { - -webkit-border-radius: 50%; - border-radius: 50%; - float: right; + display: block; content: "\f148"; background: #eee; - font: normal 20px/1 'dashicons'; + font: normal 20px/1 dashicons; speak: none; - display: block; padding: 0; - text-indent: 0; - text-align: center; - position: relative; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - text-decoration: none !important; } +/* rtl:ignore */ .wp-full-overlay.collapsed .collapse-sidebar-arrow:before, .rtl .wp-full-overlay .collapse-sidebar-arrow:before { - -webkit-transform: rotate(180deg); - -ms-transform: rotate(180deg); - transform: rotate(180deg); + -webkit-transform: rotate(180.001deg); + -ms-transform: rotate(180.001deg); + transform: rotate(180.001deg); /* Firefox: promoting to its own layer to trigger anti-aliasing */ } .rtl .wp-full-overlay.collapsed .collapse-sidebar-arrow:before { @@ -1689,45 +1469,132 @@ body.full-overlay-active { transform: none; } -.wp-full-overlay.collapsed .collapse-sidebar-arrow { - background-position: -1px -109px; +/* Animations */ +.wp-full-overlay, +.wp-full-overlay-sidebar, +.wp-full-overlay .collapse-sidebar, +.wp-full-overlay-main { + -webkit-transition-property: right, left, top, bottom, width, margin; + transition-property: right, left, top, bottom, width, margin; + -webkit-transition-duration: 0.2s; + transition-duration: 0.2s; } -.wp-full-overlay .collapse-sidebar-label { - position: absolute; - right: 100%; - line-height: 20px; - margin-right: 10px; +/* Device/preview size toggles */ + +.wp-full-overlay { + background: #191e23; } -.wp-full-overlay.collapsed .collapse-sidebar-label { - display: none; +.wp-full-overlay-main { + background-color: #f1f1f1; } -.wp-full-overlay .theme-navigation { - padding: 10px 20px; - position: absolute; - bottom: 10px; - text-align: right; +.expanded .wp-full-overlay-footer { + position: fixed; + bottom: 0; + right: 0; + width: 300px; + height: 45px; + border-top: 1px solid #ddd; } -.wp-full-overlay .theme-navigation .next-theme { + +.wp-full-overlay-footer .devices { float: left; } -.wp-full-overlay.no-navigation .theme-navigation { + +.wp-full-overlay-footer .devices button { + cursor: pointer; + background: transparent; + border: none; + height: 45px; + padding: 0 3px; + margin: 0 -4px 0 0; + -webkit-box-shadow: none; + box-shadow: none; + border-top: 1px solid transparent; + border-bottom: 4px solid transparent; + -webkit-transition: background .1s ease-in-out; + transition: background .1s ease-in-out; +} + +.wp-full-overlay-footer .devices button:focus { + -webkit-box-shadow: none; + box-shadow: none; + outline: none; +} + +.wp-full-overlay-footer .devices button:before { + display: inline-block; + -webkit-font-smoothing: antialiased; + font: normal 20px/30px "dashicons"; + vertical-align: top; + margin: 3px 0; + padding: 4px 8px; + color: #656a6f; +} + +.wp-full-overlay-footer .devices button.active { + border-bottom-color: #191e23; +} + +.wp-full-overlay-footer .devices button:hover, +.wp-full-overlay-footer .devices button:focus { + background-color: #fff; +} + +.wp-full-overlay-footer .devices button:focus { + background-color: #fff; + border-bottom-color: #0073aa; +} + +.wp-full-overlay-footer .devices button.active:before, +.wp-full-overlay-footer .devices button:hover:before, +.wp-full-overlay-footer .devices button:focus:before { + color: #191e23; +} + +.wp-full-overlay-footer .devices .preview-desktop:before { + content: "\f472"; +} + +.wp-full-overlay-footer .devices .preview-tablet:before { + content: "\f471"; +} + +.wp-full-overlay-footer .devices .preview-mobile:before { + content: "\f470"; +} + +@media screen and (max-width:1024px) { + .wp-full-overlay-footer .devices { + display: none; + } +} + +.collapsed .wp-full-overlay-footer .devices button:before { display: none; } -/* Animations */ -.wp-full-overlay, -.wp-full-overlay-sidebar, -.wp-full-overlay .collapse-sidebar, -.wp-full-overlay-main { - -webkit-transition-property: right, left, top, bottom, width, margin; - transition-property: right, left, top, bottom, width, margin; - -webkit-transition-duration: 0.2s; - transition-duration: 0.2s; +.preview-mobile .wp-full-overlay-main { + margin: auto -160px auto 0; + width: 320px; + height: 480px; + max-height: 100%; + max-width: 100%; + right: 50%; +} + +.preview-tablet .wp-full-overlay-main { + margin: auto -360px auto 0; + width: 720px; /* Size is loosely based on a typical "tablet" device size. Intentionally ambiguous - this does not represent any particular device precisely. */ + height: 1080px; + max-height: 100%; + max-width: 100%; + right: 50%; } + /*------------------------------------------------------------------------------ 24.0 - Customize Loader ------------------------------------------------------------------------------*/ @@ -1762,12 +1629,6 @@ body.full-overlay-active { opacity: 0; } -.customize-loading #customize-container { - background: #fff url(../images/spinner.gif) no-repeat fixed center center; - -webkit-background-size: 20px 20px; - background-size: 20px 20px; -} - #customize-container iframe, .theme-install-overlay iframe { height: 100%; @@ -1777,10 +1638,6 @@ body.full-overlay-active { transition: opacity 0.3s; } -#customize-container .collapse-sidebar { - bottom: 16px; -} - #customize-controls { margin-top: 0; } @@ -1819,7 +1676,7 @@ body.full-overlay-active { } .install-theme-info .theme-screenshot { - margin-top: 15px; + margin: 15px 0; width: 258px; border: 1px solid #ccc; } @@ -1830,42 +1687,67 @@ body.full-overlay-active { .theme-details .theme-version { margin: 15px 0; - float: right; -} - -.theme-details .star-rating { - margin: 7px 0; - float: left; } .theme-details .theme-description { float: right; - color: #777; + color: #72777c; line-height: 20px; max-width: 100%; } -.theme-install-overlay .wp-full-overlay-header { - margin-top: 9px; -} - .theme-install-overlay .wp-full-overlay-header .theme-install { float: left; + margin: 8px 0 0 10px; /* For when .theme-install is a span rather than a.button-primary (already installed theme) */ line-height: 26px; } .theme-install-overlay .wp-full-overlay-sidebar { - background: #EEE; - border-left: 1px solid #DDD; + background: #eee; + border-left: 1px solid #ddd; +} + +.theme-install-overlay .wp-full-overlay-sidebar-content { + background: #fff; + border-top: 1px solid #ddd; + border-bottom: 1px solid #ddd; } .theme-install-overlay .wp-full-overlay-main { - background: #fff url(../images/spinner.gif) no-repeat center center; + position: absolute; + z-index: 0; + background-color: #f1f1f1; +} + +.customize-loading #customize-container { + background-color: #f1f1f1; +} + +#customize-preview.wp-full-overlay-main:before, +.customize-loading #customize-container:before, +.theme-install-overlay .wp-full-overlay-main:before { + content: ""; + display: block; + width: 20px; + height: 20px; + position: absolute; + right: 50%; + top: 50%; + z-index: -1; + margin: -10px -10px 0 0; + -webkit-transform: translateZ(0); + transform: translateZ(0); + background: transparent url(../images/spinner.gif) no-repeat center center; -webkit-background-size: 20px 20px; background-size: 20px 20px; } +#customize-preview.wp-full-overlay-main.iframe-ready:before, +.theme-install-overlay.iframe-ready .wp-full-overlay-main:before { + background-image: none; +} + /* =Media Queries -------------------------------------------------------------- */ @@ -1873,7 +1755,6 @@ body.full-overlay-active { * HiDPI Displays */ @media print, - (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 120dpi) { .wp-full-overlay .collapse-sidebar-arrow { @@ -1882,8 +1763,9 @@ body.full-overlay-active { background-size: 15px 123px; } - .customize-loading #customize-container, - .theme-install-overlay .wp-full-overlay-main { + #customize-preview.wp-full-overlay-main:before, + .customize-loading #customize-container:before, + .theme-install-overlay .wp-full-overlay-main:before { background-image: url(../images/spinner-2x.gif); } } @@ -1899,4 +1781,13 @@ body.full-overlay-active { .available-theme .action-links .delete-theme a { padding: 0; } + + .broken-themes table { + width: 100%; + } + + .theme-install-overlay .wp-full-overlay-header .theme-install { + margin-top: 6px; + line-height: normal; + } } diff --git a/wp-admin/css/themes-rtl.min.css b/wp-admin/css/themes-rtl.min.css new file mode 100644 index 0000000..d560f6d --- /dev/null +++ b/wp-admin/css/themes-rtl.min.css @@ -0,0 +1 @@ +.theme-browser .themes{clear:both}.themes-php .wrap h1{float:right;margin-bottom:15px}.network-admin.themes-php .wrap h1{margin-bottom:0}.themes-php .wrap h1 .button{margin-right:20px}.themes-php .wp-filter-search{position:relative;top:-2px;right:20px;margin:0;width:280px;font-size:16px;font-weight:300;line-height:1.5}.themes-php div.error,.themes-php div.notice,.themes-php div.updated{margin:0 0 20px;clear:both}.theme-browser .theme{cursor:pointer;float:right;margin:0 0 4% 4%;position:relative;width:30.6%;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px -1px rgba(0,0,0,.1);box-shadow:0 1px 1px -1px rgba(0,0,0,.1);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.ie8 .theme-browser .theme{width:30%;margin:0 0 4% 3%}.theme-browser .theme:nth-child(3n){margin-left:0}.theme-browser .theme:focus,.theme-browser .theme:hover{cursor:pointer}.theme-browser .theme .theme-name{font-size:15px;font-weight:600;height:18px;margin:0;padding:15px;-webkit-box-shadow:inset 0 1px 0 rgba(0,0,0,.1);box-shadow:inset 0 1px 0 rgba(0,0,0,.1);overflow:hidden;white-space:nowrap;text-overflow:ellipsis;background:#fff;background:rgba(255,255,255,.65)}.theme-browser .theme .theme-actions{-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";opacity:0;-webkit-transition:opacity .1s ease-in-out;transition:opacity .1s ease-in-out;position:absolute;bottom:0;left:0;height:38px;padding:9px 10px 0;background:rgba(244,244,244,.7);border-right:1px solid rgba(0,0,0,.05)}.theme-browser .theme.focus .theme-actions,.theme-browser .theme:focus .theme-actions,.theme-browser .theme:hover .theme-actions{-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";opacity:1}.theme-browser .theme .theme-actions .button-primary{margin-left:3px}.theme-browser .theme .theme-actions .button-secondary{float:none;margin-right:3px}.theme-browser .theme .theme-screenshot{display:block;overflow:hidden;position:relative;-webkit-backface-visibility:hidden;-webkit-transition:opacity .2s ease-in-out;transition:opacity .2s ease-in-out}.theme-browser .theme .theme-screenshot:after{content:"";display:block;padding-top:66.66666%}.theme-browser .theme .theme-screenshot img{height:auto;position:absolute;right:0;top:0;width:100%;-webkit-transition:opacity .2s ease-in-out;transition:opacity .2s ease-in-out}.theme-browser .theme:focus .theme-screenshot,.theme-browser .theme:hover .theme-screenshot{background:#fff}.theme-browser.rendered .theme:focus .theme-screenshot img,.theme-browser.rendered .theme:hover .theme-screenshot img{opacity:.4}.theme-browser .theme .more-details{-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";opacity:0;position:absolute;top:35%;left:25%;right:25%;background:#23282d;background:rgba(0,0,0,.7);color:#fff;font-size:15px;text-shadow:0 1px 0 rgba(0,0,0,.6);-webkit-font-smoothing:antialiased;font-weight:600;padding:15px 12px;text-align:center;-webkit-border-radius:3px;border-radius:3px;-webkit-transition:opacity .1s ease-in-out;transition:opacity .1s ease-in-out}.theme-browser .theme:focus{border-color:#5b9dd9;-webkit-box-shadow:0 0 2px rgba(30,140,190,.8);box-shadow:0 0 2px rgba(30,140,190,.8)}.theme-browser .theme:focus .more-details{opacity:1}.theme-browser .theme.active:focus .theme-actions{display:block}.theme-browser.rendered .theme:focus .more-details,.theme-browser.rendered .theme:hover .more-details{-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";opacity:1}.theme-browser .theme .theme-installed,.theme-browser .theme .theme-update{background:#d54e21;background:rgba(213,78,33,.95);color:#fff;display:block;font-size:13px;font-weight:400;height:48px;line-height:48px;padding:0 10px;position:absolute;top:0;left:0;right:0;border-bottom:1px solid rgba(0,0,0,.25);overflow:hidden}.theme-browser .theme .theme-installed:before,.theme-browser .theme .theme-update:before{content:"\f463";display:inline-block;font:400 20px/1 dashicons;margin:0 0 0 6px;opacity:.8;position:relative;top:5px;speak:none;-webkit-font-smoothing:antialiased}.theme-browser .theme.active .theme-name{background:#23282d;color:#fff;padding-left:110px;font-weight:300;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.5);box-shadow:inset 0 1px 1px rgba(0,0,0,.5)}.theme-browser .customize-control .theme.active .theme-name{padding-left:15px}.theme-browser .theme.active .theme-name span{font-weight:600}.theme-browser .theme.active .theme-actions{background:rgba(49,49,49,.7);border-right:none;opacity:1}.theme-browser .theme.active .theme-actions .button-primary{margin-left:0}.theme-browser .theme .theme-author{background:#23282d;color:#eee;display:none;font-size:14px;margin:0 10px;padding:5px 10px;position:absolute;bottom:56px}.theme-browser .theme.display-author .theme-author{display:block}.theme-browser .theme.display-author .theme-author a{color:inherit;text-decoration:none}.theme-browser .theme.add-new-theme{border:none;-webkit-box-shadow:none;box-shadow:none}.theme-browser .theme.add-new-theme a{text-decoration:none;display:block;position:relative;z-index:1}.theme-browser .theme.add-new-theme a:after{display:block;content:"";background:0 0;background:rgba(0,0,0,0);position:absolute;top:0;right:0;left:0;bottom:0;padding:0;text-shadow:none;border:5px dashed #d5d2ca;border:5px dashed rgba(0,0,0,.1);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.theme-overlay .theme-actions,.theme-overlay .theme-wrap{-webkit-box-sizing:border-box;-moz-box-sizing:border-box}.theme-browser .theme.add-new-theme span:after{background:#e5e5e5;background:rgba(153,153,153,.1);-webkit-border-radius:50%;border-radius:50%;display:inline-block;content:"\f132";-webkit-font-smoothing:antialiased;font:400 74px/115px dashicons;width:100px;height:100px;vertical-align:middle;text-align:center;color:#999;position:absolute;top:30%;right:50%;margin-right:-50px;text-indent:-4px;padding:0;text-shadow:none;z-index:4}.rtl .theme-browser .theme.add-new-theme span:after{text-indent:4px}.theme-browser .theme.add-new-theme a:focus .theme-screenshot,.theme-browser .theme.add-new-theme a:hover .theme-screenshot{background:0 0}.theme-browser .theme.add-new-theme a:focus span:after,.theme-browser .theme.add-new-theme a:hover span:after{background:#fff;color:#0073aa}.theme-browser .theme.add-new-theme a:focus:after,.theme-browser .theme.add-new-theme a:hover:after{border-color:transparent;color:#fff;background:#0073aa;content:""}.theme-browser .theme.add-new-theme .theme-name{background:0 0;text-align:center;-webkit-box-shadow:none;box-shadow:none;font-weight:400;position:relative;top:0;margin-top:-18px;padding-top:0;padding-bottom:48px}.theme-browser .theme.add-new-theme a:focus .theme-name,.theme-browser .theme.add-new-theme a:hover .theme-name{color:#fff;z-index:2}.theme-overlay .theme-backdrop{position:absolute;right:-20px;left:0;top:0;bottom:0;background:#f1f1f1;background:rgba(238,238,238,.9);z-index:10000}.theme-overlay .theme-header{position:absolute;top:0;right:0;left:0;height:48px;border-bottom:1px solid #ddd}.theme-overlay .theme-header button{padding:0}.theme-overlay .theme-header .close{cursor:pointer;height:48px;width:50px;text-align:center;float:left;border:0;border-right:1px solid #ddd;background-color:transparent;-webkit-transition:color .1s ease-in-out,background .1s ease-in-out;transition:color .1s ease-in-out,background .1s ease-in-out}.theme-overlay .theme-header .close:before{font:400 22px/50px dashicons!important;color:#72777c;display:inline-block;content:"\f335";font-weight:300}.theme-overlay .theme-header .left,.theme-overlay .theme-header .right{cursor:pointer;color:#72777c;background-color:transparent;height:48px;width:54px;float:right;text-align:center;border:0;border-left:1px solid #ddd;-webkit-transition:color .1s ease-in-out,background .1s ease-in-out;transition:color .1s ease-in-out,background .1s ease-in-out}.theme-overlay .theme-header .close:focus,.theme-overlay .theme-header .close:hover,.theme-overlay .theme-header .left:focus,.theme-overlay .theme-header .left:hover,.theme-overlay .theme-header .right:focus,.theme-overlay .theme-header .right:hover{background:#ddd;border-color:#ccc;color:#000}.theme-overlay .theme-header .close:focus:before,.theme-overlay .theme-header .close:hover:before{color:#000}.theme-overlay .theme-header .close:focus,.theme-overlay .theme-header .left:focus,.theme-overlay .theme-header .right:focus{-webkit-box-shadow:none;box-shadow:none;outline:0}.theme-overlay .theme-header .left.disabled,.theme-overlay .theme-header .left.disabled:hover,.theme-overlay .theme-header .right.disabled,.theme-overlay .theme-header .right.disabled:hover{color:#ccc;background:inherit;cursor:inherit}.theme-overlay .theme-header .left:before,.theme-overlay .theme-header .right:before{font:400 20px/50px dashicons!important;display:inline;font-weight:300}.customize-support .theme-overlay .theme-actions a[href="themes.php?page=custom-header"],.customize-support .theme-overlay .theme-actions a[href="themes.php?page=custom-background"],.theme-overlay .theme-actions .active-theme,.theme-overlay.active .theme-actions .inactive-theme{display:none}.theme-overlay .theme-header .left:before{content:"\f345"}.theme-overlay .theme-header .right:before{content:"\f341"}.theme-overlay .theme-wrap{clear:both;position:fixed;top:9%;right:190px;left:30px;bottom:3%;background:#fff;-webkit-box-shadow:0 1px 20px 5px rgba(0,0,0,.1);box-shadow:0 1px 20px 5px rgba(0,0,0,.1);z-index:10000;box-sizing:border-box;-webkit-overflow-scrolling:touch}body.folded .theme-overlay .theme-wrap{right:70px}.theme-overlay .theme-about{position:absolute;top:49px;bottom:57px;right:0;left:0;overflow:auto;padding:2% 4%}.theme-overlay .theme-actions{position:absolute;text-align:center;bottom:0;right:0;left:0;padding:10px 25px 5px;background:#f3f3f3;z-index:30;box-sizing:border-box;border-top:1px solid #eee}.theme-overlay .screenshot,.upload-plugin,.upload-theme{-webkit-box-sizing:border-box;-moz-box-sizing:border-box}.ie8 .theme-overlay .theme-actions{border:1px solid #eee}.theme-overlay .theme-actions a{margin-left:5px;margin-bottom:5px}.broken-themes a.delete-theme,.theme-overlay .theme-actions .delete-theme{color:#a00;text-decoration:none;border-color:transparent;-webkit-box-shadow:none;box-shadow:none;background:0 0}.theme-overlay .theme-actions .delete-theme{position:absolute;left:10px;bottom:5px}.broken-themes a.delete-theme:focus,.broken-themes a.delete-theme:hover,.theme-overlay .theme-actions .delete-theme:focus,.theme-overlay .theme-actions .delete-theme:hover{background:#d54e21;color:#fff;border-color:#d54e21}.theme-overlay .theme-actions .inactive-theme,.theme-overlay.active .theme-actions .active-theme{display:block}.theme-overlay .theme-screenshots{float:right;margin:0 0 0 30px;width:55%;max-width:880px;text-align:center}.theme-overlay .screenshot{border:1px solid #fff;box-sizing:border-box;overflow:hidden;position:relative;-webkit-box-shadow:0 0 0 1px rgba(0,0,0,.2);box-shadow:0 0 0 1px rgba(0,0,0,.2)}.theme-overlay .screenshot:after{content:"";display:block;padding-top:75%}.theme-overlay .screenshot img{height:auto;position:absolute;right:0;top:0;width:100%}.theme-overlay.small-screenshot .theme-screenshots{position:absolute;width:302px}.theme-overlay.small-screenshot .theme-info{margin-right:350px;width:auto}.theme-overlay .screenshot.thumb{background:#ccc;border:1px solid #eee;float:none;display:inline-block;margin:10px 5px 0;width:140px;height:80px;cursor:pointer}.theme-overlay .screenshot.thumb:after{content:"";display:block;padding-top:100%}.theme-overlay .screenshot.thumb img{cursor:pointer;position:absolute;right:0;top:0;width:100%;height:auto}.theme-overlay .screenshot.selected{background:0 0;border:2px solid #00a0d2}.theme-overlay .screenshot.selected img{opacity:.8}.theme-browser .theme .theme-screenshot.blank,.theme-overlay .screenshot.blank{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAALElEQVQYGWO8d+/efwYkoKioiMRjYGBC4WHhUK6A8T8QIJt8//59ZC493AAAQssKpBK4F5AAAAAASUVORK5CYII=)}.theme-overlay .theme-info{width:40%;float:right}.theme-overlay .current-label{background:#32373c;color:#fff;font-size:11px;display:inline-block;padding:2px 8px;-webkit-border-radius:2px;border-radius:2px;margin:0 0 -10px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.theme-overlay .theme-name{color:#23282d;font-size:32px;font-weight:100;margin:10px 0 0;line-height:1.3}.theme-overlay .theme-version{color:#72777c;font-size:13px;font-weight:400;float:none;display:inline-block;margin-right:10px}.theme-overlay .theme-author{margin:15px 0 25px;color:#72777c;font-size:16px;font-weight:400;line-height:inherit}.theme-overlay .theme-author a{text-decoration:none}.theme-overlay .theme-description{color:#555;font-size:15px;font-weight:400;line-height:1.5;margin:30px 0 0}.theme-overlay .theme-tags{border-top:3px solid #eee;color:#82878c;font-size:13px;font-weight:400;margin:30px 0 0;padding-top:20px}.theme-overlay .theme-tags span{color:#444;font-weight:700;margin-left:5px}.theme-overlay .parent-theme{background:#f7fcfe;border:1px solid #eee;border-right:4px solid #00a0d2;font-size:14px;font-weight:400;margin-top:30px;padding:10px 20px 10px 10px}.theme-overlay .parent-theme strong{font-weight:700}.single-theme .theme,.single-theme .theme-overlay .theme-backdrop,.single-theme .theme-overlay .theme-header{display:none}.single-theme .theme-overlay .theme-wrap{clear:both;min-height:330px;position:relative;right:auto;left:auto;top:auto;bottom:auto;z-index:10}.single-theme .theme-overlay .theme-about{padding:30px 30px 70px;position:static}.single-theme .theme-overlay .theme-actions{position:absolute}@media only screen and (min-width:2000px){#wpwrap .theme-browser .theme{width:17.6%;margin:0 0 3% 3%}#wpwrap .theme-browser .theme:nth-child(3n),#wpwrap .theme-browser .theme:nth-child(4n){margin-left:3%}#wpwrap .theme-browser .theme:nth-child(5n){margin-left:0}}@media only screen and (min-width:1680px){.theme-overlay .theme-wrap{width:1450px;margin:0 auto}}@media only screen and (min-width:1640px){.theme-browser .theme{width:22.7%;margin:0 0 3% 3%}.theme-browser .theme .theme-screenshot:after{padding-top:75%}.theme-browser .theme:nth-child(3n){margin-left:3%}.theme-browser .theme:nth-child(4n){margin-left:0}}@media only screen and (max-width:1120px){.theme-browser .theme{width:47.5%;margin-left:0}.theme-browser .theme:nth-child(even){margin-left:0}.theme-browser .theme:nth-child(odd){margin-left:5%}}@media only screen and (max-width:900px){.theme-overlay .theme-wrap{right:65px}}@media only screen and (max-width:780px){.theme-overlay .theme-wrap,body.folded .theme-overlay .theme-wrap{top:0;left:0;bottom:0;right:0;padding:70px 20px 20px;border:none;z-index:100000;position:fixed}.theme-browser .theme.active .theme-name span{display:none}.theme-overlay .theme-screenshots{width:40%}.theme-overlay .theme-info{width:50%}.single-theme .theme-wrap{padding:10px}.theme-browser .theme .theme-actions{padding:5px 10px 4px}.theme-overlay.small-screenshot .theme-screenshots{position:static;float:none;max-width:302px}.theme-overlay.small-screenshot .theme-info{margin-right:0;width:auto}.theme:focus .more-details,.theme:hover .more-details,.theme:not(.active):focus .theme-actions,.theme:not(.active):hover .theme-actions{display:none}.theme-browser.rendered .theme:focus .theme-screenshot img,.theme-browser.rendered .theme:hover .theme-screenshot img{opacity:1}}@media only screen and (max-width:480px){.theme-browser .theme{width:100%;margin-left:0}.theme-browser .theme:nth-child(2n),.theme-browser .theme:nth-child(3n){margin-left:0}}@media only screen and (max-width:650px){.theme-overlay .theme-description,.theme-overlay .theme-update{margin-right:0}.theme-overlay .theme-actions .delete-theme{position:relative;left:auto;bottom:auto}.theme-overlay .theme-actions .inactive-theme{display:inline}.theme-overlay .theme-screenshots{width:100%;float:none}.theme-overlay .theme-info{width:100%}.theme-overlay .theme-author{margin:5px 0 15px}.theme-overlay .current-label{margin-top:10px;font-size:13px}.themes-php .wp-filter-search{float:none;clear:both;right:0;top:0;left:0;margin:10px 0;width:100%;max-width:280px}.theme-browser .theme.add-new-theme span:after{font:400 60px/90px dashicons;width:80px;height:80px;top:30%;right:50%;text-indent:0;margin-right:-40px}.single-theme .theme-wrap{margin:0 -10px 0 -12px;padding:10px}.single-theme .theme-overlay .theme-about{padding:10px;overflow:visible}.single-theme .current-label{display:none}.single-theme .theme-overlay .theme-actions{position:static}}.broken-themes{clear:both}.broken-themes table{text-align:right;width:50%;border-spacing:3px;padding:3px}.theme-browser .theme .theme-installed{background:#0073aa}.theme-browser .theme .theme-installed:before{content:"\f147"}.theme-browser .theme.is-installed .theme-actions .button-primary{display:none!important}.theme-install-php .wp-filter{padding:0 20px}.theme-install-php a.browse-themes,.theme-install-php a.upload{cursor:pointer}.theme-install-php a.browse-themes,.theme-install-php.show-upload-theme a.upload{display:none}.theme-install-php.show-upload-theme a.browse-themes{display:inline}.upload-plugin,.upload-theme{box-sizing:border-box;display:none;margin:0;padding:0;width:100%;overflow:hidden;position:relative;top:10px}.wp-full-overlay,.wp-full-overlay-main,.wp-full-overlay-sidebar{top:0;height:100%;bottom:0;right:0}.upload-plugin,body.show-upload-theme .upload-theme{display:block}body.show-upload-theme .upload-theme+.wp-filter,body.show-upload-theme .upload-theme+.wp-filter+.theme-browser,p.no-themes{display:none}.upload-plugin .wp-upload-form,.upload-theme .wp-upload-form{background:#fafafa;border:1px solid #e5e5e5;padding:30px;margin:30px auto;max-width:380px}.upload-plugin .install-help,.upload-theme .install-help{color:#555d66;font-size:18px;font-style:normal;margin:0;padding:40px 0 0;text-align:center}p.no-themes{clear:both;color:#666;font-size:18px;font-style:normal;margin:0;padding:100px 0;text-align:center}body.no-results p.no-themes{display:block}.theme-install-php .add-new-theme,body.show-upload-theme p.no-themes{display:none!important}@media only screen and (max-width:1120px){.upload-theme .wp-upload-form{margin:20px 0;max-width:100%}.upload-theme .install-help{font-size:15px;padding:20px 0 0;text-align:right}}.theme-details .theme-rating{line-height:23px}.theme-details .star-rating{display:inline}.theme-details .no-rating,.theme-details .num-ratings{font-size:11px;color:#72777c}.theme-details .no-rating{display:block;line-height:20px}.appearance_page_custom-header #headimg{border:1px solid #ddd;overflow:hidden;width:100%}.appearance_page_custom-header #upload-form p label{font-size:12px}.appearance_page_custom-header .available-headers .default-header{float:right;margin:0 0 20px 20px}.appearance_page_custom-header .random-header{clear:both;margin:0 0 20px 20px;vertical-align:middle}.appearance_page_custom-header .available-headers label input,.appearance_page_custom-header .random-header label input{margin-left:10px}.appearance_page_custom-header .available-headers label img{vertical-align:middle}div#custom-background-image{min-height:100px;border:1px solid #ddd}div#custom-background-image img{max-width:400px;max-height:300px}body.full-overlay-active{overflow:hidden}.wp-full-overlay{z-index:500000;position:fixed;overflow:visible;left:0;min-width:0}.wp-full-overlay-sidebar{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:fixed;width:300px;padding:0;margin:0;z-index:10;background:#eee;border-left:none}.wp-full-overlay.collapsed,.wp-full-overlay.expanded .wp-full-overlay-sidebar{margin-right:0!important}.wp-full-overlay.expanded{margin-right:300px}.wp-full-overlay.collapsed .wp-full-overlay-sidebar{overflow:visible;margin-right:-300px}.wp-full-overlay-sidebar:after{content:"";display:block;position:absolute;top:0;bottom:0;left:0;width:3px;z-index:1000}.wp-full-overlay-main{position:absolute;left:0}.wp-full-overlay-sidebar .wp-full-overlay-header{position:absolute;right:0;left:0;height:45px;padding:0 15px;line-height:45px;z-index:10;margin:0;border-top:none;-webkit-box-shadow:none;box-shadow:none}.wp-full-overlay-sidebar .wp-full-overlay-header a.back{margin-top:9px}.wp-full-overlay-sidebar .wp-full-overlay-footer{bottom:0;border-bottom:none;border-top:none;-webkit-box-shadow:none;box-shadow:none}.wp-full-overlay-sidebar .wp-full-overlay-sidebar-content{position:absolute;top:45px;bottom:45px;right:0;left:0;overflow:auto}.theme-install-overlay .wp-full-overlay-sidebar .wp-full-overlay-header{padding:0}.theme-install-overlay .close-full-overlay,.theme-install-overlay .next-theme,.theme-install-overlay .previous-theme{display:block;position:relative;float:right;width:45px;height:45px;padding-left:2px;background:#eee;border-left:1px solid #ddd;color:#444;cursor:pointer;text-decoration:none;-webkit-transition:color .1s ease-in-out,background .1s ease-in-out;transition:color .1s ease-in-out,background .1s ease-in-out}.theme-install-overlay .close-full-overlay:focus,.theme-install-overlay .close-full-overlay:hover,.theme-install-overlay .next-theme:focus,.theme-install-overlay .next-theme:hover,.theme-install-overlay .previous-theme:focus,.theme-install-overlay .previous-theme:hover{background:#ddd;border-color:#ccc;color:#000;outline:0;-webkit-box-shadow:none;box-shadow:none}.theme-install-overlay .close-full-overlay:before{font:400 22px/1 dashicons;content:"\f335";position:relative;top:7px;right:13px}.theme-install-overlay .previous-theme:before{font:400 20px/1 dashicons;content:"\f345";position:relative;top:6px;right:14px}.theme-install-overlay .next-theme:before{font:400 20px/1 dashicons;content:"\f341";position:relative;top:6px;right:13px}.theme-install-overlay .next-theme.disabled,.theme-install-overlay .next-theme.disabled:focus,.theme-install-overlay .next-theme.disabled:hover,.theme-install-overlay .previous-theme.disabled,.theme-install-overlay .previous-theme.disabled:focus,.theme-install-overlay .previous-theme.disabled:hover{color:#b4b9be;background:#eee;cursor:default;pointer-events:none}.wp-core-ui .wp-full-overlay .collapse-sidebar{position:fixed;bottom:8px;right:10px;padding:0;color:#656a6f;outline:0;line-height:1;background-color:transparent!important;border:none!important;-webkit-box-shadow:none!important;box-shadow:none!important;-webkit-border-radius:0!important;border-radius:0!important}.wp-core-ui .wp-full-overlay .collapse-sidebar:focus,.wp-core-ui .wp-full-overlay .collapse-sidebar:hover{color:#0073aa}.wp-full-overlay .collapse-sidebar-arrow,.wp-full-overlay .collapse-sidebar-label{display:inline-block;vertical-align:middle;line-height:20px}.wp-full-overlay .collapse-sidebar-arrow{width:20px;height:20px;margin:0 2px;-webkit-border-radius:50%;border-radius:50%;overflow:hidden}.wp-full-overlay .collapse-sidebar:focus .collapse-sidebar-arrow,.wp-full-overlay .collapse-sidebar:hover .collapse-sidebar-arrow{-webkit-box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}.wp-full-overlay .collapse-sidebar-label{margin-right:3px}.wp-full-overlay.collapsed .collapse-sidebar-label{display:none}.wp-full-overlay .collapse-sidebar-arrow:before{display:block;content:"\f148";background:#eee;font:400 20px/1 dashicons;speak:none;padding:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.rtl .wp-full-overlay .collapse-sidebar-arrow:before,.wp-full-overlay.collapsed .collapse-sidebar-arrow:before{-webkit-transform:rotate(180.001deg);-ms-transform:rotate(180.001deg);transform:rotate(180.001deg)}.rtl .wp-full-overlay.collapsed .collapse-sidebar-arrow:before{-webkit-transform:none;-ms-transform:none;transform:none}.wp-full-overlay,.wp-full-overlay .collapse-sidebar,.wp-full-overlay-main,.wp-full-overlay-sidebar{-webkit-transition-property:right,left,top,bottom,width,margin;transition-property:right,left,top,bottom,width,margin;-webkit-transition-duration:.2s;transition-duration:.2s}.wp-full-overlay{background:#191e23}.wp-full-overlay-main{background-color:#f1f1f1}.expanded .wp-full-overlay-footer{position:fixed;bottom:0;right:0;width:300px;height:45px;border-top:1px solid #ddd}.wp-full-overlay-footer .devices{float:left}.wp-full-overlay-footer .devices button{cursor:pointer;background:0 0;border:none;height:45px;padding:0 3px;margin:0 -4px 0 0;-webkit-box-shadow:none;box-shadow:none;border-top:1px solid transparent;border-bottom:4px solid transparent;-webkit-transition:background .1s ease-in-out;transition:background .1s ease-in-out}.wp-full-overlay-footer .devices button:before{display:inline-block;-webkit-font-smoothing:antialiased;font:400 20px/30px dashicons;vertical-align:top;margin:3px 0;padding:4px 8px;color:#656a6f}.wp-full-overlay-footer .devices button.active{border-bottom-color:#191e23}.wp-full-overlay-footer .devices button:focus,.wp-full-overlay-footer .devices button:hover{background-color:#fff}.wp-full-overlay-footer .devices button:focus{-webkit-box-shadow:none;box-shadow:none;outline:0;background-color:#fff;border-bottom-color:#0073aa}.wp-full-overlay-footer .devices button.active:before,.wp-full-overlay-footer .devices button:focus:before,.wp-full-overlay-footer .devices button:hover:before{color:#191e23}.wp-full-overlay-footer .devices .preview-desktop:before{content:"\f472"}.wp-full-overlay-footer .devices .preview-tablet:before{content:"\f471"}.wp-full-overlay-footer .devices .preview-mobile:before{content:"\f470"}@media screen and (max-width:1024px){.wp-full-overlay-footer .devices{display:none}}.collapsed .wp-full-overlay-footer .devices button:before{display:none}.preview-mobile .wp-full-overlay-main{margin:auto -160px auto 0;width:320px;height:480px;max-height:100%;max-width:100%;right:50%}.preview-tablet .wp-full-overlay-main{margin:auto -360px auto 0;width:720px;height:1080px;max-height:100%;max-width:100%;right:50%}.customize-support .hide-if-customize,.customize-support .wp-core-ui .hide-if-customize,.customize-support.wp-core-ui .hide-if-customize,.no-customize-support .hide-if-no-customize,.no-customize-support .wp-core-ui .hide-if-no-customize,.no-customize-support.wp-core-ui .hide-if-no-customize{display:none}#customize-container{display:none;background:#fff;z-index:500000;position:fixed;overflow:visible;top:0;bottom:0;right:0;left:0;height:100%}.customize-active #customize-container{display:block}.customize-loading #customize-container iframe{opacity:0}#customize-container iframe,.theme-install-overlay iframe{height:100%;width:100%;z-index:20;-webkit-transition:opacity .3s;transition:opacity .3s}#customize-controls{margin-top:0}.theme-install-overlay{display:none}.theme-install-overlay.single-theme{display:block}.install-theme-info{display:none;padding:10px 20px 60px}.single-theme .install-theme-info{padding-top:15px}.theme-install-overlay .install-theme-info{display:block}.install-theme-info .theme-install{float:left;margin-top:18px}.install-theme-info .theme-name{font-size:16px;line-height:24px;margin-bottom:0;margin-top:0}.install-theme-info .theme-screenshot{margin:15px 0;width:258px;border:1px solid #ccc}.install-theme-info .theme-details{overflow:hidden}.theme-details .theme-version{margin:15px 0}.theme-details .theme-description{float:right;color:#72777c;line-height:20px;max-width:100%}.theme-install-overlay .wp-full-overlay-header .theme-install{float:left;margin:8px 0 0 10px;line-height:26px}.theme-install-overlay .wp-full-overlay-sidebar{background:#eee;border-left:1px solid #ddd}.theme-install-overlay .wp-full-overlay-sidebar-content{background:#fff;border-top:1px solid #ddd;border-bottom:1px solid #ddd}.theme-install-overlay .wp-full-overlay-main{position:absolute;z-index:0;background-color:#f1f1f1}.customize-loading #customize-container{background-color:#f1f1f1}#customize-preview.wp-full-overlay-main:before,.customize-loading #customize-container:before,.theme-install-overlay .wp-full-overlay-main:before{content:"";display:block;width:20px;height:20px;position:absolute;right:50%;top:50%;z-index:-1;margin:-10px -10px 0 0;-webkit-transform:translateZ(0);transform:translateZ(0);background:url(../images/spinner.gif) center center no-repeat;-webkit-background-size:20px 20px;background-size:20px 20px}#customize-preview.wp-full-overlay-main.iframe-ready:before,.theme-install-overlay.iframe-ready .wp-full-overlay-main:before{background-image:none}@media print,(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.wp-full-overlay .collapse-sidebar-arrow{background-image:url(../images/arrows-2x.png);-webkit-background-size:15px 123px;background-size:15px 123px}#customize-preview.wp-full-overlay-main:before,.customize-loading #customize-container:before,.theme-install-overlay .wp-full-overlay-main:before{background-image:url(../images/spinner-2x.gif)}}@media screen and (max-width:782px){.available-theme .action-links .delete-theme{float:none;margin:0;padding:0;clear:both}.available-theme .action-links .delete-theme a{padding:0}.broken-themes table{width:100%}.theme-install-overlay .wp-full-overlay-header .theme-install{margin-top:6px;line-height:normal}} \ No newline at end of file diff --git a/wp-admin/css/themes.css b/wp-admin/css/themes.css index 13076cb..4947567 100644 --- a/wp-admin/css/themes.css +++ b/wp-admin/css/themes.css @@ -9,52 +9,41 @@ .theme-browser .themes { clear: both; - padding: 0 0 100px; } -.themes-php .wrap h2 { +.themes-php .wrap h1 { float: left; margin-bottom: 15px; } -.network-admin.themes-php .wrap h2 { +.network-admin.themes-php .wrap h1 { margin-bottom: 0; } -.themes-php .wrap h2 .button { +.themes-php .wrap h1 .button { margin-left: 20px; } -.themes-php .wrap .theme-count, -.theme-navigation .theme-count { - color: #fff; - -webkit-border-radius: 30px; - border-radius: 30px; - background: #777; - font-size: 14px; - padding: 4px 10px; - font-weight: 600; - margin-left: 5px; - margin-right: 20px; +/* Search form */ +.themes-php .wp-filter-search { position: relative; - top: -3px; -} - -.theme-navigation a { - text-decoration:none; + top: -2px; + left: 20px; + margin: 0; + width: 280px; + font-size: 16px; + font-weight: 300; + line-height: 1.5; } /* Position admin messages */ .themes-php div.updated, -.themes-php div.error { +.themes-php div.error, +.themes-php div.notice { margin: 0 0 20px 0; clear: both; } -.themes-php div.updated a { - text-decoration: underline; -} - /** * Main theme element * (has flexible margins) @@ -65,7 +54,7 @@ margin: 0 4% 4% 0; position: relative; width: 30.6%; - border: 1px solid #dedede; + border: 1px solid #ddd; -webkit-box-shadow: 0 1px 1px -1px rgba(0,0,0,0.1); box-shadow: 0 1px 1px -1px rgba(0,0,0,0.1); -webkit-box-sizing: border-box; @@ -143,12 +132,13 @@ display: block; overflow: hidden; position: relative; + -webkit-backface-visibility: hidden; /* Prevents flicker of the screenshot on hover. */ -webkit-transition: opacity 0.2s ease-in-out; transition: opacity 0.2s ease-in-out; } .theme-browser .theme .theme-screenshot:after { - content: ''; + content: ""; display: block; padding-top: 66.66666%; /* using a 3/2 aspect ratio */ } @@ -159,8 +149,7 @@ left: 0; top: 0; width: 100%; - -webkit-transform: translateZ( 0 ); /* Prevents rendering bugs in Chrome */ - -webkit-transition: opacity 0.2s ease-in-out; /* Prevents rendering bugs in Chrome */ + -webkit-transition: opacity 0.2s ease-in-out; transition: opacity 0.2s ease-in-out; } @@ -181,7 +170,7 @@ top: 35%; right: 25%; left: 25%; - background: #222; + background: #23282d; background: rgba(0,0,0,0.7); color: #fff; font-size: 15px; @@ -195,13 +184,17 @@ -webkit-transition: opacity 0.1s ease-in-out; transition: opacity 0.1s ease-in-out; } + .theme-browser .theme:focus { - outline: 1px dotted #222; + border-color: #5b9dd9; + -webkit-box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 ); + box-shadow: 0 0 2px rgba( 30, 140, 190, 0.8 ); } .theme-browser .theme:focus .more-details { opacity: 1; } + /* Current theme needs to have its action always on view */ .theme-browser .theme.active:focus .theme-actions { display: block; @@ -238,9 +231,9 @@ .theme-browser .theme .theme-update:before, .theme-browser .theme .theme-installed:before { - content: '\f463'; + content: "\f463"; display: inline-block; - font: normal 20px/1 'dashicons'; + font: normal 20px/1 dashicons; margin: 0 6px 0 0; opacity: 0.8; position: relative; @@ -254,7 +247,7 @@ * The currently active theme */ .theme-browser .theme.active .theme-name { - background: #2f2f2f; + background: #23282d; color: #fff; padding-right: 110px; font-weight: 300; @@ -262,6 +255,10 @@ box-shadow: inset 0 1px 1px rgba(0,0,0,0.5); } +.theme-browser .customize-control .theme.active .theme-name { + padding-right: 15px; +} + .theme-browser .theme.active .theme-name span { font-weight: 600; } @@ -277,7 +274,7 @@ } .theme-browser .theme .theme-author { - background: #222; + background: #23282d; color: #eee; display: none; font-size: 14px; @@ -306,18 +303,15 @@ } .theme-browser .theme.add-new-theme a { - color: #999; text-decoration: none; display: block; position: relative; z-index: 1; } -.theme-browser .theme.add-new-theme:after { +.theme-browser .theme.add-new-theme a:after { display: block; - content: ''; - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; - opacity: 1; + content: ""; background: transparent; background: rgba(0, 0, 0, 0); position: absolute; @@ -325,12 +319,10 @@ left: 0; right: 0; bottom: 0; - padding: 10% 0 0 0; + padding: 0; text-shadow: none; border: 5px dashed #d5d2ca; border: 5px dashed rgba(0, 0, 0, 0.1); - -webkit-transition: opacity 0.2s ease-in-out; - transition: opacity 0.2s ease-in-out; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; @@ -342,9 +334,9 @@ -webkit-border-radius: 50%; border-radius: 50%; display: inline-block; - content: '\f132'; + content: "\f132"; -webkit-font-smoothing: antialiased; - font: normal 74px/115px 'dashicons'; + font: normal 74px/115px dashicons; width: 100px; height: 100px; vertical-align: middle; @@ -364,23 +356,23 @@ text-indent: 4px; } -.theme-browser .theme.add-new-theme:hover .theme-screenshot, -.theme-browser .theme.add-new-theme:focus .theme-screenshot { +.theme-browser .theme.add-new-theme a:hover .theme-screenshot, +.theme-browser .theme.add-new-theme a:focus .theme-screenshot { background: none; } -.theme-browser .theme.add-new-theme:hover span:after, -.theme-browser .theme.add-new-theme:focus span:after { +.theme-browser .theme.add-new-theme a:hover span:after, +.theme-browser .theme.add-new-theme a:focus span:after { background: #fff; - color: #0074a2; + color: #0073aa; } -.theme-browser .theme.add-new-theme:hover:after, -.theme-browser .theme.add-new-theme:focus:after { +.theme-browser .theme.add-new-theme a:hover:after, +.theme-browser .theme.add-new-theme a:focus:after { border-color: transparent; color: #fff; - background: #0074a2; - content: ''; + background: #0073aa; + content: ""; } .theme-browser .theme.add-new-theme .theme-name { @@ -391,29 +383,17 @@ font-weight: 400; position: relative; top: 0; - margin-top: -10%; - margin-bottom: 10%; + margin-top: -18px; + padding-top: 0; + padding-bottom: 48px; } -.theme-browser .theme.add-new-theme:hover .theme-name, -.theme-browser .theme.add-new-theme:focus .theme-name { +.theme-browser .theme.add-new-theme a:hover .theme-name, +.theme-browser .theme.add-new-theme a:focus .theme-name { color: #fff; z-index: 2; } -/* - * The search form - */ -.themes-php .theme-search { - position: relative; - top: -2px; - left: 20px; - font-size: 16px; - font-weight: 300; - line-height: 1.5; - width: 280px; -} - /** * Theme Overlay * Shown when clicking a theme @@ -426,11 +406,7 @@ bottom: 0; background: #f1f1f1; background: rgba( 238, 238, 238, 0.9 ); - z-index: 10; -} - -body.theme-overlay-open { - overflow: hidden; + z-index: 10000; /* Over WP Pointers. */ } .theme-overlay .theme-header { @@ -442,6 +418,10 @@ body.theme-overlay-open { border-bottom: 1px solid #ddd; } +.theme-overlay .theme-header button { + padding: 0; +} + .theme-overlay .theme-header .close { cursor: pointer; height: 48px; @@ -451,18 +431,15 @@ body.theme-overlay-open { border: 0; border-left: 1px solid #ddd; background-color: transparent; -} - -.theme-overlay .theme-header .close:hover:before, -.theme-overlay .theme-header .close:focus:before { - color: #fff; + -webkit-transition: color .1s ease-in-out, background .1s ease-in-out; + transition: color .1s ease-in-out, background .1s ease-in-out; } .theme-overlay .theme-header .close:before { - font: normal 30px/50px 'dashicons' !important; - color: #777; + font: normal 22px/50px dashicons !important; + color: #72777c; display: inline-block; - content: '\f335'; + content: "\f335"; font-weight: 300; } @@ -470,7 +447,7 @@ body.theme-overlay-open { .theme-overlay .theme-header .right, .theme-overlay .theme-header .left { cursor: pointer; - color: #777; + color: #72777c; background-color: transparent; height: 48px; width: 54px; @@ -478,16 +455,32 @@ body.theme-overlay-open { text-align: center; border: 0; border-right: 1px solid #ddd; + -webkit-transition: color .1s ease-in-out, background .1s ease-in-out; + transition: color .1s ease-in-out, background .1s ease-in-out; } +.theme-overlay .theme-header .close:focus, .theme-overlay .theme-header .close:hover, +.theme-overlay .theme-header .right:focus, .theme-overlay .theme-header .right:hover, -.theme-overlay .theme-header .left:hover, +.theme-overlay .theme-header .left:focus, +.theme-overlay .theme-header .left:hover { + background: #ddd; + border-color: #ccc; + color: #000; +} + +.theme-overlay .theme-header .close:focus:before, +.theme-overlay .theme-header .close:hover:before { + color: #000; +} + .theme-overlay .theme-header .close:focus, .theme-overlay .theme-header .right:focus, .theme-overlay .theme-header .left:focus { - background: #0074a2; - color: #fff; + -webkit-box-shadow: none; + box-shadow: none; + outline: none; } .theme-overlay .theme-header .left.disabled, @@ -501,25 +494,17 @@ body.theme-overlay-open { .theme-overlay .theme-header .right:before, .theme-overlay .theme-header .left:before { - font: normal 20px/50px 'dashicons' !important; + font: normal 20px/50px dashicons !important; display: inline; font-weight: 300; } .theme-overlay .theme-header .left:before { - content: '\f340'; + content: "\f341"; } .theme-overlay .theme-header .right:before { - content: '\f344'; -} - -.rtl .theme-overlay .theme-header .left:before { - content: '\f345'; -} - -.rtl .theme-overlay .theme-header .right:before { - content: '\f341'; + content: "\f345"; } .theme-overlay .theme-wrap { @@ -532,18 +517,11 @@ body.theme-overlay-open { background: #fff; -webkit-box-shadow: 0 1px 20px 5px rgba(0, 0, 0, 0.1); box-shadow: 0 1px 20px 5px rgba(0, 0, 0, 0.1); - z-index: 20; + z-index: 10000; /* Over WP Pointers. */ -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; -} - -.theme-overlay .theme-wrap:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; + -webkit-overflow-scrolling: touch; } body.folded .theme-overlay .theme-wrap { @@ -559,13 +537,6 @@ body.folded .theme-overlay .theme-wrap { overflow: auto; padding: 2% 4%; } -.theme-overlay .theme-about:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} .theme-overlay .theme-actions { position: absolute; @@ -591,11 +562,15 @@ body.folded .theme-overlay .theme-wrap { margin-bottom: 5px; } +/* Hide-if-customize for items we can't add classes to */ +.customize-support .theme-overlay .theme-actions a[href="themes.php?page=custom-header"], +.customize-support .theme-overlay .theme-actions a[href="themes.php?page=custom-background"] { + display: none; +} + +.broken-themes a.delete-theme, .theme-overlay .theme-actions .delete-theme { color: #a00; - position: absolute; - right: 10px; - bottom: 5px; text-decoration: none; border-color: transparent; -webkit-box-shadow: none; @@ -603,6 +578,14 @@ body.folded .theme-overlay .theme-wrap { background: transparent; } +.theme-overlay .theme-actions .delete-theme { + position: absolute; + right: 10px; + bottom: 5px; +} + +.broken-themes a.delete-theme:hover, +.broken-themes a.delete-theme:focus, .theme-overlay .theme-actions .delete-theme:hover, .theme-overlay .theme-actions .delete-theme:focus { background: #d54e21; @@ -644,7 +627,7 @@ body.folded .theme-overlay .theme-wrap { } .theme-overlay .screenshot:after { - content: ''; + content: ""; display: block; padding-top: 75%; /* using a 4/3 aspect ratio */ } @@ -679,7 +662,7 @@ body.folded .theme-overlay .theme-wrap { } .theme-overlay .screenshot.thumb:after { - content: ''; + content: ""; display: block; padding-top: 100%; /* using a 1/1 aspect ratio */ } @@ -696,7 +679,7 @@ body.folded .theme-overlay .theme-wrap { .theme-overlay .screenshot.selected { background: transparent; - border: 2px solid #2ea2cc; + border: 2px solid #00a0d2; } .theme-overlay .screenshot.selected img { @@ -718,7 +701,7 @@ body.folded .theme-overlay .theme-wrap { } .theme-overlay .current-label { - background: #333; + background: #32373c; color: #fff; font-size: 11px; display: inline-block; @@ -733,7 +716,7 @@ body.folded .theme-overlay .theme-wrap { } .theme-overlay .theme-name { - color: #222; + color: #23282d; font-size: 32px; font-weight: 100; margin: 10px 0 0; @@ -741,23 +724,20 @@ body.folded .theme-overlay .theme-wrap { } .theme-overlay .theme-version { - color: #999; + color: #72777c; font-size: 13px; font-weight: 400; float: none; display: inline-block; margin-left: 10px; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; } .theme-overlay .theme-author { - color: #686868; + margin: 15px 0 25px; + color: #72777c; font-size: 16px; font-weight: 400; - margin: 15px 0 25px; + line-height: inherit; } .theme-overlay .theme-author a { @@ -774,7 +754,7 @@ body.folded .theme-overlay .theme-wrap { .theme-overlay .theme-tags { border-top: 3px solid #eee; - color: #888; + color: #82878c; font-size: 13px; font-weight: 400; margin: 30px 0 0 0; @@ -787,28 +767,10 @@ body.folded .theme-overlay .theme-wrap { margin-right: 5px; } -/* Theme Updates info */ -.theme-overlay .theme-update-message { - background: #fef7f1; - border: 1px solid #eee; - border-left: 4px solid #d54e21; - -webkit-border-radius: 3px; - border-radius: 3px; - padding: 5px 20px 10px; -} - -.theme-overlay .theme-update { - color: #222; - font-size: 18px; - display: inline-block; - line-height: 40px; - margin: 0; -} - .theme-overlay .parent-theme { background: #f7fcfe; border: 1px solid #eee; - border-left: 4px solid #2ea2cc; + border-left: 4px solid #00a0d2; font-size: 14px; font-weight: normal; margin-top: 30px; @@ -837,6 +799,7 @@ body.folded .theme-overlay .theme-wrap { right: auto; top: auto; bottom: auto; + z-index: 10; } .single-theme .theme-overlay .theme-about { @@ -927,7 +890,7 @@ body.folded .theme-overlay .theme-wrap { left: 0; padding: 70px 20px 20px; border: none; - z-index: 500; /* should overlap #wpadminbar, which is 500 on mobile. */ + z-index: 100000; /* should overlap #wpadminbar. */ position: fixed; } @@ -1021,11 +984,7 @@ body.folded .theme-overlay .theme-wrap { font-size: 13px; } - .themes-php .wrap h2 { - width: 100%; - } - - .themes-php .theme-search { + .themes-php .wp-filter-search { float: none; clear: both; left: 0; @@ -1033,10 +992,11 @@ body.folded .theme-overlay .theme-wrap { right: 0; margin: 10px 0; width: 100%; + max-width: 280px; } .theme-browser .theme.add-new-theme span:after { - font: normal 60px/90px 'dashicons'; + font: normal 60px/90px dashicons; width: 80px; height: 80px; top: 30%; @@ -1079,30 +1039,19 @@ body.folded .theme-overlay .theme-wrap { /* Already installed theme */ .theme-browser .theme .theme-installed { - background: #0074a2; + background: #0073aa; } .theme-browser .theme .theme-installed:before { - content: '\f147'; + content: "\f147"; } .theme-browser .theme.is-installed .theme-actions .button-primary { display: none !important; } -.theme-navigation { - background: #fff; - -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,.1); - box-shadow: 0 1px 1px 0 rgba(0,0,0,.1); - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - color: #555; - display: inline-block; - font-size: 13px; - margin: 20px 0 30px; +.theme-install-php .wp-filter { padding: 0 20px; - position: relative; - width: 100%; } + .theme-install-php a.upload, .theme-install-php a.browse-themes { cursor: pointer; @@ -1114,250 +1063,69 @@ body.folded .theme-overlay .theme-wrap { .theme-install-php.show-upload-theme a.browse-themes { display: inline; } -.upload-theme { +.upload-theme, +.upload-plugin { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; display: none; - margin: 0px 0 0; + margin: 0; padding: 0; width: 100%; overflow: hidden; position: relative; top: 10px; } -body.show-upload-theme .upload-theme { +body.show-upload-theme .upload-theme, +.upload-plugin { display: block; } -.upload-theme .wp-upload-form { +.upload-theme .wp-upload-form, +.upload-plugin .wp-upload-form { background: #fafafa; border: 1px solid #e5e5e5; padding: 30px; margin: 30px auto; max-width: 380px; } -.upload-theme .install-help { - color: #999; +.upload-theme .install-help, +.upload-plugin .install-help { + color: #555d66; /* #f1f1f1 background */ font-size: 18px; font-style: normal; margin: 0; padding: 40px 0 0; text-align: center; } -body.show-upload-theme .upload-theme + .theme-navigation, -body.show-upload-theme .upload-theme + .theme-navigation + .theme-browser { +body.show-upload-theme .upload-theme + .wp-filter, +body.show-upload-theme .upload-theme + .wp-filter + .theme-browser { display: none; } -.theme-navigation .theme-count { - margin-left: 0; - position: absolute; - top: 12px; -} -.theme-count + .theme-section { - margin-left: 60px; -} -.theme-section, -.theme-filter { - border-bottom: 4px solid #fff; - color: #666; - cursor: pointer; - display: inline-block; - margin: 0 10px; - padding: 15px 0; -} -.theme-section.current, -.theme-filter.current { - border-bottom: 4px solid #666; - color: #222; -} -.theme-top-filters { - display: inline-block; -} -.theme-navigation .more-filters { - color: #666; - cursor: pointer; - display: inline-block; - margin: 0 10px; - padding: 4px 6px; -} -body.more-filters-opened .more-filters, -body.more-filters-opened .more-filters:before { - background: #777; - -webkit-border-radius: 2px; - border-radius: 2px; - border: none; - color: #fff; -} -body.more-filters-opened .more-filters:hover, -body.more-filters-opened .more-filters:focus, -body.more-filters-opened .more-filters:hover:before, -body.more-filters-opened .more-filters:focus:before { - background: rgb(46, 162, 204); -} - -.theme-install-php .theme-search { - position: absolute; - right: 10px; - top: 9px; - font-size: 16px; - font-weight: 300; - line-height: 1.5; - width: 280px; -} -.more-filters:before { - color: #777; - text-align: center; - margin: 0 5px 0 0; - content: "\f111"; - display: inline-block; - width: 16px; - height: 16px; - -webkit-font-smoothing: antialiased; - font-size: 16px; - line-height: 1; - font-family: "dashicons"; - text-decoration: inherit; - font-weight: normal; - font-style: normal; - vertical-align: top; - -webkit-transition: color .1s ease-in 0; - transition: color .1s ease-in 0; - text-align: center; -} -.more-filters.current:before { - color: #fff; -} -.more-filters-container { - display: none; - padding: 20px; - border-top: 1px solid #eee; - margin: 0 -20px; - background: #fafafa; -} -body.more-filters-opened .more-filters-container { - display: block; - overflow: hidden; -} -body.more-filters-opened .theme-section.current { - border-bottom: none; -} -body.more-filters-opened .theme-browser, -body.more-filters-opened.filters-applied.loading-themes .theme-browser { - display: none; -} -body.more-filters-opened.filters-applied .theme-browser { - display: block; -} -.more-filters-container .filters-group { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - float: left; - width: 19%; - background: #fff; - margin: 0 1% 0 0; - border: 1px solid #e5e5e5; - -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04); - box-shadow: 0 1px 1px rgba(0,0,0,0.04); - padding: 10px; -} -.more-filters-container .wide-filters-group { - width: 38%; -} -.more-filters-container .feature-name { - margin: 0; - position: relative; -} -.more-filters-container ol { - list-style-type: none; - margin: 20px 0 0; - font-size: 12px; -} -.more-filters-container li { - display: inline-block; - vertical-align: top; - list-style-type: none; - margin: 5px 0; - padding-right: 25px; - width: 160px; -} -.theme-navigation .more-filters-container .apply-filters { - margin: 0 0 20px; -} -.theme-navigation .more-filters-container .clear-filters { - display: none; - margin: 0 0 20px 10px; -} -.more-filters-container .apply-filters span { - display: inline-block; - font-size: 12px; - text-indent: 10px; - opacity: 0.8; -} -.more-filters-container .filtering-by { - display: none; - margin: 0; -} -.more-filters-container .filtering-by > span { - font-weight: 600; -} -.more-filters-container .filtering-by .tags { - display: inline; -} -.more-filters-container .filtering-by .tag { - background: #fff; - border: 1px solid #e5e5e5; - -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04); - box-shadow: 0 1px 1px rgba(0,0,0,0.04); - font-size: 11px; - margin: 0 5px; - padding: 4px 8px; -} -.more-filters-container .filtering-by a { - margin-left: 10px; -} -body.filters-applied .more-filters-container .filters-group, -body.filters-applied .more-filters-container a.button, -body.filters-applied .more-filters-container br { - display: none !important; -} -body.filters-applied .more-filters-container .filtering-by { - display: block; -} -body.filters-applied .more-filters-container { - padding: 20px; -} p.no-themes { - color: #999; + clear: both; + color: #666; font-size: 18px; font-style: normal; margin: 0; - padding: 0; + padding: 100px 0; text-align: center; display: none; } + body.no-results p.no-themes { display: block; } + body.show-upload-theme p.no-themes { display: none !important; } - .theme-install-php .add-new-theme { display: none !important; } @media only screen and (max-width: 1120px) { - .theme-install-php .theme-search { - margin: 20px 0; - position: static; - width: 100%; - } - .more-filters-container { - border-bottom: 1px solid #eee; - } .upload-theme .wp-upload-form { margin: 20px 0; max-width: 100%; @@ -1367,94 +1135,25 @@ body.show-upload-theme p.no-themes { padding: 20px 0 0; text-align: left; } - .more-filters-container .filters-group { - margin-bottom: 0; - margin-top: 5px; - width: 100%; - } - .more-filters-container .filters-group li { - margin: 10px 0; - } } -@media only screen and (max-width: 782px) { - .more-filters-container .filters-group { - width: 100%; - } - .more-filters-container .filters-group li { - width: 100%; - } +.theme-details .theme-rating { + line-height: 23px; } -.rating { - margin: 30px 0; -} -.rating span:before { - color: #e6b800; - content: "\f154"; - display: inline-block; - -webkit-font-smoothing: antialiased; - font: normal 20px/1 'dashicons'; - vertical-align: top; -} -/* Half stars */ -.rating-10 span.one:before, -.rating-30 span.two:before, -.rating-50 span.three:before, -.rating-70 span.four:before, -.rating-90 span.five:before { - content: "\f459"; -} -/* Full stars */ -.rating-20 span.one:before { - content: "\f155"; -} -.rating-30 span.one:before, -.rating-40 span.one:before, -.rating-40 span.two:before { - content: "\f155"; -} -.rating-50 span.one:before, -.rating-50 span.two:before, -.rating-60 span.one:before, -.rating-60 span.two:before, -.rating-60 span.three:before { - content: "\f155"; -} -.rating-70 span.one:before, -.rating-70 span.two:before, -.rating-70 span.three:before, -.rating-80 span.one:before, -.rating-80 span.two:before, -.rating-80 span.three:before, -.rating-80 span.four:before { - content: "\f155"; -} -.rating-90 span.one:before, -.rating-90 span.two:before, -.rating-90 span.three:before, -.rating-90 span.four:before, -.rating-100 span.one:before, -.rating-100 span.two:before, -.rating-100 span.three:before, -.rating-100 span.four:before, -.rating-100 span.five:before { - content: "\f155"; -} -.rating .ratings { +.theme-details .star-rating { display: inline; - margin-left: 10px; - line-height: 20px; - color: #999; } -.loading-themes .theme-browser, -.error .theme-browser { - display: none; + +.theme-details .num-ratings, +.theme-details .no-rating { + font-size: 11px; + color: #72777c; } -.loading-themes .spinner { + +.theme-details .no-rating { display: block; - margin: 40px auto 0; - float: none; + line-height: 20px; } /*------------------------------------------------------------------------------ @@ -1462,7 +1161,7 @@ body.show-upload-theme p.no-themes { ------------------------------------------------------------------------------*/ .appearance_page_custom-header #headimg { - border: 1px solid #DFDFDF; + border: 1px solid #ddd; overflow: hidden; width: 100%; } @@ -1498,7 +1197,7 @@ body.show-upload-theme p.no-themes { div#custom-background-image { min-height: 100px; - border: 1px solid #dfdfdf; + border: 1px solid #ddd; } div#custom-background-image img { @@ -1540,7 +1239,6 @@ body.full-overlay-active { padding: 0; margin: 0; z-index: 10; - overflow: auto; background: #eee; border-right: none; } @@ -1563,7 +1261,7 @@ body.full-overlay-active { } .wp-full-overlay-sidebar:after { - content: ''; + content: ""; display: block; position: absolute; top: 0; @@ -1617,70 +1315,152 @@ body.full-overlay-active { overflow: auto; } -/* Close Link */ -.wp-full-overlay .close-full-overlay { +/* Close & Navigation Links */ +.theme-install-overlay .wp-full-overlay-sidebar .wp-full-overlay-header { + padding: 0; +} + +.theme-install-overlay .close-full-overlay, +.theme-install-overlay .previous-theme, +.theme-install-overlay .next-theme { + display: block; + position: relative; + float: left; + width: 45px; + height: 45px; + padding-right: 2px; + background: #eee; + border-right: 1px solid #ddd; + color: #444; + cursor: pointer; text-decoration: none; + -webkit-transition: color .1s ease-in-out, background .1s ease-in-out; + transition: color .1s ease-in-out, background .1s ease-in-out; +} + +.theme-install-overlay .close-full-overlay:hover, +.theme-install-overlay .close-full-overlay:focus, +.theme-install-overlay .previous-theme:hover, +.theme-install-overlay .previous-theme:focus, +.theme-install-overlay .next-theme:hover, +.theme-install-overlay .next-theme:focus { + background: #ddd; + border-color: #ccc; + color: #000; + outline: none; + -webkit-box-shadow: none; + box-shadow: none; +} + +.theme-install-overlay .close-full-overlay:before { + font: normal 22px/1 dashicons; + content: "\f335"; + position: relative; + top: 7px; + left: 13px; +} + +.theme-install-overlay .previous-theme:before { + font: normal 20px/1 dashicons; + content: "\f341"; + position: relative; + top: 6px; + left: 14px; +} + +.theme-install-overlay .next-theme:before { + font: normal 20px/1 dashicons; + content: "\f345"; + position: relative; + top: 6px; + left: 13px; +} + +.theme-install-overlay .previous-theme.disabled, +.theme-install-overlay .next-theme.disabled, +.theme-install-overlay .previous-theme.disabled:hover, +.theme-install-overlay .previous-theme.disabled:focus, +.theme-install-overlay .next-theme.disabled:hover, +.theme-install-overlay .next-theme.disabled:focus { + color: #b4b9be; + background: #eee; + cursor: default; + pointer-events: none; } /* Collapse Button */ -.wp-full-overlay a.collapse-sidebar { - position: absolute; - bottom: 12px; - left: 0; - z-index: 50; - display: block; - width: 19px; - height: 19px; - margin-left: 15px; +.wp-core-ui .wp-full-overlay .collapse-sidebar { + position: fixed; + bottom: 8px; + left: 10px; padding: 0; + color: #656a6f; + outline: 0; + line-height: 1; + background-color: transparent !important; + border: none !important; + -webkit-box-shadow: none !important; + box-shadow: none !important; + -webkit-border-radius: 0 !important; + border-radius: 0 !important; +} + +.wp-core-ui .wp-full-overlay .collapse-sidebar:hover, +.wp-core-ui .wp-full-overlay .collapse-sidebar:focus { + color: #0073aa; +} + +.wp-full-overlay .collapse-sidebar-arrow, +.wp-full-overlay .collapse-sidebar-label { + display: inline-block; + vertical-align: middle; + line-height: 20px; +} + +.wp-full-overlay .collapse-sidebar-arrow { + width: 20px; + height: 20px; + margin: 0 2px; /* avoid the focus box-shadow to be cut-off */ -webkit-border-radius: 50%; border-radius: 50%; - color: #777; - text-decoration: none; + overflow: hidden; } -.wp-full-overlay a.collapse-sidebar:hover { - color: #0074a2; +.wp-full-overlay .collapse-sidebar:hover .collapse-sidebar-arrow, +.wp-full-overlay .collapse-sidebar:focus .collapse-sidebar-arrow { + -webkit-box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); + box-shadow: + 0 0 0 1px #5b9dd9, + 0 0 2px 1px rgba(30, 140, 190, .8); } -.wp-full-overlay.collapsed .collapse-sidebar { - position: absolute; - left: 100%; +.wp-full-overlay .collapse-sidebar-label { + margin-left: 3px; } -.wp-full-overlay .collapse-sidebar-arrow { - position: static; - margin-top: 0; - margin-left: 0; - display: block; - width: auto; - height: auto; - background: none; +.wp-full-overlay.collapsed .collapse-sidebar-label { + display: none; } .wp-full-overlay .collapse-sidebar-arrow:before { - -webkit-border-radius: 50%; - border-radius: 50%; - float: left; + display: block; content: "\f148"; background: #eee; - font: normal 20px/1 'dashicons'; + font: normal 20px/1 dashicons; speak: none; - display: block; padding: 0; - text-indent: 0; - text-align: center; - position: relative; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - text-decoration: none !important; } +/* rtl:ignore */ .wp-full-overlay.collapsed .collapse-sidebar-arrow:before, .rtl .wp-full-overlay .collapse-sidebar-arrow:before { - -webkit-transform: rotate(180deg); - -ms-transform: rotate(180deg); - transform: rotate(180deg); + -webkit-transform: rotate(180.001deg); + -ms-transform: rotate(180.001deg); + transform: rotate(180.001deg); /* Firefox: promoting to its own layer to trigger anti-aliasing */ } .rtl .wp-full-overlay.collapsed .collapse-sidebar-arrow:before { @@ -1689,45 +1469,132 @@ body.full-overlay-active { transform: none; } -.wp-full-overlay.collapsed .collapse-sidebar-arrow { - background-position: -1px -109px; +/* Animations */ +.wp-full-overlay, +.wp-full-overlay-sidebar, +.wp-full-overlay .collapse-sidebar, +.wp-full-overlay-main { + -webkit-transition-property: left, right, top, bottom, width, margin; + transition-property: left, right, top, bottom, width, margin; + -webkit-transition-duration: 0.2s; + transition-duration: 0.2s; } -.wp-full-overlay .collapse-sidebar-label { - position: absolute; - left: 100%; - line-height: 20px; - margin-left: 10px; +/* Device/preview size toggles */ + +.wp-full-overlay { + background: #191e23; } -.wp-full-overlay.collapsed .collapse-sidebar-label { - display: none; +.wp-full-overlay-main { + background-color: #f1f1f1; } -.wp-full-overlay .theme-navigation { - padding: 10px 20px; - position: absolute; - bottom: 10px; - text-align: left; +.expanded .wp-full-overlay-footer { + position: fixed; + bottom: 0; + left: 0; + width: 300px; + height: 45px; + border-top: 1px solid #ddd; } -.wp-full-overlay .theme-navigation .next-theme { + +.wp-full-overlay-footer .devices { float: right; } -.wp-full-overlay.no-navigation .theme-navigation { + +.wp-full-overlay-footer .devices button { + cursor: pointer; + background: transparent; + border: none; + height: 45px; + padding: 0 3px; + margin: 0 0 0 -4px; + -webkit-box-shadow: none; + box-shadow: none; + border-top: 1px solid transparent; + border-bottom: 4px solid transparent; + -webkit-transition: background .1s ease-in-out; + transition: background .1s ease-in-out; +} + +.wp-full-overlay-footer .devices button:focus { + -webkit-box-shadow: none; + box-shadow: none; + outline: none; +} + +.wp-full-overlay-footer .devices button:before { + display: inline-block; + -webkit-font-smoothing: antialiased; + font: normal 20px/30px "dashicons"; + vertical-align: top; + margin: 3px 0; + padding: 4px 8px; + color: #656a6f; +} + +.wp-full-overlay-footer .devices button.active { + border-bottom-color: #191e23; +} + +.wp-full-overlay-footer .devices button:hover, +.wp-full-overlay-footer .devices button:focus { + background-color: #fff; +} + +.wp-full-overlay-footer .devices button:focus { + background-color: #fff; + border-bottom-color: #0073aa; +} + +.wp-full-overlay-footer .devices button.active:before, +.wp-full-overlay-footer .devices button:hover:before, +.wp-full-overlay-footer .devices button:focus:before { + color: #191e23; +} + +.wp-full-overlay-footer .devices .preview-desktop:before { + content: "\f472"; +} + +.wp-full-overlay-footer .devices .preview-tablet:before { + content: "\f471"; +} + +.wp-full-overlay-footer .devices .preview-mobile:before { + content: "\f470"; +} + +@media screen and (max-width:1024px) { + .wp-full-overlay-footer .devices { + display: none; + } +} + +.collapsed .wp-full-overlay-footer .devices button:before { display: none; } -/* Animations */ -.wp-full-overlay, -.wp-full-overlay-sidebar, -.wp-full-overlay .collapse-sidebar, -.wp-full-overlay-main { - -webkit-transition-property: left, right, top, bottom, width, margin; - transition-property: left, right, top, bottom, width, margin; - -webkit-transition-duration: 0.2s; - transition-duration: 0.2s; +.preview-mobile .wp-full-overlay-main { + margin: auto 0 auto -160px; + width: 320px; + height: 480px; + max-height: 100%; + max-width: 100%; + left: 50%; +} + +.preview-tablet .wp-full-overlay-main { + margin: auto 0 auto -360px; + width: 720px; /* Size is loosely based on a typical "tablet" device size. Intentionally ambiguous - this does not represent any particular device precisely. */ + height: 1080px; + max-height: 100%; + max-width: 100%; + left: 50%; } + /*------------------------------------------------------------------------------ 24.0 - Customize Loader ------------------------------------------------------------------------------*/ @@ -1762,12 +1629,6 @@ body.full-overlay-active { opacity: 0; } -.customize-loading #customize-container { - background: #fff url(../images/spinner.gif) no-repeat fixed center center; - -webkit-background-size: 20px 20px; - background-size: 20px 20px; -} - #customize-container iframe, .theme-install-overlay iframe { height: 100%; @@ -1777,10 +1638,6 @@ body.full-overlay-active { transition: opacity 0.3s; } -#customize-container .collapse-sidebar { - bottom: 16px; -} - #customize-controls { margin-top: 0; } @@ -1819,7 +1676,7 @@ body.full-overlay-active { } .install-theme-info .theme-screenshot { - margin-top: 15px; + margin: 15px 0; width: 258px; border: 1px solid #ccc; } @@ -1830,42 +1687,67 @@ body.full-overlay-active { .theme-details .theme-version { margin: 15px 0; - float: left; -} - -.theme-details .star-rating { - margin: 7px 0; - float: right; } .theme-details .theme-description { float: left; - color: #777; + color: #72777c; line-height: 20px; max-width: 100%; } -.theme-install-overlay .wp-full-overlay-header { - margin-top: 9px; -} - .theme-install-overlay .wp-full-overlay-header .theme-install { float: right; + margin: 8px 10px 0 0; /* For when .theme-install is a span rather than a.button-primary (already installed theme) */ line-height: 26px; } .theme-install-overlay .wp-full-overlay-sidebar { - background: #EEE; - border-right: 1px solid #DDD; + background: #eee; + border-right: 1px solid #ddd; +} + +.theme-install-overlay .wp-full-overlay-sidebar-content { + background: #fff; + border-top: 1px solid #ddd; + border-bottom: 1px solid #ddd; } .theme-install-overlay .wp-full-overlay-main { - background: #fff url(../images/spinner.gif) no-repeat center center; + position: absolute; + z-index: 0; + background-color: #f1f1f1; +} + +.customize-loading #customize-container { + background-color: #f1f1f1; +} + +#customize-preview.wp-full-overlay-main:before, +.customize-loading #customize-container:before, +.theme-install-overlay .wp-full-overlay-main:before { + content: ""; + display: block; + width: 20px; + height: 20px; + position: absolute; + left: 50%; + top: 50%; + z-index: -1; + margin: -10px 0 0 -10px; + -webkit-transform: translateZ(0); + transform: translateZ(0); + background: transparent url(../images/spinner.gif) no-repeat center center; -webkit-background-size: 20px 20px; background-size: 20px 20px; } +#customize-preview.wp-full-overlay-main.iframe-ready:before, +.theme-install-overlay.iframe-ready .wp-full-overlay-main:before { + background-image: none; +} + /* =Media Queries -------------------------------------------------------------- */ @@ -1873,7 +1755,6 @@ body.full-overlay-active { * HiDPI Displays */ @media print, - (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 120dpi) { .wp-full-overlay .collapse-sidebar-arrow { @@ -1882,8 +1763,9 @@ body.full-overlay-active { background-size: 15px 123px; } - .customize-loading #customize-container, - .theme-install-overlay .wp-full-overlay-main { + #customize-preview.wp-full-overlay-main:before, + .customize-loading #customize-container:before, + .theme-install-overlay .wp-full-overlay-main:before { background-image: url(../images/spinner-2x.gif); } } @@ -1899,4 +1781,13 @@ body.full-overlay-active { .available-theme .action-links .delete-theme a { padding: 0; } + + .broken-themes table { + width: 100%; + } + + .theme-install-overlay .wp-full-overlay-header .theme-install { + margin-top: 6px; + line-height: normal; + } } diff --git a/wp-admin/css/themes.min.css b/wp-admin/css/themes.min.css new file mode 100644 index 0000000..36ed560 --- /dev/null +++ b/wp-admin/css/themes.min.css @@ -0,0 +1 @@ +.theme-browser .themes{clear:both}.themes-php .wrap h1{float:left;margin-bottom:15px}.network-admin.themes-php .wrap h1{margin-bottom:0}.themes-php .wrap h1 .button{margin-left:20px}.themes-php .wp-filter-search{position:relative;top:-2px;left:20px;margin:0;width:280px;font-size:16px;font-weight:300;line-height:1.5}.themes-php div.error,.themes-php div.notice,.themes-php div.updated{margin:0 0 20px;clear:both}.theme-browser .theme{cursor:pointer;float:left;margin:0 4% 4% 0;position:relative;width:30.6%;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px -1px rgba(0,0,0,.1);box-shadow:0 1px 1px -1px rgba(0,0,0,.1);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.ie8 .theme-browser .theme{width:30%;margin:0 3% 4% 0}.theme-browser .theme:nth-child(3n){margin-right:0}.theme-browser .theme:focus,.theme-browser .theme:hover{cursor:pointer}.theme-browser .theme .theme-name{font-size:15px;font-weight:600;height:18px;margin:0;padding:15px;-webkit-box-shadow:inset 0 1px 0 rgba(0,0,0,.1);box-shadow:inset 0 1px 0 rgba(0,0,0,.1);overflow:hidden;white-space:nowrap;text-overflow:ellipsis;background:#fff;background:rgba(255,255,255,.65)}.theme-browser .theme .theme-actions{-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";opacity:0;-webkit-transition:opacity .1s ease-in-out;transition:opacity .1s ease-in-out;position:absolute;bottom:0;right:0;height:38px;padding:9px 10px 0;background:rgba(244,244,244,.7);border-left:1px solid rgba(0,0,0,.05)}.theme-browser .theme.focus .theme-actions,.theme-browser .theme:focus .theme-actions,.theme-browser .theme:hover .theme-actions{-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";opacity:1}.theme-browser .theme .theme-actions .button-primary{margin-right:3px}.theme-browser .theme .theme-actions .button-secondary{float:none;margin-left:3px}.theme-browser .theme .theme-screenshot{display:block;overflow:hidden;position:relative;-webkit-backface-visibility:hidden;-webkit-transition:opacity .2s ease-in-out;transition:opacity .2s ease-in-out}.theme-browser .theme .theme-screenshot:after{content:"";display:block;padding-top:66.66666%}.theme-browser .theme .theme-screenshot img{height:auto;position:absolute;left:0;top:0;width:100%;-webkit-transition:opacity .2s ease-in-out;transition:opacity .2s ease-in-out}.theme-browser .theme:focus .theme-screenshot,.theme-browser .theme:hover .theme-screenshot{background:#fff}.theme-browser.rendered .theme:focus .theme-screenshot img,.theme-browser.rendered .theme:hover .theme-screenshot img{opacity:.4}.theme-browser .theme .more-details{-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";opacity:0;position:absolute;top:35%;right:25%;left:25%;background:#23282d;background:rgba(0,0,0,.7);color:#fff;font-size:15px;text-shadow:0 1px 0 rgba(0,0,0,.6);-webkit-font-smoothing:antialiased;font-weight:600;padding:15px 12px;text-align:center;-webkit-border-radius:3px;border-radius:3px;-webkit-transition:opacity .1s ease-in-out;transition:opacity .1s ease-in-out}.theme-browser .theme:focus{border-color:#5b9dd9;-webkit-box-shadow:0 0 2px rgba(30,140,190,.8);box-shadow:0 0 2px rgba(30,140,190,.8)}.theme-browser .theme:focus .more-details{opacity:1}.theme-browser .theme.active:focus .theme-actions{display:block}.theme-browser.rendered .theme:focus .more-details,.theme-browser.rendered .theme:hover .more-details{-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";opacity:1}.theme-browser .theme .theme-installed,.theme-browser .theme .theme-update{background:#d54e21;background:rgba(213,78,33,.95);color:#fff;display:block;font-size:13px;font-weight:400;height:48px;line-height:48px;padding:0 10px;position:absolute;top:0;right:0;left:0;border-bottom:1px solid rgba(0,0,0,.25);overflow:hidden}.theme-browser .theme .theme-installed:before,.theme-browser .theme .theme-update:before{content:"\f463";display:inline-block;font:400 20px/1 dashicons;margin:0 6px 0 0;opacity:.8;position:relative;top:5px;speak:none;-webkit-font-smoothing:antialiased}.theme-browser .theme.active .theme-name{background:#23282d;color:#fff;padding-right:110px;font-weight:300;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.5);box-shadow:inset 0 1px 1px rgba(0,0,0,.5)}.theme-browser .customize-control .theme.active .theme-name{padding-right:15px}.theme-browser .theme.active .theme-name span{font-weight:600}.theme-browser .theme.active .theme-actions{background:rgba(49,49,49,.7);border-left:none;opacity:1}.theme-browser .theme.active .theme-actions .button-primary{margin-right:0}.theme-browser .theme .theme-author{background:#23282d;color:#eee;display:none;font-size:14px;margin:0 10px;padding:5px 10px;position:absolute;bottom:56px}.theme-browser .theme.display-author .theme-author{display:block}.theme-browser .theme.display-author .theme-author a{color:inherit;text-decoration:none}.theme-browser .theme.add-new-theme{border:none;-webkit-box-shadow:none;box-shadow:none}.theme-browser .theme.add-new-theme a{text-decoration:none;display:block;position:relative;z-index:1}.theme-browser .theme.add-new-theme a:after{display:block;content:"";background:0 0;background:rgba(0,0,0,0);position:absolute;top:0;left:0;right:0;bottom:0;padding:0;text-shadow:none;border:5px dashed #d5d2ca;border:5px dashed rgba(0,0,0,.1);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.theme-overlay .theme-actions,.theme-overlay .theme-wrap{-webkit-box-sizing:border-box;-moz-box-sizing:border-box}.theme-browser .theme.add-new-theme span:after{background:#e5e5e5;background:rgba(153,153,153,.1);-webkit-border-radius:50%;border-radius:50%;display:inline-block;content:"\f132";-webkit-font-smoothing:antialiased;font:400 74px/115px dashicons;width:100px;height:100px;vertical-align:middle;text-align:center;color:#999;position:absolute;top:30%;left:50%;margin-left:-50px;text-indent:-4px;padding:0;text-shadow:none;z-index:4}.rtl .theme-browser .theme.add-new-theme span:after{text-indent:4px}.theme-browser .theme.add-new-theme a:focus .theme-screenshot,.theme-browser .theme.add-new-theme a:hover .theme-screenshot{background:0 0}.theme-browser .theme.add-new-theme a:focus span:after,.theme-browser .theme.add-new-theme a:hover span:after{background:#fff;color:#0073aa}.theme-browser .theme.add-new-theme a:focus:after,.theme-browser .theme.add-new-theme a:hover:after{border-color:transparent;color:#fff;background:#0073aa;content:""}.theme-browser .theme.add-new-theme .theme-name{background:0 0;text-align:center;-webkit-box-shadow:none;box-shadow:none;font-weight:400;position:relative;top:0;margin-top:-18px;padding-top:0;padding-bottom:48px}.theme-browser .theme.add-new-theme a:focus .theme-name,.theme-browser .theme.add-new-theme a:hover .theme-name{color:#fff;z-index:2}.theme-overlay .theme-backdrop{position:absolute;left:-20px;right:0;top:0;bottom:0;background:#f1f1f1;background:rgba(238,238,238,.9);z-index:10000}.theme-overlay .theme-header{position:absolute;top:0;left:0;right:0;height:48px;border-bottom:1px solid #ddd}.theme-overlay .theme-header button{padding:0}.theme-overlay .theme-header .close{cursor:pointer;height:48px;width:50px;text-align:center;float:right;border:0;border-left:1px solid #ddd;background-color:transparent;-webkit-transition:color .1s ease-in-out,background .1s ease-in-out;transition:color .1s ease-in-out,background .1s ease-in-out}.theme-overlay .theme-header .close:before{font:400 22px/50px dashicons!important;color:#72777c;display:inline-block;content:"\f335";font-weight:300}.theme-overlay .theme-header .left,.theme-overlay .theme-header .right{cursor:pointer;color:#72777c;background-color:transparent;height:48px;width:54px;float:left;text-align:center;border:0;border-right:1px solid #ddd;-webkit-transition:color .1s ease-in-out,background .1s ease-in-out;transition:color .1s ease-in-out,background .1s ease-in-out}.theme-overlay .theme-header .close:focus,.theme-overlay .theme-header .close:hover,.theme-overlay .theme-header .left:focus,.theme-overlay .theme-header .left:hover,.theme-overlay .theme-header .right:focus,.theme-overlay .theme-header .right:hover{background:#ddd;border-color:#ccc;color:#000}.theme-overlay .theme-header .close:focus:before,.theme-overlay .theme-header .close:hover:before{color:#000}.theme-overlay .theme-header .close:focus,.theme-overlay .theme-header .left:focus,.theme-overlay .theme-header .right:focus{-webkit-box-shadow:none;box-shadow:none;outline:0}.theme-overlay .theme-header .left.disabled,.theme-overlay .theme-header .left.disabled:hover,.theme-overlay .theme-header .right.disabled,.theme-overlay .theme-header .right.disabled:hover{color:#ccc;background:inherit;cursor:inherit}.theme-overlay .theme-header .left:before,.theme-overlay .theme-header .right:before{font:400 20px/50px dashicons!important;display:inline;font-weight:300}.customize-support .theme-overlay .theme-actions a[href="themes.php?page=custom-header"],.customize-support .theme-overlay .theme-actions a[href="themes.php?page=custom-background"],.theme-overlay .theme-actions .active-theme,.theme-overlay.active .theme-actions .inactive-theme{display:none}.theme-overlay .theme-header .left:before{content:"\f341"}.theme-overlay .theme-header .right:before{content:"\f345"}.theme-overlay .theme-wrap{clear:both;position:fixed;top:9%;left:190px;right:30px;bottom:3%;background:#fff;-webkit-box-shadow:0 1px 20px 5px rgba(0,0,0,.1);box-shadow:0 1px 20px 5px rgba(0,0,0,.1);z-index:10000;box-sizing:border-box;-webkit-overflow-scrolling:touch}body.folded .theme-overlay .theme-wrap{left:70px}.theme-overlay .theme-about{position:absolute;top:49px;bottom:57px;left:0;right:0;overflow:auto;padding:2% 4%}.theme-overlay .theme-actions{position:absolute;text-align:center;bottom:0;left:0;right:0;padding:10px 25px 5px;background:#f3f3f3;z-index:30;box-sizing:border-box;border-top:1px solid #eee}.theme-overlay .screenshot,.upload-plugin,.upload-theme{-webkit-box-sizing:border-box;-moz-box-sizing:border-box}.ie8 .theme-overlay .theme-actions{border:1px solid #eee}.theme-overlay .theme-actions a{margin-right:5px;margin-bottom:5px}.broken-themes a.delete-theme,.theme-overlay .theme-actions .delete-theme{color:#a00;text-decoration:none;border-color:transparent;-webkit-box-shadow:none;box-shadow:none;background:0 0}.theme-overlay .theme-actions .delete-theme{position:absolute;right:10px;bottom:5px}.broken-themes a.delete-theme:focus,.broken-themes a.delete-theme:hover,.theme-overlay .theme-actions .delete-theme:focus,.theme-overlay .theme-actions .delete-theme:hover{background:#d54e21;color:#fff;border-color:#d54e21}.theme-overlay .theme-actions .inactive-theme,.theme-overlay.active .theme-actions .active-theme{display:block}.theme-overlay .theme-screenshots{float:left;margin:0 30px 0 0;width:55%;max-width:880px;text-align:center}.theme-overlay .screenshot{border:1px solid #fff;box-sizing:border-box;overflow:hidden;position:relative;-webkit-box-shadow:0 0 0 1px rgba(0,0,0,.2);box-shadow:0 0 0 1px rgba(0,0,0,.2)}.theme-overlay .screenshot:after{content:"";display:block;padding-top:75%}.theme-overlay .screenshot img{height:auto;position:absolute;left:0;top:0;width:100%}.theme-overlay.small-screenshot .theme-screenshots{position:absolute;width:302px}.theme-overlay.small-screenshot .theme-info{margin-left:350px;width:auto}.theme-overlay .screenshot.thumb{background:#ccc;border:1px solid #eee;float:none;display:inline-block;margin:10px 5px 0;width:140px;height:80px;cursor:pointer}.theme-overlay .screenshot.thumb:after{content:"";display:block;padding-top:100%}.theme-overlay .screenshot.thumb img{cursor:pointer;position:absolute;left:0;top:0;width:100%;height:auto}.theme-overlay .screenshot.selected{background:0 0;border:2px solid #00a0d2}.theme-overlay .screenshot.selected img{opacity:.8}.theme-browser .theme .theme-screenshot.blank,.theme-overlay .screenshot.blank{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAALElEQVQYGWO8d+/efwYkoKioiMRjYGBC4WHhUK6A8T8QIJt8//59ZC493AAAQssKpBK4F5AAAAAASUVORK5CYII=)}.theme-overlay .theme-info{width:40%;float:left}.theme-overlay .current-label{background:#32373c;color:#fff;font-size:11px;display:inline-block;padding:2px 8px;-webkit-border-radius:2px;border-radius:2px;margin:0 0 -10px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.theme-overlay .theme-name{color:#23282d;font-size:32px;font-weight:100;margin:10px 0 0;line-height:1.3}.theme-overlay .theme-version{color:#72777c;font-size:13px;font-weight:400;float:none;display:inline-block;margin-left:10px}.theme-overlay .theme-author{margin:15px 0 25px;color:#72777c;font-size:16px;font-weight:400;line-height:inherit}.theme-overlay .theme-author a{text-decoration:none}.theme-overlay .theme-description{color:#555;font-size:15px;font-weight:400;line-height:1.5;margin:30px 0 0}.theme-overlay .theme-tags{border-top:3px solid #eee;color:#82878c;font-size:13px;font-weight:400;margin:30px 0 0;padding-top:20px}.theme-overlay .theme-tags span{color:#444;font-weight:700;margin-right:5px}.theme-overlay .parent-theme{background:#f7fcfe;border:1px solid #eee;border-left:4px solid #00a0d2;font-size:14px;font-weight:400;margin-top:30px;padding:10px 10px 10px 20px}.theme-overlay .parent-theme strong{font-weight:700}.single-theme .theme,.single-theme .theme-overlay .theme-backdrop,.single-theme .theme-overlay .theme-header{display:none}.single-theme .theme-overlay .theme-wrap{clear:both;min-height:330px;position:relative;left:auto;right:auto;top:auto;bottom:auto;z-index:10}.single-theme .theme-overlay .theme-about{padding:30px 30px 70px;position:static}.single-theme .theme-overlay .theme-actions{position:absolute}@media only screen and (min-width:2000px){#wpwrap .theme-browser .theme{width:17.6%;margin:0 3% 3% 0}#wpwrap .theme-browser .theme:nth-child(3n),#wpwrap .theme-browser .theme:nth-child(4n){margin-right:3%}#wpwrap .theme-browser .theme:nth-child(5n){margin-right:0}}@media only screen and (min-width:1680px){.theme-overlay .theme-wrap{width:1450px;margin:0 auto}}@media only screen and (min-width:1640px){.theme-browser .theme{width:22.7%;margin:0 3% 3% 0}.theme-browser .theme .theme-screenshot:after{padding-top:75%}.theme-browser .theme:nth-child(3n){margin-right:3%}.theme-browser .theme:nth-child(4n){margin-right:0}}@media only screen and (max-width:1120px){.theme-browser .theme{width:47.5%;margin-right:0}.theme-browser .theme:nth-child(even){margin-right:0}.theme-browser .theme:nth-child(odd){margin-right:5%}}@media only screen and (max-width:900px){.theme-overlay .theme-wrap{left:65px}}@media only screen and (max-width:780px){.theme-overlay .theme-wrap,body.folded .theme-overlay .theme-wrap{top:0;right:0;bottom:0;left:0;padding:70px 20px 20px;border:none;z-index:100000;position:fixed}.theme-browser .theme.active .theme-name span{display:none}.theme-overlay .theme-screenshots{width:40%}.theme-overlay .theme-info{width:50%}.single-theme .theme-wrap{padding:10px}.theme-browser .theme .theme-actions{padding:5px 10px 4px}.theme-overlay.small-screenshot .theme-screenshots{position:static;float:none;max-width:302px}.theme-overlay.small-screenshot .theme-info{margin-left:0;width:auto}.theme:focus .more-details,.theme:hover .more-details,.theme:not(.active):focus .theme-actions,.theme:not(.active):hover .theme-actions{display:none}.theme-browser.rendered .theme:focus .theme-screenshot img,.theme-browser.rendered .theme:hover .theme-screenshot img{opacity:1}}@media only screen and (max-width:480px){.theme-browser .theme{width:100%;margin-right:0}.theme-browser .theme:nth-child(2n),.theme-browser .theme:nth-child(3n){margin-right:0}}@media only screen and (max-width:650px){.theme-overlay .theme-description,.theme-overlay .theme-update{margin-left:0}.theme-overlay .theme-actions .delete-theme{position:relative;right:auto;bottom:auto}.theme-overlay .theme-actions .inactive-theme{display:inline}.theme-overlay .theme-screenshots{width:100%;float:none}.theme-overlay .theme-info{width:100%}.theme-overlay .theme-author{margin:5px 0 15px}.theme-overlay .current-label{margin-top:10px;font-size:13px}.themes-php .wp-filter-search{float:none;clear:both;left:0;top:0;right:0;margin:10px 0;width:100%;max-width:280px}.theme-browser .theme.add-new-theme span:after{font:400 60px/90px dashicons;width:80px;height:80px;top:30%;left:50%;text-indent:0;margin-left:-40px}.single-theme .theme-wrap{margin:0 -12px 0 -10px;padding:10px}.single-theme .theme-overlay .theme-about{padding:10px;overflow:visible}.single-theme .current-label{display:none}.single-theme .theme-overlay .theme-actions{position:static}}.broken-themes{clear:both}.broken-themes table{text-align:left;width:50%;border-spacing:3px;padding:3px}.theme-browser .theme .theme-installed{background:#0073aa}.theme-browser .theme .theme-installed:before{content:"\f147"}.theme-browser .theme.is-installed .theme-actions .button-primary{display:none!important}.theme-install-php .wp-filter{padding:0 20px}.theme-install-php a.browse-themes,.theme-install-php a.upload{cursor:pointer}.theme-install-php a.browse-themes,.theme-install-php.show-upload-theme a.upload{display:none}.theme-install-php.show-upload-theme a.browse-themes{display:inline}.upload-plugin,.upload-theme{box-sizing:border-box;display:none;margin:0;padding:0;width:100%;overflow:hidden;position:relative;top:10px}.wp-full-overlay,.wp-full-overlay-main,.wp-full-overlay-sidebar{top:0;height:100%;bottom:0;left:0}.upload-plugin,body.show-upload-theme .upload-theme{display:block}body.show-upload-theme .upload-theme+.wp-filter,body.show-upload-theme .upload-theme+.wp-filter+.theme-browser,p.no-themes{display:none}.upload-plugin .wp-upload-form,.upload-theme .wp-upload-form{background:#fafafa;border:1px solid #e5e5e5;padding:30px;margin:30px auto;max-width:380px}.upload-plugin .install-help,.upload-theme .install-help{color:#555d66;font-size:18px;font-style:normal;margin:0;padding:40px 0 0;text-align:center}p.no-themes{clear:both;color:#666;font-size:18px;font-style:normal;margin:0;padding:100px 0;text-align:center}body.no-results p.no-themes{display:block}.theme-install-php .add-new-theme,body.show-upload-theme p.no-themes{display:none!important}@media only screen and (max-width:1120px){.upload-theme .wp-upload-form{margin:20px 0;max-width:100%}.upload-theme .install-help{font-size:15px;padding:20px 0 0;text-align:left}}.theme-details .theme-rating{line-height:23px}.theme-details .star-rating{display:inline}.theme-details .no-rating,.theme-details .num-ratings{font-size:11px;color:#72777c}.theme-details .no-rating{display:block;line-height:20px}.appearance_page_custom-header #headimg{border:1px solid #ddd;overflow:hidden;width:100%}.appearance_page_custom-header #upload-form p label{font-size:12px}.appearance_page_custom-header .available-headers .default-header{float:left;margin:0 20px 20px 0}.appearance_page_custom-header .random-header{clear:both;margin:0 20px 20px 0;vertical-align:middle}.appearance_page_custom-header .available-headers label input,.appearance_page_custom-header .random-header label input{margin-right:10px}.appearance_page_custom-header .available-headers label img{vertical-align:middle}div#custom-background-image{min-height:100px;border:1px solid #ddd}div#custom-background-image img{max-width:400px;max-height:300px}body.full-overlay-active{overflow:hidden}.wp-full-overlay{z-index:500000;position:fixed;overflow:visible;right:0;min-width:0}.wp-full-overlay-sidebar{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:fixed;width:300px;padding:0;margin:0;z-index:10;background:#eee;border-right:none}.wp-full-overlay.collapsed,.wp-full-overlay.expanded .wp-full-overlay-sidebar{margin-left:0!important}.wp-full-overlay.expanded{margin-left:300px}.wp-full-overlay.collapsed .wp-full-overlay-sidebar{overflow:visible;margin-left:-300px}.wp-full-overlay-sidebar:after{content:"";display:block;position:absolute;top:0;bottom:0;right:0;width:3px;z-index:1000}.wp-full-overlay-main{position:absolute;right:0}.wp-full-overlay-sidebar .wp-full-overlay-header{position:absolute;left:0;right:0;height:45px;padding:0 15px;line-height:45px;z-index:10;margin:0;border-top:none;-webkit-box-shadow:none;box-shadow:none}.wp-full-overlay-sidebar .wp-full-overlay-header a.back{margin-top:9px}.wp-full-overlay-sidebar .wp-full-overlay-footer{bottom:0;border-bottom:none;border-top:none;-webkit-box-shadow:none;box-shadow:none}.wp-full-overlay-sidebar .wp-full-overlay-sidebar-content{position:absolute;top:45px;bottom:45px;left:0;right:0;overflow:auto}.theme-install-overlay .wp-full-overlay-sidebar .wp-full-overlay-header{padding:0}.theme-install-overlay .close-full-overlay,.theme-install-overlay .next-theme,.theme-install-overlay .previous-theme{display:block;position:relative;float:left;width:45px;height:45px;padding-right:2px;background:#eee;border-right:1px solid #ddd;color:#444;cursor:pointer;text-decoration:none;-webkit-transition:color .1s ease-in-out,background .1s ease-in-out;transition:color .1s ease-in-out,background .1s ease-in-out}.theme-install-overlay .close-full-overlay:focus,.theme-install-overlay .close-full-overlay:hover,.theme-install-overlay .next-theme:focus,.theme-install-overlay .next-theme:hover,.theme-install-overlay .previous-theme:focus,.theme-install-overlay .previous-theme:hover{background:#ddd;border-color:#ccc;color:#000;outline:0;-webkit-box-shadow:none;box-shadow:none}.theme-install-overlay .close-full-overlay:before{font:400 22px/1 dashicons;content:"\f335";position:relative;top:7px;left:13px}.theme-install-overlay .previous-theme:before{font:400 20px/1 dashicons;content:"\f341";position:relative;top:6px;left:14px}.theme-install-overlay .next-theme:before{font:400 20px/1 dashicons;content:"\f345";position:relative;top:6px;left:13px}.theme-install-overlay .next-theme.disabled,.theme-install-overlay .next-theme.disabled:focus,.theme-install-overlay .next-theme.disabled:hover,.theme-install-overlay .previous-theme.disabled,.theme-install-overlay .previous-theme.disabled:focus,.theme-install-overlay .previous-theme.disabled:hover{color:#b4b9be;background:#eee;cursor:default;pointer-events:none}.wp-core-ui .wp-full-overlay .collapse-sidebar{position:fixed;bottom:8px;left:10px;padding:0;color:#656a6f;outline:0;line-height:1;background-color:transparent!important;border:none!important;-webkit-box-shadow:none!important;box-shadow:none!important;-webkit-border-radius:0!important;border-radius:0!important}.wp-core-ui .wp-full-overlay .collapse-sidebar:focus,.wp-core-ui .wp-full-overlay .collapse-sidebar:hover{color:#0073aa}.wp-full-overlay .collapse-sidebar-arrow,.wp-full-overlay .collapse-sidebar-label{display:inline-block;vertical-align:middle;line-height:20px}.wp-full-overlay .collapse-sidebar-arrow{width:20px;height:20px;margin:0 2px;-webkit-border-radius:50%;border-radius:50%;overflow:hidden}.wp-full-overlay .collapse-sidebar:focus .collapse-sidebar-arrow,.wp-full-overlay .collapse-sidebar:hover .collapse-sidebar-arrow{-webkit-box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8)}.wp-full-overlay .collapse-sidebar-label{margin-left:3px}.wp-full-overlay.collapsed .collapse-sidebar-label{display:none}.wp-full-overlay .collapse-sidebar-arrow:before{display:block;content:"\f148";background:#eee;font:400 20px/1 dashicons;speak:none;padding:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.rtl .wp-full-overlay .collapse-sidebar-arrow:before,.wp-full-overlay.collapsed .collapse-sidebar-arrow:before{-webkit-transform:rotate(180.001deg);-ms-transform:rotate(180.001deg);transform:rotate(180.001deg)}.rtl .wp-full-overlay.collapsed .collapse-sidebar-arrow:before{-webkit-transform:none;-ms-transform:none;transform:none}.wp-full-overlay,.wp-full-overlay .collapse-sidebar,.wp-full-overlay-main,.wp-full-overlay-sidebar{-webkit-transition-property:left,right,top,bottom,width,margin;transition-property:left,right,top,bottom,width,margin;-webkit-transition-duration:.2s;transition-duration:.2s}.wp-full-overlay{background:#191e23}.wp-full-overlay-main{background-color:#f1f1f1}.expanded .wp-full-overlay-footer{position:fixed;bottom:0;left:0;width:300px;height:45px;border-top:1px solid #ddd}.wp-full-overlay-footer .devices{float:right}.wp-full-overlay-footer .devices button{cursor:pointer;background:0 0;border:none;height:45px;padding:0 3px;margin:0 0 0 -4px;-webkit-box-shadow:none;box-shadow:none;border-top:1px solid transparent;border-bottom:4px solid transparent;-webkit-transition:background .1s ease-in-out;transition:background .1s ease-in-out}.wp-full-overlay-footer .devices button:before{display:inline-block;-webkit-font-smoothing:antialiased;font:400 20px/30px dashicons;vertical-align:top;margin:3px 0;padding:4px 8px;color:#656a6f}.wp-full-overlay-footer .devices button.active{border-bottom-color:#191e23}.wp-full-overlay-footer .devices button:focus,.wp-full-overlay-footer .devices button:hover{background-color:#fff}.wp-full-overlay-footer .devices button:focus{-webkit-box-shadow:none;box-shadow:none;outline:0;background-color:#fff;border-bottom-color:#0073aa}.wp-full-overlay-footer .devices button.active:before,.wp-full-overlay-footer .devices button:focus:before,.wp-full-overlay-footer .devices button:hover:before{color:#191e23}.wp-full-overlay-footer .devices .preview-desktop:before{content:"\f472"}.wp-full-overlay-footer .devices .preview-tablet:before{content:"\f471"}.wp-full-overlay-footer .devices .preview-mobile:before{content:"\f470"}@media screen and (max-width:1024px){.wp-full-overlay-footer .devices{display:none}}.collapsed .wp-full-overlay-footer .devices button:before{display:none}.preview-mobile .wp-full-overlay-main{margin:auto 0 auto -160px;width:320px;height:480px;max-height:100%;max-width:100%;left:50%}.preview-tablet .wp-full-overlay-main{margin:auto 0 auto -360px;width:720px;height:1080px;max-height:100%;max-width:100%;left:50%}.customize-support .hide-if-customize,.customize-support .wp-core-ui .hide-if-customize,.customize-support.wp-core-ui .hide-if-customize,.no-customize-support .hide-if-no-customize,.no-customize-support .wp-core-ui .hide-if-no-customize,.no-customize-support.wp-core-ui .hide-if-no-customize{display:none}#customize-container{display:none;background:#fff;z-index:500000;position:fixed;overflow:visible;top:0;bottom:0;left:0;right:0;height:100%}.customize-active #customize-container{display:block}.customize-loading #customize-container iframe{opacity:0}#customize-container iframe,.theme-install-overlay iframe{height:100%;width:100%;z-index:20;-webkit-transition:opacity .3s;transition:opacity .3s}#customize-controls{margin-top:0}.theme-install-overlay{display:none}.theme-install-overlay.single-theme{display:block}.install-theme-info{display:none;padding:10px 20px 60px}.single-theme .install-theme-info{padding-top:15px}.theme-install-overlay .install-theme-info{display:block}.install-theme-info .theme-install{float:right;margin-top:18px}.install-theme-info .theme-name{font-size:16px;line-height:24px;margin-bottom:0;margin-top:0}.install-theme-info .theme-screenshot{margin:15px 0;width:258px;border:1px solid #ccc}.install-theme-info .theme-details{overflow:hidden}.theme-details .theme-version{margin:15px 0}.theme-details .theme-description{float:left;color:#72777c;line-height:20px;max-width:100%}.theme-install-overlay .wp-full-overlay-header .theme-install{float:right;margin:8px 10px 0 0;line-height:26px}.theme-install-overlay .wp-full-overlay-sidebar{background:#eee;border-right:1px solid #ddd}.theme-install-overlay .wp-full-overlay-sidebar-content{background:#fff;border-top:1px solid #ddd;border-bottom:1px solid #ddd}.theme-install-overlay .wp-full-overlay-main{position:absolute;z-index:0;background-color:#f1f1f1}.customize-loading #customize-container{background-color:#f1f1f1}#customize-preview.wp-full-overlay-main:before,.customize-loading #customize-container:before,.theme-install-overlay .wp-full-overlay-main:before{content:"";display:block;width:20px;height:20px;position:absolute;left:50%;top:50%;z-index:-1;margin:-10px 0 0 -10px;-webkit-transform:translateZ(0);transform:translateZ(0);background:url(../images/spinner.gif) center center no-repeat;-webkit-background-size:20px 20px;background-size:20px 20px}#customize-preview.wp-full-overlay-main.iframe-ready:before,.theme-install-overlay.iframe-ready .wp-full-overlay-main:before{background-image:none}@media print,(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.wp-full-overlay .collapse-sidebar-arrow{background-image:url(../images/arrows-2x.png);-webkit-background-size:15px 123px;background-size:15px 123px}#customize-preview.wp-full-overlay-main:before,.customize-loading #customize-container:before,.theme-install-overlay .wp-full-overlay-main:before{background-image:url(../images/spinner-2x.gif)}}@media screen and (max-width:782px){.available-theme .action-links .delete-theme{float:none;margin:0;padding:0;clear:both}.available-theme .action-links .delete-theme a{padding:0}.broken-themes table{width:100%}.theme-install-overlay .wp-full-overlay-header .theme-install{margin-top:6px;line-height:normal}} \ No newline at end of file diff --git a/wp-admin/css/widgets-rtl.css b/wp-admin/css/widgets-rtl.css index be4d9c3..1ac2ed5 100644 --- a/wp-admin/css/widgets-rtl.css +++ b/wp-admin/css/widgets-rtl.css @@ -16,12 +16,17 @@ .widget-top a.widget-action, .widget-top a.widget-action:hover { + -webkit-box-shadow: none; + box-shadow: none; + outline: none; text-decoration: none; } +.widget-title h3, .widget-title h4 { margin: 0; padding: 15px; + font-size: 1em; line-height: 1; overflow: hidden; white-space: nowrap; @@ -46,7 +51,7 @@ .deleting .widget-title, .deleting .widget-top a.widget-action:after { - color: #aaa; + color: #a0a5aa; } /* Widget Dragging Helpers */ @@ -59,7 +64,7 @@ } .widget-placeholder { - border: 1px dashed #bbb; + border: 1px dashed #b4b9be; margin: 0 auto 10px; height: 45px; width: 100%; @@ -97,6 +102,7 @@ cursor: pointer; } +.sidebar-name h2, .sidebar-name h3 { margin: 0; padding: 8px 10px; @@ -108,7 +114,12 @@ padding: 0 0 15px; margin: 0; font-style: normal; - color: #777; + color: #72777c; +} + +.widget-holder .description, +.inactive-sidebar .description { + color: #555d66; } #widgets-right .widgets-holder-wrap .description { @@ -139,18 +150,17 @@ div#widgets-left .inactive-sidebar.closed .sidebar-name { margin-bottom: 10px; } +div#widgets-left .sidebar-name h2, div#widgets-left .sidebar-name h3 { padding: 10px 0; margin: 0 0 0 10px; } -div#widgets-left .sidebar-name .sidebar-name-arrow:before { - left: 0; - top: 4px; - padding: 4px 4px 4px 6px; +#widgets-left .sidebar-name .sidebar-name-arrow:before { + padding: 9px; } -#widgets-left #available-widgets, +#widgets-left .widgets-holder-wrap, div#widgets-left .widget-holder { background: transparent; border: none; @@ -220,14 +230,6 @@ div#widgets-left .inactive-sidebar .widgets-sortables { /* Widgets Right */ -div#widgets-right:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} - div#widgets-right .sidebars-column-1, div#widgets-right .sidebars-column-2 { max-width: 450px; @@ -242,13 +244,13 @@ div#widgets-right .sidebar-description { margin-top: -5px; } +div#widgets-right .sidebar-name h2, div#widgets-right .sidebar-name h3 { padding: 15px 7px; } div#widgets-right .sidebar-name .sidebar-name-arrow:before { - left: 0; - top: 4px; + top: 2px; } div#widgets-right .widget-top { @@ -267,14 +269,17 @@ div#widgets-right .closed .widgets-sortables { margin-bottom: 0; } -.sidebar-name .spinner { - margin: -5px 5px; +.sidebar-name .spinner, +.remove-inactive-widgets .spinner { float: none; + position: relative; + top: -2px; + margin: -5px 5px; } /* Dragging a widget over a closed sidebar */ #widgets-right .widgets-holder-wrap.widget-hover { - border-color: #777; + border-color: #72777c; -webkit-box-shadow: 0 1px 2px rgba(0,0,0,0.3); box-shadow: 0 1px 2px rgba(0,0,0,0.3); } @@ -341,10 +346,15 @@ div#widgets-right .closed .widgets-sortables { .js .widgets-holder-wrap.closed .widget, .js .widgets-holder-wrap.closed .sidebar-description, +.js .widgets-holder-wrap.closed .remove-inactive-widgets, .js .closed br.clear { display: none; } +.js .widgets-holder-wrap.closed .widget.ui-sortable-helper { + display: block; +} + /* Hide Widget Settings by Default */ .widget-inside, .widget-description { @@ -366,7 +376,7 @@ div#widgets-right .closed .widgets-sortables { } .js #removing-widget { - color: #2ea2cc; + color: #00a0d2; } .widget-control-noform, @@ -451,17 +461,18 @@ div#widgets-right .widget-top:hover, transition: background 0.2s ease-in-out; } + /* @todo looks like these hover/focus states are overridden by .widgets-chooser-selected */ .widgets-chooser li:hover, .widgets-chooser li:focus { background: rgba(255,255,255,0.7); } .widgets-chooser li:focus:before { - content: '\f147'; + content: "\f147"; display: block; -webkit-font-smoothing: antialiased; - font: normal 26px/1 'dashicons'; - color: #999; + font: normal 26px/1 dashicons; + color: #555d66; position: absolute; top: 7px; right: 5px; @@ -472,16 +483,16 @@ div#widgets-right .widget-top:hover, } .widgets-chooser li.widgets-chooser-selected { - background: #2ea2cc; + background: #00a0d2; color: #fff; } .widgets-chooser li.widgets-chooser-selected:before, .widgets-chooser li.widgets-chooser-selected:focus:before { - content: '\f147'; + content: "\f147"; display: block; -webkit-font-smoothing: antialiased; - font: normal 26px/1 'dashicons'; + font: normal 26px/1 dashicons; color: #fff; position: absolute; top: 7px; @@ -501,6 +512,10 @@ div#widgets-right .widget-top:hover, cursor: pointer; } +#available-widgets .widget.ui-draggable-dragging .widget-top { + cursor: move; +} + /* =Media Queries -------------------------------------------------------------- */ diff --git a/wp-admin/css/widgets-rtl.min.css b/wp-admin/css/widgets-rtl.min.css new file mode 100644 index 0000000..16d18d8 --- /dev/null +++ b/wp-admin/css/widgets-rtl.min.css @@ -0,0 +1 @@ +.widget,.widget-placeholder{-webkit-box-sizing:border-box;-moz-box-sizing:border-box}.widget{margin:0 auto 10px;position:relative;box-sizing:border-box}.widget-top{font-size:13px;font-weight:600;background:#f7f7f7}.widget-top a.widget-action,.widget-top a.widget-action:hover{-webkit-box-shadow:none;box-shadow:none;outline:0;text-decoration:none}.widget-title h3,.widget-title h4{margin:0;padding:15px;font-size:1em;line-height:1;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.widgets-holder-wrap .widget-inside{border-top:none;padding:1px 15px 15px;line-height:16px}#available-widgets .widget-description,#widgets-right a.widget-control-edit,.in-widget-title{color:#666}.deleting .widget-title,.deleting .widget-top a.widget-action:after{color:#a0a5aa}.widget.ui-draggable-dragging{min-width:100%}.widget.ui-sortable-helper{opacity:.8}.widget-placeholder{border:1px dashed #b4b9be;margin:0 auto 10px;height:45px;width:100%;box-sizing:border-box}#widgets-right .widget-placeholder{margin-top:0}#widgets-right .closed .widget-placeholder{height:0;border:0;margin-top:-10px}.sidebar-name{position:relative;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.sidebar-name-arrow{position:absolute;top:0;left:0;bottom:0}.js .sidebar-name{cursor:pointer}.sidebar-name h2,.sidebar-name h3{margin:0;padding:8px 10px;overflow:hidden;white-space:nowrap}.widgets-holder-wrap .description{padding:0 0 15px;margin:0;font-style:normal;color:#72777c}.inactive-sidebar .description,.widget-holder .description{color:#555d66}#widgets-right .widgets-holder-wrap .description{padding-right:7px;padding-left:7px}div.widget-liquid-left{margin:0;width:38%;float:right}div.widget-liquid-right{float:left;width:58%}div#widgets-left{padding-top:12px}div#widgets-left .closed .sidebar-name,div#widgets-left .inactive-sidebar.closed .sidebar-name{margin-bottom:10px}div#widgets-left .sidebar-name h2,div#widgets-left .sidebar-name h3{padding:10px 0;margin:0 0 0 10px}#widgets-left .sidebar-name .sidebar-name-arrow:before{padding:9px}#widgets-left .widgets-holder-wrap,div#widgets-left .widget-holder{background:0 0;border:none}#widgets-left .widgets-holder-wrap{border:none;-webkit-box-shadow:none;box-shadow:none}#available-widgets .widget-action{display:none}#available-widgets .widget{margin:0}#available-widgets .widget:nth-child(odd){clear:both}#available-widgets .widget .widget-description{display:block;padding:10px 15px;font-size:12px}#available-widgets #widget-list{position:relative}#widgets-left .inactive-sidebar{clear:both;width:100%;background:0 0;padding:0;margin:0 0 20px;border:none;-webkit-box-shadow:none;box-shadow:none}#widgets-left .inactive-sidebar.first{margin-top:40px}div#widgets-left .inactive-sidebar .widget.expanded{right:auto}.widget-title-action{float:left;position:relative}div#widgets-left .inactive-sidebar .widgets-sortables{min-height:42px;padding:0;background:0 0;margin:0;position:relative}div#widgets-right .sidebars-column-1,div#widgets-right .sidebars-column-2{max-width:450px}div#widgets-right .widgets-holder-wrap{margin:10px 0 0}div#widgets-right .sidebar-description{min-height:20px;margin-top:-5px}div#widgets-right .sidebar-name h2,div#widgets-right .sidebar-name h3{padding:15px 7px}div#widgets-right .sidebar-name .sidebar-name-arrow:before{top:2px}div#widgets-right .widget-top{padding:0}div#widgets-right .widgets-sortables{padding:0 8px;margin-bottom:9px;position:relative;min-height:123px}div#widgets-right .closed .widgets-sortables{min-height:0;margin-bottom:0}.remove-inactive-widgets .spinner,.sidebar-name .spinner{float:none;position:relative;top:-2px;margin:-5px 5px}#widgets-right .widgets-holder-wrap.widget-hover{border-color:#72777c;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.3);box-shadow:0 1px 2px rgba(0,0,0,.3)}.widgets_access #widgets-left .widget .widget-top{cursor:auto}.widgets_access #wpwrap .widget-control-edit,.widgets_access #wpwrap .widgets-holder-wrap.closed .sidebar-description,.widgets_access #wpwrap .widgets-holder-wrap.closed .widget{display:block}.widgets_access #widgets-left .widget .widget-top:hover,.widgets_access #widgets-right .widget .widget-top:hover{border-color:#ddd}#available-widgets .widget-control-edit .edit,#widgets-left .inactive-sidebar .widget-control-edit .add,#widgets-right .widget-control-edit .add{display:none}.editwidget .widget-inside,.widget-control-edit{display:block;padding:0 15px}.widget-control-edit{color:#666;background:#EEE;line-height:43px;border-right:1px solid #DDD}#widgets-left .widget-control-edit:hover,#widgets-right .widget-control-edit:hover{color:#fff;background:#444;border-right:0;outline:#444 solid 1px}.widgets-holder-wrap .sidebar-description,.widgets-holder-wrap .sidebar-name{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.editwidget{margin:0 auto}.editwidget .widget-control-actions{margin-top:20px}.js .closed br.clear,.js .widgets-holder-wrap.closed .remove-inactive-widgets,.js .widgets-holder-wrap.closed .sidebar-description,.js .widgets-holder-wrap.closed .widget{display:none}.js .widgets-holder-wrap.closed .widget.ui-sortable-helper{display:block}#access-off,.no-js .widget-holder .description,.widget-control-noform,.widget-description,.widget-inside,.widgets_access #access-on,.widgets_access .sidebar-name-arrow,.widgets_access .widget-action,.widgets_access .widget-holder .description{display:none}.widget-inside{background:#fff}#removing-widget{display:none;font-weight:400;padding-right:15px;font-size:12px;line-height:1;color:#000}.js #removing-widget{color:#00a0d2}.widgets_access #widget-list,.widgets_access .widget-holder{padding-top:10px}.widgets_access #access-off{display:inline}.widgets_access .sidebar-name,.widgets_access .widget .widget-top{cursor:default}.widget-liquid-left #widgets-left.chooser #available-widgets .widget,.widget-liquid-left #widgets-left.chooser .inactive-sidebar{-webkit-transition:opacity .1s linear;transition:opacity .1s linear;opacity:.2;pointer-events:none}.widget-liquid-left #widgets-left.chooser #available-widgets .widget-in-question{opacity:1;pointer-events:auto}#available-widgets .widget-top:hover,#widgets-left .widget-in-question .widget-top,#widgets-left .widget-top:hover,.widgets-chooser ul,div#widgets-right .widget-top:hover{border-color:#999;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.1);box-shadow:0 1px 2px rgba(0,0,0,.1)}.widgets-chooser ul.widgets-chooser-sidebars{margin:0;list-style-type:none;max-height:300px;overflow:auto}.widgets-chooser{display:none}.widgets-chooser ul{border:1px solid #ccc}.widgets-chooser li{padding:10px 35px 10px 15px;border-bottom:1px solid #ccc;background:#fff;margin:0;cursor:pointer;outline:0;position:relative;-webkit-transition:background .2s ease-in-out;transition:background .2s ease-in-out}.widgets-chooser li:focus,.widgets-chooser li:hover{background:rgba(255,255,255,.7)}.widgets-chooser li:focus:before{content:"\f147";display:block;-webkit-font-smoothing:antialiased;font:400 26px/1 dashicons;color:#555d66;position:absolute;top:7px;right:5px}.widgets-chooser li:last-child{border:none}.widgets-chooser li.widgets-chooser-selected{background:#00a0d2;color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{content:"\f147";display:block;-webkit-font-smoothing:antialiased;font:400 26px/1 dashicons;color:#fff;position:absolute;top:7px;right:5px}.widgets-chooser .widgets-chooser-actions{padding:10px 0 12px;text-align:center}.widgets-chooser button{margin-left:5px}#available-widgets .widget .widget-top{cursor:pointer}#available-widgets .widget.ui-draggable-dragging .widget-top{cursor:move}@media screen and (max-width:480px){div.widget-liquid-left{width:100%;float:none;border-left:none;padding-left:0}#widgets-left #available-widgets .widget-top,#widgets-left .inactive-sidebar .widgets-sortables,#widgets-left .sidebar-name{margin-left:0}div.widget-liquid-right{width:100%;float:none}div.widget{margin:0 auto 10px!important;max-width:480px}}@media screen and (max-width:320px){div.widget{max-width:320px}}@media only screen and (min-width:1250px){#widgets-left #available-widgets .widget{width:49%;float:right}.widget.ui-draggable-dragging{min-width:49%}#widgets-left #available-widgets .widget:nth-child(even){float:left}#widgets-right .sidebars-column-1,#widgets-right .sidebars-column-2{float:right;width:49%}#widgets-right .sidebars-column-1{margin-left:2%}#widgets-right.single-sidebar .sidebars-column-1,#widgets-right.single-sidebar .sidebars-column-2{float:none;width:100%;margin:0}} \ No newline at end of file diff --git a/wp-admin/css/widgets.css b/wp-admin/css/widgets.css index 75014f6..c2d6754 100644 --- a/wp-admin/css/widgets.css +++ b/wp-admin/css/widgets.css @@ -16,12 +16,17 @@ .widget-top a.widget-action, .widget-top a.widget-action:hover { + -webkit-box-shadow: none; + box-shadow: none; + outline: none; text-decoration: none; } +.widget-title h3, .widget-title h4 { margin: 0; padding: 15px; + font-size: 1em; line-height: 1; overflow: hidden; white-space: nowrap; @@ -46,7 +51,7 @@ .deleting .widget-title, .deleting .widget-top a.widget-action:after { - color: #aaa; + color: #a0a5aa; } /* Widget Dragging Helpers */ @@ -59,7 +64,7 @@ } .widget-placeholder { - border: 1px dashed #bbb; + border: 1px dashed #b4b9be; margin: 0 auto 10px; height: 45px; width: 100%; @@ -97,6 +102,7 @@ cursor: pointer; } +.sidebar-name h2, .sidebar-name h3 { margin: 0; padding: 8px 10px; @@ -108,7 +114,12 @@ padding: 0 0 15px; margin: 0; font-style: normal; - color: #777; + color: #72777c; +} + +.widget-holder .description, +.inactive-sidebar .description { + color: #555d66; } #widgets-right .widgets-holder-wrap .description { @@ -139,18 +150,17 @@ div#widgets-left .inactive-sidebar.closed .sidebar-name { margin-bottom: 10px; } +div#widgets-left .sidebar-name h2, div#widgets-left .sidebar-name h3 { padding: 10px 0; margin: 0 10px 0 0; } -div#widgets-left .sidebar-name .sidebar-name-arrow:before { - right: 0; - top: 4px; - padding: 4px 6px 4px 4px; +#widgets-left .sidebar-name .sidebar-name-arrow:before { + padding: 9px; } -#widgets-left #available-widgets, +#widgets-left .widgets-holder-wrap, div#widgets-left .widget-holder { background: transparent; border: none; @@ -220,14 +230,6 @@ div#widgets-left .inactive-sidebar .widgets-sortables { /* Widgets Right */ -div#widgets-right:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} - div#widgets-right .sidebars-column-1, div#widgets-right .sidebars-column-2 { max-width: 450px; @@ -242,13 +244,13 @@ div#widgets-right .sidebar-description { margin-top: -5px; } +div#widgets-right .sidebar-name h2, div#widgets-right .sidebar-name h3 { padding: 15px 7px; } div#widgets-right .sidebar-name .sidebar-name-arrow:before { - right: 0; - top: 4px; + top: 2px; } div#widgets-right .widget-top { @@ -267,14 +269,17 @@ div#widgets-right .closed .widgets-sortables { margin-bottom: 0; } -.sidebar-name .spinner { - margin: -5px 5px; +.sidebar-name .spinner, +.remove-inactive-widgets .spinner { float: none; + position: relative; + top: -2px; + margin: -5px 5px; } /* Dragging a widget over a closed sidebar */ #widgets-right .widgets-holder-wrap.widget-hover { - border-color: #777; + border-color: #72777c; -webkit-box-shadow: 0 1px 2px rgba(0,0,0,0.3); box-shadow: 0 1px 2px rgba(0,0,0,0.3); } @@ -341,10 +346,15 @@ div#widgets-right .closed .widgets-sortables { .js .widgets-holder-wrap.closed .widget, .js .widgets-holder-wrap.closed .sidebar-description, +.js .widgets-holder-wrap.closed .remove-inactive-widgets, .js .closed br.clear { display: none; } +.js .widgets-holder-wrap.closed .widget.ui-sortable-helper { + display: block; +} + /* Hide Widget Settings by Default */ .widget-inside, .widget-description { @@ -366,7 +376,7 @@ div#widgets-right .closed .widgets-sortables { } .js #removing-widget { - color: #2ea2cc; + color: #00a0d2; } .widget-control-noform, @@ -451,17 +461,18 @@ div#widgets-right .widget-top:hover, transition: background 0.2s ease-in-out; } + /* @todo looks like these hover/focus states are overridden by .widgets-chooser-selected */ .widgets-chooser li:hover, .widgets-chooser li:focus { background: rgba(255,255,255,0.7); } .widgets-chooser li:focus:before { - content: '\f147'; + content: "\f147"; display: block; -webkit-font-smoothing: antialiased; - font: normal 26px/1 'dashicons'; - color: #999; + font: normal 26px/1 dashicons; + color: #555d66; position: absolute; top: 7px; left: 5px; @@ -472,16 +483,16 @@ div#widgets-right .widget-top:hover, } .widgets-chooser li.widgets-chooser-selected { - background: #2ea2cc; + background: #00a0d2; color: #fff; } .widgets-chooser li.widgets-chooser-selected:before, .widgets-chooser li.widgets-chooser-selected:focus:before { - content: '\f147'; + content: "\f147"; display: block; -webkit-font-smoothing: antialiased; - font: normal 26px/1 'dashicons'; + font: normal 26px/1 dashicons; color: #fff; position: absolute; top: 7px; @@ -501,6 +512,10 @@ div#widgets-right .widget-top:hover, cursor: pointer; } +#available-widgets .widget.ui-draggable-dragging .widget-top { + cursor: move; +} + /* =Media Queries -------------------------------------------------------------- */ diff --git a/wp-admin/css/widgets.min.css b/wp-admin/css/widgets.min.css new file mode 100644 index 0000000..f1e5dfa --- /dev/null +++ b/wp-admin/css/widgets.min.css @@ -0,0 +1 @@ +.widget,.widget-placeholder{-webkit-box-sizing:border-box;-moz-box-sizing:border-box}.widget{margin:0 auto 10px;position:relative;box-sizing:border-box}.widget-top{font-size:13px;font-weight:600;background:#f7f7f7}.widget-top a.widget-action,.widget-top a.widget-action:hover{-webkit-box-shadow:none;box-shadow:none;outline:0;text-decoration:none}.widget-title h3,.widget-title h4{margin:0;padding:15px;font-size:1em;line-height:1;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.widgets-holder-wrap .widget-inside{border-top:none;padding:1px 15px 15px;line-height:16px}#available-widgets .widget-description,#widgets-right a.widget-control-edit,.in-widget-title{color:#666}.deleting .widget-title,.deleting .widget-top a.widget-action:after{color:#a0a5aa}.widget.ui-draggable-dragging{min-width:100%}.widget.ui-sortable-helper{opacity:.8}.widget-placeholder{border:1px dashed #b4b9be;margin:0 auto 10px;height:45px;width:100%;box-sizing:border-box}#widgets-right .widget-placeholder{margin-top:0}#widgets-right .closed .widget-placeholder{height:0;border:0;margin-top:-10px}.sidebar-name{position:relative;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.sidebar-name-arrow{position:absolute;top:0;right:0;bottom:0}.js .sidebar-name{cursor:pointer}.sidebar-name h2,.sidebar-name h3{margin:0;padding:8px 10px;overflow:hidden;white-space:nowrap}.widgets-holder-wrap .description{padding:0 0 15px;margin:0;font-style:normal;color:#72777c}.inactive-sidebar .description,.widget-holder .description{color:#555d66}#widgets-right .widgets-holder-wrap .description{padding-left:7px;padding-right:7px}div.widget-liquid-left{margin:0;width:38%;float:left}div.widget-liquid-right{float:right;width:58%}div#widgets-left{padding-top:12px}div#widgets-left .closed .sidebar-name,div#widgets-left .inactive-sidebar.closed .sidebar-name{margin-bottom:10px}div#widgets-left .sidebar-name h2,div#widgets-left .sidebar-name h3{padding:10px 0;margin:0 10px 0 0}#widgets-left .sidebar-name .sidebar-name-arrow:before{padding:9px}#widgets-left .widgets-holder-wrap,div#widgets-left .widget-holder{background:0 0;border:none}#widgets-left .widgets-holder-wrap{border:none;-webkit-box-shadow:none;box-shadow:none}#available-widgets .widget-action{display:none}#available-widgets .widget{margin:0}#available-widgets .widget:nth-child(odd){clear:both}#available-widgets .widget .widget-description{display:block;padding:10px 15px;font-size:12px}#available-widgets #widget-list{position:relative}#widgets-left .inactive-sidebar{clear:both;width:100%;background:0 0;padding:0;margin:0 0 20px;border:none;-webkit-box-shadow:none;box-shadow:none}#widgets-left .inactive-sidebar.first{margin-top:40px}div#widgets-left .inactive-sidebar .widget.expanded{left:auto}.widget-title-action{float:right;position:relative}div#widgets-left .inactive-sidebar .widgets-sortables{min-height:42px;padding:0;background:0 0;margin:0;position:relative}div#widgets-right .sidebars-column-1,div#widgets-right .sidebars-column-2{max-width:450px}div#widgets-right .widgets-holder-wrap{margin:10px 0 0}div#widgets-right .sidebar-description{min-height:20px;margin-top:-5px}div#widgets-right .sidebar-name h2,div#widgets-right .sidebar-name h3{padding:15px 7px}div#widgets-right .sidebar-name .sidebar-name-arrow:before{top:2px}div#widgets-right .widget-top{padding:0}div#widgets-right .widgets-sortables{padding:0 8px;margin-bottom:9px;position:relative;min-height:123px}div#widgets-right .closed .widgets-sortables{min-height:0;margin-bottom:0}.remove-inactive-widgets .spinner,.sidebar-name .spinner{float:none;position:relative;top:-2px;margin:-5px 5px}#widgets-right .widgets-holder-wrap.widget-hover{border-color:#72777c;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.3);box-shadow:0 1px 2px rgba(0,0,0,.3)}.widgets_access #widgets-left .widget .widget-top{cursor:auto}.widgets_access #wpwrap .widget-control-edit,.widgets_access #wpwrap .widgets-holder-wrap.closed .sidebar-description,.widgets_access #wpwrap .widgets-holder-wrap.closed .widget{display:block}.widgets_access #widgets-left .widget .widget-top:hover,.widgets_access #widgets-right .widget .widget-top:hover{border-color:#ddd}#available-widgets .widget-control-edit .edit,#widgets-left .inactive-sidebar .widget-control-edit .add,#widgets-right .widget-control-edit .add{display:none}.editwidget .widget-inside,.widget-control-edit{display:block;padding:0 15px}.widget-control-edit{color:#666;background:#EEE;line-height:43px;border-left:1px solid #DDD}#widgets-left .widget-control-edit:hover,#widgets-right .widget-control-edit:hover{color:#fff;background:#444;border-left:0;outline:#444 solid 1px}.widgets-holder-wrap .sidebar-description,.widgets-holder-wrap .sidebar-name{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.editwidget{margin:0 auto}.editwidget .widget-control-actions{margin-top:20px}.js .closed br.clear,.js .widgets-holder-wrap.closed .remove-inactive-widgets,.js .widgets-holder-wrap.closed .sidebar-description,.js .widgets-holder-wrap.closed .widget{display:none}.js .widgets-holder-wrap.closed .widget.ui-sortable-helper{display:block}#access-off,.no-js .widget-holder .description,.widget-control-noform,.widget-description,.widget-inside,.widgets_access #access-on,.widgets_access .sidebar-name-arrow,.widgets_access .widget-action,.widgets_access .widget-holder .description{display:none}.widget-inside{background:#fff}#removing-widget{display:none;font-weight:400;padding-left:15px;font-size:12px;line-height:1;color:#000}.js #removing-widget{color:#00a0d2}.widgets_access #widget-list,.widgets_access .widget-holder{padding-top:10px}.widgets_access #access-off{display:inline}.widgets_access .sidebar-name,.widgets_access .widget .widget-top{cursor:default}.widget-liquid-left #widgets-left.chooser #available-widgets .widget,.widget-liquid-left #widgets-left.chooser .inactive-sidebar{-webkit-transition:opacity .1s linear;transition:opacity .1s linear;opacity:.2;pointer-events:none}.widget-liquid-left #widgets-left.chooser #available-widgets .widget-in-question{opacity:1;pointer-events:auto}#available-widgets .widget-top:hover,#widgets-left .widget-in-question .widget-top,#widgets-left .widget-top:hover,.widgets-chooser ul,div#widgets-right .widget-top:hover{border-color:#999;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.1);box-shadow:0 1px 2px rgba(0,0,0,.1)}.widgets-chooser ul.widgets-chooser-sidebars{margin:0;list-style-type:none;max-height:300px;overflow:auto}.widgets-chooser{display:none}.widgets-chooser ul{border:1px solid #ccc}.widgets-chooser li{padding:10px 15px 10px 35px;border-bottom:1px solid #ccc;background:#fff;margin:0;cursor:pointer;outline:0;position:relative;-webkit-transition:background .2s ease-in-out;transition:background .2s ease-in-out}.widgets-chooser li:focus,.widgets-chooser li:hover{background:rgba(255,255,255,.7)}.widgets-chooser li:focus:before{content:"\f147";display:block;-webkit-font-smoothing:antialiased;font:400 26px/1 dashicons;color:#555d66;position:absolute;top:7px;left:5px}.widgets-chooser li:last-child{border:none}.widgets-chooser li.widgets-chooser-selected{background:#00a0d2;color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{content:"\f147";display:block;-webkit-font-smoothing:antialiased;font:400 26px/1 dashicons;color:#fff;position:absolute;top:7px;left:5px}.widgets-chooser .widgets-chooser-actions{padding:10px 0 12px;text-align:center}.widgets-chooser button{margin-right:5px}#available-widgets .widget .widget-top{cursor:pointer}#available-widgets .widget.ui-draggable-dragging .widget-top{cursor:move}@media screen and (max-width:480px){div.widget-liquid-left{width:100%;float:none;border-right:none;padding-right:0}#widgets-left #available-widgets .widget-top,#widgets-left .inactive-sidebar .widgets-sortables,#widgets-left .sidebar-name{margin-right:0}div.widget-liquid-right{width:100%;float:none}div.widget{margin:0 auto 10px!important;max-width:480px}}@media screen and (max-width:320px){div.widget{max-width:320px}}@media only screen and (min-width:1250px){#widgets-left #available-widgets .widget{width:49%;float:left}.widget.ui-draggable-dragging{min-width:49%}#widgets-left #available-widgets .widget:nth-child(even){float:right}#widgets-right .sidebars-column-1,#widgets-right .sidebars-column-2{float:left;width:49%}#widgets-right .sidebars-column-1{margin-right:2%}#widgets-right.single-sidebar .sidebars-column-1,#widgets-right.single-sidebar .sidebars-column-2{float:none;width:100%;margin:0}} \ No newline at end of file diff --git a/wp-admin/css/wp-admin-rtl.css b/wp-admin/css/wp-admin-rtl.css index c45d5b1..5e7c37d 100644 --- a/wp-admin/css/wp-admin-rtl.css +++ b/wp-admin/css/wp-admin-rtl.css @@ -7,8 +7,8 @@ @import url(revisions-rtl.css); @import url(media-rtl.css); @import url(themes-rtl.css); -@import url(press-this-rtl.css); @import url(about-rtl.css); @import url(nav-menus-rtl.css); @import url(widgets-rtl.css); +@import url(site-icon-rtl.css); @import url(l10n-rtl.css); diff --git a/wp-admin/css/wp-admin-rtl.min.css b/wp-admin/css/wp-admin-rtl.min.css index 25e9fbb..d6f74d0 100644 --- a/wp-admin/css/wp-admin-rtl.min.css +++ b/wp-admin/css/wp-admin-rtl.min.css @@ -1 +1,14 @@ -#wpwrap{height:auto;min-height:100%;width:100%;position:relative;-webkit-font-smoothing:subpixel-antialiased}#wpcontent{height:100%}#wpcontent,#wpfooter{margin-right:180px}.folded #wpcontent,.folded #wpfooter{margin-right:56px}#wpbody-content{padding-bottom:65px;float:right;width:100%;overflow:visible!important}.inner-sidebar{float:left;clear:left;display:none;width:281px;position:relative}.columns-2 .inner-sidebar{margin-left:auto;width:286px;display:block}.columns-2 .inner-sidebar #side-sortables,.inner-sidebar #side-sortables{min-height:300px;width:280px;padding:0}.has-right-sidebar .inner-sidebar{display:block}.has-right-sidebar #post-body{float:right;clear:right;width:100%;margin-left:-2000px}.has-right-sidebar #post-body-content{margin-left:300px;float:none;width:auto}#col-container,#col-left,#col-right{overflow:hidden;padding:0;margin:0}#col-left{width:35%}#col-right{float:left;clear:left;width:65%}.col-wrap{padding:0 7px}.alignleft{float:right}.alignright{float:left}.textleft{text-align:right}.textright{text-align:left}.clear{clear:both}.screen-reader-text,.screen-reader-text span,.ui-helper-hidden-accessible{position:absolute;margin:-1px;padding:0;height:1px;width:1px;overflow:hidden;clip:rect(0 0 0 0);border:0}.screen-reader-shortcut{position:absolute;top:-1000em}.screen-reader-shortcut:focus{right:6px;top:-25px;height:auto;width:auto;display:block;font-size:14px;font-weight:600;padding:15px 23px 14px;background:#f1f1f1;color:#21759b;z-index:100000;line-height:normal;-webkit-box-shadow:0 0 2px 2px rgba(0,0,0,.6);box-shadow:0 0 2px 2px rgba(0,0,0,.6);text-decoration:none;outline:0}.hidden,.js .closed .inside,.js .hide-if-js,.js .wp-core-ui .hide-if-js,.js.wp-core-ui .hide-if-js,.no-js .hide-if-no-js,.no-js .wp-core-ui .hide-if-no-js,.no-js.wp-core-ui .hide-if-no-js{display:none}#menu-management .menu-edit,#menu-settings-column .accordion-container,.feature-filter,.imgedit-group,.manage-menus,.menu-item-handle,.popular-tags,.stuffbox,.widget-inside,.widget-top,.widgets-holder-wrap,.wp-editor-container,p.popular-tags,table.widefat{border:1px solid #e5e5e5;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04)}.feature-filter,.imgedit-group,.popular-tags,.stuffbox,.widgets-holder-wrap,.wp-editor-container,p.popular-tags,table.widefat{background:#fff}body,html{height:100%;margin:0;padding:0}html{background:#f1f1f1}body{color:#444;font-family:"Open Sans",sans-serif;font-size:13px;line-height:1.4em;min-width:600px}body.iframe{min-width:0;padding-top:1px}iframe,img{border:0}td{font-family:inherit;font-size:inherit;font-weight:inherit;line-height:inherit}a{color:#0074a2;-webkit-transition-property:border,background,color;transition-property:border,background,color;-webkit-transition-duration:.05s;transition-duration:.05s;-webkit-transition-timing-function:ease-in-out;transition-timing-function:ease-in-out}a,div{outline:0}a:active,a:hover{color:#2ea2cc}a:focus{color:#124964}a:active,a:focus{outline:thin dotted}#adminmenu a:active,#adminmenu a:focus,.screen-reader-text:focus{outline:0}blockquote,q{quotes:none}blockquote:after,blockquote:before,q:after,q:before{content:'';content:none}p{font-size:13px;line-height:1.5;margin:1em 0}blockquote{margin:1em}dd,li{margin-bottom:6px}h1,h2,h3,h4,h5,h6{display:block;font-weight:600}h1{font-size:2em;margin:.67em 0}h2{color:#222;font-size:1.5em;margin:.83em 0;font-weight:400}h3{color:#222;font-size:1.3em;margin:1em 0}h4{font-size:1em;margin:1.33em 0}h5{font-size:.83em;margin:1.67em 0}h6{font-size:.67em;margin:2.33em 0}ol,ul{padding:0}ul{list-style:none}ol{list-style-type:decimal;margin-right:2em}ul.ul-disc{list-style:disc outside}ul.ul-square{list-style:square outside}ol.ol-decimal{list-style:decimal outside}ol.ol-decimal,ul.ul-disc,ul.ul-square{margin-right:1.8em}ol.ol-decimal>li,ul.ul-disc>li,ul.ul-square>li{margin:0 0 .5em}.ltr{direction:ltr}.code,code{font-family:Consolas,Monaco,monospace;direction:ltr}code,kbd{padding:3px 5px 2px;margin:0 1px;background:#eaeaea;background:rgba(0,0,0,.07);font-size:13px}.subsubsub{list-style:none;margin:8px 0 0;padding:0;font-size:13px;float:right;color:#666}.subsubsub a{line-height:2;padding:.2em;text-decoration:none}.subsubsub a .count,.subsubsub a.current .count{color:#999;font-weight:400}.subsubsub a.current{font-weight:600;border:0}.subsubsub li{display:inline-block;margin:0;padding:0;white-space:nowrap}.widefat{border-spacing:0;width:100%;clear:both;margin:0}.widefat *{word-wrap:break-word}.widefat a{text-decoration:none}.widefat td,.widefat th{padding:8px 10px}.widefat thead th{border-bottom:1px solid #e1e1e1}.widefat tfoot th{border-top:1px solid #e1e1e1;border-bottom:0}.widefat .no-items td{border-bottom-width:0}.widefat td{vertical-align:top}.widefat td,.widefat td ol,.widefat td p,.widefat td ul{font-size:13px;line-height:1.5em}.widefat th{text-align:right;line-height:1.3em;font-size:14px}.widefat th input{margin:0 8px 0 0;padding:0;vertical-align:text-top}.widefat .check-column{width:2.2em;padding:6px 0 25px;vertical-align:top}.widefat th input[type=checkbox]{margin-top:-1px}.widefat.media .check-column{padding-top:8px}.widefat tbody th.check-column,.widefat tfoot th.check-column,.widefat thead th.check-column{padding:11px 3px 0 0}.widefat thead th.check-column{padding-top:10px}.update-php div.error,.update-php div.updated{margin-right:0}.no-js .widefat tfoot .check-column input,.no-js .widefat thead .check-column input{display:none}.column-comments,.column-links,.column-posts,.widefat .num{text-align:center}.widefat th#comments{vertical-align:middle}.wrap{margin:10px 2px 0 20px}div.error,div.updated{margin:5px 15px 2px}div.error p,div.updated p{margin:.5em 0;padding:2px}.media-upload-form div.error,.wrap div.error,.wrap div.updated{margin:5px 0 15px}div.updated{border-right:4px solid #7ad03a;padding:1px 12px;background-color:#fff;-webkit-box-shadow:0 1px 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 1px 0 rgba(0,0,0,.1)}div.error{border-right:4px solid #dd3d36;background:#fff;-webkit-box-shadow:0 1px 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 1px 0 rgba(0,0,0,.1);padding:1px 12px}.attention{color:#2ea2cc}.subtitle,.wrap h2{font-weight:400;margin:0}.wrap h2{font-size:23px;font-weight:400;padding:9px 0 4px 15px;line-height:29px}.subtitle{color:#777;font-size:14px;padding-right:25px}.wrap .add-new-h2,.wrap .add-new-h2:active{margin-right:4px;padding:4px 8px;position:relative;top:-3px;text-decoration:none;border:0;-webkit-border-radius:2px;border-radius:2px;background:#e0e0e0;text-shadow:none;font-weight:600;font-size:13px}.wrap .add-new-h2:hover{background:#2ea2cc;color:#fff}.wrap h2.long-header{padding-left:0}.wp-dialog{background-color:#fff}.sorthelper{background-color:#ccf3fa}.ac_match,.subsubsub a.current{color:#000}.alt,.alternate{background-color:#f9f9f9}.bar{background-color:#e8e8e8;border-left-color:#99d}.media-upload-form label.form-help,td.help{color:#9a9a9a}.highlight{background-color:#e4f2fd;color:#000}.wp-ui-primary{color:#fff;background-color:#333}.wp-ui-text-primary{color:#333}.wp-ui-highlight{color:#fff;background-color:#1e8cbe}.wp-ui-text-highlight{color:#1e8cbe}.wp-ui-notification{color:#fff;background-color:#d54e21}.wp-ui-text-notification{color:#d54e21}.wp-ui-text-icon{color:#999}#nav-menu-footer,#nav-menu-header,#your-profile #rich_editing,.checkbox,.control-section .accordion-section-title,.menu-item-handle,.postbox h3,.side-info,.sidebar-name,.stuffbox h3,.widefat tfoot th,.widefat thead th,.widget .widget-top,h3.dashboard-widget-title,h3.dashboard-widget-title small,h3.dashboard-widget-title span{line-height:1.4em}.menu-item-handle,.widget .widget-top{background:#fafafa;color:#222}#namediv h3,#submitdiv h3,.postbox h3{border-bottom:1px solid #eee}.quicktags,.search{background-color:#ccc;color:#000;font-size:12px}.icon32{display:none}#bulk-titles div a:before,#welcome-panel.welcome-panel .welcome-panel-close::before,.tagchecklist span a:before{background:0 0;color:#bbb;content:'\f153';display:block!important;font:400 16px/1 dashicons;speak:none;height:20px;margin:2px 0;text-align:center;width:20px;-webkit-font-smoothing:antialiased!important}#bulk-titles div a:hover:before,#welcome-panel.welcome-panel .welcome-panel-close:hover:before,.tagchecklist span a:hover:before{color:#c00}.key-labels label{line-height:24px}b,strong{font-weight:600}.pre{white-space:pre-wrap;word-wrap:break-word}.howto{color:#666;font-style:italic;display:block}p.install-help{margin:8px 0;font-style:italic}.no-break{white-space:nowrap}hr{border:0;border-top:1px solid #ddd;border-bottom:1px solid #fafafa}#all-plugins-table .plugins a.delete,#media-items a.delete,#media-items a.delete-permanently,#nav-menu-footer .menu-delete,#search-plugins-table .plugins a.delete,.plugins a.delete,.row-actions span.delete a,.row-actions span.spam a,.row-actions span.trash a,.submitbox .submitdelete{color:#a00}#all-plugins-table .plugins a.delete:hover,#media-items a.delete-permanently:hover,#media-items a.delete:hover,#nav-menu-footer .menu-delete:hover,#search-plugins-table .plugins a.delete:hover,.file-error,.plugins a.delete:hover,.row-actions .delete a:hover,.row-actions .spam a:hover,.row-actions .trash a:hover,.submitbox .submitdelete:hover,.widget-control-remove:hover,abbr.required{color:red;text-decoration:none;border:0}#major-publishing-actions{padding:10px;clear:both;border-top:1px solid #ddd;background:#f5f5f5}#delete-action{line-height:28px;vertical-align:middle;text-align:right;float:right}#publishing-action{text-align:left;float:left;line-height:23px}#publishing-action .spinner{float:right}#misc-publishing-actions{padding:6px 0 0}.misc-pub-section{padding:6px 10px 8px}#minor-publishing-actions{padding:10px 10px 0;text-align:left}#save-post{float:right}.preview{float:left}#sticky-span{margin-right:18px}.side-info{margin:0;padding:4px;font-size:11px}.side-info h5{padding-bottom:7px;font-size:14px;margin:12px 2px 5px;border-bottom:1px solid #dadada}.side-info ul{margin:0;padding-right:18px;list-style:square;color:#666}.approve,.unapproved .unapprove{display:none}.spam .approve,.trash .approve,.unapproved .approve{display:inline}td.action-links,th.action-links{text-align:left}#update-nag,.update-nag{display:inline-block;line-height:19px;padding:11px 15px;font-size:14px;text-align:right;margin:25px 2px 0 20px;background-color:#fff;border-right:4px solid #ffba00;-webkit-box-shadow:0 1px 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 1px 0 rgba(0,0,0,.1)}.update-message{color:#000}.update-php .spinner{float:none;margin:-4px 0}#ajax-loading,.ajax-feedback,.ajax-loading,.imgedit-wait-spin,.list-ajax-loading{visibility:hidden}#ajax-response.alignleft{margin-right:2em}#adminmenu a,#catlist a,#sidemenu a,#taglist a{text-decoration:none}#contextual-help-wrap,#screen-options-wrap{margin:0;padding:8px 20px 12px;position:relative}#contextual-help-wrap{overflow:auto;margin-right:0!important}#screen-meta .screen-reader-text{visibility:hidden}#screen-meta-links{margin:0 0 0 20px}#screen-meta-links a{padding:3px 16px 3px 6px}#screen-meta-links a:focus{outline:0}#screen-meta{display:none;margin:0 0 -1px 20px;position:relative;background-color:#fff;border:1px solid #ddd;border-top:0;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.025);box-shadow:0 1px 0 rgba(0,0,0,.025)}#contextual-help-link-wrap,#screen-options-link-wrap{float:left;height:28px;margin:0 6px 0 0;border:1px solid #ddd;border-top:0;background:#fff;-webkit-box-shadow:0 1px 1px -1px rgba(0,0,0,.1);box-shadow:0 1px 1px -1px rgba(0,0,0,.1)}#screen-meta-links .screen-meta-toggle{position:relative;top:0}#screen-meta-links a{color:#777}#screen-meta-links a:active,#screen-meta-links a:focus,#screen-meta-links a:hover{color:#333}#screen-meta-links a:focus{border-color:#aaa;-webkit-box-shadow:0 2px 3px rgba(0,0,0,.15);box-shadow:0 2px 3px rgba(0,0,0,.15)}#screen-meta-links a.show-settings{display:block;font-size:13px;height:22px;line-height:22px;text-decoration:none;z-index:1}#screen-meta-links a:after{left:0;content:'\f140';font:400 20px/1 dashicons;speak:none;display:inline-block;padding:0 0 0 5px;bottom:2px;position:relative;vertical-align:bottom;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;color:#bbb}#screen-meta-links a.screen-meta-active:after{content:'\f142'}#screen-meta-links a.show-settings:hover{text-decoration:none}.toggle-arrow{background-repeat:no-repeat;background-position:top right;background-color:transparent;height:22px;line-height:22px;display:block}.toggle-arrow-active{background-position:bottom right}#contextual-help-wrap h5,#screen-options-wrap h5{margin:8px 0;font-size:13px}.metabox-prefs label{display:inline-block;padding-left:15px;line-height:30px}.metabox-prefs label input[type=checkbox]{margin-top:-4px;margin-left:6px}.metabox-prefs label input{margin:0 2px 0 5px}.metabox-prefs .columns-prefs label input{margin:0 2px}.metabox-prefs label a{display:none}#contextual-help-wrap{padding:0}#contextual-help-columns{position:relative}#contextual-help-back{position:absolute;top:0;bottom:0;right:150px;left:170px;border:1px solid #e1e1e1;border-top:0;border-bottom:0;background:#f6fbfd}#contextual-help-wrap.no-sidebar #contextual-help-back{left:0;border-left-width:0;-webkit-border-bottom-left-radius:2px;border-bottom-left-radius:2px}.contextual-help-tabs{float:right;width:150px;margin:0}.contextual-help-tabs ul{margin:1em 0}.contextual-help-tabs li{margin-bottom:0;list-style-type:none;border-style:solid;border-width:0 2px 0 0;border-color:transparent}.contextual-help-tabs a{display:block;padding:5px 12px 5px 5px;line-height:18px;text-decoration:none;border:1px solid transparent;border-left:0;border-right:0}.contextual-help-tabs a:hover{color:#333}.contextual-help-tabs .active{padding:0;margin:0 0 0 -1px;border-right:2px solid #2ea2cc;background:#f6fbfd;-webkit-box-shadow:0 2px 0 rgba(0,0,0,.02),0 1px 0 rgba(0,0,0,.02);box-shadow:0 2px 0 rgba(0,0,0,.02),0 1px 0 rgba(0,0,0,.02)}.contextual-help-tabs .active a{border-color:#e1e1e1;color:#333}.contextual-help-tabs-wrap{padding:0 20px;overflow:auto}.help-tab-content{display:none;margin:0 0 12px 22px;line-height:1.6em}.help-tab-content.active{display:block}.help-tab-content ul li{list-style-type:disc;margin-right:18px}.contextual-help-sidebar{width:150px;float:left;padding:0 12px 0 8px;overflow:auto}html.wp-toolbar{padding-top:32px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.narrow{width:70%;margin-bottom:40px}.narrow p{line-height:150%}.widefat td,.widefat th{overflow:hidden;color:#555}.widefat th{font-weight:400}.widefat tfoot tr th,.widefat thead tr th{color:#333}.widefat td p{margin:2px 0 .8em}.widefat ol,.widefat p,.widefat ul{color:#333}.widefat .column-comment p{margin:.6em 0}.postbox-container{float:right}.postbox-container .meta-box-sortables{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#wpbody-content .metabox-holder{padding-top:10px}.metabox-holder .postbox-container .empty-container{border:3px dashed #bbb;height:250px}.columns-2 #postbox-container-3 .empty-container,.columns-2 #postbox-container-4 .empty-container,.columns-3 #postbox-container-4 .empty-container,.metabox-holder.columns-1 .postbox-container .empty-container{border:0 none;height:0;min-height:0}#post-body-content{width:100%;min-width:463px;float:right}#post-body.columns-2 #postbox-container-1{float:left;margin-left:-300px;width:280px}#post-body.columns-2 #side-sortables{min-height:250px}@media only screen and (max-width:799px){#wpbody-content .metabox-holder .postbox-container .empty-container{border:0 none;height:0;min-height:0}}.js .postbox .hndle{cursor:move}.hndle a{font-size:11px;font-weight:400}.postbox .handlediv{float:left;width:27px;height:30px}.js .postbox .handlediv{cursor:pointer}.sortable-placeholder{border:1px dashed #bbb;margin-bottom:20px}.postbox,.stuffbox{margin-bottom:20px;padding:0;line-height:1}.postbox h3,.stuffbox h3{margin-top:1px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.js .postbox h3,.js .widget .widget-top{cursor:move}.postbox .inside,.stuffbox .inside{padding:0 12px 12px;line-height:1.4em;font-size:13px}.postbox .inside{margin:11px 0;position:relative}.postbox .inside>p:last-child,.rss-widget ul li:last-child{margin-bottom:1px!important}.postbox.closed h3{border:0;-webkit-box-shadow:none;box-shadow:none}.postbox table.form-table{margin-bottom:0}.postbox table.widefat{-webkit-box-shadow:none;box-shadow:none}.temp-border{border:1px dotted #ccc}.columns-prefs label{padding:0 5px}#adminmenu .wp-submenu li.current,#adminmenu .wp-submenu li.current a,#adminmenu .wp-submenu li.current a:hover,#dashboard_right_now .versions .b,#ed_reply_toolbar #ed_reply_strong,#pass-strength-result.short,#pass-strength-result.strong,#post-status-display,#post-visibility-display,.feature-filter .feature-name,.item-controls .item-order a,.media-item .percent,.plugins .name{font-weight:600}#wpfooter{position:absolute;bottom:0;right:0;left:0;padding:10px 0;margin-left:20px;color:#777}#wpfooter p{font-size:13px;margin:0;line-height:20px}#footer-thankyou{font-style:italic}#wpfooter a{text-decoration:none}#wpfooter a:hover{text-decoration:underline}.nav-tab{border:1px solid #ccc;border-bottom:0;background:#e4e4e4;color:#555;font-size:12px;line-height:16px;display:inline-block;padding:4px 14px 6px;text-decoration:none;margin:-4px 0 -1px 4px}.nav-tab:hover{background-color:#fff;color:#464646}.nav-tab-active,.nav-tab-active:hover{border-bottom:1px solid #f1f1f1;background:#f1f1f1;color:#000}h2.nav-tab-wrapper,h3.nav-tab-wrapper{border-bottom:1px solid #ccc;padding-bottom:0;padding-right:10px}h2 .nav-tab{padding:6px 10px;font-weight:700;font-size:15px;line-height:24px}.spinner{background:url(../images/spinner.gif) no-repeat;-webkit-background-size:20px 20px;background-size:20px 20px;display:none;float:left;opacity:.7;filter:alpha(opacity=70);width:20px;height:20px;margin:2px 5px 0}#template div{margin-left:190px}.metabox-holder h3{font-size:14px;padding:8px 12px;margin:0;line-height:1.4}#templateside ul li a{text-decoration:none}#sidemenu{margin:-30px 315px 0 15px;list-style:none;position:relative;float:left;padding-right:10px;font-size:12px}#sidemenu a{padding:0 7px;display:block;float:right;line-height:28px;border-top:1px solid #f9f9f9;border-bottom:1px solid #dfdfdf;background-color:#f9f9f9;-webkit-transition:none;transition:none}#sidemenu li{display:inline;line-height:200%;list-style:none;text-align:center;white-space:nowrap;margin:0;padding:0}#sidemenu a.current{font-weight:400;padding-right:6px;padding-left:6px;-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;border:1px solid #dfdfdf;border-bottom-color:#f1f1f1;background-color:#f1f1f1;color:#000}.plugin-install #description,.plugin-install-network #description{width:60%}table .column-rating,table .column-visible,table .vers{text-align:right}.error-message{color:red;font-weight:600}body.iframe{height:98%}.lp-show-latest p{display:none}.lp-show-latest .lp-error p,.lp-show-latest p:last-child{display:block}td.media-icon{text-align:center;width:80px;padding-top:8px;padding-bottom:8px}td.media-icon img{max-width:80px;max-height:60px}#howto{font-size:11px;margin:0 5px;display:block}.importers td{padding-left:14px}.importers{font-size:16px;width:auto}#post-body #post-body-content #namediv h3{margin-top:0}#namediv h3 label{vertical-align:baseline}#namediv table{width:100%}#namediv td.first{width:10px;white-space:nowrap}#namediv input{width:98%}#namediv p{margin:10px 0}#submitdiv h3{margin-bottom:0!important}.zerosize{height:0;width:0;margin:0;border:0;padding:0;overflow:hidden;position:absolute}br.clear{height:2px;line-height:2px}.checkbox{border:0;margin:0;padding:0}fieldset{border:0;padding:0;margin:0}.post-categories{display:inline;margin:0;padding:0}.post-categories li{display:inline}div.star-holder{position:relative;height:17px;width:100px;background:url(../images/stars.png?ver=20121108) repeat-x bottom right}div.star-holder .star-rating{background:url(../images/stars.png?ver=20121108) repeat-x top right;height:17px;float:right}.star-rating{white-space:nowrap}.star-rating .star{display:inline-block;width:20px;height:20px;-webkit-font-smoothing:antialiased;font-size:20px;line-height:1;font-family:dashicons;text-decoration:inherit;font-weight:400;font-style:normal;vertical-align:top;-webkit-transition:color .1s ease-in 0;transition:color .1s ease-in 0;text-align:center;color:#0074a2}.star-rating .star-full:before{content:'\f155'}.star-rating .star-half:before{content:'\f459'}.rtl .star-rating .star-half{-webkit-transform:rotateY(180deg);-ms-transform:rotateY(180deg);transform:rotateY(180deg)}.star-rating .star-empty:before{content:'\f154'}div.action-links{font-weight:400;margin:6px 0 0}#plugin-information{background:#fcfcfc;position:fixed;top:0;left:0;bottom:0;right:0;height:auto;padding:0}#plugin-information-title{padding:0 20px 0 76px;font-size:22px;font-weight:600;line-height:56px;top:0;left:0;right:0;height:56px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}#plugin-information-tabs{padding:0 16px;position:absolute;top:56px;left:0;right:0;height:36px;z-index:1}#plugin-information-tabs a{position:relative;float:right;padding:8px 10px 9px;margin:0;height:18px;line-height:18px;font-size:14px;text-decoration:none;-webkit-transition:none;transition:none}#plugin-information-tabs a.current{margin:-1px -1px 0;background:#fff;border:1px solid #ddd;border-bottom:0;color:#333}#plugin-information-tabs a:active,#plugin-information-tabs a:focus{outline:0}#plugin-information-content{background:#fff;border-top:1px solid #ddd;border-bottom:1px solid #ddd;position:absolute;top:90px;left:0;bottom:58px;right:0}#section-holder{margin:0;padding:10px 26px;position:absolute;top:0;left:250px;bottom:0;right:0;overflow:auto}#section-holder .updated{margin:16px 0}#plugin-information .fyi{background:#f3f3f3;border-right:1px solid #ddd;color:#666;padding:16px;position:absolute;top:0;left:0;bottom:0;width:217px;overflow:auto}#plugin-information .fyi strong{color:#464646}#plugin-information .fyi h3{font-weight:700;text-transform:uppercase;font-size:12px;color:#666;margin:24px 0 8px}#plugin-information .fyi h2{font-size:.9em;margin-bottom:0;margin-left:0}#plugin-information .fyi ul{padding:0;margin:0;list-style:none}#plugin-information .fyi li{margin:0 0 10px}#plugin-information-footer{padding:15px 16px;position:absolute;left:0;bottom:0;right:0;height:28px}#plugin-information .section ol,#plugin-information .section ul{list-style-type:disc;margin-right:24px}#plugin-information .section,#plugin-information .section p{font-size:14px;line-height:1.7}#plugin-information #section-screenshots ol{list-style:none;margin:0}#plugin-information #section-screenshots li img{vertical-align:text-top;margin-top:16px;max-width:100%;width:auto;height:auto;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.3);box-shadow:0 1px 2px rgba(0,0,0,.3)}#plugin-information #section-screenshots li p{font-style:italic;padding-right:20px}#plugin-information pre{padding:7px;overflow:auto;border:1px solid #ccc}.plugin-version-author-uri{font-size:13px}@media screen and (max-width:782px){#plugin-information-content{overflow:auto;bottom:58px}#plugin-information .fyi{border:1px solid #ddd;position:static;width:auto;margin:26px 26px 16px}#section-holder{position:static}#plugin-information .fyi h3,#plugin-information .fyi small{display:none}#plugin-information-footer{padding:12px 16px 0;height:46px}}body.import-php #TB_window,body.index-php #TB_window,body.plugin-install-php #TB_window,body.plugins-php #TB_window,body.update-core-php #TB_window{background:#fcfcfc url( ../images/spinner.gif ) no-repeat center}@media print,(-o-min-device-pixel-ratio:5/4),(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){body.import-php #TB_window,body.index-php #TB_window,body.plugin-install-php #TB_window,body.plugins-php #TB_window,body.update-core-php #TB_window{background:#fcfcfc url( ../images/spinner-2x.gif ) no-repeat center;-webkit-background-size:20px 20px;background-size:20px 20px}}body.import-php #TB_title,body.index-php #TB_title,body.plugin-install-php #TB_title,body.plugins-php #TB_title,body.update-core-php #TB_title{float:right;height:1px}body.import-php #TB_ajaxWindowTitle,body.index-php #TB_ajaxWindowTitle,body.plugin-install-php #TB_ajaxWindowTitle,body.plugins-php #TB_ajaxWindowTitle,body.update-core-php #TB_ajaxWindowTitle{display:none}body.import-php .tb-close-icon,body.index-php .tb-close-icon,body.plugin-install-php .tb-close-icon,body.plugins-php .tb-close-icon,body.update-core-php .tb-close-icon{line-height:48px;width:48px;height:48px}body.import-php .tb-close-icon:before,body.index-php .tb-close-icon:before,body.plugin-install-php .tb-close-icon:before,body.plugins-php .tb-close-icon:before,body.update-core-php .tb-close-icon:before{line-height:48px}img{border:0}#wphead{border-bottom:1px solid #dfdfdf}#wphead h1 a{color:#464646}.js .meta-box-sortables .postbox:hover .handlediv{margin-left:0!important}.js .meta-box-sortables .postbox .handlediv:before,.js .sidebar-name .sidebar-name-arrow:before{left:12px;font:400 20px/1 dashicons;speak:none;display:inline-block;padding:8px 10px;top:0;position:relative;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important}.js #widgets-left .sidebar-name .sidebar-name-arrow{display:none}.js #widgets-left .sidebar-name:hover .sidebar-name-arrow,.js #widgets-left .widgets-holder-wrap.closed .sidebar-name .sidebar-name-arrow{display:block}.js .meta-box-sortables .postbox .handlediv:before,.js .sidebar-name .sidebar-name-arrow:before{content:'\f142'}.js .meta-box-sortables .postbox.closed .handlediv:before,.js .widgets-holder-wrap.closed .sidebar-name-arrow:before{content:'\f140'}.error a{text-decoration:underline}.updated a{text-decoration:none;padding-bottom:2px}#photo-add-url-div input[type=text]{width:300px}.alignleft h3{margin:0}#template textarea{font-family:Consolas,Monaco,monospace;font-size:13px;width:97%;background:#f9f9f9;outline:0}#docs-list,#template textarea{direction:ltr}#template p{width:97%}#templateside{float:left;width:190px;word-wrap:break-word}#postcustomstuff p.submit,#templateside h3{margin:0}#templateside h4{margin:1em 0 0}#templateside ol,#templateside ul{margin:.5em 0;padding:0}#templateside li{margin:4px 0}#templateside a,.theme-editor-php .highlight{display:block;padding:3px 12px 3px 3px;text-decoration:none}.theme-editor-php .highlight{margin:-3px -12px -3px 3px}#templateside .highlight{border:0;font-weight:700}.nonessential{color:#666;font-size:11px;font-style:italic;padding-right:12px}#documentation{margin-top:10px}#documentation label{line-height:22px;vertical-align:baseline;font-weight:600}.fileedit-sub{padding:10px 0 8px;line-height:180%}.accordion-section-title:after,.control-section .accordion-section-title:after,.nav-menus-php .item-edit:before,.widget-top a.widget-action:after{left:0;content:'\f140';border:0;background:0 0;font:400 20px/1 dashicons;speak:none;display:block;padding:0;text-indent:0;text-align:center;position:relative;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important}.accordion-section-title:after,.handlediv,.item-edit,.sidebar-name-arrow,.widget-action{color:#aaa}.accordion-section-title:hover:after,.handlediv:hover,.item-edit:hover,.sidebar-name:hover .sidebar-name-arrow,.widget-action:hover{color:#777}.widget-top a.widget-action:after{padding:12px 12px 0}.nav-menus-php .item-edit:before{line-height:2.1}.accordion-section-title:after,.control-section .accordion-section-title:after{float:left;left:20px;top:-2px}#customize-info.open .accordion-section-title:after,.control-section.open .accordion-section-title:after,.nav-menus-php .menu-item-edit-active .item-edit:before{content:'\f142'}.ui-draggable,.ui-sortable{-ms-touch-action:none;touch-action:none}.menu.ui-sortable,.meta-box-sortables.ui-sortable,.widgets-holder-wrap .ui-draggable,.widgets-holder-wrap .ui-sortable{-ms-touch-action:auto;touch-action:auto}.menu.ui-sortable .menu-item-handle,.meta-box-sortables.ui-sortable .hndle{-ms-touch-action:none;touch-action:none}.accordion-section{border-bottom:1px solid #dfdfdf;margin:0}.accordion-section.open .accordion-section-content,.no-js .accordion-section .accordion-section-content{display:block}.accordion-section.open:hover{border-bottom-color:#dfdfdf}.accordion-section-content{display:none;padding:10px 20px 15px;overflow:hidden;background:#fff}.accordion-section-title{margin:0;padding:12px 15px 15px;position:relative;border-right:1px solid #dfdfdf;border-left:1px solid #dfdfdf;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.js .accordion-section-title{cursor:pointer}.js .accordion-section-title:after{position:absolute;top:12px;left:10px;z-index:1}.accordion-section-title:focus{outline:0}.accordion-section-title:focus:after,.accordion-section-title:hover:after{border-color:#aaa transparent}.cannot-expand .accordion-section-title{cursor:auto}.cannot-expand .accordion-section-title:after{display:none}.control-section .accordion-section-title{border-right:0;border-left:0;padding:10px 14px 11px 10px;line-height:21px;background:#fff}.control-section .accordion-section-title:after{top:11px}.js .control-section .accordion-section-title:focus,.js .control-section .accordion-section-title:hover,.js .control-section.open .accordion-section-title,.js .control-section:hover .accordion-section-title{color:#222;background:#f5f5f5}.control-section.open .accordion-section-title{border-bottom:1px solid #dfdfdf}@media only screen and (min-width:769px){#col-left{width:35%}#col-right{width:65%}}@media only screen and (max-width:860px){#col-left{width:35%}#col-right{width:65%}}@media only screen and (min-width:980px){#col-left{width:35%}#col-right{width:65%}}@media only screen and (max-width:768px){#col-left,#col-right{width:100%}}@media print,(-o-min-device-pixel-ratio:5/4),(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){div.star-holder,div.star-holder .star-rating{background:url(../images/stars-2x.png?ver=20121108) repeat-x bottom right;-webkit-background-size:21px 37px;background-size:21px 37px}.spinner{background-image:url(../images/spinner-2x.gif)}#bulk-titles div a,#bulk-titles div a:hover,#screen-meta-links a.show-settings,.curtime #timestamp,.meta-box-sortables .postbox:hover .handlediv,.sidebar-name-arrow,.sidebar-name:hover .sidebar-name-arrow,.tagchecklist span a,.tagchecklist span a:hover,.widget-top a.widget-action,.widget-top a.widget-action:hover{background:none!important}}@-ms-viewport{width:device-width}@media screen and (max-width:782px){html.wp-toolbar{padding-top:46px}body{min-width:240px;overflow-x:hidden}body *{-webkit-tap-highlight-color:rgba(0,0,0,0)!important}#wpwrap{background:#f0f0f0}#wpcontent{position:relative;margin-right:0;padding-right:10px}#wpbody-content{padding-bottom:100px}.wrap{margin-left:12px;margin-right:0}.col-wrap{padding:0}#collapse-menu,#screen-meta,#screen-meta-links,.post-format-select{display:none!important}.wrap .add-new-h2,.wrap .add-new-h2:active{padding:10px 15px;font-size:14px}.wp-color-result{height:auto;padding-right:45px}.wp-color-result:after{font-size:14px;height:auto;padding:6px 14px}.media-upload-form div.error,.wrap div.error,.wrap div.updated{margin:20px 0 10px;padding:5px 10px;font-size:14px;line-height:175%}.wrap .icon32+h2{margin-top:-2px}.wp-responsive-open #wpbody{left:-190px}.postbox{font-size:14px}.metabox-holder h3{padding:12px}.postbox .handlediv{margin-top:3px}.subsubsub{font-size:16px;text-align:center;margin-bottom:15px}#templateside{float:none;width:auto}#templateside li{margin:0}#templateside li a{display:block;padding:5px}#templateside .highlight{padding:5px;margin-right:-5px;margin-top:-5px}#template div{float:none;margin:0;width:auto}#template textarea{width:100%}.fileedit-sub .alignright{margin-top:15px}#comments-form .checkforspam,#wpfooter{display:none}}@media screen and (max-width:600px){#wpwrap.wp-responsive-open{overflow-x:hidden}html.wp-toolbar{padding-top:0}#wpbody{padding-top:46px}div#post-body.metabox-holder.columns-1{overflow-x:hidden}}input,input[type=email],input[type=number],input[type=password],input[type=search],input[type=text],input[type=url],textarea{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=email],input[type=url]{direction:ltr}input[type=checkbox],input[type=radio]{border:1px solid #bbb;background:#fff;color:#555;clear:none;cursor:pointer;display:inline-block;line-height:0;height:16px;margin:-4px 0 0 4px;outline:0;padding:0!important;text-align:center;vertical-align:middle;width:16px;min-width:16px;-webkit-appearance:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1);-webkit-transition:.05s border-color ease-in-out;transition:.05s border-color ease-in-out}input[type=radio]:checked+label:before{color:#888}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#2ea2cc}.wp-admin p input[type=checkbox],.wp-admin p input[type=radio],td>input[type=checkbox]{margin-top:0}.wp-admin p label input[type=checkbox]{margin-top:-4px}.wp-admin p label input[type=radio]{margin-top:-2px}input[type=radio]{-webkit-border-radius:50%;border-radius:50%;margin-left:4px;line-height:10px}input[type=checkbox]:checked:before,input[type=radio]:checked:before{float:right;display:inline-block;vertical-align:middle;width:16px;font:400 21px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}input[type=checkbox]:checked:before{content:'\f147';margin:-3px -4px 0 0;color:#1e8cbe}input[type=radio]:checked:before{content:'\2022';text-indent:-9999px;-webkit-border-radius:50px;border-radius:50px;font-size:24px;width:6px;height:6px;margin:4px;line-height:16px;background-color:#1e8cbe}input.readonly,textarea.readonly{background-color:#ddd}@-moz-document url-prefix(){.form-table input.tog,input[type=checkbox],input[type=radio]{margin-bottom:-1px}}input[type=search]{-webkit-appearance:textfield}input[type=search]::-webkit-search-decoration{display:none}.ie8 input[type=password]{font-family:sans-serif}button,input,select,textarea{font-family:inherit;font-size:inherit;font-weight:inherit}input,select,textarea{font-size:14px;padding:3px 5px;line-height:15px;-webkit-border-radius:0;border-radius:0}textarea{overflow:auto;padding:2px 6px;line-height:1.4}input[type=email],input[type=number],input[type=password],input[type=search],input[type=text],input[type=url],select,textarea{outline:0}.wp-admin input[type=file]{padding:3px 0}label{cursor:pointer}input,select{margin:1px;padding:3px 5px}input.code{padding-top:6px}textarea.code{line-height:1.4;padding:4px 6px 1px}input[type=email],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=url],select,textarea{border:1px solid #ddd;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.07);box-shadow:inset 0 1px 2px rgba(0,0,0,.07);background-color:#fff;color:#333;-webkit-transition:.05s border-color ease-in-out;transition:.05s border-color ease-in-out}select[disabled]{color:#7f7f7f}input[type=checkbox]:focus,input[type=email]:focus,input[type=number]:focus,input[type=password]:focus,input[type=radio]:focus,input[type=search]:focus,input[type=tel]:focus,input[type=text]:focus,input[type=url]:focus,select:focus,textarea:focus{border-color:#5b9dd9;-webkit-box-shadow:0 0 2px rgba(30,140,190,.8);box-shadow:0 0 2px rgba(30,140,190,.8)}input[readonly]{background-color:#eee}.wp-core-ui :-moz-placeholder,:-moz-placeholder{color:#a9a9a9}.form-invalid{background-color:#ffebe8!important}.form-invalid input,.form-invalid select{border-color:#c00!important}.form-input-tip{color:#666}input.disabled,input:disabled,textarea.disabled,textarea:disabled{-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.04);box-shadow:inset 0 1px 2px rgba(0,0,0,.04);border-color:rgba(222,222,222,.75);background:rgba(255,255,255,.5);color:rgba(51,51,51,.5)}input[type=checkbox]:disabled,input[type=checkbox]:disabled:checked:before,input[type=radio]:disabled,input[type=radio]:disabled:checked:before{opacity:.7}.wp-admin select{padding:2px;line-height:28px;height:28px;vertical-align:middle}.wp-admin .button-cancel{padding:0 5px;line-height:2}.meta-box-sortables select{max-width:100%}.wp-admin select[multiple]{height:auto}.submit{padding:1.5em 0;margin:5px 0;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;border:0}form p.submit a.cancel:hover{text-decoration:none}p.submit{text-align:right;max-width:100%;margin-top:20px;padding-top:10px}.textright p.submit{border:0;text-align:left}table.form-table+input+input+p.submit,table.form-table+input+p.submit,table.form-table+p.submit{border-top:0;padding-top:0}#major-publishing-actions input,#minor-publishing-actions .preview,#minor-publishing-actions input{text-align:center}input.all-options,textarea.all-options{width:250px}input.large-text,textarea.large-text{width:99%}#adduser .form-field input,input.regular-text{width:25em}input.small-text{width:50px;padding:1px 6px}input[type=number].small-text{width:65px}#doaction,#doaction2,#post-query-submit{margin:1px 0 0 8px}.tablenav #changeit,.tablenav #clear-recent-list,.tablenav #delete_all{margin-top:1px}.tablenav .actions select{float:right;margin-left:6px;max-width:200px}.ie8 .tablenav .actions select{width:155px}.ie8 .tablenav .actions select#cat{width:200px}#timezone_string option{margin-right:1em}#upload-form label{color:#777}#your-profile label+a,fieldset label,label{vertical-align:middle}#misc-publishing-actions label,.options-media-php label[for*="_size_"]{vertical-align:baseline}#misc-publishing-actions label[for=post_status]:before{content:'\f173';display:inline-block;font:400 20px/1 dashicons;speak:none;right:-1px;padding:0 0 0 5px;position:relative;top:0;text-decoration:none!important;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#pass-strength-result{background-color:#eee;border:1px solid #ddd;float:right;margin:13px 1px 5px 5px;padding:3px 5px;text-align:center;width:200px;display:none}#pass-strength-result.short{background-color:#ffa0a0;border-color:#f04040}#pass-strength-result.bad{background-color:#ffb78c;border-color:#ff853c}#pass-strength-result.good{background-color:#ffec8b;border-color:#fc0}#pass-strength-result.strong{background-color:#c3ff88;border-color:#8dff1c}.indicator-hint{padding-top:8px}p.search-box{float:left;margin:0}.network-admin.themes-php p.search-box{clear:right}#search-plugins input[name="s"],.search-box input[name="s"],.tagsdiv .newtag{float:right;height:28px;margin:0 0 0 4px}input[type=text].ui-autocomplete-loading{background:transparent url(../images/loading.gif) no-repeat left center;visibility:visible}ul#add-to-blog-users{margin:0 14px 0 0}.ui-autocomplete-input.open{-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0;-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0}.ui-autocomplete{padding:0;margin:0;list-style:none;position:absolute;z-index:10000;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;border:1px solid #aaa;background-color:#efefef}.ui-autocomplete li{margin-bottom:0;white-space:nowrap;text-align:right}.ui-autocomplete li a{display:block;height:100%;padding:4px 10px;color:#444}.ui-autocomplete li a.ui-state-focus{background-color:#ddd;cursor:pointer}.form-table{border-collapse:collapse;margin-top:.5em;width:100%;clear:both}.form-table,.form-table td,.form-table td p,.form-table th,.form-wrap label{font-size:14px}.form-table td{margin-bottom:9px;padding:15px 10px;line-height:1.3;vertical-align:middle}.form-table th,.form-wrap label{color:#222;font-weight:400;text-shadow:none;vertical-align:baseline}.form-table th{vertical-align:top;text-align:right;padding:20px 0 20px 10px;width:200px;line-height:1.3;font-weight:600}.form-table th.th-full{width:auto;font-weight:400}.form-table td p{margin-top:4px;margin-bottom:0}.form-table td fieldset label{margin:.25em 0 .5em!important;display:inline-block}.form-table td fieldset label,.form-table td fieldset li,.form-table td fieldset p{line-height:1.4em}.form-table input.tog,.form-table input[type=radio]{margin-top:-4px;margin-left:4px;float:none}.form-table .pre{padding:8px;margin:0}table.form-table td .updated{font-size:13px}#profile-page .form-table textarea{width:500px;margin-bottom:6px}#profile-page .form-table #rich_editing{margin-left:5px}#your-profile legend{font-size:22px}#display_name{width:15em}#createuser .form-field input{width:25em}.color-option{display:inline-block;width:24%;padding:5px 15px 15px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin-bottom:3px}.color-option.selected,.color-option:hover{background:#ddd}.color-palette{width:100%;border-spacing:0;border-collapse:collapse}.color-palette td{height:20px;padding:0;border:0}.color-option{cursor:pointer}.tool-box .title{margin:8px 0;font-size:18px;font-weight:400;line-height:24px}.pressthis{margin:20px 0}.pressthis a,.pressthis a:active,.pressthis a:focus,.pressthis a:hover{display:inline-block;position:relative;cursor:move;color:#333;background:#e6e6e6;-webkit-border-radius:5px;border-radius:5px;border:1px solid #b4b4b4;font-style:normal;line-height:16px;font-size:14px;text-decoration:none}.pressthis a:active{outline:0}.pressthis a:hover:after{-webkit-transform:skew(20deg) rotate(9deg);-ms-transform:skew(20deg) rotate(9deg);transform:skew(20deg) rotate(9deg);-webkit-box-shadow:0 10px 8px rgba(0,0,0,.7);box-shadow:0 10px 8px rgba(0,0,0,.7)}.pressthis a span{display:inline-block;margin:0;padding:0 9px 8px 12px}.pressthis a span:before{color:#777;font:400 20px/1 dashicons;content:'\f157';position:relative;display:inline-block;top:4px;margin-left:4px}.pressthis a:after{content:'';width:70%;height:55%;z-index:-1;position:absolute;left:10px;bottom:9px;background:0 0;-webkit-transform:skew(20deg) rotate(6deg);-ms-transform:skew(20deg) rotate(6deg);transform:skew(20deg) rotate(6deg);-webkit-box-shadow:0 10px 8px rgba(0,0,0,.6);box-shadow:0 10px 8px rgba(0,0,0,.6)}#local-time,#utc-time{padding-right:25px;font-style:italic}.defaultavatarpicker .avatar{margin:2px 0;vertical-align:middle}.options-general-php .spinner{float:none;margin:-3px 3px}@media screen and (max-width:782px){textarea{-webkit-appearance:none}input[type=number],input[type=password],input[type=search],input[type=text]{-webkit-appearance:none;padding:6px 10px}input.code{padding-bottom:5px;padding-top:10px}.widefat th input[type=checkbox],input[type=checkbox]{-webkit-appearance:none;padding:10px}.widefat th input[type=checkbox]{margin-bottom:8px}.widefat th input[type=checkbox]:before,input[type=checkbox]:checked:before{font:400 30px/1 Dashicons;margin:-3px -5px}input[type=checkbox],input[type=radio]{height:25px;width:25px}.wp-admin p input[type=checkbox],.wp-admin p input[type=radio]{margin-top:-3px}input[type=radio]:checked:before{vertical-align:middle;width:9px;height:9px;margin:7px;line-height:16px}.wp-upload-form input[type=submit]{margin-top:10px}#wpbody select{height:36px;font-size:16px}.wp-admin .button-cancel{padding:0;font-size:14px}#createuser .form-field input{width:100%}.form-table{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.form-table td,.form-table th{display:block;width:auto;vertical-align:middle}.form-table .color-palette td{display:table-cell;width:15px}.form-table table.color-palette{margin-left:10px}input,textarea{font-size:16px}#profile-page .form-table textarea,.form-table span.description,.form-table td input[type=password],.form-table td input[type=text],.form-table td select,.form-table td textarea{width:100%;font-size:16px;line-height:1.5;padding:7px 10px;display:block;max-width:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.form-table input[type=text].small-text,input[type=number].small-text,input[type=password].small-text,input[type=search].small-text,input[type=text].small-text{width:auto;max-width:55px;display:inline;padding:3px 6px;margin:0 3px}#pass-strength-result{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:8px}p.search-box{float:none;position:absolute;bottom:0;width:98%;height:90px;margin-bottom:20px}p.search-box input[name="s"]{height:auto;float:none;width:100%;margin-bottom:10px;vertical-align:middle;-webkit-appearance:none}p.search-box input[type=submit]{margin-bottom:10px}.form-table span.description{padding:4px 0 0;line-height:1.4em}.form-table th{padding-top:10px;padding-bottom:0;border-bottom:0}.form-table td{padding-top:8px;padding-right:0}.form-table input.regular-text{width:100%}.form-table label{font-size:14px}.form-table fieldset label{display:block}#utc-time{margin-top:10px}#local-time,#utc-time{display:block;float:none;padding:0;line-height:2}}@media only screen and (max-width:768px){.form-field input,.form-field textarea{width:99%}.form-wrap .form-field{padding:0}#profile-page .form-table textarea{max-width:400px;width:auto}}@media screen and (max-width:600px){.color-option{width:49%}}#adminmenu,#adminmenu .wp-submenu,#adminmenuback,#adminmenuwrap{width:160px;background-color:#222}#adminmenuback{position:absolute;top:0;bottom:0;z-index:-1}#adminmenu{clear:right;margin:12px 0 0;padding:0;list-style:none}.folded #adminmenu,.folded #adminmenu li.menu-top,.folded #adminmenuback,.folded #adminmenuwrap{width:36px}.icon16{height:18px;width:18px;padding:6px;margin:-6px -8px 0 0;float:right}.icon16:before{color:#999;font:400 20px/1 dashicons;speak:none;padding:6px 0;height:34px;width:20px;display:inline-block;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}.icon16.icon-dashboard:before{content:'\f226'}.icon16.icon-post:before{content:'\f109'}.icon16.icon-media:before{content:'\f104'}.icon16.icon-links:before{content:'\f103'}.icon16.icon-page:before{content:'\f105'}.icon16.icon-comments:before{content:'\f101';margin-top:1px}.icon16.icon-appearance:before{content:'\f100'}.icon16.icon-plugins:before{content:'\f106'}.icon16.icon-users:before{content:'\f110'}.icon16.icon-tools:before{content:'\f107'}.icon16.icon-settings:before{content:'\f108'}.icon16.icon-site:before{content:'\f112'}.icon16.icon-generic:before{content:'\f111'}.icon16.icon-appearance,.icon16.icon-comments,.icon16.icon-dashboard,.icon16.icon-generic,.icon16.icon-links,.icon16.icon-media,.icon16.icon-page,.icon16.icon-plugins,.icon16.icon-post,.icon16.icon-settings,.icon16.icon-site,.icon16.icon-tools,.icon16.icon-users,.menu-icon-appearance div.wp-menu-image,.menu-icon-comments div.wp-menu-image,.menu-icon-dashboard div.wp-menu-image,.menu-icon-generic div.wp-menu-image,.menu-icon-links div.wp-menu-image,.menu-icon-media div.wp-menu-image,.menu-icon-page div.wp-menu-image,.menu-icon-plugins div.wp-menu-image,.menu-icon-post div.wp-menu-image,.menu-icon-settings div.wp-menu-image,.menu-icon-site div.wp-menu-image,.menu-icon-tools div.wp-menu-image,.menu-icon-users div.wp-menu-image{background-image:none!important}#adminmenuwrap{position:relative;float:right}#adminmenu *{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}#adminmenu li{margin:0;padding:0;cursor:pointer}#adminmenu a{display:block;line-height:18px;padding:2px 5px;color:#eee}#adminmenu .wp-submenu a{color:#bbb}#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover{background:0 0}#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a:hover,#adminmenu li.menu-top>a:focus{color:#2ea2cc}#adminmenu li.menu-top{border:0;min-height:34px;position:relative}#adminmenu .wp-submenu{list-style:none;position:absolute;top:-1000em;right:160px;overflow:visible;word-wrap:break-word}#adminmenu .wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu,.folded #adminmenu a.wp-has-current-submenu:focus+.wp-submenu{padding:7px 0 8px;z-index:9999;background-color:#333;-webkit-box-shadow:0 3px 5px rgba(0,0,0,.2);box-shadow:0 3px 5px rgba(0,0,0,.2)}#adminmenu a.menu-top:focus+.wp-submenu,.js #adminmenu .opensub .wp-submenu,.js #adminmenu .sub-open,.no-js li.wp-has-submenu:hover .wp-submenu{top:-1px}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu .wp-submenu.sub-open,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.no-js li.wp-has-current-submenu:hover .wp-submenu{position:relative;z-index:3;top:auto;right:auto;left:auto;bottom:auto;border:0 none;margin-top:0;-webkit-box-shadow:none;box-shadow:none;background-color:#333}#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{position:relative;background-color:#111}.folded #adminmenu li.menu-top:hover,.folded #adminmenu li.opensub>a.menu-top,.folded #adminmenu li>a.menu-top:focus{z-index:10000}#adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu .wp-menu-arrow,#adminmenu .wp-menu-arrow div,#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top,.folded #adminmenu li.wp-has-current-submenu{background:#0074a2;color:#fff}.folded #adminmenu .opensub .wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu.sub-open,.folded #adminmenu .wp-has-current-submenu a.menu-top:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu.opensub .wp-submenu,.folded #adminmenu .wp-submenu.sub-open,.folded #adminmenu a.menu-top:focus+.wp-submenu,.no-js.folded #adminmenu .wp-has-submenu:hover .wp-submenu{top:0;right:36px}.folded #adminmenu .wp-has-current-submenu .wp-submenu,.folded #adminmenu a.wp-has-current-submenu:focus+.wp-submenu{position:absolute;top:-1000em}#adminmenu .wp-not-current-submenu .wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{min-width:160px;width:auto}#adminmenu .wp-submenu a{font-size:13px;line-height:1.2;margin:0;padding:6px 0}#adminmenu .opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current,#adminmenu .wp-submenu li.current a,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-not-current-submenu li>a,.folded #adminmenu .wp-has-current-submenu li>a{padding-left:16px;padding-right:14px;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}#adminmenu .wp-has-current-submenu ul>li>a,.folded #adminmenu li.menu-top .wp-submenu>li>a{padding:6px 12px}#adminmenu .wp-submenu-head,#adminmenu a.menu-top{font-size:14px;font-weight:400;line-height:18px;padding:0}#adminmenu .wp-submenu-head,.folded #adminmenu .wp-menu-name{display:none}.folded #adminmenu .wp-submenu-head{display:block}#adminmenu .wp-submenu li{padding:0;margin:0;overflow:hidden}#adminmenu .wp-menu-image img{padding:9px 0 0;opacity:.6;filter:alpha(opacity=60)}#adminmenu div.wp-menu-name{padding:8px 0}#adminmenu div.wp-menu-image{float:right;width:36px;height:34px;margin:0;text-align:center}#adminmenu div.wp-menu-image.svg{background-repeat:no-repeat;background-position:center;-webkit-background-size:20px auto;background-size:20px auto}div.wp-menu-image:before{color:#999;padding:7px 0;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}#adminmenu div.wp-menu-image:before{color:#999}#adminmenu .current div.wp-menu-image:before,#adminmenu .wp-has-current-submenu div.wp-menu-image:before,#adminmenu a.current:hover div.wp-menu-image:before,#adminmenu a.wp-has-current-submenu:hover div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu:hover div.wp-menu-image:before{color:#fff}#adminmenu li:hover div.wp-menu-image:before{color:#2ea2cc}.folded #adminmenu div.wp-menu-image{width:35px;height:30px;position:absolute;z-index:25}.folded #adminmenu a.menu-top{height:34px}.no-font-face #adminmenu .wp-menu-image{display:none}.no-font-face #adminmenu div.wp-menu-name{padding:8px 12px}.no-font-face.auto-fold #adminmenu .wp-menu-name{margin-right:0}.sticky-menu #adminmenuwrap{position:fixed;z-index:9999}.wp-menu-arrow{display:none!important}ul#adminmenu a.wp-has-current-submenu{position:relative}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{left:0;border:solid 8px transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none;border-left-color:#f1f1f1;top:50%;margin-top:-8px}.folded ul#adminmenu li:hover a.wp-has-current-submenu:after{display:none}.folded ul#adminmenu a.wp-has-current-submenu:after,.folded ul#adminmenu>li a.current:after{border-width:4px;margin-top:-4px}#adminmenu li.wp-has-submenu.wp-not-current-submenu:hover:after{left:0;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none;border-width:8px;top:10px;z-index:10000}.folded ul#adminmenu li.wp-has-submenu.wp-not-current-submenu:hover:after{border-width:4px;margin-top:-4px;top:18px}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-left-color:#333}#adminmenu li.menu-top:hover .wp-menu-image img,#adminmenu li.wp-has-current-submenu .wp-menu-image img{opacity:1;filter:alpha(opacity=100)}#adminmenu li.wp-menu-separator{height:5px;padding:0;margin:0 0 6px;cursor:inherit}#adminmenu div.separator{height:2px;padding:0}#adminmenu .wp-submenu .wp-submenu-head{color:#fff;font-weight:400;font-size:14px;padding:8px 11px 8px 4px;margin:-7px 0 4px}#adminmenu li.current,.folded #adminmenu li.wp-menu-open{border:0 none}#adminmenu .awaiting-mod,#adminmenu .update-plugins,#sidemenu li a span.update-plugins{display:inline-block;background-color:#d54e21;color:#fff;font-size:9px;line-height:17px;font-weight:600;margin:1px 2px 0 0;vertical-align:top;-webkit-border-radius:10px;border-radius:10px;z-index:26}#adminmenu li .awaiting-mod span,#adminmenu li span.update-plugins span,#sidemenu li a span.update-plugins span{display:block;padding:0 6px}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod{background-color:#2ea2cc;color:#fff}#adminmenu li span.count-0,#sidemenu li a .count-0{display:none}#collapse-menu{font-size:13px;line-height:34px;margin-top:10px;color:#aaa;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}#collapse-menu:hover,#collapse-menu:hover #collapse-button div:after{color:#2ea2cc}.folded #collapse-menu span{display:none}#collapse-button,#collapse-button div{width:15px;height:15px}#collapse-button{float:right;height:15px;margin:10px 11px 10px 8px;width:15px;-webkit-border-radius:10px;border-radius:10px}#wpwrap #collapse-button div{padding:0}#collapse-button div:after{content:'\f148';display:block;line-height:15px;right:-3px;top:-3px;color:#aaa;font:400 20px/1 dashicons!important;speak:none;margin:0 auto;padding:0!important;position:relative;text-align:center;width:20px;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.folded #collapse-button div:after,.rtl #collapse-button div:after{-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.rtl.folded #collapse-button div:after{-webkit-transform:none;-ms-transform:none;transform:none}li#wp-admin-bar-menu-toggle{display:none}@media only screen and (max-width:900px){.auto-fold #wpcontent,.auto-fold #wpfooter{margin-right:56px}.auto-fold #adminmenu,.auto-fold #adminmenu li.menu-top,.auto-fold #adminmenuback,.auto-fold #adminmenuwrap{width:36px}.auto-fold #adminmenu .opensub .wp-submenu,.auto-fold #adminmenu .wp-has-current-submenu .wp-submenu.sub-open,.auto-fold #adminmenu .wp-has-current-submenu a.menu-top:focus+.wp-submenu,.auto-fold #adminmenu .wp-has-current-submenu.opensub .wp-submenu,.auto-fold #adminmenu .wp-submenu.sub-open,.auto-fold #adminmenu a.menu-top:focus+.wp-submenu{top:0;right:36px}.auto-fold #adminmenu .wp-has-current-submenu .wp-submenu,.auto-fold #adminmenu a.wp-has-current-submenu:focus+.wp-submenu{position:absolute;top:-1000em;margin-left:-1px;padding:7px 0 8px;z-index:9999}.auto-fold #adminmenu .wp-has-current-submenu .wp-submenu{min-width:150px;width:auto}.auto-fold #adminmenu .wp-has-current-submenu li>a{padding-left:16px;padding-right:14px}.auto-fold #adminmenu li.menu-top .wp-submenu>li>a{padding-right:12px}.auto-fold #adminmenu .wp-menu-name{display:none}.auto-fold #adminmenu .wp-submenu-head{display:block}.auto-fold #adminmenu div.wp-menu-image{height:30px;width:34px;position:absolute;z-index:25}.auto-fold #adminmenu a.menu-top{height:34px}.auto-fold #adminmenu li.wp-menu-open{border:0 none}.auto-fold #adminmenu .wp-has-current-submenu.menu-top-last{margin-bottom:0}.auto-fold ul#adminmenu li:hover a.wp-has-current-submenu:after{display:none}.auto-fold ul#adminmenu li.wp-has-submenu.wp-not-current-submenu:hover:after{border-width:4px;margin-top:-4px;top:16px}.auto-fold ul#adminmenu a.wp-has-current-submenu:after,.auto-fold ul#adminmenu>li a.current:after{border-width:4px;margin-top:-4px}.auto-fold #adminmenu li.menu-top:hover,.auto-fold #adminmenu li.opensub>a.menu-top,.auto-fold #adminmenu li>a.menu-top:focus{z-index:10000}.auto-fold #collapse-menu span{display:none}.auto-fold #collapse-button div{background:0 0}.auto-fold #collapse-button div:after{-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.rtl.auto-fold #collapse-button div:after{-webkit-transform:none;-ms-transform:none;transform:none}}@media screen and (max-width:782px){.auto-fold #wpcontent{position:relative;margin-right:0;padding-right:10px}.sticky-menu #adminmenuwrap{position:relative;z-index:auto;top:0}.auto-fold #adminmenu,.auto-fold #adminmenuback,.auto-fold #adminmenuwrap{position:absolute;width:190px;z-index:100}.auto-fold #adminmenuback,.auto-fold #adminmenuwrap{display:none}.auto-fold .wp-responsive-open #adminmenuback,.auto-fold .wp-responsive-open #adminmenuwrap{display:block}.auto-fold #adminmenu li.menu-top{width:100%}.auto-fold #adminmenu li a{font-size:16px;padding:5px}.auto-fold #adminmenu li.menu-top .wp-submenu>li>a{padding:10px 20px 10px 10px}.auto-fold #adminmenu .wp-menu-name{display:block;margin-right:35px}.auto-fold ul#adminmenu a.wp-has-current-submenu:after,.auto-fold ul#adminmenu>li.current>a.current:after{border-width:8px;margin-top:-8px}.auto-fold ul#adminmenu li.wp-has-submenu.wp-not-current-submenu:hover:after{display:none}#adminmenu .wp-submenu{position:relative;display:none}.auto-fold #adminmenu .selected .wp-submenu,.auto-fold #adminmenu .wp-menu-open .wp-submenu{position:relative;display:block;top:0;right:-1px;-webkit-box-shadow:none;box-shadow:none}.auto-fold #adminmenu .opensub .wp-submenu,.auto-fold #adminmenu .selected .wp-submenu:after,.auto-fold #adminmenu .wp-menu-open .wp-submenu:after{display:none}.auto-fold #adminmenu .selected .wp-submenu,.auto-fold ul#adminmenu li:hover a.wp-has-current-submenu:after{display:block}.auto-fold #adminmenu .wp-has-current-submenu a.menu-top:focus+.wp-submenu,.auto-fold #adminmenu a.menu-top:focus+.wp-submenu{position:relative;right:-1px;left:0;top:0}#adminmenu .wp-submenu .wp-submenu-head{display:none}#wp-responsive-toggle{position:fixed;top:5px;right:4px;padding-left:10px;z-index:99999;border:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#wpadminbar #wp-admin-bar-menu-toggle a{display:block;padding:0;overflow:hidden;outline:0;text-decoration:none;border:1px solid transparent;background:0 0;height:44px;margin-right:-1px}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#333}li#wp-admin-bar-menu-toggle{display:block}#wpadminbar #wp-admin-bar-menu-toggle a:hover{border:1px solid transparent}#wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before{content:'\f228';display:inline-block;float:right;font:400 40px/45px Dashicons;vertical-align:middle;outline:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;height:44px;width:50px;padding:0;border:0;text-align:center;text-decoration:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}}@media screen and (max-width:600px){#adminmenuback,#adminmenuwrap{display:none}.wp-responsive-open #adminmenuback,.wp-responsive-open #adminmenuwrap{display:block}.auto-fold #adminmenu{top:46px}}#wpbody-content #dashboard-widgets.columns-1 .postbox-container{width:100%}#wpbody-content #dashboard-widgets.columns-2 .postbox-container{width:49.5%}#wpbody-content #dashboard-widgets.columns-2 #postbox-container-2,#wpbody-content #dashboard-widgets.columns-2 #postbox-container-3,#wpbody-content #dashboard-widgets.columns-2 #postbox-container-4{float:left;width:50.5%}#wpbody-content #dashboard-widgets.columns-3 .postbox-container{width:33.5%}#wpbody-content #dashboard-widgets.columns-3 #postbox-container-1{width:33%}#wpbody-content #dashboard-widgets.columns-3 #postbox-container-3,#wpbody-content #dashboard-widgets.columns-3 #postbox-container-4{float:left}#dashboard-widgets .postbox-container,#wpbody-content #dashboard-widgets.columns-4 .postbox-container{width:25%}#dashboard-widgets-wrap .columns-3 #postbox-container-4 .empty-container{border:0!important}.ie8 #wpbody-content #dashboard-widgets .postbox-container{width:49.5%}.ie8 #wpbody-content #dashboard-widgets #postbox-container-2,.ie8 #wpbody-content #dashboard-widgets #postbox-container-3,.ie8 #wpbody-content #dashboard-widgets #postbox-container-4{float:left;width:50.5%}.ie8 #dashboard-widgets #postbox-container-3 .empty-container,.ie8 #dashboard-widgets #postbox-container-4 .empty-container{border:0 none;height:0;min-height:0}#dashboard-widgets-wrap{overflow:hidden;margin:0 -8px}#dashboard-widgets .postbox .inside{margin-bottom:0}#dashboard-widgets .meta-box-sortables{margin:0 8px;min-height:100px}h3.dashboard-widget-title,h3.dashboard-widget-title small,h3.dashboard-widget-title span{color:#333}h3.dashboard-widget-title small a{color:#d7d7d7}h3.dashboard-widget-title small a:hover{color:#fff}#the-comment-list td.comment p.comment-author{margin-top:0;margin-right:0}#the-comment-list p.comment-author img{float:right;margin-left:8px}#the-comment-list p.comment-author strong a{border:0}#the-comment-list td{vertical-align:top}#the-comment-list td.comment{word-wrap:break-word}#the-comment-list td.comment img{max-width:100%}.welcome-panel{position:relative;overflow:auto;margin:16px 0;padding:23px 10px 0;border:1px solid #e5e5e5;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04);background:#fff;font-size:13px;line-height:2.1em}.welcome-panel h3{margin:0;font-size:21px;font-weight:400;line-height:1.2}.welcome-panel h4{margin:1.33em 0 0;font-size:16px}.welcome-panel li{font-size:14px}.welcome-panel p{color:#777}.welcome-panel a{text-decoration:none}.welcome-panel .about-description{font-size:16px;margin:0}.welcome-panel .welcome-panel-close{position:absolute;top:5px;left:10px;padding:20px 3px 0 15px;font-size:13px;text-decoration:none;line-height:1}#welcome-panel.welcome-panel .welcome-panel-close::before{position:absolute;right:-18px;margin-top:-2px;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}.wp-core-ui .welcome-panel .button.button-hero{margin:15px 0 3px}.welcome-panel-content{margin-right:13px;max-width:1500px}.welcome-panel .welcome-panel-column-container{clear:both;overflow:hidden;position:relative}.welcome-panel .welcome-panel-column{width:32%;min-width:200px;float:right}.ie8 .welcome-panel .welcome-panel-column{min-width:230px}.welcome-panel .welcome-panel-column:first-child{width:36%}.welcome-panel-column p.hide-if-no-customize{margin-top:10px}.welcome-panel-column p{margin-top:7px;color:#464646}.welcome-panel .welcome-icon{display:block;padding:0 0 8px;background:transparent!important}.welcome-panel .welcome-icon:before{color:#888;font:400 20px/1 dashicons;speak:none;display:inline-block;padding:0 0 0 10px;top:-1px;position:relative;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;vertical-align:top}.welcome-panel .welcome-edit-page:before,.welcome-panel .welcome-write-blog:before{content:'\f119';top:-3px}.welcome-panel .welcome-add-page:before{content:'\f132'}.welcome-panel .welcome-view-site:before{content:'\f115';top:-2px}.welcome-panel .welcome-widgets-menus:before{content:'\f116';top:-2px}.welcome-panel .welcome-comments:before{content:'\f117';top:-1px}.welcome-panel .welcome-learn-more:before{content:'\f118';top:-1px}.welcome-panel .welcome-widgets-menus{line-height:16px}.welcome-panel .welcome-panel-column ul{margin:.8em 0 1em 1em}.welcome-panel .welcome-panel-column li{line-height:16px;list-style-type:none}#dashboard_primary .inside{margin:0;padding:0}#dashboard_primary .dashboard-widget-control-form,#dashboard_primary .widget-loading{padding:12px 12px 0}body #dashboard-widgets .postbox form .submit{margin:0}.dashboard-widget-control-form{overflow:hidden}.dashboard-widget-control-form p{margin-top:0}div.dashboard-widget-error{background-color:#c43}div.dashboard-widget-notice{background-color:#cfe1ef}.rssSummary{color:#777;margin-top:4px}#dashboard_primary .rss-widget{border-bottom:1px solid #eee;font-size:13px;padding:8px 12px 10px}#dashboard_primary .rss-widget:last-child{border-bottom:0;padding-bottom:8px}#dashboard_primary .rss-widget a{font-weight:400}#dashboard_primary .rss-widget span,#dashboard_primary .rss-widget span.rss-date{color:#777}#dashboard_primary .rss-widget span.rss-date{margin-right:12px}#dashboard_primary .rss-widget ul li{margin-bottom:8px}#dashboard_right_now ul{margin:0;overflow:hidden}#dashboard_right_now li{width:50%;float:right;margin-bottom:10px}#dashboard_right_now .inside{overflow:hidden;padding:0}#dashboard_right_now .main{overflow:hidden;padding:0 12px 11px}#dashboard_right_now .main p{margin:0}#dashboard_right_now #wp-version-message .button{clear:left;float:left;position:relative;top:-5px}.mu-storage{overflow:hidden}#dashboard-widgets h4.mu-storage{margin-bottom:10px}#dashboard_right_now li a:before,#dashboard_right_now li span:before{color:#888}#dashboard_right_now .sub{color:#777;background:#f5f5f5;border-top:1px solid #eee;padding:10px 12px 6px}#dashboard_right_now .sub h4{color:#555}#dashboard_right_now .sub p{margin:0 0 1em}#dashboard_right_now .warning a:before,#dashboard_right_now .warning span:before{color:#d54e21}#dashboard_right_now li a:before,#dashboard_right_now li span:before{content:'\f159';font:400 20px/1 dashicons;speak:none;display:block;float:right;margin:0 0 0 5px;padding:0;text-indent:0;text-align:center;position:relative;-webkit-font-smoothing:antialiased;text-decoration:none!important}#dashboard_right_now .page-count a:before,#dashboard_right_now .page-count span:before{content:'\f105'}#dashboard_right_now .post-count a:before,#dashboard_right_now .post-count span:before{content:'\f109'}#dashboard_right_now .comment-count a:before{content:'\f101'}#dashboard_right_now .comment-mod-count a:before{content:'\f125'}#dashboard_right_now .storage-count a:before{content:'\f104'}#dashboard_right_now .storage-count.warning a:before{content:'\f153'}#dashboard_quick_press .inside{margin:0;padding:0}#dashboard_quick_press div.updated{margin-bottom:10px;border:1px solid #eee;border-width:1px 0 1px 1px}#dashboard_quick_press form{overflow:hidden;margin:12px}#dashboard_quick_press .drafts,#dashboard_quick_press .easy-blogging{padding:10px 0 0}input#save-post{float:right}form.initial-form.quickpress-open label.prompt{font-style:normal}form.initial-form.quickpress-open input#title{height:auto}#dashboard_quick_press input,#dashboard_quick_press textarea{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:0}#dashboard_quick_press textarea{resize:vertical}#description-wrap{margin-top:12px}#title-wrap #title-prompt-text,.textarea-wrap #content-prompt-text{color:#777}.input-text-wrap,.textarea-wrap{position:relative}.input-text-wrap .prompt,.textarea-wrap .prompt{position:absolute}.textarea-wrap #content-prompt-text{font-size:1.1em;padding:7px 8px}.textarea-wrap textarea#content{margin:0 0 8px;padding:6px 7px}#quick-press textarea#content{min-height:90px;max-height:1300px;resize:none}.js #dashboard_quick_press .drafts{border-top:1px solid #eee}#dashboard_quick_press .drafts abbr{border:0}#dashboard_quick_press .drafts h4{margin:0 12px 8px;font-weight:400}#dashboard_quick_press .drafts .view-all{float:left;margin:0 0 0 12px}#dashboard_primary a.rsswidget{font-weight:400}#dashboard_quick_press .drafts ul{margin:0 12px}#dashboard_quick_press .drafts li{margin-bottom:1em}#dashboard_quick_press .drafts li time{color:#777}#dashboard_quick_press .drafts p{margin:0;word-wrap:break-word}#dashboard_quick_press .draft-title{overflow:hidden}#dashboard_quick_press .draft-title a,#dashboard_quick_press .draft-title time{float:right;margin:0 0 0 5px}#dashboard-widgets #dashboard_activity h4{margin:0 12px 8px 0;font-weight:400}#dashboard-widgets #dashboard_activity h4.comment-meta{margin:0}#dashboard_activity h4.comment-meta{margin-bottom:4px}#dashboard_activity ul{padding:0 12px}#dashboard_activity .comment-meta span.approve:before{content:'\f227';font:20px/.5 dashicons;margin-right:12px;vertical-align:middle;position:relative;top:-1px;margin-left:2px}#dashboard_activity .inside{padding:0;margin:0}#dashboard_activity .no-activity{overflow:hidden;padding:0 12px 12px;text-align:center}#dashboard_activity .no-activity p{color:#999;font-size:16px}#dashboard_activity .no-activity .smiley{margin-top:0}#dashboard_activity .no-activity .smiley:before{content:'\f328';font:400 120px/1 dashicons;speak:none;display:block;margin:0 0 0 5px;padding:0;text-indent:0;text-align:center;position:relative;-webkit-font-smoothing:antialiased;text-decoration:none!important}#dashboard_activity .subsubsub{float:none;border-top:1px solid #eee;margin-top:0;padding:8px 12px 4px}#future-posts ul,#published-posts ul{clear:both;margin-bottom:0}#future-posts li,#published-posts li{overflow:hidden;margin-bottom:8px}#future-posts ul span,#published-posts ul span{color:#777;float:right;margin-left:8px;min-width:150px}.activity-block{border-bottom:1px solid #eee;overflow:hidden;padding:8px 0 4px}.activity-block:last-child{border-bottom:0}.activity-block .subsubsub li{color:#ddd}#activity-widget #the-comment-list div.undo,#activity-widget #the-comment-list tr.undo{background:0 0;padding:6px 0}#activity-widget #the-comment-list .alt,#activity-widget #the-comment-list .alternate{background:0 0}#activity-widget #the-comment-list .comment-item{background:#fafafa;padding:12px;position:relative}#activity-widget #the-comment-list img{position:absolute;right:13px;top:13px}#activity-widget #the-comment-list .dashboard-comment-wrap{padding-right:63px}#activity-widget #the-comment-list .dashboard-comment-wrap blockquote{margin:1em 0}#activity-widget #the-comment-list .comment-item h4{font-size:13px;color:#999}#activity-widget #the-comment-list .comment-item p.row-actions{margin:4px 0 0}#activity-widget #the-comment-list .comment-item:first-child{border-top:1px solid #eee}#activity-widget #the-comment-list .unapproved{background-color:#fef7f1}#activity-widget #the-comment-list .unapproved:before{content:"";display:block;position:absolute;right:0;top:0;bottom:0;background:#d54e21;width:4px}#activity-widget #the-comment-list .spam-undo-inside .avatar,#activity-widget #the-comment-list .trash-undo-inside .avatar{margin-left:20px;position:relative;top:0}#dashboard-widgets #dashboard_browser_nag.postbox .inside{margin:10px}.edit-box{display:none}h3:hover .edit-box{display:inline}#dashboard-widgets form .input-text-wrap input,#dashboard-widgets form .textarea-wrap textarea{width:100%}#dashboard-widgets .postbox form .submit{float:none;margin:.5em 0 0;padding:0;border:0}#dashboard-widgets-wrap #dashboard-widgets .postbox form .submit #publish{min-width:0}#dashboard-widgets a{text-decoration:none}#dashboard-widgets h3 a{text-decoration:underline}#dashboard-widgets h3 .postbox-title-action{position:absolute;left:10px;padding:0;top:5px}.js #dashboard-widgets h3 .postbox-title-action{left:33px}#dashboard-widgets h4{color:#222;font-weight:400;font-size:14px;margin:0 0 .2em;padding:0}#dashboard_plugins h5{font-size:14px}#latest-comments #the-comment-list{position:relative}#activity-widget #the-comment-list .comment{-webkit-box-shadow:inset 0 1px 0 rgba(0,0,0,.06);box-shadow:inset 0 1px 0 rgba(0,0,0,.06)}#activity-widget .comments #the-comment-list .alt{background-color:transparent}#activity-widget #latest-comments #the-comment-list .comment-item{padding:1em 12px}#latest-comments #the-comment-list .pingback{padding-right:12px!important}#latest-comments #the-comment-list .comment-item:first-child{border-top:0}#latest-comments #the-comment-list .comment-item h4{line-height:1.5em;margin-top:0;color:#666}#latest-comments #the-comment-list .comment-item h4 cite{font-style:normal;font-weight:400}#latest-comments #the-comment-list .comment-item blockquote,#latest-comments #the-comment-list .comment-item blockquote p{margin:0;padding:0;display:inline}#latest-comments #the-comment-list .comment-item p.row-actions{margin:3px 0 0;padding:0;font-size:13px}#title-wrap label{cursor:text}#title-wrap #title{padding:2px 6px;font-size:1.3em;line-height:100%;outline:0}#title-wrap #title-prompt-text{font-size:1.1em;padding:5px 8px}.rss-widget ul{margin:0;padding:0;list-style:none}a.rsswidget{font-size:14px;font-weight:600;line-height:1.7em}.rss-widget ul li{line-height:1.5em;margin-bottom:12px}.rss-widget span.rss-date{color:#999;font-size:13px;margin-right:3px}.rss-widget cite{display:block;text-align:left;margin:0 0 1em;padding:0}.rss-widget cite:before{content:'\2014'}.dashboard-comment-wrap{overflow:hidden;word-wrap:break-word}#dashboard_browser_nag a.update-browser-link{font-size:1.2em;font-weight:600}#dashboard_browser_nag a{text-decoration:underline}#dashboard_browser_nag p.browser-update-nag.has-browser-icon{padding-left:125px}#dashboard_browser_nag .browser-icon{margin-top:-35px}#dashboard_browser_nag.postbox.browser-insecure{background-color:#ac1b1b;border-color:#ac1b1b}#dashboard_browser_nag.postbox{background-color:#e29808;background-image:none;border-color:#edc048;color:#fff;-webkit-box-shadow:none;box-shadow:none}#dashboard_browser_nag.postbox.browser-insecure h3{border-bottom-color:#cd5a5a;color:#fff}#dashboard_browser_nag.postbox h3{border-bottom-color:#f6e2ac;background:transparent none;color:#fff;-webkit-box-shadow:none;box-shadow:none}#dashboard_browser_nag a{color:#fff}#dashboard_browser_nag h3.hndle{border:0;font-weight:600;font-size:20px;padding-top:10px}.postbox#dashboard_browser_nag p a.dismiss{font-size:14px}.postbox#dashboard_browser_nag a,.postbox#dashboard_browser_nag p,.postbox#dashboard_browser_nag p.browser-update-nag{font-size:16px}@media only screen and (max-width:799px){#wpbody-content #dashboard-widgets .postbox-container{width:100%}}@media only screen and (min-width:800px) and (max-width:1499px){#wpbody-content #dashboard-widgets .postbox-container{width:49.5%}#wpbody-content #dashboard-widgets #postbox-container-2,#wpbody-content #dashboard-widgets #postbox-container-3,#wpbody-content #dashboard-widgets #postbox-container-4{float:left;width:50.5%}#dashboard-widgets #postbox-container-3 .empty-container,#dashboard-widgets #postbox-container-4 .empty-container{border:0 none;height:0;min-height:0}#wpbody #wpbody-content #dashboard-widgets.columns-1 .postbox-container{width:100%}#wpbody #wpbody-content .metabox-holder.columns-1 .postbox-container .empty-container{border:0 none;height:0;min-height:0}.index-php .columns-prefs,.index-php .screen-layout{display:block}.columns-prefs .columns-prefs-3,.columns-prefs .columns-prefs-4{display:none}}@media only screen and (min-width:1500px) and (max-width:1800px){#wpbody-content #dashboard-widgets .postbox-container{width:33.5%}#wpbody-content #dashboard-widgets #postbox-container-1{width:33%}#wpbody-content #dashboard-widgets #postbox-container-3,#wpbody-content #dashboard-widgets #postbox-container-4{float:left}#dashboard-widgets #postbox-container-4 .empty-container{border:0 none;height:0;min-height:0}}@media screen and (max-width:870px){.welcome-panel .welcome-panel-column,.welcome-panel .welcome-panel-column:first-child{display:block;float:none;width:100%}.welcome-panel .welcome-panel-column li{display:inline-block;margin-left:13px}.welcome-panel .welcome-panel-column ul{margin:.4em 0 0}}@media screen and (max-width:782px){#dashboard_recent_comments #the-comment-list .comment-item .avatar{height:30px;width:30px;margin:4px 0 5px 10px}}@media screen and (max-width:600px){.welcome-panel .welcome-panel-close{overflow:hidden;text-indent:100%;white-space:nowrap;width:20px;height:20px;left:0;padding:5px}#welcome-panel.welcome-panel .welcome-panel-close::before{font-size:20px;margin:0}}.post-com-count-wrapper{min-width:22px}.post-com-count{background:0 0;height:1.3em;line-height:1.1em;display:block;text-decoration:none;padding:0 0 6px;cursor:pointer;background-position:center -80px;background-repeat:no-repeat;color:#fff}.post-com-count:after{content:"";display:block;width:0;height:0;margin-right:8px;border-top:5px solid #bbb;border-left:5px solid transparent}.post-com-count span{font-size:11px;font-weight:600;height:1.4em;line-height:1.4em;min-width:.7em;padding:0 6px;display:inline-block;-webkit-border-radius:5px;border-radius:5px;background-color:#bbb;color:#fff}.post-com-count:hover{background-position:center -3px}.post-com-count:hover span{background-color:#2ea2cc}.post-com-count:hover:after{border-top:5px solid #2ea2cc}strong .post-com-count{background-position:center -55px}strong .post-com-count span{background-color:#0074a2}strong .post-com-count:after{border-top:5px solid #0074a2}.column-response .post-com-count{float:right;margin-left:5px;text-align:center}.response-links{float:right}.commentlist li{padding:1em 1em .2em;margin:0;border-bottom:1px solid #ccc}.commentlist li li{border-bottom:0;padding:0}.commentlist p{padding:0;margin:0 0 .8em}#submitted-on,.submitted-on{color:#777}#replyrow td{padding:2px}#replysubmit{margin:0;padding:0 5px 3px;text-align:center}#replysubmit .spinner{padding:2px 0 0;vertical-align:top;float:left}#replysubmit .button{margin-left:5px}#replysubmit .error{color:red;line-height:21px;text-align:center}#replyrow h5{margin:.2em 0 0;padding:0 5px;line-height:1.4em;font-size:1em}#edithead .inside{float:right;padding:3px 5px 2px 0;margin:0;text-align:center}#edithead .inside input{width:180px}#edithead label{padding:2px 0}#replycontainer{padding:5px}#replycontent{height:120px;-webkit-box-shadow:none;box-shadow:none}#replyerror{border-color:#ddd;background-color:#f9f9f9}.commentlist .avatar{vertical-align:text-top}#the-comment-list .attachment-80x60{padding:4px 8px}#the-comment-list div.undo,#the-comment-list tr.undo{background-color:#f4f4f4}#the-comment-list .unapproved td,#the-comment-list .unapproved th{background-color:#fef7f1}#the-comment-list .unapproved th.check-column{border-right:4px solid #d54e21}#the-comment-list .unapproved th.check-column input{margin-right:4px}#the-comment-list .approve a{color:#006505}#the-comment-list .unapprove a{color:#d98500}#the-comment-list td,#the-comment-list th{-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 -1px 0 rgba(0,0,0,.1)}#the-comment-list tr:last-child td,#the-comment-list tr:last-child th{-webkit-box-shadow:none;box-shadow:none}#the-comment-list tr.unapproved+tr.approved td,#the-comment-list tr.unapproved+tr.approved th{border-top:1px solid rgba(0,0,0,.03)}.vim-current,.vim-current td,.vim-current th{background-color:#e4f2fd!important}th .comment-grey-bubble{height:16px;width:16px}th .comment-grey-bubble:before{content:'\f101';font:400 20px/.5 dashicons;speak:none;display:inline-block;padding:0;top:4px;right:-4px;position:relative;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;color:#444}table.fixed{table-layout:fixed}.fixed .column-rating,.fixed .column-visible{width:8%}.fixed .column-author,.fixed .column-date,.fixed .column-format,.fixed .column-links,.fixed .column-parent,.fixed .column-posts{width:10%}.fixed .column-comment .comment-author{display:none}.fixed .column-categories,.fixed .column-rel,.fixed .column-response,.fixed .column-role,.fixed .column-tags{width:15%}.fixed .column-slug{width:25%}.fixed .column-locations{width:35%}.fixed .column-comments{width:4em;padding:8px 0;text-align:right}.fixed .column-comments .vers{padding-right:3px}.fixed .column-comments a{float:right}.fixed .column-icon{width:80px}.wp-list-table a{-webkit-transition:none;transition:none}#the-list tr:last-child td,#the-list tr:last-child th{border-bottom:0!important;-webkit-box-shadow:none;box-shadow:none}#comments-form .fixed .column-author{width:20%}#commentsdiv.postbox .inside{margin:0;padding:0}#commentsdiv .inside .row-actions{line-height:18px}#commentsdiv .inside .column-author{width:25%}#commentsdiv .column-comment p{margin:.6em 0;padding:0}#commentsdiv #replyrow td{padding:0}#commentsdiv p{padding:8px 10px;margin:0}#commentsdiv .comments-box{border:0 none}#commentsdiv .comments-box thead th{background:0 0;padding:0 7px 4px;font-style:italic}#commentsdiv .comments-box tr:last-child td{border-bottom:0 none}#commentsdiv .spinner{padding-right:5px}.sorting-indicator{display:none;width:10px;height:4px;margin-top:8px;margin-right:7px}.sorting-indicator:before{background:0 0;content:'\f142';font:400 20px/1 dashicons;speak:none;display:inline-block;padding:0;top:-4px;right:-8px;line-height:10px;position:relative;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;color:#444}.column-comments .sorting-indicator:before{top:0;right:-10px}th.desc:hover span.sorting-indicator:before,th.sorted.asc .sorting-indicator:before{content:'\f142'}th.asc:hover span.sorting-indicator:before,th.sorted.desc .sorting-indicator:before{content:'\f140'}tr.wp-locked .locked-indicator{margin-right:6px;height:20px;width:16px}tr.wp-locked .locked-indicator:before{color:#888;content:'\f160';display:inline-block;float:right;font:400 20px/1 dashicons;speak:none;vertical-align:middle;margin-right:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}tr.wp-locked .check-column input[type=checkbox],tr.wp-locked .check-column label,tr.wp-locked .row-actions .inline,tr.wp-locked .row-actions .trash{display:none}tr .locked-info{height:0;opacity:0}tr.wp-locked .locked-info{margin-top:8px;height:auto;opacity:1}.locked-text{vertical-align:top}tr.locked-info,tr.wp-locked .locked-info{-webkit-transition:height 1s,opacity .5s;transition:height 1s,opacity .5s}.fixed .column-comments .sorting-indicator{margin-top:3px}#menu-locations-wrap .widefat{width:60%}.widefat th.sortable,.widefat th.sorted{padding:0}th.sortable a,th.sorted a{display:block;overflow:hidden;padding:7px 10px 8px 7px}th.manage-column a,th.sortable a:active,th.sortable a:focus,th.sortable a:hover{color:#333}th.sortable a:focus{background:#e1e1e1}.fixed .column-comments.sortable a,.fixed .column-comments.sorted a{padding:8px 0}th.sortable a span,th.sorted a span{float:right;cursor:pointer}th.desc:hover span.sorting-indicator,th.sorted.asc .sorting-indicator{display:block;background-position:0 0}th.asc:hover span.sorting-indicator,th.sorted.desc .sorting-indicator{display:block;background-position:-7px 0}.tablenav-pages a{font-weight:600;margin-left:1px;padding:0 2px}.tablenav-pages .current-page{padding-top:0;text-align:center}.tablenav-pages .next-page{margin-right:2px}.tablenav a.button-secondary{display:block;margin:3px 0 0 8px}.tablenav{clear:both;height:30px;margin:6px 0 4px;vertical-align:middle}.tablenav.themes{max-width:98%}.tablenav .tablenav-pages{float:left;display:block;cursor:default;height:30px;color:#555;line-height:30px;font-size:12px}.tablenav .no-pages,.tablenav .one-page .pagination-links{display:none}.tablenav .tablenav-pages a,.tablenav-pages span.current{text-decoration:none;padding:3px 6px}.tablenav .tablenav-pages a{padding:0 10px 3px;background:#eee;background:rgba(0,0,0,.05);font-size:16px;font-weight:400}.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover{color:#fff;background:#2ea2cc}.tablenav .tablenav-pages a.disabled,.tablenav .tablenav-pages a.disabled:active,.tablenav .tablenav-pages a.disabled:focus,.tablenav .tablenav-pages a.disabled:hover{color:#aaa;background:#eee;background:rgba(0,0,0,.05)}.tablenav .displaying-num{margin-left:2px;color:#777;font-size:12px;font-style:italic}.tablenav .actions{overflow:hidden;padding:2px 0 0 8px}.tablenav .delete{margin-left:20px}.tablenav .dots{border-color:transparent}.tablenav .next,.tablenav .prev{border-color:transparent;color:#0074a2}.tablenav .next:hover,.tablenav .prev:hover{border-color:transparent;color:#2ea2cc}.view-switch{float:left;margin:5px 8px 0 16px}.view-switch img{display:none}.view-switch a{text-decoration:none}.view-switch>a{display:inline-block;width:18px;height:18px}.view-switch>a:before{color:#bbb;content:'\f163';display:inline-block;float:right;font:400 20px/1 dashicons;speak:none;vertical-align:middle;margin-right:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.view-switch a:hover:before{color:#727272}.view-switch a.current:before{color:#0074a2}.view-switch>a+a:before{margin-right:5px;content:'\f164'}.filter{float:right;margin:-5px 10px 0 0}.filter .subsubsub{margin-right:-10px;margin-top:13px}.screen-per-page{width:4em}#posts-filter fieldset{float:right;margin:0 0 1em 1.5ex;padding:0}#posts-filter fieldset legend{padding:0 1px .2em 0}p.pagenav{margin:0;display:inline}.pagenav span{font-weight:600;margin:0 6px}.row-title{font-size:14px!important;font-weight:600}.column-comment .comment-author{margin-bottom:.6em}.column-author img,.column-comment .comment-author img,.column-username img{float:right;margin-left:10px;margin-top:1px}.row-actions{color:#ddd;font-size:13px;visibility:hidden;padding:2px 0 0}.mobile .row-actions,.row-actions.visible,div.comment-item:hover .row-actions,tr:hover .row-actions{visibility:visible}.row-actions-visible{padding:2px 0 0}#wpbody-content .inline-edit-row fieldset{font-size:12px;float:right;margin:0;padding:0;width:100%}#wpbody-content .inline-edit-row fieldset .inline-edit-col,tr.inline-edit-row td{padding:0 .5em}#wpbody-content .quick-edit-row-page fieldset.inline-edit-col-right .inline-edit-col{border-width:0 1px 0 0;border-style:none none none solid}#wpbody-content .quick-edit-row-post .inline-edit-col-left{width:40%}#wpbody-content .quick-edit-row-post .inline-edit-col-right{width:39%}#wpbody-content .inline-edit-row-post .inline-edit-col-center{width:20%}#wpbody-content .quick-edit-row-page .inline-edit-col-left{width:50%}#wpbody-content .bulk-edit-row-post .inline-edit-col-right,#wpbody-content .quick-edit-row-page .inline-edit-col-right{width:49%}#wpbody-content .bulk-edit-row .inline-edit-col-left{width:30%}#wpbody-content .bulk-edit-row-page .inline-edit-col-right{width:69%}#wpbody-content .bulk-edit-row .inline-edit-col-bottom{float:left;width:69%}#wpbody-content .inline-edit-row-page .inline-edit-col-right{margin-top:27px}.inline-edit-row fieldset .inline-edit-group{clear:both}.inline-edit-row fieldset .inline-edit-group:after{content:".";display:block;height:0;clear:both;visibility:hidden}.inline-edit-row p.submit{clear:both;padding:.5em;margin:.5em 0 0}.inline-edit-row span.error{line-height:22px;margin:0 15px;padding:3px 5px}.inline-edit-row h4{margin:.2em 0;padding:0;line-height:23px}.inline-edit-row fieldset span.checkbox-title,.inline-edit-row fieldset span.title{margin:0;padding:0}.inline-edit-row fieldset label,.inline-edit-row fieldset span.inline-edit-categories-label{display:block;margin:.2em 0}.inline-edit-row fieldset label.inline-edit-tags{margin-top:0}.inline-edit-row fieldset label.inline-edit-tags span.title{margin:.2em 0;width:auto}.inline-edit-row fieldset label span.title{display:block;float:right;width:5em}.inline-edit-row fieldset label span.input-text-wrap{display:block;margin-right:5em}.quick-edit-row-post fieldset.inline-edit-col-right label span.title{width:auto;padding-left:.5em}.inline-edit-row .input-text-wrap input[type=text]{width:100%}.inline-edit-row fieldset label input[type=checkbox]{vertical-align:text-bottom}.inline-edit-row fieldset label textarea{width:100%;height:4em}#wpbody-content .bulk-edit-row fieldset .inline-edit-group label{max-width:50%}#wpbody-content .quick-edit-row fieldset .inline-edit-group label.alignleft:first-child{margin-left:.5em}.inline-edit-col-right .input-text-wrap input.inline-edit-menu-order-input{width:6em}.inline-edit-save .spinner{padding:4px 10px 0;vertical-align:top;float:left}.inline-edit-row h4{text-transform:uppercase}.inline-edit-row fieldset span.checkbox-title,.inline-edit-row fieldset span.title{font-style:italic;line-height:1.8em}.inline-edit-row fieldset .inline-edit-date{float:right}.inline-edit-row fieldset input[name=hh],.inline-edit-row fieldset input[name=jj],.inline-edit-row fieldset input[name=mn]{font-size:12px;width:2.1em}.inline-edit-row fieldset input[name=aa]{font-size:12px;width:3.5em}.inline-edit-row fieldset label input.inline-edit-password-input{width:8em}ul.cat-checklist{height:12em;border:solid 1px #ddd;overflow-y:scroll;padding:0 5px;margin:0;background-color:#fff}#bulk-titles{display:block;height:12em;border:1px solid #ddd;overflow-y:scroll;padding:0 5px;margin:0 0 5px}.inline-edit-row fieldset ul.cat-checklist input,.inline-edit-row fieldset ul.cat-checklist li{margin:0;position:relative}.inline-edit-row #bulk-titles div,.inline-edit-row fieldset ul.cat-checklist label{font-style:normal;font-size:11px}.inline-edit-row fieldset label input.inline-edit-menu-order-input{width:3em}.inline-edit-row fieldset label input.inline-edit-slug-input{width:75%}.inline-edit-row #post_parent,.inline-edit-row select[name=page_template]{max-width:80%}.ie8 .inline-edit-row #post_parent,.ie8 .inline-edit-row select[name=page_template]{width:250px}.quick-edit-row-post fieldset label.inline-edit-status{float:right}#bulk-titles{line-height:140%}#bulk-titles div{margin:.2em .3em}#bulk-titles div a{cursor:pointer;display:block;float:right;height:18px;margin:0 -2px 0 3px;overflow:hidden;position:relative;width:20px}#bulk-titles div a:before{position:relative;top:-3px}.plugins tbody,.plugins tbody th.check-column{padding:8px 2px 0 0}.plugins tbody th.check-column input[type=checkbox]{margin-top:4px}#update-plugins-table tbody td p{margin-top:0}#update-plugins-table tbody td p strong{font-size:14px}.plugins .inactive th.check-column,.plugins tfoot th.check-column,.plugins thead th.check-column{padding-right:6px}#update-plugins-table tfoot th.check-column,#update-plugins-table thead th.check-column{padding-top:11px}.plugins,.plugins td,.plugins th{color:#000}.plugins tr{background:#fff}.plugins p{margin:0 4px;padding:0}.plugins .desc p{margin:0 0 8px}.plugins td.desc{line-height:1.5em}.plugins .desc ol,.plugins .desc ul{margin:0 2em 0 0}.plugins .desc ul{list-style-type:disc}.plugins .row-actions{font-size:13px}.plugins .active td,.plugins .active th,.plugins .inactive td,.plugins .inactive th{padding:10px 9px}.plugins .active td,.plugins .active th{background-color:#f7fcfe}.plugins .update td,.plugins .update th{border-bottom:0}.plugin-update-tr td{border-top:0}.plugin-install #the-list td,.plugins .active td,.plugins .active th,.plugins .inactive td,.plugins .inactive th,.upgrade .plugins td,.upgrade .plugins th{-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 -1px 0 rgba(0,0,0,.1)}.plugins tr.active+tr.inactive td,.plugins tr.active+tr.inactive th,.plugins tr.active.plugin-update-tr+tr.inactive td,.plugins tr.active.plugin-update-tr+tr.inactive th{border-top:1px solid rgba(0,0,0,.03);-webkit-box-shadow:inset 0 1px 0 rgba(0,0,0,.02),inset 0 -1px 0 #e1e1e1;box-shadow:inset 0 1px 0 rgba(0,0,0,.02),inset 0 -1px 0 #e1e1e1}.plugins .update td,.plugins .update th,.plugins tr.active+tr.inactive.update td,.plugins tr.active+tr.inactive.update th,.upgrade .plugins tr:last-of-type td,.upgrade .plugins tr:last-of-type th{-webkit-box-shadow:none;box-shadow:none}.plugins .active.update td,.plugins .active.update th,tr.active.update+tr.plugin-update-tr .plugin-update{background-color:#fef7f1}.plugins .active th.check-column{border-right:4px solid #2ea2cc}.plugins .active.update th.check-column,.plugins .active.update+.plugin-update-tr .plugin-update{border-right:4px solid #d54e21}#wpbody-content .plugins .plugin-title,#wpbody-content .plugins .theme-title{padding-left:12px;white-space:nowrap}.plugins .inactive .plugin-title strong{font-weight:400}.plugins .row-actions,.plugins .second{padding:0 0 5px}.plugins .update .row-actions,.plugins .update .second{padding-bottom:0}.plugins-php .widefat tfoot td,.plugins-php .widefat tfoot th{border-top-style:solid;border-top-width:1px}.plugin-update-tr .update-message{font-size:13px;font-weight:400;padding:6px 12px;margin:0 31px 8px 10px;background-color:#f7f7f7;background-color:rgba(0,0,0,.03)}.plugin-update-tr .update-message:before{color:#d54e21;content:'\f463';display:inline-block;font:400 20px/1 dashicons;speak:none;margin:0 -2px 0 8px;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;vertical-align:top}.plugins .plugin-update{padding:0;border:0;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 -1px 0 rgba(0,0,0,.1)}tr.active+tr.plugin-update-tr .plugin-update{background-color:#f7fcfe}tr.active+tr.plugin-update-tr .plugin-update .update-message{background-color:#fcf3ef}.plugin-install-php h4{margin:2.5em 0 8px}.wp-list-table .site-deleted{background:#ff8573}.wp-list-table .site-spammed{background:#faafaa}.wp-list-table .site-archived{background:#ffebe8}.wp-list-table .site-mature{background:#fecac2}@media screen and (max-width:782px){.tablenav{height:auto}.tablenav.top{margin:0}.tablenav.bottom{position:relative;margin-top:15px}.tablenav br{display:none}.tablenav br.clear{display:block}.tablenav.top .actions,.tablenav.top .displaying-num,.view-switch{display:none}.tablenav.bottom .displaying-num{position:absolute;left:0;top:10px;font-size:14px}.tablenav-pages{width:100%;text-align:center;margin:0 0 25px}.tablenav.bottom .tablenav-pages{margin-top:25px}.tablenav.top .tablenav-pages.one-page{display:none}.tablenav.bottom .tablenav-pages.one-page{margin:15px 0 0;height:0}.tablenav-pages .pagination-links .paging-input{font-size:18px}.tablenav-pages .pagination-links a{padding:8px 20px 11px;font-size:18px;background:rgba(0,0,0,.05)}.tablenav-pages .pagination-links .current-page{padding:10px;font-size:14px}.form-wrap>p{display:none}.comment-count{font-size:14px}.column-categories,.column-tags,.fixed .column-author,.fixed .column-date,.media .column-parent,.sites .column-registered,.sites .column-users,.tags .column-description,.users .column-email,.users .column-name{display:none}.fixed .column-comment .comment-author{display:block}.column-title{width:85%}.fixed .column-comments,.widefat .check-column{width:35px}.widefat tfoot .check-column,.widefat thead .check-column{padding:10px 0}.widefat *{word-wrap:normal}#wpbody-content .bulk-edit-row .inline-edit-col-bottom,#wpbody-content .bulk-edit-row .inline-edit-col-left,#wpbody-content .bulk-edit-row-page .inline-edit-col-right,#wpbody-content .bulk-edit-row-post .inline-edit-col-right,#wpbody-content .inline-edit-row-post .inline-edit-col-center,#wpbody-content .quick-edit-row-page .inline-edit-col-left,#wpbody-content .quick-edit-row-page .inline-edit-col-right,#wpbody-content .quick-edit-row-post .inline-edit-col-left,#wpbody-content .quick-edit-row-post .inline-edit-col-right{float:none;width:100%}#wpbody-content .bulk-edit-row fieldset .inline-edit-col label,#wpbody-content .bulk-edit-row fieldset .inline-edit-group label,#wpbody-content .quick-edit-row fieldset .inline-edit-col label,#wpbody-content .quick-edit-row fieldset .inline-edit-group label{max-width:none;float:none;margin-bottom:5px}#wpbody .bulk-edit-row fieldset select{display:block;width:100%;max-width:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.inline-edit-row #bulk-titles div,.inline-edit-row fieldset ul.cat-checklist label{font-size:16px}.inline-edit-row fieldset label span.title{float:none}.inline-edit-row fieldset label.inline-edit-tags{padding:0 .5em}.inline-edit-row fieldset .inline-edit-col label.inline-edit-tags{padding:0}.inline-edit-row fieldset label span.input-text-wrap{margin-right:0}.inline-edit-row fieldset input[name=hh],.inline-edit-row fieldset input[name=jj],.inline-edit-row fieldset input[name=mn]{width:3em}.inline-edit-row fieldset input[name=aa]{width:4.5em}#bulk-titles div{margin:.8em .3em}#bulk-titles div a{height:22px}.tags .column-posts{width:50px}.tags .column-slug{width:30%}.comments .column-response,.users .column-role{width:35%}.sites .column-blogname{width:55%}#wpbody-content #update-themes-table .plugin-title{width:auto}.link-manager-php #posts-filter{margin-top:25px}.link-manager-php .tablenav.bottom{overflow:hidden}.wp-list-table.plugins{position:relative;margin-top:35px;margin-bottom:50px}#wpbody-content .wp-list-table.plugins tfoot .column-description,.wp-list-table.plugins th#description,.wp-list-table.plugins thead .column-description{display:none}#wpbody-content .wp-list-table.plugins,#wpbody-content .wp-list-table.plugins .column-description,#wpbody-content .wp-list-table.plugins .manage-column.column-name,#wpbody-content .wp-list-table.plugins .plugin-title,#wpbody-content .wp-list-table.plugins .plugin-update,#wpbody-content .wp-list-table.plugins .theme-title,#wpbody-content .wp-list-table.plugins tbody,#wpbody-content .wp-list-table.plugins thead,#wpbody-content .wp-list-table.plugins tr{display:block;width:auto}.wp-list-table.plugins tfoot,.wp-list-table.plugins thead{position:absolute;top:-35px;right:0;left:0;width:auto;height:35px}.wp-list-table.plugins tfoot{bottom:-35px;top:auto}.active,.inactive{padding-top:0}.wp-list-table.plugins .plugin-title,.wp-list-table.plugins .theme-title{padding-top:13px;padding-bottom:4px}.plugins tr.active+tr.inactive td,.plugins tr.active+tr.inactive th.check-column,.wp-list-table.plugins .plugin-title,.wp-list-table.plugins .theme-title,.wp-list-table.plugins tbody th{-webkit-box-shadow:none;box-shadow:none}.plugins tbody{padding:1px 0 0}.plugins tr.active+tr.inactive td.column-description{-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 -1px 0 rgba(0,0,0,.1)}.plugins tr.active+tr.inactive td,.plugins tr.active+tr.inactive th.check-column{border-top:0}.wp-list-table.plugins .column-description{padding-top:0}.wp-list-table.plugins .column-description,.wp-list-table.plugins .manage-column.column-name,.wp-list-table.plugins .plugin-title,.wp-list-table.plugins .theme-title{padding-left:12px;padding-right:46px}.wp-list-table.plugins tr{position:relative}.wp-list-table.plugins th.check-column,.wp-list-table.plugins tr.update th.check-column{position:absolute;height:auto;top:0;bottom:0;right:0;padding-right:2px;padding-top:18px}.wp-list-table.plugins tfoot th.check-column,.wp-list-table.plugins thead th.check-column{padding-right:3px;padding-top:11px;background:0 0}.widefat tbody th.check-column input[type=checkbox]{margin-top:-3px;margin-right:8px}.wp-list-table.plugins .active .check-column input,.wp-list-table.plugins .update .check-column input{margin-right:5px}.wp-list-table.plugins tfoot .check-column input,.wp-list-table.plugins thead .check-column input{margin-top:-6px}.wp-list-table.plugins .active th.check-column{background:0 0}.wp-list-table.plugins .plugin-title strong,.wp-list-table.plugins .theme-title strong{font-size:1.4em;line-height:1.6em}table.plugin-install .column-description,table.plugin-install .column-name,table.plugin-install .column-rating,table.plugin-install .column-version{display:block;width:auto}table.plugin-install th.column-description,table.plugin-install th.column-name,table.plugin-install th.column-rating,table.plugin-install th.column-version{display:none}table.plugin-install td.column-name strong{font-size:1.4em;line-height:1.6em}table.plugin-install #the-list td{-webkit-box-shadow:none;box-shadow:none}table.plugin-install #the-list tr{display:block;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 -1px 0 rgba(0,0,0,.1)}}#poststuff{padding-top:10px;min-width:763px}#poststuff #post-body{padding:0}#poststuff .postbox-container{width:100%}#poststuff #post-body.columns-2{margin-left:300px}#show-comments{overflow:hidden}#save-action .spinner,#show-comments .spinner,#show-comments a{float:right}#lost-connection-notice .spinner{display:block;float:right;margin:0 0 0 5px}#titlediv{position:relative;margin-bottom:10px}#titlediv label{cursor:text}#titlediv div.inside{margin:0}#poststuff #titlewrap{border:0;padding:0}#titlediv #title{padding:3px 8px;font-size:1.7em;line-height:100%;height:1.7em;width:100%;outline:0;margin:0;background-color:#fff}#titlediv #title-prompt-text{color:#777;position:absolute;font-size:1.7em;padding:11px 10px}#wp-fullscreen-save .fs-saved{color:#999;float:left;margin-top:4px}#poststuff .inside-submitbox,#side-sortables .inside-submitbox{margin:0 3px;font-size:11px}input#link_description,input#link_url{width:98%}#pending{background:0 none;border:0 none;padding:0;font-size:11px;margin-top:-1px}#edit-slug-box{line-height:24px;min-height:25px;margin-top:5px;padding:0 10px;color:#666}#edit-slug-box .cancel{margin-left:10px;font-size:11px}#editable-post-name-full{display:none}#editable-post-name{background-color:#fffbcc}#editable-post-name input{font-size:13px;height:22px;margin:0;width:16em}.postarea h3 label{float:right}.submitbox .submit{text-align:right;padding:12px 10px 10px;font-size:11px;background-color:#464646;color:#ccc}.submitbox .submitdelete{text-decoration:none;padding:1px 2px}#normal-sortables .submitbox .submitdelete:hover{color:#000;background-color:red;border-bottom-color:red}.submitbox .submit a:hover{text-decoration:underline}.submitbox .submit input{margin-bottom:8px;margin-left:4px;padding:6px}.inside-submitbox #post_status{margin:2px -2px 2px 0}#post-status-select{margin-top:3px}#post-body #normal-sortables{min-height:50px}.postbox{position:relative;min-width:255px;border:1px solid #e5e5e5;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04);background:#fff}#trackback_url{width:99%}#normal-sortables .postbox .submit{background:transparent none;border:0 none;float:left;padding:0 12px;margin:0}.category-add input[type=text],.category-add select{width:100%;max-width:260px;vertical-align:baseline}#side-sortables .category-add input[type=text],#side-sortables .category-add select{margin:0 0 1em}#side-sortables .add-menu-item-tabs li,.wp-tab-bar li,ul.category-tabs li{display:inline;line-height:1.35em}.no-js .category-tabs li.hide-if-no-js{display:none}#side-sortables .add-menu-item-tabs a,.category-tabs a,.wp-tab-bar a{text-decoration:none}#post-body ul.add-menu-item-tabs li.tabs a,#post-body ul.category-tabs li.tabs a,#side-sortables .add-menu-item-tabs .tabs a,#side-sortables .category-tabs .tabs a,.wp-tab-bar .wp-tab-active a{color:#333}.category-tabs{margin:8px 0 5px}#category-adder h4{margin:10px 0}#side-sortables .add-menu-item-tabs,.wp-tab-bar{margin-bottom:3px}#normal-sortables .postbox #replyrow .submit{float:none;margin:0;padding:0 7px 5px}#side-sortables .submitbox .submit .preview,#side-sortables .submitbox .submit a.preview:hover,#side-sortables .submitbox .submit input{border:0 none}#side-sortables .inside-submitbox .insidebox,.stuffbox .insidebox{margin:11px 0}ul.add-menu-item-tabs,ul.category-tabs,ul.wp-tab-bar{margin-top:12px}ul.add-menu-item-tabs li,ul.category-tabs li{border:solid 1px transparent;position:relative}.wp-tab-active,ul.add-menu-item-tabs li.tabs,ul.category-tabs li.tabs{border:1px solid #dfdfdf;border-bottom-color:#fdfdfd;background-color:#fdfdfd}ul.add-menu-item-tabs li,ul.category-tabs li,ul.wp-tab-bar li{padding:3px 5px 5px}#postimagediv .inside img{max-width:100%;height:auto}form#tags-filter{position:relative}td.plugin-title strong,td.post-title strong{display:block;margin-bottom:.2em;font-size:14px}td.plugin-title p,td.post-title p{margin:6px 0}.ui-tabs-hide,.wp-hidden-children .wp-hidden-child{display:none}#post-body .tagsdiv #newtag{margin-left:5px;width:16em}#side-sortables input#post_password{width:94%}#side-sortables .tagsdiv #newtag{width:68%}#post-status-info{width:100%;border-spacing:0;border:1px solid #e5e5e5;border-top:0;background-color:#f7f7f7;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04)}#post-status-info td{font-size:12px}.autosave-info{padding:2px;text-align:left}#editorcontent #post-status-info{border:0}#content-resize-handle{background:transparent url(../images/resize.gif) no-repeat scroll left bottom;width:12px;cursor:row-resize}.rtl #content-resize-handle{background:transparent url(../images/resize-rtl.gif) no-repeat scroll right bottom}#wp-word-count{display:block;padding:2px 10px}#timestampdiv select{height:21px;line-height:14px;padding:0;vertical-align:top;font-size:12px}#aa,#hh,#jj,#mn{padding:1px;font-size:12px}#hh,#jj,#mn{width:2em}#aa{width:3.4em}.curtime #timestamp{padding:2px 0 1px;display:inline!important;height:auto!important}#misc-publishing-actions label[for=post_status]:before,#post-body #visibility:before,#post-body .misc-pub-revisions:before,.curtime #timestamp:before,span.wp-media-buttons-icon:before{color:#888}#post-body #visibility:before,#post-body .misc-pub-revisions:before,.curtime #timestamp:before{font:400 20px/1 dashicons;speak:none;display:inline-block;padding:0 0 0 2px;top:0;right:-1px;position:relative;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important}#post-body #visibility:before{content:'\f177'}.curtime #timestamp:before{content:'\f145';top:-1px}#post-body .misc-pub-revisions:before{content:'\f321'}#timestampdiv{padding-top:5px;line-height:23px}#timestampdiv p{margin:8px 0 6px}#timestampdiv input{border-width:1px;border-style:solid}.notification-dialog{position:fixed;top:30%;right:50%;width:450px;margin-right:-225px;background:#fff;-webkit-box-shadow:0 3px 6px rgba(0,0,0,.3);box-shadow:0 3px 6px rgba(0,0,0,.3);line-height:1.5;z-index:1000005}.notification-dialog-background{position:fixed;top:0;right:0;left:0;bottom:0;background:#000;opacity:.7;filter:alpha(opacity=70);z-index:1000000}#post-lock-dialog .post-locked-message,#post-lock-dialog .post-taken-over{margin:25px}#post-lock-dialog .post-locked-message a.button{margin-left:10px}#post-lock-dialog .post-locked-avatar{float:right;margin:0 0 20px 20px}#post-lock-dialog .wp-tab-first{outline:0}#post-lock-dialog .locked-saving img{float:right;margin-left:3px}#post-lock-dialog.saved .locked-saved,#post-lock-dialog.saving .locked-saving{display:inline}#excerpt,.attachmentlinks{margin:0;height:4em;width:98%}.tagchecklist{margin-right:14px;font-size:12px;overflow:auto}.tagchecklist br{display:none}.tagchecklist strong{margin-right:-8px;position:absolute}.tagchecklist span{margin-left:25px;display:block;float:right;font-size:13px;line-height:1.8em;white-space:nowrap;cursor:default}.tagchecklist span a{margin:1px -17px 0 0;cursor:pointer;width:20px;height:20px;display:block;float:right;text-indent:0;overflow:hidden;position:absolute}#poststuff h2{margin-top:20px;font-size:1.5em;margin-bottom:15px;padding:0 0 3px;clear:right}#poststuff h3{font-size:14px;padding:8px 12px;margin:0;line-height:1.4}#poststuff .inside{margin:6px 0 0}#poststuff .inside #page_template,#poststuff .inside #parent_id{max-width:100%}#poststuff .inside label.deleted,#poststuff .inside label.spam{color:red}#poststuff .inside label.waiting{color:orange}#poststuff .inside label.approved{color:green}.ie8 #poststuff .inside #page_template,.ie8 #poststuff .inside #parent_id{width:250px}#post-visibility-select{line-height:1.5em;margin-top:3px}#poststuff #submitdiv .inside{margin:0;padding:0}.edit-form-section{margin-bottom:20px}#postcustomstuff thead th{padding:5px 8px 8px;background-color:#f1f1f1}#postcustom #postcustomstuff .submit{border:0 none;float:none;padding:0 8px 8px}#side-sortables #postcustom #postcustomstuff .submit{margin:0;padding:0}#side-sortables #postcustom #postcustomstuff #the-list textarea{height:85px}#side-sortables #postcustom #postcustomstuff td.left input,#side-sortables #postcustom #postcustomstuff td.left select,#side-sortables #postcustomstuff #newmetaleft a{margin:3px 3px 0}#postcustomstuff table{margin:0;width:100%;border:1px solid #dfdfdf;border-spacing:0;background-color:#f9f9f9}#postcustomstuff tr{vertical-align:top}#postcustomstuff table input,#postcustomstuff table select,#postcustomstuff table textarea{width:96%;margin:8px}#side-sortables #postcustomstuff table input,#side-sortables #postcustomstuff table select,#side-sortables #postcustomstuff table textarea{margin:3px}#postcustomstuff td.left,#postcustomstuff th.left{width:38%}#postcustomstuff .submit input{margin:0;width:auto}#postcustomstuff #newmetaleft a{display:inline-block;margin:0 8px 8px;text-decoration:none}.no-js #postcustomstuff #enternew{display:none}#post-body-content .compat-attachment-fields{margin-bottom:20px}.compat-attachment-fields th{padding-top:5px;padding-left:10px}#select-featured-image{padding:4px 0;overflow:hidden}#select-featured-image img{max-width:100%;height:auto;margin-bottom:10px}#select-featured-image a{float:right;clear:both}#select-featured-image .remove{display:none;margin-top:10px}.js #select-featured-image.has-featured-image .remove{display:inline-block}.no-js #select-featured-image .choose{display:none}.post-state-format{overflow:hidden;display:inline-block;vertical-align:middle;height:20px;width:20px;margin-left:5px;margin-top:-4px}.post-state-format:before{display:block;height:20px;width:20px;font:400 20px/1 dashicons!important;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.post-format-icon:before,.post-state-format:before{color:#ddd;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}a.post-format-icon:hover:before,a.post-state-format:hover:before{color:#2ea2cc}#post-formats-select{line-height:2em}#post-formats-select .post-format-icon:before{top:5px}input.post-format{margin-top:1px}label.post-format-icon{margin-right:0;padding:2px 0}.post-format-icon:before{position:relative;display:inline-block;margin-left:7px;font:400 20px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.post-format-icon.post-format-standard:before,.post-state-format.post-format-standard:before,a.post-state-format.format-standard:before{content:'\f109'}.post-format-icon.post-format-image:before,.post-state-format.post-format-image:before,a.post-state-format.format-image:before{content:'\f128'}.post-format-icon.post-format-gallery:before,.post-state-format.post-format-gallery:before,a.post-state-format.format-gallery:before{content:'\f161'}.post-format-icon.post-format-audio:before,.post-state-format.post-format-audio:before,a.post-state-format.format-audio:before{content:'\f127'}.post-format-icon.post-format-video:before,.post-state-format.post-format-video:before,a.post-state-format.format-video:before{content:'\f126'}.post-format-icon.post-format-chat:before,.post-state-format.post-format-chat:before,a.post-state-format.format-chat:before{content:'\f125'}.post-format-icon.post-format-status:before,.post-state-format.post-format-status:before,a.post-state-format.format-status:before{content:'\f130'}.post-format-icon.post-format-aside:before,.post-state-format.post-format-aside:before,a.post-state-format.format-aside:before{content:'\f123'}.post-format-icon.post-format-quote:before,.post-state-format.post-format-quote:before,a.post-state-format.format-quote:before{content:'\f122'}.post-format-icon.post-format-link:before,.post-state-format.post-format-link:before,a.post-state-format.format-link:before{content:'\f103'}.category-adder{margin-right:120px;padding:4px 0}.category-adder h4{margin:0 0 8px}#side-sortables .category-adder{margin:0}.categorydiv div.tabs-panel,.customlinkdiv div.tabs-panel,.posttypediv div.tabs-panel,.taxonomydiv div.tabs-panel,.wp-tab-panel{min-height:42px;max-height:200px;overflow:auto;padding:0 .9em;border:solid 1px #dfdfdf;background-color:#fdfdfd}div.tabs-panel-active{display:block}div.tabs-panel-inactive{display:none}#front-page-warning,#front-static-pages ul,.categorydiv ul.categorychecklist ul,.customlinkdiv ul.categorychecklist ul,.inline-editor ul.cat-checklist ul,.posttypediv ul.categorychecklist ul,.taxonomydiv ul.categorychecklist ul,ul.export-filters{margin-right:18px}ul.categorychecklist li{margin:0;padding:0;line-height:22px;word-wrap:break-word}.categorydiv .tabs-panel,.customlinkdiv .tabs-panel,.posttypediv .tabs-panel,.taxonomydiv .tabs-panel{border-width:3px;border-style:solid}.form-wrap label{display:block;padding:2px;font-size:12px}.form-field input,.form-field textarea{border-style:solid;border-width:1px;width:95%}.form-wrap p,p.description{margin:2px 0 5px;color:#666}.form-wrap p,p.description,p.help,span.description{font-size:13px;font-style:italic}.form-wrap .form-field{margin:0 0 10px;padding:8px 0}.form-wrap .form-field #parent{max-width:100%}.col-wrap h3{margin:12px 0;font-size:1.1em}.col-wrap p.submit{margin-top:-10px}.tagsdiv{margin-top:-8px}#poststuff .taghint{color:#aaa;margin:15px 12px -24px 0}#poststuff .tagsdiv .howto{margin:0 0 6px}.ajaxtag .newtag{position:relative}.tagsdiv .newtag{width:180px}.tagsdiv .the-tags{display:block;height:60px;margin:0 auto;overflow:auto;width:260px}#post-body-content .tagsdiv .the-tags{margin:0 5px}.taghint{color:#aaa;margin:-17px 7px 0 0;visibility:hidden}input.newtag~div.taghint{visibility:visible}input.newtag:focus~div.taghint{visibility:hidden}p.popular-tags{border:0;line-height:2em;max-width:1000px;padding:8px 12px 12px;text-align:justify}p.popular-tags a{padding:0 3px}.tagcloud{width:97%;margin:0 0 40px;text-align:justify}.tagcloud h3{margin:2px 0 12px}.ac_results{padding:0;margin:0;list-style:none;position:absolute;z-index:10000;display:none;border:1px solid gray;background-color:#fff}.wp-customizer .ac_results{z-index:500000}.ac_results li{padding:2px 5px;white-space:nowrap;color:#101010;text-align:right}.ac_over{background-color:#f0f0b8;cursor:pointer}.ac_match{text-decoration:underline}.comment-php .wp-editor-area{height:200px}.comment-ays{margin-bottom:0;border-bottom-style:solid;border-bottom-width:1px}.comment-ays .alt{background-color:transparent}.spam-undo-inside,.trash-undo-inside{margin:1px 0 1px 8px;line-height:16px}.spam-undo-inside .avatar,.trash-undo-inside .avatar{height:20px;width:20px;margin-left:8px;vertical-align:middle}.stuffbox .editcomment{clear:none}#comment-status-radio p{margin:3px 0 5px}#comment-status-radio input{margin:2px 0 5px 3px;vertical-align:middle}#comment-status-radio label{padding:5px 0}table.links-table{width:100%;border-spacing:0}.links-table th{font-weight:400;text-align:right;vertical-align:top;min-width:80px;width:20%;word-wrap:break-word}.links-table td,.links-table th{padding:5px 0}.links-table td label{margin-left:8px}.links-table td input[type=text],.links-table td textarea{width:100%}.links-table #link_rel{max-width:280px}@media print,(-o-min-device-pixel-ratio:5/4),(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){#content-resize-handle,#post-body .wp_themeSkin .mceStatusbar a.mceResize{background:transparent url(../images/resize-2x.gif) no-repeat scroll left bottom;-webkit-background-size:11px 11px;background-size:11px 11px}.rtl #content-resize-handle,.rtl #post-body .wp_themeSkin .mceStatusbar a.mceResize{background:transparent url(../images/resize-rtl-2x.gif) no-repeat scroll left bottom}}@media only screen and (max-width:850px){#poststuff{min-width:0}#wpbody-content #poststuff #post-body{margin:0}#wpbody-content #post-body.columns-2 #postbox-container-1{margin-left:0;width:100%}#poststuff #postbox-container-1 #side-sortables:empty,#poststuff #postbox-container-1 .empty-container{border:0 none;height:0;min-height:0}#poststuff #post-body.columns-2 #side-sortables{min-height:0}.columns-prefs,.screen-layout{display:none}}@media screen and (max-width:782px){#post-body-content{min-width:0}#titlediv #title-prompt-text{padding:10px}#poststuff h3{padding:12px}.post-format-options{padding-left:0}.post-format-options a{margin-left:5px;margin-bottom:5px;min-width:52px}.post-format-options .post-format-title{font-size:11px}.post-format-options a div{height:28px;width:28px}.post-format-options a div:before{font-size:26px!important}#post-visibility-select{line-height:280%}.wp-core-ui .save-post-visibility,.wp-core-ui .save-timestamp{vertical-align:middle;margin-left:15px}.timestamp-wrap select#mm{display:block;width:100%;margin-bottom:10px}.timestamp-wrap #aa,.timestamp-wrap #hh,.timestamp-wrap #jj,.timestamp-wrap #mn{padding:12px 3px;font-size:14px;margin-bottom:5px;width:auto;text-align:center}ul.category-tabs{margin:30px 0 15px}ul.category-tabs li.tabs{padding:15px}ul.categorychecklist li{margin-bottom:15px}ul.categorychecklist ul{margin-top:15px}.category-add input[type=text],.category-add select{max-width:none;margin-bottom:15px}.tagsdiv .newtag{width:100%;height:auto;margin-bottom:15px}.tagchecklist{margin:25px 10px}.tagchecklist span{font-size:16px;line-height:120%}#commentstatusdiv p{line-height:2.8}.mceToolbar *{white-space:normal!important}.mceToolbar td,.mceToolbar tr{float:right!important}.wp_themeSkin a.mceButton{width:30px;height:30px}.wp_themeSkin .mceButton .mceIcon{margin-top:5px;margin-right:5px}.wp_themeSkin .mceSplitButton{margin-top:1px}.wp_themeSkin .mceSplitButton td a.mceAction{padding-top:6px;padding-bottom:6px;padding-right:6px;padding-left:3px}.wp_themeSkin .mceSplitButton td a.mceOpen,.wp_themeSkin .mceSplitButtonEnabled:hover td a.mceOpen{padding-top:6px;padding-bottom:6px;background-position:1px 6px}.wp_themeSkin table.mceListBox{margin:5px}div.quicktags-toolbar input{padding:10px 20px}#wp-content-editor-tools{overflow:hidden;padding:20px 0 1px 15px;top:1px}a.wp-switch-editor{font-size:16px;line-height:1em;margin:3px 7px 0 0;padding:12px 15px}#wp-content-media-buttons a{font-size:16px;line-height:37px;height:39px;padding:0 15px 0 20px}.wp-media-buttons span.jetpack-contact-form-icon,.wp-media-buttons span.wp-media-buttons-icon{width:22px!important;margin-top:-3px!important;margin-right:-5px!important}.wp-media-buttons #insert-jetpack-contact-form span.jetpack-contact-form-icon:before,.wp-media-buttons .add_media span.wp-media-buttons-icon:before{font-size:20px!important}#content_wp_fullscreen{display:none}.misc-pub-section{padding:20px 10px}.misc-pub-section>a{float:left;font-size:16px}#delete-action,#publishing-action{line-height:47px}.comment-ays{border-bottom:0}.links-table #link_rel{max-width:none}.links-table td,.links-table th{padding:10px 0}}@media only screen and (max-width:500px){#wp-content-media-buttons a{font-size:14px;padding:0 10px}}.revisions-control-frame,.revisions-diff-frame{position:relative}.revisions-controls{padding-top:40px;height:100px;z-index:1}.revisions-controls input[type=checkbox]{position:relative;top:-1px;vertical-align:text-bottom}.revisions.pinned .revisions-controls{position:fixed;top:0;height:82px;background:#fff;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.1);box-shadow:0 1px 3px rgba(0,0,0,.1)}.revisions-tickmarks{position:relative;margin:0 auto;height:.7em;top:7px;max-width:70%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;background-color:#fff}.revisions-tickmarks>div{position:absolute;height:100%;border-right:1px solid #aaa;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.revisions-tickmarks>div:first-child{border-width:0}.comparing-two-revisions .revisions-controls{height:140px}.comparing-two-revisions.pinned .revisions-controls{height:124px}.revisions .diff-error{position:absolute;text-align:center;margin:0 auto;width:100%;display:none}.revisions.diff-error .diff-error{display:block}.revisions .loading-indicator{position:fixed;vertical-align:middle;opacity:0;width:100%;top:50%;margin-right:-90px;-webkit-transition:opacity .5s;transition:opacity .5s;filter:alpha(opacity=0)}body.folded .revisions .loading-indicator{margin-right:-32px}.revisions .loading-indicator span.spinner{display:block;margin:0 auto;float:none}.revisions.loading .loading-indicator{opacity:1;filter:alpha(opacity=100)}.revisions .diff{-webkit-transition:opacity .5s;transition:opacity .5s}.revisions.loading .diff{opacity:.5;filter:alpha(opacity=50)}.revisions.diff-error .diff{visibility:hidden}.revisions-meta{margin-top:20px;background-color:#fff;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.1);box-shadow:0 1px 3px rgba(0,0,0,.1)}.revisions.pinned .revisions-meta{-webkit-box-shadow:none;box-shadow:none}.revision-toggle-compare-mode{position:absolute;top:0;left:0}.comparing-two-revisions .revisions-next,.comparing-two-revisions .revisions-previous,.revisions-meta .diff-meta-to strong{display:none}.revisions-controls .author-card .date{color:#777}.revisions-controls .author-card.autosave{color:#d54e21}.revisions-controls .author-card .author-name{font-weight:700}.comparing-two-revisions .diff-meta-to strong{display:block}.revisions.pinned .revisions-buttons{padding:0 11px}.revisions-next,.revisions-previous{position:relative;z-index:1}.revisions-previous{float:right}.revisions-next{float:left}.revisions-controls .wp-slider{max-width:70%;margin:0 auto;top:-3px}.revisions-diff{padding:15px;background-color:#fff;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.1);box-shadow:0 1px 3px rgba(0,0,0,.1)}.revisions-diff h3:first-child{margin-top:0}#revisions-meta-restored img,.post-revisions li img{vertical-align:middle}table.diff tbody tr td:nth-child(2){width:4%}table.diff{table-layout:fixed;width:100%;white-space:pre-wrap}table.diff col.content{width:auto}table.diff col.content.diffsplit{width:48%}table.diff col.diffsplit.middle{width:auto}table.diff col.ltype{width:30px}table.diff tr{background-color:transparent}table.diff td,table.diff th{font-family:Consolas,Monaco,monospace;font-size:14px;line-height:1.618;padding:.5em;vertical-align:top;word-wrap:break-word}table.diff td h1,table.diff td h2,table.diff td h3,table.diff td h4,table.diff td h5,table.diff td h6{margin:0}table.diff .diff-addedline ins,table.diff .diff-deletedline del{text-decoration:none}table.diff .diff-deletedline{background-color:#ffe9e9}table.diff .diff-deletedline del{background-color:#faa}table.diff .diff-addedline{background-color:#e9ffe9}table.diff .diff-addedline ins{background-color:#afa}.diff-meta{padding:5px;clear:both;min-height:32px}.diff-title strong{line-height:32px;min-width:60px;text-align:left;float:right;margin-left:5px}.revisions-controls .author-card .author-info{font-size:12px;line-height:16px}.revisions-controls .author-card .author-info,.revisions-controls .author-card .avatar{float:right;margin-right:6px;margin-left:6px}.revisions-controls .author-card .byline{display:block;font-size:12px}.revisions-controls .author-card .avatar{vertical-align:middle}.diff-meta input.restore-revision{float:left;margin-right:6px;margin-left:6px;margin-top:4px}.diff-meta-from{display:none}.comparing-two-revisions .diff-meta-from{display:block}.revisions-tooltip{position:absolute;bottom:105px;margin-left:0;margin-right:-69px;z-index:0;max-width:350px;min-width:130px;padding:8px 4px;opacity:0}.revisions-tooltip.flipped{margin-right:0;margin-left:-70px}.revisions.pinned .revisions-tooltip{display:none!important}.comparing-two-revisions .revisions-tooltip{bottom:145px}.revisions-tooltip-arrow{width:70px;height:15px;overflow:hidden;position:absolute;right:0;margin-right:35px;bottom:-15px}.revisions-tooltip.flipped .revisions-tooltip-arrow{margin-right:0;margin-left:35px;right:auto;left:0}.revisions-tooltip-arrow>span{content:"";position:absolute;right:20px;top:-20px;width:25px;height:25px;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg)}.revisions-tooltip.flipped .revisions-tooltip-arrow>span{right:auto;left:20px}.ie8 .revisions-tooltip-arrow>span{right:15px;top:-25px;-ms-filter:"progid:DXImageTransform.Microsoft.Matrix(SizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476)"}.ie8 .revisions-tooltip.flipped .revisions-tooltip-arrow>span{left:25px}.revisions-tooltip,.revisions-tooltip-arrow>span{border:1px solid #d7d7d7;background-color:#fff}.revisions-tooltip{display:none}.arrow{width:70px;height:16px;overflow:hidden;position:absolute;right:0;margin-right:-35px;bottom:90px;z-index:10000}.arrow::after{z-index:9999;background-color:#fff;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.1);box-shadow:0 1px 3px rgba(0,0,0,.1)}.arrow.top{top:-16px;bottom:auto}.arrow.left{right:20%}.arrow:after{content:"";position:absolute;right:20px;top:-20px;width:25px;height:25px;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg)}.revisions-tooltip,.revisions-tooltip-arrow:after{border-width:1px;border-style:solid}div.revisions-controls>.wp-slider>.ui-slider-handle{margin-right:-10px}.rtl div.revisions-controls>.wp-slider>.ui-slider-handle{margin-left:-10px}.wp-slider.ui-slider{position:relative;border:1px solid #d7d7d7;text-align:right;cursor:pointer}.wp-slider .ui-slider-handle{-webkit-border-radius:50%;border-radius:50%;height:18px;margin-top:-3px;outline:0;position:absolute;width:18px;z-index:2}.wp-slider .ui-slider-handle,.wp-slider .ui-slider-handle.focus,.wp-slider .ui-slider-handle.ui-state-hover{background:#2ea2cc;border:1px solid #0074a2;-webkit-box-shadow:inset 0 1px 0 #78c8e6,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #78c8e6,0 1px 0 rgba(0,0,0,.15)}.wp-slider .ui-slider-handle:before{background:0 0;position:absolute;top:0;right:0;color:#fff;content:"\f229";font:400 18px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.wp-slider .ui-slider-handle.from-handle:before,.wp-slider .ui-slider-handle.to-handle:before{font-size:20px!important;margin:-1px -1px 0 0}.wp-slider .ui-slider-handle.from-handle:before{content:'\f139'}.rtl .wp-slider .ui-slider-handle.from-handle:before,.wp-slider .ui-slider-handle.to-handle:before{content:'\f141'}.rtl .wp-slider .ui-slider-handle.to-handle:before{content:'\f139';left:-1px}.wp-slider .ui-slider-range{position:absolute;font-size:.7em;display:block;border:0;background-color:transparent;background-image:none}.wp-slider.ui-slider-horizontal{height:.7em}.wp-slider.ui-slider-horizontal .ui-slider-handle{top:-.25em;margin-right:-.6em}.wp-slider.ui-slider-horizontal .ui-slider-range{top:0;height:100%}.wp-slider.ui-slider-horizontal .ui-slider-range-min{right:0}.wp-slider.ui-slider-horizontal .ui-slider-range-max{left:0}@media print,(-o-min-device-pixel-ratio:5/4),(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.revision-tick.completed-false{background-image:url(../images/spinner-2x.gif)}}@media screen and (max-width:782px){#diff-next-revision,#diff-previous-revision{margin-top:-1em}table.diff{-ms-word-break:break-all;word-break:break-all;word-wrap:break-word}}.media-item .describe{border-collapse:collapse;width:100%;border-top:1px solid #dfdfdf;clear:both;cursor:default}.media-item.media-blank .describe{border:0}.media-item .describe th{vertical-align:top;text-align:right;padding:5px 10px 10px;width:140px}.media-item .describe .align th{padding-top:0}.media-item .media-item-info tr{background-color:transparent}.media-item .describe td{padding:0 0 8px 8px;vertical-align:top}.media-item thead.media-item-info td{padding:4px 10px 0}.media-item .media-item-info .A1B1{padding:0 10px 0 0}.media-item td.savesend{padding-bottom:15px}.media-item .thumbnail{max-height:128px;max-width:128px}#wpbody-content #async-upload-wrap a{display:none}.media-upload-form{margin-top:20px}.media-upload-form td label{margin-left:6px;margin-right:2px}.media-upload-form .align .field label{display:inline;padding:0 23px 0 0;margin:0 3px 0 1em;font-weight:600}.media-upload-form tr.image-size label{margin:0 5px 0 0;font-weight:600}.media-upload-form th.label label{font-weight:600;margin:.5em;font-size:13px}.media-upload-form th.label label span{padding:0 5px}.media-item .describe input[type=text],.media-item .describe textarea{width:460px}.media-item .describe p.help{margin:0;padding:0 5px 0 0}.describe-toggle-off,.describe-toggle-on,.media-item .edit-attachment{display:block;line-height:36px;float:left}.media-item .describe-toggle-off,.media-item.open .describe-toggle-on{display:none}.media-item.open .describe-toggle-off{display:block}#media-items .media-item{border-bottom:1px solid #dfdfdf;min-height:36px;position:relative;width:100%}#media-items{width:623px}.media-new-php #media-items{margin:1em 0}#media-items:empty{border:0 none}.media-item .filename{line-height:36px;overflow:hidden}.media-item .pinkynail{float:right;margin:2px 0 0 10px;max-width:40px;max-height:32px}.media-item .startclosed,.media-item .startopen{display:none}.media-item .original{position:relative;height:34px}.media-item .progress{float:left;height:22px;margin:7px 0 0;width:200px;line-height:2em;padding:0;overflow:hidden;margin-bottom:2px;-webkit-border-radius:22px;border-radius:22px;background:#ddd;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.media-item .bar{z-index:9;width:0;height:100%;margin-top:-22px;-webkit-border-radius:22px;border-radius:22px;background-color:#0074a2;-webkit-box-shadow:inset 0 0 2px rgba(0,0,0,.3);box-shadow:inset 0 0 2px rgba(0,0,0,.3)}.media-item .progress .percent{z-index:10;position:relative;width:200px;padding:0;color:#fff;text-align:center;line-height:22px;font-weight:400;text-shadow:0 1px 2px rgba(0,0,0,.2)}.upload-php .fixed .column-parent{width:15%}.js .html-uploader #plupload-upload-ui{display:none}.js .html-uploader #html-upload-ui{display:block}.media-upload-form .media-item.error{margin:0;padding:0}.media-item .error-div,.media-upload-form .media-item.error p{line-height:16px;margin:5px 10px;padding:0}.media-item .error-div a.dismiss{display:block;float:left;margin:5px 15px 0 4px}.find-box{background-color:#fff;-webkit-box-shadow:0 3px 6px rgba(0,0,0,.3);box-shadow:0 3px 6px rgba(0,0,0,.3);width:600px;overflow:hidden;margin-right:-300px;position:fixed;top:30px;bottom:30px;right:50%;z-index:100105}.find-box-head{background:#fcfcfc;border-bottom:1px solid #dfdfdf;height:36px;font-size:18px;font-weight:600;line-height:36px;padding:0 16px 0 36px;position:absolute;top:0;right:0;left:0}.find-box-inside{overflow:auto;padding:16px;background-color:#fff;position:absolute;top:37px;bottom:45px;overflow-y:scroll;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.find-box-search{padding-bottom:16px}.find-box-search .spinner{float:none;right:125px;position:absolute;top:18px}#find-posts-input,#find-posts-search{float:right}#find-posts-input{width:140px;height:28px;margin:0 0 0 4px}.widefat .found-radio{padding-left:0;width:16px}#find-posts-close{width:36px;height:36px;position:absolute;top:0;left:0;cursor:pointer;text-align:center;color:#666}#find-posts-close:hover{color:#2ea2cc}#find-posts-close:before{font:400 20px/36px dashicons;vertical-align:top;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\f158'}.find-box-buttons{padding:8px 16px;background:#fcfcfc;border-top:1px solid #dfdfdf;position:absolute;bottom:0;right:0;left:0}@media screen and (max-width:782px){.find-box-inside{bottom:57px}}@media screen and (max-width:660px){.find-box{top:0;bottom:0;right:0;left:0;margin:0;width:100%}}.ui-find-overlay{position:fixed;top:0;right:0;left:0;bottom:0;background:#000;opacity:.7;filter:alpha(opacity=70);z-index:100100}ul#dismissed-updates{display:none}form.upgrade{margin-top:8px}form.upgrade .hint{font-style:italic;font-size:85%;margin:-.5em 0 2em 0}#poststuff .inside .the-tagcloud{margin:5px 0 10px;padding:8px;border:1px solid #ddd;line-height:1.8em;word-spacing:3px;-webkit-border-radius:6px;border-radius:6px}.drag-drop #drag-drop-area{border:4px dashed #bbb;height:200px}.drag-drop .drag-drop-inside{margin:70px auto 0;width:250px}.drag-drop-inside p{color:#aaa;font-size:14px;margin:5px 0;display:none}.drag-drop .drag-drop-inside p{text-align:center}.drag-drop-inside p.drag-drop-info{font-size:20px}.drag-drop .drag-drop-inside p,.drag-drop-inside p.drag-drop-buttons{display:block}.drag-drop.drag-over #drag-drop-area{border-color:#83b4d8}#plupload-upload-ui{position:relative}.wp_attachment_details label[for=content]{font-size:13px;line-height:1.5;margin:1em 0}.wp_attachment_details #attachment_caption{height:4em}.describe .image-editor{vertical-align:top}.imgedit-wrap{position:relative}.imgedit-settings p{margin:8px 0 0}.describe .imgedit-wrap .imgedit-settings{padding:0 5px}.wp_attachment_holder div.updated{margin-top:0}.wp_attachment_holder .imgedit-wrap>div{height:auto;overflow:hidden}.wp_attachment_holder .imgedit-wrap .imgedit-panel-content{padding-left:16px;width:auto;overflow:hidden}.wp_attachment_holder .imgedit-wrap .imgedit-settings{float:left;width:250px}.imgedit-settings input{margin-top:0;vertical-align:middle}.imgedit-wait{position:absolute;top:0;background:#fff url(../images/spinner.gif) no-repeat center;-webkit-background-size:20px 20px;background-size:20px 20px;opacity:.7;filter:alpha(opacity=70);width:100%;height:500px;display:none}.no-float{float:none}.imgedit-settings .disabled,.media-disabled{color:grey}.A1B1,.wp_attachment_image{overflow:hidden}.A1B1 .button,.wp_attachment_image .button{float:right}.no-js .wp_attachment_image .button{display:none}.A1B1 .spinner,.wp_attachment_image .spinner{float:right;padding:0 0 4px;vertical-align:bottom}.imgedit-menu{margin:0 0 12px;min-width:300px}.imgedit-menu div{float:right;width:32px;border:1px solid #d5d5d5;background:#f1f1f1;margin:0 0 0 8px;height:32px;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-align:center;line-height:28px;color:#777;cursor:pointer}.imgedit-menu div:before{font:400 20px/1 dashicons;speak:none;vertical-align:middle}.imgedit-menu div:hover{border-color:#c1c1c1;background-color:#eaeaea;color:#333}.imgedit-menu div.disabled{border-color:#ccc;background-color:#ddd;color:#777;filter:alpha(opacity=50);opacity:.5;cursor:default}.imgedit-crop:before{content:'\f165'}.imgedit-rleft:before{content:'\f166'}.imgedit-rright:before{content:'\f167'}.imgedit-flipv:before{content:'\f168'}.imgedit-fliph:before{content:'\f169'}.imgedit-undo:before{content:'\f171'}.imgedit-redo:before{content:'\f172'}.imgedit-crop-wrap{position:relative}.imgedit-crop{margin:0 0 0 8px}.imgedit-rleft{margin:0 3px}.imgedit-rright{margin:0 3px 0 8px}.imgedit-flipv{margin:0 3px}.imgedit-fliph{margin:0 3px 0 8px}.imgedit-undo{margin:0 3px}.imgedit-redo{margin:0 3px 0 8px}.imgedit-applyto img{margin:0 0 0 8px}.imgedit-group-top{margin:5px 0}#poststuff .imgedit-group-top h3{padding:0}.imgedit-group-top h3 a{text-decoration:none}.imgedit-applyto .imgedit-label{padding:2px 0 0;display:block}.imgedit-help{display:none;font-style:italic}a.imgedit-help-toggle{text-decoration:none}.form-table td.imgedit-response{padding:0}.imgedit-submit{margin:8px 0}.imgedit-submit-btn{margin-right:20px}.imgedit-wrap .nowrap{white-space:nowrap}span.imgedit-scale-warn{color:red;font-size:20px;font-style:normal;visibility:hidden;vertical-align:middle}.imgedit-group{margin-bottom:8px;padding:2px 10px}audio,video{display:inline-block;max-width:100%}.mejs-container{width:100%}@media print,(-o-min-device-pixel-ratio:5/4),(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.imgedit-wait{background-image:url(../images/spinner-2x.gif)}}@media screen and (max-width:782px){.wp_attachment_details label[for=content]{font-size:14px;line-height:1.5em}}.theme-browser .themes{clear:both;padding:0 0 100px}.themes-php .wrap h2{float:right;margin-bottom:15px}.network-admin.themes-php .wrap h2{margin-bottom:0}.themes-php .wrap h2 .button{margin-right:20px}.theme-navigation .theme-count,.themes-php .wrap .theme-count{color:#fff;-webkit-border-radius:30px;border-radius:30px;background:#777;font-size:14px;padding:4px 10px;font-weight:600;margin-right:5px;margin-left:20px;position:relative;top:-3px}.theme-navigation a{text-decoration:none}.themes-php div.error,.themes-php div.updated{margin:0 0 20px;clear:both}.themes-php div.updated a{text-decoration:underline}.theme-browser .theme{cursor:pointer;float:right;margin:0 0 4% 4%;position:relative;width:30.6%;border:1px solid #dedede;-webkit-box-shadow:0 1px 1px -1px rgba(0,0,0,.1);box-shadow:0 1px 1px -1px rgba(0,0,0,.1);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.ie8 .theme-browser .theme{width:30%;margin:0 0 4% 3%}.theme-browser .theme:nth-child(3n){margin-left:0}.theme-browser .theme:focus,.theme-browser .theme:hover{cursor:pointer}.theme-browser .theme .theme-name{font-size:15px;font-weight:600;height:18px;margin:0;padding:15px;-webkit-box-shadow:inset 0 1px 0 rgba(0,0,0,.1);box-shadow:inset 0 1px 0 rgba(0,0,0,.1);overflow:hidden;white-space:nowrap;text-overflow:ellipsis;background:#fff;background:rgba(255,255,255,.65)}.theme-browser .theme .theme-actions{-ms-filter:"alpha(Opacity=0)";opacity:0;-webkit-transition:opacity .1s ease-in-out;transition:opacity .1s ease-in-out;position:absolute;bottom:0;left:0;height:38px;padding:9px 10px 0;background:rgba(244,244,244,.7);border-right:1px solid rgba(0,0,0,.05)}.theme-browser .theme.focus .theme-actions,.theme-browser .theme:focus .theme-actions,.theme-browser .theme:hover .theme-actions{-ms-filter:"alpha(Opacity=100)";opacity:1}.theme-browser .theme .theme-actions .button-primary{margin-left:3px}.theme-browser .theme .theme-actions .button-secondary{float:none;margin-right:3px}.theme-browser .theme .theme-screenshot{display:block;overflow:hidden;position:relative;-webkit-transition:opacity .2s ease-in-out;transition:opacity .2s ease-in-out}.theme-browser .theme .theme-screenshot:after{content:'';display:block;padding-top:66.66666%}.theme-browser .theme .theme-screenshot img{height:auto;position:absolute;right:0;top:0;width:100%;-webkit-transform:translateZ(0);-webkit-transition:opacity .2s ease-in-out;transition:opacity .2s ease-in-out}.theme-browser .theme:focus .theme-screenshot,.theme-browser .theme:hover .theme-screenshot{background:#fff}.theme-browser.rendered .theme:focus .theme-screenshot img,.theme-browser.rendered .theme:hover .theme-screenshot img{opacity:.4}.theme-browser .theme .more-details{-ms-filter:"alpha(Opacity=0)";opacity:0;position:absolute;top:35%;left:25%;right:25%;background:#222;background:rgba(0,0,0,.7);color:#fff;font-size:15px;text-shadow:0 1px 0 rgba(0,0,0,.6);-webkit-font-smoothing:antialiased;font-weight:600;padding:15px 12px;text-align:center;-webkit-border-radius:3px;border-radius:3px;-webkit-transition:opacity .1s ease-in-out;transition:opacity .1s ease-in-out}.theme-browser .theme:focus{outline:1px dotted #222}.theme-browser .theme:focus .more-details{opacity:1}.theme-browser .theme.active:focus .theme-actions{display:block}.theme-browser.rendered .theme:focus .more-details,.theme-browser.rendered .theme:hover .more-details{-ms-filter:"alpha(Opacity=100)";opacity:1}.theme-browser .theme .theme-installed,.theme-browser .theme .theme-update{background:#d54e21;background:rgba(213,78,33,.95);color:#fff;display:block;font-size:13px;font-weight:400;height:48px;line-height:48px;padding:0 10px;position:absolute;top:0;left:0;right:0;border-bottom:1px solid rgba(0,0,0,.25);overflow:hidden}.theme-browser .theme .theme-installed:before,.theme-browser .theme .theme-update:before{content:'\f463';display:inline-block;font:400 20px/1 dashicons;margin:0 0 0 6px;opacity:.8;position:relative;top:5px;speak:none;-webkit-font-smoothing:antialiased}.theme-browser .theme.active .theme-name{background:#2f2f2f;color:#fff;padding-left:110px;font-weight:300;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.5);box-shadow:inset 0 1px 1px rgba(0,0,0,.5)}.theme-browser .theme.active .theme-name span{font-weight:600}.theme-browser .theme.active .theme-actions{background:rgba(49,49,49,.7);border-right:0;opacity:1}.theme-browser .theme.active .theme-actions .button-primary{margin-left:0}.theme-browser .theme .theme-author{background:#222;color:#eee;display:none;font-size:14px;margin:0 10px;padding:5px 10px;position:absolute;bottom:56px}.theme-browser .theme.display-author .theme-author{display:block}.theme-browser .theme.display-author .theme-author a{color:inherit;text-decoration:none}.theme-browser .theme.add-new-theme{border:0;-webkit-box-shadow:none;box-shadow:none}.theme-browser .theme.add-new-theme a{color:#999;text-decoration:none;display:block;position:relative;z-index:1}.theme-browser .theme.add-new-theme:after{display:block;content:'';-ms-filter:"alpha(Opacity=100)";opacity:1;background:0 0;background:rgba(0,0,0,0);position:absolute;top:0;right:0;left:0;bottom:0;padding:10% 0 0;text-shadow:none;border:5px dashed #d5d2ca;border:5px dashed rgba(0,0,0,.1);-webkit-transition:opacity .2s ease-in-out;transition:opacity .2s ease-in-out;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.theme-browser .theme.add-new-theme span:after{background:#e5e5e5;background:rgba(153,153,153,.1);-webkit-border-radius:50%;border-radius:50%;display:inline-block;content:'\f132';-webkit-font-smoothing:antialiased;font:400 74px/115px dashicons;width:100px;height:100px;vertical-align:middle;text-align:center;color:#999;position:absolute;top:30%;right:50%;margin-right:-50px;text-indent:-4px;padding:0;text-shadow:none;z-index:4}.rtl .theme-browser .theme.add-new-theme span:after{text-indent:4px}.theme-browser .theme.add-new-theme:focus .theme-screenshot,.theme-browser .theme.add-new-theme:hover .theme-screenshot{background:0 0}.theme-browser .theme.add-new-theme:focus span:after,.theme-browser .theme.add-new-theme:hover span:after{background:#fff;color:#0074a2}.theme-browser .theme.add-new-theme:focus:after,.theme-browser .theme.add-new-theme:hover:after{border-color:transparent;color:#fff;background:#0074a2;content:''}.theme-browser .theme.add-new-theme .theme-name{background:0 0;text-align:center;-webkit-box-shadow:none;box-shadow:none;font-weight:400;position:relative;top:0;margin-top:-10%;margin-bottom:10%}.theme-browser .theme.add-new-theme:focus .theme-name,.theme-browser .theme.add-new-theme:hover .theme-name{color:#fff;z-index:2}.themes-php .theme-search{position:relative;top:-2px;right:20px;font-size:16px;font-weight:300;line-height:1.5;width:280px}.theme-overlay .theme-backdrop{position:absolute;right:-20px;left:0;top:0;bottom:0;background:#f1f1f1;background:rgba(238,238,238,.9);z-index:10}body.theme-overlay-open{overflow:hidden}.theme-overlay .theme-header{position:absolute;top:0;right:0;left:0;height:48px;border-bottom:1px solid #ddd}.theme-overlay .theme-header .close{cursor:pointer;height:48px;width:50px;text-align:center;float:left;border:0;border-right:1px solid #ddd;background-color:transparent}.theme-overlay .theme-header .close:focus:before,.theme-overlay .theme-header .close:hover:before{color:#fff}.theme-overlay .theme-header .close:before{font:400 30px/50px dashicons!important;color:#777;display:inline-block;content:'\f335';font-weight:300}.theme-overlay .theme-header .left,.theme-overlay .theme-header .right{cursor:pointer;color:#777;background-color:transparent;height:48px;width:54px;float:right;text-align:center;border:0;border-left:1px solid #ddd}.theme-overlay .theme-header .close:focus,.theme-overlay .theme-header .close:hover,.theme-overlay .theme-header .left:focus,.theme-overlay .theme-header .left:hover,.theme-overlay .theme-header .right:focus,.theme-overlay .theme-header .right:hover{background:#0074a2;color:#fff}.theme-overlay .theme-header .left.disabled,.theme-overlay .theme-header .left.disabled:hover,.theme-overlay .theme-header .right.disabled,.theme-overlay .theme-header .right.disabled:hover{color:#ccc;background:inherit;cursor:inherit}.theme-overlay .theme-header .left:before,.theme-overlay .theme-header .right:before{font:400 20px/50px dashicons!important;display:inline;font-weight:300}.theme-overlay .theme-header .left:before{content:'\f340'}.theme-overlay .theme-header .right:before{content:'\f344'}.rtl .theme-overlay .theme-header .left:before{content:'\f345'}.rtl .theme-overlay .theme-header .right:before{content:'\f341'}.theme-overlay .theme-wrap{clear:both;position:fixed;top:9%;right:190px;left:30px;bottom:3%;background:#fff;-webkit-box-shadow:0 1px 20px 5px rgba(0,0,0,.1);box-shadow:0 1px 20px 5px rgba(0,0,0,.1);z-index:20;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.theme-overlay .theme-wrap:after{content:".";display:block;height:0;clear:both;visibility:hidden}body.folded .theme-overlay .theme-wrap{right:70px}.theme-overlay .theme-about{position:absolute;top:49px;bottom:57px;right:0;left:0;overflow:auto;padding:2% 4%}.theme-overlay .theme-about:after{content:".";display:block;height:0;clear:both;visibility:hidden}.theme-overlay .theme-actions{position:absolute;text-align:center;bottom:0;right:0;left:0;padding:10px 25px 5px;background:#f3f3f3;z-index:30;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;border-top:1px solid #eee}.ie8 .theme-overlay .theme-actions{border:1px solid #eee}.theme-overlay .theme-actions a{margin-left:5px;margin-bottom:5px}.theme-overlay .theme-actions .delete-theme{color:#a00;position:absolute;left:10px;bottom:5px;text-decoration:none;border-color:transparent;-webkit-box-shadow:none;box-shadow:none;background:0 0}.theme-overlay .theme-actions .delete-theme:focus,.theme-overlay .theme-actions .delete-theme:hover{background:#d54e21;color:#fff;border-color:#d54e21}.theme-overlay .theme-actions .active-theme,.theme-overlay.active .theme-actions .inactive-theme{display:none}.theme-overlay .theme-actions .inactive-theme,.theme-overlay.active .theme-actions .active-theme{display:block}.theme-overlay .theme-screenshots{float:right;margin:0 0 0 30px;width:55%;max-width:880px;text-align:center}.theme-overlay .screenshot{border:1px solid #fff;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;overflow:hidden;position:relative;-webkit-box-shadow:0 0 0 1px rgba(0,0,0,.2);box-shadow:0 0 0 1px rgba(0,0,0,.2)}.theme-overlay .screenshot:after{content:'';display:block;padding-top:75%}.theme-overlay .screenshot img{height:auto;position:absolute;right:0;top:0;width:100%}.theme-overlay.small-screenshot .theme-screenshots{position:absolute;width:302px}.theme-overlay.small-screenshot .theme-info{margin-right:350px;width:auto}.theme-overlay .screenshot.thumb{background:#ccc;border:1px solid #eee;float:none;display:inline-block;margin:10px 5px 0;width:140px;height:80px;cursor:pointer}.theme-overlay .screenshot.thumb:after{content:'';display:block;padding-top:100%}.theme-overlay .screenshot.thumb img{cursor:pointer;position:absolute;right:0;top:0;width:100%;height:auto}.theme-overlay .screenshot.selected{background:0 0;border:2px solid #2ea2cc}.theme-overlay .screenshot.selected img{opacity:.8}.theme-browser .theme .theme-screenshot.blank,.theme-overlay .screenshot.blank{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAALElEQVQYGWO8d+/efwYkoKioiMRjYGBC4WHhUK6A8T8QIJt8//59ZC493AAAQssKpBK4F5AAAAAASUVORK5CYII=)}.theme-overlay .theme-info{width:40%;float:right}.theme-overlay .current-label{background:#333;color:#fff;font-size:11px;display:inline-block;padding:2px 8px;-webkit-border-radius:2px;border-radius:2px;margin:0 0 -10px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.theme-overlay .theme-name{color:#222;font-size:32px;font-weight:100;margin:10px 0 0;line-height:1.3}.theme-overlay .theme-version{color:#999;font-size:13px;font-weight:400;float:none;display:inline-block;margin-right:10px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.theme-overlay .theme-author{color:#686868;font-size:16px;font-weight:400;margin:15px 0 25px}.theme-overlay .theme-author a{text-decoration:none}.theme-overlay .theme-description{color:#555;font-size:15px;font-weight:400;line-height:1.5;margin:30px 0 0}.theme-overlay .theme-tags{border-top:3px solid #eee;color:#888;font-size:13px;font-weight:400;margin:30px 0 0;padding-top:20px}.theme-overlay .theme-tags span{color:#444;font-weight:700;margin-left:5px}.theme-overlay .theme-update-message{background:#fef7f1;border:1px solid #eee;border-right:4px solid #d54e21;-webkit-border-radius:3px;border-radius:3px;padding:5px 20px 10px}.theme-overlay .theme-update{color:#222;font-size:18px;display:inline-block;line-height:40px;margin:0}.theme-overlay .parent-theme{background:#f7fcfe;border:1px solid #eee;border-right:4px solid #2ea2cc;font-size:14px;font-weight:400;margin-top:30px;padding:10px 20px 10px 10px}.theme-overlay .parent-theme strong{font-weight:700}.single-theme .theme,.single-theme .theme-overlay .theme-backdrop,.single-theme .theme-overlay .theme-header{display:none}.single-theme .theme-overlay .theme-wrap{clear:both;min-height:330px;position:relative;right:auto;left:auto;top:auto;bottom:auto}.single-theme .theme-overlay .theme-about{padding:30px 30px 70px;position:static}.single-theme .theme-overlay .theme-actions{position:absolute}@media only screen and (min-width:2000px){#wpwrap .theme-browser .theme{width:17.6%;margin:0 0 3% 3%}#wpwrap .theme-browser .theme:nth-child(3n),#wpwrap .theme-browser .theme:nth-child(4n){margin-left:3%}#wpwrap .theme-browser .theme:nth-child(5n){margin-left:0}}@media only screen and (min-width:1680px){.theme-overlay .theme-wrap{width:1450px;margin:0 auto}}@media only screen and (min-width:1640px){.theme-browser .theme{width:22.7%;margin:0 0 3% 3%}.theme-browser .theme .theme-screenshot:after{padding-top:75%}.theme-browser .theme:nth-child(3n){margin-left:3%}.theme-browser .theme:nth-child(4n){margin-left:0}}@media only screen and (max-width:1120px){.theme-browser .theme{width:47.5%;margin-left:0}.theme-browser .theme:nth-child(even){margin-left:0}.theme-browser .theme:nth-child(odd){margin-left:5%}}@media only screen and (max-width:900px){.theme-overlay .theme-wrap{right:65px}}@media only screen and (max-width:780px){.theme-overlay .theme-wrap,body.folded .theme-overlay .theme-wrap{top:0;left:0;bottom:0;right:0;padding:70px 20px 20px;border:0;z-index:500;position:fixed}.theme-browser .theme.active .theme-name span{display:none}.theme-overlay .theme-screenshots{width:40%}.theme-overlay .theme-info{width:50%}.single-theme .theme-wrap{padding:10px}.theme-browser .theme .theme-actions{padding:5px 10px 4px}.theme-overlay.small-screenshot .theme-screenshots{position:static;float:none;max-width:302px}.theme-overlay.small-screenshot .theme-info{margin-right:0;width:auto}.theme:focus .more-details,.theme:hover .more-details,.theme:not(.active):focus .theme-actions,.theme:not(.active):hover .theme-actions{display:none}.theme-browser.rendered .theme:focus .theme-screenshot img,.theme-browser.rendered .theme:hover .theme-screenshot img{opacity:1}}@media only screen and (max-width:480px){.theme-browser .theme{width:100%;margin-left:0}.theme-browser .theme:nth-child(2n),.theme-browser .theme:nth-child(3n){margin-left:0}}@media only screen and (max-width:650px){.theme-overlay .theme-description,.theme-overlay .theme-update{margin-right:0}.theme-overlay .theme-actions .delete-theme{position:relative;left:auto;bottom:auto}.theme-overlay .theme-actions .inactive-theme{display:inline}.theme-overlay .theme-screenshots{width:100%;float:none}.theme-overlay .theme-info{width:100%}.theme-overlay .theme-author{margin:5px 0 15px}.theme-overlay .current-label{margin-top:10px;font-size:13px}.themes-php .wrap h2{width:100%}.themes-php .theme-search{float:none;clear:both;right:0;top:0;left:0;margin:10px 0;width:100%}.theme-browser .theme.add-new-theme span:after{font:400 60px/90px dashicons;width:80px;height:80px;top:30%;right:50%;text-indent:0;margin-right:-40px}.single-theme .theme-wrap{margin:0 -10px 0 -12px;padding:10px}.single-theme .theme-overlay .theme-about{padding:10px;overflow:visible}.single-theme .current-label{display:none}.single-theme .theme-overlay .theme-actions{position:static}}.broken-themes{clear:both}.broken-themes table{text-align:right;width:50%;border-spacing:3px;padding:3px}.theme-browser .theme .theme-installed{background:#0074a2}.theme-browser .theme .theme-installed:before{content:'\f147'}.theme-browser .theme.is-installed .theme-actions .button-primary{display:none!important}.theme-navigation{background:#fff;-webkit-box-shadow:0 1px 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 1px 0 rgba(0,0,0,.1);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;color:#555;display:inline-block;font-size:13px;margin:20px 0 30px;padding:0 20px;position:relative;width:100%}.theme-install-php a.browse-themes,.theme-install-php a.upload{cursor:pointer}.theme-install-php a.browse-themes,.theme-install-php.show-upload-theme a.upload{display:none}.theme-install-php.show-upload-theme a.browse-themes{display:inline}.upload-theme{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:none;margin:0;padding:0;width:100%;overflow:hidden;position:relative;top:10px}body.show-upload-theme .upload-theme{display:block}.upload-theme .wp-upload-form{background:#fafafa;border:1px solid #e5e5e5;padding:30px;margin:30px auto;max-width:380px}.upload-theme .install-help{color:#999;font-size:18px;font-style:normal;margin:0;padding:40px 0 0;text-align:center}body.show-upload-theme .upload-theme+.theme-navigation,body.show-upload-theme .upload-theme+.theme-navigation+.theme-browser{display:none}.theme-navigation .theme-count{margin-right:0;position:absolute;top:12px}.theme-count+.theme-section{margin-right:60px}.theme-filter,.theme-section{border-bottom:4px solid #fff;color:#666;cursor:pointer;display:inline-block;margin:0 10px;padding:15px 0}.theme-filter.current,.theme-section.current{border-bottom:4px solid #666;color:#222}.theme-top-filters{display:inline-block}.theme-navigation .more-filters{color:#666;cursor:pointer;display:inline-block;margin:0 10px;padding:4px 6px}body.more-filters-opened .more-filters,body.more-filters-opened .more-filters:before{background:#777;-webkit-border-radius:2px;border-radius:2px;border:0;color:#fff}body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover,body.more-filters-opened .more-filters:hover:before{background:#2ea2cc}.theme-install-php .theme-search{position:absolute;left:10px;top:9px;font-size:16px;font-weight:300;line-height:1.5;width:280px}.more-filters:before{color:#777;margin:0 0 0 5px;content:"\f111";display:inline-block;width:16px;height:16px;-webkit-font-smoothing:antialiased;font-size:16px;line-height:1;font-family:dashicons;text-decoration:inherit;font-weight:400;font-style:normal;vertical-align:top;-webkit-transition:color .1s ease-in 0;transition:color .1s ease-in 0;text-align:center}.more-filters.current:before{color:#fff}.more-filters-container{display:none;padding:20px;border-top:1px solid #eee;margin:0 -20px;background:#fafafa}body.more-filters-opened .more-filters-container{display:block;overflow:hidden}body.more-filters-opened .theme-section.current{border-bottom:0}body.more-filters-opened .theme-browser,body.more-filters-opened.filters-applied.loading-themes .theme-browser{display:none}body.more-filters-opened.filters-applied .theme-browser{display:block}.more-filters-container .filters-group{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:right;width:19%;background:#fff;margin:0 0 0 1%;border:1px solid #e5e5e5;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04);padding:10px}.more-filters-container .wide-filters-group{width:38%}.more-filters-container .feature-name{margin:0;position:relative}.more-filters-container ol{list-style-type:none;margin:20px 0 0;font-size:12px}.more-filters-container li{display:inline-block;vertical-align:top;list-style-type:none;margin:5px 0;padding-left:25px;width:160px}.theme-navigation .more-filters-container .apply-filters{margin:0 0 20px}.theme-navigation .more-filters-container .clear-filters{display:none;margin:0 10px 20px 0}.more-filters-container .apply-filters span{display:inline-block;font-size:12px;text-indent:10px;opacity:.8}.more-filters-container .filtering-by{display:none;margin:0}.more-filters-container .filtering-by>span{font-weight:600}.more-filters-container .filtering-by .tags{display:inline}.more-filters-container .filtering-by .tag{background:#fff;border:1px solid #e5e5e5;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04);font-size:11px;margin:0 5px;padding:4px 8px}.more-filters-container .filtering-by a{margin-right:10px}body.filters-applied .more-filters-container .filters-group,body.filters-applied .more-filters-container a.button,body.filters-applied .more-filters-container br{display:none!important}body.filters-applied .more-filters-container .filtering-by{display:block}body.filters-applied .more-filters-container{padding:20px}p.no-themes{color:#999;font-size:18px;font-style:normal;margin:0;padding:0;text-align:center;display:none}body.no-results p.no-themes{display:block}.theme-install-php .add-new-theme,body.show-upload-theme p.no-themes{display:none!important}@media only screen and (max-width:1120px){.theme-install-php .theme-search{margin:20px 0;position:static;width:100%}.more-filters-container{border-bottom:1px solid #eee}.upload-theme .wp-upload-form{margin:20px 0;max-width:100%}.upload-theme .install-help{font-size:15px;padding:20px 0 0;text-align:right}.more-filters-container .filters-group{margin-bottom:0;margin-top:5px;width:100%}.more-filters-container .filters-group li{margin:10px 0}}@media only screen and (max-width:782px){.more-filters-container .filters-group,.more-filters-container .filters-group li{width:100%}}.rating{margin:30px 0}.rating span:before{color:#e6b800;content:"\f154";display:inline-block;-webkit-font-smoothing:antialiased;font:400 20px/1 dashicons;vertical-align:top}.rating-10 span.one:before,.rating-30 span.two:before,.rating-50 span.three:before,.rating-70 span.four:before,.rating-90 span.five:before{content:"\f459"}.rating-100 span.five:before,.rating-100 span.four:before,.rating-100 span.one:before,.rating-100 span.three:before,.rating-100 span.two:before,.rating-20 span.one:before,.rating-30 span.one:before,.rating-40 span.one:before,.rating-40 span.two:before,.rating-50 span.one:before,.rating-50 span.two:before,.rating-60 span.one:before,.rating-60 span.three:before,.rating-60 span.two:before,.rating-70 span.one:before,.rating-70 span.three:before,.rating-70 span.two:before,.rating-80 span.four:before,.rating-80 span.one:before,.rating-80 span.three:before,.rating-80 span.two:before,.rating-90 span.four:before,.rating-90 span.one:before,.rating-90 span.three:before,.rating-90 span.two:before{content:"\f155"}.rating .ratings{display:inline;margin-right:10px;line-height:20px;color:#999}.error .theme-browser,.loading-themes .theme-browser{display:none}.loading-themes .spinner{display:block;margin:40px auto 0;float:none}.appearance_page_custom-header #headimg{border:1px solid #DFDFDF;overflow:hidden;width:100%}.appearance_page_custom-header #upload-form p label{font-size:12px}.appearance_page_custom-header .available-headers .default-header{float:right;margin:0 0 20px 20px}.appearance_page_custom-header .random-header{clear:both;margin:0 0 20px 20px;vertical-align:middle}.appearance_page_custom-header .available-headers label input,.appearance_page_custom-header .random-header label input{margin-left:10px}.appearance_page_custom-header .available-headers label img{vertical-align:middle}div#custom-background-image{min-height:100px;border:1px solid #dfdfdf}div#custom-background-image img{max-width:400px;max-height:300px}body.full-overlay-active{overflow:hidden}.wp-full-overlay{background:0 0;z-index:500000;position:fixed;overflow:visible;top:0;bottom:0;right:0;left:0;height:100%;min-width:0}.wp-full-overlay-sidebar{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:fixed;width:300px;height:100%;top:0;bottom:0;right:0;padding:0;margin:0;z-index:10;overflow:auto;background:#eee;border-left:0}.wp-full-overlay.collapsed .wp-full-overlay-sidebar{overflow:visible}.wp-full-overlay.collapsed,.wp-full-overlay.expanded .wp-full-overlay-sidebar{margin-right:0!important}.wp-full-overlay.expanded{margin-right:300px}.wp-full-overlay.collapsed .wp-full-overlay-sidebar{margin-right:-300px}.wp-full-overlay-sidebar:after{content:'';display:block;position:absolute;top:0;bottom:0;left:0;width:3px;z-index:1000}.wp-full-overlay-main{position:absolute;right:0;left:0;top:0;bottom:0;height:100%}.wp-full-overlay-sidebar .wp-full-overlay-header{position:absolute;right:0;left:0;height:45px;padding:0 15px;line-height:45px;z-index:10;margin:0;border-top:0;-webkit-box-shadow:none;box-shadow:none}.wp-full-overlay-sidebar .wp-full-overlay-header a.back{margin-top:9px}.wp-full-overlay-sidebar .wp-full-overlay-footer{bottom:0;border-bottom:0;border-top:0;-webkit-box-shadow:none;box-shadow:none}.wp-full-overlay-sidebar .wp-full-overlay-sidebar-content{position:absolute;top:45px;bottom:45px;right:0;left:0;overflow:auto}.wp-full-overlay .close-full-overlay{text-decoration:none}.wp-full-overlay a.collapse-sidebar{position:absolute;bottom:12px;right:0;z-index:50;display:block;width:19px;height:19px;margin-right:15px;padding:0;-webkit-border-radius:50%;border-radius:50%;color:#777;text-decoration:none}.wp-full-overlay a.collapse-sidebar:hover{color:#0074a2}.wp-full-overlay.collapsed .collapse-sidebar{position:absolute;right:100%}.wp-full-overlay .collapse-sidebar-arrow{position:static;margin-top:0;margin-right:0;display:block;width:auto;height:auto;background:0 0}.wp-full-overlay .collapse-sidebar-arrow:before{-webkit-border-radius:50%;border-radius:50%;float:right;content:"\f148";background:#eee;font:400 20px/1 dashicons;speak:none;display:block;padding:0;text-indent:0;text-align:center;position:relative;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important}.rtl .wp-full-overlay .collapse-sidebar-arrow:before,.wp-full-overlay.collapsed .collapse-sidebar-arrow:before{-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.rtl .wp-full-overlay.collapsed .collapse-sidebar-arrow:before{-webkit-transform:none;-ms-transform:none;transform:none}.wp-full-overlay.collapsed .collapse-sidebar-arrow{background-position:-1px -109px}.wp-full-overlay .collapse-sidebar-label{position:absolute;right:100%;line-height:20px;margin-right:10px}.wp-full-overlay.collapsed .collapse-sidebar-label{display:none}.wp-full-overlay .theme-navigation{padding:10px 20px;position:absolute;bottom:10px;text-align:right}.wp-full-overlay .theme-navigation .next-theme{float:left}.wp-full-overlay.no-navigation .theme-navigation{display:none}.wp-full-overlay,.wp-full-overlay .collapse-sidebar,.wp-full-overlay-main,.wp-full-overlay-sidebar{-webkit-transition-property:right,left,top,bottom,width,margin;transition-property:right,left,top,bottom,width,margin;-webkit-transition-duration:.2s;transition-duration:.2s}.customize-support .hide-if-customize,.customize-support .wp-core-ui .hide-if-customize,.customize-support.wp-core-ui .hide-if-customize,.no-customize-support .hide-if-no-customize,.no-customize-support .wp-core-ui .hide-if-no-customize,.no-customize-support.wp-core-ui .hide-if-no-customize{display:none}#customize-container{display:none;background:#fff;z-index:500000;position:fixed;overflow:visible;top:0;bottom:0;right:0;left:0;height:100%}.customize-active #customize-container{display:block}.customize-loading #customize-container iframe{opacity:0}.customize-loading #customize-container{background:#fff url(../images/spinner.gif) no-repeat fixed center center;-webkit-background-size:20px 20px;background-size:20px 20px}#customize-container iframe,.theme-install-overlay iframe{height:100%;width:100%;z-index:20;-webkit-transition:opacity .3s;transition:opacity .3s}#customize-container .collapse-sidebar{bottom:16px}#customize-controls{margin-top:0}.theme-install-overlay{display:none}.theme-install-overlay.single-theme{display:block}.install-theme-info{display:none;padding:10px 20px 60px}.single-theme .install-theme-info{padding-top:15px}.theme-install-overlay .install-theme-info{display:block}.install-theme-info .theme-install{float:left;margin-top:18px}.install-theme-info .theme-name{font-size:16px;line-height:24px;margin-bottom:0;margin-top:0}.install-theme-info .theme-screenshot{margin-top:15px;width:258px;border:1px solid #ccc}.install-theme-info .theme-details{overflow:hidden}.theme-details .theme-version{margin:15px 0;float:right}.theme-details .star-rating{margin:7px 0;float:left}.theme-details .theme-description{float:right;color:#777;line-height:20px;max-width:100%}.theme-install-overlay .wp-full-overlay-header{margin-top:9px}.theme-install-overlay .wp-full-overlay-header .theme-install{float:left;line-height:26px}.theme-install-overlay .wp-full-overlay-sidebar{background:#EEE;border-left:1px solid #DDD}.theme-install-overlay .wp-full-overlay-main{background:#fff url(../images/spinner.gif) no-repeat center center;-webkit-background-size:20px 20px;background-size:20px 20px}@media print,(-o-min-device-pixel-ratio:5/4),(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.wp-full-overlay .collapse-sidebar-arrow{background-image:url(../images/arrows-2x.png);-webkit-background-size:15px 123px;background-size:15px 123px}.customize-loading #customize-container,.theme-install-overlay .wp-full-overlay-main{background-image:url(../images/spinner-2x.gif)}}@media screen and (max-width:782px){.available-theme .action-links .delete-theme{float:none;margin:0;padding:0;clear:both}.available-theme .action-links .delete-theme a{padding:0}}.press-this #message{border-right:4px solid #7ad03a;padding:1px 12px;background-color:#fff;-webkit-box-shadow:0 1px 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 1px 0 rgba(0,0,0,.1)}.press-this #side-sortables .category-tabs li{display:inline;line-height:1.35em}body.press-this ul.category-tabs li.tabs a{color:#333}.press-this #content-resize-handle{bottom:2px}body.press-this{color:#333;margin:0;padding:0;min-width:708px;min-height:400px}.press-this #titlediv #title{font-size:1.4em}.press-this #site-heading:before{top:3px;position:relative;display:inline-block;font:400 18px/1 dashicons;speak:none;color:#727272;content:'\f120';-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.press-this #wphead{height:32px;margin-right:0;margin-left:0;margin-bottom:5px}.press-this #header-logo{float:right;margin:7px 7px 0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.press-this #wphead h1{font-weight:400;font-size:16px;line-height:32px;margin:0;float:right}.press-this #wphead h1 a{text-decoration:none}.press-this #wphead h1 a:hover{text-decoration:underline}.press-this #message{margin:10px 0}.press-this .posting{margin-left:250px}.press-this-sidebar{float:left;width:240px;padding-top:10px}.press-this #title{margin-right:0;margin-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.press-this .tagchecklist{margin-top:8px}.press-this #titlediv{margin:0}.press-this #wp-content-wrap #wp-content-editor-tools{padding:0;top:3px;overflow:hidden}.press-this .wp-media-buttons{cursor:default;padding:8px 8px 6px}.press-this #wp-content-wrap #wp-content-media-buttons a{padding:0;line-height:normal;height:auto;font-size:16px}.press-this #wp-content-wrap .mce-toolbar .mce-btn-group .mce-btn{margin:0 1px}.press-this #wp-content-wrap .mce-toolbar .mce-btn button{padding:2px 3px}.press-this #wp-content-wrap .quicktags-toolbar,.press-this #wp-content-wrap div.mce-toolbar-grp{padding-left:3px}.press-this .howto{margin-top:2px;margin-bottom:3px;font-size:12px;font-style:italic;display:block}.press-this #wp-content-editor-container{clear:none}.press-this #poststuff .inside{margin-top:18px}.press-this .category-tabs{margin-bottom:3px}.press-this #poststuff{margin:0 8px;padding:0}.press-this #photo-add-url-div input[type=text]{width:220px}#poststuff #editor-toolbar{height:30px}.posting{margin-left:212px;position:relative}.press-this .inner-sidebar{width:200px}.press-this .inner-sidebar .sleeve{padding-top:5px}.press-this #submitdiv p{margin:0;padding:6px}.press-this #submitdiv #publishing-actions{border-bottom:1px solid #dfdfdf}.press-this #publish{float:left}.press-this #poststuff h2,.press-this #poststuff h3{font-size:14px;line-height:1}.press-this #categorydiv h3,.press-this #tagsdiv-post_tag h3{cursor:pointer}.press-this #submitdiv h3{cursor:default}h3.tb{font-weight:600;font-size:12px;margin-right:5px}.press-this .postbox,.press-this .stuffbox{margin-bottom:10px;min-width:0}.press-this #submitdiv:hover .handlediv{background:0 0}.tbtitle{font-size:1.7em;outline:0;padding:3px 4px;border:1px solid #dfdfdf}.press-this .actions{float:left;margin:-19px 0 0}.press-this #extra-fields .actions{margin:-32px 0 0 -7px}.press-this .actions li{float:right;list-style:none;margin-left:10px}#extra-fields .button{margin-left:5px}#photo_saving{margin:0 8px 8px;vertical-align:middle}#img_container_container{overflow:auto}#extra-fields{margin-top:10px;position:relative}#extra-fields h2{margin:12px}#waiting{margin-top:10px;overflow:hidden}#waiting span{float:left;margin:0 5px 0 0}#waiting .spinner{display:block}#extra-fields .postbox{margin-bottom:5px}#extra-fields .titlewrap{padding:0;overflow:auto;height:120px}#img_container a{float:right;overflow:hidden}#img_container a,#img_container img{width:68px;height:68px}#img_container img{border:0;background-color:#f4f4f4;cursor:pointer}#img_container a,#img_container a:link,#img_container a:visited{border:1px solid #ccc;display:block;position:relative}#img_container a:active,#img_container a:hover{border-color:#000;z-index:1000;border-width:1px}#embed-code{width:100%;height:98px}.press-this .categorydiv div.tabs-panel{height:100px}.press-this .tagsdiv .newtag{width:120px}.press-this #content{margin:5px 0;padding:0 5px;border:0 none;height:340px;font-family:Consolas,Monaco,monospace;font-size:13px;line-height:19px;background:0 0}.press-this #publishing-actions .spinner{display:inline;vertical-align:middle}@media screen and (max-width:782px){.press-this ul.category-tabs li.tabs{padding:3px 5px 5px}.press-this a.wp-switch-editor{font:13px/19px "Open Sans",sans-serif;margin:5px 5px 0 0;padding:3px 8px 4px}.press-this #wp-content-media-buttons a{padding:0;line-height:normal;height:auto}.press-this #wp-content-editor-tools{padding:0;top:3px}.press-this .category-tabs{margin-top:0}.press-this .tagsdiv .newtag{width:120px;padding:3px 5px;margin-bottom:0}.press-this .tagchecklist{padding:0;margin-bottom:0}.press-this .wp_themeSkin a.mceButton{width:20px;height:20px}.press-this .wp_themeSkin .mceButton .mceIcon{margin:0}.press-this #poststuff h3,.press-this .metabox-holder h3{padding:7px 12px}.press-this input[type=checkbox],.press-this input[type=radio]{height:16px;width:16px}.press-this input[type=checkbox]:checked:before{width:16px;font:400 21px/1 dashicons;margin:-3px -4px 0 0}.press-this input[type=radio]:checked:before{font:400 21px/1 dashicons;width:6px;height:6px;margin:4px}.press-this ul.categorychecklist li,.press-this ul.categorychecklist ul{margin-top:0;margin-bottom:0}.press-this div.quicktags-toolbar input{padding:2px 4px}.press-this input,.press-this textarea{font-size:14px}.press-this .tagchecklist span{font-size:13px;line-height:1.8em}}.about-wrap{position:relative;margin:25px 20px 0 40px;max-width:1050px;font-size:15px}.about-wrap div.error,.about-wrap div.updated{display:none!important}.about-wrap hr{border:0;height:0;margin:0;border-top:1px solid rgba(0,0,0,.1)}.about-wrap img{margin:0;max-width:100%;vertical-align:middle}.about-wrap p{line-height:1.6em;font-size:14px}.about-wrap h1{margin:.2em 0 0 200px;color:#333;line-height:1.2em;font-size:2.8em;font-weight:400}.about-wrap h4{color:#222}.about-wrap .about-text,.about-wrap li.wp-person a.web,.about-wrap p.about-description{font-weight:400;line-height:1.6em;font-size:19px}.about-description{margin-top:1.4em}.about-text{margin:1em 0 1em 200px;min-height:60px;color:#777;font-size:24px}.about-wrap .changelog h2.about-headline-callout{margin:1.1em 0 .2em;font-size:2.4em;font-weight:300;line-height:1.3;text-align:center}.about-wrap h3{margin:1em 0 .6em;font-size:1.5em;line-height:1.5em}.customize h3{margin-top:1.75em;text-align:center}.about-wrap .feature-section h4{margin:1.4em 0 .6em;font-size:1.2em}.about-wrap .feature-section p{margin-top:.6em}.about-wrap code,.about-wrap ol li p{font-size:14px}.about-wrap .button.button-large{padding:8px 20px 10px!important;height:46px!important;font-size:14px;line-height:28px!important}.about-wrap .about-overview-img{margin:0}.about-wrap .point-releases{margin-top:5px;border-bottom:1px solid #dfdfdf}.about-wrap .changelog.point-releases h3{padding-top:35px}.about-wrap .changelog.point-releases h3:first-child{padding-top:7px}.wp-badge{background:#0074a2 url(../images/w-logo-white.png?ver=20131202) no-repeat;background:#0074a2,url(../images/wordpress-logo-white.svg?ver=20131110) no-repeat;background-position:center 24px;-webkit-background-size:85px 85px;background-size:85px 85px;color:#78c8e6;font-size:14px;text-align:center;font-weight:600;margin:5px 0 0;padding-top:120px;height:40px;display:inline-block;width:150px;text-rendering:optimizeLegibility;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.2);box-shadow:0 1px 3px rgba(0,0,0,.2)}.about-wrap .wp-badge{position:absolute;top:0;left:0}.about-wrap h2.nav-tab-wrapper{padding-right:6px}.about-wrap h2 .nav-tab{padding:4px 15px 6px;margin:0 0 -1px 3px;font-size:18px;vertical-align:top;border-width:1px}.about-overview{margin-top:40px;text-align:center}.about-overview .wp-video{margin:0 auto}.changelog .wp-playlist .wp-playlist-current-item img{height:64px;width:auto;max-width:100%}.about-wrap .feature-section{margin-top:40px;padding-bottom:20px}.about-wrap .feature-section.two-col>div{position:relative;width:47.5%;margin-left:4.999999999%;float:right}.about-wrap .feature-section.three-col>div{position:relative;width:29.95%;margin-left:4.999999999%;float:right}.about-wrap .feature-section.col .last-feature{margin-left:0}.about-wrap .under-the-hood .feature-section{margin-top:0}.about-wrap .changelog .feature-section{overflow:hidden}.about-wrap .feature-section.two-col div p{margin-left:3%}.about-wrap .feature-section div p img{float:left;margin-right:10px;max-width:20%}.about-wrap .changelog li{list-style-type:disc;margin-right:3em}.about-wrap .return-to-dashboard{margin:30px -5px 0 0;font-size:14px;font-weight:700}.about-wrap .return-to-dashboard a{text-decoration:none;padding:0 5px}.about-wrap h4.wp-people-group{margin-top:2.6em;font-size:16px}.about-wrap ul.wp-people-group{overflow:hidden;padding:0 5px;margin:0 -5px 0 -15px}.about-wrap ul.compact{margin-bottom:0}.about-wrap li.wp-person{float:right;margin-left:10px}.about-wrap li.wp-person img.gravatar{float:right;margin:0 0 10px 10px;padding:2px;width:60px;height:60px}.about-wrap ul.compact li.wp-person img.gravatar{width:30px;height:30px}.about-wrap li.wp-person{height:70px;width:280px;padding-bottom:15px}.about-wrap ul.compact li.wp-person{height:auto;width:180px;padding-bottom:0;margin-bottom:0}.about-wrap #wp-people-group-validators+p.wp-credits-list{margin-top:0}.about-wrap li.wp-person a.web{display:block;margin:6px 0 2px;font-size:16px;text-decoration:none}.about-wrap p.wp-credits-list a{white-space:nowrap}.freedoms-php .about-wrap ol{margin:40px 60px}.freedoms-php .about-wrap ol li{list-style-type:decimal;font-weight:700}.freedoms-php .about-wrap ol p{font-weight:400;margin:.6em 0}@media screen and (max-width:782px){.about-wrap .feature-section.one-col>div,.about-wrap .feature-section.three-col>div,.about-wrap .feature-section.two-col>div{width:100%;margin:0 0 40px;padding:0 0 40px;float:none;border-bottom:1px solid rgba(0,0,0,.1)}.about-wrap .feature-section.col>div.last-feature,.about-wrap .under-the-hood .feature-section>div{margin:0;padding:0;border-bottom:0}}@media only screen and (max-width:500px){.about-wrap{margin-left:20px;margin-right:10px}.about-text,.about-wrap h1{margin-left:0}.about-text{margin-bottom:.25em}.about-wrap .wp-badge{position:relative;margin-bottom:1.5em;width:100%}.about-wrap .feature-section.three-col div{width:100%;float:none}.about-wrap .three-col.about-updates .col-1{padding:0;float:none}.about-wrap .three-col.about-updates .col-2{margin:0 0 20px;width:100%;float:none}}.no-js #message{display:block}ul.add-menu-item-tabs li{padding:3px 8px 3px 5px}.accordion-section ul.add-menu-item-tabs,.accordion-section ul.category-tabs,.accordion-section ul.wp-tab-bar{margin:0}.accordion-section .categorychecklist{margin:13px 0}#nav-menu-meta .accordion-section-content{padding:18px 13px}#nav-menu-meta .button-controls{margin-bottom:0}#nav-menus-frame{margin-right:300px;margin-top:23px}#wpbody-content #menu-settings-column{display:inline;width:281px;margin-right:-300px;clear:both;float:right;padding-top:0}#menu-settings-column .inside{clear:both;margin:10px 0 0}.metabox-holder-disabled .accordion-section-content,.metabox-holder-disabled .accordion-section-title,.metabox-holder-disabled .postbox{opacity:.5;filter:alpha(opacity=50)}.metabox-holder-disabled .button-controls .select-all{display:none}#wpbody{position:relative}.blank-slate .menu-name{height:2em}.blank-slate .menu-settings{border:0;margin-top:0;padding-top:0;overflow:hidden}.is-submenu{color:#999;font-style:italic;font-weight:400;margin-right:4px}.manage-menus{margin-top:23px;padding:10px;overflow:hidden;background:#fbfbfb}.manage-menus select{float:right;margin-left:6px}.manage-menus .selected-menu{float:right;margin:5px 0 0 6px}.manage-menus .submit-btn{float:right;margin-top:1px}.menu-edit p{margin:.3em 0 .6em}.menu-edit #post-body-content h3{margin:1em 0 10px}.menu-settings{border-top:1px solid #eee;margin-top:2em}.menu-settings dl{margin:0 0 10px;overflow:hidden;padding-right:18%}.menu-settings dd{float:right;margin:0;width:100%}.menu-settings dt{float:right;clear:both;width:21.951%;padding:3px 0 0;margin-right:-21.951%}.menu-settings label{vertical-align:baseline}.menu-edit .checkbox-input{margin-top:4px}.theme-location-set{color:#999;font-size:11px}#menu-management-liquid{float:right;min-width:100%;margin-top:3px}#menu-management{position:relative;margin-left:20px;margin-top:-3px;width:100%;background:#f5f5f5}#menu-management .menu-edit{margin-bottom:20px}.nav-menus-php #post-body{padding:0 10px 10px;border-top:1px solid #fff;border-bottom:1px solid #dfdfdf;background:#fff}#nav-menu-footer,#nav-menu-header{padding:0 10px}#nav-menu-header{border-bottom:1px solid #dfdfdf;margin-bottom:0}#nav-menu-header .menu-name-label{margin-top:4px}.nav-menus-php #post-body div.error,.nav-menus-php #post-body div.updated{margin:0}.nav-menus-php #post-body-content{position:relative;float:none}#menu-management .menu-add-new abbr{font-weight:600}#select-nav-menu-container{text-align:left;padding:0 10px 3px;margin-bottom:5px}#select-nav-menu{width:100px;display:inline}#menu-name-label{margin-top:-2px}.widefat td.menu-location-menus{padding-bottom:5px}.menu-location-menus select{float:right}#locations-nav-menu-wrapper{padding:5px 0}.locations-nav-menu-select select{float:right;width:160px;margin-left:5px}.locations-row-links{float:right;margin:6px 6px 0 0}.locations-add-menu-link,.locations-edit-menu-link{margin:0 3px}.locations-edit-menu-link{padding-left:3px;border-left:1px solid #ccc}#wpbody .open-label{display:block;float:right}#wpbody .open-label span{padding-left:10px}.js .input-with-default-title{color:#aaa;font-style:italic}#menu-management .inside{padding:0 10px}.accordion-container .howto input,.postbox .howto input{width:180px;float:left}.accordion-container .outer-border{margin:0}.customlinkdiv .howto input{width:180px}.customlinkdiv p{margin-top:0}#nav-menu-theme-locations .howto select{width:100%}#nav-menu-theme-locations .button-controls{text-align:left}.add-menu-item-view-all{height:400px}#menu-container .submit{margin:0 0 10px;padding:0}.nav-menus-php .add-new-menu-action{float:right;margin:6px 6px 0 0;line-height:15px}.nav-menus-php .meta-sep,.nav-menus-php .submitcancel,.nav-menus-php .submitdelete{display:block;float:right;margin:6px 0;line-height:15px}.meta-sep{padding:0 2px}#cancel-save{text-decoration:underline;font-size:12px;margin-right:20px;margin-top:5px}.button-primary.right,.button-secondary.right,.button.right{float:left}.list-controls{float:right;margin-top:5px}.add-to-menu{float:left}.postbox .spinner{display:none;vertical-align:middle}.button-controls{clear:both;margin:10px 0}.hide-all,.show-all{cursor:pointer}.hide-all{display:none}#menu-name{width:270px}#manage-menu .inside{padding:0}#available-links dt{display:block}#add-custom-link .howto{font-size:12px}#add-custom-link label span{display:block;float:right;margin-top:5px;padding-left:5px}.menu-item-textbox{width:180px}.nav-menus-php .howto span{margin-top:6px;display:block;float:right}.quick-search{width:190px}.nav-menus-php .list-wrap{display:none;clear:both;margin-bottom:10px}.nav-menus-php .postbox p.submit{margin-bottom:0}.nav-menus-php .list li{display:none;margin:0;margin-bottom:5px}.nav-menus-php .list li .menu-item-title{cursor:pointer;display:block}.nav-menus-php .list li .menu-item-title input{margin-left:3px;margin-top:-3px}.menu-item-title input[type=checkbox]{display:inline-block;margin-top:-4px}#menu-container .inside{padding-bottom:10px}.menu{padding-top:1em}#menu-to-edit{margin:0;padding:.1em 0}.menu ul{width:100%}.menu li{margin-bottom:0;position:relative}.menu-item-bar{clear:both;line-height:1.5em;position:relative;margin:9px 0 0}.menu-item-bar .menu-item-handle{border:1px solid #dfdfdf;position:relative;padding:10px 15px;height:auto;width:382px;line-height:30px;overflow:hidden;word-wrap:break-word}.menu-item-bar .menu-item-handle:hover{border-color:#999}#menu-to-edit .menu-item-invalid .menu-item-handle{background:#f6c9cc;border-color:#f1acb1}.no-js .menu-item-edit-active .item-edit{display:none}.js .menu-item-handle{cursor:move}.menu li.deleting .menu-item-handle{background-image:none;background-color:#f66}.menu-item-handle .item-title{font-size:13px;font-weight:600;line-height:20px;display:block;margin-left:13em}li.menu-item.ui-sortable-helper dl{margin-top:0}li.menu-item.ui-sortable-helper .menu-item-transport dl{margin-top:13px}.menu .sortable-placeholder{height:35px;width:410px;margin-top:13px}.menu-item-depth-0{margin-right:0}.menu-item-depth-1{margin-right:30px}.menu-item-depth-2{margin-right:60px}.menu-item-depth-3{margin-right:90px}.menu-item-depth-4{margin-right:120px}.menu-item-depth-5{margin-right:150px}.menu-item-depth-6{margin-right:180px}.menu-item-depth-7{margin-right:210px}.menu-item-depth-8{margin-right:240px}.menu-item-depth-9{margin-right:270px}.menu-item-depth-10{margin-right:300px}.menu-item-depth-11{margin-right:330px}.menu-item-depth-0 .menu-item-transport{margin-right:0}.menu-item-depth-1 .menu-item-transport{margin-right:-30px}.menu-item-depth-2 .menu-item-transport{margin-right:-60px}.menu-item-depth-3 .menu-item-transport{margin-right:-90px}.menu-item-depth-4 .menu-item-transport{margin-right:-120px}.menu-item-depth-5 .menu-item-transport{margin-right:-150px}.menu-item-depth-6 .menu-item-transport{margin-right:-180px}.menu-item-depth-7 .menu-item-transport{margin-right:-210px}.menu-item-depth-8 .menu-item-transport{margin-right:-240px}.menu-item-depth-9 .menu-item-transport{margin-right:-270px}.menu-item-depth-10 .menu-item-transport{margin-right:-300px}.menu-item-depth-11 .menu-item-transport{margin-right:-330px}body.menu-max-depth-0{min-width:950px!important}body.menu-max-depth-1{min-width:980px!important}body.menu-max-depth-2{min-width:1010px!important}body.menu-max-depth-3{min-width:1040px!important}body.menu-max-depth-4{min-width:1070px!important}body.menu-max-depth-5{min-width:1100px!important}body.menu-max-depth-6{min-width:1130px!important}body.menu-max-depth-7{min-width:1160px!important}body.menu-max-depth-8{min-width:1190px!important}body.menu-max-depth-9{min-width:1220px!important}body.menu-max-depth-10{min-width:1250px!important}body.menu-max-depth-11{min-width:1280px!important}.item-type{color:#777;font-size:12px;padding:12px 10px;line-height:18px;display:block}.item-controls{font-size:12px;position:absolute;left:20px;top:-1px}.item-controls a{text-decoration:none}.item-controls a:hover{cursor:pointer}.item-controls .item-order{padding-left:10px}.nav-menus-php .item-edit{position:absolute;left:-20px;top:0;display:block;width:30px;height:40px;margin-left:0!important;text-indent:100%;outline:0;overflow:hidden;white-space:nowrap}.menu-instructions-inactive{display:none}.menu-item-settings{display:block;width:402px;padding:10px 10px 10px 0;position:relative;z-index:10;border:1px solid #e5e5e5;border-top:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04)}.menu-item-settings .field-move a{display:none;margin:0 2px}.menu-item-edit-active .menu-item-settings{display:block}.menu-item-edit-inactive .menu-item-settings{display:none}.add-menu-item-pagelinks{margin:.5em auto;text-align:center}.link-to-original{display:block;margin:0 0 10px;padding:3px 5px 5px;border:1px solid #dfdfdf;color:#777;font-size:12px;font-style:italic}.link-to-original a{padding-right:4px;font-style:normal}.hidden-field{display:none}.menu-item-settings .description-thin,.menu-item-settings .description-wide{margin-left:10px;float:right}.description-thin{width:190px;height:40px}.description-wide{width:390px}.menu-item-actions{padding-top:15px}#cancel-save{cursor:pointer}.nav-menus-php .major-publishing-actions{clear:both;padding:3px 0 6px}.nav-menus-php .major-publishing-actions .publishing-action{text-align:left;float:left;line-height:23px;margin:4px 0 1px}.nav-menus-php .blank-slate .menu-settings{display:none}.nav-menus-php .delete-action{float:right;margin-top:2px}.nav-menus-php .submitbox .submitcancel{border-bottom:1px solid #0074a2;padding:1px 2px;color:#0074a2;text-decoration:none}.nav-menus-php .submitbox .submitcancel:hover{background:#0074a2;color:#fff}.nav-menus-php .major-publishing-actions .form-invalid{padding-right:4px;margin-right:-4px}#menu-item-name-wrap:after,#menu-item-url-wrap:after,#menu-name-label:after,#menu-settings-column .inside:after,#nav-menus-frame:after,.nav-menus-php #post-body-content:after,.nav-menus-php .button-controls:after,.nav-menus-php .major-publishing-actions:after,.nav-menus-php .menu-item-settings:after{clear:both;content:".";display:block;height:0;visibility:hidden}#menu-item-name-wrap,#menu-item-url-wrap,#nav-menus-frame,.button-controls{display:block}@media screen and (max-width:782px){body.nav-menus-php{min-width:0!important}#nav-menus-frame{margin-right:0;float:none;width:100%}#wpbody-content #menu-settings-column{display:block;width:100%;float:none;margin-right:0}#side-sortables .add-menu-item-tabs{margin:15px 0 14px}ul.add-menu-item-tabs li.tabs{padding:13px 15px 14px}.nav-menus-php .item-controls .item-type{margin-top:2px}.nav-menus-php .customlinkdiv .howto input{width:65%}.nav-menus-php .quick-search{width:85%}#menu-management-liquid{margin-top:25px}.nav-menus-php .menu-name-label.howto span{margin-top:13px}.menu-name-label #menu-name{margin-top:4px}.nav-menus-php .major-publishing-actions .publishing-action{margin-top:6px}.nav-menus-php .delete-action{font-size:14px;line-height:50px;margin-top:12px}.description-wide,.menu-item-bar .menu-item-handle,.menu-item-settings{width:auto}.menu-item-settings{padding:10px}.menu-item-settings .description-thin,.menu-item-settings .description-wide{width:100%;height:auto}.menu-item-settings input{width:100%}.menu-settings dl{padding-right:0}.menu-settings dd{float:none;width:100%;margin-bottom:15px}.menu-settings dt{float:none;width:auto;margin-right:0;margin-bottom:15px}}@media only screen and (max-width:768px){#menu-locations-wrap .widefat{width:100%}}.widget{margin:0 auto 10px;position:relative;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.widget-top{font-size:13px;font-weight:600;background:#f7f7f7}.widget-top a.widget-action,.widget-top a.widget-action:hover{text-decoration:none}.widget-title h4{margin:0;padding:15px;line-height:1;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.widgets-holder-wrap .widget-inside{border-top:0;padding:1px 15px 15px;line-height:16px}#available-widgets .widget-description,#widgets-right a.widget-control-edit,.in-widget-title{color:#666}.deleting .widget-title,.deleting .widget-top a.widget-action:after{color:#aaa}.widget.ui-draggable-dragging{min-width:100%}.widget.ui-sortable-helper{opacity:.8}.widget-placeholder{border:1px dashed #bbb;margin:0 auto 10px;height:45px;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#widgets-right .widget-placeholder{margin-top:0}#widgets-right .closed .widget-placeholder{height:0;border:0;margin-top:-10px}.sidebar-name{position:relative;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.sidebar-name-arrow{position:absolute;top:0;left:0;bottom:0}.js .sidebar-name{cursor:pointer}.sidebar-name h3{margin:0;padding:8px 10px;overflow:hidden;white-space:nowrap}.widgets-holder-wrap .description{padding:0 0 15px;margin:0;font-style:normal;color:#777}#widgets-right .widgets-holder-wrap .description{padding-right:7px;padding-left:7px}div.widget-liquid-left{margin:0;width:38%;float:right}div.widget-liquid-right{float:left;width:58%}div#widgets-left{padding-top:12px}div#widgets-left .closed .sidebar-name,div#widgets-left .inactive-sidebar.closed .sidebar-name{margin-bottom:10px}div#widgets-left .sidebar-name h3{padding:10px 0;margin:0 0 0 10px}div#widgets-left .sidebar-name .sidebar-name-arrow:before{left:0;top:4px;padding:4px 4px 4px 6px}#widgets-left #available-widgets,div#widgets-left .widget-holder{background:0 0;border:0}#widgets-left .widgets-holder-wrap{border:0;-webkit-box-shadow:none;box-shadow:none}#available-widgets .widget-action{display:none}#available-widgets .widget{margin:0}#available-widgets .widget:nth-child(odd){clear:both}#available-widgets .widget .widget-description{display:block;padding:10px 15px;font-size:12px}#available-widgets #widget-list{position:relative}#widgets-left .inactive-sidebar{clear:both;width:100%;background:0 0;padding:0;margin:0 0 20px;border:0;-webkit-box-shadow:none;box-shadow:none}#widgets-left .inactive-sidebar.first{margin-top:40px}div#widgets-left .inactive-sidebar .widget.expanded{right:auto}.widget-title-action{float:left;position:relative}div#widgets-left .inactive-sidebar .widgets-sortables{min-height:42px;padding:0;background:0 0;margin:0;position:relative}div#widgets-right:after{content:".";display:block;height:0;clear:both;visibility:hidden}div#widgets-right .sidebars-column-1,div#widgets-right .sidebars-column-2{max-width:450px}div#widgets-right .widgets-holder-wrap{margin:10px 0 0}div#widgets-right .sidebar-description{min-height:20px;margin-top:-5px}div#widgets-right .sidebar-name h3{padding:15px 7px}div#widgets-right .sidebar-name .sidebar-name-arrow:before{left:0;top:4px}div#widgets-right .widget-top{padding:0}div#widgets-right .widgets-sortables{padding:0 8px;margin-bottom:9px;position:relative;min-height:123px}div#widgets-right .closed .widgets-sortables{min-height:0;margin-bottom:0}.sidebar-name .spinner{margin:-5px 5px;float:none}#widgets-right .widgets-holder-wrap.widget-hover{border-color:#777;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.3);box-shadow:0 1px 2px rgba(0,0,0,.3)}.widgets_access #widgets-left .widget .widget-top{cursor:auto}.widgets_access #wpwrap .widget-control-edit,.widgets_access #wpwrap .widgets-holder-wrap.closed .sidebar-description,.widgets_access #wpwrap .widgets-holder-wrap.closed .widget{display:block}.widgets_access #widgets-left .widget .widget-top:hover,.widgets_access #widgets-right .widget .widget-top:hover{border-color:#ddd}#available-widgets .widget-control-edit .edit,#widgets-left .inactive-sidebar .widget-control-edit .add,#widgets-right .widget-control-edit .add{display:none}.widget-control-edit{display:block;color:#666;background:#EEE;padding:0 15px;line-height:43px;border-right:1px solid #DDD}#widgets-left .widget-control-edit:hover,#widgets-right .widget-control-edit:hover{color:#fff;background:#444;border-right:0;outline:1px solid #444}.widgets-holder-wrap .sidebar-description,.widgets-holder-wrap .sidebar-name{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.editwidget{margin:0 auto}.editwidget .widget-inside{display:block;padding:0 15px}.editwidget .widget-control-actions{margin-top:20px}.js .closed br.clear,.js .widgets-holder-wrap.closed .sidebar-description,.js .widgets-holder-wrap.closed .widget,.widget-description,.widget-inside{display:none}.widget-inside{background:#fff}#removing-widget{display:none;font-weight:400;padding-right:15px;font-size:12px;line-height:1;color:#000}.js #removing-widget{color:#2ea2cc}#access-off,.no-js .widget-holder .description,.widget-control-noform,.widgets_access #access-on,.widgets_access .sidebar-name-arrow,.widgets_access .widget-action,.widgets_access .widget-holder .description{display:none}.widgets_access #widget-list,.widgets_access .widget-holder{padding-top:10px}.widgets_access #access-off{display:inline}.widgets_access .sidebar-name,.widgets_access .widget .widget-top{cursor:default}.widget-liquid-left #widgets-left.chooser #available-widgets .widget,.widget-liquid-left #widgets-left.chooser .inactive-sidebar{-webkit-transition:opacity .1s linear;transition:opacity .1s linear;opacity:.2;pointer-events:none}.widget-liquid-left #widgets-left.chooser #available-widgets .widget-in-question{opacity:1;pointer-events:auto}#available-widgets .widget-top:hover,#widgets-left .widget-in-question .widget-top,#widgets-left .widget-top:hover,.widgets-chooser ul,div#widgets-right .widget-top:hover{border-color:#999;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.1);box-shadow:0 1px 2px rgba(0,0,0,.1)}.widgets-chooser ul.widgets-chooser-sidebars{margin:0;list-style-type:none;max-height:300px;overflow:auto}.widgets-chooser{display:none}.widgets-chooser ul{border:1px solid #ccc}.widgets-chooser li{padding:10px 35px 10px 15px;border-bottom:1px solid #ccc;background:#fff;margin:0;cursor:pointer;outline:0;position:relative;-webkit-transition:background .2s ease-in-out;transition:background .2s ease-in-out}.widgets-chooser li:focus,.widgets-chooser li:hover{background:rgba(255,255,255,.7)}.widgets-chooser li:focus:before{content:'\f147';display:block;-webkit-font-smoothing:antialiased;font:400 26px/1 dashicons;color:#999;position:absolute;top:7px;right:5px}.widgets-chooser li:last-child{border:0}.widgets-chooser li.widgets-chooser-selected{background:#2ea2cc;color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{content:'\f147';display:block;-webkit-font-smoothing:antialiased;font:400 26px/1 dashicons;color:#fff;position:absolute;top:7px;right:5px}.widgets-chooser .widgets-chooser-actions{padding:10px 0 12px;text-align:center}.widgets-chooser button{margin-left:5px}#available-widgets .widget .widget-top{cursor:pointer}@media screen and (max-width:480px){div.widget-liquid-left{width:100%;float:none;border-left:0;padding-left:0}#widgets-left #available-widgets .widget-top,#widgets-left .inactive-sidebar .widgets-sortables,#widgets-left .sidebar-name{margin-left:0}div.widget-liquid-right{width:100%;float:none}div.widget{margin:0 auto 10px!important;max-width:480px}}@media screen and (max-width:320px){div.widget{max-width:320px}}@media only screen and (min-width:1250px){#widgets-left #available-widgets .widget{width:49%;float:right}.widget.ui-draggable-dragging{min-width:49%}#widgets-left #available-widgets .widget:nth-child(even){float:left}#widgets-right .sidebars-column-1,#widgets-right .sidebars-column-2{float:right;width:49%}#widgets-right .sidebars-column-1{margin-left:2%}#widgets-right.single-sidebar .sidebars-column-1,#widgets-right.single-sidebar .sidebars-column-2{float:none;width:100%;margin:0}}body.rtl,body.rtl .press-this a.wp-switch-editor{font-family:Tahoma,Arial,sans-serif}body.locale-he-il,body.locale-he-il .press-this a.wp-switch-editor{font-family:Arial,sans-serif}.locale-he-il em{font-style:normal;font-weight:700}.locale-zh-cn #local-time,.locale-zh-cn #utc-time,.locale-zh-cn .form-wrap p,.locale-zh-cn .howto,.locale-zh-cn .inline-edit-row fieldset span.checkbox-title,.locale-zh-cn .inline-edit-row fieldset span.title,.locale-zh-cn .js .input-with-default-title,.locale-zh-cn .link-to-original,.locale-zh-cn .tablenav .displaying-num,.locale-zh-cn p.description,.locale-zh-cn p.help,.locale-zh-cn p.install-help,.locale-zh-cn span.description{font-style:normal}.locale-zh-cn .hdnle a{font-size:12px}.locale-zh-cn form.upgrade .hint{font-style:normal;font-size:100%}.locale-zh-cn #wp-fullscreen-tagline{font-family:KaiTi,"æ¥·ä½",sans-serif}.locale-zh-cn #wp-fullscreen-modes a{font-size:12px}.locale-zh-cn #sort-buttons{font-size:1em!important}.locale-de-de .inline-edit-row fieldset label span.title{width:7em}.locale-de-de .inline-edit-row fieldset label span.input-text-wrap{margin-right:7em}.locale-de-de #customize-header-actions .button{padding:0 5px 1px}.locale-de-de #customize-header-actions .spinner{margin:16px 3px 0}.locale-ru-ru .inline-edit-row fieldset label span.title{width:8em}.locale-ru-ru .inline-edit-row fieldset label span.input-text-wrap{margin-right:8em}.locale-ru-ru.post-php .tagsdiv .newtag{width:165px}.locale-ru-ru.press-this .posting{margin-left:277px}.locale-ru-ru .press-this-sidebar{width:265px}.locale-ru-ru #customize-header-actions .button{padding:0 5px 1px}.locale-ru-ru #customize-header-actions .spinner{margin:16px 3px 0}.locale-lt-lt .inline-edit-row fieldset label span.title{width:8em}.locale-lt-lt .inline-edit-row fieldset label span.input-text-wrap{margin-right:8em} \ No newline at end of file +@import url(common-rtl.min.css); +@import url(forms-rtl.min.css); +@import url(admin-menu-rtl.min.css); +@import url(dashboard-rtl.min.css); +@import url(list-tables-rtl.min.css); +@import url(edit-rtl.min.css); +@import url(revisions-rtl.min.css); +@import url(media-rtl.min.css); +@import url(themes-rtl.min.css); +@import url(about-rtl.min.css); +@import url(nav-menus-rtl.min.css); +@import url(widgets-rtl.min.css); +@import url(site-icon-rtl.min.css); +@import url(l10n-rtl.min.css); diff --git a/wp-admin/css/wp-admin.css b/wp-admin/css/wp-admin.css index b29af79..14c10f9 100644 --- a/wp-admin/css/wp-admin.css +++ b/wp-admin/css/wp-admin.css @@ -7,8 +7,8 @@ @import url(revisions.css); @import url(media.css); @import url(themes.css); -@import url(press-this.css); @import url(about.css); @import url(nav-menus.css); @import url(widgets.css); +@import url(site-icon.css); @import url(l10n.css); diff --git a/wp-admin/css/wp-admin.min.css b/wp-admin/css/wp-admin.min.css index 15ded2f..197eae9 100644 --- a/wp-admin/css/wp-admin.min.css +++ b/wp-admin/css/wp-admin.min.css @@ -1 +1,14 @@ -#wpwrap{height:auto;min-height:100%;width:100%;position:relative;-webkit-font-smoothing:subpixel-antialiased}#wpcontent{height:100%}#wpcontent,#wpfooter{margin-left:180px}.folded #wpcontent,.folded #wpfooter{margin-left:56px}#wpbody-content{padding-bottom:65px;float:left;width:100%;overflow:visible!important}.inner-sidebar{float:right;clear:right;display:none;width:281px;position:relative}.columns-2 .inner-sidebar{margin-right:auto;width:286px;display:block}.columns-2 .inner-sidebar #side-sortables,.inner-sidebar #side-sortables{min-height:300px;width:280px;padding:0}.has-right-sidebar .inner-sidebar{display:block}.has-right-sidebar #post-body{float:left;clear:left;width:100%;margin-right:-2000px}.has-right-sidebar #post-body-content{margin-right:300px;float:none;width:auto}#col-container,#col-left,#col-right{overflow:hidden;padding:0;margin:0}#col-left{width:35%}#col-right{float:right;clear:right;width:65%}.col-wrap{padding:0 7px}.alignleft{float:left}.alignright{float:right}.textleft{text-align:left}.textright{text-align:right}.clear{clear:both}.screen-reader-text,.screen-reader-text span,.ui-helper-hidden-accessible{position:absolute;margin:-1px;padding:0;height:1px;width:1px;overflow:hidden;clip:rect(0 0 0 0);border:0}.screen-reader-shortcut{position:absolute;top:-1000em}.screen-reader-shortcut:focus{left:6px;top:-25px;height:auto;width:auto;display:block;font-size:14px;font-weight:600;padding:15px 23px 14px;background:#f1f1f1;color:#21759b;z-index:100000;line-height:normal;-webkit-box-shadow:0 0 2px 2px rgba(0,0,0,.6);box-shadow:0 0 2px 2px rgba(0,0,0,.6);text-decoration:none;outline:0}.hidden,.js .closed .inside,.js .hide-if-js,.js .wp-core-ui .hide-if-js,.js.wp-core-ui .hide-if-js,.no-js .hide-if-no-js,.no-js .wp-core-ui .hide-if-no-js,.no-js.wp-core-ui .hide-if-no-js{display:none}#menu-management .menu-edit,#menu-settings-column .accordion-container,.feature-filter,.imgedit-group,.manage-menus,.menu-item-handle,.popular-tags,.stuffbox,.widget-inside,.widget-top,.widgets-holder-wrap,.wp-editor-container,p.popular-tags,table.widefat{border:1px solid #e5e5e5;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04)}.feature-filter,.imgedit-group,.popular-tags,.stuffbox,.widgets-holder-wrap,.wp-editor-container,p.popular-tags,table.widefat{background:#fff}body,html{height:100%;margin:0;padding:0}html{background:#f1f1f1}body{color:#444;font-family:"Open Sans",sans-serif;font-size:13px;line-height:1.4em;min-width:600px}body.iframe{min-width:0;padding-top:1px}iframe,img{border:0}td{font-family:inherit;font-size:inherit;font-weight:inherit;line-height:inherit}a{color:#0074a2;-webkit-transition-property:border,background,color;transition-property:border,background,color;-webkit-transition-duration:.05s;transition-duration:.05s;-webkit-transition-timing-function:ease-in-out;transition-timing-function:ease-in-out}a,div{outline:0}a:active,a:hover{color:#2ea2cc}a:focus{color:#124964}a:active,a:focus{outline:thin dotted}#adminmenu a:active,#adminmenu a:focus,.screen-reader-text:focus{outline:0}blockquote,q{quotes:none}blockquote:after,blockquote:before,q:after,q:before{content:'';content:none}p{font-size:13px;line-height:1.5;margin:1em 0}blockquote{margin:1em}dd,li{margin-bottom:6px}h1,h2,h3,h4,h5,h6{display:block;font-weight:600}h1{font-size:2em;margin:.67em 0}h2{color:#222;font-size:1.5em;margin:.83em 0;font-weight:400}h3{color:#222;font-size:1.3em;margin:1em 0}h4{font-size:1em;margin:1.33em 0}h5{font-size:.83em;margin:1.67em 0}h6{font-size:.67em;margin:2.33em 0}ol,ul{padding:0}ul{list-style:none}ol{list-style-type:decimal;margin-left:2em}ul.ul-disc{list-style:disc outside}ul.ul-square{list-style:square outside}ol.ol-decimal{list-style:decimal outside}ol.ol-decimal,ul.ul-disc,ul.ul-square{margin-left:1.8em}ol.ol-decimal>li,ul.ul-disc>li,ul.ul-square>li{margin:0 0 .5em}.ltr{direction:ltr}.code,code{font-family:Consolas,Monaco,monospace;direction:ltr}code,kbd{padding:3px 5px 2px;margin:0 1px;background:#eaeaea;background:rgba(0,0,0,.07);font-size:13px}.subsubsub{list-style:none;margin:8px 0 0;padding:0;font-size:13px;float:left;color:#666}.subsubsub a{line-height:2;padding:.2em;text-decoration:none}.subsubsub a .count,.subsubsub a.current .count{color:#999;font-weight:400}.subsubsub a.current{font-weight:600;border:0}.subsubsub li{display:inline-block;margin:0;padding:0;white-space:nowrap}.widefat{border-spacing:0;width:100%;clear:both;margin:0}.widefat *{word-wrap:break-word}.widefat a{text-decoration:none}.widefat td,.widefat th{padding:8px 10px}.widefat thead th{border-bottom:1px solid #e1e1e1}.widefat tfoot th{border-top:1px solid #e1e1e1;border-bottom:0}.widefat .no-items td{border-bottom-width:0}.widefat td{vertical-align:top}.widefat td,.widefat td ol,.widefat td p,.widefat td ul{font-size:13px;line-height:1.5em}.widefat th{text-align:left;line-height:1.3em;font-size:14px}.widefat th input{margin:0 0 0 8px;padding:0;vertical-align:text-top}.widefat .check-column{width:2.2em;padding:6px 0 25px;vertical-align:top}.widefat th input[type=checkbox]{margin-top:-1px}.widefat.media .check-column{padding-top:8px}.widefat tbody th.check-column,.widefat tfoot th.check-column,.widefat thead th.check-column{padding:11px 0 0 3px}.widefat thead th.check-column{padding-top:10px}.update-php div.error,.update-php div.updated{margin-left:0}.no-js .widefat tfoot .check-column input,.no-js .widefat thead .check-column input{display:none}.column-comments,.column-links,.column-posts,.widefat .num{text-align:center}.widefat th#comments{vertical-align:middle}.wrap{margin:10px 20px 0 2px}div.error,div.updated{margin:5px 15px 2px}div.error p,div.updated p{margin:.5em 0;padding:2px}.media-upload-form div.error,.wrap div.error,.wrap div.updated{margin:5px 0 15px}div.updated{border-left:4px solid #7ad03a;padding:1px 12px;background-color:#fff;-webkit-box-shadow:0 1px 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 1px 0 rgba(0,0,0,.1)}div.error{border-left:4px solid #dd3d36;background:#fff;-webkit-box-shadow:0 1px 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 1px 0 rgba(0,0,0,.1);padding:1px 12px}.attention{color:#2ea2cc}.subtitle,.wrap h2{font-weight:400;margin:0}.wrap h2{font-size:23px;font-weight:400;padding:9px 15px 4px 0;line-height:29px}.subtitle{color:#777;font-size:14px;padding-left:25px}.wrap .add-new-h2,.wrap .add-new-h2:active{margin-left:4px;padding:4px 8px;position:relative;top:-3px;text-decoration:none;border:0;-webkit-border-radius:2px;border-radius:2px;background:#e0e0e0;text-shadow:none;font-weight:600;font-size:13px}.wrap .add-new-h2:hover{background:#2ea2cc;color:#fff}.wrap h2.long-header{padding-right:0}.wp-dialog{background-color:#fff}.sorthelper{background-color:#ccf3fa}.ac_match,.subsubsub a.current{color:#000}.alt,.alternate{background-color:#f9f9f9}.bar{background-color:#e8e8e8;border-right-color:#99d}.media-upload-form label.form-help,td.help{color:#9a9a9a}.highlight{background-color:#e4f2fd;color:#000}.wp-ui-primary{color:#fff;background-color:#333}.wp-ui-text-primary{color:#333}.wp-ui-highlight{color:#fff;background-color:#1e8cbe}.wp-ui-text-highlight{color:#1e8cbe}.wp-ui-notification{color:#fff;background-color:#d54e21}.wp-ui-text-notification{color:#d54e21}.wp-ui-text-icon{color:#999}#nav-menu-footer,#nav-menu-header,#your-profile #rich_editing,.checkbox,.control-section .accordion-section-title,.menu-item-handle,.postbox h3,.side-info,.sidebar-name,.stuffbox h3,.widefat tfoot th,.widefat thead th,.widget .widget-top,h3.dashboard-widget-title,h3.dashboard-widget-title small,h3.dashboard-widget-title span{line-height:1.4em}.menu-item-handle,.widget .widget-top{background:#fafafa;color:#222}#namediv h3,#submitdiv h3,.postbox h3{border-bottom:1px solid #eee}.quicktags,.search{background-color:#ccc;color:#000;font-size:12px}.icon32{display:none}#bulk-titles div a:before,#welcome-panel.welcome-panel .welcome-panel-close::before,.tagchecklist span a:before{background:0 0;color:#bbb;content:'\f153';display:block!important;font:400 16px/1 dashicons;speak:none;height:20px;margin:2px 0;text-align:center;width:20px;-webkit-font-smoothing:antialiased!important}#bulk-titles div a:hover:before,#welcome-panel.welcome-panel .welcome-panel-close:hover:before,.tagchecklist span a:hover:before{color:#c00}.key-labels label{line-height:24px}b,strong{font-weight:600}.pre{white-space:pre-wrap;word-wrap:break-word}.howto{color:#666;font-style:italic;display:block}p.install-help{margin:8px 0;font-style:italic}.no-break{white-space:nowrap}hr{border:0;border-top:1px solid #ddd;border-bottom:1px solid #fafafa}#all-plugins-table .plugins a.delete,#media-items a.delete,#media-items a.delete-permanently,#nav-menu-footer .menu-delete,#search-plugins-table .plugins a.delete,.plugins a.delete,.row-actions span.delete a,.row-actions span.spam a,.row-actions span.trash a,.submitbox .submitdelete{color:#a00}#all-plugins-table .plugins a.delete:hover,#media-items a.delete-permanently:hover,#media-items a.delete:hover,#nav-menu-footer .menu-delete:hover,#search-plugins-table .plugins a.delete:hover,.file-error,.plugins a.delete:hover,.row-actions .delete a:hover,.row-actions .spam a:hover,.row-actions .trash a:hover,.submitbox .submitdelete:hover,.widget-control-remove:hover,abbr.required{color:red;text-decoration:none;border:0}#major-publishing-actions{padding:10px;clear:both;border-top:1px solid #ddd;background:#f5f5f5}#delete-action{line-height:28px;vertical-align:middle;text-align:left;float:left}#publishing-action{text-align:right;float:right;line-height:23px}#publishing-action .spinner{float:left}#misc-publishing-actions{padding:6px 0 0}.misc-pub-section{padding:6px 10px 8px}#minor-publishing-actions{padding:10px 10px 0;text-align:right}#save-post{float:left}.preview{float:right}#sticky-span{margin-left:18px}.side-info{margin:0;padding:4px;font-size:11px}.side-info h5{padding-bottom:7px;font-size:14px;margin:12px 2px 5px;border-bottom:1px solid #dadada}.side-info ul{margin:0;padding-left:18px;list-style:square;color:#666}.approve,.unapproved .unapprove{display:none}.spam .approve,.trash .approve,.unapproved .approve{display:inline}td.action-links,th.action-links{text-align:right}#update-nag,.update-nag{display:inline-block;line-height:19px;padding:11px 15px;font-size:14px;text-align:left;margin:25px 20px 0 2px;background-color:#fff;border-left:4px solid #ffba00;-webkit-box-shadow:0 1px 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 1px 0 rgba(0,0,0,.1)}.update-message{color:#000}.update-php .spinner{float:none;margin:-4px 0}#ajax-loading,.ajax-feedback,.ajax-loading,.imgedit-wait-spin,.list-ajax-loading{visibility:hidden}#ajax-response.alignleft{margin-left:2em}#adminmenu a,#catlist a,#sidemenu a,#taglist a{text-decoration:none}#contextual-help-wrap,#screen-options-wrap{margin:0;padding:8px 20px 12px;position:relative}#contextual-help-wrap{overflow:auto;margin-left:0!important}#screen-meta .screen-reader-text{visibility:hidden}#screen-meta-links{margin:0 20px 0 0}#screen-meta-links a{padding:3px 6px 3px 16px}#screen-meta-links a:focus{outline:0}#screen-meta{display:none;margin:0 20px -1px 0;position:relative;background-color:#fff;border:1px solid #ddd;border-top:0;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.025);box-shadow:0 1px 0 rgba(0,0,0,.025)}#contextual-help-link-wrap,#screen-options-link-wrap{float:right;height:28px;margin:0 0 0 6px;border:1px solid #ddd;border-top:0;background:#fff;-webkit-box-shadow:0 1px 1px -1px rgba(0,0,0,.1);box-shadow:0 1px 1px -1px rgba(0,0,0,.1)}#screen-meta-links .screen-meta-toggle{position:relative;top:0}#screen-meta-links a{color:#777}#screen-meta-links a:active,#screen-meta-links a:focus,#screen-meta-links a:hover{color:#333}#screen-meta-links a:focus{border-color:#aaa;-webkit-box-shadow:0 2px 3px rgba(0,0,0,.15);box-shadow:0 2px 3px rgba(0,0,0,.15)}#screen-meta-links a.show-settings{display:block;font-size:13px;height:22px;line-height:22px;text-decoration:none;z-index:1}#screen-meta-links a:after{right:0;content:'\f140';font:400 20px/1 dashicons;speak:none;display:inline-block;padding:0 5px 0 0;bottom:2px;position:relative;vertical-align:bottom;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;color:#bbb}#screen-meta-links a.screen-meta-active:after{content:'\f142'}#screen-meta-links a.show-settings:hover{text-decoration:none}.toggle-arrow{background-repeat:no-repeat;background-position:top left;background-color:transparent;height:22px;line-height:22px;display:block}.toggle-arrow-active{background-position:bottom left}#contextual-help-wrap h5,#screen-options-wrap h5{margin:8px 0;font-size:13px}.metabox-prefs label{display:inline-block;padding-right:15px;line-height:30px}.metabox-prefs label input[type=checkbox]{margin-top:-4px;margin-right:6px}.metabox-prefs label input{margin:0 5px 0 2px}.metabox-prefs .columns-prefs label input{margin:0 2px}.metabox-prefs label a{display:none}#contextual-help-wrap{padding:0}#contextual-help-columns{position:relative}#contextual-help-back{position:absolute;top:0;bottom:0;left:150px;right:170px;border:1px solid #e1e1e1;border-top:0;border-bottom:0;background:#f6fbfd}#contextual-help-wrap.no-sidebar #contextual-help-back{right:0;border-right-width:0;-webkit-border-bottom-right-radius:2px;border-bottom-right-radius:2px}.contextual-help-tabs{float:left;width:150px;margin:0}.contextual-help-tabs ul{margin:1em 0}.contextual-help-tabs li{margin-bottom:0;list-style-type:none;border-style:solid;border-width:0 0 0 2px;border-color:transparent}.contextual-help-tabs a{display:block;padding:5px 5px 5px 12px;line-height:18px;text-decoration:none;border:1px solid transparent;border-right:0;border-left:0}.contextual-help-tabs a:hover{color:#333}.contextual-help-tabs .active{padding:0;margin:0 -1px 0 0;border-left:2px solid #2ea2cc;background:#f6fbfd;-webkit-box-shadow:0 2px 0 rgba(0,0,0,.02),0 1px 0 rgba(0,0,0,.02);box-shadow:0 2px 0 rgba(0,0,0,.02),0 1px 0 rgba(0,0,0,.02)}.contextual-help-tabs .active a{border-color:#e1e1e1;color:#333}.contextual-help-tabs-wrap{padding:0 20px;overflow:auto}.help-tab-content{display:none;margin:0 22px 12px 0;line-height:1.6em}.help-tab-content.active{display:block}.help-tab-content ul li{list-style-type:disc;margin-left:18px}.contextual-help-sidebar{width:150px;float:right;padding:0 8px 0 12px;overflow:auto}html.wp-toolbar{padding-top:32px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.narrow{width:70%;margin-bottom:40px}.narrow p{line-height:150%}.widefat td,.widefat th{overflow:hidden;color:#555}.widefat th{font-weight:400}.widefat tfoot tr th,.widefat thead tr th{color:#333}.widefat td p{margin:2px 0 .8em}.widefat ol,.widefat p,.widefat ul{color:#333}.widefat .column-comment p{margin:.6em 0}.postbox-container{float:left}.postbox-container .meta-box-sortables{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#wpbody-content .metabox-holder{padding-top:10px}.metabox-holder .postbox-container .empty-container{border:3px dashed #bbb;height:250px}.columns-2 #postbox-container-3 .empty-container,.columns-2 #postbox-container-4 .empty-container,.columns-3 #postbox-container-4 .empty-container,.metabox-holder.columns-1 .postbox-container .empty-container{border:0 none;height:0;min-height:0}#post-body-content{width:100%;min-width:463px;float:left}#post-body.columns-2 #postbox-container-1{float:right;margin-right:-300px;width:280px}#post-body.columns-2 #side-sortables{min-height:250px}@media only screen and (max-width:799px){#wpbody-content .metabox-holder .postbox-container .empty-container{border:0 none;height:0;min-height:0}}.js .postbox .hndle{cursor:move}.hndle a{font-size:11px;font-weight:400}.postbox .handlediv{float:right;width:27px;height:30px}.js .postbox .handlediv{cursor:pointer}.sortable-placeholder{border:1px dashed #bbb;margin-bottom:20px}.postbox,.stuffbox{margin-bottom:20px;padding:0;line-height:1}.postbox h3,.stuffbox h3{margin-top:1px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.js .postbox h3,.js .widget .widget-top{cursor:move}.postbox .inside,.stuffbox .inside{padding:0 12px 12px;line-height:1.4em;font-size:13px}.postbox .inside{margin:11px 0;position:relative}.postbox .inside>p:last-child,.rss-widget ul li:last-child{margin-bottom:1px!important}.postbox.closed h3{border:0;-webkit-box-shadow:none;box-shadow:none}.postbox table.form-table{margin-bottom:0}.postbox table.widefat{-webkit-box-shadow:none;box-shadow:none}.temp-border{border:1px dotted #ccc}.columns-prefs label{padding:0 5px}#adminmenu .wp-submenu li.current,#adminmenu .wp-submenu li.current a,#adminmenu .wp-submenu li.current a:hover,#dashboard_right_now .versions .b,#ed_reply_toolbar #ed_reply_strong,#pass-strength-result.short,#pass-strength-result.strong,#post-status-display,#post-visibility-display,.feature-filter .feature-name,.item-controls .item-order a,.media-item .percent,.plugins .name{font-weight:600}#wpfooter{position:absolute;bottom:0;left:0;right:0;padding:10px 0;margin-right:20px;color:#777}#wpfooter p{font-size:13px;margin:0;line-height:20px}#footer-thankyou{font-style:italic}#wpfooter a{text-decoration:none}#wpfooter a:hover{text-decoration:underline}.nav-tab{border:1px solid #ccc;border-bottom:0;background:#e4e4e4;color:#555;font-size:12px;line-height:16px;display:inline-block;padding:4px 14px 6px;text-decoration:none;margin:-4px 4px -1px 0}.nav-tab:hover{background-color:#fff;color:#464646}.nav-tab-active,.nav-tab-active:hover{border-bottom:1px solid #f1f1f1;background:#f1f1f1;color:#000}h2.nav-tab-wrapper,h3.nav-tab-wrapper{border-bottom:1px solid #ccc;padding-bottom:0;padding-left:10px}h2 .nav-tab{padding:6px 10px;font-weight:700;font-size:15px;line-height:24px}.spinner{background:url(../images/spinner.gif) no-repeat;-webkit-background-size:20px 20px;background-size:20px 20px;display:none;float:right;opacity:.7;filter:alpha(opacity=70);width:20px;height:20px;margin:2px 5px 0}#template div{margin-right:190px}.metabox-holder h3{font-size:14px;padding:8px 12px;margin:0;line-height:1.4}#templateside ul li a{text-decoration:none}#sidemenu{margin:-30px 15px 0 315px;list-style:none;position:relative;float:right;padding-left:10px;font-size:12px}#sidemenu a{padding:0 7px;display:block;float:left;line-height:28px;border-top:1px solid #f9f9f9;border-bottom:1px solid #dfdfdf;background-color:#f9f9f9;-webkit-transition:none;transition:none}#sidemenu li{display:inline;line-height:200%;list-style:none;text-align:center;white-space:nowrap;margin:0;padding:0}#sidemenu a.current{font-weight:400;padding-left:6px;padding-right:6px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-webkit-border-top-right-radius:3px;border-top-right-radius:3px;border:1px solid #dfdfdf;border-bottom-color:#f1f1f1;background-color:#f1f1f1;color:#000}.plugin-install #description,.plugin-install-network #description{width:60%}table .column-rating,table .column-visible,table .vers{text-align:left}.error-message{color:red;font-weight:600}body.iframe{height:98%}.lp-show-latest p{display:none}.lp-show-latest .lp-error p,.lp-show-latest p:last-child{display:block}td.media-icon{text-align:center;width:80px;padding-top:8px;padding-bottom:8px}td.media-icon img{max-width:80px;max-height:60px}#howto{font-size:11px;margin:0 5px;display:block}.importers td{padding-right:14px}.importers{font-size:16px;width:auto}#post-body #post-body-content #namediv h3{margin-top:0}#namediv h3 label{vertical-align:baseline}#namediv table{width:100%}#namediv td.first{width:10px;white-space:nowrap}#namediv input{width:98%}#namediv p{margin:10px 0}#submitdiv h3{margin-bottom:0!important}.zerosize{height:0;width:0;margin:0;border:0;padding:0;overflow:hidden;position:absolute}br.clear{height:2px;line-height:2px}.checkbox{border:0;margin:0;padding:0}fieldset{border:0;padding:0;margin:0}.post-categories{display:inline;margin:0;padding:0}.post-categories li{display:inline}div.star-holder{position:relative;height:17px;width:100px;background:url(../images/stars.png?ver=20121108) repeat-x bottom left}div.star-holder .star-rating{background:url(../images/stars.png?ver=20121108) repeat-x top left;height:17px;float:left}.star-rating{white-space:nowrap}.star-rating .star{display:inline-block;width:20px;height:20px;-webkit-font-smoothing:antialiased;font-size:20px;line-height:1;font-family:dashicons;text-decoration:inherit;font-weight:400;font-style:normal;vertical-align:top;-webkit-transition:color .1s ease-in 0;transition:color .1s ease-in 0;text-align:center;color:#0074a2}.star-rating .star-full:before{content:'\f155'}.star-rating .star-half:before{content:'\f459'}.rtl .star-rating .star-half{-webkit-transform:rotateY(180deg);-ms-transform:rotateY(180deg);transform:rotateY(180deg)}.star-rating .star-empty:before{content:'\f154'}div.action-links{font-weight:400;margin:6px 0 0}#plugin-information{background:#fcfcfc;position:fixed;top:0;right:0;bottom:0;left:0;height:auto;padding:0}#plugin-information-title{padding:0 76px 0 20px;font-size:22px;font-weight:600;line-height:56px;top:0;right:0;left:0;height:56px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}#plugin-information-tabs{padding:0 16px;position:absolute;top:56px;right:0;left:0;height:36px;z-index:1}#plugin-information-tabs a{position:relative;float:left;padding:8px 10px 9px;margin:0;height:18px;line-height:18px;font-size:14px;text-decoration:none;-webkit-transition:none;transition:none}#plugin-information-tabs a.current{margin:-1px -1px 0;background:#fff;border:1px solid #ddd;border-bottom:0;color:#333}#plugin-information-tabs a:active,#plugin-information-tabs a:focus{outline:0}#plugin-information-content{background:#fff;border-top:1px solid #ddd;border-bottom:1px solid #ddd;position:absolute;top:90px;right:0;bottom:58px;left:0}#section-holder{margin:0;padding:10px 26px;position:absolute;top:0;right:250px;bottom:0;left:0;overflow:auto}#section-holder .updated{margin:16px 0}#plugin-information .fyi{background:#f3f3f3;border-left:1px solid #ddd;color:#666;padding:16px;position:absolute;top:0;right:0;bottom:0;width:217px;overflow:auto}#plugin-information .fyi strong{color:#464646}#plugin-information .fyi h3{font-weight:700;text-transform:uppercase;font-size:12px;color:#666;margin:24px 0 8px}#plugin-information .fyi h2{font-size:.9em;margin-bottom:0;margin-right:0}#plugin-information .fyi ul{padding:0;margin:0;list-style:none}#plugin-information .fyi li{margin:0 0 10px}#plugin-information-footer{padding:15px 16px;position:absolute;right:0;bottom:0;left:0;height:28px}#plugin-information .section ol,#plugin-information .section ul{list-style-type:disc;margin-left:24px}#plugin-information .section,#plugin-information .section p{font-size:14px;line-height:1.7}#plugin-information #section-screenshots ol{list-style:none;margin:0}#plugin-information #section-screenshots li img{vertical-align:text-top;margin-top:16px;max-width:100%;width:auto;height:auto;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.3);box-shadow:0 1px 2px rgba(0,0,0,.3)}#plugin-information #section-screenshots li p{font-style:italic;padding-left:20px}#plugin-information pre{padding:7px;overflow:auto;border:1px solid #ccc}.plugin-version-author-uri{font-size:13px}@media screen and (max-width:782px){#plugin-information-content{overflow:auto;bottom:58px}#plugin-information .fyi{border:1px solid #ddd;position:static;width:auto;margin:26px 26px 16px}#section-holder{position:static}#plugin-information .fyi h3,#plugin-information .fyi small{display:none}#plugin-information-footer{padding:12px 16px 0;height:46px}}body.import-php #TB_window,body.index-php #TB_window,body.plugin-install-php #TB_window,body.plugins-php #TB_window,body.update-core-php #TB_window{background:#fcfcfc url( ../images/spinner.gif ) no-repeat center}@media print,(-o-min-device-pixel-ratio:5/4),(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){body.import-php #TB_window,body.index-php #TB_window,body.plugin-install-php #TB_window,body.plugins-php #TB_window,body.update-core-php #TB_window{background:#fcfcfc url( ../images/spinner-2x.gif ) no-repeat center;-webkit-background-size:20px 20px;background-size:20px 20px}}body.import-php #TB_title,body.index-php #TB_title,body.plugin-install-php #TB_title,body.plugins-php #TB_title,body.update-core-php #TB_title{float:left;height:1px}body.import-php #TB_ajaxWindowTitle,body.index-php #TB_ajaxWindowTitle,body.plugin-install-php #TB_ajaxWindowTitle,body.plugins-php #TB_ajaxWindowTitle,body.update-core-php #TB_ajaxWindowTitle{display:none}body.import-php .tb-close-icon,body.index-php .tb-close-icon,body.plugin-install-php .tb-close-icon,body.plugins-php .tb-close-icon,body.update-core-php .tb-close-icon{line-height:48px;width:48px;height:48px}body.import-php .tb-close-icon:before,body.index-php .tb-close-icon:before,body.plugin-install-php .tb-close-icon:before,body.plugins-php .tb-close-icon:before,body.update-core-php .tb-close-icon:before{line-height:48px}img{border:0}#wphead{border-bottom:1px solid #dfdfdf}#wphead h1 a{color:#464646}.js .meta-box-sortables .postbox:hover .handlediv{margin-right:0!important}.js .meta-box-sortables .postbox .handlediv:before,.js .sidebar-name .sidebar-name-arrow:before{right:12px;font:400 20px/1 dashicons;speak:none;display:inline-block;padding:8px 10px;top:0;position:relative;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important}.js #widgets-left .sidebar-name .sidebar-name-arrow{display:none}.js #widgets-left .sidebar-name:hover .sidebar-name-arrow,.js #widgets-left .widgets-holder-wrap.closed .sidebar-name .sidebar-name-arrow{display:block}.js .meta-box-sortables .postbox .handlediv:before,.js .sidebar-name .sidebar-name-arrow:before{content:'\f142'}.js .meta-box-sortables .postbox.closed .handlediv:before,.js .widgets-holder-wrap.closed .sidebar-name-arrow:before{content:'\f140'}.error a{text-decoration:underline}.updated a{text-decoration:none;padding-bottom:2px}#photo-add-url-div input[type=text]{width:300px}.alignleft h3{margin:0}#template textarea{font-family:Consolas,Monaco,monospace;font-size:13px;width:97%;background:#f9f9f9;outline:0}#docs-list,#template textarea{direction:ltr}#template p{width:97%}#templateside{float:right;width:190px;word-wrap:break-word}#postcustomstuff p.submit,#templateside h3{margin:0}#templateside h4{margin:1em 0 0}#templateside ol,#templateside ul{margin:.5em 0;padding:0}#templateside li{margin:4px 0}#templateside a,.theme-editor-php .highlight{display:block;padding:3px 3px 3px 12px;text-decoration:none}.theme-editor-php .highlight{margin:-3px 3px -3px -12px}#templateside .highlight{border:0;font-weight:700}.nonessential{color:#666;font-size:11px;font-style:italic;padding-left:12px}#documentation{margin-top:10px}#documentation label{line-height:22px;vertical-align:baseline;font-weight:600}.fileedit-sub{padding:10px 0 8px;line-height:180%}.accordion-section-title:after,.control-section .accordion-section-title:after,.nav-menus-php .item-edit:before,.widget-top a.widget-action:after{right:0;content:'\f140';border:0;background:0 0;font:400 20px/1 dashicons;speak:none;display:block;padding:0;text-indent:0;text-align:center;position:relative;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important}.accordion-section-title:after,.handlediv,.item-edit,.sidebar-name-arrow,.widget-action{color:#aaa}.accordion-section-title:hover:after,.handlediv:hover,.item-edit:hover,.sidebar-name:hover .sidebar-name-arrow,.widget-action:hover{color:#777}.widget-top a.widget-action:after{padding:12px 12px 0}.nav-menus-php .item-edit:before{line-height:2.1}.accordion-section-title:after,.control-section .accordion-section-title:after{float:right;right:20px;top:-2px}#customize-info.open .accordion-section-title:after,.control-section.open .accordion-section-title:after,.nav-menus-php .menu-item-edit-active .item-edit:before{content:'\f142'}.ui-draggable,.ui-sortable{-ms-touch-action:none;touch-action:none}.menu.ui-sortable,.meta-box-sortables.ui-sortable,.widgets-holder-wrap .ui-draggable,.widgets-holder-wrap .ui-sortable{-ms-touch-action:auto;touch-action:auto}.menu.ui-sortable .menu-item-handle,.meta-box-sortables.ui-sortable .hndle{-ms-touch-action:none;touch-action:none}.accordion-section{border-bottom:1px solid #dfdfdf;margin:0}.accordion-section.open .accordion-section-content,.no-js .accordion-section .accordion-section-content{display:block}.accordion-section.open:hover{border-bottom-color:#dfdfdf}.accordion-section-content{display:none;padding:10px 20px 15px;overflow:hidden;background:#fff}.accordion-section-title{margin:0;padding:12px 15px 15px;position:relative;border-left:1px solid #dfdfdf;border-right:1px solid #dfdfdf;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.js .accordion-section-title{cursor:pointer}.js .accordion-section-title:after{position:absolute;top:12px;right:10px;z-index:1}.accordion-section-title:focus{outline:0}.accordion-section-title:focus:after,.accordion-section-title:hover:after{border-color:#aaa transparent}.cannot-expand .accordion-section-title{cursor:auto}.cannot-expand .accordion-section-title:after{display:none}.control-section .accordion-section-title{border-left:0;border-right:0;padding:10px 10px 11px 14px;line-height:21px;background:#fff}.control-section .accordion-section-title:after{top:11px}.js .control-section .accordion-section-title:focus,.js .control-section .accordion-section-title:hover,.js .control-section.open .accordion-section-title,.js .control-section:hover .accordion-section-title{color:#222;background:#f5f5f5}.control-section.open .accordion-section-title{border-bottom:1px solid #dfdfdf}@media only screen and (min-width:769px){#col-left{width:35%}#col-right{width:65%}}@media only screen and (max-width:860px){#col-left{width:35%}#col-right{width:65%}}@media only screen and (min-width:980px){#col-left{width:35%}#col-right{width:65%}}@media only screen and (max-width:768px){#col-left,#col-right{width:100%}}@media print,(-o-min-device-pixel-ratio:5/4),(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){div.star-holder,div.star-holder .star-rating{background:url(../images/stars-2x.png?ver=20121108) repeat-x bottom left;-webkit-background-size:21px 37px;background-size:21px 37px}.spinner{background-image:url(../images/spinner-2x.gif)}#bulk-titles div a,#bulk-titles div a:hover,#screen-meta-links a.show-settings,.curtime #timestamp,.meta-box-sortables .postbox:hover .handlediv,.sidebar-name-arrow,.sidebar-name:hover .sidebar-name-arrow,.tagchecklist span a,.tagchecklist span a:hover,.widget-top a.widget-action,.widget-top a.widget-action:hover{background:none!important}}@-ms-viewport{width:device-width}@media screen and (max-width:782px){html.wp-toolbar{padding-top:46px}body{min-width:240px;overflow-x:hidden}body *{-webkit-tap-highlight-color:rgba(0,0,0,0)!important}#wpwrap{background:#f0f0f0}#wpcontent{position:relative;margin-left:0;padding-left:10px}#wpbody-content{padding-bottom:100px}.wrap{margin-right:12px;margin-left:0}.col-wrap{padding:0}#collapse-menu,#screen-meta,#screen-meta-links,.post-format-select{display:none!important}.wrap .add-new-h2,.wrap .add-new-h2:active{padding:10px 15px;font-size:14px}.wp-color-result{height:auto;padding-left:45px}.wp-color-result:after{font-size:14px;height:auto;padding:6px 14px}.media-upload-form div.error,.wrap div.error,.wrap div.updated{margin:20px 0 10px;padding:5px 10px;font-size:14px;line-height:175%}.wrap .icon32+h2{margin-top:-2px}.wp-responsive-open #wpbody{right:-190px}.postbox{font-size:14px}.metabox-holder h3{padding:12px}.postbox .handlediv{margin-top:3px}.subsubsub{font-size:16px;text-align:center;margin-bottom:15px}#templateside{float:none;width:auto}#templateside li{margin:0}#templateside li a{display:block;padding:5px}#templateside .highlight{padding:5px;margin-left:-5px;margin-top:-5px}#template div{float:none;margin:0;width:auto}#template textarea{width:100%}.fileedit-sub .alignright{margin-top:15px}#comments-form .checkforspam,#wpfooter{display:none}}@media screen and (max-width:600px){#wpwrap.wp-responsive-open{overflow-x:hidden}html.wp-toolbar{padding-top:0}#wpbody{padding-top:46px}div#post-body.metabox-holder.columns-1{overflow-x:hidden}}input,input[type=email],input[type=number],input[type=password],input[type=search],input[type=text],input[type=url],textarea{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=email],input[type=url]{direction:ltr}input[type=checkbox],input[type=radio]{border:1px solid #bbb;background:#fff;color:#555;clear:none;cursor:pointer;display:inline-block;line-height:0;height:16px;margin:-4px 4px 0 0;outline:0;padding:0!important;text-align:center;vertical-align:middle;width:16px;min-width:16px;-webkit-appearance:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1);-webkit-transition:.05s border-color ease-in-out;transition:.05s border-color ease-in-out}input[type=radio]:checked+label:before{color:#888}.wp-core-ui input[type=reset]:active,.wp-core-ui input[type=reset]:hover{color:#2ea2cc}.wp-admin p input[type=checkbox],.wp-admin p input[type=radio],td>input[type=checkbox]{margin-top:0}.wp-admin p label input[type=checkbox]{margin-top:-4px}.wp-admin p label input[type=radio]{margin-top:-2px}input[type=radio]{-webkit-border-radius:50%;border-radius:50%;margin-right:4px;line-height:10px}input[type=checkbox]:checked:before,input[type=radio]:checked:before{float:left;display:inline-block;vertical-align:middle;width:16px;font:400 21px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}input[type=checkbox]:checked:before{content:'\f147';margin:-3px 0 0 -4px;color:#1e8cbe}input[type=radio]:checked:before{content:'\2022';text-indent:-9999px;-webkit-border-radius:50px;border-radius:50px;font-size:24px;width:6px;height:6px;margin:4px;line-height:16px;background-color:#1e8cbe}input.readonly,textarea.readonly{background-color:#ddd}@-moz-document url-prefix(){.form-table input.tog,input[type=checkbox],input[type=radio]{margin-bottom:-1px}}input[type=search]{-webkit-appearance:textfield}input[type=search]::-webkit-search-decoration{display:none}.ie8 input[type=password]{font-family:sans-serif}button,input,select,textarea{font-family:inherit;font-size:inherit;font-weight:inherit}input,select,textarea{font-size:14px;padding:3px 5px;line-height:15px;-webkit-border-radius:0;border-radius:0}textarea{overflow:auto;padding:2px 6px;line-height:1.4}input[type=email],input[type=number],input[type=password],input[type=search],input[type=text],input[type=url],select,textarea{outline:0}.wp-admin input[type=file]{padding:3px 0}label{cursor:pointer}input,select{margin:1px;padding:3px 5px}input.code{padding-top:6px}textarea.code{line-height:1.4;padding:4px 6px 1px}input[type=email],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=url],select,textarea{border:1px solid #ddd;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.07);box-shadow:inset 0 1px 2px rgba(0,0,0,.07);background-color:#fff;color:#333;-webkit-transition:.05s border-color ease-in-out;transition:.05s border-color ease-in-out}select[disabled]{color:#7f7f7f}input[type=checkbox]:focus,input[type=email]:focus,input[type=number]:focus,input[type=password]:focus,input[type=radio]:focus,input[type=search]:focus,input[type=tel]:focus,input[type=text]:focus,input[type=url]:focus,select:focus,textarea:focus{border-color:#5b9dd9;-webkit-box-shadow:0 0 2px rgba(30,140,190,.8);box-shadow:0 0 2px rgba(30,140,190,.8)}input[readonly]{background-color:#eee}.wp-core-ui :-moz-placeholder,:-moz-placeholder{color:#a9a9a9}.form-invalid{background-color:#ffebe8!important}.form-invalid input,.form-invalid select{border-color:#c00!important}.form-input-tip{color:#666}input.disabled,input:disabled,textarea.disabled,textarea:disabled{-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.04);box-shadow:inset 0 1px 2px rgba(0,0,0,.04);border-color:rgba(222,222,222,.75);background:rgba(255,255,255,.5);color:rgba(51,51,51,.5)}input[type=checkbox]:disabled,input[type=checkbox]:disabled:checked:before,input[type=radio]:disabled,input[type=radio]:disabled:checked:before{opacity:.7}.wp-admin select{padding:2px;line-height:28px;height:28px;vertical-align:middle}.wp-admin .button-cancel{padding:0 5px;line-height:2}.meta-box-sortables select{max-width:100%}.wp-admin select[multiple]{height:auto}.submit{padding:1.5em 0;margin:5px 0;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;border:0}form p.submit a.cancel:hover{text-decoration:none}p.submit{text-align:left;max-width:100%;margin-top:20px;padding-top:10px}.textright p.submit{border:0;text-align:right}table.form-table+input+input+p.submit,table.form-table+input+p.submit,table.form-table+p.submit{border-top:0;padding-top:0}#major-publishing-actions input,#minor-publishing-actions .preview,#minor-publishing-actions input{text-align:center}input.all-options,textarea.all-options{width:250px}input.large-text,textarea.large-text{width:99%}#adduser .form-field input,input.regular-text{width:25em}input.small-text{width:50px;padding:1px 6px}input[type=number].small-text{width:65px}#doaction,#doaction2,#post-query-submit{margin:1px 8px 0 0}.tablenav #changeit,.tablenav #clear-recent-list,.tablenav #delete_all{margin-top:1px}.tablenav .actions select{float:left;margin-right:6px;max-width:200px}.ie8 .tablenav .actions select{width:155px}.ie8 .tablenav .actions select#cat{width:200px}#timezone_string option{margin-left:1em}#upload-form label{color:#777}#your-profile label+a,fieldset label,label{vertical-align:middle}#misc-publishing-actions label,.options-media-php label[for*="_size_"]{vertical-align:baseline}#misc-publishing-actions label[for=post_status]:before{content:'\f173';display:inline-block;font:400 20px/1 dashicons;speak:none;left:-1px;padding:0 5px 0 0;position:relative;top:0;text-decoration:none!important;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#pass-strength-result{background-color:#eee;border:1px solid #ddd;float:left;margin:13px 5px 5px 1px;padding:3px 5px;text-align:center;width:200px;display:none}#pass-strength-result.short{background-color:#ffa0a0;border-color:#f04040}#pass-strength-result.bad{background-color:#ffb78c;border-color:#ff853c}#pass-strength-result.good{background-color:#ffec8b;border-color:#fc0}#pass-strength-result.strong{background-color:#c3ff88;border-color:#8dff1c}.indicator-hint{padding-top:8px}p.search-box{float:right;margin:0}.network-admin.themes-php p.search-box{clear:left}#search-plugins input[name="s"],.search-box input[name="s"],.tagsdiv .newtag{float:left;height:28px;margin:0 4px 0 0}input[type=text].ui-autocomplete-loading{background:transparent url(../images/loading.gif) no-repeat right center;visibility:visible}ul#add-to-blog-users{margin:0 0 0 14px}.ui-autocomplete-input.open{-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0}.ui-autocomplete{padding:0;margin:0;list-style:none;position:absolute;z-index:10000;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;border:1px solid #aaa;background-color:#efefef}.ui-autocomplete li{margin-bottom:0;white-space:nowrap;text-align:left}.ui-autocomplete li a{display:block;height:100%;padding:4px 10px;color:#444}.ui-autocomplete li a.ui-state-focus{background-color:#ddd;cursor:pointer}.form-table{border-collapse:collapse;margin-top:.5em;width:100%;clear:both}.form-table,.form-table td,.form-table td p,.form-table th,.form-wrap label{font-size:14px}.form-table td{margin-bottom:9px;padding:15px 10px;line-height:1.3;vertical-align:middle}.form-table th,.form-wrap label{color:#222;font-weight:400;text-shadow:none;vertical-align:baseline}.form-table th{vertical-align:top;text-align:left;padding:20px 10px 20px 0;width:200px;line-height:1.3;font-weight:600}.form-table th.th-full{width:auto;font-weight:400}.form-table td p{margin-top:4px;margin-bottom:0}.form-table td fieldset label{margin:.25em 0 .5em!important;display:inline-block}.form-table td fieldset label,.form-table td fieldset li,.form-table td fieldset p{line-height:1.4em}.form-table input.tog,.form-table input[type=radio]{margin-top:-4px;margin-right:4px;float:none}.form-table .pre{padding:8px;margin:0}table.form-table td .updated{font-size:13px}#profile-page .form-table textarea{width:500px;margin-bottom:6px}#profile-page .form-table #rich_editing{margin-right:5px}#your-profile legend{font-size:22px}#display_name{width:15em}#createuser .form-field input{width:25em}.color-option{display:inline-block;width:24%;padding:5px 15px 15px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin-bottom:3px}.color-option.selected,.color-option:hover{background:#ddd}.color-palette{width:100%;border-spacing:0;border-collapse:collapse}.color-palette td{height:20px;padding:0;border:0}.color-option{cursor:pointer}.tool-box .title{margin:8px 0;font-size:18px;font-weight:400;line-height:24px}.pressthis{margin:20px 0}.pressthis a,.pressthis a:active,.pressthis a:focus,.pressthis a:hover{display:inline-block;position:relative;cursor:move;color:#333;background:#e6e6e6;-webkit-border-radius:5px;border-radius:5px;border:1px solid #b4b4b4;font-style:normal;line-height:16px;font-size:14px;text-decoration:none}.pressthis a:active{outline:0}.pressthis a:hover:after{-webkit-transform:skew(20deg) rotate(9deg);-ms-transform:skew(20deg) rotate(9deg);transform:skew(20deg) rotate(9deg);-webkit-box-shadow:0 10px 8px rgba(0,0,0,.7);box-shadow:0 10px 8px rgba(0,0,0,.7)}.pressthis a span{display:inline-block;margin:0;padding:0 12px 8px 9px}.pressthis a span:before{color:#777;font:400 20px/1 dashicons;content:'\f157';position:relative;display:inline-block;top:4px;margin-right:4px}.pressthis a:after{content:'';width:70%;height:55%;z-index:-1;position:absolute;right:10px;bottom:9px;background:0 0;-webkit-transform:skew(20deg) rotate(6deg);-ms-transform:skew(20deg) rotate(6deg);transform:skew(20deg) rotate(6deg);-webkit-box-shadow:0 10px 8px rgba(0,0,0,.6);box-shadow:0 10px 8px rgba(0,0,0,.6)}#local-time,#utc-time{padding-left:25px;font-style:italic}.defaultavatarpicker .avatar{margin:2px 0;vertical-align:middle}.options-general-php .spinner{float:none;margin:-3px 3px}@media screen and (max-width:782px){textarea{-webkit-appearance:none}input[type=number],input[type=password],input[type=search],input[type=text]{-webkit-appearance:none;padding:6px 10px}input.code{padding-bottom:5px;padding-top:10px}.widefat th input[type=checkbox],input[type=checkbox]{-webkit-appearance:none;padding:10px}.widefat th input[type=checkbox]{margin-bottom:8px}.widefat th input[type=checkbox]:before,input[type=checkbox]:checked:before{font:400 30px/1 Dashicons;margin:-3px -5px}input[type=checkbox],input[type=radio]{height:25px;width:25px}.wp-admin p input[type=checkbox],.wp-admin p input[type=radio]{margin-top:-3px}input[type=radio]:checked:before{vertical-align:middle;width:9px;height:9px;margin:7px;line-height:16px}.wp-upload-form input[type=submit]{margin-top:10px}#wpbody select{height:36px;font-size:16px}.wp-admin .button-cancel{padding:0;font-size:14px}#createuser .form-field input{width:100%}.form-table{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.form-table td,.form-table th{display:block;width:auto;vertical-align:middle}.form-table .color-palette td{display:table-cell;width:15px}.form-table table.color-palette{margin-right:10px}input,textarea{font-size:16px}#profile-page .form-table textarea,.form-table span.description,.form-table td input[type=password],.form-table td input[type=text],.form-table td select,.form-table td textarea{width:100%;font-size:16px;line-height:1.5;padding:7px 10px;display:block;max-width:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.form-table input[type=text].small-text,input[type=number].small-text,input[type=password].small-text,input[type=search].small-text,input[type=text].small-text{width:auto;max-width:55px;display:inline;padding:3px 6px;margin:0 3px}#pass-strength-result{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:8px}p.search-box{float:none;position:absolute;bottom:0;width:98%;height:90px;margin-bottom:20px}p.search-box input[name="s"]{height:auto;float:none;width:100%;margin-bottom:10px;vertical-align:middle;-webkit-appearance:none}p.search-box input[type=submit]{margin-bottom:10px}.form-table span.description{padding:4px 0 0;line-height:1.4em}.form-table th{padding-top:10px;padding-bottom:0;border-bottom:0}.form-table td{padding-top:8px;padding-left:0}.form-table input.regular-text{width:100%}.form-table label{font-size:14px}.form-table fieldset label{display:block}#utc-time{margin-top:10px}#local-time,#utc-time{display:block;float:none;padding:0;line-height:2}}@media only screen and (max-width:768px){.form-field input,.form-field textarea{width:99%}.form-wrap .form-field{padding:0}#profile-page .form-table textarea{max-width:400px;width:auto}}@media screen and (max-width:600px){.color-option{width:49%}}#adminmenu,#adminmenu .wp-submenu,#adminmenuback,#adminmenuwrap{width:160px;background-color:#222}#adminmenuback{position:absolute;top:0;bottom:0;z-index:-1}#adminmenu{clear:left;margin:12px 0 0;padding:0;list-style:none}.folded #adminmenu,.folded #adminmenu li.menu-top,.folded #adminmenuback,.folded #adminmenuwrap{width:36px}.icon16{height:18px;width:18px;padding:6px;margin:-6px 0 0 -8px;float:left}.icon16:before{color:#999;font:400 20px/1 dashicons;speak:none;padding:6px 0;height:34px;width:20px;display:inline-block;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}.icon16.icon-dashboard:before{content:'\f226'}.icon16.icon-post:before{content:'\f109'}.icon16.icon-media:before{content:'\f104'}.icon16.icon-links:before{content:'\f103'}.icon16.icon-page:before{content:'\f105'}.icon16.icon-comments:before{content:'\f101';margin-top:1px}.icon16.icon-appearance:before{content:'\f100'}.icon16.icon-plugins:before{content:'\f106'}.icon16.icon-users:before{content:'\f110'}.icon16.icon-tools:before{content:'\f107'}.icon16.icon-settings:before{content:'\f108'}.icon16.icon-site:before{content:'\f112'}.icon16.icon-generic:before{content:'\f111'}.icon16.icon-appearance,.icon16.icon-comments,.icon16.icon-dashboard,.icon16.icon-generic,.icon16.icon-links,.icon16.icon-media,.icon16.icon-page,.icon16.icon-plugins,.icon16.icon-post,.icon16.icon-settings,.icon16.icon-site,.icon16.icon-tools,.icon16.icon-users,.menu-icon-appearance div.wp-menu-image,.menu-icon-comments div.wp-menu-image,.menu-icon-dashboard div.wp-menu-image,.menu-icon-generic div.wp-menu-image,.menu-icon-links div.wp-menu-image,.menu-icon-media div.wp-menu-image,.menu-icon-page div.wp-menu-image,.menu-icon-plugins div.wp-menu-image,.menu-icon-post div.wp-menu-image,.menu-icon-settings div.wp-menu-image,.menu-icon-site div.wp-menu-image,.menu-icon-tools div.wp-menu-image,.menu-icon-users div.wp-menu-image{background-image:none!important}#adminmenuwrap{position:relative;float:left}#adminmenu *{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}#adminmenu li{margin:0;padding:0;cursor:pointer}#adminmenu a{display:block;line-height:18px;padding:2px 5px;color:#eee}#adminmenu .wp-submenu a{color:#bbb}#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover{background:0 0}#adminmenu .wp-submenu a:focus,#adminmenu .wp-submenu a:hover,#adminmenu a:hover,#adminmenu li.menu-top>a:focus{color:#2ea2cc}#adminmenu li.menu-top{border:0;min-height:34px;position:relative}#adminmenu .wp-submenu{list-style:none;position:absolute;top:-1000em;left:160px;overflow:visible;word-wrap:break-word}#adminmenu .wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu,.folded #adminmenu a.wp-has-current-submenu:focus+.wp-submenu{padding:7px 0 8px;z-index:9999;background-color:#333;-webkit-box-shadow:0 3px 5px rgba(0,0,0,.2);box-shadow:0 3px 5px rgba(0,0,0,.2)}#adminmenu a.menu-top:focus+.wp-submenu,.js #adminmenu .opensub .wp-submenu,.js #adminmenu .sub-open,.no-js li.wp-has-submenu:hover .wp-submenu{top:-1px}#adminmenu .wp-has-current-submenu .wp-submenu,#adminmenu .wp-has-current-submenu .wp-submenu.sub-open,#adminmenu .wp-has-current-submenu.opensub .wp-submenu,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu,.no-js li.wp-has-current-submenu:hover .wp-submenu{position:relative;z-index:3;top:auto;left:auto;right:auto;bottom:auto;border:0 none;margin-top:0;-webkit-box-shadow:none;box-shadow:none;background-color:#333}#adminmenu li.menu-top:hover,#adminmenu li.opensub>a.menu-top,#adminmenu li>a.menu-top:focus{position:relative;background-color:#111}.folded #adminmenu li.menu-top:hover,.folded #adminmenu li.opensub>a.menu-top,.folded #adminmenu li>a.menu-top:focus{z-index:10000}#adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head,#adminmenu .wp-menu-arrow,#adminmenu .wp-menu-arrow div,#adminmenu li.current a.menu-top,#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,.folded #adminmenu li.current.menu-top,.folded #adminmenu li.wp-has-current-submenu{background:#0074a2;color:#fff}.folded #adminmenu .opensub .wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu.sub-open,.folded #adminmenu .wp-has-current-submenu a.menu-top:focus+.wp-submenu,.folded #adminmenu .wp-has-current-submenu.opensub .wp-submenu,.folded #adminmenu .wp-submenu.sub-open,.folded #adminmenu a.menu-top:focus+.wp-submenu,.no-js.folded #adminmenu .wp-has-submenu:hover .wp-submenu{top:0;left:36px}.folded #adminmenu .wp-has-current-submenu .wp-submenu,.folded #adminmenu a.wp-has-current-submenu:focus+.wp-submenu{position:absolute;top:-1000em}#adminmenu .wp-not-current-submenu .wp-submenu,.folded #adminmenu .wp-has-current-submenu .wp-submenu{min-width:160px;width:auto}#adminmenu .wp-submenu a{font-size:13px;line-height:1.2;margin:0;padding:6px 0}#adminmenu .opensub .wp-submenu li.current a,#adminmenu .wp-submenu li.current,#adminmenu .wp-submenu li.current a,#adminmenu .wp-submenu li.current a:focus,#adminmenu .wp-submenu li.current a:hover,#adminmenu a.wp-has-current-submenu:focus+.wp-submenu li.current a{color:#fff}#adminmenu .wp-not-current-submenu li>a,.folded #adminmenu .wp-has-current-submenu li>a{padding-right:16px;padding-left:14px;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}#adminmenu .wp-has-current-submenu ul>li>a,.folded #adminmenu li.menu-top .wp-submenu>li>a{padding:6px 12px}#adminmenu .wp-submenu-head,#adminmenu a.menu-top{font-size:14px;font-weight:400;line-height:18px;padding:0}#adminmenu .wp-submenu-head,.folded #adminmenu .wp-menu-name{display:none}.folded #adminmenu .wp-submenu-head{display:block}#adminmenu .wp-submenu li{padding:0;margin:0;overflow:hidden}#adminmenu .wp-menu-image img{padding:9px 0 0;opacity:.6;filter:alpha(opacity=60)}#adminmenu div.wp-menu-name{padding:8px 0}#adminmenu div.wp-menu-image{float:left;width:36px;height:34px;margin:0;text-align:center}#adminmenu div.wp-menu-image.svg{background-repeat:no-repeat;background-position:center;-webkit-background-size:20px auto;background-size:20px auto}div.wp-menu-image:before{color:#999;padding:7px 0;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}#adminmenu div.wp-menu-image:before{color:#999}#adminmenu .current div.wp-menu-image:before,#adminmenu .wp-has-current-submenu div.wp-menu-image:before,#adminmenu a.current:hover div.wp-menu-image:before,#adminmenu a.wp-has-current-submenu:hover div.wp-menu-image:before,#adminmenu li.wp-has-current-submenu:hover div.wp-menu-image:before{color:#fff}#adminmenu li:hover div.wp-menu-image:before{color:#2ea2cc}.folded #adminmenu div.wp-menu-image{width:35px;height:30px;position:absolute;z-index:25}.folded #adminmenu a.menu-top{height:34px}.no-font-face #adminmenu .wp-menu-image{display:none}.no-font-face #adminmenu div.wp-menu-name{padding:8px 12px}.no-font-face.auto-fold #adminmenu .wp-menu-name{margin-left:0}.sticky-menu #adminmenuwrap{position:fixed;z-index:9999}.wp-menu-arrow{display:none!important}ul#adminmenu a.wp-has-current-submenu{position:relative}ul#adminmenu a.wp-has-current-submenu:after,ul#adminmenu>li.current>a.current:after{right:0;border:solid 8px transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none;border-right-color:#f1f1f1;top:50%;margin-top:-8px}.folded ul#adminmenu li:hover a.wp-has-current-submenu:after{display:none}.folded ul#adminmenu a.wp-has-current-submenu:after,.folded ul#adminmenu>li a.current:after{border-width:4px;margin-top:-4px}#adminmenu li.wp-has-submenu.wp-not-current-submenu:hover:after{right:0;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none;border-width:8px;top:10px;z-index:10000}.folded ul#adminmenu li.wp-has-submenu.wp-not-current-submenu:hover:after{border-width:4px;margin-top:-4px;top:18px}#adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after{border-right-color:#333}#adminmenu li.menu-top:hover .wp-menu-image img,#adminmenu li.wp-has-current-submenu .wp-menu-image img{opacity:1;filter:alpha(opacity=100)}#adminmenu li.wp-menu-separator{height:5px;padding:0;margin:0 0 6px;cursor:inherit}#adminmenu div.separator{height:2px;padding:0}#adminmenu .wp-submenu .wp-submenu-head{color:#fff;font-weight:400;font-size:14px;padding:8px 4px 8px 11px;margin:-7px 0 4px}#adminmenu li.current,.folded #adminmenu li.wp-menu-open{border:0 none}#adminmenu .awaiting-mod,#adminmenu .update-plugins,#sidemenu li a span.update-plugins{display:inline-block;background-color:#d54e21;color:#fff;font-size:9px;line-height:17px;font-weight:600;margin:1px 0 0 2px;vertical-align:top;-webkit-border-radius:10px;border-radius:10px;z-index:26}#adminmenu li .awaiting-mod span,#adminmenu li span.update-plugins span,#sidemenu li a span.update-plugins span{display:block;padding:0 6px}#adminmenu li a.wp-has-current-submenu .update-plugins,#adminmenu li.current a .awaiting-mod{background-color:#2ea2cc;color:#fff}#adminmenu li span.count-0,#sidemenu li a .count-0{display:none}#collapse-menu{font-size:13px;line-height:34px;margin-top:10px;color:#aaa;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}#collapse-menu:hover,#collapse-menu:hover #collapse-button div:after{color:#2ea2cc}.folded #collapse-menu span{display:none}#collapse-button,#collapse-button div{width:15px;height:15px}#collapse-button{float:left;height:15px;margin:10px 8px 10px 11px;width:15px;-webkit-border-radius:10px;border-radius:10px}#wpwrap #collapse-button div{padding:0}#collapse-button div:after{content:'\f148';display:block;line-height:15px;left:-3px;top:-3px;color:#aaa;font:400 20px/1 dashicons!important;speak:none;margin:0 auto;padding:0!important;position:relative;text-align:center;width:20px;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.folded #collapse-button div:after,.rtl #collapse-button div:after{-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.rtl.folded #collapse-button div:after{-webkit-transform:none;-ms-transform:none;transform:none}li#wp-admin-bar-menu-toggle{display:none}@media only screen and (max-width:900px){.auto-fold #wpcontent,.auto-fold #wpfooter{margin-left:56px}.auto-fold #adminmenu,.auto-fold #adminmenu li.menu-top,.auto-fold #adminmenuback,.auto-fold #adminmenuwrap{width:36px}.auto-fold #adminmenu .opensub .wp-submenu,.auto-fold #adminmenu .wp-has-current-submenu .wp-submenu.sub-open,.auto-fold #adminmenu .wp-has-current-submenu a.menu-top:focus+.wp-submenu,.auto-fold #adminmenu .wp-has-current-submenu.opensub .wp-submenu,.auto-fold #adminmenu .wp-submenu.sub-open,.auto-fold #adminmenu a.menu-top:focus+.wp-submenu{top:0;left:36px}.auto-fold #adminmenu .wp-has-current-submenu .wp-submenu,.auto-fold #adminmenu a.wp-has-current-submenu:focus+.wp-submenu{position:absolute;top:-1000em;margin-right:-1px;padding:7px 0 8px;z-index:9999}.auto-fold #adminmenu .wp-has-current-submenu .wp-submenu{min-width:150px;width:auto}.auto-fold #adminmenu .wp-has-current-submenu li>a{padding-right:16px;padding-left:14px}.auto-fold #adminmenu li.menu-top .wp-submenu>li>a{padding-left:12px}.auto-fold #adminmenu .wp-menu-name{display:none}.auto-fold #adminmenu .wp-submenu-head{display:block}.auto-fold #adminmenu div.wp-menu-image{height:30px;width:34px;position:absolute;z-index:25}.auto-fold #adminmenu a.menu-top{height:34px}.auto-fold #adminmenu li.wp-menu-open{border:0 none}.auto-fold #adminmenu .wp-has-current-submenu.menu-top-last{margin-bottom:0}.auto-fold ul#adminmenu li:hover a.wp-has-current-submenu:after{display:none}.auto-fold ul#adminmenu li.wp-has-submenu.wp-not-current-submenu:hover:after{border-width:4px;margin-top:-4px;top:16px}.auto-fold ul#adminmenu a.wp-has-current-submenu:after,.auto-fold ul#adminmenu>li a.current:after{border-width:4px;margin-top:-4px}.auto-fold #adminmenu li.menu-top:hover,.auto-fold #adminmenu li.opensub>a.menu-top,.auto-fold #adminmenu li>a.menu-top:focus{z-index:10000}.auto-fold #collapse-menu span{display:none}.auto-fold #collapse-button div{background:0 0}.auto-fold #collapse-button div:after{-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.rtl.auto-fold #collapse-button div:after{-webkit-transform:none;-ms-transform:none;transform:none}}@media screen and (max-width:782px){.auto-fold #wpcontent{position:relative;margin-left:0;padding-left:10px}.sticky-menu #adminmenuwrap{position:relative;z-index:auto;top:0}.auto-fold #adminmenu,.auto-fold #adminmenuback,.auto-fold #adminmenuwrap{position:absolute;width:190px;z-index:100}.auto-fold #adminmenuback,.auto-fold #adminmenuwrap{display:none}.auto-fold .wp-responsive-open #adminmenuback,.auto-fold .wp-responsive-open #adminmenuwrap{display:block}.auto-fold #adminmenu li.menu-top{width:100%}.auto-fold #adminmenu li a{font-size:16px;padding:5px}.auto-fold #adminmenu li.menu-top .wp-submenu>li>a{padding:10px 10px 10px 20px}.auto-fold #adminmenu .wp-menu-name{display:block;margin-left:35px}.auto-fold ul#adminmenu a.wp-has-current-submenu:after,.auto-fold ul#adminmenu>li.current>a.current:after{border-width:8px;margin-top:-8px}.auto-fold ul#adminmenu li.wp-has-submenu.wp-not-current-submenu:hover:after{display:none}#adminmenu .wp-submenu{position:relative;display:none}.auto-fold #adminmenu .selected .wp-submenu,.auto-fold #adminmenu .wp-menu-open .wp-submenu{position:relative;display:block;top:0;left:-1px;-webkit-box-shadow:none;box-shadow:none}.auto-fold #adminmenu .opensub .wp-submenu,.auto-fold #adminmenu .selected .wp-submenu:after,.auto-fold #adminmenu .wp-menu-open .wp-submenu:after{display:none}.auto-fold #adminmenu .selected .wp-submenu,.auto-fold ul#adminmenu li:hover a.wp-has-current-submenu:after{display:block}.auto-fold #adminmenu .wp-has-current-submenu a.menu-top:focus+.wp-submenu,.auto-fold #adminmenu a.menu-top:focus+.wp-submenu{position:relative;left:-1px;right:0;top:0}#adminmenu .wp-submenu .wp-submenu-head{display:none}#wp-responsive-toggle{position:fixed;top:5px;left:4px;padding-right:10px;z-index:99999;border:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#wpadminbar #wp-admin-bar-menu-toggle a{display:block;padding:0;overflow:hidden;outline:0;text-decoration:none;border:1px solid transparent;background:0 0;height:44px;margin-left:-1px}.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a{background:#333}li#wp-admin-bar-menu-toggle{display:block}#wpadminbar #wp-admin-bar-menu-toggle a:hover{border:1px solid transparent}#wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before{content:'\f228';display:inline-block;float:left;font:400 40px/45px Dashicons;vertical-align:middle;outline:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;height:44px;width:50px;padding:0;border:0;text-align:center;text-decoration:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}}@media screen and (max-width:600px){#adminmenuback,#adminmenuwrap{display:none}.wp-responsive-open #adminmenuback,.wp-responsive-open #adminmenuwrap{display:block}.auto-fold #adminmenu{top:46px}}#wpbody-content #dashboard-widgets.columns-1 .postbox-container{width:100%}#wpbody-content #dashboard-widgets.columns-2 .postbox-container{width:49.5%}#wpbody-content #dashboard-widgets.columns-2 #postbox-container-2,#wpbody-content #dashboard-widgets.columns-2 #postbox-container-3,#wpbody-content #dashboard-widgets.columns-2 #postbox-container-4{float:right;width:50.5%}#wpbody-content #dashboard-widgets.columns-3 .postbox-container{width:33.5%}#wpbody-content #dashboard-widgets.columns-3 #postbox-container-1{width:33%}#wpbody-content #dashboard-widgets.columns-3 #postbox-container-3,#wpbody-content #dashboard-widgets.columns-3 #postbox-container-4{float:right}#dashboard-widgets .postbox-container,#wpbody-content #dashboard-widgets.columns-4 .postbox-container{width:25%}#dashboard-widgets-wrap .columns-3 #postbox-container-4 .empty-container{border:0!important}.ie8 #wpbody-content #dashboard-widgets .postbox-container{width:49.5%}.ie8 #wpbody-content #dashboard-widgets #postbox-container-2,.ie8 #wpbody-content #dashboard-widgets #postbox-container-3,.ie8 #wpbody-content #dashboard-widgets #postbox-container-4{float:right;width:50.5%}.ie8 #dashboard-widgets #postbox-container-3 .empty-container,.ie8 #dashboard-widgets #postbox-container-4 .empty-container{border:0 none;height:0;min-height:0}#dashboard-widgets-wrap{overflow:hidden;margin:0 -8px}#dashboard-widgets .postbox .inside{margin-bottom:0}#dashboard-widgets .meta-box-sortables{margin:0 8px;min-height:100px}h3.dashboard-widget-title,h3.dashboard-widget-title small,h3.dashboard-widget-title span{color:#333}h3.dashboard-widget-title small a{color:#d7d7d7}h3.dashboard-widget-title small a:hover{color:#fff}#the-comment-list td.comment p.comment-author{margin-top:0;margin-left:0}#the-comment-list p.comment-author img{float:left;margin-right:8px}#the-comment-list p.comment-author strong a{border:0}#the-comment-list td{vertical-align:top}#the-comment-list td.comment{word-wrap:break-word}#the-comment-list td.comment img{max-width:100%}.welcome-panel{position:relative;overflow:auto;margin:16px 0;padding:23px 10px 0;border:1px solid #e5e5e5;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04);background:#fff;font-size:13px;line-height:2.1em}.welcome-panel h3{margin:0;font-size:21px;font-weight:400;line-height:1.2}.welcome-panel h4{margin:1.33em 0 0;font-size:16px}.welcome-panel li{font-size:14px}.welcome-panel p{color:#777}.welcome-panel a{text-decoration:none}.welcome-panel .about-description{font-size:16px;margin:0}.welcome-panel .welcome-panel-close{position:absolute;top:5px;right:10px;padding:20px 15px 0 3px;font-size:13px;text-decoration:none;line-height:1}#welcome-panel.welcome-panel .welcome-panel-close::before{position:absolute;left:-18px;margin-top:-2px;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}.wp-core-ui .welcome-panel .button.button-hero{margin:15px 0 3px}.welcome-panel-content{margin-left:13px;max-width:1500px}.welcome-panel .welcome-panel-column-container{clear:both;overflow:hidden;position:relative}.welcome-panel .welcome-panel-column{width:32%;min-width:200px;float:left}.ie8 .welcome-panel .welcome-panel-column{min-width:230px}.welcome-panel .welcome-panel-column:first-child{width:36%}.welcome-panel-column p.hide-if-no-customize{margin-top:10px}.welcome-panel-column p{margin-top:7px;color:#464646}.welcome-panel .welcome-icon{display:block;padding:0 0 8px;background:transparent!important}.welcome-panel .welcome-icon:before{color:#888;font:400 20px/1 dashicons;speak:none;display:inline-block;padding:0 10px 0 0;top:-1px;position:relative;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;vertical-align:top}.welcome-panel .welcome-edit-page:before,.welcome-panel .welcome-write-blog:before{content:'\f119';top:-3px}.welcome-panel .welcome-add-page:before{content:'\f132'}.welcome-panel .welcome-view-site:before{content:'\f115';top:-2px}.welcome-panel .welcome-widgets-menus:before{content:'\f116';top:-2px}.welcome-panel .welcome-comments:before{content:'\f117';top:-1px}.welcome-panel .welcome-learn-more:before{content:'\f118';top:-1px}.welcome-panel .welcome-widgets-menus{line-height:16px}.welcome-panel .welcome-panel-column ul{margin:.8em 1em 1em 0}.welcome-panel .welcome-panel-column li{line-height:16px;list-style-type:none}#dashboard_primary .inside{margin:0;padding:0}#dashboard_primary .dashboard-widget-control-form,#dashboard_primary .widget-loading{padding:12px 12px 0}body #dashboard-widgets .postbox form .submit{margin:0}.dashboard-widget-control-form{overflow:hidden}.dashboard-widget-control-form p{margin-top:0}div.dashboard-widget-error{background-color:#c43}div.dashboard-widget-notice{background-color:#cfe1ef}.rssSummary{color:#777;margin-top:4px}#dashboard_primary .rss-widget{border-bottom:1px solid #eee;font-size:13px;padding:8px 12px 10px}#dashboard_primary .rss-widget:last-child{border-bottom:0;padding-bottom:8px}#dashboard_primary .rss-widget a{font-weight:400}#dashboard_primary .rss-widget span,#dashboard_primary .rss-widget span.rss-date{color:#777}#dashboard_primary .rss-widget span.rss-date{margin-left:12px}#dashboard_primary .rss-widget ul li{margin-bottom:8px}#dashboard_right_now ul{margin:0;overflow:hidden}#dashboard_right_now li{width:50%;float:left;margin-bottom:10px}#dashboard_right_now .inside{overflow:hidden;padding:0}#dashboard_right_now .main{overflow:hidden;padding:0 12px 11px}#dashboard_right_now .main p{margin:0}#dashboard_right_now #wp-version-message .button{clear:right;float:right;position:relative;top:-5px}.mu-storage{overflow:hidden}#dashboard-widgets h4.mu-storage{margin-bottom:10px}#dashboard_right_now li a:before,#dashboard_right_now li span:before{color:#888}#dashboard_right_now .sub{color:#777;background:#f5f5f5;border-top:1px solid #eee;padding:10px 12px 6px}#dashboard_right_now .sub h4{color:#555}#dashboard_right_now .sub p{margin:0 0 1em}#dashboard_right_now .warning a:before,#dashboard_right_now .warning span:before{color:#d54e21}#dashboard_right_now li a:before,#dashboard_right_now li span:before{content:'\f159';font:400 20px/1 dashicons;speak:none;display:block;float:left;margin:0 5px 0 0;padding:0;text-indent:0;text-align:center;position:relative;-webkit-font-smoothing:antialiased;text-decoration:none!important}#dashboard_right_now .page-count a:before,#dashboard_right_now .page-count span:before{content:'\f105'}#dashboard_right_now .post-count a:before,#dashboard_right_now .post-count span:before{content:'\f109'}#dashboard_right_now .comment-count a:before{content:'\f101'}#dashboard_right_now .comment-mod-count a:before{content:'\f125'}#dashboard_right_now .storage-count a:before{content:'\f104'}#dashboard_right_now .storage-count.warning a:before{content:'\f153'}#dashboard_quick_press .inside{margin:0;padding:0}#dashboard_quick_press div.updated{margin-bottom:10px;border:1px solid #eee;border-width:1px 1px 1px 0}#dashboard_quick_press form{overflow:hidden;margin:12px}#dashboard_quick_press .drafts,#dashboard_quick_press .easy-blogging{padding:10px 0 0}input#save-post{float:left}form.initial-form.quickpress-open label.prompt{font-style:normal}form.initial-form.quickpress-open input#title{height:auto}#dashboard_quick_press input,#dashboard_quick_press textarea{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:0}#dashboard_quick_press textarea{resize:vertical}#description-wrap{margin-top:12px}#title-wrap #title-prompt-text,.textarea-wrap #content-prompt-text{color:#777}.input-text-wrap,.textarea-wrap{position:relative}.input-text-wrap .prompt,.textarea-wrap .prompt{position:absolute}.textarea-wrap #content-prompt-text{font-size:1.1em;padding:7px 8px}.textarea-wrap textarea#content{margin:0 0 8px;padding:6px 7px}#quick-press textarea#content{min-height:90px;max-height:1300px;resize:none}.js #dashboard_quick_press .drafts{border-top:1px solid #eee}#dashboard_quick_press .drafts abbr{border:0}#dashboard_quick_press .drafts h4{margin:0 12px 8px;font-weight:400}#dashboard_quick_press .drafts .view-all{float:right;margin:0 12px 0 0}#dashboard_primary a.rsswidget{font-weight:400}#dashboard_quick_press .drafts ul{margin:0 12px}#dashboard_quick_press .drafts li{margin-bottom:1em}#dashboard_quick_press .drafts li time{color:#777}#dashboard_quick_press .drafts p{margin:0;word-wrap:break-word}#dashboard_quick_press .draft-title{overflow:hidden}#dashboard_quick_press .draft-title a,#dashboard_quick_press .draft-title time{float:left;margin:0 5px 0 0}#dashboard-widgets #dashboard_activity h4{margin:0 0 8px 12px;font-weight:400}#dashboard-widgets #dashboard_activity h4.comment-meta{margin:0}#dashboard_activity h4.comment-meta{margin-bottom:4px}#dashboard_activity ul{padding:0 12px}#dashboard_activity .comment-meta span.approve:before{content:'\f227';font:20px/.5 dashicons;margin-left:12px;vertical-align:middle;position:relative;top:-1px;margin-right:2px}#dashboard_activity .inside{padding:0;margin:0}#dashboard_activity .no-activity{overflow:hidden;padding:0 12px 12px;text-align:center}#dashboard_activity .no-activity p{color:#999;font-size:16px}#dashboard_activity .no-activity .smiley{margin-top:0}#dashboard_activity .no-activity .smiley:before{content:'\f328';font:400 120px/1 dashicons;speak:none;display:block;margin:0 5px 0 0;padding:0;text-indent:0;text-align:center;position:relative;-webkit-font-smoothing:antialiased;text-decoration:none!important}#dashboard_activity .subsubsub{float:none;border-top:1px solid #eee;margin-top:0;padding:8px 12px 4px}#future-posts ul,#published-posts ul{clear:both;margin-bottom:0}#future-posts li,#published-posts li{overflow:hidden;margin-bottom:8px}#future-posts ul span,#published-posts ul span{color:#777;float:left;margin-right:8px;min-width:150px}.activity-block{border-bottom:1px solid #eee;overflow:hidden;padding:8px 0 4px}.activity-block:last-child{border-bottom:0}.activity-block .subsubsub li{color:#ddd}#activity-widget #the-comment-list div.undo,#activity-widget #the-comment-list tr.undo{background:0 0;padding:6px 0}#activity-widget #the-comment-list .alt,#activity-widget #the-comment-list .alternate{background:0 0}#activity-widget #the-comment-list .comment-item{background:#fafafa;padding:12px;position:relative}#activity-widget #the-comment-list img{position:absolute;left:13px;top:13px}#activity-widget #the-comment-list .dashboard-comment-wrap{padding-left:63px}#activity-widget #the-comment-list .dashboard-comment-wrap blockquote{margin:1em 0}#activity-widget #the-comment-list .comment-item h4{font-size:13px;color:#999}#activity-widget #the-comment-list .comment-item p.row-actions{margin:4px 0 0}#activity-widget #the-comment-list .comment-item:first-child{border-top:1px solid #eee}#activity-widget #the-comment-list .unapproved{background-color:#fef7f1}#activity-widget #the-comment-list .unapproved:before{content:"";display:block;position:absolute;left:0;top:0;bottom:0;background:#d54e21;width:4px}#activity-widget #the-comment-list .spam-undo-inside .avatar,#activity-widget #the-comment-list .trash-undo-inside .avatar{margin-right:20px;position:relative;top:0}#dashboard-widgets #dashboard_browser_nag.postbox .inside{margin:10px}.edit-box{display:none}h3:hover .edit-box{display:inline}#dashboard-widgets form .input-text-wrap input,#dashboard-widgets form .textarea-wrap textarea{width:100%}#dashboard-widgets .postbox form .submit{float:none;margin:.5em 0 0;padding:0;border:0}#dashboard-widgets-wrap #dashboard-widgets .postbox form .submit #publish{min-width:0}#dashboard-widgets a{text-decoration:none}#dashboard-widgets h3 a{text-decoration:underline}#dashboard-widgets h3 .postbox-title-action{position:absolute;right:10px;padding:0;top:5px}.js #dashboard-widgets h3 .postbox-title-action{right:33px}#dashboard-widgets h4{color:#222;font-weight:400;font-size:14px;margin:0 0 .2em;padding:0}#dashboard_plugins h5{font-size:14px}#latest-comments #the-comment-list{position:relative}#activity-widget #the-comment-list .comment{-webkit-box-shadow:inset 0 1px 0 rgba(0,0,0,.06);box-shadow:inset 0 1px 0 rgba(0,0,0,.06)}#activity-widget .comments #the-comment-list .alt{background-color:transparent}#activity-widget #latest-comments #the-comment-list .comment-item{padding:1em 12px}#latest-comments #the-comment-list .pingback{padding-left:12px!important}#latest-comments #the-comment-list .comment-item:first-child{border-top:0}#latest-comments #the-comment-list .comment-item h4{line-height:1.5em;margin-top:0;color:#666}#latest-comments #the-comment-list .comment-item h4 cite{font-style:normal;font-weight:400}#latest-comments #the-comment-list .comment-item blockquote,#latest-comments #the-comment-list .comment-item blockquote p{margin:0;padding:0;display:inline}#latest-comments #the-comment-list .comment-item p.row-actions{margin:3px 0 0;padding:0;font-size:13px}#title-wrap label{cursor:text}#title-wrap #title{padding:2px 6px;font-size:1.3em;line-height:100%;outline:0}#title-wrap #title-prompt-text{font-size:1.1em;padding:5px 8px}.rss-widget ul{margin:0;padding:0;list-style:none}a.rsswidget{font-size:14px;font-weight:600;line-height:1.7em}.rss-widget ul li{line-height:1.5em;margin-bottom:12px}.rss-widget span.rss-date{color:#999;font-size:13px;margin-left:3px}.rss-widget cite{display:block;text-align:right;margin:0 0 1em;padding:0}.rss-widget cite:before{content:'\2014'}.dashboard-comment-wrap{overflow:hidden;word-wrap:break-word}#dashboard_browser_nag a.update-browser-link{font-size:1.2em;font-weight:600}#dashboard_browser_nag a{text-decoration:underline}#dashboard_browser_nag p.browser-update-nag.has-browser-icon{padding-right:125px}#dashboard_browser_nag .browser-icon{margin-top:-35px}#dashboard_browser_nag.postbox.browser-insecure{background-color:#ac1b1b;border-color:#ac1b1b}#dashboard_browser_nag.postbox{background-color:#e29808;background-image:none;border-color:#edc048;color:#fff;-webkit-box-shadow:none;box-shadow:none}#dashboard_browser_nag.postbox.browser-insecure h3{border-bottom-color:#cd5a5a;color:#fff}#dashboard_browser_nag.postbox h3{border-bottom-color:#f6e2ac;background:transparent none;color:#fff;-webkit-box-shadow:none;box-shadow:none}#dashboard_browser_nag a{color:#fff}#dashboard_browser_nag h3.hndle{border:0;font-weight:600;font-size:20px;padding-top:10px}.postbox#dashboard_browser_nag p a.dismiss{font-size:14px}.postbox#dashboard_browser_nag a,.postbox#dashboard_browser_nag p,.postbox#dashboard_browser_nag p.browser-update-nag{font-size:16px}@media only screen and (max-width:799px){#wpbody-content #dashboard-widgets .postbox-container{width:100%}}@media only screen and (min-width:800px) and (max-width:1499px){#wpbody-content #dashboard-widgets .postbox-container{width:49.5%}#wpbody-content #dashboard-widgets #postbox-container-2,#wpbody-content #dashboard-widgets #postbox-container-3,#wpbody-content #dashboard-widgets #postbox-container-4{float:right;width:50.5%}#dashboard-widgets #postbox-container-3 .empty-container,#dashboard-widgets #postbox-container-4 .empty-container{border:0 none;height:0;min-height:0}#wpbody #wpbody-content #dashboard-widgets.columns-1 .postbox-container{width:100%}#wpbody #wpbody-content .metabox-holder.columns-1 .postbox-container .empty-container{border:0 none;height:0;min-height:0}.index-php .columns-prefs,.index-php .screen-layout{display:block}.columns-prefs .columns-prefs-3,.columns-prefs .columns-prefs-4{display:none}}@media only screen and (min-width:1500px) and (max-width:1800px){#wpbody-content #dashboard-widgets .postbox-container{width:33.5%}#wpbody-content #dashboard-widgets #postbox-container-1{width:33%}#wpbody-content #dashboard-widgets #postbox-container-3,#wpbody-content #dashboard-widgets #postbox-container-4{float:right}#dashboard-widgets #postbox-container-4 .empty-container{border:0 none;height:0;min-height:0}}@media screen and (max-width:870px){.welcome-panel .welcome-panel-column,.welcome-panel .welcome-panel-column:first-child{display:block;float:none;width:100%}.welcome-panel .welcome-panel-column li{display:inline-block;margin-right:13px}.welcome-panel .welcome-panel-column ul{margin:.4em 0 0}}@media screen and (max-width:782px){#dashboard_recent_comments #the-comment-list .comment-item .avatar{height:30px;width:30px;margin:4px 10px 5px 0}}@media screen and (max-width:600px){.welcome-panel .welcome-panel-close{overflow:hidden;text-indent:100%;white-space:nowrap;width:20px;height:20px;right:0;padding:5px}#welcome-panel.welcome-panel .welcome-panel-close::before{font-size:20px;margin:0}}.post-com-count-wrapper{min-width:22px}.post-com-count{background:0 0;height:1.3em;line-height:1.1em;display:block;text-decoration:none;padding:0 0 6px;cursor:pointer;background-position:center -80px;background-repeat:no-repeat;color:#fff}.post-com-count:after{content:"";display:block;width:0;height:0;margin-left:8px;border-top:5px solid #bbb;border-right:5px solid transparent}.post-com-count span{font-size:11px;font-weight:600;height:1.4em;line-height:1.4em;min-width:.7em;padding:0 6px;display:inline-block;-webkit-border-radius:5px;border-radius:5px;background-color:#bbb;color:#fff}.post-com-count:hover{background-position:center -3px}.post-com-count:hover span{background-color:#2ea2cc}.post-com-count:hover:after{border-top:5px solid #2ea2cc}strong .post-com-count{background-position:center -55px}strong .post-com-count span{background-color:#0074a2}strong .post-com-count:after{border-top:5px solid #0074a2}.column-response .post-com-count{float:left;margin-right:5px;text-align:center}.response-links{float:left}.commentlist li{padding:1em 1em .2em;margin:0;border-bottom:1px solid #ccc}.commentlist li li{border-bottom:0;padding:0}.commentlist p{padding:0;margin:0 0 .8em}#submitted-on,.submitted-on{color:#777}#replyrow td{padding:2px}#replysubmit{margin:0;padding:0 5px 3px;text-align:center}#replysubmit .spinner{padding:2px 0 0;vertical-align:top;float:right}#replysubmit .button{margin-right:5px}#replysubmit .error{color:red;line-height:21px;text-align:center}#replyrow h5{margin:.2em 0 0;padding:0 5px;line-height:1.4em;font-size:1em}#edithead .inside{float:left;padding:3px 0 2px 5px;margin:0;text-align:center}#edithead .inside input{width:180px}#edithead label{padding:2px 0}#replycontainer{padding:5px}#replycontent{height:120px;-webkit-box-shadow:none;box-shadow:none}#replyerror{border-color:#ddd;background-color:#f9f9f9}.commentlist .avatar{vertical-align:text-top}#the-comment-list .attachment-80x60{padding:4px 8px}#the-comment-list div.undo,#the-comment-list tr.undo{background-color:#f4f4f4}#the-comment-list .unapproved td,#the-comment-list .unapproved th{background-color:#fef7f1}#the-comment-list .unapproved th.check-column{border-left:4px solid #d54e21}#the-comment-list .unapproved th.check-column input{margin-left:4px}#the-comment-list .approve a{color:#006505}#the-comment-list .unapprove a{color:#d98500}#the-comment-list td,#the-comment-list th{-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 -1px 0 rgba(0,0,0,.1)}#the-comment-list tr:last-child td,#the-comment-list tr:last-child th{-webkit-box-shadow:none;box-shadow:none}#the-comment-list tr.unapproved+tr.approved td,#the-comment-list tr.unapproved+tr.approved th{border-top:1px solid rgba(0,0,0,.03)}.vim-current,.vim-current td,.vim-current th{background-color:#e4f2fd!important}th .comment-grey-bubble{height:16px;width:16px}th .comment-grey-bubble:before{content:'\f101';font:400 20px/.5 dashicons;speak:none;display:inline-block;padding:0;top:4px;left:-4px;position:relative;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;color:#444}table.fixed{table-layout:fixed}.fixed .column-rating,.fixed .column-visible{width:8%}.fixed .column-author,.fixed .column-date,.fixed .column-format,.fixed .column-links,.fixed .column-parent,.fixed .column-posts{width:10%}.fixed .column-comment .comment-author{display:none}.fixed .column-categories,.fixed .column-rel,.fixed .column-response,.fixed .column-role,.fixed .column-tags{width:15%}.fixed .column-slug{width:25%}.fixed .column-locations{width:35%}.fixed .column-comments{width:4em;padding:8px 0;text-align:left}.fixed .column-comments .vers{padding-left:3px}.fixed .column-comments a{float:left}.fixed .column-icon{width:80px}.wp-list-table a{-webkit-transition:none;transition:none}#the-list tr:last-child td,#the-list tr:last-child th{border-bottom:0!important;-webkit-box-shadow:none;box-shadow:none}#comments-form .fixed .column-author{width:20%}#commentsdiv.postbox .inside{margin:0;padding:0}#commentsdiv .inside .row-actions{line-height:18px}#commentsdiv .inside .column-author{width:25%}#commentsdiv .column-comment p{margin:.6em 0;padding:0}#commentsdiv #replyrow td{padding:0}#commentsdiv p{padding:8px 10px;margin:0}#commentsdiv .comments-box{border:0 none}#commentsdiv .comments-box thead th{background:0 0;padding:0 7px 4px;font-style:italic}#commentsdiv .comments-box tr:last-child td{border-bottom:0 none}#commentsdiv .spinner{padding-left:5px}.sorting-indicator{display:none;width:10px;height:4px;margin-top:8px;margin-left:7px}.sorting-indicator:before{background:0 0;content:'\f142';font:400 20px/1 dashicons;speak:none;display:inline-block;padding:0;top:-4px;left:-8px;line-height:10px;position:relative;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;color:#444}.column-comments .sorting-indicator:before{top:0;left:-10px}th.desc:hover span.sorting-indicator:before,th.sorted.asc .sorting-indicator:before{content:'\f142'}th.asc:hover span.sorting-indicator:before,th.sorted.desc .sorting-indicator:before{content:'\f140'}tr.wp-locked .locked-indicator{margin-left:6px;height:20px;width:16px}tr.wp-locked .locked-indicator:before{color:#888;content:'\f160';display:inline-block;float:left;font:400 20px/1 dashicons;speak:none;vertical-align:middle;margin-left:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}tr.wp-locked .check-column input[type=checkbox],tr.wp-locked .check-column label,tr.wp-locked .row-actions .inline,tr.wp-locked .row-actions .trash{display:none}tr .locked-info{height:0;opacity:0}tr.wp-locked .locked-info{margin-top:8px;height:auto;opacity:1}.locked-text{vertical-align:top}tr.locked-info,tr.wp-locked .locked-info{-webkit-transition:height 1s,opacity .5s;transition:height 1s,opacity .5s}.fixed .column-comments .sorting-indicator{margin-top:3px}#menu-locations-wrap .widefat{width:60%}.widefat th.sortable,.widefat th.sorted{padding:0}th.sortable a,th.sorted a{display:block;overflow:hidden;padding:7px 7px 8px 10px}th.manage-column a,th.sortable a:active,th.sortable a:focus,th.sortable a:hover{color:#333}th.sortable a:focus{background:#e1e1e1}.fixed .column-comments.sortable a,.fixed .column-comments.sorted a{padding:8px 0}th.sortable a span,th.sorted a span{float:left;cursor:pointer}th.desc:hover span.sorting-indicator,th.sorted.asc .sorting-indicator{display:block;background-position:0 0}th.asc:hover span.sorting-indicator,th.sorted.desc .sorting-indicator{display:block;background-position:-7px 0}.tablenav-pages a{font-weight:600;margin-right:1px;padding:0 2px}.tablenav-pages .current-page{padding-top:0;text-align:center}.tablenav-pages .next-page{margin-left:2px}.tablenav a.button-secondary{display:block;margin:3px 8px 0 0}.tablenav{clear:both;height:30px;margin:6px 0 4px;vertical-align:middle}.tablenav.themes{max-width:98%}.tablenav .tablenav-pages{float:right;display:block;cursor:default;height:30px;color:#555;line-height:30px;font-size:12px}.tablenav .no-pages,.tablenav .one-page .pagination-links{display:none}.tablenav .tablenav-pages a,.tablenav-pages span.current{text-decoration:none;padding:3px 6px}.tablenav .tablenav-pages a{padding:0 10px 3px;background:#eee;background:rgba(0,0,0,.05);font-size:16px;font-weight:400}.tablenav .tablenav-pages a:focus,.tablenav .tablenav-pages a:hover{color:#fff;background:#2ea2cc}.tablenav .tablenav-pages a.disabled,.tablenav .tablenav-pages a.disabled:active,.tablenav .tablenav-pages a.disabled:focus,.tablenav .tablenav-pages a.disabled:hover{color:#aaa;background:#eee;background:rgba(0,0,0,.05)}.tablenav .displaying-num{margin-right:2px;color:#777;font-size:12px;font-style:italic}.tablenav .actions{overflow:hidden;padding:2px 8px 0 0}.tablenav .delete{margin-right:20px}.tablenav .dots{border-color:transparent}.tablenav .next,.tablenav .prev{border-color:transparent;color:#0074a2}.tablenav .next:hover,.tablenav .prev:hover{border-color:transparent;color:#2ea2cc}.view-switch{float:right;margin:5px 16px 0 8px}.view-switch img{display:none}.view-switch a{text-decoration:none}.view-switch>a{display:inline-block;width:18px;height:18px}.view-switch>a:before{color:#bbb;content:'\f163';display:inline-block;float:left;font:400 20px/1 dashicons;speak:none;vertical-align:middle;margin-left:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.view-switch a:hover:before{color:#727272}.view-switch a.current:before{color:#0074a2}.view-switch>a+a:before{margin-left:5px;content:'\f164'}.filter{float:left;margin:-5px 0 0 10px}.filter .subsubsub{margin-left:-10px;margin-top:13px}.screen-per-page{width:4em}#posts-filter fieldset{float:left;margin:0 1.5ex 1em 0;padding:0}#posts-filter fieldset legend{padding:0 0 .2em 1px}p.pagenav{margin:0;display:inline}.pagenav span{font-weight:600;margin:0 6px}.row-title{font-size:14px!important;font-weight:600}.column-comment .comment-author{margin-bottom:.6em}.column-author img,.column-comment .comment-author img,.column-username img{float:left;margin-right:10px;margin-top:1px}.row-actions{color:#ddd;font-size:13px;visibility:hidden;padding:2px 0 0}.mobile .row-actions,.row-actions.visible,div.comment-item:hover .row-actions,tr:hover .row-actions{visibility:visible}.row-actions-visible{padding:2px 0 0}#wpbody-content .inline-edit-row fieldset{font-size:12px;float:left;margin:0;padding:0;width:100%}#wpbody-content .inline-edit-row fieldset .inline-edit-col,tr.inline-edit-row td{padding:0 .5em}#wpbody-content .quick-edit-row-page fieldset.inline-edit-col-right .inline-edit-col{border-width:0 0 0 1px;border-style:none none none solid}#wpbody-content .quick-edit-row-post .inline-edit-col-left{width:40%}#wpbody-content .quick-edit-row-post .inline-edit-col-right{width:39%}#wpbody-content .inline-edit-row-post .inline-edit-col-center{width:20%}#wpbody-content .quick-edit-row-page .inline-edit-col-left{width:50%}#wpbody-content .bulk-edit-row-post .inline-edit-col-right,#wpbody-content .quick-edit-row-page .inline-edit-col-right{width:49%}#wpbody-content .bulk-edit-row .inline-edit-col-left{width:30%}#wpbody-content .bulk-edit-row-page .inline-edit-col-right{width:69%}#wpbody-content .bulk-edit-row .inline-edit-col-bottom{float:right;width:69%}#wpbody-content .inline-edit-row-page .inline-edit-col-right{margin-top:27px}.inline-edit-row fieldset .inline-edit-group{clear:both}.inline-edit-row fieldset .inline-edit-group:after{content:".";display:block;height:0;clear:both;visibility:hidden}.inline-edit-row p.submit{clear:both;padding:.5em;margin:.5em 0 0}.inline-edit-row span.error{line-height:22px;margin:0 15px;padding:3px 5px}.inline-edit-row h4{margin:.2em 0;padding:0;line-height:23px}.inline-edit-row fieldset span.checkbox-title,.inline-edit-row fieldset span.title{margin:0;padding:0}.inline-edit-row fieldset label,.inline-edit-row fieldset span.inline-edit-categories-label{display:block;margin:.2em 0}.inline-edit-row fieldset label.inline-edit-tags{margin-top:0}.inline-edit-row fieldset label.inline-edit-tags span.title{margin:.2em 0;width:auto}.inline-edit-row fieldset label span.title{display:block;float:left;width:5em}.inline-edit-row fieldset label span.input-text-wrap{display:block;margin-left:5em}.quick-edit-row-post fieldset.inline-edit-col-right label span.title{width:auto;padding-right:.5em}.inline-edit-row .input-text-wrap input[type=text]{width:100%}.inline-edit-row fieldset label input[type=checkbox]{vertical-align:text-bottom}.inline-edit-row fieldset label textarea{width:100%;height:4em}#wpbody-content .bulk-edit-row fieldset .inline-edit-group label{max-width:50%}#wpbody-content .quick-edit-row fieldset .inline-edit-group label.alignleft:first-child{margin-right:.5em}.inline-edit-col-right .input-text-wrap input.inline-edit-menu-order-input{width:6em}.inline-edit-save .spinner{padding:4px 10px 0;vertical-align:top;float:right}.inline-edit-row h4{text-transform:uppercase}.inline-edit-row fieldset span.checkbox-title,.inline-edit-row fieldset span.title{font-style:italic;line-height:1.8em}.inline-edit-row fieldset .inline-edit-date{float:left}.inline-edit-row fieldset input[name=hh],.inline-edit-row fieldset input[name=jj],.inline-edit-row fieldset input[name=mn]{font-size:12px;width:2.1em}.inline-edit-row fieldset input[name=aa]{font-size:12px;width:3.5em}.inline-edit-row fieldset label input.inline-edit-password-input{width:8em}ul.cat-checklist{height:12em;border:solid 1px #ddd;overflow-y:scroll;padding:0 5px;margin:0;background-color:#fff}#bulk-titles{display:block;height:12em;border:1px solid #ddd;overflow-y:scroll;padding:0 5px;margin:0 0 5px}.inline-edit-row fieldset ul.cat-checklist input,.inline-edit-row fieldset ul.cat-checklist li{margin:0;position:relative}.inline-edit-row #bulk-titles div,.inline-edit-row fieldset ul.cat-checklist label{font-style:normal;font-size:11px}.inline-edit-row fieldset label input.inline-edit-menu-order-input{width:3em}.inline-edit-row fieldset label input.inline-edit-slug-input{width:75%}.inline-edit-row #post_parent,.inline-edit-row select[name=page_template]{max-width:80%}.ie8 .inline-edit-row #post_parent,.ie8 .inline-edit-row select[name=page_template]{width:250px}.quick-edit-row-post fieldset label.inline-edit-status{float:left}#bulk-titles{line-height:140%}#bulk-titles div{margin:.2em .3em}#bulk-titles div a{cursor:pointer;display:block;float:left;height:18px;margin:0 3px 0 -2px;overflow:hidden;position:relative;width:20px}#bulk-titles div a:before{position:relative;top:-3px}.plugins tbody,.plugins tbody th.check-column{padding:8px 0 0 2px}.plugins tbody th.check-column input[type=checkbox]{margin-top:4px}#update-plugins-table tbody td p{margin-top:0}#update-plugins-table tbody td p strong{font-size:14px}.plugins .inactive th.check-column,.plugins tfoot th.check-column,.plugins thead th.check-column{padding-left:6px}#update-plugins-table tfoot th.check-column,#update-plugins-table thead th.check-column{padding-top:11px}.plugins,.plugins td,.plugins th{color:#000}.plugins tr{background:#fff}.plugins p{margin:0 4px;padding:0}.plugins .desc p{margin:0 0 8px}.plugins td.desc{line-height:1.5em}.plugins .desc ol,.plugins .desc ul{margin:0 0 0 2em}.plugins .desc ul{list-style-type:disc}.plugins .row-actions{font-size:13px}.plugins .active td,.plugins .active th,.plugins .inactive td,.plugins .inactive th{padding:10px 9px}.plugins .active td,.plugins .active th{background-color:#f7fcfe}.plugins .update td,.plugins .update th{border-bottom:0}.plugin-update-tr td{border-top:0}.plugin-install #the-list td,.plugins .active td,.plugins .active th,.plugins .inactive td,.plugins .inactive th,.upgrade .plugins td,.upgrade .plugins th{-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 -1px 0 rgba(0,0,0,.1)}.plugins tr.active+tr.inactive td,.plugins tr.active+tr.inactive th,.plugins tr.active.plugin-update-tr+tr.inactive td,.plugins tr.active.plugin-update-tr+tr.inactive th{border-top:1px solid rgba(0,0,0,.03);-webkit-box-shadow:inset 0 1px 0 rgba(0,0,0,.02),inset 0 -1px 0 #e1e1e1;box-shadow:inset 0 1px 0 rgba(0,0,0,.02),inset 0 -1px 0 #e1e1e1}.plugins .update td,.plugins .update th,.plugins tr.active+tr.inactive.update td,.plugins tr.active+tr.inactive.update th,.upgrade .plugins tr:last-of-type td,.upgrade .plugins tr:last-of-type th{-webkit-box-shadow:none;box-shadow:none}.plugins .active.update td,.plugins .active.update th,tr.active.update+tr.plugin-update-tr .plugin-update{background-color:#fef7f1}.plugins .active th.check-column{border-left:4px solid #2ea2cc}.plugins .active.update th.check-column,.plugins .active.update+.plugin-update-tr .plugin-update{border-left:4px solid #d54e21}#wpbody-content .plugins .plugin-title,#wpbody-content .plugins .theme-title{padding-right:12px;white-space:nowrap}.plugins .inactive .plugin-title strong{font-weight:400}.plugins .row-actions,.plugins .second{padding:0 0 5px}.plugins .update .row-actions,.plugins .update .second{padding-bottom:0}.plugins-php .widefat tfoot td,.plugins-php .widefat tfoot th{border-top-style:solid;border-top-width:1px}.plugin-update-tr .update-message{font-size:13px;font-weight:400;padding:6px 12px;margin:0 10px 8px 31px;background-color:#f7f7f7;background-color:rgba(0,0,0,.03)}.plugin-update-tr .update-message:before{color:#d54e21;content:'\f463';display:inline-block;font:400 20px/1 dashicons;speak:none;margin:0 8px 0 -2px;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;vertical-align:top}.plugins .plugin-update{padding:0;border:0;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 -1px 0 rgba(0,0,0,.1)}tr.active+tr.plugin-update-tr .plugin-update{background-color:#f7fcfe}tr.active+tr.plugin-update-tr .plugin-update .update-message{background-color:#fcf3ef}.plugin-install-php h4{margin:2.5em 0 8px}.wp-list-table .site-deleted{background:#ff8573}.wp-list-table .site-spammed{background:#faafaa}.wp-list-table .site-archived{background:#ffebe8}.wp-list-table .site-mature{background:#fecac2}@media screen and (max-width:782px){.tablenav{height:auto}.tablenav.top{margin:0}.tablenav.bottom{position:relative;margin-top:15px}.tablenav br{display:none}.tablenav br.clear{display:block}.tablenav.top .actions,.tablenav.top .displaying-num,.view-switch{display:none}.tablenav.bottom .displaying-num{position:absolute;right:0;top:10px;font-size:14px}.tablenav-pages{width:100%;text-align:center;margin:0 0 25px}.tablenav.bottom .tablenav-pages{margin-top:25px}.tablenav.top .tablenav-pages.one-page{display:none}.tablenav.bottom .tablenav-pages.one-page{margin:15px 0 0;height:0}.tablenav-pages .pagination-links .paging-input{font-size:18px}.tablenav-pages .pagination-links a{padding:8px 20px 11px;font-size:18px;background:rgba(0,0,0,.05)}.tablenav-pages .pagination-links .current-page{padding:10px;font-size:14px}.form-wrap>p{display:none}.comment-count{font-size:14px}.column-categories,.column-tags,.fixed .column-author,.fixed .column-date,.media .column-parent,.sites .column-registered,.sites .column-users,.tags .column-description,.users .column-email,.users .column-name{display:none}.fixed .column-comment .comment-author{display:block}.column-title{width:85%}.fixed .column-comments,.widefat .check-column{width:35px}.widefat tfoot .check-column,.widefat thead .check-column{padding:10px 0}.widefat *{word-wrap:normal}#wpbody-content .bulk-edit-row .inline-edit-col-bottom,#wpbody-content .bulk-edit-row .inline-edit-col-left,#wpbody-content .bulk-edit-row-page .inline-edit-col-right,#wpbody-content .bulk-edit-row-post .inline-edit-col-right,#wpbody-content .inline-edit-row-post .inline-edit-col-center,#wpbody-content .quick-edit-row-page .inline-edit-col-left,#wpbody-content .quick-edit-row-page .inline-edit-col-right,#wpbody-content .quick-edit-row-post .inline-edit-col-left,#wpbody-content .quick-edit-row-post .inline-edit-col-right{float:none;width:100%}#wpbody-content .bulk-edit-row fieldset .inline-edit-col label,#wpbody-content .bulk-edit-row fieldset .inline-edit-group label,#wpbody-content .quick-edit-row fieldset .inline-edit-col label,#wpbody-content .quick-edit-row fieldset .inline-edit-group label{max-width:none;float:none;margin-bottom:5px}#wpbody .bulk-edit-row fieldset select{display:block;width:100%;max-width:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.inline-edit-row #bulk-titles div,.inline-edit-row fieldset ul.cat-checklist label{font-size:16px}.inline-edit-row fieldset label span.title{float:none}.inline-edit-row fieldset label.inline-edit-tags{padding:0 .5em}.inline-edit-row fieldset .inline-edit-col label.inline-edit-tags{padding:0}.inline-edit-row fieldset label span.input-text-wrap{margin-left:0}.inline-edit-row fieldset input[name=hh],.inline-edit-row fieldset input[name=jj],.inline-edit-row fieldset input[name=mn]{width:3em}.inline-edit-row fieldset input[name=aa]{width:4.5em}#bulk-titles div{margin:.8em .3em}#bulk-titles div a{height:22px}.tags .column-posts{width:50px}.tags .column-slug{width:30%}.comments .column-response,.users .column-role{width:35%}.sites .column-blogname{width:55%}#wpbody-content #update-themes-table .plugin-title{width:auto}.link-manager-php #posts-filter{margin-top:25px}.link-manager-php .tablenav.bottom{overflow:hidden}.wp-list-table.plugins{position:relative;margin-top:35px;margin-bottom:50px}#wpbody-content .wp-list-table.plugins tfoot .column-description,.wp-list-table.plugins th#description,.wp-list-table.plugins thead .column-description{display:none}#wpbody-content .wp-list-table.plugins,#wpbody-content .wp-list-table.plugins .column-description,#wpbody-content .wp-list-table.plugins .manage-column.column-name,#wpbody-content .wp-list-table.plugins .plugin-title,#wpbody-content .wp-list-table.plugins .plugin-update,#wpbody-content .wp-list-table.plugins .theme-title,#wpbody-content .wp-list-table.plugins tbody,#wpbody-content .wp-list-table.plugins thead,#wpbody-content .wp-list-table.plugins tr{display:block;width:auto}.wp-list-table.plugins tfoot,.wp-list-table.plugins thead{position:absolute;top:-35px;left:0;right:0;width:auto;height:35px}.wp-list-table.plugins tfoot{bottom:-35px;top:auto}.active,.inactive{padding-top:0}.wp-list-table.plugins .plugin-title,.wp-list-table.plugins .theme-title{padding-top:13px;padding-bottom:4px}.plugins tr.active+tr.inactive td,.plugins tr.active+tr.inactive th.check-column,.wp-list-table.plugins .plugin-title,.wp-list-table.plugins .theme-title,.wp-list-table.plugins tbody th{-webkit-box-shadow:none;box-shadow:none}.plugins tbody{padding:1px 0 0}.plugins tr.active+tr.inactive td.column-description{-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 -1px 0 rgba(0,0,0,.1)}.plugins tr.active+tr.inactive td,.plugins tr.active+tr.inactive th.check-column{border-top:0}.wp-list-table.plugins .column-description{padding-top:0}.wp-list-table.plugins .column-description,.wp-list-table.plugins .manage-column.column-name,.wp-list-table.plugins .plugin-title,.wp-list-table.plugins .theme-title{padding-right:12px;padding-left:46px}.wp-list-table.plugins tr{position:relative}.wp-list-table.plugins th.check-column,.wp-list-table.plugins tr.update th.check-column{position:absolute;height:auto;top:0;bottom:0;left:0;padding-left:2px;padding-top:18px}.wp-list-table.plugins tfoot th.check-column,.wp-list-table.plugins thead th.check-column{padding-left:3px;padding-top:11px;background:0 0}.widefat tbody th.check-column input[type=checkbox]{margin-top:-3px;margin-left:8px}.wp-list-table.plugins .active .check-column input,.wp-list-table.plugins .update .check-column input{margin-left:5px}.wp-list-table.plugins tfoot .check-column input,.wp-list-table.plugins thead .check-column input{margin-top:-6px}.wp-list-table.plugins .active th.check-column{background:0 0}.wp-list-table.plugins .plugin-title strong,.wp-list-table.plugins .theme-title strong{font-size:1.4em;line-height:1.6em}table.plugin-install .column-description,table.plugin-install .column-name,table.plugin-install .column-rating,table.plugin-install .column-version{display:block;width:auto}table.plugin-install th.column-description,table.plugin-install th.column-name,table.plugin-install th.column-rating,table.plugin-install th.column-version{display:none}table.plugin-install td.column-name strong{font-size:1.4em;line-height:1.6em}table.plugin-install #the-list td{-webkit-box-shadow:none;box-shadow:none}table.plugin-install #the-list tr{display:block;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:inset 0 -1px 0 rgba(0,0,0,.1)}}#poststuff{padding-top:10px;min-width:763px}#poststuff #post-body{padding:0}#poststuff .postbox-container{width:100%}#poststuff #post-body.columns-2{margin-right:300px}#show-comments{overflow:hidden}#save-action .spinner,#show-comments .spinner,#show-comments a{float:left}#lost-connection-notice .spinner{display:block;float:left;margin:0 5px 0 0}#titlediv{position:relative;margin-bottom:10px}#titlediv label{cursor:text}#titlediv div.inside{margin:0}#poststuff #titlewrap{border:0;padding:0}#titlediv #title{padding:3px 8px;font-size:1.7em;line-height:100%;height:1.7em;width:100%;outline:0;margin:0;background-color:#fff}#titlediv #title-prompt-text{color:#777;position:absolute;font-size:1.7em;padding:11px 10px}#wp-fullscreen-save .fs-saved{color:#999;float:right;margin-top:4px}#poststuff .inside-submitbox,#side-sortables .inside-submitbox{margin:0 3px;font-size:11px}input#link_description,input#link_url{width:98%}#pending{background:0 none;border:0 none;padding:0;font-size:11px;margin-top:-1px}#edit-slug-box{line-height:24px;min-height:25px;margin-top:5px;padding:0 10px;color:#666}#edit-slug-box .cancel{margin-right:10px;font-size:11px}#editable-post-name-full{display:none}#editable-post-name{background-color:#fffbcc}#editable-post-name input{font-size:13px;height:22px;margin:0;width:16em}.postarea h3 label{float:left}.submitbox .submit{text-align:left;padding:12px 10px 10px;font-size:11px;background-color:#464646;color:#ccc}.submitbox .submitdelete{text-decoration:none;padding:1px 2px}#normal-sortables .submitbox .submitdelete:hover{color:#000;background-color:red;border-bottom-color:red}.submitbox .submit a:hover{text-decoration:underline}.submitbox .submit input{margin-bottom:8px;margin-right:4px;padding:6px}.inside-submitbox #post_status{margin:2px 0 2px -2px}#post-status-select{margin-top:3px}#post-body #normal-sortables{min-height:50px}.postbox{position:relative;min-width:255px;border:1px solid #e5e5e5;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04);background:#fff}#trackback_url{width:99%}#normal-sortables .postbox .submit{background:transparent none;border:0 none;float:right;padding:0 12px;margin:0}.category-add input[type=text],.category-add select{width:100%;max-width:260px;vertical-align:baseline}#side-sortables .category-add input[type=text],#side-sortables .category-add select{margin:0 0 1em}#side-sortables .add-menu-item-tabs li,.wp-tab-bar li,ul.category-tabs li{display:inline;line-height:1.35em}.no-js .category-tabs li.hide-if-no-js{display:none}#side-sortables .add-menu-item-tabs a,.category-tabs a,.wp-tab-bar a{text-decoration:none}#post-body ul.add-menu-item-tabs li.tabs a,#post-body ul.category-tabs li.tabs a,#side-sortables .add-menu-item-tabs .tabs a,#side-sortables .category-tabs .tabs a,.wp-tab-bar .wp-tab-active a{color:#333}.category-tabs{margin:8px 0 5px}#category-adder h4{margin:10px 0}#side-sortables .add-menu-item-tabs,.wp-tab-bar{margin-bottom:3px}#normal-sortables .postbox #replyrow .submit{float:none;margin:0;padding:0 7px 5px}#side-sortables .submitbox .submit .preview,#side-sortables .submitbox .submit a.preview:hover,#side-sortables .submitbox .submit input{border:0 none}#side-sortables .inside-submitbox .insidebox,.stuffbox .insidebox{margin:11px 0}ul.add-menu-item-tabs,ul.category-tabs,ul.wp-tab-bar{margin-top:12px}ul.add-menu-item-tabs li,ul.category-tabs li{border:solid 1px transparent;position:relative}.wp-tab-active,ul.add-menu-item-tabs li.tabs,ul.category-tabs li.tabs{border:1px solid #dfdfdf;border-bottom-color:#fdfdfd;background-color:#fdfdfd}ul.add-menu-item-tabs li,ul.category-tabs li,ul.wp-tab-bar li{padding:3px 5px 5px}#postimagediv .inside img{max-width:100%;height:auto}form#tags-filter{position:relative}td.plugin-title strong,td.post-title strong{display:block;margin-bottom:.2em;font-size:14px}td.plugin-title p,td.post-title p{margin:6px 0}.ui-tabs-hide,.wp-hidden-children .wp-hidden-child{display:none}#post-body .tagsdiv #newtag{margin-right:5px;width:16em}#side-sortables input#post_password{width:94%}#side-sortables .tagsdiv #newtag{width:68%}#post-status-info{width:100%;border-spacing:0;border:1px solid #e5e5e5;border-top:0;background-color:#f7f7f7;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04)}#post-status-info td{font-size:12px}.autosave-info{padding:2px;text-align:right}#editorcontent #post-status-info{border:0}#content-resize-handle{background:transparent url(../images/resize.gif) no-repeat scroll right bottom;width:12px;cursor:row-resize}.rtl #content-resize-handle{background:transparent url(../images/resize-rtl.gif) no-repeat scroll left bottom}#wp-word-count{display:block;padding:2px 10px}#timestampdiv select{height:21px;line-height:14px;padding:0;vertical-align:top;font-size:12px}#aa,#hh,#jj,#mn{padding:1px;font-size:12px}#hh,#jj,#mn{width:2em}#aa{width:3.4em}.curtime #timestamp{padding:2px 0 1px;display:inline!important;height:auto!important}#misc-publishing-actions label[for=post_status]:before,#post-body #visibility:before,#post-body .misc-pub-revisions:before,.curtime #timestamp:before,span.wp-media-buttons-icon:before{color:#888}#post-body #visibility:before,#post-body .misc-pub-revisions:before,.curtime #timestamp:before{font:400 20px/1 dashicons;speak:none;display:inline-block;padding:0 2px 0 0;top:0;left:-1px;position:relative;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important}#post-body #visibility:before{content:'\f177'}.curtime #timestamp:before{content:'\f145';top:-1px}#post-body .misc-pub-revisions:before{content:'\f321'}#timestampdiv{padding-top:5px;line-height:23px}#timestampdiv p{margin:8px 0 6px}#timestampdiv input{border-width:1px;border-style:solid}.notification-dialog{position:fixed;top:30%;left:50%;width:450px;margin-left:-225px;background:#fff;-webkit-box-shadow:0 3px 6px rgba(0,0,0,.3);box-shadow:0 3px 6px rgba(0,0,0,.3);line-height:1.5;z-index:1000005}.notification-dialog-background{position:fixed;top:0;left:0;right:0;bottom:0;background:#000;opacity:.7;filter:alpha(opacity=70);z-index:1000000}#post-lock-dialog .post-locked-message,#post-lock-dialog .post-taken-over{margin:25px}#post-lock-dialog .post-locked-message a.button{margin-right:10px}#post-lock-dialog .post-locked-avatar{float:left;margin:0 20px 20px 0}#post-lock-dialog .wp-tab-first{outline:0}#post-lock-dialog .locked-saving img{float:left;margin-right:3px}#post-lock-dialog.saved .locked-saved,#post-lock-dialog.saving .locked-saving{display:inline}#excerpt,.attachmentlinks{margin:0;height:4em;width:98%}.tagchecklist{margin-left:14px;font-size:12px;overflow:auto}.tagchecklist br{display:none}.tagchecklist strong{margin-left:-8px;position:absolute}.tagchecklist span{margin-right:25px;display:block;float:left;font-size:13px;line-height:1.8em;white-space:nowrap;cursor:default}.tagchecklist span a{margin:1px 0 0 -17px;cursor:pointer;width:20px;height:20px;display:block;float:left;text-indent:0;overflow:hidden;position:absolute}#poststuff h2{margin-top:20px;font-size:1.5em;margin-bottom:15px;padding:0 0 3px;clear:left}#poststuff h3{font-size:14px;padding:8px 12px;margin:0;line-height:1.4}#poststuff .inside{margin:6px 0 0}#poststuff .inside #page_template,#poststuff .inside #parent_id{max-width:100%}#poststuff .inside label.deleted,#poststuff .inside label.spam{color:red}#poststuff .inside label.waiting{color:orange}#poststuff .inside label.approved{color:green}.ie8 #poststuff .inside #page_template,.ie8 #poststuff .inside #parent_id{width:250px}#post-visibility-select{line-height:1.5em;margin-top:3px}#poststuff #submitdiv .inside{margin:0;padding:0}.edit-form-section{margin-bottom:20px}#postcustomstuff thead th{padding:5px 8px 8px;background-color:#f1f1f1}#postcustom #postcustomstuff .submit{border:0 none;float:none;padding:0 8px 8px}#side-sortables #postcustom #postcustomstuff .submit{margin:0;padding:0}#side-sortables #postcustom #postcustomstuff #the-list textarea{height:85px}#side-sortables #postcustom #postcustomstuff td.left input,#side-sortables #postcustom #postcustomstuff td.left select,#side-sortables #postcustomstuff #newmetaleft a{margin:3px 3px 0}#postcustomstuff table{margin:0;width:100%;border:1px solid #dfdfdf;border-spacing:0;background-color:#f9f9f9}#postcustomstuff tr{vertical-align:top}#postcustomstuff table input,#postcustomstuff table select,#postcustomstuff table textarea{width:96%;margin:8px}#side-sortables #postcustomstuff table input,#side-sortables #postcustomstuff table select,#side-sortables #postcustomstuff table textarea{margin:3px}#postcustomstuff td.left,#postcustomstuff th.left{width:38%}#postcustomstuff .submit input{margin:0;width:auto}#postcustomstuff #newmetaleft a{display:inline-block;margin:0 8px 8px;text-decoration:none}.no-js #postcustomstuff #enternew{display:none}#post-body-content .compat-attachment-fields{margin-bottom:20px}.compat-attachment-fields th{padding-top:5px;padding-right:10px}#select-featured-image{padding:4px 0;overflow:hidden}#select-featured-image img{max-width:100%;height:auto;margin-bottom:10px}#select-featured-image a{float:left;clear:both}#select-featured-image .remove{display:none;margin-top:10px}.js #select-featured-image.has-featured-image .remove{display:inline-block}.no-js #select-featured-image .choose{display:none}.post-state-format{overflow:hidden;display:inline-block;vertical-align:middle;height:20px;width:20px;margin-right:5px;margin-top:-4px}.post-state-format:before{display:block;height:20px;width:20px;font:400 20px/1 dashicons!important;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.post-format-icon:before,.post-state-format:before{color:#ddd;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}a.post-format-icon:hover:before,a.post-state-format:hover:before{color:#2ea2cc}#post-formats-select{line-height:2em}#post-formats-select .post-format-icon:before{top:5px}input.post-format{margin-top:1px}label.post-format-icon{margin-left:0;padding:2px 0}.post-format-icon:before{position:relative;display:inline-block;margin-right:7px;font:400 20px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.post-format-icon.post-format-standard:before,.post-state-format.post-format-standard:before,a.post-state-format.format-standard:before{content:'\f109'}.post-format-icon.post-format-image:before,.post-state-format.post-format-image:before,a.post-state-format.format-image:before{content:'\f128'}.post-format-icon.post-format-gallery:before,.post-state-format.post-format-gallery:before,a.post-state-format.format-gallery:before{content:'\f161'}.post-format-icon.post-format-audio:before,.post-state-format.post-format-audio:before,a.post-state-format.format-audio:before{content:'\f127'}.post-format-icon.post-format-video:before,.post-state-format.post-format-video:before,a.post-state-format.format-video:before{content:'\f126'}.post-format-icon.post-format-chat:before,.post-state-format.post-format-chat:before,a.post-state-format.format-chat:before{content:'\f125'}.post-format-icon.post-format-status:before,.post-state-format.post-format-status:before,a.post-state-format.format-status:before{content:'\f130'}.post-format-icon.post-format-aside:before,.post-state-format.post-format-aside:before,a.post-state-format.format-aside:before{content:'\f123'}.post-format-icon.post-format-quote:before,.post-state-format.post-format-quote:before,a.post-state-format.format-quote:before{content:'\f122'}.post-format-icon.post-format-link:before,.post-state-format.post-format-link:before,a.post-state-format.format-link:before{content:'\f103'}.category-adder{margin-left:120px;padding:4px 0}.category-adder h4{margin:0 0 8px}#side-sortables .category-adder{margin:0}.categorydiv div.tabs-panel,.customlinkdiv div.tabs-panel,.posttypediv div.tabs-panel,.taxonomydiv div.tabs-panel,.wp-tab-panel{min-height:42px;max-height:200px;overflow:auto;padding:0 .9em;border:solid 1px #dfdfdf;background-color:#fdfdfd}div.tabs-panel-active{display:block}div.tabs-panel-inactive{display:none}#front-page-warning,#front-static-pages ul,.categorydiv ul.categorychecklist ul,.customlinkdiv ul.categorychecklist ul,.inline-editor ul.cat-checklist ul,.posttypediv ul.categorychecklist ul,.taxonomydiv ul.categorychecklist ul,ul.export-filters{margin-left:18px}ul.categorychecklist li{margin:0;padding:0;line-height:22px;word-wrap:break-word}.categorydiv .tabs-panel,.customlinkdiv .tabs-panel,.posttypediv .tabs-panel,.taxonomydiv .tabs-panel{border-width:3px;border-style:solid}.form-wrap label{display:block;padding:2px;font-size:12px}.form-field input,.form-field textarea{border-style:solid;border-width:1px;width:95%}.form-wrap p,p.description{margin:2px 0 5px;color:#666}.form-wrap p,p.description,p.help,span.description{font-size:13px;font-style:italic}.form-wrap .form-field{margin:0 0 10px;padding:8px 0}.form-wrap .form-field #parent{max-width:100%}.col-wrap h3{margin:12px 0;font-size:1.1em}.col-wrap p.submit{margin-top:-10px}.tagsdiv{margin-top:-8px}#poststuff .taghint{color:#aaa;margin:15px 0 -24px 12px}#poststuff .tagsdiv .howto{margin:0 0 6px}.ajaxtag .newtag{position:relative}.tagsdiv .newtag{width:180px}.tagsdiv .the-tags{display:block;height:60px;margin:0 auto;overflow:auto;width:260px}#post-body-content .tagsdiv .the-tags{margin:0 5px}.taghint{color:#aaa;margin:-17px 0 0 7px;visibility:hidden}input.newtag~div.taghint{visibility:visible}input.newtag:focus~div.taghint{visibility:hidden}p.popular-tags{border:0;line-height:2em;max-width:1000px;padding:8px 12px 12px;text-align:justify}p.popular-tags a{padding:0 3px}.tagcloud{width:97%;margin:0 0 40px;text-align:justify}.tagcloud h3{margin:2px 0 12px}.ac_results{padding:0;margin:0;list-style:none;position:absolute;z-index:10000;display:none;border:1px solid gray;background-color:#fff}.wp-customizer .ac_results{z-index:500000}.ac_results li{padding:2px 5px;white-space:nowrap;color:#101010;text-align:left}.ac_over{background-color:#f0f0b8;cursor:pointer}.ac_match{text-decoration:underline}.comment-php .wp-editor-area{height:200px}.comment-ays{margin-bottom:0;border-bottom-style:solid;border-bottom-width:1px}.comment-ays .alt{background-color:transparent}.spam-undo-inside,.trash-undo-inside{margin:1px 8px 1px 0;line-height:16px}.spam-undo-inside .avatar,.trash-undo-inside .avatar{height:20px;width:20px;margin-right:8px;vertical-align:middle}.stuffbox .editcomment{clear:none}#comment-status-radio p{margin:3px 0 5px}#comment-status-radio input{margin:2px 3px 5px 0;vertical-align:middle}#comment-status-radio label{padding:5px 0}table.links-table{width:100%;border-spacing:0}.links-table th{font-weight:400;text-align:left;vertical-align:top;min-width:80px;width:20%;word-wrap:break-word}.links-table td,.links-table th{padding:5px 0}.links-table td label{margin-right:8px}.links-table td input[type=text],.links-table td textarea{width:100%}.links-table #link_rel{max-width:280px}@media print,(-o-min-device-pixel-ratio:5/4),(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){#content-resize-handle,#post-body .wp_themeSkin .mceStatusbar a.mceResize{background:transparent url(../images/resize-2x.gif) no-repeat scroll right bottom;-webkit-background-size:11px 11px;background-size:11px 11px}.rtl #content-resize-handle,.rtl #post-body .wp_themeSkin .mceStatusbar a.mceResize{background:transparent url(../images/resize-rtl-2x.gif) no-repeat scroll right bottom}}@media only screen and (max-width:850px){#poststuff{min-width:0}#wpbody-content #poststuff #post-body{margin:0}#wpbody-content #post-body.columns-2 #postbox-container-1{margin-right:0;width:100%}#poststuff #postbox-container-1 #side-sortables:empty,#poststuff #postbox-container-1 .empty-container{border:0 none;height:0;min-height:0}#poststuff #post-body.columns-2 #side-sortables{min-height:0}.columns-prefs,.screen-layout{display:none}}@media screen and (max-width:782px){#post-body-content{min-width:0}#titlediv #title-prompt-text{padding:10px}#poststuff h3{padding:12px}.post-format-options{padding-right:0}.post-format-options a{margin-right:5px;margin-bottom:5px;min-width:52px}.post-format-options .post-format-title{font-size:11px}.post-format-options a div{height:28px;width:28px}.post-format-options a div:before{font-size:26px!important}#post-visibility-select{line-height:280%}.wp-core-ui .save-post-visibility,.wp-core-ui .save-timestamp{vertical-align:middle;margin-right:15px}.timestamp-wrap select#mm{display:block;width:100%;margin-bottom:10px}.timestamp-wrap #aa,.timestamp-wrap #hh,.timestamp-wrap #jj,.timestamp-wrap #mn{padding:12px 3px;font-size:14px;margin-bottom:5px;width:auto;text-align:center}ul.category-tabs{margin:30px 0 15px}ul.category-tabs li.tabs{padding:15px}ul.categorychecklist li{margin-bottom:15px}ul.categorychecklist ul{margin-top:15px}.category-add input[type=text],.category-add select{max-width:none;margin-bottom:15px}.tagsdiv .newtag{width:100%;height:auto;margin-bottom:15px}.tagchecklist{margin:25px 10px}.tagchecklist span{font-size:16px;line-height:120%}#commentstatusdiv p{line-height:2.8}.mceToolbar *{white-space:normal!important}.mceToolbar td,.mceToolbar tr{float:left!important}.wp_themeSkin a.mceButton{width:30px;height:30px}.wp_themeSkin .mceButton .mceIcon{margin-top:5px;margin-left:5px}.wp_themeSkin .mceSplitButton{margin-top:1px}.wp_themeSkin .mceSplitButton td a.mceAction{padding-top:6px;padding-bottom:6px;padding-left:6px;padding-right:3px}.wp_themeSkin .mceSplitButton td a.mceOpen,.wp_themeSkin .mceSplitButtonEnabled:hover td a.mceOpen{padding-top:6px;padding-bottom:6px;background-position:1px 6px}.wp_themeSkin table.mceListBox{margin:5px}div.quicktags-toolbar input{padding:10px 20px}#wp-content-editor-tools{overflow:hidden;padding:20px 15px 1px 0;top:1px}a.wp-switch-editor{font-size:16px;line-height:1em;margin:3px 0 0 7px;padding:12px 15px}#wp-content-media-buttons a{font-size:16px;line-height:37px;height:39px;padding:0 20px 0 15px}.wp-media-buttons span.jetpack-contact-form-icon,.wp-media-buttons span.wp-media-buttons-icon{width:22px!important;margin-top:-3px!important;margin-left:-5px!important}.wp-media-buttons #insert-jetpack-contact-form span.jetpack-contact-form-icon:before,.wp-media-buttons .add_media span.wp-media-buttons-icon:before{font-size:20px!important}#content_wp_fullscreen{display:none}.misc-pub-section{padding:20px 10px}.misc-pub-section>a{float:right;font-size:16px}#delete-action,#publishing-action{line-height:47px}.comment-ays{border-bottom:0}.links-table #link_rel{max-width:none}.links-table td,.links-table th{padding:10px 0}}@media only screen and (max-width:500px){#wp-content-media-buttons a{font-size:14px;padding:0 10px}}.revisions-control-frame,.revisions-diff-frame{position:relative}.revisions-controls{padding-top:40px;height:100px;z-index:1}.revisions-controls input[type=checkbox]{position:relative;top:-1px;vertical-align:text-bottom}.revisions.pinned .revisions-controls{position:fixed;top:0;height:82px;background:#fff;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.1);box-shadow:0 1px 3px rgba(0,0,0,.1)}.revisions-tickmarks{position:relative;margin:0 auto;height:.7em;top:7px;max-width:70%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;background-color:#fff}.revisions-tickmarks>div{position:absolute;height:100%;border-left:1px solid #aaa;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.revisions-tickmarks>div:first-child{border-width:0}.comparing-two-revisions .revisions-controls{height:140px}.comparing-two-revisions.pinned .revisions-controls{height:124px}.revisions .diff-error{position:absolute;text-align:center;margin:0 auto;width:100%;display:none}.revisions.diff-error .diff-error{display:block}.revisions .loading-indicator{position:fixed;vertical-align:middle;opacity:0;width:100%;top:50%;margin-left:-90px;-webkit-transition:opacity .5s;transition:opacity .5s;filter:alpha(opacity=0)}body.folded .revisions .loading-indicator{margin-left:-32px}.revisions .loading-indicator span.spinner{display:block;margin:0 auto;float:none}.revisions.loading .loading-indicator{opacity:1;filter:alpha(opacity=100)}.revisions .diff{-webkit-transition:opacity .5s;transition:opacity .5s}.revisions.loading .diff{opacity:.5;filter:alpha(opacity=50)}.revisions.diff-error .diff{visibility:hidden}.revisions-meta{margin-top:20px;background-color:#fff;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.1);box-shadow:0 1px 3px rgba(0,0,0,.1)}.revisions.pinned .revisions-meta{-webkit-box-shadow:none;box-shadow:none}.revision-toggle-compare-mode{position:absolute;top:0;right:0}.comparing-two-revisions .revisions-next,.comparing-two-revisions .revisions-previous,.revisions-meta .diff-meta-to strong{display:none}.revisions-controls .author-card .date{color:#777}.revisions-controls .author-card.autosave{color:#d54e21}.revisions-controls .author-card .author-name{font-weight:700}.comparing-two-revisions .diff-meta-to strong{display:block}.revisions.pinned .revisions-buttons{padding:0 11px}.revisions-next,.revisions-previous{position:relative;z-index:1}.revisions-previous{float:left}.revisions-next{float:right}.revisions-controls .wp-slider{max-width:70%;margin:0 auto;top:-3px}.revisions-diff{padding:15px;background-color:#fff;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.1);box-shadow:0 1px 3px rgba(0,0,0,.1)}.revisions-diff h3:first-child{margin-top:0}#revisions-meta-restored img,.post-revisions li img{vertical-align:middle}table.diff tbody tr td:nth-child(2){width:4%}table.diff{table-layout:fixed;width:100%;white-space:pre-wrap}table.diff col.content{width:auto}table.diff col.content.diffsplit{width:48%}table.diff col.diffsplit.middle{width:auto}table.diff col.ltype{width:30px}table.diff tr{background-color:transparent}table.diff td,table.diff th{font-family:Consolas,Monaco,monospace;font-size:14px;line-height:1.618;padding:.5em;vertical-align:top;word-wrap:break-word}table.diff td h1,table.diff td h2,table.diff td h3,table.diff td h4,table.diff td h5,table.diff td h6{margin:0}table.diff .diff-addedline ins,table.diff .diff-deletedline del{text-decoration:none}table.diff .diff-deletedline{background-color:#ffe9e9}table.diff .diff-deletedline del{background-color:#faa}table.diff .diff-addedline{background-color:#e9ffe9}table.diff .diff-addedline ins{background-color:#afa}.diff-meta{padding:5px;clear:both;min-height:32px}.diff-title strong{line-height:32px;min-width:60px;text-align:right;float:left;margin-right:5px}.revisions-controls .author-card .author-info{font-size:12px;line-height:16px}.revisions-controls .author-card .author-info,.revisions-controls .author-card .avatar{float:left;margin-left:6px;margin-right:6px}.revisions-controls .author-card .byline{display:block;font-size:12px}.revisions-controls .author-card .avatar{vertical-align:middle}.diff-meta input.restore-revision{float:right;margin-left:6px;margin-right:6px;margin-top:4px}.diff-meta-from{display:none}.comparing-two-revisions .diff-meta-from{display:block}.revisions-tooltip{position:absolute;bottom:105px;margin-right:0;margin-left:-69px;z-index:0;max-width:350px;min-width:130px;padding:8px 4px;opacity:0}.revisions-tooltip.flipped{margin-left:0;margin-right:-70px}.revisions.pinned .revisions-tooltip{display:none!important}.comparing-two-revisions .revisions-tooltip{bottom:145px}.revisions-tooltip-arrow{width:70px;height:15px;overflow:hidden;position:absolute;left:0;margin-left:35px;bottom:-15px}.revisions-tooltip.flipped .revisions-tooltip-arrow{margin-left:0;margin-right:35px;left:auto;right:0}.revisions-tooltip-arrow>span{content:"";position:absolute;left:20px;top:-20px;width:25px;height:25px;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg)}.revisions-tooltip.flipped .revisions-tooltip-arrow>span{left:auto;right:20px}.ie8 .revisions-tooltip-arrow>span{left:15px;top:-25px;-ms-filter:"progid:DXImageTransform.Microsoft.Matrix(SizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476)"}.ie8 .revisions-tooltip.flipped .revisions-tooltip-arrow>span{right:25px}.revisions-tooltip,.revisions-tooltip-arrow>span{border:1px solid #d7d7d7;background-color:#fff}.revisions-tooltip{display:none}.arrow{width:70px;height:16px;overflow:hidden;position:absolute;left:0;margin-left:-35px;bottom:90px;z-index:10000}.arrow::after{z-index:9999;background-color:#fff;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.1);box-shadow:0 1px 3px rgba(0,0,0,.1)}.arrow.top{top:-16px;bottom:auto}.arrow.left{left:20%}.arrow:after{content:"";position:absolute;left:20px;top:-20px;width:25px;height:25px;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg)}.revisions-tooltip,.revisions-tooltip-arrow:after{border-width:1px;border-style:solid}div.revisions-controls>.wp-slider>.ui-slider-handle{margin-left:-10px}.rtl div.revisions-controls>.wp-slider>.ui-slider-handle{margin-right:-10px}.wp-slider.ui-slider{position:relative;border:1px solid #d7d7d7;text-align:left;cursor:pointer}.wp-slider .ui-slider-handle{-webkit-border-radius:50%;border-radius:50%;height:18px;margin-top:-3px;outline:0;position:absolute;width:18px;z-index:2}.wp-slider .ui-slider-handle,.wp-slider .ui-slider-handle.focus,.wp-slider .ui-slider-handle.ui-state-hover{background:#2ea2cc;border:1px solid #0074a2;-webkit-box-shadow:inset 0 1px 0 #78c8e6,0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 #78c8e6,0 1px 0 rgba(0,0,0,.15)}.wp-slider .ui-slider-handle:before{background:0 0;position:absolute;top:0;left:0;color:#fff;content:"\f229";font:400 18px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.wp-slider .ui-slider-handle.from-handle:before,.wp-slider .ui-slider-handle.to-handle:before{font-size:20px!important;margin:-1px 0 0 -1px}.wp-slider .ui-slider-handle.from-handle:before{content:'\f139'}.rtl .wp-slider .ui-slider-handle.from-handle:before,.wp-slider .ui-slider-handle.to-handle:before{content:'\f141'}.rtl .wp-slider .ui-slider-handle.to-handle:before{content:'\f139';right:-1px}.wp-slider .ui-slider-range{position:absolute;font-size:.7em;display:block;border:0;background-color:transparent;background-image:none}.wp-slider.ui-slider-horizontal{height:.7em}.wp-slider.ui-slider-horizontal .ui-slider-handle{top:-.25em;margin-left:-.6em}.wp-slider.ui-slider-horizontal .ui-slider-range{top:0;height:100%}.wp-slider.ui-slider-horizontal .ui-slider-range-min{left:0}.wp-slider.ui-slider-horizontal .ui-slider-range-max{right:0}@media print,(-o-min-device-pixel-ratio:5/4),(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.revision-tick.completed-false{background-image:url(../images/spinner-2x.gif)}}@media screen and (max-width:782px){#diff-next-revision,#diff-previous-revision{margin-top:-1em}table.diff{-ms-word-break:break-all;word-break:break-all;word-wrap:break-word}}.media-item .describe{border-collapse:collapse;width:100%;border-top:1px solid #dfdfdf;clear:both;cursor:default}.media-item.media-blank .describe{border:0}.media-item .describe th{vertical-align:top;text-align:left;padding:5px 10px 10px;width:140px}.media-item .describe .align th{padding-top:0}.media-item .media-item-info tr{background-color:transparent}.media-item .describe td{padding:0 8px 8px 0;vertical-align:top}.media-item thead.media-item-info td{padding:4px 10px 0}.media-item .media-item-info .A1B1{padding:0 0 0 10px}.media-item td.savesend{padding-bottom:15px}.media-item .thumbnail{max-height:128px;max-width:128px}#wpbody-content #async-upload-wrap a{display:none}.media-upload-form{margin-top:20px}.media-upload-form td label{margin-right:6px;margin-left:2px}.media-upload-form .align .field label{display:inline;padding:0 0 0 23px;margin:0 1em 0 3px;font-weight:600}.media-upload-form tr.image-size label{margin:0 0 0 5px;font-weight:600}.media-upload-form th.label label{font-weight:600;margin:.5em;font-size:13px}.media-upload-form th.label label span{padding:0 5px}.media-item .describe input[type=text],.media-item .describe textarea{width:460px}.media-item .describe p.help{margin:0;padding:0 0 0 5px}.describe-toggle-off,.describe-toggle-on,.media-item .edit-attachment{display:block;line-height:36px;float:right}.media-item .describe-toggle-off,.media-item.open .describe-toggle-on{display:none}.media-item.open .describe-toggle-off{display:block}#media-items .media-item{border-bottom:1px solid #dfdfdf;min-height:36px;position:relative;width:100%}#media-items{width:623px}.media-new-php #media-items{margin:1em 0}#media-items:empty{border:0 none}.media-item .filename{line-height:36px;overflow:hidden}.media-item .pinkynail{float:left;margin:2px 10px 0 0;max-width:40px;max-height:32px}.media-item .startclosed,.media-item .startopen{display:none}.media-item .original{position:relative;height:34px}.media-item .progress{float:right;height:22px;margin:7px 0 0;width:200px;line-height:2em;padding:0;overflow:hidden;margin-bottom:2px;-webkit-border-radius:22px;border-radius:22px;background:#ddd;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.media-item .bar{z-index:9;width:0;height:100%;margin-top:-22px;-webkit-border-radius:22px;border-radius:22px;background-color:#0074a2;-webkit-box-shadow:inset 0 0 2px rgba(0,0,0,.3);box-shadow:inset 0 0 2px rgba(0,0,0,.3)}.media-item .progress .percent{z-index:10;position:relative;width:200px;padding:0;color:#fff;text-align:center;line-height:22px;font-weight:400;text-shadow:0 1px 2px rgba(0,0,0,.2)}.upload-php .fixed .column-parent{width:15%}.js .html-uploader #plupload-upload-ui{display:none}.js .html-uploader #html-upload-ui{display:block}.media-upload-form .media-item.error{margin:0;padding:0}.media-item .error-div,.media-upload-form .media-item.error p{line-height:16px;margin:5px 10px;padding:0}.media-item .error-div a.dismiss{display:block;float:right;margin:5px 4px 0 15px}.find-box{background-color:#fff;-webkit-box-shadow:0 3px 6px rgba(0,0,0,.3);box-shadow:0 3px 6px rgba(0,0,0,.3);width:600px;overflow:hidden;margin-left:-300px;position:fixed;top:30px;bottom:30px;left:50%;z-index:100105}.find-box-head{background:#fcfcfc;border-bottom:1px solid #dfdfdf;height:36px;font-size:18px;font-weight:600;line-height:36px;padding:0 36px 0 16px;position:absolute;top:0;left:0;right:0}.find-box-inside{overflow:auto;padding:16px;background-color:#fff;position:absolute;top:37px;bottom:45px;overflow-y:scroll;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.find-box-search{padding-bottom:16px}.find-box-search .spinner{float:none;left:125px;position:absolute;top:18px}#find-posts-input,#find-posts-search{float:left}#find-posts-input{width:140px;height:28px;margin:0 4px 0 0}.widefat .found-radio{padding-right:0;width:16px}#find-posts-close{width:36px;height:36px;position:absolute;top:0;right:0;cursor:pointer;text-align:center;color:#666}#find-posts-close:hover{color:#2ea2cc}#find-posts-close:before{font:400 20px/36px dashicons;vertical-align:top;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\f158'}.find-box-buttons{padding:8px 16px;background:#fcfcfc;border-top:1px solid #dfdfdf;position:absolute;bottom:0;left:0;right:0}@media screen and (max-width:782px){.find-box-inside{bottom:57px}}@media screen and (max-width:660px){.find-box{top:0;bottom:0;left:0;right:0;margin:0;width:100%}}.ui-find-overlay{position:fixed;top:0;left:0;right:0;bottom:0;background:#000;opacity:.7;filter:alpha(opacity=70);z-index:100100}ul#dismissed-updates{display:none}form.upgrade{margin-top:8px}form.upgrade .hint{font-style:italic;font-size:85%;margin:-.5em 0 2em 0}#poststuff .inside .the-tagcloud{margin:5px 0 10px;padding:8px;border:1px solid #ddd;line-height:1.8em;word-spacing:3px;-webkit-border-radius:6px;border-radius:6px}.drag-drop #drag-drop-area{border:4px dashed #bbb;height:200px}.drag-drop .drag-drop-inside{margin:70px auto 0;width:250px}.drag-drop-inside p{color:#aaa;font-size:14px;margin:5px 0;display:none}.drag-drop .drag-drop-inside p{text-align:center}.drag-drop-inside p.drag-drop-info{font-size:20px}.drag-drop .drag-drop-inside p,.drag-drop-inside p.drag-drop-buttons{display:block}.drag-drop.drag-over #drag-drop-area{border-color:#83b4d8}#plupload-upload-ui{position:relative}.wp_attachment_details label[for=content]{font-size:13px;line-height:1.5;margin:1em 0}.wp_attachment_details #attachment_caption{height:4em}.describe .image-editor{vertical-align:top}.imgedit-wrap{position:relative}.imgedit-settings p{margin:8px 0 0}.describe .imgedit-wrap .imgedit-settings{padding:0 5px}.wp_attachment_holder div.updated{margin-top:0}.wp_attachment_holder .imgedit-wrap>div{height:auto;overflow:hidden}.wp_attachment_holder .imgedit-wrap .imgedit-panel-content{padding-right:16px;width:auto;overflow:hidden}.wp_attachment_holder .imgedit-wrap .imgedit-settings{float:right;width:250px}.imgedit-settings input{margin-top:0;vertical-align:middle}.imgedit-wait{position:absolute;top:0;background:#fff url(../images/spinner.gif) no-repeat center;-webkit-background-size:20px 20px;background-size:20px 20px;opacity:.7;filter:alpha(opacity=70);width:100%;height:500px;display:none}.no-float{float:none}.imgedit-settings .disabled,.media-disabled{color:grey}.A1B1,.wp_attachment_image{overflow:hidden}.A1B1 .button,.wp_attachment_image .button{float:left}.no-js .wp_attachment_image .button{display:none}.A1B1 .spinner,.wp_attachment_image .spinner{float:left;padding:0 0 4px;vertical-align:bottom}.imgedit-menu{margin:0 0 12px;min-width:300px}.imgedit-menu div{float:left;width:32px;border:1px solid #d5d5d5;background:#f1f1f1;margin:0 8px 0 0;height:32px;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-align:center;line-height:28px;color:#777;cursor:pointer}.imgedit-menu div:before{font:400 20px/1 dashicons;speak:none;vertical-align:middle}.imgedit-menu div:hover{border-color:#c1c1c1;background-color:#eaeaea;color:#333}.imgedit-menu div.disabled{border-color:#ccc;background-color:#ddd;color:#777;filter:alpha(opacity=50);opacity:.5;cursor:default}.imgedit-crop:before{content:'\f165'}.imgedit-rleft:before{content:'\f166'}.imgedit-rright:before{content:'\f167'}.imgedit-flipv:before{content:'\f168'}.imgedit-fliph:before{content:'\f169'}.imgedit-undo:before{content:'\f171'}.imgedit-redo:before{content:'\f172'}.imgedit-crop-wrap{position:relative}.imgedit-crop{margin:0 8px 0 0}.imgedit-rleft{margin:0 3px}.imgedit-rright{margin:0 8px 0 3px}.imgedit-flipv{margin:0 3px}.imgedit-fliph{margin:0 8px 0 3px}.imgedit-undo{margin:0 3px}.imgedit-redo{margin:0 8px 0 3px}.imgedit-applyto img{margin:0 8px 0 0}.imgedit-group-top{margin:5px 0}#poststuff .imgedit-group-top h3{padding:0}.imgedit-group-top h3 a{text-decoration:none}.imgedit-applyto .imgedit-label{padding:2px 0 0;display:block}.imgedit-help{display:none;font-style:italic}a.imgedit-help-toggle{text-decoration:none}.form-table td.imgedit-response{padding:0}.imgedit-submit{margin:8px 0}.imgedit-submit-btn{margin-left:20px}.imgedit-wrap .nowrap{white-space:nowrap}span.imgedit-scale-warn{color:red;font-size:20px;font-style:normal;visibility:hidden;vertical-align:middle}.imgedit-group{margin-bottom:8px;padding:2px 10px}audio,video{display:inline-block;max-width:100%}.mejs-container{width:100%}@media print,(-o-min-device-pixel-ratio:5/4),(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.imgedit-wait{background-image:url(../images/spinner-2x.gif)}}@media screen and (max-width:782px){.wp_attachment_details label[for=content]{font-size:14px;line-height:1.5em}}.theme-browser .themes{clear:both;padding:0 0 100px}.themes-php .wrap h2{float:left;margin-bottom:15px}.network-admin.themes-php .wrap h2{margin-bottom:0}.themes-php .wrap h2 .button{margin-left:20px}.theme-navigation .theme-count,.themes-php .wrap .theme-count{color:#fff;-webkit-border-radius:30px;border-radius:30px;background:#777;font-size:14px;padding:4px 10px;font-weight:600;margin-left:5px;margin-right:20px;position:relative;top:-3px}.theme-navigation a{text-decoration:none}.themes-php div.error,.themes-php div.updated{margin:0 0 20px;clear:both}.themes-php div.updated a{text-decoration:underline}.theme-browser .theme{cursor:pointer;float:left;margin:0 4% 4% 0;position:relative;width:30.6%;border:1px solid #dedede;-webkit-box-shadow:0 1px 1px -1px rgba(0,0,0,.1);box-shadow:0 1px 1px -1px rgba(0,0,0,.1);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.ie8 .theme-browser .theme{width:30%;margin:0 3% 4% 0}.theme-browser .theme:nth-child(3n){margin-right:0}.theme-browser .theme:focus,.theme-browser .theme:hover{cursor:pointer}.theme-browser .theme .theme-name{font-size:15px;font-weight:600;height:18px;margin:0;padding:15px;-webkit-box-shadow:inset 0 1px 0 rgba(0,0,0,.1);box-shadow:inset 0 1px 0 rgba(0,0,0,.1);overflow:hidden;white-space:nowrap;text-overflow:ellipsis;background:#fff;background:rgba(255,255,255,.65)}.theme-browser .theme .theme-actions{-ms-filter:"alpha(Opacity=0)";opacity:0;-webkit-transition:opacity .1s ease-in-out;transition:opacity .1s ease-in-out;position:absolute;bottom:0;right:0;height:38px;padding:9px 10px 0;background:rgba(244,244,244,.7);border-left:1px solid rgba(0,0,0,.05)}.theme-browser .theme.focus .theme-actions,.theme-browser .theme:focus .theme-actions,.theme-browser .theme:hover .theme-actions{-ms-filter:"alpha(Opacity=100)";opacity:1}.theme-browser .theme .theme-actions .button-primary{margin-right:3px}.theme-browser .theme .theme-actions .button-secondary{float:none;margin-left:3px}.theme-browser .theme .theme-screenshot{display:block;overflow:hidden;position:relative;-webkit-transition:opacity .2s ease-in-out;transition:opacity .2s ease-in-out}.theme-browser .theme .theme-screenshot:after{content:'';display:block;padding-top:66.66666%}.theme-browser .theme .theme-screenshot img{height:auto;position:absolute;left:0;top:0;width:100%;-webkit-transform:translateZ(0);-webkit-transition:opacity .2s ease-in-out;transition:opacity .2s ease-in-out}.theme-browser .theme:focus .theme-screenshot,.theme-browser .theme:hover .theme-screenshot{background:#fff}.theme-browser.rendered .theme:focus .theme-screenshot img,.theme-browser.rendered .theme:hover .theme-screenshot img{opacity:.4}.theme-browser .theme .more-details{-ms-filter:"alpha(Opacity=0)";opacity:0;position:absolute;top:35%;right:25%;left:25%;background:#222;background:rgba(0,0,0,.7);color:#fff;font-size:15px;text-shadow:0 1px 0 rgba(0,0,0,.6);-webkit-font-smoothing:antialiased;font-weight:600;padding:15px 12px;text-align:center;-webkit-border-radius:3px;border-radius:3px;-webkit-transition:opacity .1s ease-in-out;transition:opacity .1s ease-in-out}.theme-browser .theme:focus{outline:1px dotted #222}.theme-browser .theme:focus .more-details{opacity:1}.theme-browser .theme.active:focus .theme-actions{display:block}.theme-browser.rendered .theme:focus .more-details,.theme-browser.rendered .theme:hover .more-details{-ms-filter:"alpha(Opacity=100)";opacity:1}.theme-browser .theme .theme-installed,.theme-browser .theme .theme-update{background:#d54e21;background:rgba(213,78,33,.95);color:#fff;display:block;font-size:13px;font-weight:400;height:48px;line-height:48px;padding:0 10px;position:absolute;top:0;right:0;left:0;border-bottom:1px solid rgba(0,0,0,.25);overflow:hidden}.theme-browser .theme .theme-installed:before,.theme-browser .theme .theme-update:before{content:'\f463';display:inline-block;font:400 20px/1 dashicons;margin:0 6px 0 0;opacity:.8;position:relative;top:5px;speak:none;-webkit-font-smoothing:antialiased}.theme-browser .theme.active .theme-name{background:#2f2f2f;color:#fff;padding-right:110px;font-weight:300;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.5);box-shadow:inset 0 1px 1px rgba(0,0,0,.5)}.theme-browser .theme.active .theme-name span{font-weight:600}.theme-browser .theme.active .theme-actions{background:rgba(49,49,49,.7);border-left:0;opacity:1}.theme-browser .theme.active .theme-actions .button-primary{margin-right:0}.theme-browser .theme .theme-author{background:#222;color:#eee;display:none;font-size:14px;margin:0 10px;padding:5px 10px;position:absolute;bottom:56px}.theme-browser .theme.display-author .theme-author{display:block}.theme-browser .theme.display-author .theme-author a{color:inherit;text-decoration:none}.theme-browser .theme.add-new-theme{border:0;-webkit-box-shadow:none;box-shadow:none}.theme-browser .theme.add-new-theme a{color:#999;text-decoration:none;display:block;position:relative;z-index:1}.theme-browser .theme.add-new-theme:after{display:block;content:'';-ms-filter:"alpha(Opacity=100)";opacity:1;background:0 0;background:rgba(0,0,0,0);position:absolute;top:0;left:0;right:0;bottom:0;padding:10% 0 0;text-shadow:none;border:5px dashed #d5d2ca;border:5px dashed rgba(0,0,0,.1);-webkit-transition:opacity .2s ease-in-out;transition:opacity .2s ease-in-out;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.theme-browser .theme.add-new-theme span:after{background:#e5e5e5;background:rgba(153,153,153,.1);-webkit-border-radius:50%;border-radius:50%;display:inline-block;content:'\f132';-webkit-font-smoothing:antialiased;font:400 74px/115px dashicons;width:100px;height:100px;vertical-align:middle;text-align:center;color:#999;position:absolute;top:30%;left:50%;margin-left:-50px;text-indent:-4px;padding:0;text-shadow:none;z-index:4}.rtl .theme-browser .theme.add-new-theme span:after{text-indent:4px}.theme-browser .theme.add-new-theme:focus .theme-screenshot,.theme-browser .theme.add-new-theme:hover .theme-screenshot{background:0 0}.theme-browser .theme.add-new-theme:focus span:after,.theme-browser .theme.add-new-theme:hover span:after{background:#fff;color:#0074a2}.theme-browser .theme.add-new-theme:focus:after,.theme-browser .theme.add-new-theme:hover:after{border-color:transparent;color:#fff;background:#0074a2;content:''}.theme-browser .theme.add-new-theme .theme-name{background:0 0;text-align:center;-webkit-box-shadow:none;box-shadow:none;font-weight:400;position:relative;top:0;margin-top:-10%;margin-bottom:10%}.theme-browser .theme.add-new-theme:focus .theme-name,.theme-browser .theme.add-new-theme:hover .theme-name{color:#fff;z-index:2}.themes-php .theme-search{position:relative;top:-2px;left:20px;font-size:16px;font-weight:300;line-height:1.5;width:280px}.theme-overlay .theme-backdrop{position:absolute;left:-20px;right:0;top:0;bottom:0;background:#f1f1f1;background:rgba(238,238,238,.9);z-index:10}body.theme-overlay-open{overflow:hidden}.theme-overlay .theme-header{position:absolute;top:0;left:0;right:0;height:48px;border-bottom:1px solid #ddd}.theme-overlay .theme-header .close{cursor:pointer;height:48px;width:50px;text-align:center;float:right;border:0;border-left:1px solid #ddd;background-color:transparent}.theme-overlay .theme-header .close:focus:before,.theme-overlay .theme-header .close:hover:before{color:#fff}.theme-overlay .theme-header .close:before{font:400 30px/50px dashicons!important;color:#777;display:inline-block;content:'\f335';font-weight:300}.theme-overlay .theme-header .left,.theme-overlay .theme-header .right{cursor:pointer;color:#777;background-color:transparent;height:48px;width:54px;float:left;text-align:center;border:0;border-right:1px solid #ddd}.theme-overlay .theme-header .close:focus,.theme-overlay .theme-header .close:hover,.theme-overlay .theme-header .left:focus,.theme-overlay .theme-header .left:hover,.theme-overlay .theme-header .right:focus,.theme-overlay .theme-header .right:hover{background:#0074a2;color:#fff}.theme-overlay .theme-header .left.disabled,.theme-overlay .theme-header .left.disabled:hover,.theme-overlay .theme-header .right.disabled,.theme-overlay .theme-header .right.disabled:hover{color:#ccc;background:inherit;cursor:inherit}.theme-overlay .theme-header .left:before,.theme-overlay .theme-header .right:before{font:400 20px/50px dashicons!important;display:inline;font-weight:300}.theme-overlay .theme-header .left:before{content:'\f340'}.theme-overlay .theme-header .right:before{content:'\f344'}.rtl .theme-overlay .theme-header .left:before{content:'\f345'}.rtl .theme-overlay .theme-header .right:before{content:'\f341'}.theme-overlay .theme-wrap{clear:both;position:fixed;top:9%;left:190px;right:30px;bottom:3%;background:#fff;-webkit-box-shadow:0 1px 20px 5px rgba(0,0,0,.1);box-shadow:0 1px 20px 5px rgba(0,0,0,.1);z-index:20;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.theme-overlay .theme-wrap:after{content:".";display:block;height:0;clear:both;visibility:hidden}body.folded .theme-overlay .theme-wrap{left:70px}.theme-overlay .theme-about{position:absolute;top:49px;bottom:57px;left:0;right:0;overflow:auto;padding:2% 4%}.theme-overlay .theme-about:after{content:".";display:block;height:0;clear:both;visibility:hidden}.theme-overlay .theme-actions{position:absolute;text-align:center;bottom:0;left:0;right:0;padding:10px 25px 5px;background:#f3f3f3;z-index:30;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;border-top:1px solid #eee}.ie8 .theme-overlay .theme-actions{border:1px solid #eee}.theme-overlay .theme-actions a{margin-right:5px;margin-bottom:5px}.theme-overlay .theme-actions .delete-theme{color:#a00;position:absolute;right:10px;bottom:5px;text-decoration:none;border-color:transparent;-webkit-box-shadow:none;box-shadow:none;background:0 0}.theme-overlay .theme-actions .delete-theme:focus,.theme-overlay .theme-actions .delete-theme:hover{background:#d54e21;color:#fff;border-color:#d54e21}.theme-overlay .theme-actions .active-theme,.theme-overlay.active .theme-actions .inactive-theme{display:none}.theme-overlay .theme-actions .inactive-theme,.theme-overlay.active .theme-actions .active-theme{display:block}.theme-overlay .theme-screenshots{float:left;margin:0 30px 0 0;width:55%;max-width:880px;text-align:center}.theme-overlay .screenshot{border:1px solid #fff;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;overflow:hidden;position:relative;-webkit-box-shadow:0 0 0 1px rgba(0,0,0,.2);box-shadow:0 0 0 1px rgba(0,0,0,.2)}.theme-overlay .screenshot:after{content:'';display:block;padding-top:75%}.theme-overlay .screenshot img{height:auto;position:absolute;left:0;top:0;width:100%}.theme-overlay.small-screenshot .theme-screenshots{position:absolute;width:302px}.theme-overlay.small-screenshot .theme-info{margin-left:350px;width:auto}.theme-overlay .screenshot.thumb{background:#ccc;border:1px solid #eee;float:none;display:inline-block;margin:10px 5px 0;width:140px;height:80px;cursor:pointer}.theme-overlay .screenshot.thumb:after{content:'';display:block;padding-top:100%}.theme-overlay .screenshot.thumb img{cursor:pointer;position:absolute;left:0;top:0;width:100%;height:auto}.theme-overlay .screenshot.selected{background:0 0;border:2px solid #2ea2cc}.theme-overlay .screenshot.selected img{opacity:.8}.theme-browser .theme .theme-screenshot.blank,.theme-overlay .screenshot.blank{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAALElEQVQYGWO8d+/efwYkoKioiMRjYGBC4WHhUK6A8T8QIJt8//59ZC493AAAQssKpBK4F5AAAAAASUVORK5CYII=)}.theme-overlay .theme-info{width:40%;float:left}.theme-overlay .current-label{background:#333;color:#fff;font-size:11px;display:inline-block;padding:2px 8px;-webkit-border-radius:2px;border-radius:2px;margin:0 0 -10px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.theme-overlay .theme-name{color:#222;font-size:32px;font-weight:100;margin:10px 0 0;line-height:1.3}.theme-overlay .theme-version{color:#999;font-size:13px;font-weight:400;float:none;display:inline-block;margin-left:10px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.theme-overlay .theme-author{color:#686868;font-size:16px;font-weight:400;margin:15px 0 25px}.theme-overlay .theme-author a{text-decoration:none}.theme-overlay .theme-description{color:#555;font-size:15px;font-weight:400;line-height:1.5;margin:30px 0 0}.theme-overlay .theme-tags{border-top:3px solid #eee;color:#888;font-size:13px;font-weight:400;margin:30px 0 0;padding-top:20px}.theme-overlay .theme-tags span{color:#444;font-weight:700;margin-right:5px}.theme-overlay .theme-update-message{background:#fef7f1;border:1px solid #eee;border-left:4px solid #d54e21;-webkit-border-radius:3px;border-radius:3px;padding:5px 20px 10px}.theme-overlay .theme-update{color:#222;font-size:18px;display:inline-block;line-height:40px;margin:0}.theme-overlay .parent-theme{background:#f7fcfe;border:1px solid #eee;border-left:4px solid #2ea2cc;font-size:14px;font-weight:400;margin-top:30px;padding:10px 10px 10px 20px}.theme-overlay .parent-theme strong{font-weight:700}.single-theme .theme,.single-theme .theme-overlay .theme-backdrop,.single-theme .theme-overlay .theme-header{display:none}.single-theme .theme-overlay .theme-wrap{clear:both;min-height:330px;position:relative;left:auto;right:auto;top:auto;bottom:auto}.single-theme .theme-overlay .theme-about{padding:30px 30px 70px;position:static}.single-theme .theme-overlay .theme-actions{position:absolute}@media only screen and (min-width:2000px){#wpwrap .theme-browser .theme{width:17.6%;margin:0 3% 3% 0}#wpwrap .theme-browser .theme:nth-child(3n),#wpwrap .theme-browser .theme:nth-child(4n){margin-right:3%}#wpwrap .theme-browser .theme:nth-child(5n){margin-right:0}}@media only screen and (min-width:1680px){.theme-overlay .theme-wrap{width:1450px;margin:0 auto}}@media only screen and (min-width:1640px){.theme-browser .theme{width:22.7%;margin:0 3% 3% 0}.theme-browser .theme .theme-screenshot:after{padding-top:75%}.theme-browser .theme:nth-child(3n){margin-right:3%}.theme-browser .theme:nth-child(4n){margin-right:0}}@media only screen and (max-width:1120px){.theme-browser .theme{width:47.5%;margin-right:0}.theme-browser .theme:nth-child(even){margin-right:0}.theme-browser .theme:nth-child(odd){margin-right:5%}}@media only screen and (max-width:900px){.theme-overlay .theme-wrap{left:65px}}@media only screen and (max-width:780px){.theme-overlay .theme-wrap,body.folded .theme-overlay .theme-wrap{top:0;right:0;bottom:0;left:0;padding:70px 20px 20px;border:0;z-index:500;position:fixed}.theme-browser .theme.active .theme-name span{display:none}.theme-overlay .theme-screenshots{width:40%}.theme-overlay .theme-info{width:50%}.single-theme .theme-wrap{padding:10px}.theme-browser .theme .theme-actions{padding:5px 10px 4px}.theme-overlay.small-screenshot .theme-screenshots{position:static;float:none;max-width:302px}.theme-overlay.small-screenshot .theme-info{margin-left:0;width:auto}.theme:focus .more-details,.theme:hover .more-details,.theme:not(.active):focus .theme-actions,.theme:not(.active):hover .theme-actions{display:none}.theme-browser.rendered .theme:focus .theme-screenshot img,.theme-browser.rendered .theme:hover .theme-screenshot img{opacity:1}}@media only screen and (max-width:480px){.theme-browser .theme{width:100%;margin-right:0}.theme-browser .theme:nth-child(2n),.theme-browser .theme:nth-child(3n){margin-right:0}}@media only screen and (max-width:650px){.theme-overlay .theme-description,.theme-overlay .theme-update{margin-left:0}.theme-overlay .theme-actions .delete-theme{position:relative;right:auto;bottom:auto}.theme-overlay .theme-actions .inactive-theme{display:inline}.theme-overlay .theme-screenshots{width:100%;float:none}.theme-overlay .theme-info{width:100%}.theme-overlay .theme-author{margin:5px 0 15px}.theme-overlay .current-label{margin-top:10px;font-size:13px}.themes-php .wrap h2{width:100%}.themes-php .theme-search{float:none;clear:both;left:0;top:0;right:0;margin:10px 0;width:100%}.theme-browser .theme.add-new-theme span:after{font:400 60px/90px dashicons;width:80px;height:80px;top:30%;left:50%;text-indent:0;margin-left:-40px}.single-theme .theme-wrap{margin:0 -12px 0 -10px;padding:10px}.single-theme .theme-overlay .theme-about{padding:10px;overflow:visible}.single-theme .current-label{display:none}.single-theme .theme-overlay .theme-actions{position:static}}.broken-themes{clear:both}.broken-themes table{text-align:left;width:50%;border-spacing:3px;padding:3px}.theme-browser .theme .theme-installed{background:#0074a2}.theme-browser .theme .theme-installed:before{content:'\f147'}.theme-browser .theme.is-installed .theme-actions .button-primary{display:none!important}.theme-navigation{background:#fff;-webkit-box-shadow:0 1px 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 1px 0 rgba(0,0,0,.1);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;color:#555;display:inline-block;font-size:13px;margin:20px 0 30px;padding:0 20px;position:relative;width:100%}.theme-install-php a.browse-themes,.theme-install-php a.upload{cursor:pointer}.theme-install-php a.browse-themes,.theme-install-php.show-upload-theme a.upload{display:none}.theme-install-php.show-upload-theme a.browse-themes{display:inline}.upload-theme{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:none;margin:0;padding:0;width:100%;overflow:hidden;position:relative;top:10px}body.show-upload-theme .upload-theme{display:block}.upload-theme .wp-upload-form{background:#fafafa;border:1px solid #e5e5e5;padding:30px;margin:30px auto;max-width:380px}.upload-theme .install-help{color:#999;font-size:18px;font-style:normal;margin:0;padding:40px 0 0;text-align:center}body.show-upload-theme .upload-theme+.theme-navigation,body.show-upload-theme .upload-theme+.theme-navigation+.theme-browser{display:none}.theme-navigation .theme-count{margin-left:0;position:absolute;top:12px}.theme-count+.theme-section{margin-left:60px}.theme-filter,.theme-section{border-bottom:4px solid #fff;color:#666;cursor:pointer;display:inline-block;margin:0 10px;padding:15px 0}.theme-filter.current,.theme-section.current{border-bottom:4px solid #666;color:#222}.theme-top-filters{display:inline-block}.theme-navigation .more-filters{color:#666;cursor:pointer;display:inline-block;margin:0 10px;padding:4px 6px}body.more-filters-opened .more-filters,body.more-filters-opened .more-filters:before{background:#777;-webkit-border-radius:2px;border-radius:2px;border:0;color:#fff}body.more-filters-opened .more-filters:focus,body.more-filters-opened .more-filters:focus:before,body.more-filters-opened .more-filters:hover,body.more-filters-opened .more-filters:hover:before{background:#2ea2cc}.theme-install-php .theme-search{position:absolute;right:10px;top:9px;font-size:16px;font-weight:300;line-height:1.5;width:280px}.more-filters:before{color:#777;margin:0 5px 0 0;content:"\f111";display:inline-block;width:16px;height:16px;-webkit-font-smoothing:antialiased;font-size:16px;line-height:1;font-family:dashicons;text-decoration:inherit;font-weight:400;font-style:normal;vertical-align:top;-webkit-transition:color .1s ease-in 0;transition:color .1s ease-in 0;text-align:center}.more-filters.current:before{color:#fff}.more-filters-container{display:none;padding:20px;border-top:1px solid #eee;margin:0 -20px;background:#fafafa}body.more-filters-opened .more-filters-container{display:block;overflow:hidden}body.more-filters-opened .theme-section.current{border-bottom:0}body.more-filters-opened .theme-browser,body.more-filters-opened.filters-applied.loading-themes .theme-browser{display:none}body.more-filters-opened.filters-applied .theme-browser{display:block}.more-filters-container .filters-group{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:left;width:19%;background:#fff;margin:0 1% 0 0;border:1px solid #e5e5e5;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04);padding:10px}.more-filters-container .wide-filters-group{width:38%}.more-filters-container .feature-name{margin:0;position:relative}.more-filters-container ol{list-style-type:none;margin:20px 0 0;font-size:12px}.more-filters-container li{display:inline-block;vertical-align:top;list-style-type:none;margin:5px 0;padding-right:25px;width:160px}.theme-navigation .more-filters-container .apply-filters{margin:0 0 20px}.theme-navigation .more-filters-container .clear-filters{display:none;margin:0 0 20px 10px}.more-filters-container .apply-filters span{display:inline-block;font-size:12px;text-indent:10px;opacity:.8}.more-filters-container .filtering-by{display:none;margin:0}.more-filters-container .filtering-by>span{font-weight:600}.more-filters-container .filtering-by .tags{display:inline}.more-filters-container .filtering-by .tag{background:#fff;border:1px solid #e5e5e5;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04);font-size:11px;margin:0 5px;padding:4px 8px}.more-filters-container .filtering-by a{margin-left:10px}body.filters-applied .more-filters-container .filters-group,body.filters-applied .more-filters-container a.button,body.filters-applied .more-filters-container br{display:none!important}body.filters-applied .more-filters-container .filtering-by{display:block}body.filters-applied .more-filters-container{padding:20px}p.no-themes{color:#999;font-size:18px;font-style:normal;margin:0;padding:0;text-align:center;display:none}body.no-results p.no-themes{display:block}.theme-install-php .add-new-theme,body.show-upload-theme p.no-themes{display:none!important}@media only screen and (max-width:1120px){.theme-install-php .theme-search{margin:20px 0;position:static;width:100%}.more-filters-container{border-bottom:1px solid #eee}.upload-theme .wp-upload-form{margin:20px 0;max-width:100%}.upload-theme .install-help{font-size:15px;padding:20px 0 0;text-align:left}.more-filters-container .filters-group{margin-bottom:0;margin-top:5px;width:100%}.more-filters-container .filters-group li{margin:10px 0}}@media only screen and (max-width:782px){.more-filters-container .filters-group,.more-filters-container .filters-group li{width:100%}}.rating{margin:30px 0}.rating span:before{color:#e6b800;content:"\f154";display:inline-block;-webkit-font-smoothing:antialiased;font:400 20px/1 dashicons;vertical-align:top}.rating-10 span.one:before,.rating-30 span.two:before,.rating-50 span.three:before,.rating-70 span.four:before,.rating-90 span.five:before{content:"\f459"}.rating-100 span.five:before,.rating-100 span.four:before,.rating-100 span.one:before,.rating-100 span.three:before,.rating-100 span.two:before,.rating-20 span.one:before,.rating-30 span.one:before,.rating-40 span.one:before,.rating-40 span.two:before,.rating-50 span.one:before,.rating-50 span.two:before,.rating-60 span.one:before,.rating-60 span.three:before,.rating-60 span.two:before,.rating-70 span.one:before,.rating-70 span.three:before,.rating-70 span.two:before,.rating-80 span.four:before,.rating-80 span.one:before,.rating-80 span.three:before,.rating-80 span.two:before,.rating-90 span.four:before,.rating-90 span.one:before,.rating-90 span.three:before,.rating-90 span.two:before{content:"\f155"}.rating .ratings{display:inline;margin-left:10px;line-height:20px;color:#999}.error .theme-browser,.loading-themes .theme-browser{display:none}.loading-themes .spinner{display:block;margin:40px auto 0;float:none}.appearance_page_custom-header #headimg{border:1px solid #DFDFDF;overflow:hidden;width:100%}.appearance_page_custom-header #upload-form p label{font-size:12px}.appearance_page_custom-header .available-headers .default-header{float:left;margin:0 20px 20px 0}.appearance_page_custom-header .random-header{clear:both;margin:0 20px 20px 0;vertical-align:middle}.appearance_page_custom-header .available-headers label input,.appearance_page_custom-header .random-header label input{margin-right:10px}.appearance_page_custom-header .available-headers label img{vertical-align:middle}div#custom-background-image{min-height:100px;border:1px solid #dfdfdf}div#custom-background-image img{max-width:400px;max-height:300px}body.full-overlay-active{overflow:hidden}.wp-full-overlay{background:0 0;z-index:500000;position:fixed;overflow:visible;top:0;bottom:0;left:0;right:0;height:100%;min-width:0}.wp-full-overlay-sidebar{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:fixed;width:300px;height:100%;top:0;bottom:0;left:0;padding:0;margin:0;z-index:10;overflow:auto;background:#eee;border-right:0}.wp-full-overlay.collapsed .wp-full-overlay-sidebar{overflow:visible}.wp-full-overlay.collapsed,.wp-full-overlay.expanded .wp-full-overlay-sidebar{margin-left:0!important}.wp-full-overlay.expanded{margin-left:300px}.wp-full-overlay.collapsed .wp-full-overlay-sidebar{margin-left:-300px}.wp-full-overlay-sidebar:after{content:'';display:block;position:absolute;top:0;bottom:0;right:0;width:3px;z-index:1000}.wp-full-overlay-main{position:absolute;left:0;right:0;top:0;bottom:0;height:100%}.wp-full-overlay-sidebar .wp-full-overlay-header{position:absolute;left:0;right:0;height:45px;padding:0 15px;line-height:45px;z-index:10;margin:0;border-top:0;-webkit-box-shadow:none;box-shadow:none}.wp-full-overlay-sidebar .wp-full-overlay-header a.back{margin-top:9px}.wp-full-overlay-sidebar .wp-full-overlay-footer{bottom:0;border-bottom:0;border-top:0;-webkit-box-shadow:none;box-shadow:none}.wp-full-overlay-sidebar .wp-full-overlay-sidebar-content{position:absolute;top:45px;bottom:45px;left:0;right:0;overflow:auto}.wp-full-overlay .close-full-overlay{text-decoration:none}.wp-full-overlay a.collapse-sidebar{position:absolute;bottom:12px;left:0;z-index:50;display:block;width:19px;height:19px;margin-left:15px;padding:0;-webkit-border-radius:50%;border-radius:50%;color:#777;text-decoration:none}.wp-full-overlay a.collapse-sidebar:hover{color:#0074a2}.wp-full-overlay.collapsed .collapse-sidebar{position:absolute;left:100%}.wp-full-overlay .collapse-sidebar-arrow{position:static;margin-top:0;margin-left:0;display:block;width:auto;height:auto;background:0 0}.wp-full-overlay .collapse-sidebar-arrow:before{-webkit-border-radius:50%;border-radius:50%;float:left;content:"\f148";background:#eee;font:400 20px/1 dashicons;speak:none;display:block;padding:0;text-indent:0;text-align:center;position:relative;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important}.rtl .wp-full-overlay .collapse-sidebar-arrow:before,.wp-full-overlay.collapsed .collapse-sidebar-arrow:before{-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.rtl .wp-full-overlay.collapsed .collapse-sidebar-arrow:before{-webkit-transform:none;-ms-transform:none;transform:none}.wp-full-overlay.collapsed .collapse-sidebar-arrow{background-position:-1px -109px}.wp-full-overlay .collapse-sidebar-label{position:absolute;left:100%;line-height:20px;margin-left:10px}.wp-full-overlay.collapsed .collapse-sidebar-label{display:none}.wp-full-overlay .theme-navigation{padding:10px 20px;position:absolute;bottom:10px;text-align:left}.wp-full-overlay .theme-navigation .next-theme{float:right}.wp-full-overlay.no-navigation .theme-navigation{display:none}.wp-full-overlay,.wp-full-overlay .collapse-sidebar,.wp-full-overlay-main,.wp-full-overlay-sidebar{-webkit-transition-property:left,right,top,bottom,width,margin;transition-property:left,right,top,bottom,width,margin;-webkit-transition-duration:.2s;transition-duration:.2s}.customize-support .hide-if-customize,.customize-support .wp-core-ui .hide-if-customize,.customize-support.wp-core-ui .hide-if-customize,.no-customize-support .hide-if-no-customize,.no-customize-support .wp-core-ui .hide-if-no-customize,.no-customize-support.wp-core-ui .hide-if-no-customize{display:none}#customize-container{display:none;background:#fff;z-index:500000;position:fixed;overflow:visible;top:0;bottom:0;left:0;right:0;height:100%}.customize-active #customize-container{display:block}.customize-loading #customize-container iframe{opacity:0}.customize-loading #customize-container{background:#fff url(../images/spinner.gif) no-repeat fixed center center;-webkit-background-size:20px 20px;background-size:20px 20px}#customize-container iframe,.theme-install-overlay iframe{height:100%;width:100%;z-index:20;-webkit-transition:opacity .3s;transition:opacity .3s}#customize-container .collapse-sidebar{bottom:16px}#customize-controls{margin-top:0}.theme-install-overlay{display:none}.theme-install-overlay.single-theme{display:block}.install-theme-info{display:none;padding:10px 20px 60px}.single-theme .install-theme-info{padding-top:15px}.theme-install-overlay .install-theme-info{display:block}.install-theme-info .theme-install{float:right;margin-top:18px}.install-theme-info .theme-name{font-size:16px;line-height:24px;margin-bottom:0;margin-top:0}.install-theme-info .theme-screenshot{margin-top:15px;width:258px;border:1px solid #ccc}.install-theme-info .theme-details{overflow:hidden}.theme-details .theme-version{margin:15px 0;float:left}.theme-details .star-rating{margin:7px 0;float:right}.theme-details .theme-description{float:left;color:#777;line-height:20px;max-width:100%}.theme-install-overlay .wp-full-overlay-header{margin-top:9px}.theme-install-overlay .wp-full-overlay-header .theme-install{float:right;line-height:26px}.theme-install-overlay .wp-full-overlay-sidebar{background:#EEE;border-right:1px solid #DDD}.theme-install-overlay .wp-full-overlay-main{background:#fff url(../images/spinner.gif) no-repeat center center;-webkit-background-size:20px 20px;background-size:20px 20px}@media print,(-o-min-device-pixel-ratio:5/4),(-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.wp-full-overlay .collapse-sidebar-arrow{background-image:url(../images/arrows-2x.png);-webkit-background-size:15px 123px;background-size:15px 123px}.customize-loading #customize-container,.theme-install-overlay .wp-full-overlay-main{background-image:url(../images/spinner-2x.gif)}}@media screen and (max-width:782px){.available-theme .action-links .delete-theme{float:none;margin:0;padding:0;clear:both}.available-theme .action-links .delete-theme a{padding:0}}.press-this #message{border-left:4px solid #7ad03a;padding:1px 12px;background-color:#fff;-webkit-box-shadow:0 1px 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 1px 0 rgba(0,0,0,.1)}.press-this #side-sortables .category-tabs li{display:inline;line-height:1.35em}body.press-this ul.category-tabs li.tabs a{color:#333}.press-this #content-resize-handle{bottom:2px}body.press-this{color:#333;margin:0;padding:0;min-width:708px;min-height:400px}.press-this #titlediv #title{font-size:1.4em}.press-this #site-heading:before{top:3px;position:relative;display:inline-block;font:400 18px/1 dashicons;speak:none;color:#727272;content:'\f120';-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.press-this #wphead{height:32px;margin-left:0;margin-right:0;margin-bottom:5px}.press-this #header-logo{float:left;margin:7px 7px 0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.press-this #wphead h1{font-weight:400;font-size:16px;line-height:32px;margin:0;float:left}.press-this #wphead h1 a{text-decoration:none}.press-this #wphead h1 a:hover{text-decoration:underline}.press-this #message{margin:10px 0}.press-this .posting{margin-right:250px}.press-this-sidebar{float:right;width:240px;padding-top:10px}.press-this #title{margin-left:0;margin-right:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.press-this .tagchecklist{margin-top:8px}.press-this #titlediv{margin:0}.press-this #wp-content-wrap #wp-content-editor-tools{padding:0;top:3px;overflow:hidden}.press-this .wp-media-buttons{cursor:default;padding:8px 8px 6px}.press-this #wp-content-wrap #wp-content-media-buttons a{padding:0;line-height:normal;height:auto;font-size:16px}.press-this #wp-content-wrap .mce-toolbar .mce-btn-group .mce-btn{margin:0 1px}.press-this #wp-content-wrap .mce-toolbar .mce-btn button{padding:2px 3px}.press-this #wp-content-wrap .quicktags-toolbar,.press-this #wp-content-wrap div.mce-toolbar-grp{padding-right:3px}.press-this .howto{margin-top:2px;margin-bottom:3px;font-size:12px;font-style:italic;display:block}.press-this #wp-content-editor-container{clear:none}.press-this #poststuff .inside{margin-top:18px}.press-this .category-tabs{margin-bottom:3px}.press-this #poststuff{margin:0 8px;padding:0}.press-this #photo-add-url-div input[type=text]{width:220px}#poststuff #editor-toolbar{height:30px}.posting{margin-right:212px;position:relative}.press-this .inner-sidebar{width:200px}.press-this .inner-sidebar .sleeve{padding-top:5px}.press-this #submitdiv p{margin:0;padding:6px}.press-this #submitdiv #publishing-actions{border-bottom:1px solid #dfdfdf}.press-this #publish{float:right}.press-this #poststuff h2,.press-this #poststuff h3{font-size:14px;line-height:1}.press-this #categorydiv h3,.press-this #tagsdiv-post_tag h3{cursor:pointer}.press-this #submitdiv h3{cursor:default}h3.tb{font-weight:600;font-size:12px;margin-left:5px}.press-this .postbox,.press-this .stuffbox{margin-bottom:10px;min-width:0}.press-this #submitdiv:hover .handlediv{background:0 0}.tbtitle{font-size:1.7em;outline:0;padding:3px 4px;border:1px solid #dfdfdf}.press-this .actions{float:right;margin:-19px 0 0}.press-this #extra-fields .actions{margin:-32px -7px 0 0}.press-this .actions li{float:left;list-style:none;margin-right:10px}#extra-fields .button{margin-right:5px}#photo_saving{margin:0 8px 8px;vertical-align:middle}#img_container_container{overflow:auto}#extra-fields{margin-top:10px;position:relative}#extra-fields h2{margin:12px}#waiting{margin-top:10px;overflow:hidden}#waiting span{float:right;margin:0 0 0 5px}#waiting .spinner{display:block}#extra-fields .postbox{margin-bottom:5px}#extra-fields .titlewrap{padding:0;overflow:auto;height:120px}#img_container a{float:left;overflow:hidden}#img_container a,#img_container img{width:68px;height:68px}#img_container img{border:0;background-color:#f4f4f4;cursor:pointer}#img_container a,#img_container a:link,#img_container a:visited{border:1px solid #ccc;display:block;position:relative}#img_container a:active,#img_container a:hover{border-color:#000;z-index:1000;border-width:1px}#embed-code{width:100%;height:98px}.press-this .categorydiv div.tabs-panel{height:100px}.press-this .tagsdiv .newtag{width:120px}.press-this #content{margin:5px 0;padding:0 5px;border:0 none;height:340px;font-family:Consolas,Monaco,monospace;font-size:13px;line-height:19px;background:0 0}.press-this #publishing-actions .spinner{display:inline;vertical-align:middle}@media screen and (max-width:782px){.press-this ul.category-tabs li.tabs{padding:3px 5px 5px}.press-this a.wp-switch-editor{font:13px/19px "Open Sans",sans-serif;margin:5px 0 0 5px;padding:3px 8px 4px}.press-this #wp-content-media-buttons a{padding:0;line-height:normal;height:auto}.press-this #wp-content-editor-tools{padding:0;top:3px}.press-this .category-tabs{margin-top:0}.press-this .tagsdiv .newtag{width:120px;padding:3px 5px;margin-bottom:0}.press-this .tagchecklist{padding:0;margin-bottom:0}.press-this .wp_themeSkin a.mceButton{width:20px;height:20px}.press-this .wp_themeSkin .mceButton .mceIcon{margin:0}.press-this #poststuff h3,.press-this .metabox-holder h3{padding:7px 12px}.press-this input[type=checkbox],.press-this input[type=radio]{height:16px;width:16px}.press-this input[type=checkbox]:checked:before{width:16px;font:400 21px/1 dashicons;margin:-3px 0 0 -4px}.press-this input[type=radio]:checked:before{font:400 21px/1 dashicons;width:6px;height:6px;margin:4px}.press-this ul.categorychecklist li,.press-this ul.categorychecklist ul{margin-top:0;margin-bottom:0}.press-this div.quicktags-toolbar input{padding:2px 4px}.press-this input,.press-this textarea{font-size:14px}.press-this .tagchecklist span{font-size:13px;line-height:1.8em}}.about-wrap{position:relative;margin:25px 40px 0 20px;max-width:1050px;font-size:15px}.about-wrap div.error,.about-wrap div.updated{display:none!important}.about-wrap hr{border:0;height:0;margin:0;border-top:1px solid rgba(0,0,0,.1)}.about-wrap img{margin:0;max-width:100%;vertical-align:middle}.about-wrap p{line-height:1.6em;font-size:14px}.about-wrap h1{margin:.2em 200px 0 0;color:#333;line-height:1.2em;font-size:2.8em;font-weight:400}.about-wrap h4{color:#222}.about-wrap .about-text,.about-wrap li.wp-person a.web,.about-wrap p.about-description{font-weight:400;line-height:1.6em;font-size:19px}.about-description{margin-top:1.4em}.about-text{margin:1em 200px 1em 0;min-height:60px;color:#777;font-size:24px}.about-wrap .changelog h2.about-headline-callout{margin:1.1em 0 .2em;font-size:2.4em;font-weight:300;line-height:1.3;text-align:center}.about-wrap h3{margin:1em 0 .6em;font-size:1.5em;line-height:1.5em}.customize h3{margin-top:1.75em;text-align:center}.about-wrap .feature-section h4{margin:1.4em 0 .6em;font-size:1.2em}.about-wrap .feature-section p{margin-top:.6em}.about-wrap code,.about-wrap ol li p{font-size:14px}.about-wrap .button.button-large{padding:8px 20px 10px!important;height:46px!important;font-size:14px;line-height:28px!important}.about-wrap .about-overview-img{margin:0}.about-wrap .point-releases{margin-top:5px;border-bottom:1px solid #dfdfdf}.about-wrap .changelog.point-releases h3{padding-top:35px}.about-wrap .changelog.point-releases h3:first-child{padding-top:7px}.wp-badge{background:#0074a2 url(../images/w-logo-white.png?ver=20131202) no-repeat;background:#0074a2,url(../images/wordpress-logo-white.svg?ver=20131110) no-repeat;background-position:center 24px;-webkit-background-size:85px 85px;background-size:85px 85px;color:#78c8e6;font-size:14px;text-align:center;font-weight:600;margin:5px 0 0;padding-top:120px;height:40px;display:inline-block;width:150px;text-rendering:optimizeLegibility;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.2);box-shadow:0 1px 3px rgba(0,0,0,.2)}.about-wrap .wp-badge{position:absolute;top:0;right:0}.about-wrap h2.nav-tab-wrapper{padding-left:6px}.about-wrap h2 .nav-tab{padding:4px 15px 6px;margin:0 3px -1px 0;font-size:18px;vertical-align:top;border-width:1px}.about-overview{margin-top:40px;text-align:center}.about-overview .wp-video{margin:0 auto}.changelog .wp-playlist .wp-playlist-current-item img{height:64px;width:auto;max-width:100%}.about-wrap .feature-section{margin-top:40px;padding-bottom:20px}.about-wrap .feature-section.two-col>div{position:relative;width:47.5%;margin-right:4.999999999%;float:left}.about-wrap .feature-section.three-col>div{position:relative;width:29.95%;margin-right:4.999999999%;float:left}.about-wrap .feature-section.col .last-feature{margin-right:0}.about-wrap .under-the-hood .feature-section{margin-top:0}.about-wrap .changelog .feature-section{overflow:hidden}.about-wrap .feature-section.two-col div p{margin-right:3%}.about-wrap .feature-section div p img{float:right;margin-left:10px;max-width:20%}.about-wrap .changelog li{list-style-type:disc;margin-left:3em}.about-wrap .return-to-dashboard{margin:30px 0 0 -5px;font-size:14px;font-weight:700}.about-wrap .return-to-dashboard a{text-decoration:none;padding:0 5px}.about-wrap h4.wp-people-group{margin-top:2.6em;font-size:16px}.about-wrap ul.wp-people-group{overflow:hidden;padding:0 5px;margin:0 -15px 0 -5px}.about-wrap ul.compact{margin-bottom:0}.about-wrap li.wp-person{float:left;margin-right:10px}.about-wrap li.wp-person img.gravatar{float:left;margin:0 10px 10px 0;padding:2px;width:60px;height:60px}.about-wrap ul.compact li.wp-person img.gravatar{width:30px;height:30px}.about-wrap li.wp-person{height:70px;width:280px;padding-bottom:15px}.about-wrap ul.compact li.wp-person{height:auto;width:180px;padding-bottom:0;margin-bottom:0}.about-wrap #wp-people-group-validators+p.wp-credits-list{margin-top:0}.about-wrap li.wp-person a.web{display:block;margin:6px 0 2px;font-size:16px;text-decoration:none}.about-wrap p.wp-credits-list a{white-space:nowrap}.freedoms-php .about-wrap ol{margin:40px 60px}.freedoms-php .about-wrap ol li{list-style-type:decimal;font-weight:700}.freedoms-php .about-wrap ol p{font-weight:400;margin:.6em 0}@media screen and (max-width:782px){.about-wrap .feature-section.one-col>div,.about-wrap .feature-section.three-col>div,.about-wrap .feature-section.two-col>div{width:100%;margin:0 0 40px;padding:0 0 40px;float:none;border-bottom:1px solid rgba(0,0,0,.1)}.about-wrap .feature-section.col>div.last-feature,.about-wrap .under-the-hood .feature-section>div{margin:0;padding:0;border-bottom:0}}@media only screen and (max-width:500px){.about-wrap{margin-right:20px;margin-left:10px}.about-text,.about-wrap h1{margin-right:0}.about-text{margin-bottom:.25em}.about-wrap .wp-badge{position:relative;margin-bottom:1.5em;width:100%}.about-wrap .feature-section.three-col div{width:100%;float:none}.about-wrap .three-col.about-updates .col-1{padding:0;float:none}.about-wrap .three-col.about-updates .col-2{margin:0 0 20px;width:100%;float:none}}.no-js #message{display:block}ul.add-menu-item-tabs li{padding:3px 5px 3px 8px}.accordion-section ul.add-menu-item-tabs,.accordion-section ul.category-tabs,.accordion-section ul.wp-tab-bar{margin:0}.accordion-section .categorychecklist{margin:13px 0}#nav-menu-meta .accordion-section-content{padding:18px 13px}#nav-menu-meta .button-controls{margin-bottom:0}#nav-menus-frame{margin-left:300px;margin-top:23px}#wpbody-content #menu-settings-column{display:inline;width:281px;margin-left:-300px;clear:both;float:left;padding-top:0}#menu-settings-column .inside{clear:both;margin:10px 0 0}.metabox-holder-disabled .accordion-section-content,.metabox-holder-disabled .accordion-section-title,.metabox-holder-disabled .postbox{opacity:.5;filter:alpha(opacity=50)}.metabox-holder-disabled .button-controls .select-all{display:none}#wpbody{position:relative}.blank-slate .menu-name{height:2em}.blank-slate .menu-settings{border:0;margin-top:0;padding-top:0;overflow:hidden}.is-submenu{color:#999;font-style:italic;font-weight:400;margin-left:4px}.manage-menus{margin-top:23px;padding:10px;overflow:hidden;background:#fbfbfb}.manage-menus select{float:left;margin-right:6px}.manage-menus .selected-menu{float:left;margin:5px 6px 0 0}.manage-menus .submit-btn{float:left;margin-top:1px}.menu-edit p{margin:.3em 0 .6em}.menu-edit #post-body-content h3{margin:1em 0 10px}.menu-settings{border-top:1px solid #eee;margin-top:2em}.menu-settings dl{margin:0 0 10px;overflow:hidden;padding-left:18%}.menu-settings dd{float:left;margin:0;width:100%}.menu-settings dt{float:left;clear:both;width:21.951%;padding:3px 0 0;margin-left:-21.951%}.menu-settings label{vertical-align:baseline}.menu-edit .checkbox-input{margin-top:4px}.theme-location-set{color:#999;font-size:11px}#menu-management-liquid{float:left;min-width:100%;margin-top:3px}#menu-management{position:relative;margin-right:20px;margin-top:-3px;width:100%;background:#f5f5f5}#menu-management .menu-edit{margin-bottom:20px}.nav-menus-php #post-body{padding:0 10px 10px;border-top:1px solid #fff;border-bottom:1px solid #dfdfdf;background:#fff}#nav-menu-footer,#nav-menu-header{padding:0 10px}#nav-menu-header{border-bottom:1px solid #dfdfdf;margin-bottom:0}#nav-menu-header .menu-name-label{margin-top:4px}.nav-menus-php #post-body div.error,.nav-menus-php #post-body div.updated{margin:0}.nav-menus-php #post-body-content{position:relative;float:none}#menu-management .menu-add-new abbr{font-weight:600}#select-nav-menu-container{text-align:right;padding:0 10px 3px;margin-bottom:5px}#select-nav-menu{width:100px;display:inline}#menu-name-label{margin-top:-2px}.widefat td.menu-location-menus{padding-bottom:5px}.menu-location-menus select{float:left}#locations-nav-menu-wrapper{padding:5px 0}.locations-nav-menu-select select{float:left;width:160px;margin-right:5px}.locations-row-links{float:left;margin:6px 0 0 6px}.locations-add-menu-link,.locations-edit-menu-link{margin:0 3px}.locations-edit-menu-link{padding-right:3px;border-right:1px solid #ccc}#wpbody .open-label{display:block;float:left}#wpbody .open-label span{padding-right:10px}.js .input-with-default-title{color:#aaa;font-style:italic}#menu-management .inside{padding:0 10px}.accordion-container .howto input,.postbox .howto input{width:180px;float:right}.accordion-container .outer-border{margin:0}.customlinkdiv .howto input{width:180px}.customlinkdiv p{margin-top:0}#nav-menu-theme-locations .howto select{width:100%}#nav-menu-theme-locations .button-controls{text-align:right}.add-menu-item-view-all{height:400px}#menu-container .submit{margin:0 0 10px;padding:0}.nav-menus-php .add-new-menu-action{float:left;margin:6px 0 0 6px;line-height:15px}.nav-menus-php .meta-sep,.nav-menus-php .submitcancel,.nav-menus-php .submitdelete{display:block;float:left;margin:6px 0;line-height:15px}.meta-sep{padding:0 2px}#cancel-save{text-decoration:underline;font-size:12px;margin-left:20px;margin-top:5px}.button-primary.right,.button-secondary.right,.button.right{float:right}.list-controls{float:left;margin-top:5px}.add-to-menu{float:right}.postbox .spinner{display:none;vertical-align:middle}.button-controls{clear:both;margin:10px 0}.hide-all,.show-all{cursor:pointer}.hide-all{display:none}#menu-name{width:270px}#manage-menu .inside{padding:0}#available-links dt{display:block}#add-custom-link .howto{font-size:12px}#add-custom-link label span{display:block;float:left;margin-top:5px;padding-right:5px}.menu-item-textbox{width:180px}.nav-menus-php .howto span{margin-top:6px;display:block;float:left}.quick-search{width:190px}.nav-menus-php .list-wrap{display:none;clear:both;margin-bottom:10px}.nav-menus-php .postbox p.submit{margin-bottom:0}.nav-menus-php .list li{display:none;margin:0;margin-bottom:5px}.nav-menus-php .list li .menu-item-title{cursor:pointer;display:block}.nav-menus-php .list li .menu-item-title input{margin-right:3px;margin-top:-3px}.menu-item-title input[type=checkbox]{display:inline-block;margin-top:-4px}#menu-container .inside{padding-bottom:10px}.menu{padding-top:1em}#menu-to-edit{margin:0;padding:.1em 0}.menu ul{width:100%}.menu li{margin-bottom:0;position:relative}.menu-item-bar{clear:both;line-height:1.5em;position:relative;margin:9px 0 0}.menu-item-bar .menu-item-handle{border:1px solid #dfdfdf;position:relative;padding:10px 15px;height:auto;width:382px;line-height:30px;overflow:hidden;word-wrap:break-word}.menu-item-bar .menu-item-handle:hover{border-color:#999}#menu-to-edit .menu-item-invalid .menu-item-handle{background:#f6c9cc;border-color:#f1acb1}.no-js .menu-item-edit-active .item-edit{display:none}.js .menu-item-handle{cursor:move}.menu li.deleting .menu-item-handle{background-image:none;background-color:#f66}.menu-item-handle .item-title{font-size:13px;font-weight:600;line-height:20px;display:block;margin-right:13em}li.menu-item.ui-sortable-helper dl{margin-top:0}li.menu-item.ui-sortable-helper .menu-item-transport dl{margin-top:13px}.menu .sortable-placeholder{height:35px;width:410px;margin-top:13px}.menu-item-depth-0{margin-left:0}.menu-item-depth-1{margin-left:30px}.menu-item-depth-2{margin-left:60px}.menu-item-depth-3{margin-left:90px}.menu-item-depth-4{margin-left:120px}.menu-item-depth-5{margin-left:150px}.menu-item-depth-6{margin-left:180px}.menu-item-depth-7{margin-left:210px}.menu-item-depth-8{margin-left:240px}.menu-item-depth-9{margin-left:270px}.menu-item-depth-10{margin-left:300px}.menu-item-depth-11{margin-left:330px}.menu-item-depth-0 .menu-item-transport{margin-left:0}.menu-item-depth-1 .menu-item-transport{margin-left:-30px}.menu-item-depth-2 .menu-item-transport{margin-left:-60px}.menu-item-depth-3 .menu-item-transport{margin-left:-90px}.menu-item-depth-4 .menu-item-transport{margin-left:-120px}.menu-item-depth-5 .menu-item-transport{margin-left:-150px}.menu-item-depth-6 .menu-item-transport{margin-left:-180px}.menu-item-depth-7 .menu-item-transport{margin-left:-210px}.menu-item-depth-8 .menu-item-transport{margin-left:-240px}.menu-item-depth-9 .menu-item-transport{margin-left:-270px}.menu-item-depth-10 .menu-item-transport{margin-left:-300px}.menu-item-depth-11 .menu-item-transport{margin-left:-330px}body.menu-max-depth-0{min-width:950px!important}body.menu-max-depth-1{min-width:980px!important}body.menu-max-depth-2{min-width:1010px!important}body.menu-max-depth-3{min-width:1040px!important}body.menu-max-depth-4{min-width:1070px!important}body.menu-max-depth-5{min-width:1100px!important}body.menu-max-depth-6{min-width:1130px!important}body.menu-max-depth-7{min-width:1160px!important}body.menu-max-depth-8{min-width:1190px!important}body.menu-max-depth-9{min-width:1220px!important}body.menu-max-depth-10{min-width:1250px!important}body.menu-max-depth-11{min-width:1280px!important}.item-type{color:#777;font-size:12px;padding:12px 10px;line-height:18px;display:block}.item-controls{font-size:12px;position:absolute;right:20px;top:-1px}.item-controls a{text-decoration:none}.item-controls a:hover{cursor:pointer}.item-controls .item-order{padding-right:10px}.nav-menus-php .item-edit{position:absolute;right:-20px;top:0;display:block;width:30px;height:40px;margin-right:0!important;text-indent:100%;outline:0;overflow:hidden;white-space:nowrap}.menu-instructions-inactive{display:none}.menu-item-settings{display:block;width:402px;padding:10px 0 10px 10px;position:relative;z-index:10;border:1px solid #e5e5e5;border-top:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04)}.menu-item-settings .field-move a{display:none;margin:0 2px}.menu-item-edit-active .menu-item-settings{display:block}.menu-item-edit-inactive .menu-item-settings{display:none}.add-menu-item-pagelinks{margin:.5em auto;text-align:center}.link-to-original{display:block;margin:0 0 10px;padding:3px 5px 5px;border:1px solid #dfdfdf;color:#777;font-size:12px;font-style:italic}.link-to-original a{padding-left:4px;font-style:normal}.hidden-field{display:none}.menu-item-settings .description-thin,.menu-item-settings .description-wide{margin-right:10px;float:left}.description-thin{width:190px;height:40px}.description-wide{width:390px}.menu-item-actions{padding-top:15px}#cancel-save{cursor:pointer}.nav-menus-php .major-publishing-actions{clear:both;padding:3px 0 6px}.nav-menus-php .major-publishing-actions .publishing-action{text-align:right;float:right;line-height:23px;margin:4px 0 1px}.nav-menus-php .blank-slate .menu-settings{display:none}.nav-menus-php .delete-action{float:left;margin-top:2px}.nav-menus-php .submitbox .submitcancel{border-bottom:1px solid #0074a2;padding:1px 2px;color:#0074a2;text-decoration:none}.nav-menus-php .submitbox .submitcancel:hover{background:#0074a2;color:#fff}.nav-menus-php .major-publishing-actions .form-invalid{padding-left:4px;margin-left:-4px}#menu-item-name-wrap:after,#menu-item-url-wrap:after,#menu-name-label:after,#menu-settings-column .inside:after,#nav-menus-frame:after,.nav-menus-php #post-body-content:after,.nav-menus-php .button-controls:after,.nav-menus-php .major-publishing-actions:after,.nav-menus-php .menu-item-settings:after{clear:both;content:".";display:block;height:0;visibility:hidden}#menu-item-name-wrap,#menu-item-url-wrap,#nav-menus-frame,.button-controls{display:block}@media screen and (max-width:782px){body.nav-menus-php{min-width:0!important}#nav-menus-frame{margin-left:0;float:none;width:100%}#wpbody-content #menu-settings-column{display:block;width:100%;float:none;margin-left:0}#side-sortables .add-menu-item-tabs{margin:15px 0 14px}ul.add-menu-item-tabs li.tabs{padding:13px 15px 14px}.nav-menus-php .item-controls .item-type{margin-top:2px}.nav-menus-php .customlinkdiv .howto input{width:65%}.nav-menus-php .quick-search{width:85%}#menu-management-liquid{margin-top:25px}.nav-menus-php .menu-name-label.howto span{margin-top:13px}.menu-name-label #menu-name{margin-top:4px}.nav-menus-php .major-publishing-actions .publishing-action{margin-top:6px}.nav-menus-php .delete-action{font-size:14px;line-height:50px;margin-top:12px}.description-wide,.menu-item-bar .menu-item-handle,.menu-item-settings{width:auto}.menu-item-settings{padding:10px}.menu-item-settings .description-thin,.menu-item-settings .description-wide{width:100%;height:auto}.menu-item-settings input{width:100%}.menu-settings dl{padding-left:0}.menu-settings dd{float:none;width:100%;margin-bottom:15px}.menu-settings dt{float:none;width:auto;margin-left:0;margin-bottom:15px}}@media only screen and (max-width:768px){#menu-locations-wrap .widefat{width:100%}}.widget{margin:0 auto 10px;position:relative;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.widget-top{font-size:13px;font-weight:600;background:#f7f7f7}.widget-top a.widget-action,.widget-top a.widget-action:hover{text-decoration:none}.widget-title h4{margin:0;padding:15px;line-height:1;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.widgets-holder-wrap .widget-inside{border-top:0;padding:1px 15px 15px;line-height:16px}#available-widgets .widget-description,#widgets-right a.widget-control-edit,.in-widget-title{color:#666}.deleting .widget-title,.deleting .widget-top a.widget-action:after{color:#aaa}.widget.ui-draggable-dragging{min-width:100%}.widget.ui-sortable-helper{opacity:.8}.widget-placeholder{border:1px dashed #bbb;margin:0 auto 10px;height:45px;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#widgets-right .widget-placeholder{margin-top:0}#widgets-right .closed .widget-placeholder{height:0;border:0;margin-top:-10px}.sidebar-name{position:relative;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.sidebar-name-arrow{position:absolute;top:0;right:0;bottom:0}.js .sidebar-name{cursor:pointer}.sidebar-name h3{margin:0;padding:8px 10px;overflow:hidden;white-space:nowrap}.widgets-holder-wrap .description{padding:0 0 15px;margin:0;font-style:normal;color:#777}#widgets-right .widgets-holder-wrap .description{padding-left:7px;padding-right:7px}div.widget-liquid-left{margin:0;width:38%;float:left}div.widget-liquid-right{float:right;width:58%}div#widgets-left{padding-top:12px}div#widgets-left .closed .sidebar-name,div#widgets-left .inactive-sidebar.closed .sidebar-name{margin-bottom:10px}div#widgets-left .sidebar-name h3{padding:10px 0;margin:0 10px 0 0}div#widgets-left .sidebar-name .sidebar-name-arrow:before{right:0;top:4px;padding:4px 6px 4px 4px}#widgets-left #available-widgets,div#widgets-left .widget-holder{background:0 0;border:0}#widgets-left .widgets-holder-wrap{border:0;-webkit-box-shadow:none;box-shadow:none}#available-widgets .widget-action{display:none}#available-widgets .widget{margin:0}#available-widgets .widget:nth-child(odd){clear:both}#available-widgets .widget .widget-description{display:block;padding:10px 15px;font-size:12px}#available-widgets #widget-list{position:relative}#widgets-left .inactive-sidebar{clear:both;width:100%;background:0 0;padding:0;margin:0 0 20px;border:0;-webkit-box-shadow:none;box-shadow:none}#widgets-left .inactive-sidebar.first{margin-top:40px}div#widgets-left .inactive-sidebar .widget.expanded{left:auto}.widget-title-action{float:right;position:relative}div#widgets-left .inactive-sidebar .widgets-sortables{min-height:42px;padding:0;background:0 0;margin:0;position:relative}div#widgets-right:after{content:".";display:block;height:0;clear:both;visibility:hidden}div#widgets-right .sidebars-column-1,div#widgets-right .sidebars-column-2{max-width:450px}div#widgets-right .widgets-holder-wrap{margin:10px 0 0}div#widgets-right .sidebar-description{min-height:20px;margin-top:-5px}div#widgets-right .sidebar-name h3{padding:15px 7px}div#widgets-right .sidebar-name .sidebar-name-arrow:before{right:0;top:4px}div#widgets-right .widget-top{padding:0}div#widgets-right .widgets-sortables{padding:0 8px;margin-bottom:9px;position:relative;min-height:123px}div#widgets-right .closed .widgets-sortables{min-height:0;margin-bottom:0}.sidebar-name .spinner{margin:-5px 5px;float:none}#widgets-right .widgets-holder-wrap.widget-hover{border-color:#777;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.3);box-shadow:0 1px 2px rgba(0,0,0,.3)}.widgets_access #widgets-left .widget .widget-top{cursor:auto}.widgets_access #wpwrap .widget-control-edit,.widgets_access #wpwrap .widgets-holder-wrap.closed .sidebar-description,.widgets_access #wpwrap .widgets-holder-wrap.closed .widget{display:block}.widgets_access #widgets-left .widget .widget-top:hover,.widgets_access #widgets-right .widget .widget-top:hover{border-color:#ddd}#available-widgets .widget-control-edit .edit,#widgets-left .inactive-sidebar .widget-control-edit .add,#widgets-right .widget-control-edit .add{display:none}.widget-control-edit{display:block;color:#666;background:#EEE;padding:0 15px;line-height:43px;border-left:1px solid #DDD}#widgets-left .widget-control-edit:hover,#widgets-right .widget-control-edit:hover{color:#fff;background:#444;border-left:0;outline:1px solid #444}.widgets-holder-wrap .sidebar-description,.widgets-holder-wrap .sidebar-name{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.editwidget{margin:0 auto}.editwidget .widget-inside{display:block;padding:0 15px}.editwidget .widget-control-actions{margin-top:20px}.js .closed br.clear,.js .widgets-holder-wrap.closed .sidebar-description,.js .widgets-holder-wrap.closed .widget,.widget-description,.widget-inside{display:none}.widget-inside{background:#fff}#removing-widget{display:none;font-weight:400;padding-left:15px;font-size:12px;line-height:1;color:#000}.js #removing-widget{color:#2ea2cc}#access-off,.no-js .widget-holder .description,.widget-control-noform,.widgets_access #access-on,.widgets_access .sidebar-name-arrow,.widgets_access .widget-action,.widgets_access .widget-holder .description{display:none}.widgets_access #widget-list,.widgets_access .widget-holder{padding-top:10px}.widgets_access #access-off{display:inline}.widgets_access .sidebar-name,.widgets_access .widget .widget-top{cursor:default}.widget-liquid-left #widgets-left.chooser #available-widgets .widget,.widget-liquid-left #widgets-left.chooser .inactive-sidebar{-webkit-transition:opacity .1s linear;transition:opacity .1s linear;opacity:.2;pointer-events:none}.widget-liquid-left #widgets-left.chooser #available-widgets .widget-in-question{opacity:1;pointer-events:auto}#available-widgets .widget-top:hover,#widgets-left .widget-in-question .widget-top,#widgets-left .widget-top:hover,.widgets-chooser ul,div#widgets-right .widget-top:hover{border-color:#999;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.1);box-shadow:0 1px 2px rgba(0,0,0,.1)}.widgets-chooser ul.widgets-chooser-sidebars{margin:0;list-style-type:none;max-height:300px;overflow:auto}.widgets-chooser{display:none}.widgets-chooser ul{border:1px solid #ccc}.widgets-chooser li{padding:10px 15px 10px 35px;border-bottom:1px solid #ccc;background:#fff;margin:0;cursor:pointer;outline:0;position:relative;-webkit-transition:background .2s ease-in-out;transition:background .2s ease-in-out}.widgets-chooser li:focus,.widgets-chooser li:hover{background:rgba(255,255,255,.7)}.widgets-chooser li:focus:before{content:'\f147';display:block;-webkit-font-smoothing:antialiased;font:400 26px/1 dashicons;color:#999;position:absolute;top:7px;left:5px}.widgets-chooser li:last-child{border:0}.widgets-chooser li.widgets-chooser-selected{background:#2ea2cc;color:#fff}.widgets-chooser li.widgets-chooser-selected:before,.widgets-chooser li.widgets-chooser-selected:focus:before{content:'\f147';display:block;-webkit-font-smoothing:antialiased;font:400 26px/1 dashicons;color:#fff;position:absolute;top:7px;left:5px}.widgets-chooser .widgets-chooser-actions{padding:10px 0 12px;text-align:center}.widgets-chooser button{margin-right:5px}#available-widgets .widget .widget-top{cursor:pointer}@media screen and (max-width:480px){div.widget-liquid-left{width:100%;float:none;border-right:0;padding-right:0}#widgets-left #available-widgets .widget-top,#widgets-left .inactive-sidebar .widgets-sortables,#widgets-left .sidebar-name{margin-right:0}div.widget-liquid-right{width:100%;float:none}div.widget{margin:0 auto 10px!important;max-width:480px}}@media screen and (max-width:320px){div.widget{max-width:320px}}@media only screen and (min-width:1250px){#widgets-left #available-widgets .widget{width:49%;float:left}.widget.ui-draggable-dragging{min-width:49%}#widgets-left #available-widgets .widget:nth-child(even){float:right}#widgets-right .sidebars-column-1,#widgets-right .sidebars-column-2{float:left;width:49%}#widgets-right .sidebars-column-1{margin-right:2%}#widgets-right.single-sidebar .sidebars-column-1,#widgets-right.single-sidebar .sidebars-column-2{float:none;width:100%;margin:0}}body.rtl,body.rtl .press-this a.wp-switch-editor{font-family:Tahoma,Arial,sans-serif}body.locale-he-il,body.locale-he-il .press-this a.wp-switch-editor{font-family:Arial,sans-serif}.locale-he-il em{font-style:normal;font-weight:700}.locale-zh-cn #local-time,.locale-zh-cn #utc-time,.locale-zh-cn .form-wrap p,.locale-zh-cn .howto,.locale-zh-cn .inline-edit-row fieldset span.checkbox-title,.locale-zh-cn .inline-edit-row fieldset span.title,.locale-zh-cn .js .input-with-default-title,.locale-zh-cn .link-to-original,.locale-zh-cn .tablenav .displaying-num,.locale-zh-cn p.description,.locale-zh-cn p.help,.locale-zh-cn p.install-help,.locale-zh-cn span.description{font-style:normal}.locale-zh-cn .hdnle a{font-size:12px}.locale-zh-cn form.upgrade .hint{font-style:normal;font-size:100%}.locale-zh-cn #wp-fullscreen-tagline{font-family:KaiTi,"æ¥·ä½",sans-serif}.locale-zh-cn #wp-fullscreen-modes a{font-size:12px}.locale-zh-cn #sort-buttons{font-size:1em!important}.locale-de-de .inline-edit-row fieldset label span.title{width:7em}.locale-de-de .inline-edit-row fieldset label span.input-text-wrap{margin-left:7em}.locale-de-de #customize-header-actions .button{padding:0 5px 1px}.locale-de-de #customize-header-actions .spinner{margin:16px 3px 0}.locale-ru-ru .inline-edit-row fieldset label span.title{width:8em}.locale-ru-ru .inline-edit-row fieldset label span.input-text-wrap{margin-left:8em}.locale-ru-ru.post-php .tagsdiv .newtag{width:165px}.locale-ru-ru.press-this .posting{margin-right:277px}.locale-ru-ru .press-this-sidebar{width:265px}.locale-ru-ru #customize-header-actions .button{padding:0 5px 1px}.locale-ru-ru #customize-header-actions .spinner{margin:16px 3px 0}.locale-lt-lt .inline-edit-row fieldset label span.title{width:8em}.locale-lt-lt .inline-edit-row fieldset label span.input-text-wrap{margin-left:8em} \ No newline at end of file +@import url(common.min.css); +@import url(forms.min.css); +@import url(admin-menu.min.css); +@import url(dashboard.min.css); +@import url(list-tables.min.css); +@import url(edit.min.css); +@import url(revisions.min.css); +@import url(media.min.css); +@import url(themes.min.css); +@import url(about.min.css); +@import url(nav-menus.min.css); +@import url(widgets.min.css); +@import url(site-icon.min.css); +@import url(l10n.min.css); diff --git a/wp-admin/custom-background.php b/wp-admin/custom-background.php index e53cd7d..dba32c6 100644 --- a/wp-admin/custom-background.php +++ b/wp-admin/custom-background.php @@ -18,43 +18,44 @@ class Custom_Background { /** * Callback for administration header. * - * @var callback + * @var callable * @since 3.0.0 - * @access private */ - var $admin_header_callback; + public $admin_header_callback; /** * Callback for header div. * - * @var callback + * @var callable * @since 3.0.0 - * @access private */ - var $admin_image_div_callback; + public $admin_image_div_callback; /** - * Holds the page menu hook. + * Used to trigger a success message when settings updated and set to true. * - * @var string * @since 3.0.0 * @access private + * @var bool */ - var $page = ''; + private $updated; /** * Constructor - Register administration header callback. * * @since 3.0.0 - * @param callback $admin_header_callback - * @param callback $admin_image_div_callback Optional custom image div output callback. - * @return Custom_Background + * @param callable $admin_header_callback + * @param callable $admin_image_div_callback Optional custom image div output callback. */ - function __construct($admin_header_callback = '', $admin_image_div_callback = '') { + public function __construct($admin_header_callback = '', $admin_image_div_callback = '') { $this->admin_header_callback = $admin_header_callback; $this->admin_image_div_callback = $admin_image_div_callback; add_action( 'admin_menu', array( $this, 'init' ) ); + + add_action( 'wp_ajax_custom-background-add', array( $this, 'ajax_background_add' ) ); + + // Unused since 3.5.0. add_action( 'wp_ajax_set-background-image', array( $this, 'wp_set_background_image' ) ); } @@ -63,18 +64,19 @@ class Custom_Background { * * @since 3.0.0 */ - function init() { - if ( ! current_user_can('edit_theme_options') ) + public function init() { + $page = add_theme_page( __( 'Background' ), __( 'Background' ), 'edit_theme_options', 'custom-background', array( $this, 'admin_page' ) ); + if ( ! $page ) { return; + } - $this->page = $page = add_theme_page(__('Background'), __('Background'), 'edit_theme_options', 'custom-background', array($this, 'admin_page')); - - add_action("load-$page", array($this, 'admin_load')); - add_action("load-$page", array($this, 'take_action'), 49); - add_action("load-$page", array($this, 'handle_upload'), 49); + add_action( "load-$page", array( $this, 'admin_load' ) ); + add_action( "load-$page", array( $this, 'take_action' ), 49 ); + add_action( "load-$page", array( $this, 'handle_upload' ), 49 ); - if ( $this->admin_header_callback ) - add_action("admin_head-$page", $this->admin_header_callback, 51); + if ( $this->admin_header_callback ) { + add_action( "admin_head-$page", $this->admin_header_callback, 51 ); + } } /** @@ -82,7 +84,7 @@ class Custom_Background { * * @since 3.0.0 */ - function admin_load() { + public function admin_load() { get_current_screen()->add_help_tab( array( 'id' => 'overview', 'title' => __('Overview'), @@ -95,7 +97,7 @@ class Custom_Background { get_current_screen()->set_help_sidebar( '<p><strong>' . __( 'For more information:' ) . '</strong></p>' . - '<p>' . __( '<a href="http://codex.wordpress.org/Appearance_Background_Screen" target="_blank">Documentation on Custom Background</a>' ) . '</p>' . + '<p>' . __( '<a href="https://codex.wordpress.org/Appearance_Background_Screen" target="_blank">Documentation on Custom Background</a>' ) . '</p>' . '<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>' ); @@ -109,8 +111,7 @@ class Custom_Background { * * @since 3.0.0 */ - function take_action() { - + public function take_action() { if ( empty($_POST) ) return; @@ -176,10 +177,23 @@ class Custom_Background { * * @since 3.0.0 */ - function admin_page() { + public function admin_page() { ?> <div class="wrap" id="custom-background"> -<h2><?php _e( 'Custom Background' ); ?></h2> +<h1><?php _e( 'Custom Background' ); ?></h1> + +<?php if ( current_user_can( 'customize' ) ) { ?> +<div class="notice notice-info hide-if-no-customize"> + <p> + <?php + printf( + __( 'You can now manage and live-preview Custom Backgrounds in the <a href="%1$s">Customizer</a>.' ), + admin_url( 'customize.php?autofocus[control]=background_image' ) + ); + ?> + </p> +</div> +<?php } ?> <?php if ( ! empty( $this->updated ) ) { ?> <div id="message" class="updated"> @@ -202,16 +216,18 @@ class Custom_Background { if ( $bgcolor = get_background_color() ) $background_styles .= 'background-color: #' . $bgcolor . ';'; - if ( get_background_image() ) { - $background_image_thumb = esc_url( set_url_scheme( get_theme_mod( 'background_image_thumb', str_replace( '%', '%%', get_background_image() ) ) ) ); - // background-image URL must be single quote, see below + $background_image_thumb = get_background_image(); + if ( $background_image_thumb ) { + $background_image_thumb = esc_url( set_url_scheme( get_theme_mod( 'background_image_thumb', str_replace( '%', '%%', $background_image_thumb ) ) ) ); + + // Background-image URL must be single quote, see below. $background_styles .= ' background-image: url(\'' . $background_image_thumb . '\');' . ' background-repeat: ' . get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) ) . ';' . ' background-position: top ' . get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) ); } ?> <div id="custom-background-image" style="<?php echo $background_styles; ?>"><?php // must be double quote, see above ?> - <?php if ( get_background_image() ) { ?> + <?php if ( $background_image_thumb ) { ?> <img class="custom-background-image" src="<?php echo $background_image_thumb; ?>" style="visibility:hidden;" alt="" /><br /> <img class="custom-background-image" src="<?php echo $background_image_thumb; ?>" style="visibility:hidden;" alt="" /> <?php } ?> @@ -224,7 +240,7 @@ class Custom_Background { <tr> <th scope="row"><?php _e('Remove Image'); ?></th> <td> -<form method="post" action=""> +<form method="post"> <?php wp_nonce_field('custom-background-remove', '_wpnonce-custom-background-remove'); ?> <?php submit_button( __( 'Remove Background Image' ), 'button', 'remove-background', false ); ?><br/> <?php _e('This will remove the background image. You will not be able to restore any customizations.') ?> @@ -238,7 +254,7 @@ class Custom_Background { <tr> <th scope="row"><?php _e('Restore Original Image'); ?></th> <td> -<form method="post" action=""> +<form method="post"> <?php wp_nonce_field('custom-background-reset', '_wpnonce-custom-background-reset'); ?> <?php submit_button( __( 'Restore Original Image' ), 'button', 'reset-background', false ); ?><br/> <?php _e('This will restore the original background image. You will not be able to restore any customizations.') ?> @@ -247,9 +263,10 @@ class Custom_Background { </tr> <?php endif; ?> +<?php if ( current_user_can( 'upload_files' ) ): ?> <tr> <th scope="row"><?php _e('Select Image'); ?></th> -<td><form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post" action=""> +<td><form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post"> <p> <label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label><br /> <input type="file" id="upload" name="import" /> @@ -259,18 +276,19 @@ class Custom_Background { </p> <p> <label for="choose-from-library-link"><?php _e( 'Or choose an image from your media library:' ); ?></label><br /> - <a id="choose-from-library-link" class="button" + <button id="choose-from-library-link" class="button" data-choose="<?php esc_attr_e( 'Choose a Background Image' ); ?>" - data-update="<?php esc_attr_e( 'Set as background' ); ?>"><?php _e( 'Choose Image' ); ?></a> + data-update="<?php esc_attr_e( 'Set as background' ); ?>"><?php _e( 'Choose Image' ); ?></button> </p> </form> </td> </tr> +<?php endif; ?> </tbody> </table> <h3><?php _e('Display Options') ?></h3> -<form method="post" action=""> +<form method="post"> <table class="form-table"> <tbody> <?php if ( get_background_image() ) : ?> @@ -343,8 +361,7 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) ) * * @since 3.0.0 */ - function handle_upload() { - + public function handle_upload() { if ( empty($_FILES) ) return; @@ -352,7 +369,7 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) ) $overrides = array('test_form' => false); $uploaded_file = $_FILES['import']; - $wp_filetype = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'], false ); + $wp_filetype = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'] ); if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) ) wp_die( __( 'The uploaded file is not a valid image. Please try again.' ) ); @@ -393,23 +410,59 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) ) } /** - * Unused since 3.5.0. + * AJAX handler for adding custom background context to an attachment. + * + * Triggered when the user adds a new background image from the + * Media Manager. + * + * @since 4.1.0 + */ + public function ajax_background_add() { + check_ajax_referer( 'background-add', 'nonce' ); + + if ( ! current_user_can( 'edit_theme_options' ) ) { + wp_send_json_error(); + } + + $attachment_id = absint( $_POST['attachment_id'] ); + if ( $attachment_id < 1 ) { + wp_send_json_error(); + } + + update_post_meta( $attachment_id, '_wp_attachment_is_custom_background', get_stylesheet() ); + + wp_send_json_success(); + } + + /** * * @since 3.4.0 + * @deprecated 3.5.0 + * + * @param array $form_fields + * @return array $form_fields */ - function attachment_fields_to_edit( $form_fields ) { + public function attachment_fields_to_edit( $form_fields ) { return $form_fields; } /** - * Unused since 3.5.0. * * @since 3.4.0 + * @deprecated 3.5.0 + * + * @param array $tabs + * @return array $tabs */ - function filter_upload_tabs( $tabs ) { + public function filter_upload_tabs( $tabs ) { return $tabs; } + /** + * + * @since 3.4.0 + * @deprecated 3.5.0 + */ public function wp_set_background_image() { if ( ! current_user_can('edit_theme_options') || ! isset( $_POST['attachment_id'] ) ) exit; $attachment_id = absint($_POST['attachment_id']); diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php index 1c9971f..a46bd94 100644 --- a/wp-admin/custom-header.php +++ b/wp-admin/custom-header.php @@ -18,20 +18,18 @@ class Custom_Image_Header { /** * Callback for administration header. * - * @var callback + * @var callable * @since 2.1.0 - * @access private */ - var $admin_header_callback; + public $admin_header_callback; /** * Callback for header div. * - * @var callback + * @var callable * @since 3.0.0 - * @access private */ - var $admin_image_div_callback; + public $admin_image_div_callback; /** * Holds default headers. @@ -40,35 +38,25 @@ class Custom_Image_Header { * @since 3.0.0 * @access private */ - var $default_headers = array(); + public $default_headers = array(); /** - * Holds custom headers uploaded by the user. - * - * @var array - * @since 3.2.0 - * @access private - */ - var $uploaded_headers = array(); - - /** - * Holds the page menu hook. - * - * @var string + * Used to trigger a success message when settings updated and set to true. + * * @since 3.0.0 * @access private + * @var bool */ - var $page = ''; + private $updated; /** * Constructor - Register administration header callback. * * @since 2.1.0 - * @param callback $admin_header_callback - * @param callback $admin_image_div_callback Optional custom image div output callback. - * @return Custom_Image_Header + * @param callable $admin_header_callback + * @param callable $admin_image_div_callback Optional custom image div output callback. */ - function __construct($admin_header_callback, $admin_image_div_callback = '') { + public function __construct($admin_header_callback, $admin_image_div_callback = '') { $this->admin_header_callback = $admin_header_callback; $this->admin_image_div_callback = $admin_image_div_callback; @@ -85,20 +73,20 @@ class Custom_Image_Header { * * @since 2.1.0 */ - function init() { - if ( ! current_user_can('edit_theme_options') ) + public function init() { + $page = add_theme_page( __( 'Header' ), __( 'Header' ), 'edit_theme_options', 'custom-header', array( $this, 'admin_page' ) ); + if ( ! $page ) { return; + } - $this->page = $page = add_theme_page(__('Header'), __('Header'), 'edit_theme_options', 'custom-header', array($this, 'admin_page')); - - add_action("admin_print_scripts-$page", array($this, 'js_includes')); - add_action("admin_print_styles-$page", array($this, 'css_includes')); - add_action("admin_head-$page", array($this, 'help') ); - add_action("admin_head-$page", array($this, 'take_action'), 50); - add_action("admin_head-$page", array($this, 'js'), 50); - if ( $this->admin_header_callback ) - add_action("admin_head-$page", $this->admin_header_callback, 51); - + add_action( "admin_print_scripts-$page", array( $this, 'js_includes' ) ); + add_action( "admin_print_styles-$page", array( $this, 'css_includes' ) ); + add_action( "admin_head-$page", array( $this, 'help' ) ); + add_action( "admin_head-$page", array( $this, 'take_action' ), 50 ); + add_action( "admin_head-$page", array( $this, 'js' ), 50 ); + if ( $this->admin_header_callback ) { + add_action( "admin_head-$page", $this->admin_header_callback, 51 ); + } } /** @@ -106,7 +94,7 @@ class Custom_Image_Header { * * @since 3.0.0 */ - function help() { + public function help() { get_current_screen()->add_help_tab( array( 'id' => 'overview', 'title' => __('Overview'), @@ -136,7 +124,7 @@ class Custom_Image_Header { get_current_screen()->set_help_sidebar( '<p><strong>' . __( 'For more information:' ) . '</strong></p>' . - '<p>' . __( '<a href="http://codex.wordpress.org/Appearance_Header_Screen" target="_blank">Documentation on Custom Header</a>' ) . '</p>' . + '<p>' . __( '<a href="https://codex.wordpress.org/Appearance_Header_Screen" target="_blank">Documentation on Custom Header</a>' ) . '</p>' . '<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>' ); } @@ -148,7 +136,7 @@ class Custom_Image_Header { * * @return int Current step */ - function step() { + public function step() { if ( ! isset( $_GET['step'] ) ) return 1; @@ -167,7 +155,7 @@ class Custom_Image_Header { * * @since 2.1.0 */ - function js_includes() { + public function js_includes() { $step = $this->step(); if ( ( 1 == $step || 3 == $step ) ) { @@ -185,7 +173,7 @@ class Custom_Image_Header { * * @since 2.7.0 */ - function css_includes() { + public function css_includes() { $step = $this->step(); if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) ) @@ -199,7 +187,7 @@ class Custom_Image_Header { * * @since 2.6.0 */ - function take_action() { + public function take_action() { if ( ! current_user_can('edit_theme_options') ) return; @@ -244,13 +232,12 @@ class Custom_Image_Header { * Process the default headers * * @since 3.0.0 + * + * @global array $_wp_default_headers */ - function process_default_headers() { + public function process_default_headers() { global $_wp_default_headers; - if ( !empty($this->headers) ) - return; - if ( !isset($_wp_default_headers) ) return; @@ -274,8 +261,11 @@ class Custom_Image_Header { * Random image option is on by default if no header has been set. * * @since 3.0.0 + * + * @param string $type The header type. One of 'default' (for the Uploaded Images control) + * or 'uploaded' (for the Uploaded Images control). */ - function show_header_selector( $type = 'default' ) { + public function show_header_selector( $type = 'default' ) { if ( 'default' == $type ) { $headers = $this->default_headers; } else { @@ -286,7 +276,7 @@ class Custom_Image_Header { if ( 1 < count( $headers ) ) { echo '<div class="random-header">'; echo '<label><input name="default-header" type="radio" value="random-' . $type . '-image"' . checked( is_random_header_image( $type ), true, false ) . ' />'; - echo __( '<strong>Random:</strong> Show a different image on each page.' ); + _e( '<strong>Random:</strong> Show a different image on each page.' ); echo '</label>'; echo '</div>'; } @@ -295,24 +285,24 @@ class Custom_Image_Header { foreach ( $headers as $header_key => $header ) { $header_thumbnail = $header['thumbnail_url']; $header_url = $header['url']; - $header_desc = empty( $header['description'] ) ? '' : $header['description']; + $header_alt_text = empty( $header['alt_text'] ) ? '' : $header['alt_text']; echo '<div class="default-header">'; echo '<label><input name="default-header" type="radio" value="' . esc_attr( $header_key ) . '" ' . checked( $header_url, get_theme_mod( 'header_image' ), false ) . ' />'; $width = ''; if ( !empty( $header['attachment_id'] ) ) $width = ' width="230"'; - echo '<img src="' . set_url_scheme( $header_thumbnail ) . '" alt="' . esc_attr( $header_desc ) .'" title="' . esc_attr( $header_desc ) . '"' . $width . ' /></label>'; + echo '<img src="' . set_url_scheme( $header_thumbnail ) . '" alt="' . esc_attr( $header_alt_text ) .'"' . $width . ' /></label>'; echo '</div>'; } echo '<div class="clear"></div></div>'; } /** - * Execute Javascript depending on step. + * Execute JavaScript depending on step. * * @since 2.1.0 */ - function js() { + public function js() { $step = $this->step(); if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) ) $this->js_1(); @@ -321,15 +311,22 @@ class Custom_Image_Header { } /** - * Display Javascript based on Step 1 and 3. + * Display JavaScript based on Step 1 and 3. * * @since 2.6.0 */ - function js_1() { ?> + public function js_1() { + $default_color = ''; + if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) { + $default_color = get_theme_support( 'custom-header', 'default-text-color' ); + if ( $default_color && false === strpos( $default_color, '#' ) ) { + $default_color = '#' . $default_color; + } + } + ?> <script type="text/javascript"> -/* <![CDATA[ */ (function($){ - var default_color = '#<?php echo get_theme_support( 'custom-header', 'default-text-color' ); ?>', + var default_color = '<?php echo $default_color; ?>', header_text_fields; function pickColor(color) { @@ -370,19 +367,17 @@ class Custom_Image_Header { <?php endif; ?> }); })(jQuery); -/* ]]> */ </script> <?php } /** - * Display Javascript based on Step 2. + * Display JavaScript based on Step 2. * * @since 2.6.0 */ - function js_2() { ?> + public function js_2() { ?> <script type="text/javascript"> -/* <![CDATA[ */ function onEndCrop( coords ) { jQuery( '#x1' ).val(coords.x); jQuery( '#y1' ).val(coords.y); @@ -444,7 +439,6 @@ class Custom_Image_Header { } }); }); -/* ]]> */ </script> <?php } @@ -454,12 +448,25 @@ class Custom_Image_Header { * * @since 2.1.0 */ - function step_1() { + public function step_1() { $this->process_default_headers(); ?> <div class="wrap"> -<h2><?php _e( 'Custom Header' ); ?></h2> +<h1><?php _e( 'Custom Header' ); ?></h1> + +<?php if ( current_user_can( 'customize' ) ) { ?> +<div class="notice notice-info hide-if-no-customize"> + <p> + <?php + printf( + __( 'You can now manage and live-preview Custom Header in the <a href="%1$s">Customizer</a>.' ), + admin_url( 'customize.php?autofocus[control]=header_image' ) + ); + ?> + </p> +</div> +<?php } ?> <?php if ( ! empty( $this->updated ) ) { ?> <div id="message" class="updated"> @@ -481,7 +488,14 @@ class Custom_Image_Header { call_user_func( $this->admin_image_div_callback ); } else { $custom_header = get_custom_header(); - $header_image_style = 'background-image:url(' . esc_url( get_header_image() ) . ');'; + $header_image = get_header_image(); + + if ( $header_image ) { + $header_image_style = 'background-image:url(' . esc_url( $header_image ) . ');'; + } else { + $header_image_style = ''; + } + if ( $custom_header->width ) $header_image_style .= 'max-width:' . $custom_header->width . 'px;'; if ( $custom_header->height ) @@ -494,7 +508,7 @@ class Custom_Image_Header { else $style = ' style="display:none;"'; ?> - <h1><a id="name" class="displaying-header-text" <?php echo $style; ?> onclick="return false;" href="<?php bloginfo('url'); ?>"><?php bloginfo( 'name' ); ?></a></h1> + <h1><a id="name" class="displaying-header-text" <?php echo $style; ?> onclick="return false;" href="<?php bloginfo('url'); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1> <div id="desc" class="displaying-header-text" <?php echo $style; ?>><?php bloginfo( 'description' ); ?></div> </div> <?php } ?> @@ -502,7 +516,7 @@ class Custom_Image_Header { </tr> <?php endif; ?> -<?php if ( current_theme_supports( 'custom-header', 'uploads' ) ) : ?> +<?php if ( current_user_can( 'upload_files' ) && current_theme_supports( 'custom-header', 'uploads' ) ) : ?> <tr> <th scope="row"><?php _e( 'Select Image' ); ?></th> <td> @@ -512,16 +526,48 @@ class Custom_Image_Header { printf( __( 'Images of exactly <strong>%1$d × %2$d pixels</strong> will be used as-is.' ) . '<br />', get_theme_support( 'custom-header', 'width' ), get_theme_support( 'custom-header', 'height' ) ); } elseif ( current_theme_supports( 'custom-header', 'flex-height' ) ) { if ( ! current_theme_supports( 'custom-header', 'flex-width' ) ) - printf( __( 'Images should be at least <strong>%1$d pixels</strong> wide.' ) . ' ', get_theme_support( 'custom-header', 'width' ) ); + printf( + /* translators: %s: size in pixels */ + __( 'Images should be at least %s wide.' ) . ' ', + sprintf( + /* translators: %d: custom header width */ + '<strong>' . __( '%d pixels' ) . '</strong>', + get_theme_support( 'custom-header', 'width' ) + ) + ); } elseif ( current_theme_supports( 'custom-header', 'flex-width' ) ) { if ( ! current_theme_supports( 'custom-header', 'flex-height' ) ) - printf( __( 'Images should be at least <strong>%1$d pixels</strong> tall.' ) . ' ', get_theme_support( 'custom-header', 'height' ) ); + printf( + /* translators: %s: size in pixels */ + __( 'Images should be at least %s tall.' ) . ' ', + sprintf( + /* translators: %d: custom header height */ + '<strong>' . __( '%d pixels' ) . '</strong>', + get_theme_support( 'custom-header', 'height' ) + ) + ); } if ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) { if ( current_theme_supports( 'custom-header', 'width' ) ) - printf( __( 'Suggested width is <strong>%1$d pixels</strong>.' ) . ' ', get_theme_support( 'custom-header', 'width' ) ); + printf( + /* translators: %s: size in pixels */ + __( 'Suggested width is %s.' ) . ' ', + sprintf( + /* translators: %d: custom header width */ + '<strong>' . __( '%d pixels' ) . '</strong>', + get_theme_support( 'custom-header', 'width' ) + ) + ); if ( current_theme_supports( 'custom-header', 'height' ) ) - printf( __( 'Suggested height is <strong>%1$d pixels</strong>.' ) . ' ', get_theme_support( 'custom-header', 'height' ) ); + printf( + /* translators: %s: size in pixels */ + __( 'Suggested height is %s.' ) . ' ', + sprintf( + /* translators: %d: custom header height */ + '<strong>' . __( '%d pixels' ) . '</strong>', + get_theme_support( 'custom-header', 'height' ) + ) + ); } ?></p> <form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post" action="<?php echo esc_url( add_query_arg( 'step', 2 ) ) ?>"> @@ -541,10 +587,10 @@ class Custom_Image_Header { ?> <p> <label for="choose-from-library-link"><?php _e( 'Or choose an image from your media library:' ); ?></label><br /> - <a id="choose-from-library-link" class="button" + <button id="choose-from-library-link" class="button" data-update-link="<?php echo esc_attr( $modal_update_href ); ?>" data-choose="<?php esc_attr_e( 'Choose a Custom Header' ); ?>" - data-update="<?php esc_attr_e( 'Set as header' ); ?>"><?php _e( 'Choose Image' ); ?></a> + data-update="<?php esc_attr_e( 'Set as header' ); ?>"><?php _e( 'Choose Image' ); ?></button> </p> </form> </td> @@ -554,6 +600,7 @@ class Custom_Image_Header { </table> <form method="post" action="<?php echo esc_url( add_query_arg( 'step', 1 ) ) ?>"> +<?php submit_button( null, 'screen-reader-text', 'save-header-options', false ); ?> <table class="form-table"> <tbody> <?php if ( get_uploaded_header_images() ) : ?> @@ -624,17 +671,27 @@ class Custom_Image_Header { <th scope="row"><?php _e( 'Text Color' ); ?></th> <td> <p> -<?php -$header_textcolor = display_header_text() ? get_header_textcolor() : get_theme_support( 'custom-header', 'default-text-color' ); -$default_color = ''; -if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) { - $default_color = '#' . get_theme_support( 'custom-header', 'default-text-color' ); - $default_color_attr = ' data-default-color="' . esc_attr( $default_color ) . '"'; - echo '<input type="text" name="text-color" id="text-color" value="#' . esc_attr( $header_textcolor ) . '"' . $default_color_attr . ' />'; - if ( $default_color ) - echo ' <span class="description hide-if-js">' . sprintf( _x( 'Default: %s', 'color' ), $default_color ) . '</span>'; -} -?> + <?php + $default_color = ''; + if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) { + $default_color = get_theme_support( 'custom-header', 'default-text-color' ); + if ( $default_color && false === strpos( $default_color, '#' ) ) { + $default_color = '#' . $default_color; + } + } + + $default_color_attr = $default_color ? ' data-default-color="' . esc_attr( $default_color ) . '"' : ''; + + $header_textcolor = display_header_text() ? get_header_textcolor() : get_theme_support( 'custom-header', 'default-text-color' ); + if ( $header_textcolor && false === strpos( $header_textcolor, '#' ) ) { + $header_textcolor = '#' . $header_textcolor; + } + + echo '<input type="text" name="text-color" id="text-color" value="' . esc_attr( $header_textcolor ) . '"' . $default_color_attr . ' />'; + if ( $default_color ) { + echo ' <span class="description hide-if-js">' . sprintf( _x( 'Default: %s', 'color' ), esc_html( $default_color ) ) . '</span>'; + } + ?> </p> </td> </tr> @@ -662,18 +719,26 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> * * @since 2.1.0 */ - function step_2() { + public function step_2() { check_admin_referer('custom-header-upload', '_wpnonce-custom-header-upload'); - if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) { + wp_die( + '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' . + '<p>' . __( 'The current theme does not support uploading a custom header image.' ) . '</p>', + 403 + ); + } if ( empty( $_POST ) && isset( $_GET['file'] ) ) { $attachment_id = absint( $_GET['file'] ); $file = get_attached_file( $attachment_id, true ); - $url = wp_get_attachment_image_src( $attachment_id, 'full'); + $url = wp_get_attachment_image_src( $attachment_id, 'full' ); $url = $url[0]; } elseif ( isset( $_POST ) ) { - extract($this->step_2_manage_upload()); + $data = $this->step_2_manage_upload(); + $attachment_id = $data['attachment_id']; + $file = $data['file']; + $url = $data['url']; } if ( file_exists( $file ) ) { @@ -733,14 +798,14 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> ?> <div class="wrap"> -<h2><?php _e( 'Crop Header Image' ); ?></h2> +<h1><?php _e( 'Crop Header Image' ); ?></h1> <form method="post" action="<?php echo esc_url(add_query_arg('step', 3)); ?>"> <p class="hide-if-no-js"><?php _e('Choose the part of the image you want to use as your header.'); ?></p> - <p class="hide-if-js"><strong><?php _e( 'You need Javascript to choose a part of the image.'); ?></strong></p> + <p class="hide-if-js"><strong><?php _e( 'You need JavaScript to choose a part of the image.'); ?></strong></p> <div id="crop_image" style="position: relative"> - <img src="<?php echo esc_url( $url ); ?>" id="upload" width="<?php echo $width; ?>" height="<?php echo $height; ?>" /> + <img src="<?php echo esc_url( $url ); ?>" id="upload" width="<?php echo $width; ?>" height="<?php echo $height; ?>" alt="" /> </div> <input type="hidden" name="x1" id="x1" value="0"/> @@ -772,11 +837,11 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> * * @since 3.4.0 */ - function step_2_manage_upload() { + public function step_2_manage_upload() { $overrides = array('test_form' => false); $uploaded_file = $_FILES['import']; - $wp_filetype = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'], false ); + $wp_filetype = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'] ); if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) ) wp_die( __( 'The uploaded file is not a valid image. Please try again.' ) ); @@ -808,15 +873,27 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> * Display third step of custom header image page. * * @since 2.1.0 + * @since 4.4.0 Switched to using wp_get_attachment_url() instead of the guid + * for retrieving the header image URL. */ - function step_3() { + public function step_3() { check_admin_referer( 'custom-header-crop-image' ); - if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) { + wp_die( + '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' . + '<p>' . __( 'The current theme does not support uploading a custom header image.' ) . '</p>', + 403 + ); + } - if ( ! empty( $_POST['skip-cropping'] ) && ! ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + if ( ! empty( $_POST['skip-cropping'] ) && ! ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) ) { + wp_die( + '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' . + '<p>' . __( 'The current theme does not support a flexible sized header image.' ) . '</p>', + 403 + ); + } if ( $_POST['oitar'] > 1 ) { $_POST['x1'] = $_POST['x1'] * $_POST['oitar']; @@ -856,25 +933,17 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> // Update the attachment $attachment_id = $this->insert_attachment( $object, $cropped ); - $url = $object['guid']; + $url = wp_get_attachment_url( $attachment_id ); $this->set_header_image( compact( 'url', 'attachment_id', 'width', 'height' ) ); - // cleanup + // Cleanup. $medium = str_replace( basename( $original ), 'midsize-' . basename( $original ), $original ); if ( file_exists( $medium ) ) { - /** - * Filter the path of the file to delete. - * - * @since 2.1.0 - * - * @param string $medium Path to the file to delete. - */ - @unlink( apply_filters( 'wp_delete_file', $medium ) ); + wp_delete_file( $medium ); } if ( empty( $_POST['create-new-attachment'] ) && empty( $_POST['skip-cropping'] ) ) { - /** This filter is documented in wp-admin/custom-header.php */ - @unlink( apply_filters( 'wp_delete_file', $original ) ); + wp_delete_file( $original ); } return $this->finished(); @@ -885,7 +954,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> * * @since 2.1.0 */ - function finished() { + public function finished() { $this->updated = true; $this->step_1(); } @@ -895,7 +964,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> * * @since 2.1.0 */ - function admin_page() { + public function admin_page() { if ( ! current_user_can('edit_theme_options') ) wp_die(__('You do not have permission to customize headers.')); $step = $this->step(); @@ -911,8 +980,11 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> * Unused since 3.5.0. * * @since 3.4.0 + * + * @param array $form_fields + * @return array $form_fields */ - function attachment_fields_to_edit( $form_fields ) { + public function attachment_fields_to_edit( $form_fields ) { return $form_fields; } @@ -920,8 +992,11 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> * Unused since 3.5.0. * * @since 3.4.0 + * + * @param array $tabs + * @return array $tabs */ - function filter_upload_tabs( $tabs ) { + public function filter_upload_tabs( $tabs ) { return $tabs; } @@ -929,13 +1004,13 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> * Choose a header image, selected from existing uploaded and default headers, * or provide an array of uploaded header data (either new, or from media library). * + * @since 3.4.0 + * * @param mixed $choice Which header image to select. Allows for values of 'random-default-image', * for randomly cycling among the default images; 'random-uploaded-image', for randomly cycling * among the uploaded images; the key of a default image registered for that theme; and - * the key of an image uploaded for that theme (the basename of the URL). + * the key of an image uploaded for that theme (the attachment ID of the image). * Or an array of arguments: attachment_id, url, width, height. All are required. - * - * @since 3.4.0 */ final public function set_header_image( $choice ) { if ( is_array( $choice ) || is_object( $choice ) ) { @@ -987,7 +1062,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> * @since 3.4.0 */ final public function remove_header_image() { - return $this->set_header_image( 'remove-header' ); + $this->set_header_image( 'remove-header' ); } /** @@ -1001,9 +1076,10 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> $this->process_default_headers(); $default = get_theme_support( 'custom-header', 'default-image' ); - if ( ! $default ) - return $this->remove_header_image(); - + if ( ! $default ) { + $this->remove_header_image(); + return; + } $default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() ); $default_data = array(); @@ -1021,6 +1097,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> /** * Calculate width and height based on what the currently selected theme supports. * + * @param array $dimensions * @return array dst_height and dst_width of header image. */ final public function get_header_dimensions( $dimensions ) { @@ -1032,7 +1109,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> $has_flex_width = current_theme_supports( 'custom-header', 'flex-width' ); $has_flex_height = current_theme_supports( 'custom-header', 'flex-height' ); $has_max_width = current_theme_supports( 'custom-header', 'max-width' ) ; - $dst = array( 'dst_height' => null, 'dst_height' => null ); + $dst = array( 'dst_height' => null, 'dst_width' => null ); // For flex, limit size of image displayed to 1500px unless theme says otherwise if ( $has_flex_width ) { @@ -1070,14 +1147,14 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> /** * Create an attachment 'object'. * - * @param string $cropped Cropped image URL. - * @param int $parent_attachment_id Attachment ID of parent image. + * @param string $cropped Cropped image URL. + * @param int $parent_attachment_id Attachment ID of parent image. * * @return array Attachment object. */ final public function create_attachment_object( $cropped, $parent_attachment_id ) { $parent = get_post( $parent_attachment_id ); - $parent_url = $parent->guid; + $parent_url = wp_get_attachment_url( $parent->ID ); $url = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url ); $size = @getimagesize( $cropped ); @@ -1086,7 +1163,6 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> $object = array( 'ID' => $parent_attachment_id, 'post_title' => basename($cropped), - 'post_content' => $url, 'post_mime_type' => $image_type, 'guid' => $url, 'context' => 'custom-header' @@ -1096,9 +1172,9 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> } /** - * Insert an attachment & its metadata. + * Insert an attachment and its metadata. * - * @param array $object Attachment object. + * @param array $object Attachment object. * @param string $cropped Cropped image URL. * * @return int Attachment ID. @@ -1107,8 +1183,13 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> $attachment_id = wp_insert_attachment( $object, $cropped ); $metadata = wp_generate_attachment_metadata( $attachment_id, $cropped ); /** - * Allows us to insert custom meta data for an attachment. + * Filter the header image attachment metadata. + * + * @since 3.9.0 * + * @see wp_generate_attachment_metadata() + * + * @param array $metadata Attachment metadata. */ $metadata = apply_filters( 'wp_header_image_attachment_metadata', $metadata ); wp_update_attachment_metadata( $attachment_id, $metadata ); @@ -1119,7 +1200,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> * Gets attachment uploaded by Media Manager, crops it, then saves it as a * new object. Returns JSON-encoded object details. */ - function ajax_header_crop() { + public function ajax_header_crop() { check_ajax_referer( 'image_editor-' . $_POST['id'], 'nonce' ); if ( ! current_user_can( 'edit_theme_options' ) ) { @@ -1153,6 +1234,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> wp_send_json_error( array( 'message' => __( 'Image could not be processed. Please go back and try again.' ) ) ); } + /** This filter is documented in wp-admin/custom-header.php */ $cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication $object = $this->create_attachment_object( $cropped, $attachment_id ); @@ -1162,6 +1244,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> $new_attachment_id = $this->insert_attachment( $object, $cropped ); $object['attachment_id'] = $new_attachment_id; + $object['url'] = wp_get_attachment_url( $new_attachment_id );; $object['width'] = $dimensions['dst_width']; $object['height'] = $dimensions['dst_height']; @@ -1175,7 +1258,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> * Triggered when the user tries adds a new header image from the * Media Manager, even if s/he doesn't save that change. */ - function ajax_header_add() { + public function ajax_header_add() { check_ajax_referer( 'header-add', 'nonce' ); if ( ! current_user_can( 'edit_theme_options' ) ) { @@ -1201,7 +1284,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> * Triggered when the user clicks the overlay "X" button next to each image * choice in the Customizer's Header tool. */ - function ajax_header_remove() { + public function ajax_header_remove() { check_ajax_referer( 'header-remove', 'nonce' ); if ( ! current_user_can( 'edit_theme_options' ) ) { @@ -1220,7 +1303,11 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> wp_send_json_success(); } - function customize_set_last_used( $wp_customize ) { + /** + * + * @param WP_Customize_Manager $wp_customize + */ + public function customize_set_last_used( $wp_customize ) { $data = $wp_customize->get_setting( 'header_image_data' )->post_value(); if ( ! isset( $data['attachment_id'] ) ) { @@ -1232,6 +1319,10 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> update_post_meta( $attachment_id, $key, time() ); } + /** + * + * @return array + */ public function get_default_header_images() { $this->process_default_headers(); @@ -1265,10 +1356,13 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> ); // The rest of the set comes after. - $header_images = array_merge( $header_images, $this->default_headers ); - return $header_images; + return array_merge( $header_images, $this->default_headers ); } + /** + * + * @return array + */ public function get_uploaded_header_images() { $header_images = get_uploaded_header_images(); $timestamp_key = '_wp_attachment_custom_header_last_used_' . get_stylesheet(); diff --git a/wp-admin/customize.php b/wp-admin/customize.php index b1485d1..7f667d3 100644 --- a/wp-admin/customize.php +++ b/wp-admin/customize.php @@ -12,17 +12,29 @@ define( 'IFRAME_REQUEST', true ); /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! current_user_can( 'edit_theme_options' ) ) - wp_die( __( 'Cheatin’ uh?' ) ); - -wp_reset_vars( array( 'url', 'return' ) ); -$url = urldecode( $url ); -$url = wp_validate_redirect( $url, home_url( '/' ) ); -if ( $return ) - $return = wp_validate_redirect( urldecode( $return ) ); -if ( ! $return ) - $return = $url; +if ( ! current_user_can( 'customize' ) ) { + wp_die( + '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' . + '<p>' . __( 'You are not allowed to customize the appearance of this site.' ) . '</p>', + 403 + ); +} + +wp_reset_vars( array( 'url', 'return', 'autofocus' ) ); +if ( ! empty( $url ) ) { + $wp_customize->set_preview_url( wp_unslash( $url ) ); +} +if ( ! empty( $return ) ) { + $wp_customize->set_return_url( wp_unslash( $return ) ); +} +if ( ! empty( $autofocus ) && is_array( $autofocus ) ) { + $wp_customize->set_autofocus( wp_unslash( $autofocus ) ); +} +/** + * @global WP_Scripts $wp_scripts + * @global WP_Customize_Manager $wp_customize + */ global $wp_scripts, $wp_customize; $registered = $wp_scripts->registered; @@ -43,8 +55,6 @@ do_action( 'customize_controls_init' ); wp_enqueue_script( 'customize-controls' ); wp_enqueue_style( 'customize-controls' ); -wp_enqueue_script( 'accordion' ); - /** * Enqueue Customizer control scripts. * @@ -63,23 +73,24 @@ $body_class = 'wp-core-ui wp-customizer js'; if ( wp_is_mobile() ) : $body_class .= ' mobile'; - ?><meta name="viewport" id="viewport-meta" content="width=device-width, initial-scale=0.8, minimum-scale=0.5, maximum-scale=1.2"><?php + ?><meta name="viewport" id="viewport-meta" content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=1.2" /><?php endif; -$is_ios = wp_is_mobile() && preg_match( '/iPad|iPod|iPhone/', $_SERVER['HTTP_USER_AGENT'] ); - -if ( $is_ios ) +if ( $wp_customize->is_ios() ) { $body_class .= ' ios'; +} -if ( is_rtl() ) - $body_class .= ' rtl'; +if ( is_rtl() ) { + $body_class .= ' rtl'; +} $body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) ); -$admin_title = sprintf( __( '%1$s — WordPress' ), strip_tags( sprintf( __( 'Customize %s' ), $wp_customize->theme()->display('Name') ) ) ); +$admin_title = sprintf( $wp_customize->get_document_title_template(), __( 'Loading…' ) ); + ?><title><?php echo $admin_title; ?> ">

is_theme_active() ? __( 'Save & Publish' ) : __( 'Save & Activate' ); - submit_button( $save_text, 'primary save', 'save', false ); + $save_text = $wp_customize->is_theme_active() ? __( 'Save & Publish' ) : __( 'Save & Activate' ); + submit_button( $save_text, 'primary save', 'save', false ); ?> - - + + + + + +

- theme()->get_screenshot(); - $cannot_expand = ! ( $screenshot || $wp_customize->theme()->get('Description') ); - ?> - -

' . $wp_customize->theme()->display('Name') . '' ); + echo sprintf( __( 'You are customizing %s' ), '' . get_bloginfo( 'name' ) . '' ); ?> +

- -

- - - theme()->get('Description') ): ?> -

theme()->display('Description'); ?>

- -

- +

- sections() as $section ) - $section->maybe_render(); - ?> -

1, - 'template' => $wp_customize->get_template(), - 'stylesheet' => $wp_customize->get_stylesheet(), - 'preview_iframe' => true, - 'TB_iframe' => 'true' - ), home_url( '/' ) ); - - $login_url = add_query_arg( array( - 'interim-login' => 1, - 'customize-login' => 1 - ), wp_login_url() ); - - // Prepare customizer settings to pass to Javascript. - $settings = array( - 'theme' => array( - 'stylesheet' => $wp_customize->get_stylesheet(), - 'active' => $wp_customize->is_theme_active(), - ), - 'url' => array( - 'preview' => esc_url_raw( $url ? $url : home_url( '/' ) ), - 'parent' => esc_url_raw( admin_url() ), - 'activated' => esc_url_raw( admin_url( 'themes.php?activated=true&previewed' ) ), - 'ajax' => esc_url_raw( admin_url( 'admin-ajax.php', 'relative' ) ), - 'allowed' => array_map( 'esc_url_raw', $allowed_urls ), - 'isCrossDomain' => $cross_domain, - 'fallback' => esc_url_raw( $fallback_url ), - 'home' => esc_url_raw( home_url( '/' ) ), - 'login' => esc_url_raw( $login_url ), - ), - 'browser' => array( - 'mobile' => wp_is_mobile(), - 'ios' => $is_ios, - ), - 'settings' => array(), - 'controls' => array(), - 'nonce' => array( - 'save' => wp_create_nonce( 'save-customize_' . $wp_customize->get_stylesheet() ), - 'preview' => wp_create_nonce( 'preview-customize_' . $wp_customize->get_stylesheet() ) - ), - ); - - // Prepare Customize Setting objects to pass to Javascript. - foreach ( $wp_customize->settings() as $id => $setting ) { - $settings['settings'][ $id ] = array( - 'value' => $setting->js_value(), - 'transport' => $setting->transport, - ); - } - - // Prepare Customize Control objects to pass to Javascript. - foreach ( $wp_customize->controls() as $id => $control ) { - $control->to_json(); - $settings['controls'][ $id ] = $control->json; - } - ?> -

diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index 5f28976..f5448ab 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -8,8 +8,13 @@ /** WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( !current_user_can('edit_posts') ) - wp_die(__('Cheatin’ uh?')); +if ( ! current_user_can( 'edit_posts' ) ) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'You are not allowed to edit comments.' ) . '

', + 403 + ); +} $wp_list_table = _get_list_table('WP_Comments_List_Table'); $pagenum = $wp_list_table->get_pagenum(); @@ -39,6 +44,8 @@ if ( $doaction ) { $redirect_to = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'spammed', 'unspammed', 'approved', 'unapproved', 'ids' ), wp_get_referer() ); $redirect_to = add_query_arg( 'paged', $pagenum, $redirect_to ); + wp_defer_comment_counting( true ); + foreach ( $comment_ids as $comment_id ) { // Check the permissions on each if ( !current_user_can( 'edit_comment', $comment_id ) ) continue; @@ -75,6 +82,8 @@ if ( $doaction ) { } } + wp_defer_comment_counting( false ); + if ( $approved ) $redirect_to = add_query_arg( 'approved', $approved, $redirect_to ); if ( $unapproved ) @@ -104,12 +113,34 @@ $wp_list_table->prepare_items(); wp_enqueue_script('admin-comments'); enqueue_comment_hotkeys_js(); -if ( $post_id ) - $title = sprintf( __( 'Comments on “%s”' ), wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '…' ) ); -else - $title = __('Comments'); +if ( $post_id ) { + $comments_count = wp_count_comments( $post_id ); + $draft_or_post_title = wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '…' ); + if ( $comments_count->moderated > 0 ) { + /* translators: 1: comments count 2: post title */ + $title = sprintf( __( 'Comments (%1$s) on “%2$s”' ), + number_format_i18n( $comments_count->moderated ), + $draft_or_post_title + ); + } else { + /* translators: %s: post title */ + $title = sprintf( __( 'Comments on “%s”' ), + $draft_or_post_title + ); + } +} else { + $comments_count = wp_count_comments(); + if ( $comments_count->moderated > 0 ) { + /* translators: %s: comments count */ + $title = sprintf( __( 'Comments (%s)' ), + number_format_i18n( $comments_count->moderated ) + ); + } else { + $title = __( 'Comments' ); + } +} -add_screen_option( 'per_page', array('label' => _x( 'Comments', 'comments per page (screen options)' )) ); +add_screen_option( 'per_page' ); get_current_screen()->add_help_tab( array( 'id' => 'overview', @@ -123,37 +154,52 @@ get_current_screen()->add_help_tab( array( 'content' => '

' . __( 'A red bar on the left means the comment is waiting for you to moderate it.' ) . '

' . '

' . __( 'In the Author column, in addition to the author’s name, email address, and blog URL, the commenter’s IP address is shown. Clicking on this link will show you all the comments made from this IP address.' ) . '

' . - '

' . __( 'In the Comment column, above each comment it says “Submitted on,” followed by the date and time the comment was left on your site. Clicking on the date/time link will take you to that comment on your live site. Hovering over any comment gives you options to approve, reply (and approve), quick edit, edit, spam mark, or trash that comment.' ) . '

' . - '

' . __( 'In the In Response To column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The View Post link leads to that post on your live site. The small bubble with the number in it shows the number of approved comments that post has received. If the bubble is gray, you have moderated all comments for that post. If it is blue, there are pending comments. Clicking the bubble will filter the comments screen to show only comments on that post.' ) . '

' . + '

' . __( 'In the Comment column, hovering over any comment gives you options to approve, reply (and approve), quick edit, edit, spam mark, or trash that comment.' ) . '

' . + '

' . __( 'In the In Response To column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The View Post link leads to that post on your live site. The small bubble with the number in it shows the number of approved comments that post has received. If there are pending comments, a red notification circle with the number of pending comments is displayed. Clicking the notification circle will filter the comments screen to show only pending comments on that post.' ) . '

' . + '

' . __( 'In the Submitted On column, the date and time the comment was left on your site appears. Clicking on the date/time link will take you to that comment on your live site.' ) . '

' . '

' . __( 'Many people take advantage of keyboard shortcuts to moderate their comments more quickly. Use the link to the side to learn more.' ) . '

' ) ); get_current_screen()->set_help_sidebar( '

' . __( 'For more information:' ) . '

' . - '

' . __( 'Documentation on Comments' ) . '

' . - '

' . __( 'Documentation on Comment Spam' ) . '

' . - '

' . __( 'Documentation on Keyboard Shortcuts' ) . '

' . + '

' . __( 'Documentation on Comments' ) . '

' . + '

' . __( 'Documentation on Comment Spam' ) . '

' . + '

' . __( 'Documentation on Keyboard Shortcuts' ) . '

' . '

' . __( 'Support Forums' ) . '

' ); +get_current_screen()->set_screen_reader_content( array( + 'heading_views' => __( 'Filter comments list' ), + 'heading_pagination' => __( 'Comments list navigation' ), + 'heading_list' => __( 'Comments list' ), +) ); + require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>

%s', +

%2$s', get_edit_post_link( $post_id ), wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '…' ) ) ); -else - echo __('Comments'); +} else { + _e( 'Comments' ); +} -if ( isset($_REQUEST['s']) && $_REQUEST['s'] ) - echo '' . sprintf( __( 'Search results for “%s”' ), wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50, '…' ) ) . ''; ?> -

+if ( isset($_REQUEST['s']) && strlen( $_REQUEST['s'] ) ) { + echo ''; + /* translators: %s: search keywords */ + printf( __( 'Search results for “%s”' ), + wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50, '…' ) + ); + echo ''; +} +?> 0 || $deleted > 0 || $trashed > 0 || $untrashed > 0 || $spammed > 0 || $unspammed > 0 || $same > 0 ) { - if ( $approved > 0 ) + if ( $approved > 0 ) { + /* translators: %s: number of comments approved */ $messages[] = sprintf( _n( '%s comment approved', '%s comments approved', $approved ), $approved ); + } if ( $spammed > 0 ) { $ids = isset($_REQUEST['ids']) ? $_REQUEST['ids'] : 0; + /* translators: %s: number of comments marked as spam */ $messages[] = sprintf( _n( '%s comment marked as spam.', '%s comments marked as spam.', $spammed ), $spammed ) . ' ' . __('Undo') . '
'; } - if ( $unspammed > 0 ) + if ( $unspammed > 0 ) { + /* translators: %s: number of comments restored from the spam */ $messages[] = sprintf( _n( '%s comment restored from the spam', '%s comments restored from the spam', $unspammed ), $unspammed ); + } if ( $trashed > 0 ) { $ids = isset($_REQUEST['ids']) ? $_REQUEST['ids'] : 0; + /* translators: %s: number of comments moved to the Trash */ $messages[] = sprintf( _n( '%s comment moved to the Trash.', '%s comments moved to the Trash.', $trashed ), $trashed ) . ' ' . __('Undo') . '
'; } - if ( $untrashed > 0 ) + if ( $untrashed > 0 ) { + /* translators: %s: number of comments restored from the Trash */ $messages[] = sprintf( _n( '%s comment restored from the Trash', '%s comments restored from the Trash', $untrashed ), $untrashed ); + } - if ( $deleted > 0 ) + if ( $deleted > 0 ) { + /* translators: %s: number of comments permanently deleted */ $messages[] = sprintf( _n( '%s comment permanently deleted', '%s comments permanently deleted', $deleted ), $deleted ); + } if ( $same > 0 && $comment = get_comment( $same ) ) { switch ( $comment->comment_approved ) { @@ -217,14 +273,14 @@ if ( isset($_REQUEST['approved']) || isset($_REQUEST['deleted']) || isset($_REQU } } - echo '

' . implode( "
\n", $messages ) . '

'; + echo '

' . implode( "
\n", $messages ) . '

'; } } ?> views(); ?> -

+ search_box( __( 'Search Comments' ), 'comment' ); ?> diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index 8dc4815..ea5428f 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -10,7 +10,33 @@ if ( !defined('ABSPATH') ) die('-1'); +/** + * @global string $post_type + * @global object $post_type_object + * @global WP_Post $post + */ +global $post_type, $post_type_object, $post; + wp_enqueue_script('post'); +$_wp_editor_expand = $_content_editor_dfw = false; + +/** + * Filter whether to enable the 'expand' functionality in the post editor. + * + * @since 4.0.0 + * @since 4.1.0 Added the `$post_type` parameter. + * + * @param bool $expand Whether to enable the 'expand' functionality. Default true. + * @param string $post_type Post type. + */ +if ( post_type_supports( $post_type, 'editor' ) && ! wp_is_mobile() && + ! ( $is_IE && preg_match( '/MSIE [5678]/', $_SERVER['HTTP_USER_AGENT'] ) ) && + apply_filters( 'wp_editor_expand', true, $post_type ) ) { + + wp_enqueue_script('editor-expand'); + $_content_editor_dfw = true; + $_wp_editor_expand = ( get_user_setting( 'editor_expand', 'on' ) === 'on' ); +} if ( wp_is_mobile() ) wp_enqueue_script( 'jquery-touch-punch' ); @@ -24,11 +50,16 @@ $post_ID = isset($post_ID) ? (int) $post_ID : 0; $user_ID = isset($user_ID) ? (int) $user_ID : 0; $action = isset($action) ? $action : ''; +if ( $post_ID == get_option( 'page_for_posts' ) && empty( $post->post_content ) ) { + add_action( 'edit_form_after_title', '_wp_posts_page_notice' ); + remove_post_type_support( $post_type, 'editor' ); +} + $thumbnail_support = current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports( $post_type, 'thumbnail' ); if ( ! $thumbnail_support && 'attachment' === $post_type && $post->post_mime_type ) { - if ( 0 === strpos( $post->post_mime_type, 'audio/' ) ) { + if ( wp_attachment_is( 'audio', $post ) ) { $thumbnail_support = post_type_supports( 'attachment:audio', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:audio' ); - } elseif ( 0 === strpos( $post->post_mime_type, 'video/' ) ) { + } elseif ( wp_attachment_is( 'video', $post ) ) { $thumbnail_support = post_type_supports( 'attachment:video', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:video' ); } } @@ -44,37 +75,92 @@ add_action( 'admin_footer', '_local_storage_notice' ); /* * @todo Document the $messages array(s). */ +$permalink = get_permalink( $post_ID ); +if ( ! $permalink ) { + $permalink = ''; +} + $messages = array(); + +$preview_post_link_html = $scheduled_post_link_html = $view_post_link_html = ''; +$preview_page_link_html = $scheduled_page_link_html = $view_page_link_html = ''; + +$preview_url = get_preview_post_link( $post ); + +$viewable = is_post_type_viewable( $post_type_object ); + +if ( $viewable ) { + + // Preview post link. + $preview_post_link_html = sprintf( ' %2$s', + esc_url( $preview_url ), + __( 'Preview post' ) + ); + + // Scheduled post preview link. + $scheduled_post_link_html = sprintf( ' %2$s', + esc_url( $permalink ), + __( 'Preview post' ) + ); + + // View post link. + $view_post_link_html = sprintf( ' %2$s', + esc_url( $permalink ), + __( 'View post' ) + ); + + // Preview page link. + $preview_page_link_html = sprintf( ' %2$s', + esc_url( $preview_url ), + __( 'Preview page' ) + ); + + // Scheduled page preview link. + $scheduled_page_link_html = sprintf( ' %2$s', + esc_url( $permalink ), + __( 'Preview page' ) + ); + + // View page link. + $view_page_link_html = sprintf( ' %2$s', + esc_url( $permalink ), + __( 'View page' ) + ); + +} + +/* translators: Publish box date format, see http://php.net/date */ +$scheduled_date = date_i18n( __( 'M j, Y @ H:i' ), strtotime( $post->post_date ) ); + $messages['post'] = array( 0 => '', // Unused. Messages start at index 1. - 1 => sprintf( __('Post updated. View post'), esc_url( get_permalink($post_ID) ) ), - 2 => __('Custom field updated.'), - 3 => __('Custom field deleted.'), - 4 => __('Post updated.'), + 1 => __( 'Post updated.' ) . $view_post_link_html, + 2 => __( 'Custom field updated.' ), + 3 => __( 'Custom field deleted.' ), + 4 => __( 'Post updated.' ), /* translators: %s: date and time of the revision */ - 5 => isset($_GET['revision']) ? sprintf( __('Post restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false, - 6 => sprintf( __('Post published. View post'), esc_url( get_permalink($post_ID) ) ), - 7 => __('Post saved.'), - 8 => sprintf( __('Post submitted. Preview post'), esc_url( add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ) ), - 9 => sprintf( __('Post scheduled for: %1$s. Preview post'), - /* translators: Publish box date format, see http://php.net/date */ - date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), esc_url( get_permalink($post_ID) ) ), - 10 => sprintf( __('Post draft updated. Preview post'), esc_url( add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ) ), + 5 => isset($_GET['revision']) ? sprintf( __( 'Post restored to revision from %s.' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false, + 6 => __( 'Post published.' ) . $view_post_link_html, + 7 => __( 'Post saved.' ), + 8 => __( 'Post submitted.' ) . $preview_post_link_html, + 9 => sprintf( __( 'Post scheduled for: %s.' ), '' . $scheduled_date . '' ) . $scheduled_post_link_html, + 10 => __( 'Post draft updated.' ) . $preview_post_link_html, ); $messages['page'] = array( 0 => '', // Unused. Messages start at index 1. - 1 => sprintf( __('Page updated. View page'), esc_url( get_permalink($post_ID) ) ), - 2 => __('Custom field updated.'), - 3 => __('Custom field deleted.'), - 4 => __('Page updated.'), - 5 => isset($_GET['revision']) ? sprintf( __('Page restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false, - 6 => sprintf( __('Page published. View page'), esc_url( get_permalink($post_ID) ) ), - 7 => __('Page saved.'), - 8 => sprintf( __('Page submitted. Preview page'), esc_url( add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ) ), - 9 => sprintf( __('Page scheduled for: %1$s. Preview page'), date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), esc_url( get_permalink($post_ID) ) ), - 10 => sprintf( __('Page draft updated. Preview page'), esc_url( add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ) ), + 1 => __( 'Page updated.' ) . $view_page_link_html, + 2 => __( 'Custom field updated.' ), + 3 => __( 'Custom field deleted.' ), + 4 => __( 'Page updated.' ), + /* translators: %s: date and time of the revision */ + 5 => isset($_GET['revision']) ? sprintf( __( 'Page restored to revision from %s.' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false, + 6 => __( 'Page published.' ) . $view_page_link_html, + 7 => __( 'Page saved.' ), + 8 => __( 'Page submitted.' ) . $preview_page_link_html, + 9 => sprintf( __( 'Page scheduled for: %s.' ), '' . $scheduled_date . '' ) . $scheduled_page_link_html, + 10 => __( 'Page draft updated.' ) . $preview_page_link_html, ); -$messages['attachment'] = array_fill( 1, 10, __( 'Media attachment updated.' ) ); // Hack, for now. +$messages['attachment'] = array_fill( 1, 10, __( 'Media file updated.' ) ); // Hack, for now. /** * Filter the post updated messages. @@ -111,7 +197,7 @@ $form_extra .= "post_modified_gmt, false ) > mysql2date( 'U', $post->post_modified_gmt, false ) ) { - foreach ( _wp_post_revision_fields() as $autosave_field => $_autosave_field ) { + foreach ( _wp_post_revision_fields( $post ) as $autosave_field => $_autosave_field ) { if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) { $notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below. View the autosave' ), get_edit_post_link( $autosave->ID ) ); break; @@ -147,7 +233,7 @@ if ( 'attachment' == $post_type ) { add_meta_box( 'submitdiv', __('Save'), 'attachment_submit_meta_box', null, 'side', 'core' ); add_action( 'edit_form_after_title', 'edit_form_image_editor' ); - if ( 0 === strpos( $post->post_mime_type, 'audio/' ) ) { + if ( wp_attachment_is( 'audio', $post ) ) { add_meta_box( 'attachment-id3', __( 'Metadata' ), 'attachment_id3_data_meta_box', null, 'normal', 'core' ); } } else { @@ -176,8 +262,8 @@ foreach ( get_object_taxonomies( $post ) as $tax_name ) { if ( post_type_supports($post_type, 'page-attributes') ) add_meta_box('pageparentdiv', 'page' == $post_type ? __('Page Attributes') : __('Attributes'), 'page_attributes_meta_box', null, 'side', 'core'); -if ( $thumbnail_support ) - add_meta_box('postimagediv', __('Featured Image'), 'post_thumbnail_meta_box', null, 'side', 'low'); +if ( $thumbnail_support && current_user_can( 'upload_files' ) ) + add_meta_box('postimagediv', esc_html( $post_type_object->labels->featured_image ), 'post_thumbnail_meta_box', null, 'side', 'low'); if ( post_type_supports($post_type, 'excerpt') ) add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', null, 'normal', 'core'); @@ -198,11 +284,25 @@ if ( post_type_supports($post_type, 'custom-fields') ) */ do_action( 'dbx_post_advanced', $post ); -if ( post_type_supports($post_type, 'comments') ) - add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', null, 'normal', 'core'); +// Allow the Discussion meta box to show up if the post type supports comments, +// or if comments or pings are open. +if ( comments_open( $post ) || pings_open( $post ) || post_type_supports( $post_type, 'comments' ) ) { + add_meta_box( 'commentstatusdiv', __( 'Discussion' ), 'post_comment_status_meta_box', null, 'normal', 'core' ); +} -if ( ( 'publish' == get_post_status( $post ) || 'private' == get_post_status( $post ) ) && post_type_supports($post_type, 'comments') ) - add_meta_box('commentsdiv', __('Comments'), 'post_comment_meta_box', null, 'normal', 'core'); +$stati = get_post_stati( array( 'public' => true ) ); +if ( empty( $stati ) ) { + $stati = array( 'publish' ); +} +$stati[] = 'private'; + +if ( in_array( get_post_status( $post ), $stati ) ) { + // If the post type support comments, or the post has comments, allow the + // Comments meta box. + if ( comments_open( $post ) || pings_open( $post ) || $post->comment_count > 0 || post_type_supports( $post_type, 'comments' ) ) { + add_meta_box( 'commentsdiv', __( 'Comments' ), 'post_comment_meta_box', null, 'normal', 'core' ); + } +} if ( ! ( 'pending' == get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) ) ) add_meta_box('slugdiv', __('Slug'), 'post_slug_meta_box', null, 'normal', 'core'); @@ -225,7 +325,7 @@ do_action( 'add_meta_boxes', $post_type, $post ); /** * Fires after all built-in meta boxes have been added, contextually for the given post type. * - * The dynamic portion of the hook, $post_type, refers to the post type of the post. + * The dynamic portion of the hook, `$post_type`, refers to the post type of the post. * * @since 3.0.0 * @@ -261,8 +361,12 @@ if ( 'post' == $post_type ) { 'content' => $customize_display, ) ); - $title_and_editor = '

' . __('Title - Enter a title for your post. After you enter a title, you’ll see the permalink below, which you can edit.') . '

'; - $title_and_editor .= '

' . __('Post editor - Enter the text for your post. There are two modes of editing: Visual and Text. Choose the mode by clicking on the appropriate tab. Visual mode gives you a WYSIWYG editor. Click the last icon in the row to get a second row of controls. The Text mode allows you to enter HTML along with your post text. Line breaks will be converted to paragraphs automatically. You can insert media files by clicking the icons above the post editor and following the directions. You can go to the distraction-free writing screen via the Fullscreen icon in Visual mode (second to last in the top row) or the Fullscreen button in Text mode (last in the row). Once there, you can make buttons visible by hovering over the top area. Exit Fullscreen back to the regular post editor.') . '

'; + $title_and_editor = '

' . __('Title — Enter a title for your post. After you enter a title, you’ll see the permalink below, which you can edit.') . '

'; + $title_and_editor .= '

' . __( 'Post editor — Enter the text for your post. There are two modes of editing: Visual and Text. Choose the mode by clicking on the appropriate tab.' ) . '

'; + $title_and_editor .= '

' . __( 'Visual mode gives you an editor that is similar to a word processor. Click the Toolbar Toggle button to get a second row of controls.' ) . '

'; + $title_and_editor .= '

' . __( 'The Text mode allows you to enter HTML along with your post text. Note that <p> and <br> tags are converted to line breaks when switching to the Text editor to make it less cluttered. When you type, a single line break can be used instead of typing <br>, and two line breaks instead of paragraph tags. The line breaks are converted back to tags automatically.' ) . '

'; + $title_and_editor .= '

' . __( 'You can insert media files by clicking the icons above the post editor and following the directions. You can align or edit images using the inline formatting toolbar available in Visual mode.' ) . '

'; + $title_and_editor .= '

' . __( 'You can enable distraction-free writing mode using the icon to the right. This feature is not available for old browsers or devices with small screens, and requires that the full-height editor be enabled in Screen Options.' ) . '

'; $title_and_editor .= '

' . __( 'Keyboard users: When you’re working in the visual editor, you can use Alt + F10 to access the toolbar.' ) . '

'; get_current_screen()->add_help_tab( array( @@ -272,14 +376,14 @@ if ( 'post' == $post_type ) { ) ); get_current_screen()->set_help_sidebar( - '

' . sprintf(__('You can also create posts with the Press This bookmarklet.'), 'options-writing.php') . '

' . + '

' . sprintf(__('You can also create posts with the Press This bookmarklet.'), 'tools.php') . '

' . '

' . __('For more information:') . '

' . - '

' . __('Documentation on Writing and Editing Posts') . '

' . + '

' . __('Documentation on Writing and Editing Posts') . '

' . '

' . __('Support Forums') . '

' ); } elseif ( 'page' == $post_type ) { - $about_pages = '

' . __('Pages are similar to Posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest Pages under other Pages by making one the “Parent” of the other, creating a group of Pages.') . '

' . - '

' . __('Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Screen Options tab, and expanding/collapsing boxes as you choose. This screen also has the distraction-free writing space, available in both the Visual and Text modes via the Fullscreen buttons. The Page editor mostly works the same as the Post editor, but there are some Page-specific features in the Page Attributes box:') . '

'; + $about_pages = '

' . __('Pages are similar to posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest pages under other pages by making one the “Parent” of the other, creating a group of pages.') . '

' . + '

'; get_current_screen()->add_help_tab( array( 'id' => 'about-pages', @@ -289,8 +393,8 @@ if ( 'post' == $post_type ) { get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Adding New Pages') . '

' . - '

' . __('Documentation on Editing Pages') . '

' . + '

' . __('Documentation on Adding New Pages') . '

' . + '

' . __('Documentation on Editing Pages') . '

' . '

' . __('Support Forums') . '

' ); } elseif ( 'attachment' == $post_type ) { @@ -306,14 +410,14 @@ if ( 'post' == $post_type ) { get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Edit Media') . '

' . + '

' . __('Documentation on Edit Media') . '

' . '

' . __('Support Forums') . '

' ); } if ( 'post' == $post_type || 'page' == $post_type ) { $inserting_media = '

' . __( 'You can upload and insert media (images, audio, documents, etc.) by clicking the Add Media button. You can select from the images and files already uploaded to the Media Library, or upload new media to add to your page or post. To create an image gallery, select the images to add and click the “Create a new gallery” button.' ) . '

'; - $inserting_media .= '

' . __( 'You can also embed media from many popular websites including Twitter, YouTube, Flickr and others by pasting the media URL on its own line into the content of your post/page. Please refer to the Codex to learn more about embeds.' ) . '

'; + $inserting_media .= '

'; get_current_screen()->add_help_tab( array( 'id' => 'inserting-media', @@ -324,14 +428,17 @@ if ( 'post' == $post_type || 'page' == $post_type ) { if ( 'post' == $post_type ) { $publish_box = '

' . __('Several boxes on this screen contain settings for how your content will be published, including:') . '

'; - $publish_box .= '

' . __('Publish - You can set the terms of publishing your post in the Publish box. For Status, Visibility, and Publish (immediately), click on the Edit link to reveal more options. Visibility includes options for password-protecting a post or making it stay at the top of your blog indefinitely (sticky). Publish (immediately) allows you to set a future or past date and time, so you can schedule a post to be published in the future or backdate a post.') . '

' . + __( 'Publish — You can set the terms of publishing your post in the Publish box. For Status, Visibility, and Publish (immediately), click on the Edit link to reveal more options. Visibility includes options for password-protecting a post or making it stay at the top of your blog indefinitely (sticky). The Password protected option allows you to set an arbitrary password for each post. The Private option hides the post from everyone except editors and administrators. Publish (immediately) allows you to set a future or past date and time, so you can schedule a post to be published in the future or backdate a post.' ) . + '
' . __( 'Format - Post Formats designate how your theme will display a specific post. For example, you could have a standard blog post with a title and paragraphs, or a short aside that omits the title and contains a short text blurb. Please refer to the Codex for descriptions of each post format. Your theme could enable all or some of 10 possible formats.' ) . '
' . __( 'Format — Post Formats designate how your theme will display a specific post. For example, you could have a standard blog post with a title and paragraphs, or a short aside that omits the title and contains a short text blurb. Please refer to the Codex for descriptions of each post format. Your theme could enable all or some of 10 possible formats.' ) . '
' . __('Featured Image - This allows you to associate an image with your post without inserting it. This is usually useful only if your theme makes use of the featured image as a post thumbnail on the home page, a custom header, etc.') . '
' . sprintf( __( '%s — This allows you to associate an image with your post without inserting it. This is usually useful only if your theme makes use of the image as a post thumbnail on the home page, a custom header, etc.' ), esc_html( $post_type_object->labels->featured_image ) ) . '

' . __('Send Trackbacks - Trackbacks are a way to notify legacy blog systems that you’ve linked to them. Enter the URL(s) you want to send trackbacks. If you link to other WordPress sites they’ll be notified automatically using pingbacks, and this field is unnecessary.') . '

' . __('Discussion - You can turn comments and pings on or off, and if there are comments on the post, you can see them here and moderate them.') . '

' . __('Send Trackbacks — Trackbacks are a way to notify legacy blog systems that you’ve linked to them. Enter the URL(s) you want to send trackbacks. If you link to other WordPress sites they’ll be notified automatically using pingbacks, and this field is unnecessary.') . '

' . __('Discussion — You can turn comments and pings on or off, and if there are comments on the post, you can see them here and moderate them.') . '

' . __('Parent - You can arrange your pages in hierarchies. For example, you could have an “About” page that has “Life Story” and “My Dog” pages under it. There are no limits to how many levels you can nest pages.') . '

' . __('Template - Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you’ll see them in this dropdown menu.') . '

' . __('Order - Pages are usually ordered alphabetically, but you can choose your own order by entering a number (1 for first, etc.) in this field.') . '

' . __('Parent — You can arrange your pages in hierarchies. For example, you could have an “About” page that has “Life Story” and “My Dog” pages under it. There are no limits to how many levels you can nest pages.') . '

' . __('Template — Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you’ll see them in this dropdown menu.') . '

' . __('Order — Pages are usually ordered alphabetically, but you can choose your own order by entering a number (1 for first, etc.) in this field.') . '

cap->create_posts ) ) - echo ' ' . esc_html( $post_type_object->labels->add_new ) . ''; -?>

+ echo ' ' . esc_html( $post_type_object->labels->add_new ) . ''; +?> -

- tag. + * Fires inside the post editor form tag. * * @since 3.0.0 * * @param WP_Post $post Post object. */ -?> -> +do_action( 'post_edit_form_tag', $post ); + +$referer = wp_get_referer(); +?>> @@ -399,7 +508,7 @@ if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create - + * @param string $text Placeholder text. Default 'Enter title here'. * @param WP_Post $post Post object. */ + $title_placeholder = apply_filters( 'enter_title_here', __( 'Enter title here' ), $post ); ?> - - + +

public ? get_sample_permalink_html($post->ID) : ''; -$shortlink = wp_get_shortlink($post->ID, 'post'); -$permalink = get_permalink( $post->ID ); -if ( !empty( $shortlink ) && $shortlink !== $permalink && $permalink !== home_url('?page_id=' . $post->ID) ) - $sample_permalink_html .= '' . __('Get Shortlink') . ''; + +// As of 4.4, the Get Shortlink button is hidden by default. +if ( has_filter( 'pre_get_shortlink' ) || has_filter( 'get_shortlink' ) ) { + $shortlink = wp_get_shortlink($post->ID, 'post'); + + if ( !empty( $shortlink ) && $shortlink !== $permalink && $permalink !== home_url('?page_id=' . $post->ID) ) { + $sample_permalink_html .= '' . __('Get Shortlink') . ''; + } +} if ( $post_type_object->public && ! ( 'pending' == get_post_status( $post ) && !current_user_can( $post_type_object->cap->publish_posts ) ) ) { $has_sample_permalink = $sample_permalink_html && 'auto-draft' != $post->post_status; @@ -464,6 +590,7 @@ if ( $post_type_object->public && ! ( 'pending' == get_post_status( $post ) && !

post_content, 'content', array( - 'dfw' => true, + '_content_editor_dfw' => $_content_editor_dfw, 'drag_drop_upload' => true, - 'tabfocus_elements' => 'insert-media-button,save-post', - 'editor_height' => 360, + 'tabfocus_elements' => 'content-html,save-post', + 'editor_height' => 300, 'tinymce' => array( 'resize' => false, + 'wp_autoresize_on' => $_wp_editor_expand, 'add_unload_trigger' => false, ), ) ); ?> - + "; $this->single_row_columns( $comment ); echo "\n"; + + unset( $GLOBALS['post'], $GLOBALS['comment'] ); } - function column_cb( $comment ) { - if ( $this->user_can ) { ?> - - - user_can ) { + return; + } + + $the_comment_status = wp_get_comment_status( $comment ); + + $out = ''; + + $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) ); + $approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) ); + + $url = "comment.php?c=$comment->comment_ID"; + + $approve_url = esc_url( $url . "&action=approvecomment&$approve_nonce" ); + $unapprove_url = esc_url( $url . "&action=unapprovecomment&$approve_nonce" ); + $spam_url = esc_url( $url . "&action=spamcomment&$del_nonce" ); + $unspam_url = esc_url( $url . "&action=unspamcomment&$del_nonce" ); + $trash_url = esc_url( $url . "&action=trashcomment&$del_nonce" ); + $untrash_url = esc_url( $url . "&action=untrashcomment&$del_nonce" ); + $delete_url = esc_url( $url . "&action=deletecomment&$del_nonce" ); + + // Preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash. + $actions = array( + 'approve' => '', 'unapprove' => '', + 'reply' => '', + 'quickedit' => '', + 'edit' => '', + 'spam' => '', 'unspam' => '', + 'trash' => '', 'untrash' => '', 'delete' => '' + ); + + // Not looking at all comments. + if ( $comment_status && 'all' != $comment_status ) { + if ( 'approved' === $the_comment_status ) { + $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; + } elseif ( 'unapproved' === $the_comment_status ) { + $actions['approve'] = "" . __( 'Approve' ) . ''; + } + } else { + $actions['approve'] = "" . __( 'Approve' ) . ''; + $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; + } + + if ( 'spam' !== $the_comment_status ) { + $actions['spam'] = "" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . ''; + } elseif ( 'spam' === $the_comment_status ) { + $actions['unspam'] = "" . _x( 'Not Spam', 'comment' ) . ''; + } + + if ( 'trash' === $the_comment_status ) { + $actions['untrash'] = "" . __( 'Restore' ) . ''; + } + + if ( 'spam' === $the_comment_status || 'trash' === $the_comment_status || !EMPTY_TRASH_DAYS ) { + $actions['delete'] = "" . __( 'Delete Permanently' ) . ''; + } else { + $actions['trash'] = "" . _x( 'Trash', 'verb' ) . ''; + } + + if ( 'spam' !== $the_comment_status && 'trash' !== $the_comment_status ) { + $actions['edit'] = "". __( 'Edit' ) . ''; + + $format = '%s'; + + $actions['quickedit'] = sprintf( $format, $comment->comment_ID, $comment->comment_post_ID, 'edit', 'vim-q comment-inline', esc_attr__( 'Quick edit this comment inline' ), __( 'Quick Edit' ) ); + + $actions['reply'] = sprintf( $format, $comment->comment_ID, $comment->comment_post_ID, 'replyto', 'vim-r comment-inline', esc_attr__( 'Reply to this comment' ), __( 'Reply' ) ); + } - $user_can = $this->user_can; + /** This filter is documented in wp-admin/includes/dashboard.php */ + $actions = apply_filters( 'comment_row_actions', array_filter( $actions ), $comment ); + + $i = 0; + $out .= '

'; + foreach ( $actions as $action => $link ) { + ++$i; + ( ( ( 'approve' === $action || 'unapprove' === $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | '; + + // Reply and quickedit need a hide-if-no-js span when not added with ajax + if ( ( 'reply' === $action || 'quickedit' === $action ) && ! defined('DOING_AJAX') ) + $action .= ' hide-if-no-js'; + elseif ( ( $action === 'untrash' && $the_comment_status === 'trash' ) || ( $action === 'unspam' && $the_comment_status === 'spam' ) ) { + if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) ) + $action .= ' approve'; + else + $action .= ' unapprove'; + } - $comment_url = esc_url( get_comment_link( $comment->comment_ID ) ); - $the_comment_status = wp_get_comment_status( $comment->comment_ID ); + $out .= "$sep$link"; + } + $out .= '

'; - if ( $user_can ) { - $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) ); - $approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) ); + $out .= ''; - $url = "comment.php?c=$comment->comment_ID"; + return $out; + } - $approve_url = esc_url( $url . "&action=approvecomment&$approve_nonce" ); - $unapprove_url = esc_url( $url . "&action=unapprovecomment&$approve_nonce" ); - $spam_url = esc_url( $url . "&action=spamcomment&$del_nonce" ); - $unspam_url = esc_url( $url . "&action=unspamcomment&$del_nonce" ); - $trash_url = esc_url( $url . "&action=trashcomment&$del_nonce" ); - $untrash_url = esc_url( $url . "&action=untrashcomment&$del_nonce" ); - $delete_url = esc_url( $url . "&action=deletecomment&$del_nonce" ); + /** + * + * @param WP_Comment $comment The comment object. + */ + public function column_cb( $comment ) { + if ( $this->user_can ) { ?> + + + '; $this->column_author( $comment ); echo ''; - echo '

'; - /* translators: 2: comment date, 3: comment time */ - printf( __( 'Submitted on %2$s at %3$s' ), $comment_url, - /* translators: comment date format. See http://php.net/date */ - get_comment_date( __( 'Y/m/d' ) ), - get_comment_date( get_option( 'time_format' ) ) - ); - if ( $comment->comment_parent ) { $parent = get_comment( $comment->comment_parent ); - $parent_link = esc_url( get_comment_link( $comment->comment_parent ) ); - $name = get_comment_author( $parent->comment_ID ); - printf( ' | '.__( 'In reply to %2$s.' ), $parent_link, $name ); + if ( $parent ) { + $parent_link = esc_url( get_comment_link( $parent ) ); + $name = get_comment_author( $parent ); + printf( + /* translators: %s: comment link */ + __( 'In reply to %s.' ), + '' . $name . '' + ); + } } - echo '

'; - comment_text(); - if ( $user_can ) { ?> + comment_text( $comment ); + if ( $this->user_can ) { ?>

<?php
 			/** This filter is documented in wp-admin/includes/comment.php */
@@ -424,110 +666,88 @@ class WP_Comments_List_Table extends WP_List_Table {
 		</div>
 		<?php
 		}
+	}
 
-		if ( $user_can ) {
-			// preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash
-			$actions = array(
-				'approve' => '', 'unapprove' => '',
-				'reply' => '',
-				'quickedit' => '',
-				'edit' => '',
-				'spam' => '', 'unspam' => '',
-				'trash' => '', 'untrash' => '', 'delete' => ''
-			);
+	/**
+	 *
+	 * @global string $comment_status
+	 *
+	 * @param WP_Comment $comment The comment object.
+	 */
+	public function column_author( $comment ) {
+		global $comment_status;
 
-			if ( $comment_status && 'all' != $comment_status ) { // not looking at all comments
-				if ( 'approved' == $the_comment_status )
-					$actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&new=unapproved' class='vim-u vim-destructive' title='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
-				else if ( 'unapproved' == $the_comment_status )
-					$actions['approve'] = "<a href='$approve_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&new=approved' class='vim-a vim-destructive' title='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
-			} else {
-				$actions['approve'] = "<a href='$approve_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved' class='vim-a' title='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
-				$actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved' class='vim-u' title='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
-			}
+		$author_url = get_comment_author_url( $comment );
 
-			if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) {
-				$actions['spam'] = "<a href='$spam_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::spam=1' class='vim-s vim-destructive' title='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
-			} elseif ( 'spam' == $the_comment_status ) {
-				$actions['unspam'] = "<a href='$unspam_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:66cc66:unspam=1' class='vim-z vim-destructive'>" . _x( 'Not Spam', 'comment' ) . '</a>';
-			} elseif ( 'trash' == $the_comment_status ) {
-				$actions['untrash'] = "<a href='$untrash_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:66cc66:untrash=1' class='vim-z vim-destructive'>" . __( 'Restore' ) . '</a>';
-			}
+		$author_url_display = untrailingslashit( preg_replace( '|^http(s)?://(www\.)?|i', '', $author_url ) );
+		if ( strlen( $author_url_display ) > 50 ) {
+			$author_url_display = wp_html_excerpt( $author_url_display, 49, '…' );
+		}
 
-			if ( 'spam' == $the_comment_status || 'trash' == $the_comment_status || !EMPTY_TRASH_DAYS ) {
-				$actions['delete'] = "<a href='$delete_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::delete=1' class='delete vim-d vim-destructive'>" . __( 'Delete Permanently' ) . '</a>';
-			} else {
-				$actions['trash'] = "<a href='$trash_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive' title='" . esc_attr__( 'Move this comment to the trash' ) . "'>" . _x( 'Trash', 'verb' ) . '</a>';
-			}
+		echo "<strong>"; comment_author( $comment ); echo '</strong><br />';
+		if ( ! empty( $author_url_display ) ) {
+			printf( '<a href="%s">%s</a><br />', esc_url( $author_url ), esc_html( $author_url_display ) );
+		}
 
-			if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) {
-				$actions['edit'] = "<a href='comment.php?action=editcomment&c={$comment->comment_ID}' title='" . esc_attr__( 'Edit comment' ) . "'>". __( 'Edit' ) . '</a>';
-				$actions['quickedit'] = '<a onclick="window.commentReply && commentReply.open( \''.$comment->comment_ID.'\',\''.$post->ID.'\',\'edit\' );return false;" class="vim-q" title="'.esc_attr__( 'Quick Edit' ).'" href="#">' . __( 'Quick Edit' ) . '</a>';
-				$actions['reply'] = '<a onclick="window.commentReply && commentReply.open( \''.$comment->comment_ID.'\',\''.$post->ID.'\' );return false;" class="vim-r" title="'.esc_attr__( 'Reply to this comment' ).'" href="#">' . __( 'Reply' ) . '</a>';
-			}
+		if ( $this->user_can ) {
+			if ( ! empty( $comment->comment_author_email ) ) {
+				/* This filter is documented in wp-includes/comment-template.php */
+				$email = apply_filters( 'comment_email', $comment->comment_author_email, $comment );
 
-			/** This filter is documented in wp-admin/includes/dashboard.php */
-			$actions = apply_filters( 'comment_row_actions', array_filter( $actions ), $comment );
-
-			$i = 0;
-			echo '<div class="row-actions">';
-			foreach ( $actions as $action => $link ) {
-				++$i;
-				( ( ( 'approve' == $action || 'unapprove' == $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
-
-				// Reply and quickedit need a hide-if-no-js span when not added with ajax
-				if ( ( 'reply' == $action || 'quickedit' == $action ) && ! defined('DOING_AJAX') )
-					$action .= ' hide-if-no-js';
-				elseif ( ( $action == 'untrash' && $the_comment_status == 'trash' ) || ( $action == 'unspam' && $the_comment_status == 'spam' ) ) {
-					if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) )
-						$action .= ' approve';
-					else
-						$action .= ' unapprove';
+				if ( ! empty( $email ) && '@' !== $email ) {
+					printf( '<a href="%1$s">%2$s</a><br />', esc_url( 'mailto:' . $email ), esc_html( $email ) );
 				}
+			}
 
-				echo "<span class='$action'>$sep$link</span>";
+			$author_ip = get_comment_author_IP( $comment );
+			if ( $author_ip ) {
+				$author_ip_url = add_query_arg( array( 's' => $author_ip, 'mode' => 'detail' ), admin_url( 'edit-comments.php' ) );
+				if ( 'spam' === $comment_status ) {
+					$author_ip_url = add_query_arg( 'comment_status', 'spam', $author_ip_url );
+				}
+				printf( '<a href="%1$s">%2$s</a>', esc_url( $author_ip_url ), esc_html( $author_ip ) );
 			}
-			echo '</div>';
 		}
 	}
 
-	function column_author( $comment ) {
-		global $comment_status;
-
-		$author_url = get_comment_author_url();
-		if ( 'http://' == $author_url )
-			$author_url = '';
-		$author_url_display = preg_replace( '|http://(www\.)?|i', '', $author_url );
-		if ( strlen( $author_url_display ) > 50 )
-			$author_url_display = substr( $author_url_display, 0, 49 ) . '…';
-
-		echo "<strong>"; comment_author(); echo '</strong><br />';
-		if ( !empty( $author_url ) )
-			echo "<a title='$author_url' href='$author_url'>$author_url_display</a><br />";
+	/**
+	 * @access public
+	 *
+	 * @param WP_Comment $comment The comment object.
+	 */
+	public function column_date( $comment ) {
+		/* 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 ( $this->user_can ) {
-			if ( !empty( $comment->comment_author_email ) ) {
-				comment_author_email_link();
-				echo '<br />';
-			}
-			echo '<a href="edit-comments.php?s=';
-			comment_author_IP();
-			echo '&mode=detail';
-			if ( 'spam' == $comment_status )
-				echo '&comment_status=spam';
-			echo '">';
-			comment_author_IP();
-			echo '</a>';
+		echo '<div class="submitted-on">';
+		if ( 'approved' === wp_get_comment_status( $comment ) && ! empty ( $comment->comment_post_ID ) ) {
+			printf(
+				'<a href="%s">%s</a>',
+				esc_url( get_comment_link( $comment ) ),
+				$submitted
+			);
+		} else {
+			echo $submitted;
 		}
+		echo '</div>';
 	}
 
-	function column_date( $comment ) {
-		return get_comment_date( __( 'Y/m/d \a\t g:ia' ) );
-	}
-
-	function column_response( $comment ) {
+	/**
+	 * @access public
+	 *
+	 * @param WP_Comment $comment The comment object.
+	 */
+	public function column_response( $comment ) {
 		$post = get_post();
 
+		if ( ! $post ) {
+			return;
+		}
+
 		if ( isset( $this->pending_count[$post->ID] ) ) {
 			$pending_comments = $this->pending_count[$post->ID];
 		} else {
@@ -536,24 +756,31 @@ class WP_Comments_List_Table extends WP_List_Table {
 		}
 
 		if ( current_user_can( 'edit_post', $post->ID ) ) {
-			$post_link = "<a href='" . get_edit_post_link( $post->ID ) . "'>";
-			$post_link .= get_the_title( $post->ID ) . '</a>';
+			$post_link = "<a href='" . get_edit_post_link( $post->ID ) . "' class='comments-edit-item-link'>";
+			$post_link .= esc_html( get_the_title( $post->ID ) ) . '</a>';
 		} else {
-			$post_link = get_the_title( $post->ID );
+			$post_link = esc_html( get_the_title( $post->ID ) );
 		}
 
-		echo '<div class="response-links"><span class="post-com-count-wrapper">';
-		echo $post_link . '<br />';
+		echo '<div class="response-links">';
+		if ( 'attachment' === $post->post_type && ( $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ) ) ) {
+			echo $thumb;
+		}
+		echo $post_link;
+		$post_type_object = get_post_type_object( $post->post_type );
+		echo "<a href='" . get_permalink( $post->ID ) . "' class='comments-view-item-link'>" . $post_type_object->labels->view_item . '</a>';
+		echo '<span class="post-com-count-wrapper post-com-count-', $post->ID, '">';
 		$this->comments_bubble( $post->ID, $pending_comments );
 		echo '</span> ';
-		$post_type_object = get_post_type_object( $post->post_type );
-		echo "<a href='" . get_permalink( $post->ID ) . "'>" . $post_type_object->labels->view_item . '</a>';
 		echo '</div>';
-		if ( 'attachment' == $post->post_type && ( $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ) ) )
-			echo $thumb;
 	}
 
-	function column_default( $comment, $column_name ) {
+	/**
+	 *
+	 * @param WP_Comment $comment     The comment object.
+	 * @param string     $column_name The custom column's name.
+	 */
+	public function column_default( $comment, $column_name ) {
 		/**
 		 * Fires when the default column output is displayed for a single row.
 		 *
@@ -565,52 +792,3 @@ class WP_Comments_List_Table extends WP_List_Table {
 		do_action( 'manage_comments_custom_column', $column_name, $comment->comment_ID );
 	}
 }
-
-/**
- * Post Comments List Table class.
- *
- * @package WordPress
- * @subpackage List_Table
- * @since 3.1.0
- * @access private
- *
- * @see WP_Comments_Table
- */
-class WP_Post_Comments_List_Table extends WP_Comments_List_Table {
-
-	function get_column_info() {
-		$this->_column_headers = array(
-			array(
-			'author'   => __( 'Author' ),
-			'comment'  => _x( 'Comment', 'column name' ),
-			),
-			array(),
-			array(),
-		);
-
-		return $this->_column_headers;
-	}
-
-	function get_table_classes() {
-		$classes = parent::get_table_classes();
-		$classes[] = 'comments-box';
-		return $classes;
-	}
-
-	function display( $output_empty = false ) {
-		extract( $this->_args );
-
-		wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
-?>
-<table class="<?php echo implode( ' ', $this->get_table_classes() ); ?>" style="display:none;">
-	<tbody id="the-comment-list"<?php if ( $singular ) echo " data-wp-lists='list:$singular'"; ?>>
-		<?php if ( ! $output_empty ) $this->display_rows_or_placeholder(); ?>
-	</tbody>
-</table>
-<?php
-	}
-
-	function get_per_page( $comment_status = false ) {
-		return 10;
-	}
-}
diff --git a/wp-admin/includes/class-wp-filesystem-base.php b/wp-admin/includes/class-wp-filesystem-base.php
index c471b54..5c45c97 100644
--- a/wp-admin/includes/class-wp-filesystem-base.php
+++ b/wp-admin/includes/class-wp-filesystem-base.php
@@ -19,16 +19,16 @@ class WP_Filesystem_Base {
 	 * @since 2.5.0
 	 * @var bool
 	 */
-	var $verbose = false;
+	public $verbose = false;
 
 	/**
 	 * Cached list of local filepaths to mapped remote filepaths.
 	 *
-	 * @access private
+	 * @access public
 	 * @since 2.7.0
 	 * @var array
 	 */
-	var $cache = array();
+	public $cache = array();
 
 	/**
 	 * The Access method of the current connection, Set automatically.
@@ -37,12 +37,17 @@ class WP_Filesystem_Base {
 	 * @since 2.5.0
 	 * @var string
 	 */
-	var $method = '';
+	public $method = '';
 
 	/**
-	 * Constructor (empty).
+	 * @access public
 	 */
-	function __construct() {}
+	public $errors = null;
+
+	/**
+	 * @access public
+	 */
+	public $options = array();
 
 	/**
 	 * Return the path on the remote filesystem of ABSPATH.
@@ -52,10 +57,10 @@ class WP_Filesystem_Base {
 	 *
 	 * @return string The location of the remote path.
 	 */
-	function abspath() {
+	public function abspath() {
 		$folder = $this->find_folder(ABSPATH);
 		// Perhaps the FTP folder is rooted at the WordPress install, Check for wp-includes folder in root, Could have some false positives, but rare.
-		if ( ! $folder && $this->is_dir('/wp-includes') )
+		if ( ! $folder && $this->is_dir( '/' . WPINC ) )
 			$folder = '/';
 		return $folder;
 	}
@@ -68,7 +73,7 @@ class WP_Filesystem_Base {
 	 *
 	 * @return string The location of the remote path.
 	 */
-	function wp_content_dir() {
+	public function wp_content_dir() {
 		return $this->find_folder(WP_CONTENT_DIR);
 	}
 
@@ -80,7 +85,7 @@ class WP_Filesystem_Base {
 	 *
 	 * @return string The location of the remote path.
 	 */
-	function wp_plugins_dir() {
+	public function wp_plugins_dir() {
 		return $this->find_folder(WP_PLUGIN_DIR);
 	}
 
@@ -93,7 +98,7 @@ class WP_Filesystem_Base {
 	 * @param string $theme The Theme stylesheet or template for the directory.
 	 * @return string The location of the remote path.
 	 */
-	function wp_themes_dir( $theme = false ) {
+	public function wp_themes_dir( $theme = false ) {
 		$theme_root = get_theme_root( $theme );
 
 		// Account for relative theme roots
@@ -111,7 +116,7 @@ class WP_Filesystem_Base {
 	 *
 	 * @return string The location of the remote path.
 	 */
-	function wp_lang_dir() {
+	public function wp_lang_dir() {
 		return $this->find_folder(WP_LANG_DIR);
 	}
 
@@ -132,7 +137,7 @@ class WP_Filesystem_Base {
 	 *                     Default false.
 	 * @return string The location of the remote path.
 	 */
-	function find_base_dir( $base = '.', $echo = false ) {
+	public function find_base_dir( $base = '.', $echo = false ) {
 		_deprecated_function(__FUNCTION__, '2.7', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()' );
 		$this->verbose = $echo;
 		return $this->abspath();
@@ -154,7 +159,7 @@ class WP_Filesystem_Base {
 	 * @param bool   $echo True to display debug information.
 	 * @return string The location of the remote path.
 	 */
-	function get_base_dir( $base = '.', $echo = false ) {
+	public function get_base_dir( $base = '.', $echo = false ) {
 		_deprecated_function(__FUNCTION__, '2.7', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()' );
 		$this->verbose = $echo;
 		return $this->abspath();
@@ -170,10 +175,9 @@ class WP_Filesystem_Base {
 	 * @since 2.7.0
 	 *
 	 * @param string $folder the folder to locate.
-	 * @return string The location of the remote path.
+	 * @return string|false The location of the remote path, false on failure.
 	 */
-	function find_folder( $folder ) {
-
+	public function find_folder( $folder ) {
 		if ( isset( $this->cache[ $folder ] ) )
 			return $this->cache[ $folder ];
 
@@ -233,22 +237,24 @@ class WP_Filesystem_Base {
 	 *
 	 * Expects Windows sanitized path.
 	 *
-	 * @access private
+	 * @access public
 	 * @since 2.7.0
 	 *
 	 * @param string $folder The folder to locate.
 	 * @param string $base   The folder to start searching from.
 	 * @param bool   $loop   If the function has recursed, Internal use only.
-	 * @return string The location of the remote path.
+	 * @return string|false The location of the remote path, false to cease looping.
 	 */
-	function search_for_folder( $folder, $base = '.', $loop = false ) {
+	public function search_for_folder( $folder, $base = '.', $loop = false ) {
 		if ( empty( $base ) || '.' == $base )
 			$base = trailingslashit($this->cwd());
 
 		$folder = untrailingslashit($folder);
 
-		if ( $this->verbose )
-			printf( "\n" . __('Looking for %1$s in %2$s') . "<br/>\n", $folder, $base );
+		if ( $this->verbose ) {
+			/* translators: 1: folder to locate, 2: folder to start searching from */
+			printf( "\n" . __( 'Looking for %1$s in %2$s' ) . "<br/>\n", $folder, $base );
+		}
 
 		$folder_parts = explode('/', $folder);
 		$folder_part_keys = array_keys( $folder_parts );
@@ -261,26 +267,36 @@ class WP_Filesystem_Base {
 			if ( $index == $last_index )
 				continue; // We want this to be caught by the next code block.
 
-			// Working from /home/ to /user/ to /wordpress/ see if that file exists within the current folder,
-			// If it's found, change into it and follow through looking for it.
-			// If it cant find WordPress down that route, it'll continue onto the next folder level, and see if that matches, and so on.
-			// If it reaches the end, and still cant find it, it'll return false for the entire function.
+			/*
+			 * Working from /home/ to /user/ to /wordpress/ see if that file exists within
+			 * the current folder, If it's found, change into it and follow through looking
+			 * for it. If it cant find WordPress down that route, it'll continue onto the next
+			 * folder level, and see if that matches, and so on. If it reaches the end, and still
+			 * cant find it, it'll return false for the entire function.
+			 */
 			if ( isset($files[ $key ]) ){
-				// Lets try that folder:
+
+				// Let's try that folder:
 				$newdir = trailingslashit(path_join($base, $key));
-				if ( $this->verbose )
-					printf( "\n" . __('Changing to %s') . "<br/>\n", $newdir );
-				// only search for the remaining path tokens in the directory, not the full path again
+				if ( $this->verbose ) {
+					/* translators: %s: directory name */
+					printf( "\n" . __( 'Changing to %s' ) . "<br/>\n", $newdir );
+				}
+
+				// Only search for the remaining path tokens in the directory, not the full path again.
 				$newfolder = implode( '/', array_slice( $folder_parts, $index + 1 ) );
 				if ( $ret = $this->search_for_folder( $newfolder, $newdir, $loop) )
 					return $ret;
 			}
 		}
 
-		// Only check this as a last resort, to prevent locating the incorrect install. All above procedures will fail quickly if this is the right branch to take.
+		// Only check this as a last resort, to prevent locating the incorrect install.
+		// All above procedures will fail quickly if this is the right branch to take.
 		if (isset( $files[ $last_path ] ) ) {
-			if ( $this->verbose )
-				printf( "\n" . __('Found %s') . "<br/>\n",  $base . $last_path );
+			if ( $this->verbose ) {
+				/* translators: %s: directory name */
+				printf( "\n" . __( 'Found %s' ) . "<br/>\n",  $base . $last_path );
+			}
 			return trailingslashit($base . $last_path);
 		}
 
@@ -308,8 +324,8 @@ class WP_Filesystem_Base {
 	 * @param string $file String filename.
 	 * @return string The *nix-style representation of permissions.
 	 */
-	function gethchmod( $file ){
-		$perms = $this->getchmod($file);
+	public function gethchmod( $file ){
+		$perms = intval( $this->getchmod( $file ), 8 );
 		if (($perms & 0xC000) == 0xC000) // Socket
 			$info = 's';
 		elseif (($perms & 0xA000) == 0xA000) // Symbolic Link
@@ -350,6 +366,18 @@ class WP_Filesystem_Base {
 		return $info;
 	}
 
+	/**
+	 * Gets the permissions of the specified file or filepath in their octal format
+	 *
+	 * @access public
+	 * @since 2.5.0
+	 * @param string $file
+	 * @return string the last 3 characters of the octal number
+	 */
+	public function getchmod( $file ) {
+		return '777';
+	}
+
 	/**
 	 * Convert *nix-style file permissions to a octal number.
 	 *
@@ -364,14 +392,16 @@ class WP_Filesystem_Base {
 	 * @param string $mode string The *nix-style file permission.
 	 * @return int octal representation
 	 */
-	function getnumchmodfromh( $mode ) {
+	public function getnumchmodfromh( $mode ) {
 		$realmode = '';
 		$legal =  array('', 'w', 'r', 'x', '-');
 		$attarray = preg_split('//', $mode);
 
-		for ($i=0; $i < count($attarray); $i++)
-		   if ($key = array_search($attarray[$i], $legal))
+		for ( $i = 0, $c = count( $attarray ); $i < $c; $i++ ) {
+		   if ($key = array_search($attarray[$i], $legal)) {
 			   $realmode .= $legal[$key];
+		   }
+		}
 
 		$mode = str_pad($realmode, 10, '-', STR_PAD_LEFT);
 		$trans = array('-'=>'0', 'r'=>'4', 'w'=>'2', 'x'=>'1');
@@ -387,13 +417,13 @@ class WP_Filesystem_Base {
 	/**
 	 * Determine if the string provided contains binary characters.
 	 *
-	 * @access private
+	 * @access public
 	 * @since 2.7.0
 	 *
 	 * @param string $text String to test against.
 	 * @return bool true if string is binary, false otherwise.
 	 */
-	function is_binary( $text ) {
+	public function is_binary( $text ) {
 		return (bool) preg_match( '|[^\x20-\x7E]|', $text ); // chr(32)..chr(127)
 	}
 
@@ -402,6 +432,7 @@ class WP_Filesystem_Base {
 	 *
 	 * Default behavior is to do nothing, override this in your subclass, if desired.
 	 *
+	 * @access public
 	 * @since 2.5.0
 	 *
 	 * @param string $file      Path to the file.
@@ -409,138 +440,160 @@ class WP_Filesystem_Base {
 	 * @param bool   $recursive Optional. If set True changes file owner recursivly. Defaults to False.
 	 * @return bool Returns true on success or false on failure.
 	 */
-	function chown( $file, $owner, $recursive = false ) {
+	public function chown( $file, $owner, $recursive = false ) {
 		return false;
 	}
 
 	/**
 	 * Connect filesystem.
 	 *
+	 * @access public
 	 * @since 2.5.0
+	 * @abstract
 	 *
 	 * @return bool True on success or false on failure (always true for WP_Filesystem_Direct).
 	 */
-	function connect() {
+	public function connect() {
 		return true;
 	}
 
 	/**
 	 * Read entire file into a string.
 	 *
+	 * @access public
 	 * @since 2.5.0
+	 * @abstract
 	 *
 	 * @param string $file Name of the file to read.
-	 * @return string|bool Returns the read data or false on failure.
+	 * @return mixed|bool Returns the read data or false on failure.
 	 */
-	function get_contents( $file ) {
+	public function get_contents( $file ) {
 		return false;
 	}
 
 	/**
 	 * Read entire file into an array.
 	 *
+	 * @access public
 	 * @since 2.5.0
+	 * @abstract
 	 *
 	 * @param string $file Path to the file.
 	 * @return array|bool the file contents in an array or false on failure.
 	 */
-	function get_contents_array( $file ) {
+	public function get_contents_array( $file ) {
 		return false;
 	}
 
 	/**
 	 * Write a string to a file.
 	 *
+	 * @access public
 	 * @since 2.5.0
+	 * @abstract
 	 *
 	 * @param string $file     Remote path to the file where to write the data.
 	 * @param string $contents The data to write.
 	 * @param int    $mode     Optional. The file permissions as octal number, usually 0644.
 	 * @return bool False on failure.
 	 */
-	function put_contents( $file, $contents, $mode = false ) {
+	public function put_contents( $file, $contents, $mode = false ) {
 		return false;
 	}
 
 	/**
 	 * Get the current working directory.
 	 *
+	 * @access public
 	 * @since 2.5.0
+	 * @abstract
 	 *
 	 * @return string|bool The current working directory on success, or false on failure.
 	 */
-	function cwd() {
+	public function cwd() {
 		return false;
 	}
 
 	/**
 	 * Change current directory.
 	 *
+	 * @access public
 	 * @since 2.5.0
+	 * @abstract
 	 *
 	 * @param string $dir The new current directory.
-	 * @return bool Returns true on success or false on failure.
+	 * @return bool|string
 	 */
-	function chdir( $dir ) {
+	public function chdir( $dir ) {
 		return false;
 	}
 
 	/**
 	 * Change the file group.
 	 *
+	 * @access public
 	 * @since 2.5.0
+	 * @abstract
 	 *
 	 * @param string $file      Path to the file.
 	 * @param mixed  $group     A group name or number.
 	 * @param bool   $recursive Optional. If set True changes file group recursively. Defaults to False.
-	 * @return bool Returns true on success or false on failure.
+	 * @return bool|string
 	 */
-	function chgrp( $file, $group, $recursive = false ) {
+	public function chgrp( $file, $group, $recursive = false ) {
 		return false;
 	}
 
 	/**
 	 * Change filesystem permissions.
 	 *
+	 * @access public
 	 * @since 2.5.0
+	 * @abstract
 	 *
 	 * @param string $file      Path to the file.
 	 * @param int    $mode      Optional. The permissions as octal number, usually 0644 for files, 0755 for dirs.
 	 * @param bool   $recursive Optional. If set True changes file group recursively. Defaults to False.
-	 * @return bool Returns true on success or false on failure.
+	 * @return bool|string
 	 */
-	function chmod( $file, $mode = false, $recursive = false ) {
+	public function chmod( $file, $mode = false, $recursive = false ) {
 		return false;
 	}
 
 	/**
 	 * Get the file owner.
 	 *
+	 * @access public
 	 * @since 2.5.0
-	 *
+	 * @abstract
+	 * 
 	 * @param string $file Path to the file.
 	 * @return string|bool Username of the user or false on error.
 	 */
-	function owner( $file ) {
+	public function owner( $file ) {
 		return false;
 	}
 
 	/**
 	 * Get the file's group.
 	 *
+	 * @access public
 	 * @since 2.5.0
+	 * @abstract
 	 *
 	 * @param string $file Path to the file.
 	 * @return string|bool The group or false on error.
 	 */
-	function group( $file ) {
+	public function group( $file ) {
 		return false;
 	}
 
 	/**
 	 * Copy a file.
 	 *
+	 * @access public
 	 * @since 2.5.0
+	 * @abstract
 	 *
 	 * @param string $source      Path to the source file.
 	 * @param string $destination Path to the destination file.
@@ -550,14 +603,16 @@ class WP_Filesystem_Base {
 	 *                            Default false.
 	 * @return bool True if file copied successfully, False otherwise.
 	 */
-	function copy( $source, $destination, $overwrite = false, $mode = false ) {
+	public function copy( $source, $destination, $overwrite = false, $mode = false ) {
 		return false;
 	}
 
 	/**
 	 * Move a file.
 	 *
+	 * @access public
 	 * @since 2.5.0
+	 * @abstract
 	 *
 	 * @param string $source      Path to the source file.
 	 * @param string $destination Path to the destination file.
@@ -565,14 +620,16 @@ class WP_Filesystem_Base {
 	 *                            Default false.
 	 * @return bool True if file copied successfully, False otherwise.
 	 */
-	function move( $source, $destination, $overwrite = false ) {
+	public function move( $source, $destination, $overwrite = false ) {
 		return false;
 	}
 
 	/**
 	 * Delete a file or directory.
 	 *
+	 * @access public
 	 * @since 2.5.0
+	 * @abstract
 	 *
 	 * @param string $file      Path to the file.
 	 * @param bool   $recursive Optional. If set True changes file group recursively. Defaults to False.
@@ -581,103 +638,119 @@ class WP_Filesystem_Base {
 	 *                          Default false.
 	 * @return bool True if the file or directory was deleted, false on failure.
 	 */
-	function delete( $file, $recursive = false, $type = false ) {
+	public function delete( $file, $recursive = false, $type = false ) {
 		return false;
 	}
 
 	/**
 	 * Check if a file or directory exists.
 	 *
+	 * @access public
 	 * @since 2.5.0
+	 * @abstract
 	 *
 	 * @param string $file Path to file/directory.
 	 * @return bool Whether $file exists or not.
 	 */
-	function exists( $file ) {
+	public function exists( $file ) {
 		return false;
 	}
 
 	/**
 	 * Check if resource is a file.
 	 *
+	 * @access public
 	 * @since 2.5.0
+	 * @abstract
 	 *
 	 * @param string $file File path.
 	 * @return bool Whether $file is a file.
 	 */
-	function is_file( $file ) {
+	public function is_file( $file ) {
 		return false;
 	}
 
 	/**
 	 * Check if resource is a directory.
 	 *
+	 * @access public
 	 * @since 2.5.0
+	 * @abstract
 	 *
 	 * @param string $path Directory path.
 	 * @return bool Whether $path is a directory.
 	 */
-	function is_dir( $path ) {
+	public function is_dir( $path ) {
 		return false;
 	}
 
 	/**
 	 * Check if a file is readable.
 	 *
+	 * @access public
 	 * @since 2.5.0
+	 * @abstract
 	 *
 	 * @param string $file Path to file.
 	 * @return bool Whether $file is readable.
 	 */
-	function is_readable( $file ) {
+	public function is_readable( $file ) {
 		return false;
 	}
 
 	/**
 	 * Check if a file or directory is writable.
 	 *
+	 * @access public
 	 * @since 2.5.0
+	 * @abstract
 	 *
-	 * @param string $path Path to file/directory.
+	 * @param string $file Path to file.
 	 * @return bool Whether $file is writable.
 	 */
-	function is_writable( $file ) {
+	public function is_writable( $file ) {
 		return false;
 	}
 
 	/**
 	 * Gets the file's last access time.
 	 *
+	 * @access public
 	 * @since 2.5.0
+	 * @abstract
 	 *
 	 * @param string $file Path to file.
-	 * @return int Unix timestamp representing last access time.
+	 * @return int|bool Unix timestamp representing last access time.
 	 */
-	function atime( $file ) {
+	public function atime( $file ) {
 		return false;
 	}
 
 	/**
 	 * Gets the file modification time.
 	 *
+	 * @access public
 	 * @since 2.5.0
+	 * @abstract
 	 *
 	 * @param string $file Path to file.
-	 * @return int Unix timestamp representing modification time.
+	 * @return int|bool Unix timestamp representing modification time.
 	 */
-	function mtime( $file ) {
+	public function mtime( $file ) {
 		return false;
 	}
 
 	/**
 	 * Gets the file size (in bytes).
 	 *
+	 * @access public
 	 * @since 2.5.0
+	 * @abstract
 	 *
 	 * @param string $file Path to file.
-	 * @return int Size of the file in bytes.
+	 * @return int|bool Size of the file in bytes.
 	 */
-	function size( $file ) {
+	public function size( $file ) {
 		return false;
 	}
 
@@ -686,7 +759,9 @@ class WP_Filesystem_Base {
 	 *
 	 * Note: If $file doesn't exist, it will be created.
 	 *
+	 * @access public
 	 * @since 2.5.0
+	 * @abstract
 	 *
 	 * @param string $file  Path to file.
 	 * @param int    $time  Optional. Modified time to set for file.
@@ -695,14 +770,16 @@ class WP_Filesystem_Base {
 	 *                      Default 0.
 	 * @return bool Whether operation was successful or not.
 	 */
-	function touch( $file, $time = 0, $atime = 0 ) {
+	public function touch( $file, $time = 0, $atime = 0 ) {
 		return false;
 	}
 
 	/**
 	 * Create a directory.
 	 *
+	 * @access public
 	 * @since 2.5.0
+	 * @abstract
 	 *
 	 * @param string $path  Path for new directory.
 	 * @param mixed  $chmod Optional. The permissions as octal number, (or False to skip chmod)
@@ -713,28 +790,32 @@ class WP_Filesystem_Base {
 	 *                      Default false.
 	 * @return bool False if directory cannot be created, true otherwise.
 	 */
-	function mkdir( $path, $chmod = false, $chown = false, $chgrp = false ) {
+	public function mkdir( $path, $chmod = false, $chown = false, $chgrp = false ) {
 		return false;
 	}
 
 	/**
 	 * Delete a directory.
 	 *
+	 * @access public
 	 * @since 2.5.0
+	 * @abstract
 	 *
 	 * @param string $path      Path to directory.
 	 * @param bool   $recursive Optional. Whether to recursively remove files/directories.
 	 *                          Default false.
 	 * @return bool Whether directory is deleted successfully or not.
 	 */
-	function rmdir( $path, $recursive = false ) {
+	public function rmdir( $path, $recursive = false ) {
 		return false;
 	}
 
 	/**
 	 * Get details for files in a directory or a specific file.
 	 *
+	 * @access public
 	 * @since 2.5.0
+	 * @abstract
 	 *
 	 * @param string $path           Path to directory or file.
 	 * @param bool   $include_hidden Optional. Whether to include details of hidden ("." prefixed) files.
@@ -744,19 +825,19 @@ class WP_Filesystem_Base {
 	 * @return array|bool {
 	 *     Array of files. False if unable to list directory contents.
 	 *
-	 *     @type string 'name'        Name of the file/directory.
-	 *     @type string 'perms'       *nix representation of permissions.
-	 *     @type int    'permsn'      Octal representation of permissions.
-	 *     @type string 'owner'       Owner name or ID.
-	 *     @type int    'size'        Size of file in bytes.
-	 *     @type int    'lastmodunix' Last modified unix timestamp.
-	 *     @type mixed  'lastmod'     Last modified month (3 letter) and day (without leading 0).
-	 *     @type int    'time'        Last modified time.
-	 *     @type string 'type'        Type of resource. 'f' for file, 'd' for directory.
-	 *     @type mixed  'files'       If a directory and $recursive is true, contains another array of files.
+	 *     @type string $name        Name of the file/directory.
+	 *     @type string $perms       *nix representation of permissions.
+	 *     @type int    $permsn      Octal representation of permissions.
+	 *     @type string $owner       Owner name or ID.
+	 *     @type int    $size        Size of file in bytes.
+	 *     @type int    $lastmodunix Last modified unix timestamp.
+	 *     @type mixed  $lastmod     Last modified month (3 letter) and day (without leading 0).
+	 *     @type int    $time        Last modified time.
+	 *     @type string $type        Type of resource. 'f' for file, 'd' for directory.
+	 *     @type mixed  $files       If a directory and $recursive is true, contains another array of files.
 	 * }
 	 */
-	function dirlist( $path, $include_hidden = true, $recursive = false ) {
+	public function dirlist( $path, $include_hidden = true, $recursive = false ) {
 		return false;
 	}
 
diff --git a/wp-admin/includes/class-wp-filesystem-direct.php b/wp-admin/includes/class-wp-filesystem-direct.php
index 2d4e566..bb37b8f 100644
--- a/wp-admin/includes/class-wp-filesystem-direct.php
+++ b/wp-admin/includes/class-wp-filesystem-direct.php
@@ -19,9 +19,11 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
 	/**
 	 * constructor
 	 *
+	 * @access public
+	 *
 	 * @param mixed $arg ignored argument
 	 */
-	function __construct($arg) {
+	public function __construct($arg) {
 		$this->method = 'direct';
 		$this->errors = new WP_Error();
 	}
@@ -29,32 +31,39 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
 	/**
 	 * Reads entire file into a string
 	 *
+	 * @access public
+	 *
 	 * @param string $file Name of the file to read.
 	 * @return string|bool The function returns the read data or false on failure.
 	 */
-	function get_contents($file) {
+	public function get_contents($file) {
 		return @file_get_contents($file);
 	}
 
 	/**
 	 * Reads entire file into an array
 	 *
+	 * @access public
+	 *
 	 * @param string $file Path to the file.
 	 * @return array|bool the file contents in an array or false on failure.
 	 */
-	function get_contents_array($file) {
+	public function get_contents_array($file) {
 		return @file($file);
 	}
 
 	/**
 	 * Write a string to a file
 	 *
-	 * @param string $file Remote path to the file where to write the data.
+	 * @access public
+	 *
+	 * @param string $file     Remote path to the file where to write the data.
 	 * @param string $contents The data to write.
-	 * @param int $mode (optional) The file permissions as octal number, usually 0644.
-	 * @return bool False upon failure.
+	 * @param int    $mode     Optional. The file permissions as octal number, usually 0644.
+	 *                         Default false.
+	 * @return bool False upon failure, true otherwise.
 	 */
-	function put_contents( $file, $contents, $mode = false ) {
+	public function put_contents( $file, $contents, $mode = false ) {
 		$fp = @fopen( $file, 'wb' );
 		if ( ! $fp )
 			return false;
@@ -80,31 +89,37 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
 	/**
 	 * Gets the current working directory
 	 *
+	 * @access public
+	 *
 	 * @return string|bool the current working directory on success, or false on failure.
 	 */
-	function cwd() {
+	public function cwd() {
 		return @getcwd();
 	}
 
 	/**
 	 * Change directory
 	 *
+	 * @access public
+	 *
 	 * @param string $dir The new current directory.
 	 * @return bool Returns true on success or false on failure.
 	 */
-	function chdir($dir) {
+	public function chdir($dir) {
 		return @chdir($dir);
 	}
 
 	/**
 	 * Changes file group
 	 *
-	 * @param string $file Path to the file.
-	 * @param mixed $group A group name or number.
-	 * @param bool $recursive (optional) If set True changes file group recursively. Defaults to False.
+	 * @access public
+	 *
+	 * @param string $file      Path to the file.
+	 * @param mixed  $group     A group name or number.
+	 * @param bool   $recursive Optional. If set True changes file group recursively. Default false.
 	 * @return bool Returns true on success or false on failure.
 	 */
-	function chgrp($file, $group, $recursive = false) {
+	public function chgrp($file, $group, $recursive = false) {
 		if ( ! $this->exists($file) )
 			return false;
 		if ( ! $recursive )
@@ -123,12 +138,15 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
 	/**
 	 * Changes filesystem permissions
 	 *
-	 * @param string $file Path to the file.
-	 * @param int $mode (optional) The permissions as octal number, usually 0644 for files, 0755 for dirs.
-	 * @param bool $recursive (optional) If set True changes file group recursively. Defaults to False.
+	 * @access public
+	 *
+	 * @param string $file      Path to the file.
+	 * @param int    $mode      Optional. The permissions as octal number, usually 0644 for files,
+	 *                          0755 for dirs. Default false.
+	 * @param bool   $recursive Optional. If set True changes file group recursively. Default false.
 	 * @return bool Returns true on success or false on failure.
 	 */
-	function chmod($file, $mode = false, $recursive = false) {
+	public function chmod($file, $mode = false, $recursive = false) {
 		if ( ! $mode ) {
 			if ( $this->is_file($file) )
 				$mode = FS_CHMOD_FILE;
@@ -152,12 +170,15 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
 	/**
 	 * Changes file owner
 	 *
-	 * @param string $file Path to the file.
-	 * @param mixed $owner A user name or number.
-	 * @param bool $recursive (optional) If set True changes file owner recursively. Defaults to False.
+	 * @access public
+	 *
+	 * @param string $file      Path to the file.
+	 * @param mixed  $owner     A user name or number.
+	 * @param bool   $recursive Optional. If set True changes file owner recursively.
+	 *                          Default false.
 	 * @return bool Returns true on success or false on failure.
 	 */
-	function chown($file, $owner, $recursive = false) {
+	public function chown($file, $owner, $recursive = false) {
 		if ( ! $this->exists($file) )
 			return false;
 		if ( ! $recursive )
@@ -175,10 +196,12 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
 	/**
 	 * Gets file owner
 	 *
+	 * @access public
+	 *
 	 * @param string $file Path to the file.
 	 * @return string|bool Username of the user or false on error.
 	 */
-	function owner($file) {
+	public function owner($file) {
 		$owneruid = @fileowner($file);
 		if ( ! $owneruid )
 			return false;
@@ -193,14 +216,22 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
 	 *
 	 * FIXME does not handle errors in fileperms()
 	 *
+	 * @access public
+	 *
 	 * @param string $file Path to the file.
 	 * @return string Mode of the file (last 3 digits).
 	 */
-	function getchmod($file) {
+	public function getchmod($file) {
 		return substr( decoct( @fileperms( $file ) ), -3 );
 	}
 
-	function group($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return string|false
+	 */
+	public function group($file) {
 		$gid = @filegroup($file);
 		if ( ! $gid )
 			return false;
@@ -210,7 +241,16 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
 		return $grouparray['name'];
 	}
 
-	function copy($source, $destination, $overwrite = false, $mode = false) {
+	/**
+	 * @access public
+	 *
+	 * @param string $source
+	 * @param string $destination
+	 * @param bool   $overwrite
+	 * @param int    $mode
+	 * @return bool
+	 */
+	public function copy($source, $destination, $overwrite = false, $mode = false) {
 		if ( ! $overwrite && $this->exists($destination) )
 			return false;
 
@@ -220,11 +260,19 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
 		return $rtval;
 	}
 
-	function move($source, $destination, $overwrite = false) {
+	/**
+	 * @access public
+	 *
+	 * @param string $source
+	 * @param string $destination
+	 * @param bool $overwrite
+	 * @return bool
+	 */
+	public function move($source, $destination, $overwrite = false) {
 		if ( ! $overwrite && $this->exists($destination) )
 			return false;
 
-		// try using rename first. if that fails (for example, source is read only) try copy
+		// Try using rename first. if that fails (for example, source is read only) try copy.
 		if ( @rename($source, $destination) )
 			return true;
 
@@ -236,7 +284,15 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
 		}
 	}
 
-	function delete($file, $recursive = false, $type = false) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @param bool $recursive
+	 * @param string $type
+	 * @return bool
+	 */
+	public function delete($file, $recursive = false, $type = false) {
 		if ( empty( $file ) ) // Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem.
 			return false;
 		$file = str_replace( '\\', '/', $file ); // for win32, occasional problems deleting files otherwise
@@ -263,40 +319,93 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
 
 		return $retval;
 	}
-
-	function exists($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return bool
+	 */
+	public function exists($file) {
 		return @file_exists($file);
 	}
-
-	function is_file($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return bool
+	 */
+	public function is_file($file) {
 		return @is_file($file);
 	}
-
-	function is_dir($path) {
+	/**
+	 * @access public
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function is_dir($path) {
 		return @is_dir($path);
 	}
 
-	function is_readable($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return bool
+	 */
+	public function is_readable($file) {
 		return @is_readable($file);
 	}
 
-	function is_writable($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return bool
+	 */
+	public function is_writable($file) {
 		return @is_writable($file);
 	}
 
-	function atime($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return int
+	 */
+	public function atime($file) {
 		return @fileatime($file);
 	}
 
-	function mtime($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return int
+	 */
+	public function mtime($file) {
 		return @filemtime($file);
 	}
 
-	function size($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return int
+	 */
+	public function size($file) {
 		return @filesize($file);
 	}
 
-	function touch($file, $time = 0, $atime = 0) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @param int $time
+	 * @param int $atime
+	 * @return bool
+	 */
+	public function touch($file, $time = 0, $atime = 0) {
 		if ($time == 0)
 			$time = time();
 		if ($atime == 0)
@@ -304,8 +413,17 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
 		return @touch($file, $time, $atime);
 	}
 
-	function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
-		// safe mode fails with a trailing slash under certain PHP versions.
+	/**
+	 * @access public
+	 *
+	 * @param string $path
+	 * @param mixed  $chmod
+	 * @param mixed  $chown
+	 * @param mixed  $chgrp
+	 * @return bool
+	 */
+	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
+		// Safe mode fails with a trailing slash under certain PHP versions.
 		$path = untrailingslashit($path);
 		if ( empty($path) )
 			return false;
@@ -323,11 +441,26 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
 		return true;
 	}
 
-	function rmdir($path, $recursive = false) {
+	/**
+	 * @access public
+	 *
+	 * @param string $path
+	 * @param bool $recursive
+	 * @return bool
+	 */
+	public function rmdir($path, $recursive = false) {
 		return $this->delete($path, $recursive);
 	}
 
-	function dirlist($path, $include_hidden = true, $recursive = false) {
+	/**
+	 * @access public
+	 *
+	 * @param string $path
+	 * @param bool $include_hidden
+	 * @param bool $recursive
+	 * @return bool|array
+	 */
+	public function dirlist($path, $include_hidden = true, $recursive = false) {
 		if ( $this->is_file($path) ) {
 			$limit_file = basename($path);
 			$path = dirname($path);
diff --git a/wp-admin/includes/class-wp-filesystem-ftpext.php b/wp-admin/includes/class-wp-filesystem-ftpext.php
index 434a1f9..e1202ae 100644
--- a/wp-admin/includes/class-wp-filesystem-ftpext.php
+++ b/wp-admin/includes/class-wp-filesystem-ftpext.php
@@ -15,18 +15,21 @@
  * @uses WP_Filesystem_Base Extends class
  */
 class WP_Filesystem_FTPext extends WP_Filesystem_Base {
-	var $link;
-	var $errors = null;
-	var $options = array();
-
-	function __construct($opt='') {
+	public $link;
+
+	/**
+	 * @access public
+	 *
+	 * @param array $opt
+	 */
+	public function __construct( $opt = '' ) {
 		$this->method = 'ftpext';
 		$this->errors = new WP_Error();
 
 		// Check if possible to use ftp functions.
 		if ( ! extension_loaded('ftp') ) {
 			$this->errors->add('no_ftp_ext', __('The ftp PHP extension is not available'));
-			return false;
+			return;
 		}
 
 		// This Class uses the timeout on a per-connection basis, Others use it on a per-action basis.
@@ -44,9 +47,6 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 		else
 			$this->options['hostname'] = $opt['hostname'];
 
-		if ( ! empty($opt['base']) )
-			$this->wp_base = $opt['base'];
-
 		// Check if the options provided are OK.
 		if ( empty($opt['username']) )
 			$this->errors->add('empty_username', __('FTP username is required'));
@@ -63,19 +63,34 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 			$this->options['ssl'] = true;
 	}
 
-	function connect() {
+	/**
+	 * @access public
+	 *
+	 * @return bool
+	 */
+	public function connect() {
 		if ( isset($this->options['ssl']) && $this->options['ssl'] && function_exists('ftp_ssl_connect') )
 			$this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
 		else
 			$this->link = @ftp_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
 
 		if ( ! $this->link ) {
-			$this->errors->add('connect', sprintf(__('Failed to connect to FTP Server %1$s:%2$s'), $this->options['hostname'], $this->options['port']));
+			$this->errors->add( 'connect',
+				/* translators: %s: hostname:port */
+				sprintf( __( 'Failed to connect to FTP Server %s' ),
+					$this->options['hostname'] . ':' . $this->options['port']
+				)
+			);
 			return false;
 		}
 
-		if ( ! @ftp_login($this->link,$this->options['username'], $this->options['password']) ) {
-			$this->errors->add('auth', sprintf(__('Username/Password incorrect for %s'), $this->options['username']));
+		if ( ! @ftp_login( $this->link,$this->options['username'], $this->options['password'] ) ) {
+			$this->errors->add( 'auth',
+				/* translators: %s: username */
+				sprintf( __( 'Username/Password incorrect for %s' ),
+					$this->options['username']
+				)
+			);
 			return false;
 		}
 
@@ -87,16 +102,31 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 		return true;
 	}
 
-	function get_contents( $file ) {
+	/**
+	 * Retrieves the file contents.
+	 *
+	 * @since 2.5.0
+	 * @access public
+	 *
+	 * @param string $file Filename.
+	 * @return string|false File contents on success, false if no temp file could be opened,
+	 *                      or if the file couldn't be retrieved.
+	 */
+	public function get_contents( $file ) {
 		$tempfile = wp_tempnam($file);
 		$temp = fopen($tempfile, 'w+');
 
-		if ( ! $temp )
+		if ( ! $temp ) {
+			unlink( $tempfile );
 			return false;
-
-		if ( ! @ftp_fget($this->link, $temp, $file, FTP_BINARY ) )
+		}
+		
+		if ( ! @ftp_fget( $this->link, $temp, $file, FTP_BINARY ) ) {
+			fclose( $temp );
+			unlink( $tempfile );
 			return false;
-
+		}
+		
 		fseek( $temp, 0 ); // Skip back to the start of the file being written to
 		$contents = '';
 
@@ -108,11 +138,25 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 		return $contents;
 	}
 
-	function get_contents_array($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return array
+	 */
+	public function get_contents_array($file) {
 		return explode("\n", $this->get_contents($file));
 	}
 
-	function put_contents($file, $contents, $mode = false ) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @param string $contents
+	 * @param bool|int $mode
+	 * @return bool
+	 */
+	public function put_contents($file, $contents, $mode = false ) {
 		$tempfile = wp_tempnam($file);
 		$temp = fopen( $tempfile, 'wb+' );
 		if ( ! $temp )
@@ -143,22 +187,37 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 		return $ret;
 	}
 
-	function cwd() {
+	/**
+	 * @access public
+	 *
+	 * @return string
+	 */
+	public function cwd() {
 		$cwd = @ftp_pwd($this->link);
 		if ( $cwd )
 			$cwd = trailingslashit($cwd);
 		return $cwd;
 	}
 
-	function chdir($dir) {
+	/**
+	 * @access public
+	 *
+	 * @param string $dir
+	 * @return bool
+	 */
+	public function chdir($dir) {
 		return @ftp_chdir($this->link, $dir);
 	}
 
-	function chgrp($file, $group, $recursive = false ) {
-		return false;
-	}
-
-	function chmod($file, $mode = false, $recursive = false) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @param int $mode
+	 * @param bool $recursive
+	 * @return bool
+	 */
+	public function chmod($file, $mode = false, $recursive = false) {
 		if ( ! $mode ) {
 			if ( $this->is_file($file) )
 				$mode = FS_CHMOD_FILE;
@@ -181,22 +240,48 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 		return (bool)@ftp_chmod($this->link, $mode, $file);
 	}
 
-	function owner($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return string
+	 */
+	public function owner($file) {
 		$dir = $this->dirlist($file);
 		return $dir[$file]['owner'];
 	}
-
-	function getchmod($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return string
+	 */
+	public function getchmod($file) {
 		$dir = $this->dirlist($file);
 		return $dir[$file]['permsn'];
 	}
 
-	function group($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return string
+	 */
+	public function group($file) {
 		$dir = $this->dirlist($file);
 		return $dir[$file]['group'];
 	}
 
-	function copy($source, $destination, $overwrite = false, $mode = false) {
+	/**
+	 * @access public
+	 *
+	 * @param string $source
+	 * @param string $destination
+	 * @param bool   $overwrite
+	 * @param string|bool $mode
+	 * @return bool
+	 */
+	public function copy($source, $destination, $overwrite = false, $mode = false) {
 		if ( ! $overwrite && $this->exists($destination) )
 			return false;
 		$content = $this->get_contents($source);
@@ -205,11 +290,27 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 		return $this->put_contents($destination, $content, $mode);
 	}
 
-	function move($source, $destination, $overwrite = false) {
+	/**
+	 * @access public
+	 *
+	 * @param string $source
+	 * @param string $destination
+	 * @param bool $overwrite
+	 * @return bool
+	 */
+	public function move($source, $destination, $overwrite = false) {
 		return ftp_rename($this->link, $source, $destination);
 	}
 
-	function delete($file, $recursive = false, $type = false) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @param bool $recursive
+	 * @param string $type
+	 * @return bool
+	 */
+	public function delete($file, $recursive = false, $type = false) {
 		if ( empty($file) )
 			return false;
 		if ( 'f' == $type || $this->is_file($file) )
@@ -224,16 +325,39 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 		return @ftp_rmdir($this->link, $file);
 	}
 
-	function exists($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return bool
+	 */
+	public function exists($file) {
 		$list = @ftp_nlist($this->link, $file);
+
+		if ( empty( $list ) && $this->is_dir( $file ) ) {
+			return true; // File is an empty directory.
+		}
+
 		return !empty($list); //empty list = no file, so invert.
 	}
 
-	function is_file($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return bool
+	 */
+	public function is_file($file) {
 		return $this->exists($file) && !$this->is_dir($file);
 	}
 
-	function is_dir($path) {
+	/**
+	 * @access public
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function is_dir($path) {
 		$cwd = $this->cwd();
 		$result = @ftp_chdir($this->link, trailingslashit($path) );
 		if ( $result && $path == $this->cwd() || $this->cwd() != $cwd ) {
@@ -243,31 +367,76 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 		return false;
 	}
 
-	function is_readable($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return bool
+	 */
+	public function is_readable($file) {
 		return true;
 	}
 
-	function is_writable($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return bool
+	 */
+	public function is_writable($file) {
 		return true;
 	}
 
-	function atime($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return bool
+	 */
+	public function atime($file) {
 		return false;
 	}
 
-	function mtime($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return int
+	 */
+	public function mtime($file) {
 		return ftp_mdtm($this->link, $file);
 	}
 
-	function size($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return int
+	 */
+	public function size($file) {
 		return ftp_size($this->link, $file);
 	}
 
-	function touch($file, $time = 0, $atime = 0) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return bool
+	 */
+	public function touch($file, $time = 0, $atime = 0) {
 		return false;
 	}
 
-	function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
+	/**
+	 * @access public
+	 *
+	 * @param string $path
+	 * @param mixed $chmod
+	 * @param mixed $chown
+	 * @param mixed $chgrp
+	 * @return bool
+	 */
+	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
 		$path = untrailingslashit($path);
 		if ( empty($path) )
 			return false;
@@ -275,19 +444,29 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 		if ( !@ftp_mkdir($this->link, $path) )
 			return false;
 		$this->chmod($path, $chmod);
-		if ( $chown )
-			$this->chown($path, $chown);
-		if ( $chgrp )
-			$this->chgrp($path, $chgrp);
 		return true;
 	}
 
-	function rmdir($path, $recursive = false) {
+	/**
+	 * @access public
+	 *
+	 * @param string $path
+	 * @param bool $recursive
+	 * @return bool
+	 */
+	public function rmdir($path, $recursive = false) {
 		return $this->delete($path, $recursive);
 	}
 
-	function parselisting($line) {
-		static $is_windows;
+	/**
+	 * @access public
+	 *
+	 * @staticvar bool $is_windows
+	 * @param string $line
+	 * @return array
+	 */
+	public function parselisting($line) {
+		static $is_windows = null;
 		if ( is_null($is_windows) )
 			$is_windows = stripos( ftp_systype($this->link), 'win') !== false;
 
@@ -326,6 +505,7 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 			else
 				$b['type'] = 'f';
 			$b['perms'] = $lucifer[0];
+			$b['permsn'] = $this->getnumchmodfromh( $b['perms'] );
 			$b['number'] = $lucifer[1];
 			$b['owner'] = $lucifer[2];
 			$b['group'] = $lucifer[3];
@@ -353,13 +533,22 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 		}
 
 		// Replace symlinks formatted as "source -> target" with just the source name
-		if ( $b['islink'] )
+		if ( isset( $b['islink'] ) && $b['islink'] ) {
 			$b['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $b['name'] );
+		}
 
 		return $b;
 	}
 
-	function dirlist($path = '.', $include_hidden = true, $recursive = false) {
+	/**
+	 * @access public
+	 *
+	 * @param string $path
+	 * @param bool $include_hidden
+	 * @param bool $recursive
+	 * @return bool|array
+	 */
+	public function dirlist($path = '.', $include_hidden = true, $recursive = false) {
 		if ( $this->is_file($path) ) {
 			$limit_file = basename($path);
 			$path = dirname($path) . '/';
@@ -408,7 +597,10 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 		return $ret;
 	}
 
-	function __destruct() {
+	/**
+	 * @access public
+	 */
+	public function __destruct() {
 		if ( $this->link )
 			ftp_close($this->link);
 	}
diff --git a/wp-admin/includes/class-wp-filesystem-ftpsockets.php b/wp-admin/includes/class-wp-filesystem-ftpsockets.php
index af4c531..fe74d33 100644
--- a/wp-admin/includes/class-wp-filesystem-ftpsockets.php
+++ b/wp-admin/includes/class-wp-filesystem-ftpsockets.php
@@ -15,32 +15,37 @@
  * @uses WP_Filesystem_Base Extends class
  */
 class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
-	var $ftp = false;
-	var $errors = null;
-	var $options = array();
-
-	function __construct($opt = '') {
+	/**
+	 * @access public
+	 * @var ftp
+	 */
+	public $ftp;
+
+	/**
+	 * @access public
+	 *
+	 * @param array $opt
+	 */
+	public function __construct( $opt  = '' ) {
 		$this->method = 'ftpsockets';
 		$this->errors = new WP_Error();
 
 		// Check if possible to use ftp functions.
-		if ( ! @include_once ABSPATH . 'wp-admin/includes/class-ftp.php' )
-				return false;
+		if ( ! @include_once( ABSPATH . 'wp-admin/includes/class-ftp.php' ) ) {
+			return;
+		}
 		$this->ftp = new ftp();
 
 		if ( empty($opt['port']) )
 			$this->options['port'] = 21;
 		else
-			$this->options['port'] = $opt['port'];
+			$this->options['port'] = (int) $opt['port'];
 
 		if ( empty($opt['hostname']) )
 			$this->errors->add('empty_hostname', __('FTP hostname is required'));
 		else
 			$this->options['hostname'] = $opt['hostname'];
 
-		if ( ! empty($opt['base']) )
-			$this->wp_base = $opt['base'];
-
 		// Check if the options provided are OK.
 		if ( empty ($opt['username']) )
 			$this->errors->add('empty_username', __('FTP username is required'));
@@ -53,24 +58,44 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 			$this->options['password'] = $opt['password'];
 	}
 
-	function connect() {
+	/**
+	 * @access public
+	 *
+	 * @return bool
+	 */
+	public function connect() {
 		if ( ! $this->ftp )
 			return false;
 
 		$this->ftp->setTimeout(FS_CONNECT_TIMEOUT);
 
-		if ( ! $this->ftp->SetServer($this->options['hostname'], $this->options['port']) ) {
-			$this->errors->add('connect', sprintf(__('Failed to connect to FTP Server %1$s:%2$s'), $this->options['hostname'], $this->options['port']));
+		if ( ! $this->ftp->SetServer( $this->options['hostname'], $this->options['port'] ) ) {
+			$this->errors->add( 'connect',
+				/* translators: %s: hostname:port */
+				sprintf( __( 'Failed to connect to FTP Server %s' ),
+					$this->options['hostname'] . ':' . $this->options['port']
+				)
+			);
 			return false;
 		}
 
 		if ( ! $this->ftp->connect() ) {
-			$this->errors->add('connect', sprintf(__('Failed to connect to FTP Server %1$s:%2$s'), $this->options['hostname'], $this->options['port']));
+			$this->errors->add( 'connect',
+				/* translators: %s: hostname:port */
+				sprintf( __( 'Failed to connect to FTP Server %s' ),
+					$this->options['hostname'] . ':' . $this->options['port']
+				)
+			);
 			return false;
 		}
 
-		if ( ! $this->ftp->login($this->options['username'], $this->options['password']) ) {
-			$this->errors->add('auth', sprintf(__('Username/Password incorrect for %s'), $this->options['username']));
+		if ( ! $this->ftp->login( $this->options['username'], $this->options['password'] ) ) {
+			$this->errors->add( 'auth',
+				/* translators: %s: username */
+				sprintf( __( 'Username/Password incorrect for %s' ),
+					$this->options['username']
+				)
+			);
 			return false;
 		}
 
@@ -80,7 +105,17 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 		return true;
 	}
 
-	function get_contents( $file ) {
+	/**
+	 * Retrieves the file contents.
+	 *
+	 * @since 2.5.0
+	 * @access public
+	 *
+	 * @param string $file Filename.
+	 * @return string|false File contents on success, false if no temp file could be opened,
+	 *                      or if the file doesn't exist.
+	 */
+	public function get_contents( $file ) {
 		if ( ! $this->exists($file) )
 			return false;
 
@@ -113,11 +148,25 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 		return $contents;
 	}
 
-	function get_contents_array($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return array
+	 */
+	public function get_contents_array($file) {
 		return explode("\n", $this->get_contents($file) );
 	}
 
-	function put_contents($file, $contents, $mode = false ) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @param string $contents
+	 * @param int|bool $mode
+	 * @return bool
+	 */
+	public function put_contents($file, $contents, $mode = false ) {
 		$temp = wp_tempnam( $file );
 		if ( ! $temphandle = @fopen($temp, 'w+') ) {
 			unlink($temp);
@@ -151,22 +200,37 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 		return $ret;
 	}
 
-	function cwd() {
+	/**
+	 * @access public
+	 *
+	 * @return string
+	 */
+	public function cwd() {
 		$cwd = $this->ftp->pwd();
 		if ( $cwd )
 			$cwd = trailingslashit($cwd);
 		return $cwd;
 	}
 
-	function chdir($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return bool
+	 */
+	public function chdir($file) {
 		return $this->ftp->chdir($file);
 	}
 
-	function chgrp($file, $group, $recursive = false ) {
-		return false;
-	}
-
-	function chmod($file, $mode = false, $recursive = false ) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @param int|bool $mode
+	 * @param bool $recursive
+	 * @return bool
+	 */
+	public function chmod($file, $mode = false, $recursive = false ) {
 		if ( ! $mode ) {
 			if ( $this->is_file($file) )
 				$mode = FS_CHMOD_FILE;
@@ -187,22 +251,49 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 		return $this->ftp->chmod($file, $mode);
 	}
 
-	function owner($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return string
+	 */
+	public function owner($file) {
 		$dir = $this->dirlist($file);
 		return $dir[$file]['owner'];
 	}
 
-	function getchmod($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return string
+	 */
+	public function getchmod($file) {
 		$dir = $this->dirlist($file);
 		return $dir[$file]['permsn'];
 	}
 
-	function group($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return string
+	 */
+	public function group($file) {
 		$dir = $this->dirlist($file);
 		return $dir[$file]['group'];
 	}
 
-	function copy($source, $destination, $overwrite = false, $mode = false) {
+	/**
+	 * @access public
+	 *
+	 * @param string   $source
+	 * @param string   $destination
+	 * @param bool     $overwrite
+	 * @param int|bool $mode
+	 * @return bool
+	 */
+	public function copy($source, $destination, $overwrite = false, $mode = false) {
 		if ( ! $overwrite && $this->exists($destination) )
 			return false;
 
@@ -213,11 +304,27 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 		return $this->put_contents($destination, $content, $mode);
 	}
 
-	function move($source, $destination, $overwrite = false ) {
+	/**
+	 * @access public
+	 *
+	 * @param string $source
+	 * @param string $destination
+	 * @param bool   $overwrite
+	 * @return bool
+	 */
+	public function move($source, $destination, $overwrite = false ) {
 		return $this->ftp->rename($source, $destination);
 	}
 
-	function delete($file, $recursive = false, $type = false) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @param bool   $recursive
+	 * @param string $type
+	 * @return bool
+	 */
+	public function delete($file, $recursive = false, $type = false) {
 		if ( empty($file) )
 			return false;
 		if ( 'f' == $type || $this->is_file($file) )
@@ -228,13 +335,30 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 		return $this->ftp->mdel($file);
 	}
 
-	function exists( $file ) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return bool
+	 */
+	public function exists( $file ) {
 		$list = $this->ftp->nlist( $file );
+
+		if ( empty( $list ) && $this->is_dir( $file ) ) {
+			return true; // File is an empty directory.
+		}
+
 		return !empty( $list ); //empty list = no file, so invert.
-		// return $this->ftp->is_exists($file); has issues with ABOR+426 responses on the ncFTPd server
+		// Return $this->ftp->is_exists($file); has issues with ABOR+426 responses on the ncFTPd server.
 	}
 
-	function is_file($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return bool
+	 */
+	public function is_file($file) {
 		if ( $this->is_dir($file) )
 			return false;
 		if ( $this->exists($file) )
@@ -242,7 +366,13 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 		return false;
 	}
 
-	function is_dir($path) {
+	/**
+	 * @access public
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function is_dir($path) {
 		$cwd = $this->cwd();
 		if ( $this->chdir($path) ) {
 			$this->chdir($cwd);
@@ -251,31 +381,76 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 		return false;
 	}
 
-	function is_readable($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return bool
+	 */
+	public function is_readable($file) {
 		return true;
 	}
 
-	function is_writable($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return bool
+	 */
+	public function is_writable($file) {
 		return true;
 	}
 
-	function atime($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return bool
+	 */
+	public function atime($file) {
 		return false;
 	}
 
-	function mtime($file) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return int
+	 */
+	public function mtime($file) {
 		return $this->ftp->mdtm($file);
 	}
 
-	function size($file) {
+	/**
+	 * @param string $file
+	 * @return int
+	 */
+	public function size($file) {
 		return $this->ftp->filesize($file);
 	}
 
-	function touch($file, $time = 0, $atime = 0 ) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @param int $time
+	 * @param int $atime
+	 * @return bool
+	 */
+	public function touch($file, $time = 0, $atime = 0 ) {
 		return false;
 	}
 
-	function mkdir($path, $chmod = false, $chown = false, $chgrp = false ) {
+	/**
+	 * @access public
+	 *
+	 * @param string $path
+	 * @param mixed  $chmod
+	 * @param mixed  $chown
+	 * @param mixed  $chgrp
+	 * @return bool
+	 */
+	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false ) {
 		$path = untrailingslashit($path);
 		if ( empty($path) )
 			return false;
@@ -285,18 +460,28 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 		if ( ! $chmod )
 			$chmod = FS_CHMOD_DIR;
 		$this->chmod($path, $chmod);
-		if ( $chown )
-			$this->chown($path, $chown);
-		if ( $chgrp )
-			$this->chgrp($path, $chgrp);
 		return true;
 	}
 
-	function rmdir($path, $recursive = false ) {
+	/**
+	 * @access public
+	 *
+	 * @param string $path
+	 * @param bool $recursive
+	 */
+	public function rmdir($path, $recursive = false ) {
 		$this->delete($path, $recursive);
 	}
 
-	function dirlist($path = '.', $include_hidden = true, $recursive = false ) {
+	/**
+	 * @access public
+	 *
+	 * @param string $path
+	 * @param bool   $include_hidden
+	 * @param bool   $recursive
+	 * @return bool|array
+	 */
+	public function dirlist($path = '.', $include_hidden = true, $recursive = false ) {
 		if ( $this->is_file($path) ) {
 			$limit_file = basename($path);
 			$path = dirname($path) . '/';
@@ -337,6 +522,9 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 			if ( $struc['islink'] )
 				$struc['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $struc['name'] );
 
+			// Add the Octal representation of the file permissions
+			$struc['permsn'] = $this->getnumchmodfromh( $struc['perms'] );
+
 			$ret[ $struc['name'] ] = $struc;
 		}
 
@@ -345,7 +533,10 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 		return $ret;
 	}
 
-	function __destruct() {
+	/**
+	 * @access public
+	 */
+	public function __destruct() {
 		$this->ftp->quit();
 	}
 }
diff --git a/wp-admin/includes/class-wp-filesystem-ssh2.php b/wp-admin/includes/class-wp-filesystem-ssh2.php
index 30a96b1..70f81d0 100644
--- a/wp-admin/includes/class-wp-filesystem-ssh2.php
+++ b/wp-admin/includes/class-wp-filesystem-ssh2.php
@@ -35,24 +35,42 @@
  */
 class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 
-	var $link = false;
-	var $sftp_link = false;
-	var $keys = false;
-	var $errors = array();
-	var $options = array();
+	/**
+	 * @access public
+	 */
+	public $link = false;
 
-	function __construct($opt='') {
+	/**
+	 * @access public
+	 * @var resource
+	 */
+	public $sftp_link;
+	public $keys = false;
+
+	/**
+	 * @access public
+	 *
+	 * @param array $opt
+	 */
+	public function __construct( $opt = '' ) {
 		$this->method = 'ssh2';
 		$this->errors = new WP_Error();
 
 		//Check if possible to use ssh2 functions.
 		if ( ! extension_loaded('ssh2') ) {
 			$this->errors->add('no_ssh2_ext', __('The ssh2 PHP extension is not available'));
-			return false;
+			return;
 		}
 		if ( !function_exists('stream_get_contents') ) {
-			$this->errors->add('ssh2_php_requirement', __('The ssh2 PHP extension is available, however, we require the PHP5 function <code>stream_get_contents()</code>'));
-			return false;
+			$this->errors->add(
+				'ssh2_php_requirement',
+				sprintf(
+					/* translators: %s: stream_get_contents() */
+					__( 'The ssh2 PHP extension is available, however, we require the PHP5 function %s' ),
+					'<code>stream_get_contents()</code>'
+				)
+			);
+			return;
 		}
 
 		// Set defaults:
@@ -66,9 +84,6 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 		else
 			$this->options['hostname'] = $opt['hostname'];
 
-		if ( ! empty($opt['base']) )
-			$this->wp_base = $opt['base'];
-
 		// Check if the options provided are OK.
 		if ( !empty ($opt['public_key']) && !empty ($opt['private_key']) ) {
 			$this->options['public_key'] = $opt['public_key'];
@@ -85,15 +100,20 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 			$this->options['username'] = $opt['username'];
 
 		if ( empty ($opt['password']) ) {
-			if ( !$this->keys )	//password can be blank if we are using keys
+			// Password can be blank if we are using keys.
+			if ( !$this->keys )
 				$this->errors->add('empty_password', __('SSH2 password is required'));
 		} else {
 			$this->options['password'] = $opt['password'];
 		}
-
 	}
 
-	function connect() {
+	/**
+	 * @access public
+	 *
+	 * @return bool
+	 */
+	public function connect() {
 		if ( ! $this->keys ) {
 			$this->link = @ssh2_connect($this->options['hostname'], $this->options['port']);
 		} else {
@@ -101,34 +121,91 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 		}
 
 		if ( ! $this->link ) {
-			$this->errors->add('connect', sprintf(__('Failed to connect to SSH2 Server %1$s:%2$s'), $this->options['hostname'], $this->options['port']));
+			$this->errors->add( 'connect',
+				/* translators: %s: hostname:port */
+				sprintf( __( 'Failed to connect to SSH2 Server %s' ),
+					$this->options['hostname'] . ':' . $this->options['port']
+				)
+			);
 			return false;
 		}
 
 		if ( !$this->keys ) {
 			if ( ! @ssh2_auth_password($this->link, $this->options['username'], $this->options['password']) ) {
-				$this->errors->add('auth', sprintf(__('Username/Password incorrect for %s'), $this->options['username']));
+				$this->errors->add( 'auth',
+					/* translators: %s: username */
+					sprintf( __( 'Username/Password incorrect for %s' ),
+						$this->options['username']
+					)
+				);
 				return false;
 			}
 		} else {
 			if ( ! @ssh2_auth_pubkey_file($this->link, $this->options['username'], $this->options['public_key'], $this->options['private_key'], $this->options['password'] ) ) {
-				$this->errors->add('auth', sprintf(__('Public and Private keys incorrect for %s'), $this->options['username']));
+				$this->errors->add( 'auth',
+					/* translators: %s: username */
+					sprintf( __( 'Public and Private keys incorrect for %s' ),
+						$this->options['username']
+					)
+				);
 				return false;
 			}
 		}
 
-		$this->sftp_link = ssh2_sftp($this->link);
+		$this->sftp_link = ssh2_sftp( $this->link );
+		if ( ! $this->sftp_link ) {
+			$this->errors->add( 'connect',
+				/* translators: %s: hostname:port */
+				sprintf( __( 'Failed to initialize a SFTP subsystem session with the SSH2 Server %s' ),
+					$this->options['hostname'] . ':' . $this->options['port']
+				)
+			);
+			return false;
+		}
 
 		return true;
 	}
 
-	function run_command( $command, $returnbool = false) {
+	/**
+	 * Gets the ssh2.sftp PHP stream wrapper path to open for the given file.
+	 *
+	 * This method also works around a PHP bug where the root directory (/) cannot
+	 * be opened by PHP functions, causing a false failure. In order to work around
+	 * this, the path is converted to /./ which is semantically the same as /
+	 * See https://bugs.php.net/bug.php?id=64169 for more details.
+	 *
+	 * @access public
+	 *
+	 * @since 4.4.0
+	 *
+	 * @param string $path The File/Directory path on the remote server to return
+	 * @return string The ssh2.sftp:// wrapped path to use.
+	 */
+	public function sftp_path( $path ) {
+		if ( '/' === $path ) {
+			$path = '/./';
+		}
+		return 'ssh2.sftp://' . $this->sftp_link . '/' . ltrim( $path, '/' );
+	}
 
+	/**
+	 * @access public
+	 * 
+	 * @param string $command
+	 * @param bool $returnbool
+	 * @return bool|string
+	 */
+	public function run_command( $command, $returnbool = false ) {
 		if ( ! $this->link )
 			return false;
 
 		if ( ! ($stream = ssh2_exec($this->link, $command)) ) {
-			$this->errors->add('command', sprintf(__('Unable to perform command: %s'), $command));
+			$this->errors->add( 'command',
+				/* translators: %s: command */
+				sprintf( __( 'Unable to perform command: %s'),
+					$command
+				)
+			);
 		} else {
 			stream_set_blocking( $stream, true );
 			stream_set_timeout( $stream, FS_TIMEOUT );
@@ -143,18 +220,36 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 		return false;
 	}
 
-	function get_contents( $file ) {
-		$file = ltrim($file, '/');
-		return file_get_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return string|false
+	 */
+	public function get_contents( $file ) {
+		return file_get_contents( $this->sftp_path( $file ) );
 	}
 
-	function get_contents_array($file) {
-		$file = ltrim($file, '/');
-		return file('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return array
+	 */
+	public function get_contents_array($file) {
+		return file( $this->sftp_path( $file ) );
 	}
 
-	function put_contents($file, $contents, $mode = false ) {
-		$ret = file_put_contents( 'ssh2.sftp://' . $this->sftp_link . '/' . ltrim( $file, '/' ), $contents );
+	/**
+	 * @access public
+	 *
+	 * @param string   $file
+	 * @param string   $contents
+	 * @param bool|int $mode
+	 * @return bool
+	 */
+	public function put_contents($file, $contents, $mode = false ) {
+		$ret = file_put_contents( $this->sftp_path( $file ), $contents );
 
 		if ( $ret !== strlen( $contents ) )
 			return false;
@@ -164,18 +259,39 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 		return true;
 	}
 
-	function cwd() {
-		$cwd = $this->run_command('pwd');
-		if ( $cwd )
-			$cwd = trailingslashit($cwd);
+	/**
+	 * @access public
+	 *
+	 * @return bool
+	 */
+	public function cwd() {
+		$cwd = ssh2_sftp_realpath( $this->sftp_link, '.' );
+		if ( $cwd ) {
+			$cwd = trailingslashit( trim( $cwd ) );
+		}
 		return $cwd;
 	}
 
-	function chdir($dir) {
+	/**
+	 * @access public
+	 *
+	 * @param string $dir
+	 * @return bool|string
+	 */
+	public function chdir($dir) {
 		return $this->run_command('cd ' . $dir, true);
 	}
 
-	function chgrp($file, $group, $recursive = false ) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @param string $group
+	 * @param bool   $recursive
+	 *
+	 * @return bool
+	 */
+	public function chgrp($file, $group, $recursive = false ) {
 		if ( ! $this->exists($file) )
 			return false;
 		if ( ! $recursive || ! $this->is_dir($file) )
@@ -183,7 +299,15 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 		return $this->run_command(sprintf('chgrp -R %s %s', escapeshellarg($group), escapeshellarg($file)), true);
 	}
 
-	function chmod($file, $mode = false, $recursive = false) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @param int    $mode
+	 * @param bool   $recursive
+	 * @return bool|string
+	 */
+	public function chmod($file, $mode = false, $recursive = false) {
 		if ( ! $this->exists($file) )
 			return false;
 
@@ -204,14 +328,14 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 	/**
 	 * Change the ownership of a file / folder.
 	 *
-	 * @since Unknown
+	 * @access public
 	 *
-	 * @param string $file    Path to the file.
-	 * @param mixed  $owner   A user name or number.
-	 * @param bool $recursive Optional. If set True changes file owner recursivly. Defaults to False.
-	 * @return bool Returns true on success or false on failure.
+	 * @param string     $file    Path to the file.
+	 * @param string|int $owner   A user name or number.
+	 * @param bool       $recursive Optional. If set True changes file owner recursivly. Defaults to False.
+	 * @return bool|string Returns true on success or false on failure.
 	 */
-	function chown( $file, $owner, $recursive = false ) {
+	public function chown( $file, $owner, $recursive = false ) {
 		if ( ! $this->exists($file) )
 			return false;
 		if ( ! $recursive || ! $this->is_dir($file) )
@@ -219,8 +343,14 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 		return $this->run_command(sprintf('chown -R %s %s', escapeshellarg($owner), escapeshellarg($file)), true);
 	}
 
-	function owner($file) {
-		$owneruid = @fileowner('ssh2.sftp://' . $this->sftp_link . '/' . ltrim($file, '/'));
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return string|false
+	 */
+	public function owner($file) {
+		$owneruid = @fileowner( $this->sftp_path( $file ) );
 		if ( ! $owneruid )
 			return false;
 		if ( ! function_exists('posix_getpwuid') )
@@ -229,12 +359,24 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 		return $ownerarray['name'];
 	}
 
-	function getchmod($file) {
-		return substr( decoct( @fileperms( 'ssh2.sftp://' . $this->sftp_link . '/' . ltrim( $file, '/' ) ) ), -3 );
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return string
+	 */
+	public function getchmod($file) {
+		return substr( decoct( @fileperms( $this->sftp_path( $file ) ) ), -3 );
 	}
 
-	function group($file) {
-		$gid = @filegroup('ssh2.sftp://' . $this->sftp_link . '/' . ltrim($file, '/'));
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return string|false
+	 */
+	public function group($file) {
+		$gid = @filegroup( $this->sftp_path( $file ) );
 		if ( ! $gid )
 			return false;
 		if ( ! function_exists('posix_getgrgid') )
@@ -243,7 +385,16 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 		return $grouparray['name'];
 	}
 
-	function copy($source, $destination, $overwrite = false, $mode = false) {
+	/**
+	 * @access public
+	 *
+	 * @param string   $source
+	 * @param string   $destination
+	 * @param bool     $overwrite
+	 * @param int|bool $mode
+	 * @return bool
+	 */
+	public function copy($source, $destination, $overwrite = false, $mode = false) {
 		if ( ! $overwrite && $this->exists($destination) )
 			return false;
 		$content = $this->get_contents($source);
@@ -252,11 +403,27 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 		return $this->put_contents($destination, $content, $mode);
 	}
 
-	function move($source, $destination, $overwrite = false) {
-		return @ssh2_sftp_rename($this->link, $source, $destination);
+	/**
+	 * @access public
+	 *
+	 * @param string $source
+	 * @param string $destination
+	 * @param bool   $overwrite
+	 * @return bool
+	 */
+	public function move($source, $destination, $overwrite = false) {
+		return @ssh2_sftp_rename( $this->sftp_link, $source, $destination );
 	}
 
-	function delete($file, $recursive = false, $type = false) {
+	/**
+	 * @access public
+	 *
+	 * @param string      $file
+	 * @param bool        $recursive
+	 * @param string|bool $type
+	 * @return bool
+	 */
+	public function delete($file, $recursive = false, $type = false) {
 		if ( 'f' == $type || $this->is_file($file) )
 			return ssh2_sftp_unlink($this->sftp_link, $file);
 		if ( ! $recursive )
@@ -270,51 +437,108 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 		return ssh2_sftp_rmdir($this->sftp_link, $file);
 	}
 
-	function exists($file) {
-		$file = ltrim($file, '/');
-		return file_exists('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return bool
+	 */
+	public function exists($file) {
+		return file_exists( $this->sftp_path( $file ) );
 	}
 
-	function is_file($file) {
-		$file = ltrim($file, '/');
-		return is_file('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return bool
+	 */
+	public function is_file($file) {
+		return is_file( $this->sftp_path( $file ) );
 	}
 
-	function is_dir($path) {
-		$path = ltrim($path, '/');
-		return is_dir('ssh2.sftp://' . $this->sftp_link . '/' . $path);
+	/**
+	 * @access public
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function is_dir($path) {
+		return is_dir( $this->sftp_path( $path ) );
 	}
 
-	function is_readable($file) {
-		$file = ltrim($file, '/');
-		return is_readable('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return bool
+	 */
+	public function is_readable($file) {
+		return is_readable( $this->sftp_path( $file ) );
 	}
 
-	function is_writable($file) {
-		$file = ltrim($file, '/');
-		return is_writable('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return bool
+	 */
+	public function is_writable($file) {
+		// PHP will base it's writable checks on system_user === file_owner, not ssh_user === file_owner
+		return true;
 	}
 
-	function atime($file) {
-		$file = ltrim($file, '/');
-		return fileatime('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return int
+	 */
+	public function atime($file) {
+		return fileatime( $this->sftp_path( $file ) );
 	}
 
-	function mtime($file) {
-		$file = ltrim($file, '/');
-		return filemtime('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return int
+	 */
+	public function mtime($file) {
+		return filemtime( $this->sftp_path( $file ) );
 	}
 
-	function size($file) {
-		$file = ltrim($file, '/');
-		return filesize('ssh2.sftp://' . $this->sftp_link . '/' . $file);
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @return int
+	 */
+	public function size($file) {
+		return filesize( $this->sftp_path( $file ) );
 	}
 
-	function touch($file, $time = 0, $atime = 0) {
+	/**
+	 * @access public
+	 *
+	 * @param string $file
+	 * @param int    $time
+	 * @param int    $atime
+	 */
+	public function touch($file, $time = 0, $atime = 0) {
 		//Not implemented.
 	}
 
-	function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
+	/**
+	 * @access public
+	 *
+	 * @param string $path
+	 * @param mixed  $chmod
+	 * @param mixed  $chown
+	 * @param mixed  $chgrp
+	 * @return bool
+	 */
+	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
 		$path = untrailingslashit($path);
 		if ( empty($path) )
 			return false;
@@ -330,11 +554,26 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 		return true;
 	}
 
-	function rmdir($path, $recursive = false) {
+	/**
+	 * @access public
+	 *
+	 * @param string $path
+	 * @param bool   $recursive
+	 * @return bool
+	 */
+	public function rmdir($path, $recursive = false) {
 		return $this->delete($path, $recursive);
 	}
 
-	function dirlist($path, $include_hidden = true, $recursive = false) {
+	/**
+	 * @access public
+	 *
+	 * @param string $path
+	 * @param bool   $include_hidden
+	 * @param bool   $recursive
+	 * @return bool|array
+	 */
+	public function dirlist($path, $include_hidden = true, $recursive = false) {
 		if ( $this->is_file($path) ) {
 			$limit_file = basename($path);
 			$path = dirname($path);
@@ -346,7 +585,7 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 			return false;
 
 		$ret = array();
-		$dir = @dir('ssh2.sftp://' . $this->sftp_link .'/' . ltrim($path, '/') );
+		$dir = @dir( $this->sftp_path( $path ) );
 
 		if ( ! $dir )
 			return false;
diff --git a/wp-admin/includes/class-wp-importer.php b/wp-admin/includes/class-wp-importer.php
index 57ff7f4..408fe1b 100644
--- a/wp-admin/includes/class-wp-importer.php
+++ b/wp-admin/includes/class-wp-importer.php
@@ -6,17 +6,19 @@ class WP_Importer {
 	/**
 	 * Class Constructor
 	 *
-	 * @return void
 	 */
-	function __construct() {}
+	public function __construct() {}
 
 	/**
 	 * Returns array with imported permalinks from WordPress database
 	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
+	 * @param string $importer_name
 	 * @param string $bid
 	 * @return array
 	 */
-	function get_imported_posts( $importer_name, $bid ) {
+	public function get_imported_posts( $importer_name, $bid ) {
 		global $wpdb;
 
 		$hashtable = array();
@@ -41,7 +43,7 @@ class WP_Importer {
 			}
 		} while ( count( $results ) == $limit );
 
-		// unset to save memory
+		// Unset to save memory.
 		unset( $results, $r );
 
 		return $hashtable;
@@ -50,10 +52,13 @@ class WP_Importer {
 	/**
 	 * Return count of imported permalinks from WordPress database
 	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
+	 * @param string $importer_name
 	 * @param string $bid
 	 * @return int
 	 */
-	function count_imported_posts( $importer_name, $bid ) {
+	public function count_imported_posts( $importer_name, $bid ) {
 		global $wpdb;
 
 		$count = 0;
@@ -67,7 +72,7 @@ class WP_Importer {
 		if ( !empty( $result ) )
 			$count = intval( $result[0]->cnt );
 
-		// unset to save memory
+		// Unset to save memory.
 		unset( $results );
 
 		return $count;
@@ -76,10 +81,12 @@ class WP_Importer {
 	/**
 	 * Set array with imported comments from WordPress database
 	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
 	 * @param string $bid
 	 * @return array
 	 */
-	function get_imported_comments( $bid ) {
+	public function get_imported_comments( $bid ) {
 		global $wpdb;
 
 		$hashtable = array();
@@ -109,13 +116,18 @@ class WP_Importer {
 			}
 		} while ( count( $results ) == $limit );
 
-		// unset to save memory
+		// Unset to save memory.
 		unset( $results, $r );
 
 		return $hashtable;
 	}
 
-	function set_blog( $blog_id ) {
+	/**
+	 *
+	 * @param int $blog_id
+	 * @return int|void
+	 */
+	public function set_blog( $blog_id ) {
 		if ( is_numeric( $blog_id ) ) {
 			$blog_id = (int) $blog_id;
 		} else {
@@ -142,7 +154,12 @@ class WP_Importer {
 		return $blog_id;
 	}
 
-	function set_user( $user_id ) {
+	/**
+	 *
+	 * @param int $user_id
+	 * @return int|void
+	 */
+	public function set_user( $user_id ) {
 		if ( is_numeric( $user_id ) ) {
 			$user_id = (int) $user_id;
 		} else {
@@ -164,7 +181,7 @@ class WP_Importer {
 	 * @param string $b
 	 * @return int
 	 */
-	function cmpr_strlen( $a, $b ) {
+	public function cmpr_strlen( $a, $b ) {
 		return strlen( $b ) - strlen( $a );
 	}
 
@@ -174,10 +191,10 @@ class WP_Importer {
 	 * @param string $url
 	 * @param string $username
 	 * @param string $password
-	 * @param bool $head
+	 * @param bool   $head
 	 * @return array
 	 */
-	function get_page( $url, $username = '', $password = '', $head = false ) {
+	public function get_page( $url, $username = '', $password = '', $head = false ) {
 		// Increase the timeout
 		add_filter( 'http_request_timeout', array( $this, 'bump_request_timeout' ) );
 
@@ -199,7 +216,7 @@ class WP_Importer {
 	 * @param int $val
 	 * @return int
 	 */
-	function bump_request_timeout( $val ) {
+	public function bump_request_timeout( $val ) {
 		return 60;
 	}
 
@@ -208,10 +225,9 @@ class WP_Importer {
 	 *
 	 * @return bool
 	 */
-	function is_user_over_quota() {
+	public function is_user_over_quota() {
 		if ( function_exists( 'upload_is_user_over_quota' ) ) {
-			if ( upload_is_user_over_quota( 1 ) ) {
-				echo "Sorry, you have used your upload quota.\n";
+			if ( upload_is_user_over_quota() ) {
 				return true;
 			}
 		}
@@ -225,16 +241,17 @@ class WP_Importer {
 	 * @param string $string
 	 * @return string
 	 */
-	function min_whitespace( $string ) {
+	public function min_whitespace( $string ) {
 		return preg_replace( '|[\r\n\t ]+|', ' ', $string );
 	}
 
 	/**
 	 * Reset global variables that grow out of control during imports
 	 *
-	 * @return void
+	 * @global wpdb  $wpdb
+	 * @global array $wp_actions
 	 */
-	function stop_the_insanity() {
+	public function stop_the_insanity() {
 		global $wpdb, $wp_actions;
 		// Or define( 'WP_IMPORTING', true );
 		$wpdb->queries = array();
@@ -248,7 +265,7 @@ class WP_Importer {
  * Exits when a required param is not set.
  *
  * @param string $param
- * @param bool $required
+ * @param bool   $required
  * @return mixed
  */
 function get_cli_args( $param, $required = false ) {
@@ -273,14 +290,14 @@ function get_cli_args( $param, $required = false ) {
 			}
 
 			$last_arg = $key;
-		} else if ( (bool) preg_match( "/^-([a-zA-Z0-9]+)/", $args[$i], $match ) ) {
+		} elseif ( (bool) preg_match( "/^-([a-zA-Z0-9]+)/", $args[$i], $match ) ) {
 			for ( $j = 0, $jl = strlen( $match[1] ); $j < $jl; $j++ ) {
 				$key = $match[1]{$j};
 				$out[$key] = true;
 			}
 
 			$last_arg = $key;
-		} else if ( $last_arg !== null ) {
+		} elseif ( $last_arg !== null ) {
 			$out[$last_arg] = $args[$i];
 		}
 	}
diff --git a/wp-admin/includes/class-wp-internal-pointers.php b/wp-admin/includes/class-wp-internal-pointers.php
new file mode 100644
index 0000000..94796c1
--- /dev/null
+++ b/wp-admin/includes/class-wp-internal-pointers.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * Administration API: WP_Internal_Pointers class
+ *
+ * @package WordPress
+ * @subpackage Administration
+ * @since 4.4.0
+ */
+
+/**
+ * Core class used to implement an internal admin pointers API.
+ *
+ * @since 3.3.0
+ */
+final class WP_Internal_Pointers {
+	/**
+	 * Initializes the new feature pointers.
+	 *
+	 * @since 3.3.0
+	 *
+	 * All pointers can be disabled using the following:
+	 *     remove_action( 'admin_enqueue_scripts', array( 'WP_Internal_Pointers', 'enqueue_scripts' ) );
+	 *
+	 * Individual pointers (e.g. wp390_widgets) can be disabled using the following:
+	 *     remove_action( 'admin_print_footer_scripts', array( 'WP_Internal_Pointers', 'pointer_wp390_widgets' ) );
+	 *
+	 * @static
+	 *
+	 * @param string $hook_suffix The current admin page.
+	 */
+	public static function enqueue_scripts( $hook_suffix ) {
+		/*
+		 * Register feature pointers
+		 *
+		 * Format:
+		 *     array(
+		 *         hook_suffix => pointer callback
+		 *     )
+		 *
+		 * Example:
+		 *     array(
+		 *         'themes.php' => 'wp390_widgets'
+		 *     )
+		 */
+		$registered_pointers = array(
+			// None currently
+		);
+
+		// Check if screen related pointer is registered
+		if ( empty( $registered_pointers[ $hook_suffix ] ) )
+			return;
+
+		$pointers = (array) $registered_pointers[ $hook_suffix ];
+
+		/*
+		 * Specify required capabilities for feature pointers
+		 *
+		 * Format:
+		 *     array(
+		 *         pointer callback => Array of required capabilities
+		 *     )
+		 *
+		 * Example:
+		 *     array(
+		 *         'wp390_widgets' => array( 'edit_theme_options' )
+		 *     )
+		 */
+		$caps_required = array(
+			// None currently
+		);
+
+		// Get dismissed pointers
+		$dismissed = explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) );
+
+		$got_pointers = false;
+		foreach ( array_diff( $pointers, $dismissed ) as $pointer ) {
+			if ( isset( $caps_required[ $pointer ] ) ) {
+				foreach ( $caps_required[ $pointer ] as $cap ) {
+					if ( ! current_user_can( $cap ) )
+						continue 2;
+				}
+			}
+
+			// Bind pointer print function
+			add_action( 'admin_print_footer_scripts', array( 'WP_Internal_Pointers', 'pointer_' . $pointer ) );
+			$got_pointers = true;
+		}
+
+		if ( ! $got_pointers )
+			return;
+
+		// Add pointers script and style to queue
+		wp_enqueue_style( 'wp-pointer' );
+		wp_enqueue_script( 'wp-pointer' );
+	}
+
+	/**
+	 * Print the pointer JavaScript data.
+	 *
+	 * @since 3.3.0
+	 *
+	 * @static
+	 *
+	 * @param string $pointer_id The pointer ID.
+	 * @param string $selector The HTML elements, on which the pointer should be attached.
+	 * @param array  $args Arguments to be passed to the pointer JS (see wp-pointer.js).
+	 */
+	private static function print_js( $pointer_id, $selector, $args ) {
+		if ( empty( $pointer_id ) || empty( $selector ) || empty( $args ) || empty( $args['content'] ) )
+			return;
+
+		?>
+		<script type="text/javascript">
+		(function($){
+			var options = <?php echo wp_json_encode( $args ); ?>, setup;
+
+			if ( ! options )
+				return;
+
+			options = $.extend( options, {
+				close: function() {
+					$.post( ajaxurl, {
+						pointer: '<?php echo $pointer_id; ?>',
+						action: 'dismiss-wp-pointer'
+					});
+				}
+			});
+
+			setup = function() {
+				$('<?php echo $selector; ?>').first().pointer( options ).pointer('open');
+			};
+
+			if ( options.position && options.position.defer_loading )
+				$(window).bind( 'load.wp-pointers', setup );
+			else
+				$(document).ready( setup );
+
+		})( jQuery );
+		</script>
+		<?php
+	}
+
+	public static function pointer_wp330_toolbar() {}
+	public static function pointer_wp330_media_uploader() {}
+	public static function pointer_wp330_saving_widgets() {}
+	public static function pointer_wp340_customize_current_theme_link() {}
+	public static function pointer_wp340_choose_image_from_library() {}
+	public static function pointer_wp350_media() {}
+	public static function pointer_wp360_revisions() {}
+	public static function pointer_wp360_locks() {}
+	public static function pointer_wp390_widgets() {}
+	public static function pointer_wp410_dfw() {}
+
+	/**
+	 * Prevents new users from seeing existing 'new feature' pointers.
+	 *
+	 * @since 3.3.0
+	 *
+	 * @static
+	 *
+	 * @param int $user_id User ID.
+	 */
+	public static function dismiss_pointers_for_new_users( $user_id ) {
+		add_user_meta( $user_id, 'dismissed_wp_pointers', '' );
+	}
+}
diff --git a/wp-admin/includes/class-wp-links-list-table.php b/wp-admin/includes/class-wp-links-list-table.php
index 98281b0..e4560e4 100644
--- a/wp-admin/includes/class-wp-links-list-table.php
+++ b/wp-admin/includes/class-wp-links-list-table.php
@@ -1,26 +1,55 @@
 <?php
 /**
- * Links Manager List Table class.
+ * List Table API: WP_Links_List_Table class
  *
  * @package WordPress
- * @subpackage List_Table
+ * @subpackage Administration
+ * @since 3.1.0
+ */
+
+/**
+ * Core class used to implement displaying links in a list table.
+ *
  * @since 3.1.0
  * @access private
+ *
+ * @see WP_List_Tsble
  */
 class WP_Links_List_Table extends WP_List_Table {
 
-	function __construct( $args = array() ) {
+	/**
+	 * Constructor.
+	 *
+	 * @since 3.1.0
+	 * @access public
+	 *
+	 * @see WP_List_Table::__construct() for more information on default arguments.
+	 *
+	 * @param array $args An associative array of arguments.
+	 */
+	public function __construct( $args = array() ) {
 		parent::__construct( array(
 			'plural' => 'bookmarks',
 			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
 		) );
 	}
 
-	function ajax_user_can() {
+	/**
+	 *
+	 * @return bool
+	 */
+	public function ajax_user_can() {
 		return current_user_can( 'manage_links' );
 	}
 
-	function prepare_items() {
+	/**
+	 *
+	 * @global int    $cat_id
+	 * @global string $s
+	 * @global string $orderby
+	 * @global string $order
+	 */
+	public function prepare_items() {
 		global $cat_id, $s, $orderby, $order;
 
 		wp_reset_vars( array( 'action', 'cat_id', 'link_id', 'orderby', 'order', 's' ) );
@@ -39,18 +68,30 @@ class WP_Links_List_Table extends WP_List_Table {
 		$this->items = get_bookmarks( $args );
 	}
 
-	function no_items() {
+	/**
+	 * @access public
+	 */
+	public function no_items() {
 		_e( 'No links found.' );
 	}
 
-	function get_bulk_actions() {
+	/**
+	 *
+	 * @return array
+	 */
+	protected function get_bulk_actions() {
 		$actions = array();
 		$actions['delete'] = __( 'Delete' );
 
 		return $actions;
 	}
 
-	function extra_tablenav( $which ) {
+	/**
+	 *
+	 * @global int $cat_id
+	 * @param string $which
+	 */
+	protected function extra_tablenav( $which ) {
 		global $cat_id;
 
 		if ( 'top' != $which )
@@ -62,20 +103,26 @@ class WP_Links_List_Table extends WP_List_Table {
 				'selected' => $cat_id,
 				'name' => 'cat_id',
 				'taxonomy' => 'link_category',
-				'show_option_all' => __( 'View all categories' ),
+				'show_option_all' => get_taxonomy( 'link_category' )->labels->all_items,
 				'hide_empty' => true,
 				'hierarchical' => 1,
 				'show_count' => 0,
 				'orderby' => 'name',
 			);
+
+			echo '<label class="screen-reader-text" for="cat_id">' . __( 'Filter by category' ) . '</label>';
 			wp_dropdown_categories( $dropdown_options );
-			submit_button( __( 'Filter' ), 'button', false, false, array( 'id' => 'post-query-submit' ) );
+			submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
 ?>
 		</div>
 <?php
 	}
 
-	function get_columns() {
+	/**
+	 *
+	 * @return array
+	 */
+	public function get_columns() {
 		return array(
 			'cb'         => '<input type="checkbox" />',
 			'name'       => _x( 'Name', 'link name' ),
@@ -87,7 +134,11 @@ class WP_Links_List_Table extends WP_List_Table {
 		);
 	}
 
-	function get_sortable_columns() {
+	/**
+	 *
+	 * @return array
+	 */
+	protected function get_sortable_columns() {
 		return array(
 			'name'    => 'name',
 			'url'     => 'url',
@@ -96,102 +147,187 @@ class WP_Links_List_Table extends WP_List_Table {
 		);
 	}
 
-	function display_rows() {
+	/**
+	 * Get the name of the default primary column.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @return string Name of the default primary column, in this case, 'name'.
+	 */
+	protected function get_default_primary_column_name() {
+		return 'name';
+	}
+
+	/**
+	 * Handles the checkbox column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param object $link The current link object.
+	 */
+	public function column_cb( $link ) {
+		?>
+		<label class="screen-reader-text" for="cb-select-<?php echo $link->link_id; ?>"><?php echo sprintf( __( 'Select %s' ), $link->link_name ); ?></label>
+		<input type="checkbox" name="linkcheck[]" id="cb-select-<?php echo $link->link_id; ?>" value="<?php echo esc_attr( $link->link_id ); ?>" />
+		<?php
+	}
+
+	/**
+	 * Handles the link name column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param object $link The current link object.
+	 */
+	public function column_name( $link ) {
+		$edit_link = get_edit_bookmark_link( $link );
+		printf( '<strong><a class="row-title" href="%s" aria-label="%s">%s</a></strong>',
+			$edit_link,
+			/* translators: %s: link name */
+			esc_attr( sprintf( __( 'Edit “%s”' ), $link->link_name ) ),
+			$link->link_name
+		);
+	}
+
+	/**
+	 * Handles the link URL column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param object $link The current link object.
+	 */
+	public function column_url( $link ) {
+		$short_url = url_shorten( $link->link_url );
+		echo "<a href='$link->link_url'>$short_url</a>";
+	}
+
+	/**
+	 * Handles the link categories column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @global $cat_id
+	 *
+	 * @param object $link The current link object.
+	 */
+	public function column_categories( $link ) {
 		global $cat_id;
 
-		$alt = 0;
+		$cat_names = array();
+		foreach ( $link->link_category as $category ) {
+			$cat = get_term( $category, 'link_category', OBJECT, 'display' );
+			if ( is_wp_error( $cat ) ) {
+				echo $cat->get_error_message();
+			}
+			$cat_name = $cat->name;
+			if ( $cat_id != $category ) {
+				$cat_name = "<a href='link-manager.php?cat_id=$category'>$cat_name</a>";
+			}
+			$cat_names[] = $cat_name;
+		}
+		echo implode( ', ', $cat_names );
+	}
 
-		foreach ( $this->items as $link ) {
-			$link = sanitize_bookmark( $link );
-			$link->link_name = esc_attr( $link->link_name );
-			$link->link_category = wp_get_link_cats( $link->link_id );
+	/**
+	 * Handles the link relation column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param object $link The current link object.
+	 */
+	public function column_rel( $link ) {
+		echo empty( $link->link_rel ) ? '<br />' : $link->link_rel;
+	}
 
-			$short_url = url_shorten( $link->link_url );
+	/**
+	 * Handles the link visibility column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param object $link The current link object.
+	 */
+	public function column_visible( $link ) {
+		if ( 'Y' === $link->link_visible ) {
+			_e( 'Yes' );
+		} else {
+			_e( 'No' );
+		}
+	}
 
-			$visible = ( $link->link_visible == 'Y' ) ? __( 'Yes' ) : __( 'No' );
-			$rating  = $link->link_rating;
-			$style = ( $alt++ % 2 ) ? '' : ' class="alternate"';
+	/**
+	 * Handles the link rating column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param object $link The current link object.
+	 */
+	public function column_rating( $link ) {
+		echo $link->link_rating;
+	}
 
-			$edit_link = get_edit_bookmark_link( $link );
-?>
-		<tr id="link-<?php echo $link->link_id; ?>" <?php echo $style; ?>>
-<?php
+	/**
+	 * Handles the default column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param object $link        Link object.
+	 * @param string $column_name Current column name.
+	 */
+	public function column_default( $link, $column_name ) {
+		/**
+		 * Fires for each registered custom link column.
+		 *
+		 * @since 2.1.0
+		 *
+		 * @param string $column_name Name of the custom column.
+		 * @param int    $link_id     Link ID.
+		 */
+		do_action( 'manage_link_custom_column', $column_name, $link->link_id );
+	}
 
-			list( $columns, $hidden ) = $this->get_column_info();
-
-			foreach ( $columns as $column_name => $column_display_name ) {
-				$class = "class='column-$column_name'";
-
-				$style = '';
-				if ( in_array( $column_name, $hidden ) )
-					$style = ' style="display:none;"';
-
-				$attributes = $class . $style;
-
-				switch ( $column_name ) {
-					case 'cb': ?>
-						<th scope="row" class="check-column">
-							<label class="screen-reader-text" for="cb-select-<?php echo $link->link_id; ?>"><?php echo sprintf( __( 'Select %s' ), $link->link_name ); ?></label>
-							<input type="checkbox" name="linkcheck[]" id="cb-select-<?php echo $link->link_id; ?>" value="<?php echo esc_attr( $link->link_id ); ?>" />
-						</th>
-						<?php
-						break;
-
-					case 'name':
-						echo "<td $attributes><strong><a class='row-title' href='$edit_link' title='" . esc_attr( sprintf( __( 'Edit “%s”' ), $link->link_name ) ) . "'>$link->link_name</a></strong><br />";
-
-						$actions = array();
-						$actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
-						$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( "link.php?action=delete&link_id=$link->link_id", 'delete-bookmark_' . $link->link_id ) . "' onclick=\"if ( confirm( '" . esc_js( sprintf( __( "You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete." ), $link->link_name ) ) . "' ) ) { return true;}return false;\">" . __( 'Delete' ) . "</a>";
-						echo $this->row_actions( $actions );
-
-						echo '</td>';
-						break;
-					case 'url':
-						echo "<td $attributes><a href='$link->link_url' title='". esc_attr( sprintf( __( 'Visit %s' ), $link->link_name ) )."'>$short_url</a></td>";
-						break;
-					case 'categories':
-						?><td <?php echo $attributes ?>><?php
-						$cat_names = array();
-						foreach ( $link->link_category as $category ) {
-							$cat = get_term( $category, 'link_category', OBJECT, 'display' );
-							if ( is_wp_error( $cat ) )
-								echo $cat->get_error_message();
-							$cat_name = $cat->name;
-							if ( $cat_id != $category )
-								$cat_name = "<a href='link-manager.php?cat_id=$category'>$cat_name</a>";
-							$cat_names[] = $cat_name;
-						}
-						echo implode( ', ', $cat_names );
-						?></td><?php
-						break;
-					case 'rel':
-						?><td <?php echo $attributes ?>><?php echo empty( $link->link_rel ) ? '<br />' : $link->link_rel; ?></td><?php
-						break;
-					case 'visible':
-						?><td <?php echo $attributes ?>><?php echo $visible; ?></td><?php
-						break;
-					case 'rating':
-	 					?><td <?php echo $attributes ?>><?php echo $rating; ?></td><?php
-						break;
-					default:
-						/**
-						 * Fires for each registered custom link column.
-						 *
-						 * @since 2.1.0
-						 *
-						 * @param string $column_name Name of the custom column.
-						 * @param int    $link_id     Link ID.
-						 */
-						?>
-						<td <?php echo $attributes ?>><?php do_action( 'manage_link_custom_column', $column_name, $link->link_id ); ?></td>
-						<?php
-						break;
-				}
-			}
+	public function display_rows() {
+		foreach ( $this->items as $link ) {
+			$link = sanitize_bookmark( $link );
+			$link->link_name = esc_attr( $link->link_name );
+			$link->link_category = wp_get_link_cats( $link->link_id );
 ?>
+		<tr id="link-<?php echo $link->link_id; ?>">
+			<?php $this->single_row_columns( $link ) ?>
 		</tr>
 <?php
 		}
 	}
+
+	/**
+	 * Generates and displays row action links.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @param object $link        Link being acted upon.
+	 * @param string $column_name Current column name.
+	 * @param string $primary     Primary column name.
+	 * @return string Row action output for links.
+	 */
+	protected function handle_row_actions( $link, $column_name, $primary ) {
+		if ( $primary !== $column_name ) {
+			return '';
+		}
+
+		$edit_link = get_edit_bookmark_link( $link );
+
+		$actions = array();
+		$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
+		$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&link_id=$link->link_id", 'delete-bookmark_' . $link->link_id) . "' onclick=\"if ( confirm( '" . esc_js(sprintf(__("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name)) . "' ) ) { return true;}return false;\">" . __('Delete') . "</a>";
+		return $this->row_actions( $actions );
+	}
 }
diff --git a/wp-admin/includes/class-wp-list-table.php b/wp-admin/includes/class-wp-list-table.php
index 3aa066d..32d0883 100644
--- a/wp-admin/includes/class-wp-list-table.php
+++ b/wp-admin/includes/class-wp-list-table.php
@@ -1,75 +1,138 @@
 <?php
 /**
- * Base class for displaying a list of items in an ajaxified HTML table.
+ * Administration API: WP_List_Table class
  *
  * @package WordPress
  * @subpackage List_Table
  * @since 3.1.0
+ */
+
+/**
+ * Base class for displaying a list of items in an ajaxified HTML table.
+ *
+ * @since 3.1.0
  * @access private
  */
 class WP_List_Table {
 
 	/**
-	 * The current list of items
+	 * The current list of items.
 	 *
 	 * @since 3.1.0
+	 * @access public
 	 * @var array
-	 * @access protected
 	 */
-	var $items;
+	public $items;
 
 	/**
-	 * Various information about the current table
+	 * Various information about the current table.
 	 *
 	 * @since 3.1.0
+	 * @access protected
 	 * @var array
-	 * @access private
 	 */
-	var $_args;
+	protected $_args;
 
 	/**
-	 * Various information needed for displaying the pagination
+	 * Various information needed for displaying the pagination.
 	 *
 	 * @since 3.1.0
+	 * @access protected
 	 * @var array
-	 * @access private
 	 */
-	var $_pagination_args = array();
+	protected $_pagination_args = array();
 
 	/**
-	 * The current screen
+	 * The current screen.
 	 *
 	 * @since 3.1.0
-	 * @var object
 	 * @access protected
+	 * @var object
 	 */
-	var $screen;
+	protected $screen;
 
 	/**
-	 * Cached bulk actions
+	 * Cached bulk actions.
 	 *
 	 * @since 3.1.0
-	 * @var array
 	 * @access private
+	 * @var array
 	 */
-	var $_actions;
+	private $_actions;
 
 	/**
-	 * Cached pagination output
+	 * Cached pagination output.
 	 *
 	 * @since 3.1.0
-	 * @var string
 	 * @access private
+	 * @var string
+	 */
+	private $_pagination;
+
+	/**
+	 * The view switcher modes.
+	 *
+	 * @since 4.1.0
+	 * @access protected
+	 * @var array
+	 */
+	protected $modes = array();
+
+	/**
+	 * Stores the value returned by ->get_column_info().
+	 *
+	 * @since 4.1.0
+	 * @access protected
+	 * @var array
+	 */
+	protected $_column_headers;
+
+	/**
+	 * {@internal Missing Summary}
+	 *
+	 * @access protected
+	 * @var array
 	 */
-	var $_pagination;
+	protected $compat_fields = array( '_args', '_pagination_args', 'screen', '_actions', '_pagination' );
 
 	/**
-	 * Constructor. The child class should call this constructor from its own constructor
+	 * {@internal Missing Summary}
 	 *
-	 * @param array $args An associative array with information about the current table
 	 * @access protected
+	 * @var array
 	 */
-	function __construct( $args = array() ) {
+	protected $compat_methods = array( 'set_pagination_args', 'get_views', 'get_bulk_actions', 'bulk_actions',
+		'row_actions', 'months_dropdown', 'view_switcher', 'comments_bubble', 'get_items_per_page', 'pagination',
+		'get_sortable_columns', 'get_column_info', 'get_table_classes', 'display_tablenav', 'extra_tablenav',
+		'single_row_columns' );
+
+	/**
+	 * Constructor.
+	 *
+	 * The child class should call this constructor from its own constructor to override
+	 * the default $args.
+	 *
+	 * @since 3.1.0
+	 * @access public
+	 *
+	 * @param array|string $args {
+	 *     Array or string of arguments.
+	 *
+	 *     @type string $plural   Plural value used for labels and the objects being listed.
+	 *                            This affects things such as CSS class-names and nonces used
+	 *                            in the list table, e.g. 'posts'. Default empty.
+	 *     @type string $singular Singular label for an object being listed, e.g. 'post'.
+	 *                            Default empty
+	 *     @type bool   $ajax     Whether the list table supports AJAX. This includes loading
+	 *                            and sorting data, for example. If true, the class will call
+	 *                            the {@see _js_vars()} method in the footer to provide variables
+	 *                            to any scripts handling AJAX events. Default false.
+	 *     @type string $screen   String containing the hook name used to determine the current
+	 *                            screen. If left null, the current screen will be automatically set.
+	 *                            Default null.
+	 * }
+	 */
+	public function __construct( $args = array() ) {
 		$args = wp_parse_args( $args, array(
 			'plural' => '',
 			'singular' => '',
@@ -93,17 +156,100 @@ class WP_List_Table {
 			// wp_enqueue_script( 'list-table' );
 			add_action( 'admin_footer', array( $this, '_js_vars' ) );
 		}
+
+		if ( empty( $this->modes ) ) {
+			$this->modes = array(
+				'list'    => __( 'List View' ),
+				'excerpt' => __( 'Excerpt View' )
+			);
+		}
+	}
+
+	/**
+	 * Make private properties readable for backwards compatibility.
+	 *
+	 * @since 4.0.0
+	 * @access public
+	 *
+	 * @param string $name Property to get.
+	 * @return mixed Property.
+	 */
+	public function __get( $name ) {
+		if ( in_array( $name, $this->compat_fields ) ) {
+			return $this->$name;
+		}
+	}
+
+	/**
+	 * Make private properties settable for backwards compatibility.
+	 *
+	 * @since 4.0.0
+	 * @access public
+	 *
+	 * @param string $name  Property to check if set.
+	 * @param mixed  $value Property value.
+	 * @return mixed Newly-set property.
+	 */
+	public function __set( $name, $value ) {
+		if ( in_array( $name, $this->compat_fields ) ) {
+			return $this->$name = $value;
+		}
+	}
+
+	/**
+	 * Make private properties checkable for backwards compatibility.
+	 *
+	 * @since 4.0.0
+	 * @access public
+	 *
+	 * @param string $name Property to check if set.
+	 * @return bool Whether the property is set.
+	 */
+	public function __isset( $name ) {
+		if ( in_array( $name, $this->compat_fields ) ) {
+			return isset( $this->$name );
+		}
+	}
+
+	/**
+	 * Make private properties un-settable for backwards compatibility.
+	 *
+	 * @since 4.0.0
+	 * @access public
+	 *
+	 * @param string $name Property to unset.
+	 */
+	public function __unset( $name ) {
+		if ( in_array( $name, $this->compat_fields ) ) {
+			unset( $this->$name );
+		}
+	}
+
+	/**
+	 * Make private/protected methods readable for backwards compatibility.
+	 *
+	 * @since 4.0.0
+	 * @access public
+	 *
+	 * @param callable $name      Method to call.
+	 * @param array    $arguments Arguments to pass when calling.
+	 * @return mixed|bool Return value of the callback, false otherwise.
+	 */
+	public function __call( $name, $arguments ) {
+		if ( in_array( $name, $this->compat_methods ) ) {
+			return call_user_func_array( array( $this, $name ), $arguments );
+		}
+		return false;
 	}
 
 	/**
 	 * Checks the current user's permissions
-	 * @uses wp_die()
 	 *
 	 * @since 3.1.0
 	 * @access public
 	 * @abstract
 	 */
-	function ajax_user_can() {
+	public function ajax_user_can() {
 		die( 'function WP_List_Table::ajax_user_can() must be over-ridden in a sub-class.' );
 	}
 
@@ -115,17 +261,19 @@ class WP_List_Table {
 	 * @access public
 	 * @abstract
 	 */
-	function prepare_items() {
+	public function prepare_items() {
 		die( 'function WP_List_Table::prepare_items() must be over-ridden in a sub-class.' );
 	}
 
 	/**
 	 * An internal method that sets all the necessary pagination arguments
 	 *
-	 * @param array $args An associative array with information about the pagination
+	 * @since 3.1.0
 	 * @access protected
+	 *
+	 * @param array|string $args Array or string of arguments with information about the pagination.
 	 */
-	function set_pagination_args( $args ) {
+	protected function set_pagination_args( $args ) {
 		$args = wp_parse_args( $args, array(
 			'total_items' => 0,
 			'total_pages' => 0,
@@ -135,7 +283,7 @@ class WP_List_Table {
 		if ( !$args['total_pages'] && $args['per_page'] > 0 )
 			$args['total_pages'] = ceil( $args['total_items'] / $args['per_page'] );
 
-		// redirect if page number is invalid and headers are not already sent
+		// Redirect if page number is invalid and headers are not already sent.
 		if ( ! headers_sent() && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) && $args['total_pages'] > 0 && $this->get_pagenum() > $args['total_pages'] ) {
 			wp_redirect( add_query_arg( 'paged', $args['total_pages'] ) );
 			exit;
@@ -145,20 +293,23 @@ class WP_List_Table {
 	}
 
 	/**
-	 * Access the pagination args
+	 * Access the pagination args.
 	 *
 	 * @since 3.1.0
 	 * @access public
 	 *
-	 * @param string $key
-	 * @return array
+	 * @param string $key Pagination argument to retrieve. Common values include 'total_items',
+	 *                    'total_pages', 'per_page', or 'infinite_scroll'.
+	 * @return int Number of items that correspond to the given pagination argument.
 	 */
-	function get_pagination_arg( $key ) {
-		if ( 'page' == $key )
+	public function get_pagination_arg( $key ) {
+		if ( 'page' === $key ) {
 			return $this->get_pagenum();
+		}
 
-		if ( isset( $this->_pagination_args[$key] ) )
+		if ( isset( $this->_pagination_args[$key] ) ) {
 			return $this->_pagination_args[$key];
+		}
 	}
 
 	/**
@@ -169,7 +320,7 @@ class WP_List_Table {
 	 *
 	 * @return bool
 	 */
-	function has_items() {
+	public function has_items() {
 		return !empty( $this->items );
 	}
 
@@ -179,7 +330,7 @@ class WP_List_Table {
 	 * @since 3.1.0
 	 * @access public
 	 */
-	function no_items() {
+	public function no_items() {
 		_e( 'No items found.' );
 	}
 
@@ -192,7 +343,7 @@ class WP_List_Table {
 	 * @param string $text The search button text
 	 * @param string $input_id The search input id
 	 */
-	function search_box( $text, $input_id ) {
+	public function search_box( $text, $input_id ) {
 		if ( empty( $_REQUEST['s'] ) && !$this->has_items() )
 			return;
 
@@ -210,7 +361,7 @@ class WP_List_Table {
 <p class="search-box">
 	<label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
 	<input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" />
-	<?php submit_button( $text, 'button', false, false, array('id' => 'search-submit') ); ?>
+	<?php submit_button( $text, 'button', '', false, array('id' => 'search-submit') ); ?>
 </p>
 <?php
 	}
@@ -224,7 +375,7 @@ class WP_List_Table {
 	 *
 	 * @return array
 	 */
-	function get_views() {
+	protected function get_views() {
 		return array();
 	}
 
@@ -234,12 +385,12 @@ class WP_List_Table {
 	 * @since 3.1.0
 	 * @access public
 	 */
-	function views() {
+	public function views() {
 		$views = $this->get_views();
 		/**
 		 * Filter the list of available list table views.
 		 *
-		 * The dynamic portion of the hook name, $this->screen->id, refers
+		 * The dynamic portion of the hook name, `$this->screen->id`, refers
 		 * to the ID of the current screen, usually a string.
 		 *
 		 * @since 3.5.0
@@ -251,6 +402,8 @@ class WP_List_Table {
 		if ( empty( $views ) )
 			return;
 
+		$this->screen->render_screen_reader_content( 'heading_views' );
+
 		echo "<ul class='subsubsub'>\n";
 		foreach ( $views as $class => $view ) {
 			$views[ $class ] = "\t<li class='$class'>$view";
@@ -268,7 +421,7 @@ class WP_List_Table {
 	 *
 	 * @return array
 	 */
-	function get_bulk_actions() {
+	protected function get_bulk_actions() {
 		return array();
 	}
 
@@ -276,15 +429,18 @@ class WP_List_Table {
 	 * Display the bulk actions dropdown.
 	 *
 	 * @since 3.1.0
-	 * @access public
+	 * @access protected
+	 *
+	 * @param string $which The location of the bulk actions: 'top' or 'bottom'.
+	 *                      This is designated as optional for backwards-compatibility.
 	 */
-	function bulk_actions() {
+	protected function bulk_actions( $which = '' ) {
 		if ( is_null( $this->_actions ) ) {
 			$no_new_actions = $this->_actions = $this->get_bulk_actions();
 			/**
 			 * Filter the list table Bulk Actions drop-down.
 			 *
-			 * The dynamic portion of the hook name, $this->screen->id, refers
+			 * The dynamic portion of the hook name, `$this->screen->id`, refers
 			 * to the ID of the current screen, usually a string.
 			 *
 			 * This filter can currently only be used to remove bulk actions.
@@ -303,18 +459,19 @@ class WP_List_Table {
 		if ( empty( $this->_actions ) )
 			return;
 
-		echo "<select name='action$two'>\n";
-		echo "<option value='-1' selected='selected'>" . __( 'Bulk Actions' ) . "</option>\n";
+		echo '<label for="bulk-action-selector-' . esc_attr( $which ) . '" class="screen-reader-text">' . __( 'Select bulk action' ) . '</label>';
+		echo '<select name="action' . $two . '" id="bulk-action-selector-' . esc_attr( $which ) . "\">\n";
+		echo '<option value="-1">' . __( 'Bulk Actions' ) . "</option>\n";
 
 		foreach ( $this->_actions as $name => $title ) {
-			$class = 'edit' == $name ? ' class="hide-if-no-js"' : '';
+			$class = 'edit' === $name ? ' class="hide-if-no-js"' : '';
 
-			echo "\t<option value='$name'$class>$title</option>\n";
+			echo "\t" . '<option value="' . $name . '"' . $class . '>' . $title . "</option>\n";
 		}
 
 		echo "</select>\n";
 
-		submit_button( __( 'Apply' ), 'action', false, false, array( 'id' => "doaction$two" ) );
+		submit_button( __( 'Apply' ), 'action', '', false, array( 'id' => "doaction$two" ) );
 		echo "\n";
 	}
 
@@ -324,9 +481,12 @@ class WP_List_Table {
 	 * @since 3.1.0
 	 * @access public
 	 *
-	 * @return string|bool The action name or False if no action was selected
+	 * @return string|false The action name or False if no action was selected
 	 */
-	function current_action() {
+	public function current_action() {
+		if ( isset( $_REQUEST['filter_action'] ) && ! empty( $_REQUEST['filter_action'] ) )
+			return false;
+
 		if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] )
 			return $_REQUEST['action'];
 
@@ -346,7 +506,7 @@ class WP_List_Table {
 	 * @param bool $always_visible Whether the actions should be always visible
 	 * @return string
 	 */
-	function row_actions( $actions, $always_visible = false ) {
+	protected function row_actions( $actions, $always_visible = false ) {
 		$action_count = count( $actions );
 		$i = 0;
 
@@ -361,6 +521,8 @@ class WP_List_Table {
 		}
 		$out .= '</div>';
 
+		$out .= '<button type="button" class="toggle-row"><span class="screen-reader-text">' . __( 'Show more details' ) . '</span></button>';
+
 		return $out;
 	}
 
@@ -369,14 +531,39 @@ class WP_List_Table {
 	 *
 	 * @since 3.1.0
 	 * @access protected
+	 *
+	 * @global wpdb      $wpdb
+	 * @global WP_Locale $wp_locale
+	 *
+	 * @param string $post_type
 	 */
-	function months_dropdown( $post_type ) {
+	protected function months_dropdown( $post_type ) {
 		global $wpdb, $wp_locale;
 
+		/**
+		 * Filter whether to remove the 'Months' drop-down from the post list table.
+		 *
+		 * @since 4.2.0
+		 *
+		 * @param bool   $disable   Whether to disable the drop-down. Default false.
+		 * @param string $post_type The post type.
+		 */
+		if ( apply_filters( 'disable_months_dropdown', false, $post_type ) ) {
+			return;
+		}
+
+		$extra_checks = "AND post_status != 'auto-draft'";
+		if ( ! isset( $_GET['post_status'] ) || 'trash' !== $_GET['post_status'] ) {
+			$extra_checks .= " AND post_status != 'trash'";
+		} elseif ( isset( $_GET['post_status'] ) ) {
+			$extra_checks = $wpdb->prepare( ' AND post_status = %s', $_GET['post_status'] );
+		}
+
 		$months = $wpdb->get_results( $wpdb->prepare( "
 			SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
 			FROM $wpdb->posts
 			WHERE post_type = %s
+			$extra_checks
 			ORDER BY post_date DESC
 		", $post_type ) );
 
@@ -397,8 +584,9 @@ class WP_List_Table {
 
 		$m = isset( $_GET['m'] ) ? (int) $_GET['m'] : 0;
 ?>
-		<select name='m'>
-			<option<?php selected( $m, 0 ); ?> value='0'><?php _e( 'All dates' ); ?></option>
+		<label for="filter-by-date" class="screen-reader-text"><?php _e( 'Filter by date' ); ?></label>
+		<select name="m" id="filter-by-date">
+			<option<?php selected( $m, 0 ); ?> value="0"><?php _e( 'All dates' ); ?></option>
 <?php
 		foreach ( $months as $arc_row ) {
 			if ( 0 == $arc_row->year )
@@ -424,20 +612,24 @@ class WP_List_Table {
 	 *
 	 * @since 3.1.0
 	 * @access protected
+	 *
+	 * @param string $current_mode
 	 */
-	function view_switcher( $current_mode ) {
-		$modes = array(
-			'list'    => __( 'List View' ),
-			'excerpt' => __( 'Excerpt View' )
-		);
-
+	protected function view_switcher( $current_mode ) {
 ?>
 		<input type="hidden" name="mode" value="<?php echo esc_attr( $current_mode ); ?>" />
 		<div class="view-switch">
 <?php
-			foreach ( $modes as $mode => $title ) {
-				$class = ( $current_mode == $mode ) ? 'class="current"' : '';
-				echo "<a href='" . esc_url( add_query_arg( 'mode', $mode, $_SERVER['REQUEST_URI'] ) ) . "' $class><img id='view-switch-$mode' src='" . esc_url( includes_url( 'images/blank.gif' ) ) . "' width='20' height='20' title='$title' alt='$title' /></a>\n";
+			foreach ( $this->modes as $mode => $title ) {
+				$classes = array( 'view-' . $mode );
+				if ( $current_mode === $mode )
+					$classes[] = 'current';
+				printf(
+					"<a href='%s' class='%s' id='view-switch-$mode'><span class='screen-reader-text'>%s</span></a>\n",
+					esc_url( add_query_arg( 'mode', $mode ) ),
+					implode( ' ', $classes ),
+					$title
+				);
 			}
 		?>
 		</div>
@@ -450,33 +642,64 @@ class WP_List_Table {
 	 * @since 3.1.0
 	 * @access protected
 	 *
-	 * @param int $post_id
-	 * @param int $pending_comments
+	 * @param int $post_id          The post ID.
+	 * @param int $pending_comments Number of pending comments.
 	 */
-	function comments_bubble( $post_id, $pending_comments ) {
-		$pending_phrase = sprintf( __( '%s pending' ), number_format( $pending_comments ) );
+	protected function comments_bubble( $post_id, $pending_comments ) {
+		$approved_comments = get_comments_number();
+
+		$approved_comments_number = number_format_i18n( $approved_comments );
+		$pending_comments_number = number_format_i18n( $pending_comments );
 
-		if ( $pending_comments )
-			echo '<strong>';
+		$approved_only_phrase = sprintf( _n( '%s comment', '%s comments', $approved_comments ), $approved_comments_number );
+		$approved_phrase = sprintf( _n( '%s approved comment', '%s approved comments', $approved_comments ), $approved_comments_number );
+		$pending_phrase = sprintf( _n( '%s pending comment', '%s pending comments', $pending_comments ), $pending_comments_number );
 
-		echo "<a href='" . esc_url( add_query_arg( 'p', $post_id, admin_url( 'edit-comments.php' ) ) ) . "' title='" . esc_attr( $pending_phrase ) . "' class='post-com-count'><span class='comment-count'>" . number_format_i18n( get_comments_number() ) . "</span></a>";
+		// No comments at all.
+		if ( ! $approved_comments && ! $pending_comments ) {
+			printf( '<span aria-hidden="true">â</span><span class="screen-reader-text">%s</span>',
+				__( 'No comments' )
+			);
+		// Approved comments have different display depending on some conditions.
+		} elseif ( $approved_comments ) {
+			printf( '<a href="%s" class="post-com-count post-com-count-approved"><span class="comment-count-approved" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
+				esc_url( add_query_arg( array( 'p' => $post_id, 'comment_status' => 'approved' ), admin_url( 'edit-comments.php' ) ) ),
+				$approved_comments_number,
+				$pending_comments ? $approved_phrase : $approved_only_phrase
+			);
+		} else {
+			printf( '<span class="post-com-count post-com-count-no-comments"><span class="comment-count comment-count-no-comments" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></span>',
+				$approved_comments_number,
+				$pending_comments ? __( 'No approved comments' ) : __( 'No comments' )
+			);
+		}
 
-		if ( $pending_comments )
-			echo '</strong>';
+		if ( $pending_comments ) {
+			printf( '<a href="%s" class="post-com-count post-com-count-pending"><span class="comment-count-pending" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
+				esc_url( add_query_arg( array( 'p' => $post_id, 'comment_status' => 'moderated' ), admin_url( 'edit-comments.php' ) ) ),
+				$pending_comments_number,
+				$pending_phrase
+			);
+		} else {
+			printf( '<span class="post-com-count post-com-count-pending post-com-count-no-pending"><span class="comment-count comment-count-no-pending" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></span>',
+				$pending_comments_number,
+				$approved_comments ? __( 'No pending comments' ) : __( 'No comments' )
+			);
+		}
 	}
 
 	/**
 	 * Get the current page number
 	 *
 	 * @since 3.1.0
-	 * @access protected
+	 * @access public
 	 *
 	 * @return int
 	 */
-	function get_pagenum() {
+	public function get_pagenum() {
 		$pagenum = isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 0;
 
-		if( isset( $this->_pagination_args['total_pages'] ) && $pagenum > $this->_pagination_args['total_pages'] )
+		if ( isset( $this->_pagination_args['total_pages'] ) && $pagenum > $this->_pagination_args['total_pages'] )
 			$pagenum = $this->_pagination_args['total_pages'];
 
 		return max( 1, $pagenum );
@@ -488,9 +711,11 @@ class WP_List_Table {
 	 * @since 3.1.0
 	 * @access protected
 	 *
+	 * @param string $option
+	 * @param int    $default
 	 * @return int
 	 */
-	function get_items_per_page( $option, $default = 20 ) {
+	protected function get_items_per_page( $option, $default = 20 ) {
 		$per_page = (int) get_user_option( $option );
 		if ( empty( $per_page ) || $per_page < 1 )
 			$per_page = $default;
@@ -498,10 +723,11 @@ class WP_List_Table {
 		/**
 		 * Filter the number of items to be displayed on each page of the list table.
 		 *
-		 * The dynamic hook name, $option, refers to the per page option depending
-		 * on the type of list table in use. Possible values may include:
-		 * 'edit_comments_per_page', 'sites_network_per_page', 'site_themes_network_per_page',
-		 * 'themes_netework_per_page', 'users_network_per_page', 'edit_{$post_type}', etc.
+		 * The dynamic hook name, $option, refers to the `per_page` option depending
+		 * on the type of list table in use. Possible values include: 'edit_comments_per_page',
+		 * 'sites_network_per_page', 'site_themes_network_per_page', 'themes_network_per_page',
+		 * 'users_network_per_page', 'edit_post_per_page', 'edit_page_per_page',
+		 * 'edit_{$post_type}_per_page', etc.
 		 *
 		 * @since 2.9.0
 		 *
@@ -515,14 +741,26 @@ class WP_List_Table {
 	 *
 	 * @since 3.1.0
 	 * @access protected
+	 *
+	 * @param string $which
 	 */
-	function pagination( $which ) {
-		if ( empty( $this->_pagination_args ) )
+	protected function pagination( $which ) {
+		if ( empty( $this->_pagination_args ) ) {
 			return;
+		}
 
-		extract( $this->_pagination_args, EXTR_SKIP );
+		$total_items = $this->_pagination_args['total_items'];
+		$total_pages = $this->_pagination_args['total_pages'];
+		$infinite_scroll = false;
+		if ( isset( $this->_pagination_args['infinite_scroll'] ) ) {
+			$infinite_scroll = $this->_pagination_args['infinite_scroll'];
+		}
 
-		$output = '<span class="displaying-num">' . sprintf( _n( '1 item', '%s items', $total_items ), number_format_i18n( $total_items ) ) . '</span>';
+		if ( 'top' === $which && $total_pages > 1 ) {
+			$this->screen->render_screen_reader_content( 'heading_pagination' );
+		}
+
+		$output = '<span class="displaying-num">' . sprintf( _n( '%s item', '%s items', $total_items ), number_format_i18n( $total_items ) ) . '</span>';
 
 		$current = $this->get_pagenum();
 
@@ -532,62 +770,90 @@ class WP_List_Table {
 
 		$page_links = array();
 
-		$disable_first = $disable_last = '';
-		if ( $current == 1 )
-			$disable_first = ' disabled';
-		if ( $current == $total_pages )
-			$disable_last = ' disabled';
-
-		$page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
-			'first-page' . $disable_first,
-			esc_attr__( 'Go to the first page' ),
-			esc_url( remove_query_arg( 'paged', $current_url ) ),
-			'«'
-		);
+		$total_pages_before = '<span class="paging-input">';
+		$total_pages_after  = '</span>';
 
-		$page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
-			'prev-page' . $disable_first,
-			esc_attr__( 'Go to the previous page' ),
-			esc_url( add_query_arg( 'paged', max( 1, $current-1 ), $current_url ) ),
-			'‹'
-		);
+		$disable_first = $disable_last = $disable_prev = $disable_next = false;
 
-		if ( 'bottom' == $which )
-			$html_current_page = $current;
-		else
-			$html_current_page = sprintf( "<input class='current-page' title='%s' type='text' name='paged' value='%s' size='%d' />",
-				esc_attr__( 'Current page' ),
+ 		if ( $current == 1 ) {
+			$disable_first = true;
+			$disable_prev = true;
+ 		}
+		if ( $current == 2 ) {
+			$disable_first = true;
+		}
+ 		if ( $current == $total_pages ) {
+			$disable_last = true;
+			$disable_next = true;
+ 		}
+		if ( $current == $total_pages - 1 ) {
+			$disable_last = true;
+		}
+
+		if ( $disable_first ) {
+			$page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">«</span>';
+		} else {
+			$page_links[] = sprintf( "<a class='first-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+				esc_url( remove_query_arg( 'paged', $current_url ) ),
+				__( 'First page' ),
+				'«'
+			);
+		}
+
+		if ( $disable_prev ) {
+			$page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">‹</span>';
+		} else {
+			$page_links[] = sprintf( "<a class='prev-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+				esc_url( add_query_arg( 'paged', max( 1, $current-1 ), $current_url ) ),
+				__( 'Previous page' ),
+				'‹'
+			);
+		}
+
+		if ( 'bottom' === $which ) {
+			$html_current_page  = $current;
+			$total_pages_before = '<span class="screen-reader-text">' . __( 'Current Page' ) . '</span><span id="table-paging" class="paging-input">';
+		} else {
+			$html_current_page = sprintf( "%s<input class='current-page' id='current-page-selector' type='text' name='paged' value='%s' size='%d' aria-describedby='table-paging' />",
+				'<label for="current-page-selector" class="screen-reader-text">' . __( 'Current Page' ) . '</label>',
 				$current,
 				strlen( $total_pages )
 			);
-
+		}
 		$html_total_pages = sprintf( "<span class='total-pages'>%s</span>", number_format_i18n( $total_pages ) );
-		$page_links[] = '<span class="paging-input">' . sprintf( _x( '%1$s of %2$s', 'paging' ), $html_current_page, $html_total_pages ) . '</span>';
+		$page_links[] = $total_pages_before . sprintf( _x( '%1$s of %2$s', 'paging' ), $html_current_page, $html_total_pages ) . $total_pages_after;
 
-		$page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
-			'next-page' . $disable_last,
-			esc_attr__( 'Go to the next page' ),
-			esc_url( add_query_arg( 'paged', min( $total_pages, $current+1 ), $current_url ) ),
-			'›'
-		);
+		if ( $disable_next ) {
+			$page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">›</span>';
+		} else {
+			$page_links[] = sprintf( "<a class='next-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+				esc_url( add_query_arg( 'paged', min( $total_pages, $current+1 ), $current_url ) ),
+				__( 'Next page' ),
+				'›'
+			);
+		}
 
-		$page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
-			'last-page' . $disable_last,
-			esc_attr__( 'Go to the last page' ),
-			esc_url( add_query_arg( 'paged', $total_pages, $current_url ) ),
-			'»'
-		);
+		if ( $disable_last ) {
+			$page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">»</span>';
+		} else {
+			$page_links[] = sprintf( "<a class='last-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+				esc_url( add_query_arg( 'paged', $total_pages, $current_url ) ),
+				__( 'Last page' ),
+				'»'
+			);
+		}
 
 		$pagination_links_class = 'pagination-links';
-		if ( ! empty( $infinite_scroll ) )
+		if ( ! empty( $infinite_scroll ) ) {
 			$pagination_links_class = ' hide-if-js';
+		}
 		$output .= "\n<span class='$pagination_links_class'>" . join( "\n", $page_links ) . '</span>';
 
-		if ( $total_pages )
+		if ( $total_pages ) {
 			$page_class = $total_pages < 2 ? ' one-page' : '';
-		else
+		} else {
 			$page_class = ' no-pages';
-
+		}
 		$this->_pagination = "<div class='tablenav-pages{$page_class}'>$output</div>";
 
 		echo $this->_pagination;
@@ -598,12 +864,12 @@ class WP_List_Table {
 	 * 'internal-name' => 'Title'
 	 *
 	 * @since 3.1.0
-	 * @access protected
+	 * @access public
 	 * @abstract
 	 *
 	 * @return array
 	 */
-	function get_columns() {
+	public function get_columns() {
 		die( 'function WP_List_Table::get_columns() must be over-ridden in a sub-class.' );
 	}
 
@@ -620,10 +886,87 @@ class WP_List_Table {
 	 *
 	 * @return array
 	 */
-	function get_sortable_columns() {
+	protected function get_sortable_columns() {
 		return array();
 	}
 
+	/**
+	 * Gets the name of the default primary column.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @return string Name of the default primary column, in this case, an empty string.
+	 */
+	protected function get_default_primary_column_name() {
+		$columns = $this->get_columns();
+		$column = '';
+
+		if ( empty( $columns ) ) {
+			return $column;
+		}
+
+		// We need a primary defined so responsive views show something,
+		// so let's fall back to the first non-checkbox column.
+		foreach ( $columns as $col => $column_name ) {
+			if ( 'cb' === $col ) {
+				continue;
+			}
+
+			$column = $col;
+			break;
+		}
+
+		return $column;
+	}
+
+	/**
+	 * Public wrapper for WP_List_Table::get_default_primary_column_name().
+	 *
+	 * @since 4.4.0
+	 * @access public
+	 *
+	 * @return string Name of the default primary column.
+	 */
+	public function get_primary_column() {
+		return $this->get_primary_column_name();
+	}
+
+	/**
+	 * Gets the name of the primary column.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @return string The name of the primary column.
+	 */
+	protected function get_primary_column_name() {
+		$columns = get_column_headers( $this->screen );
+		$default = $this->get_default_primary_column_name();
+
+		// If the primary column doesn't exist fall back to the
+		// first non-checkbox column.
+		if ( ! isset( $columns[ $default ] ) ) {
+			$default = WP_List_Table::get_default_primary_column_name();
+		}
+
+		/**
+		 * Filter the name of the primary column for the current list table.
+		 *
+		 * @since 4.3.0
+		 *
+		 * @param string $default Column name default for the specific list table, e.g. 'name'.
+		 * @param string $context Screen ID for specific list table, e.g. 'plugins'.
+		 */
+		$column  = apply_filters( 'list_table_primary_column', $default, $this->screen->id );
+
+		if ( empty( $column ) || ! isset( $columns[ $column ] ) ) {
+			$column = $default;
+		}
+
+		return $column;
+	}
+
 	/**
 	 * Get a list of all, hidden and sortable columns, with filter applied
 	 *
@@ -632,9 +975,18 @@ class WP_List_Table {
 	 *
 	 * @return array
 	 */
-	function get_column_info() {
-		if ( isset( $this->_column_headers ) )
-			return $this->_column_headers;
+	protected function get_column_info() {
+		// $_column_headers is already set / cached
+		if ( isset( $this->_column_headers ) && is_array( $this->_column_headers ) ) {
+			// Back-compat for list tables that have been manually setting $_column_headers for horse reasons.
+			// In 4.3, we added a fourth argument for primary column.
+			$column_headers = array( array(), array(), array(), $this->get_primary_column_name() );
+			foreach ( $this->_column_headers as $key => $value ) {
+				$column_headers[ $key ] = $value;
+			}
+
+			return $column_headers;
+		}
 
 		$columns = get_column_headers( $this->screen );
 		$hidden = get_hidden_columns( $this->screen );
@@ -643,7 +995,7 @@ class WP_List_Table {
 		/**
 		 * Filter the list table sortable columns for a specific screen.
 		 *
-		 * The dynamic portion of the hook name, $this->screen->id, refers
+		 * The dynamic portion of the hook name, `$this->screen->id`, refers
 		 * to the ID of the current screen, usually a string.
 		 *
 		 * @since 3.5.0
@@ -664,7 +1016,8 @@ class WP_List_Table {
 			$sortable[$id] = $data;
 		}
 
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$primary = $this->get_primary_column_name();
+		$this->_column_headers = array( $columns, $hidden, $sortable, $primary );
 
 		return $this->_column_headers;
 	}
@@ -677,7 +1030,7 @@ class WP_List_Table {
 	 *
 	 * @return int
 	 */
-	function get_column_count() {
+	public function get_column_count() {
 		list ( $columns, $hidden ) = $this->get_column_info();
 		$hidden = array_intersect( array_keys( $columns ), array_filter( $hidden ) );
 		return count( $columns ) - count( $hidden );
@@ -687,25 +1040,29 @@ class WP_List_Table {
 	 * Print column headers, accounting for hidden and sortable columns.
 	 *
 	 * @since 3.1.0
-	 * @access protected
+	 * @access public
+	 *
+	 * @staticvar int $cb_counter
 	 *
 	 * @param bool $with_id Whether to set the id attribute or not
 	 */
-	function print_column_headers( $with_id = true ) {
-		list( $columns, $hidden, $sortable ) = $this->get_column_info();
+	public function print_column_headers( $with_id = true ) {
+		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
 
 		$current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
 		$current_url = remove_query_arg( 'paged', $current_url );
 
-		if ( isset( $_GET['orderby'] ) )
+		if ( isset( $_GET['orderby'] ) ) {
 			$current_orderby = $_GET['orderby'];
-		else
+		} else {
 			$current_orderby = '';
+		}
 
-		if ( isset( $_GET['order'] ) && 'desc' == $_GET['order'] )
+		if ( isset( $_GET['order'] ) && 'desc' === $_GET['order'] ) {
 			$current_order = 'desc';
-		else
+		} else {
 			$current_order = 'asc';
+		}
 
 		if ( ! empty( $columns['cb'] ) ) {
 			static $cb_counter = 1;
@@ -717,22 +1074,24 @@ class WP_List_Table {
 		foreach ( $columns as $column_key => $column_display_name ) {
 			$class = array( 'manage-column', "column-$column_key" );
 
-			$style = '';
-			if ( in_array( $column_key, $hidden ) )
-				$style = 'display:none;';
-
-			$style = ' style="' . $style . '"';
+			if ( in_array( $column_key, $hidden ) ) {
+				$class[] = 'hidden';
+			}
 
-			if ( 'cb' == $column_key )
+			if ( 'cb' === $column_key )
 				$class[] = 'check-column';
 			elseif ( in_array( $column_key, array( 'posts', 'comments', 'links' ) ) )
 				$class[] = 'num';
 
+			if ( $column_key === $primary ) {
+				$class[] = 'column-primary';
+			}
+
 			if ( isset( $sortable[$column_key] ) ) {
 				list( $orderby, $desc_first ) = $sortable[$column_key];
 
-				if ( $current_orderby == $orderby ) {
-					$order = 'asc' == $current_order ? 'desc' : 'asc';
+				if ( $current_orderby === $orderby ) {
+					$order = 'asc' === $current_order ? 'desc' : 'asc';
 					$class[] = 'sorted';
 					$class[] = $current_order;
 				} else {
@@ -744,12 +1103,14 @@ class WP_List_Table {
 				$column_display_name = '<a href="' . esc_url( add_query_arg( compact( 'orderby', 'order' ), $current_url ) ) . '"><span>' . $column_display_name . '</span><span class="sorting-indicator"></span></a>';
 			}
 
+			$tag = ( 'cb' === $column_key ) ? 'td' : 'th';
+			$scope = ( 'th' === $tag ) ? 'scope="col"' : '';
 			$id = $with_id ? "id='$column_key'" : '';
 
 			if ( !empty( $class ) )
 				$class = "class='" . join( ' ', $class ) . "'";
 
-			echo "<th scope='col' $id $class $style>$column_display_name</th>";
+			echo "<$tag $scope $id $class>$column_display_name</$tag>";
 		}
 	}
 
@@ -759,11 +1120,12 @@ class WP_List_Table {
 	 * @since 3.1.0
 	 * @access public
 	 */
-	function display() {
-		extract( $this->_args );
+	public function display() {
+		$singular = $this->_args['singular'];
 
 		$this->display_tablenav( 'top' );
 
+		$this->screen->render_screen_reader_content( 'heading_list' );
 ?>
 <table class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
 	<thead>
@@ -772,30 +1134,34 @@ class WP_List_Table {
 	</tr>
 	</thead>
 
+	<tbody id="the-list"<?php
+		if ( $singular ) {
+			echo " data-wp-lists='list:$singular'";
+		} ?>>
+		<?php $this->display_rows_or_placeholder(); ?>
+	</tbody>
+
 	<tfoot>
 	<tr>
 		<?php $this->print_column_headers( false ); ?>
 	</tr>
 	</tfoot>
 
-	<tbody id="the-list"<?php if ( $singular ) echo " data-wp-lists='list:$singular'"; ?>>
-		<?php $this->display_rows_or_placeholder(); ?>
-	</tbody>
 </table>
 <?php
 		$this->display_tablenav( 'bottom' );
 	}
 
 	/**
-	 * Get a list of CSS classes for the <table> tag
+	 * Get a list of CSS classes for the WP_List_Table table tag.
 	 *
 	 * @since 3.1.0
 	 * @access protected
 	 *
-	 * @return array
+	 * @return array List of CSS classes for the table tag.
 	 */
-	function get_table_classes() {
-		return array( 'widefat', 'fixed', $this->_args['plural'] );
+	protected function get_table_classes() {
+		return array( 'widefat', 'fixed', 'striped', $this->_args['plural'] );
 	}
 
 	/**
@@ -803,17 +1169,20 @@ class WP_List_Table {
 	 *
 	 * @since 3.1.0
 	 * @access protected
+	 * @param string $which
 	 */
-	function display_tablenav( $which ) {
-		if ( 'top' == $which )
+	protected function display_tablenav( $which ) {
+		if ( 'top' === $which ) {
 			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
-?>
+		}
+		?>
 	<div class="tablenav <?php echo esc_attr( $which ); ?>">
 
+		<?php if ( $this->has_items() ): ?>
 		<div class="alignleft actions bulkactions">
-			<?php $this->bulk_actions(); ?>
+			<?php $this->bulk_actions( $which ); ?>
 		</div>
-<?php
+		<?php endif;
 		$this->extra_tablenav( $which );
 		$this->pagination( $which );
 ?>
@@ -828,20 +1197,21 @@ class WP_List_Table {
 	 *
 	 * @since 3.1.0
 	 * @access protected
+	 *
+	 * @param string $which
 	 */
-	function extra_tablenav( $which ) {}
+	protected function extra_tablenav( $which ) {}
 
 	/**
-	 * Generate the <tbody> part of the table
+	 * Generate the tbody element for the list table.
 	 *
 	 * @since 3.1.0
-	 * @access protected
+	 * @access public
 	 */
-	function display_rows_or_placeholder() {
+	public function display_rows_or_placeholder() {
 		if ( $this->has_items() ) {
 			$this->display_rows();
 		} else {
-			list( $columns, $hidden ) = $this->get_column_info();
 			echo '<tr class="no-items"><td class="colspanchange" colspan="' . $this->get_column_count() . '">';
 			$this->no_items();
 			echo '</td></tr>';
@@ -852,9 +1222,9 @@ class WP_List_Table {
 	 * Generate the table rows
 	 *
 	 * @since 3.1.0
-	 * @access protected
+	 * @access public
 	 */
-	function display_rows() {
+	public function display_rows() {
 		foreach ( $this->items as $item )
 			$this->single_row( $item );
 	}
@@ -863,19 +1233,29 @@ class WP_List_Table {
 	 * Generates content for a single row of the table
 	 *
 	 * @since 3.1.0
-	 * @access protected
+	 * @access public
 	 *
 	 * @param object $item The current item
 	 */
-	function single_row( $item ) {
-		static $row_class = '';
-		$row_class = ( $row_class == '' ? ' class="alternate"' : '' );
-
-		echo '<tr' . $row_class . '>';
+	public function single_row( $item ) {
+		echo '<tr>';
 		$this->single_row_columns( $item );
 		echo '</tr>';
 	}
 
+	/**
+	 *
+	 * @param object $item
+	 * @param string $column_name
+	 */
+	protected function column_default( $item, $column_name ) {}
+
+	/**
+	 *
+	 * @param object $item
+	 */
+	protected function column_cb( $item ) {}
+
 	/**
 	 * Generates the columns for a single row of the table
 	 *
@@ -884,75 +1264,106 @@ class WP_List_Table {
 	 *
 	 * @param object $item The current item
 	 */
-	function single_row_columns( $item ) {
-		list( $columns, $hidden ) = $this->get_column_info();
+	protected function single_row_columns( $item ) {
+		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
 
 		foreach ( $columns as $column_name => $column_display_name ) {
-			$class = "class='$column_name column-$column_name'";
+			$classes = "$column_name column-$column_name";
+			if ( $primary === $column_name ) {
+				$classes .= ' has-row-actions column-primary';
+			}
+
+			if ( in_array( $column_name, $hidden ) ) {
+				$classes .= ' hidden';
+			}
 
-			$style = '';
-			if ( in_array( $column_name, $hidden ) )
-				$style = ' style="display:none;"';
+			// Comments column uses HTML in the display name with screen reader text.
+			// Instead of using esc_attr(), we strip tags to get closer to a user-friendly string.
+			$data = 'data-colname="' . wp_strip_all_tags( $column_display_name ) . '"';
 
-			$attributes = "$class$style";
+			$attributes = "class='$classes' $data";
 
-			if ( 'cb' == $column_name ) {
+			if ( 'cb' === $column_name ) {
 				echo '<th scope="row" class="check-column">';
 				echo $this->column_cb( $item );
 				echo '</th>';
-			}
-			elseif ( method_exists( $this, 'column_' . $column_name ) ) {
+			} elseif ( method_exists( $this, '_column_' . $column_name ) ) {
+				echo call_user_func(
+					array( $this, '_column_' . $column_name ),
+					$item,
+					$classes,
+					$data,
+					$primary
+				);
+			} elseif ( method_exists( $this, 'column_' . $column_name ) ) {
 				echo "<td $attributes>";
 				echo call_user_func( array( $this, 'column_' . $column_name ), $item );
+				echo $this->handle_row_actions( $item, $column_name, $primary );
 				echo "</td>";
-			}
-			else {
+			} else {
 				echo "<td $attributes>";
 				echo $this->column_default( $item, $column_name );
+				echo $this->handle_row_actions( $item, $column_name, $primary );
 				echo "</td>";
 			}
 		}
 	}
 
+	/**
+	 * Generates and display row actions links for the list table.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @param object $item        The item being acted upon.
+	 * @param string $column_name Current column name.
+	 * @param string $primary     Primary column name.
+	 * @return string The row actions HTML, or an empty string if the current column is the primary column.
+	 */
+	protected function handle_row_actions( $item, $column_name, $primary ) {
+		return $column_name === $primary ? '<button type="button" class="toggle-row"><span class="screen-reader-text">' . __( 'Show more details' ) . '</span></button>' : '';
+ 	}
+
 	/**
 	 * Handle an incoming ajax request (called from admin-ajax.php)
 	 *
 	 * @since 3.1.0
 	 * @access public
 	 */
-	function ajax_response() {
+	public function ajax_response() {
 		$this->prepare_items();
 
-		extract( $this->_args );
-		extract( $this->_pagination_args, EXTR_SKIP );
-
 		ob_start();
-		if ( ! empty( $_REQUEST['no_placeholder'] ) )
+		if ( ! empty( $_REQUEST['no_placeholder'] ) ) {
 			$this->display_rows();
-		else
+		} else {
 			$this->display_rows_or_placeholder();
+		}
 
 		$rows = ob_get_clean();
 
 		$response = array( 'rows' => $rows );
 
-		if ( isset( $total_items ) )
-			$response['total_items_i18n'] = sprintf( _n( '1 item', '%s items', $total_items ), number_format_i18n( $total_items ) );
-
-		if ( isset( $total_pages ) ) {
-			$response['total_pages'] = $total_pages;
-			$response['total_pages_i18n'] = number_format_i18n( $total_pages );
+		if ( isset( $this->_pagination_args['total_items'] ) ) {
+			$response['total_items_i18n'] = sprintf(
+				_n( '%s item', '%s items', $this->_pagination_args['total_items'] ),
+				number_format_i18n( $this->_pagination_args['total_items'] )
+			);
+		}
+		if ( isset( $this->_pagination_args['total_pages'] ) ) {
+			$response['total_pages'] = $this->_pagination_args['total_pages'];
+			$response['total_pages_i18n'] = number_format_i18n( $this->_pagination_args['total_pages'] );
 		}
 
-		die( json_encode( $response ) );
+		die( wp_json_encode( $response ) );
 	}
 
 	/**
 	 * Send required variables to JavaScript land
 	 *
-	 * @access private
+	 * @access public
 	 */
-	function _js_vars() {
+	public function _js_vars() {
 		$args = array(
 			'class'  => get_class( $this ),
 			'screen' => array(
@@ -961,6 +1372,6 @@ class WP_List_Table {
 			)
 		);
 
-		printf( "<script type='text/javascript'>list_args = %s;</script>\n", json_encode( $args ) );
+		printf( "<script type='text/javascript'>list_args = %s;</script>\n", wp_json_encode( $args ) );
 	}
 }
diff --git a/wp-admin/includes/class-wp-media-list-table.php b/wp-admin/includes/class-wp-media-list-table.php
index 48e4363..98deaac 100644
--- a/wp-admin/includes/class-wp-media-list-table.php
+++ b/wp-admin/includes/class-wp-media-list-table.php
@@ -1,16 +1,51 @@
 <?php
 /**
- * Media Library List Table class.
+ * List Table API: WP_Media_List_Table class
  *
  * @package WordPress
- * @subpackage List_Table
+ * @subpackage Administration
+ * @since 3.1.0
+ */
+
+/**
+ * Core class used to implement displaying media items in a list table.
+ *
  * @since 3.1.0
  * @access private
+ *
+ * @see WP_List_Table
  */
 class WP_Media_List_Table extends WP_List_Table {
-
-	function __construct( $args = array() ) {
-		$this->detached = isset( $_REQUEST['detached'] ) || isset( $_REQUEST['find_detached'] );
+	/**
+	 * Holds the number of pending comments for each post.
+	 *
+	 * @since 4.4.0
+	 * @var array
+	 * @access protected
+	 */
+	protected $comment_pending_count = array();
+
+	private $detached;
+
+	private $is_trash;
+
+	/**
+	 * Constructor.
+	 *
+	 * @since 3.1.0
+	 * @access public
+	 *
+	 * @see WP_List_Table::__construct() for more information on default arguments.
+	 *
+	 * @param array $args An associative array of arguments.
+	 */
+	public function __construct( $args = array() ) {
+		$this->detached = ( isset( $_REQUEST['attachment-filter'] ) && 'detached' === $_REQUEST['attachment-filter'] );
+
+		$this->modes = array(
+			'list' => __( 'List View' ),
+			'grid' => __( 'Grid View' )
+		);
 
 		parent::__construct( array(
 			'plural' => 'media',
@@ -18,21 +53,29 @@ class WP_Media_List_Table extends WP_List_Table {
 		) );
 	}
 
-	function ajax_user_can() {
+	/**
+	 *
+	 * @return bool
+	 */
+	public function ajax_user_can() {
 		return current_user_can('upload_files');
 	}
 
-	function prepare_items() {
-		global $lost, $wpdb, $wp_query, $post_mime_types, $avail_post_mime_types;
-
-		$q = $_REQUEST;
+	/**
+	 *
+	 * @global WP_Query $wp_query
+	 * @global array    $post_mime_types
+	 * @global array    $avail_post_mime_types
+	 * @global string   $mode
+	 */
+	public function prepare_items() {
+		global $wp_query, $post_mime_types, $avail_post_mime_types, $mode;
 
-		if ( !empty( $lost ) )
-			$q['post__in'] = implode( ',', $lost );
+		list( $post_mime_types, $avail_post_mime_types ) = wp_edit_attachments_query( $_REQUEST );
 
-		list( $post_mime_types, $avail_post_mime_types ) = wp_edit_attachments_query( $q );
+ 		$this->is_trash = isset( $_REQUEST['attachment-filter'] ) && 'trash' === $_REQUEST['attachment-filter'];
 
- 		$this->is_trash = isset( $_REQUEST['status'] ) && 'trash' == $_REQUEST['status'];
+ 		$mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
 
 		$this->set_pagination_args( array(
 			'total_items' => $wp_query->found_posts,
@@ -41,100 +84,200 @@ class WP_Media_List_Table extends WP_List_Table {
 		) );
 	}
 
-	function get_views() {
-		global $wpdb, $post_mime_types, $avail_post_mime_types;
+	/**
+	 * @global array $post_mime_types
+	 * @global array $avail_post_mime_types
+	 * @return array
+	 */
+	protected function get_views() {
+		global $post_mime_types, $avail_post_mime_types;
 
 		$type_links = array();
-		$_num_posts = (array) wp_count_attachments();
-		$_total_posts = array_sum($_num_posts) - $_num_posts['trash'];
-		$total_orphans = $wpdb->get_var( "SELECT COUNT( * ) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent < 1" );
-		$matches = wp_match_mime_types(array_keys($post_mime_types), array_keys($_num_posts));
-		foreach ( $matches as $type => $reals )
-			foreach ( $reals as $real )
-				$num_posts[$type] = ( isset( $num_posts[$type] ) ) ? $num_posts[$type] + $_num_posts[$real] : $_num_posts[$real];
-
-		$class = ( empty($_GET['post_mime_type']) && !$this->detached && !isset($_GET['status']) ) ? ' class="current"' : '';
-		$type_links['all'] = "<a href='upload.php'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $_total_posts, 'uploaded files' ), number_format_i18n( $_total_posts ) ) . '</a>';
-		foreach ( $post_mime_types as $mime_type => $label ) {
-			$class = '';
 
-			if ( !wp_match_mime_types($mime_type, $avail_post_mime_types) )
+		$filter = empty( $_GET['attachment-filter'] ) ? '' : $_GET['attachment-filter'];
+
+		$type_links['all'] = sprintf(
+			'<option value=""%s>%s</option>',
+			selected( $filter, true, false ),
+			__( 'All media items' )
+		);
+
+		foreach ( $post_mime_types as $mime_type => $label ) {
+			if ( ! wp_match_mime_types( $mime_type, $avail_post_mime_types ) ) {
 				continue;
+			}
 
-			if ( !empty($_GET['post_mime_type']) && wp_match_mime_types($mime_type, $_GET['post_mime_type']) )
-				$class = ' class="current"';
-			if ( !empty( $num_posts[$mime_type] ) )
-				$type_links[$mime_type] = "<a href='upload.php?post_mime_type=$mime_type'$class>" . sprintf( translate_nooped_plural( $label[2], $num_posts[$mime_type] ), number_format_i18n( $num_posts[$mime_type] )) . '</a>';
-		}
-		$type_links['detached'] = '<a href="upload.php?detached=1"' . ( $this->detached ? ' class="current"' : '' ) . '>' . sprintf( _nx( 'Unattached <span class="count">(%s)</span>', 'Unattached <span class="count">(%s)</span>', $total_orphans, 'detached files' ), number_format_i18n( $total_orphans ) ) . '</a>';
+			$selected = selected(
+				$filter && 0 === strpos( $filter, 'post_mime_type:' ) &&
+					wp_match_mime_types( $mime_type, str_replace( 'post_mime_type:', '', $filter ) ),
+				true,
+				false
+			);
 
-		if ( !empty($_num_posts['trash']) )
-			$type_links['trash'] = '<a href="upload.php?status=trash"' . ( (isset($_GET['status']) && $_GET['status'] == 'trash' ) ? ' class="current"' : '') . '>' . sprintf( _nx( 'Trash <span class="count">(%s)</span>', 'Trash <span class="count">(%s)</span>', $_num_posts['trash'], 'uploaded files' ), number_format_i18n( $_num_posts['trash'] ) ) . '</a>';
+			$type_links[$mime_type] = sprintf(
+				'<option value="post_mime_type:%s"%s>%s</option>',
+				esc_attr( $mime_type ),
+				$selected,
+				$label[0]
+			);
+		}
+		$type_links['detached'] = '<option value="detached"' . ( $this->detached ? ' selected="selected"' : '' ) . '>' . __( 'Unattached' ) . '</option>';
 
+		if ( $this->is_trash || ( defined( 'MEDIA_TRASH') && MEDIA_TRASH ) ) {
+			$type_links['trash'] = sprintf(
+				'<option value="trash"%s>%s</option>',
+				selected( 'trash' === $filter, true, false ),
+				_x( 'Trash', 'attachment filter' )
+			);
+		}
 		return $type_links;
 	}
 
-	function get_bulk_actions() {
+	/**
+	 *
+	 * @return array
+	 */
+	protected function get_bulk_actions() {
 		$actions = array();
-		$actions['delete'] = __( 'Delete Permanently' );
+		if ( MEDIA_TRASH ) {
+			if ( $this->is_trash ) {
+				$actions['untrash'] = __( 'Restore' );
+				$actions['delete'] = __( 'Delete Permanently' );
+			} else {
+				$actions['trash'] = _x( 'Trash', 'verb' );
+			}
+		} else {
+			$actions['delete'] = __( 'Delete Permanently' );
+		}
+
 		if ( $this->detached )
-			$actions['attach'] = __( 'Attach to a post' );
+			$actions['attach'] = __( 'Attach' );
 
 		return $actions;
 	}
 
-	function extra_tablenav( $which ) {
+	/**
+	 * @param string $which
+	 */
+	protected function extra_tablenav( $which ) {
+		if ( 'bar' !== $which ) {
+			return;
+		}
 ?>
-		<div class="alignleft actions">
+		<div class="actions">
 <?php
-		if ( 'top' == $which && !is_singular() && !$this->detached && !$this->is_trash ) {
-			$this->months_dropdown( 'attachment' );
+		if ( ! is_singular() ) {
+			if ( ! $this->is_trash ) {
+				$this->months_dropdown( 'attachment' );
+			}
 
 			/** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */
-			do_action( 'restrict_manage_posts' );
-			submit_button( __( 'Filter' ), 'button', false, false, array( 'id' => 'post-query-submit' ) );
+			do_action( 'restrict_manage_posts', $this->screen->post_type );
+
+			submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
 		}
 
-		if ( $this->detached ) {
-			submit_button( __( 'Scan for lost attachments' ), 'secondary', 'find_detached', false );
-		} elseif ( $this->is_trash && current_user_can( 'edit_others_posts' ) ) {
+		if ( $this->is_trash && current_user_can( 'edit_others_posts' ) ) {
 			submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
 		} ?>
 		</div>
 <?php
 	}
 
-	function current_action() {
-		if ( isset( $_REQUEST['find_detached'] ) )
-			return 'find_detached';
-
+	/**
+	 *
+	 * @return string
+	 */
+	public function current_action() {
 		if ( isset( $_REQUEST['found_post_id'] ) && isset( $_REQUEST['media'] ) )
 			return 'attach';
 
+		if ( isset( $_REQUEST['parent_post_id'] ) && isset( $_REQUEST['media'] ) )
+			return 'detach';
+
 		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
 			return 'delete_all';
 
 		return parent::current_action();
 	}
 
-	function has_items() {
+	/**
+	 *
+	 * @return bool
+	 */
+	public function has_items() {
 		return have_posts();
 	}
 
-	function no_items() {
-		_e( 'No media attachments found.' );
+	/**
+	 * @access public
+	 */
+	public function no_items() {
+		_e( 'No media files found.' );
 	}
 
-	function get_columns() {
+	/**
+	 * Override parent views so we can use the filter bar display.
+	 *
+	 * @global string $mode
+	 */
+	public function views() {
+		global $mode;
+
+		$views = $this->get_views();
+
+		$this->screen->render_screen_reader_content( 'heading_views' );
+?>
+<div class="wp-filter">
+	<div class="filter-items">
+		<?php $this->view_switcher( $mode ); ?>
+
+		<label for="attachment-filter" class="screen-reader-text"><?php _e( 'Filter by type' ); ?></label>
+		<select class="attachment-filters" name="attachment-filter" id="attachment-filter">
+			<?php
+			if ( ! empty( $views ) ) {
+				foreach ( $views as $class => $view ) {
+					echo "\t$view\n";
+				}
+			}
+			?>
+		</select>
+
+<?php
+		$this->extra_tablenav( 'bar' );
+
+		/** This filter is documented in wp-admin/inclues/class-wp-list-table.php */
+		$views = apply_filters( "views_{$this->screen->id}", array() );
+
+		// Back compat for pre-4.0 view links.
+		if ( ! empty( $views ) ) {
+			echo '<ul class="filter-links">';
+			foreach ( $views as $class => $view ) {
+				echo "<li class='$class'>$view</li>";
+			}
+			echo '</ul>';
+		}
+?>
+	</div>
+
+	<div class="search-form">
+		<label for="media-search-input" class="screen-reader-text"><?php esc_html_e( 'Search Media' ); ?></label>
+		<input type="search" placeholder="<?php esc_attr_e( 'Search' ) ?>" id="media-search-input" class="search" name="s" value="<?php _admin_search_query(); ?>"></div>
+	</div>
+	<?php
+	}
+
+	/**
+	 *
+	 * @return array
+	 */
+	public function get_columns() {
 		$posts_columns = array();
 		$posts_columns['cb'] = '<input type="checkbox" />';
-		$posts_columns['icon'] = '';
 		/* translators: column name */
 		$posts_columns['title'] = _x( 'File', 'column name' );
 		$posts_columns['author'] = __( 'Author' );
 
-		$taxonomies = array();
-
 		$taxonomies = get_taxonomies_for_attachments( 'objects' );
 		$taxonomies = wp_filter_object_list( $taxonomies, array( 'show_admin_column' => true ), 'and', 'name' );
 
@@ -150,13 +293,13 @@ class WP_Media_List_Table extends WP_List_Table {
 		$taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
 
 		foreach ( $taxonomies as $taxonomy ) {
-			if ( 'category' == $taxonomy )
+			if ( 'category' === $taxonomy ) {
 				$column_key = 'categories';
-			elseif ( 'post_tag' == $taxonomy )
+			} elseif ( 'post_tag' === $taxonomy ) {
 				$column_key = 'tags';
-			else
+			} else {
 				$column_key = 'taxonomy-' . $taxonomy;
-
+			}
 			$posts_columns[ $column_key ] = get_taxonomy( $taxonomy )->labels->name;
 		}
 
@@ -164,7 +307,7 @@ class WP_Media_List_Table extends WP_List_Table {
 		if ( !$this->detached ) {
 			$posts_columns['parent'] = _x( 'Uploaded to', 'column name' );
 			if ( post_type_supports( 'attachment', 'comments' ) )
-				$posts_columns['comments'] = '<span class="vers"><span title="' . esc_attr__( 'Comments' ) . '" class="comment-grey-bubble"></span></span>';
+				$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
 		}
 		/* translators: column name */
 		$posts_columns['date'] = _x( 'Date', 'column name' );
@@ -177,12 +320,14 @@ class WP_Media_List_Table extends WP_List_Table {
 		 * @param bool  $detached      Whether the list table contains media not attached
 		 *                             to any posts. Default true.
 		 */
-		$posts_columns = apply_filters( 'manage_media_columns', $posts_columns, $this->detached );
-
-		return $posts_columns;
+		return apply_filters( 'manage_media_columns', $posts_columns, $this->detached );
 	}
 
-	function get_sortable_columns() {
+	/**
+	 *
+	 * @return array
+	 */
+	protected function get_sortable_columns() {
 		return array(
 			'title'    => 'title',
 			'author'   => 'author',
@@ -192,194 +337,229 @@ class WP_Media_List_Table extends WP_List_Table {
 		);
 	}
 
-	function display_rows() {
-		global $post;
-
-		add_filter( 'the_title','esc_html' );
-		$alt = '';
-
-		while ( have_posts() ) : the_post();
-			$user_can_edit = current_user_can( 'edit_post', $post->ID );
-
-			if ( $this->is_trash && $post->post_status != 'trash'
-			||  !$this->is_trash && $post->post_status == 'trash' )
-				continue;
-
-			$alt = ( 'alternate' == $alt ) ? '' : 'alternate';
-			$post_owner = ( get_current_user_id() == $post->post_author ) ? 'self' : 'other';
-			$att_title = _draft_or_post_title();
-?>
-	<tr id='post-<?php echo $post->ID; ?>' class='<?php echo trim( $alt . ' author-' . $post_owner . ' status-' . $post->post_status ); ?>'>
-<?php
-
-list( $columns, $hidden ) = $this->get_column_info();
-foreach ( $columns as $column_name => $column_display_name ) {
-	$class = "class='$column_name column-$column_name'";
-
-	$style = '';
-	if ( in_array( $column_name, $hidden ) )
-		$style = ' style="display:none;"';
-
-	$attributes = $class . $style;
-
-	switch ( $column_name ) {
-
-	case 'cb':
-?>
-		<th scope="row" class="check-column">
-			<?php if ( $user_can_edit ) { ?>
-				<label class="screen-reader-text" for="cb-select-<?php the_ID(); ?>"><?php echo sprintf( __( 'Select %s' ), $att_title );?></label>
-				<input type="checkbox" name="media[]" id="cb-select-<?php the_ID(); ?>" value="<?php the_ID(); ?>" />
-			<?php } ?>
-		</th>
-<?php
-		break;
-
-	case 'icon':
-		$attributes = 'class="column-icon media-icon"' . $style;
-?>
-		<td <?php echo $attributes ?>><?php
-			if ( $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ) ) {
-				if ( $this->is_trash || ! $user_can_edit ) {
-					echo $thumb;
-				} else {
-?>
-				<a href="<?php echo get_edit_post_link( $post->ID, true ); ?>" title="<?php echo esc_attr( sprintf( __( 'Edit “%s”' ), $att_title ) ); ?>">
-					<?php echo $thumb; ?>
-				</a>
+	/**
+	 * Handles the checkbox column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param WP_Post $post The current WP_Post object.
+	 */
+	public function column_cb( $post ) {
+		if ( current_user_can( 'edit_post', $post->ID ) ) { ?>
+			<label class="screen-reader-text" for="cb-select-<?php echo $post->ID; ?>"><?php
+				echo sprintf( __( 'Select %s' ), _draft_or_post_title() );
+			?></label>
+			<input type="checkbox" name="media[]" id="cb-select-<?php echo $post->ID; ?>" value="<?php echo $post->ID; ?>" />
+		<?php }
+	}
 
-<?php			}
-			}
-?>
-		</td>
-<?php
-		break;
+	/**
+	 * Handles the title column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param WP_Post $post The current WP_Post object.
+	 */
+	public function column_title( $post ) {
+		list( $mime ) = explode( '/', $post->post_mime_type );
+
+		$title = _draft_or_post_title();
+		$thumb = wp_get_attachment_image( $post->ID, array( 60, 60 ), true, array( 'alt' => '' ) );
+		$link_start = $link_end = '';
+
+		if ( current_user_can( 'edit_post', $post->ID ) && ! $this->is_trash ) {
+			$link_start = sprintf(
+				'<a href="%s" aria-label="%s">',
+				get_edit_post_link( $post->ID ),
+				/* translators: %s: attachment title */
+				esc_attr( sprintf( __( '“%s” (Edit)' ), $title ) )
+			);
+			$link_end = '</a>';
+		}
 
-	case 'title':
-?>
-		<td <?php echo $attributes ?>><strong>
-			<?php if ( $this->is_trash || ! $user_can_edit ) {
-				echo $att_title;
-			} else { ?>
-			<a href="<?php echo get_edit_post_link( $post->ID, true ); ?>"
-				title="<?php echo esc_attr( sprintf( __( 'Edit “%s”' ), $att_title ) ); ?>">
-				<?php echo $att_title; ?></a>
-			<?php };
-			_media_states( $post ); ?></strong>
-			<p>
-<?php
-			if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) )
-				echo esc_html( strtoupper( $matches[1] ) );
-			else
-				echo strtoupper( str_replace( 'image/', '', get_post_mime_type() ) );
-?>
-			</p>
-<?php
-		echo $this->row_actions( $this->_get_row_actions( $post, $att_title ) );
-?>
-		</td>
-<?php
-		break;
+		$class = $thumb ? ' class="has-media-icon"' : '';
+		?>
+		<strong<?php echo $class; ?>>
+			<?php
+			echo $link_start;
+			if ( $thumb ) : ?>
+				<span class="media-icon <?php echo sanitize_html_class( $mime . '-icon' ); ?>"><?php echo $thumb; ?></span>
+			<?php endif;
+			echo $title . $link_end;
+			_media_states( $post );
+			?>
+		</strong>
+		<p class="filename">
+			<span class="screen-reader-text"><?php _e( 'File name:' ); ?> </span>
+			<?php
+			$file = get_attached_file( $post->ID );
+			echo wp_basename( $file );
+			?>
+		</p>
+		<?php
+	}
 
-	case 'author':
-?>
-		<td <?php echo $attributes ?>><?php
-			printf( '<a href="%s">%s</a>',
-				esc_url( add_query_arg( array( 'author' => get_the_author_meta('ID') ), 'upload.php' ) ),
-				get_the_author()
-			);
-		?></td>
-<?php
-		break;
+	/**
+	 * Handles the author column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param WP_Post $post The current WP_Post object.
+	 */
+	public function column_author( $post ) {
+		printf( '<a href="%s">%s</a>',
+			esc_url( add_query_arg( array( 'author' => get_the_author_meta('ID') ), 'upload.php' ) ),
+			get_the_author()
+		);
+	}
 
-	case 'desc':
-?>
-		<td <?php echo $attributes ?>><?php echo has_excerpt() ? $post->post_excerpt : ''; ?></td>
-<?php
-		break;
+	/**
+	 * Handles the description column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param WP_Post $post The current WP_Post object.
+	 */
+	public function column_desc( $post ) {
+		echo has_excerpt() ? $post->post_excerpt : '';
+	}
 
-	case 'date':
-		if ( '0000-00-00 00:00:00' == $post->post_date ) {
+	/**
+	 * Handles the date column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param WP_Post $post The current WP_Post object.
+	 */
+	public function column_date( $post ) {
+		if ( '0000-00-00 00:00:00' === $post->post_date ) {
 			$h_time = __( 'Unpublished' );
 		} else {
 			$m_time = $post->post_date;
 			$time = get_post_time( 'G', true, $post, false );
 			if ( ( abs( $t_diff = time() - $time ) ) < DAY_IN_SECONDS ) {
-				if ( $t_diff < 0 )
+				if ( $t_diff < 0 ) {
 					$h_time = sprintf( __( '%s from now' ), human_time_diff( $time ) );
-				else
+				} else {
 					$h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) );
+				}
 			} else {
 				$h_time = mysql2date( __( 'Y/m/d' ), $m_time );
 			}
 		}
-?>
-		<td <?php echo $attributes ?>><?php echo $h_time ?></td>
-<?php
-		break;
 
-	case 'parent':
-		if ( $post->post_parent > 0 )
+		echo $h_time;
+	}
+
+	/**
+	 * Handles the parent column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param WP_Post $post The current WP_Post object.
+	 */
+	public function column_parent( $post ) {
+		$user_can_edit = current_user_can( 'edit_post', $post->ID );
+
+		if ( $post->post_parent > 0 ) {
 			$parent = get_post( $post->post_parent );
-		else
+		} else {
 			$parent = false;
+		}
 
 		if ( $parent ) {
 			$title = _draft_or_post_title( $post->post_parent );
 			$parent_type = get_post_type_object( $parent->post_type );
 ?>
-			<td <?php echo $attributes ?>><strong>
-				<?php if ( current_user_can( 'edit_post', $post->post_parent ) && $parent_type && $parent_type->show_ui ) { ?>
-					<a href="<?php echo get_edit_post_link( $post->post_parent ); ?>">
-						<?php echo $title ?></a><?php
-				} else {
-					echo $title;
-				} ?></strong>,
-				<?php echo get_the_time( __( 'Y/m/d' ) ); ?>
-			</td>
-<?php
+			<strong>
+			<?php if ( $parent_type && $parent_type->show_ui && current_user_can( 'edit_post', $post->post_parent ) ) { ?>
+				<a href="<?php echo get_edit_post_link( $post->post_parent ); ?>">
+					<?php echo $title ?></a><?php
+			} else {
+				echo $title;
+			} ?></strong>
+			<br />
+			<?php
+			if ( $user_can_edit ):
+				$detach_url = add_query_arg( array(
+					'parent_post_id' => $post->post_parent,
+					'media[]' => $post->ID,
+					'_wpnonce' => wp_create_nonce( 'bulk-' . $this->_args['plural'] )
+				), 'upload.php' );
+				printf(
+					'<a href="%s" class="hide-if-no-js detach-from-parent" aria-label="%s">%s</a>',
+					$detach_url,
+					/* translators: %s: title of the post the attachment is attached to */
+					esc_attr( sprintf( __( 'Detach from “%s”' ), $title ) ),
+					__( 'Detach' )
+				);
+			endif;
 		} else {
-?>
-			<td <?php echo $attributes ?>><?php _e( '(Unattached)' ); ?><br />
-			<?php if ( $user_can_edit ) { ?>
-				<a class="hide-if-no-js"
-					onclick="findPosts.open( 'media[]','<?php echo $post->ID ?>' ); return false;"
-					href="#the-list">
-					<?php _e( 'Attach' ); ?></a>
-			<?php } ?></td>
-<?php
+			_e( '(Unattached)' ); ?><br />
+			<?php if ( $user_can_edit ) {
+				$title = _draft_or_post_title( $post->post_parent );
+				printf(
+					'<a href="#the-list" onclick="findPosts.open( \'media[]\', \'%s\' ); return false;" class="hide-if-no-js" aria-label="%s">%s</a>',
+					$post->ID,
+					/* translators: %s: attachment title */
+					esc_attr( sprintf( __( 'Attach “%s” to existing content' ), $title ) ),
+					__( 'Attach' )
+				);
+			}
 		}
-		break;
+	}
 
-	case 'comments':
-		$attributes = 'class="comments column-comments num"' . $style;
-?>
-		<td <?php echo $attributes ?>>
-			<div class="post-com-count-wrapper">
-<?php
-		$pending_comments = get_pending_comments_num( $post->ID );
+	/**
+	 * Handles the comments column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param WP_Post $post The current WP_Post object.
+	 */
+	public function column_comments( $post ) {
+		echo '<div class="post-com-count-wrapper">';
+
+		if ( isset( $this->comment_pending_count[ $post->ID ] ) ) {
+			$pending_comments = $this->comment_pending_count[ $post->ID ];
+		} else {
+			$pending_comments = get_pending_comments_num( $post->ID );
+		}
 
 		$this->comments_bubble( $post->ID, $pending_comments );
-?>
-			</div>
-		</td>
-<?php
-		break;
 
-	default:
-		if ( 'categories' == $column_name )
+		echo '</div>';
+	}
+
+	/**
+	 * Handles output for the default column.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param WP_Post $post        The current WP_Post object.
+	 * @param string  $column_name Current column name.
+	 */
+	public function column_default( $post, $column_name ) {
+		if ( 'categories' === $column_name ) {
 			$taxonomy = 'category';
-		elseif ( 'tags' == $column_name )
+		} elseif ( 'tags' === $column_name ) {
 			$taxonomy = 'post_tag';
-		elseif ( 0 === strpos( $column_name, 'taxonomy-' ) )
+		} elseif ( 0 === strpos( $column_name, 'taxonomy-' ) ) {
 			$taxonomy = substr( $column_name, 9 );
-		else
+		} else {
 			$taxonomy = false;
+		}
 
 		if ( $taxonomy ) {
-			$taxonomy_object = get_taxonomy( $taxonomy );
-			echo '<td ' . $attributes . '>';
-			if ( $terms = get_the_terms( $post->ID, $taxonomy ) ) {
+			$terms = get_the_terms( $post->ID, $taxonomy );
+			if ( is_array( $terms ) ) {
 				$out = array();
 				foreach ( $terms as $t ) {
 					$posts_in_term_qv = array();
@@ -394,69 +574,173 @@ foreach ( $columns as $column_name => $column_display_name ) {
 				/* translators: used between list items, there is a space after the comma */
 				echo join( __( ', ' ), $out );
 			} else {
-				echo '—';
+				echo '<span aria-hidden="true">—</span><span class="screen-reader-text">' . get_taxonomy( $taxonomy )->labels->no_terms . '</span>';
 			}
-			echo '</td>';
-			break;
+
+			return;
 		}
-?>
-		<td <?php echo $attributes ?>>
-			<?php
-				/**
-				 * Fires for each custom column in the Media list table.
-				 *
-				 * Custom columns are registered using the 'manage_media_columns' filter.
-				 *
-				 * @since 2.5.0
-				 *
-				 * @param string $column_name Name of the custom column.
-				 * @param int    $post_id     Attachment ID.
-				 */
-			?>
-			<?php do_action( 'manage_media_custom_column', $column_name, $post->ID ); ?>
-		</td>
-<?php
-		break;
+
+		/**
+		 * Fires for each custom column in the Media list table.
+		 *
+		 * Custom columns are registered using the {@see 'manage_media_columns'} filter.
+		 *
+		 * @since 2.5.0
+		 *
+		 * @param string $column_name Name of the custom column.
+		 * @param int    $post_id     Attachment ID.
+		 */
+		do_action( 'manage_media_custom_column', $column_name, $post->ID );
 	}
-}
-?>
-	</tr>
-<?php endwhile;
+
+	/**
+	 *
+	 * @global WP_Post $post
+	 */
+	public function display_rows() {
+		global $post, $wp_query;
+
+		$post_ids = wp_list_pluck( $wp_query->posts, 'ID' );
+		reset( $wp_query->posts );
+
+		$this->comment_pending_count = get_pending_comments_num( $post_ids );
+
+		add_filter( 'the_title','esc_html' );
+
+		while ( have_posts() ) : the_post();
+			if (
+				( $this->is_trash && $post->post_status != 'trash' )
+				|| ( ! $this->is_trash && $post->post_status === 'trash' )
+			) {
+				continue;
+			}
+			$post_owner = ( get_current_user_id() == $post->post_author ) ? 'self' : 'other';
+		?>
+			<tr id="post-<?php echo $post->ID; ?>" class="<?php echo trim( ' author-' . $post_owner . ' status-' . $post->post_status ); ?>">
+				<?php $this->single_row_columns( $post ); ?>
+			</tr>
+		<?php
+		endwhile;
+	}
+
+	/**
+	 * Gets the name of the default primary column.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @return string Name of the default primary column, in this case, 'title'.
+	 */
+	protected function get_default_primary_column_name() {
+		return 'title';
 	}
 
-	function _get_row_actions( $post, $att_title ) {
+	/**
+	 * @param WP_Post $post
+	 * @param string  $att_title
+	 *
+	 * @return array
+	 */
+	private function _get_row_actions( $post, $att_title ) {
 		$actions = array();
 
 		if ( $this->detached ) {
-			if ( current_user_can( 'edit_post', $post->ID ) )
-				$actions['edit'] = '<a href="' . get_edit_post_link( $post->ID, true ) . '">' . __( 'Edit' ) . '</a>';
-			if ( current_user_can( 'delete_post', $post->ID ) )
+			if ( current_user_can( 'edit_post', $post->ID ) ) {
+				$actions['edit'] = sprintf(
+					'<a href="%s" aria-label="%s">%s</a>',
+					get_edit_post_link( $post->ID ),
+					/* translators: %s: attachment title */
+					esc_attr( sprintf( __( 'Edit “%s”' ), $att_title ) ),
+					__( 'Edit' )
+				);
+			}
+			if ( current_user_can( 'delete_post', $post->ID ) ) {
 				if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
-					$actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=trash&post=$post->ID", 'trash-post_' . $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
+					$actions['trash'] = sprintf(
+						'<a href="%s" class="submitdelete" aria-label="%s">%s</a>',
+						wp_nonce_url( "post.php?action=trash&post=$post->ID", 'trash-post_' . $post->ID ),
+						/* translators: %s: attachment title */
+						esc_attr( sprintf( __( 'Move “%s” to the Trash' ), $att_title ) ),
+						_x( 'Trash', 'verb' )
+					);
 				} else {
-					$delete_ays = !MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
-					$actions['delete'] = "<a class='submitdelete'$delete_ays href='" . wp_nonce_url( "post.php?action=delete&post=$post->ID", 'delete-post_' . $post->ID ) . "'>" . __( 'Delete Permanently' ) . "</a>";
+					$delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
+					$actions['delete'] = sprintf(
+						'<a href="%s" class="submitdelete"%s aria-label="%s">%s</a>',
+						wp_nonce_url( "post.php?action=delete&post=$post->ID", 'delete-post_' . $post->ID ),
+						$delete_ays,
+						/* translators: %s: attachment title */
+						esc_attr( sprintf( __( 'Delete “%s” permanently' ), $att_title ) ),
+						__( 'Delete Permanently' )
+					);
 				}
-			$actions['view'] = '<a href="' . get_permalink( $post->ID ) . '" title="' . esc_attr( sprintf( __( 'View “%s”' ), $att_title ) ) . '" rel="permalink">' . __( 'View' ) . '</a>';
-			if ( current_user_can( 'edit_post', $post->ID ) )
-				$actions['attach'] = '<a href="#the-list" onclick="findPosts.open( \'media[]\',\''.$post->ID.'\' );return false;" class="hide-if-no-js">'.__( 'Attach' ).'</a>';
+			}
+			$actions['view'] = sprintf(
+				'<a href="%s" aria-label="%s" rel="permalink">%s</a>',
+				get_permalink( $post->ID ),
+				/* translators: %s: attachment title */
+				esc_attr( sprintf( __( 'View “%s”' ), $att_title ) ),
+				__( 'View' )
+			);
+
+			if ( current_user_can( 'edit_post', $post->ID ) ) {
+				$actions['attach'] = sprintf(
+					'<a href="#the-list" onclick="findPosts.open( \'media[]\', \'%s\' ); return false;" class="hide-if-no-js" aria-label="%s">%s</a>',
+					$post->ID,
+					/* translators: %s: attachment title */
+					esc_attr( sprintf( __( 'Attach “%s” to existing content' ), $att_title ) ),
+					__( 'Attach' )
+				);
+			}
 		}
 		else {
-			if ( current_user_can( 'edit_post', $post->ID ) && !$this->is_trash )
-				$actions['edit'] = '<a href="' . get_edit_post_link( $post->ID, true ) . '">' . __( 'Edit' ) . '</a>';
+			if ( current_user_can( 'edit_post', $post->ID ) && !$this->is_trash ) {
+				$actions['edit'] = sprintf(
+					'<a href="%s" aria-label="%s">%s</a>',
+					get_edit_post_link( $post->ID ),
+					/* translators: %s: attachment title */
+					esc_attr( sprintf( __( 'Edit “%s”' ), $att_title ) ),
+					__( 'Edit' )
+				);
+			}
 			if ( current_user_can( 'delete_post', $post->ID ) ) {
-				if ( $this->is_trash )
-					$actions['untrash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=untrash&post=$post->ID", 'untrash-post_' . $post->ID ) . "'>" . __( 'Restore' ) . "</a>";
-				elseif ( EMPTY_TRASH_DAYS && MEDIA_TRASH )
-					$actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=trash&post=$post->ID", 'trash-post_' . $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
-				if ( $this->is_trash || !EMPTY_TRASH_DAYS || !MEDIA_TRASH ) {
+				if ( $this->is_trash ) {
+					$actions['untrash'] = sprintf(
+						'<a href="%s" class="submitdelete" aria-label="%s">%s</a>',
+						wp_nonce_url( "post.php?action=untrash&post=$post->ID", 'untrash-post_' . $post->ID ),
+						/* translators: %s: attachment title */
+						esc_attr( sprintf( __( 'Restore “%s” from the Trash' ), $att_title ) ),
+						__( 'Restore' )
+					);
+				} elseif ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
+					$actions['trash'] = sprintf(
+						'<a href="%s" class="submitdelete" aria-label="%s">%s</a>',
+						wp_nonce_url( "post.php?action=trash&post=$post->ID", 'trash-post_' . $post->ID ),
+						/* translators: %s: attachment title */
+						esc_attr( sprintf( __( 'Move “%s” to the Trash' ), $att_title ) ),
+						_x( 'Trash', 'verb' )
+					);
+				}
+				if ( $this->is_trash || ! EMPTY_TRASH_DAYS || ! MEDIA_TRASH ) {
 					$delete_ays = ( !$this->is_trash && !MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : '';
-					$actions['delete'] = "<a class='submitdelete'$delete_ays href='" . wp_nonce_url( "post.php?action=delete&post=$post->ID", 'delete-post_' . $post->ID ) . "'>" . __( 'Delete Permanently' ) . "</a>";
+					$actions['delete'] = sprintf(
+						'<a href="%s" class="submitdelete"%s aria-label="%s">%s</a>',
+						wp_nonce_url( "post.php?action=delete&post=$post->ID", 'delete-post_' . $post->ID ),
+						$delete_ays,
+						/* translators: %s: attachment title */
+						esc_attr( sprintf( __( 'Delete “%s” permanently' ), $att_title ) ),
+						__( 'Delete Permanently' )
+					);
 				}
 			}
-			if ( !$this->is_trash ) {
-				$title =_draft_or_post_title( $post->post_parent );
-				$actions['view'] = '<a href="' . get_permalink( $post->ID ) . '" title="' . esc_attr( sprintf( __( 'View “%s”' ), $title ) ) . '" rel="permalink">' . __( 'View' ) . '</a>';
+			if ( ! $this->is_trash ) {
+				$actions['view'] = sprintf(
+					'<a href="%s" aria-label="%s" rel="permalink">%s</a>',
+					get_permalink( $post->ID ),
+					/* translators: %s: attachment title */
+					esc_attr( sprintf( __( 'View “%s”' ), $att_title ) ),
+					__( 'View' )
+				);
 			}
 		}
 
@@ -471,8 +755,26 @@ foreach ( $columns as $column_name => $column_display_name ) {
 		 * @param bool    $detached Whether the list table contains media not attached
 		 *                          to any posts. Default true.
 		 */
-		$actions = apply_filters( 'media_row_actions', $actions, $post, $this->detached );
+		return apply_filters( 'media_row_actions', $actions, $post, $this->detached );
+	}
 
-		return $actions;
+	/**
+	 * Generates and displays row action links.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @param object $post        Attachment being acted upon.
+	 * @param string $column_name Current column name.
+	 * @param string $primary     Primary column name.
+	 * @return string Row actions output for media attachments.
+	 */
+	protected function handle_row_actions( $post, $column_name, $primary ) {
+		if ( $primary !== $column_name ) {
+			return '';
+		}
+
+		$att_title = _draft_or_post_title();
+		return $this->row_actions( $this->_get_row_actions( $post, $att_title ) );
 	}
 }
diff --git a/wp-admin/includes/class-wp-ms-sites-list-table.php b/wp-admin/includes/class-wp-ms-sites-list-table.php
index fcabfd7..9dd1d38 100644
--- a/wp-admin/includes/class-wp-ms-sites-list-table.php
+++ b/wp-admin/includes/class-wp-ms-sites-list-table.php
@@ -1,31 +1,80 @@
 <?php
 /**
- * Sites List Table class.
+ * List Table API: WP_MS_Sites_List_Table class
  *
  * @package WordPress
- * @subpackage List_Table
+ * @subpackage Administration
+ * @since 3.1.0
+ */
+
+/**
+ * Core class used to implement displaying sites in a list table for the network admin.
+ *
  * @since 3.1.0
  * @access private
+ *
+ * @see WP_List_Table
  */
 class WP_MS_Sites_List_Table extends WP_List_Table {
 
-	function __construct( $args = array() ) {
+	/**
+	 * Site status list.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var array
+	 */
+	public $status_list;
+
+	/**
+	 * Constructor.
+	 *
+	 * @since 3.1.0
+	 * @access public
+	 *
+	 * @see WP_List_Table::__construct() for more information on default arguments.
+	 *
+	 * @param array $args An associative array of arguments.
+	 */
+	public function __construct( $args = array() ) {
+		$this->status_list = array(
+			'archived' => array( 'site-archived', __( 'Archived' ) ),
+			'spam'     => array( 'site-spammed', _x( 'Spam', 'site' ) ),
+			'deleted'  => array( 'site-deleted', __( 'Deleted' ) ),
+			'mature'   => array( 'site-mature', __( 'Mature' ) )
+		);
+
 		parent::__construct( array(
 			'plural' => 'sites',
 			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
 		) );
 	}
 
-	function ajax_user_can() {
+	/**
+	 *
+	 * @return bool
+	 */
+	public function ajax_user_can() {
 		return current_user_can( 'manage_sites' );
 	}
 
-	function prepare_items() {
+	/**
+	 *
+	 * @global string $s
+	 * @global string $mode
+	 * @global wpdb   $wpdb
+	 */
+	public function prepare_items() {
 		global $s, $mode, $wpdb;
 
 		$current_site = get_current_site();
 
-		$mode = ( empty( $_REQUEST['mode'] ) ) ? 'list' : $_REQUEST['mode'];
+		if ( ! empty( $_REQUEST['mode'] ) ) {
+			$mode = $_REQUEST['mode'] === 'excerpt' ? 'excerpt' : 'list';
+			set_user_setting( 'sites_list_mode', $mode );
+		} else {
+			$mode = get_user_setting( 'sites_list_mode', 'list' );
+		}
 
 		$per_page = $this->get_items_per_page( 'sites_network_per_page' );
 
@@ -38,10 +87,10 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 			$s = trim($s, '*');
 		}
 
-		$like_s = esc_sql( like_escape( $s ) );
-
-		// If the network is large and a search is not being performed, show only the latest blogs with no paging in order
-		// to avoid expensive count queries.
+		/*
+		 * If the network is large and a search is not being performed, show only
+		 * the latest sites with no paging in order to avoid expensive count queries.
+		 */
 		if ( !$s && wp_is_large_network() ) {
 			if ( !isset($_REQUEST['orderby']) )
 				$_GET['orderby'] = $_REQUEST['orderby'] = '';
@@ -58,7 +107,8 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 					preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
 					preg_match( '/^[0-9]{1,3}\.$/', $s ) ) {
 			// IPv4 address
-			$reg_blog_ids = $wpdb->get_col( "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE ( '{$like_s}$wild' )" );
+			$sql = $wpdb->prepare( "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like( $s ) . $wild );
+			$reg_blog_ids = $wpdb->get_col( $sql );
 
 			if ( !$reg_blog_ids )
 				$reg_blog_ids = array( 0 );
@@ -69,38 +119,40 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 				AND {$wpdb->blogs}.blog_id IN (" . implode( ', ', $reg_blog_ids ) . ")";
 		} else {
 			if ( is_numeric($s) && empty( $wild ) ) {
-				$query .= " AND ( {$wpdb->blogs}.blog_id = '{$like_s}' )";
+				$query .= $wpdb->prepare( " AND ( {$wpdb->blogs}.blog_id = %s )", $s );
 			} elseif ( is_subdomain_install() ) {
-				$blog_s = str_replace( '.' . $current_site->domain, '', $like_s );
-				$blog_s .= $wild . '.' . $current_site->domain;
-				$query .= " AND ( {$wpdb->blogs}.domain LIKE '$blog_s' ) ";
+				$blog_s = str_replace( '.' . $current_site->domain, '', $s );
+				$blog_s = $wpdb->esc_like( $blog_s ) . $wild . $wpdb->esc_like( '.' . $current_site->domain );
+				$query .= $wpdb->prepare( " AND ( {$wpdb->blogs}.domain LIKE %s ) ", $blog_s );
 			} else {
-				if ( $like_s != trim('/', $current_site->path) )
-					$blog_s = $current_site->path . $like_s . $wild . '/';
-				else
-					$blog_s = $like_s;
-				$query .= " AND  ( {$wpdb->blogs}.path LIKE '$blog_s' )";
+				if ( $s != trim('/', $current_site->path) ) {
+					$blog_s = $wpdb->esc_like( $current_site->path . $s ) . $wild . $wpdb->esc_like( '/' );
+				} else {
+					$blog_s = $wpdb->esc_like( $s );
+				}
+				$query .= $wpdb->prepare( " AND  ( {$wpdb->blogs}.path LIKE %s )", $blog_s );
 			}
 		}
 
 		$order_by = isset( $_REQUEST['orderby'] ) ? $_REQUEST['orderby'] : '';
-		if ( $order_by == 'registered' ) {
+		if ( $order_by === 'registered' ) {
 			$query .= ' ORDER BY registered ';
-		} elseif ( $order_by == 'lastupdated' ) {
+		} elseif ( $order_by === 'lastupdated' ) {
 			$query .= ' ORDER BY last_updated ';
-		} elseif ( $order_by == 'blogname' ) {
-			if ( is_subdomain_install() )
+		} elseif ( $order_by === 'blogname' ) {
+			if ( is_subdomain_install() ) {
 				$query .= ' ORDER BY domain ';
-			else
+			} else {
 				$query .= ' ORDER BY path ';
-		} elseif ( $order_by == 'blog_id' ) {
+			}
+		} elseif ( $order_by === 'blog_id' ) {
 			$query .= ' ORDER BY blog_id ';
 		} else {
 			$order_by = null;
 		}
 
 		if ( isset( $order_by ) ) {
-			$order = ( isset( $_REQUEST['order'] ) && 'DESC' == strtoupper( $_REQUEST['order'] ) ) ? "DESC" : "ASC";
+			$order = ( isset( $_REQUEST['order'] ) && 'DESC' === strtoupper( $_REQUEST['order'] ) ) ? "DESC" : "ASC";
 			$query .= $order;
 		}
 
@@ -120,11 +172,18 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 		) );
 	}
 
-	function no_items() {
+	/**
+	 * @access public
+	 */
+	public function no_items() {
 		_e( 'No sites found.' );
 	}
 
-	function get_bulk_actions() {
+	/**
+	 *
+	 * @return array
+	 */
+	protected function get_bulk_actions() {
 		$actions = array();
 		if ( current_user_can( 'delete_sites' ) )
 			$actions['delete'] = __( 'Delete' );
@@ -134,27 +193,35 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 		return $actions;
 	}
 
-	function pagination( $which ) {
+	/**
+	 * @global string $mode
+	 *
+	 * @param string $which
+	 */
+	protected function pagination( $which ) {
 		global $mode;
 
 		parent::pagination( $which );
 
-		if ( 'top' == $which )
+		if ( 'top' === $which )
 			$this->view_switcher( $mode );
 	}
 
-	function get_columns() {
-		$blogname_columns = ( is_subdomain_install() ) ? __( 'Domain' ) : __( 'Path' );
+	/**
+	 * @return array
+	 */
+	public function get_columns() {
 		$sites_columns = array(
 			'cb'          => '<input type="checkbox" />',
-			'blogname'    => $blogname_columns,
+			'blogname'    => __( 'URL' ),
 			'lastupdated' => __( 'Last Updated' ),
 			'registered'  => _x( 'Registered', 'site' ),
-			'users'       => __( 'Users' )
+			'users'       => __( 'Users' ),
 		);
 
-		if ( has_filter( 'wpmublogsaction' ) )
+		if ( has_filter( 'wpmublogsaction' ) ) {
 			$sites_columns['plugins'] = __( 'Actions' );
+		}
 
 		/**
 		 * Filter the displayed site columns in Sites list table.
@@ -164,12 +231,13 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 		 * @param array $sites_columns An array of displayed site columns. Default 'cb',
 		 *                             'blogname', 'lastupdated', 'registered', 'users'.
 		 */
-		$sites_columns = apply_filters( 'wpmu_blogs_columns', $sites_columns );
-
-		return $sites_columns;
+		return apply_filters( 'wpmu_blogs_columns', $sites_columns );
 	}
 
-	function get_sortable_columns() {
+	/**
+	 * @return array
+	 */
+	protected function get_sortable_columns() {
 		return array(
 			'blogname'    => 'blogname',
 			'lastupdated' => 'lastupdated',
@@ -177,212 +245,307 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 		);
 	}
 
-	function display_rows() {
+	/**
+	 * Handles the checkbox column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param array $blog Current site.
+	 */
+	public function column_cb( $blog ) {
+		if ( ! is_main_site( $blog['blog_id'] ) ) :
+			$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
+		?>
+			<label class="screen-reader-text" for="blog_<?php echo $blog['blog_id']; ?>"><?php
+				printf( __( 'Select %s' ), $blogname );
+			?></label>
+			<input type="checkbox" id="blog_<?php echo $blog['blog_id'] ?>" name="allblogs[]" value="<?php echo esc_attr( $blog['blog_id'] ) ?>" />
+		<?php endif;
+	}
+
+	/**
+	 * Handles the ID column output.
+	 *
+	 * @since 4.4.0
+	 * @access public
+	 *
+	 * @param array $blog Current site.
+	 */
+	public function column_id( $blog ) {
+		echo $blog['blog_id'];
+	}
+
+	/**
+	 * Handles the site name column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @global string $mode
+	 *
+	 * @param array $blog Current site.
+	 */
+	public function column_blogname( $blog ) {
 		global $mode;
 
-		$status_list = array(
-			'archived' => array( 'site-archived', __( 'Archived' ) ),
-			'spam'     => array( 'site-spammed', _x( 'Spam', 'site' ) ),
-			'deleted'  => array( 'site-deleted', __( 'Deleted' ) ),
-			'mature'   => array( 'site-mature', __( 'Mature' ) )
+		$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
+		$blog_states = array();
+		reset( $this->status_list );
+
+		foreach ( $this->status_list as $status => $col ) {
+			if ( $blog[ $status ] == 1 ) {
+				$blog_states[] = $col[1];
+			}
+		}
+		$blog_state = '';
+		if ( ! empty( $blog_states ) ) {
+			$state_count = count( $blog_states );
+			$i = 0;
+			$blog_state .= ' - ';
+			foreach ( $blog_states as $state ) {
+				++$i;
+				$sep = ( $i == $state_count ) ? '' : ', ';
+				$blog_state .= "<span class='post-state'>$state$sep</span>";
+			}
+		}
+
+		?>
+		<a href="<?php echo esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ); ?>" class="edit"><?php echo $blogname . $blog_state; ?></a>
+		<?php
+		if ( 'list' !== $mode ) {
+			switch_to_blog( $blog['blog_id'] );
+			echo '<p>';
+			printf(
+				/* translators: 1: site name, 2: site tagline. */
+				__( '%1$s – %2$s' ),
+				get_option( 'blogname' ),
+				'<em>' . get_option( 'blogdescription ' ) . '</em>'
+			);
+			echo '</p>';
+			restore_current_blog();
+		}
+	}
+
+	/**
+	 * Handles the lastupdated column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param array $blog Current site.
+	 */
+	public function column_lastupdated( $blog ) {
+		global $mode;
+
+		if ( 'list' === $mode ) {
+			$date = __( 'Y/m/d' );
+		} else {
+			$date = __( 'Y/m/d g:i:s a' );
+		}
+
+		echo ( $blog['last_updated'] === '0000-00-00 00:00:00' ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] );
+	}
+
+	/**
+	 * Handles the registered column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param array $blog Current site.
+	 */
+	public function column_registered( $blog ) {
+		global $mode;
+
+		if ( 'list' === $mode ) {
+			$date = __( 'Y/m/d' );
+		} else {
+			$date = __( 'Y/m/d g:i:s a' );
+		}
+
+		if ( $blog['registered'] === '0000-00-00 00:00:00' ) {
+			echo '—';
+		} else {
+			echo mysql2date( $date, $blog['registered'] );
+		}
+	}
+
+	/**
+	 * Handles the users column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param array $blog Current site.
+	 */
+	public function column_users( $blog ) {
+		$user_count = wp_cache_get( $blog['blog_id'] . '_user_count', 'blog-details' );
+		if ( ! $user_count ) {
+			$blog_users = get_users( array( 'blog_id' => $blog['blog_id'], 'fields' => 'ID' ) );
+			$user_count = count( $blog_users );
+			unset( $blog_users );
+			wp_cache_set( $blog['blog_id'] . '_user_count', $user_count, 'blog-details', 12 * HOUR_IN_SECONDS );
+		}
+
+		printf(
+			'<a href="%s">%s</a>',
+			esc_url( network_admin_url( 'site-users.php?id=' . $blog['blog_id'] ) ),
+			number_format_i18n( $user_count )
 		);
+	}
+
+	/**
+	 * Handles the plugins column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param array $blog Current site.
+	 */
+	public function column_plugins( $blog ) {
+		if ( has_filter( 'wpmublogsaction' ) ) {
+			/**
+			 * Fires inside the auxiliary 'Actions' column of the Sites list table.
+			 *
+			 * By default this column is hidden unless something is hooked to the action.
+			 *
+			 * @since MU
+			 *
+			 * @param int $blog_id The site ID.
+			 */
+			do_action( 'wpmublogsaction', $blog['blog_id'] );
+		}
+	}
+
+	/**
+	 * Handles output for the default column.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param array  $blog        Current site.
+	 * @param string $column_name Current column name.
+	 */
+	public function column_default( $blog, $column_name ) {
+		/**
+		 * Fires for each registered custom column in the Sites list table.
+		 *
+		 * @since 3.1.0
+		 *
+		 * @param string $column_name The name of the column to display.
+		 * @param int    $blog_id     The site ID.
+		 */
+		do_action( 'manage_sites_custom_column', $column_name, $blog['blog_id'] );
+	}
 
-		$class = '';
+	/**
+	 *
+	 * @global string $mode
+	 */
+	public function display_rows() {
 		foreach ( $this->items as $blog ) {
-			$class = ( 'alternate' == $class ) ? '' : 'alternate';
-			reset( $status_list );
-
-			$blog_states = array();
-			foreach ( $status_list as $status => $col ) {
-				if ( get_blog_status( $blog['blog_id'], $status ) == 1 ) {
-					$class = $col[0];
-					$blog_states[] = $col[1];
+			$class = '';
+			reset( $this->status_list );
+
+			foreach ( $this->status_list as $status => $col ) {
+				if ( $blog[ $status ] == 1 ) {
+					$class = " class='{$col[0]}'";
 				}
 			}
-			$blog_state = '';
-			if ( ! empty( $blog_states ) ) {
-				$state_count = count( $blog_states );
-				$i = 0;
-				$blog_state .= ' - ';
-				foreach ( $blog_states as $state ) {
-					++$i;
-					( $i == $state_count ) ? $sep = '' : $sep = ', ';
-					$blog_state .= "<span class='post-state'>$state$sep</span>";
-				}
+
+			echo "<tr{$class}>";
+
+			$this->single_row_columns( $blog );
+
+			echo '</tr>';
+		}
+	}
+
+	/**
+	 * Gets the name of the default primary column.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @return string Name of the default primary column, in this case, 'blogname'.
+	 */
+	protected function get_default_primary_column_name() {
+		return 'blogname';
+	}
+
+	/**
+	 * Generates and displays row action links.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @param object $blog        Site being acted upon.
+	 * @param string $column_name Current column name.
+	 * @param string $primary     Primary column name.
+	 * @return string Row actions output.
+	 */
+	protected function handle_row_actions( $blog, $column_name, $primary ) {
+		if ( $primary !== $column_name ) {
+			return;
+		}
+
+		$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
+
+		// Preordered.
+		$actions = array(
+			'edit' => '', 'backend' => '',
+			'activate' => '', 'deactivate' => '',
+			'archive' => '', 'unarchive' => '',
+			'spam' => '', 'unspam' => '',
+			'delete' => '',
+			'visit' => '',
+		);
+
+		$actions['edit']	= '<a href="' . esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ) . '">' . __( 'Edit' ) . '</a>';
+		$actions['backend']	= "<a href='" . esc_url( get_admin_url( $blog['blog_id'] ) ) . "' class='edit'>" . __( 'Dashboard' ) . '</a>';
+		if ( get_current_site()->blog_id != $blog['blog_id'] ) {
+			if ( $blog['deleted'] == '1' ) {
+				$actions['activate']   = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&action2=activateblog&id=' . $blog['blog_id'] ), 'activateblog_' . $blog['blog_id'] ) ) . '">' . __( 'Activate' ) . '</a>';
+			} else {
+				$actions['deactivate'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&action2=deactivateblog&id=' . $blog['blog_id'] ), 'deactivateblog_' . $blog['blog_id'] ) ) . '">' . __( 'Deactivate' ) . '</a>';
 			}
-			echo "<tr class='$class'>";
-
-			$blogname = ( is_subdomain_install() ) ? str_replace( '.' . get_current_site()->domain, '', $blog['domain'] ) : $blog['path'];
-
-			list( $columns, $hidden ) = $this->get_column_info();
-
-			foreach ( $columns as $column_name => $column_display_name ) {
-				$style = '';
-				if ( in_array( $column_name, $hidden ) )
-					$style = ' style="display:none;"';
-
-				switch ( $column_name ) {
-					case 'cb': ?>
-						<th scope="row" class="check-column">
-							<?php if ( ! is_main_site( $blog['blog_id'] ) ) : ?>
-							<label class="screen-reader-text" for="blog_<?php echo $blog['blog_id']; ?>"><?php printf( __( 'Select %s' ), $blogname ); ?></label>
-							<input type="checkbox" id="blog_<?php echo $blog['blog_id'] ?>" name="allblogs[]" value="<?php echo esc_attr( $blog['blog_id'] ) ?>" />
-							<?php endif; ?>
-						</th>
-					<?php
-					break;
-
-					case 'id':?>
-						<th scope="row">
-							<?php echo $blog['blog_id'] ?>
-						</th>
-					<?php
-					break;
-
-					case 'blogname':
-						echo "<td class='column-$column_name $column_name'$style>"; ?>
-							<a href="<?php echo esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ); ?>" class="edit"><?php echo $blogname . $blog_state; ?></a>
-							<?php
-							if ( 'list' != $mode ) {
-								switch_to_blog( $blog['blog_id'] );
-								echo '<p>' . sprintf( _x( '%1$s – <em>%2$s</em>', '%1$s: site name. %2$s: site tagline.' ), get_option( 'blogname' ), get_option( 'blogdescription ' ) ) . '</p>';
-								restore_current_blog();
-							}
-
-							// Preordered.
-							$actions = array(
-								'edit' => '', 'backend' => '',
-								'activate' => '', 'deactivate' => '',
-								'archive' => '', 'unarchive' => '',
-								'spam' => '', 'unspam' => '',
-								'delete' => '',
-								'visit' => '',
-							);
-
-							$actions['edit']	= '<span class="edit"><a href="' . esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ) . '">' . __( 'Edit' ) . '</a></span>';
-							$actions['backend']	= "<span class='backend'><a href='" . esc_url( get_admin_url( $blog['blog_id'] ) ) . "' class='edit'>" . __( 'Dashboard' ) . '</a></span>';
-							if ( get_current_site()->blog_id != $blog['blog_id'] ) {
-								if ( get_blog_status( $blog['blog_id'], 'deleted' ) == '1' )
-									$actions['activate']	= '<span class="activate"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&action2=activateblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( 'You are about to activate the site %s' ), $blogname ) ) ), 'confirm' ) ) . '">' . __( 'Activate' ) . '</a></span>';
-								else
-									$actions['deactivate']	= '<span class="activate"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&action2=deactivateblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( 'You are about to deactivate the site %s' ), $blogname ) ) ), 'confirm') ) . '">' . __( 'Deactivate' ) . '</a></span>';
-
-								if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' )
-									$actions['unarchive']	= '<span class="archive"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&action2=unarchiveblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( 'You are about to unarchive the site %s.' ), $blogname ) ) ), 'confirm') ) . '">' . __( 'Unarchive' ) . '</a></span>';
-								else
-									$actions['archive']	= '<span class="archive"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&action2=archiveblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( 'You are about to archive the site %s.' ), $blogname ) ) ), 'confirm') ) . '">' . _x( 'Archive', 'verb; site' ) . '</a></span>';
-
-								if ( get_blog_status( $blog['blog_id'], 'spam' ) == '1' )
-									$actions['unspam']	= '<span class="spam"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&action2=unspamblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( 'You are about to unspam the site %s.' ), $blogname ) ) ), 'confirm') ) . '">' . _x( 'Not Spam', 'site' ) . '</a></span>';
-								else
-									$actions['spam']	= '<span class="spam"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&action2=spamblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( 'You are about to mark the site %s as spam.' ), $blogname ) ) ), 'confirm') ) . '">' . _x( 'Spam', 'site' ) . '</a></span>';
-
-								if ( current_user_can( 'delete_site', $blog['blog_id'] ) )
-									$actions['delete']	= '<span class="delete"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&action2=deleteblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( 'You are about to delete the site %s.' ), $blogname ) ) ), 'confirm') ) . '">' . __( 'Delete' ) . '</a></span>';
-							}
-
-							$actions['visit']	= "<span class='view'><a href='" . esc_url( get_home_url( $blog['blog_id'], '/' ) ) . "' rel='permalink'>" . __( 'Visit' ) . '</a></span>';
-
-							/**
-							 * Filter the action links displayed for each site in the Sites list table.
-							 *
-							 * The 'Edit', 'Dashboard', 'Delete', and 'Visit' links are displayed by
-							 * default for each site. The site's status determines whether to show the
-							 * 'Activate' or 'Deactivate' link, 'Unarchive' or 'Archive' links, and
-							 * 'Not Spam' or 'Spam' link for each site.
-							 *
-							 * @since 3.1.0
-							 *
-							 * @param array  $actions  An array of action links to be displayed.
-							 * @param int    $blog_id  The site ID.
-							 * @param string $blogname Site path, formatted depending on whether it is a sub-domain
-							 *                         or subdirectory multisite install.
-							 */
-							$actions = apply_filters( 'manage_sites_action_links', array_filter( $actions ), $blog['blog_id'], $blogname );
-							echo $this->row_actions( $actions );
-					?>
-						</td>
-					<?php
-					break;
-
-					case 'lastupdated':
-						echo "<td class='$column_name column-$column_name'$style>";
-							if ( 'list' == $mode )
-								$date = 'Y/m/d';
-							else
-								$date = 'Y/m/d \<\b\r \/\> g:i:s a';
-							echo ( $blog['last_updated'] == '0000-00-00 00:00:00' ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] ); ?>
-						</td>
-					<?php
-					break;
-				case 'registered':
-						echo "<td class='$column_name column-$column_name'$style>";
-						if ( $blog['registered'] == '0000-00-00 00:00:00' )
-							echo '—';
-						else
-							echo mysql2date( $date, $blog['registered'] );
-						?>
-						</td>
-					<?php
-					break;
-				case 'users':
-						echo "<td class='$column_name column-$column_name'$style>";
-							$blogusers = get_users( array( 'blog_id' => $blog['blog_id'], 'number' => 6) );
-							if ( is_array( $blogusers ) ) {
-								$blogusers_warning = '';
-								if ( count( $blogusers ) > 5 ) {
-									$blogusers = array_slice( $blogusers, 0, 5 );
-									$blogusers_warning = __( 'Only showing first 5 users.' ) . ' <a href="' . esc_url( network_admin_url( 'site-users.php?id=' . $blog['blog_id'] ) ) . '">' . __( 'More' ) . '</a>';
-								}
-								foreach ( $blogusers as $user_object ) {
-									echo '<a href="' . esc_url( network_admin_url( 'user-edit.php?user_id=' . $user_object->ID ) ) . '">' . esc_html( $user_object->user_login ) . '</a> ';
-									if ( 'list' != $mode )
-										echo '( ' . $user_object->user_email . ' )';
-									echo '<br />';
-								}
-								if ( $blogusers_warning != '' )
-									echo '<strong>' . $blogusers_warning . '</strong><br />';
-							}
-							?>
-						</td>
-					<?php
-					break;
-
-				case 'plugins': ?>
-					<?php if ( has_filter( 'wpmublogsaction' ) ) {
-					echo "<td class='$column_name column-$column_name'$style>";
-						/**
-						 * Fires inside the auxiliary 'Actions' column of the Sites list table.
-						 *
-						 * By default this column is hidden unless something is hooked to the action.
-						 *
-						 * @since MU
-						 *
-						 * @param int $blog_id The site ID.
-						 */
-						do_action( 'wpmublogsaction', $blog['blog_id'] ); ?>
-					</td>
-					<?php }
-					break;
-
-				default:
-					echo "<td class='$column_name column-$column_name'$style>";
-					/**
-					 * Fires for each registered custom column in the Sites list table.
-					 *
-					 * @since 3.1.0
-					 *
-					 * @param string $column_name The name of the column to display.
-					 * @param int    $blog_id     The site ID.
-					 */
-					do_action( 'manage_sites_custom_column', $column_name, $blog['blog_id'] );
-					echo "</td>";
-					break;
-				}
+
+			if ( $blog['archived'] == '1' ) {
+				$actions['unarchive'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&action2=unarchiveblog&id=' . $blog['blog_id'] ), 'unarchiveblog_' . $blog['blog_id'] ) ) . '">' . __( 'Unarchive' ) . '</a>';
+			} else {
+				$actions['archive']   = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&action2=archiveblog&id=' . $blog['blog_id'] ), 'archiveblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Archive', 'verb; site' ) . '</a>';
+			}
+
+			if ( $blog['spam'] == '1' ) {
+				$actions['unspam'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&action2=unspamblog&id=' . $blog['blog_id'] ), 'unspamblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Not Spam', 'site' ) . '</a>';
+			} else {
+				$actions['spam']   = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&action2=spamblog&id=' . $blog['blog_id'] ), 'spamblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Spam', 'site' ) . '</a>';
+			}
+
+			if ( current_user_can( 'delete_site', $blog['blog_id'] ) ) {
+				$actions['delete'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&action2=deleteblog&id=' . $blog['blog_id'] ), 'deleteblog_' . $blog['blog_id'] ) ) . '">' . __( 'Delete' ) . '</a>';
 			}
-			?>
-			</tr>
-			<?php
 		}
+
+		$actions['visit']	= "<a href='" . esc_url( get_home_url( $blog['blog_id'], '/' ) ) . "' rel='permalink'>" . __( 'Visit' ) . '</a>';
+
+		/**
+		 * Filter the action links displayed for each site in the Sites list table.
+		 *
+		 * The 'Edit', 'Dashboard', 'Delete', and 'Visit' links are displayed by
+		 * default for each site. The site's status determines whether to show the
+		 * 'Activate' or 'Deactivate' link, 'Unarchive' or 'Archive' links, and
+		 * 'Not Spam' or 'Spam' link for each site.
+		 *
+		 * @since 3.1.0
+		 *
+		 * @param array  $actions  An array of action links to be displayed.
+		 * @param int    $blog_id  The site ID.
+		 * @param string $blogname Site path, formatted depending on whether it is a sub-domain
+		 *                         or subdirectory multisite install.
+		 */
+		$actions = apply_filters( 'manage_sites_action_links', array_filter( $actions ), $blog['blog_id'], $blogname );
+		return $this->row_actions( $actions );
 	}
 }
diff --git a/wp-admin/includes/class-wp-ms-themes-list-table.php b/wp-admin/includes/class-wp-ms-themes-list-table.php
index 59183c3..825c047 100644
--- a/wp-admin/includes/class-wp-ms-themes-list-table.php
+++ b/wp-admin/includes/class-wp-ms-themes-list-table.php
@@ -1,18 +1,41 @@
 <?php
 /**
- * MS Themes List Table class.
+ * List Table API: WP_MS_Themes_List_Table class
  *
  * @package WordPress
- * @subpackage List_Table
+ * @subpackage Administration
+ * @since 3.1.0
+ */
+
+/**
+ * Core class used to implement displaying themes in a list table for the network admin.
+ *
  * @since 3.1.0
  * @access private
+ *
+ * @see WP_List_Table
  */
 class WP_MS_Themes_List_Table extends WP_List_Table {
 
-	var $site_id;
-	var $is_site_themes;
-
-	function __construct( $args = array() ) {
+	public $site_id;
+	public $is_site_themes;
+
+	private $has_items;
+
+	/**
+	 * Constructor.
+	 *
+	 * @since 3.1.0
+	 * @access public
+	 *
+	 * @see WP_List_Table::__construct() for more information on default arguments.
+	 *
+	 * @global string $status
+	 * @global int    $page
+	 *
+	 * @param array $args An associative array of arguments.
+	 */
+	public function __construct( $args = array() ) {
 		global $status, $page;
 
 		parent::__construct( array(
@@ -26,24 +49,42 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 
 		$page = $this->get_pagenum();
 
-		$this->is_site_themes = ( 'site-themes-network' == $this->screen->id ) ? true : false;
+		$this->is_site_themes = ( 'site-themes-network' === $this->screen->id ) ? true : false;
 
 		if ( $this->is_site_themes )
 			$this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
 	}
 
-	function get_table_classes() {
-		return array( 'widefat', 'plugins' );	// todo: remove and add CSS for .themes
+	/**
+	 *
+	 * @return array
+	 */
+	protected function get_table_classes() {
+		// todo: remove and add CSS for .themes
+		return array( 'widefat', 'plugins' );
 	}
 
-	function ajax_user_can() {
+	/**
+	 *
+	 * @return bool
+	 */
+	public function ajax_user_can() {
 		if ( $this->is_site_themes )
 			return current_user_can( 'manage_sites' );
 		else
 			return current_user_can( 'manage_network_themes' );
 	}
 
-	function prepare_items() {
+	/**
+	 *
+	 * @global string $status
+	 * @global array $totals
+	 * @global int $page
+	 * @global string $orderby
+	 * @global string $order
+	 * @global string $s
+	 */
+	public function prepare_items() {
 		global $status, $totals, $page, $orderby, $order, $s;
 
 		wp_reset_vars( array( 'orderby', 'order', 's' ) );
@@ -112,9 +153,10 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 			$orderby = ucfirst( $orderby );
 			$order = strtoupper( $order );
 
-			if ( $orderby == 'Name' ) {
-				if ( 'ASC' == $order )
+			if ( $orderby === 'Name' ) {
+				if ( 'ASC' === $order ) {
 					$this->items = array_reverse( $this->items );
+				}
 			} else {
 				uasort( $this->items, array( $this, '_order_callback' ) );
 			}
@@ -131,8 +173,13 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 		) );
 	}
 
-	function _search_callback( $theme ) {
-		static $term;
+	/**
+	 * @staticvar string $term
+	 * @param WP_Theme $theme
+	 * @return bool
+	 */
+	public function _search_callback( $theme ) {
+		static $term = null;
 		if ( is_null( $term ) )
 			$term = wp_unslash( $_REQUEST['s'] );
 
@@ -152,7 +199,14 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 	}
 
 	// Not used by any core columns.
-	function _order_callback( $theme_a, $theme_b ) {
+	/**
+	 * @global string $orderby
+	 * @global string $order
+	 * @param array $theme_a
+	 * @param array $theme_b
+	 * @return int
+	 */
+	public function _order_callback( $theme_a, $theme_b ) {
 		global $orderby, $order;
 
 		$a = $theme_a[ $orderby ];
@@ -161,22 +215,28 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 		if ( $a == $b )
 			return 0;
 
-		if ( 'DESC' == $order )
+		if ( 'DESC' === $order )
 			return ( $a < $b ) ? 1 : -1;
 		else
 			return ( $a < $b ) ? -1 : 1;
 	}
 
-	function no_items() {
-		if ( ! $this->has_items )
+	/**
+	 * @access public
+	 */
+	public function no_items() {
+		if ( $this->has_items ) {
 			_e( 'No themes found.' );
-		else
+		} else {
 			_e( 'You do not appear to have any themes available at this time.' );
+		}
 	}
 
-	function get_columns() {
-		global $status;
-
+	/**
+	 *
+	 * @return array
+	 */
+	public function get_columns() {
 		return array(
 			'cb'          => '<input type="checkbox" />',
 			'name'        => __( 'Theme' ),
@@ -184,13 +244,35 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 		);
 	}
 
-	function get_sortable_columns() {
+	/**
+	 *
+	 * @return array
+	 */
+	protected function get_sortable_columns() {
 		return array(
 			'name'         => 'name',
 		);
 	}
 
-	function get_views() {
+	/**
+	 * Gets the name of the primary column.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @return string Unalterable name of the primary column name, in this case, 'name'.
+	 */
+	protected function get_primary_column_name() {
+		return 'name';
+	}
+
+	/**
+	 *
+	 * @global array $totals
+	 * @global string $status
+	 * @return array
+	 */
+	protected function get_views() {
 		global $totals, $status;
 
 		$status_links = array();
@@ -224,7 +306,7 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 			if ( 'search' != $type ) {
 				$status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
 					esc_url( add_query_arg('theme_status', $type, $url) ),
-					( $type == $status ) ? ' class="current"' : '',
+					( $type === $status ) ? ' class="current"' : '',
 					sprintf( $text, number_format_i18n( $count ) )
 				);
 			}
@@ -233,7 +315,12 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 		return $status_links;
 	}
 
-	function get_bulk_actions() {
+	/**
+	 * @global string $status
+	 *
+	 * @return array
+	 */
+	protected function get_bulk_actions() {
 		global $status;
 
 		$actions = array();
@@ -250,13 +337,44 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 		return $actions;
 	}
 
-	function display_rows() {
+	/**
+	 * @access public
+	 */
+	public function display_rows() {
 		foreach ( $this->items as $theme )
 			$this->single_row( $theme );
 	}
 
-	function single_row( $theme ) {
-		global $status, $page, $s, $totals;
+	/**
+	 * Handles the checkbox column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param WP_Theme $theme The current WP_Theme object.
+	 */
+	public function column_cb( $theme ) {
+		$checkbox_id = 'checkbox_' . md5( $theme->get('Name') );
+		?>
+		<input type="checkbox" name="checked[]" value="<?php echo esc_attr( $theme->get_stylesheet() ) ?>" id="<?php echo $checkbox_id ?>" />
+		<label class="screen-reader-text" for="<?php echo $checkbox_id ?>" ><?php _e( 'Select' ) ?>  <?php echo $theme->display( 'Name' ) ?></label>
+		<?php
+	}
+
+	/**
+	 * Handles the name column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @global string $status
+	 * @global int    $page
+	 * @global string $s
+	 *
+	 * @param WP_Theme $theme The current WP_Theme object.
+	 */
+	public function column_name( $theme ) {
+		global $status, $page, $s;
 
 		$context = $status;
 
@@ -268,7 +386,7 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 			$allowed = $theme->is_allowed( 'network' );
 		}
 
-		// preorder
+		// Pre-order.
 		$actions = array(
 			'enable' => '',
 			'disable' => '',
@@ -280,18 +398,84 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 		$theme_key = urlencode( $stylesheet );
 
 		if ( ! $allowed ) {
-			if ( ! $theme->errors() )
-				$actions['enable'] = '<a href="' . esc_url( wp_nonce_url($url . 'action=enable&theme=' . $theme_key . '&paged=' . $page . '&s=' . $s, 'enable-theme_' . $stylesheet ) ) . '" title="' . esc_attr__('Enable this theme') . '" class="edit">' . ( $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' ) ) . '</a>';
+			if ( ! $theme->errors() ) {
+				$url = add_query_arg( array(
+					'action' => 'enable',
+					'theme'  => $theme_key,
+					'paged'  => $page,
+					's'      => $s,
+				), $url );
+
+				if ( $this->is_site_themes ) {
+					/* translators: %s: theme name */
+					$aria_label = sprintf( __( 'Enable %s' ), $theme->display( 'Name' ) );
+				} else {
+					/* translators: %s: theme name */
+					$aria_label = sprintf( __( 'Network Enable %s' ), $theme->display( 'Name' ) );
+				}
+
+				$actions['enable'] = sprintf( '<a href="%s" class="edit" aria-label="%s">%s</a>',
+					esc_url( wp_nonce_url( $url, 'enable-theme_' . $stylesheet ) ),
+					esc_attr( $aria_label ),
+					( $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' ) )
+				);
+			}
 		} else {
-			$actions['disable'] = '<a href="' . esc_url( wp_nonce_url($url . 'action=disable&theme=' . $theme_key . '&paged=' . $page . '&s=' . $s, 'disable-theme_' . $stylesheet ) ) . '" title="' . esc_attr__('Disable this theme') . '">' . ( $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' ) ) . '</a>';
+			$url = add_query_arg( array(
+				'action' => 'disable',
+				'theme'  => $theme_key,
+				'paged'  => $page,
+				's'      => $s,
+			), $url );
+
+			if ( $this->is_site_themes ) {
+				/* translators: %s: theme name */
+				$aria_label = sprintf( __( 'Disable %s' ), $theme->display( 'Name' ) );
+			} else {
+				/* translators: %s: theme name */
+				$aria_label = sprintf( __( 'Network Disable %s' ), $theme->display( 'Name' ) );
+			}
+
+			$actions['disable'] = sprintf( '<a href="%s" aria-label="%s">%s</a>',
+				esc_url( wp_nonce_url( $url, 'disable-theme_' . $stylesheet ) ),
+				esc_attr( $aria_label ),
+				( $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' ) )
+			);
 		}
 
-		if ( current_user_can('edit_themes') )
-			$actions['edit'] = '<a href="' . esc_url('theme-editor.php?theme=' . $theme_key ) . '" title="' . esc_attr__('Open this theme in the Theme Editor') . '" class="edit">' . __('Edit') . '</a>';
+		if ( current_user_can('edit_themes') ) {
+			$url = add_query_arg( array(
+				'theme' => $theme_key,
+			), 'theme-editor.php' );
 
-		if ( ! $allowed && current_user_can( 'delete_themes' ) && ! $this->is_site_themes && $stylesheet != get_option( 'stylesheet' ) && $stylesheet != get_option( 'template' ) )
-			$actions['delete'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=delete-selected&checked[]=' . $theme_key . '&theme_status=' . $context . '&paged=' . $page . '&s=' . $s, 'bulk-themes' ) ) . '" title="' . esc_attr__( 'Delete this theme' ) . '" class="delete">' . __( 'Delete' ) . '</a>';
+			/* translators: %s: theme name */
+			$aria_label = sprintf( __( 'Open %s in the Theme Editor' ), $theme->display( 'Name' ) );
+
+			$actions['edit'] = sprintf( '<a href="%s" class="edit" aria-label="%s">%s</a>',
+				esc_url( $url ),
+				esc_attr( $aria_label ),
+				__( 'Edit' )
+			);
+		}
 
+		if ( ! $allowed && current_user_can( 'delete_themes' ) && ! $this->is_site_themes && $stylesheet != get_option( 'stylesheet' ) && $stylesheet != get_option( 'template' ) ) {
+			$url = add_query_arg( array(
+				'action'       => 'delete-selected',
+				'checked[]'    => $theme_key,
+				'theme_status' => $context,
+				'paged'        => $page,
+				's'            => $s,
+			), 'themes.php' );
+
+			/* translators: %s: theme name */
+			$aria_label = sprintf( __( 'Delete %s' ), $theme->display( 'Name' ) );
+
+			$actions['delete'] = sprintf( '<a href="%s" class="delete" aria-label="%s">%s</a>',
+				esc_url( wp_nonce_url( $url, 'bulk-themes' ) ),
+				esc_attr( $aria_label ),
+				__( 'Delete' )
+			);
+		}
 		/**
 		 * Filter the action links displayed for each theme in the Multisite
 		 * themes list table.
@@ -320,7 +504,7 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 		 * Filter the action links of a specific theme in the Multisite themes
 		 * list table.
 		 *
-		 * The dynamic portion of the hook name, $stylesheet, refers to the
+		 * The dynamic portion of the hook name, `$stylesheet`, refers to the
 		 * directory name of the theme, which in most cases is synonymous
 		 * with the template name.
 		 *
@@ -332,87 +516,182 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 		 */
 		$actions = apply_filters( "theme_action_links_$stylesheet", $actions, $theme, $context );
 
-		$class = ! $allowed ? 'inactive' : 'active';
-		$checkbox_id = "checkbox_" . md5( $theme->get('Name') );
-		$checkbox = "<input type='checkbox' name='checked[]' value='" . esc_attr( $stylesheet ) . "' id='" . $checkbox_id . "' /><label class='screen-reader-text' for='" . $checkbox_id . "' >" . __('Select') . " " . $theme->display('Name') . "</label>";
+		echo $this->row_actions( $actions, true );
+	}
 
-		$id = sanitize_html_class( $theme->get_stylesheet() );
+	/**
+	 * Handles the description column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @global string $status
+	 * @global array  $totals
+	 *
+	 * @param WP_Theme $theme The current WP_Theme object.
+	 */
+	public function column_description( $theme ) {
+		global $status, $totals;
+		if ( $theme->errors() ) {
+			$pre = $status === 'broken' ? __( 'Broken Theme:' ) . ' ' : '';
+			echo '<p><strong class="error-message">' . $pre . $theme->errors()->get_error_message() . '</strong></p>';
+		}
 
+		if ( $this->is_site_themes ) {
+			$allowed = $theme->is_allowed( 'site', $this->site_id );
+		} else {
+			$allowed = $theme->is_allowed( 'network' );
+		}
+
+		$class = ! $allowed ? 'inactive' : 'active';
 		if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) )
 			$class .= ' update';
 
-		echo "<tr id='$id' class='$class'>";
+		echo "<div class='theme-description'><p>" . $theme->display( 'Description' ) . "</p></div>
+			<div class='$class second theme-version-author-uri'>";
 
-		list( $columns, $hidden ) = $this->get_column_info();
+		$stylesheet = $theme->get_stylesheet();
+		$theme_meta = array();
+
+		if ( $theme->get('Version') ) {
+			$theme_meta[] = sprintf( __( 'Version %s' ), $theme->display('Version') );
+		}
+		$theme_meta[] = sprintf( __( 'By %s' ), $theme->display('Author') );
+
+		if ( $theme->get('ThemeURI') ) {
+			/* translators: %s: theme name */
+			$aria_label = sprintf( __( 'Visit %s homepage' ), $theme->display( 'Name' ) );
+
+			$theme_meta[] = sprintf( '<a href="%s" aria-label="%s">%s</a>',
+				$theme->display( 'ThemeURI' ),
+				esc_attr( $aria_label ),
+				__( 'Visit Theme Site' )
+			);
+		}
+		/**
+		 * Filter the array of row meta for each theme in the Multisite themes
+		 * list table.
+		 *
+		 * @since 3.1.0
+		 *
+		 * @param array    $theme_meta An array of the theme's metadata,
+		 *                             including the version, author, and
+		 *                             theme URI.
+		 * @param string   $stylesheet Directory name of the theme.
+		 * @param WP_Theme $theme      WP_Theme object.
+		 * @param string   $status     Status of the theme.
+		 */
+		$theme_meta = apply_filters( 'theme_row_meta', $theme_meta, $stylesheet, $theme, $status );
+		echo implode( ' | ', $theme_meta );
+
+		echo '</div>';
+	}
+
+	/**
+	 * Handles default column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param WP_Theme $theme       The current WP_Theme object.
+	 * @param string   $column_name The current column name.
+	 */
+	public function column_default( $theme, $column_name ) {
+		$stylesheet = $theme->get_stylesheet();
+
+		/**
+		 * Fires inside each custom column of the Multisite themes list table.
+		 *
+		 * @since 3.1.0
+		 *
+		 * @param string   $column_name Name of the column.
+		 * @param string   $stylesheet  Directory name of the theme.
+		 * @param WP_Theme $theme       Current WP_Theme object.
+		 */
+		do_action( 'manage_themes_custom_column', $column_name, $stylesheet, $theme );
+	}
+
+	/**
+	 * Handles the output for a single table row.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param WP_Theme $item The current WP_Theme object.
+	 */
+	public function single_row_columns( $item ) {
+		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
 
 		foreach ( $columns as $column_name => $column_display_name ) {
-			$style = '';
-			if ( in_array( $column_name, $hidden ) )
-				$style = ' style="display:none;"';
+			$extra_classes = '';
+			if ( in_array( $column_name, $hidden ) ) {
+				$extra_classes .= ' hidden';
+			}
 
 			switch ( $column_name ) {
 				case 'cb':
-					echo "<th scope='row' class='check-column'>$checkbox</th>";
+					echo '<th scope="row" class="check-column">';
+
+					$this->column_cb( $item );
+
+					echo '</th>';
 					break;
+
 				case 'name':
-					echo "<td class='theme-title'$style><strong>" . $theme->display('Name') . "</strong>";
-					echo $this->row_actions( $actions, true );
+					echo "<td class='theme-title column-primary{$extra_classes}'><strong>" . $item->display('Name') . "</strong>";
+
+					$this->column_name( $item );
+
 					echo "</td>";
 					break;
+
 				case 'description':
-					echo "<td class='column-description desc'$style>";
-					if ( $theme->errors() ) {
-						$pre = $status == 'broken' ? __( 'Broken Theme:' ) . ' ' : '';
-						echo '<p><strong class="attention">' . $pre . $theme->errors()->get_error_message() . '</strong></p>';
-					}
-					echo "<div class='theme-description'><p>" . $theme->display( 'Description' ) . "</p></div>
-						<div class='$class second theme-version-author-uri'>";
-
-					$theme_meta = array();
-
-					if ( $theme->get('Version') )
-						$theme_meta[] = sprintf( __( 'Version %s' ), $theme->display('Version') );
-
-					$theme_meta[] = sprintf( __( 'By %s' ), $theme->display('Author') );
-
-					if ( $theme->get('ThemeURI') )
-						$theme_meta[] = '<a href="' . $theme->display('ThemeURI') . '" title="' . esc_attr__( 'Visit theme homepage' ) . '">' . __( 'Visit Theme Site' ) . '</a>';
-
-					/**
-					 * Filter the array of row meta for each theme in the Multisite themes
-					 * list table.
-					 *
-					 * @since 3.1.0
-					 *
-					 * @param array    $theme_meta An array of the theme's metadata,
-					 *                             including the version, author, and
-					 *                             theme URI.
-					 * @param string   $stylesheet Directory name of the theme.
-					 * @param WP_Theme $theme      WP_Theme object.
-					 * @param string   $status     Status of the theme.
-					 */
-					$theme_meta = apply_filters( 'theme_row_meta', $theme_meta, $stylesheet, $theme, $status );
-					echo implode( ' | ', $theme_meta );
-
-					echo "</div></td>";
+					echo "<td class='column-description desc{$extra_classes}'>";
+
+					$this->column_description( $item );
+
+					echo '</td>';
 					break;
 
 				default:
-					echo "<td class='$column_name column-$column_name'$style>";
-
-					/**
-					 * Fires inside each custom column of the Multisite themes list table.
-					 *
-					 * @since 3.1.0
-					 *
-					 * @param string   $column_name Name of the column.
-					 * @param string   $stylesheet  Directory name of the theme.
-					 * @param WP_Theme $theme       Current WP_Theme object.
-					 */
-					do_action( 'manage_themes_custom_column', $column_name, $stylesheet, $theme );
+					echo "<td class='$column_name column-$column_name{$extra_classes}'>";
+
+					$this->column_default( $item, $column_name );
+
 					echo "</td>";
+					break;
 			}
 		}
+	}
+
+	/**
+	 * @global string $status
+	 * @global array  $totals
+	 *
+	 * @param WP_Theme $theme
+	 */
+	public function single_row( $theme ) {
+		global $status, $totals;
+
+		if ( $this->is_site_themes ) {
+			$allowed = $theme->is_allowed( 'site', $this->site_id );
+		} else {
+			$allowed = $theme->is_allowed( 'network' );
+		}
+
+		$stylesheet = $theme->get_stylesheet();
+
+		$class = ! $allowed ? 'inactive' : 'active';
+		if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) ) {
+			$class .= ' update';
+		}
+
+		printf( '<tr class="%s" data-slug="%s">',
+			esc_attr( $class ),
+			esc_attr( $stylesheet )
+		);
+
+		$this->single_row_columns( $theme );
 
 		echo "</tr>";
 
@@ -433,7 +712,7 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 		/**
 		 * Fires after each specific row in the Multisite themes list table.
 		 *
-		 * The dynamic portion of the hook name, $stylesheet, refers to the
+		 * The dynamic portion of the hook name, `$stylesheet`, refers to the
 		 * directory name of the theme, most often synonymous with the template
 		 * name of the theme.
 		 *
diff --git a/wp-admin/includes/class-wp-ms-users-list-table.php b/wp-admin/includes/class-wp-ms-users-list-table.php
index df06406..380e4a0 100644
--- a/wp-admin/includes/class-wp-ms-users-list-table.php
+++ b/wp-admin/includes/class-wp-ms-users-list-table.php
@@ -1,19 +1,37 @@
 <?php
 /**
- * Multisite Users List Table class.
+ * List Table API: WP_MS_Users_List_Table class
  *
  * @package WordPress
- * @subpackage List_Table
+ * @subpackage Administration
+ * @since 3.1.0
+ */
+
+/**
+ * Core class used to implement displaying users in a list table for the network admin.
+ *
  * @since 3.1.0
  * @access private
+ *
+ * @see WP_List_Table
  */
 class WP_MS_Users_List_Table extends WP_List_Table {
-
-	function ajax_user_can() {
+	/**
+	 *
+	 * @return bool
+	 */
+	public function ajax_user_can() {
 		return current_user_can( 'manage_network_users' );
 	}
 
-	function prepare_items() {
+	/**
+	 *
+	 * @global string $usersearch
+	 * @global string $role
+	 * @global wpdb   $wpdb
+	 * @global string $mode
+	 */
+	public function prepare_items() {
 		global $usersearch, $role, $wpdb, $mode;
 
 		$usersearch = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST['s'] ) ) : '';
@@ -32,16 +50,23 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 			'fields' => 'all_with_meta'
 		);
 
-		if ( wp_is_large_network( 'users' ) )
+		if ( wp_is_large_network( 'users' ) ) {
 			$args['search'] = ltrim( $args['search'], '*' );
+		} else if ( '' !== $args['search'] ) {
+			$args['search'] = trim( $args['search'], '*' );
+			$args['search'] = '*' . $args['search'] . '*';
+		}
 
-		if ( $role == 'super' ) {
+		if ( $role === 'super' ) {
 			$logins = implode( "', '", get_super_admins() );
 			$args['include'] = $wpdb->get_col( "SELECT ID FROM $wpdb->users WHERE user_login IN ('$logins')" );
 		}
 
-		// If the network is large and a search is not being performed, show only the latest users with no paging in order
-		// to avoid expensive count queries.
+		/*
+		 * If the network is large and a search is not being performed,
+		 * show only the latest users with no paging in order to avoid
+		 * expensive count queries.
+		 */
 		if ( !$usersearch && wp_is_large_network( 'users' ) ) {
 			if ( !isset($_REQUEST['orderby']) )
 				$_GET['orderby'] = $_REQUEST['orderby'] = 'id';
@@ -56,7 +81,15 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 		if ( isset( $_REQUEST['order'] ) )
 			$args['order'] = $_REQUEST['order'];
 
-		$mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
+		if ( ! empty( $_REQUEST['mode'] ) ) {
+			$mode = $_REQUEST['mode'] === 'excerpt' ? 'excerpt' : 'list';
+			set_user_setting( 'network_users_list_mode', $mode );
+		} else {
+			$mode = get_user_setting( 'network_users_list_mode', 'list' );
+		}
+
+		/** This filter is documented in wp-admin/includes/class-wp-users-list-table.php */
+		$args = apply_filters( 'users_list_table_query_args', $args );
 
 		// Query the user IDs for this page
 		$wp_user_search = new WP_User_Query( $args );
@@ -69,7 +102,11 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 		) );
 	}
 
-	function get_bulk_actions() {
+	/**
+	 *
+	 * @return array
+	 */
+	protected function get_bulk_actions() {
 		$actions = array();
 		if ( current_user_can( 'delete_users' ) )
 			$actions['delete'] = __( 'Delete' );
@@ -79,42 +116,58 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 		return $actions;
 	}
 
-	function no_items() {
+	/**
+	 * @access public
+	 */
+	public function no_items() {
 		_e( 'No users found.' );
 	}
 
-	function get_views() {
-		global $wp_roles, $role;
+	/**
+	 *
+	 * @global string $role
+	 * @return array
+	 */
+	protected function get_views() {
+		global $role;
 
 		$total_users = get_user_count();
 		$super_admins = get_super_admins();
 		$total_admins = count( $super_admins );
 
-		$current_role = false;
 		$class = $role != 'super' ? ' class="current"' : '';
 		$role_links = array();
 		$role_links['all'] = "<a href='" . network_admin_url('users.php') . "'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
-		$class = $role == 'super' ? ' class="current"' : '';
+		$class = $role === 'super' ? ' class="current"' : '';
 		$role_links['super'] = "<a href='" . network_admin_url('users.php?role=super') . "'$class>" . sprintf( _n( 'Super Admin <span class="count">(%s)</span>', 'Super Admins <span class="count">(%s)</span>', $total_admins ), number_format_i18n( $total_admins ) ) . '</a>';
 
 		return $role_links;
 	}
 
-	function pagination( $which ) {
+	/**
+	 * @global string $mode
+	 * @param string $which
+	 */
+	protected function pagination( $which ) {
 		global $mode;
 
 		parent::pagination ( $which );
 
-		if ( 'top' == $which )
+		if ( 'top' === $which ) {
 			$this->view_switcher( $mode );
+		}
 	}
 
-	function get_columns() {
+	/**
+	 *
+	 * @return array
+	 */
+	public function get_columns() {
 		$users_columns = array(
 			'cb'         => '<input type="checkbox" />',
 			'username'   => __( 'Username' ),
 			'name'       => __( 'Name' ),
-			'email'      => __( 'E-mail' ),
+			'email'      => __( 'Email' ),
 			'registered' => _x( 'Registered', 'user' ),
 			'blogs'      => __( 'Sites' )
 		);
@@ -126,12 +179,14 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 		 * @param array $users_columns An array of user columns. Default 'cb', 'username',
 		 *                             'name', 'email', 'registered', 'blogs'.
 		 */
-		$users_columns = apply_filters( 'wpmu_users_columns', $users_columns );
-
-		return $users_columns;
+		return apply_filters( 'wpmu_users_columns', $users_columns );
 	}
 
-	function get_sortable_columns() {
+	/**
+	 *
+	 * @return array
+	 */
+	protected function get_sortable_columns() {
 		return array(
 			'username'   => 'login',
 			'name'       => 'name',
@@ -140,162 +195,266 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 		);
 	}
 
-	function display_rows() {
-		global $mode;
+	/**
+	 * Handles the checkbox column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param WP_User $user The current WP_User object.
+	 */
+	public function column_cb( $user ) {
+		if ( is_super_admin( $user->ID ) ) {
+			return;
+		}
+		?>
+		<label class="screen-reader-text" for="blog_<?php echo $user->ID; ?>"><?php echo sprintf( __( 'Select %s' ), $user->user_login ); ?></label>
+		<input type="checkbox" id="blog_<?php echo $user->ID ?>" name="allusers[]" value="<?php echo esc_attr( $user->ID ) ?>" />
+		<?php
+	}
+
+	/**
+	 * Handles the ID column output.
+	 *
+	 * @since 4.4.0
+	 * @access public
+	 *
+	 * @param WP_User $user The current WP_User object.
+	 */
+	public function column_id( $user ) {
+		echo $user->ID;
+	}
 
-		$alt = '';
+	/**
+	 * Handles the username column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param WP_User $user The current WP_User object.
+	 */
+	public function column_username( $user ) {
 		$super_admins = get_super_admins();
+		$avatar	= get_avatar( $user->user_email, 32 );
+		$edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user->ID ) ) );
+
+		echo $avatar;
+
+		?><strong><a href="<?php echo $edit_link; ?>" class="edit"><?php echo $user->user_login; ?></a><?php
+		if ( in_array( $user->user_login, $super_admins ) ) {
+			echo ' - ' . __( 'Super Admin' );
+		}
+		?></strong>
+	<?php
+	}
+
+	/**
+	 * Handles the name column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param WP_User $user The current WP_User object.
+	 */
+	public function column_name( $user ) {
+		echo "$user->first_name $user->last_name";
+	}
+
+	/**
+	 * Handles the email column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param WP_User $user The current WP_User object.
+	 */
+	public function column_email( $user ) {
+		echo "<a href='" . esc_url( "mailto:$user->user_email" ) . "'>$user->user_email</a>";
+	}
+
+	/**
+	 * Handles the registered date column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @global string $mode
+	 *
+	 * @param WP_User $user The current WP_User object.
+	 */
+	public function column_registered( $user ) {
+		global $mode;
+		if ( 'list' === $mode ) {
+			$date = __( 'Y/m/d' );
+		} else {
+			$date = __( 'Y/m/d g:i:s a' );
+		}
+		echo mysql2date( $date, $user->user_registered );
+	}
+
+	/**
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @param WP_User $user
+	 * @param string  $classes
+	 * @param string  $data
+	 * @param string  $primary
+	 */
+	protected function _column_blogs( $user, $classes, $data, $primary ) {
+		echo '<td class="', $classes, ' has-row-actions" ', $data, '>';
+		echo $this->column_blogs( $user );
+		echo $this->handle_row_actions( $user, 'blogs', $primary );
+		echo '</td>';
+	}
+
+	/**
+	 * Handles the sites column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param WP_User $user The current WP_User object.
+	 */
+	public function column_blogs( $user ) {
+		$blogs = get_blogs_of_user( $user->ID, true );
+		if ( ! is_array( $blogs ) ) {
+			return;
+		}
+
+		foreach ( $blogs as $val ) {
+			if ( ! can_edit_network( $val->site_id ) ) {
+				continue;
+			}
+
+			$path	= ( $val->path === '/' ) ? '' : $val->path;
+			echo '<span class="site-' . $val->site_id . '" >';
+			echo '<a href="'. esc_url( network_admin_url( 'site-info.php?id=' . $val->userblog_id ) ) .'">' . str_replace( '.' . get_current_site()->domain, '', $val->domain . $path ) . '</a>';
+			echo ' <small class="row-actions">';
+			$actions = array();
+			$actions['edit'] = '<a href="'. esc_url( network_admin_url( 'site-info.php?id=' . $val->userblog_id ) ) .'">' . __( 'Edit' ) . '</a>';
+
+			$class = '';
+			if ( $val->spam == 1 ) {
+				$class .= 'site-spammed ';
+			}
+			if ( $val->mature == 1 ) {
+				$class .= 'site-mature ';
+			}
+			if ( $val->deleted == 1 ) {
+				$class .= 'site-deleted ';
+			}
+			if ( $val->archived == 1 ) {
+				$class .= 'site-archived ';
+			}
+
+			$actions['view'] = '<a class="' . $class . '" href="' . esc_url( get_home_url( $val->userblog_id ) ) . '">' . __( 'View' ) . '</a>';
+
+			/**
+			 * Filter the action links displayed next the sites a user belongs to
+			 * in the Network Admin Users list table.
+			 *
+			 * @since 3.1.0
+			 *
+			 * @param array $actions     An array of action links to be displayed.
+			 *                           Default 'Edit', 'View'.
+			 * @param int   $userblog_id The site ID.
+			 */
+			$actions = apply_filters( 'ms_user_list_site_actions', $actions, $val->userblog_id );
+
+			$i=0;
+			$action_count = count( $actions );
+			foreach ( $actions as $action => $link ) {
+				++$i;
+				$sep = ( $i == $action_count ) ? '' : ' | ';
+				echo "<span class='$action'>$link$sep</span>";
+			}
+			echo '</small></span><br/>';
+		}
+	}
+
+	/**
+	 * Handles the default column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param WP_User $user       The current WP_User object.
+	 * @param string $column_name The current column name.
+	 */
+	public function column_default( $user, $column_name ) {
+		/** This filter is documented in wp-admin/includes/class-wp-users-list-table.php */
+		echo apply_filters( 'manage_users_custom_column', '', $column_name, $user->ID );
+	}
+
+	public function display_rows() {
 		foreach ( $this->items as $user ) {
-			$alt = ( 'alternate' == $alt ) ? '' : 'alternate';
+			$class = '';
 
 			$status_list = array( 'spam' => 'site-spammed', 'deleted' => 'site-deleted' );
 
 			foreach ( $status_list as $status => $col ) {
-				if ( $user->$status )
-					$alt .= " $col";
+				if ( $user->$status ) {
+					$class .= " $col";
+				}
 			}
 
 			?>
-			<tr class="<?php echo $alt; ?>">
-			<?php
-
-			list( $columns, $hidden ) = $this->get_column_info();
-
-			foreach ( $columns as $column_name => $column_display_name ) :
-				$class = "class='$column_name column-$column_name'";
-
-				$style = '';
-				if ( in_array( $column_name, $hidden ) )
-					$style = ' style="display:none;"';
-
-				$attributes = "$class$style";
-
-				switch ( $column_name ) {
-					case 'cb': ?>
-						<th scope="row" class="check-column">
-							<label class="screen-reader-text" for="blog_<?php echo $user->ID; ?>"><?php echo sprintf( __( 'Select %s' ), $user->user_login ); ?></label>
-							<input type="checkbox" id="blog_<?php echo $user->ID ?>" name="allusers[]" value="<?php echo esc_attr( $user->ID ) ?>" />
-						</th>
-					<?php
-					break;
-
-					case 'username':
-						$avatar	= get_avatar( $user->user_email, 32 );
-						$edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user->ID ) ) );
-
-						echo "<td $attributes>"; ?>
-							<?php echo $avatar; ?><strong><a href="<?php echo $edit_link; ?>" class="edit"><?php echo $user->user_login; ?></a><?php
-							if ( in_array( $user->user_login, $super_admins ) )
-								echo ' - ' . __( 'Super Admin' );
-							?></strong>
-							<br/>
-							<?php
-								$actions = array();
-								$actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
-
-								if ( current_user_can( 'delete_user', $user->ID ) && ! in_array( $user->user_login, $super_admins ) ) {
-									$actions['delete'] = '<a href="' . $delete = esc_url( network_admin_url( add_query_arg( '_wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'users.php', 'deleteuser' ) . '&action=deleteuser&id=' . $user->ID ) ) ) . '" class="delete">' . __( 'Delete' ) . '</a>';
-								}
-
-								/**
-								 * Filter the action links displayed under each user
-								 * in the Network Admin Users list table.
-								 *
-								 * @since 3.2.0
-								 *
-								 * @param array   $actions An array of action links to be displayed.
-								 *                         Default 'Edit', 'Delete'.
-								 * @param WP_User $user    WP_User object.
-								 */
-								$actions = apply_filters( 'ms_user_row_actions', $actions, $user );
-								echo $this->row_actions( $actions );
-							?>
-						</td>
-					<?php
-					break;
-
-					case 'name':
-						echo "<td $attributes>$user->first_name $user->last_name</td>";
-					break;
-
-					case 'email':
-						echo "<td $attributes><a href='mailto:$user->user_email'>$user->user_email</a></td>";
-					break;
-
-					case 'registered':
-						if ( 'list' == $mode )
-							$date = 'Y/m/d';
-						else
-							$date = 'Y/m/d \<\b\r \/\> g:i:s a';
-
-						echo "<td $attributes>" . mysql2date( $date, $user->user_registered ) . "</td>";
-					break;
-
-					case 'blogs':
-						$blogs = get_blogs_of_user( $user->ID, true );
-						echo "<td $attributes>";
-							if ( is_array( $blogs ) ) {
-								foreach ( (array) $blogs as $key => $val ) {
-									if ( !can_edit_network( $val->site_id ) )
-										continue;
-
-									$path	= ( $val->path == '/' ) ? '' : $val->path;
-									echo '<span class="site-' . $val->site_id . '" >';
-									echo '<a href="'. esc_url( network_admin_url( 'site-info.php?id=' . $val->userblog_id ) ) .'">' . str_replace( '.' . get_current_site()->domain, '', $val->domain . $path ) . '</a>';
-									echo ' <small class="row-actions">';
-									$actions = array();
-									$actions['edit'] = '<a href="'. esc_url( network_admin_url( 'site-info.php?id=' . $val->userblog_id ) ) .'">' . __( 'Edit' ) . '</a>';
-
-									$class = '';
-									if ( get_blog_status( $val->userblog_id, 'spam' ) == 1 )
-										$class .= 'site-spammed ';
-									if ( get_blog_status( $val->userblog_id, 'mature' ) == 1 )
-										$class .= 'site-mature ';
-									if ( get_blog_status( $val->userblog_id, 'deleted' ) == 1 )
-										$class .= 'site-deleted ';
-									if ( get_blog_status( $val->userblog_id, 'archived' ) == 1 )
-										$class .= 'site-archived ';
-
-									$actions['view'] = '<a class="' . $class . '" href="' . esc_url( get_home_url( $val->userblog_id ) ) . '">' . __( 'View' ) . '</a>';
-
-									/**
-									 * Filter the action links displayed next the sites a user belongs to
-									 * in the Network Admin Users list table.
-									 *
-									 * @since 3.1.0
-									 *
-									 * @param array $actions     An array of action links to be displayed.
-									 *                           Default 'Edit', 'View'.
-									 * @param int   $userblog_id The site ID.
-									 */
-									$actions = apply_filters( 'ms_user_list_site_actions', $actions, $val->userblog_id );
-
-									$i=0;
-									$action_count = count( $actions );
-									foreach ( $actions as $action => $link ) {
-										++$i;
-										( $i == $action_count ) ? $sep = '' : $sep = ' | ';
-										echo "<span class='$action'>$link$sep</span>";
-									}
-									echo '</small></span><br/>';
-								}
-							}
-							?>
-						</td>
-					<?php
-					break;
-
-					default:
-						echo "<td $attributes>";
-						/** This filter is documented in wp-admin/includes/class-wp-users-list-table.php */
-						echo apply_filters( 'manage_users_custom_column', '', $column_name, $user->ID );
-						echo "</td>";
-					break;
-				}
-			endforeach
-			?>
+			<tr class="<?php echo trim( $class ); ?>">
+				<?php $this->single_row_columns( $user ); ?>
 			</tr>
 			<?php
 		}
 	}
+
+	/**
+	 * Gets the name of the default primary column.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @return string Name of the default primary column, in this case, 'username'.
+	 */
+	protected function get_default_primary_column_name() {
+		return 'username';
+	}
+
+	/**
+	 * Generates and displays row action links.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @param object $user        User being acted upon.
+	 * @param string $column_name Current column name.
+	 * @param string $primary     Primary column name.
+	 * @return string Row actions output for users in Multisite.
+	 */
+	protected function handle_row_actions( $user, $column_name, $primary ) {
+		if ( $primary !== $column_name ) {
+			return '';
+		}
+
+		$super_admins = get_super_admins();
+		$edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user->ID ) ) );
+
+		$actions = array();
+		$actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
+
+		if ( current_user_can( 'delete_user', $user->ID ) && ! in_array( $user->user_login, $super_admins ) ) {
+			$actions['delete'] = '<a href="' . $delete = esc_url( network_admin_url( add_query_arg( '_wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'users.php', 'deleteuser' ) . '&action=deleteuser&id=' . $user->ID ) ) ) . '" class="delete">' . __( 'Delete' ) . '</a>';
+		}
+
+		/**
+		 * Filter the action links displayed under each user in the Network Admin Users list table.
+		 *
+		 * @since 3.2.0
+		 *
+		 * @param array   $actions An array of action links to be displayed.
+		 *                         Default 'Edit', 'Delete'.
+		 * @param WP_User $user    WP_User object.
+		 */
+		$actions = apply_filters( 'ms_user_row_actions', $actions, $user );
+		return $this->row_actions( $actions );
+	}
 }
diff --git a/wp-admin/includes/class-wp-plugin-install-list-table.php b/wp-admin/includes/class-wp-plugin-install-list-table.php
index 868c08c..26c8a0a 100644
--- a/wp-admin/includes/class-wp-plugin-install-list-table.php
+++ b/wp-admin/includes/class-wp-plugin-install-list-table.php
@@ -1,19 +1,77 @@
 <?php
 /**
- * Plugin Installer List Table class.
+ * List Table API: WP_Plugin_Install_List_Table class
  *
  * @package WordPress
- * @subpackage List_Table
+ * @subpackage Administration
+ * @since 3.1.0
+ */
+
+/**
+ * Core class used to implement displaying plugins to install in a list table.
+ *
  * @since 3.1.0
  * @access private
+ *
+ * @see WP_List_Table
  */
 class WP_Plugin_Install_List_Table extends WP_List_Table {
 
-	function ajax_user_can() {
+	public $order = 'ASC';
+	public $orderby = null;
+	public $groups = array();
+
+	private $error;
+
+	/**
+	 *
+	 * @return bool
+	 */
+	public function ajax_user_can() {
 		return current_user_can('install_plugins');
 	}
 
-	function prepare_items() {
+	/**
+	 * Return a list of slugs of installed plugins, if known.
+	 *
+	 * Uses the transient data from the updates API to determine the slugs of
+	 * known installed plugins. This might be better elsewhere, perhaps even
+	 * within get_plugins().
+	 *
+	 * @since 4.0.0
+	 * @access protected
+	 *
+	 * @return array
+	 */
+	protected function get_installed_plugin_slugs() {
+		$slugs = array();
+
+		$plugin_info = get_site_transient( 'update_plugins' );
+		if ( isset( $plugin_info->no_update ) ) {
+			foreach ( $plugin_info->no_update as $plugin ) {
+				$slugs[] = $plugin->slug;
+			}
+		}
+
+		if ( isset( $plugin_info->response ) ) {
+			foreach ( $plugin_info->response as $plugin ) {
+				$slugs[] = $plugin->slug;
+			}
+		}
+
+		return $slugs;
+	}
+
+	/**
+	 *
+	 * @global array  $tabs
+	 * @global string $tab
+	 * @global int    $paged
+	 * @global string $type
+	 * @global string $term
+	 * @global string $wp_version
+	 */
+	public function prepare_items() {
 		include( ABSPATH . 'wp-admin/includes/plugin-install.php' );
 
 		global $tabs, $tab, $paged, $type, $term;
@@ -26,24 +84,32 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 
 		// These are the tabs which are shown on the page
 		$tabs = array();
-		$tabs['dashboard'] = __( 'Search' );
-		if ( 'search' == $tab )
-			$tabs['search']	= __( 'Search Results' );
-		$tabs['upload']    = __( 'Upload' );
-		$tabs['featured']  = _x( 'Featured', 'Plugin Installer' );
-		$tabs['popular']   = _x( 'Popular', 'Plugin Installer' );
-		$tabs['new']       = _x( 'Newest', 'Plugin Installer' );
-		$tabs['favorites'] = _x( 'Favorites', 'Plugin Installer' );
 
-		$nonmenu_tabs = array( 'plugin-information' ); //Valid actions to perform which do not have a Menu item.
+		if ( 'search' === $tab ) {
+			$tabs['search'] = __( 'Search Results' );
+		}
+		if ( $tab === 'beta' || false !== strpos( $GLOBALS['wp_version'], '-' ) ) {
+			$tabs['beta'] = _x( 'Beta Testing', 'Plugin Installer' );
+		}
+		$tabs['featured']    = _x( 'Featured', 'Plugin Installer' );
+		$tabs['popular']     = _x( 'Popular', 'Plugin Installer' );
+		$tabs['recommended'] = _x( 'Recommended', 'Plugin Installer' );
+		$tabs['favorites']   = _x( 'Favorites', 'Plugin Installer' );
+		if ( current_user_can( 'upload_plugins' ) ) {
+			// No longer a real tab. Here for filter compatibility.
+			// Gets skipped in get_views().
+			$tabs['upload'] = __( 'Upload Plugin' );
+		}
+
+		$nonmenu_tabs = array( 'plugin-information' ); // Valid actions to perform which do not have a Menu item.
 
 		/**
 		 * Filter the tabs shown on the Plugin Install screen.
 		 *
 		 * @since 2.7.0
 		 *
-		 * @param array $tabs The tabs shown on the Plugin Install screen. Defaults are 'dashboard', 'search',
-		 *                    'upload', 'featured', 'popular', 'new', and 'favorites'.
+		 * @param array $tabs The tabs shown on the Plugin Install screen. Defaults include 'featured', 'popular',
+		 *                    'recommended', 'favorites', and 'upload'.
 		 */
 		$tabs = apply_filters( 'install_plugins_tabs', $tabs );
 
@@ -60,7 +126,18 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 		if ( empty( $tab ) || ( !isset( $tabs[ $tab ] ) && !in_array( $tab, (array) $nonmenu_tabs ) ) )
 			$tab = key( $tabs );
 
-		$args = array( 'page' => $paged, 'per_page' => $per_page );
+		$args = array(
+			'page' => $paged,
+			'per_page' => $per_page,
+			'fields' => array(
+				'last_updated' => true,
+				'icons' => true,
+				'active_installs' => true
+			),
+			// Send the locale and installed plugin slugs to the API so it can provide context-sensitive results.
+			'locale' => get_locale(),
+			'installed_plugins' => $this->get_installed_plugin_slugs(),
+		);
 
 		switch ( $tab ) {
 			case 'search':
@@ -79,18 +156,27 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 						break;
 				}
 
-				add_action( 'install_plugins_table_header', 'install_search_form', 10, 0 );
 				break;
 
 			case 'featured':
+				$args['fields']['group'] = true;
+				$this->orderby = 'group';
+				// No break!
 			case 'popular':
 			case 'new':
+			case 'beta':
+			case 'recommended':
 				$args['browse'] = $tab;
 				break;
 
 			case 'favorites':
-				$user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
-				update_user_meta( get_current_user_id(), 'wporg_favorites', $user );
+				$action = 'save_wporg_username_' . get_current_user_id();
+				if ( isset( $_GET['_wpnonce'] ) && wp_verify_nonce( wp_unslash( $_GET['_wpnonce'] ), $action ) ) {
+					$user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
+					update_user_meta( get_current_user_id(), 'wporg_favorites', $user );
+				} else {
+					$user = get_user_option( 'wporg_favorites' );
+				}
 				if ( $user )
 					$args['user'] = $user;
 				else
@@ -107,9 +193,8 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 		/**
 		 * Filter API request arguments for each Plugin Install screen tab.
 		 *
-		 * The dynamic portion of the hook name, $tab, refers to the plugin install tabs.
-		 * Default tabs are 'dashboard', 'search', 'upload', 'featured', 'popular', 'new',
-		 * and 'favorites'.
+		 * The dynamic portion of the hook name, `$tab`, refers to the plugin install tabs.
+		 * Default tabs include 'featured', 'popular', 'recommended', 'favorites', and 'upload'.
 		 *
 		 * @since 3.7.0
 		 *
@@ -122,36 +207,129 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 
 		$api = plugins_api( 'query_plugins', $args );
 
-		if ( is_wp_error( $api ) )
-			wp_die( $api->get_error_message() . '</p> <p class="hide-if-no-js"><a href="#" onclick="document.location.reload(); return false;">' . __( 'Try again' ) . '</a>' );
+		if ( is_wp_error( $api ) ) {
+			$this->error = $api;
+			return;
+		}
 
 		$this->items = $api->plugins;
 
+		if ( $this->orderby ) {
+			uasort( $this->items, array( $this, 'order_callback' ) );
+		}
+
 		$this->set_pagination_args( array(
 			'total_items' => $api->info['results'],
 			'per_page' => $args['per_page'],
 		) );
+
+		if ( isset( $api->info['groups'] ) ) {
+			$this->groups = $api->info['groups'];
+		}
 	}
 
-	function no_items() {
-		_e( 'No plugins match your request.' );
+	/**
+	 * @access public
+	 */
+	public function no_items() {
+		if ( isset( $this->error ) ) {
+			$message = $this->error->get_error_message() . '<p class="hide-if-no-js"><a href="#" class="button" onclick="document.location.reload(); return false;">' . __( 'Try again' ) . '</a></p>';
+		} else {
+			$message = __( 'No plugins match your request.' );
+		}
+		echo '<div class="no-plugin-results">' . $message . '</div>';
 	}
 
-	function get_views() {
+	/**
+	 *
+	 * @global array $tabs
+	 * @global string $tab
+	 *
+	 * @return array
+	 */
+	protected function get_views() {
 		global $tabs, $tab;
 
 		$display_tabs = array();
 		foreach ( (array) $tabs as $action => $text ) {
-			$class = ( $action == $tab ) ? ' class="current"' : '';
+			$class = ( $action === $tab ) ? ' current' : '';
 			$href = self_admin_url('plugin-install.php?tab=' . $action);
-			$display_tabs['plugin-install-'.$action] = "<a href='$href'$class>$text</a>";
+			$display_tabs['plugin-install-'.$action] = "<a href='$href' class='$class'>$text</a>";
 		}
+		// No longer a real tab.
+		unset( $display_tabs['plugin-install-upload'] );
 
 		return $display_tabs;
 	}
 
-	function display_tablenav( $which ) {
-		if ( 'top' ==  $which ) { ?>
+	/**
+	 * Override parent views so we can use the filter bar display.
+	 */
+	public function views() {
+		$views = $this->get_views();
+
+		/** This filter is documented in wp-admin/inclues/class-wp-list-table.php */
+		$views = apply_filters( "views_{$this->screen->id}", $views );
+
+		$this->screen->render_screen_reader_content( 'heading_views' );
+?>
+<div class="wp-filter">
+	<ul class="filter-links">
+		<?php
+		if ( ! empty( $views ) ) {
+			foreach ( $views as $class => $view ) {
+				$views[ $class ] = "\t<li class='$class'>$view";
+			}
+			echo implode( " </li>\n", $views ) . "</li>\n";
+		}
+		?>
+	</ul>
+
+	<?php install_search_form( isset( $views['plugin-install-search'] ) ); ?>
+</div>
+<?php
+	}
+
+	/**
+	 * Override the parent display() so we can provide a different container.
+	 */
+	public function display() {
+		$singular = $this->_args['singular'];
+
+		$data_attr = '';
+
+		if ( $singular ) {
+			$data_attr = " data-wp-lists='list:$singular'";
+		}
+
+		$this->display_tablenav( 'top' );
+
+?>
+<div class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
+<?php
+	$this->screen->render_screen_reader_content( 'heading_list' );
+?>
+	<div id="the-list"<?php echo $data_attr; ?>>
+		<?php $this->display_rows_or_placeholder(); ?>
+	</div>
+</div>
+<?php
+		$this->display_tablenav( 'bottom' );
+	}
+
+	/**
+	 * @global string $tab
+	 *
+	 * @param string $which
+	 */
+	protected function display_tablenav( $which ) {
+		if ( $GLOBALS['tab'] === 'featured' ) {
+			return;
+		}
+
+		if ( 'top' === $which ) {
+			wp_referer_field();
+		?>
 			<div class="tablenav top">
 				<div class="alignleft actions">
 					<?php
@@ -174,22 +352,49 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 		}
 	}
 
-	function get_table_classes() {
-		extract( $this->_args );
+	/**
+	 * @return array
+	 */
+	protected function get_table_classes() {
+		return array( 'widefat', $this->_args['plural'] );
+	}
 
-		return array( 'widefat', $plural );
+	/**
+	 * @return array
+	 */
+	public function get_columns() {
+		return array();
 	}
 
-	function get_columns() {
-		return array(
-			'name'        => _x( 'Name', 'plugin name' ),
-			'version'     => __( 'Version' ),
-			'rating'      => __( 'Rating' ),
-			'description' => __( 'Description' ),
-		);
+	/**
+	 * @param object $plugin_a
+	 * @param object $plugin_b
+	 * @return int
+	 */
+	private function order_callback( $plugin_a, $plugin_b ) {
+		$orderby = $this->orderby;
+		if ( ! isset( $plugin_a->$orderby, $plugin_b->$orderby ) ) {
+			return 0;
+		}
+
+		$a = $plugin_a->$orderby;
+		$b = $plugin_b->$orderby;
+
+		if ( $a == $b ) {
+			return 0;
+		}
+
+		if ( 'DESC' === $this->order ) {
+			return ( $a < $b ) ? 1 : -1;
+		} else {
+			return ( $a < $b ) ? -1 : 1;
+		}
 	}
 
-	function display_rows() {
+	/**
+	 * @global string $wp_version
+	 */
+	public function display_rows() {
 		$plugins_allowedtags = array(
 			'a' => array( 'href' => array(),'title' => array(), 'target' => array() ),
 			'abbr' => array( 'title' => array() ),'acronym' => array( 'title' => array() ),
@@ -197,63 +402,97 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 			'ul' => array(), 'ol' => array(), 'li' => array(), 'p' => array(), 'br' => array()
 		);
 
-		list( $columns, $hidden ) = $this->get_column_info();
+		$plugins_group_titles = array(
+			'Performance' => _x( 'Performance', 'Plugin installer group title' ),
+			'Social'      => _x( 'Social',      'Plugin installer group title' ),
+			'Tools'       => _x( 'Tools',       'Plugin installer group title' ),
+		);
 
-		$style = array();
-		foreach ( $columns as $column_name => $column_display_name ) {
-			$style[ $column_name ] = in_array( $column_name, $hidden ) ? 'style="display:none;"' : '';
-		}
+		$group = null;
 
 		foreach ( (array) $this->items as $plugin ) {
-			if ( is_object( $plugin ) )
+			if ( is_object( $plugin ) ) {
 				$plugin = (array) $plugin;
+			}
+
+			// Display the group heading if there is one
+			if ( isset( $plugin['group'] ) && $plugin['group'] != $group ) {
+				if ( isset( $this->groups[ $plugin['group'] ] ) ) {
+					$group_name = $this->groups[ $plugin['group'] ];
+					if ( isset( $plugins_group_titles[ $group_name ] ) ) {
+						$group_name = $plugins_group_titles[ $group_name ];
+					}
+				} else {
+					$group_name = $plugin['group'];
+				}
 
+				// Starting a new group, close off the divs of the last one
+				if ( ! empty( $group ) ) {
+					echo '</div></div>';
+				}
+
+				echo '<div class="plugin-group"><h3>' . esc_html( $group_name ) . '</h3>';
+				// needs an extra wrapping div for nth-child selectors to work
+				echo '<div class="plugin-items">';
+
+				$group = $plugin['group'];
+			}
 			$title = wp_kses( $plugin['name'], $plugins_allowedtags );
-			//Limit description to 400char, and remove any HTML.
-			$description = strip_tags( $plugin['description'] );
-			if ( strlen( $description ) > 400 )
-				$description = mb_substr( $description, 0, 400 ) . '…';
-			//remove any trailing entities
-			$description = preg_replace( '/&[^;\s]{0,6}$/', '', $description );
-			//strip leading/trailing & multiple consecutive lines
-			$description = trim( $description );
-			$description = preg_replace( "|(\r?\n)+|", "\n", $description );
-			//\n => <br>
-			$description = nl2br( $description );
+
+			// Remove any HTML from the description.
+			$description = strip_tags( $plugin['short_description'] );
 			$version = wp_kses( $plugin['version'], $plugins_allowedtags );
 
 			$name = strip_tags( $title . ' ' . $version );
 
-			$author = $plugin['author'];
-			if ( ! empty( $plugin['author'] ) )
-				$author = ' <cite>' . sprintf( __( 'By %s' ), $author ) . '.</cite>';
-
-			$author = wp_kses( $author, $plugins_allowedtags );
+			$author = wp_kses( $plugin['author'], $plugins_allowedtags );
+			if ( ! empty( $author ) ) {
+				$author = ' <cite>' . sprintf( __( 'By %s' ), $author ) . '</cite>';
+			}
 
 			$action_links = array();
-			$action_links[] = '<a href="' . self_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin['slug'] .
-								'&TB_iframe=true&width=600&height=550' ) . '" class="thickbox" title="' .
-								esc_attr( sprintf( __( 'More information about %s' ), $name ) ) . '">' . __( 'Details' ) . '</a>';
 
 			if ( current_user_can( 'install_plugins' ) || current_user_can( 'update_plugins' ) ) {
 				$status = install_plugin_install_status( $plugin );
 
 				switch ( $status['status'] ) {
 					case 'install':
-						if ( $status['url'] )
-							$action_links[] = '<a class="install-now" href="' . $status['url'] . '" title="' . esc_attr( sprintf( __( 'Install %s' ), $name ) ) . '">' . __( 'Install Now' ) . '</a>';
+						if ( $status['url'] ) {
+							/* translators: 1: Plugin name and version. */
+							$action_links[] = '<a class="install-now button" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Install %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Install Now' ) . '</a>';
+						}
+
 						break;
 					case 'update_available':
-						if ( $status['url'] )
-							$action_links[] = '<a href="' . $status['url'] . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $status['version'] ) ) . '">' . __( 'Update Now' ) . '</a>';
+						if ( $status['url'] ) {
+							/* translators: 1: Plugin name and version */
+							$action_links[] = '<a class="update-now button aria-button-if-js" data-plugin="' . esc_attr( $status['file'] ) . '" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Update %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Update Now' ) . '</a>';
+						}
+
 						break;
 					case 'latest_installed':
 					case 'newer_installed':
-						$action_links[] = '<span title="' . esc_attr__( 'This plugin is already installed and is up to date' ) . ' ">' . _x( 'Installed', 'plugin' ) . '</span>';
+						$action_links[] = '<span class="button button-disabled">' . _x( 'Installed', 'plugin' ) . '</span>';
 						break;
 				}
 			}
 
+			$details_link   = self_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin['slug'] .
+								'&TB_iframe=true&width=600&height=550' );
+
+			/* translators: 1: Plugin name and version. */
+			$action_links[] = '<a href="' . esc_url( $details_link ) . '" class="thickbox open-plugin-details-modal" aria-label="' . esc_attr( sprintf( __( 'More information about %s' ), $name ) ) . '" data-title="' . esc_attr( $name ) . '">' . __( 'More Details' ) . '</a>';
+
+			if ( !empty( $plugin['icons']['svg'] ) ) {
+				$plugin_icon_url = $plugin['icons']['svg'];
+			} elseif ( !empty( $plugin['icons']['2x'] ) ) {
+				$plugin_icon_url = $plugin['icons']['2x'];
+			} elseif ( !empty( $plugin['icons']['1x'] ) ) {
+				$plugin_icon_url = $plugin['icons']['1x'];
+			} else {
+				$plugin_icon_url = $plugin['icons']['default'];
+			}
+
 			/**
 			 * Filter the install action links for a plugin.
 			 *
@@ -263,18 +502,68 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 			 * @param array $plugin       The plugin currently being listed.
 			 */
 			$action_links = apply_filters( 'plugin_install_action_links', $action_links, $plugin );
+
+			$last_updated_timestamp = strtotime( $plugin['last_updated'] );
 		?>
-		<tr>
-			<td class="name column-name"<?php echo $style['name']; ?>><strong><?php echo $title; ?></strong>
-				<div class="action-links"><?php if ( !empty( $action_links ) ) echo implode( ' | ', $action_links ); ?></div>
-			</td>
-			<td class="vers column-version"<?php echo $style['version']; ?>><?php echo $version; ?></td>
-			<td class="vers column-rating"<?php echo $style['rating']; ?>>
-				<?php wp_star_rating( array( 'rating' => $plugin['rating'], 'type' => 'percent', 'number' => $plugin['num_ratings'] ) ); ?>
-			</td>
-			<td class="desc column-description"<?php echo $style['description']; ?>><?php echo $description, $author; ?></td>
-		</tr>
+		<div class="plugin-card plugin-card-<?php echo sanitize_html_class( $plugin['slug'] ); ?>">
+			<div class="plugin-card-top">
+				<div class="name column-name">
+					<h3>
+						<a href="<?php echo esc_url( $details_link ); ?>" class="thickbox open-plugin-details-modal">
+						<?php echo $title; ?>
+						<img src="<?php echo esc_attr( $plugin_icon_url ) ?>" class="plugin-icon" alt="">
+						</a>
+					</h3>
+				</div>
+				<div class="action-links">
+					<?php
+						if ( $action_links ) {
+							echo '<ul class="plugin-action-buttons"><li>' . implode( '</li><li>', $action_links ) . '</li></ul>';
+						}
+					?>
+				</div>
+				<div class="desc column-description">
+					<p><?php echo $description; ?></p>
+					<p class="authors"><?php echo $author; ?></p>
+				</div>
+			</div>
+			<div class="plugin-card-bottom">
+				<div class="vers column-rating">
+					<?php wp_star_rating( array( 'rating' => $plugin['rating'], 'type' => 'percent', 'number' => $plugin['num_ratings'] ) ); ?>
+					<span class="num-ratings" aria-hidden="true">(<?php echo number_format_i18n( $plugin['num_ratings'] ); ?>)</span>
+				</div>
+				<div class="column-updated">
+					<strong><?php _e( 'Last Updated:' ); ?></strong> <?php printf( __( '%s ago' ), human_time_diff( $last_updated_timestamp ) ); ?>
+				</div>
+				<div class="column-downloaded">
+					<?php
+					if ( $plugin['active_installs'] >= 1000000 ) {
+						$active_installs_text = _x( '1+ Million', 'Active plugin installs' );
+					} else {
+						$active_installs_text = number_format_i18n( $plugin['active_installs'] ) . '+';
+					}
+					printf( __( '%s Active Installs' ), $active_installs_text );
+					?>
+				</div>
+				<div class="column-compatibility">
+					<?php
+					if ( ! empty( $plugin['tested'] ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $plugin['tested'] ) ), $plugin['tested'], '>' ) ) {
+						echo '<span class="compatibility-untested">' . __( 'Untested with your version of WordPress' ) . '</span>';
+					} elseif ( ! empty( $plugin['requires'] ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $plugin['requires'] ) ), $plugin['requires'], '<' ) ) {
+						echo '<span class="compatibility-incompatible">' . __( '<strong>Incompatible</strong> with your version of WordPress' ) . '</span>';
+					} else {
+						echo '<span class="compatibility-compatible">' . __( '<strong>Compatible</strong> with your version of WordPress' ) . '</span>';
+					}
+					?>
+				</div>
+			</div>
+		</div>
 		<?php
 		}
+
+		// Close off the group divs of the last one
+		if ( ! empty( $group ) ) {
+			echo '</div></div>';
+		}
 	}
 }
diff --git a/wp-admin/includes/class-wp-plugins-list-table.php b/wp-admin/includes/class-wp-plugins-list-table.php
index 6535833..f49d1c8 100644
--- a/wp-admin/includes/class-wp-plugins-list-table.php
+++ b/wp-admin/includes/class-wp-plugins-list-table.php
@@ -1,15 +1,36 @@
 <?php
 /**
- * Plugins List Table class.
+ * List Table API: WP_Plugins_List_Table class
  *
  * @package WordPress
- * @subpackage List_Table
+ * @subpackage Administration
+ * @since 3.1.0
+ */
+
+/**
+ * Core class used to implement displaying installed plugins in a list table.
+ *
  * @since 3.1.0
  * @access private
+ *
+ * @see WP_List_Table
  */
 class WP_Plugins_List_Table extends WP_List_Table {
 
-	function __construct( $args = array() ) {
+	/**
+	 * Constructor.
+	 *
+	 * @since 3.1.0
+	 * @access public
+	 *
+	 * @see WP_List_Table::__construct() for more information on default arguments.
+	 *
+	 * @global string $status
+	 * @global int    $page
+	 *
+	 * @param array $args An associative array of arguments.
+	 */
+	public function __construct( $args = array() ) {
 		global $status, $page;
 
 		parent::__construct( array(
@@ -27,37 +48,55 @@ class WP_Plugins_List_Table extends WP_List_Table {
 		$page = $this->get_pagenum();
 	}
 
-	function get_table_classes() {
+	/**
+	 * @return array
+	 */
+	protected function get_table_classes() {
 		return array( 'widefat', $this->_args['plural'] );
 	}
 
-	function ajax_user_can() {
+	/**
+	 * @return bool
+	 */
+	public function ajax_user_can() {
 		return current_user_can('activate_plugins');
 	}
 
-	function prepare_items() {
+	/**
+	 *
+	 * @global string $status
+	 * @global array  $plugins
+	 * @global array  $totals
+	 * @global int    $page
+	 * @global string $orderby
+	 * @global string $order
+	 * @global string $s
+	 */
+	public function prepare_items() {
 		global $status, $plugins, $totals, $page, $orderby, $order, $s;
 
-		wp_reset_vars( array( 'orderby', 'order', 's' ) );
+		wp_reset_vars( array( 'orderby', 'order' ) );
 
 		/**
-		 * Filter the full array of plugins to list in the Plugins list table.
+		 * Filters the full array of plugins to list in the Plugins list table.
 		 *
 		 * @since 3.0.0
 		 *
 		 * @see get_plugins()
 		 *
-		 * @param array $plugins An array of plugins to display in the list table.
+		 * @param array $all_plugins An array of plugins to display in the list table.
 		 */
+		$all_plugins = apply_filters( 'all_plugins', get_plugins() );
+
 		$plugins = array(
-			'all' => apply_filters( 'all_plugins', get_plugins() ),
-			'search' => array(),
-			'active' => array(),
-			'inactive' => array(),
+			'all'                => $all_plugins,
+			'search'             => array(),
+			'active'             => array(),
+			'inactive'           => array(),
 			'recently_activated' => array(),
-			'upgrade' => array(),
-			'mustuse' => array(),
-			'dropins' => array()
+			'upgrade'            => array(),
+			'mustuse'            => array(),
+			'dropins'            => array(),
 		);
 
 		$screen = $this->screen;
@@ -98,33 +137,88 @@ class WP_Plugins_List_Table extends WP_List_Table {
 			}
 		}
 
+		if ( ! $screen->in_admin( 'network' ) ) {
+			$show = current_user_can( 'manage_network_plugins' );
+			/**
+			 * Filter whether to display network-active plugins alongside plugins active for the current site.
+			 *
+			 * This also controls the display of inactive network-only plugins (plugins with
+			 * "Network: true" in the plugin header).
+			 *
+			 * Plugins cannot be network-activated or network-deactivated from this screen.
+			 *
+			 * @since 4.4.0
+			 *
+			 * @param bool $show Whether to show network-active plugins. Default is whether the current
+			 *                   user can manage network plugins (ie. a Super Admin).
+			 */
+			$show_network_active = apply_filters( 'show_network_active_plugins', $show );
+		}
+
 		set_transient( 'plugin_slugs', array_keys( $plugins['all'] ), DAY_IN_SECONDS );
 
-		if ( ! $screen->in_admin( 'network' ) ) {
+		if ( $screen->in_admin( 'network' ) ) {
+			$recently_activated = get_site_option( 'recently_activated', array() );
+		} else {
 			$recently_activated = get_option( 'recently_activated', array() );
+		}
+
+		foreach ( $recently_activated as $key => $time ) {
+			if ( $time + WEEK_IN_SECONDS < time() ) {
+				unset( $recently_activated[$key] );
+			}
+		}
 
-			foreach ( $recently_activated as $key => $time )
-				if ( $time + WEEK_IN_SECONDS < time() )
-					unset( $recently_activated[$key] );
+		if ( $screen->in_admin( 'network' ) ) {
+			update_site_option( 'recently_activated', $recently_activated );
+		} else {
 			update_option( 'recently_activated', $recently_activated );
 		}
 
+		$plugin_info = get_site_transient( 'update_plugins' );
+
 		foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
+			// Extra info if known. array_merge() ensures $plugin_data has precedence if keys collide.
+			if ( isset( $plugin_info->response[ $plugin_file ] ) ) {
+				$plugins['all'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->response[ $plugin_file ], $plugin_data );
+				// Make sure that $plugins['upgrade'] also receives the extra info since it is used on ?plugin_status=upgrade
+				if ( isset( $plugins['upgrade'][ $plugin_file ] ) ) {
+					$plugins['upgrade'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->response[ $plugin_file ], $plugin_data );
+				}
+
+			} elseif ( isset( $plugin_info->no_update[ $plugin_file ] ) ) {
+				$plugins['all'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->no_update[ $plugin_file ], $plugin_data );
+				// Make sure that $plugins['upgrade'] also receives the extra info since it is used on ?plugin_status=upgrade
+				if ( isset( $plugins['upgrade'][ $plugin_file ] ) ) {
+					$plugins['upgrade'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->no_update[ $plugin_file ], $plugin_data );
+				}
+			}
+
 			// Filter into individual sections
 			if ( is_multisite() && ! $screen->in_admin( 'network' ) && is_network_only_plugin( $plugin_file ) && ! is_plugin_active( $plugin_file ) ) {
-				// On the non-network screen, filter out network-only plugins as long as they're not individually activated
-				unset( $plugins['all'][ $plugin_file ] );
+				if ( $show_network_active ) {
+					// On the non-network screen, show inactive network-only plugins if allowed
+					$plugins['inactive'][ $plugin_file ] = $plugin_data;
+				} else {
+					// On the non-network screen, filter out network-only plugins as long as they're not individually active
+					unset( $plugins['all'][ $plugin_file ] );
+				}
 			} elseif ( ! $screen->in_admin( 'network' ) && is_plugin_active_for_network( $plugin_file ) ) {
-				// On the non-network screen, filter out network activated plugins
-				unset( $plugins['all'][ $plugin_file ] );
+				if ( $show_network_active ) {
+					// On the non-network screen, show network-active plugins if allowed
+					$plugins['active'][ $plugin_file ] = $plugin_data;
+				} else {
+					// On the non-network screen, filter out network-active plugins
+					unset( $plugins['all'][ $plugin_file ] );
+				}
 			} elseif ( ( ! $screen->in_admin( 'network' ) && is_plugin_active( $plugin_file ) )
 				|| ( $screen->in_admin( 'network' ) && is_plugin_active_for_network( $plugin_file ) ) ) {
 				// On the non-network screen, populate the active list with plugins that are individually activated
 				// On the network-admin screen, populate the active list with plugins that are network activated
 				$plugins['active'][ $plugin_file ] = $plugin_data;
 			} else {
-				if ( ! $screen->in_admin( 'network' ) && isset( $recently_activated[ $plugin_file ] ) ) {
-					// On the non-network screen, populate the recently activated list with plugins that have been recently activated
+				if ( isset( $recently_activated[ $plugin_file ] ) ) {
+					// Populate the recently activated list with plugins that have been recently activated
 					$plugins['recently_activated'][ $plugin_file ] = $plugin_data;
 				}
 				// Populate the inactive list with plugins that aren't activated
@@ -132,7 +226,7 @@ class WP_Plugins_List_Table extends WP_List_Table {
 			}
 		}
 
-		if ( $s ) {
+		if ( strlen( $s ) ) {
 			$status = 'search';
 			$plugins['search'] = array_filter( $plugins['all'], array( $this, '_search_callback' ) );
 		}
@@ -152,13 +246,16 @@ class WP_Plugins_List_Table extends WP_List_Table {
 
 		$total_this_page = $totals[ $status ];
 
-		if ( $orderby ) {
+		if ( ! $orderby ) {
+			$orderby = 'Name';
+		} else {
 			$orderby = ucfirst( $orderby );
-			$order = strtoupper( $order );
-
-			uasort( $this->items, array( $this, '_order_callback' ) );
 		}
 
+		$order = strtoupper( $order );
+
+		uasort( $this->items, array( $this, '_order_callback' ) );
+
 		$plugins_per_page = $this->get_items_per_page( str_replace( '-', '_', $screen->id . '_per_page' ), 999 );
 
 		$start = ( $page - 1 ) * $plugins_per_page;
@@ -172,13 +269,17 @@ class WP_Plugins_List_Table extends WP_List_Table {
 		) );
 	}
 
-	function _search_callback( $plugin ) {
-		static $term;
-		if ( is_null( $term ) )
-			$term = wp_unslash( $_REQUEST['s'] );
+	/**
+	 * @global string $s URL encoded search term.
+	 *
+	 * @param array $plugin
+	 * @return bool
+	 */
+	public function _search_callback( $plugin ) {
+		global $s;
 
 		foreach ( $plugin as $value ) {
-			if ( false !== stripos( strip_tags( $value ), $term ) ) {
+			if ( is_string( $value ) && false !== stripos( strip_tags( $value ), urldecode( $s ) ) ) {
 				return true;
 			}
 		}
@@ -186,7 +287,14 @@ class WP_Plugins_List_Table extends WP_List_Table {
 		return false;
 	}
 
-	function _order_callback( $plugin_a, $plugin_b ) {
+	/**
+	 * @global string $orderby
+	 * @global string $order
+	 * @param array $plugin_a
+	 * @param array $plugin_b
+	 * @return int
+	 */
+	public function _order_callback( $plugin_a, $plugin_b ) {
 		global $orderby, $order;
 
 		$a = $plugin_a[$orderby];
@@ -195,22 +303,41 @@ class WP_Plugins_List_Table extends WP_List_Table {
 		if ( $a == $b )
 			return 0;
 
-		if ( 'DESC' == $order )
-			return ( $a < $b ) ? 1 : -1;
-		else
-			return ( $a < $b ) ? -1 : 1;
+		if ( 'DESC' === $order ) {
+			return strcasecmp( $b, $a );
+		} else {
+			return strcasecmp( $a, $b );
+		}
 	}
 
-	function no_items() {
+	/**
+	 *
+	 * @global array $plugins
+	 */
+	public function no_items() {
 		global $plugins;
 
-		if ( !empty( $plugins['all'] ) )
+		if ( ! empty( $_REQUEST['s'] ) ) {
+			$s = esc_html( wp_unslash( $_REQUEST['s'] ) );
+
+			printf( __( 'No plugins found for “%s”.' ), $s );
+
+			// We assume that somebody who can install plugins in multisite is experienced enough to not need this helper link.
+			if ( ! is_multisite() && current_user_can( 'install_plugins' ) ) {
+				echo ' <a href="' . esc_url( admin_url( 'plugin-install.php?tab=search&s=' . urlencode( $s ) ) ) . '">' . __( 'Search for plugins in the WordPress Plugin Directory.' ) . '</a>';
+			}
+		} elseif ( ! empty( $plugins['all'] ) )
 			_e( 'No plugins found.' );
 		else
 			_e( 'You do not appear to have any plugins available at this time.' );
 	}
 
-	function get_columns() {
+	/**
+	 *
+	 * @global string $status
+	 * @return array
+	 */
+	public function get_columns() {
 		global $status;
 
 		return array(
@@ -220,11 +347,20 @@ class WP_Plugins_List_Table extends WP_List_Table {
 		);
 	}
 
-	function get_sortable_columns() {
+	/**
+	 * @return array
+	 */
+	protected function get_sortable_columns() {
 		return array();
 	}
 
-	function get_views() {
+	/**
+	 *
+	 * @global array $totals
+	 * @global string $status
+	 * @return array
+	 */
+	protected function get_views() {
 		global $totals, $status;
 
 		$status_links = array();
@@ -256,10 +392,10 @@ class WP_Plugins_List_Table extends WP_List_Table {
 					break;
 			}
 
-			if ( 'search' != $type ) {
+			if ( 'search' !== $type ) {
 				$status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
 					add_query_arg('plugin_status', $type, 'plugins.php'),
-					( $type == $status ) ? ' class="current"' : '',
+					( $type === $status ) ? ' class="current"' : '',
 					sprintf( $text, number_format_i18n( $count ) )
 					);
 			}
@@ -268,7 +404,12 @@ class WP_Plugins_List_Table extends WP_List_Table {
 		return $status_links;
 	}
 
-	function get_bulk_actions() {
+	/**
+	 *
+	 * @global string $status
+	 * @return array
+	 */
+	protected function get_bulk_actions() {
 		global $status;
 
 		$actions = array();
@@ -289,16 +430,24 @@ class WP_Plugins_List_Table extends WP_List_Table {
 		return $actions;
 	}
 
-	function bulk_actions() {
+	/**
+	 * @global string $status
+	 * @param string $which
+	 */
+	public function bulk_actions( $which = '' ) {
 		global $status;
 
 		if ( in_array( $status, array( 'mustuse', 'dropins' ) ) )
 			return;
 
-		parent::bulk_actions();
+		parent::bulk_actions( $which );
 	}
 
-	function extra_tablenav( $which ) {
+	/**
+	 * @global string $status
+	 * @param string $which
+	 */
+	protected function extra_tablenav( $which ) {
 		global $status;
 
 		if ( ! in_array($status, array('recently_activated', 'mustuse', 'dropins') ) )
@@ -306,24 +455,37 @@ class WP_Plugins_List_Table extends WP_List_Table {
 
 		echo '<div class="alignleft actions">';
 
-		if ( ! $this->screen->in_admin( 'network' ) && 'recently_activated' == $status )
+		if ( 'recently_activated' == $status ) {
 			submit_button( __( 'Clear List' ), 'button', 'clear-recent-list', false );
-		elseif ( 'top' == $which && 'mustuse' == $status )
-			echo '<p>' . sprintf( __( 'Files in the <code>%s</code> directory are executed automatically.' ), str_replace( ABSPATH, '/', WPMU_PLUGIN_DIR ) ) . '</p>';
-		elseif ( 'top' == $which && 'dropins' == $status )
-			echo '<p>' . sprintf( __( 'Drop-ins are advanced plugins in the <code>%s</code> directory that replace WordPress functionality when present.' ), str_replace( ABSPATH, '', WP_CONTENT_DIR ) ) . '</p>';
-
+		} elseif ( 'top' === $which && 'mustuse' === $status ) {
+			/* translators: %s: mu-plugins directory name */
+			echo '<p>' . sprintf( __( 'Files in the %s directory are executed automatically.' ),
+				'<code>' . str_replace( ABSPATH, '/', WPMU_PLUGIN_DIR ) . '</code>'
+			) . '</p>';
+		} elseif ( 'top' === $which && 'dropins' === $status ) {
+			/* translators: %s: wp-content directory name */
+			echo '<p>' . sprintf( __( 'Drop-ins are advanced plugins in the %s directory that replace WordPress functionality when present.' ),
+				'<code>' . str_replace( ABSPATH, '', WP_CONTENT_DIR ) . '</code>'
+			) . '</p>';
+		}
 		echo '</div>';
 	}
 
-	function current_action() {
+	/**
+	 * @return string
+	 */
+	public function current_action() {
 		if ( isset($_POST['clear-recent-list']) )
 			return 'clear-recent-list';
 
 		return parent::current_action();
 	}
 
-	function display_rows() {
+	/**
+	 *
+	 * @global string $status
+	 */
+	public function display_rows() {
 		global $status;
 
 		if ( is_multisite() && ! $this->screen->in_admin( 'network' ) && in_array( $status, array( 'mustuse', 'dropins' ) ) )
@@ -333,24 +495,37 @@ class WP_Plugins_List_Table extends WP_List_Table {
 			$this->single_row( array( $plugin_file, $plugin_data ) );
 	}
 
-	function single_row( $item ) {
+	/**
+	 * @global string $status
+	 * @global int $page
+	 * @global string $s
+	 * @global array $totals
+	 *
+	 * @param array $item
+	 */
+	public function single_row( $item ) {
 		global $status, $page, $s, $totals;
 
 		list( $plugin_file, $plugin_data ) = $item;
 		$context = $status;
 		$screen = $this->screen;
 
-		// preorder
+		// Pre-order.
 		$actions = array(
 			'deactivate' => '',
 			'activate' => '',
+			'details' => '',
 			'edit' => '',
 			'delete' => '',
 		);
 
-		if ( 'mustuse' == $context ) {
+		// Do not restrict by default
+		$restrict_network_active = false;
+		$restrict_network_only = false;
+
+		if ( 'mustuse' === $context ) {
 			$is_active = true;
-		} elseif ( 'dropins' == $context ) {
+		} elseif ( 'dropins' === $context ) {
 			$dropins = _get_dropins();
 			$plugin_name = $plugin_file;
 			if ( $plugin_file != $plugin_data['Name'] )
@@ -363,94 +538,154 @@ class WP_Plugins_List_Table extends WP_List_Table {
 				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
 			} else {
 				$is_active = false;
-				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . ' <span class="attention">' . __('Inactive:') . '</span></strong> ' . sprintf( __( 'Requires <code>%s</code> in <code>wp-config.php</code>.' ), "define('" . $dropins[ $plugin_file ][1] . "', true);" ) . '</p>';
+				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . ' <span class="error-message">' . __( 'Inactive:' ) . '</span></strong> ' .
+					/* translators: 1: drop-in constant name, 2: wp-config.php */
+					sprintf( __( 'Requires %1$s in %2$s file.' ),
+						"<code>define('" . $dropins[ $plugin_file ][1] . "', true);</code>",
+						'<code>wp-config.php</code>'
+					) . '</p>';
 			}
 			if ( $plugin_data['Description'] )
 				$description .= '<p>' . $plugin_data['Description'] . '</p>';
 		} else {
-			if ( $screen->in_admin( 'network' ) )
+			if ( $screen->in_admin( 'network' ) ) {
 				$is_active = is_plugin_active_for_network( $plugin_file );
-			else
+			} else {
 				$is_active = is_plugin_active( $plugin_file );
+				$restrict_network_active = ( is_multisite() && is_plugin_active_for_network( $plugin_file ) );
+				$restrict_network_only = ( is_multisite() && is_network_only_plugin( $plugin_file ) && ! $is_active );
+			}
 
 			if ( $screen->in_admin( 'network' ) ) {
 				if ( $is_active ) {
-					if ( current_user_can( 'manage_network_plugins' ) )
-						$actions['deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&plugin=' . $plugin_file . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'deactivate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Deactivate this plugin') . '">' . __('Network Deactivate') . '</a>';
+					if ( current_user_can( 'manage_network_plugins' ) ) {
+						/* translators: %s: plugin name */
+						$actions['deactivate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=deactivate&plugin=' . $plugin_file . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'deactivate-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( __( 'Network deactivate %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Network Deactivate' ) . '</a>';
+						}
 				} else {
-					if ( current_user_can( 'manage_network_plugins' ) )
-						$actions['activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&plugin=' . $plugin_file . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin for all sites in this network') . '" class="edit">' . __('Network Activate') . '</a>';
-					if ( current_user_can( 'delete_plugins' ) && ! is_plugin_active( $plugin_file ) )
-						$actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&checked[]=' . $plugin_file . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'bulk-plugins') . '" title="' . esc_attr__('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
+					if ( current_user_can( 'manage_network_plugins' ) ) {
+						/* translators: %s: plugin name */
+						$actions['activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&plugin=' . $plugin_file . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'activate-plugin_' . $plugin_file ) . '" class="edit" aria-label="' . esc_attr( sprintf( __( 'Network Activate %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Network Activate' ) . '</a>';
+					}
+					if ( current_user_can( 'delete_plugins' ) && ! is_plugin_active( $plugin_file ) ) {
+						/* translators: %s: plugin name */
+						$actions['delete'] = '<a href="' . wp_nonce_url( 'plugins.php?action=delete-selected&checked[]=' . $plugin_file . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'bulk-plugins' ) . '" class="delete" aria-label="' . esc_attr( sprintf( __( 'Delete %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Delete' ) . '</a>';
+					}
 				}
 			} else {
-				if ( $is_active ) {
-					$actions['deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&plugin=' . $plugin_file . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'deactivate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Deactivate this plugin') . '">' . __('Deactivate') . '</a>';
+				if ( $restrict_network_active ) {
+					$actions = array(
+						'network_active' => __( 'Network Active' ),
+					);
+				} elseif ( $restrict_network_only ) {
+					$actions = array(
+						'network_only' => __( 'Network Only' ),
+					);
+				} elseif ( $is_active ) {
+					/* translators: %s: plugin name */
+					$actions['deactivate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=deactivate&plugin=' . $plugin_file . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'deactivate-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( __( 'Deactivate %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Deactivate' ) . '</a>';
 				} else {
-					$actions['activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&plugin=' . $plugin_file . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin') . '" class="edit">' . __('Activate') . '</a>';
+					/* translators: %s: plugin name */
+					$actions['activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&plugin=' . $plugin_file . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'activate-plugin_' . $plugin_file ) . '" class="edit" aria-label="' . esc_attr( sprintf( __( 'Activate %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Activate' ) . '</a>';
 
-					if ( ! is_multisite() && current_user_can('delete_plugins') )
-						$actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&checked[]=' . $plugin_file . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'bulk-plugins') . '" title="' . esc_attr__('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
+					if ( ! is_multisite() && current_user_can( 'delete_plugins' ) ) {
+						/* translators: %s: plugin name */
+						$actions['delete'] = '<a href="' . wp_nonce_url( 'plugins.php?action=delete-selected&checked[]=' . $plugin_file . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'bulk-plugins' ) . '" class="delete" aria-label="' . esc_attr( sprintf( __( 'Delete %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Delete' ) . '</a>';
+					}
 				} // end if $is_active
+
 			 } // end if $screen->in_admin( 'network' )
 
-			if ( ( ! is_multisite() || $screen->in_admin( 'network' ) ) && current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) )
-				$actions['edit'] = '<a href="plugin-editor.php?file=' . $plugin_file . '" title="' . esc_attr__('Open this file in the Plugin Editor') . '" class="edit">' . __('Edit') . '</a>';
+			if ( ( ! is_multisite() || $screen->in_admin( 'network' ) ) && current_user_can( 'edit_plugins' ) && is_writable( WP_PLUGIN_DIR . '/' . $plugin_file ) ) {
+				/* translators: %s: plugin name */
+				$actions['edit'] = '<a href="plugin-editor.php?file=' . $plugin_file . '" class="edit" aria-label="' . esc_attr( sprintf( __( 'Edit %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Edit' ) . '</a>';
+			}
 		} // end if $context
 
-		$prefix = $screen->in_admin( 'network' ) ? 'network_admin_' : '';
+		$actions = array_filter( $actions );
 
-		/**
-		 * Filter the action links displayed for each plugin in the Plugins list table.
-		 *
-		 * The dynamic portion of the hook name, $prefix, refers to the context the
-		 * action links are displayed in. The 'network_admin_' prefix is used if the
-		 * current screen is the Network plugins list table. The prefix is empty ('')
-		 * if the current screen is the site plugins list table.
-		 *
-		 * The default action links for the Network plugins list table include
-		 * 'Network Activate', 'Network Deactivate', 'Edit', and 'Delete'.
-		 *
-		 * The default action links for the site plugins list table include
-		 * 'Activate', 'Deactivate', and 'Edit', for a network site, and
-		 * 'Activate', 'Deactivate', 'Edit', and 'Delete' for a single site.
-		 *
-		 * @since 2.5.0
-		 *
-		 * @param array  $actions     An array of plugin action links.
-		 * @param string $plugin_file Path to the plugin file.
-		 * @param array  $plugin_data An array of plugin data.
-		 * @param string $context     The plugin context. Defaults are 'All', 'Active',
-		 *                            'Inactive', 'Recently Activated', 'Upgrade',
-		 *                            'Must-Use', 'Drop-ins', 'Search'.
-		 */
-		$actions = apply_filters( $prefix . 'plugin_action_links', array_filter( $actions ), $plugin_file, $plugin_data, $context );
+		if ( $screen->in_admin( 'network' ) ) {
 
-		/**
-		 * Filter the list of action links displayed for a specific plugin.
-		 *
-		 * The first dynamic portion of the hook name, $prefix, refers to the context
-		 * the action links are displayed in. The 'network_admin_' prefix is used if the
-		 * current screen is the Network plugins list table. The prefix is empty ('')
-		 * if the current screen is the site plugins list table.
-		 *
-		 * The second dynamic portion of the hook name, $plugin_file, refers to the path
-		 * to the plugin file, relative to the plugins directory.
-		 *
-		 * @since 2.7.0
-		 *
-		 * @param array  $actions     An array of plugin action links.
-		 * @param string $plugin_file Path to the plugin file.
-		 * @param array  $plugin_data An array of plugin data.
-		 * @param string $context     The plugin context. Defaults are 'All', 'Active',
-		 *                            'Inactive', 'Recently Activated', 'Upgrade',
-		 *                            'Must-Use', 'Drop-ins', 'Search'.
-		 */
-		$actions = apply_filters( $prefix . "plugin_action_links_$plugin_file", $actions, $plugin_file, $plugin_data, $context );
+			/**
+			 * Filter the action links displayed for each plugin in the Network Admin Plugins list table.
+			 *
+			 * The default action links for the Network plugins list table include
+			 * 'Network Activate', 'Network Deactivate', 'Edit', and 'Delete'.
+			 *
+			 * @since 3.1.0 As `{$prefix}_plugin_action_links`
+			 * @since 4.4.0
+			 *
+			 * @param array  $actions     An array of plugin action links.
+			 * @param string $plugin_file Path to the plugin file relative to the plugins directory.
+			 * @param array  $plugin_data An array of plugin data.
+			 * @param string $context     The plugin context. Defaults are 'All', 'Active',
+			 *                            'Inactive', 'Recently Activated', 'Upgrade',
+			 *                            'Must-Use', 'Drop-ins', 'Search'.
+			 */
+			$actions = apply_filters( 'network_admin_plugin_action_links', $actions, $plugin_file, $plugin_data, $context );
+
+			/**
+			 * Filter the list of action links displayed for a specific plugin in the Network Admin Plugins list table.
+			 *
+			 * The dynamic portion of the hook name, $plugin_file, refers to the path
+			 * to the plugin file, relative to the plugins directory.
+			 *
+			 * @since 3.1.0 As `{$prefix}_plugin_action_links_{$plugin_file}`
+			 * @since 4.4.0
+			 *
+			 * @param array  $actions     An array of plugin action links.
+			 * @param string $plugin_file Path to the plugin file relative to the plugins directory.
+			 * @param array  $plugin_data An array of plugin data.
+			 * @param string $context     The plugin context. Defaults are 'All', 'Active',
+			 *                            'Inactive', 'Recently Activated', 'Upgrade',
+			 *                            'Must-Use', 'Drop-ins', 'Search'.
+			 */
+			$actions = apply_filters( "network_admin_plugin_action_links_{$plugin_file}", $actions, $plugin_file, $plugin_data, $context );
+
+		} else {
+
+			/**
+			 * Filter the action links displayed for each plugin in the Plugins list table.
+			 *
+			 * The default action links for the site plugins list table include
+			 * 'Activate', 'Deactivate', and 'Edit', for a network site, and
+			 * 'Activate', 'Deactivate', 'Edit', and 'Delete' for a single site.
+			 *
+			 * @since 2.5.0 As `{$prefix}_plugin_action_links`
+			 * @since 4.4.0
+			 *
+			 * @param array  $actions     An array of plugin action links.
+			 * @param string $plugin_file Path to the plugin file relative to the plugins directory.
+			 * @param array  $plugin_data An array of plugin data.
+			 * @param string $context     The plugin context. Defaults are 'All', 'Active',
+			 *                            'Inactive', 'Recently Activated', 'Upgrade',
+			 *                            'Must-Use', 'Drop-ins', 'Search'.
+			 */
+			$actions = apply_filters( 'plugin_action_links', $actions, $plugin_file, $plugin_data, $context );
+
+			/**
+			 * Filter the list of action links displayed for a specific plugin in the Plugins list table.
+			 *
+			 * The dynamic portion of the hook name, $plugin_file, refers to the path
+			 * to the plugin file, relative to the plugins directory.
+			 *
+			 * @since 2.7.0 As `{$prefix}_plugin_action_links_{$plugin_file}`
+			 * @since 4.4.0
+			 *
+			 * @param array  $actions     An array of plugin action links.
+			 * @param string $plugin_file Path to the plugin file relative to the plugins directory.
+			 * @param array  $plugin_data An array of plugin data.
+			 * @param string $context     The plugin context. Defaults are 'All', 'Active',
+			 *                            'Inactive', 'Recently Activated', 'Upgrade',
+			 *                            'Must-Use', 'Drop-ins', 'Search'.
+			 */
+			$actions = apply_filters( "plugin_action_links_{$plugin_file}", $actions, $plugin_file, $plugin_data, $context );
+
+		}
 
 		$class = $is_active ? 'active' : 'inactive';
 		$checkbox_id =  "checkbox_" . md5($plugin_data['Name']);
-		if ( in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
+		if ( $restrict_network_active || $restrict_network_only || in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
 			$checkbox = '';
 		} else {
 			$checkbox = "<label class='screen-reader-text' for='" . $checkbox_id . "' >" . sprintf( __( 'Select %s' ), $plugin_data['Name'] ) . "</label>"
@@ -461,30 +696,37 @@ class WP_Plugins_List_Table extends WP_List_Table {
 			$plugin_name = $plugin_data['Name'];
 		}
 
-		$id = sanitize_title( $plugin_name );
 		if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) )
 			$class .= ' update';
 
-		echo "<tr id='$id' class='$class'>";
+		$plugin_slug = isset( $plugin_data['slug'] ) ? $plugin_data['slug'] : sanitize_title( $plugin_name );
+		printf( '<tr class="%s" data-slug="%s" data-plugin="%s">',
+			esc_attr( $class ),
+			esc_attr( $plugin_slug ),
+			esc_attr( $plugin_file )
+		);
 
-		list( $columns, $hidden ) = $this->get_column_info();
+		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
 
 		foreach ( $columns as $column_name => $column_display_name ) {
-			$style = '';
-			if ( in_array( $column_name, $hidden ) )
-				$style = ' style="display:none;"';
+			$extra_classes = '';
+			if ( in_array( $column_name, $hidden ) ) {
+				$extra_classes = ' hidden';
+			}
 
 			switch ( $column_name ) {
 				case 'cb':
 					echo "<th scope='row' class='check-column'>$checkbox</th>";
 					break;
 				case 'name':
-					echo "<td class='plugin-title'$style><strong>$plugin_name</strong>";
+					echo "<td class='plugin-title column-primary'><strong>$plugin_name</strong>";
 					echo $this->row_actions( $actions, true );
 					echo "</td>";
 					break;
 				case 'description':
-					echo "<td class='column-description desc'$style>
+					$classes = 'column-description desc';
+
+					echo "<td class='$classes{$extra_classes}'>
 						<div class='plugin-description'>$description</div>
 						<div class='$class second plugin-version-author-uri'>";
 
@@ -494,11 +736,25 @@ class WP_Plugins_List_Table extends WP_List_Table {
 					if ( !empty( $plugin_data['Author'] ) ) {
 						$author = $plugin_data['Author'];
 						if ( !empty( $plugin_data['AuthorURI'] ) )
-							$author = '<a href="' . $plugin_data['AuthorURI'] . '" title="' . esc_attr__( 'Visit author homepage' ) . '">' . $plugin_data['Author'] . '</a>';
+							$author = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
 						$plugin_meta[] = sprintf( __( 'By %s' ), $author );
 					}
-					if ( ! empty( $plugin_data['PluginURI'] ) )
-						$plugin_meta[] = '<a href="' . $plugin_data['PluginURI'] . '" title="' . esc_attr__( 'Visit plugin site' ) . '">' . __( 'Visit plugin site' ) . '</a>';
+
+					// Details link using API info, if available
+					if ( isset( $plugin_data['slug'] ) && current_user_can( 'install_plugins' ) ) {
+						$plugin_meta[] = sprintf( '<a href="%s" class="thickbox open-plugin-details-modal" aria-label="%s" data-title="%s">%s</a>',
+							esc_url( network_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_data['slug'] .
+								'&TB_iframe=true&width=600&height=550' ) ),
+							esc_attr( sprintf( __( 'More information about %s' ), $plugin_name ) ),
+							esc_attr( $plugin_name ),
+							__( 'View details' )
+						);
+					} elseif ( ! empty( $plugin_data['PluginURI'] ) ) {
+						$plugin_meta[] = sprintf( '<a href="%s">%s</a>',
+							esc_url( $plugin_data['PluginURI'] ),
+							__( 'Visit plugin site' )
+						);
+					}
 
 					/**
 					 * Filter the array of row meta for each plugin in the Plugins list table.
@@ -520,7 +776,9 @@ class WP_Plugins_List_Table extends WP_List_Table {
 					echo "</div></td>";
 					break;
 				default:
-					echo "<td class='$column_name column-$column_name'$style>";
+					$classes = "$column_name column-$column_name$class";
+
+					echo "<td class='$classes{$extra_classes}'>";
 
 					/**
 					 * Fires inside each custom column of the Plugins list table.
@@ -532,6 +790,7 @@ class WP_Plugins_List_Table extends WP_List_Table {
 					 * @param array  $plugin_data An array of plugin data.
 					 */
 					do_action( 'manage_plugins_custom_column', $column_name, $plugin_file, $plugin_data );
+
 					echo "</td>";
 			}
 		}
@@ -554,7 +813,7 @@ class WP_Plugins_List_Table extends WP_List_Table {
 		/**
 		 * Fires after each specific row in the Plugins list table.
 		 *
-		 * The dynamic portion of the hook name, $plugin_file, refers to the path
+		 * The dynamic portion of the hook name, `$plugin_file`, refers to the path
 		 * to the plugin file, relative to the plugins directory.
 		 *
 		 * @since 2.7.0
@@ -567,4 +826,16 @@ class WP_Plugins_List_Table extends WP_List_Table {
 		 */
 		do_action( "after_plugin_row_$plugin_file", $plugin_file, $plugin_data, $status );
 	}
+
+	/**
+	 * Gets the name of the primary column for this specific list table.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @return string Unalterable name for the primary column, in this case, 'name'.
+	 */
+	protected function get_primary_column_name() {
+		return 'name';
+	}
 }
diff --git a/wp-admin/includes/class-wp-post-comments-list-table.php b/wp-admin/includes/class-wp-post-comments-list-table.php
new file mode 100644
index 0000000..719d655
--- /dev/null
+++ b/wp-admin/includes/class-wp-post-comments-list-table.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * List Table API: WP_Post_Comments_List_Table class
+ *
+ * @package WordPress
+ * @subpackage Administration
+ * @since 4.4.0
+ */
+
+/**
+ * Core class used to implement displaying post comments in a list table.
+ *
+ * @since 3.1.0
+ * @access private
+ *
+ * @see WP_Comments_List_Table
+ */
+class WP_Post_Comments_List_Table extends WP_Comments_List_Table {
+
+	/**
+	 *
+	 * @return array
+	 */
+	protected function get_column_info() {
+		return array(
+			array(
+				'author'   => __( 'Author' ),
+				'comment'  => _x( 'Comment', 'column name' ),
+			),
+			array(),
+			array(),
+			'comment',
+		);
+	}
+
+	/**
+	 *
+	 * @return array
+	 */
+	protected function get_table_classes() {
+		$classes = parent::get_table_classes();
+		$classes[] = 'wp-list-table';
+		$classes[] = 'comments-box';
+		return $classes;
+	}
+
+	/**
+	 *
+	 * @param bool $output_empty
+	 */
+	public function display( $output_empty = false ) {
+		$singular = $this->_args['singular'];
+
+		wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
+?>
+<table class="<?php echo implode( ' ', $this->get_table_classes() ); ?>" style="display:none;">
+	<tbody id="the-comment-list"<?php
+		if ( $singular ) {
+			echo " data-wp-lists='list:$singular'";
+		} ?>>
+		<?php if ( ! $output_empty ) {
+			$this->display_rows_or_placeholder();
+		} ?>
+	</tbody>
+</table>
+<?php
+	}
+
+	/**
+	 *
+	 * @param bool $comment_status
+	 * @return int
+	 */
+	public function get_per_page( $comment_status = false ) {
+		return 10;
+	}
+}
diff --git a/wp-admin/includes/class-wp-posts-list-table.php b/wp-admin/includes/class-wp-posts-list-table.php
index 1e763f2..33eca44 100644
--- a/wp-admin/includes/class-wp-posts-list-table.php
+++ b/wp-admin/includes/class-wp-posts-list-table.php
@@ -1,40 +1,48 @@
 <?php
 /**
- * Posts List Table class.
+ * List Table API: WP_Posts_List_Table class
  *
  * @package WordPress
- * @subpackage List_Table
+ * @subpackage Administration
+ * @since 3.1.0
+ */
+
+/**
+ * Core class used to implement displaying posts in a list table.
+ *
  * @since 3.1.0
  * @access private
+ *
+ * @see WP_List_Table
  */
 class WP_Posts_List_Table extends WP_List_Table {
 
 	/**
-	 * Whether the items should be displayed hierarchically or linearly
+	 * Whether the items should be displayed hierarchically or linearly.
 	 *
 	 * @since 3.1.0
 	 * @var bool
 	 * @access protected
 	 */
-	var $hierarchical_display;
+	protected $hierarchical_display;
 
 	/**
-	 * Holds the number of pending comments for each post
+	 * Holds the number of pending comments for each post.
 	 *
 	 * @since 3.1.0
-	 * @var int
+	 * @var array
 	 * @access protected
 	 */
-	var $comment_pending_count;
+	protected $comment_pending_count;
 
 	/**
-	 * Holds the number of posts for this user
+	 * Holds the number of posts for this user.
 	 *
 	 * @since 3.1.0
 	 * @var int
 	 * @access private
 	 */
-	var $user_posts_count;
+	private $user_posts_count;
 
 	/**
 	 * Holds the number of posts which are sticky.
@@ -43,9 +51,33 @@ class WP_Posts_List_Table extends WP_List_Table {
 	 * @var int
 	 * @access private
 	 */
-	var $sticky_posts_count = 0;
+	private $sticky_posts_count = 0;
+
+	private $is_trash;
+
+	/**
+	 * Current level for output.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 * @var int
+	 */
+	protected $current_level = 0;
 
-	function __construct( $args = array() ) {
+	/**
+	 * Constructor.
+	 *
+	 * @since 3.1.0
+	 * @access public
+	 *
+	 * @see WP_List_Table::__construct() for more information on default arguments.
+	 *
+	 * @global object $post_type_object
+	 * @global wpdb   $wpdb
+	 *
+	 * @param array $args An associative array of arguments.
+	 */
+	public function __construct( $args = array() ) {
 		global $post_type_object, $wpdb;
 
 		parent::__construct( array(
@@ -53,39 +85,63 @@ class WP_Posts_List_Table extends WP_List_Table {
 			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
 		) );
 
-		$post_type = $this->screen->post_type;
+		$post_type        = $this->screen->post_type;
 		$post_type_object = get_post_type_object( $post_type );
 
-		if ( !current_user_can( $post_type_object->cap->edit_others_posts ) ) {
-			$exclude_states = get_post_stati( array( 'show_in_admin_all_list' => false ) );
-			$this->user_posts_count = $wpdb->get_var( $wpdb->prepare( "
-				SELECT COUNT( 1 ) FROM $wpdb->posts
-				WHERE post_type = %s AND post_status NOT IN ( '" . implode( "','", $exclude_states ) . "' )
-				AND post_author = %d
-			", $post_type, get_current_user_id() ) );
-
-			if ( $this->user_posts_count && empty( $_REQUEST['post_status'] ) && empty( $_REQUEST['all_posts'] ) && empty( $_REQUEST['author'] ) && empty( $_REQUEST['show_sticky'] ) )
-				$_GET['author'] = get_current_user_id();
+		$exclude_states   = get_post_stati( array(
+			'show_in_admin_all_list' => false,
+		) );
+		$this->user_posts_count = intval( $wpdb->get_var( $wpdb->prepare( "
+			SELECT COUNT( 1 )
+			FROM $wpdb->posts
+			WHERE post_type = %s
+			AND post_status NOT IN ( '" . implode( "','", $exclude_states ) . "' )
+			AND post_author = %d
+		", $post_type, get_current_user_id() ) ) );
+
+		if ( $this->user_posts_count && ! current_user_can( $post_type_object->cap->edit_others_posts ) && empty( $_REQUEST['post_status'] ) && empty( $_REQUEST['all_posts'] ) && empty( $_REQUEST['author'] ) && empty( $_REQUEST['show_sticky'] ) ) {
+			$_GET['author'] = get_current_user_id();
 		}
 
-		if ( 'post' == $post_type && $sticky_posts = get_option( 'sticky_posts' ) ) {
+		if ( 'post' === $post_type && $sticky_posts = get_option( 'sticky_posts' ) ) {
 			$sticky_posts = implode( ', ', array_map( 'absint', (array) $sticky_posts ) );
 			$this->sticky_posts_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( 1 ) FROM $wpdb->posts WHERE post_type = %s AND post_status NOT IN ('trash', 'auto-draft') AND ID IN ($sticky_posts)", $post_type ) );
 		}
 	}
 
-	function ajax_user_can() {
+	/**
+	 * Sets whether the table layout should be hierarchical or not.
+	 *
+	 * @since 4.2.0
+	 *
+	 * @param bool $display Whether the table layout should be hierarchical.
+	 */
+	public function set_hierarchical_display( $display ) {
+		$this->hierarchical_display = $display;
+	}
+
+	/**
+	 *
+	 * @return bool
+	 */
+	public function ajax_user_can() {
 		return current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_posts );
 	}
 
-	function prepare_items() {
+	/**
+	 *
+	 * @global array    $avail_post_stati
+	 * @global WP_Query $wp_query
+	 * @global int      $per_page
+	 * @global string   $mode
+	 */
+	public function prepare_items() {
 		global $avail_post_stati, $wp_query, $per_page, $mode;
 
+		// is going to call wp()
 		$avail_post_stati = wp_edit_posts_query();
 
-		$this->hierarchical_display = ( is_post_type_hierarchical( $this->screen->post_type ) && 'menu_order title' == $wp_query->query['orderby'] );
-
-		$total_items = $this->hierarchical_display ? $wp_query->post_count : $wp_query->found_posts;
+		$this->set_hierarchical_display( is_post_type_hierarchical( $this->screen->post_type ) && 'menu_order title' === $wp_query->query['orderby'] );
 
 		$post_type = $this->screen->post_type;
 		$per_page = $this->get_items_per_page( 'edit_' . $post_type . '_per_page' );
@@ -93,34 +149,119 @@ class WP_Posts_List_Table extends WP_List_Table {
 		/** This filter is documented in wp-admin/includes/post.php */
  		$per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type );
 
-		if ( $this->hierarchical_display )
-			$total_pages = ceil( $total_items / $per_page );
-		else
-			$total_pages = $wp_query->max_num_pages;
+		if ( $this->hierarchical_display ) {
+			$total_items = $wp_query->post_count;
+		} elseif ( $wp_query->found_posts || $this->get_pagenum() === 1 ) {
+			$total_items = $wp_query->found_posts;
+		} else {
+			$post_counts = (array) wp_count_posts( $post_type, 'readable' );
+
+			if ( isset( $_REQUEST['post_status'] ) && in_array( $_REQUEST['post_status'] , $avail_post_stati ) ) {
+				$total_items = $post_counts[ $_REQUEST['post_status'] ];
+			} elseif ( isset( $_REQUEST['show_sticky'] ) && $_REQUEST['show_sticky'] ) {
+				$total_items = $this->sticky_posts_count;
+			} elseif ( isset( $_GET['author'] ) && $_GET['author'] == get_current_user_id() ) {
+				$total_items = $this->user_posts_count;
+			} else {
+				$total_items = array_sum( $post_counts );
+
+				// Subtract post types that are not included in the admin all list.
+				foreach ( get_post_stati( array( 'show_in_admin_all_list' => false ) ) as $state ) {
+					$total_items -= $post_counts[ $state ];
+				}
+			}
+		}
 
-		$mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
+		if ( ! empty( $_REQUEST['mode'] ) ) {
+			$mode = $_REQUEST['mode'] === 'excerpt' ? 'excerpt' : 'list';
+			set_user_setting( 'posts_list_mode', $mode );
+		} else {
+			$mode = get_user_setting( 'posts_list_mode', 'list' );
+		}
 
-		$this->is_trash = isset( $_REQUEST['post_status'] ) && $_REQUEST['post_status'] == 'trash';
+		$this->is_trash = isset( $_REQUEST['post_status'] ) && $_REQUEST['post_status'] === 'trash';
 
 		$this->set_pagination_args( array(
 			'total_items' => $total_items,
-			'total_pages' => $total_pages,
 			'per_page' => $per_page
 		) );
 	}
 
-	function has_items() {
+	/**
+	 *
+	 * @return bool
+	 */
+	public function has_items() {
 		return have_posts();
 	}
 
-	function no_items() {
-		if ( isset( $_REQUEST['post_status'] ) && 'trash' == $_REQUEST['post_status'] )
+	/**
+	 * @access public
+	 */
+	public function no_items() {
+		if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] )
 			echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
 		else
 			echo get_post_type_object( $this->screen->post_type )->labels->not_found;
 	}
 
-	function get_views() {
+	/**
+	 * Determine if the current view is the "All" view.
+	 *
+	 * @since 4.2.0
+	 *
+	 * @return bool Whether the current view is the "All" view.
+	 */
+	protected function is_base_request() {
+		$vars = $_GET;
+		unset( $vars['paged'] );
+
+		if ( empty( $vars ) ) {
+			return true;
+		} elseif ( 1 === count( $vars ) && ! empty( $vars['post_type'] ) ) {
+			return $this->screen->post_type === $vars['post_type'];
+		}
+
+		return 1 === count( $vars ) && ! empty( $vars['mode'] );
+	}
+
+	/**
+	 * Helper to create links to edit.php with params.
+	 *
+	 * @since 4.4.0
+	 * @access protected
+	 *
+	 * @param array  $args  URL parameters for the link.
+	 * @param string $label Link text.
+	 * @param string $class Optional. Class attribute. Default empty string.
+	 * @return string The formatted link string.
+	 */
+	protected function get_edit_link( $args, $label, $class = '' ) {
+		$url = add_query_arg( $args, 'edit.php' );
+
+		$class_html = '';
+		if ( ! empty( $class ) ) {
+			 $class_html = sprintf(
+				' class="%s"',
+				esc_attr( $class )
+			);
+		}
+
+		return sprintf(
+			'<a href="%s"%s>%s</a>',
+			esc_url( $url ),
+			$class_html,
+			$label
+		);
+	}
+
+	/**
+	 *
+	 * @global array $locked_post_status This seems to be deprecated.
+	 * @global array $avail_post_stati
+	 * @return array
+	 */
+	protected function get_views() {
 		global $locked_post_status, $avail_post_stati;
 
 		$post_type = $this->screen->post_type;
@@ -130,48 +271,110 @@ class WP_Posts_List_Table extends WP_List_Table {
 
 		$status_links = array();
 		$num_posts = wp_count_posts( $post_type, 'readable' );
+		$total_posts = array_sum( (array) $num_posts );
 		$class = '';
-		$allposts = '';
 
 		$current_user_id = get_current_user_id();
+		$all_args = array( 'post_type' => $post_type );
+		$mine = '';
+
+		// Subtract post types that are not included in the admin all list.
+		foreach ( get_post_stati( array( 'show_in_admin_all_list' => false ) ) as $state ) {
+			$total_posts -= $num_posts->$state;
+		}
+
+		if ( $this->user_posts_count && $this->user_posts_count !== $total_posts ) {
+			if ( isset( $_GET['author'] ) && ( $_GET['author'] == $current_user_id ) ) {
+				$class = 'current';
+			}
+
+			$mine_args = array(
+				'post_type' => $post_type,
+				'author' => $current_user_id
+			);
+
+			$mine_inner_html = sprintf(
+				_nx(
+					'Mine <span class="count">(%s)</span>',
+					'Mine <span class="count">(%s)</span>',
+					$this->user_posts_count,
+					'posts'
+				),
+				number_format_i18n( $this->user_posts_count )
+			);
+
+			$mine = $this->get_edit_link( $mine_args, $mine_inner_html, $class );
 
-		if ( $this->user_posts_count ) {
-			if ( isset( $_GET['author'] ) && ( $_GET['author'] == $current_user_id ) )
-				$class = ' class="current"';
-			$status_links['mine'] = "<a href='edit.php?post_type=$post_type&author=$current_user_id'$class>" . sprintf( _nx( 'Mine <span class="count">(%s)</span>', 'Mine <span class="count">(%s)</span>', $this->user_posts_count, 'posts' ), number_format_i18n( $this->user_posts_count ) ) . '</a>';
-			$allposts = '&all_posts=1';
+			$all_args['all_posts'] = 1;
+			$class = '';
 		}
 
-		$total_posts = array_sum( (array) $num_posts );
+		if ( empty( $class ) && ( $this->is_base_request() || isset( $_REQUEST['all_posts'] ) ) ) {
+			$class = 'current';
+		}
 
-		// Subtract post types that are not included in the admin all list.
-		foreach ( get_post_stati( array('show_in_admin_all_list' => false) ) as $state )
-			$total_posts -= $num_posts->$state;
+		$all_inner_html = sprintf(
+			_nx(
+				'All <span class="count">(%s)</span>',
+				'All <span class="count">(%s)</span>',
+				$total_posts,
+				'posts'
+			),
+			number_format_i18n( $total_posts )
+		);
 
-		$class = empty( $class ) && empty( $_REQUEST['post_status'] ) && empty( $_REQUEST['show_sticky'] ) ? ' class="current"' : '';
-		$status_links['all'] = "<a href='edit.php?post_type=$post_type{$allposts}'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts, 'posts' ), number_format_i18n( $total_posts ) ) . '</a>';
+		$status_links['all'] = $this->get_edit_link( $all_args, $all_inner_html, $class );
+		if ( $mine ) {
+			$status_links['mine'] = $mine;
+		}
 
 		foreach ( get_post_stati(array('show_in_admin_status_list' => true), 'objects') as $status ) {
 			$class = '';
 
 			$status_name = $status->name;
 
-			if ( !in_array( $status_name, $avail_post_stati ) )
+			if ( ! in_array( $status_name, $avail_post_stati ) || empty( $num_posts->$status_name ) ) {
 				continue;
+			}
 
-			if ( empty( $num_posts->$status_name ) )
-				continue;
+			if ( isset($_REQUEST['post_status']) && $status_name === $_REQUEST['post_status'] ) {
+				$class = 'current';
+			}
+
+			$status_args = array(
+				'post_status' => $status_name,
+				'post_type' => $post_type,
+			);
 
-			if ( isset($_REQUEST['post_status']) && $status_name == $_REQUEST['post_status'] )
-				$class = ' class="current"';
+			$status_label = sprintf(
+				translate_nooped_plural( $status->label_count, $num_posts->$status_name ),
+				number_format_i18n( $num_posts->$status_name )
+			);
 
-			$status_links[$status_name] = "<a href='edit.php?post_status=$status_name&post_type=$post_type'$class>" . sprintf( translate_nooped_plural( $status->label_count, $num_posts->$status_name ), number_format_i18n( $num_posts->$status_name ) ) . '</a>';
+			$status_links[ $status_name ] = $this->get_edit_link( $status_args, $status_label, $class );
 		}
 
 		if ( ! empty( $this->sticky_posts_count ) ) {
-			$class = ! empty( $_REQUEST['show_sticky'] ) ? ' class="current"' : '';
-
-			$sticky_link = array( 'sticky' => "<a href='edit.php?post_type=$post_type&show_sticky=1'$class>" . sprintf( _nx( 'Sticky <span class="count">(%s)</span>', 'Sticky <span class="count">(%s)</span>', $this->sticky_posts_count, 'posts' ), number_format_i18n( $this->sticky_posts_count ) ) . '</a>' );
+			$class = ! empty( $_REQUEST['show_sticky'] ) ? 'current' : '';
+
+			$sticky_args = array(
+				'post_type'	=> $post_type,
+				'show_sticky' => 1
+			);
+
+			$sticky_inner_html = sprintf(
+				_nx(
+					'Sticky <span class="count">(%s)</span>',
+					'Sticky <span class="count">(%s)</span>',
+					$this->sticky_posts_count,
+					'posts'
+				),
+				number_format_i18n( $this->sticky_posts_count )
+			);
+
+			$sticky_link = array(
+				'sticky' => $this->get_edit_link( $sticky_args, $sticky_inner_html, $class )
+			);
 
 			// Sticky comes after Publish, or if not listed, after All.
 			$split = 1 + array_search( ( isset( $status_links['publish'] ) ? 'publish' : 'all' ), array_keys( $status_links ) );
@@ -181,40 +384,57 @@ class WP_Posts_List_Table extends WP_List_Table {
 		return $status_links;
 	}
 
-	function get_bulk_actions() {
+	/**
+	 *
+	 * @return array
+	 */
+	protected function get_bulk_actions() {
 		$actions = array();
+		$post_type_obj = get_post_type_object( $this->screen->post_type );
 
-		if ( $this->is_trash )
-			$actions['untrash'] = __( 'Restore' );
-		else
-			$actions['edit'] = __( 'Edit' );
+		if ( current_user_can( $post_type_obj->cap->edit_posts ) ) {
+			if ( $this->is_trash ) {
+				$actions['untrash'] = __( 'Restore' );
+			} else {
+				$actions['edit'] = __( 'Edit' );
+			}
+		}
 
-		if ( $this->is_trash || !EMPTY_TRASH_DAYS )
-			$actions['delete'] = __( 'Delete Permanently' );
-		else
-			$actions['trash'] = __( 'Move to Trash' );
+		if ( current_user_can( $post_type_obj->cap->delete_posts ) ) {
+			if ( $this->is_trash || ! EMPTY_TRASH_DAYS ) {
+				$actions['delete'] = __( 'Delete Permanently' );
+			} else {
+				$actions['trash'] = __( 'Move to Trash' );
+			}
+		}
 
 		return $actions;
 	}
 
-	function extra_tablenav( $which ) {
+	/**
+	 * @global int $cat
+	 * @param string $which
+	 */
+	protected function extra_tablenav( $which ) {
 		global $cat;
 ?>
 		<div class="alignleft actions">
 <?php
-		if ( 'top' == $which && !is_singular() ) {
+		if ( 'top' === $which && !is_singular() ) {
 
 			$this->months_dropdown( $this->screen->post_type );
 
 			if ( is_object_in_taxonomy( $this->screen->post_type, 'category' ) ) {
 				$dropdown_options = array(
-					'show_option_all' => __( 'View all categories' ),
+					'show_option_all' => get_taxonomy( 'category' )->labels->all_items,
 					'hide_empty' => 0,
 					'hierarchical' => 1,
 					'show_count' => 0,
 					'orderby' => 'name',
 					'selected' => $cat
 				);
+
+				echo '<label class="screen-reader-text" for="cat">' . __( 'Filter by category' ) . '</label>';
 				wp_dropdown_categories( $dropdown_options );
 			}
 
@@ -225,10 +445,13 @@ class WP_Posts_List_Table extends WP_List_Table {
 			 * Posts list table, and sorting by date on the Pages list table.
 			 *
 			 * @since 2.1.0
+			 * @since 4.4.0 The `$post_type` parameter was added.
+			 *
+			 * @param string $post_type The post type slug.
 			 */
-			do_action( 'restrict_manage_posts' );
+			do_action( 'restrict_manage_posts', $this->screen->post_type );
 
-			submit_button( __( 'Filter' ), 'button', false, false, array( 'id' => 'post-query-submit' ) );
+			submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
 		}
 
 		if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_others_posts ) ) {
@@ -237,29 +460,41 @@ class WP_Posts_List_Table extends WP_List_Table {
 ?>
 		</div>
 <?php
+		/**
+		 * Fires immediately following the closing "actions" div in the tablenav for the posts
+		 * list table.
+		 *
+		 * @since 4.4.0
+		 *
+		 * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
+		 */
+		do_action( 'manage_posts_extra_tablenav', $which );
 	}
 
-	function current_action() {
+	/**
+	 *
+	 * @return string
+	 */
+	public function current_action() {
 		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
 			return 'delete_all';
 
 		return parent::current_action();
 	}
 
-	function pagination( $which ) {
-		global $mode;
-
-		parent::pagination( $which );
-
-		if ( 'top' == $which && ! is_post_type_hierarchical( $this->screen->post_type ) )
-			$this->view_switcher( $mode );
-	}
-
-	function get_table_classes() {
-		return array( 'widefat', 'fixed', is_post_type_hierarchical( $this->screen->post_type ) ? 'pages' : 'posts' );
+	/**
+	 *
+	 * @return array
+	 */
+	protected function get_table_classes() {
+		return array( 'widefat', 'fixed', 'striped', is_post_type_hierarchical( $this->screen->post_type ) ? 'pages' : 'posts' );
 	}
 
-	function get_columns() {
+	/**
+	 *
+	 * @return array
+	 */
+	public function get_columns() {
 		$post_type = $this->screen->post_type;
 
 		$posts_columns = array();
@@ -269,10 +504,9 @@ class WP_Posts_List_Table extends WP_List_Table {
 		/* translators: manage posts column name */
 		$posts_columns['title'] = _x( 'Title', 'column name' );
 
-		if ( post_type_supports( $post_type, 'author' ) )
+		if ( post_type_supports( $post_type, 'author' ) ) {
 			$posts_columns['author'] = __( 'Author' );
-
-		$taxonomies = array();
+		}
 
 		$taxonomies = get_object_taxonomies( $post_type, 'objects' );
 		$taxonomies = wp_filter_object_list( $taxonomies, array( 'show_admin_column' => true ), 'and', 'name' );
@@ -280,7 +514,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 		/**
 		 * Filter the taxonomy columns in the Posts list table.
 		 *
-		 * The dynamic portion of the hook name, $post_type, refers to the post
+		 * The dynamic portion of the hook name, `$post_type`, refers to the post
 		 * type slug.
 		 *
 		 * @since 3.5.0
@@ -292,9 +526,9 @@ class WP_Posts_List_Table extends WP_List_Table {
 		$taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
 
 		foreach ( $taxonomies as $taxonomy ) {
-			if ( 'category' == $taxonomy )
+			if ( 'category' === $taxonomy )
 				$column_key = 'categories';
-			elseif ( 'post_tag' == $taxonomy )
+			elseif ( 'post_tag' === $taxonomy )
 				$column_key = 'tags';
 			else
 				$column_key = 'taxonomy-' . $taxonomy;
@@ -304,11 +538,11 @@ class WP_Posts_List_Table extends WP_List_Table {
 
 		$post_status = !empty( $_REQUEST['post_status'] ) ? $_REQUEST['post_status'] : 'all';
 		if ( post_type_supports( $post_type, 'comments' ) && !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) )
-			$posts_columns['comments'] = '<span class="vers"><span title="' . esc_attr__( 'Comments' ) . '" class="comment-grey-bubble"></span></span>';
+			$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
 
 		$posts_columns['date'] = __( 'Date' );
 
-		if ( 'page' == $post_type ) {
+		if ( 'page' === $post_type ) {
 
 			/**
 			 * Filter the columns displayed in the Pages list table.
@@ -334,18 +568,20 @@ class WP_Posts_List_Table extends WP_List_Table {
 		/**
 		 * Filter the columns displayed in the Posts list table for a specific post type.
 		 *
-		 * The dynamic portion of the hook name, $post_type, refers to the post type slug.
+		 * The dynamic portion of the hook name, `$post_type`, refers to the post type slug.
 		 *
 		 * @since 3.0.0
 		 *
 		 * @param array $post_columns An array of column names.
 		 */
-		$posts_columns = apply_filters( "manage_{$post_type}_posts_columns", $posts_columns );
-
-		return $posts_columns;
+		return apply_filters( "manage_{$post_type}_posts_columns", $posts_columns );
 	}
 
-	function get_sortable_columns() {
+	/**
+	 *
+	 * @return array
+	 */
+	protected function get_sortable_columns() {
 		return array(
 			'title'    => 'title',
 			'parent'   => 'parent',
@@ -354,7 +590,13 @@ class WP_Posts_List_Table extends WP_List_Table {
 		);
 	}
 
-	function display_rows( $posts = array(), $level = 0 ) {
+	/**
+	 * @global WP_Query $wp_query
+	 * @global int $per_page
+	 * @param array $posts
+	 * @param int $level
+	 */
+	public function display_rows( $posts = array(), $level = 0 ) {
 		global $wp_query, $per_page;
 
 		if ( empty( $posts ) )
@@ -369,9 +611,11 @@ class WP_Posts_List_Table extends WP_List_Table {
 		}
 	}
 
-	function _display_rows( $posts, $level = 0 ) {
-		global $mode;
-
+	/**
+	 * @param array $posts
+	 * @param int $level
+	 */
+	private function _display_rows( $posts, $level = 0 ) {
 		// Create array of post IDs.
 		$post_ids = array();
 
@@ -384,7 +628,14 @@ class WP_Posts_List_Table extends WP_List_Table {
 			$this->single_row( $post, $level );
 	}
 
-	function _display_rows_hierarchical( $pages, $pagenum = 1, $per_page = 20 ) {
+	/**
+	 * @global wpdb    $wpdb
+	 * @global WP_Post $post
+	 * @param array $pages
+	 * @param int $pagenum
+	 * @param int $per_page
+	 */
+	private function _display_rows_hierarchical( $pages, $pagenum = 1, $per_page = 20 ) {
 		global $wpdb;
 
 		$level = 0;
@@ -393,7 +644,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 			$pages = get_pages( array( 'sort_column' => 'menu_order' ) );
 
 			if ( ! $pages )
-				return false;
+				return;
 		}
 
 		/*
@@ -410,7 +661,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 
 			foreach ( $pages as $page ) {
 
-				// catch and repair bad pages
+				// Catch and repair bad pages.
 				if ( $page->post_parent == $page->ID ) {
 					$page->post_parent = 0;
 					$wpdb->update( $wpdb->posts, array( 'post_parent' => 0 ), array( 'ID' => $page->ID ) );
@@ -429,23 +680,23 @@ class WP_Posts_List_Table extends WP_List_Table {
 		$count = 0;
 		$start = ( $pagenum - 1 ) * $per_page;
 		$end = $start + $per_page;
+		$to_display = array();
 
 		foreach ( $pages as $page ) {
 			if ( $count >= $end )
 				break;
 
 			if ( $count >= $start ) {
-				echo "\t";
-				$this->single_row( $page, $level );
+				$to_display[$page->ID] = $level;
 			}
 
 			$count++;
 
 			if ( isset( $children_pages ) )
-				$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page );
+				$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
 		}
 
-		// if it is the last pagenum and there are orphaned pages, display them with paging as well
+		// If it is the last pagenum and there are orphaned pages, display them with paging as well.
 		if ( isset( $children_pages ) && $count < $end ){
 			foreach ( $children_pages as $orphans ){
 				foreach ( $orphans as $op ) {
@@ -453,14 +704,25 @@ class WP_Posts_List_Table extends WP_List_Table {
 						break;
 
 					if ( $count >= $start ) {
-						echo "\t";
-						$this->single_row( $op, 0 );
+						$to_display[$op->ID] = 0;
 					}
 
 					$count++;
 				}
 			}
 		}
+
+		$ids = array_keys( $to_display );
+		_prime_post_caches( $ids );
+
+		if ( ! isset( $GLOBALS['post'] ) ) {
+			$GLOBALS['post'] = reset( $ids );
+		}
+
+		foreach ( $to_display as $page_id => $level ) {
+			echo "\t";
+			$this->single_row( $page_id, $level );
+		}
 	}
 
 	/**
@@ -468,6 +730,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 	 * together with paging support
 	 *
 	 * @since 3.1.0 (Standalone function exists since 2.6.0)
+	 * @since 4.2.0 Added the `$to_display` parameter.
 	 *
 	 * @param array $children_pages
 	 * @param int $count
@@ -475,9 +738,9 @@ class WP_Posts_List_Table extends WP_List_Table {
 	 * @param int $level
 	 * @param int $pagenum
 	 * @param int $per_page
+	 * @param array $to_display List of pages to be displayed. Passed by reference.
 	 */
-	function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page ) {
-
+	private function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page, &$to_display ) {
 		if ( ! isset( $children_pages[$parent] ) )
 			return;
 
@@ -485,7 +748,6 @@ class WP_Posts_List_Table extends WP_List_Table {
 		$end = $start + $per_page;
 
 		foreach ( $children_pages[$parent] as $page ) {
-
 			if ( $count >= $end )
 				break;
 
@@ -494,7 +756,13 @@ class WP_Posts_List_Table extends WP_List_Table {
 				$my_parents = array();
 				$my_parent = $page->post_parent;
 				while ( $my_parent ) {
-					$my_parent = get_post( $my_parent );
+					// Get the ID from the list or the attribute if my_parent is an object
+					$parent_id = $my_parent;
+					if ( is_object( $my_parent ) ) {
+						$parent_id = $my_parent->ID;
+					}
+
+					$my_parent = get_post( $parent_id );
 					$my_parents[] = $my_parent;
 					if ( !$my_parent->post_parent )
 						break;
@@ -502,384 +770,524 @@ class WP_Posts_List_Table extends WP_List_Table {
 				}
 				$num_parents = count( $my_parents );
 				while ( $my_parent = array_pop( $my_parents ) ) {
-					echo "\t";
-					$this->single_row( $my_parent, $level - $num_parents );
+					$to_display[$my_parent->ID] = $level - $num_parents;
 					$num_parents--;
 				}
 			}
 
 			if ( $count >= $start ) {
-				echo "\t";
-				$this->single_row( $page, $level );
+				$to_display[$page->ID] = $level;
 			}
 
 			$count++;
 
-			$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page );
+			$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
 		}
 
 		unset( $children_pages[$parent] ); //required in order to keep track of orphans
 	}
 
-	function single_row( $post, $level = 0 ) {
+	/**
+	 * Handles the checkbox column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param WP_Post $post The current WP_Post object.
+	 */
+	public function column_cb( $post ) {
+		if ( current_user_can( 'edit_post', $post->ID ) ): ?>
+			<label class="screen-reader-text" for="cb-select-<?php the_ID(); ?>"><?php
+				printf( __( 'Select %s' ), _draft_or_post_title() );
+			?></label>
+			<input id="cb-select-<?php the_ID(); ?>" type="checkbox" name="post[]" value="<?php the_ID(); ?>" />
+			<div class="locked-indicator"></div>
+		<?php endif;
+	}
+
+	/**
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @param WP_Post $post
+	 * @param string  $classes
+	 * @param string  $data
+	 * @param string  $primary
+	 */
+	protected function _column_title( $post, $classes, $data, $primary ) {
+		echo '<td class="' . $classes . ' page-title" ', $data, '>';
+		echo $this->column_title( $post );
+		echo $this->handle_row_actions( $post, 'title', $primary );
+		echo '</td>';
+	}
+
+	/**
+	 * Handles the title column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @global string $mode
+	 *
+	 * @param WP_Post $post The current WP_Post object.
+	 */
+	public function column_title( $post ) {
 		global $mode;
-		static $alternate;
 
-		$global_post = get_post();
-		$GLOBALS['post'] = $post;
-		setup_postdata( $post );
+		if ( $this->hierarchical_display ) {
+			if ( 0 === $this->current_level && (int) $post->post_parent > 0 ) {
+				// Sent level 0 by accident, by default, or because we don't know the actual level.
+				$find_main_page = (int) $post->post_parent;
+				while ( $find_main_page > 0 ) {
+					$parent = get_post( $find_main_page );
 
-		$edit_link = get_edit_post_link( $post->ID );
-		$title = _draft_or_post_title();
-		$post_type_object = get_post_type_object( $post->post_type );
-		$can_edit_post = current_user_can( 'edit_post', $post->ID );
+					if ( is_null( $parent ) ) {
+						break;
+					}
 
-		$alternate = 'alternate' == $alternate ? '' : 'alternate';
-		$classes = $alternate . ' iedit author-' . ( get_current_user_id() == $post->post_author ? 'self' : 'other' );
+					$this->current_level++;
+					$find_main_page = (int) $parent->post_parent;
 
-		$lock_holder = wp_check_post_lock( $post->ID );
-		if ( $lock_holder ) {
-			$classes .= ' wp-locked';
-			$lock_holder = get_userdata( $lock_holder );
+					if ( ! isset( $parent_name ) ) {
+						/** This filter is documented in wp-includes/post-template.php */
+						$parent_name = apply_filters( 'the_title', $parent->post_title, $parent->ID );
+					}
+				}
+			}
 		}
 
-		if ( $post->post_parent ) {
-		    $count = count( get_post_ancestors( $post->ID ) );
-		    $classes .= ' level-'. $count;
-		} else {
-		    $classes .= ' level-0';
+		$pad = str_repeat( '— ', $this->current_level );
+		echo "<strong>";
+
+		$format = get_post_format( $post->ID );
+		if ( $format ) {
+			$label = get_post_format_string( $format );
+
+			$format_class = 'post-state-format post-format-icon post-format-' . $format;
+
+			$format_args = array(
+				'post_format' => $format,
+				'post_type' => $post->post_type
+			);
+
+			echo $this->get_edit_link( $format_args, $label . ':', $format_class );
 		}
-	?>
-		<tr id="post-<?php echo $post->ID; ?>" class="<?php echo implode( ' ', get_post_class( $classes, $post->ID ) ); ?>">
-	<?php
 
-		list( $columns, $hidden ) = $this->get_column_info();
+		$can_edit_post = current_user_can( 'edit_post', $post->ID );
+		$title = _draft_or_post_title();
 
-		foreach ( $columns as $column_name => $column_display_name ) {
-			$class = "class=\"$column_name column-$column_name\"";
+		if ( $can_edit_post && $post->post_status != 'trash' ) {
+			printf(
+				'<a class="row-title" href="%s" aria-label="%s">%s%s</a>',
+				get_edit_post_link( $post->ID ),
+				/* translators: %s: post title */
+				esc_attr( sprintf( __( '“%s” (Edit)' ), $title ) ),
+				$pad,
+				$title
+			);
+		} else {
+			echo $pad . $title;
+		}
+		_post_states( $post );
 
-			$style = '';
-			if ( in_array( $column_name, $hidden ) )
-				$style = ' style="display:none;"';
+		if ( isset( $parent_name ) ) {
+			$post_type_object = get_post_type_object( $post->post_type );
+			echo ' | ' . $post_type_object->labels->parent_item_colon . ' ' . esc_html( $parent_name );
+		}
+		echo "</strong>\n";
 
-			$attributes = "$class$style";
+		if ( $can_edit_post && $post->post_status != 'trash' ) {
+			$lock_holder = wp_check_post_lock( $post->ID );
 
-			switch ( $column_name ) {
+			if ( $lock_holder ) {
+				$lock_holder = get_userdata( $lock_holder );
+				$locked_avatar = get_avatar( $lock_holder->ID, 18 );
+				$locked_text = esc_html( sprintf( __( '%s is currently editing' ), $lock_holder->display_name ) );
+			} else {
+				$locked_avatar = $locked_text = '';
+			}
 
-			case 'cb':
-			?>
-			<th scope="row" class="check-column">
-				<?php
-				if ( $can_edit_post ) {
+			echo '<div class="locked-info"><span class="locked-avatar">' . $locked_avatar . '</span> <span class="locked-text">' . $locked_text . "</span></div>\n";
+		}
 
-				?>
-				<label class="screen-reader-text" for="cb-select-<?php the_ID(); ?>"><?php printf( __( 'Select %s' ), $title ); ?></label>
-				<input id="cb-select-<?php the_ID(); ?>" type="checkbox" name="post[]" value="<?php the_ID(); ?>" />
-				<div class="locked-indicator"></div>
-				<?php
-				}
-				?>
-			</th>
-			<?php
-			break;
-
-			case 'title':
-				$attributes = 'class="post-title page-title column-title"' . $style;
-				if ( $this->hierarchical_display ) {
-					if ( 0 == $level && (int) $post->post_parent > 0 ) {
-						//sent level 0 by accident, by default, or because we don't know the actual level
-						$find_main_page = (int) $post->post_parent;
-						while ( $find_main_page > 0 ) {
-							$parent = get_post( $find_main_page );
-
-							if ( is_null( $parent ) )
-								break;
-
-							$level++;
-							$find_main_page = (int) $parent->post_parent;
-
-							if ( !isset( $parent_name ) ) {
-								/** This filter is documented in wp-includes/post-template.php */
-								$parent_name = apply_filters( 'the_title', $parent->post_title, $parent->ID );
-							}
-						}
-					}
-				}
+		if ( ! is_post_type_hierarchical( $this->screen->post_type ) && 'excerpt' === $mode && current_user_can( 'read_post', $post->ID ) ) {
+			the_excerpt();
+		}
 
-				$pad = str_repeat( '— ', $level );
-				echo "<td $attributes><strong>";
+		get_inline_data( $post );
+	}
 
-				if ( $format = get_post_format( $post->ID ) ) {
-					$label = get_post_format_string( $format );
+	/**
+	 * Handles the post date column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @global string $mode
+	 *
+	 * @param WP_Post $post The current WP_Post object.
+	 */
+	public function column_date( $post ) {
+		global $mode;
 
-					echo '<a href="' . esc_url( add_query_arg( array( 'post_format' => $format, 'post_type' => $post->post_type ), 'edit.php' ) ) . '" class="post-state-format post-format-icon post-format-' . $format . '" title="' . $label . '">' . $label . ":</a> ";
-				}
+		if ( '0000-00-00 00:00:00' === $post->post_date ) {
+			$t_time = $h_time = __( 'Unpublished' );
+			$time_diff = 0;
+		} else {
+			$t_time = get_the_time( __( 'Y/m/d g:i:s a' ) );
+			$m_time = $post->post_date;
+			$time = get_post_time( 'G', true, $post );
 
-				if ( $can_edit_post && $post->post_status != 'trash' ) {
-					echo '<a class="row-title" href="' . $edit_link . '" title="' . esc_attr( sprintf( __( 'Edit “%s”' ), $title ) ) . '">' . $pad . $title . '</a>';
-				} else {
-					echo $pad . $title;
-				}
-				_post_states( $post );
+			$time_diff = time() - $time;
 
-				if ( isset( $parent_name ) )
-					echo ' | ' . $post_type_object->labels->parent_item_colon . ' ' . esc_html( $parent_name );
+			if ( $time_diff > 0 && $time_diff < DAY_IN_SECONDS ) {
+				$h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) );
+			} else {
+				$h_time = mysql2date( __( 'Y/m/d' ), $m_time );
+			}
+		}
 
-				echo "</strong>\n";
+		if ( 'publish' === $post->post_status ) {
+			_e( 'Published' );
+		} elseif ( 'future' === $post->post_status ) {
+			if ( $time_diff > 0 ) {
+				echo '<strong class="error-message">' . __( 'Missed schedule' ) . '</strong>';
+			} else {
+				_e( 'Scheduled' );
+			}
+		} else {
+			_e( 'Last Modified' );
+		}
+		echo '<br />';
+		if ( 'excerpt' === $mode ) {
+			/**
+			 * Filter the published time of the post.
+			 *
+			 * If `$mode` equals 'excerpt', the published time and date are both displayed.
+			 * If `$mode` equals 'list' (default), the publish date is displayed, with the
+			 * time and date together available as an abbreviation definition.
+			 *
+			 * @since 2.5.1
+			 *
+			 * @param string  $t_time      The published time.
+			 * @param WP_Post $post        Post object.
+			 * @param string  $column_name The column name.
+			 * @param string  $mode        The list display mode ('excerpt' or 'list').
+			 */
+			echo apply_filters( 'post_date_column_time', $t_time, $post, 'date', $mode );
+		} else {
 
-				if ( $can_edit_post && $post->post_status != 'trash' ) {
-					if ( $lock_holder ) {
-						$locked_avatar = get_avatar( $lock_holder->ID, 18 );
-						$locked_text = esc_html( sprintf( __( '%s is currently editing' ), $lock_holder->display_name ) );
-					} else {
-						$locked_avatar = $locked_text = '';
-					}
+			/** This filter is documented in wp-admin/includes/class-wp-posts-list-table.php */
+			echo '<abbr title="' . $t_time . '">' . apply_filters( 'post_date_column_time', $h_time, $post, 'date', $mode ) . '</abbr>';
+		}
+	}
 
-					echo '<div class="locked-info"><span class="locked-avatar">' . $locked_avatar . '</span> <span class="locked-text">' . $locked_text . "</span></div>\n";
-				}
+	/**
+	 * Handles the comments column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param WP_Post $post The current WP_Post object.
+	 */
+	public function column_comments( $post ) {
+		?>
+		<div class="post-com-count-wrapper">
+		<?php
+			$pending_comments = isset( $this->comment_pending_count[$post->ID] ) ? $this->comment_pending_count[$post->ID] : 0;
 
-				if ( ! $this->hierarchical_display && 'excerpt' == $mode && current_user_can( 'read_post', $post->ID ) )
-						the_excerpt();
+			$this->comments_bubble( $post->ID, $pending_comments );
+		?>
+		</div>
+		<?php
+	}
 
-				$actions = array();
-				if ( $can_edit_post && 'trash' != $post->post_status ) {
-					$actions['edit'] = '<a href="' . get_edit_post_link( $post->ID, true ) . '" title="' . esc_attr( __( 'Edit this item' ) ) . '">' . __( 'Edit' ) . '</a>';
-					$actions['inline hide-if-no-js'] = '<a href="#" class="editinline" title="' . esc_attr( __( 'Edit this item inline' ) ) . '">' . __( 'Quick Edit' ) . '</a>';
-				}
-				if ( current_user_can( 'delete_post', $post->ID ) ) {
-					if ( 'trash' == $post->post_status )
-						$actions['untrash'] = "<a title='" . esc_attr( __( 'Restore this item from the Trash' ) ) . "' href='" . wp_nonce_url( admin_url( sprintf( $post_type_object->_edit_link . '&action=untrash', $post->ID ) ), 'untrash-post_' . $post->ID ) . "'>" . __( 'Restore' ) . "</a>";
-					elseif ( EMPTY_TRASH_DAYS )
-						$actions['trash'] = "<a class='submitdelete' title='" . esc_attr( __( 'Move this item to the Trash' ) ) . "' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
-					if ( 'trash' == $post->post_status || !EMPTY_TRASH_DAYS )
-						$actions['delete'] = "<a class='submitdelete' title='" . esc_attr( __( 'Delete this item permanently' ) ) . "' href='" . get_delete_post_link( $post->ID, '', true ) . "'>" . __( 'Delete Permanently' ) . "</a>";
-				}
-				if ( $post_type_object->public ) {
-					if ( in_array( $post->post_status, array( 'pending', 'draft', 'future' ) ) ) {
-						if ( $can_edit_post ) {
-
-							/** This filter is documented in wp-admin/includes/meta-boxes.php */
-							$actions['view'] = '<a href="' . esc_url( apply_filters( 'preview_post_link', set_url_scheme( add_query_arg( 'preview', 'true', get_permalink( $post->ID ) ) ) ) ) . '" title="' . esc_attr( sprintf( __( 'Preview “%s”' ), $title ) ) . '" rel="permalink">' . __( 'Preview' ) . '</a>';
-						}
-					} elseif ( 'trash' != $post->post_status ) {
-						$actions['view'] = '<a href="' . get_permalink( $post->ID ) . '" title="' . esc_attr( sprintf( __( 'View “%s”' ), $title ) ) . '" rel="permalink">' . __( 'View' ) . '</a>';
+	/**
+	 * Handles the post author column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param WP_Post $post The current WP_Post object.
+	 */
+	public function column_author( $post ) {
+		$args = array(
+			'post_type' => $post->post_type,
+			'author' => get_the_author_meta( 'ID' )
+		);
+		echo $this->get_edit_link( $args, get_the_author() );
+	}
+
+	/**
+	 * Handles the default column output.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param WP_Post $post        The current WP_Post object.
+	 * @param string  $column_name The current column name.
+	 */
+	public function column_default( $post, $column_name ) {
+		if ( 'categories' === $column_name ) {
+			$taxonomy = 'category';
+		} elseif ( 'tags' === $column_name ) {
+			$taxonomy = 'post_tag';
+		} elseif ( 0 === strpos( $column_name, 'taxonomy-' ) ) {
+			$taxonomy = substr( $column_name, 9 );
+		} else {
+			$taxonomy = false;
+		}
+		if ( $taxonomy ) {
+			$taxonomy_object = get_taxonomy( $taxonomy );
+			$terms = get_the_terms( $post->ID, $taxonomy );
+			if ( is_array( $terms ) ) {
+				$out = array();
+				foreach ( $terms as $t ) {
+					$posts_in_term_qv = array();
+					if ( 'post' != $post->post_type ) {
+						$posts_in_term_qv['post_type'] = $post->post_type;
+					}
+					if ( $taxonomy_object->query_var ) {
+						$posts_in_term_qv[ $taxonomy_object->query_var ] = $t->slug;
+					} else {
+						$posts_in_term_qv['taxonomy'] = $taxonomy;
+						$posts_in_term_qv['term'] = $t->slug;
 					}
-				}
 
-				if ( is_post_type_hierarchical( $post->post_type ) ) {
-
-					/**
-					 * Filter the array of row action links on the Pages list table.
-					 *
-					 * The filter is evaluated only for hierarchical post types.
-					 *
-					 * @since 2.8.0
-					 *
-					 * @param array   $actions An array of row action links. Defaults are
-					 *                         'Edit', 'Quick Edit', 'Restore, 'Trash',
-					 *                         'Delete Permanently', 'Preview', and 'View'.
-					 * @param WP_Post $post    The post object.
-					 */
-					$actions = apply_filters( 'page_row_actions', $actions, $post );
-				} else {
-
-					/**
-					 * Filter the array of row action links on the Posts list table.
-					 *
-					 * The filter is evaluated only for non-hierarchical post types.
-					 *
-					 * @since 2.8.0
-					 *
-					 * @param array   $actions An array of row action links. Defaults are
-					 *                         'Edit', 'Quick Edit', 'Restore, 'Trash',
-					 *                         'Delete Permanently', 'Preview', and 'View'.
-					 * @param WP_Post $post    The post object.
-					 */
-					$actions = apply_filters( 'post_row_actions', $actions, $post );
+					$label = esc_html( sanitize_term_field( 'name', $t->name, $t->term_id, $taxonomy, 'display' ) );
+					$out[] = $this->get_edit_link( $posts_in_term_qv, $label );
 				}
+				/* translators: used between list items, there is a space after the comma */
+				echo join( __( ', ' ), $out );
+			} else {
+				echo '<span aria-hidden="true">—</span><span class="screen-reader-text">' . $taxonomy_object->labels->no_terms . '</span>';
+			}
+			return;
+		}
 
-				echo $this->row_actions( $actions );
+		if ( is_post_type_hierarchical( $post->post_type ) ) {
 
-				get_inline_data( $post );
-				echo '</td>';
-			break;
+			/**
+			 * Fires in each custom column on the Posts list table.
+			 *
+			 * This hook only fires if the current post type is hierarchical,
+			 * such as pages.
+			 *
+			 * @since 2.5.0
+			 *
+			 * @param string $column_name The name of the column to display.
+			 * @param int    $post_id     The current post ID.
+			 */
+			do_action( 'manage_pages_custom_column', $column_name, $post->ID );
+		} else {
 
-			case 'date':
-				if ( '0000-00-00 00:00:00' == $post->post_date ) {
-					$t_time = $h_time = __( 'Unpublished' );
-					$time_diff = 0;
-				} else {
-					$t_time = get_the_time( __( 'Y/m/d g:i:s A' ) );
-					$m_time = $post->post_date;
-					$time = get_post_time( 'G', true, $post );
+			/**
+			 * Fires in each custom column in the Posts list table.
+			 *
+			 * This hook only fires if the current post type is non-hierarchical,
+			 * such as posts.
+			 *
+			 * @since 1.5.0
+			 *
+			 * @param string $column_name The name of the column to display.
+			 * @param int    $post_id     The current post ID.
+			 */
+			do_action( 'manage_posts_custom_column', $column_name, $post->ID );
+		}
 
-					$time_diff = time() - $time;
+		/**
+		 * Fires for each custom column of a specific post type in the Posts list table.
+		 *
+		 * The dynamic portion of the hook name, `$post->post_type`, refers to the post type.
+		 *
+		 * @since 3.1.0
+		 *
+		 * @param string $column_name The name of the column to display.
+		 * @param int    $post_id     The current post ID.
+		 */
+		do_action( "manage_{$post->post_type}_posts_custom_column", $column_name, $post->ID );
+	}
 
-					if ( $time_diff > 0 && $time_diff < DAY_IN_SECONDS )
-						$h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) );
-					else
-						$h_time = mysql2date( __( 'Y/m/d' ), $m_time );
-				}
+	/**
+	 * @global WP_Post $post
+	 *
+	 * @param int|WP_Post $post
+	 * @param int         $level
+	 */
+	public function single_row( $post, $level = 0 ) {
+		$global_post = get_post();
 
-				echo '<td ' . $attributes . '>';
-				if ( 'excerpt' == $mode ) {
-
-					/**
-					 * Filter the published time of the post.
-					 *
-					 * If $mode equals 'excerpt', the published time and date are both displayed.
-					 * If $mode equals 'list' (default), the publish date is displayed, with the
-					 * time and date together available as an abbreviation definition.
-					 *
-					 * @since 2.5.1
-					 *
-					 * @param array   $t_time      The published time.
-					 * @param WP_Post $post        Post object.
-					 * @param string  $column_name The column name.
-					 * @param string  $mode        The list display mode ('excerpt' or 'list').
-					 */
-					echo apply_filters( 'post_date_column_time', $t_time, $post, $column_name, $mode );
-				} else {
-
-					/** This filter is documented in wp-admin/includes/class-wp-posts-list-table.php */
-					echo '<abbr title="' . $t_time . '">' . apply_filters( 'post_date_column_time', $h_time, $post, $column_name, $mode ) . '</abbr>';
-				}
-				echo '<br />';
-				if ( 'publish' == $post->post_status ) {
-					_e( 'Published' );
-				} elseif ( 'future' == $post->post_status ) {
-					if ( $time_diff > 0 )
-						echo '<strong class="attention">' . __( 'Missed schedule' ) . '</strong>';
-					else
-						_e( 'Scheduled' );
-				} else {
-					_e( 'Last Modified' );
-				}
-				echo '</td>';
-			break;
+		$post = get_post( $post );
+		$this->current_level = $level;
 
-			case 'comments':
-			?>
-			<td <?php echo $attributes ?>><div class="post-com-count-wrapper">
-			<?php
-				$pending_comments = isset( $this->comment_pending_count[$post->ID] ) ? $this->comment_pending_count[$post->ID] : 0;
+		$GLOBALS['post'] = $post;
+		setup_postdata( $post );
 
-				$this->comments_bubble( $post->ID, $pending_comments );
-			?>
-			</div></td>
-			<?php
-			break;
+		$classes = 'iedit author-' . ( get_current_user_id() == $post->post_author ? 'self' : 'other' );
 
-			case 'author':
-			?>
-			<td <?php echo $attributes ?>><?php
-				printf( '<a href="%s">%s</a>',
-					esc_url( add_query_arg( array( 'post_type' => $post->post_type, 'author' => get_the_author_meta( 'ID' ) ), 'edit.php' )),
-					get_the_author()
-				);
-			?></td>
-			<?php
-			break;
-
-			default:
-				if ( 'categories' == $column_name )
-					$taxonomy = 'category';
-				elseif ( 'tags' == $column_name )
-					$taxonomy = 'post_tag';
-				elseif ( 0 === strpos( $column_name, 'taxonomy-' ) )
-					$taxonomy = substr( $column_name, 9 );
-				else
-					$taxonomy = false;
-
-				if ( $taxonomy ) {
-					$taxonomy_object = get_taxonomy( $taxonomy );
-					echo '<td ' . $attributes . '>';
-					if ( $terms = get_the_terms( $post->ID, $taxonomy ) ) {
-						$out = array();
-						foreach ( $terms as $t ) {
-							$posts_in_term_qv = array();
-							if ( 'post' != $post->post_type )
-								$posts_in_term_qv['post_type'] = $post->post_type;
-							if ( $taxonomy_object->query_var ) {
-								$posts_in_term_qv[ $taxonomy_object->query_var ] = $t->slug;
-							} else {
-								$posts_in_term_qv['taxonomy'] = $taxonomy;
-								$posts_in_term_qv['term'] = $t->slug;
-							}
-
-							$out[] = sprintf( '<a href="%s">%s</a>',
-								esc_url( add_query_arg( $posts_in_term_qv, 'edit.php' ) ),
-								esc_html( sanitize_term_field( 'name', $t->name, $t->term_id, $taxonomy, 'display' ) )
-							);
-						}
-						/* translators: used between list items, there is a space after the comma */
-						echo join( __( ', ' ), $out );
-					} else {
-						echo '—';
-					}
-					echo '</td>';
-					break;
-				}
-			?>
-			<td <?php echo $attributes ?>><?php
-				if ( is_post_type_hierarchical( $post->post_type ) ) {
-
-					/**
-					 * Fires in each custom column on the Posts list table.
-					 *
-					 * This hook only fires if the current post type is hierarchical,
-					 * such as pages.
-					 *
-					 * @since 2.5.0
-					 *
-					 * @param string $column_name The name of the column to display.
-					 * @param int    $post_id     The current post ID.
-					 */
-					do_action( 'manage_pages_custom_column', $column_name, $post->ID );
-				} else {
-
-					/**
-					 * Fires in each custom column in the Posts list table.
-					 *
-					 * This hook only fires if the current post type is non-hierarchical,
-					 * such as posts.
-					 *
-					 * @since 1.5.0
-					 *
-					 * @param string $column_name The name of the column to display.
-					 * @param int    $post_id     The current post ID.
-					 */
-					do_action( 'manage_posts_custom_column', $column_name, $post->ID );
-				}
+		$lock_holder = wp_check_post_lock( $post->ID );
+		if ( $lock_holder ) {
+			$classes .= ' wp-locked';
+		}
 
-				/**
-				 * Fires for each custom column of a specific post type in the Posts list table.
-				 *
-				 * The dynamic portion of the hook name, $post->post_type, refers to the post type.
-				 *
-				 * @since 3.1.0
-				 *
-				 * @param string $column_name The name of the column to display.
-				 * @param int    $post_id     The current post ID.
-				 */
-				do_action( "manage_{$post->post_type}_posts_custom_column", $column_name, $post->ID );
-			?></td>
-			<?php
-			break;
-			}
+		if ( $post->post_parent ) {
+		    $count = count( get_post_ancestors( $post->ID ) );
+		    $classes .= ' level-'. $count;
+		} else {
+		    $classes .= ' level-0';
 		}
 	?>
+		<tr id="post-<?php echo $post->ID; ?>" class="<?php echo implode( ' ', get_post_class( $classes, $post->ID ) ); ?>">
+			<?php $this->single_row_columns( $post ); ?>
 		</tr>
 	<?php
 		$GLOBALS['post'] = $global_post;
 	}
 
+	/**
+	 * Gets the name of the default primary column.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @return string Name of the default primary column, in this case, 'title'.
+	 */
+	protected function get_default_primary_column_name() {
+		return 'title';
+	}
+
+	/**
+	 * Generates and displays row action links.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @param object $post        Post being acted upon.
+	 * @param string $column_name Current column name.
+	 * @param string $primary     Primary column name.
+	 * @return string Row actions output for posts.
+	 */
+	protected function handle_row_actions( $post, $column_name, $primary ) {
+		if ( $primary !== $column_name ) {
+			return '';
+		}
+
+		$post_type_object = get_post_type_object( $post->post_type );
+		$can_edit_post = current_user_can( 'edit_post', $post->ID );
+		$actions = array();
+		$title = _draft_or_post_title();
+
+		if ( $can_edit_post && 'trash' != $post->post_status ) {
+			$actions['edit'] = sprintf(
+				'<a href="%s" aria-label="%s">%s</a>',
+				get_edit_post_link( $post->ID ),
+				/* translators: %s: post title */
+				esc_attr( sprintf( __( 'Edit “%s”' ), $title ) ),
+				__( 'Edit' )
+			);
+			$actions['inline hide-if-no-js'] = sprintf(
+				'<a href="#" class="editinline" aria-label="%s">%s</a>',
+				/* translators: %s: post title */
+				esc_attr( sprintf( __( 'Quick edit “%s” inline' ), $title ) ),
+				__( 'Quick Edit' )
+			);
+		}
+
+		if ( current_user_can( 'delete_post', $post->ID ) ) {
+			if ( 'trash' === $post->post_status ) {
+				$actions['untrash'] = sprintf(
+					'<a href="%s" aria-label="%s">%s</a>',
+					wp_nonce_url( admin_url( sprintf( $post_type_object->_edit_link . '&action=untrash', $post->ID ) ), 'untrash-post_' . $post->ID ),
+					/* translators: %s: post title */
+					esc_attr( sprintf( __( 'Restore “%s” from the Trash' ), $title ) ),
+					__( 'Restore' )
+				);
+			} elseif ( EMPTY_TRASH_DAYS ) {
+				$actions['trash'] = sprintf(
+					'<a href="%s" class="submitdelete" aria-label="%s">%s</a>',
+					get_delete_post_link( $post->ID ),
+					/* translators: %s: post title */
+					esc_attr( sprintf( __( 'Move “%s” to the Trash' ), $title ) ),
+					_x( 'Trash', 'verb' )
+				);
+			}
+			if ( 'trash' === $post->post_status || ! EMPTY_TRASH_DAYS ) {
+				$actions['delete'] = sprintf(
+					'<a href="%s" class="submitdelete" aria-label="%s">%s</a>',
+					get_delete_post_link( $post->ID, '', true ),
+					/* translators: %s: post title */
+					esc_attr( sprintf( __( 'Delete “%s” permanently' ), $title ) ),
+					__( 'Delete Permanently' )
+				);
+			}
+		}
+
+		if ( is_post_type_viewable( $post_type_object ) ) {
+			if ( in_array( $post->post_status, array( 'pending', 'draft', 'future' ) ) ) {
+				if ( $can_edit_post ) {
+					$preview_link = get_preview_post_link( $post );
+					$actions['view'] = sprintf(
+						'<a href="%s" rel="permalink" aria-label="%s">%s</a>',
+						esc_url( $preview_link ),
+						/* translators: %s: post title */
+						esc_attr( sprintf( __( 'Preview “%s”' ), $title ) ),
+						__( 'Preview' )
+					);
+				}
+			} elseif ( 'trash' != $post->post_status ) {
+				$actions['view'] = sprintf(
+					'<a href="%s" rel="permalink" aria-label="%s">%s</a>',
+					get_permalink( $post->ID ),
+					/* translators: %s: post title */
+					esc_attr( sprintf( __( 'View “%s”' ), $title ) ),
+					__( 'View' )
+				);
+			}
+		}
+
+		if ( is_post_type_hierarchical( $post->post_type ) ) {
+
+			/**
+			 * Filter the array of row action links on the Pages list table.
+			 *
+			 * The filter is evaluated only for hierarchical post types.
+			 *
+			 * @since 2.8.0
+			 *
+			 * @param array $actions An array of row action links. Defaults are
+			 *                         'Edit', 'Quick Edit', 'Restore, 'Trash',
+			 *                         'Delete Permanently', 'Preview', and 'View'.
+			 * @param WP_Post $post The post object.
+			 */
+			$actions = apply_filters( 'page_row_actions', $actions, $post );
+		} else {
+
+			/**
+			 * Filter the array of row action links on the Posts list table.
+			 *
+			 * The filter is evaluated only for non-hierarchical post types.
+			 *
+			 * @since 2.8.0
+			 *
+			 * @param array $actions An array of row action links. Defaults are
+			 *                         'Edit', 'Quick Edit', 'Restore, 'Trash',
+			 *                         'Delete Permanently', 'Preview', and 'View'.
+			 * @param WP_Post $post The post object.
+			 */
+			$actions = apply_filters( 'post_row_actions', $actions, $post );
+		}
+
+		return $this->row_actions( $actions );
+	}
+
 	/**
 	 * Outputs the hidden row displayed when inline editing
 	 *
 	 * @since 3.1.0
+	 *
+	 * @global string $mode
 	 */
-	function inline_edit() {
+	public function inline_edit() {
 		global $mode;
 
 		$screen = $this->screen;
@@ -891,10 +1299,23 @@ class WP_Posts_List_Table extends WP_List_Table {
 		$hierarchical_taxonomies = array();
 		$flat_taxonomies = array();
 		foreach ( $taxonomy_names as $taxonomy_name ) {
+
 			$taxonomy = get_taxonomy( $taxonomy_name );
 
-			if ( !$taxonomy->show_ui )
+			$show_in_quick_edit = $taxonomy->show_in_quick_edit;
+
+			/**
+			 * Filter whether the current taxonomy should be shown in the Quick Edit panel.
+			 *
+			 * @since 4.2.0
+			 *
+			 * @param bool   $show_in_quick_edit Whether to show the current taxonomy in Quick Edit.
+			 * @param string $taxonomy_name      Taxonomy name.
+			 * @param string $post_type          Post type of current Quick Edit post.
+			 */
+			if ( ! apply_filters( 'quick_edit_show_taxonomy', $show_in_quick_edit, $taxonomy_name, $screen->post_type ) ) {
 				continue;
+			}
 
 			if ( $taxonomy->hierarchical )
 				$hierarchical_taxonomies[] = $taxonomy;
@@ -902,13 +1323,13 @@ class WP_Posts_List_Table extends WP_List_Table {
 				$flat_taxonomies[] = $taxonomy;
 		}
 
-		$m = ( isset( $mode ) && 'excerpt' == $mode ) ? 'excerpt' : 'list';
+		$m = ( isset( $mode ) && 'excerpt' === $mode ) ? 'excerpt' : 'list';
 		$can_publish = current_user_can( $post_type_object->cap->publish_posts );
 		$core_columns = array( 'cb' => true, 'date' => true, 'title' => true, 'categories' => true, 'tags' => true, 'comments' => true, 'author' => true );
 
 	?>
 
-	<form method="get" action=""><table style="display: none"><tbody id="inlineedit">
+	<form method="get"><table style="display: none"><tbody id="inlineedit">
 		<?php
 		$hclass = count( $hierarchical_taxonomies ) ? 'post' : 'page';
 		$bulk = 0;
@@ -918,8 +1339,9 @@ class WP_Posts_List_Table extends WP_List_Table {
 			echo $bulk ? " bulk-edit-row bulk-edit-row-$hclass bulk-edit-{$screen->post_type}" : " quick-edit-row quick-edit-row-$hclass inline-edit-{$screen->post_type}";
 		?>" style="display: none"><td colspan="<?php echo $this->get_column_count(); ?>" class="colspanchange">
 
-		<fieldset class="inline-edit-col-left"><div class="inline-edit-col">
-			<h4><?php echo $bulk ? __( 'Bulk Edit' ) : __( 'Quick Edit' ); ?></h4>
+		<fieldset class="inline-edit-col-left">
+			<legend class="inline-edit-legend"><?php echo $bulk ? __( 'Bulk Edit' ) : __( 'Quick Edit' ); ?></legend>
+			<div class="inline-edit-col">
 	<?php
 
 	if ( post_type_supports( $screen->post_type, 'title' ) ) :
@@ -944,10 +1366,10 @@ class WP_Posts_List_Table extends WP_List_Table {
 	endif; // post_type_supports title ?>
 
 	<?php if ( !$bulk ) : ?>
-			<label><span class="title"><?php _e( 'Date' ); ?></span></label>
-			<div class="inline-edit-date">
+			<fieldset class="inline-edit-date">
+			<legend><span class="title"><?php _e( 'Date' ); ?></span></legend>
 				<?php touch_time( 1, 1, 0, 1 ); ?>
-			</div>
+			</fieldset>
 			<br class="clear" />
 	<?php endif; // $bulk
 
@@ -961,7 +1383,8 @@ class WP_Posts_List_Table extends WP_List_Table {
 					'name' => 'post_author',
 					'class'=> 'authors',
 					'multi' => 1,
-					'echo' => 0
+					'echo' => 0,
+					'show' => 'display_name_with_login',
 				);
 				if ( $bulk )
 					$users_opt['show_option_none'] = __( '— No Change —' );
@@ -981,21 +1404,21 @@ class WP_Posts_List_Table extends WP_List_Table {
 	if ( !$bulk && $can_publish ) :
 	?>
 
-			<div class="inline-edit-group">
+			<div class="inline-edit-group wp-clearfix">
 				<label class="alignleft">
 					<span class="title"><?php _e( 'Password' ); ?></span>
 					<span class="input-text-wrap"><input type="text" name="post_password" class="inline-edit-password-input" value="" /></span>
 				</label>
 
-				<em style="margin:5px 10px 0 0" class="alignleft">
+				<em class="alignleft inline-edit-or">
 					<?php
 					/* translators: Between password field and private checkbox on post quick edit interface */
-					echo __( '–OR–' );
+					_e( '–OR–' );
 					?>
 				</em>
 				<label class="alignleft inline-edit-private">
 					<input type="checkbox" name="keep_private" value="private" />
-					<span class="checkbox-title"><?php echo __( 'Private' ); ?></span>
+					<span class="checkbox-title"><?php _e( 'Private' ); ?></span>
 				</label>
 			</div>
 
@@ -1010,7 +1433,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 	<?php foreach ( $hierarchical_taxonomies as $taxonomy ) : ?>
 
 			<span class="title inline-edit-categories-label"><?php echo esc_html( $taxonomy->labels->name ) ?></span>
-			<input type="hidden" name="<?php echo ( $taxonomy->name == 'category' ) ? 'post_category[]' : 'tax_input[' . esc_attr( $taxonomy->name ) . '][]'; ?>" value="0" />
+			<input type="hidden" name="<?php echo ( $taxonomy->name === 'category' ) ? 'post_category[]' : 'tax_input[' . esc_attr( $taxonomy->name ) . '][]'; ?>" value="0" />
 			<ul class="cat-checklist <?php echo esc_attr( $taxonomy->name )?>-checklist">
 				<?php wp_terms_checklist( null, array( 'taxonomy' => $taxonomy->name ) ) ?>
 			</ul>
@@ -1073,7 +1496,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 
 	<?php	endif; // !$bulk
 
-			if ( 'page' == $screen->post_type ) :
+			if ( 'page' === $screen->post_type ) :
 	?>
 
 			<label>
@@ -1082,7 +1505,11 @@ class WP_Posts_List_Table extends WP_List_Table {
 	<?php	if ( $bulk ) : ?>
 					<option value="-1"><?php _e( '— No Change —' ); ?></option>
 	<?php	endif; // $bulk ?>
-					<option value="default"><?php _e( 'Default Template' ); ?></option>
+    				<?php
+					/** This filter is documented in wp-admin/includes/meta-boxes.php */
+					$default_title = apply_filters( 'default_page_template_title',  __( 'Default Template' ), 'quick-edit' );
+    				?>
+					<option value="default"><?php echo esc_html( $default_title ); ?></option>
 					<?php page_template_dropdown() ?>
 				</select>
 			</label>
@@ -1109,7 +1536,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 	<?php if ( post_type_supports( $screen->post_type, 'comments' ) || post_type_supports( $screen->post_type, 'trackbacks' ) ) :
 		if ( $bulk ) : ?>
 
-			<div class="inline-edit-group">
+			<div class="inline-edit-group wp-clearfix">
 		<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
 			<label class="alignleft">
 				<span class="title"><?php _e( 'Comments' ); ?></span>
@@ -1133,7 +1560,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 
 	<?php else : // $bulk ?>
 
-			<div class="inline-edit-group">
+			<div class="inline-edit-group wp-clearfix">
 			<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
 				<label class="alignleft">
 					<input type="checkbox" name="comment_status" value="open" />
@@ -1150,7 +1577,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 	<?php endif; // $bulk
 	endif; // post_type_supports comments or pings ?>
 
-			<div class="inline-edit-group">
+			<div class="inline-edit-group wp-clearfix">
 				<label class="inline-edit-status alignleft">
 					<span class="title"><?php _e( 'Status' ); ?></span>
 					<select name="_status">
@@ -1169,7 +1596,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 					</select>
 				</label>
 
-	<?php if ( 'post' == $screen->post_type && $can_publish && current_user_can( $post_type_object->cap->edit_others_posts ) ) : ?>
+	<?php if ( 'post' === $screen->post_type && $can_publish && current_user_can( $post_type_object->cap->edit_others_posts ) ) : ?>
 
 	<?php	if ( $bulk ) : ?>
 
@@ -1201,19 +1628,19 @@ class WP_Posts_List_Table extends WP_List_Table {
 		$post_formats = get_theme_support( 'post-formats' );
 
 		?>
-		<label class="alignleft" for="post_format">
+		<label class="alignleft">
 		<span class="title"><?php _ex( 'Format', 'post format' ); ?></span>
 		<select name="post_format">
 			<option value="-1"><?php _e( '— No Change —' ); ?></option>
 			<option value="0"><?php echo get_post_format_string( 'standard' ); ?></option>
 			<?php
-
-			foreach ( $post_formats[0] as $format ) {
-				?>
-				<option value="<?php echo esc_attr( $format ); ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></option>
-				<?php
+			if ( is_array( $post_formats[0] ) ) {
+				foreach ( $post_formats[0] as $format ) {
+					?>
+					<option value="<?php echo esc_attr( $format ); ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></option>
+					<?php
+				}
 			}
-
 			?>
 		</select></label>
 	<?php
@@ -1249,8 +1676,8 @@ class WP_Posts_List_Table extends WP_List_Table {
 				 *
 				 * @since 2.7.0
 				 *
-				 * @param string  $column_name Name of the column to edit.
-				 * @param WP_Post $post_type   The post type slug.
+				 * @param string $column_name Name of the column to edit.
+				 * @param string $post_type   The post type slug.
 				 */
 				do_action( 'quick_edit_custom_box', $column_name, $screen->post_type );
 			}
@@ -1258,14 +1685,14 @@ class WP_Posts_List_Table extends WP_List_Table {
 		}
 	?>
 		<p class="submit inline-edit-save">
-			<a accesskey="c" href="#inline-edit" class="button-secondary cancel alignleft"><?php _e( 'Cancel' ); ?></a>
+			<button type="button" class="button-secondary cancel alignleft"><?php _e( 'Cancel' ); ?></button>
 			<?php if ( ! $bulk ) {
 				wp_nonce_field( 'inlineeditnonce', '_inline_edit', false );
 				?>
-				<a accesskey="s" href="#inline-edit" class="button-primary save alignright"><?php _e( 'Update' ); ?></a>
+				<button type="button" class="button-primary save alignright"><?php _e( 'Update' ); ?></button>
 				<span class="spinner"></span>
 			<?php } else {
-				submit_button( __( 'Update' ), 'button-primary alignright', 'bulk_edit', false, array( 'accesskey' => 's' ) );
+				submit_button( __( 'Update' ), 'button-primary alignright', 'bulk_edit', false );
 			} ?>
 			<input type="hidden" name="post_view" value="<?php echo esc_attr( $m ); ?>" />
 			<input type="hidden" name="screen" value="<?php echo esc_attr( $screen->id ); ?>" />
diff --git a/wp-admin/includes/class-wp-press-this.php b/wp-admin/includes/class-wp-press-this.php
new file mode 100644
index 0000000..0288ed0
--- /dev/null
+++ b/wp-admin/includes/class-wp-press-this.php
@@ -0,0 +1,1550 @@
+<?php
+/**
+ * Press This class and display functionality
+ *
+ * @package WordPress
+ * @subpackage Press_This
+ * @since 4.2.0
+ */
+
+/**
+ * Press This class.
+ *
+ * @since 4.2.0
+ */
+class WP_Press_This {
+
+	// Used to trigger the bookmarklet update notice.
+	public $version = 8;
+
+	private $images = array();
+
+	private $embeds = array();
+
+	private $domain = '';
+
+	/**
+	 * Constructor.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 */
+	public function __construct() {}
+
+	/**
+	 * App and site settings data, including i18n strings for the client-side.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 *
+	 * @return array Site settings.
+	 */
+	public function site_settings() {
+		return array(
+			/**
+			 * Filter whether or not Press This should redirect the user in the parent window upon save.
+			 *
+			 * @since 4.2.0
+			 *
+			 * @param bool $redirect Whether to redirect in parent window or not. Default false.
+			 */
+			'redirInParent' => apply_filters( 'press_this_redirect_in_parent', false ),
+		);
+	}
+
+	/**
+	 * Get the source's images and save them locally, for posterity, unless we can't.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 *
+	 * @param int    $post_id Post ID.
+	 * @param string $content Optional. Current expected markup for Press This. Expects slashed. Default empty.
+	 * @return string New markup with old image URLs replaced with the local attachment ones if swapped.
+	 */
+	public function side_load_images( $post_id, $content = '' ) {
+		$content = wp_unslash( $content );
+
+		if ( preg_match_all( '/<img [^>]+>/', $content, $matches ) && current_user_can( 'upload_files' ) ) {
+			foreach ( (array) $matches[0] as $image ) {
+				// This is inserted from our JS so HTML attributes should always be in double quotes.
+				if ( ! preg_match( '/src="([^"]+)"/', $image, $url_matches ) ) {
+					continue;
+				}
+
+				$image_src = $url_matches[1];
+
+				// Don't try to sideload a file without a file extension, leads to WP upload error.
+				if ( ! preg_match( '/[^\?]+\.(?:jpe?g|jpe|gif|png)(?:\?|$)/i', $image_src ) ) {
+					continue;
+				}
+
+				// Sideload image, which gives us a new image src.
+				$new_src = media_sideload_image( $image_src, $post_id, null, 'src' );
+
+				if ( ! is_wp_error( $new_src ) ) {
+					// Replace the POSTED content <img> with correct uploaded ones.
+					// Need to do it in two steps so we don't replace links to the original image if any.
+					$new_image = str_replace( $image_src, $new_src, $image );
+					$content = str_replace( $image, $new_image, $content );
+				}
+			}
+		}
+
+		// Expected slashed
+		return wp_slash( $content );
+	}
+
+	/**
+	 * AJAX handler for saving the post as draft or published.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 */
+	public function save_post() {
+		if ( empty( $_POST['post_ID'] ) || ! $post_id = (int) $_POST['post_ID'] ) {
+			wp_send_json_error( array( 'errorMessage' => __( 'Missing post ID.' ) ) );
+		}
+
+		if ( empty( $_POST['_wpnonce'] ) || ! wp_verify_nonce( $_POST['_wpnonce'], 'update-post_' . $post_id ) ||
+			! current_user_can( 'edit_post', $post_id ) ) {
+
+			wp_send_json_error( array( 'errorMessage' => __( 'Invalid post.' ) ) );
+		}
+
+		$post_data = array(
+			'ID'            => $post_id,
+			'post_title'    => ( ! empty( $_POST['post_title'] ) ) ? sanitize_text_field( trim( $_POST['post_title'] ) ) : '',
+			'post_content'  => ( ! empty( $_POST['post_content'] ) ) ? trim( $_POST['post_content'] ) : '',
+			'post_type'     => 'post',
+			'post_status'   => 'draft',
+			'post_format'   => ( ! empty( $_POST['post_format'] ) ) ? sanitize_text_field( $_POST['post_format'] ) : '',
+			'tax_input'     => ( ! empty( $_POST['tax_input'] ) ) ? $_POST['tax_input'] : array(),
+			'post_category' => ( ! empty( $_POST['post_category'] ) ) ? $_POST['post_category'] : array(),
+		);
+
+		if ( ! empty( $_POST['post_status'] ) && 'publish' === $_POST['post_status'] ) {
+			if ( current_user_can( 'publish_posts' ) ) {
+				$post_data['post_status'] = 'publish';
+			} else {
+				$post_data['post_status'] = 'pending';
+			}
+		}
+
+		$post_data['post_content'] = $this->side_load_images( $post_id, $post_data['post_content'] );
+
+		/**
+		 * Filter the post data of a Press This post before saving/updating, after
+		 * side_load_images action had run.
+		 *
+		 * @since 4.5.0
+		 *
+		 * @param array $post_data The post data.
+		 */
+		$post_data = apply_filters( 'press_this_save_post', $post_data );
+
+		$updated = wp_update_post( $post_data, true );
+
+		if ( is_wp_error( $updated ) ) {
+			wp_send_json_error( array( 'errorMessage' => $updated->get_error_message() ) );
+		} else {
+			if ( isset( $post_data['post_format'] ) ) {
+				if ( current_theme_supports( 'post-formats', $post_data['post_format'] ) ) {
+					set_post_format( $post_id, $post_data['post_format'] );
+				} elseif ( $post_data['post_format'] ) {
+					set_post_format( $post_id, false );
+				}
+			}
+
+			$forceRedirect = false;
+
+			if ( 'publish' === get_post_status( $post_id ) ) {
+				$redirect = get_post_permalink( $post_id );
+			} elseif ( isset( $_POST['pt-force-redirect'] ) && $_POST['pt-force-redirect'] === 'true' ) {
+				$forceRedirect = true;
+				$redirect = get_edit_post_link( $post_id, 'js' );
+			} else {
+				$redirect = false;
+			}
+
+			/**
+			 * Filter the URL to redirect to when Press This saves.
+			 *
+			 * @since 4.2.0
+			 *
+			 * @param string $url     Redirect URL. If `$status` is 'publish', this will be the post permalink.
+			 *                        Otherwise, the default is false resulting in no redirect.
+			 * @param int    $post_id Post ID.
+			 * @param string $status  Post status.
+			 */
+			$redirect = apply_filters( 'press_this_save_redirect', $redirect, $post_id, $post_data['post_status'] );
+
+			if ( $redirect ) {
+				wp_send_json_success( array( 'redirect' => $redirect, 'force' => $forceRedirect ) );
+			} else {
+				wp_send_json_success( array( 'postSaved' => true ) );
+			}
+		}
+	}
+
+	/**
+	 * AJAX handler for adding a new category.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 */
+	public function add_category() {
+		if ( false === wp_verify_nonce( $_POST['new_cat_nonce'], 'add-category' ) ) {
+			wp_send_json_error();
+		}
+
+		$taxonomy = get_taxonomy( 'category' );
+
+		if ( ! current_user_can( $taxonomy->cap->edit_terms ) || empty( $_POST['name'] ) ) {
+			wp_send_json_error();
+		}
+
+		$parent = isset( $_POST['parent'] ) && (int) $_POST['parent'] > 0 ? (int) $_POST['parent'] : 0;
+		$names = explode( ',', $_POST['name'] );
+		$added = $data = array();
+
+		foreach ( $names as $cat_name ) {
+			$cat_name = trim( $cat_name );
+			$cat_nicename = sanitize_title( $cat_name );
+
+			if ( empty( $cat_nicename ) ) {
+				continue;
+			}
+
+			// @todo Find a more performant way to check existence, maybe get_term() with a separate parent check.
+			if ( term_exists( $cat_name, $taxonomy->name, $parent ) ) {
+				if ( count( $names ) === 1 ) {
+					wp_send_json_error( array( 'errorMessage' => __( 'This category already exists.' ) ) );
+				} else {
+					continue;
+				}
+			}
+
+			$cat_id = wp_insert_term( $cat_name, $taxonomy->name, array( 'parent' => $parent ) );
+
+			if ( is_wp_error( $cat_id ) ) {
+				continue;
+			} elseif ( is_array( $cat_id ) ) {
+				$cat_id = $cat_id['term_id'];
+			}
+
+			$added[] = $cat_id;
+		}
+
+		if ( empty( $added ) ) {
+			wp_send_json_error( array( 'errorMessage' => __( 'This category cannot be added. Please change the name and try again.' ) ) );
+		}
+
+		foreach ( $added as $new_cat_id ) {
+			$new_cat = get_category( $new_cat_id );
+
+			if ( is_wp_error( $new_cat ) ) {
+				wp_send_json_error( array( 'errorMessage' => __( 'Error while adding the category. Please try again later.' ) ) );
+			}
+
+			$data[] = array(
+				'term_id' => $new_cat->term_id,
+				'name' => $new_cat->name,
+				'parent' => $new_cat->parent,
+			);
+		}
+		wp_send_json_success( $data );
+	}
+
+	/**
+	 * Downloads the source's HTML via server-side call for the given URL.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 *
+	 * @param string $url URL to scan.
+	 * @return string Source's HTML sanitized markup
+	 */
+	public function fetch_source_html( $url ) {
+		global $wp_version;
+
+		if ( empty( $url ) ) {
+			return new WP_Error( 'invalid-url', __( 'A valid URL was not provided.' ) );
+		}
+
+		$remote_url = wp_safe_remote_get( $url, array(
+			'timeout' => 30,
+			// Use an explicit user-agent for Press This
+			'user-agent' => 'Press This (WordPress/' . $wp_version . '); ' . get_bloginfo( 'url' )
+		) );
+
+		if ( is_wp_error( $remote_url ) ) {
+			return $remote_url;
+		}
+
+		$allowed_elements = array(
+			'img' => array(
+				'src'      => true,
+				'width'    => true,
+				'height'   => true,
+			),
+			'iframe' => array(
+				'src'      => true,
+			),
+			'link' => array(
+				'rel'      => true,
+				'itemprop' => true,
+				'href'     => true,
+			),
+			'meta' => array(
+				'property' => true,
+				'name'     => true,
+				'content'  => true,
+			)
+		);
+
+		$source_content = wp_remote_retrieve_body( $remote_url );
+		$source_content = wp_kses( $source_content, $allowed_elements );
+
+		return $source_content;
+	}
+
+	/**
+	 * Utility method to limit an array to 50 values.
+	 *
+	 * @ignore
+	 * @since 4.2.0
+	 *
+	 * @param array $value Array to limit.
+	 * @return array Original array if fewer than 50 values, limited array, empty array otherwise.
+	 */
+	private function _limit_array( $value ) {
+		if ( is_array( $value ) ) {
+			if ( count( $value ) > 50 ) {
+				return array_slice( $value, 0, 50 );
+			}
+
+			return $value;
+		}
+
+		return array();
+	}
+
+	/**
+	 * Utility method to limit the length of a given string to 5,000 characters.
+	 *
+	 * @ignore
+	 * @since 4.2.0
+	 *
+	 * @param string $value String to limit.
+	 * @return bool|int|string If boolean or integer, that value. If a string, the original value
+	 *                         if fewer than 5,000 characters, a truncated version, otherwise an
+	 *                         empty string.
+	 */
+	private function _limit_string( $value ) {
+		$return = '';
+
+		if ( is_numeric( $value ) || is_bool( $value ) ) {
+			$return = $value;
+		} else if ( is_string( $value ) ) {
+			if ( mb_strlen( $value ) > 5000 ) {
+				$return = mb_substr( $value, 0, 5000 );
+			} else {
+				$return = $value;
+			}
+
+			$return = html_entity_decode( $return, ENT_QUOTES, 'UTF-8' );
+			$return = sanitize_text_field( trim( $return ) );
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Utility method to limit a given URL to 2,048 characters.
+	 *
+	 * @ignore
+	 * @since 4.2.0
+	 *
+	 * @param string $url URL to check for length and validity.
+	 * @return string Escaped URL if of valid length (< 2048) and makeup. Empty string otherwise.
+	 */
+	private function _limit_url( $url ) {
+		if ( ! is_string( $url ) ) {
+			return '';
+		}
+
+		// HTTP 1.1 allows 8000 chars but the "de-facto" standard supported in all current browsers is 2048.
+		if ( strlen( $url ) > 2048 ) {
+			return ''; // Return empty rather than a truncated/invalid URL
+		}
+
+		// Does not look like a URL.
+		if ( ! preg_match( '/^([!#$&-;=?-\[\]_a-z~]|%[0-9a-fA-F]{2})+$/', $url ) ) {
+			return '';
+		}
+
+		// If the URL is root-relative, prepend the protocol and domain name
+		if ( $url && $this->domain && preg_match( '%^/[^/]+%', $url ) ) {
+			$url = $this->domain . $url;
+		}
+
+		// Not absolute or protocol-relative URL.
+		if ( ! preg_match( '%^(?:https?:)?//[^/]+%', $url ) ) {
+			return '';
+		}
+
+		return esc_url_raw( $url, array( 'http', 'https' ) );
+	}
+
+	/**
+	 * Utility method to limit image source URLs.
+	 *
+	 * Excluded URLs include share-this type buttons, loaders, spinners, spacers, WordPress interface images,
+	 * tiny buttons or thumbs, mathtag.com or quantserve.com images, or the WordPress.com stats gif.
+	 *
+	 * @ignore
+	 * @since 4.2.0
+	 *
+	 * @param string $src Image source URL.
+	 * @return string If not matched an excluded URL type, the original URL, empty string otherwise.
+	 */
+	private function _limit_img( $src ) {
+		$src = $this->_limit_url( $src );
+
+		if ( preg_match( '!/ad[sx]?/!i', $src ) ) {
+			// Ads
+			return '';
+		} else if ( preg_match( '!(/share-?this[^.]+?\.[a-z0-9]{3,4})(\?.*)?$!i', $src ) ) {
+			// Share-this type button
+			return '';
+		} else if ( preg_match( '!/(spinner|loading|spacer|blank|rss)\.(gif|jpg|png)!i', $src ) ) {
+			// Loaders, spinners, spacers
+			return '';
+		} else if ( preg_match( '!/([^./]+[-_])?(spinner|loading|spacer|blank)s?([-_][^./]+)?\.[a-z0-9]{3,4}!i', $src ) ) {
+			// Fancy loaders, spinners, spacers
+			return '';
+		} else if ( preg_match( '!([^./]+[-_])?thumb[^.]*\.(gif|jpg|png)$!i', $src ) ) {
+			// Thumbnails, too small, usually irrelevant to context
+			return '';
+		} else if ( false !== stripos( $src, '/wp-includes/' ) ) {
+			// Classic WordPress interface images
+			return '';
+		} else if ( preg_match( '![^\d]\d{1,2}x\d+\.(gif|jpg|png)$!i', $src ) ) {
+			// Most often tiny buttons/thumbs (< 100px wide)
+			return '';
+		} else if ( preg_match( '!/pixel\.(mathtag|quantserve)\.com!i', $src ) ) {
+			// See mathtag.com and https://www.quantcast.com/how-we-do-it/iab-standard-measurement/how-we-collect-data/
+			return '';
+		} else if ( preg_match( '!/[gb]\.gif(\?.+)?$!i', $src ) ) {
+			// WordPress.com stats gif
+			return '';
+		}
+
+		return $src;
+	}
+
+	/**
+	 * Limit embed source URLs to specific providers.
+	 *
+	 * Not all core oEmbed providers are supported. Supported providers include YouTube, Vimeo,
+	 * Vine, Daily Motion, SoundCloud, and Twitter.
+	 *
+	 * @ignore
+	 * @since 4.2.0
+	 *
+	 * @param string $src Embed source URL.
+	 * @return string If not from a supported provider, an empty string. Otherwise, a reformattd embed URL.
+	 */
+	private function _limit_embed( $src ) {
+		$src = $this->_limit_url( $src );
+
+		if ( empty( $src ) )
+			return '';
+
+		if ( preg_match( '!//(m|www)\.youtube\.com/(embed|v)/([^?]+)\?.+$!i', $src, $src_matches ) ) {
+			// Embedded Youtube videos (www or mobile)
+			$src = 'https://www.youtube.com/watch?v=' . $src_matches[3];
+		} else if ( preg_match( '!//player\.vimeo\.com/video/([\d]+)([?/].*)?$!i', $src, $src_matches ) ) {
+			// Embedded Vimeo iframe videos
+			$src = 'https://vimeo.com/' . (int) $src_matches[1];
+		} else if ( preg_match( '!//vimeo\.com/moogaloop\.swf\?clip_id=([\d]+)$!i', $src, $src_matches ) ) {
+			// Embedded Vimeo Flash videos
+			$src = 'https://vimeo.com/' . (int) $src_matches[1];
+		} else if ( preg_match( '!//vine\.co/v/([^/]+)/embed!i', $src, $src_matches ) ) {
+			// Embedded Vine videos
+			$src = 'https://vine.co/v/' . $src_matches[1];
+		} else if ( preg_match( '!//(www\.)?dailymotion\.com/embed/video/([^/?]+)([/?].+)?!i', $src, $src_matches ) ) {
+			// Embedded Daily Motion videos
+			$src = 'https://www.dailymotion.com/video/' . $src_matches[2];
+		} else {
+			require_once( ABSPATH . WPINC . '/class-oembed.php' );
+			$oembed = _wp_oembed_get_object();
+
+			if ( ! $oembed->get_provider( $src, array( 'discover' => false ) ) ) {
+				$src = '';
+			}
+		}
+
+		return $src;
+	}
+
+	/**
+	 * Process a meta data entry from the source.
+	 *
+	 * @ignore
+	 * @since 4.2.0
+	 *
+	 * @param string $meta_name  Meta key name.
+	 * @param mixed  $meta_value Meta value.
+	 * @param array  $data       Associative array of source data.
+	 * @return array Processed data array.
+	 */
+	private function _process_meta_entry( $meta_name, $meta_value, $data ) {
+		if ( preg_match( '/:?(title|description|keywords|site_name)$/', $meta_name ) ) {
+			$data['_meta'][ $meta_name ] = $meta_value;
+		} else {
+			switch ( $meta_name ) {
+				case 'og:url':
+				case 'og:video':
+				case 'og:video:secure_url':
+					$meta_value = $this->_limit_embed( $meta_value );
+
+					if ( ! isset( $data['_embeds'] ) ) {
+						$data['_embeds'] = array();
+					}
+
+					if ( ! empty( $meta_value ) && ! in_array( $meta_value, $data['_embeds'] ) ) {
+						$data['_embeds'][] = $meta_value;
+					}
+
+					break;
+				case 'og:image':
+				case 'og:image:secure_url':
+				case 'twitter:image0:src':
+				case 'twitter:image0':
+				case 'twitter:image:src':
+				case 'twitter:image':
+					$meta_value = $this->_limit_img( $meta_value );
+
+					if ( ! isset( $data['_images'] ) ) {
+						$data['_images'] = array();
+					}
+
+					if ( ! empty( $meta_value ) && ! in_array( $meta_value, $data['_images'] ) ) {
+						$data['_images'][] = $meta_value;
+					}
+
+					break;
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Fetches and parses _meta, _images, and _links data from the source.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 *
+	 * @param string $url  URL to scan.
+	 * @param array  $data Optional. Existing data array if you have one. Default empty array.
+	 * @return array New data array.
+	 */
+	public function source_data_fetch_fallback( $url, $data = array() ) {
+		if ( empty( $url ) ) {
+			return array();
+		}
+
+		// Download source page to tmp file.
+		$source_content = $this->fetch_source_html( $url );
+		if ( is_wp_error( $source_content ) ) {
+			return array( 'errors' => $source_content->get_error_messages() );
+		}
+
+		// Fetch and gather <meta> data first, so discovered media is offered 1st to user.
+		if ( empty( $data['_meta'] ) ) {
+			$data['_meta'] = array();
+		}
+
+		if ( preg_match_all( '/<meta [^>]+>/', $source_content, $matches ) ) {
+			$items = $this->_limit_array( $matches[0] );
+
+			foreach ( $items as $value ) {
+				if ( preg_match( '/(property|name)="([^"]+)"[^>]+content="([^"]+)"/', $value, $new_matches ) ) {
+					$meta_name  = $this->_limit_string( $new_matches[2] );
+					$meta_value = $this->_limit_string( $new_matches[3] );
+
+					// Sanity check. $key is usually things like 'title', 'description', 'keywords', etc.
+					if ( strlen( $meta_name ) > 100 ) {
+						continue;
+					}
+
+					$data = $this->_process_meta_entry( $meta_name, $meta_value, $data );
+				}
+			}
+		}
+
+		// Fetch and gather <img> data.
+		if ( empty( $data['_images'] ) ) {
+			$data['_images'] = array();
+		}
+
+		if ( preg_match_all( '/<img [^>]+>/', $source_content, $matches ) ) {
+			$items = $this->_limit_array( $matches[0] );
+
+			foreach ( $items as $value ) {
+				if ( ( preg_match( '/width=(\'|")(\d+)\\1/i', $value, $new_matches ) && $new_matches[2] < 256 ) ||
+					( preg_match( '/height=(\'|")(\d+)\\1/i', $value, $new_matches ) && $new_matches[2] < 128 ) ) {
+
+					continue;
+				}
+
+				if ( preg_match( '/src=(\'|")([^\'"]+)\\1/i', $value, $new_matches ) ) {
+					$src = $this->_limit_img( $new_matches[2] );
+					if ( ! empty( $src ) && ! in_array( $src, $data['_images'] ) ) {
+						$data['_images'][] = $src;
+					}
+				}
+			}
+		}
+
+		// Fetch and gather <iframe> data.
+		if ( empty( $data['_embeds'] ) ) {
+			$data['_embeds'] = array();
+		}
+
+		if ( preg_match_all( '/<iframe [^>]+>/', $source_content, $matches ) ) {
+			$items = $this->_limit_array( $matches[0] );
+
+			foreach ( $items as $value ) {
+				if ( preg_match( '/src=(\'|")([^\'"]+)\\1/', $value, $new_matches ) ) {
+					$src = $this->_limit_embed( $new_matches[2] );
+
+					if ( ! empty( $src ) && ! in_array( $src, $data['_embeds'] ) ) {
+						$data['_embeds'][] = $src;
+					}
+				}
+			}
+		}
+
+		// Fetch and gather <link> data.
+		if ( empty( $data['_links'] ) ) {
+			$data['_links'] = array();
+		}
+
+		if ( preg_match_all( '/<link [^>]+>/', $source_content, $matches ) ) {
+			$items = $this->_limit_array( $matches[0] );
+
+			foreach ( $items as $value ) {
+				if ( preg_match( '/rel=["\'](canonical|shortlink|icon)["\']/i', $value, $matches_rel ) && preg_match( '/href=[\'"]([^\'" ]+)[\'"]/i', $value, $matches_url ) ) {
+					$rel = $matches_rel[1];
+					$url = $this->_limit_url( $matches_url[1] );
+
+					if ( ! empty( $url ) && empty( $data['_links'][ $rel ] ) ) {
+						$data['_links'][ $rel ] = $url;
+					}
+				}
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Handles backward-compat with the legacy version of Press This by supporting its query string params.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 *
+	 * @return array
+	 */
+	public function merge_or_fetch_data() {
+		// Get data from $_POST and $_GET, as appropriate ($_POST > $_GET), to remain backward compatible.
+		$data = array();
+
+		// Only instantiate the keys we want. Sanity check and sanitize each one.
+		foreach ( array( 'u', 's', 't', 'v' ) as $key ) {
+			if ( ! empty( $_POST[ $key ] ) ) {
+				$value = wp_unslash( $_POST[ $key ] );
+			} else if ( ! empty( $_GET[ $key ] ) ) {
+				$value = wp_unslash( $_GET[ $key ] );
+			} else {
+				continue;
+			}
+
+			if ( 'u' === $key ) {
+				$value = $this->_limit_url( $value );
+
+				if ( preg_match( '%^(?:https?:)?//[^/]+%i', $value, $domain_match ) ) {
+					$this->domain = $domain_match[0];
+				}
+			} else {
+				$value = $this->_limit_string( $value );
+			}
+
+			if ( ! empty( $value ) ) {
+				$data[ $key ] = $value;
+			}
+		}
+
+		/**
+		 * Filter whether to enable in-source media discovery in Press This.
+		 *
+		 * @since 4.2.0
+		 *
+		 * @param bool $enable Whether to enable media discovery.
+		 */
+		if ( apply_filters( 'enable_press_this_media_discovery', true ) ) {
+			/*
+			 * If no title, _images, _embed, and _meta was passed via $_POST, fetch data from source as fallback,
+			 * making PT fully backward compatible with the older bookmarklet.
+			 */
+			if ( empty( $_POST ) && ! empty( $data['u'] ) ) {
+				$data = $this->source_data_fetch_fallback( $data['u'], $data );
+			} else {
+				foreach ( array( '_images', '_embeds' ) as $type ) {
+					if ( empty( $_POST[ $type ] ) ) {
+						continue;
+					}
+
+					$data[ $type ] = array();
+					$items = $this->_limit_array( $_POST[ $type ] );
+
+					foreach ( $items as $key => $value ) {
+						if ( $type === '_images' ) {
+							$value = $this->_limit_img( wp_unslash( $value ) );
+						} else {
+							$value = $this->_limit_embed( wp_unslash( $value ) );
+						}
+
+						if ( ! empty( $value ) ) {
+							$data[ $type ][] = $value;
+						}
+					}
+				}
+
+				foreach ( array( '_meta', '_links' ) as $type ) {
+					if ( empty( $_POST[ $type ] ) ) {
+						continue;
+					}
+
+					$data[ $type ] = array();
+					$items = $this->_limit_array( $_POST[ $type ] );
+
+					foreach ( $items as $key => $value ) {
+						// Sanity check. These are associative arrays, $key is usually things like 'title', 'description', 'keywords', etc.
+						if ( empty( $key ) || strlen( $key ) > 100 ) {
+							continue;
+						}
+
+						if ( $type === '_meta' ) {
+							$value = $this->_limit_string( wp_unslash( $value ) );
+
+							if ( ! empty( $value ) ) {
+								$data = $this->_process_meta_entry( $key, $value, $data );
+							}
+						} else {
+							if ( in_array( $key, array( 'canonical', 'shortlink', 'icon' ), true ) ) {
+								$data[ $type ][ $key ] = $this->_limit_url( wp_unslash( $value ) );
+							}
+						}
+					}
+				}
+			}
+
+			// Support passing a single image src as `i`
+			if ( ! empty( $_REQUEST['i'] ) && ( $img_src = $this->_limit_img( wp_unslash( $_REQUEST['i'] ) ) ) ) {
+				if ( empty( $data['_images'] ) ) {
+					$data['_images'] = array( $img_src );
+				} elseif ( ! in_array( $img_src, $data['_images'], true ) ) {
+					array_unshift( $data['_images'], $img_src );
+				}
+			}
+		}
+
+		/**
+		 * Filter the Press This data array.
+		 *
+		 * @since 4.2.0
+		 *
+		 * @param array $data Press This Data array.
+		 */
+		return apply_filters( 'press_this_data', $data );
+	}
+
+	/**
+	 * Adds another stylesheet inside TinyMCE.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 *
+	 * @param string $styles URL to editor stylesheet.
+	 * @return string Possibly modified stylesheets list.
+	 */
+	public function add_editor_style( $styles ) {
+		if ( ! empty( $styles ) ) {
+			$styles .= ',';
+		}
+
+		$press_this = admin_url( 'css/press-this-editor.css' );
+		if ( is_rtl() ) {
+			$press_this = str_replace( '.css', '-rtl.css', $press_this );
+		}
+
+		$open_sans_font_url = '';
+
+		/* translators: If there are characters in your language that are not supported
+		 * by Open Sans, translate this to 'off'. Do not translate into your own language.
+		 */
+		if ( 'off' !== _x( 'on', 'Open Sans font: on or off' ) ) {
+			$subsets = 'latin,latin-ext';
+
+			/* translators: To add an additional Open Sans character subset specific to your language,
+			 * translate this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your own language.
+			 */
+			$subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)' );
+
+			if ( 'cyrillic' == $subset ) {
+				$subsets .= ',cyrillic,cyrillic-ext';
+			} elseif ( 'greek' == $subset ) {
+				$subsets .= ',greek,greek-ext';
+			} elseif ( 'vietnamese' == $subset ) {
+				$subsets .= ',vietnamese';
+			}
+
+			$query_args = array(
+				'family' => urlencode( 'Open Sans:400italic,700italic,400,600,700' ),
+				'subset' => urlencode( $subsets ),
+			);
+
+			$open_sans_font_url = ',' . add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
+		}
+
+		return $styles . $press_this . $open_sans_font_url;
+	}
+
+	/**
+	 * Outputs the post format selection HTML.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 *
+	 * @param WP_Post $post Post object.
+	 */
+	public function post_formats_html( $post ) {
+		if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) ) {
+			$post_formats = get_theme_support( 'post-formats' );
+
+			if ( is_array( $post_formats[0] ) ) {
+				$post_format = get_post_format( $post->ID );
+
+				if ( ! $post_format ) {
+					$post_format = '0';
+				}
+
+				// Add in the current one if it isn't there yet, in case the current theme doesn't support it.
+				if ( $post_format && ! in_array( $post_format, $post_formats[0] ) ) {
+					$post_formats[0][] = $post_format;
+				}
+
+				?>
+				<div id="post-formats-select">
+				<fieldset><legend class="screen-reader-text"><?php _e( 'Post Formats' ); ?></legend>
+					<input type="radio" name="post_format" class="post-format" id="post-format-0" value="0" <?php checked( $post_format, '0' ); ?> />
+					<label for="post-format-0" class="post-format-icon post-format-standard"><?php echo get_post_format_string( 'standard' ); ?></label>
+					<?php
+
+					foreach ( $post_formats[0] as $format ) {
+						$attr_format = esc_attr( $format );
+						?>
+						<br />
+						<input type="radio" name="post_format" class="post-format" id="post-format-<?php echo $attr_format; ?>" value="<?php echo $attr_format; ?>" <?php checked( $post_format, $format ); ?> />
+						<label for="post-format-<?php echo $attr_format ?>" class="post-format-icon post-format-<?php echo $attr_format; ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></label>
+						<?php
+					 }
+
+					 ?>
+				</fieldset>
+				</div>
+				<?php
+			}
+		}
+	}
+
+	/**
+	 * Outputs the categories HTML.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 *
+	 * @param WP_Post $post Post object.
+	 */
+	public function categories_html( $post ) {
+		$taxonomy = get_taxonomy( 'category' );
+
+		if ( current_user_can( $taxonomy->cap->edit_terms ) ) {
+			?>
+			<button type="button" class="add-cat-toggle button-link" aria-expanded="false">
+				<span class="dashicons dashicons-plus"></span><span class="screen-reader-text"><?php _e( 'Toggle add category' ); ?></span>
+			</button>
+			<div class="add-category is-hidden">
+				<label class="screen-reader-text" for="new-category"><?php echo $taxonomy->labels->add_new_item; ?></label>
+				<input type="text" id="new-category" class="add-category-name" placeholder="<?php echo esc_attr( $taxonomy->labels->new_item_name ); ?>" value="" aria-required="true">
+				<label class="screen-reader-text" for="new-category-parent"><?php echo $taxonomy->labels->parent_item_colon; ?></label>
+				<div class="postform-wrapper">
+					<?php
+					wp_dropdown_categories( array(
+						'taxonomy'         => 'category',
+						'hide_empty'       => 0,
+						'name'             => 'new-category-parent',
+						'orderby'          => 'name',
+						'hierarchical'     => 1,
+						'show_option_none' => '— ' . $taxonomy->labels->parent_item . ' —'
+					) );
+					?>
+				</div>
+				<button type="button" class="add-cat-submit"><?php _e( 'Add' ); ?></button>
+			</div>
+			<?php
+
+		}
+		?>
+		<div class="categories-search-wrapper">
+			<input id="categories-search" type="search" class="categories-search" placeholder="<?php esc_attr_e( 'Search categories by name' ) ?>">
+			<label for="categories-search">
+				<span class="dashicons dashicons-search"></span><span class="screen-reader-text"><?php _e( 'Search categories' ); ?></span>
+			</label>
+		</div>
+		<div aria-label="<?php esc_attr_e( 'Categories' ); ?>">
+			<ul class="categories-select">
+				<?php wp_terms_checklist( $post->ID, array( 'taxonomy' => 'category', 'list_only' => true ) ); ?>
+			</ul>
+		</div>
+		<?php
+	}
+
+	/**
+	 * Outputs the tags HTML.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 *
+	 * @param WP_Post $post Post object.
+	 */
+	public function tags_html( $post ) {
+		$taxonomy              = get_taxonomy( 'post_tag' );
+		$user_can_assign_terms = current_user_can( $taxonomy->cap->assign_terms );
+		$esc_tags              = get_terms_to_edit( $post->ID, 'post_tag' );
+
+		if ( ! $esc_tags || is_wp_error( $esc_tags ) ) {
+			$esc_tags = '';
+		}
+
+		?>
+		<div class="tagsdiv" id="post_tag">
+			<div class="jaxtag">
+			<input type="hidden" name="tax_input[post_tag]" class="the-tags" value="<?php echo $esc_tags; // escaped in get_terms_to_edit() ?>">
+		 	<?php
+
+			if ( $user_can_assign_terms ) {
+				?>
+				<div class="ajaxtag hide-if-no-js">
+					<label class="screen-reader-text" for="new-tag-post_tag"><?php _e( 'Tags' ); ?></label>
+					<p>
+						<input type="text" id="new-tag-post_tag" name="newtag[post_tag]" class="newtag form-input-tip" size="16" autocomplete="off" value="" aria-describedby="new-tag-desc" />
+						<button type="button" class="tagadd"><?php _e( 'Add' ); ?></button>
+					</p>
+				</div>
+				<p class="howto" id="new-tag-desc">
+					<?php echo $taxonomy->labels->separate_items_with_commas; ?>
+				</p>
+				<?php
+			}
+
+			?>
+			</div>
+			<div class="tagchecklist"></div>
+		</div>
+		<?php
+
+		if ( $user_can_assign_terms ) {
+			?>
+			<button type="button" class="button-link tagcloud-link" id="link-post_tag"><?php echo $taxonomy->labels->choose_from_most_used; ?></button>
+			<?php
+		}
+	}
+
+	/**
+	 * Get a list of embeds with no duplicates.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 *
+	 * @param array $data The site's data.
+	 * @return array Embeds selected to be available.
+	 */
+	public function get_embeds( $data ) {
+		$selected_embeds = array();
+
+		// Make sure to add the Pressed page if it's a valid oembed itself
+		if ( ! empty ( $data['u'] ) && $this->_limit_embed( $data['u'] ) ) {
+			$data['_embeds'][] = $data['u'];
+		}
+
+		if ( ! empty( $data['_embeds'] ) ) {
+			foreach ( $data['_embeds'] as $src ) {
+				$prot_relative_src = preg_replace( '/^https?:/', '', $src );
+
+				if ( in_array( $prot_relative_src, $this->embeds ) ) {
+					continue;
+				}
+
+				$selected_embeds[] = $src;
+				$this->embeds[] = $prot_relative_src;
+			}
+		}
+
+		return $selected_embeds;
+	}
+
+	/**
+	 * Get a list of images with no duplicates.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 *
+	 * @param array $data The site's data.
+	 * @return array
+	 */
+	public function get_images( $data ) {
+		$selected_images = array();
+
+		if ( ! empty( $data['_images'] ) ) {
+			foreach ( $data['_images'] as $src ) {
+				if ( false !== strpos( $src, 'gravatar.com' ) ) {
+					$src = preg_replace( '%http://[\d]+\.gravatar\.com/%', 'https://secure.gravatar.com/', $src );
+				}
+
+				$prot_relative_src = preg_replace( '/^https?:/', '', $src );
+
+				if ( in_array( $prot_relative_src, $this->images ) ||
+					( false !== strpos( $src, 'avatar' ) && count( $this->images ) > 15 ) ) {
+					// Skip: already selected or some type of avatar and we've already gathered more than 15 images.
+					continue;
+				}
+
+				$selected_images[] = $src;
+				$this->images[] = $prot_relative_src;
+			}
+		}
+
+		return $selected_images;
+	}
+
+	/**
+	 * Gets the source page's canonical link, based on passed location and meta data.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 *
+ 	 * @param array $data The site's data.
+	 * @return string Discovered canonical URL, or empty
+	 */
+	public function get_canonical_link( $data ) {
+		$link = '';
+
+		if ( ! empty( $data['_links']['canonical'] ) ) {
+			$link = $data['_links']['canonical'];
+		} elseif ( ! empty( $data['u'] ) ) {
+			$link = $data['u'];
+		} elseif ( ! empty( $data['_meta'] ) ) {
+			if ( ! empty( $data['_meta']['twitter:url'] ) ) {
+				$link = $data['_meta']['twitter:url'];
+			} else if ( ! empty( $data['_meta']['og:url'] ) ) {
+				$link = $data['_meta']['og:url'];
+			}
+		}
+
+		if ( empty( $link ) && ! empty( $data['_links']['shortlink'] ) ) {
+			$link = $data['_links']['shortlink'];
+		}
+
+		return $link;
+	}
+
+	/**
+	 * Gets the source page's site name, based on passed meta data.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 *
+	 * @param array $data The site's data.
+	 * @return string Discovered site name, or empty
+	 */
+	public function get_source_site_name( $data ) {
+		$name = '';
+
+		if ( ! empty( $data['_meta'] ) ) {
+			if ( ! empty( $data['_meta']['og:site_name'] ) ) {
+				$name = $data['_meta']['og:site_name'];
+			} else if ( ! empty( $data['_meta']['application-name'] ) ) {
+				$name = $data['_meta']['application-name'];
+			}
+		}
+
+		return $name;
+	}
+
+	/**
+	 * Gets the source page's title, based on passed title and meta data.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 *
+	 * @param array $data The site's data.
+	 * @return string Discovered page title, or empty
+	 */
+	public function get_suggested_title( $data ) {
+		$title = '';
+
+		if ( ! empty( $data['t'] ) ) {
+			$title = $data['t'];
+		} elseif ( ! empty( $data['_meta'] ) ) {
+			if ( ! empty( $data['_meta']['twitter:title'] ) ) {
+				$title = $data['_meta']['twitter:title'];
+			} else if ( ! empty( $data['_meta']['og:title'] ) ) {
+				$title = $data['_meta']['og:title'];
+			} else if ( ! empty( $data['_meta']['title'] ) ) {
+				$title = $data['_meta']['title'];
+			}
+		}
+
+		return $title;
+	}
+
+	/**
+	 * Gets the source page's suggested content, based on passed data (description, selection, etc).
+	 *
+	 * Features a blockquoted excerpt, as well as content attribution, if any.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 *
+	 * @param array $data The site's data.
+	 * @return string Discovered content, or empty
+	 */
+	public function get_suggested_content( $data ) {
+		$content = $text = '';
+
+		if ( ! empty( $data['s'] ) ) {
+			$text = $data['s'];
+		} else if ( ! empty( $data['_meta'] ) ) {
+			if ( ! empty( $data['_meta']['twitter:description'] ) ) {
+				$text = $data['_meta']['twitter:description'];
+			} else if ( ! empty( $data['_meta']['og:description'] ) ) {
+				$text = $data['_meta']['og:description'];
+			} else if ( ! empty( $data['_meta']['description'] ) ) {
+				$text = $data['_meta']['description'];
+			}
+
+			// If there is an ellipsis at the end, the description is very likely auto-generated. Better to ignore it.
+			if ( $text && substr( $text, -3 ) === '...' ) {
+				$text = '';
+			}
+		}
+
+		$default_html = array( 'quote' => '', 'link' => '', 'embed' => '' );
+
+		if ( ! empty( $data['u'] ) && $this->_limit_embed( $data['u'] ) ) {
+			$default_html['embed'] = '<p>[embed]' . $data['u'] . '[/embed]</p>';
+
+			if ( ! empty( $data['s'] ) ) {
+				// If the user has selected some text, do quote it.
+				$default_html['quote'] = '<blockquote>%1$s</blockquote>';
+			}
+		} else {
+			$default_html['quote'] = '<blockquote>%1$s</blockquote>';
+			$default_html['link'] = '<p>' . _x( 'Source:', 'Used in Press This to indicate where the content comes from.' ) .
+				' <em><a href="%1$s">%2$s</a></em></p>';
+		}
+
+		/**
+		 * Filter the default HTML tags used in the suggested content for the editor.
+		 *
+		 * The HTML strings use printf format. After filtering the content is added at the specified places with `sprintf()`.
+		 *
+		 * @since 4.2.0
+		 *
+		 * @param array $default_html Associative array with three possible keys:
+		 *                                - 'quote' where %1$s is replaced with the site description or the selected content.
+		 *                                - 'link' where %1$s is link href, %2$s is link text, usually the source page title.
+		 *                                - 'embed' which contains an [embed] shortcode when the source page offers embeddable content.
+		 * @param array $data         Associative array containing the data from the source page.
+		 */
+		$default_html = apply_filters( 'press_this_suggested_html', $default_html, $data );
+
+		if ( ! empty( $default_html['embed'] ) ) {
+			$content .= $default_html['embed'];
+		}
+
+		// Wrap suggested content in the specified HTML.
+		if ( ! empty( $default_html['quote'] ) && $text ) {
+			$content .= sprintf( $default_html['quote'], $text );
+		}
+
+		// Add source attribution if there is one available.
+		if ( ! empty( $default_html['link'] ) ) {
+			$title = $this->get_suggested_title( $data );
+			$url = $this->get_canonical_link( $data );
+
+			if ( ! $title ) {
+				$title = $this->get_source_site_name( $data );
+			}
+
+			if ( $url && $title ) {
+				$content .= sprintf( $default_html['link'], $url, $title );
+			}
+		}
+
+		return $content;
+	}
+
+	/**
+	 * Serves the app's base HTML, which in turns calls the load script.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 *
+	 * @global WP_Locale $wp_locale
+	 * @global string    $wp_version
+	 * @global bool      $is_IE
+	 */
+	public function html() {
+		global $wp_locale, $wp_version;
+
+		// Get data, new (POST) and old (GET).
+		$data = $this->merge_or_fetch_data();
+
+		$post_title = $this->get_suggested_title( $data );
+
+		$post_content = $this->get_suggested_content( $data );
+
+		// Get site settings array/data.
+		$site_settings = $this->site_settings();
+
+		// Pass the images and embeds
+		$images = $this->get_images( $data );
+		$embeds = $this->get_embeds( $data );
+
+		$site_data = array(
+			'v' => ! empty( $data['v'] ) ? $data['v'] : '',
+			'u' => ! empty( $data['u'] ) ? $data['u'] : '',
+			'hasData' => ! empty( $data ),
+		);
+
+		if ( ! empty( $images ) ) {
+			$site_data['_images'] = $images;
+		}
+
+		if ( ! empty( $embeds ) ) {
+			$site_data['_embeds'] = $embeds;
+		}
+
+		// Add press-this-editor.css and remove theme's editor-style.css, if any.
+		remove_editor_styles();
+
+		add_filter( 'mce_css', array( $this, 'add_editor_style' ) );
+
+		if ( ! empty( $GLOBALS['is_IE'] ) ) {
+			@header( 'X-UA-Compatible: IE=edge' );
+		}
+
+		@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
+
+?>
+<!DOCTYPE html>
+
+
+ <html <?php language_attributes(); ?>> 
+<head>
+	<meta http-equiv="Content-Type" content="<?php echo esc_attr( get_bloginfo( 'html_type' ) ); ?>; charset=<?php echo esc_attr( get_option( 'blog_charset' ) ); ?>" />
+	<meta name="viewport" content="width=device-width">
+	<title><?php esc_html_e( 'Press This!' ) ?></title>
+
+	<script>
+		window.wpPressThisData   = <?php echo wp_json_encode( $site_data ); ?>;
+		window.wpPressThisConfig = <?php echo wp_json_encode( $site_settings ); ?>;
+	</script>
+
+	<script type="text/javascript">
+		var ajaxurl = '<?php echo esc_js( admin_url( 'admin-ajax.php', 'relative' ) ); ?>',
+			pagenow = 'press-this',
+			typenow = 'post',
+			adminpage = 'press-this-php',
+			thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
+			decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
+			isRtl = <?php echo (int) is_rtl(); ?>;
+	</script>
+
+	<?php
+		/*
+		 * $post->ID is needed for the embed shortcode so we can show oEmbed previews in the editor.
+		 * Maybe find a way without it.
+		 */
+		$post = get_default_post_to_edit( 'post', true );
+		$post_ID = (int) $post->ID;
+
+		wp_enqueue_media( array( 'post' => $post_ID ) );
+		wp_enqueue_style( 'press-this' );
+		wp_enqueue_script( 'press-this' );
+		wp_enqueue_script( 'json2' );
+		wp_enqueue_script( 'editor' );
+
+		$supports_formats = false;
+		$post_format      = 0;
+
+		if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) ) {
+			$supports_formats = true;
+
+			if ( ! ( $post_format = get_post_format( $post_ID ) ) ) {
+				$post_format = 0;
+			}
+		}
+
+		/** This action is documented in wp-admin/admin-header.php */
+		do_action( 'admin_enqueue_scripts', 'press-this.php' );
+
+		/** This action is documented in wp-admin/admin-header.php */
+		do_action( 'admin_print_styles-press-this.php' );
+
+		/** This action is documented in wp-admin/admin-header.php */
+		do_action( 'admin_print_styles' );
+
+		/** This action is documented in wp-admin/admin-header.php */
+		do_action( 'admin_print_scripts-press-this.php' );
+
+		/** This action is documented in wp-admin/admin-header.php */
+		do_action( 'admin_print_scripts' );
+
+		/** This action is documented in wp-admin/admin-header.php */
+		do_action( 'admin_head-press-this.php' );
+
+		/** This action is documented in wp-admin/admin-header.php */
+		do_action( 'admin_head' );
+	?>
+</head>
+<?php
+
+	$admin_body_class  = 'press-this';
+	$admin_body_class .= ( is_rtl() ) ? ' rtl' : '';
+	$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 .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
+	$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
+
+	/** This filter is documented in wp-admin/admin-header.php */
+	$admin_body_classes = apply_filters( 'admin_body_class', '' );
+
+?>
+<body class="wp-admin wp-core-ui <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
+	<div id="adminbar" class="adminbar">
+		<h1 id="current-site" class="current-site">
+			<a class="current-site-link" href="<?php echo esc_url( home_url( '/' ) ); ?>" target="_blank" rel="home">
+				<span class="dashicons dashicons-wordpress"></span>
+				<span class="current-site-name"><?php bloginfo( 'name' ); ?></span>
+			</a>
+		</h1>
+		<button type="button" class="options button-link closed">
+			<span class="dashicons dashicons-tag on-closed"></span>
+			<span class="screen-reader-text on-closed"><?php _e( 'Show post options' ); ?></span>
+			<span aria-hidden="true" class="on-open"><?php _e( 'Done' ); ?></span>
+			<span class="screen-reader-text on-open"><?php _e( 'Hide post options' ); ?></span>
+		</button>
+	</div>
+
+	<div id="scanbar" class="scan">
+		<form method="GET">
+			<label for="url-scan" class="screen-reader-text"><?php _e( 'Scan site for content' ); ?></label>
+			<input type="url" name="u" id="url-scan" class="scan-url" value="" placeholder="<?php esc_attr_e( 'Enter a URL to scan' ) ?>" />
+			<input type="submit" name="url-scan-submit" id="url-scan-submit" class="scan-submit" value="<?php esc_attr_e( 'Scan' ) ?>" />
+		</form>
+	</div>
+
+	<form id="pressthis-form" method="post" action="post.php" autocomplete="off">
+		<input type="hidden" name="post_ID" id="post_ID" value="<?php echo $post_ID; ?>" />
+		<input type="hidden" name="action" value="press-this-save-post" />
+		<input type="hidden" name="post_status" id="post_status" value="draft" />
+		<input type="hidden" name="wp-preview" id="wp-preview" value="" />
+		<input type="hidden" name="post_title" id="post_title" value="" />
+		<input type="hidden" name="pt-force-redirect" id="pt-force-redirect" value="" />
+		<?php
+
+		wp_nonce_field( 'update-post_' . $post_ID, '_wpnonce', false );
+		wp_nonce_field( 'add-category', '_ajax_nonce-add-category', false );
+
+		?>
+
+	<div class="wrapper">
+		<div class="editor-wrapper">
+			<div class="alerts" role="alert" aria-live="assertive" aria-relevant="all" aria-atomic="true">
+				<?php
+
+				if ( isset( $data['v'] ) && $this->version > $data['v'] ) {
+					?>
+					<p class="alert is-notice">
+						<?php printf( __( 'You should upgrade <a href="%s" target="_blank">your bookmarklet</a> to the latest version!' ), admin_url( 'tools.php' ) ); ?>
+					</p>
+					<?php
+				}
+
+				?>
+			</div>
+
+			<div id="app-container" class="editor">
+				<span id="title-container-label" class="post-title-placeholder" aria-hidden="true"><?php _e( 'Post title' ); ?></span>
+				<h2 id="title-container" class="post-title" contenteditable="true" spellcheck="true" aria-label="<?php esc_attr_e( 'Post title' ); ?>" tabindex="0"><?php echo esc_html( $post_title ); ?></h2>
+
+				<div class="media-list-container">
+					<div class="media-list-inner-container">
+						<h2 class="screen-reader-text"><?php _e( 'Suggested media' ); ?></h2>
+						<ul class="media-list"></ul>
+					</div>
+				</div>
+
+				<?php
+				wp_editor( $post_content, 'pressthis', array(
+					'drag_drop_upload' => true,
+					'editor_height'    => 600,
+					'media_buttons'    => false,
+					'textarea_name'    => 'post_content',
+					'teeny'            => true,
+					'tinymce'          => array(
+						'resize'                => false,
+						'wordpress_adv_hidden'  => false,
+						'add_unload_trigger'    => false,
+						'statusbar'             => false,
+						'autoresize_min_height' => 600,
+						'wp_autoresize_on'      => true,
+						'plugins'               => 'lists,media,paste,tabfocus,fullscreen,wordpress,wpautoresize,wpeditimage,wpgallery,wplink,wptextpattern,wpview',
+						'toolbar1'              => 'bold,italic,bullist,numlist,blockquote,link,unlink',
+						'toolbar2'              => 'undo,redo',
+					),
+					'quicktags' => array(
+						'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,more',
+					),
+				) );
+
+				?>
+			</div>
+		</div>
+
+		<div class="options-panel-back is-hidden" tabindex="-1"></div>
+		<div class="options-panel is-off-screen is-hidden" tabindex="-1">
+			<div class="post-options">
+
+				<?php if ( $supports_formats ) : ?>
+					<button type="button" class="button-link post-option">
+						<span class="dashicons dashicons-admin-post"></span>
+						<span class="post-option-title"><?php _ex( 'Format', 'post format' ); ?></span>
+						<span class="post-option-contents" id="post-option-post-format"><?php echo esc_html( get_post_format_string( $post_format ) ); ?></span>
+						<span class="dashicons post-option-forward"></span>
+					</button>
+				<?php endif; ?>
+
+				<button type="button" class="button-link post-option">
+					<span class="dashicons dashicons-category"></span>
+					<span class="post-option-title"><?php _e( 'Categories' ); ?></span>
+					<span class="dashicons post-option-forward"></span>
+				</button>
+
+				<button type="button" class="button-link post-option">
+					<span class="dashicons dashicons-tag"></span>
+					<span class="post-option-title"><?php _e( 'Tags' ); ?></span>
+					<span class="dashicons post-option-forward"></span>
+				</button>
+			</div>
+
+			<?php if ( $supports_formats ) : ?>
+				<div class="setting-modal is-off-screen is-hidden">
+					<button type="button" class="button-link modal-close">
+						<span class="dashicons post-option-back"></span>
+						<span class="setting-title" aria-hidden="true"><?php _ex( 'Format', 'post format' ); ?></span>
+						<span class="screen-reader-text"><?php _e( 'Back to post options' ) ?></span>
+					</button>
+					<?php $this->post_formats_html( $post ); ?>
+				</div>
+			<?php endif; ?>
+
+			<div class="setting-modal is-off-screen is-hidden">
+				<button type="button" class="button-link modal-close">
+					<span class="dashicons post-option-back"></span>
+					<span class="setting-title" aria-hidden="true"><?php _e( 'Categories' ); ?></span>
+					<span class="screen-reader-text"><?php _e( 'Back to post options' ) ?></span>
+				</button>
+				<?php $this->categories_html( $post ); ?>
+			</div>
+
+			<div class="setting-modal tags is-off-screen is-hidden">
+				<button type="button" class="button-link modal-close">
+					<span class="dashicons post-option-back"></span>
+					<span class="setting-title" aria-hidden="true"><?php _e( 'Tags' ); ?></span>
+					<span class="screen-reader-text"><?php _e( 'Back to post options' ) ?></span>
+				</button>
+				<?php $this->tags_html( $post ); ?>
+			</div>
+		</div>
+	</div>
+
+	<div class="press-this-actions">
+		<div class="pressthis-media-buttons">
+			<button type="button" class="insert-media button-link" data-editor="pressthis">
+				<span class="dashicons dashicons-admin-media"></span>
+				<span class="screen-reader-text"><?php _e( 'Add Media' ); ?></span>
+			</button>
+		</div>
+		<div class="post-actions">
+			<span class="spinner"> </span>
+			<div class="split-button">
+				<div class="split-button-head">
+					<button type="button" class="publish-button split-button-primary" aria-live="polite">
+						<span class="publish"><?php echo ( current_user_can( 'publish_posts' ) ) ? __( 'Publish' ) : __( 'Submit for Review' ); ?></span>
+						<span class="saving-draft"><?php _e( 'Saving…' ); ?></span>
+					</button><button type="button" class="split-button-toggle" aria-haspopup="true" aria-expanded="false">
+						<i class="dashicons dashicons-arrow-down-alt2"></i>
+						<span class="screen-reader-text"><?php _e('More actions'); ?></span>
+					</button>
+				</div>
+				<ul class="split-button-body">
+					<li><button type="button" class="button-link draft-button split-button-option"><?php _e( 'Save Draft' ); ?></button></li>
+					<li><button type="button" class="button-link standard-editor-button split-button-option"><?php _e( 'Standard Editor' ); ?></button></li>
+					<li><button type="button" class="button-link preview-button split-button-option"><?php _e( 'Preview' ); ?></button></li>
+				</ul>
+			</div>
+		</div>
+	</div>
+	</form>
+
+	<?php
+	/** This action is documented in wp-admin/admin-footer.php */
+	do_action( 'admin_footer' );
+
+	/** This action is documented in wp-admin/admin-footer.php */
+	do_action( 'admin_print_footer_scripts' );
+
+	/** This action is documented in wp-admin/admin-footer.php */
+	do_action( 'admin_footer-press-this.php' );
+	?>
+</body>
+</html>
+<?php
+		die();
+	}
+}
+
+/**
+ *
+ * @global WP_Press_This $wp_press_this
+ */
+$GLOBALS['wp_press_this'] = new WP_Press_This;
diff --git a/wp-admin/includes/class-wp-screen.php b/wp-admin/includes/class-wp-screen.php
new file mode 100644
index 0000000..ebd20b8
--- /dev/null
+++ b/wp-admin/includes/class-wp-screen.php
@@ -0,0 +1,1256 @@
+<?php
+/**
+ * Screen API: WP_Screen class
+ *
+ * @package WordPress
+ * @subpackage Administration
+ * @since 4.4.0
+ */
+
+/**
+ * Core class used to implement an admin screen API.
+ *
+ * @since 3.3.0
+ */
+final class WP_Screen {
+	/**
+	 * Any action associated with the screen. 'add' for *-add.php and *-new.php screens. Empty otherwise.
+	 *
+	 * @since 3.3.0
+	 * @var string
+	 * @access public
+	 */
+	public $action;
+
+	/**
+	 * The base type of the screen. This is typically the same as $id but with any post types and taxonomies stripped.
+	 * For example, for an $id of 'edit-post' the base is 'edit'.
+	 *
+	 * @since 3.3.0
+	 * @var string
+	 * @access public
+	 */
+	public $base;
+
+	/**
+	 * The number of columns to display. Access with get_columns().
+	 *
+	 * @since 3.4.0
+	 * @var int
+	 * @access private
+	 */
+	private $columns = 0;
+
+	/**
+	 * The unique ID of the screen.
+	 *
+	 * @since 3.3.0
+	 * @var string
+	 * @access public
+	 */
+	public $id;
+
+	/**
+	 * Which admin the screen is in. network | user | site | false
+	 *
+	 * @since 3.5.0
+	 * @var string
+	 * @access protected
+	 */
+	protected $in_admin;
+
+	/**
+	 * Whether the screen is in the network admin.
+	 *
+	 * Deprecated. Use in_admin() instead.
+	 *
+	 * @since 3.3.0
+	 * @deprecated 3.5.0
+	 * @var bool
+	 * @access public
+	 */
+	public $is_network;
+
+	/**
+	 * Whether the screen is in the user admin.
+	 *
+	 * Deprecated. Use in_admin() instead.
+	 *
+	 * @since 3.3.0
+	 * @deprecated 3.5.0
+	 * @var bool
+	 * @access public
+	 */
+	public $is_user;
+
+	/**
+	 * The base menu parent.
+	 * This is derived from $parent_file by removing the query string and any .php extension.
+	 * $parent_file values of 'edit.php?post_type=page' and 'edit.php?post_type=post' have a $parent_base of 'edit'.
+	 *
+	 * @since 3.3.0
+	 * @var string
+	 * @access public
+	 */
+	public $parent_base;
+
+	/**
+	 * The parent_file for the screen per the admin menu system.
+	 * Some $parent_file values are 'edit.php?post_type=page', 'edit.php', and 'options-general.php'.
+	 *
+	 * @since 3.3.0
+	 * @var string
+	 * @access public
+	 */
+	public $parent_file;
+
+	/**
+	 * The post type associated with the screen, if any.
+	 * The 'edit.php?post_type=page' screen has a post type of 'page'.
+	 * The 'edit-tags.php?taxonomy=$taxonomy&post_type=page' screen has a post type of 'page'.
+	 *
+	 * @since 3.3.0
+	 * @var string
+	 * @access public
+	 */
+	public $post_type;
+
+	/**
+	 * The taxonomy associated with the screen, if any.
+	 * The 'edit-tags.php?taxonomy=category' screen has a taxonomy of 'category'.
+	 * @since 3.3.0
+	 * @var string
+	 * @access public
+	 */
+	public $taxonomy;
+
+	/**
+	 * The help tab data associated with the screen, if any.
+	 *
+	 * @since 3.3.0
+	 * @var array
+	 * @access private
+	 */
+	private $_help_tabs = array();
+
+	/**
+	 * The help sidebar data associated with screen, if any.
+	 *
+	 * @since 3.3.0
+	 * @var string
+	 * @access private
+	 */
+	private $_help_sidebar = '';
+
+ 	/**
+	 * The accessible hidden headings and text associated with the screen, if any.
+	 *
+	 * @since 4.4.0
+	 * @access private
+	 * @var array
+	 */
+	private $_screen_reader_content = array();
+
+	/**
+	 * Stores old string-based help.
+	 *
+	 * @static
+	 * @access private
+	 *
+	 * @var array
+	 */
+	private static $_old_compat_help = array();
+
+	/**
+	 * The screen options associated with screen, if any.
+	 *
+	 * @since 3.3.0
+	 * @var array
+	 * @access private
+	 */
+	private $_options = array();
+
+	/**
+	 * The screen object registry.
+	 *
+	 * @since 3.3.0
+	 *
+	 * @static
+	 * @access private
+	 *
+	 * @var array
+	 */
+	private static $_registry = array();
+
+	/**
+	 * Stores the result of the public show_screen_options function.
+	 *
+	 * @since 3.3.0
+	 * @var bool
+	 * @access private
+	 */
+	private $_show_screen_options;
+
+	/**
+	 * Stores the 'screen_settings' section of screen options.
+	 *
+	 * @since 3.3.0
+	 * @var string
+	 * @access private
+	 */
+	private $_screen_settings;
+
+	/**
+	 * Fetches a screen object.
+	 *
+	 * @since 3.3.0
+	 * @access public
+	 *
+	 * @static
+	 *
+	 * @global string $hook_suffix
+	 *
+	 * @param string|WP_Screen $hook_name Optional. The hook name (also known as the hook suffix) used to determine the screen.
+	 * 	                                  Defaults to the current $hook_suffix global.
+	 * @return WP_Screen Screen object.
+	 */
+	public static function get( $hook_name = '' ) {
+		if ( $hook_name instanceof WP_Screen ) {
+			return $hook_name;
+		}
+
+		$post_type = $taxonomy = null;
+		$in_admin = false;
+		$action = '';
+
+		if ( $hook_name )
+			$id = $hook_name;
+		else
+			$id = $GLOBALS['hook_suffix'];
+
+		// For those pesky meta boxes.
+		if ( $hook_name && post_type_exists( $hook_name ) ) {
+			$post_type = $id;
+			$id = 'post'; // changes later. ends up being $base.
+		} else {
+			if ( '.php' == substr( $id, -4 ) )
+				$id = substr( $id, 0, -4 );
+
+			if ( 'post-new' == $id || 'link-add' == $id || 'media-new' == $id || 'user-new' == $id ) {
+				$id = substr( $id, 0, -4 );
+				$action = 'add';
+			}
+		}
+
+		if ( ! $post_type && $hook_name ) {
+			if ( '-network' == substr( $id, -8 ) ) {
+				$id = substr( $id, 0, -8 );
+				$in_admin = 'network';
+			} elseif ( '-user' == substr( $id, -5 ) ) {
+				$id = substr( $id, 0, -5 );
+				$in_admin = 'user';
+			}
+
+			$id = sanitize_key( $id );
+			if ( 'edit-comments' != $id && 'edit-tags' != $id && 'edit-' == substr( $id, 0, 5 ) ) {
+				$maybe = substr( $id, 5 );
+				if ( taxonomy_exists( $maybe ) ) {
+					$id = 'edit-tags';
+					$taxonomy = $maybe;
+				} elseif ( post_type_exists( $maybe ) ) {
+					$id = 'edit';
+					$post_type = $maybe;
+				}
+			}
+
+			if ( ! $in_admin )
+				$in_admin = 'site';
+		} else {
+			if ( defined( 'WP_NETWORK_ADMIN' ) && WP_NETWORK_ADMIN )
+				$in_admin = 'network';
+			elseif ( defined( 'WP_USER_ADMIN' ) && WP_USER_ADMIN )
+				$in_admin = 'user';
+			else
+				$in_admin = 'site';
+		}
+
+		if ( 'index' == $id )
+			$id = 'dashboard';
+		elseif ( 'front' == $id )
+			$in_admin = false;
+
+		$base = $id;
+
+		// If this is the current screen, see if we can be more accurate for post types and taxonomies.
+		if ( ! $hook_name ) {
+			if ( isset( $_REQUEST['post_type'] ) )
+				$post_type = post_type_exists( $_REQUEST['post_type'] ) ? $_REQUEST['post_type'] : false;
+			if ( isset( $_REQUEST['taxonomy'] ) )
+				$taxonomy = taxonomy_exists( $_REQUEST['taxonomy'] ) ? $_REQUEST['taxonomy'] : false;
+
+			switch ( $base ) {
+				case 'post' :
+					if ( isset( $_GET['post'] ) )
+						$post_id = (int) $_GET['post'];
+					elseif ( isset( $_POST['post_ID'] ) )
+						$post_id = (int) $_POST['post_ID'];
+					else
+						$post_id = 0;
+
+					if ( $post_id ) {
+						$post = get_post( $post_id );
+						if ( $post )
+							$post_type = $post->post_type;
+					}
+					break;
+				case 'edit-tags' :
+				case 'term' :
+					if ( null === $post_type && is_object_in_taxonomy( 'post', $taxonomy ? $taxonomy : 'post_tag' ) )
+						$post_type = 'post';
+					break;
+			}
+		}
+
+		switch ( $base ) {
+			case 'post' :
+				if ( null === $post_type )
+					$post_type = 'post';
+				$id = $post_type;
+				break;
+			case 'edit' :
+				if ( null === $post_type )
+					$post_type = 'post';
+				$id .= '-' . $post_type;
+				break;
+			case 'edit-tags' :
+			case 'term' :
+				if ( null === $taxonomy )
+					$taxonomy = 'post_tag';
+				// The edit-tags ID does not contain the post type. Look for it in the request.
+				if ( null === $post_type ) {
+					$post_type = 'post';
+					if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) )
+						$post_type = $_REQUEST['post_type'];
+				}
+
+				$id = 'edit-' . $taxonomy;
+				break;
+		}
+
+		if ( 'network' == $in_admin ) {
+			$id   .= '-network';
+			$base .= '-network';
+		} elseif ( 'user' == $in_admin ) {
+			$id   .= '-user';
+			$base .= '-user';
+		}
+
+		if ( isset( self::$_registry[ $id ] ) ) {
+			$screen = self::$_registry[ $id ];
+			if ( $screen === get_current_screen() )
+				return $screen;
+		} else {
+			$screen = new WP_Screen();
+			$screen->id     = $id;
+		}
+
+		$screen->base       = $base;
+		$screen->action     = $action;
+		$screen->post_type  = (string) $post_type;
+		$screen->taxonomy   = (string) $taxonomy;
+		$screen->is_user    = ( 'user' == $in_admin );
+		$screen->is_network = ( 'network' == $in_admin );
+		$screen->in_admin   = $in_admin;
+
+		self::$_registry[ $id ] = $screen;
+
+		return $screen;
+	}
+
+	/**
+	 * Makes the screen object the current screen.
+	 *
+	 * @see set_current_screen()
+	 * @since 3.3.0
+	 *
+	 * @global WP_Screen $current_screen
+	 * @global string    $taxnow
+	 * @global string    $typenow
+	 */
+	public function set_current_screen() {
+		global $current_screen, $taxnow, $typenow;
+		$current_screen = $this;
+		$taxnow = $this->taxonomy;
+		$typenow = $this->post_type;
+
+		/**
+		 * Fires after the current screen has been set.
+		 *
+		 * @since 3.0.0
+		 *
+		 * @param WP_Screen $current_screen Current WP_Screen object.
+		 */
+		do_action( 'current_screen', $current_screen );
+	}
+
+	/**
+	 * Constructor
+	 *
+	 * @since 3.3.0
+	 * @access private
+	 */
+	private function __construct() {}
+
+	/**
+	 * Indicates whether the screen is in a particular admin
+	 *
+	 * @since 3.5.0
+	 *
+	 * @param string $admin The admin to check against (network | user | site).
+	 *                      If empty any of the three admins will result in true.
+	 * @return bool True if the screen is in the indicated admin, false otherwise.
+	 */
+	public function in_admin( $admin = null ) {
+		if ( empty( $admin ) )
+			return (bool) $this->in_admin;
+
+		return ( $admin == $this->in_admin );
+	}
+
+	/**
+	 * Sets the old string-based contextual help for the screen.
+	 *
+	 * For backwards compatibility.
+	 *
+	 * @since 3.3.0
+	 *
+	 * @static
+	 *
+	 * @param WP_Screen $screen A screen object.
+	 * @param string $help Help text.
+	 */
+	public static function add_old_compat_help( $screen, $help ) {
+		self::$_old_compat_help[ $screen->id ] = $help;
+	}
+
+	/**
+	 * Set the parent information for the screen.
+	 * This is called in admin-header.php after the menu parent for the screen has been determined.
+	 *
+	 * @since 3.3.0
+	 *
+	 * @param string $parent_file The parent file of the screen. Typically the $parent_file global.
+	 */
+	public function set_parentage( $parent_file ) {
+		$this->parent_file = $parent_file;
+		list( $this->parent_base ) = explode( '?', $parent_file );
+		$this->parent_base = str_replace( '.php', '', $this->parent_base );
+	}
+
+	/**
+	 * Adds an option for the screen.
+	 * Call this in template files after admin.php is loaded and before admin-header.php is loaded to add screen options.
+	 *
+	 * @since 3.3.0
+	 *
+	 * @param string $option Option ID
+	 * @param mixed $args Option-dependent arguments.
+	 */
+	public function add_option( $option, $args = array() ) {
+		$this->_options[ $option ] = $args;
+	}
+
+	/**
+	 * Remove an option from the screen.
+	 *
+	 * @since 3.8.0
+	 *
+	 * @param string $option Option ID.
+	 */
+	public function remove_option( $option ) {
+		unset( $this->_options[ $option ] );
+	}
+
+	/**
+	 * Remove all options from the screen.
+	 *
+	 * @since 3.8.0
+	 */
+	public function remove_options() {
+		$this->_options = array();
+	}
+
+	/**
+	 * Get the options registered for the screen.
+	 *
+	 * @since 3.8.0
+	 *
+	 * @return array Options with arguments.
+	 */
+	public function get_options() {
+		return $this->_options;
+	}
+
+	/**
+	 * Gets the arguments for an option for the screen.
+	 *
+	 * @since 3.3.0
+	 *
+	 * @param string $option Option name.
+	 * @param string $key    Optional. Specific array key for when the option is an array.
+	 *                       Default false.
+	 * @return string The option value if set, null otherwise.
+	 */
+	public function get_option( $option, $key = false ) {
+		if ( ! isset( $this->_options[ $option ] ) )
+			return null;
+		if ( $key ) {
+			if ( isset( $this->_options[ $option ][ $key ] ) )
+				return $this->_options[ $option ][ $key ];
+			return null;
+		}
+		return $this->_options[ $option ];
+	}
+
+	/**
+	 * Gets the help tabs registered for the screen.
+	 *
+	 * @since 3.4.0
+	 * @since 4.4.0 Help tabs are ordered by their priority.
+	 *
+	 * @return array Help tabs with arguments.
+	 */
+	public function get_help_tabs() {
+		$help_tabs = $this->_help_tabs;
+
+		$priorities = array();
+		foreach ( $help_tabs as $help_tab ) {
+			if ( isset( $priorities[ $help_tab['priority'] ] ) ) {
+				$priorities[ $help_tab['priority'] ][] = $help_tab;
+			} else {
+				$priorities[ $help_tab['priority'] ] = array( $help_tab );
+			}
+		}
+
+		ksort( $priorities );
+
+		$sorted = array();
+		foreach ( $priorities as $list ) {
+			foreach ( $list as $tab ) {
+				$sorted[ $tab['id'] ] = $tab;
+			}
+		}
+
+		return $sorted;
+	}
+
+	/**
+	 * Gets the arguments for a help tab.
+	 *
+	 * @since 3.4.0
+	 *
+	 * @param string $id Help Tab ID.
+	 * @return array Help tab arguments.
+	 */
+	public function get_help_tab( $id ) {
+		if ( ! isset( $this->_help_tabs[ $id ] ) )
+			return null;
+		return $this->_help_tabs[ $id ];
+	}
+
+	/**
+	 * Add a help tab to the contextual help for the screen.
+	 * Call this on the load-$pagenow hook for the relevant screen.
+	 *
+	 * @since 3.3.0
+	 * @since 4.4.0 The `$priority` argument was added.
+	 *
+	 * @param array $args {
+	 *     Array of arguments used to display the help tab.
+	 *
+	 *     @type string $title    Title for the tab. Default false.
+	 *     @type string $id       Tab ID. Must be HTML-safe. Default false.
+	 *     @type string $content  Optional. Help tab content in plain text or HTML. Default empty string.
+	 *     @type string $callback Optional. A callback to generate the tab content. Default false.
+	 *     @type int    $priority Optional. The priority of the tab, used for ordering. Default 10.
+	 * }
+	 */
+	public function add_help_tab( $args ) {
+		$defaults = array(
+			'title'    => false,
+			'id'       => false,
+			'content'  => '',
+			'callback' => false,
+			'priority' => 10,
+		);
+		$args = wp_parse_args( $args, $defaults );
+
+		$args['id'] = sanitize_html_class( $args['id'] );
+
+		// Ensure we have an ID and title.
+		if ( ! $args['id'] || ! $args['title'] )
+			return;
+
+		// Allows for overriding an existing tab with that ID.
+		$this->_help_tabs[ $args['id'] ] = $args;
+	}
+
+	/**
+	 * Removes a help tab from the contextual help for the screen.
+	 *
+	 * @since 3.3.0
+	 *
+	 * @param string $id The help tab ID.
+	 */
+	public function remove_help_tab( $id ) {
+		unset( $this->_help_tabs[ $id ] );
+	}
+
+	/**
+	 * Removes all help tabs from the contextual help for the screen.
+	 *
+	 * @since 3.3.0
+	 */
+	public function remove_help_tabs() {
+		$this->_help_tabs = array();
+	}
+
+	/**
+	 * Gets the content from a contextual help sidebar.
+	 *
+	 * @since 3.4.0
+	 *
+	 * @return string Contents of the help sidebar.
+	 */
+	public function get_help_sidebar() {
+		return $this->_help_sidebar;
+	}
+
+	/**
+	 * Add a sidebar to the contextual help for the screen.
+	 * Call this in template files after admin.php is loaded and before admin-header.php is loaded to add a sidebar to the contextual help.
+	 *
+	 * @since 3.3.0
+	 *
+	 * @param string $content Sidebar content in plain text or HTML.
+	 */
+	public function set_help_sidebar( $content ) {
+		$this->_help_sidebar = $content;
+	}
+
+	/**
+	 * Gets the number of layout columns the user has selected.
+	 *
+	 * The layout_columns option controls the max number and default number of
+	 * columns. This method returns the number of columns within that range selected
+	 * by the user via Screen Options. If no selection has been made, the default
+	 * provisioned in layout_columns is returned. If the screen does not support
+	 * selecting the number of layout columns, 0 is returned.
+	 *
+	 * @since 3.4.0
+	 *
+	 * @return int Number of columns to display.
+	 */
+	public function get_columns() {
+		return $this->columns;
+	}
+
+ 	/**
+	 * Get the accessible hidden headings and text used in the screen.
+	 *
+	 * @since 4.4.0
+	 *
+	 * @see set_screen_reader_content() For more information on the array format.
+	 *
+	 * @return array An associative array of screen reader text strings.
+	 */
+	public function get_screen_reader_content() {
+		return $this->_screen_reader_content;
+	}
+
+	/**
+	 * Get a screen reader text string.
+	 *
+	 * @since 4.4.0
+	 *
+	 * @param string $key Screen reader text array named key.
+	 * @return string Screen reader text string.
+	 */
+	public function get_screen_reader_text( $key ) {
+		if ( ! isset( $this->_screen_reader_content[ $key ] ) ) {
+			return null;
+		}
+		return $this->_screen_reader_content[ $key ];
+	}
+
+	/**
+	 * Add accessible hidden headings and text for the screen.
+	 *
+	 * @since 4.4.0
+	 *
+	 * @param array $content {
+	 *     An associative array of screen reader text strings.
+	 *
+	 *     @type string $heading_views      Screen reader text for the filter links heading.
+	 *                                      Default 'Filter items list'.
+	 *     @type string $heading_pagination Screen reader text for the pagination heading.
+	 *                                      Default 'Items list navigation'.
+	 *     @type string $heading_list       Screen reader text for the items list heading.
+	 *                                      Default 'Items list'.
+	 * }
+	 */
+	public function set_screen_reader_content( $content = array() ) {
+		$defaults = array(
+			'heading_views'      => __( 'Filter items list' ),
+			'heading_pagination' => __( 'Items list navigation' ),
+			'heading_list'       => __( 'Items list' ),
+		);
+		$content = wp_parse_args( $content, $defaults );
+
+		$this->_screen_reader_content = $content;
+	}
+
+	/**
+	 * Remove all the accessible hidden headings and text for the screen.
+	 *
+	 * @since 4.4.0
+	 */
+	public function remove_screen_reader_content() {
+		$this->_screen_reader_content = array();
+	}
+
+	/**
+	 * Render the screen's help section.
+	 *
+	 * This will trigger the deprecated filters for backwards compatibility.
+	 *
+	 * @since 3.3.0
+	 *
+	 * @global string $screen_layout_columns
+	 */
+	public function render_screen_meta() {
+
+		/**
+		 * Filter the legacy contextual help list.
+		 *
+		 * @since 2.7.0
+		 * @deprecated 3.3.0 Use get_current_screen()->add_help_tab() or
+		 *                   get_current_screen()->remove_help_tab() instead.
+		 *
+		 * @param array     $old_compat_help Old contextual help.
+		 * @param WP_Screen $this            Current WP_Screen instance.
+		 */
+		self::$_old_compat_help = apply_filters( 'contextual_help_list', self::$_old_compat_help, $this );
+
+		$old_help = isset( self::$_old_compat_help[ $this->id ] ) ? self::$_old_compat_help[ $this->id ] : '';
+
+		/**
+		 * Filter the legacy contextual help text.
+		 *
+		 * @since 2.7.0
+		 * @deprecated 3.3.0 Use get_current_screen()->add_help_tab() or
+		 *                   get_current_screen()->remove_help_tab() instead.
+		 *
+		 * @param string    $old_help  Help text that appears on the screen.
+		 * @param string    $screen_id Screen ID.
+		 * @param WP_Screen $this      Current WP_Screen instance.
+		 *
+		 */
+		$old_help = apply_filters( 'contextual_help', $old_help, $this->id, $this );
+
+		// Default help only if there is no old-style block of text and no new-style help tabs.
+		if ( empty( $old_help ) && ! $this->get_help_tabs() ) {
+
+			/**
+			 * Filter the default legacy contextual help text.
+			 *
+			 * @since 2.8.0
+			 * @deprecated 3.3.0 Use get_current_screen()->add_help_tab() or
+			 *                   get_current_screen()->remove_help_tab() instead.
+			 *
+			 * @param string $old_help_default Default contextual help text.
+			 */
+			$default_help = apply_filters( 'default_contextual_help', '' );
+			if ( $default_help )
+				$old_help = '<p>' . $default_help . '</p>';
+		}
+
+		if ( $old_help ) {
+			$this->add_help_tab( array(
+				'id'      => 'old-contextual-help',
+				'title'   => __('Overview'),
+				'content' => $old_help,
+			) );
+		}
+
+		$help_sidebar = $this->get_help_sidebar();
+
+		$help_class = 'hidden';
+		if ( ! $help_sidebar )
+			$help_class .= ' no-sidebar';
+
+		// Time to render!
+		?>
+		<div id="screen-meta" class="metabox-prefs">
+
+			<div id="contextual-help-wrap" class="<?php echo esc_attr( $help_class ); ?>" tabindex="-1" aria-label="<?php esc_attr_e('Contextual Help Tab'); ?>">
+				<div id="contextual-help-back"></div>
+				<div id="contextual-help-columns">
+					<div class="contextual-help-tabs">
+						<ul>
+						<?php
+						$class = ' class="active"';
+						foreach ( $this->get_help_tabs() as $tab ) :
+							$link_id  = "tab-link-{$tab['id']}";
+							$panel_id = "tab-panel-{$tab['id']}";
+							?>
+
+							<li id="<?php echo esc_attr( $link_id ); ?>"<?php echo $class; ?>>
+								<a href="<?php echo esc_url( "#$panel_id" ); ?>" aria-controls="<?php echo esc_attr( $panel_id ); ?>">
+									<?php echo esc_html( $tab['title'] ); ?>
+								</a>
+							</li>
+						<?php
+							$class = '';
+						endforeach;
+						?>
+						</ul>
+					</div>
+
+					<?php if ( $help_sidebar ) : ?>
+					<div class="contextual-help-sidebar">
+						<?php echo $help_sidebar; ?>
+					</div>
+					<?php endif; ?>
+
+					<div class="contextual-help-tabs-wrap">
+						<?php
+						$classes = 'help-tab-content active';
+						foreach ( $this->get_help_tabs() as $tab ):
+							$panel_id = "tab-panel-{$tab['id']}";
+							?>
+
+							<div id="<?php echo esc_attr( $panel_id ); ?>" class="<?php echo $classes; ?>">
+								<?php
+								// Print tab content.
+								echo $tab['content'];
+
+								// If it exists, fire tab callback.
+								if ( ! empty( $tab['callback'] ) )
+									call_user_func_array( $tab['callback'], array( $this, $tab ) );
+								?>
+							</div>
+						<?php
+							$classes = 'help-tab-content';
+						endforeach;
+						?>
+					</div>
+				</div>
+			</div>
+		<?php
+		// Setup layout columns
+
+		/**
+		 * Filter the array of screen layout columns.
+		 *
+		 * This hook provides back-compat for plugins using the back-compat
+		 * filter instead of add_screen_option().
+		 *
+		 * @since 2.8.0
+		 *
+		 * @param array     $empty_columns Empty array.
+		 * @param string    $screen_id     Screen ID.
+		 * @param WP_Screen $this          Current WP_Screen instance.
+		 */
+		$columns = apply_filters( 'screen_layout_columns', array(), $this->id, $this );
+
+		if ( ! empty( $columns ) && isset( $columns[ $this->id ] ) )
+			$this->add_option( 'layout_columns', array('max' => $columns[ $this->id ] ) );
+
+		if ( $this->get_option( 'layout_columns' ) ) {
+			$this->columns = (int) get_user_option("screen_layout_$this->id");
+
+			if ( ! $this->columns && $this->get_option( 'layout_columns', 'default' ) )
+				$this->columns = $this->get_option( 'layout_columns', 'default' );
+		}
+		$GLOBALS[ 'screen_layout_columns' ] = $this->columns; // Set the global for back-compat.
+
+		// Add screen options
+		if ( $this->show_screen_options() )
+			$this->render_screen_options();
+		?>
+		</div>
+		<?php
+		if ( ! $this->get_help_tabs() && ! $this->show_screen_options() )
+			return;
+		?>
+		<div id="screen-meta-links">
+		<?php if ( $this->get_help_tabs() ) : ?>
+			<div id="contextual-help-link-wrap" class="hide-if-no-js screen-meta-toggle">
+			<button type="button" id="contextual-help-link" class="button show-settings" aria-controls="contextual-help-wrap" aria-expanded="false"><?php _e( 'Help' ); ?></button>
+			</div>
+		<?php endif;
+		if ( $this->show_screen_options() ) : ?>
+			<div id="screen-options-link-wrap" class="hide-if-no-js screen-meta-toggle">
+			<button type="button" id="show-settings-link" class="button show-settings" aria-controls="screen-options-wrap" aria-expanded="false"><?php _e( 'Screen Options' ); ?></button>
+			</div>
+		<?php endif; ?>
+		</div>
+		<?php
+	}
+
+	/**
+	 *
+	 * @global array $wp_meta_boxes
+	 *
+	 * @return bool
+	 */
+	public function show_screen_options() {
+		global $wp_meta_boxes;
+
+		if ( is_bool( $this->_show_screen_options ) )
+			return $this->_show_screen_options;
+
+		$columns = get_column_headers( $this );
+
+		$show_screen = ! empty( $wp_meta_boxes[ $this->id ] ) || $columns || $this->get_option( 'per_page' );
+
+		switch ( $this->base ) {
+			case 'widgets':
+				$this->_screen_settings = '<p><a id="access-on" href="widgets.php?widgets-access=on">' . __('Enable accessibility mode') . '</a><a id="access-off" href="widgets.php?widgets-access=off">' . __('Disable accessibility mode') . "</a></p>\n";
+				break;
+			case 'post' :
+				$expand = '<fieldset class="editor-expand hidden"><legend>' . __( 'Additional settings' ) . '</legend><label for="editor-expand-toggle">';
+				$expand .= '<input type="checkbox" id="editor-expand-toggle"' . checked( get_user_setting( 'editor_expand', 'on' ), 'on', false ) . ' />';
+				$expand .= __( 'Enable full-height editor and distraction-free functionality.' ) . '</label></fieldset>';
+				$this->_screen_settings = $expand;
+				break;
+			default:
+				$this->_screen_settings = '';
+				break;
+		}
+
+		/**
+		 * Filter the screen settings text displayed in the Screen Options tab.
+		 *
+		 * This filter is currently only used on the Widgets screen to enable
+		 * accessibility mode.
+		 *
+		 * @since 3.0.0
+		 *
+		 * @param string    $screen_settings Screen settings.
+		 * @param WP_Screen $this            WP_Screen object.
+		 */
+		$this->_screen_settings = apply_filters( 'screen_settings', $this->_screen_settings, $this );
+
+		if ( $this->_screen_settings || $this->_options )
+			$show_screen = true;
+
+		/**
+		 * Filter whether to show the Screen Options tab.
+		 *
+		 * @since 3.2.0
+		 *
+		 * @param bool      $show_screen Whether to show Screen Options tab.
+		 *                               Default true.
+		 * @param WP_Screen $this        Current WP_Screen instance.
+		 */
+		$this->_show_screen_options = apply_filters( 'screen_options_show_screen', $show_screen, $this );
+		return $this->_show_screen_options;
+	}
+
+	/**
+	 * Render the screen options tab.
+	 *
+	 * @since 3.3.0
+	 *
+	 * @param array $options {
+	 *     @type bool $wrap  Whether the screen-options-wrap div will be included. Defaults to true.
+	 * }
+	 */
+	public function render_screen_options( $options = array() ) {
+		$options = wp_parse_args( $options, array(
+			'wrap' => true,
+		) );
+
+		$wrapper_start = $wrapper_end = $form_start = $form_end = '';
+
+		// Output optional wrapper.
+		if ( $options['wrap'] ) {
+			$wrapper_start = '<div id="screen-options-wrap" class="hidden" tabindex="-1" aria-label="' . esc_attr__( 'Screen Options Tab' ) . '">';
+			$wrapper_end = '</div>';
+		}
+
+		// Don't output the form and nonce for the widgets accessibility mode links.
+		if ( 'widgets' !== $this->base ) {
+			$form_start = "\n<form id='adv-settings' method='post'>\n";
+			$form_end = "\n" . wp_nonce_field( 'screen-options-nonce', 'screenoptionnonce', false, false ) . "\n</form>\n";
+		}
+
+		echo $wrapper_start . $form_start;
+
+		$this->render_meta_boxes_preferences();
+		$this->render_list_table_columns_preferences();
+		$this->render_screen_layout();
+		$this->render_per_page_options();
+		$this->render_view_mode();
+		echo $this->_screen_settings;
+
+		/**
+		 * Filter whether to show the Screen Options submit button.
+		 *
+		 * @since 4.4.0
+		 *
+		 * @param bool      $show_button Whether to show Screen Options submit button.
+		 *                               Default false.
+		 * @param WP_Screen $this        Current WP_Screen instance.
+		 */
+		$show_button = apply_filters( 'screen_options_show_submit', false, $this );
+
+		if ( $show_button ) {
+			submit_button( __( 'Apply' ), 'primary', 'screen-options-apply', true );
+		}
+
+		echo $form_end . $wrapper_end;
+	}
+
+	/**
+	 * Render the meta boxes preferences.
+	 *
+	 * @since 4.4.0
+	 *
+	 * @global array $wp_meta_boxes
+	 */
+	public function render_meta_boxes_preferences() {
+		global $wp_meta_boxes;
+
+		if ( ! isset( $wp_meta_boxes[ $this->id ] ) ) {
+			return;
+		}
+		?>
+		<fieldset class="metabox-prefs">
+		<legend><?php _e( 'Boxes' ); ?></legend>
+		<?php
+			meta_box_prefs( $this );
+
+			if ( 'dashboard' === $this->id && has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) {
+				if ( isset( $_GET['welcome'] ) ) {
+					$welcome_checked = empty( $_GET['welcome'] ) ? 0 : 1;
+					update_user_meta( get_current_user_id(), 'show_welcome_panel', $welcome_checked );
+				} else {
+					$welcome_checked = get_user_meta( get_current_user_id(), 'show_welcome_panel', true );
+					if ( 2 == $welcome_checked && wp_get_current_user()->user_email != get_option( 'admin_email' ) ) {
+						$welcome_checked = false;
+					}
+				}
+				echo '<label for="wp_welcome_panel-hide">';
+				echo '<input type="checkbox" id="wp_welcome_panel-hide"' . checked( (bool) $welcome_checked, true, false ) . ' />';
+				echo _x( 'Welcome', 'Welcome panel' ) . "</label>\n";
+			}
+		?>
+		</fieldset>
+		<?php
+	}
+
+	/**
+	 * Render the list table columns preferences.
+	 *
+	 * @since 4.4.0
+	 */
+	public function render_list_table_columns_preferences() {
+
+		$columns = get_column_headers( $this );
+		$hidden  = get_hidden_columns( $this );
+
+		if ( ! $columns ) {
+			return;
+		}
+
+		$legend = ! empty( $columns['_title'] ) ? $columns['_title'] : __( 'Columns' );
+		?>
+		<fieldset class="metabox-prefs">
+		<legend><?php echo $legend; ?></legend>
+		<?php
+		$special = array( '_title', 'cb', 'comment', 'media', 'name', 'title', 'username', 'blogname' );
+
+		foreach ( $columns as $column => $title ) {
+			// Can't hide these for they are special
+			if ( in_array( $column, $special ) ) {
+				continue;
+			}
+
+			if ( empty( $title ) ) {
+				continue;
+			}
+
+			if ( 'comments' == $column ) {
+				$title = __( 'Comments' );
+			}
+
+			$id = "$column-hide";
+			echo '<label>';
+			echo '<input class="hide-column-tog" name="' . $id . '" type="checkbox" id="' . $id . '" value="' . $column . '"' . checked( ! in_array( $column, $hidden ), true, false ) . ' />';
+			echo "$title</label>\n";
+		}
+		?>
+		</fieldset>
+		<?php
+	}
+
+	/**
+	 * Render the option for number of columns on the page
+	 *
+	 * @since 3.3.0
+	 */
+	public function render_screen_layout() {
+		if ( ! $this->get_option( 'layout_columns' ) ) {
+			return;
+		}
+
+		$screen_layout_columns = $this->get_columns();
+		$num = $this->get_option( 'layout_columns', 'max' );
+
+		?>
+		<fieldset class='columns-prefs'>
+		<legend class="screen-layout"><?php _e( 'Layout' ); ?></legend><?php
+			for ( $i = 1; $i <= $num; ++$i ):
+				?>
+				<label class="columns-prefs-<?php echo $i; ?>">
+					<input type='radio' name='screen_columns' value='<?php echo esc_attr( $i ); ?>'
+						<?php checked( $screen_layout_columns, $i ); ?> />
+					<?php printf( _n( '%s column', '%s columns', $i ), number_format_i18n( $i ) ); ?>
+				</label>
+				<?php
+			endfor; ?>
+		</fieldset>
+		<?php
+	}
+
+	/**
+	 * Render the items per page option
+	 *
+	 * @since 3.3.0
+	 */
+	public function render_per_page_options() {
+		if ( null === $this->get_option( 'per_page' ) ) {
+			return;
+		}
+
+		$per_page_label = $this->get_option( 'per_page', 'label' );
+		if ( null === $per_page_label ) {
+			$per_page_label = __( 'Number of items per page:' );
+		}
+
+		$option = $this->get_option( 'per_page', 'option' );
+		if ( ! $option ) {
+			$option = str_replace( '-', '_', "{$this->id}_per_page" );
+		}
+
+		$per_page = (int) get_user_option( $option );
+		if ( empty( $per_page ) || $per_page < 1 ) {
+			$per_page = $this->get_option( 'per_page', 'default' );
+			if ( ! $per_page ) {
+				$per_page = 20;
+			}
+		}
+
+		if ( 'edit_comments_per_page' == $option ) {
+			$comment_status = isset( $_REQUEST['comment_status'] ) ? $_REQUEST['comment_status'] : 'all';
+
+			/** This filter is documented in wp-admin/includes/class-wp-comments-list-table.php */
+			$per_page = apply_filters( 'comments_per_page', $per_page, $comment_status );
+		} elseif ( 'categories_per_page' == $option ) {
+			/** This filter is documented in wp-admin/includes/class-wp-terms-list-table.php */
+			$per_page = apply_filters( 'edit_categories_per_page', $per_page );
+		} else {
+			/** This filter is documented in wp-admin/includes/class-wp-list-table.php */
+			$per_page = apply_filters( $option, $per_page );
+		}
+
+		// Back compat
+		if ( isset( $this->post_type ) ) {
+			/** This filter is documented in wp-admin/includes/post.php */
+			$per_page = apply_filters( 'edit_posts_per_page', $per_page, $this->post_type );
+		}
+
+		// This needs a submit button
+		add_filter( 'screen_options_show_submit', '__return_true' );
+
+		?>
+		<fieldset class="screen-options">
+		<legend><?php _e( 'Pagination' ); ?></legend>
+			<?php if ( $per_page_label ) : ?>
+				<label for="<?php echo esc_attr( $option ); ?>"><?php echo $per_page_label; ?></label>
+				<input type="number" step="1" min="1" max="999" class="screen-per-page" name="wp_screen_options[value]"
+					id="<?php echo esc_attr( $option ); ?>" maxlength="3"
+					value="<?php echo esc_attr( $per_page ); ?>" />
+			<?php endif; ?>
+				<input type="hidden" name="wp_screen_options[option]" value="<?php echo esc_attr( $option ); ?>" />
+		</fieldset>
+		<?php
+	}
+
+	/**
+	 * Render the list table view mode preferences.
+	 *
+	 * @since 4.4.0
+	 */
+	public function render_view_mode() {
+		$screen = get_current_screen();
+
+		// Currently only enabled for posts lists
+		if ( 'edit' !== $screen->base ) {
+			return;
+		}
+
+		$view_mode_post_types = get_post_types( array( 'hierarchical' => false, 'show_ui' => true ) );
+
+		/**
+		 * Filter the post types that have different view mode options.
+		 *
+		 * @since 4.4.0
+		 *
+		 * @param array $view_mode_post_types Array of post types that can change view modes.
+		 *                                    Default hierarchical post types with show_ui on.
+		 */
+		$view_mode_post_types = apply_filters( 'view_mode_post_types', $view_mode_post_types );
+
+		if ( ! in_array( $this->post_type, $view_mode_post_types ) ) {
+			return;
+		}
+
+		global $mode;
+
+		// This needs a submit button
+		add_filter( 'screen_options_show_submit', '__return_true' );
+?>
+		<fieldset class="metabox-prefs view-mode">
+		<legend><?php _e( 'View Mode' ); ?></legend>
+				<label for="list-view-mode">
+					<input id="list-view-mode" type="radio" name="mode" value="list" <?php checked( 'list', $mode ); ?> />
+					<?php _e( 'List View' ); ?>
+				</label>
+				<label for="excerpt-view-mode">
+					<input id="excerpt-view-mode" type="radio" name="mode" value="excerpt" <?php checked( 'excerpt', $mode ); ?> />
+					<?php _e( 'Excerpt View' ); ?>
+				</label>
+		</fieldset>
+<?php
+	}
+
+	/**
+	 * Render screen reader text.
+	 *
+	 * @since 4.4.0
+	 *
+	 * @param string $key The screen reader text array named key.
+	 * @param string $tag Optional. The HTML tag to wrap the screen reader text. Default h2.
+	 */
+	public function render_screen_reader_content( $key = '', $tag = 'h2' ) {
+
+		if ( ! isset( $this->_screen_reader_content[ $key ] ) ) {
+			return;
+		}
+		echo "<$tag class='screen-reader-text'>" . $this->_screen_reader_content[ $key ] . "</$tag>";
+	}
+}
diff --git a/wp-admin/includes/class-wp-site-icon.php b/wp-admin/includes/class-wp-site-icon.php
new file mode 100644
index 0000000..8c06db6
--- /dev/null
+++ b/wp-admin/includes/class-wp-site-icon.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ * Administration API: WP_Site_Icon class
+ *
+ * @package WordPress
+ * @subpackage Administration
+ * @since 4.3.0
+ */
+
+/**
+ * Core class used to implement site icon functionality.
+ *
+ * @since 4.3.0
+ */
+class WP_Site_Icon {
+
+	/**
+	 * The minimum size of the site icon.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var int
+	 */
+	public $min_size  = 512;
+
+	/**
+	 * The size to which to crop the image so that we can display it in the UI nicely.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var int
+	 */
+	public $page_crop = 512;
+
+	/**
+	 * List of site icon sizes.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var array
+	 */
+	public $site_icon_sizes = array(
+		/*
+		 * Square, medium sized tiles for IE11+.
+		 *
+		 * See https://msdn.microsoft.com/library/dn455106(v=vs.85).aspx
+		 */
+		270,
+
+		/*
+		 * App icon for Android/Chrome.
+		 *
+		 * @link https://developers.google.com/web/updates/2014/11/Support-for-theme-color-in-Chrome-39-for-Android
+		 * @link https://developer.chrome.com/multidevice/android/installtohomescreen
+		 */
+		192,
+
+		/*
+		 * App icons up to iPhone 6 Plus.
+		 *
+		 * See https://developer.apple.com/library/prerelease/ios/documentation/UserExperience/Conceptual/MobileHIG/IconMatrix.html
+		 */
+		180,
+
+		// Our regular Favicon.
+		32,
+	);
+
+	/**
+	 * Registers actions and filters.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 */
+	public function __construct() {
+		add_action( 'delete_attachment', array( $this, 'delete_attachment_data' ) );
+		add_filter( 'get_post_metadata', array( $this, 'get_post_metadata' ), 10, 4 );
+	}
+
+	/**
+	 * Creates an attachment 'object'.
+	 *
+	 * @since 4.3.0
+	 *
+	 * @param string $cropped              Cropped image URL.
+	 * @param int    $parent_attachment_id Attachment ID of parent image.
+	 * @return array Attachment object.
+	 */
+	public function create_attachment_object( $cropped, $parent_attachment_id ) {
+		$parent     = get_post( $parent_attachment_id );
+		$parent_url = wp_get_attachment_url( $parent->ID );
+		$url        = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url );
+
+		$size       = @getimagesize( $cropped );
+		$image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
+
+		$object = array(
+			'ID'             => $parent_attachment_id,
+			'post_title'     => basename( $cropped ),
+			'post_content'   => $url,
+			'post_mime_type' => $image_type,
+			'guid'           => $url,
+			'context'        => 'site-icon'
+		);
+
+		return $object;
+	}
+
+	/**
+	 * Inserts an attachment.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param array  $object Attachment object.
+	 * @param string $file   File path of the attached image.
+	 * @return int           Attachment ID
+	 */
+	public function insert_attachment( $object, $file ) {
+		$attachment_id = wp_insert_attachment( $object, $file );
+		$metadata      = wp_generate_attachment_metadata( $attachment_id, $file );
+
+		/**
+		 * Filter the site icon attachment metadata.
+		 *
+		 * @since 4.3.0
+		 *
+		 * @see wp_generate_attachment_metadata()
+		 *
+		 * @param array $metadata Attachment metadata.
+		 */
+		$metadata = apply_filters( 'site_icon_attachment_metadata', $metadata );
+		wp_update_attachment_metadata( $attachment_id, $metadata );
+
+		return $attachment_id;
+	}
+
+	/**
+	 * Adds additional sizes to be made when creating the site_icon images.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param array $sizes List of additional sizes.
+	 * @return array Additional image sizes.
+	 */
+	public function additional_sizes( $sizes = array() ) {
+		$only_crop_sizes = array();
+
+		/**
+		 * Filter the different dimensions that a site icon is saved in.
+		 *
+		 * @since 4.3.0
+		 *
+		 * @param array $site_icon_sizes Sizes available for the Site Icon.
+		 */
+		$this->site_icon_sizes = apply_filters( 'site_icon_image_sizes', $this->site_icon_sizes );
+
+		// Use a natural sort of numbers.
+		natsort( $this->site_icon_sizes );
+		$this->site_icon_sizes = array_reverse( $this->site_icon_sizes );
+
+		// ensure that we only resize the image into
+		foreach ( $sizes as $name => $size_array ) {
+			if ( isset( $size_array['crop'] ) ) {
+				$only_crop_sizes[ $name ] = $size_array;
+			}
+		}
+
+		foreach ( $this->site_icon_sizes as $size ) {
+			if ( $size < $this->min_size ) {
+				$only_crop_sizes[ 'site_icon-' . $size ] = array(
+					'width ' => $size,
+					'height' => $size,
+					'crop'   => true,
+				);
+			}
+		}
+
+		return $only_crop_sizes;
+	}
+
+	/**
+	 * Adds Site Icon sizes to the array of image sizes on demand.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param array $sizes List of image sizes.
+	 * @return array List of intermediate image sizes.
+	 */
+	public function intermediate_image_sizes( $sizes = array() ) {
+		/** This filter is documented in wp-admin/includes/class-wp-site-icon.php */
+		$this->site_icon_sizes = apply_filters( 'site_icon_image_sizes', $this->site_icon_sizes );
+		foreach ( $this->site_icon_sizes as $size ) {
+			$sizes[] = 'site_icon-' . $size;
+		}
+
+		return $sizes;
+	}
+
+	/**
+	 * Deletes the Site Icon when the image file is deleted.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param int $post_id Attachment ID.
+	 */
+	public function delete_attachment_data( $post_id ) {
+		$site_icon_id = get_option( 'site_icon' );
+
+		if ( $site_icon_id && $post_id == $site_icon_id ) {
+			delete_option( 'site_icon' );
+		}
+	}
+
+	/**
+	 * Adds custom image sizes when meta data for an image is requested, that happens to be used as Site Icon.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param null|array|string $value    The value get_metadata() should return a single metadata value, or an
+	 *                                    array of values.
+	 * @param int               $post_id  Post ID.
+	 * @param string            $meta_key Meta key.
+	 * @param string|array      $single   Meta value, or an array of values.
+	 * @return array|null|string The attachment metadata value, array of values, or null.
+	 */
+	public function get_post_metadata( $value, $post_id, $meta_key, $single ) {
+		if ( $single && '_wp_attachment_backup_sizes' === $meta_key ) {
+			$site_icon_id = get_option( 'site_icon' );
+
+			if ( $post_id == $site_icon_id ) {
+				add_filter( 'intermediate_image_sizes', array( $this, 'intermediate_image_sizes' ) );
+			}
+		}
+
+		return $value;
+	}
+}
+
+/**
+ * @global WP_Site_Icon $wp_site_icon
+ */
+$GLOBALS['wp_site_icon'] = new WP_Site_Icon;
diff --git a/wp-admin/includes/class-wp-terms-list-table.php b/wp-admin/includes/class-wp-terms-list-table.php
index bf31468..7da91a2 100644
--- a/wp-admin/includes/class-wp-terms-list-table.php
+++ b/wp-admin/includes/class-wp-terms-list-table.php
@@ -1,17 +1,42 @@
 <?php
 /**
- * Terms List Table class.
+ * List Table API: WP_Terms_List_Table class
  *
  * @package WordPress
- * @subpackage List_Table
+ * @subpackage Administration
+ * @since 3.1.0
+ */
+
+/**
+ * Core class used to implement displaying terms in a list table.
+ *
  * @since 3.1.0
  * @access private
+ *
+ * @see WP_List_Table
  */
 class WP_Terms_List_Table extends WP_List_Table {
 
-	var $callback_args;
+	public $callback_args;
+
+	private $level;
 
-	function __construct( $args = array() ) {
+	/**
+	 * Constructor.
+	 *
+	 * @since 3.1.0
+	 * @access public
+	 *
+	 * @see WP_List_Table::__construct() for more information on default arguments.
+	 *
+	 * @global string $post_type
+	 * @global string $taxonomy
+	 * @global string $action
+	 * @global object $tax
+	 *
+	 * @param array $args An associative array of arguments.
+	 */
+	public function __construct( $args = array() ) {
 		global $post_type, $taxonomy, $action, $tax;
 
 		parent::__construct( array(
@@ -38,14 +63,21 @@ class WP_Terms_List_Table extends WP_List_Table {
 
 	}
 
-	function ajax_user_can() {
+	/**
+	 *
+	 * @return bool
+	 */
+	public function ajax_user_can() {
 		return current_user_can( get_taxonomy( $this->screen->taxonomy )->cap->manage_terms );
 	}
 
-	function prepare_items() {
+	/**
+	 * @access public
+	 */
+	public function prepare_items() {
 		$tags_per_page = $this->get_items_per_page( 'edit_' . $this->screen->taxonomy . '_per_page' );
 
-		if ( 'post_tag' == $this->screen->taxonomy ) {
+		if ( 'post_tag' === $this->screen->taxonomy ) {
 			/**
 			 * Filter the number of terms displayed per page for the Tags list table.
 			 *
@@ -64,7 +96,7 @@ class WP_Terms_List_Table extends WP_List_Table {
 			 * @param int $tags_per_page Number of tags to be displayed. Default 20.
 			 */
 			$tags_per_page = apply_filters( 'tagsperpage', $tags_per_page );
-		} elseif ( 'category' == $this->screen->taxonomy ) {
+		} elseif ( 'category' === $this->screen->taxonomy ) {
 			/**
 			 * Filter the number of terms displayed per page for the Categories list table.
 			 *
@@ -97,26 +129,49 @@ class WP_Terms_List_Table extends WP_List_Table {
 		) );
 	}
 
-	function has_items() {
+	/**
+	 *
+	 * @return bool
+	 */
+	public function has_items() {
 		// todo: populate $this->items in prepare_items()
 		return true;
 	}
 
-	function get_bulk_actions() {
+	/**
+	 * @access public
+	 */
+	public function no_items() {
+		echo get_taxonomy( $this->screen->taxonomy )->labels->not_found;
+	}
+
+	/**
+	 *
+	 * @return array
+	 */
+	protected function get_bulk_actions() {
 		$actions = array();
 		$actions['delete'] = __( 'Delete' );
 
 		return $actions;
 	}
 
-	function current_action() {
-		if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && ( 'delete' == $_REQUEST['action'] || 'delete' == $_REQUEST['action2'] ) )
+	/**
+	 *
+	 * @return string
+	 */
+	public function current_action() {
+		if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && ( 'delete' === $_REQUEST['action'] || 'delete' === $_REQUEST['action2'] ) )
 			return 'bulk-delete';
 
 		return parent::current_action();
 	}
 
-	function get_columns() {
+	/**
+	 *
+	 * @return array
+	 */
+	public function get_columns() {
 		$columns = array(
 			'cb'          => '<input type="checkbox" />',
 			'name'        => _x( 'Name', 'term name' ),
@@ -124,17 +179,20 @@ class WP_Terms_List_Table extends WP_List_Table {
 			'slug'        => __( 'Slug' ),
 		);
 
-		if ( 'link_category' == $this->screen->taxonomy ) {
+		if ( 'link_category' === $this->screen->taxonomy ) {
 			$columns['links'] = __( 'Links' );
 		} else {
-			$post_type_object = get_post_type_object( $this->screen->post_type );
-			$columns['posts'] = $post_type_object ? $post_type_object->labels->name : __( 'Posts' );
+			$columns['posts'] = _x( 'Count', 'Number/count of items' );
 		}
 
 		return $columns;
 	}
 
-	function get_sortable_columns() {
+	/**
+	 *
+	 * @return array
+	 */
+	protected function get_sortable_columns() {
 		return array(
 			'name'        => 'name',
 			'description' => 'description',
@@ -144,7 +202,10 @@ class WP_Terms_List_Table extends WP_List_Table {
 		);
 	}
 
-	function display_rows_or_placeholder() {
+	/**
+	 * @access public
+	 */
+	public function display_rows_or_placeholder() {
 		$taxonomy = $this->screen->taxonomy;
 
 		$args = wp_parse_args( $this->callback_args, array(
@@ -154,46 +215,55 @@ class WP_Terms_List_Table extends WP_List_Table {
 			'hide_empty' => 0
 		) );
 
-		extract( $args, EXTR_SKIP );
+		$page = $args['page'];
+
+		// Set variable because $args['number'] can be subsequently overridden.
+		$number = $args['number'];
 
 		$args['offset'] = $offset = ( $page - 1 ) * $number;
 
-		// convert it to table rows
+		// Convert it to table rows.
 		$count = 0;
 
-		$terms = array();
-
-		if ( is_taxonomy_hierarchical( $taxonomy ) && !isset( $orderby ) ) {
+		if ( is_taxonomy_hierarchical( $taxonomy ) && ! isset( $args['orderby'] ) ) {
 			// We'll need the full set of terms then.
 			$args['number'] = $args['offset'] = 0;
 		}
 		$terms = get_terms( $taxonomy, $args );
 
-		if ( empty( $terms ) ) {
-			list( $columns, $hidden ) = $this->get_column_info();
+		if ( empty( $terms ) || ! is_array( $terms ) ) {
 			echo '<tr class="no-items"><td class="colspanchange" colspan="' . $this->get_column_count() . '">';
 			$this->no_items();
 			echo '</td></tr>';
 			return;
 		}
 
-		if ( is_taxonomy_hierarchical( $taxonomy ) && !isset( $orderby ) ) {
-			if ( !empty( $search ) ) // Ignore children on searches.
+		if ( is_taxonomy_hierarchical( $taxonomy ) && ! isset( $args['orderby'] ) ) {
+			if ( ! empty( $args['search'] ) ) {// Ignore children on searches.
 				$children = array();
-			else
+			} else {
 				$children = _get_term_hierarchy( $taxonomy );
-
+			}
 			// Some funky recursion to get the job done( Paging & parents mainly ) is contained within, Skip it for non-hierarchical taxonomies for performance sake
 			$this->_rows( $taxonomy, $terms, $children, $offset, $number, $count );
 		} else {
-			$terms = get_terms( $taxonomy, $args );
-			foreach ( $terms as $term )
+			foreach ( $terms as $term ) {
 				$this->single_row( $term );
-			$count = $number; // Only displaying a single page.
+			}
 		}
 	}
 
-	function _rows( $taxonomy, $terms, &$children, $start, $per_page, &$count, $parent = 0, $level = 0 ) {
+	/**
+	 * @param string $taxonomy
+	 * @param array $terms
+	 * @param array $children
+	 * @param int   $start
+	 * @param int   $per_page
+	 * @param int   $count
+	 * @param int   $parent
+	 * @param int   $level
+	 */
+	private function _rows( $taxonomy, $terms, &$children, $start, $per_page, &$count, $parent = 0, $level = 0 ) {
 
 		$end = $start + $per_page;
 
@@ -241,18 +311,27 @@ class WP_Terms_List_Table extends WP_List_Table {
 		}
 	}
 
-	function single_row( $tag, $level = 0 ) {
-		static $row_class = '';
-		$row_class = ( $row_class == '' ? ' class="alternate"' : '' );
+	/**
+	 * @global string $taxonomy
+	 * @param object $tag
+	 * @param int $level
+	 */
+	public function single_row( $tag, $level = 0 ) {
+		global $taxonomy;
+ 		$tag = sanitize_term( $tag, $taxonomy );
 
 		$this->level = $level;
 
-		echo '<tr id="tag-' . $tag->term_id . '"' . $row_class . '>';
+		echo '<tr id="tag-' . $tag->term_id . '">';
 		$this->single_row_columns( $tag );
 		echo '</tr>';
 	}
 
-	function column_cb( $tag ) {
+	/**
+	 * @param object $tag
+	 * @return string
+	 */
+	public function column_cb( $tag ) {
 		$default_term = get_option( 'default_' . $this->screen->taxonomy );
 
 		if ( current_user_can( get_taxonomy( $this->screen->taxonomy )->cap->delete_terms ) && $tag->term_id != $default_term )
@@ -262,11 +341,12 @@ class WP_Terms_List_Table extends WP_List_Table {
 		return ' ';
 	}
 
-	function column_name( $tag ) {
+	/**
+	 * @param object $tag
+	 * @return string
+	 */
+	public function column_name( $tag ) {
 		$taxonomy = $this->screen->taxonomy;
-		$tax = get_taxonomy( $taxonomy );
-
-		$default_term = get_option( 'default_' . $taxonomy );
 
 		$pad = str_repeat( '— ', max( 0, $this->level ) );
 
@@ -286,19 +366,107 @@ class WP_Terms_List_Table extends WP_List_Table {
 		$name = apply_filters( 'term_name', $pad . ' ' . $tag->name, $tag );
 
 		$qe_data = get_term( $tag->term_id, $taxonomy, OBJECT, 'edit' );
-		$edit_link = esc_url( get_edit_term_link( $tag->term_id, $taxonomy, $this->screen->post_type ) );
 
-		$out = '<strong><a class="row-title" href="' . $edit_link . '" title="' . esc_attr( sprintf( __( 'Edit “%s”' ), $name ) ) . '">' . $name . '</a></strong><br />';
+		$uri = ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ? wp_get_referer() : $_SERVER['REQUEST_URI'];
+
+		$edit_link = add_query_arg(
+			'wp_http_referer',
+			urlencode( wp_unslash( $uri ) ),
+			get_edit_term_link( $tag->term_id, $taxonomy, $this->screen->post_type )
+		);
+
+		$out = sprintf(
+			'<strong><a class="row-title" href="%s" aria-label="%s">%s</a></strong><br />',
+			esc_url( $edit_link ),
+			/* translators: %s: taxonomy term name */
+			esc_attr( sprintf( __( '“%s” (Edit)' ), $tag->name ) ),
+			$name
+		);
+
+		$out .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">';
+		$out .= '<div class="name">' . $qe_data->name . '</div>';
+
+		/** This filter is documented in wp-admin/edit-tag-form.php */
+		$out .= '<div class="slug">' . apply_filters( 'editable_slug', $qe_data->slug, $qe_data ) . '</div>';
+		$out .= '<div class="parent">' . $qe_data->parent . '</div></div>';
+
+		return $out;
+	}
+
+	/**
+	 * Gets the name of the default primary column.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @return string Name of the default primary column, in this case, 'name'.
+	 */
+	protected function get_default_primary_column_name() {
+		return 'name';
+	}
+
+	/**
+	 * Generates and displays row action links.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @param object $tag         Tag being acted upon.
+	 * @param string $column_name Current column name.
+	 * @param string $primary     Primary column name.
+	 * @return string Row actions output for terms.
+	 */
+	protected function handle_row_actions( $tag, $column_name, $primary ) {
+		if ( $primary !== $column_name ) {
+			return '';
+		}
+
+		$taxonomy = $this->screen->taxonomy;
+		$tax = get_taxonomy( $taxonomy );
+		$default_term = get_option( 'default_' . $taxonomy );
+
+		$uri = ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ? wp_get_referer() : $_SERVER['REQUEST_URI'];
+
+		$edit_link = add_query_arg(
+			'wp_http_referer',
+			urlencode( wp_unslash( $uri ) ),
+			get_edit_term_link( $tag->term_id, $taxonomy, $this->screen->post_type )
+		);
 
 		$actions = array();
 		if ( current_user_can( $tax->cap->edit_terms ) ) {
-			$actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
-			$actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __( 'Quick Edit' ) . '</a>';
+			$actions['edit'] = sprintf(
+				'<a href="%s" aria-label="%s">%s</a>',
+				esc_url( $edit_link ),
+				/* translators: %s: taxonomy term name */
+				esc_attr( sprintf( __( 'Edit “%s”' ), $tag->name ) ),
+				__( 'Edit' )
+			);
+			$actions['inline hide-if-no-js'] = sprintf(
+				'<a href="#" class="editinline aria-button-if-js" aria-label="%s">%s</a>',
+				/* translators: %s: taxonomy term name */
+				esc_attr( sprintf( __( 'Quick edit “%s” inline' ), $tag->name ) ),
+				__( 'Quick Edit' )
+			);
+		}
+		if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term ) {
+			$actions['delete'] = sprintf(
+				'<a href="%s" class="delete-tag aria-button-if-js" aria-label="%s">%s</a>',
+				wp_nonce_url( "edit-tags.php?action=delete&taxonomy=$taxonomy&tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ),
+				/* translators: %s: taxonomy term name */
+				esc_attr( sprintf( __( 'Delete “%s”' ), $tag->name ) ),
+				__( 'Delete' )
+			);
+		}
+		if ( $tax->public ) {
+			$actions['view'] = sprintf(
+				'<a href="%s" aria-label="%s">%s</a>',
+				get_term_link( $tag ),
+				/* translators: %s: taxonomy term name */
+				esc_attr( sprintf( __( 'View “%s” archive' ), $tag->name ) ),
+				__( 'View' )
+			);
 		}
-		if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term )
-			$actions['delete'] = "<a class='delete-tag' href='" . wp_nonce_url( "edit-tags.php?action=delete&taxonomy=$taxonomy&tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ) . "'>" . __( 'Delete' ) . "</a>";
-		if ( $tax->public )
-			$actions['view'] = '<a href="' . get_term_link( $tag ) . '">' . __( 'View' ) . '</a>';
 
 		/**
 		 * Filter the action links displayed for each term in the Tags list table.
@@ -315,7 +483,7 @@ class WP_Terms_List_Table extends WP_List_Table {
 		/**
 		 * Filter the action links displayed for each term in the terms list table.
 		 *
-		 * The dynamic portion of the hook name, $taxonomy, refers to the taxonomy slug.
+		 * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
 		 *
 		 * @since 3.0.0
 		 *
@@ -325,27 +493,31 @@ class WP_Terms_List_Table extends WP_List_Table {
 		 */
 		$actions = apply_filters( "{$taxonomy}_row_actions", $actions, $tag );
 
-		$out .= $this->row_actions( $actions );
-		$out .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">';
-		$out .= '<div class="name">' . $qe_data->name . '</div>';
-
-		/** This filter is documented in wp-admin/edit-tag-form.php */
-		$out .= '<div class="slug">' . apply_filters( 'editable_slug', $qe_data->slug ) . '</div>';
-		$out .= '<div class="parent">' . $qe_data->parent . '</div></div>';
-
-		return $out;
+		return $this->row_actions( $actions );
 	}
 
-	function column_description( $tag ) {
+	/**
+	 * @param object $tag
+	 * @return string
+	 */
+	public function column_description( $tag ) {
 		return $tag->description;
 	}
 
-	function column_slug( $tag ) {
+	/**
+	 * @param object $tag
+	 * @return string
+	 */
+	public function column_slug( $tag ) {
 		/** This filter is documented in wp-admin/edit-tag-form.php */
-		return apply_filters( 'editable_slug', $tag->slug );
+		return apply_filters( 'editable_slug', $tag->slug, $tag );
 	}
 
-	function column_posts( $tag ) {
+	/**
+	 * @param object $tag
+	 * @return string
+	 */
+	public function column_posts( $tag ) {
 		$count = number_format_i18n( $tag->count );
 
 		$tax = get_taxonomy( $this->screen->taxonomy );
@@ -363,24 +535,33 @@ class WP_Terms_List_Table extends WP_List_Table {
 		if ( 'post' != $this->screen->post_type )
 			$args['post_type'] = $this->screen->post_type;
 
-		if ( 'attachment' == $this->screen->post_type )
+		if ( 'attachment' === $this->screen->post_type )
 			return "<a href='" . esc_url ( add_query_arg( $args, 'upload.php' ) ) . "'>$count</a>";
 
 		return "<a href='" . esc_url ( add_query_arg( $args, 'edit.php' ) ) . "'>$count</a>";
 	}
 
-	function column_links( $tag ) {
+	/**
+	 * @param object $tag
+	 * @return string
+	 */
+	public function column_links( $tag ) {
 		$count = number_format_i18n( $tag->count );
 		if ( $count )
 			$count = "<a href='link-manager.php?cat_id=$tag->term_id'>$count</a>";
 		return $count;
 	}
 
-	function column_default( $tag, $column_name ) {
+	/**
+	 * @param object $tag
+	 * @param string $column_name
+	 * @return string
+	 */
+	public function column_default( $tag, $column_name ) {
 		/**
 		 * Filter the displayed columns in the terms list table.
 		 *
-		 * The dynamic portion of the hook name, $this->screen->taxonomy,
+		 * The dynamic portion of the hook name, `$this->screen->taxonomy`,
 		 * refers to the slug of the current taxonomy.
 		 *
 		 * @since 2.8.0
@@ -397,19 +578,19 @@ class WP_Terms_List_Table extends WP_List_Table {
 	 *
 	 * @since 3.1.0
 	 */
-	function inline_edit() {
+	public function inline_edit() {
 		$tax = get_taxonomy( $this->screen->taxonomy );
 
 		if ( ! current_user_can( $tax->cap->edit_terms ) )
 			return;
 ?>
 
-	<form method="get" action=""><table style="display: none"><tbody id="inlineedit">
+	<form method="get"><table style="display: none"><tbody id="inlineedit">
 		<tr id="inline-edit" class="inline-edit-row" style="display: none"><td colspan="<?php echo $this->get_column_count(); ?>" class="colspanchange">
 
-			<fieldset><div class="inline-edit-col">
-				<h4><?php _e( 'Quick Edit' ); ?></h4>
-
+			<fieldset>
+				<legend class="inline-edit-legend"><?php _e( 'Quick Edit' ); ?></legend>
+				<div class="inline-edit-col">
 				<label>
 					<span class="title"><?php _ex( 'Name', 'term name' ); ?></span>
 					<span class="input-text-wrap"><input type="text" name="name" class="ptitle" value="" /></span>
@@ -438,8 +619,8 @@ class WP_Terms_List_Table extends WP_List_Table {
 	?>
 
 		<p class="inline-edit-save submit">
-			<a accesskey="c" href="#inline-edit" class="cancel button-secondary alignleft"><?php _e( 'Cancel' ); ?></a>
-			<a accesskey="s" href="#inline-edit" class="save button-primary alignright"><?php echo $tax->labels->update_item; ?></a>
+			<button type="button" class="cancel button-secondary alignleft"><?php _e( 'Cancel' ); ?></button>
+			<button type="button" class="save button-primary alignright"><?php echo $tax->labels->update_item; ?></button>
 			<span class="spinner"></span>
 			<span class="error" style="display:none;"></span>
 			<?php wp_nonce_field( 'taxinlineeditnonce', '_inline_edit', false ); ?>
diff --git a/wp-admin/includes/class-wp-theme-install-list-table.php b/wp-admin/includes/class-wp-theme-install-list-table.php
index e991c4e..3780c89 100644
--- a/wp-admin/includes/class-wp-theme-install-list-table.php
+++ b/wp-admin/includes/class-wp-theme-install-list-table.php
@@ -1,21 +1,41 @@
 <?php
 /**
- * Theme Installer List Table class.
+ * List Table API: WP_Theme_Install_List_Table class
  *
  * @package WordPress
- * @subpackage List_Table
+ * @subpackage Administration
+ * @since 3.1.0
+ */
+
+/**
+ * Core class used to implement displaying themes to install in a list table.
+ *
  * @since 3.1.0
  * @access private
+ *
+ * @see WP_Thenes_List_Table
  */
 class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 
-	var $features = array();
+	public $features = array();
 
-	function ajax_user_can() {
+	/**
+	 *
+	 * @return bool
+	 */
+	public function ajax_user_can() {
 		return current_user_can( 'install_themes' );
 	}
 
-	function prepare_items() {
+	/**
+	 *
+	 * @global array  $tabs
+	 * @global string $tab
+	 * @global int    $paged
+	 * @global string $type
+	 * @global array  $theme_field_defaults
+	 */
+	public function prepare_items() {
 		include( ABSPATH . 'wp-admin/includes/theme-install.php' );
 
 		global $tabs, $tab, $paged, $type, $theme_field_defaults;
@@ -38,24 +58,17 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 		// These are the tabs which are shown on the page,
 		$tabs = array();
 		$tabs['dashboard'] = __( 'Search' );
-		if ( 'search' == $tab )
+		if ( 'search' === $tab )
 			$tabs['search']	= __( 'Search Results' );
 		$tabs['upload'] = __( 'Upload' );
-		$tabs['featured'] = _x( 'Featured','Theme Installer' );
-		//$tabs['popular']  = _x( 'Popular','Theme Installer' );
-		$tabs['new']      = _x( 'Newest','Theme Installer' );
-		$tabs['updated']  = _x( 'Recently Updated','Theme Installer' );
+		$tabs['featured'] = _x( 'Featured', 'themes' );
+		//$tabs['popular']  = _x( 'Popular', 'themes' );
+		$tabs['new']      = _x( 'Latest', 'themes' );
+		$tabs['updated']  = _x( 'Recently Updated', 'themes' );
 
 		$nonmenu_tabs = array( 'theme-information' ); // Valid actions to perform which do not have a Menu item.
 
-		/**
-		 * Filter the tabs shown on the Install Themes screen.
-		 *
-		 * @since 2.8.0
-		 *
-		 * @param array $tabs The tabs shown on the Install Themes screen. Defaults are
-		 *                    'dashboard', 'search', 'upload', 'featured', 'new', and 'updated'.
-		 */
+		/** This filter is documented in wp-admin/theme-install.php */
 		$tabs = apply_filters( 'install_themes_tabs', $tabs );
 
 		/**
@@ -99,7 +112,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 				break;
 
 			case 'featured':
-			//case 'popular':
+			// case 'popular':
 			case 'new':
 			case 'updated':
 				$args['browse'] = $tab;
@@ -113,7 +126,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 		/**
 		 * Filter API request arguments for each Install Themes screen tab.
 		 *
-		 * The dynamic portion of the hook name, $tab, refers to the theme install
+		 * The dynamic portion of the hook name, `$tab`, refers to the theme install
 		 * tabs. Default tabs are 'dashboard', 'search', 'upload', 'featured',
 		 * 'new', and 'updated'.
 		 *
@@ -140,16 +153,25 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 		) );
 	}
 
-	function no_items() {
+	/**
+	 * @access public
+	 */
+	public function no_items() {
 		_e( 'No themes match your request.' );
 	}
 
-	function get_views() {
+	/**
+	 *
+	 * @global array $tabs
+	 * @global string $tab
+	 * @return array
+	 */
+	protected function get_views() {
 		global $tabs, $tab;
 
 		$display_tabs = array();
 		foreach ( (array) $tabs as $action => $text ) {
-			$class = ( $action == $tab ) ? ' class="current"' : '';
+			$class = ( $action === $tab ) ? ' class="current"' : '';
 			$href = self_admin_url('theme-install.php?tab=' . $action);
 			$display_tabs['theme-install-'.$action] = "<a href='$href'$class>$text</a>";
 		}
@@ -157,7 +179,10 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 		return $display_tabs;
 	}
 
-	function display() {
+	/**
+	 * @access public
+	 */
+	public function display() {
 		wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
 ?>
 		<div class="tablenav top themes">
@@ -180,10 +205,13 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 		</div>
 
 		<?php
-		parent::tablenav( 'bottom' );
+		$this->tablenav( 'bottom' );
 	}
 
-	function display_rows() {
+	/**
+	 * @access public
+	 */
+	public function display_rows() {
 		$themes = $this->items;
 		foreach ( $themes as $theme ) {
 				?>
@@ -198,6 +226,8 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 	/**
 	 * Prints a theme from the WordPress.org API.
 	 *
+	 * @global array $themes_allowedtags
+	 *
 	 * @param object $theme An object that contains theme data returned by the WordPress.org API.
 	 *
 	 * Example theme data:
@@ -211,10 +241,10 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 	 *     public 'rating' => float 80
 	 *     public 'num_ratings' => int 1
 	 *     public 'homepage' => string 'http://wordpress.org/themes/magazine-basic'
-	 *     public 'description' => string 'A basic magazine style layout with a fully customizable layout through a backend interface. Designed by <a href="http://bavotasan.com">c.bavota</a> of <a href="http://tinkerpriestmedia.com">Tinker Priest Media</a>.'
+	 *     public 'description' => string 'A basic magazine style layout with a fully customizable layout through a back-end interface. Designed by <a href="http://bavotasan.com">c.bavota</a> of <a href="http://tinkerpriestmedia.com">Tinker Priest Media</a>.'
 	 *     public 'download_link' => string 'http://wordpress.org/themes/download/magazine-basic.1.1.zip'
 	 */
-	function single_row( $theme ) {
+	public function single_row( $theme ) {
 		global $themes_allowedtags;
 
 		if ( empty( $theme ) )
@@ -244,10 +274,6 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 		$status = $this->_get_theme_status( $theme );
 
 		switch ( $status ) {
-			default:
-			case 'install':
-				$actions[] = '<a class="install-now" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Install %s' ), $name ) ) . '">' . __( 'Install Now' ) . '</a>';
-				break;
 			case 'update_available':
 				$actions[] = '<a class="install-now" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
 				break;
@@ -255,6 +281,10 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 			case 'latest_installed':
 				$actions[] = '<span class="install-now" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
 				break;
+			case 'install':
+			default:
+				$actions[] = '<a class="install-now" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Install %s' ), $name ) ) . '">' . __( 'Install Now' ) . '</a>';
+				break;
 		}
 
 		$actions[] = '<a class="install-theme-preview" href="' . esc_url( $preview_url ) . '" title="' . esc_attr( sprintf( __( 'Preview %s' ), $name ) ) . '">' . __( 'Preview' ) . '</a>';
@@ -272,7 +302,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 
 		?>
 		<a class="screenshot install-theme-preview" href="<?php echo esc_url( $preview_url ); ?>" title="<?php echo esc_attr( $preview_title ); ?>">
-			<img src='<?php echo esc_url( $theme->screenshot_url ); ?>' width='150' />
+			<img src="<?php echo esc_url( $theme->screenshot_url ); ?>" width="150" alt="" />
 		</a>
 
 		<h3><?php echo $name; ?></h3>
@@ -294,7 +324,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 	/**
 	 * Prints the wrapper for the theme installer.
 	 */
-	function theme_installer() {
+	public function theme_installer() {
 		?>
 		<div id="theme-installer" class="wp-full-overlay expanded">
 			<div class="wp-full-overlay-sidebar">
@@ -306,10 +336,10 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 					<div class="install-theme-info"></div>
 				</div>
 				<div class="wp-full-overlay-footer">
-					<a href="#" class="collapse-sidebar" title="<?php esc_attr_e('Collapse Sidebar'); ?>">
-						<span class="collapse-sidebar-label"><?php _e('Collapse'); ?></span>
+					<button type="button" class="collapse-sidebar button-secondary" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
 						<span class="collapse-sidebar-arrow"></span>
-					</a>
+						<span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span>
+					</button>
 				</div>
 			</div>
 			<div class="wp-full-overlay-main"></div>
@@ -323,7 +353,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 	 *
 	 * @param object $theme - A WordPress.org Theme API object.
 	 */
-	function theme_installer_single( $theme ) {
+	public function theme_installer_single( $theme ) {
 		?>
 		<div id="theme-installer" class="wp-full-overlay single-theme">
 			<div class="wp-full-overlay-sidebar">
@@ -339,9 +369,11 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 	/**
 	 * Prints the info for a theme (to be used in the theme installer modal).
 	 *
+	 * @global array $themes_allowedtags
+	 *
 	 * @param object $theme - A WordPress.org Theme API object.
 	 */
-	function install_theme_info( $theme ) {
+	public function install_theme_info( $theme ) {
 		global $themes_allowedtags;
 
 		if ( empty( $theme ) )
@@ -350,8 +382,6 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 		$name   = wp_kses( $theme->name,   $themes_allowedtags );
 		$author = wp_kses( $theme->author, $themes_allowedtags );
 
-		$num_ratings = sprintf( _n( '(based on %s rating)', '(based on %s ratings)', $theme->num_ratings ), number_format_i18n( $theme->num_ratings ) );
-
 		$install_url = add_query_arg( array(
 			'action' => 'install-theme',
 			'theme'  => $theme->slug,
@@ -367,10 +397,6 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 		?>
 		<div class="install-theme-info"><?php
 			switch ( $status ) {
-				default:
-				case 'install':
-					echo '<a class="theme-install button-primary" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '">' . __( 'Install' ) . '</a>';
-					break;
 				case 'update_available':
 					echo '<a class="theme-install button-primary" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
 					break;
@@ -378,11 +404,15 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 				case 'latest_installed':
 					echo '<span class="theme-install" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
 					break;
+				case 'install':
+				default:
+					echo '<a class="theme-install button-primary" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '">' . __( 'Install' ) . '</a>';
+					break;
 			} ?>
 			<h3 class="theme-name"><?php echo $name; ?></h3>
 			<span class="theme-by"><?php printf( __( 'By %s' ), $author ); ?></span>
 			<?php if ( isset( $theme->screenshot_url ) ): ?>
-				<img class="theme-screenshot" src="<?php echo esc_url( $theme->screenshot_url ); ?>" />
+				<img class="theme-screenshot" src="<?php echo esc_url( $theme->screenshot_url ); ?>" alt="" />
 			<?php endif; ?>
 			<div class="theme-details">
 				<?php wp_star_rating( array( 'rating' => $theme->rating, 'type' => 'percent', 'number' => $theme->num_ratings ) ); ?>
@@ -403,12 +433,14 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 	 * Send required variables to JavaScript land
 	 *
 	 * @since 3.4.0
-	 * @access private
+	 * @access public
+	 *
+	 * @global string $tab  Current tab within Themes->Install screen
+	 * @global string $type Type of search.
 	 *
-	 * @uses $tab Global; current tab within Themes->Install screen
-	 * @uses $type Global; type of search.
+	 * @param array $extra_args Unused.
 	 */
-	function _js_vars( $extra_args = array() ) {
+	public function _js_vars( $extra_args = array() ) {
 		global $tab, $type;
 		parent::_js_vars( compact( 'tab', 'type' ) );
 	}
diff --git a/wp-admin/includes/class-wp-themes-list-table.php b/wp-admin/includes/class-wp-themes-list-table.php
index be75de0..2426e61 100644
--- a/wp-admin/includes/class-wp-themes-list-table.php
+++ b/wp-admin/includes/class-wp-themes-list-table.php
@@ -1,30 +1,55 @@
 <?php
 /**
- * Themes List Table class.
+ * List Table API: WP_Themes_List_Table class
  *
  * @package WordPress
- * @subpackage List_Table
+ * @subpackage Administration
+ * @since 3.1.0
+ */
+
+/**
+ * Core class used to implement displaying installed themes in a list table.
+ *
  * @since 3.1.0
  * @access private
+ *
+ * @see WP_List_Table
  */
 class WP_Themes_List_Table extends WP_List_Table {
 
 	protected $search_terms = array();
-	var $features = array();
+	public $features = array();
 
-	function __construct( $args = array() ) {
+	/**
+	 * Constructor.
+	 *
+	 * @since 3.1.0
+	 * @access public
+	 *
+	 * @see WP_List_Table::__construct() for more information on default arguments.
+	 *
+	 * @param array $args An associative array of arguments.
+	 */
+	public function __construct( $args = array() ) {
 		parent::__construct( array(
 			'ajax' => true,
 			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
 		) );
 	}
 
-	function ajax_user_can() {
+	/**
+	 *
+	 * @return bool
+	 */
+	public function ajax_user_can() {
 		// Do not check edit_theme_options here. AJAX calls for available themes require switch_themes.
 		return current_user_can( 'switch_themes' );
 	}
 
-	function prepare_items() {
+	/**
+	 * @access public
+	 */
+	public function prepare_items() {
 		$themes = wp_get_themes( array( 'allowed' => true ) );
 
 		if ( ! empty( $_REQUEST['s'] ) )
@@ -57,7 +82,10 @@ class WP_Themes_List_Table extends WP_List_Table {
 		) );
 	}
 
-	function no_items() {
+	/**
+	 * @access public
+	 */
+	public function no_items() {
 		if ( $this->search_terms || $this->features ) {
 			_e( 'No items found.' );
 			return;
@@ -73,7 +101,7 @@ class WP_Themes_List_Table extends WP_List_Table {
 
 				return;
 			}
-			// else, fallthrough. install_themes doesn't help if you can't enable it.
+			// Else, fallthrough. install_themes doesn't help if you can't enable it.
 		} else {
 			if ( current_user_can( 'install_themes' ) ) {
 				printf( __( 'You only have one theme installed right now. Live a little! You can choose from over 1,000 free themes in the WordPress.org Theme Directory at any time: just click on the <a href="%s">Install Themes</a> tab above.' ), admin_url( 'theme-install.php' ) );
@@ -85,7 +113,10 @@ class WP_Themes_List_Table extends WP_List_Table {
 		printf( __( 'Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes.' ), get_site_option( 'site_name' ) );
 	}
 
-	function tablenav( $which = 'top' ) {
+	/**
+	 * @param string $which
+	 */
+	public function tablenav( $which = 'top' ) {
 		if ( $this->get_pagination_arg( 'total_pages' ) <= 1 )
 			return;
 		?>
@@ -97,7 +128,10 @@ class WP_Themes_List_Table extends WP_List_Table {
 		<?php
 	}
 
-	function display() {
+	/**
+	 * @access public
+	 */
+	public function display() {
 		wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
 ?>
 		<?php $this->tablenav( 'top' ); ?>
@@ -110,11 +144,18 @@ class WP_Themes_List_Table extends WP_List_Table {
 <?php
 	}
 
-	function get_columns() {
+	/**
+	 *
+	 * @return array
+	 */
+	public function get_columns() {
 		return array();
 	}
 
-	function display_rows_or_placeholder() {
+	/**
+	 * @access public
+	 */
+	public function display_rows_or_placeholder() {
 		if ( $this->has_items() ) {
 			$this->display_rows();
 		} else {
@@ -124,7 +165,10 @@ class WP_Themes_List_Table extends WP_List_Table {
 		}
 	}
 
-	function display_rows() {
+	/**
+	 * @access public
+	 */
+	public function display_rows() {
 		$themes = $this->items;
 
 		foreach ( $themes as $theme ):
@@ -138,20 +182,14 @@ class WP_Themes_List_Table extends WP_List_Table {
 
 			$activate_link = wp_nonce_url( "themes.php?action=activate&template=" . urlencode( $template ) . "&stylesheet=" . urlencode( $stylesheet ), 'switch-theme_' . $stylesheet );
 
-			$preview_link = esc_url( add_query_arg(
-				array( 'preview' => 1, 'template' => urlencode( $template ), 'stylesheet' => urlencode( $stylesheet ), 'preview_iframe' => true, 'TB_iframe' => 'true' ),
-				home_url( '/' ) ) );
-
 			$actions = array();
 			$actions['activate'] = '<a href="' . $activate_link . '" class="activatelink" title="'
 				. esc_attr( sprintf( __( 'Activate “%s”' ), $title ) ) . '">' . __( 'Activate' ) . '</a>';
 
-			$actions['preview'] = '<a href="' . $preview_link . '" class="hide-if-customize" title="'
-				. esc_attr( sprintf( __( 'Preview “%s”' ), $title ) ) . '">' . __( 'Preview' ) . '</a>';
-
-			if ( current_user_can( 'edit_theme_options' ) )
+			if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
 				$actions['preview'] .= '<a href="' . wp_customize_url( $stylesheet ) . '" class="load-customize hide-if-no-customize">'
 					. __( 'Live Preview' ) . '</a>';
+			}
 
 			if ( ! is_multisite() && current_user_can( 'delete_themes' ) )
 				$actions['delete'] = '<a class="submitdelete deletion" href="' . wp_nonce_url( 'themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet )
@@ -168,11 +206,11 @@ class WP_Themes_List_Table extends WP_List_Table {
 
 			?>
 
-			<a href="<?php echo $preview_link; ?>" class="screenshot hide-if-customize">
+			<span class="screenshot hide-if-customize">
 				<?php if ( $screenshot = $theme->get_screenshot() ) : ?>
 					<img src="<?php echo esc_url( $screenshot ); ?>" alt="" />
 				<?php endif; ?>
-			</a>
+			</span>
 			<a href="<?php echo wp_customize_url( $stylesheet ); ?>" class="screenshot load-customize hide-if-no-customize">
 				<?php if ( $screenshot = $theme->get_screenshot() ) : ?>
 					<img src="<?php echo esc_url( $screenshot ); ?>" alt="" />
@@ -194,11 +232,11 @@ class WP_Themes_List_Table extends WP_List_Table {
 			</div>
 
 			<div class="themedetaildiv hide-if-js">
-				<p><strong><?php _e('Version: '); ?></strong><?php echo $version; ?></p>
+				<p><strong><?php _e('Version:'); ?></strong> <?php echo $version; ?></p>
 				<p><?php echo $theme->display('Description'); ?></p>
 				<?php if ( $theme->parent() ) {
 					printf( ' <p class="howto">' . __( 'This <a href="%1$s">child theme</a> requires its parent theme, %2$s.' ) . '</p>',
-						__( 'http://codex.wordpress.org/Child_Themes' ),
+						__( 'https://codex.wordpress.org/Child_Themes' ),
 						$theme->parent()->display( 'Name' ) );
 				} ?>
 			</div>
@@ -208,7 +246,11 @@ class WP_Themes_List_Table extends WP_List_Table {
 		endforeach;
 	}
 
-	function search_theme( $theme ) {
+	/**
+	 * @param WP_Theme $theme
+	 * @return bool
+	 */
+	public function search_theme( $theme ) {
 		// Search the features
 		foreach ( $this->features as $word ) {
 			if ( ! in_array( $word, $theme->get('Tags') ) )
@@ -243,13 +285,11 @@ class WP_Themes_List_Table extends WP_List_Table {
 	 * Send required variables to JavaScript land
 	 *
 	 * @since 3.4.0
-	 * @access private
+	 * @access public
 	 *
-	 * @uses $this->features Array of all feature search terms.
-	 * @uses get_pagenum()
-	 * @uses _pagination_args['total_pages']
+	 * @param array $extra_args
 	 */
-	 function _js_vars( $extra_args = array() ) {
+	public function _js_vars( $extra_args = array() ) {
 		$search_string = isset( $_REQUEST['s'] ) ? esc_attr( wp_unslash( $_REQUEST['s'] ) ) : '';
 
 		$args = array(
@@ -262,7 +302,7 @@ class WP_Themes_List_Table extends WP_List_Table {
 		if ( is_array( $extra_args ) )
 			$args = array_merge( $args, $extra_args );
 
-		printf( "<script type='text/javascript'>var theme_list_args = %s;</script>\n", json_encode( $args ) );
+		printf( "<script type='text/javascript'>var theme_list_args = %s;</script>\n", wp_json_encode( $args ) );
 		parent::_js_vars();
 	}
 }
diff --git a/wp-admin/includes/class-wp-upgrader-skins.php b/wp-admin/includes/class-wp-upgrader-skins.php
index 8c48407..c9d32ce 100644
--- a/wp-admin/includes/class-wp-upgrader-skins.php
+++ b/wp-admin/includes/class-wp-upgrader-skins.php
@@ -16,48 +16,93 @@
  */
 class WP_Upgrader_Skin {
 
-	var $upgrader;
-	var $done_header = false;
-	var $result = false;
+	public $upgrader;
+	public $done_header = false;
+	public $done_footer = false;
+	public $result = false;
+	public $options = array();
 
-	function __construct($args = array()) {
+	/**
+	 *
+	 * @param array $args
+	 */
+	public function __construct($args = array()) {
 		$defaults = array( 'url' => '', 'nonce' => '', 'title' => '', 'context' => false );
 		$this->options = wp_parse_args($args, $defaults);
 	}
 
-	function set_upgrader(&$upgrader) {
+	/**
+	 * @param WP_Upgrader $upgrader
+	 */
+	public function set_upgrader(&$upgrader) {
 		if ( is_object($upgrader) )
 			$this->upgrader =& $upgrader;
 		$this->add_strings();
 	}
 
-	function add_strings() {
+	/**
+	 * @access public
+	 */
+	public function add_strings() {
 	}
 
-	function set_result($result) {
+	/**
+	 *
+	 * @param string|false|WP_Error $result
+	 */
+	public function set_result($result) {
 		$this->result = $result;
 	}
 
-	function request_filesystem_credentials($error = false) {
+	/**
+	 *
+	 * @param bool   $error
+	 * @param string $context
+	 * @param bool   $allow_relaxed_file_ownership
+	 * @return type
+	 */
+	public function request_filesystem_credentials( $error = false, $context = false, $allow_relaxed_file_ownership = false ) {
 		$url = $this->options['url'];
-		$context = $this->options['context'];
-		if ( !empty($this->options['nonce']) )
+		if ( ! $context ) {
+			$context = $this->options['context'];
+		}
+		if ( !empty($this->options['nonce']) ) {
 			$url = wp_nonce_url($url, $this->options['nonce']);
-		return request_filesystem_credentials($url, '', $error, $context); //Possible to bring inline, Leaving as is for now.
+		}
+
+		$extra_fields = array();
+
+		return request_filesystem_credentials( $url, '', $error, $context, $extra_fields, $allow_relaxed_file_ownership );
 	}
 
-	function header() {
-		if ( $this->done_header )
+	/**
+	 * @access public
+	 */
+	public function header() {
+		if ( $this->done_header ) {
 			return;
+		}
 		$this->done_header = true;
 		echo '<div class="wrap">';
-		echo '<h2>' . $this->options['title'] . '</h2>';
+		echo '<h1>' . $this->options['title'] . '</h1>';
 	}
-	function footer() {
+
+	/**
+	 * @access public
+	 */
+	public function footer() {
+		if ( $this->done_footer ) {
+			return;
+		}
+		$this->done_footer = true;
 		echo '</div>';
 	}
 
-	function error($errors) {
+	/**
+	 *
+	 * @param string|WP_Error $errors
+	 */
+	public function error($errors) {
 		if ( ! $this->done_header )
 			$this->header();
 		if ( is_string($errors) ) {
@@ -72,7 +117,11 @@ class WP_Upgrader_Skin {
 		}
 	}
 
-	function feedback($string) {
+	/**
+	 *
+	 * @param string $string
+	 */
+	public function feedback($string) {
 		if ( isset( $this->upgrader->strings[$string] ) )
 			$string = $this->upgrader->strings[$string];
 
@@ -89,8 +138,16 @@ class WP_Upgrader_Skin {
 			return;
 		show_message($string);
 	}
-	function before() {}
-	function after() {}
+
+	/**
+	 * @access public
+	 */
+	public function before() {}
+
+	/**
+	 * @access public
+	 */
+	public function after() {}
 
 	/**
 	 * Output JavaScript that calls function to decrement the update counts.
@@ -104,14 +161,33 @@ class WP_Upgrader_Skin {
 		if ( ! $this->result || is_wp_error( $this->result ) || 'up_to_date' === $this->result ) {
 			return;
 		}
-		echo '<script type="text/javascript">
-				(function( wp ) {
-					if ( wp && wp.updates.decrementCount ) {
-						wp.updates.decrementCount( "' . $type . '" );
+
+		if ( defined( 'IFRAME_REQUEST' ) ) {
+			echo '<script type="text/javascript">
+					if ( window.postMessage && JSON ) {
+						window.parent.postMessage( JSON.stringify( { action: "decrementUpdateCount", upgradeType: "' . $type . '" } ), window.location.protocol + "//" + window.location.hostname );
 					}
-				})( window.wp );
-			</script>';
+				</script>';
+		} else {
+			echo '<script type="text/javascript">
+					(function( wp ) {
+						if ( wp && wp.updates.decrementCount ) {
+							wp.updates.decrementCount( "' . $type . '" );
+						}
+					})( window.wp );
+				</script>';
+		}
 	}
+
+	/**
+	 * @access public
+	 */
+	public function bulk_header() {}
+
+	/**
+	 * @access public
+	 */
+	public function bulk_footer() {}
 }
 
 /**
@@ -122,11 +198,15 @@ class WP_Upgrader_Skin {
  * @since 2.8.0
  */
 class Plugin_Upgrader_Skin extends WP_Upgrader_Skin {
-	var $plugin = '';
-	var $plugin_active = false;
-	var $plugin_network_active = false;
+	public $plugin = '';
+	public $plugin_active = false;
+	public $plugin_network_active = false;
 
-	function __construct($args = array()) {
+	/**
+	 *
+	 * @param array $args
+	 */
+	public function __construct( $args = array() ) {
 		$defaults = array( 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Update Plugin') );
 		$args = wp_parse_args($args, $defaults);
 
@@ -138,17 +218,21 @@ class Plugin_Upgrader_Skin extends WP_Upgrader_Skin {
 		parent::__construct($args);
 	}
 
-	function after() {
+	/**
+	 * @access public
+	 */
+	public function after() {
 		$this->plugin = $this->upgrader->plugin_info();
 		if ( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){
-			echo '<iframe style="border:0;overflow:hidden" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&networkwide=' . $this->plugin_network_active . '&plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin) .'"></iframe>';
+			// Currently used only when JS is off for a single plugin update?
+			echo '<iframe title="' . esc_attr__( 'Update progress' ) . '" style="border:0;overflow:hidden" width="100%" height="170" src="' . wp_nonce_url( 'update.php?action=activate-plugin&networkwide=' . $this->plugin_network_active . '&plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin ) . '"></iframe>';
 		}
 
 		$this->decrement_update_count( 'plugin' );
 
 		$update_actions =  array(
-			'activate_plugin' => '<a href="' . wp_nonce_url('plugins.php?action=activate&plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin) . '" title="' . esc_attr__('Activate this plugin') . '" target="_parent">' . __('Activate Plugin') . '</a>',
-			'plugins_page' => '<a href="' . self_admin_url('plugins.php') . '" title="' . esc_attr__('Go to plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>'
+			'activate_plugin' => '<a href="' . wp_nonce_url( 'plugins.php?action=activate&plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin) . '" target="_parent">' . __( 'Activate Plugin' ) . '</a>',
+			'plugins_page' => '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>'
 		);
 		if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugins' ) )
 			unset( $update_actions['activate_plugin'] );
@@ -176,25 +260,41 @@ class Plugin_Upgrader_Skin extends WP_Upgrader_Skin {
  * @since 3.0.0
  */
 class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
-	var $in_loop = false;
-	var $error = false;
+	public $in_loop = false;
+	/**
+	 * @var string|false
+	 */
+	public $error = false;
 
-	function __construct($args = array()) {
+	/**
+	 *
+	 * @param array $args
+	 */
+	public function __construct($args = array()) {
 		$defaults = array( 'url' => '', 'nonce' => '' );
 		$args = wp_parse_args($args, $defaults);
 
 		parent::__construct($args);
 	}
 
-	function add_strings() {
+	/**
+	 * @access public
+	 */
+	public function add_strings() {
 		$this->upgrader->strings['skin_upgrade_start'] = __('The update process is starting. This process may take a while on some hosts, so please be patient.');
-		$this->upgrader->strings['skin_update_failed_error'] = __('An error occurred while updating %1$s: <strong>%2$s</strong>');
+		/* translators: 1: Title of an update, 2: Error message */
+		$this->upgrader->strings['skin_update_failed_error'] = __('An error occurred while updating %1$s: %2$s');
+		/* translators: 1: Title of an update */
 		$this->upgrader->strings['skin_update_failed'] = __('The update of %1$s failed.');
-		$this->upgrader->strings['skin_update_successful'] = __('%1$s updated successfully.').' <a onclick="%2$s" href="#" class="hide-if-no-js"><span>'.__('Show Details').'</span><span class="hidden">'.__('Hide Details').'</span>.</a>';
+		/* translators: 1: Title of an update */
+		$this->upgrader->strings['skin_update_successful'] = __( '%1$s updated successfully.' ) . ' <a onclick="%2$s" href="#" class="hide-if-no-js"><span>' . __( 'Show Details' ) . '</span><span class="hidden">' . __( 'Hide Details' ) . '</span></a>';
 		$this->upgrader->strings['skin_upgrade_end'] = __('All updates have been completed.');
 	}
 
-	function feedback($string) {
+	/**
+	 * @param string $string
+	 */
+	public function feedback($string) {
 		if ( isset( $this->upgrader->strings[$string] ) )
 			$string = $this->upgrader->strings[$string];
 
@@ -215,18 +315,30 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
 			echo "<p>$string</p>\n";
 	}
 
-	function header() {
+	/**
+	 * @access public
+	 */
+	public function header() {
 		// Nothing, This will be displayed within a iframe.
 	}
 
-	function footer() {
+	/**
+	 * @access public
+	 */
+	public function footer() {
 		// Nothing, This will be displayed within a iframe.
 	}
-	function error($error) {
+
+	/**
+	 *
+	 * @param string|WP_Error $error
+	 */
+	public function error($error) {
 		if ( is_string($error) && isset( $this->upgrader->strings[$error] ) )
 			$this->error = $this->upgrader->strings[$error];
 
 		if ( is_wp_error($error) ) {
+			$messages = array();
 			foreach ( $error->get_error_messages() as $emessage ) {
 				if ( $error->get_error_data() && is_string( $error->get_error_data() ) )
 					$messages[] = $emessage . ' ' . esc_html( strip_tags( $error->get_error_data() ) );
@@ -238,29 +350,44 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
 		echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
 	}
 
-	function bulk_header() {
+	/**
+	 * @access public
+	 */
+	public function bulk_header() {
 		$this->feedback('skin_upgrade_start');
 	}
 
-	function bulk_footer() {
+	/**
+	 * @access public
+	 */
+	public function bulk_footer() {
 		$this->feedback('skin_upgrade_end');
 	}
 
-	function before($title = '') {
+	/**
+	 *
+	 * @param string $title
+	 */
+	public function before($title = '') {
 		$this->in_loop = true;
-		printf( '<h4>' . $this->upgrader->strings['skin_before_update_header'] . ' <span class="spinner waiting-' . $this->upgrader->update_current . '"></span></h4>',  $title, $this->upgrader->update_current, $this->upgrader->update_count);
+		printf( '<h2>' . $this->upgrader->strings['skin_before_update_header'] . ' <span class="spinner waiting-' . $this->upgrader->update_current . '"></span></h2>', $title, $this->upgrader->update_current, $this->upgrader->update_count );
 		echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').css("display", "inline-block");</script>';
 		echo '<div class="update-messages hide-if-js" id="progress-' . esc_attr($this->upgrader->update_current) . '"><p>';
 		$this->flush_output();
 	}
 
-	function after($title = '') {
+	/**
+	 *
+	 * @param string $title
+	 */
+	public function after($title = '') {
 		echo '</p></div>';
 		if ( $this->error || ! $this->result ) {
-			if ( $this->error )
-				echo '<div class="error"><p>' . sprintf($this->upgrader->strings['skin_update_failed_error'], $title, $this->error) . '</p></div>';
-			else
+			if ( $this->error ) {
+				echo '<div class="error"><p>' . sprintf($this->upgrader->strings['skin_update_failed_error'], $title, '<strong>' . $this->error . '</strong>' ) . '</p></div>';
+			} else {
 				echo '<div class="error"><p>' . sprintf($this->upgrader->strings['skin_update_failed'], $title) . '</p></div>';
+			}
 
 			echo '<script type="text/javascript">jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').show();</script>';
 		}
@@ -274,61 +401,56 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
 		$this->flush_output();
 	}
 
-	function reset() {
+	/**
+	 * @access public
+	 */
+	public function reset() {
 		$this->in_loop = false;
 		$this->error = false;
 	}
 
-	function flush_output() {
-		wp_ob_end_flush_all();
-		flush();
-	}
-
 	/**
-	 * Output JavaScript that sends message to parent window to decrement the update counts.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @param string $type Type of update count to decrement. Likely values include 'plugin',
-	 *                     'theme', 'translation', etc.
+	 * @access public
 	 */
-	protected function decrement_update_count( $type ) {
-		if ( ! $this->result || is_wp_error( $this->result ) || 'up_to_date' === $this->result ) {
-			return;
-		}
-		echo '<script type="text/javascript">
-				if ( window.postMessage && JSON ) {
-					window.parent.postMessage( JSON.stringify( { action: "decrementUpdateCount", upgradeType: "' . $type . '" } ), window.location.protocol + "//" + window.location.hostname );
-				}
-			</script>';
+	public function flush_output() {
+		wp_ob_end_flush_all();
+		flush();
 	}
 }
 
 class Bulk_Plugin_Upgrader_Skin extends Bulk_Upgrader_Skin {
-	var $plugin_info = array(); // Plugin_Upgrader::bulk() will fill this in.
-
-	function __construct($args = array()) {
-		parent::__construct($args);
-	}
+	public $plugin_info = array(); // Plugin_Upgrader::bulk() will fill this in.
 
-	function add_strings() {
+	public function add_strings() {
 		parent::add_strings();
 		$this->upgrader->strings['skin_before_update_header'] = __('Updating Plugin %1$s (%2$d/%3$d)');
 	}
 
-	function before($title = '') {
+	/**
+	 *
+	 * @param string $title
+	 */
+	public function before($title = '') {
 		parent::before($this->plugin_info['Title']);
 	}
 
-	function after($title = '') {
+	/**
+	 *
+	 * @param string $title
+	 */
+	public function after($title = '') {
 		parent::after($this->plugin_info['Title']);
 		$this->decrement_update_count( 'plugin' );
 	}
-	function bulk_footer() {
+
+	/**
+	 * @access public
+	 */
+	public function bulk_footer() {
 		parent::bulk_footer();
 		$update_actions =  array(
-			'plugins_page' => '<a href="' . self_admin_url('plugins.php') . '" title="' . esc_attr__('Go to plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>',
-			'updates_page' => '<a href="' . self_admin_url('update-core.php') . '" title="' . esc_attr__('Go to WordPress Updates page') . '" target="_parent">' . __('Return to WordPress Updates') . '</a>'
+			'plugins_page' => '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>',
+			'updates_page' => '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>'
 		);
 		if ( ! current_user_can( 'activate_plugins' ) )
 			unset( $update_actions['plugins_page'] );
@@ -349,31 +471,38 @@ class Bulk_Plugin_Upgrader_Skin extends Bulk_Upgrader_Skin {
 }
 
 class Bulk_Theme_Upgrader_Skin extends Bulk_Upgrader_Skin {
-	var $theme_info = array(); // Theme_Upgrader::bulk() will fill this in.
+	public $theme_info = array(); // Theme_Upgrader::bulk() will fill this in.
 
-	function __construct($args = array()) {
-		parent::__construct($args);
-	}
-
-	function add_strings() {
+	public function add_strings() {
 		parent::add_strings();
 		$this->upgrader->strings['skin_before_update_header'] = __('Updating Theme %1$s (%2$d/%3$d)');
 	}
 
-	function before($title = '') {
+	/**
+	 *
+	 * @param string $title
+	 */
+	public function before($title = '') {
 		parent::before( $this->theme_info->display('Name') );
 	}
 
-	function after($title = '') {
+	/**
+	 *
+	 * @param string $title
+	 */
+	public function after($title = '') {
 		parent::after( $this->theme_info->display('Name') );
 		$this->decrement_update_count( 'theme' );
 	}
 
-	function bulk_footer() {
+	/**
+	 * @access public
+	 */
+	public function bulk_footer() {
 		parent::bulk_footer();
 		$update_actions =  array(
-			'themes_page' => '<a href="' . self_admin_url('themes.php') . '" title="' . esc_attr__('Go to themes page') . '" target="_parent">' . __('Return to Themes page') . '</a>',
-			'updates_page' => '<a href="' . self_admin_url('update-core.php') . '" title="' . esc_attr__('Go to WordPress Updates page') . '" target="_parent">' . __('Return to WordPress Updates') . '</a>'
+			'themes_page' => '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>',
+			'updates_page' => '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>'
 		);
 		if ( ! current_user_can( 'switch_themes' ) && ! current_user_can( 'edit_theme_options' ) )
 			unset( $update_actions['themes_page'] );
@@ -401,10 +530,14 @@ class Bulk_Theme_Upgrader_Skin extends Bulk_Upgrader_Skin {
  * @since 2.8.0
  */
 class Plugin_Installer_Skin extends WP_Upgrader_Skin {
-	var $api;
-	var $type;
+	public $api;
+	public $type;
 
-	function __construct($args = array()) {
+	/**
+	 *
+	 * @param array $args
+	 */
+	public function __construct($args = array()) {
 		$defaults = array( 'type' => 'web', 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => '' );
 		$args = wp_parse_args($args, $defaults);
 
@@ -414,13 +547,18 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin {
 		parent::__construct($args);
 	}
 
-	function before() {
+	/**
+	 * @access public
+	 */
+	public function before() {
 		if ( !empty($this->api) )
 			$this->upgrader->strings['process_success'] = sprintf( __('Successfully installed the plugin <strong>%s %s</strong>.'), $this->api->name, $this->api->version);
 	}
 
-	function after() {
-
+	/**
+	 * @access public
+	 */
+	public function after() {
 		$plugin_file = $this->upgrader->plugin_info();
 
 		$install_actions = array();
@@ -428,21 +566,22 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin {
 		$from = isset($_GET['from']) ? wp_unslash( $_GET['from'] ) : 'plugins';
 
 		if ( 'import' == $from )
-			$install_actions['activate_plugin'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&from=import&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin') . '" target="_parent">' . __('Activate Plugin & Run Importer') . '</a>';
+			$install_actions['activate_plugin'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&from=import&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin & Run Importer' ) . '</a>';
 		else
-			$install_actions['activate_plugin'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin') . '" target="_parent">' . __('Activate Plugin') . '</a>';
+			$install_actions['activate_plugin'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin' ) . '</a>';
 
 		if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) {
-			$install_actions['network_activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&networkwide=1&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin for all sites in this network') . '" target="_parent">' . __('Network Activate') . '</a>';
+			$install_actions['network_activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&networkwide=1&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Network Activate' ) . '</a>';
 			unset( $install_actions['activate_plugin'] );
 		}
 
-		if ( 'import' == $from )
-			$install_actions['importers_page'] = '<a href="' . admin_url('import.php') . '" title="' . esc_attr__('Return to Importers') . '" target="_parent">' . __('Return to Importers') . '</a>';
-		else if ( $this->type == 'web' )
-			$install_actions['plugins_page'] = '<a href="' . self_admin_url('plugin-install.php') . '" title="' . esc_attr__('Return to Plugin Installer') . '" target="_parent">' . __('Return to Plugin Installer') . '</a>';
-		else
-			$install_actions['plugins_page'] = '<a href="' . self_admin_url('plugins.php') . '" title="' . esc_attr__('Return to Plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>';
+		if ( 'import' == $from ) {
+			$install_actions['importers_page'] = '<a href="' . admin_url( 'import.php' ) . '" target="_parent">' . __( 'Return to Importers' ) . '</a>';
+		} elseif ( $this->type == 'web' ) {
+			$install_actions['plugins_page'] = '<a href="' . self_admin_url( 'plugin-install.php' ) . '" target="_parent">' . __( 'Return to Plugin Installer' ) . '</a>';
+		} else {
+			$install_actions['plugins_page'] = '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>';
+		}
 
 		if ( ! $this->result || is_wp_error($this->result) ) {
 			unset( $install_actions['activate_plugin'], $install_actions['network_activate'] );
@@ -476,10 +615,14 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin {
  * @since 2.8.0
  */
 class Theme_Installer_Skin extends WP_Upgrader_Skin {
-	var $api;
-	var $type;
+	public $api;
+	public $type;
 
-	function __construct($args = array()) {
+	/**
+	 *
+	 * @param array $args
+	 */
+	public function __construct($args = array()) {
 		$defaults = array( 'type' => 'web', 'url' => '', 'theme' => '', 'nonce' => '', 'title' => '' );
 		$args = wp_parse_args($args, $defaults);
 
@@ -489,12 +632,18 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin {
 		parent::__construct($args);
 	}
 
-	function before() {
+	/**
+	 * @access public
+	 */
+	public function before() {
 		if ( !empty($this->api) )
 			$this->upgrader->strings['process_success'] = sprintf( $this->upgrader->strings['process_success_specific'], $this->api->name, $this->api->version);
 	}
 
-	function after() {
+	/**
+	 * @access public
+	 */
+	public function after() {
 		if ( empty($this->upgrader->result['destination_name']) )
 			return;
 
@@ -506,12 +655,6 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin {
 		$stylesheet = $this->upgrader->result['destination_name'];
 		$template   = $theme_info->get_template();
 
-		$preview_link = add_query_arg( array(
-			'preview'    => 1,
-			'template'   => urlencode( $template ),
-			'stylesheet' => urlencode( $stylesheet ),
-		), trailingslashit( home_url() ) );
-
 		$activate_link = add_query_arg( array(
 			'action'     => 'activate',
 			'template'   => urlencode( $template ),
@@ -520,17 +663,19 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin {
 		$activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $stylesheet );
 
 		$install_actions = array();
-		$install_actions['preview']  = '<a href="' . esc_url( $preview_link ) . '" class="hide-if-customize" title="' . esc_attr( sprintf( __('Preview “%s”'), $name ) ) . '">' . __('Preview') . '</a>';
-		$install_actions['preview'] .= '<a href="' . wp_customize_url( $stylesheet ) . '" class="hide-if-no-customize load-customize" title="' . esc_attr( sprintf( __('Preview “%s”'), $name ) ) . '">' . __('Live Preview') . '</a>';
-		$install_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink" title="' . esc_attr( sprintf( __('Activate “%s”'), $name ) ) . '">' . __('Activate') . '</a>';
+
+		if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
+			$install_actions['preview'] = '<a href="' . wp_customize_url( $stylesheet ) . '" class="hide-if-no-customize load-customize"><span aria-hidden="true">' . __( 'Live Preview' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Live Preview “%s”' ), $name ) . '</span></a>';
+		}
+		$install_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink"><span aria-hidden="true">' . __( 'Activate' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Activate “%s”' ), $name ) . '</span></a>';
 
 		if ( is_network_admin() && current_user_can( 'manage_network_themes' ) )
-			$install_actions['network_enable'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=enable&theme=' . urlencode( $stylesheet ), 'enable-theme_' . $stylesheet ) ) . '" title="' . esc_attr__( 'Enable this theme for all sites in this network' ) . '" target="_parent">' . __( 'Network Enable' ) . '</a>';
+			$install_actions['network_enable'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=enable&theme=' . urlencode( $stylesheet ), 'enable-theme_' . $stylesheet ) ) . '" target="_parent">' . __( 'Network Enable' ) . '</a>';
 
 		if ( $this->type == 'web' )
-			$install_actions['themes_page'] = '<a href="' . self_admin_url('theme-install.php') . '" title="' . esc_attr__('Return to Theme Installer') . '" target="_parent">' . __('Return to Theme Installer') . '</a>';
+			$install_actions['themes_page'] = '<a href="' . self_admin_url( 'theme-install.php' ) . '" target="_parent">' . __( 'Return to Theme Installer' ) . '</a>';
 		elseif ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) )
-			$install_actions['themes_page'] = '<a href="' . self_admin_url('themes.php') . '" title="' . esc_attr__('Themes page') . '" target="_parent">' . __('Return to Themes page') . '</a>';
+			$install_actions['themes_page'] = '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>';
 
 		if ( ! $this->result || is_wp_error($this->result) || is_network_admin() || ! current_user_can( 'switch_themes' ) )
 			unset( $install_actions['activate'], $install_actions['preview'] );
@@ -559,9 +704,13 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin {
  * @since 2.8.0
  */
 class Theme_Upgrader_Skin extends WP_Upgrader_Skin {
-	var $theme = '';
+	public $theme = '';
 
-	function __construct($args = array()) {
+	/**
+	 *
+	 * @param array $args
+	 */
+	public function __construct($args = array()) {
 		$defaults = array( 'url' => '', 'theme' => '', 'nonce' => '', 'title' => __('Update Theme') );
 		$args = wp_parse_args($args, $defaults);
 
@@ -570,7 +719,10 @@ class Theme_Upgrader_Skin extends WP_Upgrader_Skin {
 		parent::__construct($args);
 	}
 
-	function after() {
+	/**
+	 * @access public
+	 */
+	public function after() {
 		$this->decrement_update_count( 'theme' );
 
 		$update_actions = array();
@@ -579,12 +731,6 @@ class Theme_Upgrader_Skin extends WP_Upgrader_Skin {
 			$stylesheet = $this->upgrader->result['destination_name'];
 			$template   = $theme_info->get_template();
 
-			$preview_link = add_query_arg( array(
-				'preview'    => 1,
-				'template'   => urlencode( $template ),
-				'stylesheet' => urlencode( $stylesheet ),
-			), trailingslashit( home_url() ) );
-
 			$activate_link = add_query_arg( array(
 				'action'     => 'activate',
 				'template'   => urlencode( $template ),
@@ -593,19 +739,21 @@ class Theme_Upgrader_Skin extends WP_Upgrader_Skin {
 			$activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $stylesheet );
 
 			if ( get_stylesheet() == $stylesheet ) {
-				if ( current_user_can( 'edit_theme_options' ) )
-					$update_actions['preview']  = '<a href="' . wp_customize_url( $stylesheet ) . '" class="hide-if-no-customize load-customize" title="' . esc_attr( sprintf( __('Customize “%s”'), $name ) ) . '">' . __('Customize') . '</a>';
+				if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
+					$update_actions['preview']  = '<a href="' . wp_customize_url( $stylesheet ) . '" class="hide-if-no-customize load-customize"><span aria-hidden="true">' . __( 'Customize' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Customize “%s”' ), $name ) . '</span></a>';
+				}
 			} elseif ( current_user_can( 'switch_themes' ) ) {
-				$update_actions['preview']  = '<a href="' . esc_url( $preview_link ) . '" class="hide-if-customize" title="' . esc_attr( sprintf( __('Preview “%s”'), $name ) ) . '">' . __('Preview') . '</a>';
-				$update_actions['preview'] .= '<a href="' . wp_customize_url( $stylesheet ) . '" class="hide-if-no-customize load-customize" title="' . esc_attr( sprintf( __('Preview “%s”'), $name ) ) . '">' . __('Live Preview') . '</a>';
-				$update_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink" title="' . esc_attr( sprintf( __('Activate “%s”'), $name ) ) . '">' . __('Activate') . '</a>';
+				if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
+					$update_actions['preview'] = '<a href="' . wp_customize_url( $stylesheet ) . '" class="hide-if-no-customize load-customize"><span aria-hidden="true">' . __( 'Live Preview' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Live Preview “%s”' ), $name ) . '</span></a>';
+				}
+				$update_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink"><span aria-hidden="true">' . __( 'Activate' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Activate “%s”' ), $name ) . '</span></a>';
 			}
 
 			if ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() )
 				unset( $update_actions['preview'], $update_actions['activate'] );
 		}
 
-		$update_actions['themes_page'] = '<a href="' . self_admin_url('themes.php') . '" title="' . esc_attr__('Return to Themes page') . '" target="_parent">' . __('Return to Themes page') . '</a>';
+		$update_actions['themes_page'] = '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>';
 
 		/**
 		 * Filter the list of action links available following a single theme update.
@@ -630,42 +778,61 @@ class Theme_Upgrader_Skin extends WP_Upgrader_Skin {
  * @since 3.7.0
  */
 class Language_Pack_Upgrader_Skin extends WP_Upgrader_Skin {
-	var $language_update = null;
-	var $done_header = false;
-	var $display_footer_actions = true;
+	public $language_update = null;
+	public $done_header = false;
+	public $done_footer = false;
+	public $display_footer_actions = true;
 
-	function __construct( $args = array() ) {
+	/**
+	 *
+	 * @param array $args
+	 */
+	public function __construct( $args = array() ) {
 		$defaults = array( 'url' => '', 'nonce' => '', 'title' => __( 'Update Translations' ), 'skip_header_footer' => false );
 		$args = wp_parse_args( $args, $defaults );
 		if ( $args['skip_header_footer'] ) {
 			$this->done_header = true;
+			$this->done_footer = true;
 			$this->display_footer_actions = false;
 		}
 		parent::__construct( $args );
 	}
 
-	function before() {
+	/**
+	 * @access public
+	 */
+	public function before() {
 		$name = $this->upgrader->get_name_for_update( $this->language_update );
 
 		echo '<div class="update-messages lp-show-latest">';
 
-		printf( '<h4>' . __( 'Updating translations for %1$s (%2$s)…' ) . '</h4>', $name, $this->language_update->language );
+		printf( '<h2>' . __( 'Updating translations for %1$s (%2$s)…' ) . '</h2>', $name, $this->language_update->language );
 	}
 
-	function error( $error ) {
+	/**
+	 *
+	 * @param string|WP_Error $error
+	 */
+	public function error( $error ) {
 		echo '<div class="lp-error">';
 		parent::error( $error );
 		echo '</div>';
 	}
 
-	function after() {
+	/**
+	 * @access public
+	 */
+	public function after() {
 		echo '</div>';
 	}
 
-	function bulk_footer() {
+	/**
+	 * @access public
+	 */
+	public function bulk_footer() {
 		$this->decrement_update_count( 'translation' );
 		$update_actions = array();
-		$update_actions['updates_page'] = '<a href="' . self_admin_url( 'update-core.php' ) . '" title="' . esc_attr__( 'Go to WordPress Updates page' ) . '" target="_parent">' . __( 'Return to WordPress Updates' ) . '</a>';
+		$update_actions['updates_page'] = '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>';
 
 		/**
 		 * Filter the list of action links available following a translations update.
@@ -678,8 +845,6 @@ class Language_Pack_Upgrader_Skin extends WP_Upgrader_Skin {
 
 		if ( $update_actions && $this->display_footer_actions )
 			$this->feedback( implode( ' | ', $update_actions ) );
-
-		parent::footer();
 	}
 }
 
@@ -696,29 +861,45 @@ class Language_Pack_Upgrader_Skin extends WP_Upgrader_Skin {
 class Automatic_Upgrader_Skin extends WP_Upgrader_Skin {
 	protected $messages = array();
 
-	function request_filesystem_credentials( $error = false, $context = '' ) {
-		if ( $context )
+	/**
+	 *
+	 * @param bool   $error
+	 * @param string $context
+	 * @param bool   $allow_relaxed_file_ownership
+	 * @return bool
+	 */
+	public function request_filesystem_credentials( $error = false, $context = '', $allow_relaxed_file_ownership = false ) {
+		if ( $context ) {
 			$this->options['context'] = $context;
+		}
 		// TODO: fix up request_filesystem_credentials(), or split it, to allow us to request a no-output version
 		// This will output a credentials form in event of failure, We don't want that, so just hide with a buffer
 		ob_start();
-		$result = parent::request_filesystem_credentials( $error );
+		$result = parent::request_filesystem_credentials( $error, $context, $allow_relaxed_file_ownership );
 		ob_end_clean();
 		return $result;
 	}
 
-	function get_upgrade_messages() {
+	/**
+	 * @access public
+	 *
+	 * @return array
+	 */
+	public function get_upgrade_messages() {
 		return $this->messages;
 	}
 
-	function feedback( $data ) {
-		if ( is_wp_error( $data ) )
+	/**
+	 * @param string|array|WP_Error $data
+	 */
+	public function feedback( $data ) {
+		if ( is_wp_error( $data ) ) {
 			$string = $data->get_error_message();
-		else if ( is_array( $data ) )
+		} elseif ( is_array( $data ) ) {
 			return;
-		else
+		} else {
 			$string = $data;
-
+		}
 		if ( ! empty( $this->upgrader->strings[ $string ] ) )
 			$string = $this->upgrader->strings[ $string ];
 
@@ -747,19 +928,19 @@ class Automatic_Upgrader_Skin extends WP_Upgrader_Skin {
 		$this->messages[] = $string;
 	}
 
-	function header() {
+	/**
+	 * @access public
+	 */
+	public function header() {
 		ob_start();
 	}
 
-	function footer() {
-		$output = ob_get_contents();
+	/**
+	 * @access public
+	 */
+	public function footer() {
+		$output = ob_get_clean();
 		if ( ! empty( $output ) )
 			$this->feedback( $output );
-		ob_end_clean();
 	}
-
-	function bulk_header() {}
-	function bulk_footer() {}
-	function before() {}
-	function after() {}
 }
diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php
index 6db2c27..246f646 100644
--- a/wp-admin/includes/class-wp-upgrader.php
+++ b/wp-admin/includes/class-wp-upgrader.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * A File upgrader class for WordPress.
+ * Upgrade API: WP_Upgrader, Plugin_Upgrader, Theme_Upgrader, Language_Pack_Upgrader,
+ * Core_Upgrader, File_Upload_Upgrader, and WP_Automatic_Updater classes
  *
- * This set of classes are designed to be used to upgrade/install a local set of files on the filesystem via the Filesystem Abstraction classes.
- *
- * @link http://trac.wordpress.org/ticket/7875 consolidate plugin/theme/core upgrade/install functions
+ * This set of classes are designed to be used to upgrade/install a local set of files
+ * on the filesystem via the Filesystem Abstraction classes.
  *
  * @package WordPress
  * @subpackage Upgrader
@@ -14,30 +14,116 @@
 require ABSPATH . 'wp-admin/includes/class-wp-upgrader-skins.php';
 
 /**
- * WordPress Upgrader class for Upgrading/Installing a local set of files via the Filesystem Abstraction classes from a Zip file.
+ * Core class used for upgrading/installing a local set of files via
+ * the Filesystem Abstraction classes from a Zip file.
  *
- * @package WordPress
- * @subpackage Upgrader
  * @since 2.8.0
  */
 class WP_Upgrader {
-	var $strings = array();
-	var $skin = null;
-	var $result = array();
 
-	function __construct($skin = null) {
+	/**
+	 * The error/notification strings used to update the user on the progress.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 * @var string $strings
+	 */
+	public $strings = array();
+
+	/**
+	 * The upgrader skin being used.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 * @var WP_Upgrader_Skin $skin
+	 */
+	public $skin = null;
+
+	/**
+	 * The result of the installation.
+	 *
+	 * This is set by {@see WP_Upgrader::install_package()}, only when the package is installed
+	 * successfully. It will then be an array, unless a {@see WP_Error} is returned by the
+	 * {@see 'upgrader_post_install'} filter. In that case, the `WP_Error` will be assigned to
+	 * it.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 *
+	 * @var WP_Error|array $result {
+	 *      @type string $source             The full path to the source the files were installed from.
+	 *      @type string $source_files       List of all the files in the source directory.
+	 *      @type string $destination        The full path to the install destination folder.
+	 *      @type string $destination_name   The name of the destination folder, or empty if `$destination`
+	 *                                       and `$local_destination` are the same.
+	 *      @type string $local_destination  The full local path to the destination folder. This is usually
+	 *                                       the same as `$destination`.
+	 *      @type string $remote_destination The full remote path to the destination folder
+	 *                                       (i.e., from `$wp_filesystem`).
+	 *      @type bool   $clear_destination  Whether the destination folder was cleared.
+	 * }
+	 */
+	public $result = array();
+
+	/**
+	 * The total number of updates being performed.
+	 *
+	 * Set by the bulk update methods.
+	 *
+	 * @since 3.0.0
+	 * @access public
+	 * @var int $update_count
+	 */
+	public $update_count = 0;
+
+	/**
+	 * The current update if multiple updates are being performed.
+	 *
+	 * Used by the bulk update methods, and incremented for each update.
+	 *
+	 * @since 3.0.0
+	 * @access public
+	 * @var int
+	 */
+	public $update_current = 0;
+
+	/**
+	 * Construct the upgrader with a skin.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 *
+	 * @param WP_Upgrader_Skin $skin The upgrader skin to use. Default is a {@see WP_Upgrader_Skin}
+	 *                               instance.
+	 */
+	public function __construct( $skin = null ) {
 		if ( null == $skin )
 			$this->skin = new WP_Upgrader_Skin();
 		else
 			$this->skin = $skin;
 	}
 
-	function init() {
+	/**
+	 * Initialize the upgrader.
+	 *
+	 * This will set the relationship between the skin being used and this upgrader,
+	 * and also add the generic strings to `WP_Upgrader::$strings`.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 */
+	public function init() {
 		$this->skin->set_upgrader($this);
 		$this->generic_strings();
 	}
 
-	function generic_strings() {
+	/**
+	 * Add the generic strings to WP_Upgrader::$strings.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 */
+	public function generic_strings() {
 		$this->strings['bad_request'] = __('Invalid Data provided.');
 		$this->strings['fs_unavailable'] = __('Could not access filesystem.');
 		$this->strings['fs_error'] = __('Filesystem error.');
@@ -54,22 +140,40 @@ class WP_Upgrader {
 		$this->strings['folder_exists'] = __('Destination folder already exists.');
 		$this->strings['mkdir_failed'] = __('Could not create directory.');
 		$this->strings['incompatible_archive'] = __('The package could not be installed.');
+		$this->strings['files_not_writable'] = __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' );
 
 		$this->strings['maintenance_start'] = __('Enabling Maintenance mode…');
 		$this->strings['maintenance_end'] = __('Disabling Maintenance mode…');
 	}
 
-	function fs_connect( $directories = array() ) {
+	/**
+	 * Connect to the filesystem.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 *
+	 * @global WP_Filesystem_Base $wp_filesystem Subclass
+	 *
+	 * @param array $directories                  Optional. A list of directories. If any of these do
+	 *                                            not exist, a {@see WP_Error} object will be returned.
+	 *                                            Default empty array.
+	 * @param bool  $allow_relaxed_file_ownership Whether to allow relaxed file ownership.
+	 *                                            Default false.
+	 * @return bool|WP_Error True if able to connect, false or a {@see WP_Error} otherwise.
+	 */
+	public function fs_connect( $directories = array(), $allow_relaxed_file_ownership = false ) {
 		global $wp_filesystem;
 
-		if ( false === ($credentials = $this->skin->request_filesystem_credentials()) )
+		if ( false === ( $credentials = $this->skin->request_filesystem_credentials( false, $directories[0], $allow_relaxed_file_ownership ) ) ) {
 			return false;
+		}
 
-		if ( ! WP_Filesystem($credentials) ) {
+		if ( ! WP_Filesystem( $credentials, $directories[0], $allow_relaxed_file_ownership ) ) {
 			$error = true;
 			if ( is_object($wp_filesystem) && $wp_filesystem->errors->get_error_code() )
 				$error = $wp_filesystem->errors;
-			$this->skin->request_filesystem_credentials($error); //Failed to connect, Error and request again
+			// Failed to connect, Error and request again
+			$this->skin->request_filesystem_credentials( $error, $directories[0], $allow_relaxed_file_ownership );
 			return false;
 		}
 
@@ -106,12 +210,23 @@ class WP_Upgrader {
 		return true;
 	} //end fs_connect();
 
-	function download_package($package) {
+	/**
+	 * Download a package.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 *
+	 * @param string $package The URI of the package. If this is the full path to an
+	 *                        existing local file, it will be returned untouched.
+	 * @return string|WP_Error The full path to the downloaded package file, or a {@see WP_Error} object.
+	 */
+	public function download_package( $package ) {
 
 		/**
 		 * Filter whether to return the package.
 		 *
 		 * @since 3.7.0
+		 * @access public
 		 *
 		 * @param bool        $reply   Whether to bail without returning the package.
 		 *                             Default false.
@@ -138,7 +253,20 @@ class WP_Upgrader {
 		return $download_file;
 	}
 
-	function unpack_package($package, $delete_package = true) {
+	/**
+	 * Unpack a compressed package file.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 *
+	 * @global WP_Filesystem_Base $wp_filesystem Subclass
+	 *
+	 * @param string $package        Full path to the package file.
+	 * @param bool   $delete_package Optional. Whether to delete the package file after attempting
+	 *                               to unpack it. Default true.
+	 * @return string|WP_Error The path to the unpacked contents, or a {@see WP_Error} on failure.
+	 */
+	public function unpack_package( $package, $delete_package = true ) {
 		global $wp_filesystem;
 
 		$this->skin->feedback('unpack_package');
@@ -152,8 +280,8 @@ class WP_Upgrader {
 				$wp_filesystem->delete($upgrade_folder . $file['name'], true);
 		}
 
-		//We need a working directory
-		$working_dir = $upgrade_folder . basename($package, '.zip');
+		// We need a working directory - Strip off any .tmp or .zip suffixes
+		$working_dir = $upgrade_folder . basename( basename( $package, '.tmp' ), '.zip' );
 
 		// Clean up working directory
 		if ( $wp_filesystem->is_dir($working_dir) )
@@ -177,7 +305,98 @@ class WP_Upgrader {
 		return $working_dir;
 	}
 
-	function install_package( $args = array() ) {
+	/**
+	 * Clears the directory where this item is going to be installed into.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @global WP_Filesystem_Base $wp_filesystem Subclass
+	 *
+	 * @param string $remote_destination The location on the remote filesystem to be cleared
+	 * @return bool|WP_Error True upon success, WP_Error on failure.
+	 */
+	public function clear_destination( $remote_destination ) {
+		global $wp_filesystem;
+
+		if ( ! $wp_filesystem->exists( $remote_destination ) ) {
+			return true;
+		}
+
+		// Check all files are writable before attempting to clear the destination.
+		$unwritable_files = array();
+
+		$_files = $wp_filesystem->dirlist( $remote_destination, true, true );
+
+		// Flatten the resulting array, iterate using each as we append to the array during iteration.
+		while ( $f = each( $_files ) ) {
+			$file = $f['value'];
+			$name = $f['key'];
+
+			if ( ! isset( $file['files'] ) ) {
+				continue;
+			}
+
+			foreach ( $file['files'] as $filename => $details ) {
+				$_files[ $name . '/' . $filename ] = $details;
+			}
+		}
+
+		// Check writability.
+		foreach ( $_files as $filename => $file_details ) {
+			if ( ! $wp_filesystem->is_writable( $remote_destination . $filename ) ) {
+
+				// Attempt to alter permissions to allow writes and try again.
+				$wp_filesystem->chmod( $remote_destination . $filename, ( 'd' == $file_details['type'] ? FS_CHMOD_DIR : FS_CHMOD_FILE ) );
+				if ( ! $wp_filesystem->is_writable( $remote_destination . $filename ) ) {
+					$unwritable_files[] = $filename;
+				}
+			}
+		}
+
+		if ( ! empty( $unwritable_files ) ) {
+			return new WP_Error( 'files_not_writable', $this->strings['files_not_writable'], implode( ', ', $unwritable_files ) );
+		}
+
+		if ( ! $wp_filesystem->delete( $remote_destination, true ) ) {
+			return new WP_Error( 'remove_old_failed', $this->strings['remove_old_failed'] );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Install a package.
+	 *
+	 * Copies the contents of a package form a source directory, and installs them in
+	 * a destination directory. Optionally removes the source. It can also optionally
+	 * clear out the destination folder if it already exists.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 *
+	 * @global WP_Filesystem_Base $wp_filesystem Subclass
+	 * @global array              $wp_theme_directories
+	 *
+	 * @param array|string $args {
+	 *     Optional. Array or string of arguments for installing a package. Default empty array.
+	 *
+	 *     @type string $source                      Required path to the package source. Default empty.
+	 *     @type string $destination                 Required path to a folder to install the package in.
+	 *                                               Default empty.
+	 *     @type bool   $clear_destination           Whether to delete any files already in the destination
+	 *                                               folder. Default false.
+	 *     @type bool   $clear_working               Whether to delete the files form the working directory
+	 *                                               after copying to the destination. Default false.
+	 *     @type bool   $abort_if_destination_exists Whether to abort the installation if
+	 *                                               the destination folder already exists. Default true.
+	 *     @type array  $hook_extra                  Extra arguments to pass to the filter hooks called by
+	 *                                               {@see WP_Upgrader::install_package()}. Default empty array.
+	 * }
+	 *
+	 * @return array|WP_Error The result (also stored in `WP_Upgrader:$result`), or a {@see WP_Error} on failure.
+	 */
+	public function install_package( $args = array() ) {
 		global $wp_filesystem, $wp_theme_directories;
 
 		$defaults = array(
@@ -190,14 +409,18 @@ class WP_Upgrader {
 		);
 
 		$args = wp_parse_args($args, $defaults);
-		extract($args);
 
-		@set_time_limit( 300 );
+		// These were previously extract()'d.
+		$source = $args['source'];
+		$destination = $args['destination'];
+		$clear_destination = $args['clear_destination'];
 
-		if ( empty($source) || empty($destination) )
-			return new WP_Error('bad_request', $this->strings['bad_request']);
+		@set_time_limit( 300 );
 
-		$this->skin->feedback('installing_package');
+		if ( empty( $source ) || empty( $destination ) ) {
+			return new WP_Error( 'bad_request', $this->strings['bad_request'] );
+		}
+		$this->skin->feedback( 'installing_package' );
 
 		/**
 		 * Filter the install response before the installation has started.
@@ -211,77 +434,90 @@ class WP_Upgrader {
 		 * @param bool|WP_Error $response   Response.
 		 * @param array         $hook_extra Extra arguments passed to hooked filters.
 		 */
-		$res = apply_filters( 'upgrader_pre_install', true, $hook_extra );
-		if ( is_wp_error($res) )
+		$res = apply_filters( 'upgrader_pre_install', true, $args['hook_extra'] );
+
+		if ( is_wp_error( $res ) ) {
 			return $res;
+		}
 
 		//Retain the Original source and destinations
-		$remote_source = $source;
+		$remote_source = $args['source'];
 		$local_destination = $destination;
 
-		$source_files = array_keys( $wp_filesystem->dirlist($remote_source) );
-		$remote_destination = $wp_filesystem->find_folder($local_destination);
+		$source_files = array_keys( $wp_filesystem->dirlist( $remote_source ) );
+		$remote_destination = $wp_filesystem->find_folder( $local_destination );
 
 		//Locate which directory to copy to the new folder, This is based on the actual folder holding the files.
-		if ( 1 == count($source_files) && $wp_filesystem->is_dir( trailingslashit($source) . $source_files[0] . '/') ) //Only one folder? Then we want its contents.
-			$source = trailingslashit($source) . trailingslashit($source_files[0]);
-		elseif ( count($source_files) == 0 )
+		if ( 1 == count( $source_files ) && $wp_filesystem->is_dir( trailingslashit( $args['source'] ) . $source_files[0] . '/' ) ) { //Only one folder? Then we want its contents.
+			$source = trailingslashit( $args['source'] ) . trailingslashit( $source_files[0] );
+		} elseif ( count( $source_files ) == 0 ) {
 			return new WP_Error( 'incompatible_archive_empty', $this->strings['incompatible_archive'], $this->strings['no_files'] ); // There are no files?
-		else //It's only a single file, the upgrader will use the foldername of this file as the destination folder. foldername is based on zip filename.
-			$source = trailingslashit($source);
+		} else { // It's only a single file, the upgrader will use the folder name of this file as the destination folder. Folder name is based on zip filename.
+			$source = trailingslashit( $args['source'] );
+		}
 
 		/**
 		 * Filter the source file location for the upgrade package.
 		 *
 		 * @since 2.8.0
+		 * @since 4.4.0 The $hook_extra parameter became available.
 		 *
 		 * @param string      $source        File source location.
-		 * @param string      $remote_source Remove file source location.
+		 * @param string      $remote_source Remote file source location.
 		 * @param WP_Upgrader $this          WP_Upgrader instance.
+		 * @param array       $hook_extra    Extra arguments passed to hooked filters.
 		 */
-		$source = apply_filters( 'upgrader_source_selection', $source, $remote_source, $this );
-		if ( is_wp_error($source) )
+		$source = apply_filters( 'upgrader_source_selection', $source, $remote_source, $this, $args['hook_extra'] );
+
+		if ( is_wp_error( $source ) ) {
 			return $source;
+		}
 
-		//Has the source location changed? If so, we need a new source_files list.
-		if ( $source !== $remote_source )
-			$source_files = array_keys( $wp_filesystem->dirlist($source) );
+		// Has the source location changed? If so, we need a new source_files list.
+		if ( $source !== $remote_source ) {
+			$source_files = array_keys( $wp_filesystem->dirlist( $source ) );
+		}
 
-		// Protection against deleting files in any important base directories.
-		// Theme_Upgrader & Plugin_Upgrader also trigger this, as they pass the destination directory (WP_PLUGIN_DIR / wp-content/themes)
-		// intending to copy the directory into the directory, whilst they pass the source as the actual files to copy.
+		/*
+		 * Protection against deleting files in any important base directories.
+		 * Theme_Upgrader & Plugin_Upgrader also trigger this, as they pass the
+		 * destination directory (WP_PLUGIN_DIR / wp-content/themes) intending
+		 * to copy the directory into the directory, whilst they pass the source
+		 * as the actual files to copy.
+		 */
 		$protected_directories = array( ABSPATH, WP_CONTENT_DIR, WP_PLUGIN_DIR, WP_CONTENT_DIR . '/themes' );
-		if ( is_array( $wp_theme_directories ) )
+
+		if ( is_array( $wp_theme_directories ) ) {
 			$protected_directories = array_merge( $protected_directories, $wp_theme_directories );
+		}
+
 		if ( in_array( $destination, $protected_directories ) ) {
-			$remote_destination = trailingslashit($remote_destination) . trailingslashit(basename($source));
-			$destination = trailingslashit($destination) . trailingslashit(basename($source));
+			$remote_destination = trailingslashit( $remote_destination ) . trailingslashit( basename( $source ) );
+			$destination = trailingslashit( $destination ) . trailingslashit( basename( $source ) );
 		}
 
 		if ( $clear_destination ) {
-			//We're going to clear the destination if there's something there
+			// We're going to clear the destination if there's something there.
 			$this->skin->feedback('remove_old');
-			$removed = true;
-			if ( $wp_filesystem->exists($remote_destination) )
-				$removed = $wp_filesystem->delete($remote_destination, true);
+
+			$removed = $this->clear_destination( $remote_destination );
 
 			/**
 			 * Filter whether the upgrader cleared the destination.
 			 *
 			 * @since 2.8.0
 			 *
-			 * @param bool   $removed            Whether the destination was cleared.
+			 * @param mixed  $removed            Whether the destination was cleared. true on success, WP_Error on failure
 			 * @param string $local_destination  The local package destination.
 			 * @param string $remote_destination The remote package destination.
 			 * @param array  $hook_extra         Extra arguments passed to hooked filters.
 			 */
-			$removed = apply_filters( 'upgrader_clear_destination', $removed, $local_destination, $remote_destination, $hook_extra );
+			$removed = apply_filters( 'upgrader_clear_destination', $removed, $local_destination, $remote_destination, $args['hook_extra'] );
 
-			if ( is_wp_error($removed) )
+			if ( is_wp_error( $removed ) ) {
 				return $removed;
-			else if ( ! $removed )
-				return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
-		} elseif ( $abort_if_destination_exists && $wp_filesystem->exists($remote_destination) ) {
+			}
+		} elseif ( $args['abort_if_destination_exists'] && $wp_filesystem->exists($remote_destination) ) {
 			//If we're not clearing the destination folder and something exists there already, Bail.
 			//But first check to see if there are actually any files in the folder.
 			$_files = $wp_filesystem->dirlist($remote_destination);
@@ -292,27 +528,31 @@ class WP_Upgrader {
 		}
 
 		//Create destination if needed
-		if ( !$wp_filesystem->exists($remote_destination) )
-			if ( !$wp_filesystem->mkdir($remote_destination, FS_CHMOD_DIR) )
+		if ( ! $wp_filesystem->exists( $remote_destination ) ) {
+			if ( ! $wp_filesystem->mkdir( $remote_destination, FS_CHMOD_DIR ) ) {
 				return new WP_Error( 'mkdir_failed_destination', $this->strings['mkdir_failed'], $remote_destination );
-
+			}
+		}
 		// Copy new version of item into place.
 		$result = copy_dir($source, $remote_destination);
 		if ( is_wp_error($result) ) {
-			if ( $clear_working )
-				$wp_filesystem->delete($remote_source, true);
+			if ( $args['clear_working'] ) {
+				$wp_filesystem->delete( $remote_source, true );
+			}
 			return $result;
 		}
 
 		//Clear the Working folder?
-		if ( $clear_working )
-			$wp_filesystem->delete($remote_source, true);
+		if ( $args['clear_working'] ) {
+			$wp_filesystem->delete( $remote_source, true );
+		}
 
 		$destination_name = basename( str_replace($local_destination, '', $destination) );
-		if ( '.' == $destination_name )
+		if ( '.' == $destination_name ) {
 			$destination_name = '';
+		}
 
-		$this->result = compact('local_source', 'source', 'source_name', 'source_files', 'destination', 'destination_name', 'local_destination', 'remote_destination', 'clear_destination', 'delete_source_dir');
+		$this->result = compact( 'source', 'source_files', 'destination', 'destination_name', 'local_destination', 'remote_destination', 'clear_destination' );
 
 		/**
 		 * Filter the install response after the installation has finished.
@@ -323,7 +563,7 @@ class WP_Upgrader {
 		 * @param array $hook_extra Extra arguments passed to hooked filters.
 		 * @param array $result     Installation result data.
 		 */
-		$res = apply_filters( 'upgrader_post_install', true, $hook_extra, $this->result );
+		$res = apply_filters( 'upgrader_post_install', true, $args['hook_extra'], $this->result );
 
 		if ( is_wp_error($res) ) {
 			$this->result = $res;
@@ -334,7 +574,41 @@ class WP_Upgrader {
 		return $this->result;
 	}
 
-	function run($options) {
+	/**
+	 * Run an upgrade/install.
+	 *
+	 * Attempts to download the package (if it is not a local file), unpack it, and
+	 * install it in the destination folder.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 *
+	 * @param array $options {
+	 *     Array or string of arguments for upgrading/installing a package.
+	 *
+	 *     @type string $package                     The full path or URI of the package to install.
+	 *                                               Default empty.
+	 *     @type string $destination                 The full path to the destination folder.
+	 *                                               Default empty.
+	 *     @type bool   $clear_destination           Whether to delete any files already in the
+	 *                                               destination folder. Default false.
+	 *     @type bool   $clear_working               Whether to delete the files form the working
+	 *                                               directory after copying to the destination.
+	 *                                               Default false.
+	 *     @type bool   $abort_if_destination_exists Whether to abort the installation if the destination
+	 *                                               folder already exists. When true, `$clear_destination`
+	 *                                               should be false. Default true.
+	 *     @type bool   $is_multi                    Whether this run is one of multiple upgrade/install
+	 *                                               actions being performed in bulk. When true, the skin
+	 *                                               {@see WP_Upgrader::header()} and {@see WP_Upgrader::footer()}
+	 *                                               aren't called. Default false.
+	 *     @type array  $hook_extra                  Extra arguments to pass to the filter hooks called by
+	 *                                               {@see WP_Upgrader::run()}.
+	 * }
+	 * @return array|false|WP_error The result from self::install_package() on success, otherwise a WP_Error,
+	 *                              or false if unable to connect to the filesystem.
+	 */
+	public function run( $options ) {
 
 		$defaults = array(
 			'package' => '', // Please always pass this.
@@ -346,18 +620,38 @@ class WP_Upgrader {
 			'hook_extra' => array() // Pass any extra $hook_extra args here, this will be passed to any hooked filters.
 		);
 
-		$options = wp_parse_args($options, $defaults);
-		extract($options);
+		$options = wp_parse_args( $options, $defaults );
 
-		if ( ! $is_multi ) // call $this->header separately if running multiple times
+		/**
+		 * Filter the package options before running an update.
+		 *
+		 * @since 4.3.0
+		 *
+		 * @param array $options {
+		 *     Options used by the upgrader.
+		 *
+		 *     @type string $package                     Package for update.
+		 *     @type string $destination                 Update location.
+		 *     @type bool   $clear_destination           Clear the destination resource.
+		 *     @type bool   $clear_working               Clear the working resource.
+		 *     @type bool   $abort_if_destination_exists Abort if the Destination directory exists.
+		 *     @type bool   $is_multi                    Whether the upgrader is running multiple times.
+		 *     @type array  $hook_extra                  Extra hook arguments.
+		 * }
+		 */
+		$options = apply_filters( 'upgrader_package_options', $options );
+
+		if ( ! $options['is_multi'] ) { // call $this->header separately if running multiple times
 			$this->skin->header();
+		}
 
 		// Connect to the Filesystem first.
-		$res = $this->fs_connect( array(WP_CONTENT_DIR, $destination) );
+		$res = $this->fs_connect( array( WP_CONTENT_DIR, $options['destination'] ) );
 		// Mainly for non-connected filesystem.
 		if ( ! $res ) {
-			if ( ! $is_multi )
+			if ( ! $options['is_multi'] ) {
 				$this->skin->footer();
+			}
 			return false;
 		}
 
@@ -366,41 +660,47 @@ class WP_Upgrader {
 		if ( is_wp_error($res) ) {
 			$this->skin->error($res);
 			$this->skin->after();
-			if ( ! $is_multi )
+			if ( ! $options['is_multi'] ) {
 				$this->skin->footer();
+			}
 			return $res;
 		}
 
-		//Download the package (Note, This just returns the filename of the file if the package is a local file)
-		$download = $this->download_package( $package );
+		/*
+		 * Download the package (Note, This just returns the filename
+		 * of the file if the package is a local file)
+		 */
+		$download = $this->download_package( $options['package'] );
 		if ( is_wp_error($download) ) {
 			$this->skin->error($download);
 			$this->skin->after();
-			if ( ! $is_multi )
+			if ( ! $options['is_multi'] ) {
 				$this->skin->footer();
+			}
 			return $download;
 		}
 
-		$delete_package = ($download != $package); // Do not delete a "local" file
+		$delete_package = ( $download != $options['package'] ); // Do not delete a "local" file
 
-		//Unzips the file into a temporary directory
+		// Unzips the file into a temporary directory.
 		$working_dir = $this->unpack_package( $download, $delete_package );
 		if ( is_wp_error($working_dir) ) {
 			$this->skin->error($working_dir);
 			$this->skin->after();
-			if ( ! $is_multi )
+			if ( ! $options['is_multi'] ) {
 				$this->skin->footer();
+			}
 			return $working_dir;
 		}
 
-		//With the given options, this installs it to the destination directory.
+		// With the given options, this installs it to the destination directory.
 		$result = $this->install_package( array(
 			'source' => $working_dir,
-			'destination' => $destination,
-			'clear_destination' => $clear_destination,
-			'abort_if_destination_exists' => $abort_if_destination_exists,
-			'clear_working' => $clear_working,
-			'hook_extra' => $hook_extra
+			'destination' => $options['destination'],
+			'clear_destination' => $options['clear_destination'],
+			'abort_if_destination_exists' => $options['abort_if_destination_exists'],
+			'clear_working' => $options['clear_working'],
+			'hook_extra' => $options['hook_extra']
 		) );
 
 		$this->skin->set_result($result);
@@ -408,23 +708,35 @@ class WP_Upgrader {
 			$this->skin->error($result);
 			$this->skin->feedback('process_failed');
 		} else {
-			//Install Succeeded
+			// Install succeeded.
 			$this->skin->feedback('process_success');
 		}
 
 		$this->skin->after();
 
-		if ( ! $is_multi ) {
+		if ( ! $options['is_multi'] ) {
 
 			/** This action is documented in wp-admin/includes/class-wp-upgrader.php */
-			do_action( 'upgrader_process_complete', $this, $hook_extra );
+			do_action( 'upgrader_process_complete', $this, $options['hook_extra'] );
 			$this->skin->footer();
 		}
 
 		return $result;
 	}
 
-	function maintenance_mode($enable = false) {
+	/**
+	 * Toggle maintenance mode for the site.
+	 *
+	 * Creates/deletes the maintenance file to enable/disable maintenance mode.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 *
+	 * @global WP_Filesystem_Base $wp_filesystem Subclass
+	 *
+	 * @param bool $enable True to enable maintenance mode, false to disable.
+	 */
+	public function maintenance_mode( $enable = false ) {
 		global $wp_filesystem;
 		$file = $wp_filesystem->abspath() . '.maintenance';
 		if ( $enable ) {
@@ -433,27 +745,116 @@ class WP_Upgrader {
 			$maintenance_string = '<?php $upgrading = ' . time() . '; ?>';
 			$wp_filesystem->delete($file);
 			$wp_filesystem->put_contents($file, $maintenance_string, FS_CHMOD_FILE);
-		} else if ( !$enable && $wp_filesystem->exists($file) ) {
+		} elseif ( ! $enable && $wp_filesystem->exists( $file ) ) {
 			$this->skin->feedback('maintenance_end');
 			$wp_filesystem->delete($file);
 		}
 	}
 
+	/**
+ 	 * Creates a lock using WordPress options.
+ 	 *
+ 	 * @since 4.5.0
+ 	 * @access public
+ 	 * @static
+ 	 *
+ 	 * @param string $lock_name       The name of this unique lock.
+ 	 * @param int    $release_timeout Optional. The duration in seconds to respect an existing lock.
+	 *                                Default: 1 hour.
+ 	 * @return bool False if a lock couldn't be created or if the lock is no longer valid. True otherwise.
+ 	 */
+	public static function create_lock( $lock_name, $release_timeout = null ) {
+		global $wpdb;
+		if ( ! $release_timeout ) {
+			$release_timeout = HOUR_IN_SECONDS;
+		}
+		$lock_option = $lock_name . '.lock';
+
+		// Try to lock.
+		$lock_result = $wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO `$wpdb->options` ( `option_name`, `option_value`, `autoload` ) VALUES (%s, %s, 'no') /* LOCK */", $lock_option, time() ) );
+
+		if ( ! $lock_result ) {
+			$lock_result = get_option( $lock_option );
+
+			// If a lock couldn't be created, and there isn't a lock, bail.
+			if ( ! $lock_result ) {
+				return false;
+			}
+
+			// Check to see if the lock is still valid. If not, bail.
+			if ( $lock_result > ( time() - $release_timeout ) ) {
+				return false;
+			}
+
+			// There must exist an expired lock, clear it and re-gain it.
+			WP_Upgrader::release_lock( $lock_name );
+
+			return WP_Upgrader::create_lock( $lock_name, $release_timeout );
+		}
+
+		// Update the lock, as by this point we've definitely got a lock, just need to fire the actions.
+		update_option( $lock_option, time() );
+
+		return true;
+	}
+
+	/**
+ 	 * Releases an upgrader lock.
+ 	 *
+ 	 * @since 4.5.0
+ 	 * @access public
+ 	 * @static
+	 *
+	 * @see WP_Upgrader::create_lock()
+ 	 *
+ 	 * @param string $lock_name The name of this unique lock.
+	 * @return bool True if the lock was successfully released. False on failure.
+ 	 */
+	public static function release_lock( $lock_name ) {
+		return delete_option( $lock_name . '.lock' );
+	}
+
 }
 
 /**
- * Plugin Upgrader class for WordPress Plugins, It is designed to upgrade/install plugins from a local zip, remote zip URL, or uploaded zip file.
+ * Core class used for upgrading/installing plugins.
+ *
+ * It is designed to upgrade/install plugins from a local zip, remote zip URL,
+ * or uploaded zip file.
  *
- * @package WordPress
- * @subpackage Upgrader
  * @since 2.8.0
+ *
+ * @see WP_Upgrader
  */
 class Plugin_Upgrader extends WP_Upgrader {
 
-	var $result;
-	var $bulk = false;
+	/**
+	 * Plugin upgrade result.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 * @var array|WP_Error $result
+	 *
+	 * @see WP_Upgrader::$result
+	 */
+	public $result;
 
-	function upgrade_strings() {
+	/**
+	 * Whether a bulk upgrade/install is being performed.
+	 *
+	 * @since 2.9.0
+	 * @access public
+	 * @var bool $bulk
+	 */
+	public $bulk = false;
+
+	/**
+	 * Initialize the upgrade strings.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 */
+	public function upgrade_strings() {
 		$this->strings['up_to_date'] = __('The plugin is at the latest version.');
 		$this->strings['no_package'] = __('Update package not available.');
 		$this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>…');
@@ -462,9 +863,16 @@ class Plugin_Upgrader extends WP_Upgrader {
 		$this->strings['remove_old_failed'] = __('Could not remove the old plugin.');
 		$this->strings['process_failed'] = __('Plugin update failed.');
 		$this->strings['process_success'] = __('Plugin updated successfully.');
+		$this->strings['process_bulk_success'] = __('Plugins updated successfully.');
 	}
 
-	function install_strings() {
+	/**
+	 * Initialize the install strings.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 */
+	public function install_strings() {
 		$this->strings['no_package'] = __('Install package not available.');
 		$this->strings['downloading_package'] = __('Downloading install package from <span class="code">%s</span>…');
 		$this->strings['unpack_package'] = __('Unpacking the package…');
@@ -474,7 +882,23 @@ class Plugin_Upgrader extends WP_Upgrader {
 		$this->strings['process_success'] = __('Plugin installed successfully.');
 	}
 
-	function install( $package, $args = array() ) {
+	/**
+	 * Install a plugin package.
+	 *
+	 * @since 2.8.0
+	 * @since 3.7.0 The `$args` parameter was added, making clearing the plugin update cache optional.
+	 * @access public
+	 *
+	 * @param string $package The full local path or URI of the package.
+	 * @param array  $args {
+	 *     Optional. Other arguments for installing a plugin package. Default empty array.
+	 *
+	 *     @type bool $clear_update_cache Whether to clear the plugin updates cache if successful.
+	 *                                    Default true.
+	 * }
+	 * @return bool|WP_Error True if the install was successful, false or a WP_Error otherwise.
+	 */
+	public function install( $package, $args = array() ) {
 
 		$defaults = array(
 			'clear_update_cache' => true,
@@ -485,6 +909,8 @@ class Plugin_Upgrader extends WP_Upgrader {
 		$this->install_strings();
 
 		add_filter('upgrader_source_selection', array($this, 'check_package') );
+		// Clear cache so wp_update_plugins() knows about the new plugin.
+		add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
 
 		$this->run( array(
 			'package' => $package,
@@ -497,6 +923,7 @@ class Plugin_Upgrader extends WP_Upgrader {
 			)
 		) );
 
+		remove_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9 );
 		remove_filter('upgrader_source_selection', array($this, 'check_package') );
 
 		if ( ! $this->result || is_wp_error($this->result) )
@@ -508,7 +935,23 @@ class Plugin_Upgrader extends WP_Upgrader {
 		return true;
 	}
 
-	function upgrade( $plugin, $args = array() ) {
+	/**
+	 * Upgrade a plugin.
+	 *
+	 * @since 2.8.0
+	 * @since 3.7.0 The `$args` parameter was added, making clearing the plugin update cache optional.
+	 * @access public
+	 *
+	 * @param string $plugin The basename path to the main plugin file.
+	 * @param array  $args {
+	 *     Optional. Other arguments for upgrading a plugin package. Default empty array.
+	 *
+	 *     @type bool $clear_update_cache Whether to clear the plugin updates cache if successful.
+	 *                                    Default true.
+	 * }
+	 * @return bool|WP_Error True if the upgrade was successful, false or a {@see WP_Error} object otherwise.
+	 */
+	public function upgrade( $plugin, $args = array() ) {
 
 		$defaults = array(
 			'clear_update_cache' => true,
@@ -559,7 +1002,23 @@ class Plugin_Upgrader extends WP_Upgrader {
 		return true;
 	}
 
-	function bulk_upgrade( $plugins, $args = array() ) {
+	/**
+	 * Bulk upgrade several plugins at once.
+	 *
+	 * @since 2.8.0
+	 * @since 3.7.0 The `$args` parameter was added, making clearing the plugin update cache optional.
+	 * @access public
+	 *
+	 * @param array $plugins Array of the basename paths of the plugins' main files.
+	 * @param array $args {
+	 *     Optional. Other arguments for upgrading several plugins at once. Default empty array.
+	 *
+	 *     @type bool $clear_update_cache Whether to clear the plugin updates cache if successful.
+	 *                                    Default true.
+	 * }
+	 * @return array|false An array of results indexed by plugin file, or false if unable to connect to the filesystem.
+	 */
+	public function bulk_upgrade( $plugins, $args = array() ) {
 
 		$defaults = array(
 			'clear_update_cache' => true,
@@ -585,10 +1044,12 @@ class Plugin_Upgrader extends WP_Upgrader {
 
 		$this->skin->bulk_header();
 
-		// Only start maintenance mode if:
-		// - running Multisite and there are one or more plugins specified, OR
-		// - a plugin with an update available is currently active.
-		// @TODO: For multisite, maintenance mode should only kick in for individual sites if at all possible.
+		/*
+		 * Only start maintenance mode if:
+		 * - running Multisite and there are one or more plugins specified, OR
+		 * - a plugin with an update available is currently active.
+		 * @TODO: For multisite, maintenance mode should only kick in for individual sites if at all possible.
+		 */
 		$maintenance = ( is_multisite() && ! empty( $plugins ) );
 		foreach ( $plugins as $plugin )
 			$maintenance = $maintenance || ( is_plugin_active( $plugin ) && isset( $current->response[ $plugin] ) );
@@ -612,7 +1073,7 @@ class Plugin_Upgrader extends WP_Upgrader {
 				continue;
 			}
 
-			// Get the URL to the zip file
+			// Get the URL to the zip file.
 			$r = $current->response[ $plugin ];
 
 			$this->skin->plugin_active = is_plugin_active($plugin);
@@ -667,29 +1128,47 @@ class Plugin_Upgrader extends WP_Upgrader {
 		// Cleanup our hooks, in case something else does a upgrade on this connection.
 		remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'));
 
-		// Force refresh of plugin update information
+		// Force refresh of plugin update information.
 		wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
 
 		return $results;
 	}
 
-	function check_package($source) {
+	/**
+	 * Check a source package to be sure it contains a plugin.
+	 *
+	 * This function is added to the {@see 'upgrader_source_selection'} filter by
+	 * {@see Plugin_Upgrader::install()}.
+	 *
+	 * @since 3.3.0
+	 * @access public
+	 *
+	 * @global WP_Filesystem_Base $wp_filesystem Subclass
+	 *
+	 * @param string $source The path to the downloaded package source.
+	 * @return string|WP_Error The source as passed, or a {@see WP_Error} object
+	 *                         if no plugins were found.
+	 */
+	public function check_package($source) {
 		global $wp_filesystem;
 
 		if ( is_wp_error($source) )
 			return $source;
 
 		$working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
-		if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, lets not prevent installation.
+		if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, let's not prevent installation.
 			return $source;
 
 		// Check the folder contains at least 1 valid plugin.
 		$plugins_found = false;
-		foreach ( glob( $working_directory . '*.php' ) as $file ) {
-			$info = get_plugin_data($file, false, false);
-			if ( !empty( $info['Name'] ) ) {
-				$plugins_found = true;
-				break;
+		$files = glob( $working_directory . '*.php' );
+		if ( $files ) {
+			foreach ( $files as $file ) {
+				$info = get_plugin_data( $file, false, false );
+				if ( ! empty( $info['Name'] ) ) {
+					$plugins_found = true;
+					break;
+				}
 			}
 		}
 
@@ -699,8 +1178,17 @@ class Plugin_Upgrader extends WP_Upgrader {
 		return $source;
 	}
 
-	//return plugin info.
-	function plugin_info() {
+	/**
+	 * Retrieve the path to the file that contains the plugin info.
+	 *
+	 * This isn't used internally in the class, but is called by the skins.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 *
+	 * @return string|false The full path to the main plugin file, or false.
+	 */
+	public function plugin_info() {
 		if ( ! is_array($this->result) )
 			return false;
 		if ( empty($this->result['destination_name']) )
@@ -715,8 +1203,20 @@ class Plugin_Upgrader extends WP_Upgrader {
 		return $this->result['destination_name'] . '/' . $pluginfiles[0];
 	}
 
-	//Hooked to pre_install
-	function deactivate_plugin_before_upgrade($return, $plugin) {
+	/**
+	 * Deactivates a plugin before it is upgraded.
+	 *
+	 * Hooked to the {@see 'upgrader_pre_install'} filter by {@see Plugin_Upgrader::upgrade()}.
+	 *
+	 * @since 2.8.0
+	 * @since 4.1.0 Added a return value.
+	 * @access public
+	 *
+	 * @param bool|WP_Error  $return Upgrade offer return.
+	 * @param array          $plugin Plugin package arguments.
+	 * @return bool|WP_Error The passed in $return param or {@see WP_Error}.
+	 */
+	public function deactivate_plugin_before_upgrade($return, $plugin) {
 
 		if ( is_wp_error($return) ) //Bypass.
 			return $return;
@@ -733,10 +1233,28 @@ class Plugin_Upgrader extends WP_Upgrader {
 			//Deactivate the plugin silently, Prevent deactivation hooks from running.
 			deactivate_plugins($plugin, true);
 		}
+
+		return $return;
 	}
 
-	//Hooked to upgrade_clear_destination
-	function delete_old_plugin($removed, $local_destination, $remote_destination, $plugin) {
+	/**
+	 * Delete the old plugin during an upgrade.
+	 *
+	 * Hooked to the {@see 'upgrader_clear_destination'} filter by
+	 * {@see Plugin_Upgrader::upgrade()} and {@see Plugin_Upgrader::bulk_upgrade()}.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 *
+	 * @global WP_Filesystem_Base $wp_filesystem Subclass
+     *
+	 * @param bool|WP_Error $removed
+	 * @param string        $local_destination
+	 * @param string        $remote_destination
+	 * @param array         $plugin
+	 * @return WP_Error|bool
+	 */
+	public function delete_old_plugin($removed, $local_destination, $remote_destination, $plugin) {
 		global $wp_filesystem;
 
 		if ( is_wp_error($removed) )
@@ -766,18 +1284,43 @@ class Plugin_Upgrader extends WP_Upgrader {
 }
 
 /**
- * Theme Upgrader class for WordPress Themes, It is designed to upgrade/install themes from a local zip, remote zip URL, or uploaded zip file.
+ * Core class used for upgrading/installing themes.
+ *
+ * It is designed to upgrade/install themes from a local zip, remote zip URL,
+ * or uploaded zip file.
  *
- * @package WordPress
- * @subpackage Upgrader
  * @since 2.8.0
+ *
+ * @see WP_Upgrader
  */
 class Theme_Upgrader extends WP_Upgrader {
 
-	var $result;
-	var $bulk = false;
+	/**
+	 * Result of the theme upgrade offer.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 * @var array|WP_Error $result
+	 * @see WP_Upgrader::$result
+	 */
+	public $result;
 
-	function upgrade_strings() {
+	/**
+	 * Whether multiple themes are being upgraded/installed in bulk.
+	 *
+	 * @since 2.9.0
+	 * @access public
+	 * @var bool $bulk
+	 */
+	public $bulk = false;
+
+	/**
+	 * Initialize the upgrade strings.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 */
+	public function upgrade_strings() {
 		$this->strings['up_to_date'] = __('The theme is at the latest version.');
 		$this->strings['no_package'] = __('Update package not available.');
 		$this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>…');
@@ -788,7 +1331,13 @@ class Theme_Upgrader extends WP_Upgrader {
 		$this->strings['process_success'] = __('Theme updated successfully.');
 	}
 
-	function install_strings() {
+	/**
+	 * Initialize the install strings.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 */
+	public function install_strings() {
 		$this->strings['no_package'] = __('Install package not available.');
 		$this->strings['downloading_package'] = __('Downloading install package from <span class="code">%s</span>…');
 		$this->strings['unpack_package'] = __('Unpacking the package…');
@@ -808,7 +1357,20 @@ class Theme_Upgrader extends WP_Upgrader {
 		$this->strings['parent_theme_not_found'] = __('<strong>The parent theme could not be found.</strong> You will need to install the parent theme, <strong>%s</strong>, before you can use this child theme.');
 	}
 
-	function check_parent_theme_filter($install_result, $hook_extra, $child_result) {
+	/**
+	 * Check if a child theme is being installed and we need to install its parent.
+	 *
+	 * Hooked to the {@see 'upgrader_post_install'} filter by {@see Theme_Upgrader::install()}.
+	 *
+	 * @since 3.4.0
+	 * @access public
+	 *
+	 * @param bool  $install_result
+	 * @param array $hook_extra
+	 * @param array $child_result
+	 * @return type
+	 */
+	public function check_parent_theme_filter( $install_result, $hook_extra, $child_result ) {
 		// Check to see if we need to install a parent theme
 		$theme_info = $this->theme_info();
 
@@ -823,7 +1385,7 @@ class Theme_Upgrader extends WP_Upgrader {
 			return $install_result;
 		}
 
-		// We don't have the parent theme, lets install it
+		// We don't have the parent theme, let's install it.
 		$api = themes_api('theme_information', array('slug' => $theme_info->get('Template'), 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth.
 
 		if ( ! $api || is_wp_error($api) ) {
@@ -867,12 +1429,42 @@ class Theme_Upgrader extends WP_Upgrader {
 		return $install_result;
 	}
 
-	function hide_activate_preview_actions($actions) {
+	/**
+	 * Don't display the activate and preview actions to the user.
+	 *
+	 * Hooked to the {@see 'install_theme_complete_actions'} filter by
+	 * {@see Theme_Upgrader::check_parent_theme_filter()} when installing
+	 * a child theme and installing the parent theme fails.
+	 *
+	 * @since 3.4.0
+	 * @access public
+	 *
+	 * @param array $actions Preview actions.
+	 * @return array
+	 */
+	public function hide_activate_preview_actions( $actions ) {
 		unset($actions['activate'], $actions['preview']);
 		return $actions;
 	}
 
-	function install( $package, $args = array() ) {
+	/**
+	 * Install a theme package.
+	 *
+	 * @since 2.8.0
+	 * @since 3.7.0 The `$args` parameter was added, making clearing the update cache optional.
+	 * @access public
+	 *
+	 * @param string $package The full local path or URI of the package.
+	 * @param array  $args {
+	 *     Optional. Other arguments for installing a theme package. Default empty array.
+	 *
+	 *     @type bool $clear_update_cache Whether to clear the updates cache if successful.
+	 *                                    Default true.
+	 * }
+	 *
+	 * @return bool|WP_Error True if the install was successful, false or a {@see WP_Error} object otherwise.
+	 */
+	public function install( $package, $args = array() ) {
 
 		$defaults = array(
 			'clear_update_cache' => true,
@@ -884,6 +1476,8 @@ class Theme_Upgrader extends WP_Upgrader {
 
 		add_filter('upgrader_source_selection', array($this, 'check_package') );
 		add_filter('upgrader_post_install', array($this, 'check_parent_theme_filter'), 10, 3);
+		// Clear cache so wp_update_themes() knows about the new theme.
+		add_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9, 0 );
 
 		$this->run( array(
 			'package' => $package,
@@ -896,6 +1490,7 @@ class Theme_Upgrader extends WP_Upgrader {
 			),
 		) );
 
+		remove_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9 );
 		remove_filter('upgrader_source_selection', array($this, 'check_package') );
 		remove_filter('upgrader_post_install', array($this, 'check_parent_theme_filter'));
 
@@ -908,7 +1503,23 @@ class Theme_Upgrader extends WP_Upgrader {
 		return true;
 	}
 
-	function upgrade( $theme, $args = array() ) {
+	/**
+	 * Upgrade a theme.
+	 *
+	 * @since 2.8.0
+	 * @since 3.7.0 The `$args` parameter was added, making clearing the update cache optional.
+	 * @access public
+	 *
+	 * @param string $theme The theme slug.
+	 * @param array  $args {
+	 *     Optional. Other arguments for upgrading a theme. Default empty array.
+	 *
+	 *     @type bool $clear_update_cache Whether to clear the update cache if successful.
+	 *                                    Default true.
+	 * }
+	 * @return bool|WP_Error True if the upgrade was successful, false or a {@see WP_Error} object otherwise.
+	 */
+	public function upgrade( $theme, $args = array() ) {
 
 		$defaults = array(
 			'clear_update_cache' => true,
@@ -958,7 +1569,23 @@ class Theme_Upgrader extends WP_Upgrader {
 		return true;
 	}
 
-	function bulk_upgrade( $themes, $args = array() ) {
+	/**
+	 * Upgrade several themes at once.
+	 *
+	 * @since 3.0.0
+	 * @since 3.7.0 The `$args` parameter was added, making clearing the update cache optional.
+	 * @access public
+	 *
+	 * @param array $themes The theme slugs.
+	 * @param array $args {
+	 *     Optional. Other arguments for upgrading several themes at once. Default empty array.
+	 *
+	 *     @type bool $clear_update_cache Whether to clear the update cache if successful.
+	 *                                    Default true.
+	 * }
+	 * @return array[]|false An array of results, or false if unable to connect to the filesystem.
+	 */
+	public function bulk_upgrade( $themes, $args = array() ) {
 
 		$defaults = array(
 			'clear_update_cache' => true,
@@ -1022,6 +1649,7 @@ class Theme_Upgrader extends WP_Upgrader {
 				'destination' => get_theme_root( $theme ),
 				'clear_destination' => true,
 				'clear_working' => true,
+				'is_multi' => true,
 				'hook_extra' => array(
 					'theme' => $theme
 				),
@@ -1059,7 +1687,22 @@ class Theme_Upgrader extends WP_Upgrader {
 		return $results;
 	}
 
-	function check_package($source) {
+	/**
+	 * Check that the package source contains a valid theme.
+	 *
+	 * Hooked to the {@see 'upgrader_source_selection'} filter by {@see Theme_Upgrader::install()}.
+	 * It will return an error if the theme doesn't have style.css or index.php
+	 * files.
+	 *
+	 * @since 3.3.0
+	 * @access public
+	 *
+	 * @global WP_Filesystem_Base $wp_filesystem Subclass
+	 *
+	 * @param string $source The full path to the package source.
+	 * @return string|WP_Error The source or a WP_Error.
+	 */
+	public function check_package( $source ) {
 		global $wp_filesystem;
 
 		if ( is_wp_error($source) )
@@ -1067,27 +1710,57 @@ class Theme_Upgrader extends WP_Upgrader {
 
 		// Check the folder contains a valid theme
 		$working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
-		if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, lets not prevent installation.
+		if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, let's not prevent installation.
 			return $source;
 
 		// A proper archive should have a style.css file in the single subdirectory
-		if ( ! file_exists( $working_directory . 'style.css' ) )
-			return new WP_Error( 'incompatible_archive_theme_no_style', $this->strings['incompatible_archive'], __( 'The theme is missing the <code>style.css</code> stylesheet.' ) );
+		if ( ! file_exists( $working_directory . 'style.css' ) ) {
+			return new WP_Error( 'incompatible_archive_theme_no_style', $this->strings['incompatible_archive'],
+				/* translators: %s: style.css */
+				sprintf( __( 'The theme is missing the %s stylesheet.' ),
+					'<code>style.css</code>'
+				)
+			);
+		}
 
 		$info = get_file_data( $working_directory . 'style.css', array( 'Name' => 'Theme Name', 'Template' => 'Template' ) );
 
-		if ( empty( $info['Name'] ) )
-			return new WP_Error( 'incompatible_archive_theme_no_name', $this->strings['incompatible_archive'], __( "The <code>style.css</code> stylesheet doesn't contain a valid theme header." ) );
+		if ( empty( $info['Name'] ) ) {
+			return new WP_Error( 'incompatible_archive_theme_no_name', $this->strings['incompatible_archive'],
+				/* translators: %s: style.css */
+				sprintf( __( 'The %s stylesheet doesn’t contain a valid theme header.' ),
+					'<code>style.css</code>'
+				)
+			);
+		}
 
 		// If it's not a child theme, it must have at least an index.php to be legit.
-		if ( empty( $info['Template'] ) && ! file_exists( $working_directory . 'index.php' ) )
-			return new WP_Error( 'incompatible_archive_theme_no_index', $this->strings['incompatible_archive'], __( 'The theme is missing the <code>index.php</code> file.' ) );
+		if ( empty( $info['Template'] ) && ! file_exists( $working_directory . 'index.php' ) ) {
+			return new WP_Error( 'incompatible_archive_theme_no_index', $this->strings['incompatible_archive'],
+				/* translators: %s: index.php */
+				sprintf( __( 'The theme is missing the %s file.' ),
+					'<code>index.php</code>'
+				)
+			);
+		}
 
 		return $source;
 	}
 
-	function current_before($return, $theme) {
-
+	/**
+	 * Turn on maintenance mode before attempting to upgrade the current theme.
+	 *
+	 * Hooked to the {@see 'upgrader_pre_install'} filter by {@see Theme_Upgrader::upgrade()} and
+	 * {@see Theme_Upgrader::bulk_upgrade()}.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 *
+	 * @param bool|WP_Error  $return
+	 * @param array          $theme
+	 * @return bool|WP_Error
+	 */
+	public function current_before($return, $theme) {
 		if ( is_wp_error($return) )
 			return $return;
 
@@ -1102,7 +1775,20 @@ class Theme_Upgrader extends WP_Upgrader {
 		return $return;
 	}
 
-	function current_after($return, $theme) {
+	/**
+	 * Turn off maintenance mode after upgrading the current theme.
+	 *
+	 * Hooked to the {@see 'upgrader_post_install'} filter by {@see Theme_Upgrader::upgrade()}
+	 * and {@see Theme_Upgrader::bulk_upgrade()}.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 *
+	 * @param bool|WP_Error  $return
+	 * @param array          $theme
+	 * @return bool|WP_Error
+	 */
+	public function current_after($return, $theme) {
 		if ( is_wp_error($return) )
 			return $return;
 
@@ -1124,7 +1810,24 @@ class Theme_Upgrader extends WP_Upgrader {
 		return $return;
 	}
 
-	function delete_old_theme( $removed, $local_destination, $remote_destination, $theme ) {
+	/**
+	 * Delete the old theme during an upgrade.
+	 *
+	 * Hooked to the {@see 'upgrader_clear_destination'} filter by {@see Theme_Upgrader::upgrade()}
+	 * and {@see Theme_Upgrader::bulk_upgrade()}.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 *
+	 * @global WP_Filesystem_Base $wp_filesystem Subclass
+	 *
+	 * @param bool   $removed
+	 * @param string $local_destination
+	 * @param string $remote_destination
+	 * @param array  $theme
+	 * @return bool
+	 */
+	public function delete_old_theme( $removed, $local_destination, $remote_destination, $theme ) {
 		global $wp_filesystem;
 
 		if ( is_wp_error( $removed ) )
@@ -1143,7 +1846,19 @@ class Theme_Upgrader extends WP_Upgrader {
 		return true;
 	}
 
-	function theme_info($theme = null) {
+	/**
+	 * Get the WP_Theme object for a theme.
+	 *
+	 * @since 2.8.0
+	 * @since 3.0.0 The `$theme` argument was added.
+	 * @access public
+	 *
+	 * @param string $theme The directory name of the theme. This is optional, and if not supplied,
+	 *                      the directory name from the last result will be used.
+	 * @return WP_Theme|false The theme's info object, or false `$theme` is not supplied
+	 *                        and the last result isn't set.
+	 */
+	public function theme_info($theme = null) {
 
 		if ( empty($theme) ) {
 			if ( !empty($this->result['destination_name']) )
@@ -1156,39 +1871,111 @@ class Theme_Upgrader extends WP_Upgrader {
 
 }
 
-add_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
-
 /**
- * Language pack upgrader, for updating translations of plugins, themes, and core.
+ * Core class used for updating/installing language packs (translations)
+ * for plugins, themes, and core.
  *
- * @package WordPress
- * @subpackage Upgrader
  * @since 3.7.0
+ *
+ * @see WP_Upgrader
  */
 class Language_Pack_Upgrader extends WP_Upgrader {
 
-	var $result;
-	var $bulk = true;
+	/**
+	 * Result of the language pack upgrade.
+	 *
+	 * @since 3.7.0
+	 * @access public
+	 * @var array|WP_Error $result
+	 * @see WP_Upgrader::$result
+	 */
+	public $result;
+
+	/**
+	 * Whether a bulk upgrade/install is being performed.
+	 *
+	 * @since 3.7.0
+	 * @access public
+	 * @var bool $bulk
+	 */
+	public $bulk = true;
 
-	static function async_upgrade( $upgrader = false ) {
+	/**
+	 * Asynchronously upgrades language packs after other upgrades have been made.
+	 *
+	 * Hooked to the {@see 'upgrader_process_complete'} action by default.
+	 *
+	 * @since 3.7.0
+	 * @access public
+	 * @static
+	 *
+	 * @param false|WP_Upgrader $upgrader Optional. WP_Upgrader instance or false. If `$upgrader` is
+	 *                                    a Language_Pack_Upgrader instance, the method will bail to
+	 *                                    avoid recursion. Otherwise unused. Default false.
+	 */
+	public static function async_upgrade( $upgrader = false ) {
 		// Avoid recursion.
-		if ( $upgrader && $upgrader instanceof Language_Pack_Upgrader )
+		if ( $upgrader && $upgrader instanceof Language_Pack_Upgrader ) {
 			return;
+		}
 
 		// Nothing to do?
 		$language_updates = wp_get_translation_updates();
-		if ( ! $language_updates )
+		if ( ! $language_updates ) {
+			return;
+		}
+
+		/*
+		 * Avoid messing with VCS installs, at least for now.
+		 * Noted: this is not the ideal way to accomplish this.
+		 */
+		$check_vcs = new WP_Automatic_Updater;
+		if ( $check_vcs->is_vcs_checkout( WP_CONTENT_DIR ) ) {
 			return;
+		}
 
-		$skin = new Language_Pack_Upgrader_Skin( array(
-			'skip_header_footer' => true,
-		) );
+		foreach ( $language_updates as $key => $language_update ) {
+			$update = ! empty( $language_update->autoupdate );
+
+			/**
+			 * Filter whether to asynchronously update translation for core, a plugin, or a theme.
+			 *
+			 * @since 4.0.0
+			 *
+			 * @param bool   $update          Whether to update.
+			 * @param object $language_update The update offer.
+			 */
+			$update = apply_filters( 'async_update_translation', $update, $language_update );
+
+			if ( ! $update ) {
+				unset( $language_updates[ $key ] );
+			}
+		}
+
+		if ( empty( $language_updates ) ) {
+			return;
+		}
+
+		// Re-use the automatic upgrader skin if the parent upgrader is using it.
+		if ( $upgrader && $upgrader->skin instanceof Automatic_Upgrader_Skin ) {
+			$skin = $upgrader->skin;
+		} else {
+			$skin = new Language_Pack_Upgrader_Skin( array(
+				'skip_header_footer' => true,
+			) );
+		}
 
 		$lp_upgrader = new Language_Pack_Upgrader( $skin );
-		$lp_upgrader->upgrade();
+		$lp_upgrader->bulk_upgrade( $language_updates );
 	}
 
-	function upgrade_strings() {
+	/**
+	 * Initialize the upgrade strings.
+	 *
+	 * @since 3.7.0
+	 * @access public
+	 */
+	public function upgrade_strings() {
 		$this->strings['starting_upgrade'] = __( 'Some of your translations need updating. Sit tight for a few more seconds while we update them as well.' );
 		$this->strings['up_to_date'] = __( 'The translation is up to date.' ); // We need to silently skip this case
 		$this->strings['no_package'] = __( 'Update package not available.' );
@@ -1198,14 +1985,50 @@ class Language_Pack_Upgrader extends WP_Upgrader {
 		$this->strings['process_success'] = __( 'Translation updated successfully.' );
 	}
 
-	function upgrade( $update = false, $args = array() ) {
-		if ( $update )
+	/**
+	 * Upgrade a language pack.
+	 *
+	 * @since 3.7.0
+	 * @access public
+	 *
+	 * @param string|false $update Optional. Whether an update offer is available. Default false.
+	 * @param array        $args   Optional. Other optional arguments, see
+	 *                             {@see Language_Pack_Upgrader::bulk_upgrade()}. Default empty array.
+	 * @return array|bool|WP_Error The result of the upgrade, or a {@see wP_Error} object instead.
+	 */
+	public function upgrade( $update = false, $args = array() ) {
+		if ( $update ) {
 			$update = array( $update );
+		}
+
 		$results = $this->bulk_upgrade( $update, $args );
+
+		if ( ! is_array( $results ) ) {
+			return $results;
+		}
+
 		return $results[0];
 	}
 
-	function bulk_upgrade( $language_updates = array(), $args = array() ) {
+	/**
+	 * Bulk upgrade language packs.
+	 *
+	 * @since 3.7.0
+	 * @access public
+	 *
+	 * @global WP_Filesystem_Base $wp_filesystem Subclass
+	 *
+	 * @param array $language_updates Optional. Language pack updates. Default empty array.
+	 * @param array $args {
+	 *     Optional. Other arguments for upgrading multiple language packs. Default empty array
+	 *
+	 *     @type bool $clear_update_cache Whether to clear the update cache when done.
+	 *                                    Default true.
+	 * }
+	 * @return array|bool|WP_Error Will return an array of results, or true if there are no updates,
+	 *                                   false or WP_Error for initial errors.
+	 */
+	public function bulk_upgrade( $language_updates = array(), $args = array() ) {
 		global $wp_filesystem;
 
 		$defaults = array(
@@ -1233,7 +2056,13 @@ class Language_Pack_Upgrader extends WP_Upgrader {
 		if ( 'upgrader_process_complete' == current_filter() )
 			$this->skin->feedback( 'starting_upgrade' );
 
-		add_filter( 'upgrader_source_selection', array( &$this, 'check_package' ), 10, 3 );
+		// Remove any existing upgrade filters from the plugin/theme upgraders #WP29425 & #WP29230
+		remove_all_filters( 'upgrader_pre_install' );
+		remove_all_filters( 'upgrader_clear_destination' );
+		remove_all_filters( 'upgrader_post_install' );
+		remove_all_filters( 'upgrader_source_selection' );
+
+		add_filter( 'upgrader_source_selection', array( $this, 'check_package' ), 10, 2 );
 
 		$this->skin->header();
 
@@ -1249,8 +2078,10 @@ class Language_Pack_Upgrader extends WP_Upgrader {
 		$this->update_count = count( $language_updates );
 		$this->update_current = 0;
 
-		// The filesystem's mkdir() is not recursive. Make sure WP_LANG_DIR exists,
-		// as we then may need to create a /plugins or /themes directory inside of it.
+		/*
+		 * The filesystem's mkdir() is not recursive. Make sure WP_LANG_DIR exists,
+		 * as we then may need to create a /plugins or /themes directory inside of it.
+		 */
 		$remote_destination = $wp_filesystem->find_folder( WP_LANG_DIR );
 		if ( ! $wp_filesystem->exists( $remote_destination ) )
 			if ( ! $wp_filesystem->mkdir( $remote_destination, FS_CHMOD_DIR ) )
@@ -1295,18 +2126,30 @@ class Language_Pack_Upgrader extends WP_Upgrader {
 		$this->skin->footer();
 
 		// Clean up our hooks, in case something else does an upgrade on this connection.
-		remove_filter( 'upgrader_source_selection', array( &$this, 'check_package' ), 10, 2 );
+		remove_filter( 'upgrader_source_selection', array( $this, 'check_package' ) );
 
 		if ( $parsed_args['clear_update_cache'] ) {
-			wp_clean_themes_cache( true );
-			wp_clean_plugins_cache( true );
-			delete_site_transient( 'update_core' );
+			wp_clean_update_cache();
 		}
 
 		return $results;
 	}
 
-	function check_package( $source, $remote_source ) {
+	/**
+	 * Check the package source to make sure there are .mo and .po files.
+	 *
+	 * Hooked to the {@see 'upgrader_source_selection'} filter by
+	 * {@see Language_Pack_Upgrader::bulk_upgrade()}.
+	 *
+	 * @since 3.7.0
+	 * @access public
+	 *
+	 * @global WP_Filesystem_Base $wp_filesystem Subclass
+	 *
+	 * @param string|WP_Error $source
+	 * @param string          $remote_source
+	 */
+	public function check_package( $source, $remote_source ) {
 		global $wp_filesystem;
 
 		if ( is_wp_error( $source ) )
@@ -1324,18 +2167,33 @@ class Language_Pack_Upgrader extends WP_Upgrader {
 				$mo = true;
 		}
 
-		if ( ! $mo || ! $po )
+		if ( ! $mo || ! $po ) {
 			return new WP_Error( 'incompatible_archive_pomo', $this->strings['incompatible_archive'],
-				__( 'The language pack is missing either the <code>.po</code> or <code>.mo</code> files.' ) );
+				/* translators: 1: .po 2: .mo */
+				sprintf( __( 'The language pack is missing either the %1$s or %2$s files.' ),
+					'<code>.po</code>',
+					'<code>.mo</code>'
+				)
+			);
+		}
 
 		return $source;
 	}
 
-	function get_name_for_update( $update ) {
+	/**
+	 * Get the name of an item being updated.
+	 *
+	 * @since 3.7.0
+	 * @access public
+	 *
+	 * @param object $update The data for an update.
+	 * @return string The name of the item being updated.
+	 */
+	public function get_name_for_update( $update ) {
 		switch ( $update->type ) {
 			case 'core':
 				return 'WordPress'; // Not translated
-				break;
+
 			case 'theme':
 				$theme = wp_get_theme( $update->slug );
 				if ( $theme->exists() )
@@ -1343,7 +2201,7 @@ class Language_Pack_Upgrader extends WP_Upgrader {
 				break;
 			case 'plugin':
 				$plugin_data = get_plugins( '/' . $update->slug );
-				$plugin_data = array_shift( $plugin_data );
+				$plugin_data = reset( $plugin_data );
 				if ( $plugin_data )
 					return $plugin_data['Name'];
 				break;
@@ -1354,16 +2212,26 @@ class Language_Pack_Upgrader extends WP_Upgrader {
 }
 
 /**
- * Core Upgrader class for WordPress. It allows for WordPress to upgrade itself in combination with the wp-admin/includes/update-core.php file
+ * Core class used for updating core.
+ *
+ * It allows for WordPress to upgrade itself in combination with
+ * the wp-admin/includes/update-core.php file.
  *
- * @package WordPress
- * @subpackage Upgrader
  * @since 2.8.0
+ *
+ * @see WP_Upgrader
  */
 class Core_Upgrader extends WP_Upgrader {
 
-	function upgrade_strings() {
+	/**
+	 * Initialize the upgrade strings.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 */
+	public function upgrade_strings() {
 		$this->strings['up_to_date'] = __('WordPress is at the latest version.');
+		$this->strings['locked'] = __('Another update is currently in progress.');
 		$this->strings['no_package'] = __('Update package not available.');
 		$this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>…');
 		$this->strings['unpack_package'] = __('Unpacking the update…');
@@ -1373,10 +2241,32 @@ class Core_Upgrader extends WP_Upgrader {
 		$this->strings['rollback_was_required'] = __( 'Due to an error during updating, WordPress has rolled back to your previous version.' );
 	}
 
-	function upgrade( $current, $args = array() ) {
+	/**
+	 * Upgrade WordPress core.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 *
+	 * @global WP_Filesystem_Base $wp_filesystem Subclass
+	 * @global callable           $_wp_filesystem_direct_method
+	 *
+	 * @param object $current Response object for whether WordPress is current.
+	 * @param array  $args {
+	 *        Optional. Arguments for upgrading WordPress core. Default empty array.
+	 *
+	 *        @type bool $pre_check_md5    Whether to check the file checksums before
+	 *                                     attempting the upgrade. Default true.
+	 *        @type bool $attempt_rollback Whether to attempt to rollback the chances if
+	 *                                     there is a problem. Default false.
+	 *        @type bool $do_rollback      Whether to perform this "upgrade" as a rollback.
+	 *                                     Default false.
+	 * }
+	 * @return null|false|WP_Error False or WP_Error on failure, null on success.
+	 */
+	public function upgrade( $current, $args = array() ) {
 		global $wp_filesystem;
 
-		include ABSPATH . WPINC . '/version.php'; // $wp_version;
+		include( ABSPATH . WPINC . '/version.php' ); // $wp_version;
 
 		$start_time = time();
 
@@ -1384,6 +2274,7 @@ class Core_Upgrader extends WP_Upgrader {
 			'pre_check_md5'    => true,
 			'attempt_rollback' => false,
 			'do_rollback'      => false,
+			'allow_relaxed_file_ownership' => false,
 		);
 		$parsed_args = wp_parse_args( $args, $defaults );
 
@@ -1394,7 +2285,7 @@ class Core_Upgrader extends WP_Upgrader {
 		if ( !isset( $current->response ) || $current->response == 'latest' )
 			return new WP_Error('up_to_date', $this->strings['up_to_date']);
 
-		$res = $this->fs_connect( array(ABSPATH, WP_CONTENT_DIR) );
+		$res = $this->fs_connect( array( ABSPATH, WP_CONTENT_DIR ), $parsed_args['allow_relaxed_file_ownership'] );
 		if ( ! $res || is_wp_error( $res ) ) {
 			return $res;
 		}
@@ -1425,25 +2316,38 @@ class Core_Upgrader extends WP_Upgrader {
 		else
 			$to_download = 'full';
 
+		// Lock to prevent multiple Core Updates occuring
+		$lock = WP_Upgrader::create_lock( 'core_updater', 15 * MINUTE_IN_SECONDS );
+		if ( ! $lock ) {
+			return new WP_Error( 'locked', $this->strings['locked'] );
+		}
+
 		$download = $this->download_package( $current->packages->$to_download );
-		if ( is_wp_error($download) )
+		if ( is_wp_error( $download ) ) {
+			WP_Upgrader::release_lock( 'core_updater' );
 			return $download;
+		}
 
 		$working_dir = $this->unpack_package( $download );
-		if ( is_wp_error($working_dir) )
+		if ( is_wp_error( $working_dir ) ) {
+			WP_Upgrader::release_lock( 'core_updater' );
 			return $working_dir;
+		}
 
 		// Copy update-core.php from the new version into place.
 		if ( !$wp_filesystem->copy($working_dir . '/wordpress/wp-admin/includes/update-core.php', $wp_dir . 'wp-admin/includes/update-core.php', true) ) {
 			$wp_filesystem->delete($working_dir, true);
+			WP_Upgrader::release_lock( 'core_updater' );
 			return new WP_Error( 'copy_failed_for_update_core_file', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), 'wp-admin/includes/update-core.php' );
 		}
 		$wp_filesystem->chmod($wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE);
 
 		require_once( ABSPATH . 'wp-admin/includes/update-core.php' );
 
-		if ( ! function_exists( 'update_core' ) )
+		if ( ! function_exists( 'update_core' ) ) {
+			WP_Upgrader::release_lock( 'core_updater' );
 			return new WP_Error( 'copy_failed_space', $this->strings['copy_failed_space'] );
+		}
 
 		$result = update_core( $working_dir, $wp_dir );
 
@@ -1452,9 +2356,11 @@ class Core_Upgrader extends WP_Upgrader {
 			$try_rollback = false;
 			if ( is_wp_error( $result ) ) {
 				$error_code = $result->get_error_code();
-				// Not all errors are equal. These codes are critical: copy_failed__copy_dir,
-				// mkdir_failed__copy_dir, copy_failed__copy_dir_retry, and disk_full.
-				// do_rollback allows for update_core() to trigger a rollback if needed.
+				/*
+				 * Not all errors are equal. These codes are critical: copy_failed__copy_dir,
+				 * mkdir_failed__copy_dir, copy_failed__copy_dir_retry, and disk_full.
+				 * do_rollback allows for update_core() to trigger a rollback if needed.
+				 */
 				if ( false !== strpos( $error_code, 'do_rollback' ) )
 					$try_rollback = true;
 				elseif ( false !== strpos( $error_code, '__copy_dir' ) )
@@ -1489,6 +2395,7 @@ class Core_Upgrader extends WP_Upgrader {
 				'success'          => true,
 				'fs_method'        => $wp_filesystem->method,
 				'fs_method_forced' => defined( 'FS_METHOD' ) || has_filter( 'filesystem_method' ),
+				'fs_method_direct' => !empty( $GLOBALS['_wp_filesystem_direct_method'] ) ? $GLOBALS['_wp_filesystem_direct_method'] : '',
 				'time_taken'       => time() - $start_time,
 				'reported'         => $wp_version,
 				'attempted'        => $current->version,
@@ -1515,12 +2422,24 @@ class Core_Upgrader extends WP_Upgrader {
 			wp_version_check( $stats );
 		}
 
+		WP_Upgrader::release_lock( 'core_updater' );
+
 		return $result;
 	}
 
-	// Determines if this WordPress Core version should update to $offered_ver or not
-	static function should_update_to_version( $offered_ver /* x.y.z */ ) {
-		include ABSPATH . WPINC . '/version.php'; // $wp_version; // x.y.z
+	/**
+	 * Determines if this WordPress Core version should update to an offered version or not.
+	 *
+	 * @since 3.7.0
+	 * @access public
+	 *
+	 * @static
+	 *
+	 * @param string $offered_ver The offered version, of the format x.y.z.
+	 * @return bool True if we should update to the offered version, otherwise false.
+	 */
+	public static function should_update_to_version( $offered_ver ) {
+		include( ABSPATH . WPINC . '/version.php' ); // $wp_version; // x.y.z
 
 		$current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version  ), 0, 2 ) ); // x.y
 		$new_branch     = implode( '.', array_slice( preg_split( '/[.-]/', $offered_ver ), 0, 2 ) ); // x.y
@@ -1584,7 +2503,7 @@ class Core_Upgrader extends WP_Upgrader {
 			 */
 			if ( ! apply_filters( 'allow_dev_auto_core_updates', $upgrade_dev ) )
 				return false;
-			// else fall through to minor + major branches below
+			// Else fall through to minor + major branches below.
 		}
 
 		// 4: Minor In-branch updates (3.7.0 -> 3.7.1 -> 3.7.2 -> 3.7.4)
@@ -1617,7 +2536,18 @@ class Core_Upgrader extends WP_Upgrader {
 		return false;
 	}
 
-	function check_files() {
+	/**
+	 * Compare the disk file checksums against the expected checksums.
+	 *
+	 * @since 3.7.0
+	 * @access public
+	 *
+	 * @global string $wp_version
+	 * @global string $wp_local_package
+	 *
+	 * @return bool True if the checksums match, otherwise false.
+	 */
+	public function check_files() {
 		global $wp_version, $wp_local_package;
 
 		$checksums = get_core_checksums( $wp_version, isset( $wp_local_package ) ? $wp_local_package : 'en_US' );
@@ -1638,18 +2568,52 @@ class Core_Upgrader extends WP_Upgrader {
 }
 
 /**
- * Upgrade Skin helper for File uploads. This class handles the upload process and passes it as if it's a local file to the Upgrade/Installer functions.
+ * Core class used for handling file uploads.
+ *
+ * This class handles the upload process and passes it as if it's a local file
+ * to the Upgrade/Installer functions.
  *
- * @package WordPress
- * @subpackage Upgrader
  * @since 2.8.0
  */
 class File_Upload_Upgrader {
-	var $package;
-	var $filename;
-	var $id = 0;
 
-	function __construct($form, $urlholder) {
+	/**
+	 * The full path to the file package.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 * @var string $package
+	 */
+	public $package;
+
+	/**
+	 * The name of the file.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 * @var string $filename
+	 */
+	public $filename;
+
+	/**
+	 * The ID of the attachment post for this file.
+	 *
+	 * @since 3.3.0
+	 * @access public
+	 * @var int $id
+	 */
+	public $id = 0;
+
+	/**
+	 * Construct the upgrader for a form.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 *
+	 * @param string $form      The name of the form the file was uploaded from.
+	 * @param string $urlholder The name of the `GET` parameter that holds the filename.
+	 */
+	public function __construct( $form, $urlholder ) {
 
 		if ( empty($_FILES[$form]['name']) && empty($_GET[$urlholder]) )
 			wp_die(__('Please select a file'));
@@ -1675,11 +2639,11 @@ class File_Upload_Upgrader {
 				'post_status' => 'private'
 			);
 
-			// Save the data
+			// Save the data.
 			$this->id = wp_insert_attachment( $object, $file['file'] );
 
-			// schedule a cleanup for 2 hours from now in case of failed install
-			wp_schedule_single_event( time() + 7200, 'upgrader_scheduled_cleanup', array( $this->id ) );
+			// Schedule a cleanup for 2 hours from now in case of failed install.
+			wp_schedule_single_event( time() + 2 * HOUR_IN_SECONDS, 'upgrader_scheduled_cleanup', array( $this->id ) );
 
 		} elseif ( is_numeric( $_GET[$urlholder] ) ) {
 			// Numeric Package = previously uploaded file, see above.
@@ -1700,7 +2664,15 @@ class File_Upload_Upgrader {
 		}
 	}
 
-	function cleanup() {
+	/**
+	 * Delete the attachment/uploaded file.
+	 *
+	 * @since 3.2.2
+	 * @access public
+	 *
+	 * @return bool Whether the cleanup was successful.
+	 */
+	public function cleanup() {
 		if ( $this->id )
 			wp_delete_attachment( $this->id );
 
@@ -1712,10 +2684,8 @@ class File_Upload_Upgrader {
 }
 
 /**
- * The WordPress automatic background updater.
+ * Core class used for handling automatic background updates.
  *
- * @package WordPress
- * @subpackage Upgrader
  * @since 3.7.0
  */
 class WP_Automatic_Updater {
@@ -1724,6 +2694,7 @@ class WP_Automatic_Updater {
 	 * Tracks update results during processing.
 	 *
 	 * @var array
+	 * @access protected
 	 */
 	protected $update_results = array();
 
@@ -1731,13 +2702,14 @@ class WP_Automatic_Updater {
 	 * Whether the entire automatic updater is disabled.
 	 *
 	 * @since 3.7.0
+	 * @access public
 	 */
 	public function is_disabled() {
 		// Background updates are disabled if you don't want file changes.
 		if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
 			return true;
 
-		if ( defined( 'WP_INSTALLING' ) )
+		if ( wp_installing() )
 			return true;
 
 		// More fine grained control can be done through the WP_AUTO_UPDATE_CORE constant and filters.
@@ -1771,6 +2743,7 @@ class WP_Automatic_Updater {
 	 * how things get updated.
 	 *
 	 * @since 3.7.0
+	 * @access public
 	 *
 	 * @param string $context The filesystem path to check, in addition to ABSPATH.
 	 */
@@ -1823,6 +2796,9 @@ class WP_Automatic_Updater {
 	 * Tests to see if we can and should update a specific item.
 	 *
 	 * @since 3.7.0
+	 * @access public
+	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
 	 * @param string $type    The type of update being checked: 'core', 'theme',
 	 *                        'plugin', 'translation'.
@@ -1837,8 +2813,14 @@ class WP_Automatic_Updater {
 		if ( $this->is_disabled() )
 			return false;
 
+		// Only relax the filesystem checks when the update doesn't include new files
+		$allow_relaxed_file_ownership = false;
+		if ( 'core' == $type && isset( $item->new_files ) && ! $item->new_files ) {
+			$allow_relaxed_file_ownership = true;
+		}
+
 		// If we can't do an auto core update, we may still be able to email the user.
-		if ( ! $skin->request_filesystem_credentials( false, $context ) || $this->is_vcs_checkout( $context ) ) {
+		if ( ! $skin->request_filesystem_credentials( false, $context, $allow_relaxed_file_ownership ) || $this->is_vcs_checkout( $context ) ) {
 			if ( 'core' == $type )
 				$this->send_core_update_notification_email( $item );
 			return false;
@@ -1853,15 +2835,15 @@ class WP_Automatic_Updater {
 		/**
 		 * Filter whether to automatically update core, a plugin, a theme, or a language.
 		 *
-		 * The dynamic portion of the hook name, $type, refers to the type of update
+		 * The dynamic portion of the hook name, `$type`, refers to the type of update
 		 * being checked. Can be 'core', 'theme', 'plugin', or 'translation'.
 		 *
 		 * Generally speaking, plugins, themes, and major core versions are not updated
 		 * by default, while translations and minor and development versions for core
 		 * are updated by default.
 		 *
-		 * See the allow_dev_auto_core_updates, allow_minor_auto_core_updates, and
-		 * allow_major_auto_core_updates filters for a more straightforward way to
+		 * See the {@see 'allow_dev_auto_core_updates', {@see 'allow_minor_auto_core_updates'},
+		 * and {@see 'allow_major_auto_core_updates'} filters for a more straightforward way to
 		 * adjust core updates.
 		 *
 		 * @since 3.7.0
@@ -1898,11 +2880,11 @@ class WP_Automatic_Updater {
 	 * Notifies an administrator of a core update.
 	 *
 	 * @since 3.7.0
+	 * @access protected
 	 *
 	 * @param object $item The update offer.
 	 */
 	protected function send_core_update_notification_email( $item ) {
-		$notify   = true;
 		$notified = get_site_option( 'auto_core_update_notified' );
 
 		// Don't notify if we've already notified the same email address of the same version.
@@ -1942,9 +2924,12 @@ class WP_Automatic_Updater {
 	 * Update an item, if appropriate.
 	 *
 	 * @since 3.7.0
+	 * @access public
 	 *
 	 * @param string $type The type of update being checked: 'core', 'theme', 'plugin', 'translation'.
 	 * @param object $item The update offer.
+	 *
+	 * @return null|WP_Error
 	 */
 	public function update( $type, $item ) {
 		$skin = new Automatic_Upgrader_Skin;
@@ -1974,6 +2959,18 @@ class WP_Automatic_Updater {
 		if ( ! $this->should_update( $type, $item, $context ) )
 			return false;
 
+		/**
+		 * Fires immediately prior to an auto-update.
+		 *
+		 * @since 4.4.0
+		 *
+		 * @param string $type    The type of update being checked: 'core', 'theme', 'plugin', or 'translation'.
+		 * @param object $item    The update offer.
+		 * @param string $context The filesystem context (a path) against which filesystem access and status
+		 *                        should be checked.
+		 */
+		do_action( 'pre_auto_update', $type, $item, $context );
+
 		$upgrader_item = $item;
 		switch ( $type ) {
 			case 'core':
@@ -1999,20 +2996,34 @@ class WP_Automatic_Updater {
 				break;
 		}
 
+		$allow_relaxed_file_ownership = false;
+		if ( 'core' == $type && isset( $item->new_files ) && ! $item->new_files ) {
+			$allow_relaxed_file_ownership = true;
+		}
+
 		// Boom, This sites about to get a whole new splash of paint!
 		$upgrade_result = $upgrader->upgrade( $upgrader_item, array(
 			'clear_update_cache' => false,
-			'pre_check_md5'      => false, /* always use partial builds if possible for core updates */
-			'attempt_rollback'   => true, /* only available for core updates */
+			// Always use partial builds if possible for core updates.
+			'pre_check_md5'      => false,
+			// Only available for core updates.
+			'attempt_rollback'   => true,
+			// Allow relaxed file ownership in some scenarios
+			'allow_relaxed_file_ownership' => $allow_relaxed_file_ownership,
 		) );
 
-		// if the filesystem is unavailable, false is returned.
+		// If the filesystem is unavailable, false is returned.
 		if ( false === $upgrade_result ) {
 			$upgrade_result = new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) );
 		}
 
-		// Core doesn't output this, so lets append it so we don't get confused
 		if ( 'core' == $type ) {
+			if ( is_wp_error( $upgrade_result ) && ( 'up_to_date' == $upgrade_result->get_error_code() || 'locked' == $upgrade_result->get_error_code() ) ) {
+				// These aren't actual errors, treat it as a skipped-update instead to avoid triggering the post-core update failure routines.
+				return false;
+			}
+
+			// Core doesn't output this, so let's append it so we don't get confused.
 			if ( is_wp_error( $upgrade_result ) ) {
 				$skin->error( __( 'Installation Failed' ), $upgrade_result );
 			} else {
@@ -2034,6 +3045,10 @@ class WP_Automatic_Updater {
 	 * Kicks off the background update process, looping through all pending updates.
 	 *
 	 * @since 3.7.0
+	 * @access public
+	 *
+	 * @global wpdb   $wpdb
+	 * @global string $wp_version
 	 */
 	public function run() {
 		global $wpdb, $wp_version;
@@ -2044,25 +3059,8 @@ class WP_Automatic_Updater {
 		if ( ! is_main_network() || ! is_main_site() )
 			return;
 
-		$lock_name = 'auto_updater.lock';
-
-		// Try to lock
-		$lock_result = $wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO `$wpdb->options` ( `option_name`, `option_value`, `autoload` ) VALUES (%s, %s, 'no') /* LOCK */", $lock_name, time() ) );
-
-		if ( ! $lock_result ) {
-			$lock_result = get_option( $lock_name );
-
-			// If we couldn't create a lock, and there isn't a lock, bail
-			if ( ! $lock_result )
-				return;
-
-			// Check to see if the lock is still valid
-			if ( $lock_result > ( time() - HOUR_IN_SECONDS ) )
-				return;
-		}
-
-		// Update the lock, as by this point we've definately got a lock, just need to fire the actions
-		update_option( $lock_name, time() );
+		if ( ! WP_Upgrader::create_lock( 'auto_updater' ) )
+			return;
 
 		// Don't automatically run these thins, as we'll handle it ourselves
 		remove_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
@@ -2125,9 +3123,7 @@ class WP_Automatic_Updater {
 			}
 
 			// Clear existing caches
-			wp_clean_plugins_cache();
-			wp_clean_themes_cache();
-			delete_site_transient( 'update_core' );
+			wp_clean_update_cache();
 
 			wp_version_check();  // check for Core updates
 			wp_update_themes();  // Check for Theme updates
@@ -2163,14 +3159,18 @@ class WP_Automatic_Updater {
 			do_action( 'automatic_updates_complete', $this->update_results );
 		}
 
-		// Clear the lock
-		delete_option( $lock_name );
+		WP_Upgrader::release_lock( 'auto_updater' );
 	}
 
 	/**
 	 * If we tried to perform a core update, check if we should send an email,
 	 * and if we need to avoid processing future updates.
 	 *
+	 * @since Unknown
+	 * @access protected
+	 *
+	 * @global string $wp_version
+	 *
 	 * @param object $update_result The result of the core update. Includes the update offer and result.
 	 */
 	protected function after_core_update( $update_result ) {
@@ -2229,7 +3229,7 @@ class WP_Automatic_Updater {
 		 * the issue could actually be on WordPress.org's side.) If that one fails, then email.
 		 */
 		$send = true;
-  		$transient_failures = array( 'incompatible_archive', 'download_failed', 'insane_distro' );
+  		$transient_failures = array( 'incompatible_archive', 'download_failed', 'insane_distro', 'locked' );
   		if ( in_array( $error_code, $transient_failures ) && ! get_site_option( 'auto_core_update_failed' ) ) {
   			wp_schedule_single_event( time() + HOUR_IN_SECONDS, 'wp_maybe_auto_update' );
   			$send = false;
@@ -2257,6 +3257,9 @@ class WP_Automatic_Updater {
 	 * Sends an email upon the completion or failure of a background core update.
 	 *
 	 * @since 3.7.0
+	 * @access protected
+	 *
+	 * @global string $wp_version
 	 *
 	 * @param string $type        The type of email to send. Can be one of 'success', 'fail', 'manual', 'critical'.
 	 * @param object $core_update The update offer that was attempted.
@@ -2368,7 +3371,7 @@ class WP_Automatic_Updater {
 		$critical_support = 'critical' === $type && ! empty( $core_update->support_email );
 		if ( $critical_support ) {
 			// Support offer if available.
-			$body .= "\n\n" . sprintf( __( "The WordPress team is willing to help you. Forward this email to %s and theÂ teamÂ will work with you to make sure your site is working." ), $core_update->support_email );
+			$body .= "\n\n" . sprintf( __( "The WordPress team is willing to help you. Forward this email to %s and the team will work with you to make sure your site is working." ), $core_update->support_email );
 		} else {
 			// Add a note about the support forums.
 			$body .= "\n\n" . __( 'If you experience any issues or need support, the volunteers in the WordPress.org support forums may be able to help.' );
@@ -2454,6 +3457,7 @@ class WP_Automatic_Updater {
 	 * Prepares and sends an email of a full log of background update results, useful for debugging and geekery.
 	 *
 	 * @since 3.7.0
+	 * @access protected
 	 */
 	protected function send_debug_email() {
 		$update_count = 0;
@@ -2515,26 +3519,27 @@ class WP_Automatic_Updater {
 
 		$site_title = wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES );
 		if ( $failures ) {
-			$body[] = __( "
-BETA TESTING?
+			$body[] = trim( __(
+"BETA TESTING?
 =============
 
 This debugging email is sent when you are using a development version of WordPress.
 
 If you think these failures might be due to a bug in WordPress, could you report it?
  * Open a thread in the support forums: https://wordpress.org/support/forum/alphabeta
- * Or, if you're comfortable writing a bug report: http://core.trac.wordpress.org/
+ * Or, if you're comfortable writing a bug report: https://core.trac.wordpress.org/
 
-Thanks! -- The WordPress Team" );
+Thanks! -- The WordPress Team" ) );
+			$body[] = '';
 
 			$subject = sprintf( __( '[%s] There were failures during background updates' ), $site_title );
 		} else {
 			$subject = sprintf( __( '[%s] Background updates have finished' ), $site_title );
 		}
 
-		$title = __( 'UPDATE LOG' );
-		$body[] = $title;
-		$body[] = str_repeat( '=', strlen( $title ) );
+		$body[] = trim( __(
+'UPDATE LOG
+==========' ) );
 		$body[] = '';
 
 		foreach ( array( 'core', 'plugin', 'theme', 'translation' ) as $type ) {
diff --git a/wp-admin/includes/class-wp-users-list-table.php b/wp-admin/includes/class-wp-users-list-table.php
index dcce6d5..9e26867 100644
--- a/wp-admin/includes/class-wp-users-list-table.php
+++ b/wp-admin/includes/class-wp-users-list-table.php
@@ -1,12 +1,19 @@
 <?php
 /**
- * Users List Table class.
+ * List Table API: WP_Users_List_Table class
+ *
+ * @package WordPress
+ * @subpackage Administration
+ * @since 3.1.0
+ */
+
+/**
+ * Core class used to implement displaying users in a list table.
  *
  * @since 3.1.0
  * @access private
  *
- * @package WordPress
- * @subpackage List_Table
+ * @see WP_List_Table
  */
 class WP_Users_List_Table extends WP_List_Table {
 
@@ -17,7 +24,7 @@ class WP_Users_List_Table extends WP_List_Table {
 	 * @access public
 	 * @var int
 	 */
-	var $site_id;
+	public $site_id;
 
 	/**
 	 * Whether or not the current Users list table is for Multisite.
@@ -26,22 +33,26 @@ class WP_Users_List_Table extends WP_List_Table {
 	 * @access public
 	 * @var bool
 	 */
-	var $is_site_users;
+	public $is_site_users;
 
 	/**
 	 * Constructor.
 	 *
 	 * @since 3.1.0
 	 * @access public
+	 *
+	 * @see WP_List_Table::__construct() for more information on default arguments.
+	 *
+	 * @param array $args An associative array of arguments.
 	 */
-	function __construct( $args = array() ) {
+	public function __construct( $args = array() ) {
 		parent::__construct( array(
 			'singular' => 'user',
 			'plural'   => 'users',
 			'screen'   => isset( $args['screen'] ) ? $args['screen'] : null,
 		) );
 
-		$this->is_site_users = 'site-users-network' == $this->screen->id;
+		$this->is_site_users = 'site-users-network' === $this->screen->id;
 
 		if ( $this->is_site_users )
 			$this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
@@ -52,8 +63,10 @@ class WP_Users_List_Table extends WP_List_Table {
 	 *
  	 * @since 3.1.0
 	 * @access public
+	 *
+	 * @return bool
 	 */
-	function ajax_user_can() {
+	public function ajax_user_can() {
 		if ( $this->is_site_users )
 			return current_user_can( 'manage_sites' );
 		else
@@ -65,8 +78,11 @@ class WP_Users_List_Table extends WP_List_Table {
 	 *
 	 * @since 3.1.0
 	 * @access public
+	 *
+	 * @global string $role
+	 * @global string $usersearch
 	 */
-	function prepare_items() {
+	public function prepare_items() {
 		global $role, $usersearch;
 
 		$usersearch = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST['s'] ) ) : '';
@@ -78,13 +94,23 @@ class WP_Users_List_Table extends WP_List_Table {
 
 		$paged = $this->get_pagenum();
 
-		$args = array(
-			'number' => $users_per_page,
-			'offset' => ( $paged-1 ) * $users_per_page,
-			'role' => $role,
-			'search' => $usersearch,
-			'fields' => 'all_with_meta'
-		);
+		if ( 'none' === $role ) {
+			$args = array(
+				'number' => $users_per_page,
+				'offset' => ( $paged-1 ) * $users_per_page,
+				'include' => wp_get_users_with_no_role(),
+				'search' => $usersearch,
+				'fields' => 'all_with_meta'
+			);
+		} else {
+			$args = array(
+				'number' => $users_per_page,
+				'offset' => ( $paged-1 ) * $users_per_page,
+				'role' => $role,
+				'search' => $usersearch,
+				'fields' => 'all_with_meta'
+			);
+		}
 
 		if ( '' !== $args['search'] )
 			$args['search'] = '*' . $args['search'] . '*';
@@ -98,6 +124,16 @@ class WP_Users_List_Table extends WP_List_Table {
 		if ( isset( $_REQUEST['order'] ) )
 			$args['order'] = $_REQUEST['order'];
 
+		/**
+		 * Filter the query arguments used to retrieve users for the current users list table.
+		 *
+		 * @since 4.4.0
+		 *
+		 * @param array $args Arguments passed to WP_User_Query to retrieve items for the current
+		 *                    users list table.
+		 */
+		$args = apply_filters( 'users_list_table_query_args', $args );
+
 		// Query the user IDs for this page
 		$wp_user_search = new WP_User_Query( $args );
 
@@ -115,8 +151,8 @@ class WP_Users_List_Table extends WP_List_Table {
 	 * @since 3.1.0
 	 * @access public
 	 */
-	function no_items() {
-		_e( 'No matching users were found.' );
+	public function no_items() {
+		_e( 'No users found.' );
 	}
 
 	/**
@@ -127,12 +163,16 @@ class WP_Users_List_Table extends WP_List_Table {
 	 * filtering of the user table.
 	 *
 	 * @since  3.1.0
-	 * @access public
+	 * @access protected
+	 *
+	 * @global string $role
 	 *
 	 * @return array An array of HTML links, one for each view.
 	 */
-	function get_views() {
-		global $wp_roles, $role;
+	protected function get_views() {
+		global $role;
+
+		$wp_roles = wp_roles();
 
 		if ( $this->is_site_users ) {
 			$url = 'site-users.php?id=' . $this->site_id;
@@ -143,11 +183,11 @@ class WP_Users_List_Table extends WP_List_Table {
 			$url = 'users.php';
 			$users_of_blog = count_users();
 		}
+
 		$total_users = $users_of_blog['total_users'];
 		$avail_roles =& $users_of_blog['avail_roles'];
 		unset($users_of_blog);
 
-		$current_role = false;
 		$class = empty($role) ? ' class="current"' : '';
 		$role_links = array();
 		$role_links['all'] = "<a href='$url'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
@@ -157,8 +197,7 @@ class WP_Users_List_Table extends WP_List_Table {
 
 			$class = '';
 
-			if ( $this_role == $role ) {
-				$current_role = $role;
+			if ( $this_role === $role ) {
 				$class = ' class="current"';
 			}
 
@@ -168,6 +207,21 @@ class WP_Users_List_Table extends WP_List_Table {
 			$role_links[$this_role] = "<a href='" . esc_url( add_query_arg( 'role', $this_role, $url ) ) . "'$class>$name</a>";
 		}
 
+		if ( ! empty( $avail_roles['none' ] ) ) {
+
+			$class = '';
+
+			if ( 'none' === $role ) {
+				$class = ' class="current"';
+			}
+
+			$name = __( 'No role' );
+			/* translators: User role name with count */
+			$name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n( $avail_roles['none' ] ) );
+			$role_links['none'] = "<a href='" . esc_url( add_query_arg( 'role', 'none', $url ) ) . "'$class>$name</a>";
+
+		}
+
 		return $role_links;
 	}
 
@@ -175,11 +229,11 @@ class WP_Users_List_Table extends WP_List_Table {
 	 * Retrieve an associative array of bulk actions available on this table.
 	 *
 	 * @since  3.1.0
-	 * @access public
+	 * @access protected
 	 *
 	 * @return array Array of bulk actions.
 	 */
-	function get_bulk_actions() {
+	protected function get_bulk_actions() {
 		$actions = array();
 
 		if ( is_multisite() ) {
@@ -197,20 +251,19 @@ class WP_Users_List_Table extends WP_List_Table {
 	 * Output the controls to allow user roles to be changed in bulk.
 	 *
 	 * @since 3.1.0
-	 * @access public
+	 * @access protected
 	 *
 	 * @param string $which Whether this is being invoked above ("top")
 	 *                      or below the table ("bottom").
 	 */
-	function extra_tablenav( $which ) {
-		if ( 'top' != $which )
-			return;
+	protected function extra_tablenav( $which ) {
+		$id = 'bottom' === $which ? 'new_role2' : 'new_role';
 	?>
 	<div class="alignleft actions">
-		<?php if ( current_user_can( 'promote_users' ) ) : ?>
-		<label class="screen-reader-text" for="new_role"><?php _e( 'Change role to…' ) ?></label>
-		<select name="new_role" id="new_role">
-			<option value=''><?php _e( 'Change role to…' ) ?></option>
+		<?php if ( current_user_can( 'promote_users' ) && $this->has_items() ) : ?>
+		<label class="screen-reader-text" for="<?php echo $id ?>"><?php _e( 'Change role to…' ) ?></label>
+		<select name="<?php echo $id ?>" id="<?php echo $id ?>">
+			<option value=""><?php _e( 'Change role to…' ) ?></option>
 			<?php wp_dropdown_roles(); ?>
 		</select>
 	<?php
@@ -238,9 +291,11 @@ class WP_Users_List_Table extends WP_List_Table {
 	 *
 	 * @return string The bulk action required.
 	 */
-	function current_action() {
-		if ( isset($_REQUEST['changeit']) && !empty($_REQUEST['new_role']) )
+	public function current_action() {
+		if ( isset( $_REQUEST['changeit'] ) &&
+			( ! empty( $_REQUEST['new_role'] ) || ! empty( $_REQUEST['new_role2'] ) ) ) {
 			return 'promote';
+		}
 
 		return parent::current_action();
 	}
@@ -254,12 +309,12 @@ class WP_Users_List_Table extends WP_List_Table {
 	 * @return array Array in which the key is the ID of the column,
 	 *               and the value is the description.
 	 */
-	function get_columns() {
+	public function get_columns() {
 		$c = array(
 			'cb'       => '<input type="checkbox" />',
 			'username' => __( 'Username' ),
 			'name'     => __( 'Name' ),
-			'email'    => __( 'E-mail' ),
+			'email'    => __( 'Email' ),
 			'role'     => __( 'Role' ),
 			'posts'    => __( 'Posts' )
 		);
@@ -274,20 +329,17 @@ class WP_Users_List_Table extends WP_List_Table {
 	 * Get a list of sortable columns for the list table.
 	 *
 	 * @since 3.1.0
-	 * @access public
+	 * @access protected
 	 *
 	 * @return array Array of sortable columns.
 	 */
-	function get_sortable_columns() {
+	protected function get_sortable_columns() {
 		$c = array(
 			'username' => 'login',
 			'name'     => 'name',
 			'email'    => 'email',
 		);
 
-		if ( $this->is_site_users )
-			unset( $c['posts'] );
-
 		return $c;
 	}
 
@@ -297,28 +349,16 @@ class WP_Users_List_Table extends WP_List_Table {
 	 * @since 3.1.0
 	 * @access public
 	 */
-	function display_rows() {
+	public function display_rows() {
 		// Query the post counts for this page
 		if ( ! $this->is_site_users )
 			$post_counts = count_many_users_posts( array_keys( $this->items ) );
 
-		$editable_roles = array_keys( get_editable_roles() );
-
-		$style = '';
 		foreach ( $this->items as $userid => $user_object ) {
-			if ( count( $user_object->roles ) <= 1 ) {
-				$role = reset( $user_object->roles );
-			} elseif ( $roles = array_intersect( array_values( $user_object->roles ), $editable_roles ) ) {
-				$role = reset( $roles );
-			} else {
-				$role = reset( $user_object->roles );
-			}
-
 			if ( is_multisite() && empty( $user_object->allcaps ) )
 				continue;
 
-			$style = ( ' class="alternate"' == $style ) ? '' : ' class="alternate"';
-			echo "\n\t" . $this->single_row( $user_object, $style, $role, isset( $post_counts ) ? $post_counts[ $userid ] : 0 );
+			echo "\n\t" . $this->single_row( $user_object, '', '', isset( $post_counts ) ? $post_counts[ $userid ] : 0 );
 		}
 	}
 
@@ -326,21 +366,21 @@ class WP_Users_List_Table extends WP_List_Table {
 	 * Generate HTML for a single row on the users.php admin panel.
 	 *
 	 * @since 3.1.0
+	 * @since 4.2.0 The `$style` parameter was deprecated.
+	 * @since 4.4.0 The `$role` parameter was deprecated.
 	 * @access public
 	 *
 	 * @param object $user_object The current user object.
-	 * @param string $style       Optional. Style attributes added to the <tr> element.
-	 *                            Must be sanitized. Default empty.
-	 * @param string $role        Optional. Key for the $wp_roles array. Default empty.
+	 * @param string $style       Deprecated. Not used.
+	 * @param string $role        Deprecated. Not used.
 	 * @param int    $numposts    Optional. Post count to display for this user. Defaults
 	 *                            to zero, as in, a new user has made zero posts.
 	 * @return string Output for a single row.
 	 */
-	function single_row( $user_object, $style = '', $role = '', $numposts = 0 ) {
-		global $wp_roles;
-
-		if ( !( is_object( $user_object ) && is_a( $user_object, 'WP_User' ) ) )
+	public function single_row( $user_object, $style = '', $role = '', $numposts = 0 ) {
+		if ( ! ( $user_object instanceof WP_User ) ) {
 			$user_object = get_userdata( (int) $user_object );
+		}
 		$user_object->filter = 'display';
 		$email = $user_object->user_email;
 
@@ -349,15 +389,16 @@ class WP_Users_List_Table extends WP_List_Table {
 		else
 			$url = 'users.php?';
 
+		$user_roles = $this->get_role_list( $user_object );
+
+		// Set up the hover actions for this user
+		$actions = array();
 		$checkbox = '';
 		// Check if the user for this row is editable
 		if ( current_user_can( 'list_users' ) ) {
 			// Set up the user editing link
 			$edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user_object->ID ) ) );
 
-			// Set up the hover actions for this user
-			$actions = array();
-
 			if ( current_user_can( 'edit_user',  $user_object->ID ) ) {
 				$edit = "<strong><a href=\"$edit_link\">$user_object->user_login</a></strong><br />";
 				$actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
@@ -381,77 +422,139 @@ class WP_Users_List_Table extends WP_List_Table {
 			 * @param WP_User $user_object WP_User object for the currently-listed user.
 			 */
 			$actions = apply_filters( 'user_row_actions', $actions, $user_object );
-			$edit .= $this->row_actions( $actions );
+
+			// Role classes.
+			$role_classes = esc_attr( implode( ' ', array_keys( $user_roles ) ) );
 
 			// Set up the checkbox ( because the user is editable, otherwise it's empty )
-			$checkbox = '<label class="screen-reader-text" for="cb-select-' . $user_object->ID . '">' . sprintf( __( 'Select %s' ), $user_object->user_login ) . '</label>'
-						. "<input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='$role' value='{$user_object->ID}' />";
+			$checkbox = '<label class="screen-reader-text" for="user_' . $user_object->ID . '">' . sprintf( __( 'Select %s' ), $user_object->user_login ) . '</label>'
+						. "<input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='{$role_classes}' value='{$user_object->ID}' />";
 
 		} else {
 			$edit = '<strong>' . $user_object->user_login . '</strong>';
 		}
-		$role_name = isset( $wp_roles->role_names[$role] ) ? translate_user_role( $wp_roles->role_names[$role] ) : __( 'None' );
 		$avatar = get_avatar( $user_object->ID, 32 );
 
-		$r = "<tr id='user-$user_object->ID'$style>";
+		// Comma-separated list of user roles.
+		$roles_list = implode( ', ', $user_roles );
+
+		$r = "<tr id='user-$user_object->ID'>";
 
-		list( $columns, $hidden ) = $this->get_column_info();
+		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
 
 		foreach ( $columns as $column_name => $column_display_name ) {
-			$class = "class=\"$column_name column-$column_name\"";
-
-			$style = '';
-			if ( in_array( $column_name, $hidden ) )
-				$style = ' style="display:none;"';
-
-			$attributes = "$class$style";
-
-			switch ( $column_name ) {
-				case 'cb':
-					$r .= "<th scope='row' class='check-column'>$checkbox</th>";
-					break;
-				case 'username':
-					$r .= "<td $attributes>$avatar $edit</td>";
-					break;
-				case 'name':
-					$r .= "<td $attributes>$user_object->first_name $user_object->last_name</td>";
-					break;
-				case 'email':
-					$r .= "<td $attributes><a href='mailto:$email' title='" . esc_attr( sprintf( __( 'E-mail: %s' ), $email ) ) . "'>$email</a></td>";
-					break;
-				case 'role':
-					$r .= "<td $attributes>$role_name</td>";
-					break;
-				case 'posts':
-					$attributes = 'class="posts column-posts num"' . $style;
-					$r .= "<td $attributes>";
-					if ( $numposts > 0 ) {
-						$r .= "<a href='edit.php?author=$user_object->ID' title='" . esc_attr__( 'View posts by this author' ) . "' class='edit'>";
-						$r .= $numposts;
-						$r .= '</a>';
-					} else {
-						$r .= 0;
-					}
-					$r .= "</td>";
-					break;
-				default:
-					$r .= "<td $attributes>";
-
-					/**
-					 * Filter the display output of custom columns in the Users list table.
-					 *
-					 * @since 2.8.0
-					 *
-					 * @param string $output      Custom column output. Default empty.
-					 * @param string $column_name Column name.
-					 * @param int    $user_id     ID of the currently-listed user.
-					 */
-					$r .= apply_filters( 'manage_users_custom_column', '', $column_name, $user_object->ID );
-					$r .= "</td>";
+			$classes = "$column_name column-$column_name";
+			if ( $primary === $column_name ) {
+				$classes .= ' has-row-actions column-primary';
+			}
+			if ( 'posts' === $column_name ) {
+				$classes .= ' num'; // Special case for that column
+			}
+
+			if ( in_array( $column_name, $hidden ) ) {
+				$classes .= ' hidden';
+			}
+
+			$data = 'data-colname="' . wp_strip_all_tags( $column_display_name ) . '"';
+
+			$attributes = "class='$classes' $data";
+
+			if ( 'cb' === $column_name ) {
+				$r .= "<th scope='row' class='check-column'>$checkbox</th>";
+			} else {
+				$r .= "<td $attributes>";
+				switch ( $column_name ) {
+					case 'username':
+						$r .= "$avatar $edit";
+						break;
+					case 'name':
+						$r .= "$user_object->first_name $user_object->last_name";
+						break;
+					case 'email':
+						$r .= "<a href='" . esc_url( "mailto:$email" ) . "'>$email</a>";
+						break;
+					case 'role':
+						$r .= esc_html( $roles_list );
+						break;
+					case 'posts':
+						if ( $numposts > 0 ) {
+							$r .= "<a href='edit.php?author=$user_object->ID' class='edit'>";
+							$r .= '<span aria-hidden="true">' . $numposts . '</span>';
+							$r .= '<span class="screen-reader-text">' . sprintf( _n( '%s post by this author', '%s posts by this author', $numposts ), number_format_i18n( $numposts ) ) . '</span>';
+							$r .= '</a>';
+						} else {
+							$r .= 0;
+						}
+						break;
+					default:
+						/**
+						 * Filter the display output of custom columns in the Users list table.
+						 *
+						 * @since 2.8.0
+						 *
+						 * @param string $output      Custom column output. Default empty.
+						 * @param string $column_name Column name.
+						 * @param int    $user_id     ID of the currently-listed user.
+						 */
+						$r .= apply_filters( 'manage_users_custom_column', '', $column_name, $user_object->ID );
+				}
+
+				if ( $primary === $column_name ) {
+					$r .= $this->row_actions( $actions );
+				}
+				$r .= "</td>";
 			}
 		}
 		$r .= '</tr>';
 
 		return $r;
 	}
+
+	/**
+	 * Gets the name of the default primary column.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @return string Name of the default primary column, in this case, 'username'.
+	 */
+	protected function get_default_primary_column_name() {
+		return 'username';
+	}
+
+	/**
+	 * Returns an array of user roles for a given user object.
+	 *
+	 * @since 4.4.0
+	 * @access protected
+	 *
+	 * @param WP_User $user_object The WP_User object.
+	 * @return array An array of user roles.
+	 */
+	protected function get_role_list( $user_object ) {
+		$wp_roles = wp_roles();
+
+		$role_list = array();
+
+		foreach ( $user_object->roles as $role ) {
+			if ( isset( $wp_roles->role_names[ $role ] ) ) {
+				$role_list[ $role ] = translate_user_role( $wp_roles->role_names[ $role ] );
+			}
+		}
+
+		if ( empty( $role_list ) ) {
+			$role_list['none'] = _x( 'None', 'no user roles' );
+		}
+
+		/**
+		 * Filter the returned array of roles for a user.
+		 *
+		 * @since 4.4.0
+		 *
+		 * @param array   $role_list   An array of user roles.
+		 * @param WP_User $user_object A WP_User object.
+		 */
+		return apply_filters( 'get_role_list', $role_list, $user_object );
+	}
+
 }
diff --git a/wp-admin/includes/comment.php b/wp-admin/includes/comment.php
index a74eeaa..3037c41 100644
--- a/wp-admin/includes/comment.php
+++ b/wp-admin/includes/comment.php
@@ -4,26 +4,39 @@
  *
  * @package WordPress
  * @subpackage Administration
+ * @since 2.3.0
  */
 
 /**
  * Determine if a comment exists based on author and date.
  *
+ * For best performance, use `$timezone = 'gmt'`, which queries a field that is properly indexed. The default value
+ * for `$timezone` is 'blog' for legacy reasons.
+ *
  * @since 2.0.0
- * @uses $wpdb
+ * @since 4.4.0 Added the `$timezone` parameter.
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @param string $comment_author Author of the comment.
+ * @param string $comment_date   Date of the comment.
+ * @param string $timezone       Timezone. Accepts 'blog' or 'gmt'. Default 'blog'.
  *
- * @param string $comment_author Author of the comment
- * @param string $comment_date Date of the comment
  * @return mixed Comment post ID on success.
  */
-function comment_exists($comment_author, $comment_date) {
+function comment_exists( $comment_author, $comment_date, $timezone = 'blog' ) {
 	global $wpdb;
 
-	$comment_author = stripslashes($comment_author);
-	$comment_date = stripslashes($comment_date);
+	$date_field = 'comment_date';
+	if ( 'gmt' === $timezone ) {
+		$date_field = 'comment_date_gmt';
+	}
 
 	return $wpdb->get_var( $wpdb->prepare("SELECT comment_post_ID FROM $wpdb->comments
-			WHERE comment_author = %s AND comment_date = %s", $comment_author, $comment_date) );
+			WHERE comment_author = %s AND $date_field = %s",
+			stripslashes( $comment_author ),
+			stripslashes( $comment_date )
+	) );
 }
 
 /**
@@ -32,7 +45,6 @@ function comment_exists($comment_author, $comment_date) {
  * @since 2.0.0
  */
 function edit_comment() {
-
 	if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) )
 		wp_die ( __( 'You are not allowed to edit comments on this post.' ) );
 
@@ -74,12 +86,12 @@ function edit_comment() {
 }
 
 /**
- * Returns a comment object based on comment ID.
+ * Returns a WP_Comment object based on comment ID.
  *
  * @since 2.0.0
  *
  * @param int $id ID of comment to retrieve.
- * @return bool|object Comment if found. False on failure.
+ * @return WP_Comment|false Comment if found. False on failure.
  */
 function get_comment_to_edit( $id ) {
 	if ( !$comment = get_comment($id) )
@@ -110,7 +122,8 @@ function get_comment_to_edit( $id ) {
  * Get the number of pending comments on a post or posts
  *
  * @since 2.3.0
- * @uses $wpdb
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int|array $post_id Either a single Post ID or an array of Post IDs
  * @return int|array Either a single Posts pending comments as an int or an array of ints keyed on the Post IDs
@@ -154,18 +167,30 @@ function get_pending_comments_num( $post_id ) {
  * Add avatars to relevant places in admin, or try to.
  *
  * @since 2.5.0
- * @uses $comment
  *
  * @param string $name User name.
  * @return string Avatar with Admin name.
  */
 function floated_admin_avatar( $name ) {
-	global $comment;
-	$avatar = get_avatar( $comment, 32, 'mystery' );
+	$avatar = get_avatar( get_comment(), 32, 'mystery' );
 	return "$avatar $name";
 }
 
+/**
+ * @since 2.7.0
+ */
 function enqueue_comment_hotkeys_js() {
 	if ( 'true' == get_user_option( 'comment_shortcuts' ) )
 		wp_enqueue_script( 'jquery-table-hotkeys' );
 }
+
+/**
+ * Display error message at bottom of comments.
+ *
+ * @param string $msg Error Message. Assumed to contain HTML and be sanitized.
+ */
+function comment_footer_die( $msg ) {
+	echo "<div class='wrap'><p>$msg</p></div>";
+	include( ABSPATH . 'wp-admin/admin-footer.php' );
+	die;
+}
\ No newline at end of file
diff --git a/wp-admin/includes/continents-cities.php b/wp-admin/includes/continents-cities.php
index 0ebc4f3..02ebbe7 100644
--- a/wp-admin/includes/continents-cities.php
+++ b/wp-admin/includes/continents-cities.php
@@ -1,7 +1,12 @@
 <?php
-
-/* Continent and city translations for timezone selection.
+/**
+ * Translation API: Continent and city translations for timezone selection
+ *
  * This file is not included anywhere. It exists solely for use by xgettext.
+ *
+ * @package WordPress
+ * @subpackage i18n
+ * @since 2.8.0
  */
 
 __('Africa', 'continents-cities');
diff --git a/wp-admin/includes/credits.php b/wp-admin/includes/credits.php
new file mode 100644
index 0000000..80f1269
--- /dev/null
+++ b/wp-admin/includes/credits.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * WordPress Credits Administration API.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ * @since 4.4.0
+ */
+
+/**
+ * Retrieve the contributor credits.
+ *
+ * @global string $wp_version The current WordPress version.
+ *
+ * @since 3.2.0
+ *
+ * @return array|false A list of all of the contributors, or false on error.
+ */
+function wp_credits() {
+	global $wp_version;
+	$locale = get_locale();
+
+	$results = get_site_transient( 'wordpress_credits_' . $locale );
+
+	if ( ! is_array( $results )
+		|| false !== strpos( $wp_version, '-' )
+		|| ( isset( $results['data']['version'] ) && strpos( $wp_version, $results['data']['version'] ) !== 0 )
+	) {
+		$response = wp_remote_get( "http://api.wordpress.org/core/credits/1.1/?version=$wp_version&locale=$locale" );
+
+		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
+			return false;
+
+		$results = json_decode( wp_remote_retrieve_body( $response ), true );
+
+		if ( ! is_array( $results ) )
+			return false;
+
+		set_site_transient( 'wordpress_credits_' . $locale, $results, DAY_IN_SECONDS );
+	}
+
+	return $results;
+}
+
+/**
+ * Retrieve the link to a contributor's WordPress.org profile page.
+ *
+ * @access private
+ * @since 3.2.0
+ *
+ * @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.
+ */
+function _wp_credits_add_profile_link( &$display_name, $username, $profiles ) {
+	$display_name = '<a href="' . esc_url( sprintf( $profiles, $username ) ) . '">' . esc_html( $display_name ) . '</a>';
+}
+
+/**
+ * Retrieve the link to an external library used in WordPress.
+ *
+ * @access private
+ * @since 3.2.0
+ *
+ * @param string $data External library data, passed by reference.
+ */
+function _wp_credits_build_object_link( &$data ) {
+	$data = '<a href="' . esc_url( $data[1] ) . '">' . esc_html( $data[0] ) . '</a>';
+}
diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php
index fb50197..5a23485 100644
--- a/wp-admin/includes/dashboard.php
+++ b/wp-admin/includes/dashboard.php
@@ -12,17 +12,16 @@
  * Handles POST data, sets up filters.
  *
  * @since 2.5.0
+ *
+ * @global array $wp_registered_widgets
+ * @global array $wp_registered_widget_controls
+ * @global array $wp_dashboard_control_callbacks
  */
 function wp_dashboard_setup() {
 	global $wp_registered_widgets, $wp_registered_widget_controls, $wp_dashboard_control_callbacks;
 	$wp_dashboard_control_callbacks = array();
 	$screen = get_current_screen();
 
-	$update = false;
-	$widget_options = get_option( 'dashboard_widget_options' );
-	if ( !$widget_options || !is_array($widget_options) )
-		$widget_options = array();
-
 	/* Register Widgets and Controls */
 
 	$response = wp_check_browser_version();
@@ -48,7 +47,7 @@ function wp_dashboard_setup() {
 	}
 
 	// QuickPress Widget
-	if ( is_blog_admin() && current_user_can( 'edit_posts' ) ) {
+	if ( is_blog_admin() && current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
 		$quick_draft_title = sprintf( '<span class="hide-if-no-js">%1$s</span> <span class="hide-if-js">%2$s</span>', __( 'Quick Draft' ), __( 'Drafts' ) );
 		wp_add_dashboard_widget( 'dashboard_quick_press', $quick_draft_title, 'wp_dashboard_quick_press' );
 	}
@@ -123,9 +122,6 @@ function wp_dashboard_setup() {
 		exit;
 	}
 
-	if ( $update )
-		update_option( 'dashboard_widget_options', $widget_options );
-
 	/** This action is documented in wp-admin/edit-form-advanced.php */
 	do_action( 'do_meta_boxes', $screen->id, 'normal', '' );
 
@@ -133,6 +129,21 @@ function wp_dashboard_setup() {
 	do_action( 'do_meta_boxes', $screen->id, 'side', '' );
 }
 
+/**
+ * Adds a new dashboard widget.
+ *
+ * @since 2.7.0
+ *
+ * @global array $wp_dashboard_control_callbacks
+ *
+ * @param string   $widget_id        Widget ID  (used in the 'id' attribute for the widget).
+ * @param string   $widget_name      Title of the widget.
+ * @param callable $callback         Function that fills the widget with the desired content.
+ *                                   The function should echo its output.
+ * @param callable $control_callback Optional. Function that outputs controls for the widget. Default null.
+ * @param array    $callback_args    Optional. Data that should be set as the $args property of the widget array
+ *                                   (which is the second parameter passed to your callback). Default null.
+ */
 function wp_add_dashboard_widget( $widget_id, $widget_name, $callback, $control_callback = null, $callback_args = null ) {
 	$screen = get_current_screen();
 	global $wp_dashboard_control_callbacks;
@@ -162,8 +173,17 @@ function wp_add_dashboard_widget( $widget_id, $widget_name, $callback, $control_
 	add_meta_box( $widget_id, $widget_name, $callback, $screen, $location, $priority, $callback_args );
 }
 
+/**
+ * Outputs controls for the current dashboard widget.
+ *
+ * @access private
+ * @since 2.7.0
+ *
+ * @param mixed $dashboard
+ * @param array $meta_box
+ */
 function _wp_dashboard_control_callback( $dashboard, $meta_box ) {
-	echo '<form action="" method="post" class="dashboard-widget-control-form">';
+	echo '<form method="post" class="dashboard-widget-control-form">';
 	wp_dashboard_trigger_widget_control( $meta_box['id'] );
 	wp_nonce_field( 'edit-dashboard-widget_' . $meta_box['id'], 'dashboard-widget-nonce' );
 	echo '<input type="hidden" name="widget_id" value="' . esc_attr($meta_box['id']) . '" />';
@@ -186,16 +206,16 @@ function wp_dashboard() {
 
 ?>
 <div id="dashboard-widgets" class="metabox-holder<?php echo $columns_css; ?>">
-	<div id='postbox-container-1' class='postbox-container'>
+	<div id="postbox-container-1" class="postbox-container">
 	<?php do_meta_boxes( $screen->id, 'normal', '' ); ?>
 	</div>
-	<div id='postbox-container-2' class='postbox-container'>
+	<div id="postbox-container-2" class="postbox-container">
 	<?php do_meta_boxes( $screen->id, 'side', '' ); ?>
 	</div>
-	<div id='postbox-container-3' class='postbox-container'>
+	<div id="postbox-container-3" class="postbox-container">
 	<?php do_meta_boxes( $screen->id, 'column3', '' ); ?>
 	</div>
-	<div id='postbox-container-4' class='postbox-container'>
+	<div id="postbox-container-4" class="postbox-container">
 	<?php do_meta_boxes( $screen->id, 'column4', '' ); ?>
 	</div>
 </div>
@@ -218,11 +238,6 @@ function wp_dashboard() {
  * @since 2.7.0
  */
 function wp_dashboard_right_now() {
-	$theme = wp_get_theme();
-	if ( current_user_can( 'switch_themes' ) )
-		$theme_name = sprintf( '<a href="themes.php">%1$s</a>', $theme->display('Name') );
-	else
-		$theme_name = $theme->display('Name');
 ?>
 	<div class="main">
 	<ul>
@@ -248,18 +263,23 @@ function wp_dashboard_right_now() {
 	}
 	// Comments
 	$num_comm = wp_count_comments();
-	if ( $num_comm && $num_comm->total_comments ) {
-		$text = sprintf( _n( '%s Comment', '%s Comments', $num_comm->total_comments ), number_format_i18n( $num_comm->total_comments ) );
+	if ( $num_comm && $num_comm->approved ) {
+		$text = sprintf( _n( '%s Comment', '%s Comments', $num_comm->approved ), number_format_i18n( $num_comm->approved ) );
 		?>
 		<li class="comment-count"><a href="edit-comments.php"><?php echo $text; ?></a></li>
 		<?php
-		if ( $num_comm->moderated ) {
-			/* translators: Number of comments in moderation */
-			$text = sprintf( _nx( '%s in moderation', '%s in moderation', $num_comm->moderated, 'comments' ), number_format_i18n( $num_comm->moderated ) );
-			?>
-			<li class="comment-mod-count"><a href="edit-comments.php?comment_status=moderated"><?php echo $text; ?></a></li>
-			<?php
-		}
+		$moderated_comments_count_i18n = number_format_i18n( $num_comm->moderated );
+		/* translators: Number of comments in moderation */
+		$text = sprintf( _nx( '%s in moderation', '%s in moderation', $num_comm->moderated, 'comments' ), $moderated_comments_count_i18n );
+		/* translators: Number of comments in moderation */
+		$aria_label = sprintf( _nx( '%s comment in moderation', '%s comments in moderation', $num_comm->moderated, 'comments' ), $moderated_comments_count_i18n );
+		?>
+		<li class="comment-mod-count<?php
+			if ( ! $num_comm->moderated ) {
+				echo ' hidden';
+			}
+		?>"><a href="edit-comments.php?comment_status=moderated" aria-label="<?php esc_attr_e( $aria_label ); ?>"><?php echo $text; ?></a></li>
+		<?php
 	}
 
 	/**
@@ -285,7 +305,7 @@ function wp_dashboard_right_now() {
 	update_right_now_message();
 
 	// Check if search engines are asked not to index this site.
-	if ( ! is_network_admin() && ! is_user_admin() && current_user_can( 'manage_options' ) && '1' != get_option( 'blog_public' ) ) {
+	if ( ! is_network_admin() && ! is_user_admin() && current_user_can( 'manage_options' ) && '0' == get_option( 'blog_public' ) ) {
 
 		/**
 		 * Filter the link title attribute for the 'Search Engines Discouraged'
@@ -294,10 +314,11 @@ function wp_dashboard_right_now() {
 		 * Prior to 3.8.0, the widget was named 'Right Now'.
 		 *
 		 * @since 3.0.0
+		 * @since 4.5.0 The default for `$title` was updated to an empty string.
 		 *
 		 * @param string $title Default attribute text.
 		 */
-		$title = apply_filters( 'privacy_on_link_title', __( 'Your site is asking search engines not to index its content' ) );
+		$title = apply_filters( 'privacy_on_link_title', '' );
 
 		/**
 		 * Filter the link label for the 'Search Engines Discouraged' message
@@ -310,8 +331,9 @@ function wp_dashboard_right_now() {
 		 * @param string $content Default text.
 		 */
 		$content = apply_filters( 'privacy_on_link_text' , __( 'Search Engines Discouraged' ) );
+		$title_attr = '' === $title ? '' : " title='$title'";
 
-		echo "<p><a href='options-reading.php' title='$title'>$content</a></p>";
+		echo "<p><a href='options-reading.php'$title_attr>$content</a></p>";
 	}
 	?>
 	</div>
@@ -349,6 +371,9 @@ function wp_dashboard_right_now() {
 	<?php endif;
 }
 
+/**
+ * @since 3.1.0
+ */
 function wp_network_dashboard_right_now() {
 	$actions = array();
 	if ( current_user_can('create_sites') )
@@ -392,15 +417,17 @@ function wp_network_dashboard_right_now() {
 
 	<form action="<?php echo network_admin_url('users.php'); ?>" method="get">
 		<p>
-			<input type="search" name="s" value="" size="30" autocomplete="off" />
-			<?php submit_button( __( 'Search Users' ), 'button', 'submit', false, array( 'id' => 'submit_users' ) ); ?>
+			<label class="screen-reader-text" for="search-users"><?php _e( 'Search Users' ); ?></label>
+			<input type="search" name="s" value="" size="30" autocomplete="off" id="search-users"/>
+			<?php submit_button( __( 'Search Users' ), 'button', false, false, array( 'id' => 'submit_users' ) ); ?>
 		</p>
 	</form>
 
 	<form action="<?php echo network_admin_url('sites.php'); ?>" method="get">
 		<p>
-			<input type="search" name="s" value="" size="30" autocomplete="off" />
-			<?php submit_button( __( 'Search Sites' ), 'button', 'submit', false, array( 'id' => 'submit_sites' ) ); ?>
+			<label class="screen-reader-text" for="search-sites"><?php _e( 'Search Sites' ); ?></label>
+			<input type="search" name="s" value="" size="30" autocomplete="off" id="search-sites"/>
+			<?php submit_button( __( 'Search Sites' ), 'button', false, false, array( 'id' => 'submit_sites' ) ); ?>
 		</p>
 	</form>
 <?php
@@ -424,11 +451,17 @@ function wp_network_dashboard_right_now() {
  *
  * @since 3.8.0
  *
+ * @global int $post_ID
+ *
  * @param string $error_msg Optional. Error message. Default false.
  */
 function wp_dashboard_quick_press( $error_msg = false ) {
 	global $post_ID;
 
+	if ( ! current_user_can( 'edit_posts' ) ) {
+		return;
+	}
+
 	/* Check if a new auto-draft (= no new post_ID) is needed or if the old can be used */
 	$last_post_id = (int) get_user_option( 'dashboard_quick_press_last_post_id' ); // Get the last post_ID
 	if ( $last_post_id ) {
@@ -469,7 +502,7 @@ function wp_dashboard_quick_press( $error_msg = false ) {
 
 		<div class="textarea-wrap" id="description-wrap">
 			<label class="screen-reader-text prompt" for="content" id="content-prompt-text"><?php _e( 'What’s on your mind?' ); ?></label>
-			<textarea name="content" id="content" class="mceEditor" rows="3" cols="15">

@@ -490,6 +523,8 @@ function wp_dashboard_quick_press( $error_msg = false ) { * Show recent drafts of the user on the dashboard. * * @since 2.7.0 + * + * @param array $drafts */ function wp_dashboard_recent_drafts( $drafts = false ) { if ( ! $drafts ) { @@ -501,6 +536,16 @@ function wp_dashboard_recent_drafts( $drafts = false ) { 'orderby' => 'modified', 'order' => 'DESC' ); + + /** + * Filter the post query arguments for the 'Recent Drafts' dashboard widget. + * + * @since 4.4.0 + * + * @param array $query_args The query arguments for the 'Recent Drafts' dashboard widget. + */ + $query_args = apply_filters( 'dashboard_recent_drafts_query_args', $query_args ); + $drafts = get_posts( $query_args ); if ( ! $drafts ) { return; @@ -509,17 +554,18 @@ function wp_dashboard_recent_drafts( $drafts = false ) { echo '

'; if ( count( $drafts ) > 3 ) { - echo '

' . _x( 'View all', 'drafts' ) . "

\n"; + echo '

' . _x( 'View all', 'drafts' ) . "

\n"; } - echo '

' . __( 'Drafts' ) . "

\n"; - echo '
' . esc_html( $title ) . ''; - echo '' . get_the_time( get_option( 'date_format' ), $draft ) . '
'; + /* translators: %s: post title */ + echo '
' . esc_html( $title ) . ''; + echo '' . get_the_time( __( 'F j, Y' ), $draft ) . '
'; if ( $the_content = wp_trim_words( $draft->post_content, 10 ) ) { echo '
' . $the_content . '
'; } @@ -528,29 +574,39 @@ function wp_dashboard_recent_drafts( $drafts = false ) { echo "

"; } +/** + * Outputs a row for the Recent Comments widget. + * + * @access private + * @since 2.7.0 + * + * @global WP_Comment $comment + * + * @param WP_Comment $comment The current comment. + * @param bool $show_date Optional. Whether to display the date. + */ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { - $GLOBALS['comment'] =& $comment; + $GLOBALS['comment'] = clone $comment; - $comment_post_title = strip_tags(get_the_title( $comment->comment_post_ID )); + if ( $comment->comment_post_ID > 0 ) { - if ( current_user_can( 'edit_post', $comment->comment_post_ID ) ) { - $comment_post_url = get_edit_post_link( $comment->comment_post_ID ); + $comment_post_title = _draft_or_post_title( $comment->comment_post_ID ); + $comment_post_url = get_the_permalink( $comment->comment_post_ID ); $comment_post_link = "$comment_post_title"; } else { - $comment_post_link = $comment_post_title; + $comment_post_link = ''; } - $comment_link = '#'; - $actions_string = ''; if ( current_user_can( 'edit_comment', $comment->comment_ID ) ) { - // preorder it: Approve | Reply | Edit | Spam | Trash + // Pre-order it: Approve | Reply | Edit | Spam | Trash. $actions = array( 'approve' => '', 'unapprove' => '', 'reply' => '', 'edit' => '', 'spam' => '', - 'trash' => '', 'delete' => '' + 'trash' => '', 'delete' => '', + 'view' => '', ); $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) ); @@ -562,15 +618,21 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { $trash_url = esc_url( "comment.php?action=trashcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" ); $delete_url = esc_url( "comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" ); - $actions['approve'] = "" . __( 'Approve' ) . ''; - $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; - $actions['edit'] = "". __('Edit') . ''; - $actions['reply'] = '' . __('Reply') . ''; - $actions['spam'] = "" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . ''; - if ( !EMPTY_TRASH_DAYS ) - $actions['delete'] = "" . __('Delete Permanently') . ''; - else - $actions['trash'] = "" . _x('Trash', 'verb') . ''; + $actions['approve'] = "" . __( 'Approve' ) . ''; + $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; + $actions['edit'] = "". __( 'Edit' ) . ''; + $actions['reply'] = '' . __( 'Reply' ) . ''; + $actions['spam'] = "" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . ''; + + if ( ! EMPTY_TRASH_DAYS ) { + $actions['delete'] = "" . __( 'Delete Permanently' ) . ''; + } else { + $actions['trash'] = "" . _x( 'Trash', 'verb' ) . ''; + } + + if ( '1' === $comment->comment_approved ) { + $actions['view'] = '' . __( 'View' ) . ''; + } /** * Filter the action links displayed for each comment in the 'Recent Comments' @@ -578,10 +640,10 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { * * @since 2.6.0 * - * @param array $actions An array of comment actions. Default actions include: - * 'Approve', 'Unapprove', 'Edit', 'Reply', 'Spam', - * 'Delete', and 'Trash'. - * @param object $comment The comment object. + * @param array $actions An array of comment actions. Default actions include: + * 'Approve', 'Unapprove', 'Edit', 'Reply', 'Spam', + * 'Delete', and 'Trash'. + * @param WP_Comment $comment The comment object. */ $actions = apply_filters( 'comment_row_actions', array_filter($actions), $comment ); @@ -597,46 +659,84 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { $actions_string .= "$sep$link"; } } - ?> -

comment_ID) ) ); ?>> +

> comment_type || 'comment' == $comment->comment_type ) : ?> -

- ' . get_comment_author_link() . '', $comment_post_link.' '.$comment_link, ' ' . __( '[Pending]' ) . '' ); ?> -

+ ' . get_comment_author_link( $comment ) . '', + $comment_post_link, + '' . __( '[Pending]' ) . '' + ); + } else { + printf( + /* translators: 1: comment author, 2: notification if the comment is pending */ + __( 'From %1$s %2$s' ), + '' . get_comment_author_link( $comment ) . '', + '' . __( '[Pending]' ) . '' + ); + } + ?> +

comment_type ) : - case 'pingback' : - $type = __( 'Pingback' ); - break; - case 'trackback' : - $type = __( 'Trackback' ); - break; - default : - $type = ucwords( $comment->comment_type ); - endswitch; + switch ( $comment->comment_type ) { + case 'pingback' : + $type = __( 'Pingback' ); + break; + case 'trackback' : + $type = __( 'Trackback' ); + break; + default : + $type = ucwords( $comment->comment_type ); + } $type = esc_html( $type ); ?> -

- -

$type", $comment_post_link." ".$comment_link ); ?>

+ $type", + $comment_post_link, + '' . __( '[Pending]' ) . '' + ); + } else { + printf( + /* translators: 1: type of comment, 2: notification if the comment is pending */ + _x( '%1$s %2$s', 'dashboard' ), + "$type", + '' . __( '[Pending]' ) . '' + ); + } + ?> +

false, 'perm' => ( 'future' === $args['status'] ) ? 'editable' : 'readable', ); + + /** + * Filter the query arguments used for the Recent Posts widget. + * + * @since 4.2.0 + * + * @param array $query_args The arguments passed to WP_Query to produce the list of posts. + */ + $query_args = apply_filters( 'dashboard_recent_posts_query_args', $query_args ); $posts = new WP_Query( $query_args ); if ( $posts->have_posts() ) { echo '

'; - echo '

' . $args['title'] . '

'; + echo '

' . $args['title'] . '

'; echo '

%1$s, %2$s

%4$s

$format

%1$s, %2$s

$format
%1$s %4$s

'; @@ -761,11 +876,8 @@ function wp_dashboard_recent_posts( $args ) { * @return bool False if no comments were found. True otherwise. */ function wp_dashboard_recent_comments( $total_items = 5 ) { - global $wpdb; - // Select all comment types and filter out spam later for better query performance. $comments = array(); - $start = 0; $comments_query = array( 'number' => $total_items * 5, @@ -775,6 +887,9 @@ function wp_dashboard_recent_comments( $total_items = 5 ) { $comments_query['status'] = 'approve'; while ( count( $comments ) < $total_items && $possible = get_comments( $comments_query ) ) { + if ( ! is_array( $possible ) ) { + break; + } foreach ( $possible as $comment ) { if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) ) continue; @@ -786,19 +901,19 @@ function wp_dashboard_recent_comments( $total_items = 5 ) { $comments_query['number'] = $total_items * 10; } - - if ( $comments ) { echo '

'; - echo '

' . __( 'Comments' ) . '

'; + echo '

' . __( 'Recent Comments' ) . '

'; - echo '

'; + echo '

'; foreach ( $comments as $comment ) _wp_dashboard_recent_comments_row( $comment ); - echo '

'; + echo ''; - if ( current_user_can('edit_posts') ) - _get_list_table('WP_Comments_List_Table')->views(); + if ( current_user_can( 'edit_posts' ) ) { + echo ''; + _get_list_table( 'WP_Comments_List_Table' )->views(); + } wp_comment_reply( -1, false, 'dashboard', false ); wp_comment_trashnotice(); @@ -835,7 +950,7 @@ function wp_dashboard_rss_output( $widget_id ) { * @since 2.5.0 * * @param string $widget_id - * @param callback $callback + * @param callable $callback * @param array $check_urls RSS feeds * @return bool False on failure. True on success. */ @@ -852,7 +967,8 @@ function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = ar $check_urls = array( $widgets[$widget_id]['url'] ); } - $cache_key = 'dash_' . md5( $widget_id ); + $locale = get_locale(); + $cache_key = 'dash_' . md5( $widget_id . '_' . $locale ); if ( false !== ( $output = get_transient( $cache_key ) ) ) { echo $output; return true; @@ -864,8 +980,8 @@ function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = ar } if ( $callback && is_callable( $callback ) ) { - $args = array_slice( func_get_args(), 2 ); - array_unshift( $args, $widget_id ); + $args = array_slice( func_get_args(), 3 ); + array_unshift( $args, $widget_id, $check_urls ); ob_start(); call_user_func_array( $callback, $args ); set_transient( $cache_key, ob_get_flush(), 12 * HOUR_IN_SECONDS ); // Default lifetime in cache of 12 hours (same as the feeds) @@ -874,14 +990,17 @@ function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = ar return true; } -/* Dashboard Widgets Controls */ +// +// Dashboard Widgets Controls +// -// Calls widget_control callback /** * Calls widget control callback. * * @since 2.5.0 * + * @global array $wp_dashboard_control_callbacks + * * @param int $widget_control_id Registered Widget ID. */ function wp_dashboard_trigger_widget_control( $widget_control_id = false ) { @@ -917,7 +1036,8 @@ function wp_dashboard_rss_control( $widget_id, $form_inputs = array() ) { $_POST['widget-rss'][$number] = wp_unslash( $_POST['widget-rss'][$number] ); $widget_options[$widget_id] = wp_widget_rss_process( $_POST['widget-rss'][$number] ); $widget_options[$widget_id]['number'] = $number; - // title is optional. If black, fill it if possible + + // Title is optional. If black, fill it if possible. if ( !$widget_options[$widget_id]['title'] && isset($_POST['widget-rss'][$number]['title']) ) { $rss = fetch_feed($widget_options[$widget_id]['url']); if ( is_wp_error($rss) ) { @@ -952,7 +1072,7 @@ function wp_dashboard_primary() { * * @param string $link The widget's primary link URL. */ - 'link' => apply_filters( 'dashboard_primary_link', __( 'http://wordpress.org/news/' ) ), + 'link' => apply_filters( 'dashboard_primary_link', __( 'https://wordpress.org/news/' ) ), /** * Filter the primary feed URL for the 'WordPress News' dashboard widget. @@ -985,7 +1105,7 @@ function wp_dashboard_primary() { * * @param string $link The widget's secondary link URL. */ - 'link' => apply_filters( 'dashboard_secondary_link', __( 'http://planet.wordpress.org/' ) ), + 'link' => apply_filters( 'dashboard_secondary_link', __( 'https://planet.wordpress.org/' ) ), /** * Filter the secondary feed URL for the 'WordPress News' dashboard widget. @@ -994,7 +1114,7 @@ function wp_dashboard_primary() { * * @param string $url The widget's secondary feed URL. */ - 'url' => apply_filters( 'dashboard_secondary_feed', __( 'http://planet.wordpress.org/feed/' ) ), + 'url' => apply_filters( 'dashboard_secondary_feed', __( 'https://planet.wordpress.org/feed/' ) ), /** * Filter the secondary link title for the 'WordPress News' dashboard widget. @@ -1004,7 +1124,15 @@ function wp_dashboard_primary() { * @param string $title Title attribute for the widget's secondary link. */ 'title' => apply_filters( 'dashboard_secondary_title', __( 'Other WordPress News' ) ), - 'items' => 3, + + /** + * Filter the number of secondary link items for the 'WordPress News' dashboard widget. + * + * @since 4.4.0 + * + * @param string $items How many items to show in the secondary feed. + */ + 'items' => apply_filters( 'dashboard_secondary_items', 3 ), 'show_summary' => 0, 'show_author' => 0, 'show_date' => 0, @@ -1037,7 +1165,7 @@ function wp_dashboard_primary() { * @param array $feeds Array of RSS feeds. */ function wp_dashboard_primary_output( $widget_id, $feeds ) { - foreach( $feeds as $type => $args ) { + foreach ( $feeds as $type => $args ) { $args['type'] = $type; echo '

'; if ( $type === 'plugins' ) { @@ -1053,6 +1181,9 @@ function wp_dashboard_primary_output( $widget_id, $feeds ) { * Display plugins text for the WordPress news widget. * * @since 2.5.0 + * + * @param string $rss The RSS feed URL. + * @param array $args Array of arguments for this RSS feed. */ function wp_dashboard_plugins_output( $rss, $args = array() ) { // Plugin feeds plus link to install them @@ -1065,13 +1196,11 @@ function wp_dashboard_plugins_output( $rss, $args = array() ) { echo '

' . __( 'Popular Plugin' ) . ': ' . esc_html( $raw_title ) . + ' (' . __( 'Install' ) . ')
$label: $title (" . __( 'Install' ) . ")

'; @@ -1134,8 +1263,8 @@ function wp_dashboard_plugins_output( $rss, $args = array() ) { * * @since 3.0.0 * - * @return bool True if not multisite, user can't upload files, or the space check option is disabled. -*/ + * @return bool|null True if not multisite, user can't upload files, or the space check option is disabled. + */ function wp_dashboard_quota() { if ( !is_multisite() || !current_user_can( 'upload_files' ) || get_site_option( 'upload_space_check_disabled' ) ) return true; @@ -1152,7 +1281,7 @@ function wp_dashboard_quota() { $percentused = number_format( $percentused ); ?> -

@@ -1162,10 +1291,10 @@ function wp_dashboard_quota() { number_format_i18n( $quota ) ); printf( - '%3$s', + '%2$s (%3$s)', esc_url( admin_url( 'upload.php' ) ), - __( 'Manage Uploads' ), - $text + $text, + __( 'Manage Uploads' ) ); ?>
%3$s', + '%2$s (%3$s)', esc_url( admin_url( 'upload.php' ) ), - __( 'Manage Uploads' ), - $text + $text, + __( 'Manage Uploads' ) ); ?>

%s. Using an outdated browser makes your computer unsafe. For the best WordPress experience, please update your browser." ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ) ); + /* translators: %s: browser name and link */ + $msg = sprintf( __( "It looks like you're using an insecure version of %s. Using an outdated browser makes your computer unsafe. For the best WordPress experience, please update your browser." ), + sprintf( '%s', esc_url( $response['update_url'] ), esc_html( $response['name'] ) ) + ); } else { - $msg = sprintf( __( "It looks like you're using an old version of %s. For the best WordPress experience, please update your browser." ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ) ); + /* translators: %s: browser name and link */ + $msg = sprintf( __( "It looks like you're using an old version of %s. For the best WordPress experience, please update your browser." ), + sprintf( '%s', esc_url( $response['update_url'] ), esc_html( $response['name'] ) ) + ); } $browser_nag_class = ''; @@ -1214,7 +1348,7 @@ function wp_dashboard_browser_nag() { $browsehappy = add_query_arg( 'locale', $locale, $browsehappy ); $notice .= '

' . sprintf( __( 'Update %2$s or learn how to browse happy' ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ), esc_url( $browsehappy ) ) . '

'; - $notice .= '

' . __( 'Dismiss' ) . '

'; + $notice .= '

' . __( 'Dismiss' ) . '

'; $notice .= '

'; } @@ -1229,6 +1363,12 @@ function wp_dashboard_browser_nag() { echo apply_filters( 'browse-happy-notice', $notice, $response ); } +/** + * @since 3.2.0 + * + * @param array $classes + * @return array + */ function dashboard_browser_nag_class( $classes ) { $response = wp_check_browser_version(); @@ -1243,6 +1383,8 @@ function dashboard_browser_nag_class( $classes ) { * * @since 3.2.0 * + * @global string $wp_version + * * @return array|bool False on failure, array of browser data on success. */ function wp_check_browser_version() { @@ -1267,8 +1409,8 @@ function wp_check_browser_version() { /** * Response should be an array with: * 'name' - string - A user friendly browser name - * 'version' - string - The most recent version of the browser - * 'current_version' - string - The version of the browser the user is using + * 'version' - string - The version of the browser the user is using + * 'current_version' - string - The most recent version of the browser * 'upgrade' - boolean - Whether the browser needs an upgrade * 'insecure' - boolean - Whether the browser is deemed insecure * 'upgrade_url' - string - The url to visit to upgrade @@ -1299,19 +1441,21 @@ function wp_dashboard_empty() {} function wp_welcome_panel() { ?>

- + +

+ + true ) ) ) > 1 ) ) : ?>

change your theme completely' ), admin_url( 'themes.php' ) ); ?>

' . __( 'Edit your front page' ) . '', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?>

' . __( 'Turn comments on or off' ) . '', admin_url( 'options-discussion.php' ) ); ?>
' . __( 'Learn more about getting started' ) . '', __( 'http://codex.wordpress.org/First_Steps_With_WordPress' ) ); ?>
' . __( 'Learn more about getting started' ) . '', __( 'https://codex.wordpress.org/First_Steps_With_WordPress' ) ); ?>

diff --git a/wp-admin/includes/deprecated.php b/wp-admin/includes/deprecated.php index 36b4ca2..1c245b3 100644 --- a/wp-admin/includes/deprecated.php +++ b/wp-admin/includes/deprecated.php @@ -14,8 +14,7 @@ /** * @since 2.1.0 - * @deprecated 2.1.0 - * @deprecated Use wp_editor(). + * @deprecated 2.1.0 Use wp_editor() * @see wp_editor() */ function tinymce_include() { @@ -33,15 +32,13 @@ function tinymce_include() { */ function documentation_link() { _deprecated_function( __FUNCTION__, '2.5' ); - return; } /** * Calculates the new dimensions for a downsampled image. * * @since 2.0.0 - * @deprecated 3.0.0 - * @deprecated Use wp_constrain_dimensions() + * @deprecated 3.0.0 Use wp_constrain_dimensions() * @see wp_constrain_dimensions() * * @param int $width Current width of the image @@ -59,8 +56,7 @@ function wp_shrink_dimensions( $width, $height, $wmax = 128, $hmax = 96 ) { * Calculated the new dimensions for a downsampled image. * * @since 2.0.0 - * @deprecated 3.5.0 - * @deprecated Use wp_constrain_dimensions() + * @deprecated 3.5.0 Use wp_constrain_dimensions() * @see wp_constrain_dimensions() * * @param int $width Current width of the image @@ -73,16 +69,15 @@ function get_udims( $width, $height ) { } /** - * {@internal Missing Short Description}} + * Legacy function used to generate the categories checklist control. * * @since 0.71 - * @deprecated 2.6.0 - * @deprecated Use wp_category_checklist() + * @deprecated 2.6.0 Use wp_category_checklist() * @see wp_category_checklist() * - * @param unknown_type $default - * @param unknown_type $parent - * @param unknown_type $popular_ids + * @param int $default Unused. + * @param int $parent Unused. + * @param array $popular_ids Unused. */ function dropdown_categories( $default = 0, $parent = 0, $popular_ids = array() ) { _deprecated_function( __FUNCTION__, '2.6', 'wp_category_checklist()' ); @@ -91,14 +86,13 @@ function dropdown_categories( $default = 0, $parent = 0, $popular_ids = array() } /** - * {@internal Missing Short Description}} + * Legacy function used to generate a link categories checklist control. * * @since 2.1.0 - * @deprecated 2.6.0 - * @deprecated Use wp_link_category_checklist() + * @deprecated 2.6.0 Use wp_link_category_checklist() * @see wp_link_category_checklist() * - * @param unknown_type $default + * @param int $default Unused. */ function dropdown_link_categories( $default = 0 ) { _deprecated_function( __FUNCTION__, '2.6', 'wp_link_category_checklist()' ); @@ -123,19 +117,18 @@ function get_real_file_to_edit( $file ) { } /** - * {@internal Missing Short Description}} + * Legacy function used for generating a categories drop-down control. * * @since 1.2.0 - * @deprecated 3.0.0 - * @deprecated Use wp_dropdown_categories() + * @deprecated 3.0.0 Use wp_dropdown_categories() * @see wp_dropdown_categories() * - * @param unknown_type $currentcat - * @param unknown_type $currentparent - * @param unknown_type $parent - * @param unknown_type $level - * @param unknown_type $categories - * @return unknown + * @param int $currentcat Optional. ID of the current category. Default 0. + * @param int $currentparent Optional. Current parent category ID. Default 0. + * @param int $parent Optional. Parent ID to retrieve categories for. Default 0. + * @param int $level Optional. Number of levels deep to display. Default 0. + * @param array $categories Optional. Categories to include in the control. Default 0. + * @return bool|null False if no categories were found. */ function wp_dropdown_cats( $currentcat = 0, $currentparent = 0, $parent = 0, $level = 0, $categories = 0 ) { _deprecated_function( __FUNCTION__, '3.0', 'wp_dropdown_categories()' ); @@ -163,37 +156,33 @@ function wp_dropdown_cats( $currentcat = 0, $currentparent = 0, $parent = 0, $le * Register a setting and its sanitization callback * * @since 2.7.0 - * @deprecated 3.0.0 - * @deprecated Use register_setting() + * @deprecated 3.0.0 Use register_setting() * @see register_setting() * * @param string $option_group A settings group name. Should correspond to a whitelisted option key name. * Default whitelisted option key names include "general," "discussion," and "reading," among others. * @param string $option_name The name of an option to sanitize and save. - * @param unknown_type $sanitize_callback A callback function that sanitizes the option's value. - * @return unknown + * @param callable $sanitize_callback A callback function that sanitizes the option's value. */ function add_option_update_handler( $option_group, $option_name, $sanitize_callback = '' ) { _deprecated_function( __FUNCTION__, '3.0', 'register_setting()' ); - return register_setting( $option_group, $option_name, $sanitize_callback ); + register_setting( $option_group, $option_name, $sanitize_callback ); } /** * Unregister a setting * * @since 2.7.0 - * @deprecated 3.0.0 - * @deprecated Use unregister_setting() + * @deprecated 3.0.0 Use unregister_setting() * @see unregister_setting() * - * @param unknown_type $option_group - * @param unknown_type $option_name - * @param unknown_type $sanitize_callback - * @return unknown + * @param string $option_group + * @param string $option_name + * @param callable $sanitize_callback */ function remove_option_update_handler( $option_group, $option_name, $sanitize_callback = '' ) { _deprecated_function( __FUNCTION__, '3.0', 'unregister_setting()' ); - return unregister_setting( $option_group, $option_name, $sanitize_callback ); + unregister_setting( $option_group, $option_name, $sanitize_callback ); } /** @@ -206,18 +195,16 @@ function remove_option_update_handler( $option_group, $option_name, $sanitize_ca **/ function codepress_get_lang( $filename ) { _deprecated_function( __FUNCTION__, '3.0' ); - return; } /** - * Adds Javascript required to make CodePress work on the theme/plugin editors. + * Adds JavaScript required to make CodePress work on the theme/plugin editors. * * @since 2.8.0 * @deprecated 3.0.0 **/ function codepress_footer_js() { _deprecated_function( __FUNCTION__, '3.0' ); - return; } /** @@ -228,11 +215,12 @@ function codepress_footer_js() { **/ function use_codepress() { _deprecated_function( __FUNCTION__, '3.0' ); - return; } /** - * @deprecated 3.1.0 + * Get all user IDs. + * + * @deprecated 3.1.0 Use get_users() * * @return array List of user IDs. */ @@ -249,7 +237,9 @@ function get_author_user_ids() { } /** - * @deprecated 3.1.0 + * Gets author users who can edit posts. + * + * @deprecated 3.1.0 Use get_users() * * @param int $user_id User ID. * @return array|bool List of editable authors. False if no editable users. @@ -272,11 +262,13 @@ function get_editable_authors( $user_id ) { } /** - * @deprecated 3.1.0 + * Gets the IDs of any users who can edit posts. * - * @param int $user_id User ID. - * @param bool $exclude_zeros Optional, default is true. Whether to exclude zeros. - * @return unknown + * @deprecated 3.1.0 Use get_users() + * + * @param int $user_id User ID. + * @param bool $exclude_zeros Optional. Whether to exclude zeroes. Default true. + * @return array Array of editable user IDs, empty array otherwise. */ function get_editable_user_ids( $user_id, $exclude_zeros = true, $post_type = 'post' ) { _deprecated_function( __FUNCTION__, '3.1', 'get_users()' ); @@ -307,7 +299,9 @@ function get_editable_user_ids( $user_id, $exclude_zeros = true, $post_type = 'p } /** - * @deprecated 3.1.0 + * Gets all users who are not authors. + * + * @deprecated 3.1.0 Use get_users() */ function get_nonauthor_user_ids() { _deprecated_function( __FUNCTION__, '3.1', 'get_users()' ); @@ -322,12 +316,12 @@ function get_nonauthor_user_ids() { return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value = '0'", $level_key) ); } -if ( !class_exists('WP_User_Search') ) : +if ( ! class_exists( 'WP_User_Search', false ) ) : /** * WordPress User Search class. * * @since 2.1.0 - * @deprecated 3.1.0 + * @deprecated 3.1.0 Use WP_User_Query */ class WP_User_Search { @@ -336,7 +330,7 @@ class WP_User_Search { * * @since 2.1.0 * @access private - * @var unknown_type + * @var mixed */ var $results; @@ -345,7 +339,7 @@ class WP_User_Search { * * @since 2.1.0 * @access private - * @var unknown_type + * @var string */ var $search_term; @@ -390,7 +384,7 @@ class WP_User_Search { * * @since 2.1.0 * @access private - * @var unknown_type + * @var int */ var $first_user; @@ -462,7 +456,7 @@ class WP_User_Search { * * @since 2.1.0 * @access private - * @var unknown_type + * @var WP_Error */ var $search_errors; @@ -471,12 +465,12 @@ class WP_User_Search { * * @since 2.7.0 * @access private - * @var unknown_type + * @var string */ var $paging_text; /** - * PHP4 Constructor - Sets up the object properties. + * PHP5 Constructor - Sets up the object properties. * * @since 2.1.0 * @@ -485,7 +479,7 @@ class WP_User_Search { * @param string $role Role name. * @return WP_User_Search */ - function WP_User_Search ($search_term = '', $page = '', $role = '') { + function __construct( $search_term = '', $page = '', $role = '' ) { _deprecated_function( __FUNCTION__, '3.1', 'WP_User_Query' ); $this->search_term = wp_unslash( $search_term ); @@ -499,14 +493,26 @@ class WP_User_Search { } /** - * {@internal Missing Short Description}} + * PHP4 Constructor - Sets up the object properties. * - * {@internal Missing Long Description}} + * @since 2.1.0 + * + * @param string $search_term Search terms string. + * @param int $page Optional. Page ID. + * @param string $role Role name. + * @return WP_User_Search + */ + public function WP_User_Search( $search_term = '', $page = '', $role = '' ) { + self::__construct( $search_term, $page, $role ); + } + + /** + * Prepares the user search query (legacy). * * @since 2.1.0 * @access public */ - function prepare_query() { + public function prepare_query() { global $wpdb; $this->first_user = ($this->page - 1) * $this->users_per_page; @@ -539,14 +545,12 @@ class WP_User_Search { } /** - * {@internal Missing Short Description}} - * - * {@internal Missing Long Description}} + * Executes the user search query. * * @since 2.1.0 * @access public */ - function query() { + public function query() { global $wpdb; $this->results = $wpdb->get_col("SELECT DISTINCT($wpdb->users.ID)" . $this->query_from . $this->query_where . $this->query_orderby . $this->query_limit); @@ -554,13 +558,11 @@ class WP_User_Search { if ( $this->results ) $this->total_users_for_query = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))" . $this->query_from . $this->query_where); // no limit else - $this->search_errors = new WP_Error('no_matching_users_found', __('No matching users were found!')); + $this->search_errors = new WP_Error('no_matching_users_found', __('No users found.')); } /** - * {@internal Missing Short Description}} - * - * {@internal Missing Long Description}} + * Prepares variables for use in templates. * * @since 2.1.0 * @access public @@ -568,19 +570,17 @@ class WP_User_Search { function prepare_vars_for_template_usage() {} /** - * {@internal Missing Short Description}} - * - * {@internal Missing Long Description}} + * Handles paging for the user search query. * * @since 2.1.0 * @access public */ - function do_paging() { + public function do_paging() { if ( $this->total_users_for_query > $this->users_per_page ) { // have to page the results $args = array(); - if( ! empty($this->search_term) ) + if ( ! empty($this->search_term) ) $args['usersearch'] = urlencode($this->search_term); - if( ! empty($this->role) ) + if ( ! empty($this->role) ) $args['role'] = urlencode($this->role); $this->paging_text = paginate_links( array( @@ -602,16 +602,14 @@ class WP_User_Search { } /** - * {@internal Missing Short Description}} - * - * {@internal Missing Long Description}} + * Retrieves the user search query results. * * @since 2.1.0 * @access public * - * @return unknown + * @return array */ - function get_results() { + public function get_results() { return (array) $this->results; } @@ -660,15 +658,18 @@ class WP_User_Search { endif; /** - * Retrieve editable posts from other users. + * Retrieves editable posts from other users. * - * @deprecated 3.1.0 + * @since 2.3.0 + * @deprecated 3.1.0 Use get_posts() + * @see get_posts() * - * @param int $user_id User ID to not retrieve posts from. - * @param string $type Optional, defaults to 'any'. Post type to retrieve, can be 'draft' or 'pending'. + * @param int $user_id User ID to not retrieve posts from. + * @param string $type Optional. Post type to retrieve. Accepts 'draft', 'pending' or 'any' (all). + * Default 'any'. * @return array List of posts from others. */ -function get_others_unpublished_posts($user_id, $type='any') { +function get_others_unpublished_posts( $user_id, $type = 'any' ) { _deprecated_function( __FUNCTION__, '3.1' ); global $wpdb; @@ -695,7 +696,8 @@ function get_others_unpublished_posts($user_id, $type='any') { /** * Retrieve drafts from other users. * - * @deprecated 3.1.0 + * @deprecated 3.1.0 Use get_posts() + * @see get_posts() * * @param int $user_id User ID. * @return array List of drafts from other users. @@ -709,7 +711,8 @@ function get_others_drafts($user_id) { /** * Retrieve pending review posts from other users. * - * @deprecated 3.1.0 + * @deprecated 3.1.0 Use get_posts() + * @see get_posts() * * @param int $user_id User ID. * @return array List of posts with pending review post type from other users. @@ -724,8 +727,7 @@ function get_others_pending($user_id) { * Output the QuickPress dashboard widget. * * @since 3.0.0 - * @deprecated 3.2.0 - * @deprecated Use wp_dashboard_quick_press() + * @deprecated 3.2.0 Use wp_dashboard_quick_press() * @see wp_dashboard_quick_press() */ function wp_dashboard_quick_press_output() { @@ -734,17 +736,20 @@ function wp_dashboard_quick_press_output() { } /** + * Outputs the TinyMCE editor. + * * @since 2.7.0 - * @deprecated 3.3.0 - * @deprecated Use wp_editor() + * @deprecated 3.3.0 Use wp_editor() * @see wp_editor() + * + * @staticvar int $num */ function wp_tiny_mce( $teeny = false, $settings = false ) { _deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' ); static $num = 1; - if ( ! class_exists('_WP_Editors' ) ) + if ( ! class_exists( '_WP_Editors', false ) ) require_once( ABSPATH . WPINC . '/class-wp-editor.php' ); $editor_id = 'content' . $num++; @@ -760,8 +765,9 @@ function wp_tiny_mce( $teeny = false, $settings = false ) { } /** - * @deprecated 3.3.0 - * @deprecated Use wp_editor() + * Preloads TinyMCE dialogs. + * + * @deprecated 3.3.0 Use wp_editor() * @see wp_editor() */ function wp_preload_dialogs() { @@ -769,8 +775,9 @@ function wp_preload_dialogs() { } /** - * @deprecated 3.3.0 - * @deprecated Use wp_editor() + * Prints TinyMCE editor JS. + * + * @deprecated 3.3.0 Use wp_editor() * @see wp_editor() */ function wp_print_editor_js() { @@ -778,8 +785,9 @@ function wp_print_editor_js() { } /** - * @deprecated 3.3.0 - * @deprecated Use wp_editor() + * Handles quicktags. + * + * @deprecated 3.3.0 Use wp_editor() * @see wp_editor() */ function wp_quicktags() { @@ -790,8 +798,7 @@ function wp_quicktags() { * Returns the screen layout options. * * @since 2.8.0 - * @deprecated 3.3.0 - * @deprecated Use $current_screen->render_screen_layout() + * @deprecated 3.3.0 WP_Screen::render_screen_layout() * @see WP_Screen::render_screen_layout() */ function screen_layout( $screen ) { @@ -811,8 +818,7 @@ function screen_layout( $screen ) { * Returns the screen's per-page options. * * @since 2.8.0 - * @deprecated 3.3.0 - * @deprecated Use $current_screen->render_per_page_options() + * @deprecated 3.3.0 Use WP_Screen::render_per_page_options() * @see WP_Screen::render_per_page_options() */ function screen_options( $screen ) { @@ -832,8 +838,7 @@ function screen_options( $screen ) { * Renders the screen's help. * * @since 2.7.0 - * @deprecated 3.3.0 - * @deprecated Use $current_screen->render_screen_meta() + * @deprecated 3.3.0 Use WP_Screen::render_screen_meta() * @see WP_Screen::render_screen_meta() */ function screen_meta( $screen ) { @@ -845,49 +850,114 @@ function screen_meta( $screen ) { * Favorite actions were deprecated in version 3.2. Use the admin bar instead. * * @since 2.7.0 - * @deprecated 3.2.0 + * @deprecated 3.2.0 Use WP_Admin_Bar + * @see WP_Admin_Bar */ function favorite_actions() { _deprecated_function( __FUNCTION__, '3.2', 'WP_Admin_Bar' ); } +/** + * Handles uploading an image. + * + * @deprecated 3.3.0 Use wp_media_upload_handler() + * @see wp_media_upload_handler() + * + * @return null|string + */ function media_upload_image() { - __deprecated_function( __FUNCTION__, '3.3', 'wp_media_upload_handler()' ); + _deprecated_function( __FUNCTION__, '3.3', 'wp_media_upload_handler()' ); return wp_media_upload_handler(); } +/** + * Handles uploading an audio file. + * + * @deprecated 3.3.0 Use wp_media_upload_handler() + * @see wp_media_upload_handler() + * + * @return null|string + */ function media_upload_audio() { - __deprecated_function( __FUNCTION__, '3.3', 'wp_media_upload_handler()' ); + _deprecated_function( __FUNCTION__, '3.3', 'wp_media_upload_handler()' ); return wp_media_upload_handler(); } +/** + * Handles uploading a video file. + * + * @deprecated 3.3.0 Use wp_media_upload_handler() + * @see wp_media_upload_handler() + * + * @return null|string + */ function media_upload_video() { - __deprecated_function( __FUNCTION__, '3.3', 'wp_media_upload_handler()' ); + _deprecated_function( __FUNCTION__, '3.3', 'wp_media_upload_handler()' ); return wp_media_upload_handler(); } +/** + * Handles uploading a generic file. + * + * @deprecated 3.3.0 Use wp_media_upload_handler() + * @see wp_media_upload_handler() + * + * @return null|string + */ function media_upload_file() { - __deprecated_function( __FUNCTION__, '3.3', 'wp_media_upload_handler()' ); + _deprecated_function( __FUNCTION__, '3.3', 'wp_media_upload_handler()' ); return wp_media_upload_handler(); } +/** + * Handles retrieving the insert-from-URL form for an image. + * + * @deprecated 3.3.0 Use wp_media_insert_url_form() + * @see wp_media_insert_url_form() + * + * @return string + */ function type_url_form_image() { - __deprecated_function( __FUNCTION__, '3.3', "wp_media_insert_url_form('image')" ); + _deprecated_function( __FUNCTION__, '3.3', "wp_media_insert_url_form('image')" ); return wp_media_insert_url_form( 'image' ); } +/** + * Handles retrieving the insert-from-URL form for an audio file. + * + * @deprecated 3.3.0 Use wp_media_insert_url_form() + * @see wp_media_insert_url_form() + * + * @return string + */ function type_url_form_audio() { - __deprecated_function( __FUNCTION__, '3.3', "wp_media_insert_url_form('audio')" ); + _deprecated_function( __FUNCTION__, '3.3', "wp_media_insert_url_form('audio')" ); return wp_media_insert_url_form( 'audio' ); } +/** + * Handles retrieving the insert-from-URL form for a video file. + * + * @deprecated 3.3.0 Use wp_media_insert_url_form() + * @see wp_media_insert_url_form() + * + * @return string + */ function type_url_form_video() { - __deprecated_function( __FUNCTION__, '3.3', "wp_media_insert_url_form('video')" ); + _deprecated_function( __FUNCTION__, '3.3', "wp_media_insert_url_form('video')" ); return wp_media_insert_url_form( 'video' ); } +/** + * Handles retrieving the insert-from-URL form for a generic file. + * + * @deprecated 3.3.0 Use wp_media_insert_url_form() + * @see wp_media_insert_url_form() + * + * @return string + */ function type_url_form_file() { - __deprecated_function( __FUNCTION__, '3.3', "wp_media_insert_url_form('file')" ); + _deprecated_function( __FUNCTION__, '3.3', "wp_media_insert_url_form('file')" ); return wp_media_insert_url_form( 'file' ); } @@ -897,9 +967,8 @@ function type_url_form_file() { * Creates an 'Overview' help tab. * * @since 2.7.0 - * @deprecated 3.3.0 - * @deprecated Use get_current_screen()->add_help_tab() - * @see WP_Screen + * @deprecated 3.3.0 Use WP_Screen::add_help_tab() + * @see WP_Screen::add_help_tab() * * @param string $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions. * @param string $help The content of an 'Overview' help tab. @@ -914,11 +983,10 @@ function add_contextual_help( $screen, $help ) { } /** - * Get the allowed themes for the current blog. + * Get the allowed themes for the current site. * * @since 3.0.0 - * @deprecated 3.4.0 - * @deprecated Use wp_get_themes() + * @deprecated 3.4.0 Use wp_get_themes() * @see wp_get_themes() * * @return array $themes Array of allowed themes. @@ -937,12 +1005,13 @@ function get_allowed_themes() { } /** - * {@internal Missing Short Description}} + * Retrieves a list of broken themes. * * @since 1.5.0 - * @deprecated 3.4.0 + * @deprecated 3.4.0 Use wp_get_themes() + * @see wp_get_themes() * - * @return unknown + * @return array */ function get_broken_themes() { _deprecated_function( __FUNCTION__, '3.4', "wp_get_themes( array( 'errors' => true )" ); @@ -961,12 +1030,13 @@ function get_broken_themes() { } /** - * {@internal Missing Short Description}} + * Retrieves information on the current active theme. * * @since 2.0.0 - * @deprecated 3.4.0 + * @deprecated 3.4.0 Use wp_get_theme() + * @see wp_get_theme() * - * @return unknown + * @return WP_Theme */ function current_theme_info() { _deprecated_function( __FUNCTION__, '3.4', 'wp_get_theme()' ); @@ -975,7 +1045,9 @@ function current_theme_info() { } /** - * This was once used to display an 'Insert into Post' button. Now it is deprecated and stubbed. + * This was once used to display an 'Insert into Post' button. + * + * Now it is deprecated and stubbed. * * @deprecated 3.5.0 */ @@ -984,7 +1056,9 @@ function _insert_into_post_button( $type ) { } /** - * This was once used to display a media button. Now it is deprecated and stubbed. + * This was once used to display a media button. + * + * Now it is deprecated and stubbed. * * @deprecated 3.5.0 */ @@ -993,10 +1067,11 @@ function _media_button($title, $icon, $type, $id) { } /** - * Get an existing post and format it for editing. + * Gets an existing post and format it for editing. * * @since 2.0.0 - * @deprecated 3.5.0 + * @deprecated 3.5.0 Use get_post() + * @see get_post() * * @param int $id * @return object @@ -1008,11 +1083,11 @@ function get_post_to_edit( $id ) { } /** - * Get the default page information to use. + * Gets the default page information to use. * * @since 2.5.0 - * @deprecated 3.5.0 - * @deprecated Use get_default_post_to_edit() + * @deprecated 3.5.0 Use get_default_post_to_edit() + * @see get_default_post_to_edit() * * @return WP_Post Post object containing all the default post data as attributes */ @@ -1028,8 +1103,7 @@ function get_default_page_to_edit() { * This was once used to create a thumbnail from an Image given a maximum side size. * * @since 1.2.0 - * @deprecated 3.5.0 - * @deprecated Use image_resize() + * @deprecated 3.5.0 Use image_resize() * @see image_resize() * * @param mixed $file Filename of the original image, Or attachment id. @@ -1061,7 +1135,7 @@ function wp_nav_menu_locations_meta_box() { * and calling the 'upgrade' method. * * @since 2.7.0 - * @deprecated 3.7.0 + * @deprecated 3.7.0 Use Core_Upgrader * @see Core_Upgrader */ function wp_update_core($current, $feedback = '') { @@ -1070,7 +1144,7 @@ function wp_update_core($current, $feedback = '') { if ( !empty($feedback) ) add_filter('update_feedback', $feedback); - include ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; + include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); $upgrader = new Core_Upgrader(); return $upgrader->upgrade($current); @@ -1084,7 +1158,7 @@ function wp_update_core($current, $feedback = '') { * Unused since 2.8.0. * * @since 2.5.0 - * @deprecated 3.7.0 + * @deprecated 3.7.0 Use Plugin_Upgrader * @see Plugin_Upgrader */ function wp_update_plugin($plugin, $feedback = '') { @@ -1093,7 +1167,7 @@ function wp_update_plugin($plugin, $feedback = '') { if ( !empty($feedback) ) add_filter('update_feedback', $feedback); - include ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; + include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); $upgrader = new Plugin_Upgrader(); return $upgrader->upgrade($plugin); } @@ -1106,7 +1180,7 @@ function wp_update_plugin($plugin, $feedback = '') { * Unused since 2.8.0. * * @since 2.7.0 - * @deprecated 3.7.0 + * @deprecated 3.7.0 Use Theme_Upgrader * @see Theme_Upgrader */ function wp_update_theme($theme, $feedback = '') { @@ -1115,7 +1189,7 @@ function wp_update_theme($theme, $feedback = '') { if ( !empty($feedback) ) add_filter('update_feedback', $feedback); - include ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; + include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); $upgrader = new Theme_Upgrader(); return $upgrader->upgrade($theme); } @@ -1123,57 +1197,102 @@ function wp_update_theme($theme, $feedback = '') { /** * This was once used to display attachment links. Now it is deprecated and stubbed. * - * {@internal Missing Short Description}} - * * @since 2.0.0 * @deprecated 3.7.0 * - * @param unknown_type $id - * @return unknown + * @param int|bool $id */ function the_attachment_links( $id = false ) { _deprecated_function( __FUNCTION__, '3.7' ); } -/**#@+ +/** * Displays a screen icon. * * @since 2.7.0 * @since 3.8.0 Screen icons are no longer used in WordPress. This function no longer produces output. - * @deprecated 3.8.0 + * @deprecated 3.8.0 Use get_screen_icon() + * @see get_screen_icon() */ function screen_icon() { echo get_screen_icon(); } + +/** + * Retrieves the screen icon (no longer used in 3.8+). + * + * @deprecated 3.8.0 + * + * @return string + */ function get_screen_icon() { return ''; } -/**#@-*/ -/**#@+ +/** * Deprecated dashboard widget controls. * * @since 2.5.0 * @deprecated 3.8.0 */ function wp_dashboard_incoming_links_output() {} + +/** + * Deprecated dashboard secondary output. + * + * @deprecated 3.8.0 + */ function wp_dashboard_secondary_output() {} -/**#@-*/ -/**#@+ +/** * Deprecated dashboard widget controls. * * @since 2.7.0 * @deprecated 3.8.0 */ function wp_dashboard_incoming_links() {} + +/** + * Deprecated dashboard incoming links control. + * + * @deprecated 3.8.0 + */ function wp_dashboard_incoming_links_control() {} + +/** + * Deprecated dashboard plugins control. + * + * @deprecated 3.8.0 + */ function wp_dashboard_plugins() {} + +/** + * Deprecated dashboard primary control. + * + * @deprecated 3.8.0 + */ function wp_dashboard_primary_control() {} + +/** + * Deprecated dashboard recent comments control. + * + * @deprecated 3.8.0 + */ function wp_dashboard_recent_comments_control() {} + +/** + * Deprecated dashboard secondary section. + * + * @deprecated 3.8.0 + */ function wp_dashboard_secondary() {} + +/** + * Deprecated dashboard secondary control. + * + * @deprecated 3.8.0 + */ function wp_dashboard_secondary_control() {} -/**#@-*/ /** * This was once used to move child posts to a new parent. @@ -1188,3 +1307,69 @@ function wp_dashboard_secondary_control() {} function _relocate_children( $old_ID, $new_ID ) { _deprecated_function( __FUNCTION__, '3.9' ); } + +/** + * Add a top-level menu page in the 'objects' section. + * + * This function takes a capability which will be used to determine whether + * or not a page is included in the menu. + * + * The function which is hooked in to handle the output of the page must check + * that the user has the required capability as well. + * + * @since 2.7.0 + * + * @deprecated 4.5.0 Use add_menu_page() + * @see add_menu_page() + * @global int $_wp_last_object_menu + * + * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected. + * @param string $menu_title The text to be used for the menu. + * @param string $capability The capability required for this menu to be displayed to the user. + * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu). + * @param callable $function The function to be called to output the content for this page. + * @param string $icon_url The url to the icon to be used for this menu. + * @return string The resulting page's hook_suffix. + */ +function add_object_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '') { + _deprecated_function( __FUNCTION__, '4.5', 'add_menu_page()' ); + + global $_wp_last_object_menu; + + $_wp_last_object_menu++; + + return add_menu_page($page_title, $menu_title, $capability, $menu_slug, $function, $icon_url, $_wp_last_object_menu); +} + +/** + * Add a top-level menu page in the 'utility' section. + * + * This function takes a capability which will be used to determine whether + * or not a page is included in the menu. + * + * The function which is hooked in to handle the output of the page must check + * that the user has the required capability as well. + * + * @since 2.7.0 + * + * @deprecated 4.5.0 Use add_menu_page() + * @see add_menu_page() + * @global int $_wp_last_utility_menu + * + * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected. + * @param string $menu_title The text to be used for the menu. + * @param string $capability The capability required for this menu to be displayed to the user. + * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu). + * @param callable $function The function to be called to output the content for this page. + * @param string $icon_url The url to the icon to be used for this menu. + * @return string The resulting page's hook_suffix. + */ +function add_utility_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '') { + _deprecated_function( __FUNCTION__, '4.5', 'add_menu_page()' ); + + global $_wp_last_utility_menu; + + $_wp_last_utility_menu++; + + return add_menu_page($page_title, $menu_title, $capability, $menu_slug, $function, $icon_url, $_wp_last_utility_menu); +} diff --git a/wp-admin/includes/edit-tag-messages.php b/wp-admin/includes/edit-tag-messages.php new file mode 100644 index 0000000..dcfd603 --- /dev/null +++ b/wp-admin/includes/edit-tag-messages.php @@ -0,0 +1,58 @@ + '', + 1 => __( 'Item added.' ), + 2 => __( 'Item deleted.' ), + 3 => __( 'Item updated.' ), + 4 => __( 'Item not added.' ), + 5 => __( 'Item not updated.' ), + 6 => __( 'Items deleted.' ), +); + +$messages['category'] = array( + 0 => '', + 1 => __( 'Category added.' ), + 2 => __( 'Category deleted.' ), + 3 => __( 'Category updated.' ), + 4 => __( 'Category not added.' ), + 5 => __( 'Category not updated.' ), + 6 => __( 'Categories deleted.' ), +); + +$messages['post_tag'] = array( + 0 => '', + 1 => __( 'Tag added.' ), + 2 => __( 'Tag deleted.' ), + 3 => __( 'Tag updated.' ), + 4 => __( 'Tag not added.' ), + 5 => __( 'Tag not updated.' ), + 6 => __( 'Tags deleted.' ), +); + +/** + * Filter the messages displayed when a tag is updated. + * + * @since 3.7.0 + * + * @param array $messages The messages to be displayed. + */ +$messages = apply_filters( 'term_updated_messages', $messages ); + +$message = false; +if ( isset( $_REQUEST['message'] ) && ( $msg = (int) $_REQUEST['message'] ) ) { + if ( isset( $messages[ $taxonomy ][ $msg ] ) ) { + $message = $messages[ $taxonomy ][ $msg ]; + } elseif ( ! isset( $messages[ $taxonomy ] ) && isset( $messages['_item'][ $msg ] ) ) { + $message = $messages['_item'][ $msg ]; + } +} \ No newline at end of file diff --git a/wp-admin/includes/export.php b/wp-admin/includes/export.php index 162e007..4b18c9c 100644 --- a/wp-admin/includes/export.php +++ b/wp-admin/includes/export.php @@ -16,11 +16,14 @@ define( 'WXR_VERSION', '1.2' ); /** - * Generates the WXR export file for download + * Generates the WXR export file for download. * * @since 2.1.0 * - * @param array $args Filters defining what should be included in the export + * @global wpdb $wpdb + * @global WP_Post $post + * + * @param array $args Filters defining what should be included in the export. */ function export_wp( $args = array() ) { global $wpdb, $post; @@ -40,8 +43,21 @@ function export_wp( $args = array() ) { do_action( 'export_wp', $args ); $sitename = sanitize_key( get_bloginfo( 'name' ) ); - if ( ! empty($sitename) ) $sitename .= '.'; - $filename = $sitename . 'wordpress.' . date( 'Y-m-d' ) . '.xml'; + if ( ! empty( $sitename ) ) { + $sitename .= '.'; + } + $date = date( 'Y-m-d' ); + $wp_filename = $sitename . 'wordpress.' . $date . '.xml'; + /** + * Filter the export filename. + * + * @since 4.4.0 + * + * @param string $wp_filename The name of the file for download. + * @param string $sitename The site name. + * @param string $date Today's date, formatted. + */ + $filename = apply_filters( 'export_wp_filename', $wp_filename, $sitename, $date ); header( 'Content-Description: File Transfer' ); header( 'Content-Disposition: attachment; filename=' . $filename ); @@ -72,7 +88,7 @@ function export_wp( $args = array() ) { } } - if ( 'post' == $args['content'] || 'page' == $args['content'] ) { + if ( 'post' == $args['content'] || 'page' == $args['content'] || 'attachment' == $args['content'] ) { if ( $args['author'] ) $where .= $wpdb->prepare( " AND {$wpdb->posts}.post_author = %d", $args['author'] ); @@ -83,23 +99,26 @@ function export_wp( $args = array() ) { $where .= $wpdb->prepare( " AND {$wpdb->posts}.post_date < %s", date( 'Y-m-d', strtotime('+1 month', strtotime($args['end_date'])) ) ); } - // grab a snapshot of post IDs, just in case it changes during the export + // Grab a snapshot of post IDs, just in case it changes during the export. $post_ids = $wpdb->get_col( "SELECT ID FROM {$wpdb->posts} $join WHERE $where" ); - // get the requested terms ready, empty unless posts filtered by category or all content + /* + * Get the requested terms ready, empty unless posts filtered by category + * or all content. + */ $cats = $tags = $terms = array(); if ( isset( $term ) && $term ) { $cat = get_term( $term['term_id'], 'category' ); $cats = array( $cat->term_id => $cat ); unset( $term, $cat ); - } else if ( 'all' == $args['content'] ) { + } elseif ( 'all' == $args['content'] ) { $categories = (array) get_categories( array( 'get' => 'all' ) ); $tags = (array) get_tags( array( 'get' => 'all' ) ); $custom_taxonomies = get_taxonomies( array( '_builtin' => false ) ); $custom_terms = (array) get_terms( $custom_taxonomies, array( 'get' => 'all' ) ); - // put categories in order with no child going before its parent + // Put categories in order with no child going before its parent. while ( $cat = array_shift( $categories ) ) { if ( $cat->parent == 0 || isset( $cats[$cat->parent] ) ) $cats[$cat->term_id] = $cat; @@ -107,7 +126,7 @@ function export_wp( $args = array() ) { $categories[] = $cat; } - // put terms in order with no child going before its parent + // Put terms in order with no child going before its parent. while ( $t = array_shift( $custom_terms ) ) { if ( $t->parent == 0 || isset( $terms[$t->parent] ) ) $terms[$t->term_id] = $t; @@ -127,9 +146,9 @@ function export_wp( $args = array() ) { * @return string */ function wxr_cdata( $str ) { - if ( seems_utf8( $str ) == false ) + if ( ! seems_utf8( $str ) ) { $str = utf8_encode( $str ); - + } // $str = ent2ncr(esc_html($str)); $str = '', ']]]]>', $str ) . ']]>'; @@ -144,10 +163,10 @@ function export_wp( $args = array() ) { * @return string Site URL. */ function wxr_site_url() { - // ms: the base url + // Multisite: the base URL. if ( is_multisite() ) return network_home_url(); - // wp: the blog url + // WordPress (single site): the blog URL. else return get_bloginfo_rss( 'url' ); } @@ -240,12 +259,23 @@ function export_wp( $args = array() ) { * Output list of authors with posts * * @since 3.1.0 + * + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param array $post_ids Array of post IDs to filter the query by. Optional. */ - function wxr_authors_list() { + function wxr_authors_list( array $post_ids = null ) { global $wpdb; + if ( !empty( $post_ids ) ) { + $post_ids = array_map( 'absint', $post_ids ); + $and = 'AND ID IN ( ' . implode( ', ', $post_ids ) . ')'; + } else { + $and = ''; + } + $authors = array(); - $results = $wpdb->get_results( "SELECT DISTINCT post_author FROM $wpdb->posts WHERE post_status != 'auto-draft'" ); + $results = $wpdb->get_results( "SELECT DISTINCT post_author FROM $wpdb->posts WHERE post_status != 'auto-draft' $and" ); foreach ( (array) $results as $result ) $authors[] = get_userdata( $result->post_author ); @@ -253,12 +283,12 @@ function export_wp( $args = array() ) { foreach ( $authors as $author ) { echo "\t"; - echo '' . $author->ID . ''; - echo '' . $author->user_login . ''; - echo '' . $author->user_email . ''; + echo '' . intval( $author->ID ) . ''; + echo '' . wxr_cdata( $author->user_login ) . ''; + echo '' . wxr_cdata( $author->user_email ) . ''; echo '' . wxr_cdata( $author->display_name ) . ''; - echo '' . wxr_cdata( $author->user_firstname ) . ''; - echo '' . wxr_cdata( $author->user_lastname ) . ''; + echo '' . wxr_cdata( $author->first_name ) . ''; + echo '' . wxr_cdata( $author->last_name ) . ''; echo "\n"; } } @@ -274,7 +304,10 @@ function export_wp( $args = array() ) { return; foreach ( $nav_menus as $menu ) { - echo "\t{$menu->term_id}nav_menu{$menu->slug}"; + echo "\t"; + echo '' . intval( $menu->term_id ) . ''; + echo 'nav_menu'; + echo '' . wxr_cdata( $menu->slug ) . ''; wxr_term_name( $menu ); echo "\n"; } @@ -298,6 +331,12 @@ function export_wp( $args = array() ) { } } + /** + * + * @param bool $return_me + * @param string $meta_key + * @return bool + */ function wxr_filter_postmeta( $return_me, $meta_key ) { if ( '_edit_lock' == $meta_key ) $return_me = true; @@ -344,16 +383,16 @@ function export_wp( $args = array() ) { - + - term_id ?>slug; ?>parent ? $cats[$c->parent]->slug : ''; ?> + term_id ); ?>slug ); ?>parent ? $cats[$c->parent]->slug : '' ); ?> - term_id ?>slug; ?> + term_id ); ?>slug ); ?> - term_id ?>taxonomy; ?>slug; ?>parent ? $terms[$t->parent]->slug : ''; ?> + term_id ); ?>taxonomy ); ?>slug ); ?>parent ? $terms[$t->parent]->slug : '' ); ?> @@ -363,22 +402,29 @@ function export_wp( $args = array() ) { ?> in_the_loop = true; // Fake being in the loop. - // fetch 20 posts at a time rather than loading the entire table into memory + // Fake being in the loop. + $wp_query->in_the_loop = true; + + // Fetch 20 posts at a time rather than loading the entire table into memory. while ( $next_posts = array_splice( $post_ids, 0, 20 ) ) { $where = 'WHERE ID IN (' . join( ',', $next_posts ) . ')'; $posts = $wpdb->get_results( "SELECT * FROM {$wpdb->posts} $where" ); - // Begin Loop + // Begin Loop. foreach ( $posts as $post ) { setup_postdata( $post ); $is_sticky = is_sticky( $post->ID ) ? 1 : 0; ?> - - <?php echo apply_filters( 'the_title_rss', $post->post_title ); ?> + <?php + /** This filter is documented in wp-includes/feed.php */ + echo apply_filters( 'the_title_rss', $post->post_title ); + ?> @@ -404,20 +450,20 @@ function export_wp( $args = array() ) { */ echo wxr_cdata( apply_filters( 'the_excerpt_export', $post->post_excerpt ) ); ?> - ID; ?> - post_date; ?> - post_date_gmt; ?> - comment_status; ?> - ping_status; ?> - post_name; ?> - post_status; ?> - post_parent; ?> - menu_order; ?> - post_type; ?> - post_password; ?> - + ID ); ?> + post_date ); ?> + post_date_gmt ); ?> + comment_status ); ?> + ping_status ); ?> + post_name ); ?> + post_status ); ?> + post_parent ); ?> + menu_order ); ?> + post_type ); ?> + post_password ); ?> + post_type == 'attachment' ) : ?> - ID ); ?> + ID ) ); ?> get_results( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE post_id = %d", $post->ID ) ); @@ -438,29 +484,47 @@ function export_wp( $args = array() ) { continue; ?> - meta_key; ?> + meta_key ); ?> meta_value ); ?> - -get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved <> 'spam'", $post->ID ) ); +get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved <> 'spam'", $post->ID ) ); + $comments = array_map( 'get_comment', $_comments ); foreach ( $comments as $c ) : ?> - comment_ID; ?> + comment_ID ); ?> comment_author ); ?> - comment_author_email; ?> + comment_author_email ); ?> comment_author_url ); ?> - comment_author_IP; ?> - comment_date; ?> - comment_date_gmt; ?> + comment_author_IP ); ?> + comment_date ); ?> + comment_date_gmt ); ?> comment_content ) ?> - comment_approved; ?> - comment_type; ?> - comment_parent; ?> - user_id; ?> + comment_approved ); ?> + comment_type ); ?> + comment_parent ); ?> + user_id ); ?> get_results( $wpdb->prepare( "SELECT * FROM $wpdb->commentmeta WHERE comment_id = %d", $c->comment_ID ) ); - foreach ( $c_meta as $meta ) : ?> + foreach ( $c_meta as $meta ) : + /** + * Filter whether to selectively skip comment meta used for WXR exports. + * + * Returning a truthy value to the filter will skip the current meta + * object from being exported. + * + * @since 4.0.0 + * + * @param bool $skip Whether to skip the current comment meta. Default false. + * @param string $meta_key Current meta key. + * @param object $meta Current meta object. + */ + if ( apply_filters( 'wxr_export_skip_commentmeta', false, $meta->meta_key, $meta ) ) { + continue; + } + ?> - meta_key; ?> + meta_key ); ?> meta_value ); ?> diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index d81dd52..72f5e22 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -1,47 +1,60 @@ __( 'Main Index Template' ), - 'style.css' => __( 'Stylesheet' ), - 'editor-style.css' => __( 'Visual Editor Stylesheet' ), - 'editor-style-rtl.css' => __( 'Visual Editor RTL Stylesheet' ), - 'rtl.css' => __( 'RTL Stylesheet' ), - 'comments.php' => __( 'Comments' ), - 'comments-popup.php' => __( 'Popup Comments' ), - 'footer.php' => __( 'Footer' ), - 'header.php' => __( 'Header' ), - 'sidebar.php' => __( 'Sidebar' ), - 'archive.php' => __( 'Archives' ), - 'author.php' => __( 'Author Template' ), - 'tag.php' => __( 'Tag Template' ), - 'category.php' => __( 'Category Template' ), - 'page.php' => __( 'Page Template' ), - 'search.php' => __( 'Search Results' ), - 'searchform.php' => __( 'Search Form' ), - 'single.php' => __( 'Single Post' ), - '404.php' => __( '404 Template' ), - 'link.php' => __( 'Links Template' ), - 'functions.php' => __( 'Theme Functions' ), - 'attachment.php' => __( 'Attachment Template' ), - 'image.php' => __('Image Attachment Template'), - 'video.php' => __('Video Attachment Template'), - 'audio.php' => __('Audio Attachment Template'), - 'application.php' => __('Application Attachment Template'), - 'my-hacks.php' => __( 'my-hacks.php (legacy hacks support)' ), - '.htaccess' => __( '.htaccess (for rewrite rules )' ), + 'functions.php' => __( 'Theme Functions' ), + 'header.php' => __( 'Theme Header' ), + 'footer.php' => __( 'Theme Footer' ), + 'sidebar.php' => __( 'Sidebar' ), + 'comments.php' => __( 'Comments' ), + 'searchform.php' => __( 'Search Form' ), + '404.php' => __( '404 Template' ), + 'link.php' => __( 'Links Template' ), + // Archives + 'index.php' => __( 'Main Index Template' ), + 'archive.php' => __( 'Archives' ), + 'author.php' => __( 'Author Template' ), + 'taxonomy.php' => __( 'Taxonomy Template' ), + 'category.php' => __( 'Category Template' ), + 'tag.php' => __( 'Tag Template' ), + 'home.php' => __( 'Posts Page' ), + 'search.php' => __( 'Search Results' ), + 'date.php' => __( 'Date Template' ), + // Content + 'singular.php' => __( 'Singular Template' ), + 'single.php' => __( 'Single Post' ), + 'page.php' => __( 'Single Page' ), + 'front-page.php' => __( 'Static Front Page' ), + // Attachments + 'attachment.php' => __( 'Attachment Template' ), + 'image.php' => __( 'Image Attachment Template' ), + 'video.php' => __( 'Video Attachment Template' ), + 'audio.php' => __( 'Audio Attachment Template' ), + 'application.php' => __( 'Application Attachment Template' ), + // Stylesheets + 'style.css' => __( 'Stylesheet' ), + 'editor-style.css' => __( 'Visual Editor Stylesheet' ), + 'editor-style-rtl.css' => __( 'Visual Editor RTL Stylesheet' ), + 'rtl.css' => __( 'RTL Stylesheet' ), + // Other + 'my-hacks.php' => __( 'my-hacks.php (legacy hacks support)' ), + '.htaccess' => __( '.htaccess (for rewrite rules )' ), // Deprecated files - 'wp-layout.css' => __( 'Stylesheet' ), - 'wp-comments.php' => __( 'Comments Template' ), + 'wp-layout.css' => __( 'Stylesheet' ), + 'wp-comments.php' => __( 'Comments Template' ), 'wp-comments-popup.php' => __( 'Popup Comments Template' ), + 'comments-popup.php' => __( 'Popup Comments' ), ); /** @@ -50,21 +63,23 @@ $wp_file_descriptions = array( * * @since 1.5.0 * - * @uses _cleanup_header_comment - * @uses $wp_file_descriptions + * @global array $wp_file_descriptions * @param string $file Filesystem path or filename - * @return string Description of file from $wp_file_descriptions or basename of $file if description doesn't exist + * @return string Description of file from $wp_file_descriptions or basename of $file if description doesn't exist. + * Appends 'Page Template' to basename of $file if the file is a page template */ function get_file_description( $file ) { - global $wp_file_descriptions; - - if ( isset( $wp_file_descriptions[basename( $file )] ) ) { - return $wp_file_descriptions[basename( $file )]; - } - elseif ( file_exists( $file ) && is_file( $file ) ) { - $template_data = implode( '', file( $file ) ); - if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name )) - return sprintf( __( '%s Page Template' ), _cleanup_header_comment($name[1]) ); + global $wp_file_descriptions, $allowed_files; + + $relative_pathinfo = pathinfo( $file ); + $file_path = $allowed_files[ $file ]; + if ( isset( $wp_file_descriptions[ basename( $file ) ] ) && '.' === $relative_pathinfo['dirname'] ) { + return $wp_file_descriptions[ basename( $file ) ]; + } elseif ( file_exists( $file_path ) && is_file( $file_path ) ) { + $template_data = implode( '', file( $file_path ) ); + if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name ) ) { + return sprintf( __( '%s Page Template' ), _cleanup_header_comment( $name[1] ) ); + } } return trim( basename( $file ) ); @@ -75,12 +90,11 @@ function get_file_description( $file ) { * * @since 1.5.0 * - * @uses get_option * @return string Full filesystem path to the root of the WordPress installation */ function get_home_path() { - $home = get_option( 'home' ); - $siteurl = get_option( 'siteurl' ); + $home = set_url_scheme( get_option( 'home' ), 'http' ); + $siteurl = set_url_scheme( get_option( 'siteurl' ), 'http' ); if ( ! empty( $home ) && 0 !== strcasecmp( $home, $siteurl ) ) { $wp_path_rel_to_home = str_ireplace( $home, '', $siteurl ); /* $siteurl - $home */ $pos = strripos( str_replace( '\\', '/', $_SERVER['SCRIPT_FILENAME'] ), trailingslashit( $wp_path_rel_to_home ) ); @@ -99,8 +113,8 @@ function get_home_path() { * * @since 2.6.0 * - * @param string $folder Full path to folder - * @param int $levels (optional) Levels of folders to follow, Default: 100 (PHP Loop limit). + * @param string $folder Optional. Full path to folder. Default empty. + * @param int $levels Optional. Levels of folders to follow, Default 100 (PHP Loop limit). * @return bool|array False on failure, Else array of files */ function list_files( $folder = '', $levels = 100 ) { @@ -139,35 +153,54 @@ function list_files( $folder = '', $levels = 100 ) { * * @since 2.6.0 * - * @param string $filename (optional) Filename to base the Unique file off - * @param string $dir (optional) Directory to store the file in + * @param string $filename Optional. Filename to base the Unique file off. Default empty. + * @param string $dir Optional. Directory to store the file in. Default empty. * @return string a writable filename */ -function wp_tempnam($filename = '', $dir = '') { - if ( empty($dir) ) +function wp_tempnam( $filename = '', $dir = '' ) { + if ( empty( $dir ) ) { $dir = get_temp_dir(); - $filename = basename($filename); - if ( empty($filename) ) + } + + if ( empty( $filename ) || '.' == $filename || '/' == $filename ) { $filename = time(); + } + + // Use the basename of the given file without the extension as the name for the temporary directory + $temp_filename = basename( $filename ); + $temp_filename = preg_replace( '|\.[^.]*$|', '', $temp_filename ); + + // If the folder is falsey, use its parent directory name instead. + if ( ! $temp_filename ) { + return wp_tempnam( dirname( $filename ), $dir ); + } + + // Suffix some random data to avoid filename conflicts + $temp_filename .= '-' . wp_generate_password( 6, false ); + $temp_filename .= '.tmp'; + $temp_filename = $dir . wp_unique_filename( $dir, $temp_filename ); - $filename = preg_replace('|\..*$|', '.tmp', $filename); - $filename = $dir . wp_unique_filename($dir, $filename); - touch($filename); - return $filename; + $fp = @fopen( $temp_filename, 'x' ); + if ( ! $fp && is_writable( $dir ) && file_exists( $temp_filename ) ) { + return wp_tempnam( $filename, $dir ); + } + if ( $fp ) { + fclose( $fp ); + } + + return $temp_filename; } /** * Make sure that the file that was requested to edit, is allowed to be edited * - * Function will die if if you are not allowed to edit the file + * Function will die if you are not allowed to edit the file * * @since 1.5.0 * - * @uses wp_die - * @uses validate_file * @param string $file file the users is attempting to edit * @param array $allowed_files Array of allowed files to edit, $file must match an entry exactly - * @return null + * @return string|null */ function validate_file_to_edit( $file, $allowed_files = '' ) { $code = validate_file( $file, $allowed_files ); @@ -179,8 +212,8 @@ function validate_file_to_edit( $file, $allowed_files = '' ) { case 1 : wp_die( __( 'Sorry, that file cannot be edited.' ) ); - //case 2 : - // wp_die( __('Sorry, can’t call files with their real path.' )); + // case 2 : + // wp_die( __('Sorry, can’t call files with their real path.' )); case 3 : wp_die( __( 'Sorry, that file cannot be edited.' ) ); @@ -191,145 +224,173 @@ function validate_file_to_edit( $file, $allowed_files = '' ) { * Handle PHP uploads in WordPress, sanitizing file names, checking extensions for mime type, * and moving the file to the appropriate directory within the uploads directory. * - * @since 2.0.0 + * @access private + * @since 4.0.0 + * + * @see wp_handle_upload_error * - * @uses wp_handle_upload_error - * @uses is_multisite - * @uses wp_check_filetype_and_ext - * @uses current_user_can - * @uses wp_upload_dir - * @uses wp_unique_filename - * @uses delete_transient - * @param array $file Reference to a single element of $_FILES. Call the function once for each uploaded file. - * @param array $overrides Optional. An associative array of names=>values to override default variables with extract( $overrides, EXTR_OVERWRITE ). - * @param string $time Optional. Time formatted in 'yyyy/mm'. - * @return array On success, returns an associative array of file attributes. On failure, returns $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ). + * @param array $file Reference to a single element of $_FILES. Call the function once for each uploaded file. + * @param array|false $overrides An associative array of names => values to override default variables. Default false. + * @param string $time Time formatted in 'yyyy/mm'. + * @param string $action Expected value for $_POST['action']. + * @return array On success, returns an associative array of file attributes. On failure, returns + * $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ). */ -function wp_handle_upload( &$file, $overrides = false, $time = null ) { +function _wp_handle_upload( &$file, $overrides, $time, $action ) { // The default error handler. if ( ! function_exists( 'wp_handle_upload_error' ) ) { function wp_handle_upload_error( &$file, $message ) { - return array( 'error'=>$message ); + return array( 'error' => $message ); } } /** - * Filter data for the current file to upload. + * Filter the data for a file before it is uploaded to WordPress. * - * @since 2.9.0 + * The dynamic portion of the hook name, `$action`, refers to the post action. + * + * @since 2.9.0 as 'wp_handle_upload_prefilter'. + * @since 4.0.0 Converted to a dynamic hook with `$action`. * * @param array $file An array of data for a single file. */ - $file = apply_filters( 'wp_handle_upload_prefilter', $file ); + $file = apply_filters( "{$action}_prefilter", $file ); // You may define your own function and pass the name in $overrides['upload_error_handler'] $upload_error_handler = 'wp_handle_upload_error'; + if ( isset( $overrides['upload_error_handler'] ) ) { + $upload_error_handler = $overrides['upload_error_handler']; + } // You may have had one or more 'wp_handle_upload_prefilter' functions error out the file. Handle that gracefully. - if ( isset( $file['error'] ) && !is_numeric( $file['error'] ) && $file['error'] ) + if ( isset( $file['error'] ) && ! is_numeric( $file['error'] ) && $file['error'] ) { return $upload_error_handler( $file, $file['error'] ); + } + + // Install user overrides. Did we mention that this voids your warranty? // You may define your own function and pass the name in $overrides['unique_filename_callback'] $unique_filename_callback = null; + if ( isset( $overrides['unique_filename_callback'] ) ) { + $unique_filename_callback = $overrides['unique_filename_callback']; + } - // $_POST['action'] must be set and its value must equal $overrides['action'] or this: - $action = 'wp_handle_upload'; - - // Courtesy of php.net, the strings that describe the error indicated in $_FILES[{form field}]['error']. - $upload_error_strings = array( false, - __( "The uploaded file exceeds the upload_max_filesize directive in php.ini." ), - __( "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form." ), - __( "The uploaded file was only partially uploaded." ), - __( "No file was uploaded." ), - '', - __( "Missing a temporary folder." ), - __( "Failed to write file to disk." ), - __( "File upload stopped by extension." )); + /* + * This may not have orignially been intended to be overrideable, + * but historically has been. + */ + if ( isset( $overrides['upload_error_strings'] ) ) { + $upload_error_strings = $overrides['upload_error_strings']; + } else { + // Courtesy of php.net, the strings that describe the error indicated in $_FILES[{form field}]['error']. + $upload_error_strings = array( + false, + __( 'The uploaded file exceeds the upload_max_filesize directive in php.ini.' ), + __( 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.' ), + __( 'The uploaded file was only partially uploaded.' ), + __( 'No file was uploaded.' ), + '', + __( 'Missing a temporary folder.' ), + __( 'Failed to write file to disk.' ), + __( 'File upload stopped by extension.' ) + ); + } // All tests are on by default. Most can be turned off by $overrides[{test_name}] = false; - $test_form = true; - $test_size = true; - $test_upload = true; + $test_form = isset( $overrides['test_form'] ) ? $overrides['test_form'] : true; + $test_size = isset( $overrides['test_size'] ) ? $overrides['test_size'] : true; - // If you override this, you must provide $ext and $type!!!! - $test_type = true; - $mimes = false; - - // Install user overrides. Did we mention that this voids your warranty? - if ( is_array( $overrides ) ) - extract( $overrides, EXTR_OVERWRITE ); + // If you override this, you must provide $ext and $type!! + $test_type = isset( $overrides['test_type'] ) ? $overrides['test_type'] : true; + $mimes = isset( $overrides['mimes'] ) ? $overrides['mimes'] : false; // A correct form post will pass this test. - if ( $test_form && (!isset( $_POST['action'] ) || ($_POST['action'] != $action ) ) ) - return call_user_func($upload_error_handler, $file, __( 'Invalid form submission.' )); - + if ( $test_form && ( ! isset( $_POST['action'] ) || ( $_POST['action'] != $action ) ) ) { + return call_user_func( $upload_error_handler, $file, __( 'Invalid form submission.' ) ); + } // A successful upload will pass this test. It makes no sense to override this one. if ( isset( $file['error'] ) && $file['error'] > 0 ) { return call_user_func( $upload_error_handler, $file, $upload_error_strings[ $file['error'] ] ); } + $test_file_size = 'wp_handle_upload' === $action ? $file['size'] : filesize( $file['tmp_name'] ); // A non-empty file will pass this test. - if ( $test_size && !($file['size'] > 0 ) ) { - if ( is_multisite() ) + if ( $test_size && ! ( $test_file_size > 0 ) ) { + if ( is_multisite() ) { $error_msg = __( 'File is empty. Please upload something more substantial.' ); - else + } else { $error_msg = __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' ); - return call_user_func($upload_error_handler, $file, $error_msg); + } + return call_user_func( $upload_error_handler, $file, $error_msg ); } // A properly uploaded file will pass this test. There should be no reason to override this one. - if ( $test_upload && ! @ is_uploaded_file( $file['tmp_name'] ) ) - return call_user_func($upload_error_handler, $file, __( 'Specified file failed upload test.' )); + $test_uploaded_file = 'wp_handle_upload' === $action ? @ is_uploaded_file( $file['tmp_name'] ) : @ is_file( $file['tmp_name'] ); + if ( ! $test_uploaded_file ) { + return call_user_func( $upload_error_handler, $file, __( 'Specified file failed upload test.' ) ); + } // A correct MIME type will pass this test. Override $mimes or use the upload_mimes filter. if ( $test_type ) { $wp_filetype = wp_check_filetype_and_ext( $file['tmp_name'], $file['name'], $mimes ); - - extract( $wp_filetype ); + $ext = empty( $wp_filetype['ext'] ) ? '' : $wp_filetype['ext']; + $type = empty( $wp_filetype['type'] ) ? '' : $wp_filetype['type']; + $proper_filename = empty( $wp_filetype['proper_filename'] ) ? '' : $wp_filetype['proper_filename']; // Check to see if wp_check_filetype_and_ext() determined the filename was incorrect - if ( $proper_filename ) + if ( $proper_filename ) { $file['name'] = $proper_filename; - - if ( ( !$type || !$ext ) && !current_user_can( 'unfiltered_upload' ) ) - return call_user_func($upload_error_handler, $file, __( 'Sorry, this file type is not permitted for security reasons.' )); - - if ( !$ext ) - $ext = ltrim(strrchr($file['name'], '.'), '.'); - - if ( !$type ) + } + if ( ( ! $type || !$ext ) && ! current_user_can( 'unfiltered_upload' ) ) { + return call_user_func( $upload_error_handler, $file, __( 'Sorry, this file type is not permitted for security reasons.' ) ); + } + if ( ! $type ) { $type = $file['type']; + } } else { $type = ''; } - // A writable uploads dir will pass this test. Again, there's no point overriding this one. - if ( ! ( ( $uploads = wp_upload_dir($time) ) && false === $uploads['error'] ) ) - return call_user_func($upload_error_handler, $file, $uploads['error'] ); + /* + * A writable uploads dir will pass this test. Again, there's no point + * overriding this one. + */ + if ( ! ( ( $uploads = wp_upload_dir( $time ) ) && false === $uploads['error'] ) ) { + return call_user_func( $upload_error_handler, $file, $uploads['error'] ); + } $filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback ); - // Move the file to the uploads dir + // Move the file to the uploads dir. $new_file = $uploads['path'] . "/$filename"; - if ( false === @ move_uploaded_file( $file['tmp_name'], $new_file ) ) { - if ( 0 === strpos( $uploads['basedir'], ABSPATH ) ) + if ( 'wp_handle_upload' === $action ) { + $move_new_file = @ move_uploaded_file( $file['tmp_name'], $new_file ); + } else { + // use copy and unlink because rename breaks streams. + $move_new_file = @ copy( $file['tmp_name'], $new_file ); + unlink( $file['tmp_name'] ); + } + + if ( false === $move_new_file ) { + if ( 0 === strpos( $uploads['basedir'], ABSPATH ) ) { $error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir']; - else + } else { $error_path = basename( $uploads['basedir'] ) . $uploads['subdir']; - + } return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $error_path ) ); } - // Set correct file permissions + // Set correct file permissions. $stat = stat( dirname( $new_file )); $perms = $stat['mode'] & 0000666; @ chmod( $new_file, $perms ); - // Compute the URL + // Compute the URL. $url = $uploads['url'] . "/$filename"; - if ( is_multisite() ) + if ( is_multisite() ) { delete_transient( 'dirsize_cache' ); + } /** * Filter the data array for the uploaded file. @@ -343,140 +404,72 @@ function wp_handle_upload( &$file, $overrides = false, $time = null ) { * @type string $url URL of the uploaded file. * @type string $type File type. * } - * @param string $context The type of upload action. Accepts 'upload' or 'sideload'. + * @param string $context The type of upload action. Values include 'upload' or 'sideload'. */ - return apply_filters( 'wp_handle_upload', array( 'file' => $new_file, 'url' => $url, 'type' => $type ), 'upload' ); + return apply_filters( 'wp_handle_upload', array( + 'file' => $new_file, + 'url' => $url, + 'type' => $type + ), 'wp_handle_sideload' === $action ? 'sideload' : 'upload' ); } /** - * Handle sideloads, which is the process of retrieving a media item from another server instead of - * a traditional media upload. This process involves sanitizing the filename, checking extensions - * for mime type, and moving the file to the appropriate directory within the uploads directory. + * Wrapper for _wp_handle_upload(), passes 'wp_handle_upload' action. * - * @since 2.6.0 + * @since 2.0.0 + * + * @see _wp_handle_upload() * - * @uses wp_handle_upload_error - * @uses wp_check_filetype_and_ext - * @uses current_user_can - * @uses wp_upload_dir - * @uses wp_unique_filename - * @param array $file an array similar to that of a PHP $_FILES POST array - * @param array $overrides Optional. An associative array of names=>values to override default variables with extract( $overrides, EXTR_OVERWRITE ). - * @param string $time Optional. Time formatted in 'yyyy/mm'. - * @return array On success, returns an associative array of file attributes. On failure, returns $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ). + * @param array $file Reference to a single element of $_FILES. Call the function once for + * each uploaded file. + * @param array|bool $overrides Optional. An associative array of names=>values to override default + * variables. Default false. + * @param string $time Optional. Time formatted in 'yyyy/mm'. Default null. + * @return array On success, returns an associative array of file attributes. On failure, returns + * $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ). */ -function wp_handle_sideload( &$file, $overrides = false, $time = null ) { - // The default error handler. - if (! function_exists( 'wp_handle_upload_error' ) ) { - function wp_handle_upload_error( &$file, $message ) { - return array( 'error'=>$message ); - } +function wp_handle_upload( &$file, $overrides = false, $time = null ) { + /* + * $_POST['action'] must be set and its value must equal $overrides['action'] + * or this: + */ + $action = 'wp_handle_upload'; + if ( isset( $overrides['action'] ) ) { + $action = $overrides['action']; } - // You may define your own function and pass the name in $overrides['upload_error_handler'] - $upload_error_handler = 'wp_handle_upload_error'; - - // You may define your own function and pass the name in $overrides['unique_filename_callback'] - $unique_filename_callback = null; + return _wp_handle_upload( $file, $overrides, $time, $action ); +} - // $_POST['action'] must be set and its value must equal $overrides['action'] or this: +/** + * Wrapper for _wp_handle_upload(), passes 'wp_handle_sideload' action + * + * @since 2.6.0 + * + * @see _wp_handle_upload() + * + * @param array $file An array similar to that of a PHP $_FILES POST array + * @param array|bool $overrides Optional. An associative array of names=>values to override default + * variables. Default false. + * @param string $time Optional. Time formatted in 'yyyy/mm'. Default null. + * @return array On success, returns an associative array of file attributes. On failure, returns + * $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ). + */ +function wp_handle_sideload( &$file, $overrides = false, $time = null ) { + /* + * $_POST['action'] must be set and its value must equal $overrides['action'] + * or this: + */ $action = 'wp_handle_sideload'; - - // Courtesy of php.net, the strings that describe the error indicated in $_FILES[{form field}]['error']. - $upload_error_strings = array( false, - __( "The uploaded file exceeds the upload_max_filesize directive in php.ini." ), - __( "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form." ), - __( "The uploaded file was only partially uploaded." ), - __( "No file was uploaded." ), - '', - __( "Missing a temporary folder." ), - __( "Failed to write file to disk." ), - __( "File upload stopped by extension." )); - - // All tests are on by default. Most can be turned off by $overrides[{test_name}] = false; - $test_form = true; - $test_size = true; - - // If you override this, you must provide $ext and $type!!!! - $test_type = true; - $mimes = false; - - // Install user overrides. Did we mention that this voids your warranty? - if ( is_array( $overrides ) ) - extract( $overrides, EXTR_OVERWRITE ); - - // A correct form post will pass this test. - if ( $test_form && (!isset( $_POST['action'] ) || ($_POST['action'] != $action ) ) ) - return $upload_error_handler( $file, __( 'Invalid form submission.' )); - - // A successful upload will pass this test. It makes no sense to override this one. - if ( ! empty( $file['error'] ) ) - return $upload_error_handler( $file, $upload_error_strings[$file['error']] ); - - // A non-empty file will pass this test. - if ( $test_size && !(filesize($file['tmp_name']) > 0 ) ) - return $upload_error_handler( $file, __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini.' )); - - // A properly uploaded file will pass this test. There should be no reason to override this one. - if (! @ is_file( $file['tmp_name'] ) ) - return $upload_error_handler( $file, __( 'Specified file does not exist.' )); - - // A correct MIME type will pass this test. Override $mimes or use the upload_mimes filter. - if ( $test_type ) { - $wp_filetype = wp_check_filetype_and_ext( $file['tmp_name'], $file['name'], $mimes ); - - extract( $wp_filetype ); - - // Check to see if wp_check_filetype_and_ext() determined the filename was incorrect - if ( $proper_filename ) - $file['name'] = $proper_filename; - - if ( ( !$type || !$ext ) && !current_user_can( 'unfiltered_upload' ) ) - return $upload_error_handler( $file, __( 'Sorry, this file type is not permitted for security reasons.' )); - - if ( !$ext ) - $ext = ltrim(strrchr($file['name'], '.'), '.'); - - if ( !$type ) - $type = $file['type']; - } - - // A writable uploads dir will pass this test. Again, there's no point overriding this one. - if ( ! ( ( $uploads = wp_upload_dir( $time ) ) && false === $uploads['error'] ) ) - return $upload_error_handler( $file, $uploads['error'] ); - - $filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback ); - - // Strip the query strings. - $filename = str_replace('?','-', $filename); - $filename = str_replace('&','-', $filename); - - // Move the file to the uploads dir - $new_file = $uploads['path'] . "/$filename"; - if ( false === @ rename( $file['tmp_name'], $new_file ) ) { - if ( 0 === strpos( $uploads['basedir'], ABSPATH ) ) - $error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir']; - else - $error_path = basename( $uploads['basedir'] ) . $uploads['subdir']; - return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $error_path ) ); + if ( isset( $overrides['action'] ) ) { + $action = $overrides['action']; } - - // Set correct file permissions - $stat = stat( dirname( $new_file )); - $perms = $stat['mode'] & 0000666; - @ chmod( $new_file, $perms ); - - // Compute the URL - $url = $uploads['url'] . "/$filename"; - - /** This filter is documented in wp-admin/includes/file.php */ - $return = apply_filters( 'wp_handle_upload', array( 'file' => $new_file, 'url' => $url, 'type' => $type ), 'sideload' ); - - return $return; + return _wp_handle_upload( $file, $overrides, $time, $action ); } + /** - * Downloads a url to a local temporary file using the WordPress HTTP Class. + * Downloads a URL to a local temporary file using the WordPress HTTP Class. * Please note, That the calling function must unlink() the file. * * @since 2.5.0 @@ -552,6 +545,8 @@ function verify_file_md5( $filename, $expected_md5 ) { * * @since 2.5.0 * + * @global WP_Filesystem_Base $wp_filesystem Subclass + * * @param string $file Full path and filename of zip archive * @param string $to Full path on the filesystem to extract archive to * @return mixed WP_Error on failure, True on success @@ -594,7 +589,7 @@ function unzip_file($file, $to) { * * @param bool $ziparchive Whether to use ZipArchive. Default true. */ - if ( class_exists( 'ZipArchive' ) && apply_filters( 'unzip_file_use_ziparchive', true ) ) { + if ( class_exists( 'ZipArchive', false ) && apply_filters( 'unzip_file_use_ziparchive', true ) ) { $result = _unzip_file_ziparchive($file, $to, $needed_dirs); if ( true === $result ) { return $result; @@ -615,6 +610,8 @@ function unzip_file($file, $to) { * @see unzip_file * @access private * + * @global WP_Filesystem_Base $wp_filesystem Subclass + * * @param string $file Full path and filename of zip archive * @param string $to Full path on the filesystem to extract archive to * @param array $needed_dirs A partial list of required folders needed to be created. @@ -675,8 +672,10 @@ function _unzip_file_ziparchive($file, $to, $needed_dirs = array() ) { // Create those directories if need be: foreach ( $needed_dirs as $_dir ) { - if ( ! $wp_filesystem->mkdir($_dir, FS_CHMOD_DIR) && ! $wp_filesystem->is_dir($_dir) ) // Only check to see if the Dir exists upon creation failure. Less I/O this way. + // Only check to see if the Dir exists upon creation failure. Less I/O this way. + if ( ! $wp_filesystem->mkdir( $_dir, FS_CHMOD_DIR ) && ! $wp_filesystem->is_dir( $_dir ) ) { return new WP_Error( 'mkdir_failed_ziparchive', __( 'Could not create directory.' ), substr( $_dir, strlen( $to ) ) ); + } } unset($needed_dirs); @@ -711,6 +710,8 @@ function _unzip_file_ziparchive($file, $to, $needed_dirs = array() ) { * @see unzip_file * @access private * + * @global WP_Filesystem_Base $wp_filesystem Subclass + * * @param string $file Full path and filename of zip archive * @param string $to Full path on the filesystem to extract archive to * @param array $needed_dirs A partial list of required folders needed to be created. @@ -803,6 +804,8 @@ function _unzip_file_pclzip($file, $to, $needed_dirs = array()) { * * @since 2.5.0 * + * @global WP_Filesystem_Base $wp_filesystem Subclass + * * @param string $from source directory * @param string $to destination directory * @param array $skip_list a list of files/folders to skip copying @@ -852,25 +855,30 @@ function copy_dir($from, $to, $skip_list = array() ) { * Initialises and connects the WordPress Filesystem Abstraction classes. * This function will include the chosen transport and attempt connecting. * - * Plugins may add extra transports, And force WordPress to use them by returning the filename via the 'filesystem_method_file' filter. + * Plugins may add extra transports, And force WordPress to use them by returning + * the filename via the {@see 'filesystem_method_file'} filter. * * @since 2.5.0 * - * @param array $args (optional) Connection args, These are passed directly to the WP_Filesystem_*() classes. - * @param string $context (optional) Context for get_filesystem_method(), See function declaration for more information. - * @return boolean false on failure, true on success + * @global WP_Filesystem_Base $wp_filesystem Subclass + * + * @param array|false $args Optional. Connection args, These are passed directly to + * the `WP_Filesystem_*()` classes. Default false. + * @param string|false $context Optional. Context for get_filesystem_method(). Default false. + * @param bool $allow_relaxed_file_ownership Optional. Whether to allow Group/World writable. Default false. + * @return null|bool false on failure, true on success. */ -function WP_Filesystem( $args = false, $context = false ) { +function WP_Filesystem( $args = false, $context = false, $allow_relaxed_file_ownership = false ) { global $wp_filesystem; require_once(ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php'); - $method = get_filesystem_method($args, $context); + $method = get_filesystem_method( $args, $context, $allow_relaxed_file_ownership ); if ( ! $method ) return false; - if ( ! class_exists("WP_Filesystem_$method") ) { + if ( ! class_exists( "WP_Filesystem_$method" ) ) { /** * Filter the path for a specific filesystem method class file. @@ -915,38 +923,70 @@ function WP_Filesystem( $args = false, $context = false ) { } /** - * Determines which Filesystem Method to use. - * The priority of the Transports are: Direct, SSH2, FTP PHP Extension, FTP Sockets (Via Sockets class, or fsockopen()) + * Determines which method to use for reading, writing, modifying, or deleting + * files on the filesystem. + * + * The priority of the transports are: Direct, SSH2, FTP PHP Extension, FTP Sockets + * (Via Sockets class, or `fsockopen()`). Valid values for these are: 'direct', 'ssh2', + * 'ftpext' or 'ftpsockets'. + * + * The return value can be overridden by defining the `FS_METHOD` constant in `wp-config.php`, + * or filtering via {@see 'filesystem_method'}. + * + * @link https://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants * - * Note that the return value of this function can be overridden in 2 ways - * - By defining FS_METHOD in your wp-config.php file - * - By using the filesystem_method filter - * Valid values for these are: 'direct', 'ssh2', 'ftpext' or 'ftpsockets' - * Plugins may also define a custom transport handler, See the WP_Filesystem function for more information. + * Plugins may define a custom transport handler, See WP_Filesystem(). * * @since 2.5.0 * - * @param array $args Connection details. - * @param string $context Full path to the directory that is tested for being writable. + * @global callable $_wp_filesystem_direct_method + * + * @param array $args Optional. Connection details. Default empty array. + * @param string $context Optional. Full path to the directory that is tested + * for being writable. Default false. + * @param bool $allow_relaxed_file_ownership Optional. Whether to allow Group/World writable. + * Default false. * @return string The transport to use, see description for valid return values. */ -function get_filesystem_method($args = array(), $context = false) { +function get_filesystem_method( $args = array(), $context = false, $allow_relaxed_file_ownership = false ) { $method = defined('FS_METHOD') ? FS_METHOD : false; // Please ensure that this is either 'direct', 'ssh2', 'ftpext' or 'ftpsockets' - if ( ! $method && function_exists('getmyuid') && function_exists('fileowner') ){ - if ( !$context ) - $context = WP_CONTENT_DIR; + if ( ! $context ) { + $context = WP_CONTENT_DIR; + } + + // If the directory doesn't exist (wp-content/languages) then use the parent directory as we'll create it. + if ( WP_LANG_DIR == $context && ! is_dir( $context ) ) { + $context = dirname( $context ); + } + + $context = trailingslashit( $context ); - // If the directory doesn't exist (wp-content/languages) then use the parent directory as we'll create it. - if ( WP_LANG_DIR == $context && ! is_dir( $context ) ) - $context = dirname( $context ); + if ( ! $method ) { - $context = trailingslashit($context); $temp_file_name = $context . 'temp-write-test-' . time(); $temp_handle = @fopen($temp_file_name, 'w'); if ( $temp_handle ) { - if ( getmyuid() == @fileowner($temp_file_name) ) + + // Attempt to determine the file owner of the WordPress files, and that of newly created files + $wp_file_owner = $temp_file_owner = false; + if ( function_exists('fileowner') ) { + $wp_file_owner = @fileowner( __FILE__ ); + $temp_file_owner = @fileowner( $temp_file_name ); + } + + if ( $wp_file_owner !== false && $wp_file_owner === $temp_file_owner ) { + // WordPress is creating files as the same owner as the WordPress files, + // this means it's safe to modify & create new files via PHP. $method = 'direct'; + $GLOBALS['_wp_filesystem_direct_method'] = 'file_owner'; + } elseif ( $allow_relaxed_file_ownership ) { + // The $context directory is writable, and $allow_relaxed_file_ownership is set, this means we can modify files + // safely in this directory. This mode doesn't create new files, only alter existing ones. + $method = 'direct'; + $GLOBALS['_wp_filesystem_direct_method'] = 'relaxed_ownership'; + } + @fclose($temp_handle); @unlink($temp_file_name); } @@ -961,30 +1001,45 @@ function get_filesystem_method($args = array(), $context = false) { * * @since 2.6.0 * - * @param string $method Filesystem method to return. - * @param array $args An array of connection details for the method. + * @param string $method Filesystem method to return. + * @param array $args An array of connection details for the method. + * @param string $context Full path to the directory that is tested for being writable. + * @param bool $allow_relaxed_file_ownership Whether to allow Group/World writable. */ - return apply_filters( 'filesystem_method', $method, $args ); + return apply_filters( 'filesystem_method', $method, $args, $context, $allow_relaxed_file_ownership ); } /** - * Displays a form to the user to request for their FTP/SSH details in order to connect to the filesystem. + * Displays a form to the user to request for their FTP/SSH details in order + * to connect to the filesystem. + * * All chosen/entered details are saved, Excluding the Password. * - * Hostnames may be in the form of hostname:portnumber (eg: wordpress.org:2467) to specify an alternate FTP/SSH port. + * Hostnames may be in the form of hostname:portnumber (eg: wordpress.org:2467) + * to specify an alternate FTP/SSH port. * - * Plugins may override this form by returning true|false via the request_filesystem_credentials filter. + * Plugins may override this form by returning true|false via the + * {@see 'request_filesystem_credentials'} filter. * - * @since 2.5.0 + * @since 2.5. + * + * @global string $pagenow * - * @param string $form_post the URL to post the form to - * @param string $type the chosen Filesystem method in use - * @param boolean $error if the current request has failed to connect - * @param string $context The directory which is needed access to, The write-test will be performed on this directory by get_filesystem_method() - * @param string $extra_fields Extra POST fields which should be checked for to be included in the post. - * @return boolean False on failure. True on success. + * @param string $form_post The URL to post the form to. + * @param string $type Optional. Chosen type of filesystem. Default empty. + * @param bool $error Optional. Whether the current request has failed to connect. + * Default false. + * @param string $context Optional. Full path to the directory that is tested + * for being writable. Default false. + * @param array $extra_fields Optional. Extra POST fields which should be checked for + * to be included in the post. Default null. + * @param bool $allow_relaxed_file_ownership Optional. Whether to allow Group/World writable. + * Default false. + * + * @return bool False on failure, true on success. */ -function request_filesystem_credentials($form_post, $type = '', $error = false, $context = false, $extra_fields = null) { +function request_filesystem_credentials( $form_post, $type = '', $error = false, $context = false, $extra_fields = null, $allow_relaxed_file_ownership = false ) { + global $pagenow; /** * Filter the filesystem credentials form output. @@ -994,21 +1049,24 @@ function request_filesystem_credentials($form_post, $type = '', $error = false, * * @since 2.5.0 * - * @param mixed $output Form output to return instead. Default empty. - * @param string $form_post URL to POST the form to. - * @param string $type Chosen type of filesystem. - * @param bool $error Whether the current request has failed to connect. - * Default false. - * @param string $context Full path to the directory that is tested for - * being writable. - * @param array $extra_fields Extra POST fields. + * @param mixed $output Form output to return instead. Default empty. + * @param string $form_post The URL to post the form to. + * @param string $type Chosen type of filesystem. + * @param bool $error Whether the current request has failed to connect. + * Default false. + * @param string $context Full path to the directory that is tested for + * being writable. + * @param bool $allow_relaxed_file_ownership Whether to allow Group/World writable. + * Default false. + * @param array $extra_fields Extra POST fields. */ - $req_cred = apply_filters( 'request_filesystem_credentials', '', $form_post, $type, $error, $context, $extra_fields ); + $req_cred = apply_filters( 'request_filesystem_credentials', '', $form_post, $type, $error, $context, $extra_fields, $allow_relaxed_file_ownership ); if ( '' !== $req_cred ) return $req_cred; - if ( empty($type) ) - $type = get_filesystem_method(array(), $context); + if ( empty($type) ) { + $type = get_filesystem_method( array(), $context, $allow_relaxed_file_ownership ); + } if ( 'direct' == $type ) return true; @@ -1027,7 +1085,7 @@ function request_filesystem_credentials($form_post, $type = '', $error = false, $credentials['public_key'] = defined('FTP_PUBKEY') ? FTP_PUBKEY : (!empty($_POST['public_key']) ? wp_unslash( $_POST['public_key'] ) : ''); $credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : (!empty($_POST['private_key']) ? wp_unslash( $_POST['private_key'] ) : ''); - //sanitize the hostname, Some people might pass in odd-data: + // Sanitize the hostname, Some people might pass in odd-data: $credentials['hostname'] = preg_replace('|\w+://|', '', $credentials['hostname']); //Strip any schemes off if ( strpos($credentials['hostname'], ':') ) { @@ -1038,15 +1096,15 @@ function request_filesystem_credentials($form_post, $type = '', $error = false, unset($credentials['port']); } - if ( ( defined('FTP_SSH') && FTP_SSH ) || ( defined('FS_METHOD') && 'ssh2' == FS_METHOD ) ) + if ( ( defined( 'FTP_SSH' ) && FTP_SSH ) || ( defined( 'FS_METHOD' ) && 'ssh2' == FS_METHOD ) ) { $credentials['connection_type'] = 'ssh'; - else if ( (defined('FTP_SSL') && FTP_SSL) && 'ftpext' == $type ) //Only the FTP Extension understands SSL + } elseif ( ( defined( 'FTP_SSL' ) && FTP_SSL ) && 'ftpext' == $type ) { //Only the FTP Extension understands SSL $credentials['connection_type'] = 'ftps'; - else if ( !empty($_POST['connection_type']) ) + } elseif ( ! empty( $_POST['connection_type'] ) ) { $credentials['connection_type'] = wp_unslash( $_POST['connection_type'] ); - else if ( !isset($credentials['connection_type']) ) //All else fails (And it's not defaulted to something else saved), Default to FTP + } elseif ( ! isset( $credentials['connection_type'] ) ) { //All else fails (And it's not defaulted to something else saved), Default to FTP $credentials['connection_type'] = 'ftp'; - + } if ( ! $error && ( ( !empty($credentials['password']) && !empty($credentials['username']) && !empty($credentials['hostname']) ) || @@ -1057,15 +1115,18 @@ function request_filesystem_credentials($form_post, $type = '', $error = false, $stored_credentials['hostname'] .= ':' . $stored_credentials['port']; unset($stored_credentials['password'], $stored_credentials['port'], $stored_credentials['private_key'], $stored_credentials['public_key']); - update_option('ftp_credentials', $stored_credentials); + if ( ! wp_installing() ) { + update_option( 'ftp_credentials', $stored_credentials ); + } return $credentials; } - $hostname = ''; - $username = ''; - $password = ''; - $connection_type = ''; - if ( !empty($credentials) ) - extract($credentials, EXTR_OVERWRITE); + $hostname = isset( $credentials['hostname'] ) ? $credentials['hostname'] : ''; + $username = isset( $credentials['username'] ) ? $credentials['username'] : ''; + $public_key = isset( $credentials['public_key'] ) ? $credentials['public_key'] : ''; + $private_key = isset( $credentials['private_key'] ) ? $credentials['private_key'] : ''; + $port = isset( $credentials['port'] ) ? $credentials['port'] : ''; + $connection_type = isset( $credentials['connection_type'] ) ? $credentials['connection_type'] : ''; + if ( $error ) { $error_string = __('ERROR: There was an error connecting to the server, Please verify the settings are correct.'); if ( is_wp_error($error) ) @@ -1105,14 +1166,21 @@ jQuery(function($){ jQuery("#ftp, #ftps").click(function () { jQuery("#ssh_keys").hide(); }); - jQuery('form input[value=""]:first').focus(); + jQuery('#request-filesystem-credentials-form input[value=""]:first').focus(); }); --> -

+" . __( 'Connection Information' ) . ""; +?> +

0' ); ?>

post_status ) { echo ''; if ( $last_user = get_userdata( get_post_meta( $post_ID, '_edit_last', true ) ) ) { - printf(__('Last edited by %1$s on %2$s at %3$s'), esc_html( $last_user->display_name ), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified)); + printf( __( 'Last edited by %1$s on %2$s at %3$s' ), esc_html( $last_user->display_name ), mysql2date( __( 'F j, Y' ), $post->post_modified ), mysql2date( __( 'g:i a' ), $post->post_modified ) ); } else { - printf(__('Last edited on %1$s at %2$s'), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified)); + printf( __( 'Last edited on %1$s at %2$s' ), mysql2date( __( 'F j, Y' ), $post->post_modified ), mysql2date( __( 'g:i a' ), $post->post_modified ) ); } echo ''; } ?> @@ -612,7 +740,7 @@ if ( post_type_supports( $post_type, 'comments' ) ) wp_comment_reply(); ?> -post_title ) : ?> +post_title ) : ?> diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php index 3d0ebf5..e73ee48 100644 --- a/wp-admin/edit-form-comment.php +++ b/wp-admin/edit-form-comment.php @@ -13,56 +13,58 @@ if ( !defined('ABSPATH') ) comment_ID) ?>

+comment_post_ID > 0 ) : + $comment_link = get_comment_link( $comment ); +?> +

+ +

+ - + - - + + - - + +


- comment_author_email ) { - printf( __( 'E-mail (%s):' ), get_comment_author_email_link( __( 'send e-mail' ), '', '' ) ); - } else { - _e( 'E-mail:' ); - } -?>			+ +
- comment_author_url ) && 'http://' != $comment->comment_author_url ) { - $link = '' . __('visit site') . ''; - /** This filter is documented in wp-includes/comment-template.php */ - printf( __( 'URL (%s):' ), apply_filters( 'get_comment_author_link', $link ) ); - } else { - _e( 'URL:' ); - } ?>			+ +

' . __( 'Comment' ) . ''; $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' ); wp_editor( $comment->comment_content, 'content', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) ); wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?> @@ -71,42 +73,86 @@ if ( !defined('ABSPATH') )

- -

-comment_approved, '1' ); ?> name="comment_status" value="1" />
-comment_approved, '0' ); ?> name="comment_status" value="0" />
-comment_approved, 'spam' ); ?> name="comment_status" value="spam" /> -

- - -

- -

- +

+ +comment_approved, '1' ); ?> name="comment_status" value="1" />
+comment_approved, '0' ); ?> name="comment_status" value="0" />
+comment_approved, 'spam' ); ?> name="comment_status" value="spam" /> +

%1$s'); -$date = date_i18n( $datef, strtotime( $comment->comment_date ) ); +$datef = __( 'M j, Y @ H:i' ); +?> +' . date_i18n( $datef, strtotime( $comment->comment_date ) ) . '' +); +?> + +

+ + +

+ +comment_post_ID; +if ( current_user_can( 'edit_post', $post_id ) ) { + $post_link = ""; + $post_link .= esc_html( get_the_title( $post_id ) ) . ''; +} else { + $post_link = esc_html( get_the_title( $post_id ) ); +} ?> - -

+ +

+ ' . $post_link . '' + ); ?>

+ +comment_parent ) : + $parent = get_comment( $comment->comment_parent ); + if ( $parent ) : + $parent_link = esc_url( get_comment_link( $parent ) ); + $name = get_comment_author( $parent ); + ?> +

+ ' . $name . '' + ); ?> +

+ + + +

@@ -135,18 +181,19 @@ do_action( 'add_meta_boxes', 'comment', $comment ); * * @since 3.0.0 * - * @param object $comment Comment object. + * @param WP_Comment $comment Comment object. */ do_action( 'add_meta_boxes_comment', $comment ); do_meta_boxes(null, 'normal', $comment); +$referer = wp_get_referer(); ?>

- + @@ -155,6 +202,8 @@ do_meta_boxes(null, 'normal', $comment);

+ +Links / Edit Link' ), 'link-manager.php' ); $submit_text = __('Update Link'); - $form = '

'; + $form_name = 'editlink'; $nonce_action = 'update-bookmark_' . $link_id; } else { $heading = sprintf( __( 'Links / Add New Link' ), 'link-manager.php' ); $submit_text = __('Add Link'); - $form = ''; + $form_name = 'addlink'; $nonce_action = 'add-bookmark'; } @@ -62,7 +62,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

' . __( 'For more information:' ) . '

' . - '

' . __( 'Documentation on Creating Links' ) . '

' . + '

' . __( 'Documentation on Creating Links' ) . '

' . '

' . __( 'Support Forums' ) . '

' ); @@ -70,17 +70,17 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>

@@ -99,7 +99,7 @@ wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>

http://wordpress.org/ — don’t forget the http://'); ?>

@@ -107,7 +107,7 @@ wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>

@@ -118,11 +118,7 @@ wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>

labels->edit_item; ?>

+ + +

+ +

labels->name ); ?>

+ +

labels->name ); ?>

+ +

+ +> + + + + -> - - - - - - + + - - + + slug ) ? apply_filters( 'editable_slug', $tag->slug, $tag ) : ''; ?> - - - + + - - - + + + /** * Fires after the Edit Term form fields are displayed. * - * The dynamic portion of the hook name, $taxonomy, refers to + * The dynamic portion of the hook name, `$taxonomy`, refers to * the taxonomy slug. * * @since 3.0.0 @@ -186,7 +245,7 @@ if ( 'category' == $taxonomy ) { /** * Fires at the end of the Edit Term form for all taxonomies. * - * The dynamic portion of the hook name, $taxonomy, refers to the taxonomy slug. + * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug. * * @since 3.0.0 * @@ -199,6 +258,9 @@ submit_button( __('Update') ); ?> + + +cap->manage_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); +if ( ! in_array( $tax->name, get_taxonomies( array( 'show_ui' => true ) ) ) ) { + wp_die( __( 'You are not allowed to manage these items.' ) ); +} + +if ( ! current_user_can( $tax->cap->manage_terms ) ) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'You are not allowed to manage these items.' ) . '

', + 403 + ); +} + +/** + * $post_type is set when the WP_Terms_List_Table instance is created + * + * @global string $post_type + */ +global $post_type; $wp_list_table = _get_list_table('WP_Terms_List_Table'); $pagenum = $wp_list_table->get_pagenum(); @@ -28,7 +44,7 @@ $title = $tax->labels->name; if ( 'post' != $post_type ) { $parent_file = ( 'attachment' == $post_type ) ? 'upload.php' : "edit.php?post_type=$post_type"; $submenu_file = "edit-tags.php?taxonomy=$taxonomy&post_type=$post_type"; -} else if ( 'link_category' == $tax->name ) { +} elseif ( 'link_category' == $tax->name ) { $parent_file = 'link-manager.php'; $submenu_file = 'edit-tags.php?taxonomy=link_category'; } else { @@ -36,7 +52,15 @@ if ( 'post' != $post_type ) { $submenu_file = "edit-tags.php?taxonomy=$taxonomy"; } -add_screen_option( 'per_page', array( 'label' => $title, 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page' ) ); +add_screen_option( 'per_page', array( 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page' ) ); + +get_current_screen()->set_screen_reader_content( array( + 'heading_pagination' => $tax->labels->items_list_navigation, + 'heading_list' => $tax->labels->items_list, +) ); + +$location = false; +$referer = wp_get_referer(); switch ( $wp_list_table->current_action() ) { @@ -44,60 +68,70 @@ case 'add-tag': check_admin_referer( 'add-tag', '_wpnonce_add-tag' ); - if ( !current_user_can( $tax->cap->edit_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + if ( ! current_user_can( $tax->cap->edit_terms ) ) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'You are not allowed to add this item.' ) . '

', + 403 + ); + } $ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST ); $location = 'edit-tags.php?taxonomy=' . $taxonomy; if ( 'post' != $post_type ) $location .= '&post_type=' . $post_type; - if ( $referer = wp_get_original_referer() ) { - if ( false !== strpos( $referer, 'edit-tags.php' ) ) - $location = $referer; + if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) { + $location = $referer; } if ( $ret && !is_wp_error( $ret ) ) $location = add_query_arg( 'message', 1, $location ); else - $location = add_query_arg( 'message', 4, $location ); - wp_redirect( $location ); - exit; -break; + $location = add_query_arg( array( 'error' => true, 'message' => 4 ), $location ); + + break; case 'delete': $location = 'edit-tags.php?taxonomy=' . $taxonomy; if ( 'post' != $post_type ) $location .= '&post_type=' . $post_type; - if ( $referer = wp_get_referer() ) { - if ( false !== strpos( $referer, 'edit-tags.php' ) ) - $location = $referer; + + if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) { + $location = $referer; } - if ( !isset( $_REQUEST['tag_ID'] ) ) { - wp_redirect( $location ); - exit; + if ( ! isset( $_REQUEST['tag_ID'] ) ) { + break; } $tag_ID = (int) $_REQUEST['tag_ID']; check_admin_referer( 'delete-tag_' . $tag_ID ); - if ( !current_user_can( $tax->cap->delete_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + if ( ! current_user_can( $tax->cap->delete_terms ) ) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'You are not allowed to delete this item.' ) . '

', + 403 + ); + } wp_delete_term( $tag_ID, $taxonomy ); $location = add_query_arg( 'message', 2, $location ); - wp_redirect( $location ); - exit; -break; + break; case 'bulk-delete': check_admin_referer( 'bulk-tags' ); - if ( !current_user_can( $tax->cap->delete_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + if ( ! current_user_can( $tax->cap->delete_terms ) ) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'You are not allowed to delete these items.' ) . '

', + 403 + ); + } $tags = (array) $_REQUEST['delete_tags']; foreach ( $tags as $tag_ID ) { @@ -107,36 +141,40 @@ case 'bulk-delete': $location = 'edit-tags.php?taxonomy=' . $taxonomy; if ( 'post' != $post_type ) $location .= '&post_type=' . $post_type; - if ( $referer = wp_get_referer() ) { - if ( false !== strpos( $referer, 'edit-tags.php' ) ) - $location = $referer; + if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) { + $location = $referer; } $location = add_query_arg( 'message', 6, $location ); - wp_redirect( $location ); - exit; -break; + break; case 'edit': - $title = $tax->labels->edit_item; + if ( ! isset( $_REQUEST['tag_ID'] ) ) { + break; + } - $tag_ID = (int) $_REQUEST['tag_ID']; + $term_id = (int) $_REQUEST['tag_ID']; + $term = get_term( $term_id ); - $tag = get_term( $tag_ID, $taxonomy, OBJECT, 'edit' ); - if ( ! $tag ) + if ( ! $term instanceof WP_Term ) { wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) ); - require_once( ABSPATH . 'wp-admin/admin-header.php' ); - include( ABSPATH . 'wp-admin/edit-tag-form.php' ); + } -break; + wp_redirect( esc_url_raw( get_edit_term_link( $term_id, $taxonomy, $post_type ) ) ); + exit; case 'editedtag': $tag_ID = (int) $_POST['tag_ID']; check_admin_referer( 'update-tag_' . $tag_ID ); - if ( !current_user_can( $tax->cap->edit_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + if ( ! current_user_can( $tax->cap->edit_terms ) ) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'You are not allowed to edit this item.' ) . '

', + 403 + ); + } $tag = get_term( $tag_ID, $taxonomy ); if ( ! $tag ) @@ -148,27 +186,25 @@ case 'editedtag': if ( 'post' != $post_type ) $location .= '&post_type=' . $post_type; - if ( $referer = wp_get_original_referer() ) { - if ( false !== strpos( $referer, 'edit-tags.php' ) ) - $location = $referer; + if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) { + $location = $referer; } if ( $ret && !is_wp_error( $ret ) ) $location = add_query_arg( 'message', 3, $location ); else - $location = add_query_arg( 'message', 5, $location ); - - wp_redirect( $location ); - exit; -break; + $location = add_query_arg( array( 'error' => true, 'message' => 5 ), $location ); + break; +} -default: -if ( ! empty($_REQUEST['_wp_http_referer']) ) { +if ( ! $location && ! empty( $_REQUEST['_wp_http_referer'] ) ) { $location = remove_query_arg( array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI']) ); +} - if ( ! empty( $_REQUEST['paged'] ) ) - $location = add_query_arg( 'paged', (int) $_REQUEST['paged'] ); - +if ( $location ) { + if ( ! empty( $_REQUEST['paged'] ) ) { + $location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location ); + } wp_redirect( $location ); exit; } @@ -212,15 +248,15 @@ if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $t $help = '

' . __( 'When adding a new tag on this screen, you’ll fill in the following fields:' ) . '

'; $help .= '

' . __( 'Name - The name is how it appears on your site.' ) . '
' . __( 'Name — The name is how it appears on your site.' ) . '
' . __( 'Slug - The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ) . '
' . __( 'Slug — The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ) . '
' . __( 'Parent - Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have child categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown.' ) . '
' . __( 'Parent — Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have child categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown.' ) . '
' . __( 'Description - The description is not prominent by default; however, some themes may display it.' ) . '
' . __( 'Description — The description is not prominent by default; however, some themes may display it.' ) . '

' . '

' . __( 'You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table.' ) . '

'; @@ -234,11 +270,11 @@ if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $t $help = '

' . __( 'For more information:' ) . '

'; if ( 'category' == $taxonomy ) - $help .= '

' . __( 'Documentation on Categories' ) . '

'; + $help .= '

' . __( 'Documentation on Categories' ) . '

'; elseif ( 'link_category' == $taxonomy ) - $help .= '

' . __( 'Documentation on Link Categories' ) . '

'; + $help .= '

' . __( 'Documentation on Link Categories' ) . '

'; else - $help .= '

' . __( 'Documentation on Tags' ) . '

'; + $help .= '

' . __( 'Documentation on Tags' ) . '

'; $help .= '

' . __('Support Forums') . '

'; @@ -249,70 +285,43 @@ if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $t require_once( ABSPATH . 'wp-admin/admin-header.php' ); -if ( !current_user_can($tax->cap->edit_terms) ) - wp_die( __('You are not allowed to edit this item.') ); - -$messages = array(); -$messages['_item'] = array( - 0 => '', // Unused. Messages start at index 1. - 1 => __( 'Item added.' ), - 2 => __( 'Item deleted.' ), - 3 => __( 'Item updated.' ), - 4 => __( 'Item not added.' ), - 5 => __( 'Item not updated.' ), - 6 => __( 'Items deleted.' ) -); -$messages['category'] = array( - 0 => '', // Unused. Messages start at index 1. - 1 => __( 'Category added.' ), - 2 => __( 'Category deleted.' ), - 3 => __( 'Category updated.' ), - 4 => __( 'Category not added.' ), - 5 => __( 'Category not updated.' ), - 6 => __( 'Categories deleted.' ) -); -$messages['post_tag'] = array( - 0 => '', // Unused. Messages start at index 1. - 1 => __( 'Tag added.' ), - 2 => __( 'Tag deleted.' ), - 3 => __( 'Tag updated.' ), - 4 => __( 'Tag not added.' ), - 5 => __( 'Tag not updated.' ), - 6 => __( 'Tags deleted.' ) -); +if ( ! current_user_can( $tax->cap->edit_terms ) ) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'You are not allowed to edit this item.' ) . '

', + 403 + ); +} + +/** Also used by the Edit Tag form */ +require_once( ABSPATH . 'wp-admin/includes/edit-tag-messages.php' ); -/** - * Filter the messages displayed when a tag is updated. - * - * @since 3.7.0 - * - * @param array $messages The messages to be displayed. - */ -$messages = apply_filters( 'term_updated_messages', $messages ); - -$message = false; -if ( isset( $_REQUEST['message'] ) && ( $msg = (int) $_REQUEST['message'] ) ) { - if ( isset( $messages[ $taxonomy ][ $msg ] ) ) - $message = $messages[ $taxonomy ][ $msg ]; - elseif ( ! isset( $messages[ $taxonomy ] ) && isset( $messages['_item'][ $msg ] ) ) - $message = $messages['_item'][ $msg ]; +$class = ( isset( $_REQUEST['error'] ) ) ? 'error' : 'updated'; + +if ( is_plugin_active( 'wpcat2tag-importer/wpcat2tag-importer.php' ) ) { + $import_link = admin_url( 'admin.php?import=wpcat2tag' ); +} else { + $import_link = admin_url( 'import.php' ); } ?>

' . __('Search results for “%s”') . '', esc_html( wp_unslash($_REQUEST['s']) ) ); ?> -

' . __( 'Search results for “%s”' ) . '', esc_html( wp_unslash( $_REQUEST['s'] ) ) ); +} +?> +

- notice is-dismissible">

- + @@ -325,7 +334,7 @@ endif; ?>

- + @@ -336,22 +345,31 @@ endif; ?>

- -

Note:
Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category %s.'), apply_filters('the_category', get_cat_name(get_option('default_category')))) ?>

+ ' . __( 'Note:' ) . '
'; + printf( + /* translators: %s: default category */ + __( 'Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category %s.' ), + /** This filter is documented in wp-includes/category-template.php */ + '' . apply_filters( 'the_category', get_cat_name( get_option( 'default_category') ) ) . '' + ); + ?> +

category to tag converter.'), 'import.php') ?>

category to tag converter.' ), esc_url( $import_link ) ) ?>

tag to category converter.'), 'import.php') ;?>

tag to category converter.' ), esc_url( $import_link ) ) ;?>

labels->popular_items ) ) { if ( $tag_cloud ) : ?> cap->edit_terms) ) { /** * Fires before the Add Term form for all taxonomies. * - * The dynamic portion of the hook name, $taxonomy, refers to the taxonomy slug. + * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug. * * @since 3.0.0 * @@ -430,38 +448,39 @@ if ( current_user_can($tax->cap->edit_terms) ) { ?>

labels->add_new_item; ?>

+ -> +do_action( "{$taxonomy}_term_new_form_tag" ); +?>> -

- +

+ 0, @@ -477,6 +496,7 @@ if ( current_user_can($tax->cap->edit_terms) ) { * Filter the taxonomy parent drop-down on the Edit Term page. * * @since 3.7.0 + * @since 4.2.0 Added `$context` parameter. * * @param array $dropdown_args { * An array of taxonomy parent drop-down arguments. @@ -491,8 +511,10 @@ if ( current_user_can($tax->cap->edit_terms) ) { * @type string $show_option_none Label to display if there are no terms. Default 'None'. * } * @param string $taxonomy The taxonomy slug. + * @param string $context Filter context. Accepts 'new' or 'edit'. */ - $dropdown_args = apply_filters( 'taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy ); + $dropdown_args = apply_filters( 'taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'new' ); + wp_dropdown_categories( $dropdown_args ); ?> @@ -500,8 +522,8 @@ if ( current_user_can($tax->cap->edit_terms) ) {

- +

@@ -519,9 +541,9 @@ if ( ! is_taxonomy_hierarchical( $taxonomy ) ) { } /** - * Fires after the Add Term form fields for hierarchical taxonomies. + * Fires after the Add Term form fields. * - * The dynamic portion of the hook name, $taxonomy, refers to the taxonomy slug. + * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug. * * @since 3.0.0 * @@ -566,7 +588,7 @@ if ( 'category' == $taxonomy ) { /** * Fires at the end of the Add Term form for all taxonomies. * - * The dynamic portion of the hook name, $taxonomy, refers to the taxonomy slug. + * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug. * * @since 3.0.0 * @@ -582,13 +604,14 @@ do_action( "{$taxonomy}_add_form", $taxonomy );

+ + -inline_edit(); ?> - inline_edit(); include( ABSPATH . 'wp-admin/admin-footer.php' ); diff --git a/wp-admin/edit.php b/wp-admin/edit.php index a062b09..27d8f68 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -12,14 +12,35 @@ require_once( dirname( __FILE__ ) . '/admin.php' ); if ( ! $typenow ) wp_die( __( 'Invalid post type' ) ); +if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ) ) ) { + wp_die( __( 'You are not allowed to edit posts in this post type.' ) ); +} + +if ( 'attachment' === $typenow ) { + if ( wp_redirect( admin_url( 'upload.php' ) ) ) { + exit; + } +} + +/** + * @global string $post_type + * @global object $post_type_object + */ +global $post_type, $post_type_object; + $post_type = $typenow; $post_type_object = get_post_type_object( $post_type ); if ( ! $post_type_object ) wp_die( __( 'Invalid post type' ) ); -if ( ! current_user_can( $post_type_object->cap->edit_posts ) ) - wp_die( __( 'Cheatin’ uh?' ) ); +if ( ! current_user_can( $post_type_object->cap->edit_posts ) ) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'You are not allowed to edit posts in this post type.' ) . '

', + 403 + ); +} $wp_list_table = _get_list_table('WP_Posts_List_Table'); $pagenum = $wp_list_table->get_pagenum(); @@ -56,9 +77,12 @@ if ( $doaction ) { $sendback = admin_url($post_new_file); if ( 'delete_all' == $doaction ) { + // Prepare for deletion of all posts with a specified post status (i.e. Empty trash). $post_status = preg_replace('/[^a-z0-9_-]+/i', '', $_REQUEST['post_status']); - if ( get_post_status_object($post_status) ) // Check the post status exists first + // Validate the post status exists. + if ( get_post_status_object( $post_status ) ) { $post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type=%s AND post_status = %s", $post_type, $post_status ) ); + } $doaction = 'delete'; } elseif ( isset( $_REQUEST['media'] ) ) { $post_ids = $_REQUEST['media']; @@ -77,7 +101,7 @@ if ( $doaction ) { case 'trash': $trashed = $locked = 0; - foreach( (array) $post_ids as $post_id ) { + foreach ( (array) $post_ids as $post_id ) { if ( !current_user_can( 'delete_post', $post_id) ) wp_die( __('You are not allowed to move this item to the Trash.') ); @@ -96,7 +120,7 @@ if ( $doaction ) { break; case 'untrash': $untrashed = 0; - foreach( (array) $post_ids as $post_id ) { + foreach ( (array) $post_ids as $post_id ) { if ( !current_user_can( 'delete_post', $post_id) ) wp_die( __('You are not allowed to restore this item from the Trash.') ); @@ -109,7 +133,7 @@ if ( $doaction ) { break; case 'delete': $deleted = 0; - foreach( (array) $post_ids as $post_id ) { + foreach ( (array) $post_ids as $post_id ) { $post_del = get_post($post_id); if ( !current_user_can( 'delete_post', $post_id ) ) @@ -152,6 +176,7 @@ if ( $doaction ) { $wp_list_table->prepare_items(); wp_enqueue_script('inline-edit-post'); +wp_enqueue_script('heartbeat'); $title = $post_type_object->labels->name; @@ -170,7 +195,7 @@ if ( 'post' == $post_type ) { '

' . __('You can hide/display columns based on your needs and decide how many posts to list per screen using the Screen Options tab.') . '
' . __('You can filter the list of posts by post status using the text links in the upper left to show All, Published, Draft, or Trashed posts. The default view is to show all posts.') . '
' . __('You can view posts in a simple title list or with an excerpt. Choose the view you prefer by clicking on the icons at the top of the list on the right.') . '
' . __('You can view posts in a simple title list or with an excerpt using the Screen Options tab.') . '
' . __('You can refine the list to show only posts in a specific category or from a specific month by using the dropdown menus above the posts list. Click the Filter button after making your selection. You also can refine the list by clicking on the post author, category or tag in the posts list.') . '

' ) ); @@ -196,7 +221,7 @@ if ( 'post' == $post_type ) { get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Managing Posts') . '

' . + '

' . __('Documentation on Managing Posts') . '

' . '

' . __('Support Forums') . '

' ); @@ -217,12 +242,19 @@ if ( 'post' == $post_type ) { get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Managing Pages') . '

' . + '

' . __('Documentation on Managing Pages') . '

' . '

' . __('Support Forums') . '

' ); + } -add_screen_option( 'per_page', array( 'label' => $title, 'default' => 20, 'option' => 'edit_' . $post_type . '_per_page' ) ); +get_current_screen()->set_screen_reader_content( array( + 'heading_views' => $post_type_object->labels->filter_items_list, + 'heading_pagination' => $post_type_object->labels->items_list_navigation, + 'heading_list' => $post_type_object->labels->items_list, +) ); + +add_screen_option( 'per_page', array( 'default' => 20, 'option' => 'edit_' . $post_type . '_per_page' ) ); $bulk_counts = array( 'updated' => isset( $_REQUEST['updated'] ) ? absint( $_REQUEST['updated'] ) : 0, @@ -235,14 +267,16 @@ $bulk_counts = array( $bulk_messages = array(); $bulk_messages['post'] = array( 'updated' => _n( '%s post updated.', '%s posts updated.', $bulk_counts['updated'] ), - 'locked' => _n( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $bulk_counts['locked'] ), + 'locked' => ( 1 == $bulk_counts['locked'] ) ? __( '1 post not updated, somebody is editing it.' ) : + _n( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $bulk_counts['locked'] ), 'deleted' => _n( '%s post permanently deleted.', '%s posts permanently deleted.', $bulk_counts['deleted'] ), 'trashed' => _n( '%s post moved to the Trash.', '%s posts moved to the Trash.', $bulk_counts['trashed'] ), 'untrashed' => _n( '%s post restored from the Trash.', '%s posts restored from the Trash.', $bulk_counts['untrashed'] ), ); $bulk_messages['page'] = array( 'updated' => _n( '%s page updated.', '%s pages updated.', $bulk_counts['updated'] ), - 'locked' => _n( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $bulk_counts['locked'] ), + 'locked' => ( 1 == $bulk_counts['locked'] ) ? __( '1 page not updated, somebody is editing it.' ) : + _n( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $bulk_counts['locked'] ), 'deleted' => _n( '%s page permanently deleted.', '%s pages permanently deleted.', $bulk_counts['deleted'] ), 'trashed' => _n( '%s page moved to the Trash.', '%s pages moved to the Trash.', $bulk_counts['trashed'] ), 'untrashed' => _n( '%s page restored from the Trash.', '%s pages restored from the Trash.', $bulk_counts['untrashed'] ), @@ -265,13 +299,16 @@ $bulk_counts = array_filter( $bulk_counts ); require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>

labels->name ); if ( current_user_can( $post_type_object->cap->create_posts ) ) - echo ' ' . esc_html( $post_type_object->labels->add_new ) . ''; -if ( ! empty( $_REQUEST['s'] ) ) - printf( ' ' . __('Search results for “%s”') . '', get_search_query() ); -?>

+ echo ' ' . esc_html( $post_type_object->labels->add_new ) . ''; + +if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) { + /* translators: %s: search keywords */ + printf( ' ' . __( 'Search results for “%s”' ) . '', get_search_query() ); +} +?> $count ) { } if ( $messages ) - echo '

' . join( ' ', $messages ) . '

'; + echo '

' . join( ' ', $messages ) . '

'; unset( $messages ); $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'locked', 'skipped', 'updated', 'deleted', 'trashed', 'untrashed' ), $_SERVER['REQUEST_URI'] ); @@ -297,7 +334,7 @@ $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'locked', 'skipped', 'updated views(); ?> - + search_box( $post_type_object->labels->search_items, 'post' ); ?> diff --git a/wp-admin/export.php b/wp-admin/export.php index 1ad91a0..5ce4e34 100644 --- a/wp-admin/export.php +++ b/wp-admin/export.php @@ -24,7 +24,6 @@ $title = __('Export'); function export_add_js() { ?> add_help_tab( array( get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Export') . '

' . + '

' . __('Documentation on Export') . '

' . '

' . __('Support Forums') . '

' ); +// If the 'download' URL parameter is set, a WXR export file is baked and returned. if ( isset( $_GET['download'] ) ) { $args = array(); if ( ! isset( $_GET['content'] ) || 'all' == $_GET['content'] ) { $args['content'] = 'all'; - } else if ( 'posts' == $_GET['content'] ) { + } elseif ( 'posts' == $_GET['content'] ) { $args['content'] = 'post'; if ( $_GET['cat'] ) @@ -77,7 +77,7 @@ if ( isset( $_GET['download'] ) ) { if ( $_GET['post_status'] ) $args['status'] = $_GET['post_status']; - } else if ( 'pages' == $_GET['content'] ) { + } elseif ( 'pages' == $_GET['content'] ) { $args['content'] = 'page'; if ( $_GET['page_author'] ) @@ -90,7 +90,15 @@ if ( isset( $_GET['download'] ) ) { if ( $_GET['page_status'] ) $args['status'] = $_GET['page_status']; - } else { + } elseif ( 'attachment' == $_GET['content'] ) { + $args['content'] = 'attachment'; + + if ( $_GET['attachment_start_date'] || $_GET['attachment_end_date'] ) { + $args['start_date'] = $_GET['attachment_start_date']; + $args['end_date'] = $_GET['attachment_end_date']; + } + } + else { $args['content'] = $_GET['content']; } @@ -112,7 +120,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); /** * Create the date options fields for exporting a given post type. * - * @global wpdb $wpdb WordPress database object. + * @global wpdb $wpdb WordPress database abstraction object. * @global WP_Locale $wp_locale Date and Time Locale object. * * @since 3.1.0 @@ -144,45 +152,58 @@ function export_date_options( $post_type = 'post' ) { ?>

- +

+ +

+ -

- + __('All') ) ); ?> +
- - + get_col( "SELECT DISTINCT post_author FROM {$wpdb->posts} WHERE post_type = 'post'" ); - wp_dropdown_users( array( 'include' => $authors, 'name' => 'post_author', 'multi' => true, 'show_option_all' => __('All') ) ); -?> + wp_dropdown_users( array( + 'include' => $authors, + 'name' => 'post_author', + 'multi' => true, + 'show_option_all' => __( 'All' ), + 'show' => 'display_name_with_login', + ) ); ?> +
- - + - + +

- - false ), 'objects' ); foreach ( $post_stati as $status ) : ?> @@ -195,26 +216,36 @@ function export_date_options( $post_type = 'post' ) {

- - + get_col( "SELECT DISTINCT post_author FROM {$wpdb->posts} WHERE post_type = 'page'" ); - wp_dropdown_users( array( 'include' => $authors, 'name' => 'page_author', 'multi' => true, 'show_option_all' => __('All') ) ); -?> + wp_dropdown_users( array( + 'include' => $authors, + 'name' => 'page_author', + 'multi' => true, + 'show_option_all' => __( 'All' ), + 'show' => 'display_name_with_login', + ) ); ?> +
- - + - + +
- - @@ -227,9 +258,29 @@ function export_date_options( $post_type = 'post' ) {
label ); ?>
+

+
- +
  + + + + + +
  +
+ + -
+

-
- - - - - - - +
+ + +

license, the GPL.' ), 'https://wordpress.org/about/license/' ); ?>
diff --git a/wp-admin/images/browser.png b/wp-admin/images/browser.png new file mode 100644 index 0000000..83ead47 Binary files /dev/null and b/wp-admin/images/browser.png differ diff --git a/wp-admin/images/bubble_bg.gif b/wp-admin/images/bubble_bg.gif index f4535c9..f3bfdcd 100644 Binary files a/wp-admin/images/bubble_bg.gif and b/wp-admin/images/bubble_bg.gif differ diff --git a/wp-admin/images/date-button-2x.gif b/wp-admin/images/date-button-2x.gif index 53cc417..f658b51 100644 Binary files a/wp-admin/images/date-button-2x.gif and b/wp-admin/images/date-button-2x.gif differ diff --git a/wp-admin/images/date-button.gif b/wp-admin/images/date-button.gif index dc40633..5080544 100644 Binary files a/wp-admin/images/date-button.gif and b/wp-admin/images/date-button.gif differ diff --git a/wp-admin/images/icons32-2x.png b/wp-admin/images/icons32-2x.png index 67893fe..b86b727 100644 Binary files a/wp-admin/images/icons32-2x.png and b/wp-admin/images/icons32-2x.png differ diff --git a/wp-admin/images/icons32-vs-2x.png b/wp-admin/images/icons32-vs-2x.png index 512aea8..54e2fb2 100644 Binary files a/wp-admin/images/icons32-vs-2x.png and b/wp-admin/images/icons32-vs-2x.png differ diff --git a/wp-admin/images/icons32-vs.png b/wp-admin/images/icons32-vs.png index c967844..e46d6be 100644 Binary files a/wp-admin/images/icons32-vs.png and b/wp-admin/images/icons32-vs.png differ diff --git a/wp-admin/images/icons32.png b/wp-admin/images/icons32.png index af061c1..e491b1a 100644 Binary files a/wp-admin/images/icons32.png and b/wp-admin/images/icons32.png differ diff --git a/wp-admin/images/imgedit-icons-2x.png b/wp-admin/images/imgedit-icons-2x.png index 814da5e..98dd412 100644 Binary files a/wp-admin/images/imgedit-icons-2x.png and b/wp-admin/images/imgedit-icons-2x.png differ diff --git a/wp-admin/images/imgedit-icons.png b/wp-admin/images/imgedit-icons.png index ca0b88d..0d544ee 100644 Binary files a/wp-admin/images/imgedit-icons.png and b/wp-admin/images/imgedit-icons.png differ diff --git a/wp-admin/images/loading.gif b/wp-admin/images/loading.gif index 7df3368..1e9dea9 100644 Binary files a/wp-admin/images/loading.gif and b/wp-admin/images/loading.gif differ diff --git a/wp-admin/images/media-button-image.gif b/wp-admin/images/media-button-image.gif index d3db580..56a9747 100644 Binary files a/wp-admin/images/media-button-image.gif and b/wp-admin/images/media-button-image.gif differ diff --git a/wp-admin/images/media-button-music.gif b/wp-admin/images/media-button-music.gif index c9795b3..42e65b2 100644 Binary files a/wp-admin/images/media-button-music.gif and b/wp-admin/images/media-button-music.gif differ diff --git a/wp-admin/images/media-button-other.gif b/wp-admin/images/media-button-other.gif index 86b9777..c7544ec 100644 Binary files a/wp-admin/images/media-button-other.gif and b/wp-admin/images/media-button-other.gif differ diff --git a/wp-admin/images/media-button-video.gif b/wp-admin/images/media-button-video.gif index 15fe0a4..405083b 100644 Binary files a/wp-admin/images/media-button-video.gif and b/wp-admin/images/media-button-video.gif differ diff --git a/wp-admin/images/menu-2x.png b/wp-admin/images/menu-2x.png index 0038190..7131763 100644 Binary files a/wp-admin/images/menu-2x.png and b/wp-admin/images/menu-2x.png differ diff --git a/wp-admin/images/menu-vs-2x.png b/wp-admin/images/menu-vs-2x.png index 17309fc..99b3823 100644 Binary files a/wp-admin/images/menu-vs-2x.png and b/wp-admin/images/menu-vs-2x.png differ diff --git a/wp-admin/images/menu-vs.png b/wp-admin/images/menu-vs.png index afdb3d3..fe28108 100644 Binary files a/wp-admin/images/menu-vs.png and b/wp-admin/images/menu-vs.png differ diff --git a/wp-admin/images/menu.png b/wp-admin/images/menu.png index 52189c2..c1d15af 100644 Binary files a/wp-admin/images/menu.png and b/wp-admin/images/menu.png differ diff --git a/wp-admin/images/post-formats-vs.png b/wp-admin/images/post-formats-vs.png index c8e7e8d..d77f91c 100644 Binary files a/wp-admin/images/post-formats-vs.png and b/wp-admin/images/post-formats-vs.png differ diff --git a/wp-admin/images/post-formats32-vs.png b/wp-admin/images/post-formats32-vs.png index af2c59f..f565340 100644 Binary files a/wp-admin/images/post-formats32-vs.png and b/wp-admin/images/post-formats32-vs.png differ diff --git a/wp-admin/images/post-formats32.png b/wp-admin/images/post-formats32.png index ccafc80..69ec095 100644 Binary files a/wp-admin/images/post-formats32.png and b/wp-admin/images/post-formats32.png differ diff --git a/wp-admin/images/resize-rtl-2x.gif b/wp-admin/images/resize-rtl-2x.gif index a379ad4..51edc79 100644 Binary files a/wp-admin/images/resize-rtl-2x.gif and b/wp-admin/images/resize-rtl-2x.gif differ diff --git a/wp-admin/images/resize-rtl.gif b/wp-admin/images/resize-rtl.gif index 329f93d..61afefe 100644 Binary files a/wp-admin/images/resize-rtl.gif and b/wp-admin/images/resize-rtl.gif differ diff --git a/wp-admin/images/resize.gif b/wp-admin/images/resize.gif index 4bff03d..ca42227 100644 Binary files a/wp-admin/images/resize.gif and b/wp-admin/images/resize.gif differ diff --git a/wp-admin/images/sort-2x.gif b/wp-admin/images/sort-2x.gif index 1362f43..60b6084 100644 Binary files a/wp-admin/images/sort-2x.gif and b/wp-admin/images/sort-2x.gif differ diff --git a/wp-admin/images/sort.gif b/wp-admin/images/sort.gif index 70b4bf9..aa65db1 100644 Binary files a/wp-admin/images/sort.gif and b/wp-admin/images/sort.gif differ diff --git a/wp-admin/images/spinner-2x.gif b/wp-admin/images/spinner-2x.gif index 9593f3d..a4e161e 100644 Binary files a/wp-admin/images/spinner-2x.gif and b/wp-admin/images/spinner-2x.gif differ diff --git a/wp-admin/images/spinner.gif b/wp-admin/images/spinner.gif index c15632f..209d10b 100644 Binary files a/wp-admin/images/spinner.gif and b/wp-admin/images/spinner.gif differ diff --git a/wp-admin/images/w-logo-white.png b/wp-admin/images/w-logo-white.png index bb70f57..ed5efcd 100644 Binary files a/wp-admin/images/w-logo-white.png and b/wp-admin/images/w-logo-white.png differ diff --git a/wp-admin/images/wheel.png b/wp-admin/images/wheel.png index 7e53103..9b9fdf4 100644 Binary files a/wp-admin/images/wheel.png and b/wp-admin/images/wheel.png differ diff --git a/wp-admin/images/wordpress-logo-white.svg b/wp-admin/images/wordpress-logo-white.svg index c0d0ba9..682e80b 100644 --- a/wp-admin/images/wordpress-logo-white.svg +++ b/wp-admin/images/wordpress-logo-white.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/wp-admin/images/wordpress-logo.svg b/wp-admin/images/wordpress-logo.svg index da5e5df..ba26fef 100644 --- a/wp-admin/images/wordpress-logo.svg +++ b/wp-admin/images/wordpress-logo.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/wp-admin/images/wpspin_light-2x.gif b/wp-admin/images/wpspin_light-2x.gif index fe2d5c0..392e82f 100644 Binary files a/wp-admin/images/wpspin_light-2x.gif and b/wp-admin/images/wpspin_light-2x.gif differ diff --git a/wp-admin/images/wpspin_light.gif b/wp-admin/images/wpspin_light.gif index 7f71727..4c42dcb 100644 Binary files a/wp-admin/images/wpspin_light.gif and b/wp-admin/images/wpspin_light.gif differ diff --git a/wp-admin/images/xit-2x.gif b/wp-admin/images/xit-2x.gif index b5ce86b..3a72ee1 100644 Binary files a/wp-admin/images/xit-2x.gif and b/wp-admin/images/xit-2x.gif differ diff --git a/wp-admin/images/xit.gif b/wp-admin/images/xit.gif index 64cb854..d288954 100644 Binary files a/wp-admin/images/xit.gif and b/wp-admin/images/xit.gif differ diff --git a/wp-admin/import.php b/wp-admin/import.php index e6f05e0..a1ce80e 100644 --- a/wp-admin/import.php +++ b/wp-admin/import.php @@ -25,7 +25,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '
' . __('For more information:') . '
' . - '
' . __('Documentation on Import') . '
' . + '
' . __('Documentation on Import') . '
' . '
' . __('Support Forums') . '
' ); @@ -52,9 +52,14 @@ $parent_file = 'tools.php'; ?>
-
+
-
%s importer is invalid or is not installed.'), esc_html( $_GET['invalid'] ) ); ?>
+
+
' . esc_html( $_GET['invalid'] ) . '' ); + ?>
+

@@ -76,10 +81,9 @@ if ( empty( $importers ) ) { } else { uasort( $importers, '_usort_by_first_member' ); ?> -




	+

	- 0, 'hide_if_empty' => false, 'name' => 'parent', 'orderby' => 'name', 'taxonomy' => $taxonomy, 'selected' => $tag->parent, 'exclude_tree' => $tag->term_id, 'hierarchical' => true, 'show_option_none' => __('None'))); ?> + 0, + 'hide_if_empty' => false, + 'taxonomy' => $taxonomy, + 'name' => 'parent', + 'orderby' => 'name', + 'selected' => $tag->parent, + 'exclude_tree' => $tag->term_id, + 'hierarchical' => true, + 'show_option_none' => __( 'None' ), + ); + + /** This filter is documented in wp-admin/edit-tags.php */ + $dropdown_args = apply_filters( 'taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'edit' ); + wp_dropdown_categories( $dropdown_args ); ?>
	<?php echo $tag->description; // textarea_escaped ?> -
	<?php echo $tag->description; // textarea_escaped ?> +

$data) { $action = ''; if ( isset( $data['install'] ) ) { @@ -97,7 +101,7 @@ if ( empty( $importers ) ) { if ( empty($action) ) { if ( is_main_site() ) { $action = '' . $data[0] . ''; } else { $action = $data[0]; @@ -108,9 +112,8 @@ if ( empty( $importers ) ) { $action = "{$data[0]}"; } - $alt = $alt ? '' : ' class="alternate"'; echo " - + "; diff --git a/wp-admin/includes/admin-filters.php b/wp-admin/includes/admin-filters.php new file mode 100644 index 0000000..38051e3 --- /dev/null +++ b/wp-admin/includes/admin-filters.php @@ -0,0 +1,112 @@ +id and the JS global 'pagenow' + // screen_id is the same as $current_screen->id and the JS global 'pagenow'. if ( ! empty($_POST['screen_id']) ) $screen_id = sanitize_key($_POST['screen_id']); else @@ -61,14 +65,22 @@ function wp_ajax_nopriv_heartbeat() { */ do_action( 'heartbeat_nopriv_tick', $response, $screen_id ); - // send the current time according to the server + // Send the current time according to the server. $response['server_time'] = time(); wp_send_json($response); } -/* - * GET-based Ajax handlers. +// +// GET-based Ajax handlers. +// + +/** + * Ajax handler for fetching a list table. + * + * @since 3.1.0 + * + * @global WP_List_Table $wp_list_table */ function wp_ajax_fetch_list() { global $wp_list_table; @@ -87,20 +99,27 @@ function wp_ajax_fetch_list() { wp_die( 0 ); } + +/** + * Ajax handler for tag search. + * + * @since 3.1.0 + */ function wp_ajax_ajax_tag_search() { - global $wpdb; + if ( ! isset( $_GET['tax'] ) ) { + wp_die( 0 ); + } - if ( isset( $_GET['tax'] ) ) { - $taxonomy = sanitize_key( $_GET['tax'] ); - $tax = get_taxonomy( $taxonomy ); - if ( ! $tax ) - wp_die( 0 ); - if ( ! current_user_can( $tax->cap->assign_terms ) ) - wp_die( -1 ); - } else { + $taxonomy = sanitize_key( $_GET['tax'] ); + $tax = get_taxonomy( $taxonomy ); + if ( ! $tax ) { wp_die( 0 ); } + if ( ! current_user_can( $tax->cap->assign_terms ) ) { + wp_die( -1 ); + } + $s = wp_unslash( $_GET['q'] ); $comma = _x( ',', 'tag delimiter' ); @@ -111,8 +130,25 @@ function wp_ajax_ajax_tag_search() { $s = $s[count( $s ) - 1]; } $s = trim( $s ); - if ( strlen( $s ) < 2 ) - wp_die(); // require 2 chars for matching + + /** + * Filter the minimum number of characters required to fire a tag search via AJAX. + * + * @since 4.0.0 + * + * @param int $characters The minimum number of characters required. Default 2. + * @param object $tax The taxonomy object. + * @param string $s The search term. + */ + $term_search_min_chars = (int) apply_filters( 'term_search_min_chars', 2, $tax, $s ); + + /* + * Require $term_search_min_chars chars for matching (default: 2) + * ensure it's a non-negative, non-zero integer. + */ + if ( ( $term_search_min_chars == 0 ) || ( strlen( $s ) < $term_search_min_chars ) ){ + wp_die(); + } $results = get_terms( $taxonomy, array( 'name__like' => $s, 'fields' => 'names', 'hide_empty' => false ) ); @@ -120,6 +156,11 @@ function wp_ajax_ajax_tag_search() { wp_die(); } +/** + * Ajax handler for compression testing. + * + * @since 3.1.0 + */ function wp_ajax_wp_compression_test() { if ( !current_user_can( 'manage_options' ) ) wp_die( -1 ); @@ -134,7 +175,7 @@ function wp_ajax_wp_compression_test() { header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' ); header( 'Cache-Control: no-cache, must-revalidate, max-age=0' ); header( 'Pragma: no-cache' ); - header('Content-Type: application/x-javascript; charset=UTF-8'); + header('Content-Type: application/javascript; charset=UTF-8'); $force_gzip = ( defined('ENFORCE_GZIP') && ENFORCE_GZIP ); $test_str = '"wpCompressionTest Lorem ipsum dolor sit amet consectetuer mollis sapien urna ut a. Eu nonummy condimentum fringilla tempor pretium platea vel nibh netus Maecenas. Hac molestie amet justo quis pellentesque est ultrices interdum nibh Morbi. Cras mattis pretium Phasellus ante ipsum ipsum ut sociis Suspendisse Lorem. Ante et non molestie. Porta urna Vestibulum egestas id congue nibh eu risus gravida sit. Ac augue auctor Ut et non a elit massa id sodales. Elit eu Nulla at nibh adipiscing mattis lacus mauris at tempus. Netus nibh quis suscipit nec feugiat eget sed lorem et urna. Pellentesque lacus at ut massa consectetuer ligula ut auctor semper Pellentesque. Ut metus massa nibh quam Curabitur molestie nec mauris congue. Volutpat molestie elit justo facilisis neque ac risus Ut nascetur tristique. Vitae sit lorem tellus et quis Phasellus lacus tincidunt nunc Fusce. Pharetra wisi Suspendisse mus sagittis libero lacinia Integer consequat ac Phasellus. Et urna ac cursus tortor aliquam Aliquam amet tellus volutpat Vestibulum. Justo interdum condimentum In augue congue tellus sollicitudin Quisque quis nibh."'; @@ -156,8 +197,10 @@ function wp_ajax_wp_compression_test() { echo $out; wp_die(); } elseif ( 'no' == $_GET['test'] ) { + check_ajax_referer( 'update_can_compress_scripts' ); update_site_option('can_compress_scripts', 0); } elseif ( 'yes' == $_GET['test'] ) { + check_ajax_referer( 'update_can_compress_scripts' ); update_site_option('can_compress_scripts', 1); } } @@ -165,6 +208,11 @@ function wp_ajax_wp_compression_test() { wp_die( 0 ); } +/** + * Ajax handler for image editor previews. + * + * @since 3.1.0 + */ function wp_ajax_imgedit_preview() { $post_id = intval($_GET['postid']); if ( empty($post_id) || !current_user_can('edit_post', $post_id) ) @@ -179,13 +227,23 @@ function wp_ajax_imgedit_preview() { wp_die(); } +/** + * Ajax handler for oEmbed caching. + * + * @since 3.1.0 + * + * @global WP_Embed $wp_embed + */ function wp_ajax_oembed_cache() { - global $wp_embed; - - $return = ( $wp_embed->cache_oembed( $_GET['post'] ) ) ? '1' : '0'; - wp_die( $return ); + $GLOBALS['wp_embed']->cache_oembed( $_GET['post'] ); + wp_die( 0 ); } +/** + * Ajax handler for user autocomplete. + * + * @since 3.4.0 + */ function wp_ajax_autocomplete_user() { if ( ! is_multisite() || ! current_user_can( 'promote_users' ) || wp_is_large_network( 'users' ) ) wp_die( -1 ); @@ -233,14 +291,19 @@ function wp_ajax_autocomplete_user() { foreach ( $users as $user ) { $return[] = array( /* translators: 1: user_login, 2: user_email */ - 'label' => sprintf( __( '%1$s (%2$s)' ), $user->user_login, $user->user_email ), + 'label' => sprintf( _x( '%1$s (%2$s)', 'user autocomplete result' ), $user->user_login, $user->user_email ), 'value' => $user->$field, ); } - wp_die( json_encode( $return ) ); + wp_die( wp_json_encode( $return ) ); } +/** + * Ajax handler for dashboard widgets. + * + * @since 3.4.0 + */ function wp_ajax_dashboard_widgets() { require_once ABSPATH . 'wp-admin/includes/dashboard.php'; @@ -257,23 +320,29 @@ function wp_ajax_dashboard_widgets() { wp_die(); } +/** + * Ajax handler for Customizer preview logged-in status. + * + * @since 3.4.0 + */ function wp_ajax_logged_in() { wp_die( 1 ); } -/* - * Ajax helper. - */ +// +// Ajax helpers. +// /** * Sends back current comment total and new page links if they need to be updated. * * Contrary to normal success AJAX response ("1"), die with time() on success. * + * @access private * @since 2.7.0 * * @param int $comment_id - * @return die + * @param int $delta */ function _wp_ajax_delete_comment_response( $comment_id, $delta = -1 ) { $total = isset( $_POST['_total'] ) ? (int) $_POST['_total'] : 0; @@ -282,8 +351,33 @@ function _wp_ajax_delete_comment_response( $comment_id, $delta = -1 ) { $url = isset( $_POST['_url'] ) ? esc_url_raw( $_POST['_url'] ) : ''; // JS didn't send us everything we need to know. Just die with success message - if ( !$total || !$per_page || !$page || !$url ) - wp_die( time() ); + if ( ! $total || ! $per_page || ! $page || ! $url ) { + $time = time(); + $comment = get_comment( $comment_id ); + + $counts = wp_count_comments(); + + $x = new WP_Ajax_Response( array( + 'what' => 'comment', + // Here for completeness - not used. + 'id' => $comment_id, + 'supplemental' => array( + 'status' => $comment ? $comment->comment_approved : '', + 'postId' => $comment ? $comment->comment_post_ID : '', + 'time' => $time, + 'in_moderation' => $counts->moderated, + 'i18n_comments_text' => sprintf( + _n( '%s Comment', '%s Comments', $counts->approved ), + number_format_i18n( $counts->approved ) + ), + 'i18n_moderation_text' => sprintf( + _nx( '%s in moderation', '%s in moderation', $counts->moderated, 'comments' ), + number_format_i18n( $counts->moderated ) + ) + ) + ) ); + $x->send(); + } $total += $delta; if ( $total < 0 ) @@ -292,7 +386,8 @@ function _wp_ajax_delete_comment_response( $comment_id, $delta = -1 ) { // Only do the expensive stuff on a page-break, and about 1 other time per page if ( 0 == $total % $per_page || 1 == mt_rand( 1, $per_page ) ) { $post_id = 0; - $status = 'total_comments'; // What type of comment count are we looking for? + // What type of comment count are we looking for? + $status = 'all'; $parsed = parse_url( $url ); if ( isset( $parsed['query'] ) ) { parse_str( $parsed['query'], $query_vars ); @@ -304,18 +399,24 @@ function _wp_ajax_delete_comment_response( $comment_id, $delta = -1 ) { $comment_count = wp_count_comments($post_id); - if ( isset( $comment_count->$status ) ) // We're looking for a known type of comment count + // We're looking for a known type of comment count. + if ( isset( $comment_count->$status ) ) $total = $comment_count->$status; - // else use the decremented value from above + // Else use the decremented value from above. } - $time = time(); // The time since the last comment count + // The time since the last comment count. + $time = time(); + $comment = get_comment( $comment_id ); $x = new WP_Ajax_Response( array( 'what' => 'comment', - 'id' => $comment_id, // here for completeness - not used + // Here for completeness - not used. + 'id' => $comment_id, 'supplemental' => array( - 'total_items_i18n' => sprintf( _n( '1 item', '%s items', $total ), number_format_i18n( $total ) ), + 'status' => $comment ? $comment->comment_approved : '', + 'postId' => $comment ? $comment->comment_post_ID : '', + 'total_items_i18n' => sprintf( _n( '%s item', '%s items', $total ), number_format_i18n( $total ) ), 'total_pages' => ceil( $total / $per_page ), 'total_pages_i18n' => number_format_i18n( ceil( $total / $per_page ) ), 'total' => $total, @@ -325,10 +426,16 @@ function _wp_ajax_delete_comment_response( $comment_id, $delta = -1 ) { $x->send(); } -/* - * POST-based Ajax handlers. - */ +// +// POST-based Ajax handlers. +// +/** + * Ajax handler for adding a hierarchical term. + * + * @access private + * @since 3.1.0 + */ function _wp_ajax_add_hierarchical_term() { $action = $_POST['action']; $taxonomy = get_taxonomy(substr($action, 4)); @@ -353,17 +460,21 @@ function _wp_ajax_add_hierarchical_term() { continue; if ( !$cat_id = term_exists( $cat_name, $taxonomy->name, $parent ) ) $cat_id = wp_insert_term( $cat_name, $taxonomy->name, array( 'parent' => $parent ) ); - if ( is_wp_error( $cat_id ) ) + if ( is_wp_error( $cat_id ) ) { continue; - else if ( is_array( $cat_id ) ) + } elseif ( is_array( $cat_id ) ) { $cat_id = $cat_id['term_id']; + } $checked_categories[] = $cat_id; if ( $parent ) // Do these all at once in a second continue; + ob_start(); - wp_terms_checklist( 0, array( 'taxonomy' => $taxonomy->name, 'descendants_and_self' => $cat_id, 'selected_cats' => $checked_categories, 'popular_cats' => $popular_ids )); - $data = ob_get_contents(); - ob_end_clean(); + + wp_terms_checklist( 0, array( 'taxonomy' => $taxonomy->name, 'descendants_and_self' => $cat_id, 'selected_cats' => $checked_categories, 'popular_cats' => $popular_ids )); + + $data = ob_get_clean(); + $add = array( 'what' => $taxonomy->name, 'id' => $cat_id, @@ -384,9 +495,11 @@ function _wp_ajax_add_hierarchical_term() { } ob_start(); - wp_terms_checklist( 0, array('taxonomy' => $taxonomy->name, 'descendants_and_self' => $term_id, 'selected_cats' => $checked_categories, 'popular_cats' => $popular_ids)); - $data = ob_get_contents(); - ob_end_clean(); + + wp_terms_checklist( 0, array('taxonomy' => $taxonomy->name, 'descendants_and_self' => $term_id, 'selected_cats' => $checked_categories, 'popular_cats' => $popular_ids)); + + $data = ob_get_clean(); + $add = array( 'what' => $taxonomy->name, 'id' => $term_id, @@ -396,18 +509,25 @@ function _wp_ajax_add_hierarchical_term() { } ob_start(); - wp_dropdown_categories( array( - 'taxonomy' => $taxonomy->name, 'hide_empty' => 0, 'name' => 'new'.$taxonomy->name.'_parent', 'orderby' => 'name', - 'hierarchical' => 1, 'show_option_none' => '— '.$taxonomy->labels->parent_item.' —' - ) ); - $sup = ob_get_contents(); - ob_end_clean(); + + wp_dropdown_categories( array( + 'taxonomy' => $taxonomy->name, 'hide_empty' => 0, 'name' => 'new'.$taxonomy->name.'_parent', 'orderby' => 'name', + 'hierarchical' => 1, 'show_option_none' => '— '.$taxonomy->labels->parent_item.' —' + ) ); + + $sup = ob_get_clean(); + $add['supplemental'] = array( 'newcat_parent' => $sup ); $x = new WP_Ajax_Response( $add ); $x->send(); } +/** + * Ajax handler for deleting a comment. + * + * @since 3.1.0 + */ function wp_ajax_delete_comment() { $id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0; @@ -417,31 +537,31 @@ function wp_ajax_delete_comment() { wp_die( -1 ); check_ajax_referer( "delete-comment_$id" ); - $status = wp_get_comment_status( $comment->comment_ID ); + $status = wp_get_comment_status( $comment ); $delta = -1; if ( isset($_POST['trash']) && 1 == $_POST['trash'] ) { if ( 'trash' == $status ) wp_die( time() ); - $r = wp_trash_comment( $comment->comment_ID ); + $r = wp_trash_comment( $comment ); } elseif ( isset($_POST['untrash']) && 1 == $_POST['untrash'] ) { if ( 'trash' != $status ) wp_die( time() ); - $r = wp_untrash_comment( $comment->comment_ID ); + $r = wp_untrash_comment( $comment ); if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'trash' ) // undo trash, not in trash $delta = 1; } elseif ( isset($_POST['spam']) && 1 == $_POST['spam'] ) { if ( 'spam' == $status ) wp_die( time() ); - $r = wp_spam_comment( $comment->comment_ID ); + $r = wp_spam_comment( $comment ); } elseif ( isset($_POST['unspam']) && 1 == $_POST['unspam'] ) { if ( 'spam' != $status ) wp_die( time() ); - $r = wp_unspam_comment( $comment->comment_ID ); + $r = wp_unspam_comment( $comment ); if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'spam' ) // undo spam, not in spam $delta = 1; } elseif ( isset($_POST['delete']) && 1 == $_POST['delete'] ) { - $r = wp_delete_comment( $comment->comment_ID ); + $r = wp_delete_comment( $comment ); } else { wp_die( -1 ); } @@ -451,6 +571,11 @@ function wp_ajax_delete_comment() { wp_die( 0 ); } +/** + * Ajax handler for deleting a tag. + * + * @since 3.1.0 + */ function wp_ajax_delete_tag() { $tag_id = (int) $_POST['tag_ID']; check_ajax_referer( "delete-tag_$tag_id" ); @@ -471,6 +596,11 @@ function wp_ajax_delete_tag() { wp_die( 0 ); } +/** + * Ajax handler for deleting a link. + * + * @since 3.1.0 + */ function wp_ajax_delete_link() { $id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0; @@ -488,6 +618,11 @@ function wp_ajax_delete_link() { wp_die( 0 ); } +/** + * Ajax handler for deleting meta. + * + * @since 3.1.0 + */ function wp_ajax_delete_meta() { $id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0; @@ -502,6 +637,13 @@ function wp_ajax_delete_meta() { wp_die( 0 ); } +/** + * Ajax handler for deleting a post. + * + * @since 3.1.0 + * + * @param string $action Action to perform. + */ function wp_ajax_delete_post( $action ) { if ( empty( $action ) ) $action = 'delete-post'; @@ -520,6 +662,13 @@ function wp_ajax_delete_post( $action ) { wp_die( 0 ); } +/** + * Ajax handler for sending a post to the trash. + * + * @since 3.1.0 + * + * @param string $action Action to perform. + */ function wp_ajax_trash_post( $action ) { if ( empty( $action ) ) $action = 'trash-post'; @@ -543,12 +692,24 @@ function wp_ajax_trash_post( $action ) { wp_die( 0 ); } +/** + * Ajax handler to restore a post from the trash. + * + * @since 3.1.0 + * + * @param string $action Action to perform. + */ function wp_ajax_untrash_post( $action ) { if ( empty( $action ) ) $action = 'untrash-post'; wp_ajax_trash_post( $action ); } +/** + * @since 3.1.0 + * + * @param string $action + */ function wp_ajax_delete_page( $action ) { if ( empty( $action ) ) $action = 'delete-page'; @@ -567,6 +728,11 @@ function wp_ajax_delete_page( $action ) { wp_die( 0 ); } +/** + * Ajax handler to dim a comment. + * + * @since 3.1.0 + */ function wp_ajax_dim_comment() { $id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0; @@ -581,15 +747,16 @@ function wp_ajax_dim_comment() { if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) && ! current_user_can( 'moderate_comments' ) ) wp_die( -1 ); - $current = wp_get_comment_status( $comment->comment_ID ); + $current = wp_get_comment_status( $comment ); if ( isset( $_POST['new'] ) && $_POST['new'] == $current ) wp_die( time() ); check_ajax_referer( "approve-comment_$id" ); - if ( in_array( $current, array( 'unapproved', 'spam' ) ) ) - $result = wp_set_comment_status( $comment->comment_ID, 'approve', true ); - else - $result = wp_set_comment_status( $comment->comment_ID, 'hold', true ); + if ( in_array( $current, array( 'unapproved', 'spam' ) ) ) { + $result = wp_set_comment_status( $comment, 'approve', true ); + } else { + $result = wp_set_comment_status( $comment, 'hold', true ); + } if ( is_wp_error($result) ) { $x = new WP_Ajax_Response( array( @@ -604,6 +771,13 @@ function wp_ajax_dim_comment() { wp_die( 0 ); } +/** + * Ajax handler for deleting a link category. + * + * @since 3.1.0 + * + * @param string $action Action to perform. + */ function wp_ajax_add_link_category( $action ) { if ( empty( $action ) ) $action = 'add-link-category'; @@ -619,10 +793,11 @@ function wp_ajax_add_link_category( $action ) { continue; if ( !$cat_id = term_exists( $cat_name, 'link_category' ) ) $cat_id = wp_insert_term( $cat_name, 'link_category' ); - if ( is_wp_error( $cat_id ) ) + if ( is_wp_error( $cat_id ) ) { continue; - else if ( is_array( $cat_id ) ) + } elseif ( is_array( $cat_id ) ) { $cat_id = $cat_id['term_id']; + } $cat_name = esc_html( $cat_name ); $x->add( array( 'what' => 'link-category', @@ -634,11 +809,17 @@ function wp_ajax_add_link_category( $action ) { $x->send(); } +/** + * Ajax handler to add a tag. + * + * @since 3.1.0 + * + * @global WP_List_Table $wp_list_table + */ function wp_ajax_add_tag() { global $wp_list_table; check_ajax_referer( 'add-tag', '_wpnonce_add-tag' ); - $post_type = !empty($_POST['post_type']) ? $_POST['post_type'] : 'post'; $taxonomy = !empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag'; $tax = get_taxonomy($taxonomy); @@ -665,7 +846,7 @@ function wp_ajax_add_tag() { $level = 0; if ( is_taxonomy_hierarchical($taxonomy) ) { - $level = count( get_ancestors( $tag->term_id, $taxonomy ) ); + $level = count( get_ancestors( $tag->term_id, $taxonomy, 'taxonomy' ) ); ob_start(); $wp_list_table->single_row( $tag, $level ); $noparents = ob_get_clean(); @@ -678,27 +859,35 @@ function wp_ajax_add_tag() { $x->add( array( 'what' => 'taxonomy', 'supplemental' => compact('parents', 'noparents') - ) ); + ) ); $x->add( array( 'what' => 'term', 'position' => $level, 'supplemental' => (array) $tag - ) ); + ) ); $x->send(); } +/** + * Ajax handler for getting a tagcloud. + * + * @since 3.1.0 + */ function wp_ajax_get_tagcloud() { - if ( isset( $_POST['tax'] ) ) { - $taxonomy = sanitize_key( $_POST['tax'] ); - $tax = get_taxonomy( $taxonomy ); - if ( ! $tax ) - wp_die( 0 ); - if ( ! current_user_can( $tax->cap->assign_terms ) ) - wp_die( -1 ); - } else { + if ( ! isset( $_POST['tax'] ) ) { + wp_die( 0 ); + } + + $taxonomy = sanitize_key( $_POST['tax'] ); + $tax = get_taxonomy( $taxonomy ); + if ( ! $tax ) { wp_die( 0 ); } + if ( ! current_user_can( $tax->cap->assign_terms ) ) { + wp_die( -1 ); + } + $tags = get_terms( $taxonomy, array( 'number' => 45, 'orderby' => 'count', 'order' => 'DESC' ) ); if ( empty( $tags ) ) @@ -723,6 +912,16 @@ function wp_ajax_get_tagcloud() { wp_die(); } +/** + * Ajax handler for getting comments. + * + * @since 3.1.0 + * + * @global WP_List_Table $wp_list_table + * @global int $post_id + * + * @param string $action Action to perform. + */ function wp_ajax_get_comments( $action ) { global $wp_list_table, $post_id; if ( empty( $action ) ) @@ -757,8 +956,7 @@ function wp_ajax_get_comments( $action ) { get_comment( $comment ); $wp_list_table->single_row( $comment ); } - $comment_list_item = ob_get_contents(); - ob_end_clean(); + $comment_list_item = ob_get_clean(); $x->add( array( 'what' => 'comments', @@ -767,8 +965,17 @@ function wp_ajax_get_comments( $action ) { $x->send(); } +/** + * Ajax handler for replying to a comment. + * + * @since 3.1.0 + * + * @global WP_List_Table $wp_list_table + * + * @param string $action Action to perform. + */ function wp_ajax_replyto_comment( $action ) { - global $wp_list_table, $wpdb; + global $wp_list_table; if ( empty( $action ) ) $action = 'replyto-comment'; @@ -793,7 +1000,8 @@ function wp_ajax_replyto_comment( $action ) { $comment_author = wp_slash( $user->display_name ); $comment_author_email = wp_slash( $user->user_email ); $comment_author_url = wp_slash( $user->user_url ); - $comment_content = trim($_POST['content']); + $comment_content = trim( $_POST['content'] ); + $comment_type = isset( $_POST['comment_type'] ) ? trim( $_POST['comment_type'] ) : ''; if ( current_user_can( 'unfiltered_html' ) ) { if ( ! isset( $_POST['_wp_unfiltered_html_comment'] ) ) $_POST['_wp_unfiltered_html_comment'] = ''; @@ -816,12 +1024,16 @@ function wp_ajax_replyto_comment( $action ) { $comment_auto_approved = false; $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'comment_parent', 'user_ID'); - // automatically approve parent comment + // Automatically approve parent comment. if ( !empty($_POST['approve_parent']) ) { $parent = get_comment( $comment_parent ); if ( $parent && $parent->comment_approved === '0' && $parent->comment_post_ID == $comment_post_ID ) { - if ( wp_set_comment_status( $parent->comment_ID, 'approve' ) ) + if ( ! current_user_can( 'edit_comment', $parent->comment_ID ) ) { + wp_die( -1 ); + } + + if ( wp_set_comment_status( $parent, 'approve' ) ) $comment_auto_approved = true; } } @@ -853,14 +1065,36 @@ function wp_ajax_replyto_comment( $action ) { 'position' => $position ); - if ( $comment_auto_approved ) - $response['supplemental'] = array( 'parent_approved' => $parent->comment_ID ); + $counts = wp_count_comments(); + $response['supplemental'] = array( + 'in_moderation' => $counts->moderated, + 'i18n_comments_text' => sprintf( + _n( '%s Comment', '%s Comments', $counts->approved ), + number_format_i18n( $counts->approved ) + ), + 'i18n_moderation_text' => sprintf( + _nx( '%s in moderation', '%s in moderation', $counts->moderated, 'comments' ), + number_format_i18n( $counts->moderated ) + ) + ); + + if ( $comment_auto_approved ) { + $response['supplemental']['parent_approved'] = $parent->comment_ID; + $response['supplemental']['parent_post_id'] = $parent->comment_post_ID; + } $x = new WP_Ajax_Response(); $x->add( $response ); $x->send(); } +/** + * Ajax handler for editing a comment. + * + * @since 3.1.0 + * + * @global WP_List_Table $wp_list_table + */ function wp_ajax_edit_comment() { global $wp_list_table; @@ -878,8 +1112,6 @@ function wp_ajax_edit_comment() { edit_comment(); $position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1'; - $comments_status = isset($_POST['comments_listing']) ? $_POST['comments_listing'] : ''; - $checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0; $wp_list_table = _get_list_table( $checkbox ? 'WP_Comments_List_Table' : 'WP_Post_Comments_List_Table', array( 'screen' => 'edit-comments' ) ); @@ -903,6 +1135,11 @@ function wp_ajax_edit_comment() { $x->send(); } +/** + * Ajax handler for adding a menu item. + * + * @since 3.1.0 + */ function wp_ajax_add_menu_item() { check_ajax_referer( 'add-menu_item', 'menu-settings-column-nonce' ); @@ -926,13 +1163,17 @@ function wp_ajax_add_menu_item() { $_object = get_post( $menu_item_data['menu-item-object-id'] ); break; + case 'post_type_archive' : + $_object = get_post_type_object( $menu_item_data['menu-item-object'] ); + break; + case 'taxonomy' : $_object = get_term( $menu_item_data['menu-item-object-id'], $menu_item_data['menu-item-object'] ); break; } $_menu_items = array_map( 'wp_setup_nav_menu_item', array( $_object ) ); - $_menu_item = array_shift( $_menu_items ); + $_menu_item = reset( $_menu_items ); // Restore the missing menu item properties $menu_item_data['menu-item-description'] = $_menu_item->description; @@ -956,14 +1197,7 @@ function wp_ajax_add_menu_item() { } } - /** - * Filter the Walker class used when adding nav menu items. - * - * @since 3.4.0 - * - * @param string $class The walker class to use. Default 'Walker_Nav_Menu_Edit'. - * @param int $menu_id The menu id, derived from $_POST['menu']. - */ + /** This filter is documented in wp-admin/includes/nav-menu.php */ $walker_class_name = apply_filters( 'wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $_POST['menu'] ); if ( ! class_exists( $walker_class_name ) ) @@ -982,6 +1216,11 @@ function wp_ajax_add_menu_item() { wp_die(); } +/** + * Ajax handler for adding meta. + * + * @since 3.1.0 + */ function wp_ajax_add_meta() { check_ajax_referer( 'add-meta', '_ajax_nonce-add-meta' ); $c = 0; @@ -993,17 +1232,19 @@ function wp_ajax_add_meta() { wp_die( -1 ); if ( isset($_POST['metakeyselect']) && '#NONE#' == $_POST['metakeyselect'] && empty($_POST['metakeyinput']) ) wp_die( 1 ); + + // If the post is an autodraft, save the post as a draft and then attempt to save the meta. if ( $post->post_status == 'auto-draft' ) { - $save_POST = $_POST; // Backup $_POST - $_POST = array(); // Make it empty for edit_post() - $_POST['action'] = 'draft'; // Warning fix - $_POST['post_ID'] = $pid; - $_POST['post_type'] = $post->post_type; - $_POST['post_status'] = 'draft'; + $post_data = array(); + $post_data['action'] = 'draft'; // Warning fix + $post_data['post_ID'] = $pid; + $post_data['post_type'] = $post->post_type; + $post_data['post_status'] = 'draft'; $now = current_time('timestamp', 1); - $_POST['post_title'] = sprintf( __( 'Draft created on %1$s at %2$s' ), date( get_option( 'date_format' ), $now ), date( get_option( 'time_format' ), $now ) ); + $post_data['post_title'] = sprintf( __( 'Draft created on %1$s at %2$s' ), date( __( 'F j, Y' ), $now ), date( __( 'g:i a' ), $now ) ); - if ( $pid = edit_post() ) { + $pid = edit_post( $post_data ); + if ( $pid ) { if ( is_wp_error( $pid ) ) { $x = new WP_Ajax_Response( array( 'what' => 'meta', @@ -1011,13 +1252,13 @@ function wp_ajax_add_meta() { ) ); $x->send(); } - $_POST = $save_POST; // Now we can restore original $_POST again + if ( !$mid = add_meta( $pid ) ) wp_die( __( 'Please provide a custom field value.' ) ); } else { wp_die( 0 ); } - } else if ( !$mid = add_meta( $pid ) ) { + } elseif ( ! $mid = add_meta( $pid ) ) { wp_die( __( 'Please provide a custom field value.' ) ); } @@ -1065,6 +1306,15 @@ function wp_ajax_add_meta() { $x->send(); } +/** + * Ajax handler for adding a user. + * + * @since 3.1.0 + * + * @global WP_List_Table $wp_list_table + * + * @param string $action Action to perform. + */ function wp_ajax_add_user( $action ) { global $wp_list_table; if ( empty( $action ) ) @@ -1093,13 +1343,22 @@ function wp_ajax_add_user( $action ) { 'id' => $user_id, 'data' => $wp_list_table->single_row( $user_object, '', $role ), 'supplemental' => array( - 'show-link' => sprintf(__( 'User %s added' ), "user-$user_id", $user_object->user_login), + 'show-link' => sprintf( + /* translators: %s: the new user */ + __( 'User %s added' ), + '' . $user_object->user_login . '' + ), 'role' => $role, ) ) ); $x->send(); } +/** + * Ajax handler for closed post boxes. + * + * @since 3.1.0 + */ function wp_ajax_closed_postboxes() { check_ajax_referer( 'closedpostboxes', 'closedpostboxesnonce' ); $closed = isset( $_POST['closed'] ) ? explode( ',', $_POST['closed']) : array(); @@ -1127,10 +1386,13 @@ function wp_ajax_closed_postboxes() { wp_die( 1 ); } +/** + * Ajax handler for hidden columns. + * + * @since 3.1.0 + */ function wp_ajax_hidden_columns() { check_ajax_referer( 'screen-options-nonce', 'screenoptionnonce' ); - $hidden = isset( $_POST['hidden'] ) ? $_POST['hidden'] : ''; - $hidden = explode( ',', $_POST['hidden'] ); $page = isset( $_POST['page'] ) ? $_POST['page'] : ''; if ( $page != sanitize_key( $page ) ) @@ -1139,12 +1401,17 @@ function wp_ajax_hidden_columns() { if ( ! $user = wp_get_current_user() ) wp_die( -1 ); - if ( is_array($hidden) ) - update_user_option($user->ID, "manage{$page}columnshidden", $hidden, true); + $hidden = ! empty( $_POST['hidden'] ) ? explode( ',', $_POST['hidden'] ) : array(); + update_user_option( $user->ID, "manage{$page}columnshidden", $hidden, true ); wp_die( 1 ); } +/** + * Ajax handler for updating whether to display the welcome panel. + * + * @since 3.1.0 + */ function wp_ajax_update_welcome_panel() { check_ajax_referer( 'welcome-panel-nonce', 'welcomepanelnonce' ); @@ -1156,6 +1423,11 @@ function wp_ajax_update_welcome_panel() { wp_die( 1 ); } +/** + * Ajax handler for retrieving menu meta boxes. + * + * @since 3.1.0 + */ function wp_ajax_menu_get_metabox() { if ( ! current_user_can( 'edit_theme_options' ) ) wp_die( -1 ); @@ -1174,14 +1446,8 @@ function wp_ajax_menu_get_metabox() { if ( ! empty( $_POST['item-object'] ) && isset( $items[$_POST['item-object']] ) ) { $menus_meta_box_object = $items[ $_POST['item-object'] ]; - /** - * Filter a nav menu meta box object. - * - * @since 3.0.0 - * - * @param object $menus_meta_box_object A nav menu meta box object, such as Page, - * Post, Category, Tag, etc. - */ + + /** This filter is documented in wp-admin/includes/nav-menu.php */ $item = apply_filters( 'nav_menu_meta_box_object', $menus_meta_box_object ); ob_start(); call_user_func_array($callback, array( @@ -1196,7 +1462,7 @@ function wp_ajax_menu_get_metabox() { $markup = ob_get_clean(); - echo json_encode(array( + echo wp_json_encode(array( 'replace-id' => $type . '-' . $item->name, 'markup' => $markup, )); @@ -1205,13 +1471,24 @@ function wp_ajax_menu_get_metabox() { wp_die(); } +/** + * Ajax handler for internal linking. + * + * @since 3.1.0 + */ function wp_ajax_wp_link_ajax() { check_ajax_referer( 'internal-linking', '_ajax_linking_nonce' ); $args = array(); - if ( isset( $_POST['search'] ) ) + if ( isset( $_POST['search'] ) ) { $args['s'] = wp_unslash( $_POST['search'] ); + } + + if ( isset( $_POST['term'] ) ) { + $args['s'] = wp_unslash( $_POST['term'] ); + } + $args['pagenum'] = ! empty( $_POST['page'] ) ? absint( $_POST['page'] ) : 1; require(ABSPATH . WPINC . '/class-wp-editor.php'); @@ -1220,12 +1497,17 @@ function wp_ajax_wp_link_ajax() { if ( ! isset( $results ) ) wp_die( 0 ); - echo json_encode( $results ); + echo wp_json_encode( $results ); echo "\n"; wp_die(); } +/** + * Ajax handler for menu locations save. + * + * @since 3.1.0 + */ function wp_ajax_menu_locations_save() { if ( ! current_user_can( 'edit_theme_options' ) ) wp_die( -1 ); @@ -1236,6 +1518,11 @@ function wp_ajax_menu_locations_save() { wp_die( 1 ); } +/** + * Ajax handler for saving the meta box order. + * + * @since 3.1.0 + */ function wp_ajax_meta_box_order() { check_ajax_referer( 'meta-box-order' ); $order = isset( $_POST['order'] ) ? (array) $_POST['order'] : false; @@ -1261,6 +1548,11 @@ function wp_ajax_meta_box_order() { wp_die( 1 ); } +/** + * Ajax handler for menu quick searching. + * + * @since 3.1.0 + */ function wp_ajax_menu_quick_search() { if ( ! current_user_can( 'edit_theme_options' ) ) wp_die( -1 ); @@ -1272,12 +1564,22 @@ function wp_ajax_menu_quick_search() { wp_die(); } +/** + * Ajax handler to retrieve a permalink. + * + * @since 3.1.0 + */ function wp_ajax_get_permalink() { check_ajax_referer( 'getpermalink', 'getpermalinknonce' ); $post_id = isset($_POST['post_id'])? intval($_POST['post_id']) : 0; - wp_die( add_query_arg( array( 'preview' => 'true' ), get_permalink( $post_id ) ) ); + wp_die( get_preview_post_link( $post_id ) ); } +/** + * Ajax handler to retrieve a sample permalink. + * + * @since 3.1.0 + */ function wp_ajax_sample_permalink() { check_ajax_referer( 'samplepermalink', 'samplepermalinknonce' ); $post_id = isset($_POST['post_id'])? intval($_POST['post_id']) : 0; @@ -1286,8 +1588,15 @@ function wp_ajax_sample_permalink() { wp_die( get_sample_permalink_html( $post_id, $title, $slug ) ); } +/** + * Ajax handler for Quick Edit saving a post from a list table. + * + * @since 3.1.0 + * + * @global WP_List_Table $wp_list_table + */ function wp_ajax_inline_save() { - global $wp_list_table; + global $wp_list_table, $mode; check_ajax_referer( 'inlineeditnonce', '_inline_edit' ); @@ -1312,40 +1621,55 @@ function wp_ajax_inline_save() { $data = &$_POST; $post = get_post( $post_ID, ARRAY_A ); - $post = wp_slash($post); //since it is from db + + // Since it's coming from the database. + $post = wp_slash($post); $data['content'] = $post['post_content']; $data['excerpt'] = $post['post_excerpt']; - // rename + // Rename. $data['user_ID'] = get_current_user_id(); if ( isset($data['post_parent']) ) $data['parent_id'] = $data['post_parent']; - // status - if ( isset($data['keep_private']) && 'private' == $data['keep_private'] ) + // Status. + if ( isset( $data['keep_private'] ) && 'private' == $data['keep_private'] ) { + $data['visibility'] = 'private'; $data['post_status'] = 'private'; - else + } else { $data['post_status'] = $data['_status']; + } if ( empty($data['comment_status']) ) $data['comment_status'] = 'closed'; if ( empty($data['ping_status']) ) $data['ping_status'] = 'closed'; + // Exclude terms from taxonomies that are not supposed to appear in Quick Edit. + if ( ! empty( $data['tax_input'] ) ) { + foreach ( $data['tax_input'] as $taxonomy => $terms ) { + $tax_object = get_taxonomy( $taxonomy ); + /** This filter is documented in wp-admin/includes/class-wp-posts-list-table.php */ + if ( ! apply_filters( 'quick_edit_show_taxonomy', $tax_object->show_in_quick_edit, $taxonomy, $post['post_type'] ) ) { + unset( $data['tax_input'][ $taxonomy ] ); + } + } + } + // Hack: wp_unique_post_slug() doesn't work for drafts, so we will fake that our post is published. if ( ! empty( $data['post_name'] ) && in_array( $post['post_status'], array( 'draft', 'pending' ) ) ) { $post['post_status'] = 'publish'; $data['post_name'] = wp_unique_post_slug( $data['post_name'], $post['ID'], $post['post_status'], $post['post_type'], $post['post_parent'] ); } - // update the post + // Update the post. edit_post(); $wp_list_table = _get_list_table( 'WP_Posts_List_Table', array( 'screen' => $_POST['screen'] ) ); - $mode = $_POST['post_view']; + $mode = $_POST['post_view'] === 'excerpt' ? 'excerpt' : 'list'; $level = 0; $request_post = array( get_post( $_POST['post_ID'] ) ); @@ -1362,6 +1686,13 @@ function wp_ajax_inline_save() { wp_die(); } +/** + * Ajax handler for quick edit saving for a term. + * + * @since 3.1.0 + * + * @global WP_List_Table $wp_list_table + */ function wp_ajax_inline_save_tax() { global $wp_list_table; @@ -1407,16 +1738,20 @@ function wp_ajax_inline_save_tax() { wp_die(); } +/** + * Ajax handler for querying posts for the Find Posts modal. + * + * @see window.findPosts + * + * @since 3.1.0 + */ function wp_ajax_find_posts() { - global $wpdb; - check_ajax_referer( 'find-posts' ); $post_types = get_post_types( array( 'public' => true ), 'objects' ); unset( $post_types['attachment'] ); $s = wp_unslash( $_POST['ps'] ); - $searchand = $search = ''; $args = array( 'post_type' => array_keys( $post_types ), 'post_status' => 'any', @@ -1427,8 +1762,9 @@ function wp_ajax_find_posts() { $posts = get_posts( $args ); - if ( ! $posts ) - wp_die( __('No items found.') ); + if ( ! $posts ) { + wp_send_json_error( __( 'No items found.' ) ); + } $html = '

$action

{$data[1]}

'; $alt = ''; @@ -1468,6 +1804,11 @@ function wp_ajax_find_posts() { wp_send_json_success( $html ); } +/** + * Ajax handler for saving the widgets order. + * + * @since 3.1.0 + */ function wp_ajax_widgets_order() { check_ajax_referer( 'save-sidebar-widgets', 'savewidgets' ); @@ -1476,7 +1817,7 @@ function wp_ajax_widgets_order() { unset( $_POST['savewidgets'], $_POST['action'] ); - // save widgets order for all sidebars + // Save widgets order for all sidebars. if ( is_array($_POST['sidebars']) ) { $sidebars = array(); foreach ( $_POST['sidebars'] as $key => $val ) { @@ -1499,6 +1840,15 @@ function wp_ajax_widgets_order() { wp_die( -1 ); } +/** + * Ajax handler for saving a widget. + * + * @since 3.1.0 + * + * @global array $wp_registered_widgets + * @global array $wp_registered_widget_controls + * @global array $wp_registered_widget_updates + */ function wp_ajax_save_widget() { global $wp_registered_widgets, $wp_registered_widget_controls, $wp_registered_widget_updates; @@ -1536,7 +1886,7 @@ function wp_ajax_save_widget() { $sidebars = wp_get_sidebars_widgets(); $sidebar = isset($sidebars[$sidebar_id]) ? $sidebars[$sidebar_id] : array(); - // delete + // Delete. if ( isset($_POST['delete_widget']) && $_POST['delete_widget'] ) { if ( !isset($wp_registered_widgets[$widget_id]) ) @@ -1544,11 +1894,15 @@ function wp_ajax_save_widget() { $sidebar = array_diff( $sidebar, array($widget_id) ); $_POST = array('sidebar' => $sidebar_id, 'widget-' . $id_base => array(), 'the-widget-id' => $widget_id, 'delete_widget' => '1'); + + /** This action is documented in wp-admin/widgets.php */ + do_action( 'delete_widget', $widget_id, $sidebar_id, $id_base ); + } elseif ( $settings && preg_match( '/__i__|%i%/', key($settings) ) ) { if ( !$multi_number ) wp_die( $error ); - $_POST['widget-' . $id_base] = array( $multi_number => array_shift($settings) ); + $_POST[ 'widget-' . $id_base ] = array( $multi_number => reset( $settings ) ); $widget_id = $id_base . '-' . $multi_number; $sidebar[] = $widget_id; } @@ -1583,21 +1937,91 @@ function wp_ajax_save_widget() { wp_die(); } +/** + * Ajax handler for saving a widget. + * + * @since 3.9.0 + * + * @global WP_Customize_Manager $wp_customize + */ function wp_ajax_update_widget() { global $wp_customize; $wp_customize->widgets->wp_ajax_update_widget(); } +/** + * Ajax handler for removing inactive widgets. + * + * @since 4.4.0 + */ +function wp_ajax_delete_inactive_widgets() { + check_ajax_referer( 'remove-inactive-widgets', 'removeinactivewidgets' ); + + if ( ! current_user_can( 'edit_theme_options' ) ) { + wp_die( -1 ); + } + + unset( $_POST['removeinactivewidgets'], $_POST['action'] ); + + do_action( 'load-widgets.php' ); + do_action( 'widgets.php' ); + do_action( 'sidebar_admin_setup' ); + + $sidebars_widgets = wp_get_sidebars_widgets(); + + foreach ( $sidebars_widgets['wp_inactive_widgets'] as $key => $widget_id ) { + $pieces = explode( '-', $widget_id ); + $multi_number = array_pop( $pieces ); + $id_base = implode( '-', $pieces ); + $widget = get_option( 'widget_' . $id_base ); + unset( $widget[$multi_number] ); + update_option( 'widget_' . $id_base, $widget ); + unset( $sidebars_widgets['wp_inactive_widgets'][$key] ); + } + + wp_set_sidebars_widgets( $sidebars_widgets ); + + wp_die(); +} + +/** + * Ajax handler for uploading attachments + * + * @since 3.3.0 + */ function wp_ajax_upload_attachment() { check_ajax_referer( 'media-form' ); + /* + * This function does not use wp_send_json_success() / wp_send_json_error() + * as the html4 Plupload handler requires a text/html content-type for older IE. + * See https://core.trac.wordpress.org/ticket/31037 + */ + + if ( ! current_user_can( 'upload_files' ) ) { + echo wp_json_encode( array( + 'success' => false, + 'data' => array( + 'message' => __( 'You do not have permission to upload files.' ), + 'filename' => $_FILES['async-upload']['name'], + ) + ) ); - if ( ! current_user_can( 'upload_files' ) ) wp_die(); + } if ( isset( $_REQUEST['post_id'] ) ) { $post_id = $_REQUEST['post_id']; - if ( ! current_user_can( 'edit_post', $post_id ) ) + if ( ! current_user_can( 'edit_post', $post_id ) ) { + echo wp_json_encode( array( + 'success' => false, + 'data' => array( + 'message' => __( "You don't have permission to attach files to this post." ), + 'filename' => $_FILES['async-upload']['name'], + ) + ) ); + wp_die(); + } } else { $post_id = null; } @@ -1606,9 +2030,9 @@ function wp_ajax_upload_attachment() { // If the context is custom header or background, make sure the uploaded file is an image. if ( isset( $post_data['context'] ) && in_array( $post_data['context'], array( 'custom-header', 'custom-background' ) ) ) { - $wp_filetype = wp_check_filetype_and_ext( $_FILES['async-upload']['tmp_name'], $_FILES['async-upload']['name'], false ); + $wp_filetype = wp_check_filetype_and_ext( $_FILES['async-upload']['tmp_name'], $_FILES['async-upload']['name'] ); if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) ) { - echo json_encode( array( + echo wp_json_encode( array( 'success' => false, 'data' => array( 'message' => __( 'The uploaded file is not a valid image. Please try again.' ), @@ -1623,7 +2047,7 @@ function wp_ajax_upload_attachment() { $attachment_id = media_handle_upload( 'async-upload', $post_id, $post_data ); if ( is_wp_error( $attachment_id ) ) { - echo json_encode( array( + echo wp_json_encode( array( 'success' => false, 'data' => array( 'message' => $attachment_id->get_error_message(), @@ -1645,7 +2069,7 @@ function wp_ajax_upload_attachment() { if ( ! $attachment = wp_prepare_attachment_for_js( $attachment_id ) ) wp_die(); - echo json_encode( array( + echo wp_json_encode( array( 'success' => true, 'data' => $attachment, ) ); @@ -1653,6 +2077,11 @@ function wp_ajax_upload_attachment() { wp_die(); } +/** + * Ajax handler for image editing. + * + * @since 3.1.0 + */ function wp_ajax_image_editor() { $attachment_id = intval($_POST['postid']); if ( empty($attachment_id) || !current_user_can('edit_post', $attachment_id) ) @@ -1665,7 +2094,7 @@ function wp_ajax_image_editor() { switch ( $_POST['do'] ) { case 'save' : $msg = wp_save_image($attachment_id); - $msg = json_encode($msg); + $msg = wp_json_encode($msg); wp_die( $msg ); break; case 'scale' : @@ -1680,6 +2109,11 @@ function wp_ajax_image_editor() { wp_die(); } +/** + * Ajax handler for setting the featured image. + * + * @since 3.1.0 + */ function wp_ajax_set_post_thumbnail() { $json = ! empty( $_REQUEST['json'] ); // New-style request @@ -1711,27 +2145,89 @@ function wp_ajax_set_post_thumbnail() { wp_die( 0 ); } +/** + * AJAX handler for setting the featured image for an attachment. + * + * @since 4.0.0 + * + * @see set_post_thumbnail() + */ +function wp_ajax_set_attachment_thumbnail() { + if ( empty( $_POST['urls'] ) || ! is_array( $_POST['urls'] ) ) { + wp_send_json_error(); + } + + $thumbnail_id = (int) $_POST['thumbnail_id']; + if ( empty( $thumbnail_id ) ) { + wp_send_json_error(); + } + + $post_ids = array(); + // For each URL, try to find its corresponding post ID. + foreach ( $_POST['urls'] as $url ) { + $post_id = attachment_url_to_postid( $url ); + if ( ! empty( $post_id ) ) { + $post_ids[] = $post_id; + } + } + + if ( empty( $post_ids ) ) { + wp_send_json_error(); + } + + $success = 0; + // For each found attachment, set its thumbnail. + foreach ( $post_ids as $post_id ) { + if ( ! current_user_can( 'edit_post', $post_id ) ) { + continue; + } + + if ( set_post_thumbnail( $post_id, $thumbnail_id ) ) { + $success++; + } + } + + if ( 0 === $success ) { + wp_send_json_error(); + } else { + wp_send_json_success(); + } + + wp_send_json_error(); +} + +/** + * Ajax handler for date formatting. + * + * @since 3.1.0 + */ function wp_ajax_date_format() { wp_die( date_i18n( sanitize_option( 'date_format', wp_unslash( $_POST['date'] ) ) ) ); } +/** + * Ajax handler for time formatting. + * + * @since 3.1.0 + */ function wp_ajax_time_format() { wp_die( date_i18n( sanitize_option( 'time_format', wp_unslash( $_POST['date'] ) ) ) ); } +/** + * Ajax handler for saving posts from the fullscreen editor. + * + * @since 3.1.0 + * @deprecated 4.3.0 + */ function wp_ajax_wp_fullscreen_save_post() { $post_id = isset( $_POST['post_ID'] ) ? (int) $_POST['post_ID'] : 0; - $post = $post_type = null; + $post = null; if ( $post_id ) $post = get_post( $post_id ); - if ( $post ) - $post_type = $post->post_type; - elseif ( isset( $_POST['post_type'] ) && post_type_exists( $_POST['post_type'] ) ) - $post_type = $_POST['post_type']; - check_ajax_referer('update-post_' . $post_id, '_wpnonce'); $post_id = edit_post(); @@ -1741,11 +2237,11 @@ function wp_ajax_wp_fullscreen_save_post() { } if ( $post ) { - $last_date = mysql2date( get_option('date_format'), $post->post_modified ); - $last_time = mysql2date( get_option('time_format'), $post->post_modified ); + $last_date = mysql2date( __( 'F j, Y' ), $post->post_modified ); + $last_time = mysql2date( __( 'g:i a' ), $post->post_modified ); } else { - $last_date = date_i18n( get_option('date_format') ); - $last_time = date_i18n( get_option('time_format') ); + $last_date = date_i18n( __( 'F j, Y' ) ); + $last_time = date_i18n( __( 'g:i a' ) ); } if ( $last_id = get_post_meta( $post_id, '_edit_last', true ) ) { @@ -1758,6 +2254,11 @@ function wp_ajax_wp_fullscreen_save_post() { wp_send_json_success( array( 'last_edited' => $last_edited ) ); } +/** + * Ajax handler for removing a post lock. + * + * @since 3.1.0 + */ function wp_ajax_wp_remove_post_lock() { if ( empty( $_POST['post_ID'] ) || empty( $_POST['active_post_lock'] ) ) wp_die( 0 ); @@ -1787,6 +2288,11 @@ function wp_ajax_wp_remove_post_lock() { wp_die( 1 ); } +/** + * Ajax handler for dismissing a WordPress pointer. + * + * @since 3.1.0 + */ function wp_ajax_dismiss_wp_pointer() { $pointer = $_POST['pointer']; if ( $pointer != sanitize_key( $pointer ) ) @@ -1807,7 +2313,7 @@ function wp_ajax_dismiss_wp_pointer() { } /** - * Get an attachment. + * Ajax handler for getting an attachment. * * @since 3.5.0 */ @@ -1834,7 +2340,7 @@ function wp_ajax_get_attachment() { } /** - * Query for attachments. + * Ajax handler for querying attachments. * * @since 3.5.0 */ @@ -1843,13 +2349,26 @@ function wp_ajax_query_attachments() { wp_send_json_error(); $query = isset( $_REQUEST['query'] ) ? (array) $_REQUEST['query'] : array(); - $query = array_intersect_key( $query, array_flip( array( + $keys = array( 's', 'order', 'orderby', 'posts_per_page', 'paged', 'post_mime_type', - 'post_parent', 'post__in', 'post__not_in', - ) ) ); + 'post_parent', 'post__in', 'post__not_in', 'year', 'monthnum' + ); + foreach ( get_taxonomies_for_attachments( 'objects' ) as $t ) { + if ( $t->query_var && isset( $query[ $t->query_var ] ) ) { + $keys[] = $t->query_var; + } + } + $query = array_intersect_key( $query, array_flip( $keys ) ); $query['post_type'] = 'attachment'; - $query['post_status'] = 'inherit'; + if ( MEDIA_TRASH + && ! empty( $_REQUEST['query']['post_status'] ) + && 'trash' === $_REQUEST['query']['post_status'] ) { + $query['post_status'] = 'trash'; + } else { + $query['post_status'] = 'inherit'; + } + if ( current_user_can( get_post_type_object( 'attachment' )->cap->read_private_posts ) ) $query['post_status'] .= ',private'; @@ -1873,7 +2392,7 @@ function wp_ajax_query_attachments() { } /** - * Save attachment attributes. + * Ajax handler for updating attachment attributes. * * @since 3.5.0 */ @@ -1895,6 +2414,9 @@ function wp_ajax_save_attachment() { if ( 'attachment' != $post['post_type'] ) wp_send_json_error(); + if ( isset( $changes['parent'] ) ) + $post['post_parent'] = $changes['parent']; + if ( isset( $changes['title'] ) ) $post['post_title'] = $changes['title']; @@ -1904,6 +2426,9 @@ function wp_ajax_save_attachment() { if ( isset( $changes['description'] ) ) $post['post_content'] = $changes['description']; + if ( MEDIA_TRASH && isset( $changes['status'] ) ) + $post['post_status'] = $changes['status']; + if ( isset( $changes['alt'] ) ) { $alt = wp_unslash( $changes['alt'] ); if ( $alt != get_post_meta( $id, '_wp_attachment_image_alt', true ) ) { @@ -1912,12 +2437,36 @@ function wp_ajax_save_attachment() { } } - wp_update_post( $post ); + if ( wp_attachment_is( 'audio', $post['ID'] ) ) { + $changed = false; + $id3data = wp_get_attachment_metadata( $post['ID'] ); + if ( ! is_array( $id3data ) ) { + $changed = true; + $id3data = array(); + } + foreach ( wp_get_attachment_id3_keys( (object) $post, 'edit' ) as $key => $label ) { + if ( isset( $changes[ $key ] ) ) { + $changed = true; + $id3data[ $key ] = sanitize_text_field( wp_unslash( $changes[ $key ] ) ); + } + } + + if ( $changed ) { + wp_update_attachment_metadata( $id, $id3data ); + } + } + + if ( MEDIA_TRASH && isset( $changes['status'] ) && 'trash' === $changes['status'] ) { + wp_delete_post( $id ); + } else { + wp_update_post( $post ); + } + wp_send_json_success(); } /** - * Save backwards compatible attachment attributes. + * Ajax handler for saving backwards compatible attachment attributes. * * @since 3.5.0 */ @@ -1963,6 +2512,11 @@ function wp_ajax_save_attachment_compat() { wp_send_json_success( $attachment ); } +/** + * Ajax handler for saving the attachment order. + * + * @since 3.5.0 + */ function wp_ajax_save_attachment_order() { if ( ! isset( $_REQUEST['post_id'] ) ) wp_send_json_error(); @@ -1980,8 +2534,6 @@ function wp_ajax_save_attachment_order() { if ( ! current_user_can( 'edit_post', $post_id ) ) wp_send_json_error(); - $post = get_post( $post_id, ARRAY_A ); - foreach ( $attachments as $attachment_id => $menu_order ) { if ( ! current_user_can( 'edit_post', $attachment_id ) ) continue; @@ -1997,9 +2549,11 @@ function wp_ajax_save_attachment_order() { } /** + * Ajax handler for sending an attachment to the editor. + * * Generates the HTML to send an attachment to the editor. - * Backwards compatible with the media_send_to_editor filter and the chain - * of filters that follow. + * Backwards compatible with the media_send_to_editor filter + * and the chain of filters that follow. * * @since 3.5.0 */ @@ -2023,14 +2577,8 @@ function wp_ajax_send_attachment_to_editor() { } } - $rel = $url = ''; - $html = $title = isset( $attachment['post_title'] ) ? $attachment['post_title'] : ''; - if ( ! empty( $attachment['url'] ) ) { - $url = $attachment['url']; - if ( strpos( $url, 'attachment_id') || get_attachment_link( $id ) == $url ) - $rel = ' rel="attachment wp-att-' . $id . '"'; - $html = '' . $html . ''; - } + $url = empty( $attachment['url'] ) ? '' : $attachment['url']; + $rel = ( strpos( $url, 'attachment_id') || get_attachment_link( $id ) == $url ); remove_filter( 'media_send_to_editor', 'image_media_send_to_editor' ); @@ -2038,11 +2586,24 @@ function wp_ajax_send_attachment_to_editor() { $align = isset( $attachment['align'] ) ? $attachment['align'] : 'none'; $size = isset( $attachment['image-size'] ) ? $attachment['image-size'] : 'medium'; $alt = isset( $attachment['image_alt'] ) ? $attachment['image_alt'] : ''; + + // No whitespace-only captions. $caption = isset( $attachment['post_excerpt'] ) ? $attachment['post_excerpt'] : ''; + if ( '' === trim( $caption ) ) { + $caption = ''; + } + $title = ''; // We no longer insert title tags into tags, as they are redundant. - $html = get_image_send_to_editor( $id, $caption, $title, $align, $url, (bool) $rel, $size, $alt ); - } elseif ( 'video' === substr( $post->post_mime_type, 0, 5 ) || 'audio' === substr( $post->post_mime_type, 0, 5 ) ) { + $html = get_image_send_to_editor( $id, $caption, $title, $align, $url, $rel, $size, $alt ); + } elseif ( wp_attachment_is( 'video', $post ) || wp_attachment_is( 'audio', $post ) ) { $html = stripslashes_deep( $_POST['html'] ); + } else { + $html = isset( $attachment['post_title'] ) ? $attachment['post_title'] : ''; + $rel = $rel ? ' rel="attachment wp-att-' . $id . '"' : ''; // Hard-coded string, $id is already sanitized + + if ( ! empty( $url ) ) { + $html = '' . $html . ''; + } } /** This filter is documented in wp-admin/includes/media.php */ @@ -2052,6 +2613,8 @@ function wp_ajax_send_attachment_to_editor() { } /** + * Ajax handler for sending a link to the editor. + * * Generates the HTML to send a non-image embed link to the editor. * * Backwards compatible with the following filters: @@ -2060,8 +2623,13 @@ function wp_ajax_send_attachment_to_editor() { * - video_send_to_editor_url * * @since 3.5.0 + * + * @global WP_Post $post + * @global WP_Embed $wp_embed */ function wp_ajax_send_link_to_editor() { + global $post, $wp_embed; + check_ajax_referer( 'media-send-to-editor', 'nonce' ); if ( ! $src = wp_unslash( $_POST['src'] ) ) @@ -2073,12 +2641,25 @@ function wp_ajax_send_link_to_editor() { if ( ! $src = esc_url_raw( $src ) ) wp_send_json_error(); - if ( ! $title = trim( wp_unslash( $_POST['title'] ) ) ) - $title = wp_basename( $src ); + if ( ! $link_text = trim( wp_unslash( $_POST['link_text'] ) ) ) + $link_text = wp_basename( $src ); + + $post = get_post( isset( $_POST['post_id'] ) ? $_POST['post_id'] : 0 ); - $html = ''; - if ( $title ) - $html = '' . $title . ''; + // Ping WordPress for an embed. + $check_embed = $wp_embed->run_shortcode( '[embed]'. $src .'[/embed]' ); + + // Fallback that WordPress creates when no oEmbed was found. + $fallback = $wp_embed->maybe_make_link( $src ); + + if ( $check_embed !== $fallback ) { + // TinyMCE view for [embed] will parse this + $html = '[embed]' . $src . '[/embed]'; + } elseif ( $link_text ) { + $html = '' . $link_text . ''; + } else { + $html = ''; + } // Figure out what filter to run: $type = 'file'; @@ -2087,45 +2668,56 @@ function wp_ajax_send_link_to_editor() { $type = $ext_type; /** This filter is documented in wp-admin/includes/media.php */ - $html = apply_filters( $type . '_send_to_editor_url', $html, $src, $title ); + $html = apply_filters( $type . '_send_to_editor_url', $html, $src, $link_text ); wp_send_json_success( $html ); } /** - * Heartbeat API (experimental) + * Ajax handler for the Heartbeat API. * * Runs when the user is logged in. + * + * @since 3.6.0 */ function wp_ajax_heartbeat() { - if ( empty( $_POST['_nonce'] ) ) + if ( empty( $_POST['_nonce'] ) ) { wp_send_json_error(); - - $response = array(); - - if ( false === wp_verify_nonce( $_POST['_nonce'], 'heartbeat-nonce' ) ) { - // User is logged in but nonces have expired. - $response['nonces_expired'] = true; - wp_send_json($response); } - // screen_id is the same as $current_screen->id and the JS global 'pagenow' - if ( ! empty($_POST['screen_id']) ) + $response = $data = array(); + $nonce_state = wp_verify_nonce( $_POST['_nonce'], 'heartbeat-nonce' ); + + // screen_id is the same as $current_screen->id and the JS global 'pagenow'. + if ( ! empty( $_POST['screen_id'] ) ) { $screen_id = sanitize_key($_POST['screen_id']); - else + } else { $screen_id = 'front'; + } - if ( ! empty($_POST['data']) ) { + if ( ! empty( $_POST['data'] ) ) { $data = wp_unslash( (array) $_POST['data'] ); + } + + if ( 1 !== $nonce_state ) { + $response = apply_filters( 'wp_refresh_nonces', $response, $data, $screen_id ); + if ( false === $nonce_state ) { + // User is logged in but nonces have expired. + $response['nonces_expired'] = true; + wp_send_json( $response ); + } + } + + if ( ! empty( $data ) ) { /** * Filter the Heartbeat response received. * * @since 3.6.0 * - * @param array|object $response The Heartbeat response object or array. - * @param array $data The $_POST data sent. - * @param string $screen_id The screen id. + * @param array $response The Heartbeat response. + * @param array $data The $_POST data sent. + * @param string $screen_id The screen id. */ $response = apply_filters( 'heartbeat_received', $response, $data, $screen_id ); } @@ -2135,8 +2727,8 @@ function wp_ajax_heartbeat() { * * @since 3.6.0 * - * @param array|object $response The Heartbeat response object or array. - * @param string $screen_id The screen id. + * @param array $response The Heartbeat response. + * @param string $screen_id The screen id. */ $response = apply_filters( 'heartbeat_send', $response, $screen_id ); @@ -2147,17 +2739,22 @@ function wp_ajax_heartbeat() { * * @since 3.6.0 * - * @param array|object $response The Heartbeat response object or array. - * @param string $screen_id The screen id. + * @param array $response The Heartbeat response. + * @param string $screen_id The screen id. */ do_action( 'heartbeat_tick', $response, $screen_id ); // Send the current time according to the server $response['server_time'] = time(); - wp_send_json($response); + wp_send_json( $response ); } +/** + * Ajax handler for getting revision diffs. + * + * @since 3.6.0 + */ function wp_ajax_get_revision_diffs() { require ABSPATH . 'wp-admin/includes/revision.php'; @@ -2186,9 +2783,12 @@ function wp_ajax_get_revision_diffs() { } /** - * Auto-save the selected color scheme for a user's own profile. + * Ajax handler for auto-saving the selected color scheme for + * a user's own profile. + * + * @since 3.8.0 * - * @since 3.8.0 + * @global array $_wp_admin_css_colors */ function wp_ajax_save_user_color_scheme() { global $_wp_admin_css_colors; @@ -2201,14 +2801,22 @@ function wp_ajax_save_user_color_scheme() { wp_send_json_error(); } + $previous_color_scheme = get_user_meta( get_current_user_id(), 'admin_color', true ); update_user_meta( get_current_user_id(), 'admin_color', $color_scheme ); - wp_send_json_success(); + + wp_send_json_success( array( + 'previousScheme' => 'admin-color-' . $previous_color_scheme, + 'currentScheme' => 'admin-color-' . $color_scheme + ) ); } /** - * Get themes from themes_api(). + * Ajax handler for getting themes from themes_api(). * * @since 3.9.0 + * + * @global array $themes_allowedtags + * @global array $theme_field_defaults */ function wp_ajax_query_themes() { global $themes_allowedtags, $theme_field_defaults; @@ -2222,6 +2830,13 @@ function wp_ajax_query_themes() { 'fields' => $theme_field_defaults ) ); + if ( isset( $args['browse'] ) && 'favorites' === $args['browse'] && ! isset( $args['user'] ) ) { + $user = get_user_option( 'wporg_favorites' ); + if ( $user ) { + $args['user'] = $user; + } + } + $old_filter = isset( $args['browse'] ) ? $args['browse'] : 'search'; /** This filter is documented in wp-admin/includes/class-wp-theme-install-list-table.php */ @@ -2244,8 +2859,471 @@ function wp_ajax_query_themes() { $theme->author = wp_kses( $theme->author, $themes_allowedtags ); $theme->version = wp_kses( $theme->version, $themes_allowedtags ); $theme->description = wp_kses( $theme->description, $themes_allowedtags ); - $theme->num_ratings = sprintf( _n( '(based on %s rating)', '(based on %s ratings)', $theme->num_ratings ), number_format_i18n( $theme->num_ratings ) ); + $theme->stars = wp_star_rating( array( 'rating' => $theme->rating, 'type' => 'percent', 'number' => $theme->num_ratings, 'echo' => false ) ); + $theme->num_ratings = number_format_i18n( $theme->num_ratings ); + $theme->preview_url = set_url_scheme( $theme->preview_url ); } wp_send_json_success( $api ); } + +/** + * Apply [embed] AJAX handlers to a string. + * + * @since 4.0.0 + * + * @global WP_Post $post Global $post. + * @global WP_Embed $wp_embed Embed API instance. + * @global WP_Scripts $wp_scripts + */ +function wp_ajax_parse_embed() { + global $post, $wp_embed; + + if ( ! $post = get_post( (int) $_POST['post_ID'] ) ) { + wp_send_json_error(); + } + + if ( empty( $_POST['shortcode'] ) || ! current_user_can( 'edit_post', $post->ID ) ) { + wp_send_json_error(); + } + + $shortcode = wp_unslash( $_POST['shortcode'] ); + + preg_match( '/' . get_shortcode_regex() . '/s', $shortcode, $matches ); + $atts = shortcode_parse_atts( $matches[3] ); + if ( ! empty( $matches[5] ) ) { + $url = $matches[5]; + } elseif ( ! empty( $atts['src'] ) ) { + $url = $atts['src']; + } else { + $url = ''; + } + + $parsed = false; + setup_postdata( $post ); + + $wp_embed->return_false_on_fail = true; + + if ( is_ssl() && 0 === strpos( $url, 'http://' ) ) { + // Admin is ssl and the user pasted non-ssl URL. + // Check if the provider supports ssl embeds and use that for the preview. + $ssl_shortcode = preg_replace( '%^(\\[embed[^\\]]*\\])http://%i', '$1https://', $shortcode ); + $parsed = $wp_embed->run_shortcode( $ssl_shortcode ); + + if ( ! $parsed ) { + $no_ssl_support = true; + } + } + + if ( $url && ! $parsed ) { + $parsed = $wp_embed->run_shortcode( $shortcode ); + } + + if ( ! $parsed ) { + wp_send_json_error( array( + 'type' => 'not-embeddable', + 'message' => sprintf( __( '%s failed to embed.' ), '' . esc_html( $url ) . '' ), + ) ); + } + + if ( has_shortcode( $parsed, 'audio' ) || has_shortcode( $parsed, 'video' ) ) { + $styles = ''; + $mce_styles = wpview_media_sandbox_styles(); + foreach ( $mce_styles as $style ) { + $styles .= sprintf( '', $style ); + } + + $html = do_shortcode( $parsed ); + + global $wp_scripts; + if ( ! empty( $wp_scripts ) ) { + $wp_scripts->done = array(); + } + ob_start(); + wp_print_scripts( 'wp-mediaelement' ); + $scripts = ob_get_clean(); + + $parsed = $styles . $html . $scripts; + } + + + if ( ! empty( $no_ssl_support ) || ( is_ssl() && ( preg_match( '%<(iframe|script|embed) [^>]*src="http://%', $parsed ) || + preg_match( '%]*href="http://%', $parsed ) ) ) ) { + // Admin is ssl and the embed is not. Iframes, scripts, and other "active content" will be blocked. + wp_send_json_error( array( + 'type' => 'not-ssl', + 'message' => __( 'This preview is unavailable in the editor.' ), + ) ); + } + + wp_send_json_success( array( + 'body' => $parsed, + 'attr' => $wp_embed->last_attr + ) ); +} + +/** + * @since 4.0.0 + * + * @global WP_Post $post + * @global WP_Scripts $wp_scripts + */ +function wp_ajax_parse_media_shortcode() { + global $post, $wp_scripts; + + if ( empty( $_POST['shortcode'] ) ) { + wp_send_json_error(); + } + + $shortcode = wp_unslash( $_POST['shortcode'] ); + + if ( ! empty( $_POST['post_ID'] ) ) { + $post = get_post( (int) $_POST['post_ID'] ); + } + + // the embed shortcode requires a post + if ( ! $post || ! current_user_can( 'edit_post', $post->ID ) ) { + if ( 'embed' === $shortcode ) { + wp_send_json_error(); + } + } else { + setup_postdata( $post ); + } + + $parsed = do_shortcode( $shortcode ); + + if ( empty( $parsed ) ) { + wp_send_json_error( array( + 'type' => 'no-items', + 'message' => __( 'No items found.' ), + ) ); + } + + $head = ''; + $styles = wpview_media_sandbox_styles(); + + foreach ( $styles as $style ) { + $head .= ''; + } + + if ( ! empty( $wp_scripts ) ) { + $wp_scripts->done = array(); + } + + ob_start(); + + echo $parsed; + + if ( 'playlist' === $_REQUEST['type'] ) { + wp_underscore_playlist_templates(); + + wp_print_scripts( 'wp-playlist' ); + } else { + wp_print_scripts( array( 'froogaloop', 'wp-mediaelement' ) ); + } + + wp_send_json_success( array( + 'head' => $head, + 'body' => ob_get_clean() + ) ); +} + +/** + * AJAX handler for destroying multiple open sessions for a user. + * + * @since 4.1.0 + */ +function wp_ajax_destroy_sessions() { + $user = get_userdata( (int) $_POST['user_id'] ); + if ( $user ) { + if ( ! current_user_can( 'edit_user', $user->ID ) ) { + $user = false; + } elseif ( ! wp_verify_nonce( $_POST['nonce'], 'update-user_' . $user->ID ) ) { + $user = false; + } + } + + if ( ! $user ) { + wp_send_json_error( array( + 'message' => __( 'Could not log out user sessions. Please try again.' ), + ) ); + } + + $sessions = WP_Session_Tokens::get_instance( $user->ID ); + + if ( $user->ID === get_current_user_id() ) { + $sessions->destroy_others( wp_get_session_token() ); + $message = __( 'You are now logged out everywhere else.' ); + } else { + $sessions->destroy_all(); + /* translators: 1: User's display name. */ + $message = sprintf( __( '%s has been logged out.' ), $user->display_name ); + } + + wp_send_json_success( array( 'message' => $message ) ); +} + + +/** + * AJAX handler for updating a plugin. + * + * @since 4.2.0 + * + * @see Plugin_Upgrader + */ +function wp_ajax_update_plugin() { + global $wp_filesystem; + + $plugin = urldecode( $_POST['plugin'] ); + + $status = array( + 'update' => 'plugin', + 'plugin' => $plugin, + 'slug' => sanitize_key( $_POST['slug'] ), + 'oldVersion' => '', + 'newVersion' => '', + ); + + $plugin_data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin ); + if ( $plugin_data['Version'] ) { + $status['oldVersion'] = sprintf( __( 'Version %s' ), $plugin_data['Version'] ); + } + + if ( ! current_user_can( 'update_plugins' ) ) { + $status['error'] = __( 'You do not have sufficient permissions to update plugins for this site.' ); + wp_send_json_error( $status ); + } + + check_ajax_referer( 'updates' ); + + include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); + + wp_update_plugins(); + + $skin = new Automatic_Upgrader_Skin(); + $upgrader = new Plugin_Upgrader( $skin ); + $result = $upgrader->bulk_upgrade( array( $plugin ) ); + + if ( is_array( $result ) && empty( $result[$plugin] ) && is_wp_error( $skin->result ) ) { + $result = $skin->result; + } + + if ( is_array( $result ) && !empty( $result[ $plugin ] ) ) { + $plugin_update_data = current( $result ); + + /* + * If the `update_plugins` site transient is empty (e.g. when you update + * two plugins in quick succession before the transient repopulates), + * this may be the return. + * + * Preferably something can be done to ensure `update_plugins` isn't empty. + * For now, surface some sort of error here. + */ + if ( $plugin_update_data === true ) { + $status['error'] = __( 'Plugin update failed.' ); + wp_send_json_error( $status ); + } + + $plugin_data = get_plugins( '/' . $result[ $plugin ]['destination_name'] ); + $plugin_data = reset( $plugin_data ); + + if ( $plugin_data['Version'] ) { + $status['newVersion'] = sprintf( __( 'Version %s' ), $plugin_data['Version'] ); + } + + wp_send_json_success( $status ); + } else if ( is_wp_error( $result ) ) { + $status['error'] = $result->get_error_message(); + wp_send_json_error( $status ); + + } else if ( is_bool( $result ) && ! $result ) { + $status['errorCode'] = 'unable_to_connect_to_filesystem'; + $status['error'] = __( 'Unable to connect to the filesystem. Please confirm your credentials.' ); + + // Pass through the error from WP_Filesystem if one was raised + if ( is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) { + $status['error'] = $wp_filesystem->errors->get_error_message(); + } + + wp_send_json_error( $status ); + + } else { + // An unhandled error occured + $status['error'] = __( 'Plugin update failed.' ); + wp_send_json_error( $status ); + } +} + +/** + * AJAX handler for saving a post from Press This. + * + * @since 4.2.0 + * + * @global WP_Press_This $wp_press_this + */ +function wp_ajax_press_this_save_post() { + if ( empty( $GLOBALS['wp_press_this'] ) ) { + include( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' ); + } + + $GLOBALS['wp_press_this']->save_post(); +} + +/** + * AJAX handler for creating new category from Press This. + * + * @since 4.2.0 + * + * @global WP_Press_This $wp_press_this + */ +function wp_ajax_press_this_add_category() { + if ( empty( $GLOBALS['wp_press_this'] ) ) { + include( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' ); + } + + $GLOBALS['wp_press_this']->add_category(); +} + +/** + * AJAX handler for cropping an image. + * + * @since 4.3.0 + * + * @global WP_Site_Icon $wp_site_icon + */ +function wp_ajax_crop_image() { + $attachment_id = absint( $_POST['id'] ); + + check_ajax_referer( 'image_editor-' . $attachment_id, 'nonce' ); + if ( ! current_user_can( 'customize' ) ) { + wp_send_json_error(); + } + + $context = str_replace( '_', '-', $_POST['context'] ); + $data = array_map( 'absint', $_POST['cropDetails'] ); + $cropped = wp_crop_image( $attachment_id, $data['x1'], $data['y1'], $data['width'], $data['height'], $data['dst_width'], $data['dst_height'] ); + + if ( ! $cropped || is_wp_error( $cropped ) ) { + wp_send_json_error( array( 'message' => __( 'Image could not be processed.' ) ) ); + } + + switch ( $context ) { + case 'site-icon': + require_once ABSPATH . '/wp-admin/includes/class-wp-site-icon.php'; + global $wp_site_icon; + + // Skip creating a new attachment if the attachment is a Site Icon. + if ( get_post_meta( $attachment_id, '_wp_attachment_context', true ) == $context ) { + + // Delete the temporary cropped file, we don't need it. + wp_delete_file( $cropped ); + + // Additional sizes in wp_prepare_attachment_for_js(). + add_filter( 'image_size_names_choose', array( $wp_site_icon, 'additional_sizes' ) ); + break; + } + + /** This filter is documented in wp-admin/custom-header.php */ + $cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication. + $object = $wp_site_icon->create_attachment_object( $cropped, $attachment_id ); + unset( $object['ID'] ); + + // Update the attachment. + add_filter( 'intermediate_image_sizes_advanced', array( $wp_site_icon, 'additional_sizes' ) ); + $attachment_id = $wp_site_icon->insert_attachment( $object, $cropped ); + remove_filter( 'intermediate_image_sizes_advanced', array( $wp_site_icon, 'additional_sizes' ) ); + + // Additional sizes in wp_prepare_attachment_for_js(). + add_filter( 'image_size_names_choose', array( $wp_site_icon, 'additional_sizes' ) ); + break; + + default: + + /** + * Fires before a cropped image is saved. + * + * Allows to add filters to modify the way a cropped image is saved. + * + * @since 4.3.0 + * + * @param string $context The Customizer control requesting the cropped image. + * @param int $attachment_id The attachment ID of the original image. + * @param string $cropped Path to the cropped image file. + */ + do_action( 'wp_ajax_crop_image_pre_save', $context, $attachment_id, $cropped ); + + /** This filter is documented in wp-admin/custom-header.php */ + $cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication. + + $parent_url = wp_get_attachment_url( $attachment_id ); + $url = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url ); + + $size = @getimagesize( $cropped ); + $image_type = ( $size ) ? $size['mime'] : 'image/jpeg'; + + $object = array( + 'post_title' => basename( $cropped ), + 'post_content' => $url, + 'post_mime_type' => $image_type, + 'guid' => $url, + 'context' => $context, + ); + + $attachment_id = wp_insert_attachment( $object, $cropped ); + $metadata = wp_generate_attachment_metadata( $attachment_id, $cropped ); + + /** + * Filter the cropped image attachment metadata. + * + * @since 4.3.0 + * + * @see wp_generate_attachment_metadata() + * + * @param array $metadata Attachment metadata. + */ + $metadata = apply_filters( 'wp_ajax_cropped_attachment_metadata', $metadata ); + wp_update_attachment_metadata( $attachment_id, $metadata ); + + /** + * Filter the attachment ID for a cropped image. + * + * @since 4.3.0 + * + * @param int $attachment_id The attachment ID of the cropped image. + * @param string $context The Customizer control requesting the cropped image. + */ + $attachment_id = apply_filters( 'wp_ajax_cropped_attachment_id', $attachment_id, $context ); + } + + wp_send_json_success( wp_prepare_attachment_for_js( $attachment_id ) ); +} + +/** + * Ajax handler for generating a password. + * + * @since 4.4.0 + */ +function wp_ajax_generate_password() { + wp_send_json_success( wp_generate_password( 24 ) ); +} + +/** + * Ajax handler for saving the user's WordPress.org username. + * + * @since 4.4.0 + */ +function wp_ajax_save_wporg_username() { + if ( ! current_user_can( 'install_themes' ) && ! current_user_can( 'install_plugins' ) ) { + wp_send_json_error(); + } + + check_ajax_referer( 'save_wporg_username_' . get_current_user_id() ); + + $username = isset( $_REQUEST['username'] ) ? wp_unslash( $_REQUEST['username'] ) : false; + + if ( ! $username ) { + wp_send_json_error(); + } + + wp_send_json_success( update_user_meta( get_current_user_id(), 'wporg_favorites', $username ) ); +} diff --git a/wp-admin/includes/bookmark.php b/wp-admin/includes/bookmark.php index 3378596..0d85026 100644 --- a/wp-admin/includes/bookmark.php +++ b/wp-admin/includes/bookmark.php @@ -18,16 +18,21 @@ function add_link() { } /** - * Update or insert a link using values provided in $_POST. + * Updates or inserts a link using values provided in $_POST. * * @since 2.0.0 * - * @param int $link_id Optional. ID of the link to edit. + * @param int $link_id Optional. ID of the link to edit. Default 0. * @return int|WP_Error Value 0 or WP_Error on failure. The link ID on success. */ function edit_link( $link_id = 0 ) { - if ( !current_user_can( 'manage_links' ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + if ( ! current_user_can( 'manage_links' ) ) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'You do not have sufficient permissions to edit the links for this site.' ) . '

', + 403 + ); + } $_POST['link_url'] = esc_html( $_POST['link_url'] ); $_POST['link_url'] = esc_url($_POST['link_url']); @@ -46,11 +51,11 @@ function edit_link( $link_id = 0 ) { } /** - * Retrieve the default link for editing. + * Retrieves the default link for editing. * * @since 2.0.0 * - * @return object Default link + * @return stdClass Default link object. */ function get_default_link_to_edit() { $link = new stdClass; @@ -70,12 +75,14 @@ function get_default_link_to_edit() { } /** - * Delete link specified from database. + * Deletes a specified link from the database. * * @since 2.0.0 * + * @global wpdb $wpdb WordPress database abstraction object. + * * @param int $link_id ID of the link to delete - * @return bool True + * @return true Always true. */ function wp_delete_link( $link_id ) { global $wpdb; @@ -91,6 +98,7 @@ function wp_delete_link( $link_id ) { wp_delete_object_term_relationships( $link_id, 'link_category' ); $wpdb->delete( $wpdb->links, array( 'link_id' => $link_id ) ); + /** * Fires after a link has been deleted. * @@ -114,31 +122,31 @@ function wp_delete_link( $link_id ) { * @return array The requested link's categories */ function wp_get_link_cats( $link_id = 0 ) { - $cats = wp_get_object_terms( $link_id, 'link_category', array('fields' => 'ids') ); - return array_unique( $cats ); } /** - * Retrieve link data based on ID. + * Retrieves link data based on its ID. * * @since 2.0.0 * - * @param int $link_id ID of link to retrieve - * @return object Link for editing + * @param int $link_id ID of link to retrieve. + * @return object Link object for editing. */ function get_link_to_edit( $link_id ) { return get_bookmark( $link_id, OBJECT, 'edit' ); } /** - * This function inserts/updates links into/in the database. + * Inserts/updates links into/in the database. * * @since 2.0.0 * + * @global wpdb $wpdb WordPress database abstraction object. + * * @param array $linkdata Elements that make up the link to insert. - * @param bool $wp_error Optional. If true return WP_Error object on failure. + * @param bool $wp_error Optional. Whether to return a WP_Error object on failure. Default false. * @return int|WP_Error Value 0 or WP_Error on failure. The link ID on success. */ function wp_insert_link( $linkdata, $wp_error = false ) { @@ -146,15 +154,17 @@ function wp_insert_link( $linkdata, $wp_error = false ) { $defaults = array( 'link_id' => 0, 'link_name' => '', 'link_url' => '', 'link_rating' => 0 ); - $linkdata = wp_parse_args( $linkdata, $defaults ); - $linkdata = sanitize_bookmark( $linkdata, 'db' ); + $args = wp_parse_args( $linkdata, $defaults ); + $r = wp_unslash( sanitize_bookmark( $args, 'db' ) ); - extract( wp_unslash( $linkdata ), EXTR_SKIP ); + $link_id = $r['link_id']; + $link_name = $r['link_name']; + $link_url = $r['link_url']; $update = false; - - if ( !empty( $link_id ) ) + if ( ! empty( $link_id ) ) { $update = true; + } if ( trim( $link_name ) == '' ) { if ( trim( $link_url ) != '' ) { @@ -164,54 +174,41 @@ function wp_insert_link( $linkdata, $wp_error = false ) { } } - if ( trim( $link_url ) == '' ) + if ( trim( $link_url ) == '' ) { return 0; + } - if ( empty( $link_rating ) ) - $link_rating = 0; - - if ( empty( $link_image ) ) - $link_image = ''; - - if ( empty( $link_target ) ) - $link_target = ''; - - if ( empty( $link_visible ) ) - $link_visible = 'Y'; - - if ( empty( $link_owner ) ) - $link_owner = get_current_user_id(); - - if ( empty( $link_notes ) ) - $link_notes = ''; - - if ( empty( $link_description ) ) - $link_description = ''; - - if ( empty( $link_rss ) ) - $link_rss = ''; - - if ( empty( $link_rel ) ) - $link_rel = ''; - - // Make sure we set a valid category - if ( ! isset( $link_category ) || 0 == count( $link_category ) || !is_array( $link_category ) ) { + $link_rating = ( ! empty( $r['link_rating'] ) ) ? $r['link_rating'] : 0; + $link_image = ( ! empty( $r['link_image'] ) ) ? $r['link_image'] : ''; + $link_target = ( ! empty( $r['link_target'] ) ) ? $r['link_target'] : ''; + $link_visible = ( ! empty( $r['link_visible'] ) ) ? $r['link_visible'] : 'Y'; + $link_owner = ( ! empty( $r['link_owner'] ) ) ? $r['link_owner'] : get_current_user_id(); + $link_notes = ( ! empty( $r['link_notes'] ) ) ? $r['link_notes'] : ''; + $link_description = ( ! empty( $r['link_description'] ) ) ? $r['link_description'] : ''; + $link_rss = ( ! empty( $r['link_rss'] ) ) ? $r['link_rss'] : ''; + $link_rel = ( ! empty( $r['link_rel'] ) ) ? $r['link_rel'] : ''; + $link_category = ( ! empty( $r['link_category'] ) ) ? $r['link_category'] : array(); + + // Make sure we set a valid category. + if ( ! is_array( $link_category ) || 0 == count( $link_category ) ) { $link_category = array( get_option( 'default_link_category' ) ); } if ( $update ) { - if ( false === $wpdb->update( $wpdb->links, compact('link_url', 'link_name', 'link_image', 'link_target', 'link_description', 'link_visible', 'link_rating', 'link_rel', 'link_notes', 'link_rss'), compact('link_id') ) ) { - if ( $wp_error ) + if ( false === $wpdb->update( $wpdb->links, compact( 'link_url', 'link_name', 'link_image', 'link_target', 'link_description', 'link_visible', 'link_rating', 'link_rel', 'link_notes', 'link_rss' ), compact( 'link_id' ) ) ) { + if ( $wp_error ) { return new WP_Error( 'db_update_error', __( 'Could not update link in the database' ), $wpdb->last_error ); - else + } else { return 0; + } } } else { - if ( false === $wpdb->insert( $wpdb->links, compact('link_url', 'link_name', 'link_image', 'link_target', 'link_description', 'link_visible', 'link_owner', 'link_rating', 'link_rel', 'link_notes', 'link_rss') ) ) { - if ( $wp_error ) + if ( false === $wpdb->insert( $wpdb->links, compact( 'link_url', 'link_name', 'link_image', 'link_target', 'link_description', 'link_visible', 'link_owner', 'link_rating', 'link_rel', 'link_notes', 'link_rss' ) ) ) { + if ( $wp_error ) { return new WP_Error( 'db_insert_error', __( 'Could not insert link into the database' ), $wpdb->last_error ); - else + } else { return 0; + } } $link_id = (int) $wpdb->insert_id; } @@ -247,8 +244,8 @@ function wp_insert_link( $linkdata, $wp_error = false ) { * * @since 2.1.0 * - * @param int $link_id ID of link to update - * @param array $link_categories Array of categories to + * @param int $link_id ID of the link to update. + * @param array $link_categories Array of link categories to add the link to. */ function wp_set_link_cats( $link_id = 0, $link_categories = array() ) { // If $link_categories isn't already an array, make it one: @@ -264,7 +261,7 @@ function wp_set_link_cats( $link_id = 0, $link_categories = array() ) { } /** - * Update a link in the database. + * Updates a link in the database. * * @since 2.0.0 * @@ -294,8 +291,12 @@ function wp_update_link( $linkdata ) { } /** + * Outputs the 'disabled' message for the WordPress Link Manager. + * * @since 3.5.0 * @access private + * + * @global string $pagenow */ function wp_link_manager_disabled_message() { global $pagenow; @@ -313,4 +314,3 @@ function wp_link_manager_disabled_message() { wp_die( __( 'You do not have sufficient permissions to edit the links for this site.' ) ); } -add_action( 'admin_page_access_denied', 'wp_link_manager_disabled_message' ); diff --git a/wp-admin/includes/class-ftp-pure.php b/wp-admin/includes/class-ftp-pure.php index bb7742a..28e5677 100644 --- a/wp-admin/includes/class-ftp-pure.php +++ b/wp-admin/includes/class-ftp-pure.php @@ -27,14 +27,14 @@ */ class ftp extends ftp_base { - function ftp($verb=FALSE, $le=FALSE) { - $this->__construct($verb, $le); - } - function __construct($verb=FALSE, $le=FALSE) { parent::__construct(false, $verb, $le); } + function ftp($verb=FALSE, $le=FALSE) { + $this->__construct($verb, $le); + } + // // // @@ -110,7 +110,7 @@ class ftp extends ftp_base { $this->_data_close(); return FALSE; } - $ip_port = explode(",", ereg_replace("^.+ \$?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\$?.*".CRLF."$", "\\1", $this->_message)); + $ip_port = explode(",", preg_replace("/^.+ \$?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\$?.*$/s", "\\1", $this->_message)); $this->_datahost=$ip_port[0].".".$ip_port[1].".".$ip_port[2].".".$ip_port[3]; $this->_dataport=(((int)$ip_port[4])<<8) + ((int)$ip_port[5]); $this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport); diff --git a/wp-admin/includes/class-ftp-sockets.php b/wp-admin/includes/class-ftp-sockets.php index f9ea6cd..c71205e 100644 --- a/wp-admin/includes/class-ftp-sockets.php +++ b/wp-admin/includes/class-ftp-sockets.php @@ -27,14 +27,14 @@ */ class ftp extends ftp_base { - function ftp($verb=FALSE, $le=FALSE) { - $this->__construct($verb, $le); - } - function __construct($verb=FALSE, $le=FALSE) { parent::__construct(true, $verb, $le); } + function ftp($verb=FALSE, $le=FALSE) { + $this->__construct($verb, $le); + } + // // // @@ -131,9 +131,9 @@ class ftp extends ftp_base { $this->_data_close(); return FALSE; } - $ip_port = explode(",", ereg_replace("^.+ \$?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\$?.*".CRLF."$", "\\1", $this->_message)); + $ip_port = explode(",", preg_replace("/^.+ \$?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\$?.*$/s", "\\1", $this->_message)); $this->_datahost=$ip_port[0].".".$ip_port[1].".".$ip_port[2].".".$ip_port[3]; - $this->_dataport=(((int)$ip_port[4])<<8) + ((int)$ip_port[5]); + $this->_dataport=(((int)$ip_port[4])<<8) + ((int)$ip_port[5]); $this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport); if(!@socket_connect($this->_ftp_data_sock, $this->_datahost, $this->_dataport)) { $this->PushError("_data_prepare","socket_connect", socket_strerror(socket_last_error($this->_ftp_data_sock))); diff --git a/wp-admin/includes/class-ftp.php b/wp-admin/includes/class-ftp.php index f068f15..de6a299 100644 --- a/wp-admin/includes/class-ftp.php +++ b/wp-admin/includes/class-ftp.php @@ -121,10 +121,6 @@ class ftp_base { var $AutoAsciiExt; /* Constructor */ - function ftp_base($port_mode=FALSE) { - $this->__construct($port_mode); - } - function __construct($port_mode=FALSE, $verb=FALSE, $le=FALSE) { $this->LocalEcho=$le; $this->Verbose=$verb; @@ -157,6 +153,10 @@ class ftp_base { elseif(strtoupper(substr(PHP_OS, 0, 3)) === 'MAC') $this->OS_local=FTP_OS_Mac; } + function ftp_base($port_mode=FALSE) { + $this->__construct($port_mode); + } + // // // @@ -380,7 +380,7 @@ class ftp_base { function pwd() { if(!$this->_exec("PWD", "pwd")) return FALSE; if(!$this->_checkCode()) return FALSE; - return ereg_replace("^[0-9]{3} \"(.+)\".+", "\\1", $this->_message); + return preg_replace("/^[0-9]{3} \"(.+)\".*$/s", "\\1", $this->_message); } function cdup() { @@ -424,7 +424,7 @@ class ftp_base { } if(!$this->_exec("SIZE ".$pathname, "filesize")) return FALSE; if(!$this->_checkCode()) return FALSE; - return ereg_replace("^[0-9]{3} ([0-9]+)".CRLF, "\\1", $this->_message); + return preg_replace("/^[0-9]{3} ([0-9]+).*$/s", "\\1", $this->_message); } function abort() { @@ -444,7 +444,7 @@ class ftp_base { } if(!$this->_exec("MDTM ".$pathname, "mdtm")) return FALSE; if(!$this->_checkCode()) return FALSE; - $mdtm = ereg_replace("^[0-9]{3} ([0-9]+)".CRLF, "\\1", $this->_message); + $mdtm = preg_replace("/^[0-9]{3} ([0-9]+).*$/s", "\\1", $this->_message); $date = sscanf($mdtm, "%4d%2d%2d%2d%2d%2d"); $timestamp = mktime($date[3], $date[4], $date[5], $date[1], $date[2], $date[0]); return $timestamp; @@ -504,7 +504,7 @@ class ftp_base { return $this->_list(($arg?" ".$arg:"").($pathname?" ".$pathname:""), "LIST", "rawlist"); } - function nlist($pathname="") { + function nlist($pathname="", $arg="") { return $this->_list(($arg?" ".$arg:"").($pathname?" ".$pathname:""), "NLST", "nlist"); } @@ -694,7 +694,7 @@ class ftp_base { } foreach($list as $k=>$v) { $list[$k]=$this->parselisting($v); - if($list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]); + if( ! $list[$k] or $list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]); } $ret=true; foreach($list as $el) { @@ -727,7 +727,7 @@ class ftp_base { foreach($list as $k=>$v) { $list[$k]=$this->parselisting($v); - if($list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]); + if( ! $list[$k] or $list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]); } $ret=true; @@ -818,8 +818,8 @@ class ftp_base { function glob_regexp($pattern,$probe) { $sensitive=(PHP_OS!='WIN32'); return ($sensitive? - ereg($pattern,$probe): - eregi($pattern,$probe) + preg_match( '/' . preg_quote( $pattern, '/' ) . '/', $probe ) : + preg_match( '/' . preg_quote( $pattern, '/' ) . '/i', $probe ) ); } @@ -903,5 +903,4 @@ if ( ! $mod_sockets && function_exists( 'dl' ) && is_callable( 'dl' ) ) { $mod_sockets = extension_loaded( 'sockets' ); } -require_once "class-ftp-" . ( $mod_sockets ? "sockets" : "pure" ) . ".php"; -?> +require_once dirname( __FILE__ ) . "/class-ftp-" . ( $mod_sockets ? "sockets" : "pure" ) . ".php"; diff --git a/wp-admin/includes/class-pclzip.php b/wp-admin/includes/class-pclzip.php index 5e6a619..f36a4a3 100644 --- a/wp-admin/includes/class-pclzip.php +++ b/wp-admin/includes/class-pclzip.php @@ -212,7 +212,7 @@ // Note that no real action is taken, if the archive does not exist it is not // created. Use create() for that. // -------------------------------------------------------------------------------- - function PclZip($p_zipname) + function __construct($p_zipname) { // ----- Tests the zlib @@ -229,6 +229,10 @@ // ----- Return return; } + + public function PclZip($p_zipname) { + self::__construct($p_zipname); + } // -------------------------------------------------------------------------------- // -------------------------------------------------------------------------------- diff --git a/wp-admin/includes/class-walker-category-checklist.php b/wp-admin/includes/class-walker-category-checklist.php new file mode 100644 index 0000000..cd38bfc --- /dev/null +++ b/wp-admin/includes/class-walker-category-checklist.php @@ -0,0 +1,125 @@ + 'parent', 'id' => 'term_id'); //TODO: decouple this + + /** + * Starts the list before the elements are added. + * + * @see Walker:start_lvl() + * + * @since 2.5.1 + * + * @param string $output Passed by reference. Used to append additional content. + * @param int $depth Depth of category. Used for tab indentation. + * @param array $args An array of arguments. @see wp_terms_checklist() + */ + public function start_lvl( &$output, $depth = 0, $args = array() ) { + $indent = str_repeat("\t", $depth); + $output .= "$indent

\n"; + } + + /** + * Ends the list of after the elements are added. + * + * @see Walker::end_lvl() + * + * @since 2.5.1 + * + * @param string $output Passed by reference. Used to append additional content. + * @param int $depth Depth of category. Used for tab indentation. + * @param array $args An array of arguments. @see wp_terms_checklist() + */ + public function end_lvl( &$output, $depth = 0, $args = array() ) { + $indent = str_repeat("\t", $depth); + $output .= "$indent\n"; + } + + /** + * Start the element output. + * + * @see Walker::start_el() + * + * @since 2.5.1 + * + * @param string $output Passed by reference. Used to append additional content. + * @param object $category The current term object. + * @param int $depth Depth of the term in reference to parents. Default 0. + * @param array $args An array of arguments. @see wp_terms_checklist() + * @param int $id ID of the current term. + */ + public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) { + if ( empty( $args['taxonomy'] ) ) { + $taxonomy = 'category'; + } else { + $taxonomy = $args['taxonomy']; + } + + if ( $taxonomy == 'category' ) { + $name = 'post_category'; + } else { + $name = 'tax_input[' . $taxonomy . ']'; + } + + $args['popular_cats'] = empty( $args['popular_cats'] ) ? array() : $args['popular_cats']; + $class = in_array( $category->term_id, $args['popular_cats'] ) ? ' class="popular-category"' : ''; + + $args['selected_cats'] = empty( $args['selected_cats'] ) ? array() : $args['selected_cats']; + + if ( ! empty( $args['list_only'] ) ) { + $aria_cheched = 'false'; + $inner_class = 'category'; + + if ( in_array( $category->term_id, $args['selected_cats'] ) ) { + $inner_class .= ' selected'; + $aria_cheched = 'true'; + } + + /** This filter is documented in wp-includes/category-template.php */ + $output .= "\n" . '' . + '

' . + esc_html( apply_filters( 'the_category', $category->name ) ) . '

'; + } else { + /** This filter is documented in wp-includes/category-template.php */ + $output .= "\n

" . + 'term_id, $args['selected_cats'] ), true, false ) . + disabled( empty( $args['disabled'] ), false, false ) . ' /> ' . + esc_html( apply_filters( 'the_category', $category->name ) ) . ''; + } + } + + /** + * Ends the element output, if needed. + * + * @see Walker::end_el() + * + * @since 2.5.1 + * + * @param string $output Passed by reference. Used to append additional content. + * @param object $category The current term object. + * @param int $depth Depth of the term in reference to parents. Default 0. + * @param array $args An array of arguments. @see wp_terms_checklist() + */ + public function end_el( &$output, $category, $depth = 0, $args = array() ) { + $output .= "

\n"; + } +} diff --git a/wp-admin/includes/class-walker-nav-menu-checklist.php b/wp-admin/includes/class-walker-nav-menu-checklist.php new file mode 100644 index 0000000..8817601 --- /dev/null +++ b/wp-admin/includes/class-walker-nav-menu-checklist.php @@ -0,0 +1,117 @@ +db_fields = $fields; + } + } + + /** + * Starts the list before the elements are added. + * + * @see Walker_Nav_Menu::start_lvl() + * + * @since 3.0.0 + * + * @param string $output Passed by reference. Used to append additional content. + * @param int $depth Depth of page. Used for padding. + * @param array $args Not used. + */ + public function start_lvl( &$output, $depth = 0, $args = array() ) { + $indent = str_repeat( "\t", $depth ); + $output .= "\n$indent

\n"; + } + + /** + * Ends the list of after the elements are added. + * + * @see Walker_Nav_Menu::end_lvl() + * + * @since 3.0.0 + * + * @param string $output Passed by reference. Used to append additional content. + * @param int $depth Depth of page. Used for padding. + * @param array $args Not used. + */ + public function end_lvl( &$output, $depth = 0, $args = array() ) { + $indent = str_repeat( "\t", $depth ); + $output .= "\n$indent"; + } + + /** + * Start the element output. + * + * @see Walker_Nav_Menu::start_el() + * + * @since 3.0.0 + * + * @global int $_nav_menu_placeholder + * + * @param string $output Passed by reference. Used to append additional content. + * @param object $item Menu item data object. + * @param int $depth Depth of menu item. Used for padding. + * @param array $args Not used. + * @param int $id Not used. + */ + public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) { + global $_nav_menu_placeholder; + + $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1; + $possible_object_id = isset( $item->post_type ) && 'nav_menu_item' == $item->post_type ? $item->object_id : $_nav_menu_placeholder; + $possible_db_id = ( ! empty( $item->ID ) ) && ( 0 < $possible_object_id ) ? (int) $item->ID : 0; + + $indent = ( $depth ) ? str_repeat( "\t", $depth ) : ''; + + $output .= $indent . '

'; + $output .= ''; + $output .= ' '; + + if ( ! empty( $item->label ) ) { + $title = $item->label; + } elseif ( isset( $item->post_type ) ) { + /** This filter is documented in wp-includes/post-template.php */ + $title = apply_filters( 'the_title', $item->post_title, $item->ID ); + if ( ! empty( $item->front_or_home ) && _x( 'Home', 'nav menu home label' ) !== $title ) + $title = sprintf( _x( 'Home: %s', 'nav menu front page title' ), $title ); + } + + $output .= isset( $title ) ? esc_html( $title ) : esc_html( $item->title ); + $output .= ''; + + // Menu item hidden fields + $output .= ''; + $output .= ''; + $output .= ''; + $output .= ''; + $output .= ''; + $output .= ''; + $output .= ''; + $output .= ''; + $output .= ''; + $output .= ''; + } + +} // Walker_Nav_Menu_Checklist diff --git a/wp-admin/includes/class-walker-nav-menu-edit.php b/wp-admin/includes/class-walker-nav-menu-edit.php new file mode 100644 index 0000000..7576de1 --- /dev/null +++ b/wp-admin/includes/class-walker-nav-menu-edit.php @@ -0,0 +1,243 @@ + $_wp_nav_menu_max_depth ? $depth : $_wp_nav_menu_max_depth; + + ob_start(); + $item_id = esc_attr( $item->ID ); + $removed_args = array( + 'action', + 'customlink-tab', + 'edit-menu-item', + 'menu-item', + 'page-tab', + '_wpnonce', + ); + + $original_title = ''; + if ( 'taxonomy' == $item->type ) { + $original_title = get_term_field( 'name', $item->object_id, $item->object, 'raw' ); + if ( is_wp_error( $original_title ) ) + $original_title = false; + } elseif ( 'post_type' == $item->type ) { + $original_object = get_post( $item->object_id ); + $original_title = get_the_title( $original_object->ID ); + } elseif ( 'post_type_archive' == $item->type ) { + $original_object = get_post_type_object( $item->object ); + if ( $original_object ) { + $original_title = $original_object->labels->archives; + } + } + + $classes = array( + 'menu-item menu-item-depth-' . $depth, + 'menu-item-' . esc_attr( $item->object ), + 'menu-item-edit-' . ( ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? 'active' : 'inactive'), + ); + + $title = $item->title; + + if ( ! empty( $item->_invalid ) ) { + $classes[] = 'menu-item-invalid'; + /* translators: %s: title of menu item which is invalid */ + $title = sprintf( __( '%s (Invalid)' ), $item->title ); + } elseif ( isset( $item->post_status ) && 'draft' == $item->post_status ) { + $classes[] = 'pending'; + /* translators: %s: title of menu item in draft status */ + $title = sprintf( __('%s (Pending)'), $item->title ); + } + + $title = ( ! isset( $item->label ) || '' == $item->label ) ? $title : $item->label; + + $submenu_text = ''; + if ( 0 == $depth ) + $submenu_text = 'style="display: none;"'; + + ?> +

+ + +

+ type ) : ?> +

+ +
+ + +

+ +

+ +
+ + +

+ + target, '_blank' ); ?> /> + + +

+ +
+ + +

+ +
+ <?php echo esc_html( $item->description ); // textarea_escaped ?> + + +

+ +

+ + + + + + + + +

+ + + + + + + + + +

+ + 'comments', @@ -37,11 +54,27 @@ class WP_Comments_List_Table extends WP_List_Table { ) ); } - function ajax_user_can() { + public function floated_admin_avatar( $name, $comment_ID ) { + $comment = get_comment( $comment_ID ); + $avatar = get_avatar( $comment, 32, 'mystery' ); + return "$avatar $name"; + } + + /** + * @return bool + */ + public function ajax_user_can() { return current_user_can('edit_posts'); } - function prepare_items() { + /** + * + * @global int $post_id + * @global string $comment_status + * @global string $search + * @global string $comment_type + */ + public function prepare_items() { global $post_id, $comment_status, $search, $comment_type; $comment_status = isset( $_REQUEST['comment_status'] ) ? $_REQUEST['comment_status'] : 'all'; @@ -102,22 +135,22 @@ class WP_Comments_List_Table extends WP_List_Table { ); $_comments = get_comments( $args ); + if ( is_array( $_comments ) ) { + update_comment_cache( $_comments ); - update_comment_cache( $_comments ); - - $this->items = array_slice( $_comments, 0, $comments_per_page ); - $this->extra_items = array_slice( $_comments, $comments_per_page ); + $this->items = array_slice( $_comments, 0, $comments_per_page ); + $this->extra_items = array_slice( $_comments, $comments_per_page ); - $total_comments = get_comments( array_merge( $args, array('count' => true, 'offset' => 0, 'number' => 0) ) ); + $_comment_post_ids = array_unique( wp_list_pluck( $_comments, 'comment_post_ID' ) ); - $_comment_post_ids = array(); - foreach ( $_comments as $_c ) { - $_comment_post_ids[] = $_c->comment_post_ID; + $this->pending_count = get_pending_comments_num( $_comment_post_ids ); } - $_comment_post_ids = array_unique( $_comment_post_ids ); - - $this->pending_count = get_pending_comments_num( $_comment_post_ids ); + $total_comments = get_comments( array_merge( $args, array( + 'count' => true, + 'offset' => 0, + 'number' => 0 + ) ) ); $this->set_pagination_args( array( 'total_items' => $total_comments, @@ -125,7 +158,12 @@ class WP_Comments_List_Table extends WP_List_Table { ) ); } - function get_per_page( $comment_status = 'all' ) { + /** + * + * @param string $comment_status + * @return int + */ + public function get_per_page( $comment_status = 'all' ) { $comments_per_page = $this->get_items_per_page( 'edit_comments_per_page' ); /** * Filter the number of comments listed per page in the comments list table. @@ -135,20 +173,30 @@ class WP_Comments_List_Table extends WP_List_Table { * @param int $comments_per_page The number of comments to list per page. * @param string $comment_status The comment status name. Default 'All'. */ - $comments_per_page = apply_filters( 'comments_per_page', $comments_per_page, $comment_status ); - return $comments_per_page; + return apply_filters( 'comments_per_page', $comments_per_page, $comment_status ); } - function no_items() { + /** + * + * @global string $comment_status + */ + public function no_items() { global $comment_status; - if ( 'moderated' == $comment_status ) + if ( 'moderated' === $comment_status ) { _e( 'No comments awaiting moderation.' ); - else + } else { _e( 'No comments found.' ); + } } - function get_views() { + /** + * + * @global int $post_id + * @global string $comment_status + * @global string $comment_type + */ + protected function get_views() { global $post_id, $comment_status, $comment_type; $status_links = array(); @@ -156,22 +204,51 @@ class WP_Comments_List_Table extends WP_List_Table { //, number_format_i18n($num_comments->moderated) ), "" . number_format_i18n($num_comments->moderated) . ""), //, number_format_i18n($num_comments->spam) ), "" . number_format_i18n($num_comments->spam) . "") $stati = array( - 'all' => _nx_noop('All', 'All', 'comments'), // singular not used - 'moderated' => _n_noop('Pending (%s)', 'Pending (%s)'), - 'approved' => _n_noop('Approved', 'Approved'), // singular not used - 'spam' => _n_noop('Spam (%s)', 'Spam (%s)'), - 'trash' => _n_noop('Trash (%s)', 'Trash (%s)') - ); + /* translators: %s: all comments count */ + 'all' => _nx_noop( + 'All (%s)', + 'All (%s)', + 'comments' + ), // singular not used + + /* translators: %s: pending comments count */ + 'moderated' => _nx_noop( + 'Pending (%s)', + 'Pending (%s)', + 'comments' + ), + + /* translators: %s: approved comments count */ + 'approved' => _nx_noop( + 'Approved (%s)', + 'Approved (%s)', + 'comments' + ), + + /* translators: %s: spam comments count */ + 'spam' => _nx_noop( + 'Spam (%s)', + 'Spam (%s)', + 'comments' + ), + + /* translators: %s: trashed comments count */ + 'trash' => _nx_noop( + 'Trash (%s)', + 'Trash (%s)', + 'comments' + ) + ); if ( !EMPTY_TRASH_DAYS ) unset($stati['trash']); - $link = 'edit-comments.php'; + $link = admin_url( 'edit-comments.php' ); if ( !empty($comment_type) && 'all' != $comment_type ) $link = add_query_arg( 'comment_type', $comment_type, $link ); foreach ( $stati as $status => $label ) { - $class = ( $status == $comment_status ) ? ' class="current"' : ''; + $class = ( $status === $comment_status ) ? ' class="current"' : ''; if ( !isset( $num_comments->$status ) ) $num_comments->$status = 10; @@ -183,9 +260,12 @@ class WP_Comments_List_Table extends WP_List_Table { if ( !empty( $_REQUEST['s'] ) ) $link = add_query_arg( 's', esc_attr( wp_unslash( $_REQUEST['s'] ) ), $link ); */ - $status_links[$status] = "" . sprintf( + $status_links[ $status ] = "" . sprintf( translate_nooped_plural( $label, $num_comments->$status ), - number_format_i18n( $num_comments->$status ) + sprintf( '%s', + ( 'moderated' === $status ) ? 'pending' : $status, + number_format_i18n( $num_comments->$status ) + ) ) . ''; } @@ -197,11 +277,16 @@ class WP_Comments_List_Table extends WP_List_Table { * @param array $status_links An array of fully-formed status links. Default 'All'. * Accepts 'All', 'Pending', 'Approved', 'Spam', and 'Trash'. */ - $status_links = apply_filters( 'comment_status_links', $status_links ); - return $status_links; + return apply_filters( 'comment_status_links', $status_links ); } - function get_bulk_actions() { + /** + * + * @global string $comment_status + * + * @return array + */ + protected function get_bulk_actions() { global $comment_status; $actions = array(); @@ -209,13 +294,14 @@ class WP_Comments_List_Table extends WP_List_Table { $actions['unapprove'] = __( 'Unapprove' ); if ( in_array( $comment_status, array( 'all', 'moderated' ) ) ) $actions['approve'] = __( 'Approve' ); - if ( in_array( $comment_status, array( 'all', 'moderated', 'approved' ) ) ) + if ( in_array( $comment_status, array( 'all', 'moderated', 'approved', 'trash' ) ) ) $actions['spam'] = _x( 'Mark as Spam', 'comment' ); - if ( 'trash' == $comment_status ) + if ( 'trash' === $comment_status ) { $actions['untrash'] = __( 'Restore' ); - elseif ( 'spam' == $comment_status ) + } elseif ( 'spam' === $comment_status ) { $actions['unspam'] = _x( 'Not Spam', 'comment' ); + } if ( in_array( $comment_status, array( 'trash', 'spam' ) ) || !EMPTY_TRASH_DAYS ) $actions['delete'] = __( 'Delete Permanently' ); @@ -225,14 +311,22 @@ class WP_Comments_List_Table extends WP_List_Table { return $actions; } - function extra_tablenav( $which ) { + /** + * + * @global string $comment_status + * @global string $comment_type + * + * @param string $which + */ + protected function extra_tablenav( $which ) { global $comment_status, $comment_type; ?>

- $label ) - echo "\t\n"; + echo "\t" . '\n"; ?> 'post-query-submit' ) ); + submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) ); } - if ( ( 'spam' == $comment_status || 'trash' == $comment_status ) && current_user_can( 'moderate_comments' ) ) { + if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_user_can( 'moderate_comments' ) ) { wp_nonce_field( 'bulk-destroy', '_destroy_nonce' ); - $title = ( 'spam' == $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' ); + $title = ( 'spam' === $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' ); submit_button( $title, 'apply', 'delete_all', false ); } /** @@ -277,14 +371,23 @@ class WP_Comments_List_Table extends WP_List_Table { echo '

'; } - function current_action() { + /** + * @return string|false + */ + public function current_action() { if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) ) return 'delete_all'; return parent::current_action(); } - function get_columns() { + /** + * + * @global int $post_id + * + * @return array + */ + public function get_columns() { global $post_id; $columns = array(); @@ -295,123 +398,262 @@ class WP_Comments_List_Table extends WP_List_Table { $columns['author'] = __( 'Author' ); $columns['comment'] = _x( 'Comment', 'column name' ); - if ( !$post_id ) - $columns['response'] = _x( 'In Response To', 'column name' ); + if ( ! $post_id ) { + /* translators: column name or table row header */ + $columns['response'] = __( 'In Response To' ); + } + + $columns['date'] = _x( 'Submitted On', 'column name' ); return $columns; } - function get_sortable_columns() { + /** + * + * @return array + */ + protected function get_sortable_columns() { return array( 'author' => 'comment_author', - 'response' => 'comment_post_ID' + 'response' => 'comment_post_ID', + 'date' => 'comment_date' ); } - function display() { - extract( $this->_args ); + /** + * Get the name of the default primary column. + * + * @since 4.3.0 + * @access protected + * + * @return string Name of the default primary column, in this case, 'comment'. + */ + protected function get_default_primary_column_name() { + return 'comment'; + } + /** + * @access public + */ + public function display() { wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' ); $this->display_tablenav( 'top' ); + $this->screen->render_screen_reader_content( 'heading_list' ); + ?> -

	'.__('Title').'	'.__('Type').'	'.__('Date').'	'.__('Status').'

print_column_headers(); ?> - - - print_column_headers( false ); ?> - - - display_rows_or_placeholder(); ?> - items = $this->extra_items; $this->display_rows(); ?> + items = $this->extra_items; + $this->display_rows_or_placeholder(); + ?> + + + + print_column_headers( false ); ?> + + +

display_tablenav( 'bottom' ); } - function single_row( $a_comment ) { + /** + * @global WP_Post $post + * @global WP_Comment $comment + * + * @param WP_Comment $item + */ + public function single_row( $item ) { global $post, $comment; - $comment = $a_comment; - $the_comment_class = wp_get_comment_status( $comment->comment_ID ); - $the_comment_class = join( ' ', get_comment_class( $the_comment_class, $comment->comment_ID, $comment->comment_post_ID ) ); + $comment = $item; - $post = get_post( $comment->comment_post_ID ); + $the_comment_class = wp_get_comment_status( $comment ); + if ( ! $the_comment_class ) { + $the_comment_class = ''; + } + $the_comment_class = join( ' ', get_comment_class( $the_comment_class, $comment, $comment->comment_post_ID ) ); + if ( $comment->comment_post_ID > 0 ) { + $post = get_post( $comment->comment_post_ID ); + } $this->user_can = current_user_can( 'edit_comment', $comment->comment_ID ); echo "

- - - - - - - - - - - - - - - + + + " /> + +

+ + + /> + +

+ + + /> + + +

- - - - +

+ + + + /> + + + + /> + +

+ - - - - - -

	" size="40" />
	size="40" />
	size="40" /> -
- - - -	size="40" /> size="40" /> -
	- + + $text ) : ?> @@ -1173,19 +1241,44 @@ jQuery(function($){ -

- '; } -submit_button( __( 'Proceed' ), 'button', 'upgrade' ); ?> +

+ + +

+ +

+ -

@@ -47,9 +55,22 @@ function wp_image_editor($post_id, $msg = false) {

- × - ! - , 'scale')" class="button button-primary" value="" /> + +

+ +

+ + + + × + + + + ! + , 'scale')" class="button button-primary" value="" /> +

@@ -58,7 +79,7 @@ function wp_image_editor($post_id, $msg = false) {

@@ -90,23 +112,32 @@ function wp_image_editor($post_id, $msg = false) {

- - - - : - - -

- -

- - - - × - - -

+ +

+ + + + : + + + +

+ +

+ + + + × + + + +

-
+

+ @@ -138,55 +171,57 @@ function wp_image_editor($post_id, $msg = false) { -

- -

+ +

, this)" class="imgedit-crop disabled" title="">

+ get_post_mime_type( $post_id ), 'methods' => array( 'rotate' ) ) ) ) { ?> -

, this)" title="">

+ if ( wp_image_editor_supports( array( 'mime_type' => get_post_mime_type( $post_id ), 'methods' => array( 'rotate' ) ) ) ) { + $note_no_rotate = ''; + ?> + + ' . __( 'Image rotation is not supported by your web host.' ) . '

'; ?> -

+ + - -

, this)" class="imgedit-flipv" title="">

, this)" class="imgedit-fliph" title="">

- -

, this)" class="imgedit-undo disabled" title="">

, this)" class="imgedit-redo disabled" title="">

-
+ + + + + + +

- + - - +

- +

- + )" disabled="disabled" class="button button-primary imgedit-submit-btn" value="" />

- +

@@ -202,7 +237,7 @@ function wp_image_editor($post_id, $msg = false) { * @param WP_Image_Editor $image * @param string $mime_type * @param int $post_id - * @return boolean + * @return bool */ function wp_stream_image( $image, $mime_type, $post_id ) { if ( $image instanceof WP_Image_Editor ) { @@ -258,7 +293,7 @@ function wp_stream_image( $image, $mime_type, $post_id ) { * @param WP_Image_Editor $image * @param string $mime_type * @param int $post_id - * @return boolean + * @return bool */ function wp_save_image_file( $filename, $image, $mime_type, $post_id ) { if ( $image instanceof WP_Image_Editor ) { @@ -327,12 +362,31 @@ function wp_save_image_file( $filename, $image, $mime_type, $post_id ) { } } +/** + * Image preview ratio. Internal use only. + * + * @since 2.9.0 + * + * @ignore + * @param int $w Image width in pixels. + * @param int $h Image height in pixels. + * @return float|int Image preview ratio. + */ function _image_get_preview_ratio($w, $h) { $max = max($w, $h); return $max > 400 ? (400 / $max) : 1; } -// @TODO: Returns GD resource, but is NOT public +/** + * Returns an image resource. Internal use only. + * + * @since 2.9.0 + * + * @ignore + * @param resource $img Image resource. + * @param float|int $angle Image rotation angle, in degrees. + * @return resource|false GD image resource, false otherwise. + */ function _rotate_image_resource($img, $angle) { _deprecated_function( __FUNCTION__, '3.5', __( 'Use WP_Image_Editor::rotate' ) ); if ( function_exists('imagerotate') ) { @@ -346,14 +400,15 @@ function _rotate_image_resource($img, $angle) { } /** - * @TODO: Only used within image_edit_apply_changes - * and receives/returns GD Resource. - * Consider removal. + * Flips an image resource. Internal use only. * - * @param GD_Resource $img - * @param boolean $horz - * @param boolean $vert - * @return GD_Resource + * @since 2.9.0 + * + * @ignore + * @param resource $img Image resource. + * @param bool $horz Whether to flip horizontally. + * @param bool $vert Whether to flip vertically. + * @return resource (maybe) flipped image resource. */ function _flip_image_resource($img, $horz, $vert) { _deprecated_function( __FUNCTION__, '3.5', __( 'Use WP_Image_Editor::flip' ) ); @@ -375,16 +430,17 @@ function _flip_image_resource($img, $horz, $vert) { } /** - * @TODO: Only used within image_edit_apply_changes - * and receives/returns GD Resource. - * Consider removal. + * Crops an image resource. Internal use only. + * + * @since 2.9.0 * - * @param GD_Resource $img - * @param float $x - * @param float $y - * @param float $w - * @param float $h - * @return GD_Resource + * @ignore + * @param resource $img Image resource. + * @param float $x Source point x-coordinate. + * @param float $y Source point y-cooredinate. + * @param float $w Source width. + * @param float $h Source height. + * @return resource (maybe) cropped image resource. */ function _crop_image_resource($img, $x, $y, $w, $h) { $dst = wp_imagecreatetruecolor($w, $h); @@ -400,9 +456,11 @@ function _crop_image_resource($img, $x, $y, $w, $h) { /** * Performs group of changes on Editor specified. * - * @param WP_Image_Editor $image - * @param type $changes - * @return WP_Image_Editor + * @since 2.9.0 + * + * @param WP_Image_Editor $image {@see WP_Image_Editor} instance. + * @param array $changes Array of change operations. + * @return WP_Image_Editor {@see WP_Image_Editor} instance with changes applied. */ function image_edit_apply_changes( $image, $changes ) { if ( is_resource( $image ) ) @@ -411,7 +469,7 @@ function image_edit_apply_changes( $image, $changes ) { if ( !is_array($changes) ) return $image; - // expand change operations + // Expand change operations. foreach ( $changes as $key => $obj ) { if ( isset($obj->r) ) { $obj->type = 'rotate'; @@ -429,10 +487,10 @@ function image_edit_apply_changes( $image, $changes ) { $changes[$key] = $obj; } - // combine operations + // Combine operations. if ( count($changes) > 1 ) { $filtered = array($changes[0]); - for ( $i = 0, $j = 1; $j < count($changes); $j++ ) { + for ( $i = 0, $j = 1, $c = count( $changes ); $j < $c; $j++ ) { $combined = false; if ( $filtered[$i]->type == $changes[$j]->type ) { switch ( $filtered[$i]->type ) { @@ -453,7 +511,7 @@ function image_edit_apply_changes( $image, $changes ) { unset($filtered); } - // image resource before applying the changes + // Image resource before applying the changes. if ( $image instanceof WP_Image_Editor ) { /** @@ -523,7 +581,7 @@ function image_edit_apply_changes( $image, $changes ) { * in $_REQUEST['history'] * * @param int $post_id - * @return boolean + * @return bool */ function stream_preview_image( $post_id ) { $post = get_post( $post_id ); @@ -533,14 +591,15 @@ function stream_preview_image( $post_id ) { $img = wp_get_image_editor( _load_image_to_edit_path( $post_id ) ); - if ( is_wp_error( $img ) ) - return false; + if ( is_wp_error( $img ) ) { + return false; + } $changes = !empty($_REQUEST['history']) ? json_decode( wp_unslash($_REQUEST['history']) ) : null; if ( $changes ) $img = image_edit_apply_changes( $img, $changes ); - // scale the image + // Scale the image. $size = $img->get_size(); $w = $size['width']; $h = $size['height']; @@ -555,10 +614,18 @@ function stream_preview_image( $post_id ) { return wp_stream_image( $img, $post->post_mime_type, $post_id ); } +/** + * Restores the metadata for a given attachment. + * + * @since 2.9.0 + * + * @param int $post_id Attachment post ID. + * @return stdClass Image restoration message object. + */ function wp_restore_image($post_id) { $meta = wp_get_attachment_metadata($post_id); $file = get_attached_file($post_id); - $backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true ); + $backup_sizes = $old_backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true ); $restored = false; $msg = new stdClass; @@ -576,12 +643,10 @@ function wp_restore_image($post_id) { if ( $parts['basename'] != $data['file'] ) { if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) { - // delete only if it's edited image - if ( preg_match('/-e[0-9]{13}\./', $parts['basename']) ) { - /** This filter is documented in wp-admin/custom-header.php */ - $delpath = apply_filters( 'wp_delete_file', $file ); - @unlink($delpath); + // Delete only if it's an edited image. + if ( preg_match('/-e[0-9]{13}\./', $parts['basename']) ) { + wp_delete_file( $file ); } } elseif ( isset( $meta['width'], $meta['height'] ) ) { $backup_sizes["full-$suffix"] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $parts['basename']); @@ -601,11 +666,11 @@ function wp_restore_image($post_id) { $data = $backup_sizes["$default_size-orig"]; if ( isset($meta['sizes'][$default_size]) && $meta['sizes'][$default_size]['file'] != $data['file'] ) { if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) { - // delete only if it's edited image + + // Delete only if it's an edited image. if ( preg_match('/-e[0-9]{13}-/', $meta['sizes'][$default_size]['file']) ) { - /** This filter is documented in wp-admin/custom-header.php */ - $delpath = apply_filters( 'wp_delete_file', path_join($parts['dirname'], $meta['sizes'][$default_size]['file']) ); - @unlink($delpath); + $delete_file = path_join( $parts['dirname'], $meta['sizes'][$default_size]['file'] ); + wp_delete_file( $delete_file ); } } else { $backup_sizes["$default_size-{$suffix}"] = $meta['sizes'][$default_size]; @@ -618,7 +683,9 @@ function wp_restore_image($post_id) { } } - if ( !wp_update_attachment_metadata($post_id, $meta) || !update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes) ) { + if ( ! wp_update_attachment_metadata( $post_id, $meta ) || + ( $old_backup_sizes !== $backup_sizes && ! update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes ) ) ) { + $msg->error = __('Cannot save image metadata.'); return $msg; } @@ -635,6 +702,8 @@ function wp_restore_image($post_id) { * Saves image to post along with enqueued changes * in $_REQUEST['history'] * + * @global array $_wp_additional_image_sizes + * * @param int $post_id * @return \stdClass */ @@ -661,10 +730,10 @@ function wp_save_image( $post_id ) { $sX = $size['width']; $sY = $size['height']; - // check if it has roughly the same w / h ratio + // Check if it has roughly the same w / h ratio. $diff = round($sX / $sY, 2) - round($fwidth / $fheight, 2); if ( -0.1 < $diff && $diff < 0.1 ) { - // scale the full size image + // Scale the full size image. if ( $img->resize( $fwidth, $fheight ) ) $scaled = true; } @@ -693,7 +762,7 @@ function wp_save_image( $post_id ) { if ( !is_array($backup_sizes) ) $backup_sizes = array(); - // generate new filename + // Generate new filename. $path = get_attached_file($post_id); $path_parts = pathinfo( $path ); $filename = $path_parts['filename']; @@ -719,7 +788,7 @@ function wp_save_image( $post_id ) { } } - // save the full-size file, also needed to create sub-sizes + // Save the full-size file, also needed to create sub-sizes. if ( !wp_save_image_file($new_path, $img, $post->post_mime_type, $post_id) ) { $return->error = esc_js( __('Unable to save the image.') ); return $return; @@ -737,7 +806,7 @@ function wp_save_image( $post_id ) { if ( $tag ) $backup_sizes[$tag] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $path_parts['basename']); - $success = update_attached_file( $post_id, $new_path ); + $success = ( $path === $new_path ) || update_attached_file( $post_id, $new_path ); $meta['file'] = _wp_relative_upload_path( $new_path ); @@ -804,10 +873,11 @@ function wp_save_image( $post_id ) { $return->thumbnail = $thumb_url[0]; } else { $file_url = wp_get_attachment_url($post_id); - if ( $thumb = $meta['sizes']['thumbnail'] ) + if ( ! empty( $meta['sizes']['thumbnail'] ) && $thumb = $meta['sizes']['thumbnail'] ) { $return->thumbnail = path_join( dirname($file_url), $thumb['file'] ); - else + } else { $return->thumbnail = "$file_url?w=128&h=128"; + } } } } else { @@ -815,10 +885,7 @@ function wp_save_image( $post_id ) { } if ( $delete ) { - - /** This filter is documented in wp-admin/custom-header.php */ - $delpath = apply_filters( 'wp_delete_file', $new_path ); - @unlink( $delpath ); + wp_delete_file( $new_path ); } $return->msg = esc_js( __('Image saved') ); diff --git a/wp-admin/includes/image.php b/wp-admin/includes/image.php index 5799d28..f0cb0e9 100644 --- a/wp-admin/includes/image.php +++ b/wp-admin/includes/image.php @@ -28,7 +28,7 @@ function wp_crop_image( $src, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $s $src_file = get_attached_file( $src ); if ( ! file_exists( $src_file ) ) { - // If the file doesn't exist, attempt a url fopen on the src link. + // If the file doesn't exist, attempt a URL fopen on the src link. // This can occur with certain file replication plugins. $src = _load_image_to_edit_path( $src, 'full' ); } else { @@ -47,8 +47,10 @@ function wp_crop_image( $src, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $s if ( ! $dst_file ) $dst_file = str_replace( basename( $src_file ), 'cropped-' . basename( $src_file ), $src_file ); - // The directory containing the original file may no longer exist when - // using a replication plugin. + /* + * The directory containing the original file may no longer exist when + * using a replication plugin. + */ wp_mkdir_p( dirname( $dst_file ) ); $dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) ); @@ -65,6 +67,8 @@ function wp_crop_image( $src, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $s * * @since 2.1.0 * + * @global array $_wp_additional_image_sizes + * * @param int $attachment_id Attachment Id to process. * @param string $file Filepath of the Attached image. * @return mixed Metadata for attachment. @@ -79,10 +83,10 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) { $metadata['width'] = $imagesize[0]; $metadata['height'] = $imagesize[1]; - // Make the file path relative to the upload dir + // Make the file path relative to the upload dir. $metadata['file'] = _wp_relative_upload_path($file); - // make thumbnails and other intermediate sizes + // Make thumbnails and other intermediate sizes. global $_wp_additional_image_sizes; $sizes = array(); @@ -106,10 +110,12 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) { * Filter the image sizes automatically generated when uploading an image. * * @since 2.9.0 + * @since 4.4.0 Added the `$metadata` argument. * - * @param array $sizes An associative array of image sizes. + * @param array $sizes An associative array of image sizes. + * @param array $metadata An associative array of image metadata: width, height, file. */ - $sizes = apply_filters( 'intermediate_image_sizes_advanced', $sizes ); + $sizes = apply_filters( 'intermediate_image_sizes_advanced', $sizes, $metadata ); if ( $sizes ) { $editor = wp_get_image_editor( $file ); @@ -120,21 +126,21 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) { $metadata['sizes'] = array(); } - // fetch additional metadata from exif/iptc + // Fetch additional metadata from EXIF/IPTC. $image_meta = wp_read_image_metadata( $file ); if ( $image_meta ) $metadata['image_meta'] = $image_meta; - } elseif ( preg_match( '#^video/#', get_post_mime_type( $attachment ) ) ) { + } elseif ( wp_attachment_is( 'video', $attachment ) ) { $metadata = wp_read_video_metadata( $file ); $support = current_theme_supports( 'post-thumbnails', 'attachment:video' ) || post_type_supports( 'attachment:video', 'thumbnail' ); - } elseif ( preg_match( '#^audio/#', get_post_mime_type( $attachment ) ) ) { + } elseif ( wp_attachment_is( 'audio', $attachment ) ) { $metadata = wp_read_audio_metadata( $file ); $support = current_theme_supports( 'post-thumbnails', 'attachment:audio' ) || post_type_supports( 'attachment:audio', 'thumbnail' ); } if ( $support && ! empty( $metadata['image']['data'] ) ) { - // check for existing cover + // Check for existing cover. $hash = md5( $metadata['image']['data'] ); $posts = get_posts( array( 'fields' => 'ids', @@ -187,9 +193,10 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) { } } - // remove the blob of binary data from the array - if ( isset( $metadata['image']['data'] ) ) + // Remove the blob of binary data from the array. + if ( $metadata ) { unset( $metadata['image']['data'] ); + } /** * Filter the generated attachment meta data. @@ -254,10 +261,12 @@ function wp_read_image_metadata( $file ) { list( , , $sourceImageType ) = getimagesize( $file ); - // exif contains a bunch of data we'll probably never need formatted in ways - // that are difficult to use. We'll normalize it and just extract the fields - // that are likely to be useful. Fractions and numbers are converted to - // floats, dates to unix timestamps, and everything else to strings. + /* + * EXIF contains a bunch of data we'll probably never need formatted in ways + * that are difficult to use. We'll normalize it and just extract the fields + * that are likely to be useful. Fractions and numbers are converted to + * floats, dates to unix timestamps, and everything else to strings. + */ $meta = array( 'aperture' => 0, 'credit' => '', @@ -269,34 +278,45 @@ function wp_read_image_metadata( $file ) { 'iso' => 0, 'shutter_speed' => 0, 'title' => '', + 'orientation' => 0, + 'keywords' => array(), ); - // read iptc first, since it might contain data not available in exif such - // as caption, description etc + $iptc = array(); + /* + * Read IPTC first, since it might contain data not available in exif such + * as caption, description etc. + */ if ( is_callable( 'iptcparse' ) ) { getimagesize( $file, $info ); if ( ! empty( $info['APP13'] ) ) { $iptc = iptcparse( $info['APP13'] ); - // headline, "A brief synopsis of the caption." - if ( ! empty( $iptc['2#105'][0] ) ) + // Headline, "A brief synopsis of the caption." + if ( ! empty( $iptc['2#105'][0] ) ) { $meta['title'] = trim( $iptc['2#105'][0] ); - // title, "Many use the Title field to store the filename of the image, though the field may be used in many ways." - elseif ( ! empty( $iptc['2#005'][0] ) ) + /* + * Title, "Many use the Title field to store the filename of the image, + * though the field may be used in many ways." + */ + } elseif ( ! empty( $iptc['2#005'][0] ) ) { $meta['title'] = trim( $iptc['2#005'][0] ); + } if ( ! empty( $iptc['2#120'][0] ) ) { // description / legacy caption $caption = trim( $iptc['2#120'][0] ); - if ( empty( $meta['title'] ) ) { + + mbstring_binary_safe_encoding(); + $caption_length = strlen( $caption ); + reset_mbstring_encoding(); + + if ( empty( $meta['title'] ) && $caption_length < 80 ) { // Assume the title is stored in 2:120 if it's short. - if ( strlen( $caption ) < 80 ) - $meta['title'] = $caption; - else - $meta['caption'] = $caption; - } elseif ( $caption != $meta['title'] ) { - $meta['caption'] = $caption; + $meta['title'] = $caption; } + + $meta['caption'] = $caption; } if ( ! empty( $iptc['2#110'][0] ) ) // credit @@ -304,11 +324,15 @@ function wp_read_image_metadata( $file ) { elseif ( ! empty( $iptc['2#080'][0] ) ) // creator / legacy byline $meta['credit'] = trim( $iptc['2#080'][0] ); - if ( ! empty( $iptc['2#055'][0] ) and ! empty( $iptc['2#060'][0] ) ) // created date and time + if ( ! empty( $iptc['2#055'][0] ) && ! empty( $iptc['2#060'][0] ) ) // created date and time $meta['created_timestamp'] = strtotime( $iptc['2#055'][0] . ' ' . $iptc['2#060'][0] ); if ( ! empty( $iptc['2#116'][0] ) ) // copyright $meta['copyright'] = trim( $iptc['2#116'][0] ); + + if ( ! empty( $iptc['2#025'][0] ) ) { // keywords array + $meta['keywords'] = array_values( $iptc['2#025'] ); + } } } @@ -322,60 +346,88 @@ function wp_read_image_metadata( $file ) { if ( is_callable( 'exif_read_data' ) && in_array( $sourceImageType, apply_filters( 'wp_read_image_metadata_types', array( IMAGETYPE_JPEG, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM ) ) ) ) { $exif = @exif_read_data( $file ); - if ( !empty( $exif['Title'] ) ) - $meta['title'] = trim( $exif['Title'] ); - if ( ! empty( $exif['ImageDescription'] ) ) { - if ( empty( $meta['title'] ) && strlen( $exif['ImageDescription'] ) < 80 ) { + mbstring_binary_safe_encoding(); + $description_length = strlen( $exif['ImageDescription'] ); + reset_mbstring_encoding(); + + if ( empty( $meta['title'] ) && $description_length < 80 ) { // Assume the title is stored in ImageDescription $meta['title'] = trim( $exif['ImageDescription'] ); - if ( ! empty( $exif['COMPUTED']['UserComment'] ) && trim( $exif['COMPUTED']['UserComment'] ) != $meta['title'] ) - $meta['caption'] = trim( $exif['COMPUTED']['UserComment'] ); - } elseif ( trim( $exif['ImageDescription'] ) != $meta['title'] ) { + } + + if ( empty( $meta['caption'] ) && ! empty( $exif['COMPUTED']['UserComment'] ) ) { + $meta['caption'] = trim( $exif['COMPUTED']['UserComment'] ); + } + + if ( empty( $meta['caption'] ) ) { $meta['caption'] = trim( $exif['ImageDescription'] ); } - } elseif ( ! empty( $exif['Comments'] ) && trim( $exif['Comments'] ) != $meta['title'] ) { + } elseif ( empty( $meta['caption'] ) && ! empty( $exif['Comments'] ) ) { $meta['caption'] = trim( $exif['Comments'] ); } - if ( ! empty( $exif['Artist'] ) ) - $meta['credit'] = trim( $exif['Artist'] ); - elseif ( ! empty($exif['Author'] ) ) - $meta['credit'] = trim( $exif['Author'] ); + if ( empty( $meta['credit'] ) ) { + if ( ! empty( $exif['Artist'] ) ) { + $meta['credit'] = trim( $exif['Artist'] ); + } elseif ( ! empty($exif['Author'] ) ) { + $meta['credit'] = trim( $exif['Author'] ); + } + } - if ( ! empty( $exif['Copyright'] ) ) + if ( empty( $meta['copyright'] ) && ! empty( $exif['Copyright'] ) ) { $meta['copyright'] = trim( $exif['Copyright'] ); - if ( ! empty($exif['FNumber'] ) ) + } + if ( ! empty( $exif['FNumber'] ) ) { $meta['aperture'] = round( wp_exif_frac2dec( $exif['FNumber'] ), 2 ); - if ( ! empty($exif['Model'] ) ) + } + if ( ! empty( $exif['Model'] ) ) { $meta['camera'] = trim( $exif['Model'] ); - if ( ! empty($exif['DateTimeDigitized'] ) ) - $meta['created_timestamp'] = wp_exif_date2ts($exif['DateTimeDigitized'] ); - if ( ! empty($exif['FocalLength'] ) ) + } + if ( empty( $meta['created_timestamp'] ) && ! empty( $exif['DateTimeDigitized'] ) ) { + $meta['created_timestamp'] = wp_exif_date2ts( $exif['DateTimeDigitized'] ); + } + if ( ! empty( $exif['FocalLength'] ) ) { $meta['focal_length'] = (string) wp_exif_frac2dec( $exif['FocalLength'] ); - if ( ! empty($exif['ISOSpeedRatings'] ) ) { + } + if ( ! empty( $exif['ISOSpeedRatings'] ) ) { $meta['iso'] = is_array( $exif['ISOSpeedRatings'] ) ? reset( $exif['ISOSpeedRatings'] ) : $exif['ISOSpeedRatings']; $meta['iso'] = trim( $meta['iso'] ); } - if ( ! empty($exif['ExposureTime'] ) ) + if ( ! empty( $exif['ExposureTime'] ) ) { $meta['shutter_speed'] = (string) wp_exif_frac2dec( $exif['ExposureTime'] ); + } + if ( ! empty( $exif['Orientation'] ) ) { + $meta['orientation'] = $exif['Orientation']; + } } foreach ( array( 'title', 'caption', 'credit', 'copyright', 'camera', 'iso' ) as $key ) { - if ( $meta[ $key ] && ! seems_utf8( $meta[ $key ] ) ) + if ( $meta[ $key ] && ! seems_utf8( $meta[ $key ] ) ) { $meta[ $key ] = utf8_encode( $meta[ $key ] ); + } } + foreach ( $meta['keywords'] as $key => $keyword ) { + if ( ! seems_utf8( $keyword ) ) { + $meta['keywords'][ $key ] = utf8_encode( $keyword ); + } + } + + $meta = wp_kses_post_deep( $meta ); + /** * Filter the array of meta data read from an image's exif data. * * @since 2.5.0 + * @since 4.4.0 The `$iptc` parameter was added. * * @param array $meta Image meta data. * @param string $file Path to image file. * @param int $sourceImageType Type of image. + * @param array $iptc IPTC data. */ - return apply_filters( 'wp_read_image_metadata', $meta, $file, $sourceImageType ); + return apply_filters( 'wp_read_image_metadata', $meta, $file, $sourceImageType, $iptc ); } @@ -401,13 +453,16 @@ function file_is_valid_image($path) { * @return bool True if suitable, false if not suitable. */ function file_is_displayable_image($path) { - $info = @getimagesize($path); - if ( empty($info) ) + $displayable_image_types = array( IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP ); + + $info = @getimagesize( $path ); + if ( empty( $info ) ) { $result = false; - elseif ( !in_array($info[2], array(IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG)) ) // only gif, jpeg and png images can reliably be displayed + } elseif ( ! in_array( $info[2], $displayable_image_types ) ) { $result = false; - else + } else { $result = true; + } /** * Filter whether the current image is displayable in the browser. @@ -544,8 +599,10 @@ function _copy_image_file( $attachment_id ) { $dst_file = str_replace( basename( $dst_file ), 'copy-' . basename( $dst_file ), $dst_file ); $dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) ); - // The directory containing the original file may no longer exist when - // using a replication plugin. + /* + * The directory containing the original file may no longer + * exist when using a replication plugin. + */ wp_mkdir_p( dirname( $dst_file ) ); if ( ! @copy( $src_file, $dst_file ) ) diff --git a/wp-admin/includes/import.php b/wp-admin/includes/import.php index f01eb87..fa980e6 100644 --- a/wp-admin/includes/import.php +++ b/wp-admin/includes/import.php @@ -11,6 +11,7 @@ * * @since 2.0.0 * + * @global array $wp_importers * @return array */ function get_importers() { @@ -42,10 +43,12 @@ function _usort_by_first_member( $a, $b ) { * * @since 2.0.0 * - * @param string $id Importer tag. Used to uniquely identify importer. - * @param string $name Importer name and title. - * @param string $description Importer description. - * @param callback $callback Callback to run. + * @global array $wp_importers + * + * @param string $id Importer tag. Used to uniquely identify importer. + * @param string $name Importer name and title. + * @param string $description Importer description. + * @param callable $callback Callback to run. * @return WP_Error Returns WP_Error when $callback is WP_Error. */ function register_importer( $id, $name, $description, $callback ) { @@ -76,39 +79,40 @@ function wp_import_cleanup( $id ) { * @return array Uploaded file's details on success, error message on failure */ function wp_import_handle_upload() { - if ( !isset($_FILES['import']) ) { - $file['error'] = __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' ); - return $file; + if ( ! isset( $_FILES['import'] ) ) { + return array( + 'error' => __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' ) + ); } $overrides = array( 'test_form' => false, 'test_type' => false ); $_FILES['import']['name'] .= '.txt'; - $file = wp_handle_upload( $_FILES['import'], $overrides ); - - if ( isset( $file['error'] ) ) - return $file; + $upload = wp_handle_upload( $_FILES['import'], $overrides ); - $url = $file['url']; - $type = $file['type']; - $file = $file['file']; - $filename = basename( $file ); + if ( isset( $upload['error'] ) ) { + return $upload; + } // Construct the object array - $object = array( 'post_title' => $filename, - 'post_content' => $url, - 'post_mime_type' => $type, - 'guid' => $url, + $object = array( + 'post_title' => basename( $upload['file'] ), + 'post_content' => $upload['url'], + 'post_mime_type' => $upload['type'], + 'guid' => $upload['url'], 'context' => 'import', 'post_status' => 'private' ); // Save the data - $id = wp_insert_attachment( $object, $file ); + $id = wp_insert_attachment( $object, $upload['file'] ); - // schedule a cleanup for one day from now in case of failed import or missing wp_import_cleanup() call + /* + * Schedule a cleanup for one day from now in case of failed + * import or missing wp_import_cleanup() call. + */ wp_schedule_single_event( time() + DAY_IN_SECONDS, 'importer_scheduled_cleanup', array( $id ) ); - return array( 'file' => $file, 'id' => $id ); + return array( 'file' => $upload['file'], 'id' => $id ); } /** @@ -119,7 +123,7 @@ function wp_import_handle_upload() { * @return array Importers with metadata for each. */ function wp_get_popular_importers() { - include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version + include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version $locale = get_locale(); $popular_importers = get_site_transient( 'popular_importers_' . $locale ); diff --git a/wp-admin/includes/list-table.php b/wp-admin/includes/list-table.php index 2403ec8..bcc182c 100644 --- a/wp-admin/includes/list-table.php +++ b/wp-admin/includes/list-table.php @@ -13,6 +13,8 @@ * @access private * @since 3.1.0 * + * @global string $hook_suffix + * * @param string $class The type of the list table, which is the class name. * @param array $args Optional. Arguments to pass to the class. Accepts 'screen'. * @return object|bool Object on success, false if the class does not exist. @@ -25,7 +27,7 @@ function _get_list_table( $class, $args = array() ) { 'WP_Terms_List_Table' => 'terms', 'WP_Users_List_Table' => 'users', 'WP_Comments_List_Table' => 'comments', - 'WP_Post_Comments_List_Table' => 'comments', + 'WP_Post_Comments_List_Table' => array( 'comments', 'post-comments' ), 'WP_Links_List_Table' => 'links', 'WP_Plugin_Install_List_Table' => 'plugin-install', 'WP_Themes_List_Table' => 'themes', @@ -71,11 +73,14 @@ function register_column_headers($screen, $columns) { * Prints column headers for a particular screen. * * @since 2.7.0 + * + * @param string|WP_Screen $screen The screen hook name or screen object. + * @param bool $with_id Whether to set the id attribute or not. */ -function print_column_headers($screen, $id = true) { +function print_column_headers( $screen, $with_id = true ) { $wp_list_table = new _WP_List_Table_Compat($screen); - $wp_list_table->print_column_headers($id); + $wp_list_table->print_column_headers( $with_id ); } /** @@ -84,10 +89,10 @@ function print_column_headers($screen, $id = true) { * @since 3.1.0 */ class _WP_List_Table_Compat extends WP_List_Table { - var $_screen; - var $_columns; + public $_screen; + public $_columns; - function _WP_List_Table_Compat( $screen, $columns = array() ) { + public function __construct( $screen, $columns = array() ) { if ( is_string( $screen ) ) $screen = convert_to_screen( $screen ); @@ -99,15 +104,26 @@ class _WP_List_Table_Compat extends WP_List_Table { } } - function get_column_info() { + /** + * @access protected + * + * @return array + */ + protected function get_column_info() { $columns = get_column_headers( $this->_screen ); $hidden = get_hidden_columns( $this->_screen ); $sortable = array(); + $primary = $this->get_default_primary_column_name(); - return array( $columns, $hidden, $sortable ); + return array( $columns, $hidden, $sortable, $primary ); } - function get_columns() { + /** + * @access public + * + * @return array + */ + public function get_columns() { return $this->_columns; } } diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index 06cd1c1..194e827 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -36,6 +36,8 @@ function media_upload_tabs() { * * @since 2.5.0 * + * @global wpdb $wpdb WordPress database abstraction object. + * * @param array $tabs * @return array $tabs with gallery if post has image attachment */ @@ -61,12 +63,13 @@ function update_gallery_tab($tabs) { return $tabs; } -add_filter('media_upload_tabs', 'update_gallery_tab'); /** - * {@internal Missing Short Description}} + * Outputs the legacy media upload tabs UI. * * @since 2.5.0 + * + * @global string $redir_tab */ function the_media_upload_tabs() { global $redir_tab; @@ -99,42 +102,52 @@ function the_media_upload_tabs() { } /** - * {@internal Missing Short Description}} + * Retrieves the image HTML to send to the editor. * * @since 2.5.0 * - * @param integer $id image attachment id - * @param string $caption image caption - * @param string $alt image alt attribute - * @param string $title image title attribute - * @param string $align image css alignment property - * @param string $url image src url - * @param string|bool $rel image rel attribute - * @param string $size image size (thumbnail, medium, large, full or added with add_image_size() ) - * @return string the html to insert into editor + * @param int $id Image attachment id. + * @param string $caption Image caption. + * @param string $title Image title attribute. + * @param string $align Image CSS alignment property. + * @param string $url Optional. Image src URL. Default empty. + * @param bool|string $rel Optional. Value for rel attribute or whether to add a dafault value. Default false. + * @param string|array $size Optional. Image size. Accepts any valid image size, or an array of width + * and height values in pixels (in that order). Default 'medium'. + * @param string $alt Optional. Image alt attribute. Default empty. + * @return string The HTML output to insert into the editor. */ -function get_image_send_to_editor($id, $caption, $title, $align, $url='', $rel = false, $size='medium', $alt = '') { +function get_image_send_to_editor( $id, $caption, $title, $align, $url = '', $rel = false, $size = 'medium', $alt = '' ) { - $html = get_image_tag($id, $alt, '', $align, $size); + $html = get_image_tag( $id, $alt, '', $align, $size ); - $rel = $rel ? ' rel="attachment wp-att-' . esc_attr($id).'"' : ''; + if ( $rel ) { + if ( is_string( $rel ) ) { + $rel = ' rel="' . esc_attr( $rel ) . '"'; + } else { + $rel = ' rel="attachment wp-att-' . intval( $id ) . '"'; + } + } else { + $rel = ''; + } if ( $url ) - $html = '$html"; + $html = '' . $html . ''; /** * Filter the image HTML markup to send to the editor. * * @since 2.5.0 * - * @param string $html The image HTML markup to send. - * @param int $id The attachment id. - * @param string $caption The image caption. - * @param string $title The image title. - * @param string $align The image alignment. - * @param string $url The image source URL. - * @param string $size The image size. - * @param string $alt The image alternative, or alt, text. + * @param string $html The image HTML markup to send. + * @param int $id The attachment id. + * @param string $caption The image caption. + * @param string $title The image title. + * @param string $align The image alignment. + * @param string $url The image source URL. + * @param string|array $size Size of image. Image size or array of width and height values + * (in that order). Default 'medium'. + * @param string $alt The image alternative, or alt, text. */ $html = apply_filters( 'image_send_to_editor', $html, $id, $caption, $title, $align, $url, $size, $alt ); @@ -149,15 +162,31 @@ function get_image_send_to_editor($id, $caption, $title, $align, $url='', $rel = * @param string $html * @param integer $id * @param string $caption image caption - * @param string $alt image alt attribute * @param string $title image title attribute * @param string $align image css alignment property * @param string $url image src url * @param string $size image size (thumbnail, medium, large, full or added with add_image_size() ) + * @param string $alt image alt attribute * @return string */ function image_add_caption( $html, $id, $caption, $title, $align, $url, $size, $alt = '' ) { + /** + * Filter the caption text. + * + * Note: If the caption text is empty, the caption shortcode will not be appended + * to the image HTML when inserted into the editor. + * + * Passing an empty value also prevents the {@see 'image_add_caption_shortcode'} + * filter from being evaluated at the end of {@see image_add_caption()}. + * + * @since 4.1.0 + * + * @param string $caption The original caption text. + * @param int $id The attachment ID. + */ + $caption = apply_filters( 'image_add_caption_text', $caption, $id ); + /** * Filter whether to disable captions. * @@ -180,7 +209,8 @@ function image_add_caption( $html, $id, $caption, $title, $align, $url, $size, $ $caption = str_replace( array("\r\n", "\r"), "\n", $caption); $caption = preg_replace_callback( '/<[a-zA-Z0-9]+(?: [^<>]+>)*/', '_cleanup_image_add_caption', $caption ); - // convert any remaining line breaks to
+ + // Convert any remaining line breaks to
. $caption = preg_replace( '/[ \n\t]*\n[ \t]*/', '
', $caption ); $html = preg_replace( '/(class=["\'][^\'"]*)align(none|left|right|center)\s?/', '$1', $html ); @@ -199,7 +229,6 @@ function image_add_caption( $html, $id, $caption, $title, $align, $url, $size, $ */ return apply_filters( 'image_add_caption_shortcode', $shcode, $html ); } -add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 ); /** * Private preg_replace callback used in image_add_caption() @@ -208,7 +237,7 @@ add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 ); * @since 3.4.0 */ function _cleanup_image_add_caption( $matches ) { - // remove any line breaks from inside the tags + // Remove any line breaks from inside the tags. return preg_replace( '/[\r\n\t]+/', ' ', $matches[0] ); } @@ -222,24 +251,23 @@ function _cleanup_image_add_caption( $matches ) { function media_send_to_editor($html) { ?> false )) { @@ -264,31 +292,31 @@ function media_handle_upload($file_id, $post_id, $post_data = array(), $override $file = $file['file']; $title = $name; $content = ''; + $excerpt = ''; if ( preg_match( '#^audio#', $type ) ) { $meta = wp_read_audio_metadata( $file ); - if ( ! empty( $meta['title'] ) ) + if ( ! empty( $meta['title'] ) ) { $title = $meta['title']; - - $content = ''; + } if ( ! empty( $title ) ) { if ( ! empty( $meta['album'] ) && ! empty( $meta['artist'] ) ) { /* translators: 1: audio track title, 2: album title, 3: artist name */ $content .= sprintf( __( '"%1$s" from %2$s by %3$s.' ), $title, $meta['album'], $meta['artist'] ); - } else if ( ! empty( $meta['album'] ) ) { + } elseif ( ! empty( $meta['album'] ) ) { /* translators: 1: audio track title, 2: album title */ $content .= sprintf( __( '"%1$s" from %2$s.' ), $title, $meta['album'] ); - } else if ( ! empty( $meta['artist'] ) ) { + } elseif ( ! empty( $meta['artist'] ) ) { /* translators: 1: audio track title, 2: artist name */ $content .= sprintf( __( '"%1$s" by %2$s.' ), $title, $meta['artist'] ); } else { $content .= sprintf( __( '"%s".' ), $title ); } - } else if ( ! empty( $meta['album'] ) ) { + } elseif ( ! empty( $meta['album'] ) ) { if ( ! empty( $meta['artist'] ) ) { /* translators: 1: audio album title, 2: artist name */ @@ -297,7 +325,7 @@ function media_handle_upload($file_id, $post_id, $post_data = array(), $override $content .= $meta['album'] . '.'; } - } else if ( ! empty( $meta['artist'] ) ) { + } elseif ( ! empty( $meta['artist'] ) ) { $content .= $meta['artist'] . '.'; @@ -317,12 +345,15 @@ function media_handle_upload($file_id, $post_id, $post_data = array(), $override if ( ! empty( $meta['genre'] ) ) $content .= ' ' . sprintf( __( 'Genre: %s.' ), $meta['genre'] ); - // use image exif/iptc data for title and caption defaults if possible - } elseif ( $image_meta = @wp_read_image_metadata( $file ) ) { - if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) + // Use image exif/iptc data for title and caption defaults if possible. + } elseif ( 0 === strpos( $type, 'image/' ) && $image_meta = @wp_read_image_metadata( $file ) ) { + if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) { $title = $image_meta['title']; - if ( trim( $image_meta['caption'] ) ) - $content = $image_meta['caption']; + } + + if ( trim( $image_meta['caption'] ) ) { + $excerpt = $image_meta['caption']; + } } // Construct the attachment array @@ -332,11 +363,11 @@ function media_handle_upload($file_id, $post_id, $post_data = array(), $override 'post_parent' => $post_id, 'post_title' => $title, 'post_content' => $content, + 'post_excerpt' => $excerpt, ), $post_data ); // This should never be set as it would then overwrite an existing attachment. - if ( isset( $attachment['ID'] ) ) - unset( $attachment['ID'] ); + unset( $attachment['ID'] ); // Save the data $id = wp_insert_attachment($attachment, $file, $post_id); @@ -378,7 +409,7 @@ function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = $title = preg_replace('/\.[^.]+$/', '', basename($file)); $content = ''; - // use image exif/iptc data for title and caption defaults if possible + // Use image exif/iptc data for title and caption defaults if possible. if ( $image_meta = @wp_read_image_metadata($file) ) { if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) $title = $image_meta['title']; @@ -389,7 +420,7 @@ function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = if ( isset( $desc ) ) $title = $desc; - // Construct the attachment array + // Construct the attachment array. $attachment = array_merge( array( 'post_mime_type' => $type, 'guid' => $url, @@ -399,8 +430,7 @@ function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = ), $post_data ); // This should never be set as it would then overwrite an existing attachment. - if ( isset( $attachment['ID'] ) ) - unset( $attachment['ID'] ); + unset( $attachment['ID'] ); // Save the attachment metadata $id = wp_insert_attachment($attachment, $file, $post_id); @@ -415,7 +445,9 @@ function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = * * @since 2.5.0 * - * @param array $content_func + * @global int $body_id + * + * @param string|callable $content_func */ function wp_iframe($content_func /* ... */) { _wp_admin_html_begin(); @@ -427,15 +459,13 @@ wp_enqueue_style( 'colors' ); // Check callback name for 'media' if ( ( is_array( $content_func ) && ! empty( $content_func[1] ) && 0 === strpos( (string) $content_func[1], 'media' ) ) || ( ! is_array( $content_func ) && 0 === strpos( $content_func, 'media' ) ) ) - wp_enqueue_style( 'media' ); + wp_enqueue_style( 'deprecated-media' ); wp_enqueue_style( 'ie' ); ?> '; - echo '' . $img . __( 'Add Media' ) . ''; - + $id_attribute = $instance === 1 ? ' id="insert-media-button"' : ''; + printf( '', + $id_attribute, + esc_attr( $editor_id ), + $img . __( 'Add Media' ) + ); /** * Filter the legacy (pre-3.5.0) media buttons. * @@ -543,8 +584,15 @@ function media_buttons($editor_id = 'content') { echo $legacy_filter; } } -add_action( 'media_buttons', 'media_buttons' ); +/** + * + * @global int $post_ID + * @param string $type + * @param int $post_id + * @param string $tab + * @return string + */ function get_upload_iframe_src( $type = null, $post_id = null, $tab = null ) { global $post_ID; @@ -562,7 +610,7 @@ function get_upload_iframe_src( $type = null, $post_id = null, $tab = null ) { /** * Filter the upload iframe source URL for a specific media type. * - * The dynamic portion of the hook name, $type, refers to the type + * The dynamic portion of the hook name, `$type`, refers to the type * of media uploaded. * * @since 3.0.0 @@ -575,7 +623,7 @@ function get_upload_iframe_src( $type = null, $post_id = null, $tab = null ) { } /** - * {@internal Missing Short Description}} + * Handles form submissions for the legacy media uploader. * * @since 2.5.0 * @@ -587,8 +635,8 @@ function media_upload_form_handler() { $errors = null; if ( isset($_POST['send']) ) { - $keys = array_keys($_POST['send']); - $send_id = (int) array_shift($keys); + $keys = array_keys( $_POST['send'] ); + $send_id = (int) reset( $keys ); } if ( !empty($_POST['attachments']) ) foreach ( $_POST['attachments'] as $attachment_id => $attachment ) { @@ -618,8 +666,8 @@ function media_upload_form_handler() { * * @see wp_get_attachment_metadata() * - * @param WP_Post $post The WP_Post object. - * @param array $attachment An array of attachment metadata. + * @param array $post An array of post data. + * @param array $attachment An array of attachment metadata. */ $post = apply_filters( 'attachment_fields_to_save', $post, $attachment ); @@ -627,7 +675,8 @@ function media_upload_form_handler() { $image_alt = wp_unslash( $attachment['image_alt'] ); if ( $image_alt != get_post_meta($attachment_id, '_wp_attachment_image_alt', true) ) { $image_alt = wp_strip_all_tags( $image_alt, true ); - // update_meta expects slashed + + // Update_meta expects slashed. update_post_meta( $attachment_id, '_wp_attachment_image_alt', wp_slash( $image_alt ) ); } } @@ -648,10 +697,8 @@ function media_upload_form_handler() { if ( isset($_POST['insert-gallery']) || isset($_POST['update-gallery']) ) { ?> "; return $html; + } else { + return new WP_Error( 'image_sideload_failed' ); } } /** - * {@internal Missing Short Description}} + * Retrieves the legacy media uploader form in an iframe. * * @since 2.5.0 * - * @return unknown + * @return string|null */ function media_upload_gallery() { $errors = array(); @@ -860,11 +919,11 @@ function media_upload_gallery() { } /** - * {@internal Missing Short Description}} + * Retrieves the legacy media library form in an iframe. * * @since 2.5.0 * - * @return unknown + * @return string|null */ function media_upload_library() { $errors = array(); @@ -885,7 +944,7 @@ function media_upload_library() { * * @since 2.7.0 * - * @param object $post + * @param WP_Post $post * @param string $checked * @return string */ @@ -913,12 +972,11 @@ function image_align_input_fields( $post, $checked = '' ) { * * @since 2.7.0 * - * @param object $post + * @param WP_Post $post * @param bool|string $check * @return array */ function image_size_input_fields( $post, $check = '' ) { - /** * Filter the names and labels of the default image sizes. * @@ -934,45 +992,53 @@ function image_size_input_fields( $post, $check = '' ) { 'full' => __( 'Full Size' ) ) ); - if ( empty($check) ) - $check = get_user_setting('imgsize', 'medium'); - - foreach ( $size_names as $size => $label ) { - $downsize = image_downsize($post->ID, $size); - $checked = ''; - - // is this size selectable? - $enabled = ( $downsize[3] || 'full' == $size ); - $css_id = "image-size-{$size}-{$post->ID}"; - // if this size is the default but that's not available, don't select it - if ( $size == $check ) { - if ( $enabled ) - $checked = " checked='checked'"; - else - $check = ''; - } elseif ( !$check && $enabled && 'thumbnail' != $size ) { - // if $check is not enabled, default to the first available size that's bigger than a thumbnail - $check = $size; + if ( empty( $check ) ) { + $check = get_user_setting('imgsize', 'medium'); + } + $out = array(); + + foreach ( $size_names as $size => $label ) { + $downsize = image_downsize( $post->ID, $size ); + $checked = ''; + + // Is this size selectable? + $enabled = ( $downsize[3] || 'full' == $size ); + $css_id = "image-size-{$size}-{$post->ID}"; + + // If this size is the default but that's not available, don't select it. + if ( $size == $check ) { + if ( $enabled ) { $checked = " checked='checked'"; + } else { + $check = ''; } + } elseif ( ! $check && $enabled && 'thumbnail' != $size ) { + /* + * If $check is not enabled, default to the first available size + * that's bigger than a thumbnail. + */ + $check = $size; + $checked = " checked='checked'"; + } - $html = "

"; - - $html .= "$label"; - // only show the dimensions if that choice is available - if ( $enabled ) - $html .= " " . sprintf( "(%d × %d)", $downsize[1], $downsize[2] ). ""; + $html = "

"; - $html .= '

'; + $html .= "$label"; - $out[] = $html; + // Only show the dimensions if that choice is available. + if ( $enabled ) { + $html .= " " . sprintf( "(%d × %d)", $downsize[1], $downsize[2] ). ""; } + $html .= '

'; - return array( - 'label' => __('Size'), - 'input' => 'html', - 'html' => join("\n", $out), - ); + $out[] = $html; + } + + return array( + 'label' => __( 'Size' ), + 'input' => 'html', + 'html' => join( "\n", $out ), + ); } /** @@ -980,7 +1046,7 @@ function image_size_input_fields( $post, $check = '' ) { * * @since 2.7.0 * - * @param object $post + * @param WP_Post $post * @param string $url_type * @return string */ @@ -1006,15 +1072,23 @@ function image_link_input_fields($post, $url_type = '') { "; } +/** + * Output a textarea element for inputting an attachment caption. + * + * @since 3.4.0 + * + * @param WP_Post $edit_post Attachment WP_Post object. + * @return string HTML markup for the textarea element. + */ function wp_caption_input_textarea($edit_post) { - // post data is already escaped + // Post data is already escaped. $name = "attachments[{$edit_post->ID}][post_excerpt]"; return ''; } /** - * {@internal Missing Short Description}} + * Retrieves the image attachment fields to edit form fields. * * @since 2.5.0 * @@ -1027,13 +1101,13 @@ function image_attachment_fields_to_edit($form_fields, $post) { } /** - * {@internal Missing Short Description}} + * Retrieves the single non-image attachment fields to edit form fields. * * @since 2.5.0 * - * @param array $form_fields - * @param object $post {@internal $post not used}} - * @return array + * @param array $form_fields An array of attachment form fields. + * @param WP_Post $post The WP_Post attachment object. + * @return array Filtered attachment form fields. */ function media_single_attachment_fields_to_edit( $form_fields, $post ) { unset($form_fields['url'], $form_fields['align'], $form_fields['image-size']); @@ -1041,13 +1115,13 @@ function media_single_attachment_fields_to_edit( $form_fields, $post ) { } /** - * {@internal Missing Short Description}} + * Retrieves the post non-image attachment fields to edito form fields. * * @since 2.8.0 * - * @param array $form_fields - * @param object $post {@internal $post not used}} - * @return array + * @param array $form_fields An array of attachment form fields. + * @param WP_Post $post The WP_Post attachment object. + * @return array Filtered attachment form fields. */ function media_post_single_attachment_fields_to_edit( $form_fields, $post ) { unset($form_fields['image_url']); @@ -1063,9 +1137,9 @@ function media_post_single_attachment_fields_to_edit( $form_fields, $post ) { * * @since 2.5.0 * - * @param object $post - * @param array $attachment {@internal $attachment not used}} - * @return array + * @param array $post The WP_Post attachment object converted to an array. + * @param array $attachment An array of attachment metadata. + * @return array Filtered attachment post object. */ function image_attachment_fields_to_save( $post, $attachment ) { if ( substr( $post['post_mime_type'], 0, 5 ) == 'image' ) { @@ -1079,17 +1153,15 @@ function image_attachment_fields_to_save( $post, $attachment ) { return $post; } -add_filter( 'attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2 ); - /** - * {@internal Missing Short Description}} + * Retrieves the media element HTML to send to the editor. * * @since 2.5.0 * * @param string $html * @param integer $attachment_id * @param array $attachment - * @return array + * @return string */ function image_media_send_to_editor($html, $attachment_id, $attachment) { $post = get_post($attachment_id); @@ -1098,7 +1170,7 @@ function image_media_send_to_editor($html, $attachment_id, $attachment) { $align = !empty($attachment['align']) ? $attachment['align'] : 'none'; $size = !empty($attachment['image-size']) ? $attachment['image-size'] : 'medium'; $alt = !empty($attachment['image_alt']) ? $attachment['image_alt'] : ''; - $rel = ( $url == get_attachment_link($attachment_id) ); + $rel = ( strpos( $url, 'attachment_id') || $url === get_attachment_link( $attachment_id ) ); return get_image_send_to_editor($attachment_id, $attachment['post_excerpt'], $attachment['post_title'], $align, $url, $rel, $size, $alt); } @@ -1106,14 +1178,12 @@ function image_media_send_to_editor($html, $attachment_id, $attachment) { return $html; } -add_filter('media_send_to_editor', 'image_media_send_to_editor', 10, 3); - /** - * {@internal Missing Short Description}} + * Retrieves the attachment fields to edit form fields. * * @since 2.5.0 * - * @param object $post + * @param WP_Post $post * @param array $errors * @return array */ @@ -1185,7 +1255,7 @@ function get_attachment_fields_to_edit($post, $errors = null) { } // Merge default fields with their errors, so any key passed with the error (e.g. 'error', 'helps', 'value') will replace the default - // The recursive merge is easily traversed with array casting: foreach( (array) $things as $thing ) + // The recursive merge is easily traversed with array casting: foreach ( (array) $things as $thing ) $form_fields = array_merge_recursive($form_fields, (array) $errors); // This was formerly in image_attachment_fields_to_edit(). @@ -1236,6 +1306,8 @@ function get_attachment_fields_to_edit($post, $errors = null) { * * @since 2.5.0 * + * @global WP_Query $wp_the_query + * * @param int $post_id Optional. Post ID. * @param array $errors Errors for attachment, if any. * @return string @@ -1270,6 +1342,8 @@ function get_media_items( $post_id, $errors ) { * * @since 2.5.0 * + * @global string $redir_tab + * * @param int $attachment_id Attachment ID for modification. * @param string|array $args Optional. Override defaults. * @return string HTML form for attachment. @@ -1285,7 +1359,13 @@ function get_media_item( $attachment_id, $args = null ) { $post = get_post( $attachment_id ); $current_post_id = !empty( $_GET['post_id'] ) ? (int) $_GET['post_id'] : 0; - $default_args = array( 'errors' => null, 'send' => $current_post_id ? post_type_supports( get_post_type( $current_post_id ), 'editor' ) : true, 'delete' => true, 'toggle' => true, 'show_title' => true ); + $default_args = array( + 'errors' => null, + 'send' => $current_post_id ? post_type_supports( get_post_type( $current_post_id ), 'editor' ) : true, + 'delete' => true, + 'toggle' => true, + 'show_title' => true + ); $args = wp_parse_args( $args, $default_args ); /** @@ -1297,30 +1377,24 @@ function get_media_item( $attachment_id, $args = null ) { * * @param array $args An array of arguments. */ - $args = apply_filters( 'get_media_item_args', $args ); - extract( $args, EXTR_SKIP ); + $r = apply_filters( 'get_media_item_args', $args ); $toggle_on = __( 'Show' ); $toggle_off = __( 'Hide' ); - $filename = esc_html( wp_basename( $post->guid ) ); + $file = get_attached_file( $post->ID ); + $filename = esc_html( wp_basename( $file ) ); $title = esc_attr( $post->post_title ); - if ( $_tags = get_the_tags( $attachment_id ) ) { - foreach ( $_tags as $tag ) - $tags[] = $tag->name; - $tags = esc_attr( join( ', ', $tags ) ); - } - $post_mime_types = get_post_mime_types(); $keys = array_keys( wp_match_mime_types( array_keys( $post_mime_types ), $post->post_mime_type ) ); - $type = array_shift( $keys ); + $type = reset( $keys ); $type_html = ""; - $form_fields = get_attachment_fields_to_edit( $post, $errors ); + $form_fields = get_attachment_fields_to_edit( $post, $r['errors'] ); - if ( $toggle ) { - $class = empty( $errors ) ? 'startclosed' : 'startopen'; + if ( $r['toggle'] ) { + $class = empty( $r['errors'] ) ? 'startclosed' : 'startopen'; $toggle_links = " $toggle_on $toggle_off"; @@ -1330,7 +1404,7 @@ function get_media_item( $attachment_id, $args = null ) { } $display_title = ( !empty( $title ) ) ? $title : $filename; // $title shouldn't ever be empty, but just in case - $display_title = $show_title ? "

" . wp_html_excerpt( $display_title, 60, '…' ) . "

" : ''; + $display_title = $r['show_title'] ? "

" . wp_html_excerpt( $display_title, 60, '…' ) . "

" : ''; $gallery = ( ( isset( $_REQUEST['tab'] ) && 'gallery' == $_REQUEST['tab'] ) || ( isset( $redir_tab ) && 'gallery' == $redir_tab ) ); $order = ''; @@ -1385,7 +1459,7 @@ function get_media_item( $attachment_id, $args = null ) {

" . __('File name:') . " $filename

" . __('File type:') . " $post->post_mime_type

" . __('Upload date:') . " " . mysql2date( get_option('date_format'), $post->post_date ). '

'; +

" . __('Upload date:') . " " . mysql2date( __( 'F j, Y' ), $post->post_date ). '

'; if ( !empty( $media_dims ) ) $item .= "

" . __('Dimensions:') . " $media_dims

\n"; @@ -1394,8 +1468,9 @@ function get_media_item( $attachment_id, $args = null ) { $item .= " - - \n"; + \n + \n +

" . sprintf( __( 'Required fields are marked %s' ), '*' ) . "

			+ + +

		1 ) { $found = false; ?> -
- - -

user_login; ?> + ' . "\n"; ?> +	' . $delete_user->user_login . '' + ); ?> + $details ) { + $blog_users = get_users( array( 'blog_id' => $details->userblog_id, 'fields' => array( 'ID', 'user_login' ) ) ); + if ( is_array( $blog_users ) && !empty( $blog_users ) ) { + $user_site = "{$details->blogname}"; + $user_dropdown = '' . __( 'Select a user' ) . ''; + $user_dropdown .= "\n"; + ?> + + + + + + + + +
+ +

\n"; $defaults = array( 'input' => 'text', @@ -1404,14 +1479,19 @@ function get_media_item( $attachment_id, $args = null ) { 'extra_rows' => array(), ); - if ( $send ) - $send = get_submit_button( __( 'Insert into Post' ), 'button', "send[$attachment_id]", false ); + if ( $r['send'] ) { + $r['send'] = get_submit_button( __( 'Insert into Post' ), 'button', "send[$attachment_id]", false ); + } + + $delete = empty( $r['delete'] ) ? '' : $r['delete']; if ( $delete && current_user_can( 'delete_post', $attachment_id ) ) { if ( !EMPTY_TRASH_DAYS ) { $delete = "" . __( 'Delete Permanently' ) . ''; } elseif ( !MEDIA_TRASH ) { $delete = "" . __( 'Delete' ) . " - '; + include( ABSPATH . 'wp-admin/admin-footer.php' ); + die(); + } + + echo '

'; + + wp_nonce_field( 'install-network-1' ); + + $error_codes = array(); + if ( is_wp_error( $errors ) ) { + echo '

' . __( 'ERROR: The network could not be created.' ) . '

'; + foreach ( $errors->get_error_messages() as $error ) + echo "

$error

"; + echo '

'; + $error_codes = $errors->get_error_codes(); + } + + $site_name = ( ! empty( $_POST['sitename'] ) && ! in_array( 'empty_sitename', $error_codes ) ) ? $_POST['sitename'] : sprintf( _x('%s Sites', 'Default network name' ), get_option( 'blogname' ) ); + $admin_email = ( ! empty( $_POST['email'] ) && ! in_array( 'invalid_email', $error_codes ) ) ? $_POST['email'] : get_option( 'admin_email' ); + ?> +

' . __( 'Note:' ) . ' '; + /* translators: %s: mod_rewrite */ + printf( __( 'Please make sure the Apache %s module is installed as it will be used at the end of this installation.' ), + 'mod_rewrite' + ); + echo '

'; + } elseif ( $is_apache ) { + echo '

' . __( 'Warning!' ) . ' '; + /* translators: %s: mod_rewrite */ + printf( __( 'It looks like the Apache %s module is not installed.' ), + 'mod_rewrite' + ); + echo '

'; + } + + if ( $got_mod_rewrite || $is_apache ) { // Protect against mod_rewrite mimicry (but ! Apache) + echo '

'; + /* translators: 1: mod_rewrite, 2: mod_rewrite documentation URL, 3: Google search for mod_rewrite */ + printf( __( 'If %1$s is disabled, ask your administrator to enable that module, or look at the Apache documentation or elsewhere for help setting it up.' ), + 'mod_rewrite', + 'http://httpd.apache.org/docs/mod/mod_rewrite.html', + 'http://www.google.com/search?q=apache+mod_rewrite' + ); + echo '

'; + } + } + + if ( allow_subdomain_install() && allow_subdirectory_install() ) : ?> +

+ + + + + + + + + + +

/>	site1.%1$s and `site2.%1$s`', 'subdomain examples' ), + $hostname + ); ?>
/>	%1$s/site1 and `%1$s/site2`', 'subdirectory examples' ), + $hostname + ); ?>

+ +

' . __('Warning!') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '

'; + + $is_www = ( 0 === strpos( $hostname, 'www.' ) ); + if ( $is_www ) : + ?> +

' . substr( $hostname, 4 ) . '', + '' . $hostname . '', + 'www' + ); ?>

+ + + + + +

	+ ' . $hostname . '' + ); ?> +

+ + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

	localhost', + '`localhost.localdomain`' + ); + // Uh oh: + if ( !allow_subdirectory_install() ) + echo ' ' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . ''; + ?>
	' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . ''; + ?>
	' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . ''; + ?>
	+ ' . $hostname . '' + ); ?> +
	+ + + + +
	+ + + + +

+ + + ' . $errors->get_error_message() . '

'; + + if ( $_POST ) { + if ( allow_subdomain_install() ) + $subdomain_install = allow_subdirectory_install() ? ! empty( $_POST['subdomain_install'] ) : true; + else + $subdomain_install = false; + } else { + if ( is_multisite() ) { + $subdomain_install = is_subdomain_install(); +?> +

+get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = 1 AND meta_key = 'subdomain_install'" ); +?> +

+ +

' . __( 'Caution:' ) . ' '; + printf( + /* translators: 1: wp-config.php 2: .htaccess */ + __( 'We recommend you back up your existing %1$s and %2$s files.' ), + 'wp-config.php', + '.htaccess' + ); + } elseif ( file_exists( $home_path . 'web.config' ) ) { + echo '' . __( 'Caution:' ) . ' '; + printf( + /* translators: 1: wp-config.php 2: web.config */ + __( 'We recommend you back up your existing %1$s and %2$s files.' ), + 'wp-config.php', + 'web.config' + ); + } else { + echo '' . __( 'Caution:' ) . ' '; + printf( + /* translators: 1: wp-config.php */ + __( 'We recommend you back up your existing %s file.' ), + 'wp-config.php' + ); + } + ?>

+ +

above the line reading /* That’s all, stop editing! Happy blogging. */:' ), + 'wp-config.php', + '' . $location_of_wp_config . '' + ); ?>
+ +define('MULTISITE', true); +define('SUBDOMAIN_INSTALL', <?php echo $subdomain_install ? 'true' : 'false'; ?>); +define('DOMAIN_CURRENT_SITE', '<?php echo $hostname; ?>'); +define('PATH_CURRENT_SITE', '<?php echo $base; ?>'); +define('SITE_ID_CURRENT_SITE', 1); +define('BLOG_ID_CURRENT_SITE', 1); + + '', 'SECURE_AUTH_KEY' => '', 'LOGGED_IN_KEY' => '', 'NONCE_KEY' => '', 'AUTH_SALT' => '', 'SECURE_AUTH_SALT' => '', 'LOGGED_IN_SALT' => '', 'NONCE_SALT' => '' ); + foreach ( $keys_salts as $c => $v ) { + if ( defined( $c ) ) + unset( $keys_salts[ $c ] ); + } + + if ( ! empty( $keys_salts ) ) { + $keys_salts_str = ''; + $from_api = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' ); + if ( is_wp_error( $from_api ) ) { + foreach ( $keys_salts as $c => $v ) { + $keys_salts_str .= "\ndefine( '$c', '" . wp_generate_password( 64, true, true ) . "' );"; + } + } else { + $from_api = explode( "\n", wp_remote_retrieve_body( $from_api ) ); + foreach ( $keys_salts as $c => $v ) { + $keys_salts_str .= "\ndefine( '$c', '" . substr( array_shift( $from_api ), 28, 64 ) . "' );"; + } + } + $num_keys_salts = count( $keys_salts ); +?> +
+ wp-config.php' + ); + } else { + printf( + /* translators: 1: wp-config.php */ + __( 'These unique authentication keys are also missing from your %s file.' ), + 'wp-config.php' + ); + } + ?> + +
+ <?php echo esc_textarea( $keys_salts_str ); ?> + +

+ + + + + + + '; + if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) { + $web_config_file .= ' + + + + '; + } + $web_config_file .= ' + + + + + + + + + + + + + + + + + + + + + + + + + + + +

'; + printf( + /* translators: 1: a filename like .htaccess. 2: a file path. */ + __( 'Add the following to your %1$s file in %2$s, replacing other WordPress rules:' ), + 'web.config', + '' . $home_path . '' + ); + echo '
'; + if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' ) + echo '
' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '
'; + ?> + <?php echo esc_textarea( $web_config_file ); ?> +

+ +

'; + printf( + /* translators: 1: a filename like .htaccess. 2: a file path. */ + __( 'Add the following to your %1$s file in %2$s, replacing other WordPress rules:' ), + '.htaccess', + '' . $home_path . '' + ); + echo '

'; + if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' ) + echo '

' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '

'; + ?> +

">
+<?php echo esc_textarea( $htaccess_file ); ?>

+ + + +

+ + + + + + + + +'; + echo '

' . __( 'The character encoding of your site (UTF-8 is recommended)' ) . '

'; +} diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php index 44a6a1b..b1727a2 100644 --- a/wp-admin/includes/plugin-install.php +++ b/wp-admin/includes/plugin-install.php @@ -7,37 +7,115 @@ */ /** - * Retrieve plugin installer pages from WordPress Plugins API. + * Retrieves plugin installer pages from the WordPress.org Plugins API. * * It is possible for a plugin to override the Plugin API result with three * filters. Assume this is for plugins, which can extend on the Plugin Info to - * offer more choices. This is very powerful and must be used with care, when + * offer more choices. This is very powerful and must be used with care when * overriding the filters. * - * The first filter, 'plugins_api_args', is for the args and gives the action as - * the second parameter. The hook for 'plugins_api_args' must ensure that an - * object is returned. + * The first filter, {@see 'plugins_api_args'}, is for the args and gives the action + * as the second parameter. The hook for {@see 'plugins_api_args'} must ensure that + * an object is returned. * - * The second filter, 'plugins_api', is the result that would be returned. + * The second filter, {@see 'plugins_api'}, allows a plugin to override the WordPress.org + * Plugin Install API entirely. If `$action` is 'query_plugins' or 'plugin_information', + * an object MUST be passed. If `$action` is 'hot_tags` or 'hot_categories', an array MUST + * be passed. + * + * Finally, the third filter, {@see 'plugins_api_result'}, makes it possible to filter the + * response object or array, depending on the `$action` type. + * + * Supported arguments per action: + * + * | Argument Name | query_plugins | plugin_information | hot_tags | hot_categories | + * | -------------------- | :-----------: | :----------------: | :------: | :------------: | + * | `$slug` | No | Yes | No | No | + * | `$per_page` | Yes | No | No | No | + * | `$page` | Yes | No | No | No | + * | `$number` | No | No | Yes | Yes | + * | `$search` | Yes | No | No | No | + * | `$tag` | Yes | No | No | No | + * | `$author` | Yes | No | No | No | + * | `$user` | Yes | No | No | No | + * | `$browse` | Yes | No | No | No | + * | `$locale` | Yes | Yes | No | No | + * | `$installed_plugins` | Yes | No | No | No | + * | `$is_ssl` | Yes | Yes | No | No | + * | `$fields` | Yes | Yes | No | No | * * @since 2.7.0 * - * @param string $action - * @param array|object $args Optional. Arguments to serialize for the Plugin Info API. - * @return object plugins_api response object on success, WP_Error on failure. + * @param string $action API action to perform: 'query_plugins', 'plugin_information', + * 'hot_tags' or 'hot_categories'. + * @param array|object $args { + * Optional. Array or object of arguments to serialize for the Plugin Info API. + * + * @type string $slug The plugin slug. Default empty. + * @type int $per_page Number of plugins per page. Default 24. + * @type int $page Number of current page. Default 1. + * @type int $number Number of tags or categories to be queried. + * @type string $search A search term. Default empty. + * @type string $tag Tag to filter plugins. Default empty. + * @type string $author Username of an plugin author to filter plugins. Default empty. + * @type string $user Username to query for their favorites. Default empty. + * @type string $browse Browse view: 'popular', 'new', 'beta', 'recommended'. + * @type string $locale Locale to provide context-sensitive results. Default is the value + * of get_locale(). + * @type string $installed_plugins Installed plugins to provide context-sensitive results. + * @type bool $is_ssl Whether links should be returned with https or not. Default false. + * @type array $fields { + * Array of fields which should or should not be returned. + * + * @type bool $short_description Whether to return the plugin short description. Default true. + * @type bool $description Whether to return the plugin full description. Default false. + * @type bool $sections Whether to return the plugin readme sections: description, installation, + * FAQ, screenshots, other notes, and changelog. Default false. + * @type bool $tested Whether to return the 'Compatible up to' value. Default true. + * @type bool $requires Whether to return the required WordPress version. Default true. + * @type bool $rating Whether to return the rating in percent and total number of ratings. + * Default true. + * @type bool $ratings Whether to return the number of rating for each star (1-5). Default true. + * @type bool $downloaded Whether to return the download count. Default true. + * @type bool $downloadlink Whether to return the download link for the package. Default true. + * @type bool $last_updated Whether to return the date of the last update. Default true. + * @type bool $added Whether to return the date when the plugin was added to the wordpress.org + * repository. Default true. + * @type bool $tags Whether to return the assigned tags. Default true. + * @type bool $compatibility Whether to return the WordPress compatibility list. Default true. + * @type bool $homepage Whether to return the plugin homepage link. Default true. + * @type bool $versions Whether to return the list of all available versions. Default false. + * @type bool $donate_link Whether to return the donation link. Default true. + * @type bool $reviews Whether to return the plugin reviews. Default false. + * @type bool $banners Whether to return the banner images links. Default false. + * @type bool $icons Whether to return the icon links. Default false. + * @type bool $active_installs Whether to return the number of active installs. Default false. + * @type bool $group Whether to return the assigned group. Default false. + * @type bool $contributors Whether to return the list of contributors. Default false. + * } + * } + * @return object|array|WP_Error Response object or array on success, WP_Error on failure. See the + * {@link https://developer.wordpress.org/reference/functions/plugins_api/ function reference article} + * for more information on the make-up of possible return values depending on the value of `$action`. */ -function plugins_api($action, $args = null) { +function plugins_api( $action, $args = array() ) { - if ( is_array($args) ) - $args = (object)$args; + if ( is_array( $args ) ) { + $args = (object) $args; + } - if ( !isset($args->per_page) ) + if ( ! isset( $args->per_page ) ) { $args->per_page = 24; + } + + if ( ! isset( $args->locale ) ) { + $args->locale = get_locale(); + } /** - * Override the Plugin Install API arguments. + * Filter the WordPress.org Plugin Install API arguments. * - * Please ensure that an object is returned. + * Important: An object MUST be returned to this filter. * * @since 2.7.0 * @@ -47,15 +125,18 @@ function plugins_api($action, $args = null) { $args = apply_filters( 'plugins_api_args', $args, $action ); /** - * Allows a plugin to override the WordPress.org Plugin Install API entirely. + * Filter the response for the current WordPress.org Plugin Install API request. * - * Please ensure that an object is returned. + * Passing a non-false value will effectively short-circuit the WordPress.org API request. + * + * If `$action` is 'query_plugins' or 'plugin_information', an object MUST be passed. + * If `$action` is 'hot_tags` or 'hot_categories', an array should be passed. * * @since 2.7.0 * - * @param bool|object $result The result object. Default false. - * @param string $action The type of information being requested from the Plugin Install API. - * @param object $args Plugin API arguments. + * @param false|object|array $result The result object or array. Default false. + * @param string $action The type of information being requested from the Plugin Install API. + * @param object $args Plugin API arguments. */ $res = apply_filters( 'plugins_api', false, $action, $args ); @@ -64,18 +145,18 @@ function plugins_api($action, $args = null) { if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) $url = set_url_scheme( $url, 'https' ); - $args = array( + $http_args = array( 'timeout' => 15, 'body' => array( 'action' => $action, 'request' => serialize( $args ) ) ); - $request = wp_remote_post( $url, $args ); + $request = wp_remote_post( $url, $http_args ); if ( $ssl && is_wp_error( $request ) ) { trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE ); - $request = wp_remote_post( $http_url, $args ); + $request = wp_remote_post( $http_url, $http_args ); } if ( is_wp_error($request) ) { @@ -124,15 +205,17 @@ function install_popular_tags( $args = array() ) { return $tags; } +/** + * @since 2.7.0 + */ function install_dashboard() { ?>

WordPress Plugin Directory or upload a plugin in .zip format via this page.' ), 'https://wordpress.org/plugins/', self_admin_url( 'plugin-install.php?tab=upload' ) ); ?>

- + -

esc_url( self_admin_url('plugin-install.php?tab=search&type=tag&s=' . urlencode($tag['name'])) ), - 'name' => $tag['name'], - 'id' => sanitize_title_with_dashes($tag['name']), - 'count' => $tag['count'] ); + foreach ( (array) $api_tags as $tag ) { + $url = self_admin_url( 'plugin-install.php?tab=search&type=tag&s=' . urlencode( $tag['name'] ) ); + $data = array( + 'link' => esc_url( $url ), + 'name' => $tag['name'], + 'slug' => $tag['slug'], + 'id' => sanitize_title_with_dashes( $tag['name'] ), + 'count' => $tag['count'] + ); + $tags[ $tag['name'] ] = (object) $data; + } echo wp_generate_tag_cloud($tags, array( 'single_text' => __('%s plugin'), 'multiple_text' => __('%s plugins') ) ); } echo '

'; } -add_action('install_plugins_dashboard', 'install_dashboard'); /** * Display search form for searching plugins. * * @since 2.7.0 + * + * @param bool $type_selector */ function install_search_form( $type_selector = true ) { $type = isset($_REQUEST['type']) ? wp_unslash( $_REQUEST['type'] ) : 'term'; $term = isset($_REQUEST['s']) ? wp_unslash( $_REQUEST['s'] ) : ''; + $input_attrs = ''; + $button_type = 'button screen-reader-text'; + + // assume no $type_selector means it's a simplified search form + if ( ! $type_selector ) { + $input_attrs = 'class="wp-filter-search" placeholder="' . esc_attr__( 'Search Plugins' ) . '" '; + } - ?> -

- ' . __( 'These suggestions are based on the plugins you and other users have installed.' ) . '

'; + break; + case 'install_plugins_beta' : + printf( + '

' . __( 'You are using a development version of WordPress. These feature plugins are also under development. Learn more.' ) . '

', + 'https://make.wordpress.org/core/handbook/about/release-cycle/features-as-plugins/' + ); + break; + } - $wp_list_table->display(); + ?> + + response ) ) { foreach ( (array)$update_plugins->response as $file => $plugin ) { @@ -275,7 +395,8 @@ function install_plugin_install_status($api, $loop = false) { $url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug); } else { $key = array_keys( $installed_plugin ); - $key = array_shift( $key ); //Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers + $key = reset( $key ); //Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers + $update_file = $api->slug . '/' . $key; if ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '=') ){ $status = 'latest_installed'; } elseif ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '<') ) { @@ -299,71 +420,117 @@ function install_plugin_install_status($api, $loop = false) { if ( isset($_GET['from']) ) $url .= '&from=' . urlencode( wp_unslash( $_GET['from'] ) ); - return compact('status', 'url', 'version'); + $file = $update_file; + return compact( 'status', 'url', 'version', 'file' ); } /** * Display plugin information in dialog box form. * * @since 2.7.0 + * + * @global string $tab + * @global string $wp_version */ function install_plugin_information() { global $tab; - $api = plugins_api( 'plugin_information', array( 'slug' => wp_unslash( $_REQUEST['plugin'] ), 'is_ssl' => is_ssl() ) ); + if ( empty( $_REQUEST['plugin'] ) ) { + return; + } - if ( is_wp_error( $api ) ) + $api = plugins_api( 'plugin_information', array( + 'slug' => wp_unslash( $_REQUEST['plugin'] ), + 'is_ssl' => is_ssl(), + 'fields' => array( + 'banners' => true, + 'reviews' => true, + 'downloaded' => false, + 'active_installs' => true + ) + ) ); + + if ( is_wp_error( $api ) ) { wp_die( $api ); + } $plugins_allowedtags = array( 'a' => array( 'href' => array(), 'title' => array(), 'target' => array() ), 'abbr' => array( 'title' => array() ), 'acronym' => array( 'title' => array() ), 'code' => array(), 'pre' => array(), 'em' => array(), 'strong' => array(), - 'div' => array(), 'p' => array(), 'ul' => array(), 'ol' => array(), 'li' => array(), + 'div' => array( 'class' => array() ), 'span' => array( 'class' => array() ), + 'p' => array(), 'ul' => array(), 'ol' => array(), 'li' => array(), 'h1' => array(), 'h2' => array(), 'h3' => array(), 'h4' => array(), 'h5' => array(), 'h6' => array(), 'img' => array( 'src' => array(), 'class' => array(), 'alt' => array() ) ); $plugins_section_titles = array( - 'description' => _x('Description', 'Plugin installer section title'), - 'installation' => _x('Installation', 'Plugin installer section title'), - 'faq' => _x('FAQ', 'Plugin installer section title'), - 'screenshots' => _x('Screenshots', 'Plugin installer section title'), - 'changelog' => _x('Changelog', 'Plugin installer section title'), - 'other_notes' => _x('Other Notes', 'Plugin installer section title') + 'description' => _x( 'Description', 'Plugin installer section title' ), + 'installation' => _x( 'Installation', 'Plugin installer section title' ), + 'faq' => _x( 'FAQ', 'Plugin installer section title' ), + 'screenshots' => _x( 'Screenshots', 'Plugin installer section title' ), + 'changelog' => _x( 'Changelog', 'Plugin installer section title' ), + 'reviews' => _x( 'Reviews', 'Plugin installer section title' ), + 'other_notes' => _x( 'Other Notes', 'Plugin installer section title' ) ); - //Sanitize HTML - foreach ( (array)$api->sections as $section_name => $content ) { - $api->sections[$section_name] = wp_kses($content, $plugins_allowedtags); + // Sanitize HTML + foreach ( (array) $api->sections as $section_name => $content ) { + $api->sections[$section_name] = wp_kses( $content, $plugins_allowedtags ); } foreach ( array( 'version', 'author', 'requires', 'tested', 'homepage', 'downloaded', 'slug' ) as $key ) { - if ( isset( $api->$key ) ) + if ( isset( $api->$key ) ) { $api->$key = wp_kses( $api->$key, $plugins_allowedtags ); + } } $_tab = esc_attr( $tab ); - $section = isset( $_REQUEST['section'] ) ? wp_unslash( $_REQUEST['section'] ) : 'description'; //Default to the Description tab, Do not translate, API returns English. + $section = isset( $_REQUEST['section'] ) ? wp_unslash( $_REQUEST['section'] ) : 'description'; // Default to the Description tab, Do not translate, API returns English. if ( empty( $section ) || ! isset( $api->sections[ $section ] ) ) { $section_titles = array_keys( (array) $api->sections ); - $section = array_shift( $section_titles ); + $section = reset( $section_titles ); } - iframe_header( __('Plugin Install') ); + iframe_header( __( 'Plugin Install' ) ); + + $_with_banner = ''; + + if ( ! empty( $api->banners ) && ( ! empty( $api->banners['low'] ) || ! empty( $api->banners['high'] ) ) ) { + $_with_banner = 'with-banner'; + $low = empty( $api->banners['low'] ) ? $api->banners['high'] : $api->banners['low']; + $high = empty( $api->banners['high'] ) ? $api->banners['low'] : $api->banners['high']; + ?> + + {$api->name}

"; - echo "

\n"; + echo '

'; + echo "

{$api->name}

"; + echo "

\n"; - foreach ( (array)$api->sections as $section_name => $content ) { + foreach ( (array) $api->sections as $section_name => $content ) { + if ( 'reviews' === $section_name && ( empty( $api->ratings ) || 0 === array_sum( (array) $api->ratings ) ) ) { + continue; + } - if ( isset( $plugins_section_titles[ $section_name ] ) ) + if ( isset( $plugins_section_titles[ $section_name ] ) ) { $title = $plugins_section_titles[ $section_name ]; - else + } else { $title = ucwords( str_replace( '_', ' ', $section_name ) ); + } - $class = ( $section_name == $section ) ? ' class="current"' : ''; + $class = ( $section_name === $section ) ? ' class="current"' : ''; $href = add_query_arg( array('tab' => $tab, 'section' => $section_name) ); $href = esc_url( $href ); $san_section = esc_attr( $section_name ); @@ -373,55 +540,107 @@ function install_plugin_information() { echo "

\n"; ?> -

version ?>
author, '_blank') ?>
last_updated)) ) ?>
requires) ?>
tested ?>
downloaded), number_format_i18n($api->downloaded)) ?>
version; ?>
author, '_blank' ); ?>
+ last_updated ) ) ); ?> +
requires ); ?>
tested; ?>
active_installs >= 1000000 ) { + _ex( '1+ Million', 'Active plugin installs' ); + } else { + echo number_format_i18n( $api->active_installs ) . '+'; + } + ?>

- rating ) ) : ?> -

+ rating ) ) { ?> +

$api->rating, 'type' => 'percent', 'number' => $api->num_ratings ) ); ?> - num_ratings), number_format_i18n($api->num_ratings) ); ?> - + + ratings ) && array_sum( (array) $api->ratings ) > 0 ) { ?> +

+ ratings as $key => $ratecount ) { + // Avoid div-by-zero. + $_rating = $api->num_ratings ? ( $ratecount / $api->num_ratings ) : 0; + /* translators: 1: number of stars (used to determine singular/plural), 2: number of reviews */ + $aria_label = esc_attr( sprintf( _n( 'Reviews with %1$d star: %2$s. Opens in a new window.', 'Reviews with %1$d stars: %2$s. Opens in a new window.', $key ), + $key, + number_format_i18n( $ratecount ) + ) ); + ?> +

+ + + + + +

+ contributors ) ) { ?> +

{$contrib_username}
{$contrib_username}

+ donate_link ) ) { ?> + + +

tested ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $api->tested ) ), $api->tested, '>' ) ) - echo '

' . __('Warning: This plugin has not been tested with your current version of WordPress.') . '

'; - - else if ( ! empty( $api->requires ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $api->requires ) ), $api->requires, '<' ) ) - echo '

' . __('Warning: This plugin has not been marked as compatible with your version of WordPress.') . '

'; - - foreach ( (array)$api->sections as $section_name => $content ) { - - if ( isset( $plugins_section_titles[ $section_name ] ) ) - $title = $plugins_section_titles[ $section_name ]; - else - $title = ucwords( str_replace( '_', ' ', $section_name ) ); + if ( ! empty( $api->tested ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $api->tested ) ), $api->tested, '>' ) ) { + echo '

' . __( 'Warning: This plugin has not been tested with your current version of WordPress.' ) . '

'; + } elseif ( ! empty( $api->requires ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $api->requires ) ), $api->requires, '<' ) ) { + echo '

' . __( 'Warning: This plugin has not been marked as compatible with your version of WordPress.' ) . '

'; + } + foreach ( (array) $api->sections as $section_name => $content ) { $content = links_add_base_url( $content, 'https://wordpress.org/plugins/' . $api->slug . '/' ); $content = links_add_target( $content, '_blank' ); $san_section = esc_attr( $section_name ); - $display = ( $section_name == $section ) ? 'block' : 'none'; + $display = ( $section_name === $section ) ? 'block' : 'none'; echo "\t

\n"; echo $content; @@ -429,23 +648,26 @@ function install_plugin_information() { } echo "

\n"; echo "

\n"; + echo "

\n"; // #plugin-information-scrollable echo "

\n"; - if ( ! empty( $api->download_link ) && ( current_user_can('install_plugins') || current_user_can('update_plugins') ) ) { - $status = install_plugin_install_status($api); + if ( ! empty( $api->download_link ) && ( current_user_can( 'install_plugins' ) || current_user_can( 'update_plugins' ) ) ) { + $status = install_plugin_install_status( $api ); switch ( $status['status'] ) { case 'install': - if ( $status['url'] ) - echo '' . __('Install Now') . ''; + if ( $status['url'] ) { + echo '' . __( 'Install Now' ) . ''; + } break; case 'update_available': - if ( $status['url'] ) - echo '' . __('Install Update Now') .''; + if ( $status['url'] ) { + echo '' . __( 'Install Update Now' ) .''; + } break; case 'newer_installed': - echo '' . sprintf(__('Newer Version (%s) Installed'), $status['version']) . ''; + echo '' . sprintf( __( 'Newer Version (%s) Installed'), $status['version'] ) . ''; break; case 'latest_installed': - echo '' . __('Latest Version Installed') . ''; + echo '' . __( 'Latest Version Installed' ) . ''; break; } } @@ -454,4 +676,3 @@ function install_plugin_information() { iframe_footer(); exit; } -add_action('install_plugins_pre_plugin-information', 'install_plugin_information'); diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index 08adef8..25f6828 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -7,46 +7,31 @@ */ /** - * Parse the plugin contents to retrieve plugin's metadata. + * Parses the plugin contents to retrieve plugin's metadata. * * The metadata of the plugin's data searches for the following in the plugin's * header. All plugin data must be on its own line. For plugin description, it * must not have any newlines or only parts of the description will be displayed * and the same goes for the plugin data. The below is formatted for printing. * - *


- * /*
- * Plugin Name: Name of Plugin
- * Plugin URI: Link to plugin information
- * Description: Plugin Description
- * Author: Plugin author's name
- * Author URI: Link to the author's web site
- * Version: Must be set in the plugin for WordPress 2.3+
- * Text Domain: Optional. Unique identifier, should be same as the one used in
- *		plugin_text_domain()
- * Domain Path: Optional. Only useful if the translations are located in a
- *		folder above the plugin's base path. For example, if .mo files are
- *		located in the locale folder then Domain Path will be "/locale/" and
- *		must have the first slash. Defaults to the base folder the plugin is
- *		located in.
- * Network: Optional. Specify "Network: true" to require that a plugin is activated
- *		across all sites in an installation. This will prevent a plugin from being
- *		activated on a single site when Multisite is enabled.
- *  * / # Remove the space to close comment
- *

- * - * Plugin data returned array contains the following: - * 'Name' - Name of the plugin, must be unique. - * 'Title' - Title of the plugin and the link to the plugin's web site. - * 'Description' - Description of what the plugin does and/or notes - * from the author. - * 'Author' - The author's name - * 'AuthorURI' - The authors web site address. - * 'Version' - The plugin version number. - * 'PluginURI' - Plugin web site address. - * 'TextDomain' - Plugin's text domain for localization. - * 'DomainPath' - Plugin's relative directory path to .mo files. - * 'Network' - Boolean. Whether the plugin can only be activated network wide. + * /* + * Plugin Name: Name of Plugin + * Plugin URI: Link to plugin information + * Description: Plugin Description + * Author: Plugin author's name + * Author URI: Link to the author's web site + * Version: Must be set in the plugin for WordPress 2.3+ + * Text Domain: Optional. Unique identifier, should be same as the one used in + * load_plugin_textdomain() + * Domain Path: Optional. Only useful if the translations are located in a + * folder above the plugin's base path. For example, if .mo files are + * located in the locale folder then Domain Path will be "/locale/" and + * must have the first slash. Defaults to the base folder the plugin is + * located in. + * Network: Optional. Specify "Network: true" to require that a plugin is activated + * across all sites in an installation. This will prevent a plugin from being + * activated on a single site when Multisite is enabled. + * * / # Remove the space to close comment * * Some users have issues with opening large files and manipulating the contents * for want is usually the first 1kiB or 2kiB. This function stops pulling in @@ -60,14 +45,25 @@ * the file. This is not checked however and the file is only opened for * reading. * - * @link http://trac.wordpress.org/ticket/5651 Previous Optimizations. - * @link http://trac.wordpress.org/ticket/7372 Further and better Optimizations. * @since 1.5.0 * * @param string $plugin_file Path to the plugin file - * @param bool $markup Optional. If the returned data should have HTML markup applied. Defaults to true. - * @param bool $translate Optional. If the returned data should be translated. Defaults to true. - * @return array See above for description. + * @param bool $markup Optional. If the returned data should have HTML markup applied. + * Default true. + * @param bool $translate Optional. If the returned data should be translated. Default true. + * @return array { + * Plugin data. Values will be empty if not supplied by the plugin. + * + * @type string $Name Name of the plugin. Should be unique. + * @type string $Title Title of the plugin and link to the plugin's site (if set). + * @type string $Description Plugin description. + * @type string $Author Author's name. + * @type string $AuthorURI Author's website address (if set). + * @type string $Version Plugin version. + * @type string $TextDomain Plugin textdomain. + * @type string $DomainPath Plugins relative directory path to .mo files. + * @type bool $Network Whether the plugin can only be activated network-wide. + * } */ function get_plugin_data( $plugin_file, $markup = true, $translate = true ) { @@ -89,7 +85,8 @@ function get_plugin_data( $plugin_file, $markup = true, $translate = true ) { // Site Wide Only is the old header for Network if ( ! $plugin_data['Network'] && $plugin_data['_sitewide'] ) { - _deprecated_argument( __FUNCTION__, '3.0', sprintf( __( 'The %1$s plugin header is deprecated. Use %2$s instead.' ), 'Site Wide Only: true', 'Network: true' ) ); + /* translators: 1: Site Wide Only: true, 2: Network: true */ + _deprecated_argument( __FUNCTION__, '3.0', sprintf( __( 'The %1$s plugin header is deprecated. Use %2$s instead.' ), 'Site Wide Only: true', 'Network: true' ) ); $plugin_data['Network'] = $plugin_data['_sitewide']; } $plugin_data['Network'] = ( 'true' == strtolower( $plugin_data['Network'] ) ); @@ -120,11 +117,14 @@ function _get_plugin_data_markup_translate( $plugin_file, $plugin_data, $markup // Translate fields if ( $translate ) { if ( $textdomain = $plugin_data['TextDomain'] ) { - if ( $plugin_data['DomainPath'] ) - load_plugin_textdomain( $textdomain, false, dirname( $plugin_file ) . $plugin_data['DomainPath'] ); - else - load_plugin_textdomain( $textdomain, false, dirname( $plugin_file ) ); - } elseif ( in_array( basename( $plugin_file ), array( 'hello.php', 'akismet.php' ) ) ) { + if ( ! is_textdomain_loaded( $textdomain ) ) { + if ( $plugin_data['DomainPath'] ) { + load_plugin_textdomain( $textdomain, false, dirname( $plugin_file ) . $plugin_data['DomainPath'] ); + } else { + load_plugin_textdomain( $textdomain, false, dirname( $plugin_file ) ); + } + } + } elseif ( 'hello.php' == basename( $plugin_file ) ) { $textdomain = 'default'; } if ( $textdomain ) { @@ -160,10 +160,10 @@ function _get_plugin_data_markup_translate( $plugin_file, $plugin_data, $markup // Apply markup if ( $markup ) { if ( $plugin_data['PluginURI'] && $plugin_data['Name'] ) - $plugin_data['Title'] = '' . $plugin_data['Name'] . ''; + $plugin_data['Title'] = '' . $plugin_data['Name'] . ''; if ( $plugin_data['AuthorURI'] && $plugin_data['Author'] ) - $plugin_data['Author'] = '' . $plugin_data['Author'] . ''; + $plugin_data['Author'] = '' . $plugin_data['Author'] . ''; $plugin_data['Description'] = wptexturize( $plugin_data['Description'] ); @@ -219,9 +219,9 @@ function get_plugin_files($plugin) { * * WordPress only supports plugin files in the base plugins directory * (wp-content/plugins) and in one directory above the plugins directory - * (wp-content/plugins/my-plugin). The file it looks for has the plugin data and - * must be found in those two locations. It is recommended that do keep your - * plugin files in directories. + * (wp-content/plugins/my-plugin). The file it looks for has the plugin data + * and must be found in those two locations. It is recommended to keep your + * plugin files in their own directories. * * The file with the plugin data is the file that will be included and therefore * needs to have the main execution for the plugin. This does not mean @@ -427,7 +427,12 @@ function _get_dropins() { } /** - * Check whether the plugin is active by checking the active_plugins list. + * Check whether a plugin is active. + * + * Only plugins installed in the plugins/ folder can be active. + * + * Plugins in the mu-plugins/ folder can't be "activated," so this function will + * return false for those plugins. * * @since 2.5.0 * @@ -456,6 +461,11 @@ function is_plugin_inactive( $plugin ) { /** * Check whether the plugin is active for the entire network. * + * Only plugins installed in the plugins/ folder can be active. + * + * Plugins in the mu-plugins/ folder can't be "activated," so this function will + * return false for those plugins. + * * @since 3.0.0 * * @param string $plugin Base plugin path from plugins directory. @@ -511,11 +521,11 @@ function is_network_only_plugin( $plugin ) { * * @since 2.5.0 * - * @param string $plugin Plugin path to main plugin file with plugin data. - * @param string $redirect Optional. URL to redirect to. - * @param bool $network_wide Whether to enable the plugin for all sites in the - * network or just the current site. Multisite only. Default is false. - * @param bool $silent Prevent calling activation hooks. Optional, default is false. + * @param string $plugin Plugin path to main plugin file with plugin data. + * @param string $redirect Optional. URL to redirect to. + * @param bool $network_wide Optional. Whether to enable the plugin for all sites in the network + * or just the current site. Multisite only. Default false. + * @param bool $silent Optional. Whether to prevent calling activation hooks. Default false. * @return WP_Error|null WP_Error on invalid file or null on success. */ function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silent = false ) { @@ -533,12 +543,14 @@ function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silen if ( is_wp_error($valid) ) return $valid; - if ( !in_array($plugin, $current) ) { + if ( ( $network_wide && ! isset( $current[ $plugin ] ) ) || ( ! $network_wide && ! in_array( $plugin, $current ) ) ) { if ( !empty($redirect) ) wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect)); // we'll override this later if the plugin can be included without fatal error ob_start(); wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin ); + $_wp_plugin_file = $plugin; include_once( WP_PLUGIN_DIR . '/' . $plugin ); + $plugin = $_wp_plugin_file; // Avoid stomping of the $plugin variable in a plugin. if ( ! $silent ) { /** @@ -556,11 +568,11 @@ function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silen do_action( 'activate_plugin', $plugin, $network_wide ); /** - * Fires as a specific plugin is being deactivated. + * Fires as a specific plugin is being activated. * - * This hook is the "deactivation" hook used internally by - * register_deactivation_hook(). The dynamic portion of the - * hook name, $plugin. refers to the plugin basename. + * This hook is the "activation" hook used internally by + * {@see register_activation_hook()}. The dynamic portion of the + * hook name, `$plugin`, refers to the plugin basename. * * If a plugin is silently activated (such as during an update), * this hook does not fire. @@ -574,9 +586,11 @@ function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silen } if ( $network_wide ) { + $current = get_site_option( 'active_sitewide_plugins', array() ); $current[$plugin] = time(); update_site_option( 'active_sitewide_plugins', $current ); } else { + $current = get_option( 'active_plugins', array() ); $current[] = $plugin; sort($current); update_option('active_plugins', $current); @@ -672,8 +686,8 @@ function deactivate_plugins( $plugins, $silent = false, $network_wide = null ) { * Fires as a specific plugin is being deactivated. * * This hook is the "deactivation" hook used internally by - * register_deactivation_hook(). The dynamic portion of the - * hook name, $plugin. refers to the plugin basename. + * {@see register_deactivation_hook()}. The dynamic portion of the + * hook name, `$plugin`, refers to the plugin basename. * * If a plugin is silently deactivated (such as during an update), * this hook does not fire. @@ -717,7 +731,7 @@ function deactivate_plugins( $plugins, $silent = false, $network_wide = null ) { * * @since 2.6.0 * - * @param string|array $plugins + * @param string|array $plugins Single plugin or list of plugins to activate. * @param string $redirect Redirect to page after successful activation. * @param bool $network_wide Whether to enable the plugin for all sites in the network. * @param bool $silent Prevent calling activation hooks. Default is false. @@ -743,32 +757,32 @@ function activate_plugins( $plugins, $redirect = '', $network_wide = false, $sil } /** - * Remove directory and files of a plugin for a single or list of plugin(s). - * - * If the plugins parameter list is empty, false will be returned. True when - * completed. + * Remove directory and files of a plugin for a list of plugins. * * @since 2.6.0 * - * @param array $plugins List of plugin - * @param string $redirect Redirect to page when complete. - * @return mixed + * @global WP_Filesystem_Base $wp_filesystem + * + * @param array $plugins List of plugins to delete. + * @param string $deprecated Deprecated. + * @return bool|null|WP_Error True on success, false is $plugins is empty, WP_Error on failure. + * Null if filesystem credentials are required to proceed. */ -function delete_plugins($plugins, $redirect = '' ) { +function delete_plugins( $plugins, $deprecated = '' ) { global $wp_filesystem; if ( empty($plugins) ) return false; $checked = array(); - foreach( $plugins as $plugin ) + foreach ( $plugins as $plugin ) $checked[] = 'checked[]=' . $plugin; ob_start(); $url = wp_nonce_url('plugins.php?action=delete-selected&verify-delete=1&' . implode('&', $checked), 'bulk-plugins'); if ( false === ($credentials = request_filesystem_credentials($url)) ) { - $data = ob_get_contents(); - ob_end_clean(); + $data = ob_get_clean(); + if ( ! empty($data) ){ include_once( ABSPATH . 'wp-admin/admin-header.php'); echo $data; @@ -780,8 +794,8 @@ function delete_plugins($plugins, $redirect = '' ) { if ( ! WP_Filesystem($credentials) ) { request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again - $data = ob_get_contents(); - ob_end_clean(); + $data = ob_get_clean(); + if ( ! empty($data) ){ include_once( ABSPATH . 'wp-admin/admin-header.php'); echo $data; @@ -797,29 +811,67 @@ function delete_plugins($plugins, $redirect = '' ) { if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() ) return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors); - //Get the base plugin folder + // Get the base plugin folder. $plugins_dir = $wp_filesystem->wp_plugins_dir(); - if ( empty($plugins_dir) ) - return new WP_Error('fs_no_plugins_dir', __('Unable to locate WordPress Plugin directory.')); + if ( empty( $plugins_dir ) ) { + return new WP_Error( 'fs_no_plugins_dir', __( 'Unable to locate WordPress Plugin directory.' ) ); + } $plugins_dir = trailingslashit( $plugins_dir ); + $plugin_translations = wp_get_installed_translations( 'plugins' ); + $errors = array(); - foreach( $plugins as $plugin_file ) { - // Run Uninstall hook - if ( is_uninstallable_plugin( $plugin_file ) ) + foreach ( $plugins as $plugin_file ) { + // Run Uninstall hook. + if ( is_uninstallable_plugin( $plugin_file ) ) { uninstall_plugin($plugin_file); + } + + /** + * Fires immediately before a plugin deletion attempt. + * + * @since 4.4.0 + * + * @param string $plugin_file Plugin file name. + */ + do_action( 'delete_plugin', $plugin_file ); + + $this_plugin_dir = trailingslashit( dirname( $plugins_dir . $plugin_file ) ); - $this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin_file) ); // If plugin is in its own directory, recursively delete the directory. - if ( strpos($plugin_file, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory separator AND that it's not the root plugin folder - $deleted = $wp_filesystem->delete($this_plugin_dir, true); - else - $deleted = $wp_filesystem->delete($plugins_dir . $plugin_file); + if ( strpos( $plugin_file, '/' ) && $this_plugin_dir != $plugins_dir ) { //base check on if plugin includes directory separator AND that it's not the root plugin folder + $deleted = $wp_filesystem->delete( $this_plugin_dir, true ); + } else { + $deleted = $wp_filesystem->delete( $plugins_dir . $plugin_file ); + } - if ( ! $deleted ) + /** + * Fires immediately after a plugin deletion attempt. + * + * @since 4.4.0 + * + * @param string $plugin_file Plugin file name. + * @param bool $deleted Whether the plugin deletion was successful. + */ + do_action( 'deleted_plugin', $plugin_file, $deleted ); + + if ( ! $deleted ) { $errors[] = $plugin_file; + continue; + } + + // Remove language files, silently. + $plugin_slug = dirname( $plugin_file ); + if ( '.' !== $plugin_slug && ! empty( $plugin_translations[ $plugin_slug ] ) ) { + $translations = $plugin_translations[ $plugin_slug ]; + + foreach ( $translations as $translation => $data ) { + $wp_filesystem->delete( WP_LANG_DIR . '/plugins/' . $plugin_slug . '-' . $translation . '.po' ); + $wp_filesystem->delete( WP_LANG_DIR . '/plugins/' . $plugin_slug . '-' . $translation . '.mo' ); + } + } } // Remove deleted plugins from the plugin updates list. @@ -851,7 +903,7 @@ function delete_plugins($plugins, $redirect = '' ) { */ function validate_active_plugins() { $plugins = get_option( 'active_plugins', array() ); - // validate vartype: array + // Validate vartype: array. if ( ! is_array( $plugins ) ) { update_option( 'active_plugins', array() ); $plugins = array(); @@ -863,11 +915,11 @@ function validate_active_plugins() { } if ( empty( $plugins ) ) - return; + return array(); $invalid = array(); - // invalid plugins get deactivated + // Invalid plugins get deactivated. foreach ( $plugins as $plugin ) { $result = validate_plugin( $plugin ); if ( is_wp_error( $result ) ) { @@ -926,11 +978,23 @@ function is_uninstallable_plugin($plugin) { * @since 2.7.0 * * @param string $plugin Relative plugin path from Plugin Directory. + * @return true True if a plugin's uninstall.php file has been found and included. */ function uninstall_plugin($plugin) { $file = plugin_basename($plugin); $uninstallable_plugins = (array) get_option('uninstall_plugins'); + + /** + * Fires in uninstall_plugin() immediately before the plugin is uninstalled. + * + * @since 4.5.0 + * + * @param string $plugin Relative plugin path from plugin directory. + * @param array $uninstallable_plugins Uninstallable plugins. + */ + do_action( 'pre_uninstall_plugin', $plugin, $uninstallable_plugins ); + if ( file_exists( WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php' ) ) { if ( isset( $uninstallable_plugins[$file] ) ) { unset($uninstallable_plugins[$file]); @@ -940,7 +1004,7 @@ function uninstall_plugin($plugin) { define('WP_UNINSTALL_PLUGIN', $file); wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . dirname( $file ) ); - include WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php'; + include( WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php' ); return true; } @@ -952,7 +1016,7 @@ function uninstall_plugin($plugin) { unset($uninstallable_plugins); wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $file ); - include WP_PLUGIN_DIR . '/' . $file; + include( WP_PLUGIN_DIR . '/' . $file ); add_action( 'uninstall_' . $file, $callable ); @@ -973,7 +1037,7 @@ function uninstall_plugin($plugin) { // /** - * Add a top level menu page + * Add a top-level menu page. * * This function takes a capability which will be used to determine whether * or not a page is included in the menu. @@ -981,19 +1045,24 @@ function uninstall_plugin($plugin) { * The function which is hooked in to handle the output of the page must check * that the user has the required capability as well. * - * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected - * @param string $menu_title The text to be used for the menu - * @param string $capability The capability required for this menu to be displayed to the user. - * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu) - * @param callback $function The function to be called to output the content for this page. - * @param string $icon_url The url to the icon to be used for this menu. - * * Pass a base64-encoded SVG using a data URI, which will be colored to match the color scheme. - * This should begin with 'data:image/svg+xml;base64,'. - * * Pass the name of a Dashicons helper class to use a font icon, e.g. 'dashicons-chart-pie'. - * * Pass 'none' to leave div.wp-menu-image empty so an icon can be added via CSS. - * @param int $position The position in the menu order this one should appear - * - * @return string The resulting page's hook_suffix + * @global array $menu + * @global array $admin_page_hooks + * @global array $_registered_pages + * @global array $_parent_pages + * + * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected. + * @param string $menu_title The text to be used for the menu. + * @param string $capability The capability required for this menu to be displayed to the user. + * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu). + * @param callable $function The function to be called to output the content for this page. + * @param string $icon_url The URL to the icon to be used for this menu. + * * Pass a base64-encoded SVG using a data URI, which will be colored to match + * the color scheme. This should begin with 'data:image/svg+xml;base64,'. + * * Pass the name of a Dashicons helper class to use a font icon, + * e.g. 'dashicons-chart-pie'. + * * Pass 'none' to leave div.wp-menu-image empty so an icon can be added via CSS. + * @param int $position The position in the menu order this one should appear. + * @return string The resulting page's hook_suffix. */ function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '', $position = null ) { global $menu, $admin_page_hooks, $_registered_pages, $_parent_pages; @@ -1017,10 +1086,14 @@ function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $func $new_menu = array( $menu_title, $capability, $menu_slug, $page_title, 'menu-top ' . $icon_class . $hookname, $hookname, $icon_url ); - if ( null === $position ) + if ( null === $position ) { $menu[] = $new_menu; - else - $menu[$position] = $new_menu; + } elseif ( isset( $menu[ "$position" ] ) ) { + $position = $position + substr( base_convert( md5( $menu_slug . $menu_title ), 16, 10 ) , -5 ) * 0.00001; + $menu[ "$position" ] = $new_menu; + } else { + $menu[ $position ] = $new_menu; + } $_registered_pages[$hookname] = true; @@ -1031,33 +1104,7 @@ function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $func } /** - * Add a top level menu page in the 'objects' section - * - * This function takes a capability which will be used to determine whether - * or not a page is included in the menu. - * - * The function which is hooked in to handle the output of the page must check - * that the user has the required capability as well. - * - * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected - * @param string $menu_title The text to be used for the menu - * @param string $capability The capability required for this menu to be displayed to the user. - * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu) - * @param callback $function The function to be called to output the content for this page. - * @param string $icon_url The url to the icon to be used for this menu - * - * @return string The resulting page's hook_suffix - */ -function add_object_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '') { - global $_wp_last_object_menu; - - $_wp_last_object_menu++; - - return add_menu_page($page_title, $menu_title, $capability, $menu_slug, $function, $icon_url, $_wp_last_object_menu); -} - -/** - * Add a top level menu page in the 'utility' section + * Add a submenu page. * * This function takes a capability which will be used to determine whether * or not a page is included in the menu. @@ -1065,48 +1112,24 @@ function add_object_page( $page_title, $menu_title, $capability, $menu_slug, $fu * The function which is hooked in to handle the output of the page must check * that the user has the required capability as well. * - * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected - * @param string $menu_title The text to be used for the menu - * @param string $capability The capability required for this menu to be displayed to the user. - * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu) - * @param callback $function The function to be called to output the content for this page. - * @param string $icon_url The url to the icon to be used for this menu - * - * @return string The resulting page's hook_suffix - */ -function add_utility_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '') { - global $_wp_last_utility_menu; - - $_wp_last_utility_menu++; - - return add_menu_page($page_title, $menu_title, $capability, $menu_slug, $function, $icon_url, $_wp_last_utility_menu); -} - -/** - * Add a sub menu page - * - * This function takes a capability which will be used to determine whether - * or not a page is included in the menu. - * - * The function which is hooked in to handle the output of the page must check - * that the user has the required capability as well. - * - * @param string $parent_slug The slug name for the parent menu (or the file name of a standard WordPress admin page) - * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected - * @param string $menu_title The text to be used for the menu - * @param string $capability The capability required for this menu to be displayed to the user. - * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu) - * @param callback $function The function to be called to output the content for this page. - * - * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required. + * @global array $submenu + * @global array $menu + * @global array $_wp_real_parent_file + * @global bool $_wp_submenu_nopriv + * @global array $_registered_pages + * @global array $_parent_pages + * + * @param string $parent_slug The slug name for the parent menu (or the file name of a standard WordPress admin page). + * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected. + * @param string $menu_title The text to be used for the menu. + * @param string $capability The capability required for this menu to be displayed to the user. + * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu). + * @param callable $function The function to be called to output the content for this page. + * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required. */ function add_submenu_page( $parent_slug, $page_title, $menu_title, $capability, $menu_slug, $function = '' ) { - global $submenu; - global $menu; - global $_wp_real_parent_file; - global $_wp_submenu_nopriv; - global $_registered_pages; - global $_parent_pages; + global $submenu, $menu, $_wp_real_parent_file, $_wp_submenu_nopriv, + $_registered_pages, $_parent_pages; $menu_slug = plugin_basename( $menu_slug ); $parent_slug = plugin_basename( $parent_slug); @@ -1119,14 +1142,16 @@ function add_submenu_page( $parent_slug, $page_title, $menu_title, $capability, return false; } - // If the parent doesn't already have a submenu, add a link to the parent - // as the first item in the submenu. If the submenu file is the same as the - // parent file someone is trying to link back to the parent manually. In - // this case, don't automatically add a link back to avoid duplication. + /* + * If the parent doesn't already have a submenu, add a link to the parent + * as the first item in the submenu. If the submenu file is the same as the + * parent file someone is trying to link back to the parent manually. In + * this case, don't automatically add a link back to avoid duplication. + */ if (!isset( $submenu[$parent_slug] ) && $menu_slug != $parent_slug ) { foreach ( (array)$menu as $parent_menu ) { if ( $parent_menu[2] == $parent_slug && current_user_can( $parent_menu[1] ) ) - $submenu[$parent_slug][] = $parent_menu; + $submenu[$parent_slug][] = array_slice( $parent_menu, 0, 4 ); } } @@ -1137,18 +1162,22 @@ function add_submenu_page( $parent_slug, $page_title, $menu_title, $capability, add_action( $hookname, $function ); $_registered_pages[$hookname] = true; - // backwards-compatibility for plugins using add_management page. See wp-admin/admin.php for redirect from edit.php to tools.php + + /* + * Backward-compatibility for plugins using add_management page. + * See wp-admin/admin.php for redirect from edit.php to tools.php + */ if ( 'tools.php' == $parent_slug ) $_registered_pages[get_plugin_page_hookname( $menu_slug, 'edit.php')] = true; - // No parent as top level + // No parent as top level. $_parent_pages[$menu_slug] = $parent_slug; return $hookname; } /** - * Add sub menu page to the tools main menu. + * Add submenu page to the Tools main menu. * * This function takes a capability which will be used to determine whether * or not a page is included in the menu. @@ -1156,20 +1185,19 @@ function add_submenu_page( $parent_slug, $page_title, $menu_title, $capability, * The function which is hooked in to handle the output of the page must check * that the user has the required capability as well. * - * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected - * @param string $menu_title The text to be used for the menu - * @param string $capability The capability required for this menu to be displayed to the user. - * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu) - * @param callback $function The function to be called to output the content for this page. - * - * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required. + * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected. + * @param string $menu_title The text to be used for the menu. + * @param string $capability The capability required for this menu to be displayed to the user. + * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu). + * @param callable $function The function to be called to output the content for this page. + * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required. */ function add_management_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) { return add_submenu_page( 'tools.php', $page_title, $menu_title, $capability, $menu_slug, $function ); } /** - * Add sub menu page to the options main menu. + * Add submenu page to the Settings main menu. * * This function takes a capability which will be used to determine whether * or not a page is included in the menu. @@ -1177,20 +1205,19 @@ function add_management_page( $page_title, $menu_title, $capability, $menu_slug, * The function which is hooked in to handle the output of the page must check * that the user has the required capability as well. * - * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected - * @param string $menu_title The text to be used for the menu - * @param string $capability The capability required for this menu to be displayed to the user. - * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu) - * @param callback $function The function to be called to output the content for this page. - * - * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required. + * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected. + * @param string $menu_title The text to be used for the menu. + * @param string $capability The capability required for this menu to be displayed to the user. + * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu). + * @param callable $function The function to be called to output the content for this page. + * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required. */ function add_options_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) { return add_submenu_page( 'options-general.php', $page_title, $menu_title, $capability, $menu_slug, $function ); } /** - * Add sub menu page to the themes main menu. + * Add submenu page to the Appearance main menu. * * This function takes a capability which will be used to determine whether * or not a page is included in the menu. @@ -1198,20 +1225,19 @@ function add_options_page( $page_title, $menu_title, $capability, $menu_slug, $f * The function which is hooked in to handle the output of the page must check * that the user has the required capability as well. * - * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected - * @param string $menu_title The text to be used for the menu - * @param string $capability The capability required for this menu to be displayed to the user. - * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu) - * @param callback $function The function to be called to output the content for this page. - * - * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required. + * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected. + * @param string $menu_title The text to be used for the menu. + * @param string $capability The capability required for this menu to be displayed to the user. + * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu). + * @param callable $function The function to be called to output the content for this page. + * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required. */ function add_theme_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) { return add_submenu_page( 'themes.php', $page_title, $menu_title, $capability, $menu_slug, $function ); } /** - * Add sub menu page to the plugins main menu. + * Add submenu page to the Plugins main menu. * * This function takes a capability which will be used to determine whether * or not a page is included in the menu. @@ -1219,20 +1245,19 @@ function add_theme_page( $page_title, $menu_title, $capability, $menu_slug, $fun * The function which is hooked in to handle the output of the page must check * that the user has the required capability as well. * - * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected - * @param string $menu_title The text to be used for the menu - * @param string $capability The capability required for this menu to be displayed to the user. - * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu) - * @param callback $function The function to be called to output the content for this page. - * - * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required. + * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected. + * @param string $menu_title The text to be used for the menu. + * @param string $capability The capability required for this menu to be displayed to the user. + * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu). + * @param callable $function The function to be called to output the content for this page. + * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required. */ function add_plugins_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) { return add_submenu_page( 'plugins.php', $page_title, $menu_title, $capability, $menu_slug, $function ); } /** - * Add sub menu page to the Users/Profile main menu. + * Add submenu page to the Users/Profile main menu. * * This function takes a capability which will be used to determine whether * or not a page is included in the menu. @@ -1240,13 +1265,12 @@ function add_plugins_page( $page_title, $menu_title, $capability, $menu_slug, $f * The function which is hooked in to handle the output of the page must check * that the user has the required capability as well. * - * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected - * @param string $menu_title The text to be used for the menu - * @param string $capability The capability required for this menu to be displayed to the user. - * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu) - * @param callback $function The function to be called to output the content for this page. - * - * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required. + * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected. + * @param string $menu_title The text to be used for the menu. + * @param string $capability The capability required for this menu to be displayed to the user. + * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu). + * @param callable $function The function to be called to output the content for this page. + * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required. */ function add_users_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) { if ( current_user_can('edit_users') ) @@ -1256,7 +1280,7 @@ function add_users_page( $page_title, $menu_title, $capability, $menu_slug, $fun return add_submenu_page( $parent, $page_title, $menu_title, $capability, $menu_slug, $function ); } /** - * Add sub menu page to the Dashboard main menu. + * Add submenu page to the Dashboard main menu. * * This function takes a capability which will be used to determine whether * or not a page is included in the menu. @@ -1264,20 +1288,19 @@ function add_users_page( $page_title, $menu_title, $capability, $menu_slug, $fun * The function which is hooked in to handle the output of the page must check * that the user has the required capability as well. * - * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected - * @param string $menu_title The text to be used for the menu - * @param string $capability The capability required for this menu to be displayed to the user. - * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu) - * @param callback $function The function to be called to output the content for this page. - * - * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required. + * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected. + * @param string $menu_title The text to be used for the menu. + * @param string $capability The capability required for this menu to be displayed to the user. + * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu). + * @param callable $function The function to be called to output the content for this page. + * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required. */ function add_dashboard_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) { return add_submenu_page( 'index.php', $page_title, $menu_title, $capability, $menu_slug, $function ); } /** - * Add sub menu page to the posts main menu. + * Add submenu page to the Posts main menu. * * This function takes a capability which will be used to determine whether * or not a page is included in the menu. @@ -1285,20 +1308,19 @@ function add_dashboard_page( $page_title, $menu_title, $capability, $menu_slug, * The function which is hooked in to handle the output of the page must check * that the user has the required capability as well. * - * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected - * @param string $menu_title The text to be used for the menu - * @param string $capability The capability required for this menu to be displayed to the user. - * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu) - * @param callback $function The function to be called to output the content for this page. - * - * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required. + * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected. + * @param string $menu_title The text to be used for the menu. + * @param string $capability The capability required for this menu to be displayed to the user. + * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu). + * @param callable $function The function to be called to output the content for this page. + * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required. */ function add_posts_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) { return add_submenu_page( 'edit.php', $page_title, $menu_title, $capability, $menu_slug, $function ); } /** - * Add sub menu page to the media main menu. + * Add submenu page to the Media main menu. * * This function takes a capability which will be used to determine whether * or not a page is included in the menu. @@ -1306,20 +1328,19 @@ function add_posts_page( $page_title, $menu_title, $capability, $menu_slug, $fun * The function which is hooked in to handle the output of the page must check * that the user has the required capability as well. * - * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected - * @param string $menu_title The text to be used for the menu - * @param string $capability The capability required for this menu to be displayed to the user. - * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu) - * @param callback $function The function to be called to output the content for this page. - * - * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required. + * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected. + * @param string $menu_title The text to be used for the menu. + * @param string $capability The capability required for this menu to be displayed to the user. + * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu). + * @param callable $function The function to be called to output the content for this page. + * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required. */ function add_media_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) { return add_submenu_page( 'upload.php', $page_title, $menu_title, $capability, $menu_slug, $function ); } /** - * Add sub menu page to the links main menu. + * Add submenu page to the Links main menu. * * This function takes a capability which will be used to determine whether * or not a page is included in the menu. @@ -1327,20 +1348,19 @@ function add_media_page( $page_title, $menu_title, $capability, $menu_slug, $fun * The function which is hooked in to handle the output of the page must check * that the user has the required capability as well. * - * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected - * @param string $menu_title The text to be used for the menu - * @param string $capability The capability required for this menu to be displayed to the user. - * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu) - * @param callback $function The function to be called to output the content for this page. - * - * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required. + * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected. + * @param string $menu_title The text to be used for the menu. + * @param string $capability The capability required for this menu to be displayed to the user. + * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu). + * @param callable $function The function to be called to output the content for this page. + * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required. */ function add_links_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) { return add_submenu_page( 'link-manager.php', $page_title, $menu_title, $capability, $menu_slug, $function ); } /** - * Add sub menu page to the pages main menu. + * Add submenu page to the Pages main menu. * * This function takes a capability which will be used to determine whether * or not a page is included in the menu. @@ -1348,20 +1368,19 @@ function add_links_page( $page_title, $menu_title, $capability, $menu_slug, $fun * The function which is hooked in to handle the output of the page must check * that the user has the required capability as well. * - * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected - * @param string $menu_title The text to be used for the menu - * @param string $capability The capability required for this menu to be displayed to the user. - * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu) - * @param callback $function The function to be called to output the content for this page. - * - * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required. -*/ + * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected. + * @param string $menu_title The text to be used for the menu. + * @param string $capability The capability required for this menu to be displayed to the user. + * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu). + * @param callable $function The function to be called to output the content for this page. + * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required. + */ function add_pages_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) { return add_submenu_page( 'edit.php?post_type=page', $page_title, $menu_title, $capability, $menu_slug, $function ); } /** - * Add sub menu page to the comments main menu. + * Add submenu page to the Comments main menu. * * This function takes a capability which will be used to determine whether * or not a page is included in the menu. @@ -1369,25 +1388,26 @@ function add_pages_page( $page_title, $menu_title, $capability, $menu_slug, $fun * The function which is hooked in to handle the output of the page must check * that the user has the required capability as well. * - * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected - * @param string $menu_title The text to be used for the menu - * @param string $capability The capability required for this menu to be displayed to the user. - * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu) - * @param callback $function The function to be called to output the content for this page. - * - * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required. -*/ + * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected. + * @param string $menu_title The text to be used for the menu. + * @param string $capability The capability required for this menu to be displayed to the user. + * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu). + * @param callable $function The function to be called to output the content for this page. + * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required. + */ function add_comments_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) { return add_submenu_page( 'edit-comments.php', $page_title, $menu_title, $capability, $menu_slug, $function ); } /** - * Remove a top level admin menu + * Remove a top-level admin menu. * * @since 3.1.0 * - * @param string $menu_slug The slug of the menu - * @return array|bool The removed menu on success, False if not found + * @global array $menu + * + * @param string $menu_slug The slug of the menu. + * @return array|bool The removed menu on success, false if not found. */ function remove_menu_page( $menu_slug ) { global $menu; @@ -1403,13 +1423,15 @@ function remove_menu_page( $menu_slug ) { } /** - * Remove an admin submenu + * Remove an admin submenu. * * @since 3.1.0 * - * @param string $menu_slug The slug for the parent menu - * @param string $submenu_slug The slug of the submenu - * @return array|bool The removed submenu on success, False if not found + * @global array $submenu + * + * @param string $menu_slug The slug for the parent menu. + * @param string $submenu_slug The slug of the submenu. + * @return array|bool The removed submenu on success, false if not found. */ function remove_submenu_page( $menu_slug, $submenu_slug ) { global $submenu; @@ -1434,6 +1456,8 @@ function remove_submenu_page( $menu_slug, $submenu_slug ) { * * @since 3.0.0 * + * @global array $_parent_pages + * * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu) * @param bool $echo Whether or not to echo the url - default is true * @return string the url @@ -1463,17 +1487,21 @@ function menu_page_url($menu_slug, $echo = true) { // // Pluggable Menu Support -- Private // - +/** + * + * @global string $parent_file + * @global array $menu + * @global array $submenu + * @global string $pagenow + * @global string $typenow + * @global string $plugin_page + * @global array $_wp_real_parent_file + * @global array $_wp_menu_nopriv + * @global array $_wp_submenu_nopriv + */ function get_admin_page_parent( $parent = '' ) { - global $parent_file; - global $menu; - global $submenu; - global $pagenow; - global $typenow; - global $plugin_page; - global $_wp_real_parent_file; - global $_wp_menu_nopriv; - global $_wp_submenu_nopriv; + global $parent_file, $menu, $submenu, $pagenow, $typenow, + $plugin_page, $_wp_real_parent_file, $_wp_menu_nopriv, $_wp_submenu_nopriv; if ( !empty ( $parent ) && 'admin.php' != $parent ) { if ( isset( $_wp_real_parent_file[$parent] ) ) @@ -1515,11 +1543,10 @@ function get_admin_page_parent( $parent = '' ) { } elseif ( $submenu_array[2] == $pagenow && empty($typenow) && ( empty($parent_file) || false === strpos($parent_file, '?') ) ) { $parent_file = $parent; return $parent; - } else - if ( isset( $plugin_page ) && ($plugin_page == $submenu_array[2] ) ) { - $parent_file = $parent; - return $parent; - } + } elseif ( isset( $plugin_page ) && ($plugin_page == $submenu_array[2] ) ) { + $parent_file = $parent; + return $parent; + } } } @@ -1528,13 +1555,17 @@ function get_admin_page_parent( $parent = '' ) { return ''; } +/** + * + * @global string $title + * @global array $menu + * @global array $submenu + * @global string $pagenow + * @global string $plugin_page + * @global string $typenow + */ function get_admin_page_title() { - global $title; - global $menu; - global $submenu; - global $pagenow; - global $plugin_page; - global $typenow; + global $title, $menu, $submenu, $pagenow, $plugin_page, $typenow; if ( ! empty ( $title ) ) return $title; @@ -1549,11 +1580,10 @@ function get_admin_page_title() { if ( $menu_array[2] == $pagenow ) { $title = $menu_array[3]; return $menu_array[3]; - } else - if ( isset( $plugin_page ) && ($plugin_page == $menu_array[2] ) && ($hook == $menu_array[3] ) ) { - $title = $menu_array[3]; - return $menu_array[3]; - } + } elseif ( isset( $plugin_page ) && ($plugin_page == $menu_array[2] ) && ($hook == $menu_array[3] ) ) { + $title = $menu_array[3]; + return $menu_array[3]; + } } else { $title = $menu_array[0]; return $title; @@ -1605,6 +1635,13 @@ function get_admin_page_title() { return $title; } +/** + * @since 2.3.0 + * + * @param string $plugin_page + * @param string $parent_page + * @return string|null + */ function get_plugin_page_hook( $plugin_page, $parent_page ) { $hook = get_plugin_page_hookname( $plugin_page, $parent_page ); if ( has_action($hook) ) @@ -1613,6 +1650,12 @@ function get_plugin_page_hook( $plugin_page, $parent_page ) { return null; } +/** + * + * @global array $admin_page_hooks + * @param string $plugin_page + * @param string $parent_page + */ function get_plugin_page_hookname( $plugin_page, $parent_page ) { global $admin_page_hooks; @@ -1620,12 +1663,12 @@ function get_plugin_page_hookname( $plugin_page, $parent_page ) { $page_type = 'admin'; if ( empty ( $parent_page ) || 'admin.php' == $parent_page || isset( $admin_page_hooks[$plugin_page] ) ) { - if ( isset( $admin_page_hooks[$plugin_page] ) ) + if ( isset( $admin_page_hooks[$plugin_page] ) ) { $page_type = 'toplevel'; - else - if ( isset( $admin_page_hooks[$parent] )) - $page_type = $admin_page_hooks[$parent]; - } else if ( isset( $admin_page_hooks[$parent] ) ) { + } elseif ( isset( $admin_page_hooks[$parent] )) { + $page_type = $admin_page_hooks[$parent]; + } + } elseif ( isset( $admin_page_hooks[$parent] ) ) { $page_type = $admin_page_hooks[$parent]; } @@ -1634,14 +1677,19 @@ function get_plugin_page_hookname( $plugin_page, $parent_page ) { return $page_type . '_page_' . $plugin_name; } +/** + * + * @global string $pagenow + * @global array $menu + * @global array $submenu + * @global array $_wp_menu_nopriv + * @global array $_wp_submenu_nopriv + * @global string $plugin_page + * @global array $_registered_pages + */ function user_can_access_admin_page() { - global $pagenow; - global $menu; - global $submenu; - global $_wp_menu_nopriv; - global $_wp_submenu_nopriv; - global $plugin_page; - global $_registered_pages; + global $pagenow, $menu, $submenu, $_wp_menu_nopriv, $_wp_submenu_nopriv, + $plugin_page, $_registered_pages; $parent = get_admin_page_parent(); @@ -1686,7 +1734,7 @@ function user_can_access_admin_page() { return true; else return false; - } else if ( $submenu_array[2] == $pagenow ) { + } elseif ( $submenu_array[2] == $pagenow ) { if ( current_user_can( $submenu_array[1] )) return true; else @@ -1714,11 +1762,12 @@ function user_can_access_admin_page() { * * @since 2.7.0 * + * @global array $new_whitelist_options + * * @param string $option_group A settings group name. Should correspond to a whitelisted option key name. * Default whitelisted option key names include "general," "discussion," and "reading," among others. * @param string $option_name The name of an option to sanitize and save. - * @param unknown_type $sanitize_callback A callback function that sanitizes the option's value. - * @return unknown + * @param callable $sanitize_callback A callback function that sanitizes the option's value. */ function register_setting( $option_group, $option_name, $sanitize_callback = '' ) { global $new_whitelist_options; @@ -1743,10 +1792,11 @@ function register_setting( $option_group, $option_name, $sanitize_callback = '' * * @since 2.7.0 * - * @param unknown_type $option_group - * @param unknown_type $option_name - * @param unknown_type $sanitize_callback - * @return unknown + * @global array $new_whitelist_options + * + * @param string $option_group + * @param string $option_name + * @param callable $sanitize_callback */ function unregister_setting( $option_group, $option_name, $sanitize_callback = '' ) { global $new_whitelist_options; @@ -1761,7 +1811,7 @@ function unregister_setting( $option_group, $option_name, $sanitize_callback = ' $option_group = 'reading'; } - $pos = array_search( $option_name, (array) $new_whitelist_options ); + $pos = array_search( $option_name, (array) $new_whitelist_options[ $option_group ] ); if ( $pos !== false ) unset( $new_whitelist_options[ $option_group ][ $pos ] ); if ( $sanitize_callback != '' ) @@ -1769,12 +1819,14 @@ function unregister_setting( $option_group, $option_name, $sanitize_callback = ' } /** - * {@internal Missing Short Description}} + * Refreshes the value of the options whitelist available via the 'whitelist_options' filter. * * @since 2.7.0 * - * @param unknown_type $options - * @return unknown + * @global array $new_whitelist_options + * + * @param array $options + * @return array */ function option_update_filter( $options ) { global $new_whitelist_options; @@ -1784,16 +1836,17 @@ function option_update_filter( $options ) { return $options; } -add_filter( 'whitelist_options', 'option_update_filter' ); /** - * {@internal Missing Short Description}} + * Adds an array of options to the options whitelist. * * @since 2.7.0 * - * @param unknown_type $new_options - * @param unknown_type $options - * @return unknown + * @global array $whitelist_options + * + * @param array $new_options + * @param string|array $options + * @return array */ function add_option_whitelist( $new_options, $options = '' ) { if ( $options == '' ) @@ -1818,13 +1871,15 @@ function add_option_whitelist( $new_options, $options = '' ) { } /** - * {@internal Missing Short Description}} + * Removes a list of options from the options whitelist. * * @since 2.7.0 * - * @param unknown_type $del_options - * @param unknown_type $options - * @return unknown + * @global array $whitelist_options + * + * @param array $del_options + * @param string|array $options + * @return array */ function remove_option_whitelist( $del_options, $options = '' ) { if ( $options == '' ) @@ -1870,3 +1925,11 @@ function wp_clean_plugins_cache( $clear_update_cache = true ) { delete_site_transient( 'update_plugins' ); wp_cache_delete( 'plugins', 'plugins' ); } + +/** + * @param string $plugin + */ +function plugin_sandbox_scrape( $plugin ) { + wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin ); + include( WP_PLUGIN_DIR . '/' . $plugin ); +} diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php index 64b63d6..8be6147 100644 --- a/wp-admin/includes/post.php +++ b/wp-admin/includes/post.php @@ -173,10 +173,13 @@ function _wp_translate_postdata( $update = false, $post_data = null ) { * * @since 1.5.0 * + * @global wpdb $wpdb WordPress database abstraction object. + * * @param array $post_data Optional. * @return int Post ID. */ function edit_post( $post_data = null ) { + global $wpdb; if ( empty($post_data) ) $post_data = &$_POST; @@ -302,7 +305,7 @@ function edit_post( $post_data = null ) { $image_alt = wp_unslash( $post_data['_wp_attachment_image_alt'] ); if ( $image_alt != get_post_meta( $post_ID, '_wp_attachment_image_alt', true ) ) { $image_alt = wp_strip_all_tags( $image_alt, true ); - // update_meta expects slashed + // update_meta expects slashed. update_post_meta( $post_ID, '_wp_attachment_image_alt', wp_slash( $image_alt ) ); } } @@ -313,18 +316,76 @@ function edit_post( $post_data = null ) { $post_data = apply_filters( 'attachment_fields_to_save', $post_data, $attachment_data ); } + // Convert taxonomy input to term IDs, to avoid ambiguity. + if ( isset( $post_data['tax_input'] ) ) { + foreach ( (array) $post_data['tax_input'] as $taxonomy => $terms ) { + // Hierarchical taxonomy data is already sent as term IDs, so no conversion is necessary. + if ( is_taxonomy_hierarchical( $taxonomy ) ) { + continue; + } + + /* + * Assume that a 'tax_input' string is a comma-separated list of term names. + * Some languages may use a character other than a comma as a delimiter, so we standardize on + * commas before parsing the list. + */ + if ( ! is_array( $terms ) ) { + $comma = _x( ',', 'tag delimiter' ); + if ( ',' !== $comma ) { + $terms = str_replace( $comma, ',', $terms ); + } + $terms = explode( ',', trim( $terms, " \n\t\r\0\x0B," ) ); + } + + $clean_terms = array(); + foreach ( $terms as $term ) { + // Empty terms are invalid input. + if ( empty( $term ) ) { + continue; + } + + $_term = get_terms( $taxonomy, array( + 'name' => $term, + 'fields' => 'ids', + 'hide_empty' => false, + ) ); + + if ( ! empty( $_term ) ) { + $clean_terms[] = intval( $_term[0] ); + } else { + // No existing term was found, so pass the string. A new term will be created. + $clean_terms[] = $term; + } + } + + $post_data['tax_input'][ $taxonomy ] = $clean_terms; + } + } + add_meta( $post_ID ); update_post_meta( $post_ID, '_edit_last', get_current_user_id() ); - wp_update_post( $post_data ); + $success = wp_update_post( $post_data ); + // If the save failed, see if we can sanity check the main fields and try again + if ( ! $success && is_callable( array( $wpdb, 'strip_invalid_text_for_column' ) ) ) { + $fields = array( 'post_title', 'post_content', 'post_excerpt' ); + + foreach ( $fields as $field ) { + if ( isset( $post_data[ $field ] ) ) { + $post_data[ $field ] = $wpdb->strip_invalid_text_for_column( $wpdb->posts, $field, $post_data[ $field ] ); + } + } + + wp_update_post( $post_data ); + } // Now that we have an ID we can fix any attachment anchor hrefs _fix_attachment_links( $post_ID ); wp_set_post_lock( $post_ID ); - if ( current_user_can( $ptype->cap->edit_others_posts ) ) { + if ( current_user_can( $ptype->cap->edit_others_posts ) && current_user_can( $ptype->cap->publish_posts ) ) { if ( ! empty( $post_data['sticky'] ) ) stick_post( $post_ID ); else @@ -342,6 +403,8 @@ function edit_post( $post_data = null ) { * * @since 2.7.0 * + * @global wpdb $wpdb WordPress database abstraction object. + * * @param array $post_data Optional, the array of post data to process if not provided will use $_POST superglobal. * @return array */ @@ -514,12 +577,11 @@ function bulk_edit_posts( $post_data = null ) { * * @since 2.0.0 * - * @param string $post_type A post type string, defaults to 'post'. + * @param string $post_type Optional. A post type string. Default 'post'. + * @param bool $create_in_db Optional. Whether to insert the post into database. Default false. * @return WP_Post Post object containing all the default post data as attributes */ function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) { - global $wpdb; - $post_title = ''; if ( !empty( $_REQUEST['post_title'] ) ) $post_title = esc_html( wp_unslash( $_REQUEST['post_title'] )); @@ -544,12 +606,13 @@ function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) $post->post_date = ''; $post->post_date_gmt = ''; $post->post_password = ''; + $post->post_name = ''; $post->post_type = $post_type; $post->post_status = 'draft'; $post->to_ping = ''; $post->pinged = ''; - $post->comment_status = get_option( 'default_comment_status' ); - $post->ping_status = get_option( 'default_ping_status' ); + $post->comment_status = get_default_comment_status( $post_type ); + $post->ping_status = get_default_comment_status( $post_type, 'pingback' ); $post->post_pingback = get_option( 'default_pingback_flag' ); $post->post_category = get_option( 'default_category' ); $post->page_template = 'default'; @@ -587,7 +650,6 @@ function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) * @param WP_Post $post Post object. */ $post->post_excerpt = apply_filters( 'default_excerpt', $post_excerpt, $post ); - $post->post_name = ''; return $post; } @@ -597,6 +659,8 @@ function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) * * @since 2.0.0 * + * @global wpdb $wpdb WordPress database abstraction object. + * * @param string $title Post title * @param string $content Optional post content * @param string $date Optional post date @@ -623,7 +687,7 @@ function post_exists($title, $content = '', $date = '') { } if ( !empty ( $content ) ) { - $query .= 'AND post_content = %s'; + $query .= ' AND post_content = %s'; $args[] = $post_content; } @@ -638,7 +702,9 @@ function post_exists($title, $content = '', $date = '') { * * @since 2.1.0 * - * @return unknown + * @global WP_User $current_user + * + * @return int|WP_Error */ function wp_write_post() { if ( isset($_POST['post_type']) ) @@ -706,11 +772,8 @@ function wp_write_post() { * Calls wp_write_post() and handles the errors. * * @since 2.0.0 - - * @uses wp_write_post() - * @uses is_wp_error() - * @uses wp_die() - * @return unknown + * + * @return int|null */ function write_post() { $result = wp_write_post(); @@ -725,15 +788,14 @@ function write_post() { // /** - * {@internal Missing Short Description}} + * Add post meta data defined in $_POST superglobal for post with given ID. * * @since 1.2.0 * - * @param unknown_type $post_ID - * @return unknown + * @param int $post_ID + * @return int|bool */ function add_meta( $post_ID ) { - global $wpdb; $post_ID = (int) $post_ID; $metakeyselect = isset($_POST['metakeyselect']) ? wp_unslash( trim( $_POST['metakeyselect'] ) ) : ''; @@ -743,9 +805,10 @@ function add_meta( $post_ID ) { $metavalue = trim( $metavalue ); if ( ('0' === $metavalue || ! empty ( $metavalue ) ) && ( ( ( '#NONE#' != $metakeyselect ) && !empty ( $metakeyselect) ) || !empty ( $metakeyinput ) ) ) { - // We have a key/value pair. If both the select and the - // input for the key have data, the input takes precedence: - + /* + * We have a key/value pair. If both the select and the input + * for the key have data, the input takes precedence. + */ if ( '#NONE#' != $metakeyselect ) $metakey = $metakeyselect; @@ -764,12 +827,12 @@ function add_meta( $post_ID ) { } // add_meta /** - * {@internal Missing Short Description}} + * Delete post meta data by meta ID. * * @since 1.2.0 * - * @param unknown_type $mid - * @return unknown + * @param int $mid + * @return bool */ function delete_meta( $mid ) { return delete_metadata_by_mid( 'post' , $mid ); @@ -780,7 +843,9 @@ function delete_meta( $mid ) { * * @since 1.2.0 * - * @return unknown + * @global wpdb $wpdb WordPress database abstraction object. + * + * @return mixed */ function get_meta_keys() { global $wpdb; @@ -795,26 +860,26 @@ function get_meta_keys() { } /** - * {@internal Missing Short Description}} + * Get post meta data by meta ID. * * @since 2.1.0 * - * @param unknown_type $mid - * @return unknown + * @param int $mid + * @return object|bool */ function get_post_meta_by_id( $mid ) { return get_metadata_by_mid( 'post', $mid ); } /** - * {@internal Missing Short Description}} - * - * Some postmeta stuff. + * Get meta data for the given post ID. * * @since 1.2.0 * - * @param unknown_type $postid - * @return unknown + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param int $postid + * @return mixed */ function has_meta( $postid ) { global $wpdb; @@ -825,14 +890,14 @@ function has_meta( $postid ) { } /** - * {@internal Missing Short Description}} + * Update post meta data by meta ID. * * @since 1.2.0 * - * @param unknown_type $meta_id - * @param unknown_type $meta_key Expect Slashed - * @param unknown_type $meta_value Expect Slashed - * @return unknown + * @param int $meta_id + * @param string $meta_key Expect Slashed + * @param string $meta_value Expect Slashed + * @return bool */ function update_meta( $meta_id, $meta_key, $meta_value ) { $meta_key = wp_unslash( $meta_key ); @@ -939,17 +1004,19 @@ function wp_edit_posts_query( $q = false ) { $perm = 'readable'; } - if ( isset($q['orderby']) ) + if ( isset( $q['orderby'] ) ) { $orderby = $q['orderby']; - elseif ( isset($q['post_status']) && in_array($q['post_status'], array('pending', 'draft')) ) + } elseif ( isset( $q['post_status'] ) && in_array( $q['post_status'], array( 'pending', 'draft' ) ) ) { $orderby = 'modified'; + } - if ( isset($q['order']) ) + if ( isset( $q['order'] ) ) { $order = $q['order']; - elseif ( isset($q['post_status']) && 'pending' == $q['post_status'] ) + } elseif ( isset( $q['post_status'] ) && 'pending' == $q['post_status'] ) { $order = 'ASC'; + } - $per_page = 'edit_' . $post_type . '_per_page'; + $per_page = "edit_{$post_type}_per_page"; $posts_per_page = (int) get_user_option( $per_page ); if ( empty( $posts_per_page ) || $posts_per_page < 1 ) $posts_per_page = 20; @@ -957,26 +1024,25 @@ function wp_edit_posts_query( $q = false ) { /** * Filter the number of items per page to show for a specific 'per_page' type. * - * The dynamic hook name, $per_page, refers to a hook name comprised of the post type, - * preceded by 'edit_', and succeeded by '_per_page', e.g. 'edit_$post_type_per_page'. + * The dynamic portion of the hook name, `$post_type`, refers to the post type. * * Some examples of filter hooks generated here include: 'edit_attachment_per_page', * 'edit_post_per_page', 'edit_page_per_page', etc. * * @since 3.0.0 * - * @param int $posts_per_page Number of posts to display per page for the given 'per_page' + * @param int $posts_per_page Number of posts to display per page for the given post * type. Default 20. */ - $posts_per_page = apply_filters( $per_page, $posts_per_page ); + $posts_per_page = apply_filters( "edit_{$post_type}_per_page", $posts_per_page ); /** * Filter the number of posts displayed per page when specifically listing "posts". * * @since 2.8.0 * - * @param int $per_page Number of posts to be displayed. Default 20. - * @param string $post_type The post type. + * @param int $posts_per_page Number of posts to be displayed. Default 20. + * @param string $post_type The post type. */ $posts_per_page = apply_filters( 'edit_posts_per_page', $posts_per_page, $post_type ); @@ -988,6 +1054,7 @@ function wp_edit_posts_query( $q = false ) { $query['order'] = 'asc'; $query['posts_per_page'] = -1; $query['posts_per_archive_page'] = -1; + $query['fields'] = 'id=>parent'; } if ( ! empty( $q['show_sticky'] ) ) @@ -999,12 +1066,14 @@ function wp_edit_posts_query( $q = false ) { } /** - * {@internal Missing Short Description}} + * Get all available post MIME types for a given post type. * * @since 2.5.0 * - * @param unknown_type $type - * @return unknown + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string $type + * @return mixed */ function get_available_post_mime_types($type = 'attachment') { global $wpdb; @@ -1014,30 +1083,34 @@ function get_available_post_mime_types($type = 'attachment') { } /** - * Executes a query for attachments. An array of WP_Query arguments - * can be passed in, which will override the arguments set by this function. + * Get the query variables for the current attachments request. * - * @since 2.5.0 + * @since 4.2.0 * - * @param array|bool $q Array of query variables to use to build the query or false to use $_GET superglobal. - * @return array + * @param array|false $q Optional. Array of query variables to use to build the query or false + * to use $_GET superglobal. Default false. + * @return array The parsed query vars. */ -function wp_edit_attachments_query( $q = false ) { - if ( false === $q ) +function wp_edit_attachments_query_vars( $q = false ) { + if ( false === $q ) { $q = $_GET; - + } $q['m'] = isset( $q['m'] ) ? (int) $q['m'] : 0; $q['cat'] = isset( $q['cat'] ) ? (int) $q['cat'] : 0; $q['post_type'] = 'attachment'; $post_type = get_post_type_object( 'attachment' ); $states = 'inherit'; - if ( current_user_can( $post_type->cap->read_private_posts ) ) + if ( current_user_can( $post_type->cap->read_private_posts ) ) { $states .= ',private'; + } $q['post_status'] = isset( $q['status'] ) && 'trash' == $q['status'] ? 'trash' : $states; + $q['post_status'] = isset( $q['attachment-filter'] ) && 'trash' == $q['attachment-filter'] ? 'trash' : $states; + $media_per_page = (int) get_user_option( 'upload_per_page' ); - if ( empty( $media_per_page ) || $media_per_page < 1 ) + if ( empty( $media_per_page ) || $media_per_page < 1 ) { $media_per_page = 20; + } /** * Filter the number of items to list per page when listing media items. @@ -1049,28 +1122,50 @@ function wp_edit_attachments_query( $q = false ) { $q['posts_per_page'] = apply_filters( 'upload_per_page', $media_per_page ); $post_mime_types = get_post_mime_types(); - $avail_post_mime_types = get_available_post_mime_types('attachment'); - - if ( isset($q['post_mime_type']) && !array_intersect( (array) $q['post_mime_type'], array_keys($post_mime_types) ) ) + if ( isset($q['post_mime_type']) && !array_intersect( (array) $q['post_mime_type'], array_keys($post_mime_types) ) ) { unset($q['post_mime_type']); + } - if ( isset($q['detached']) ) + foreach ( array_keys( $post_mime_types ) as $type ) { + if ( isset( $q['attachment-filter'] ) && "post_mime_type:$type" == $q['attachment-filter'] ) { + $q['post_mime_type'] = $type; + break; + } + } + + if ( isset( $q['detached'] ) || ( isset( $q['attachment-filter'] ) && 'detached' == $q['attachment-filter'] ) ) { $q['post_parent'] = 0; + } + + return $q; +} + +/** + * Executes a query for attachments. An array of WP_Query arguments + * can be passed in, which will override the arguments set by this function. + * + * @since 2.5.0 + * + * @param array|false $q Array of query variables to use to build the query or false to use $_GET superglobal. + * @return array + */ +function wp_edit_attachments_query( $q = false ) { + wp( wp_edit_attachments_query_vars( $q ) ); - wp( $q ); + $post_mime_types = get_post_mime_types(); + $avail_post_mime_types = get_available_post_mime_types( 'attachment' ); - return array($post_mime_types, $avail_post_mime_types); + return array( $post_mime_types, $avail_post_mime_types ); } /** * Returns the list of classes to be used by a metabox * - * @uses get_user_option() * @since 2.5.0 * - * @param unknown_type $id - * @param unknown_type $page - * @return unknown + * @param string $id + * @param string $page + * @return string */ function postbox_classes( $id, $page ) { if ( isset( $_GET['edit'] ) && $_GET['edit'] == $id ) { @@ -1088,8 +1183,8 @@ function postbox_classes( $id, $page ) { /** * Filter the postbox classes for a specific screen and screen ID combo. * - * The dynamic portions of the hook name, $page, and $id, refer to - * the screen, and screen ID, respectively. + * The dynamic portions of the hook name, `$page` and `$id`, refer to + * the screen and screen ID, respectively. * * @since 3.2.0 * @@ -1100,14 +1195,14 @@ function postbox_classes( $id, $page ) { } /** - * {@internal Missing Short Description}} + * Get a sample permalink based off of the post name. * * @since 2.5.0 * - * @param int|object $id Post ID or post object. - * @param string $title (optional) Title - * @param string $name (optional) Name - * @return array With two entries of type string + * @param int $id Post ID or post object. + * @param string $title Optional. Title. Default null. + * @param string $name Optional. Name. Default null. + * @return array Array with two entries of type string. */ function get_sample_permalink($id, $title = null, $name = null) { $post = get_post( $id ); @@ -1121,7 +1216,7 @@ function get_sample_permalink($id, $title = null, $name = null) { $original_name = $post->post_name; // Hack: get_permalink() would return ugly permalink for drafts, so we will fake that our post is published. - if ( in_array( $post->post_status, array( 'draft', 'pending' ) ) ) { + if ( in_array( $post->post_status, array( 'draft', 'pending', 'future' ) ) ) { $post->post_status = 'publish'; $post->post_name = sanitize_title($post->post_name ? $post->post_name : $post->post_title, $post->ID); } @@ -1143,25 +1238,38 @@ function get_sample_permalink($id, $title = null, $name = null) { // Handle page hierarchy if ( $ptype->hierarchical ) { $uri = get_page_uri($post); - $uri = untrailingslashit($uri); - $uri = strrev( stristr( strrev( $uri ), '/' ) ); - $uri = untrailingslashit($uri); + if ( $uri ) { + $uri = untrailingslashit($uri); + $uri = strrev( stristr( strrev( $uri ), '/' ) ); + $uri = untrailingslashit($uri); + } /** This filter is documented in wp-admin/edit-tag-form.php */ - $uri = apply_filters( 'editable_slug', $uri ); + $uri = apply_filters( 'editable_slug', $uri, $post ); if ( !empty($uri) ) $uri .= '/'; $permalink = str_replace('%pagename%', "{$uri}%pagename%", $permalink); } /** This filter is documented in wp-admin/edit-tag-form.php */ - $permalink = array( $permalink, apply_filters( 'editable_slug', $post->post_name ) ); + $permalink = array( $permalink, apply_filters( 'editable_slug', $post->post_name, $post ) ); $post->post_status = $original_status; $post->post_date = $original_date; $post->post_name = $original_name; unset($post->filter); - return $permalink; + /** + * Filter the sample permalink. + * + * @since 4.4.0 + * + * @param string $permalink Sample permalink. + * @param int $post_id Post ID. + * @param string $title Post title. + * @param string $name Post name (slug). + * @param WP_Post $post Post object. + */ + return apply_filters( 'get_sample_permalink', $permalink, $post->ID, $title, $name, $post ); } /** @@ -1169,9 +1277,9 @@ function get_sample_permalink($id, $title = null, $name = null) { * * @since 2.5.0 * - * @param int|object $id Post ID or post object. - * @param string $new_title Optional. New title. - * @param string $new_slug Optional. New slug. + * @param int $id Post ID or post object. + * @param string $new_title Optional. New title. Default null. + * @param string $new_slug Optional. New slug. Default null. * @return string The HTML of the sample permalink slug editor. */ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) { @@ -1181,68 +1289,76 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) { list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug); - if ( current_user_can( 'read_post', $post->ID ) ) { - $ptype = get_post_type_object( $post->post_type ); - $view_post = $ptype->labels->view_item; - } + $view_link = false; + $preview_target = ''; - if ( 'publish' == get_post_status( $post ) ) { - $title = __('Click to edit this part of the permalink'); - } else { - $title = __('Temporary permalink. Click to edit this part.'); + if ( current_user_can( 'read_post', $post->ID ) ) { + if ( 'draft' === $post->post_status ) { + $view_link = get_preview_post_link( $post ); + $preview_target = " target='wp-preview-{$post->ID}'"; + } else { + if ( 'publish' === $post->post_status || 'attachment' === $post->post_type ) { + $view_link = get_permalink( $post ); + } else { + // Allow non-published (private, future) to be viewed at a pretty permalink. + $view_link = str_replace( array( '%pagename%', '%postname%' ), $post->post_name, $permalink ); + } + } } - if ( false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%') ) { - $return = '' . __('Permalink:') . "\n" . '' . $permalink . "\n"; - if ( '' == get_option( 'permalink_structure' ) && current_user_can( 'manage_options' ) && !( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') ) ) - $return .= '' . __('Change Permalinks') . "\n"; - if ( isset( $view_post ) ) - $return .= "$view_post\n"; - - /** - * Filter the sample permalink HTML markup. - * - * @since 2.9.0 - * - * @param string $return Sample permalink HTML markup. - * @param int|WP_Post $id Post object or ID. - * @param string $new_title New sample permalink title. - * @param string $new_slug New sample permalink slug. - */ - $return = apply_filters( 'get_sample_permalink_html', $return, $id, $new_title, $new_slug ); - - return $return; - } + // Permalinks without a post/page name placeholder don't have anything to edit + if ( false === strpos( $permalink, '%postname%' ) && false === strpos( $permalink, '%pagename%' ) ) { + $return = '' . __( 'Permalink:' ) . "\n"; - if ( function_exists('mb_strlen') ) { - if ( mb_strlen($post_name) > 30 ) { - $post_name_abridged = mb_substr($post_name, 0, 14). '…' . mb_substr($post_name, -14); + if ( false !== $view_link ) { + $display_link = urldecode( $view_link ); + $return .= '' . $display_link . "\n"; } else { - $post_name_abridged = $post_name; + $return .= '' . $permalink . "\n"; + } + + // Encourage a pretty permalink setting + if ( '' == get_option( 'permalink_structure' ) && current_user_can( 'manage_options' ) && !( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') ) ) { + $return .= '' . __('Change Permalinks') . "\n"; } } else { - if ( strlen($post_name) > 30 ) { - $post_name_abridged = substr($post_name, 0, 14). '…' . substr($post_name, -14); + if ( function_exists( 'mb_strlen' ) ) { + if ( mb_strlen( $post_name ) > 34 ) { + $post_name_abridged = mb_substr( $post_name, 0, 16 ) . '…' . mb_substr( $post_name, -16 ); + } else { + $post_name_abridged = $post_name; + } } else { - $post_name_abridged = $post_name; + if ( strlen( $post_name ) > 34 ) { + $post_name_abridged = substr( $post_name, 0, 16 ) . '…' . substr( $post_name, -16 ); + } else { + $post_name_abridged = $post_name; + } } - } - $post_name_html = '' . $post_name_abridged . ''; - $display_link = str_replace(array('%pagename%','%postname%'), $post_name_html, $permalink); - $view_link = str_replace(array('%pagename%','%postname%'), $post_name, $permalink); - $return = '' . __('Permalink:') . "\n"; - $return .= '' . $display_link . "\n"; - $return .= '‎'; // Fix bi-directional text display defect in RTL languages. - $return .= '' . __('Edit') . "\n"; - $return .= '' . $post_name . "\n"; + $post_name_html = '' . $post_name_abridged . ''; + $display_link = str_replace( array( '%pagename%', '%postname%' ), $post_name_html, urldecode( $permalink ) ); - if ( isset( $view_post ) ) { - $return .= "$view_post\n"; + $return = '' . __( 'Permalink:' ) . "\n"; + $return .= '' . $display_link . "\n"; + $return .= '‎'; // Fix bi-directional text display defect in RTL languages. + $return .= '\n"; + $return .= '' . $post_name . "\n"; } - /** This filter is documented in wp-admin/includes/post.php */ - $return = apply_filters( 'get_sample_permalink_html', $return, $id, $new_title, $new_slug ); + /** + * Filter the sample permalink HTML markup. + * + * @since 2.9.0 + * @since 4.4.0 Added `$post` parameter. + * + * @param string $return Sample permalink HTML markup. + * @param int $post_id Post ID. + * @param string $new_title New sample permalink title. + * @param string $new_slug New sample permalink slug. + * @param WP_Post $post Post object. + */ + $return = apply_filters( 'get_sample_permalink_html', $return, $post->ID, $new_title, $new_slug, $post ); return $return; } @@ -1252,6 +1368,9 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) { * * @since 2.9.0 * + * @global int $content_width + * @global array $_wp_additional_image_sizes + * * @param int $thumbnail_id ID of the attachment used for thumbnail * @param mixed $post The post ID or object associated with the thumbnail, defaults to global $post. * @return string html @@ -1259,25 +1378,51 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) { function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) { global $content_width, $_wp_additional_image_sizes; - $post = get_post( $post ); + $post = get_post( $post ); + $post_type_object = get_post_type_object( $post->post_type ); + $set_thumbnail_link = '

'; + $upload_iframe_src = get_upload_iframe_src( 'image', $post->ID ); - $upload_iframe_src = esc_url( get_upload_iframe_src('image', $post->ID ) ); - $set_thumbnail_link = '

'; - $content = sprintf( $set_thumbnail_link, $upload_iframe_src, esc_html__( 'Set featured image' ) ); + $content = sprintf( $set_thumbnail_link, + esc_url( $upload_iframe_src ), + '', // Empty when there's no featured image set, `aria-describedby` attribute otherwise. + esc_html( $post_type_object->labels->set_featured_image ) + ); if ( $thumbnail_id && get_post( $thumbnail_id ) ) { - $old_content_width = $content_width; - $content_width = 266; - if ( !isset( $_wp_additional_image_sizes['post-thumbnail'] ) ) - $thumbnail_html = wp_get_attachment_image( $thumbnail_id, array( $content_width, $content_width ) ); - else - $thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'post-thumbnail' ); + $size = isset( $_wp_additional_image_sizes['post-thumbnail'] ) ? 'post-thumbnail' : array( 266, 266 ); + + /** + * Filter the size used to display the post thumbnail image in the 'Featured Image' meta box. + * + * Note: When a theme adds 'post-thumbnail' support, a special 'post-thumbnail' + * image size is registered, which differs from the 'thumbnail' image size + * managed via the Settings > Media screen. See the `$size` parameter description + * for more information on default values. + * + * @since 4.4.0 + * + * @param string|array $size Post thumbnail image size to display in the meta box. Accepts any valid + * image size, or an array of width and height values in pixels (in that order). + * If the 'post-thumbnail' size is set, default is 'post-thumbnail'. Otherwise, + * default is an array with 266 as both the height and width values. + * @param int $thumbnail_id Post thumbnail attachment ID. + * @param WP_Post $post The post object associated with the thumbnail. + */ + $size = apply_filters( 'admin_post_thumbnail_size', $size, $thumbnail_id, $post ); + + $thumbnail_html = wp_get_attachment_image( $thumbnail_id, $size ); + if ( !empty( $thumbnail_html ) ) { $ajax_nonce = wp_create_nonce( 'set_post_thumbnail-' . $post->ID ); - $content = sprintf( $set_thumbnail_link, $upload_iframe_src, $thumbnail_html ); - $content .= '

' . esc_html__( 'Remove featured image' ) . '

'; + $content = sprintf( $set_thumbnail_link, + esc_url( $upload_iframe_src ), + ' aria-describedby="set-post-thumbnail-desc"', + $thumbnail_html + ); + $content .= '

' . __( 'Click the image to edit or update' ) . '

'; + $content .= '

' . esc_html( $post_type_object->labels->remove_featured_image ) . '

'; } - $content_width = $old_content_width; } /** @@ -1297,7 +1442,7 @@ function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) { * @since 2.5.0 * * @param int $post_id ID of the post to check for editing - * @return bool|int False: not locked or locked by current user. Int: user ID of user with lock. + * @return integer False: not locked or locked by current user. Int: user ID of user with lock. */ function wp_check_post_lock( $post_id ) { if ( !$post = get_post( $post_id ) ) @@ -1396,20 +1541,17 @@ function _admin_notice_post_locked() { post_type )->public ) { - $preview_link = set_url_scheme( add_query_arg( 'preview', 'true', get_permalink( $post->ID ) ) ); - if ( 'publish' == $post->post_status || $user->ID != $post->post_author ) { // Latest content is in autosave $nonce = wp_create_nonce( 'post_preview_' . $post->ID ); - $preview_link = add_query_arg( array( 'preview_id' => $post->ID, 'preview_nonce' => $nonce ), $preview_link ); + $query_args['preview_id'] = $post->ID; + $query_args['preview_nonce'] = $nonce; } - } else { - $preview_link = ''; } - /** This filter is documented in wp-admin/includes/meta-boxes.php */ - $preview_link = apply_filters( 'preview_post_link', $preview_link ); + $preview_link = get_preview_post_link( $post->ID, $query_args ); /** * Filter whether to allow the post lock to be overridden. @@ -1456,7 +1598,7 @@ function _admin_notice_post_locked() { // Allow plugins to prevent some users overriding the post lock if ( $override ) { ?> - +

-
- +
+

ID; $new_autosave['post_author'] = $post_author; // If the new autosave has the same content as the post, delete the autosave. $post = get_post( $post_id ); $autosave_is_different = false; - foreach ( array_intersect( array_keys( $new_autosave ), array_keys( _wp_post_revision_fields() ) ) as $field ) { + foreach ( array_intersect( array_keys( $new_autosave ), array_keys( _wp_post_revision_fields( $post ) ) ) as $field ) { if ( normalize_whitespace( $new_autosave[ $field ] ) != normalize_whitespace( $post->$field ) ) { $autosave_is_different = true; break; @@ -1542,6 +1681,15 @@ function wp_create_post_autosave( $post_data ) { return 0; } + /** + * Fires before an autosave is stored. + * + * @since 4.1.0 + * + * @param array $new_autosave Post array - the autosave that is about to be saved. + */ + do_action( 'wp_creating_autosave', $new_autosave ); + return wp_update_post( $new_autosave ); } @@ -1558,15 +1706,6 @@ function wp_create_post_autosave( $post_data ) { * @package WordPress * @since 2.7.0 * - * @uses get_post_status() - * @uses edit_post() - * @uses get_post() - * @uses current_user_can() - * @uses wp_die() - * @uses wp_create_post_autosave() - * @uses add_query_arg() - * @uses wp_create_nonce() - * * @return str URL to redirect to show the preview */ function post_preview() { @@ -1589,7 +1728,7 @@ function post_preview() { } else { $is_autosave = true; - if ( 'auto-draft' == $_POST['post_status'] ) + if ( isset( $_POST['post_status'] ) && 'auto-draft' == $_POST['post_status'] ) $_POST['post_status'] = 'draft'; $saved_post_id = wp_create_post_autosave( $post->ID ); @@ -1598,7 +1737,7 @@ function post_preview() { if ( is_wp_error( $saved_post_id ) ) wp_die( $saved_post_id->get_error_message() ); - $query_args = array( 'preview' => 'true' ); + $query_args = array(); if ( $is_autosave && $saved_post_id ) { $query_args['preview_id'] = $post->ID; @@ -1608,10 +1747,7 @@ function post_preview() { $query_args['post_format'] = empty( $_POST['post_format'] ) ? 'standard' : sanitize_key( $_POST['post_format'] ); } - $url = add_query_arg( $query_args, get_permalink( $post->ID ) ); - - /** This filter is documented in wp-admin/includes/meta-boxes.php */ - return apply_filters( 'preview_post_link', $url ); + return get_preview_post_link( $post, $query_args ); } /** @@ -1619,11 +1755,11 @@ function post_preview() { * * Intended for use with heartbeat and autosave.js * - * @since 3.9 + * @since 3.9.0 * - * @param $post_data Associative array of the submitted post data. + * @param array $post_data Associative array of the submitted post data. * @return mixed The value 0 or WP_Error on failure. The saved post ID on success. - * Te ID can be the draft post_id or the autosave revision post_id. + * The ID can be the draft post_id or the autosave revision post_id. */ function wp_autosave( $post_data ) { // Back-compat @@ -1657,3 +1793,52 @@ function wp_autosave( $post_data ) { return wp_create_post_autosave( wp_slash( $post_data ) ); } } + +/** + * Redirect to previous page. + * + * @param int $post_id Optional. Post ID. + */ +function redirect_post($post_id = '') { + if ( isset($_POST['save']) || isset($_POST['publish']) ) { + $status = get_post_status( $post_id ); + + if ( isset( $_POST['publish'] ) ) { + switch ( $status ) { + case 'pending': + $message = 8; + break; + case 'future': + $message = 9; + break; + default: + $message = 6; + } + } else { + $message = 'draft' == $status ? 10 : 1; + } + + $location = add_query_arg( 'message', $message, get_edit_post_link( $post_id, 'url' ) ); + } elseif ( isset($_POST['addmeta']) && $_POST['addmeta'] ) { + $location = add_query_arg( 'message', 2, wp_get_referer() ); + $location = explode('#', $location); + $location = $location[0] . '#postcustom'; + } elseif ( isset($_POST['deletemeta']) && $_POST['deletemeta'] ) { + $location = add_query_arg( 'message', 3, wp_get_referer() ); + $location = explode('#', $location); + $location = $location[0] . '#postcustom'; + } else { + $location = add_query_arg( 'message', 4, get_edit_post_link( $post_id, 'url' ) ); + } + + /** + * Filter the post redirect destination URL. + * + * @since 2.9.0 + * + * @param string $location The destination URL. + * @param int $post_id The post ID. + */ + wp_redirect( apply_filters( 'redirect_post_location', $location, $post_id ) ); + exit; +} diff --git a/wp-admin/includes/revision.php b/wp-admin/includes/revision.php index 737c3b1..3f038f1 100644 --- a/wp-admin/includes/revision.php +++ b/wp-admin/includes/revision.php @@ -4,6 +4,7 @@ * * @package WordPress * @subpackage Administration + * @since 3.6.0 */ /** @@ -54,11 +55,11 @@ function wp_get_revision_ui_diff( $post, $compare_from, $compare_to ) { $return = array(); - foreach ( _wp_post_revision_fields() as $field => $name ) { + foreach ( _wp_post_revision_fields( $post ) as $field => $name ) { /** * Contextually filter a post revision field. * - * The dynamic portion of the hook name, $field, corresponds to each of the post + * The dynamic portion of the hook name, `$field`, corresponds to each of the post * fields of the revision object being iterated over in a foreach statement. * * @since 3.6.0 @@ -66,14 +67,38 @@ function wp_get_revision_ui_diff( $post, $compare_from, $compare_to ) { * @param string $compare_from->$field The current revision field to compare to or from. * @param string $field The current revision field. * @param WP_Post $compare_from The revision post object to compare to or from. - * @param string null The context of whether the current revision is the old or the new one. Values are 'to' or 'from'. + * @param string null The context of whether the current revision is the old + * or the new one. Values are 'to' or 'from'. */ $content_from = $compare_from ? apply_filters( "_wp_post_revision_field_$field", $compare_from->$field, $field, $compare_from, 'from' ) : ''; /** This filter is documented in wp-admin/includes/revision.php */ $content_to = apply_filters( "_wp_post_revision_field_$field", $compare_to->$field, $field, $compare_to, 'to' ); - $diff = wp_text_diff( $content_from, $content_to, array( 'show_split_view' => true ) ); + $args = array( + 'show_split_view' => true + ); + + /** + * Filter revisions text diff options. + * + * Filter the options passed to {@see wp_text_diff()} when viewing a post revision. + * + * @since 4.1.0 + * + * @param array $args { + * Associative array of options to pass to {@see wp_text_diff()}. + * + * @type bool $show_split_view True for split view (two columns), false for + * un-split view (single column). Default true. + * } + * @param string $field The current revision field. + * @param WP_Post $compare_from The revision post to compare from. + * @param WP_Post $compare_to The revision post to compare to. + */ + $args = apply_filters( 'revision_text_diff_options', $args, $field, $compare_from, $compare_to ); + + $diff = wp_text_diff( $content_from, $content_to, $args ); if ( ! $diff && 'post_title' === $field ) { // It's a better user experience to still show the Title, even if it didn't change. @@ -92,7 +117,18 @@ function wp_get_revision_ui_diff( $post, $compare_from, $compare_to ) { ); } } - return $return; + + /** + * Filter the fields displayed in the post revision diff UI. + * + * @since 4.1.0 + * + * @param array $return Revision UI fields. Each item is an array of id, name and diff. + * @param WP_Post $compare_from The revision post to compare from. + * @param WP_Post $compare_to The revision post to compare to. + */ + return apply_filters( 'wp_get_revision_ui_diff', $return, $compare_from, $compare_to ); + } /** @@ -108,7 +144,7 @@ function wp_get_revision_ui_diff( $post, $compare_from, $compare_to ) { */ function wp_prepare_revisions_for_js( $post, $selected_revision_id, $from = null ) { $post = get_post( $post ); - $revisions = $authors = array(); + $authors = array(); $now_gmt = time(); $revisions = wp_get_post_revisions( $post->ID, array( 'order' => 'ASC', 'check_enabled' => false ) ); @@ -126,6 +162,7 @@ function wp_prepare_revisions_for_js( $post, $selected_revision_id, $from = null cache_users( wp_list_pluck( $revisions, 'post_author' ) ); $can_restore = current_user_can( 'edit_post', $post->ID ); + $current_id = false; foreach ( $revisions as $revision ) { $modified = strtotime( $revision->post_modified ); @@ -163,21 +200,67 @@ function wp_prepare_revisions_for_js( $post, $selected_revision_id, $from = null $current_id = $revision->ID; } - $revisions[ $revision->ID ] = array( + $revisions_data = array( 'id' => $revision->ID, 'title' => get_the_title( $post->ID ), 'author' => $authors[ $revision->post_author ], - 'date' => date_i18n( __( 'M j, Y @ G:i' ), $modified ), - 'dateShort' => date_i18n( _x( 'j M @ G:i', 'revision date short format' ), $modified ), + 'date' => date_i18n( __( 'M j, Y @ H:i' ), $modified ), + 'dateShort' => date_i18n( _x( 'j M @ H:i', 'revision date short format' ), $modified ), 'timeAgo' => sprintf( __( '%s ago' ), human_time_diff( $modified_gmt, $now_gmt ) ), 'autosave' => $autosave, 'current' => $current, 'restoreUrl' => $can_restore ? $restore_link : false, ); + + /** + * Filter the array of revisions used on the revisions screen. + * + * @since 4.4.0 + * + * @param array $revisions_data { + * The bootstrapped data for the revisions screen. + * + * @type int $id Revision ID. + * @type string $title Title for the revision's parent WP_Post object. + * @type int $author Revision post author ID. + * @type string $date Date the revision was modified. + * @type string $dateShort Short-form version of the date the revision was modified. + * @type string $timeAgo GMT-aware amount of time ago the revision was modified. + * @type bool $autosave Whether the revision is an autosave. + * @type bool $current Whether the revision is both not an autosave and the post + * modified date matches the revision modified date (GMT-aware). + * @type bool|false $restoreUrl URL if the revision can be restored, false otherwise. + * } + * @param WP_Post $revision The revision's WP_Post object. + * @param WP_Post $post The revision's parent WP_Post object. + */ + $revisions[ $revision->ID ] = apply_filters( 'wp_prepare_revision_for_js', $revisions_data, $revision, $post ); + } + + /** + * If we only have one revision, the initial revision is missing; This happens + * when we have an autsosave and the user has clicked 'View the Autosave' + */ + if ( 1 === sizeof( $revisions ) ) { + $revisions[ $post->ID ] = array( + 'id' => $post->ID, + 'title' => get_the_title( $post->ID ), + 'author' => $authors[ $post->post_author ], + 'date' => date_i18n( __( 'M j, Y @ H:i' ), strtotime( $post->post_modified ) ), + 'dateShort' => date_i18n( _x( 'j M @ H:i', 'revision date short format' ), strtotime( $post->post_modified ) ), + 'timeAgo' => sprintf( __( '%s ago' ), human_time_diff( strtotime( $post->post_modified_gmt ), $now_gmt ) ), + 'autosave' => false, + 'current' => true, + 'restoreUrl' => false, + ); + $current_id = $post->ID; } - // If a post has been saved since the last revision (no revisioned fields were changed) - // we may not have a "current" revision. Mark the latest revision as "current". + /* + * If a post has been saved since the last revision (no revisioned fields + * were changed), we may not have a "current" revision. Mark the latest + * revision as "current". + */ if ( empty( $current_id ) ) { if ( $revisions[ $revision->ID ]['autosave'] ) { $revision = end( $revisions ); @@ -191,7 +274,7 @@ function wp_prepare_revisions_for_js( $post, $selected_revision_id, $from = null $revisions[ $current_id ]['current'] = true; } - // Now, grab the initial diff + // Now, grab the initial diff. $compare_two_mode = is_numeric( $from ); if ( ! $compare_two_mode ) { $found = array_search( $selected_revision_id, array_keys( $revisions ) ); @@ -222,3 +305,99 @@ function wp_prepare_revisions_for_js( $post, $selected_revision_id, $from = null 'revisionIds' => array_keys( $revisions ), ); } + +/** + * Print JavaScript templates required for the revisions experience. + * + * @since 4.1.0 + * + * @global WP_Post $post The global `$post` object. + */ +function wp_print_revision_templates() { + global $post; + ?> + + + + + + + + get_charset_collate(); @@ -24,8 +27,10 @@ $charset_collate = $wpdb->get_charset_collate(); * * @since 3.3.0 * + * @global wpdb $wpdb WordPress database abstraction object. + * * @param string $scope Optional. The tables for which to retrieve SQL. Can be all, global, ms_global, or blog tables. Defaults to all. - * @param int $blog_id Optional. The blog ID for which to retrieve SQL. Default is the current blog ID. + * @param int $blog_id Optional. The site ID for which to retrieve SQL. Default is the current site ID. * @return string The SQL needed to create the requested tables. */ function wp_get_db_schema( $scope = 'all', $blog_id = null ) { @@ -44,15 +49,31 @@ function wp_get_db_schema( $scope = 'all', $blog_id = null ) { // Engage multisite if in the middle of turning it on from network.php. $is_multisite = is_multisite() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK ); + /* + * Indexes have a maximum size of 767 bytes. Historically, we haven't need to be concerned about that. + * As of 4.2, however, we moved to utf8mb4, which uses 4 bytes per character. This means that an index which + * used to have room for floor(767/3) = 255 characters, now only has room for floor(767/4) = 191 characters. + */ + $max_index_length = 191; + // Blog specific tables. - $blog_tables = "CREATE TABLE $wpdb->terms ( + $blog_tables = "CREATE TABLE $wpdb->termmeta ( + meta_id bigint(20) unsigned NOT NULL auto_increment, + term_id bigint(20) unsigned NOT NULL default '0', + meta_key varchar(255) default NULL, + meta_value longtext, + PRIMARY KEY (meta_id), + KEY term_id (term_id), + KEY meta_key (meta_key($max_index_length)) +) $charset_collate; +CREATE TABLE $wpdb->terms ( term_id bigint(20) unsigned NOT NULL auto_increment, name varchar(200) NOT NULL default '', slug varchar(200) NOT NULL default '', term_group bigint(10) NOT NULL default 0, PRIMARY KEY (term_id), - UNIQUE KEY slug (slug), - KEY name (name) + KEY slug (slug($max_index_length)), + KEY name (name($max_index_length)) ) $charset_collate; CREATE TABLE $wpdb->term_taxonomy ( term_taxonomy_id bigint(20) unsigned NOT NULL auto_increment, @@ -79,7 +100,7 @@ CREATE TABLE $wpdb->commentmeta ( meta_value longtext, PRIMARY KEY (meta_id), KEY comment_id (comment_id), - KEY meta_key (meta_key) + KEY meta_key (meta_key($max_index_length)) ) $charset_collate; CREATE TABLE $wpdb->comments ( comment_ID bigint(20) unsigned NOT NULL auto_increment, @@ -101,7 +122,8 @@ CREATE TABLE $wpdb->comments ( KEY comment_post_ID (comment_post_ID), KEY comment_approved_date_gmt (comment_approved,comment_date_gmt), KEY comment_date_gmt (comment_date_gmt), - KEY comment_parent (comment_parent) + KEY comment_parent (comment_parent), + KEY comment_author_email (comment_author_email(10)) ) $charset_collate; CREATE TABLE $wpdb->links ( link_id bigint(20) unsigned NOT NULL auto_increment, @@ -122,7 +144,7 @@ CREATE TABLE $wpdb->links ( ) $charset_collate; CREATE TABLE $wpdb->options ( option_id bigint(20) unsigned NOT NULL auto_increment, - option_name varchar(64) NOT NULL default '', + option_name varchar(191) NOT NULL default '', option_value longtext NOT NULL, autoload varchar(20) NOT NULL default 'yes', PRIMARY KEY (option_id), @@ -135,7 +157,7 @@ CREATE TABLE $wpdb->postmeta ( meta_value longtext, PRIMARY KEY (meta_id), KEY post_id (post_id), - KEY meta_key (meta_key) + KEY meta_key (meta_key($max_index_length)) ) $charset_collate; CREATE TABLE $wpdb->posts ( ID bigint(20) unsigned NOT NULL auto_increment, @@ -162,7 +184,7 @@ CREATE TABLE $wpdb->posts ( post_mime_type varchar(100) NOT NULL default '', comment_count bigint(20) NOT NULL default '0', PRIMARY KEY (ID), - KEY post_name (post_name), + KEY post_name (post_name($max_index_length)), KEY type_status_date (post_type,post_status,post_date,ID), KEY post_parent (post_parent), KEY post_author (post_author) @@ -172,39 +194,41 @@ CREATE TABLE $wpdb->posts ( $users_single_table = "CREATE TABLE $wpdb->users ( ID bigint(20) unsigned NOT NULL auto_increment, user_login varchar(60) NOT NULL default '', - user_pass varchar(64) NOT NULL default '', + user_pass varchar(255) NOT NULL default '', user_nicename varchar(50) NOT NULL default '', user_email varchar(100) NOT NULL default '', user_url varchar(100) NOT NULL default '', user_registered datetime NOT NULL default '0000-00-00 00:00:00', - user_activation_key varchar(60) NOT NULL default '', + user_activation_key varchar(255) NOT NULL default '', user_status int(11) NOT NULL default '0', display_name varchar(250) NOT NULL default '', PRIMARY KEY (ID), KEY user_login_key (user_login), - KEY user_nicename (user_nicename) + KEY user_nicename (user_nicename), + KEY user_email (user_email) ) $charset_collate;\n"; // Multisite users table $users_multi_table = "CREATE TABLE $wpdb->users ( ID bigint(20) unsigned NOT NULL auto_increment, user_login varchar(60) NOT NULL default '', - user_pass varchar(64) NOT NULL default '', + user_pass varchar(255) NOT NULL default '', user_nicename varchar(50) NOT NULL default '', user_email varchar(100) NOT NULL default '', user_url varchar(100) NOT NULL default '', user_registered datetime NOT NULL default '0000-00-00 00:00:00', - user_activation_key varchar(60) NOT NULL default '', + user_activation_key varchar(255) NOT NULL default '', user_status int(11) NOT NULL default '0', display_name varchar(250) NOT NULL default '', spam tinyint(2) NOT NULL default '0', deleted tinyint(2) NOT NULL default '0', PRIMARY KEY (ID), KEY user_login_key (user_login), - KEY user_nicename (user_nicename) + KEY user_nicename (user_nicename), + KEY user_email (user_email) ) $charset_collate;\n"; - // usermeta + // Usermeta. $usermeta_table = "CREATE TABLE $wpdb->usermeta ( umeta_id bigint(20) unsigned NOT NULL auto_increment, user_id bigint(20) unsigned NOT NULL default '0', @@ -212,7 +236,7 @@ CREATE TABLE $wpdb->posts ( meta_value longtext, PRIMARY KEY (umeta_id), KEY user_id (user_id), - KEY meta_key (meta_key) + KEY meta_key (meta_key($max_index_length)) ) $charset_collate;\n"; // Global tables @@ -260,7 +284,7 @@ CREATE TABLE $wpdb->site ( domain varchar(200) NOT NULL default '', path varchar(100) NOT NULL default '', PRIMARY KEY (id), - KEY domain (domain,path) + KEY domain (domain(140),path(51)) ) $charset_collate; CREATE TABLE $wpdb->sitemeta ( meta_id bigint(20) NOT NULL auto_increment, @@ -268,7 +292,7 @@ CREATE TABLE $wpdb->sitemeta ( meta_key varchar(255) default NULL, meta_value longtext, PRIMARY KEY (meta_id), - KEY meta_key (meta_key), + KEY meta_key (meta_key($max_index_length)), KEY site_id (site_id) ) $charset_collate; CREATE TABLE $wpdb->signups ( @@ -287,7 +311,7 @@ CREATE TABLE $wpdb->signups ( KEY activation_key (activation_key), KEY user_email (user_email), KEY user_login_email (user_login,user_email), - KEY domain_path (domain,path) + KEY domain_path (domain(140),path(51)) ) $charset_collate;"; switch ( $scope ) { @@ -302,8 +326,8 @@ CREATE TABLE $wpdb->signups ( case 'ms_global' : $queries = $ms_global_tables; break; - default: case 'all' : + default: $queries = $global_tables . $blog_tables; if ( $is_multisite ) $queries .= $ms_global_tables; @@ -323,8 +347,10 @@ $wp_queries = wp_get_db_schema( 'all' ); * Create WordPress options and set the default values. * * @since 1.5.0 - * @uses $wpdb - * @uses $wp_db_version + * + * @global wpdb $wpdb WordPress database abstraction object. + * @global int $wp_db_version + * @global int $wp_current_db_version */ function populate_options() { global $wpdb, $wp_db_version, $wp_current_db_version; @@ -344,11 +370,18 @@ function populate_options() { $uploads_use_yearmonth_folders = 1; } - $template = WP_DEFAULT_THEME; - // If default theme is a child theme, we need to get its template - $theme = wp_get_theme( $template ); - if ( ! $theme->errors() ) - $template = $theme->get_template(); + // If WP_DEFAULT_THEME doesn't exist, fall back to the latest core default theme. + $stylesheet = $template = WP_DEFAULT_THEME; + $theme = wp_get_theme( WP_DEFAULT_THEME ); + if ( ! $theme->exists() ) { + $theme = WP_Theme::get_core_default_theme(); + } + + // If we can't find a core default theme, WP_DEFAULT_THEME is the best we can do. + if ( $theme ) { + $stylesheet = $theme->get_stylesheet(); + $template = $theme->get_template(); + } $timezone_string = ''; $gmt_offset = 0; @@ -364,8 +397,9 @@ function populate_options() { $options = array( 'siteurl' => $guessurl, + 'home' => $guessurl, 'blogname' => __('My Site'), - /* translators: blog tagline */ + /* translators: site tagline */ 'blogdescription' => __('Just another WordPress site'), 'users_can_register' => 0, 'admin_email' => 'you@example.com', @@ -395,15 +429,13 @@ function populate_options() { 'comment_moderation' => 0, 'moderation_notify' => 1, 'permalink_structure' => '', - 'gzipcompression' => 0, + 'rewrite_rules' => '', 'hack_file' => 0, 'blog_charset' => 'UTF-8', 'moderation_keys' => '', 'active_plugins' => array(), - 'home' => $guessurl, 'category_base' => '', 'ping_sites' => 'http://rpc.pingomatic.com/', - 'advanced_edit' => 0, 'comment_max_links' => 2, 'gmt_offset' => $gmt_offset, @@ -411,7 +443,7 @@ function populate_options() { 'default_email_category' => 1, 'recently_edited' => '', 'template' => $template, - 'stylesheet' => WP_DEFAULT_THEME, + 'stylesheet' => $stylesheet, 'comment_whitelist' => 1, 'blacklist_keys' => '', 'comment_registration' => 0, @@ -452,7 +484,7 @@ function populate_options() { // 2.7 'large_size_w' => 1024, 'large_size_h' => 1024, - 'image_default_link_type' => 'file', + 'image_default_link_type' => 'none', 'image_default_size' => '', 'image_default_align' => '', 'close_comments_for_old_posts' => 0, @@ -481,6 +513,14 @@ function populate_options() { // 3.5 'link_manager_enabled' => 0, + + // 4.3.0 + 'finished_splitting_shared_terms' => 1, + 'site_icon' => 0, + + // 4.4.0 + 'medium_large_size_w' => 768, + 'medium_large_size_h' => 0, ); // 3.3 @@ -491,7 +531,7 @@ function populate_options() { // 3.0 multisite if ( is_multisite() ) { - /* translators: blog tagline */ + /* translators: site tagline */ $options[ 'blogdescription' ] = sprintf(__('Just another %s site'), get_current_site()->site_name ); $options[ 'permalink_structure' ] = '/%year%/%monthnum%/%day%/%postname%/'; } @@ -521,10 +561,10 @@ function populate_options() { if ( !empty($insert) ) $wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES " . $insert); - // in case it is set, but blank, update "home" + // In case it is set, but blank, update "home". if ( !__get_option('home') ) update_option('home', $guessurl); - // Delete unused options + // Delete unused options. $unusedoptions = array( 'blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', @@ -541,31 +581,35 @@ function populate_options() { 'can_compress_scripts', 'page_uris', 'update_core', 'update_plugins', 'update_themes', 'doing_cron', 'random_seed', 'rss_excerpt_length', 'secret', 'use_linksupdate', 'default_comment_status_page', 'wporg_popular_tags', 'what_to_show', 'rss_language', 'language', 'enable_xmlrpc', 'enable_app', - 'embed_autourls', 'default_post_edit_rows', + 'embed_autourls', 'default_post_edit_rows', 'gzipcompression', 'advanced_edit' ); foreach ( $unusedoptions as $option ) delete_option($option); - // delete obsolete magpie stuff + // Delete obsolete magpie stuff. $wpdb->query("DELETE FROM $wpdb->options WHERE option_name REGEXP '^rss_[0-9a-f]{32}(_ts)?$'"); - // Deletes all expired transients. - // The multi-table delete syntax is used to delete the transient record from table a, - // and the corresponding transient_timeout record from table b. + /* + * Deletes all expired transients. The multi-table delete syntax is used + * to delete the transient record from table a, and the corresponding + * transient_timeout record from table b. + */ $time = time(); - $wpdb->query("DELETE a, b FROM $wpdb->options a, $wpdb->options b WHERE - a.option_name LIKE '\_transient\_%' AND - a.option_name NOT LIKE '\_transient\_timeout\_%' AND - b.option_name = CONCAT( '_transient_timeout_', SUBSTRING( a.option_name, 12 ) ) - AND b.option_value < $time"); + $sql = "DELETE a, b FROM $wpdb->options a, $wpdb->options b + WHERE a.option_name LIKE %s + AND a.option_name NOT LIKE %s + AND b.option_name = CONCAT( '_transient_timeout_', SUBSTRING( a.option_name, 12 ) ) + AND b.option_value < %d"; + $wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_transient_' ) . '%', $wpdb->esc_like( '_transient_timeout_' ) . '%', $time ) ); if ( is_main_site() && is_main_network() ) { - $wpdb->query("DELETE a, b FROM $wpdb->options a, $wpdb->options b WHERE - a.option_name LIKE '\_site\_transient\_%' AND - a.option_name NOT LIKE '\_site\_transient\_timeout\_%' AND - b.option_name = CONCAT( '_site_transient_timeout_', SUBSTRING( a.option_name, 17 ) ) - AND b.option_value < $time"); - } + $sql = "DELETE a, b FROM $wpdb->options a, $wpdb->options b + WHERE a.option_name LIKE %s + AND a.option_name NOT LIKE %s + AND b.option_name = CONCAT( '_site_transient_timeout_', SUBSTRING( a.option_name, 17 ) ) + AND b.option_value < %d"; + $wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_site_transient_' ) . '%', $wpdb->esc_like( '_site_transient_timeout_' ) . '%', $time ) ); + } } /** @@ -815,11 +859,6 @@ function populate_roles_300() { $role->add_cap( 'update_core' ); $role->add_cap( 'list_users' ); $role->add_cap( 'remove_users' ); - - // Never used, will be removed. create_users or - // promote_users is the capability you're looking for. - $role->add_cap( 'add_users' ); - $role->add_cap( 'promote_users' ); $role->add_cap( 'edit_theme_options' ); $role->add_cap( 'delete_themes' ); @@ -847,7 +886,18 @@ endif; * * @since 3.0.0 * - * @param int $network_id ID of network to populate. + * @global wpdb $wpdb + * @global object $current_site + * @global int $wp_db_version + * @global WP_Rewrite $wp_rewrite + * + * @param int $network_id ID of network to populate. + * @param string $domain The domain name for the network (eg. "example.com"). + * @param string $email Email address for the network administrator. + * @param string $site_name The name of the network. + * @param string $path Optional. The path to append to the network's domain name. Default '/'. + * @param bool $subdomain_install Optional. Whether the network is a subdomain install or a subdirectory install. + * Default false, meaning the network is a subdirectory install. * @return bool|WP_Error True on success, or WP_Error on warning (with the install otherwise successful, * so the error code must be checked) or failure. */ @@ -860,25 +910,41 @@ function populate_network( $network_id = 1, $domain = '', $email = '', $site_nam if ( '' == $site_name ) $errors->add( 'empty_sitename', __( 'You must provide a name for your network of sites.' ) ); - // check for network collision + // Check for network collision. if ( $network_id == $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE id = %d", $network_id ) ) ) $errors->add( 'siteid_exists', __( 'The network already exists.' ) ); - $site_user = get_user_by( 'email', $email ); if ( ! is_email( $email ) ) - $errors->add( 'invalid_email', __( 'You must provide a valid e-mail address.' ) ); + $errors->add( 'invalid_email', __( 'You must provide a valid email address.' ) ); if ( $errors->get_error_code() ) return $errors; - // set up site tables + // If a user with the provided email does not exist, default to the current user as the new network admin. + $site_user = get_user_by( 'email', $email ); + if ( false === $site_user ) { + $site_user = wp_get_current_user(); + } + + // Set up site tables. $template = get_option( 'template' ); $stylesheet = get_option( 'stylesheet' ); $allowed_themes = array( $stylesheet => true ); - if ( $template != $stylesheet ) + + if ( $template != $stylesheet ) { $allowed_themes[ $template ] = true; - if ( WP_DEFAULT_THEME != $stylesheet && WP_DEFAULT_THEME != $template ) + } + + if ( WP_DEFAULT_THEME != $stylesheet && WP_DEFAULT_THEME != $template ) { $allowed_themes[ WP_DEFAULT_THEME ] = true; + } + + // If WP_DEFAULT_THEME doesn't exist, also whitelist the latest core default theme. + if ( ! wp_get_theme( WP_DEFAULT_THEME )->exists() ) { + if ( $core_default = WP_Theme::get_core_default_theme() ) { + $allowed_themes[ $core_default->get_stylesheet() ] = true; + } + } if ( 1 == $network_id ) { $wpdb->insert( $wpdb->site, array( 'domain' => $domain, 'path' => $path ) ); @@ -902,12 +968,14 @@ function populate_network( $network_id = 1, $domain = '', $email = '', $site_nam $site_admins = get_site_option( 'site_admins' ); } - $welcome_email = __( 'Dear User, + /* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */ + $welcome_email = __( 'Howdy USERNAME, Your new SITE_NAME site has been successfully set up at: BLOG_URL You can log in to the administrator account with the following information: + Username: USERNAME Password: PASSWORD Log in here: BLOG_URLwp-login.php @@ -916,12 +984,26 @@ We hope you enjoy your new site. Thanks! --The Team @ SITE_NAME' ); + $misc_exts = array( + // Images. + 'jpg', 'jpeg', 'png', 'gif', + // Video. + 'mov', 'avi', 'mpg', '3gp', '3g2', + // "audio". + 'midi', 'mid', + // Miscellaneous. + 'pdf', 'doc', 'ppt', 'odt', 'pptx', 'docx', 'pps', 'ppsx', 'xls', 'xlsx', 'key', + ); + $audio_exts = wp_get_audio_extensions(); + $video_exts = wp_get_video_extensions(); + $upload_filetypes = array_unique( array_merge( $misc_exts, $audio_exts, $video_exts ) ); + $sitemeta = array( 'site_name' => $site_name, - 'admin_email' => $site_user->user_email, + 'admin_email' => $email, 'admin_user_id' => $site_user->ID, 'registration' => 'none', - 'upload_filetypes' => 'jpg jpeg png gif mp3 mov avi wmv midi mid pdf', + 'upload_filetypes' => implode( ' ', $upload_filetypes ), 'blog_upload_space' => 100, 'fileupload_maxk' => 1500, 'site_admins' => $site_admins, @@ -929,7 +1011,8 @@ We hope you enjoy your new site. Thanks! 'illegal_names' => array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', 'files' ), 'wpmu_upgrade_site' => $wp_db_version, 'welcome_email' => $welcome_email, - 'first_post' => __( 'Welcome to SITE_NAME. This is your first post. Edit or delete it, then start blogging!' ), + /* translators: %s: site link */ + 'first_post' => __( 'Welcome to %s. This is your first post. Edit or delete it, then start blogging!' ), // @todo - network admins should have a method of editing the network siteurl (used for cookie hash) 'siteurl' => get_option( 'siteurl' ) . '/', 'add_new_users' => '0', @@ -964,9 +1047,13 @@ We hope you enjoy your new site. Thanks! } $wpdb->query( "INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES " . $insert ); - // When upgrading from single to multisite, assume the current site will become the main site of the network. - // When using populate_network() to create another network in an existing multisite environment, - // skip these steps since the main site of the new network has not yet been created. + /* + * When upgrading from single to multisite, assume the current site will + * become the main site of the network. When using populate_network() + * to create another network in an existing multisite environment, skip + * these steps since the main site of the new network has not yet been + * created. + */ if ( ! is_multisite() ) { $current_site = new stdClass; $current_site->domain = $domain; @@ -998,12 +1085,26 @@ We hope you enjoy your new site. Thanks! if ( ! $vhost_ok ) { $msg = '

' . __( 'Warning! Wildcard DNS may not be configured correctly!' ) . '

'; - $msg .= '

' . sprintf( __( 'The installer attempted to contact a random hostname (%1$s) on your domain.' ), $hostname ); - if ( ! empty ( $errstr ) ) + + $msg .= '

' . sprintf( + /* translators: %s: host name */ + __( 'The installer attempted to contact a random hostname (%s) on your domain.' ), + '' . $hostname . '' + ); + if ( ! empty ( $errstr ) ) { + /* translators: %s: error message */ $msg .= ' ' . sprintf( __( 'This resulted in an error message: %s' ), '' . $errstr . '' ); + } $msg .= '

'; - $msg .= '

' . __( 'To use a subdomain configuration, you must have a wildcard entry in your DNS. This usually means adding a * hostname record pointing at your web server in your DNS configuration tool.' ) . '

'; + + $msg .= '

' . sprintf( + /* translators: %s: asterisk symbol (*) */ + __( 'To use a subdomain configuration, you must have a wildcard entry in your DNS. This usually means adding a %s hostname record pointing at your web server in your DNS configuration tool.' ), + '*' + ) . '

'; + $msg .= '

' . __( 'You can still use your site but any subdomain you create may not be accessible. If you know your DNS is correct, ignore this message.' ) . '

'; + return new WP_Error( 'no_wildcard_dns', $msg ); } } diff --git a/wp-admin/includes/screen.php b/wp-admin/includes/screen.php index 7d4ec88..a72a807 100644 --- a/wp-admin/includes/screen.php +++ b/wp-admin/includes/screen.php @@ -11,6 +11,8 @@ * * @since 2.7.0 * + * @staticvar array $column_headers + * * @param string|WP_Screen $screen The screen you want the headers for * @return array Containing the headers in the format id => UI String */ @@ -25,7 +27,7 @@ function get_column_headers( $screen ) { /** * Filter the column headers for a list table on a specific screen. * - * The dynamic portion of the hook name, $screen->id, refers to the + * The dynamic portion of the hook name, `$screen->id`, refers to the * ID of a specific screen. For example, the screen ID for the Posts * list table is edit-post, so the filter for that screen would be * manage_edit-post_columns. @@ -34,7 +36,7 @@ function get_column_headers( $screen ) { * * @param array $columns An array of column headers. Default empty. */ - $column_headers[ $screen->id ] = apply_filters( 'manage_' . $screen->id . '_columns', array() ); + $column_headers[ $screen->id ] = apply_filters( "manage_{$screen->id}_columns", array() ); } return $column_headers[ $screen->id ]; @@ -49,10 +51,39 @@ function get_column_headers( $screen ) { * @return array */ function get_hidden_columns( $screen ) { - if ( is_string( $screen ) ) + if ( is_string( $screen ) ) { $screen = convert_to_screen( $screen ); + } + + $hidden = get_user_option( 'manage' . $screen->id . 'columnshidden' ); + + $use_defaults = ! is_array( $hidden ); + + if ( $use_defaults ) { + $hidden = array(); + + /** + * Filter the default list of hidden columns. + * + * @since 4.4.0 + * + * @param array $hidden An array of columns hidden by default. + * @param WP_Screen $screen WP_Screen object of the current screen. + */ + $hidden = apply_filters( 'default_hidden_columns', $hidden, $screen ); + } - return (array) get_user_option( 'manage' . $screen->id . 'columnshidden' ); + /** + * Filter the list of hidden columns. + * + * @since 4.4.0 + * @since 4.4.1 Added the `use_defaults` parameter. + * + * @param array $hidden An array of hidden columns. + * @param WP_Screen $screen WP_Screen object of the current screen. + * @param bool $use_defaults Whether to show the default columns. + */ + return apply_filters( 'hidden_columns', $hidden, $screen, $use_defaults ); } /** @@ -60,7 +91,9 @@ function get_hidden_columns( $screen ) { * * @since 2.7.0 * - * @param string|WP_Screen $screen + * @global array $wp_meta_boxes + * + * @param WP_Screen $screen */ function meta_box_prefs( $screen ) { global $wp_meta_boxes; @@ -73,9 +106,12 @@ function meta_box_prefs( $screen ) { $hidden = get_hidden_meta_boxes($screen); - foreach ( array_keys($wp_meta_boxes[$screen->id]) as $context ) { - foreach ( array_keys($wp_meta_boxes[$screen->id][$context]) as $priority ) { - foreach ( $wp_meta_boxes[$screen->id][$context][$priority] as $box ) { + foreach ( array_keys( $wp_meta_boxes[ $screen->id ] ) as $context ) { + foreach ( array( 'high', 'core', 'default', 'low' ) as $priority ) { + if ( ! isset( $wp_meta_boxes[ $screen->id ][ $context ][ $priority ] ) ) { + continue; + } + foreach ( $wp_meta_boxes[ $screen->id ][ $context ][ $priority ] as $box ) { if ( false == $box || ! $box['title'] ) continue; // Submit box cannot be hidden @@ -162,6 +198,8 @@ function add_screen_option( $option, $args = array() ) { * * @since 3.1.0 * + * @global WP_Screen $current_screen + * * @return WP_Screen Current screen object */ function get_current_screen() { @@ -177,998 +215,10 @@ function get_current_screen() { * Set the current screen object * * @since 3.0.0 - * @uses $current_screen * * @param mixed $hook_name Optional. The hook name (also known as the hook suffix) used to determine the screen, - * or an existing screen object. + * or an existing screen object. */ function set_current_screen( $hook_name = '' ) { WP_Screen::get( $hook_name )->set_current_screen(); } - -/** - * A class representing the admin screen. - * - * @since 3.3.0 - * @access public - */ -final class WP_Screen { - /** - * Any action associated with the screen. 'add' for *-add.php and *-new.php screens. Empty otherwise. - * - * @since 3.3.0 - * @var string - * @access public - */ - public $action; - - /** - * The base type of the screen. This is typically the same as $id but with any post types and taxonomies stripped. - * For example, for an $id of 'edit-post' the base is 'edit'. - * - * @since 3.3.0 - * @var string - * @access public - */ - public $base; - - /** - * The number of columns to display. Access with get_columns(). - * - * @since 3.4.0 - * @var int - * @access private - */ - private $columns = 0; - - /** - * The unique ID of the screen. - * - * @since 3.3.0 - * @var string - * @access public - */ - public $id; - - /** - * Which admin the screen is in. network | user | site | false - * - * @since 3.5.0 - * @var string - * @access protected - */ - protected $in_admin; - - /** - * Whether the screen is in the network admin. - * - * Deprecated. Use in_admin() instead. - * - * @since 3.3.0 - * @deprecated 3.5.0 - * @var bool - * @access public - */ - public $is_network; - - /** - * Whether the screen is in the user admin. - * - * Deprecated. Use in_admin() instead. - * - * @since 3.3.0 - * @deprecated 3.5.0 - * @var bool - * @access public - */ - public $is_user; - - /** - * The base menu parent. - * This is derived from $parent_file by removing the query string and any .php extension. - * $parent_file values of 'edit.php?post_type=page' and 'edit.php?post_type=post' have a $parent_base of 'edit'. - * - * @since 3.3.0 - * @var string - * @access public - */ - public $parent_base; - - /** - * The parent_file for the screen per the admin menu system. - * Some $parent_file values are 'edit.php?post_type=page', 'edit.php', and 'options-general.php'. - * - * @since 3.3.0 - * @var string - * @access public - */ - public $parent_file; - - /** - * The post type associated with the screen, if any. - * The 'edit.php?post_type=page' screen has a post type of 'page'. - * The 'edit-tags.php?taxonomy=$taxonomy&post_type=page' screen has a post type of 'page'. - * - * @since 3.3.0 - * @var string - * @access public - */ - public $post_type; - - /** - * The taxonomy associated with the screen, if any. - * The 'edit-tags.php?taxonomy=category' screen has a taxonomy of 'category'. - * @since 3.3.0 - * @var string - * @access public - */ - public $taxonomy; - - /** - * The help tab data associated with the screen, if any. - * - * @since 3.3.0 - * @var array - * @access private - */ - private $_help_tabs = array(); - - /** - * The help sidebar data associated with screen, if any. - * - * @since 3.3.0 - * @var string - * @access private - */ - private $_help_sidebar = ''; - - /** - * Stores old string-based help. - */ - private static $_old_compat_help = array(); - - /** - * The screen options associated with screen, if any. - * - * @since 3.3.0 - * @var array - * @access private - */ - private $_options = array(); - - /** - * The screen object registry. - * - * @since 3.3.0 - * @var array - * @access private - */ - private static $_registry = array(); - - /** - * Stores the result of the public show_screen_options function. - * - * @since 3.3.0 - * @var bool - * @access private - */ - private $_show_screen_options; - - /** - * Stores the 'screen_settings' section of screen options. - * - * @since 3.3.0 - * @var string - * @access private - */ - private $_screen_settings; - - /** - * Fetches a screen object. - * - * @since 3.3.0 - * @access public - * - * @param string $hook_name Optional. The hook name (also known as the hook suffix) used to determine the screen. - * Defaults to the current $hook_suffix global. - * @return WP_Screen Screen object. - */ - public static function get( $hook_name = '' ) { - - if ( is_a( $hook_name, 'WP_Screen' ) ) - return $hook_name; - - $post_type = $taxonomy = null; - $in_admin = false; - $action = ''; - - if ( $hook_name ) - $id = $hook_name; - else - $id = $GLOBALS['hook_suffix']; - - // For those pesky meta boxes. - if ( $hook_name && post_type_exists( $hook_name ) ) { - $post_type = $id; - $id = 'post'; // changes later. ends up being $base. - } else { - if ( '.php' == substr( $id, -4 ) ) - $id = substr( $id, 0, -4 ); - - if ( 'post-new' == $id || 'link-add' == $id || 'media-new' == $id || 'user-new' == $id ) { - $id = substr( $id, 0, -4 ); - $action = 'add'; - } - } - - if ( ! $post_type && $hook_name ) { - if ( '-network' == substr( $id, -8 ) ) { - $id = substr( $id, 0, -8 ); - $in_admin = 'network'; - } elseif ( '-user' == substr( $id, -5 ) ) { - $id = substr( $id, 0, -5 ); - $in_admin = 'user'; - } - - $id = sanitize_key( $id ); - if ( 'edit-comments' != $id && 'edit-tags' != $id && 'edit-' == substr( $id, 0, 5 ) ) { - $maybe = substr( $id, 5 ); - if ( taxonomy_exists( $maybe ) ) { - $id = 'edit-tags'; - $taxonomy = $maybe; - } elseif ( post_type_exists( $maybe ) ) { - $id = 'edit'; - $post_type = $maybe; - } - } - - if ( ! $in_admin ) - $in_admin = 'site'; - } else { - if ( defined( 'WP_NETWORK_ADMIN' ) && WP_NETWORK_ADMIN ) - $in_admin = 'network'; - elseif ( defined( 'WP_USER_ADMIN' ) && WP_USER_ADMIN ) - $in_admin = 'user'; - else - $in_admin = 'site'; - } - - if ( 'index' == $id ) - $id = 'dashboard'; - elseif ( 'front' == $id ) - $in_admin = false; - - $base = $id; - - // If this is the current screen, see if we can be more accurate for post types and taxonomies. - if ( ! $hook_name ) { - if ( isset( $_REQUEST['post_type'] ) ) - $post_type = post_type_exists( $_REQUEST['post_type'] ) ? $_REQUEST['post_type'] : false; - if ( isset( $_REQUEST['taxonomy'] ) ) - $taxonomy = taxonomy_exists( $_REQUEST['taxonomy'] ) ? $_REQUEST['taxonomy'] : false; - - switch ( $base ) { - case 'post' : - if ( isset( $_GET['post'] ) ) - $post_id = (int) $_GET['post']; - elseif ( isset( $_POST['post_ID'] ) ) - $post_id = (int) $_POST['post_ID']; - else - $post_id = 0; - - if ( $post_id ) { - $post = get_post( $post_id ); - if ( $post ) - $post_type = $post->post_type; - } - break; - case 'edit-tags' : - if ( null === $post_type && is_object_in_taxonomy( 'post', $taxonomy ? $taxonomy : 'post_tag' ) ) - $post_type = 'post'; - break; - } - } - - switch ( $base ) { - case 'post' : - if ( null === $post_type ) - $post_type = 'post'; - $id = $post_type; - break; - case 'edit' : - if ( null === $post_type ) - $post_type = 'post'; - $id .= '-' . $post_type; - break; - case 'edit-tags' : - if ( null === $taxonomy ) - $taxonomy = 'post_tag'; - // The edit-tags ID does not contain the post type. Look for it in the request. - if ( null === $post_type ) { - $post_type = 'post'; - if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) ) - $post_type = $_REQUEST['post_type']; - } - - $id = 'edit-' . $taxonomy; - break; - } - - if ( 'network' == $in_admin ) { - $id .= '-network'; - $base .= '-network'; - } elseif ( 'user' == $in_admin ) { - $id .= '-user'; - $base .= '-user'; - } - - if ( isset( self::$_registry[ $id ] ) ) { - $screen = self::$_registry[ $id ]; - if ( $screen === get_current_screen() ) - return $screen; - } else { - $screen = new WP_Screen(); - $screen->id = $id; - } - - $screen->base = $base; - $screen->action = $action; - $screen->post_type = (string) $post_type; - $screen->taxonomy = (string) $taxonomy; - $screen->is_user = ( 'user' == $in_admin ); - $screen->is_network = ( 'network' == $in_admin ); - $screen->in_admin = $in_admin; - - self::$_registry[ $id ] = $screen; - - return $screen; - } - - /** - * Makes the screen object the current screen. - * - * @see set_current_screen() - * @since 3.3.0 - */ - function set_current_screen() { - global $current_screen, $taxnow, $typenow; - $current_screen = $this; - $taxnow = $this->taxonomy; - $typenow = $this->post_type; - - /** - * Fires after the current screen has been set. - * - * @since 3.0.0 - * - * @param WP_Screen $current_screen Current WP_Screen object. - */ - do_action( 'current_screen', $current_screen ); - } - - /** - * Constructor - * - * @since 3.3.0 - * @access private - */ - private function __construct() {} - - /** - * Indicates whether the screen is in a particular admin - * - * @since 3.5.0 - * - * @param string $admin The admin to check against (network | user | site). - * If empty any of the three admins will result in true. - * @return boolean True if the screen is in the indicated admin, false otherwise. - * - */ - public function in_admin( $admin = null ) { - if ( empty( $admin ) ) - return (bool) $this->in_admin; - - return ( $admin == $this->in_admin ); - } - - /** - * Sets the old string-based contextual help for the screen. - * - * For backwards compatibility. - * - * @since 3.3.0 - * - * @param WP_Screen $screen A screen object. - * @param string $help Help text. - */ - static function add_old_compat_help( $screen, $help ) { - self::$_old_compat_help[ $screen->id ] = $help; - } - - /** - * Set the parent information for the screen. - * This is called in admin-header.php after the menu parent for the screen has been determined. - * - * @since 3.3.0 - * - * @param string $parent_file The parent file of the screen. Typically the $parent_file global. - */ - function set_parentage( $parent_file ) { - $this->parent_file = $parent_file; - list( $this->parent_base ) = explode( '?', $parent_file ); - $this->parent_base = str_replace( '.php', '', $this->parent_base ); - } - - /** - * Adds an option for the screen. - * Call this in template files after admin.php is loaded and before admin-header.php is loaded to add screen options. - * - * @since 3.3.0 - * - * @param string $option Option ID - * @param mixed $args Option-dependent arguments. - */ - public function add_option( $option, $args = array() ) { - $this->_options[ $option ] = $args; - } - - /** - * Remove an option from the screen. - * - * @since 3.8.0 - * - * @param string $option Option ID. - */ - public function remove_option( $option ) { - unset( $this->_options[ $option ] ); - } - - /** - * Remove all options from the screen. - * - * @since 3.8.0 - */ - public function remove_options() { - $this->_options = array(); - } - - /** - * Get the options registered for the screen. - * - * @since 3.8.0 - * - * @return array Options with arguments. - */ - public function get_options() { - return $this->_options; - } - - /** - * Gets the arguments for an option for the screen. - * - * @since 3.3.0 - * - * @param string $option Option ID. - * @param mixed $key Optional. Specific array key for when the option is an array. - */ - public function get_option( $option, $key = false ) { - if ( ! isset( $this->_options[ $option ] ) ) - return null; - if ( $key ) { - if ( isset( $this->_options[ $option ][ $key ] ) ) - return $this->_options[ $option ][ $key ]; - return null; - } - return $this->_options[ $option ]; - } - - /** - * Gets the help tabs registered for the screen. - * - * @since 3.4.0 - * - * @return array Help tabs with arguments. - */ - public function get_help_tabs() { - return $this->_help_tabs; - } - - /** - * Gets the arguments for a help tab. - * - * @since 3.4.0 - * - * @param string $id Help Tab ID. - * @return array Help tab arguments. - */ - public function get_help_tab( $id ) { - if ( ! isset( $this->_help_tabs[ $id ] ) ) - return null; - return $this->_help_tabs[ $id ]; - } - - /** - * Add a help tab to the contextual help for the screen. - * Call this on the load-$pagenow hook for the relevant screen. - * - * @since 3.3.0 - * - * @param array $args - * - string - title - Title for the tab. - * - string - id - Tab ID. Must be HTML-safe. - * - string - content - Help tab content in plain text or HTML. Optional. - * - callback - callback - A callback to generate the tab content. Optional. - * - */ - public function add_help_tab( $args ) { - $defaults = array( - 'title' => false, - 'id' => false, - 'content' => '', - 'callback' => false, - ); - $args = wp_parse_args( $args, $defaults ); - - $args['id'] = sanitize_html_class( $args['id'] ); - - // Ensure we have an ID and title. - if ( ! $args['id'] || ! $args['title'] ) - return; - - // Allows for overriding an existing tab with that ID. - $this->_help_tabs[ $args['id'] ] = $args; - } - - /** - * Removes a help tab from the contextual help for the screen. - * - * @since 3.3.0 - * - * @param string $id The help tab ID. - */ - public function remove_help_tab( $id ) { - unset( $this->_help_tabs[ $id ] ); - } - - /** - * Removes all help tabs from the contextual help for the screen. - * - * @since 3.3.0 - */ - public function remove_help_tabs() { - $this->_help_tabs = array(); - } - - /** - * Gets the content from a contextual help sidebar. - * - * @since 3.4.0 - * - * @return string Contents of the help sidebar. - */ - public function get_help_sidebar() { - return $this->_help_sidebar; - } - - /** - * Add a sidebar to the contextual help for the screen. - * Call this in template files after admin.php is loaded and before admin-header.php is loaded to add a sidebar to the contextual help. - * - * @since 3.3.0 - * - * @param string $content Sidebar content in plain text or HTML. - */ - public function set_help_sidebar( $content ) { - $this->_help_sidebar = $content; - } - - /** - * Gets the number of layout columns the user has selected. - * - * The layout_columns option controls the max number and default number of - * columns. This method returns the number of columns within that range selected - * by the user via Screen Options. If no selection has been made, the default - * provisioned in layout_columns is returned. If the screen does not support - * selecting the number of layout columns, 0 is returned. - * - * @since 3.4.0 - * - * @return int Number of columns to display. - */ - public function get_columns() { - return $this->columns; - } - - /** - * Render the screen's help section. - * - * This will trigger the deprecated filters for backwards compatibility. - * - * @since 3.3.0 - */ - public function render_screen_meta() { - - /** - * Filter the legacy contextual help list. - * - * @since 2.7.0 - * @deprecated 3.3.0 Use get_current_screen()->add_help_tab() or - * get_current_screen()->remove_help_tab() instead. - * - * @param array $old_compat_help Old contextual help. - * @param WP_Screen $this Current WP_Screen instance. - */ - self::$_old_compat_help = apply_filters( 'contextual_help_list', self::$_old_compat_help, $this ); - - $old_help = isset( self::$_old_compat_help[ $this->id ] ) ? self::$_old_compat_help[ $this->id ] : ''; - - /** - * Filter the legacy contextual help text. - * - * @since 2.7.0 - * @deprecated 3.3.0 Use get_current_screen()->add_help_tab() or - * get_current_screen()->remove_help_tab() instead. - * - * @param string $old_help Help text that appears on the screen. - * @param string $screen_id Screen ID. - * @param WP_Screen $this Current WP_Screen instance. - * - */ - $old_help = apply_filters( 'contextual_help', $old_help, $this->id, $this ); - - // Default help only if there is no old-style block of text and no new-style help tabs. - if ( empty( $old_help ) && ! $this->get_help_tabs() ) { - - /** - * Filter the default legacy contextual help text. - * - * @since 2.8.0 - * @deprecated 3.3.0 Use get_current_screen()->add_help_tab() or - * get_current_screen()->remove_help_tab() instead. - * - * @param string $old_help_default Default contextual help text. - */ - $default_help = apply_filters( 'default_contextual_help', '' ); - if ( $default_help ) - $old_help = '

' . $default_help . '

'; - } - - if ( $old_help ) { - $this->add_help_tab( array( - 'id' => 'old-contextual-help', - 'title' => __('Overview'), - 'content' => $old_help, - ) ); - } - - $help_sidebar = $this->get_help_sidebar(); - - $help_class = 'hidden'; - if ( ! $help_sidebar ) - $help_class .= ' no-sidebar'; - - // Time to render! - ?> -

- -

> - " aria-controls=""> - - -

- - -

- -

- - -

- get_help_tabs() as $tab ): - $panel_id = "tab-panel-{$tab['id']}"; - ?> - -

- -

- id, $this ); - - if ( ! empty( $columns ) && isset( $columns[ $this->id ] ) ) - $this->add_option( 'layout_columns', array('max' => $columns[ $this->id ] ) ); - - if ( $this->get_option( 'layout_columns' ) ) { - $this->columns = (int) get_user_option("screen_layout_$this->id"); - - if ( ! $this->columns && $this->get_option( 'layout_columns', 'default' ) ) - $this->columns = $this->get_option( 'layout_columns', 'default' ); - } - $GLOBALS[ 'screen_layout_columns' ] = $this->columns; // Set the global for back-compat. - - // Add screen options - if ( $this->show_screen_options() ) - $this->render_screen_options(); - ?> -

- get_help_tabs() && ! $this->show_screen_options() ) - return; - ?> -

- get_help_tabs() ) : ?> -

- -

- show_screen_options() ) : ?> -

- -

- _show_screen_options ) ) - return $this->_show_screen_options; - - $columns = get_column_headers( $this ); - - $show_screen = ! empty( $wp_meta_boxes[ $this->id ] ) || $columns || $this->get_option( 'per_page' ); - - switch ( $this->id ) { - case 'widgets': - $this->_screen_settings = '

' . __('Enable accessibility mode') . '' . __('Disable accessibility mode') . "

\n"; - break; - default: - $this->_screen_settings = ''; - break; - } - - /** - * Filter the screen settings text displayed in the Screen Options tab. - * - * This filter is currently only used on the Widgets screen to enable - * accessibility mode. - * - * @since 3.0.0 - * - * @param string $screen_settings Screen settings. - * @param WP_Screen $this WP_Screen object. - */ - $this->_screen_settings = apply_filters( 'screen_settings', $this->_screen_settings, $this ); - - if ( $this->_screen_settings || $this->_options ) - $show_screen = true; - - /** - * Filter whether to show the Screen Options tab. - * - * @since 3.2.0 - * - * @param bool $show_screen Whether to show Screen Options tab. - * Default true. - * @param WP_Screen $this Current WP_Screen instance. - */ - $this->_show_screen_options = apply_filters( 'screen_options_show_screen', $show_screen, $this ); - return $this->_show_screen_options; - } - - /** - * Render the screen options tab. - * - * @since 3.3.0 - */ - public function render_screen_options() { - global $wp_meta_boxes, $wp_list_table; - - $columns = get_column_headers( $this ); - $hidden = get_hidden_columns( $this ); - $post = get_post(); - - ?> - - get_option('layout_columns') ) - return; - - $screen_layout_columns = $this->get_columns(); - $num = $this->get_option( 'layout_columns', 'max' ); - - ?> -

- - /> - - - -

- get_option( 'per_page' ) ) - return; - - $per_page_label = $this->get_option( 'per_page', 'label' ); - - $option = $this->get_option( 'per_page', 'option' ); - if ( ! $option ) - $option = str_replace( '-', '_', "{$this->id}_per_page" ); - - $per_page = (int) get_user_option( $option ); - if ( empty( $per_page ) || $per_page < 1 ) { - $per_page = $this->get_option( 'per_page', 'default' ); - if ( ! $per_page ) - $per_page = 20; - } - - if ( 'edit_comments_per_page' == $option ) { - $comment_status = isset( $_REQUEST['comment_status'] ) ? $_REQUEST['comment_status'] : 'all'; - - /** This filter is documented in wp-admin/includes/class-wp-comments-list-table.php */ - $per_page = apply_filters( 'comments_per_page', $per_page, $comment_status ); - } elseif ( 'categories_per_page' == $option ) { - /** This filter is documented in wp-admin/includes/class-wp-terms-list-table.php */ - $per_page = apply_filters( 'edit_categories_per_page', $per_page ); - } else { - /** This filter is documented in wp-admin/includes/class-wp-list-table.php */ - $per_page = apply_filters( $option, $per_page ); - } - - // Back compat - if ( isset( $this->post_type ) ) { - /** This filter is documented in wp-admin/includes/class-wp-posts-list-table.php */ - $per_page = apply_filters( 'edit_posts_per_page', $per_page, $this->post_type ); - } - - ?> -

- - - - - - - -

- 0, 'taxonomy' => 'category', 'cat_name' => '', 'category_description' => '', 'category_nicename' => '', 'category_parent' => ''); - $catarr = wp_parse_args($catarr, $cat_defaults); - extract($catarr, EXTR_SKIP); +function wp_insert_category( $catarr, $wp_error = false ) { + $cat_defaults = array( 'cat_ID' => 0, 'taxonomy' => 'category', 'cat_name' => '', 'category_description' => '', 'category_nicename' => '', 'category_parent' => '' ); + $catarr = wp_parse_args( $catarr, $cat_defaults ); - if ( trim( $cat_name ) == '' ) { - if ( ! $wp_error ) + if ( trim( $catarr['cat_name'] ) == '' ) { + if ( ! $wp_error ) { return 0; - else - return new WP_Error( 'cat_name', __('You did not enter a category name.') ); + } else { + return new WP_Error( 'cat_name', __( 'You did not enter a category name.' ) ); + } } - $cat_ID = (int) $cat_ID; + $catarr['cat_ID'] = (int) $catarr['cat_ID']; // Are we updating or creating? - if ( !empty ($cat_ID) ) - $update = true; - else - $update = false; - - $name = $cat_name; - $description = $category_description; - $slug = $category_nicename; - $parent = $category_parent; - - $parent = (int) $parent; - if ( $parent < 0 ) + $update = ! empty ( $catarr['cat_ID'] ); + + $name = $catarr['cat_name']; + $description = $catarr['category_description']; + $slug = $catarr['category_nicename']; + $parent = (int) $catarr['category_parent']; + if ( $parent < 0 ) { $parent = 0; + } - if ( empty( $parent ) || ! term_exists( $parent, $taxonomy ) || ( $cat_ID && term_is_ancestor_of( $cat_ID, $parent, $taxonomy ) ) ) + if ( empty( $parent ) + || ! term_exists( $parent, $catarr['taxonomy'] ) + || ( $catarr['cat_ID'] && term_is_ancestor_of( $catarr['cat_ID'], $parent, $catarr['taxonomy'] ) ) ) { $parent = 0; + } $args = compact('name', 'slug', 'parent', 'description'); - if ( $update ) - $cat_ID = wp_update_term($cat_ID, $taxonomy, $args); - else - $cat_ID = wp_insert_term($cat_name, $taxonomy, $args); + if ( $update ) { + $catarr['cat_ID'] = wp_update_term( $catarr['cat_ID'], $catarr['taxonomy'], $args ); + } else { + $catarr['cat_ID'] = wp_insert_term( $catarr['cat_name'], $catarr['taxonomy'], $args ); + } - if ( is_wp_error($cat_ID) ) { - if ( $wp_error ) - return $cat_ID; - else + if ( is_wp_error( $catarr['cat_ID'] ) ) { + if ( $wp_error ) { + return $catarr['cat_ID']; + } else { return 0; + } } - - return $cat_ID['term_id']; + return $catarr['cat_ID']['term_id']; } /** @@ -173,66 +189,74 @@ function wp_update_category($catarr) { // /** - * {@internal Missing Short Description}} + * Check whether a post tag with a given name exists. * * @since 2.3.0 * - * @param unknown_type $tag_name - * @return unknown + * @param int|string $tag_name + * @return mixed */ function tag_exists($tag_name) { return term_exists($tag_name, 'post_tag'); } /** - * {@internal Missing Short Description}} + * Add a new tag to the database if it does not already exist. * * @since 2.3.0 * - * @param unknown_type $tag_name - * @return unknown + * @param int|string $tag_name + * @return array|WP_Error */ function wp_create_tag($tag_name) { return wp_create_term( $tag_name, 'post_tag'); } /** - * {@internal Missing Short Description}} + * Get comma-separated list of tags available to edit. * * @since 2.3.0 * - * @param unknown_type $post_id - * @return unknown + * @param int $post_id + * @param string $taxonomy Optional. The taxonomy for which to retrieve terms. Default 'post_tag'. + * @return string|bool|WP_Error */ function get_tags_to_edit( $post_id, $taxonomy = 'post_tag' ) { return get_terms_to_edit( $post_id, $taxonomy); } /** - * {@internal Missing Short Description}} + * Get comma-separated list of terms available to edit for the given post ID. * * @since 2.8.0 * - * @param unknown_type $post_id - * @return unknown + * @param int $post_id + * @param string $taxonomy Optional. The taxonomy for which to retrieve terms. Default 'post_tag'. + * @return string|bool|WP_Error */ function get_terms_to_edit( $post_id, $taxonomy = 'post_tag' ) { $post_id = (int) $post_id; if ( !$post_id ) return false; - $tags = wp_get_post_terms($post_id, $taxonomy, array()); + $terms = get_object_term_cache( $post_id, $taxonomy ); + if ( false === $terms ) { + $terms = wp_get_object_terms( $post_id, $taxonomy ); + wp_cache_add( $post_id, $terms, $taxonomy . '_relationships' ); + } - if ( !$tags ) + if ( ! $terms ) { return false; + } + if ( is_wp_error( $terms ) ) { + return $terms; + } + $term_names = array(); + foreach ( $terms as $term ) { + $term_names[] = $term->name; + } - if ( is_wp_error($tags) ) - return $tags; - - foreach ( $tags as $tag ) - $tag_names[] = $tag->name; - $tags_to_edit = join( ',', $tag_names ); - $tags_to_edit = esc_attr( $tags_to_edit ); + $terms_to_edit = esc_attr( join( ',', $term_names ) ); /** * Filter the comma-separated list of terms available to edit. @@ -241,21 +265,22 @@ function get_terms_to_edit( $post_id, $taxonomy = 'post_tag' ) { * * @see get_terms_to_edit() * - * @param array $tags_to_edit An array of terms. + * @param array $terms_to_edit An array of terms. * @param string $taxonomy The taxonomy for which to retrieve terms. Default 'post_tag'. */ - $tags_to_edit = apply_filters( 'terms_to_edit', $tags_to_edit, $taxonomy ); + $terms_to_edit = apply_filters( 'terms_to_edit', $terms_to_edit, $taxonomy ); - return $tags_to_edit; + return $terms_to_edit; } /** - * {@internal Missing Short Description}} + * Add a new term to the database if it does not already exist. * * @since 2.8.0 * - * @param unknown_type $tag_name - * @return unknown + * @param int|string $tag_name + * @param string $taxonomy Optional. The taxonomy for which to retrieve terms. Default 'post_tag'. + * @return array|WP_Error */ function wp_create_term($tag_name, $taxonomy = 'post_tag') { if ( $id = term_exists($tag_name, $taxonomy) ) diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index fb58144..5138fd2 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -8,113 +8,34 @@ * @subpackage Administration */ +/** Walker_Category_Checklist class */ +require_once( ABSPATH . 'wp-admin/includes/class-walker-category-checklist.php' ); + +/** WP_Internal_Pointers class */ +require_once( ABSPATH . 'wp-admin/includes/class-wp-internal-pointers.php' ); + // // Category Checklists // /** - * Walker to output an unordered list of category checkbox elements. + * Output an unordered list of checkbox input elements labeled with category names. * - * @see Walker - * @see wp_category_checklist() - * @see wp_terms_checklist() * @since 2.5.1 - */ -class Walker_Category_Checklist extends Walker { - var $tree_type = 'category'; - var $db_fields = array ('parent' => 'parent', 'id' => 'term_id'); //TODO: decouple this - - /** - * Starts the list before the elements are added. - * - * @see Walker:start_lvl() - * - * @since 2.5.1 - * - * @param string $output Passed by reference. Used to append additional content. - * @param int $depth Depth of category. Used for tab indentation. - * @param array $args An array of arguments. @see wp_terms_checklist() - */ - function start_lvl( &$output, $depth = 0, $args = array() ) { - $indent = str_repeat("\t", $depth); - $output .= "$indent

\n"; - } - - /** - * Ends the list of after the elements are added. - * - * @see Walker::end_lvl() - * - * @since 2.5.1 - * - * @param string $output Passed by reference. Used to append additional content. - * @param int $depth Depth of category. Used for tab indentation. - * @param array $args An array of arguments. @see wp_terms_checklist() - */ - function end_lvl( &$output, $depth = 0, $args = array() ) { - $indent = str_repeat("\t", $depth); - $output .= "$indent\n"; - } - - /** - * Start the element output. - * - * @see Walker::start_el() - * - * @since 2.5.1 - * - * @param string $output Passed by reference. Used to append additional content. - * @param object $category The current term object. - * @param int $depth Depth of the term in reference to parents. Default 0. - * @param array $args An array of arguments. @see wp_terms_checklist() - * @param int $id ID of the current term. - */ - function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) { - extract($args); - if ( empty($taxonomy) ) - $taxonomy = 'category'; - - if ( $taxonomy == 'category' ) - $name = 'post_category'; - else - $name = 'tax_input['.$taxonomy.']'; - - $class = in_array( $category->term_id, $popular_cats ) ? ' class="popular-category"' : ''; - - /** This filter is documented in wp-includes/category-template.php */ - $output .= "\n

" . 'term_id, $selected_cats ), true, false ) . disabled( empty( $args['disabled'] ), false, false ) . ' /> ' . esc_html( apply_filters( 'the_category', $category->name ) ) . ''; - } - - /** - * Ends the element output, if needed. - * - * @see Walker::end_el() - * - * @since 2.5.1 - * - * @param string $output Passed by reference. Used to append additional content. - * @param object $category The current term object. - * @param int $depth Depth of the term in reference to parents. Default 0. - * @param array $args An array of arguments. @see wp_terms_checklist() - */ - function end_el( &$output, $category, $depth = 0, $args = array() ) { - $output .= "

\n"; - } -} - -/** - * Output an unordered list of checkbox elements labelled - * with category names. * * @see wp_terms_checklist() - * @since 2.5.1 * - * @param int $post_id Mark categories associated with this post as checked. $selected_cats must not be an array. - * @param int $descendants_and_self ID of the category to output along with its descendents. - * @param bool|array $selected_cats List of categories to mark as checked. - * @param bool|array $popular_cats Override the list of categories that receive the "popular-category" class. - * @param object $walker Walker object to use to build the output. - * @param bool $checked_ontop Move checked items out of the hierarchy and to the top of the list. + * @param int $post_id Optional. Post to generate a categories checklist for. Default 0. + * $selected_cats must not be an array. Default 0. + * @param int $descendants_and_self Optional. ID of the category to output along with its descendants. + * Default 0. + * @param array $selected_cats Optional. List of categories to mark as checked. Default false. + * @param array $popular_cats Optional. List of categories to receive the "popular-category" class. + * Default false. + * @param object $walker Optional. Walker object to use to build the output. + * Default is a Walker_Category_Checklist instance. + * @param bool $checked_ontop Optional. Whether to move checked items out of the hierarchy and to + * the top of the list. Default true. */ function wp_category_checklist( $post_id = 0, $descendants_and_self = 0, $selected_cats = false, $popular_cats = false, $walker = null, $checked_ontop = true ) { wp_terms_checklist( $post_id, array( @@ -128,22 +49,40 @@ function wp_category_checklist( $post_id = 0, $descendants_and_self = 0, $select } /** - * Output an unordered list of checkbox elements labelled - * with term names. Taxonomy independent version of wp_category_checklist(). + * Output an unordered list of checkbox input elements labelled with term names. * - * @since 3.0.0 + * Taxonomy-independent version of wp_category_checklist(). * - * @param int $post_id - * @param array $args + * @since 3.0.0 + * @since 4.4.0 Introduced the `$echo` argument. + * + * @param int $post_id Optional. Post ID. Default 0. + * @param array|string $args { + * Optional. Array or string of arguments for generating a terms checklist. Default empty array. + * + * @type int $descendants_and_self ID of the category to output along with its descendants. + * Default 0. + * @type array $selected_cats List of categories to mark as checked. Default false. + * @type array $popular_cats List of categories to receive the "popular-category" class. + * Default false. + * @type object $walker Walker object to use to build the output. + * Default is a Walker_Category_Checklist instance. + * @type string $taxonomy Taxonomy to generate the checklist for. Default 'category'. + * @type bool $checked_ontop Whether to move checked items out of the hierarchy and to + * the top of the list. Default true. + * @type bool $echo Whether to echo the generated markup. False to return the markup instead + * of echoing it. Default true. + * } */ -function wp_terms_checklist($post_id = 0, $args = array()) { +function wp_terms_checklist( $post_id = 0, $args = array() ) { $defaults = array( 'descendants_and_self' => 0, 'selected_cats' => false, 'popular_cats' => false, 'walker' => null, 'taxonomy' => 'category', - 'checked_ontop' => true + 'checked_ontop' => true, + 'echo' => true, ); /** @@ -156,46 +95,64 @@ function wp_terms_checklist($post_id = 0, $args = array()) { * @param array $args An array of arguments. * @param int $post_id The post ID. */ - $args = apply_filters( 'wp_terms_checklist_args', $args, $post_id ); + $params = apply_filters( 'wp_terms_checklist_args', $args, $post_id ); - extract( wp_parse_args($args, $defaults), EXTR_SKIP ); + $r = wp_parse_args( $params, $defaults ); - if ( empty($walker) || !is_a($walker, 'Walker') ) + if ( empty( $r['walker'] ) || ! ( $r['walker'] instanceof Walker ) ) { $walker = new Walker_Category_Checklist; + } else { + $walker = $r['walker']; + } - $descendants_and_self = (int) $descendants_and_self; - - $args = array('taxonomy' => $taxonomy); + $taxonomy = $r['taxonomy']; + $descendants_and_self = (int) $r['descendants_and_self']; - $tax = get_taxonomy($taxonomy); - $args['disabled'] = !current_user_can($tax->cap->assign_terms); + $args = array( 'taxonomy' => $taxonomy ); - if ( is_array( $selected_cats ) ) - $args['selected_cats'] = $selected_cats; - elseif ( $post_id ) - $args['selected_cats'] = wp_get_object_terms($post_id, $taxonomy, array_merge($args, array('fields' => 'ids'))); - else - $args['selected_cats'] = array(); + $tax = get_taxonomy( $taxonomy ); + $args['disabled'] = ! current_user_can( $tax->cap->assign_terms ); - if ( is_array( $popular_cats ) ) - $args['popular_cats'] = $popular_cats; - else - $args['popular_cats'] = get_terms( $taxonomy, array( 'fields' => 'ids', 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) ); + $args['list_only'] = ! empty( $r['list_only'] ); + if ( is_array( $r['selected_cats'] ) ) { + $args['selected_cats'] = $r['selected_cats']; + } elseif ( $post_id ) { + $args['selected_cats'] = wp_get_object_terms( $post_id, $taxonomy, array_merge( $args, array( 'fields' => 'ids' ) ) ); + } else { + $args['selected_cats'] = array(); + } + if ( is_array( $r['popular_cats'] ) ) { + $args['popular_cats'] = $r['popular_cats']; + } else { + $args['popular_cats'] = get_terms( $taxonomy, array( + 'fields' => 'ids', + 'orderby' => 'count', + 'order' => 'DESC', + 'number' => 10, + 'hierarchical' => false + ) ); + } if ( $descendants_and_self ) { - $categories = (array) get_terms($taxonomy, array( 'child_of' => $descendants_and_self, 'hierarchical' => 0, 'hide_empty' => 0 ) ); + $categories = (array) get_terms( $taxonomy, array( + 'child_of' => $descendants_and_self, + 'hierarchical' => 0, + 'hide_empty' => 0 + ) ); $self = get_term( $descendants_and_self, $taxonomy ); array_unshift( $categories, $self ); } else { - $categories = (array) get_terms($taxonomy, array('get' => 'all')); + $categories = (array) get_terms( $taxonomy, array( 'get' => 'all' ) ); } - if ( $checked_ontop ) { + $output = ''; + + if ( $r['checked_ontop'] ) { // Post process $categories rather than adding an exclude to the get_terms() query to keep the query the same across all posts (for any query cache) $checked_categories = array(); $keys = array_keys( $categories ); - foreach( $keys as $k ) { + foreach ( $keys as $k ) { if ( in_array( $categories[$k]->term_id, $args['selected_cats'] ) ) { $checked_categories[] = $categories[$k]; unset( $categories[$k] ); @@ -203,24 +160,30 @@ function wp_terms_checklist($post_id = 0, $args = array()) { } // Put checked cats on top - echo call_user_func_array(array(&$walker, 'walk'), array($checked_categories, 0, $args)); + $output .= call_user_func_array( array( $walker, 'walk' ), array( $checked_categories, 0, $args ) ); } // Then the rest of them - echo call_user_func_array(array(&$walker, 'walk'), array($categories, 0, $args)); + $output .= call_user_func_array( array( $walker, 'walk' ), array( $categories, 0, $args ) ); + + if ( $r['echo'] ) { + echo $output; + } + + return $output; } /** * Retrieve a list of the most popular terms from the specified taxonomy. * * If the $echo argument is true then the elements for a list of checkbox - * elements labelled with the names of the selected terms is output. + * `` elements labelled with the names of the selected terms is output. * If the $post_ID global isn't empty then the terms associated with that * post will be marked as checked. * * @since 2.5.0 * * @param string $taxonomy Taxonomy to retrieve terms from. - * @param int $default Unused. + * @param int $default Not used. * @param int $number Number of terms to retrieve. Defaults to 10. * @param bool $echo Optionally output the list as well. Defaults to true. * @return array List of popular term IDs. @@ -262,20 +225,23 @@ function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10, $ech } /** - * {@internal Missing Short Description}} + * Outputs a link category checklist element. * * @since 2.5.1 * - * @param unknown_type $link_id + * @param int $link_id */ function wp_link_category_checklist( $link_id = 0 ) { $default = 1; + $checked_categories = array(); + if ( $link_id ) { $checked_categories = wp_get_link_cats( $link_id ); // No selected categories, strange - if ( ! count( $checked_categories ) ) + if ( ! count( $checked_categories ) ) { $checked_categories[] = $default; + } } else { $checked_categories[] = $default; } @@ -295,13 +261,12 @@ function wp_link_category_checklist( $link_id = 0 ) { } } -// adds hidden fields with the data for use in the inline editor for posts and pages /** - * {@internal Missing Short Description}} + * Adds hidden fields with the data for use in the inline editor for posts and pages. * * @since 2.7.0 * - * @param unknown_type $post + * @param WP_Post $post Post object. */ function get_inline_data($post) { $post_type_object = get_post_type_object($post->post_type); @@ -313,8 +278,9 @@ function get_inline_data($post) { /** This filter is documented in wp-admin/edit-tag-form.php */ echo ' '; + } } @@ -359,16 +340,19 @@ function get_inline_data($post) { } /** - * {@internal Missing Short Description}} + * Outputs the in-line comment reply-to form in the Comments list table. * * @since 2.7.0 * - * @param unknown_type $position - * @param unknown_type $checkbox - * @param unknown_type $mode + * @global WP_List_Table $wp_list_table + * + * @param int $position + * @param bool $checkbox + * @param string $mode + * @param bool $table_row */ -function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single', $table_row = true) { - +function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $table_row = true ) { + global $wp_list_table; /** * Filter the in-line comment reply-to form output in the Comments * list table. @@ -391,44 +375,51 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single', return; } - if ( $mode == 'single' ) { - $wp_list_table = _get_list_table('WP_Post_Comments_List_Table'); - } else { - $wp_list_table = _get_list_table('WP_Comments_List_Table'); + if ( ! $wp_list_table ) { + if ( $mode == 'single' ) { + $wp_list_table = _get_list_table('WP_Post_Comments_List_Table'); + } else { + $wp_list_table = _get_list_table('WP_Comments_List_Table'); + } } ?> -

+ -"; + $r .= "\n\t"; $r .= "\n\t\t` element when the + * field is output. + * } */ function add_settings_field($id, $title, $callback, $page, $section = 'default', $args = array()) { global $wp_settings_fields; @@ -1184,7 +1271,7 @@ function add_settings_field($id, $title, $callback, $page, $section = 'default', * @global $wp_settings_fields Storage array of settings fields and info about their pages/sections * @since 2.7.0 * - * @param string $page The slug name of the page whos settings sections you want to output + * @param string $page The slug name of the page whose settings sections you want to output */ function do_settings_sections( $page ) { global $wp_settings_sections, $wp_settings_fields; @@ -1194,7 +1281,7 @@ function do_settings_sections( $page ) { foreach ( (array) $wp_settings_sections[$page] as $section ) { if ( $section['title'] ) - echo "

{$section['title']}

\n"; + echo "

{$section['title']}

\n"; if ( $section['callback'] ) call_user_func( $section['callback'], $section ); @@ -1219,7 +1306,7 @@ function do_settings_sections( $page ) { * @since 2.7.0 * * @param string $page Slug title of the admin page who's settings fields you want to show. - * @param section $section Slug title of the settings section who's fields you want to show. + * @param string $section Slug title of the settings section who's fields you want to show. */ function do_settings_fields($page, $section) { global $wp_settings_fields; @@ -1228,11 +1315,20 @@ function do_settings_fields($page, $section) { return; foreach ( (array) $wp_settings_fields[$page][$section] as $field ) { - echo ''; - if ( !empty($field['args']['label_for']) ) + $class = ''; + + if ( ! empty( $field['args']['class'] ) ) { + $class = ' class="' . esc_attr( $field['args']['class'] ) . '"'; + } + + echo ""; + + if ( ! empty( $field['args']['label_for'] ) ) { echo ''; - else + } else { echo ''; + } + echo ''; @@ -1258,20 +1354,21 @@ function do_settings_fields($page, $section) { * @global array $wp_settings_errors Storage array of errors registered during this pageload * * @param string $setting Slug title of the setting to which this error applies - * @param string $code Slug-name to identify the error. Used as part of 'id' attribute in HTML output. - * @param string $message The formatted message text to display to the user (will be shown inside styled

and

) - * @param string $type The type of message it is, controls HTML class. Use 'error' or 'updated'. + * @param string $code Slug-name to identify the error. Used as part of 'id' attribute in HTML output. + * @param string $message The formatted message text to display to the user (will be shown inside styled + * `

` and `

` tags). + * @param string $type Optional. Message type, controls HTML class. Accepts 'error' or 'updated'. + * Default 'error'. */ function add_settings_error( $setting, $code, $message, $type = 'error' ) { global $wp_settings_errors; - $new_error = array( + $wp_settings_errors[] = array( 'setting' => $setting, - 'code' => $code, + 'code' => $code, 'message' => $message, - 'type' => $type + 'type' => $type ); - $wp_settings_errors[] = $new_error; } /** @@ -1299,23 +1396,25 @@ function add_settings_error( $setting, $code, $message, $type = 'error' ) { function get_settings_errors( $setting = '', $sanitize = false ) { global $wp_settings_errors; - // If $sanitize is true, manually re-run the sanitization for this option - // This allows the $sanitize_callback from register_setting() to run, adding - // any settings errors you want to show by default. + /* + * If $sanitize is true, manually re-run the sanitization for this option + * This allows the $sanitize_callback from register_setting() to run, adding + * any settings errors you want to show by default. + */ if ( $sanitize ) sanitize_option( $setting, get_option( $setting ) ); - // If settings were passed back from options.php then use them + // If settings were passed back from options.php then use them. if ( isset( $_GET['settings-updated'] ) && $_GET['settings-updated'] && get_transient( 'settings_errors' ) ) { $wp_settings_errors = array_merge( (array) $wp_settings_errors, get_transient( 'settings_errors' ) ); delete_transient( 'settings_errors' ); } - // Check global in case errors have been added on this pageload + // Check global in case errors have been added on this pageload. if ( ! count( $wp_settings_errors ) ) return array(); - // Filter the results to those of a specific setting if one was set + // Filter the results to those of a specific setting if one was set. if ( $setting ) { $setting_errors = array(); foreach ( (array) $wp_settings_errors as $key => $details ) { @@ -1329,26 +1428,30 @@ function get_settings_errors( $setting = '', $sanitize = false ) { } /** - * Display settings errors registered by add_settings_error() + * Display settings errors registered by {@see add_settings_error()}. * - * Part of the Settings API. Outputs a

for each error retrieved by get_settings_errors(). + * Part of the Settings API. Outputs a div for each error retrieved by + * {@see get_settings_errors()}. * - * This is called automatically after a settings page based on the Settings API is submitted. - * Errors should be added during the validation callback function for a setting defined in register_setting() + * This is called automatically after a settings page based on the + * Settings API is submitted. Errors should be added during the validation + * callback function for a setting defined in {@see register_setting()} * - * The $sanitize option is passed into get_settings_errors() and will re-run the setting sanitization + * The $sanitize option is passed into {@see get_settings_errors()} and will + * re-run the setting sanitization * on its current value. * - * The $hide_on_update option will cause errors to only show when the settings page is first loaded. - * if the user has already saved new values it will be hidden to avoid repeating messages already - * shown in the default error reporting after submission. This is useful to show general errors like missing - * settings when the user arrives at the settings page. + * The $hide_on_update option will cause errors to only show when the settings + * page is first loaded. if the user has already saved new values it will be + * hidden to avoid repeating messages already shown in the default error + * reporting after submission. This is useful to show general errors like + * missing settings when the user arrives at the settings page. * * @since 3.0.0 * - * @param string $setting Optional slug title of a specific setting who's errors you want. - * @param boolean $sanitize Whether to re-sanitize the setting value before returning errors. - * @param boolean $hide_on_update If set to true errors will not be shown if the settings page has already been submitted. + * @param string $setting Optional slug title of a specific setting who's errors you want. + * @param bool $sanitize Whether to re-sanitize the setting value before returning errors. + * @param bool $hide_on_update If set to true errors will not be shown if the settings page has already been submitted. */ function settings_errors( $setting = '', $sanitize = false, $hide_on_update = false ) { @@ -1363,7 +1466,7 @@ function settings_errors( $setting = '', $sanitize = false, $hide_on_update = fa $output = ''; foreach ( $settings_errors as $key => $details ) { $css_id = 'setting-error-' . $details['code']; - $css_class = $details['type'] . ' settings-error'; + $css_class = $details['type'] . ' settings-error notice is-dismissible'; $output .= "

\n"; $output .= "

{$details['message']}

"; $output .= "

\n"; @@ -1372,17 +1475,17 @@ function settings_errors( $setting = '', $sanitize = false, $hide_on_update = fa } /** - * {@internal Missing Short Description}} + * Outputs the modal window used for attaching media to posts or pages in the media-listing screen. * * @since 2.7.0 * - * @param unknown_type $found_action + * @param string $found_action */ function find_posts_div($found_action = '') { ?>

- +

@@ -1414,7 +1517,6 @@ function find_posts_div($found_action = '') { * The password is passed through {@link esc_attr()} to ensure that it * is safe for placing in an html attribute. * - * @uses attr * @since 2.7.0 */ function the_post_password() { @@ -1430,14 +1532,15 @@ function the_post_password() { * returned. * * @since 2.7.0 - * @param mixed $post Post id or object. If not supplied the global $post is used. - * @return string The post title if set + * + * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post. + * @return string The post title if set. */ function _draft_or_post_title( $post = 0 ) { $title = get_the_title( $post ); if ( empty( $title ) ) $title = __( '(no title)' ); - return $title; + return esc_html( $title ); } /** @@ -1446,9 +1549,7 @@ function _draft_or_post_title( $post = 0 ) { * A simple wrapper to display the "s" parameter in a GET URI. This function * should only be used when {@link the_search_query()} cannot. * - * @uses attr * @since 2.7.0 - * */ function _admin_search_query() { echo isset($_REQUEST['s']) ? esc_attr( wp_unslash( $_REQUEST['s'] ) ) : ''; @@ -1458,13 +1559,17 @@ function _admin_search_query() { * Generic Iframe header for use with Thickbox * * @since 2.7.0 - * @param string $title Title of the Iframe page. - * @param bool $limit_styles Limit styles to colour-related styles only (unless others are enqueued). * + * @global string $hook_suffix + * @global string $admin_body_class + * @global WP_Locale $wp_locale + * + * @param string $title Optional. Title of the Iframe page. Default empty. + * @param bool $deprecated Not used. */ -function iframe_header( $title = '', $limit_styles = false ) { +function iframe_header( $title = '', $deprecated = false ) { show_admin_bar( false ); - global $hook_suffix, $current_user, $admin_body_class, $wp_locale; + global $hook_suffix, $admin_body_class, $wp_locale; $admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix); $current_screen = get_current_screen(); @@ -1477,7 +1582,6 @@ function iframe_header( $title = '', $limit_styles = false ) { wp_enqueue_style( 'colors' ); ?> - - class="wp-admin wp-core-ui no-js iframe "> + + class="wp-admin wp-core-ui no-js iframe "> @@ -1560,6 +1667,10 @@ function iframe_footer() { post_status && 'draft' != $post_status ) $post_states['draft'] = __('Draft'); if ( 'pending' == $post->post_status && 'pending' != $post_status ) - /* translators: post state */ - $post_states['pending'] = _x('Pending', 'post state'); + $post_states['pending'] = _x('Pending', 'post status'); if ( is_sticky($post->ID) ) $post_states['sticky'] = __('Sticky'); + if ( 'future' === $post->post_status ) { + $post_states['scheduled'] = __( 'Scheduled' ); + } + + if ( 'page' === get_option( 'show_on_front' ) ) { + if ( intval( get_option( 'page_on_front' ) ) === $post->ID ) { + $post_states['page_on_front'] = __( 'Front Page' ); + } + + if ( intval( get_option( 'page_for_posts' ) ) === $post->ID ) { + $post_states['page_for_posts'] = __( 'Posts Page' ); + } + } + /** - * Filter the default post display states used in the Posts list table. + * Filter the default post display states used in the posts list table. * * @since 2.8.0 * - * @param array $post_states An array of post display states. Values include 'Password protected', - * 'Private', 'Draft', 'Pending', and 'Sticky'. - * @param int $post The post ID. + * @param array $post_states An array of post display states. + * @param WP_Post $post The current post object. */ $post_states = apply_filters( 'display_post_states', $post_states, $post ); if ( ! empty($post_states) ) { $state_count = count($post_states); $i = 0; - echo ' - '; + echo ' — '; foreach ( $post_states as $state ) { ++$i; ( $i == $state_count ) ? $sep = '' : $sep = ', '; @@ -1603,6 +1726,10 @@ function _post_states($post) { } +/** + * + * @param WP_Post $post + */ function _media_states( $post ) { $media_states = array(); $stylesheet = get_option('stylesheet'); @@ -1619,20 +1746,28 @@ function _media_states( $post ) { $media_states[] = __( 'Background Image' ); } + if ( $post->ID == get_option( 'site_icon' ) ) { + $media_states[] = __( 'Site Icon' ); + } + + if ( $post->ID == get_theme_mod( 'site_logo' ) ) { + $media_states[] = __( 'Logo' ); + } + /** * Filter the default media display states for items in the Media list table. * * @since 3.2.0 * * @param array $media_states An array of media states. Default 'Header Image', - * 'Background Image'. + * 'Background Image', 'Site Icon', 'Logo'. */ $media_states = apply_filters( 'display_media_states', $media_states ); if ( ! empty( $media_states ) ) { $state_count = count( $media_states ); $i = 0; - echo ' - '; + echo ' — '; foreach ( $media_states as $state ) { ++$i; ( $i == $state_count ) ? $sep = '' : $sep = ', '; @@ -1654,7 +1789,7 @@ function _media_states( $post ) { function compression_test() { ?> '1' ). - * These attributes will be output as attribute="value", such as tabindex="1". - * Defaults to no other attributes. Other attributes can also be provided as a - * string such as 'tabindex="1"', though the array format is typically cleaner. + * @param string $text Optional. The text of the button. Default 'Save Changes'. + * @param string $type Optional. The type of button. Accepts 'primary', 'secondary', + * or 'delete'. Default 'primary large'. + * @param string $name Optional. The HTML name of the submit button. Defaults to "submit". + * If no id attribute is given in $other_attributes below, `$name` will + * be used as the button's id. Default 'submit'. + * @param bool $wrap Optional. True if the output button should be wrapped in a paragraph + * tag, false otherwise. Default true. + * @param array|string $other_attributes Optional. Other attributes that should be output with the button, + * mapping attributes to their values, such as `array( 'tabindex' => '1' )`. + * These attributes will be output as `attribute="value"`, such as + * `tabindex="1"`. Other attributes can also be provided as a string such + * as `tabindex="1"`, though the array format is typically cleaner. + * Default empty. + * @return string Submit button HTML. */ -function get_submit_button( $text = null, $type = 'primary large', $name = 'submit', $wrap = true, $other_attributes = null ) { +function get_submit_button( $text = '', $type = 'primary large', $name = 'submit', $wrap = true, $other_attributes = '' ) { if ( ! is_array( $type ) ) $type = explode( ' ', $type ); @@ -1779,11 +1917,15 @@ function get_submit_button( $text = null, $type = 'primary large', $name = 'subm foreach ( $other_attributes as $attribute => $value ) { $attributes .= $attribute . '="' . esc_attr( $value ) . '" '; // Trailing space is important } - } else if ( !empty( $other_attributes ) ) { // Attributes provided as a string + } elseif ( ! empty( $other_attributes ) ) { // Attributes provided as a string $attributes = $other_attributes; } - $button = ''; if ( $wrap ) { @@ -1793,6 +1935,10 @@ function get_submit_button( $text = null, $type = 'primary large', $name = 'subm return $button; } +/** + * + * @global bool $is_IE + */ function _wp_admin_html_begin() { global $is_IE; @@ -1801,212 +1947,29 @@ function _wp_admin_html_begin() { if ( $is_IE ) @header('X-UA-Compatible: IE=edge'); -/** - * Fires inside the HTML tag in the admin header. - * - * @since 2.2.0 - */ ?> - - > + > pointer_id ) - */ - - $registered_pointers = array( - 'post-new.php' => 'wp350_media', - 'post.php' => array( 'wp350_media', 'wp360_revisions' ), - 'edit.php' => 'wp360_locks', - 'widgets.php' => 'wp390_widgets', - 'themes.php' => 'wp390_widgets', - ); - - // Check if screen related pointer is registered - if ( empty( $registered_pointers[ $hook_suffix ] ) ) - return; - - $pointers = (array) $registered_pointers[ $hook_suffix ]; - - $caps_required = array( - 'wp350_media' => array( 'upload_files' ), - 'wp390_widgets' => array( 'edit_theme_options' ), - ); - - // Get dismissed pointers - $dismissed = explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) ); - - $got_pointers = false; - foreach ( array_diff( $pointers, $dismissed ) as $pointer ) { - if ( isset( $caps_required[ $pointer ] ) ) { - foreach ( $caps_required[ $pointer ] as $cap ) { - if ( ! current_user_can( $cap ) ) - continue 2; - } - } - - // Bind pointer print function - add_action( 'admin_print_footer_scripts', array( 'WP_Internal_Pointers', 'pointer_' . $pointer ) ); - $got_pointers = true; - } - - if ( ! $got_pointers ) - return; - - // Add pointers script and style to queue - wp_enqueue_style( 'wp-pointer' ); - wp_enqueue_script( 'wp-pointer' ); - } - - /** - * Print the pointer javascript data. - * - * @since 3.3.0 - * - * @param string $pointer_id The pointer ID. - * @param string $selector The HTML elements, on which the pointer should be attached. - * @param array $args Arguments to be passed to the pointer JS (see wp-pointer.js). - */ - private static function print_js( $pointer_id, $selector, $args ) { - if ( empty( $pointer_id ) || empty( $selector ) || empty( $args ) || empty( $args['content'] ) ) - return; - - ?> - - ' . __( 'New Media Manager' ) . ''; - $content .= '

' . __( 'Uploading files and creating image galleries has a whole new look. Check it out!' ) . '

'; - - self::print_js( 'wp350_media', '.insert-media', array( - 'content' => $content, - 'position' => array( 'edge' => is_rtl() ? 'right' : 'left', 'align' => 'center' ), - ) ); - } - - public static function pointer_wp360_revisions() { - $content = '

' . __( 'Compare Revisions' ) . '

'; - $content .= '

' . __( 'View, compare, and restore other versions of this content on the improved revisions screen.' ) . '

'; - - self::print_js( 'wp360_revisions', '.misc-pub-section.misc-pub-revisions', array( - 'content' => $content, - 'position' => array( 'edge' => is_rtl() ? 'left' : 'right', 'align' => 'center', 'my' => is_rtl() ? 'left' : 'right-14px' ), - ) ); - } - - public static function pointer_wp360_locks() { - if ( ! is_multi_author() ) { - return; - } - - $content = '

' . __( 'Edit Lock' ) . '

'; - $content .= '

' . __( 'Someone else is editing this. No need to refresh; the lock will disappear when they’re done.' ) . '

'; - - self::print_js( 'wp360_locks', 'tr.wp-locked .locked-indicator', array( - 'content' => $content, - 'position' => array( 'edge' => 'left', 'align' => 'left' ), - ) ); - } - - public static function pointer_wp390_widgets() { - if ( ! current_theme_supports( 'widgets' ) ) { - return; - } - - $content = '

' . __( 'New Feature: Live Widget Previews' ) . '

'; - $content .= '

' . __( 'Add, edit, and play around with your widgets from the theme customizer.' ) . ' ' . __( 'Preview your changes in real-time and only save them when you’re ready.' ) . '

'; - - if ( 'themes' === get_current_screen()->id ) { - $selector = '.theme.active .customize'; - $position = array( 'edge' => is_rtl() ? 'right' : 'left', 'align' => 'center', 'my' => is_rtl() ? 'right-13px' : '' ); - } else { - $selector = 'a[href="customize.php"]'; - if ( is_rtl() ) { - $position = array( 'edge' => 'right', 'align' => 'center', 'my' => 'right-5px' ); - } else { - $position = array( 'edge' => 'left', 'align' => 'center', 'my' => 'left-5px' ); - } - } - - self::print_js( 'wp390_widgets', $selector, array( - 'content' => $content, - 'position' => $position, - ) ); - } - - /** - * Prevents new users from seeing existing 'new feature' pointers. - * - * @since 3.3.0 - */ - public static function dismiss_pointers_for_new_users( $user_id ) { - add_user_meta( $user_id, 'dismissed_wp_pointers', 'wp350_media,wp360_revisions,wp360_locks,wp390_widgets' ); - } -} - -add_action( 'admin_enqueue_scripts', array( 'WP_Internal_Pointers', 'enqueue_scripts' ) ); -add_action( 'user_register', array( 'WP_Internal_Pointers', 'dismiss_pointers_for_new_users' ) ); - /** * Convert a screen string to a screen object * @@ -2016,7 +1979,7 @@ add_action( 'user_register', array( 'WP_Internal_Pointers', 'dismiss_poi * @return WP_Screen Screen object. */ function convert_to_screen( $hook_name ) { - if ( ! class_exists( 'WP_Screen' ) ) { + if ( ! class_exists( 'WP_Screen', false ) ) { _doing_it_wrong( 'convert_to_screen(), add_meta_box()', __( "Likely direct inclusion of wp-admin/includes/template.php in order to use add_meta_box(). This is very wrong. Hook the add_meta_box() call into the add_meta_boxes action instead." ), '3.3' ); return (object) array( 'id' => '_invalid', 'base' => '_are_belong_to_us' ); } @@ -2032,7 +1995,7 @@ function convert_to_screen( $hook_name ) { */ function _local_storage_notice() { ?> -

'; } +/** + * + * @global int $upgrading + * @return false|void + */ function maintenance_nag() { - include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version + include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version global $upgrading; $nag = isset( $upgrading ); if ( ! $nag ) { @@ -436,5 +557,3 @@ function maintenance_nag() { echo "

$msg

"; } -add_action( 'admin_notices', 'maintenance_nag' ); -add_action( 'network_admin_notices', 'maintenance_nag' ); diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index 4a853fe..9e4e19d 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -2,7 +2,7 @@ /** * WordPress Upgrade API * - * Most of the functions are pluggable and can be overwritten + * Most of the functions are pluggable and can be overwritten. * * @package WordPress * @subpackage Administration @@ -20,21 +20,23 @@ require_once(ABSPATH . 'wp-admin/includes/schema.php'); if ( !function_exists('wp_install') ) : /** - * Installs the blog + * Installs the site. * - * {@internal Missing Long Description}} + * Runs the required functions to set up and populate the database, + * including primary admin user and initial options. * * @since 2.1.0 * - * @param string $blog_title Blog title. - * @param string $user_name User's username. - * @param string $user_email User's email. - * @param bool $public Whether blog is public. - * @param null $deprecated Optional. Not used. - * @param string $user_password Optional. User's chosen password. Will default to a random password. - * @return array Array keys 'url', 'user_id', 'password', 'password_message'. + * @param string $blog_title Site title. + * @param string $user_name User's username. + * @param string $user_email User's email. + * @param bool $public Whether site is public. + * @param string $deprecated Optional. Not used. + * @param string $user_password Optional. User's chosen password. Default empty (random password). + * @param string $language Optional. Language chosen. Default empty. + * @return array Array keys 'url', 'user_id', 'password', and 'password_message'. */ -function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '' ) { +function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '', $language = '' ) { if ( !empty( $deprecated ) ) _deprecated_argument( __FUNCTION__, '2.6' ); @@ -48,6 +50,10 @@ function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated update_option('admin_email', $user_email); update_option('blog_public', $public); + if ( $language ) { + update_option( 'WPLANG', $language ); + } + $guessurl = wp_guess_url(); update_option('siteurl', $guessurl); @@ -56,8 +62,10 @@ function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated if ( ! $public ) update_option('default_pingback_flag', 0); - // Create default user. If the user already exists, the user tables are - // being shared among blogs. Just set the role in that case. + /* + * Create default user. If the user already exists, the user tables are + * being shared among sites. Just set the role in that case. + */ $user_id = username_exists($user_name); $user_password = trim($user_password); $email_password = false; @@ -67,7 +75,7 @@ function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated $user_id = wp_create_user($user_name, $user_password, $user_email); update_user_option($user_id, 'default_password_nag', true, true); $email_password = true; - } else if ( !$user_id ) { + } elseif ( ! $user_id ) { // Password has been provided $message = ''.__('Your chosen password.').''; $user_id = wp_create_user($user_name, $user_password, $user_email); @@ -80,6 +88,8 @@ function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated wp_install_defaults($user_id); + wp_install_maybe_enable_pretty_permalinks(); + flush_rewrite_rules(); wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during the install.') ) ); @@ -101,12 +111,17 @@ endif; if ( !function_exists('wp_install_defaults') ) : /** - * {@internal Missing Short Description}} + * Creates the initial content for a newly-installed site. * - * {@internal Missing Long Description}} + * Adds the default "Uncategorized" category, the first post (with comment), + * first page, and default widgets for default theme for the current version. * * @since 2.1.0 * + * @global wpdb $wpdb + * @global WP_Rewrite $wp_rewrite + * @global string $table_prefix + * * @param int $user_id User ID. */ function wp_install_defaults( $user_id ) { @@ -133,39 +148,46 @@ function wp_install_defaults( $user_id ) { $cat_tt_id = $wpdb->insert_id; // First post - $now = date('Y-m-d H:i:s'); - $now_gmt = gmdate('Y-m-d H:i:s'); - $first_post_guid = get_option('home') . '/?p=1'; + $now = current_time( 'mysql' ); + $now_gmt = current_time( 'mysql', 1 ); + $first_post_guid = get_option( 'home' ) . '/?p=1'; if ( is_multisite() ) { $first_post = get_site_option( 'first_post' ); - if ( empty($first_post) ) - $first_post = __( 'Welcome to SITE_NAME. This is your first post. Edit or delete it, then start blogging!' ); + if ( ! $first_post ) { + /* translators: %s: site link */ + $first_post = __( 'Welcome to %s. This is your first post. Edit or delete it, then start blogging!' ); + } - $first_post = str_replace( "SITE_URL", esc_url( network_home_url() ), $first_post ); - $first_post = str_replace( "SITE_NAME", get_current_site()->site_name, $first_post ); + $first_post = sprintf( $first_post, + sprintf( '%s', esc_url( network_home_url() ), get_current_site()->site_name ) + ); + + // Back-compat for pre-4.4 + $first_post = str_replace( 'SITE_URL', esc_url( network_home_url() ), $first_post ); + $first_post = str_replace( 'SITE_NAME', get_current_site()->site_name, $first_post ); } else { - $first_post = __('Welcome to WordPress. This is your first post. Edit or delete it, then start blogging!'); + $first_post = __( 'Welcome to WordPress. This is your first post. Edit or delete it, then start writing!' ); } $wpdb->insert( $wpdb->posts, array( - 'post_author' => $user_id, - 'post_date' => $now, - 'post_date_gmt' => $now_gmt, - 'post_content' => $first_post, - 'post_excerpt' => '', - 'post_title' => __('Hello world!'), - /* translators: Default post slug */ - 'post_name' => sanitize_title( _x('hello-world', 'Default post slug') ), - 'post_modified' => $now, - 'post_modified_gmt' => $now_gmt, - 'guid' => $first_post_guid, - 'comment_count' => 1, - 'to_ping' => '', - 'pinged' => '', - 'post_content_filtered' => '' - )); + 'post_author' => $user_id, + 'post_date' => $now, + 'post_date_gmt' => $now_gmt, + 'post_content' => $first_post, + 'post_excerpt' => '', + 'post_title' => __('Hello world!'), + /* translators: Default post slug */ + 'post_name' => sanitize_title( _x('hello-world', 'Default post slug') ), + 'post_modified' => $now, + 'post_modified_gmt' => $now_gmt, + 'guid' => $first_post_guid, + 'comment_count' => 1, + 'to_ping' => '', + 'pinged' => '', + 'post_content_filtered' => '' + )); $wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => $cat_tt_id, 'object_id' => 1) ); // Default comment @@ -179,19 +201,19 @@ To delete a comment, just log in and view the post's comments. There you wi $first_comment = get_site_option( 'first_comment', $first_comment ); } $wpdb->insert( $wpdb->comments, array( - 'comment_post_ID' => 1, - 'comment_author' => $first_comment_author, - 'comment_author_email' => '', - 'comment_author_url' => $first_comment_url, - 'comment_date' => $now, - 'comment_date_gmt' => $now_gmt, - 'comment_content' => $first_comment - )); + 'comment_post_ID' => 1, + 'comment_author' => $first_comment_author, + 'comment_author_email' => '', + 'comment_author_url' => $first_comment_url, + 'comment_date' => $now, + 'comment_date_gmt' => $now_gmt, + 'comment_content' => $first_comment + )); // First Page $first_page = sprintf( __( "This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this: -

Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my blog. I live in Los Angeles, have a great dog named Jack, and I like piña coladas. (And gettin' caught in the rain.)

Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my website. I live in Los Angeles, have a great dog named Jack, and I like piña coladas. (And gettin' caught in the rain.)

...or something like this: @@ -202,22 +224,23 @@ As a new WordPress user, you should go to your dashboard to d $first_page = get_site_option( 'first_page', $first_page ); $first_post_guid = get_option('home') . '/?page_id=2'; $wpdb->insert( $wpdb->posts, array( - 'post_author' => $user_id, - 'post_date' => $now, - 'post_date_gmt' => $now_gmt, - 'post_content' => $first_page, - 'post_excerpt' => '', - 'post_title' => __( 'Sample Page' ), - /* translators: Default page slug */ - 'post_name' => __( 'sample-page' ), - 'post_modified' => $now, - 'post_modified_gmt' => $now_gmt, - 'guid' => $first_post_guid, - 'post_type' => 'page', - 'to_ping' => '', - 'pinged' => '', - 'post_content_filtered' => '' - )); + 'post_author' => $user_id, + 'post_date' => $now, + 'post_date_gmt' => $now_gmt, + 'post_content' => $first_page, + 'post_excerpt' => '', + 'comment_status' => 'closed', + 'post_title' => __( 'Sample Page' ), + /* translators: Default page slug */ + 'post_name' => __( 'sample-page' ), + 'post_modified' => $now, + 'post_modified_gmt' => $now_gmt, + 'guid' => $first_post_guid, + 'post_type' => 'page', + 'to_ping' => '', + 'pinged' => '', + 'post_content_filtered' => '' + )); $wpdb->insert( $wpdb->postmeta, array( 'post_id' => 2, 'meta_key' => '_wp_page_template', 'meta_value' => 'default' ) ); // Set up default widgets for default theme. @@ -227,7 +250,7 @@ As a new WordPress user, you should go to your dashboard to d update_option( 'widget_archives', array ( 2 => array ( 'title' => '', 'count' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) ); update_option( 'widget_categories', array ( 2 => array ( 'title' => '', 'count' => 0, 'hierarchical' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) ); update_option( 'widget_meta', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) ); - update_option( 'sidebars_widgets', array ( 'wp_inactive_widgets' => array (), 'sidebar-1' => array ( 0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2', ), 'sidebar-2' => array (), 'sidebar-3' => array (), 'array_version' => 3 ) ); + update_option( 'sidebars_widgets', array ( 'wp_inactive_widgets' => array (), 'sidebar-1' => array ( 0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2', ), 'array_version' => 3 ) ); if ( ! is_multisite() ) update_user_meta( $user_id, 'show_welcome_panel', 1 ); @@ -253,24 +276,100 @@ As a new WordPress user, you should go to your dashboard to d } endif; +/** + * Maybe enable pretty permalinks on install. + * + * If after enabling pretty permalinks don't work, fallback to query-string permalinks. + * + * @since 4.2.0 + * + * @global WP_Rewrite $wp_rewrite WordPress rewrite component. + * + * @return bool Whether pretty permalinks are enabled. False otherwise. + */ +function wp_install_maybe_enable_pretty_permalinks() { + global $wp_rewrite; + + // Bail if a permalink structure is already enabled. + if ( get_option( 'permalink_structure' ) ) { + return true; + } + + /* + * The Permalink structures to attempt. + * + * The first is designed for mod_rewrite or nginx rewriting. + * + * The second is PATHINFO-based permalinks for web server configurations + * without a true rewrite module enabled. + */ + $permalink_structures = array( + '/%year%/%monthnum%/%day%/%postname%/', + '/index.php/%year%/%monthnum%/%day%/%postname%/' + ); + + foreach ( (array) $permalink_structures as $permalink_structure ) { + $wp_rewrite->set_permalink_structure( $permalink_structure ); + + /* + * Flush rules with the hard option to force refresh of the web-server's + * rewrite config file (e.g. .htaccess or web.config). + */ + $wp_rewrite->flush_rules( true ); + + // Test against a real WordPress Post, or if none were created, a random 404 page. + $test_url = get_permalink( 1 ); + + if ( ! $test_url ) { + $test_url = home_url( '/wordpress-check-for-rewrites/' ); + } + + /* + * Send a request to the site, and check whether + * the 'x-pingback' header is returned as expected. + * + * Uses wp_remote_get() instead of wp_remote_head() because web servers + * can block head requests. + */ + $response = wp_remote_get( $test_url, array( 'timeout' => 5 ) ); + $x_pingback_header = wp_remote_retrieve_header( $response, 'x-pingback' ); + $pretty_permalinks = $x_pingback_header && $x_pingback_header === get_bloginfo( 'pingback_url' ); + + if ( $pretty_permalinks ) { + return true; + } + } + + /* + * If it makes it this far, pretty permalinks failed. + * Fallback to query-string permalinks. + */ + $wp_rewrite->set_permalink_structure( '' ); + $wp_rewrite->flush_rules( true ); + + return false; +} + if ( !function_exists('wp_new_blog_notification') ) : /** - * {@internal Missing Short Description}} + * Notifies the site admin that the setup is complete. * - * {@internal Missing Long Description}} + * Sends an email with wp_mail to the new administrator that the site setup is complete, + * and provides them with a record of their login credentials. * * @since 2.1.0 * - * @param string $blog_title Blog title. - * @param string $blog_url Blog url. - * @param int $user_id User ID. - * @param string $password User's Password. + * @param string $blog_title Site title. + * @param string $blog_url Site url. + * @param int $user_id User ID. + * @param string $password User's Password. */ function wp_new_blog_notification($blog_title, $blog_url, $user_id, $password) { $user = new WP_User( $user_id ); $email = $user->user_email; $name = $user->user_login; - $message = sprintf(__("Your new WordPress site has been successfully set up at: + $login_url = wp_login_url(); + $message = sprintf( __( "Your new WordPress site has been successfully set up at: %1\$s @@ -278,12 +377,13 @@ You can log in to the administrator account with the following information: Username: %2\$s Password: %3\$s +Log in here: %4\$s We hope you enjoy your new site. Thanks! --The WordPress Team https://wordpress.org/ -"), $blog_url, $name, $password); +"), $blog_url, $name, $password, $login_url ); @wp_mail($email, __('New WordPress Site'), $message); } @@ -291,13 +391,15 @@ endif; if ( !function_exists('wp_upgrade') ) : /** - * Run WordPress Upgrade functions. + * Runs WordPress Upgrade functions. * - * {@internal Missing Long Description}} + * Upgrades the database if needed during a site update. * * @since 2.1.0 * - * @return null + * @global int $wp_current_db_version + * @global int $wp_db_version + * @global wpdb $wpdb WordPress database abstraction object. */ function wp_upgrade() { global $wp_current_db_version, $wp_db_version, $wpdb; @@ -342,9 +444,14 @@ endif; /** * Functions to be called in install and upgrade scripts. * - * {@internal Missing Long Description}} + * Contains conditional checks to determine which upgrade scripts to run, + * based on database version and WP version being updated-to. * + * @ignore * @since 1.0.1 + * + * @global int $wp_current_db_version + * @global int $wp_db_version */ function upgrade_all() { global $wp_current_db_version, $wp_db_version; @@ -430,6 +537,21 @@ function upgrade_all() { if ( $wp_current_db_version < 26691 ) upgrade_380(); + if ( $wp_current_db_version < 29630 ) + upgrade_400(); + + if ( $wp_current_db_version < 33055 ) + upgrade_430(); + + if ( $wp_current_db_version < 33056 ) + upgrade_431(); + + if ( $wp_current_db_version < 35700 ) + upgrade_440(); + + if ( $wp_current_db_version < 36686 ) + upgrade_450(); + maybe_disable_link_manager(); maybe_disable_automattic_widgets(); @@ -441,7 +563,10 @@ function upgrade_all() { /** * Execute changes made in WordPress 1.0. * + * @ignore * @since 1.0.0 + * + * @global wpdb $wpdb WordPress database abstraction object. */ function upgrade_100() { global $wpdb; @@ -449,7 +574,7 @@ function upgrade_100() { // Get the title and ID of every post, post_name to check if it already has a value $posts = $wpdb->get_results("SELECT ID, post_title, post_name FROM $wpdb->posts WHERE post_name = ''"); if ($posts) { - foreach($posts as $post) { + foreach ($posts as $post) { if ('' == $post->post_name) { $newtitle = sanitize_title($post->post_title); $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_name = %s WHERE ID = %d", $newtitle, $post->ID) ); @@ -465,12 +590,15 @@ function upgrade_100() { } } - $wpdb->query("UPDATE $wpdb->options SET option_value = REPLACE(option_value, 'wp-links/links-images/', 'wp-images/links/') - WHERE option_name LIKE 'links_rating_image%' - AND option_value LIKE 'wp-links/links-images/%'"); + $sql = "UPDATE $wpdb->options + SET option_value = REPLACE(option_value, 'wp-links/links-images/', 'wp-images/links/') + WHERE option_name LIKE %s + AND option_value LIKE %s"; + $wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( 'links_rating_image' ) . '%', $wpdb->esc_like( 'wp-links/links-images/' ) . '%' ) ); $done_ids = $wpdb->get_results("SELECT DISTINCT post_id FROM $wpdb->post2cat"); if ($done_ids) : + $done_posts = array(); foreach ($done_ids as $done_id) : $done_posts[] = $done_id->post_id; endforeach; @@ -494,7 +622,10 @@ function upgrade_100() { /** * Execute changes made in WordPress 1.0.1. * + * @ignore * @since 1.0.1 + * + * @global wpdb $wpdb WordPress database abstraction object. */ function upgrade_101() { global $wpdb; @@ -512,7 +643,10 @@ function upgrade_101() { /** * Execute changes made in WordPress 1.2. * + * @ignore * @since 1.2.0 + * + * @global wpdb $wpdb WordPress database abstraction object. */ function upgrade_110() { global $wpdb; @@ -572,7 +706,10 @@ function upgrade_110() { /** * Execute changes made in WordPress 1.5. * + * @ignore * @since 1.5.0 + * + * @global wpdb $wpdb WordPress database abstraction object. */ function upgrade_130() { global $wpdb; @@ -580,7 +717,7 @@ function upgrade_130() { // Remove extraneous backslashes. $posts = $wpdb->get_results("SELECT ID, post_title, post_content, post_excerpt, guid, post_date, post_name, post_status, post_author FROM $wpdb->posts"); if ($posts) { - foreach($posts as $post) { + foreach ($posts as $post) { $post_content = addslashes(deslash($post->post_content)); $post_title = addslashes(deslash($post->post_title)); $post_excerpt = addslashes(deslash($post->post_excerpt)); @@ -597,7 +734,7 @@ function upgrade_130() { // Remove extraneous backslashes. $comments = $wpdb->get_results("SELECT comment_ID, comment_author, comment_content FROM $wpdb->comments"); if ($comments) { - foreach($comments as $comment) { + foreach ($comments as $comment) { $comment_content = deslash($comment->comment_content); $comment_author = deslash($comment->comment_author); @@ -608,7 +745,7 @@ function upgrade_130() { // Remove extraneous backslashes. $links = $wpdb->get_results("SELECT link_id, link_name, link_description FROM $wpdb->links"); if ($links) { - foreach($links as $link) { + foreach ($links as $link) { $link_name = deslash($link->link_name); $link_description = deslash($link->link_description); @@ -618,8 +755,10 @@ function upgrade_130() { $active_plugins = __get_option('active_plugins'); - // If plugins are not stored in an array, they're stored in the old - // newline separated format. Convert to new format. + /* + * If plugins are not stored in an array, they're stored in the old + * newline separated format. Convert to new format. + */ if ( !is_array( $active_plugins ) ) { $active_plugins = explode("\n", trim($active_plugins)); update_option('active_plugins', $active_plugins); @@ -654,7 +793,11 @@ function upgrade_130() { /** * Execute changes made in WordPress 2.0. * + * @ignore * @since 2.0.0 + * + * @global wpdb $wpdb WordPress database abstraction object. + * @global int $wp_current_db_version */ function upgrade_160() { global $wpdb, $wp_current_db_version; @@ -709,14 +852,16 @@ function upgrade_160() { $wpdb->query("ALTER TABLE $wpdb->users DROP $old"); $wpdb->show_errors(); - // populate comment_count field of posts table + // Populate comment_count field of posts table. $comments = $wpdb->get_results( "SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID" ); if ( is_array( $comments ) ) foreach ($comments as $comment) $wpdb->update( $wpdb->posts, array('comment_count' => $comment->c), array('ID' => $comment->comment_post_ID) ); - // Some alpha versions used a post status of object instead of attachment and put - // the mime type in post_type instead of post_mime_type. + /* + * Some alpha versions used a post status of object instead of attachment + * and put the mime type in post_type instead of post_mime_type. + */ if ( $wp_current_db_version > 2541 && $wp_current_db_version <= 3091 ) { $objects = $wpdb->get_results("SELECT ID, post_type FROM $wpdb->posts WHERE post_status = 'object'"); foreach ($objects as $object) { @@ -735,7 +880,11 @@ function upgrade_160() { /** * Execute changes made in WordPress 2.1. * + * @ignore * @since 2.1.0 + * + * @global wpdb $wpdb WordPress database abstraction object. + * @global int $wp_current_db_version */ function upgrade_210() { global $wpdb, $wp_current_db_version; @@ -751,7 +900,7 @@ function upgrade_210() { if ( 'static' == $status ) { $status = 'publish'; $type = 'page'; - } else if ( 'attachment' == $status ) { + } elseif ( 'attachment' == $status ) { $status = 'inherit'; $type = 'attachment'; } @@ -779,7 +928,11 @@ function upgrade_210() { /** * Execute changes made in WordPress 2.3. * + * @ignore * @since 2.3.0 + * + * @global wpdb $wpdb WordPress database abstraction object. + * @global int $wp_current_db_version */ function upgrade_230() { global $wp_current_db_version, $wpdb; @@ -873,8 +1026,10 @@ function upgrade_230() { // < 3570 we used linkcategories. >= 3570 we used categories and link2cat. if ( $wp_current_db_version < 3570 ) { - // Create link_category terms for link categories. Create a map of link cat IDs - // to link_category terms. + /* + * Create link_category terms for link categories. Create a map of link + * cat IDs to link_category terms. + */ $link_cat_id_map = array(); $default_link_cat = 0; $tt_ids = array(); @@ -953,7 +1108,10 @@ function upgrade_230() { /** * Remove old options from the database. * + * @ignore * @since 2.3.0 + * + * @global wpdb $wpdb WordPress database abstraction object. */ function upgrade_230_options_table() { global $wpdb; @@ -967,7 +1125,10 @@ function upgrade_230_options_table() { /** * Remove old categories, link2cat, and post2cat database tables. * + * @ignore * @since 2.3.0 + * + * @global wpdb $wpdb WordPress database abstraction object. */ function upgrade_230_old_tables() { global $wpdb; @@ -979,10 +1140,13 @@ function upgrade_230_old_tables() { /** * Upgrade old slugs made in version 2.2. * + * @ignore * @since 2.2.0 + * + * @global wpdb $wpdb WordPress database abstraction object. */ function upgrade_old_slugs() { - // upgrade people who were using the Redirect Old Slugs plugin + // Upgrade people who were using the Redirect Old Slugs plugin. global $wpdb; $wpdb->query("UPDATE $wpdb->postmeta SET meta_key = '_wp_old_slug' WHERE meta_key = 'old_slug'"); } @@ -990,7 +1154,10 @@ function upgrade_old_slugs() { /** * Execute changes made in WordPress 2.5.0. * + * @ignore * @since 2.5.0 + * + * @global int $wp_current_db_version */ function upgrade_250() { global $wp_current_db_version; @@ -1004,7 +1171,10 @@ function upgrade_250() { /** * Execute changes made in WordPress 2.5.2. * + * @ignore * @since 2.5.2 + * + * @global wpdb $wpdb WordPress database abstraction object. */ function upgrade_252() { global $wpdb; @@ -1015,7 +1185,10 @@ function upgrade_252() { /** * Execute changes made in WordPress 2.6. * + * @ignore * @since 2.6.0 + * + * @global int $wp_current_db_version */ function upgrade_260() { global $wp_current_db_version; @@ -1027,7 +1200,11 @@ function upgrade_260() { /** * Execute changes made in WordPress 2.7. * + * @ignore * @since 2.7.0 + * + * @global wpdb $wpdb WordPress database abstraction object. + * @global int $wp_current_db_version */ function upgrade_270() { global $wpdb, $wp_current_db_version; @@ -1043,7 +1220,11 @@ function upgrade_270() { /** * Execute changes made in WordPress 2.8. * + * @ignore * @since 2.8.0 + * + * @global int $wp_current_db_version + * @global wpdb $wpdb WordPress database abstraction object. */ function upgrade_280() { global $wp_current_db_version, $wpdb; @@ -1053,7 +1234,7 @@ function upgrade_280() { if ( is_multisite() ) { $start = 0; while( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) { - foreach( $rows as $row ) { + foreach ( $rows as $row ) { $value = $row->option_value; if ( !@unserialize( $value ) ) $value = stripslashes( $value ); @@ -1070,7 +1251,10 @@ function upgrade_280() { /** * Execute changes made in WordPress 2.9. * + * @ignore * @since 2.9.0 + * + * @global int $wp_current_db_version */ function upgrade_290() { global $wp_current_db_version; @@ -1087,7 +1271,11 @@ function upgrade_290() { /** * Execute changes made in WordPress 3.0. * + * @ignore * @since 3.0.0 + * + * @global int $wp_current_db_version + * @global wpdb $wpdb WordPress database abstraction object. */ function upgrade_300() { global $wp_current_db_version, $wpdb; @@ -1099,10 +1287,29 @@ function upgrade_300() { add_site_option( 'siteurl', '' ); // 3.0 screen options key name changes. - if ( is_main_site() && !defined('DO_NOT_UPGRADE_GLOBAL_TABLES') ) { - $prefix = like_escape($wpdb->base_prefix); - $wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key LIKE '{$prefix}%meta-box-hidden%' OR meta_key LIKE '{$prefix}%closedpostboxes%' OR meta_key LIKE '{$prefix}%manage-%-columns-hidden%' OR meta_key LIKE '{$prefix}%meta-box-order%' OR meta_key LIKE '{$prefix}%metaboxorder%' OR meta_key LIKE '{$prefix}%screen_layout%' - OR meta_key = 'manageedittagscolumnshidden' OR meta_key='managecategoriescolumnshidden' OR meta_key = 'manageedit-tagscolumnshidden' OR meta_key = 'manageeditcolumnshidden' OR meta_key = 'categories_per_page' OR meta_key = 'edit_tags_per_page'" ); + if ( wp_should_upgrade_global_tables() ) { + $sql = "DELETE FROM $wpdb->usermeta + WHERE meta_key LIKE %s + OR meta_key LIKE %s + OR meta_key LIKE %s + OR meta_key LIKE %s + OR meta_key LIKE %s + OR meta_key LIKE %s + OR meta_key = 'manageedittagscolumnshidden' + OR meta_key = 'managecategoriescolumnshidden' + OR meta_key = 'manageedit-tagscolumnshidden' + OR meta_key = 'manageeditcolumnshidden' + OR meta_key = 'categories_per_page' + OR meta_key = 'edit_tags_per_page'"; + $prefix = $wpdb->esc_like( $wpdb->base_prefix ); + $wpdb->query( $wpdb->prepare( $sql, + $prefix . '%' . $wpdb->esc_like( 'meta-box-hidden' ) . '%', + $prefix . '%' . $wpdb->esc_like( 'closedpostboxes' ) . '%', + $prefix . '%' . $wpdb->esc_like( 'manage-' ) . '%' . $wpdb->esc_like( '-columns-hidden' ) . '%', + $prefix . '%' . $wpdb->esc_like( 'meta-box-order' ) . '%', + $prefix . '%' . $wpdb->esc_like( 'metaboxorder' ) . '%', + $prefix . '%' . $wpdb->esc_like( 'screen_layout' ) . '%' + ) ); } } @@ -1110,12 +1317,18 @@ function upgrade_300() { /** * Execute changes made in WordPress 3.3. * + * @ignore * @since 3.3.0 + * + * @global int $wp_current_db_version + * @global wpdb $wpdb + * @global array $wp_registered_widgets + * @global array $sidebars_widgets */ function upgrade_330() { global $wp_current_db_version, $wpdb, $wp_registered_widgets, $sidebars_widgets; - if ( $wp_current_db_version < 19061 && is_main_site() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { + if ( $wp_current_db_version < 19061 && wp_should_upgrade_global_tables() ) { $wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('show_admin_bar_admin', 'plugins_last_view')" ); } @@ -1179,7 +1392,11 @@ function upgrade_330() { /** * Execute changes made in WordPress 3.4. * + * @ignore * @since 3.4.0 + * + * @global int $wp_current_db_version + * @global wpdb $wpdb */ function upgrade_340() { global $wp_current_db_version, $wpdb; @@ -1196,7 +1413,7 @@ function upgrade_340() { $wpdb->show_errors(); } - if ( $wp_current_db_version < 20022 && is_main_site() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { + if ( $wp_current_db_version < 20022 && wp_should_upgrade_global_tables() ) { $wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key = 'themes_last_view'" ); } @@ -1212,7 +1429,11 @@ function upgrade_340() { /** * Execute changes made in WordPress 3.5. * + * @ignore * @since 3.5.0 + * + * @global int $wp_current_db_version + * @global wpdb $wpdb */ function upgrade_350() { global $wp_current_db_version, $wpdb; @@ -1220,7 +1441,7 @@ function upgrade_350() { if ( $wp_current_db_version < 22006 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) ) update_option( 'link_manager_enabled', 1 ); // Previously set to 0 by populate_options() - if ( $wp_current_db_version < 21811 && is_main_site() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { + if ( $wp_current_db_version < 21811 && wp_should_upgrade_global_tables() ) { $meta_keys = array(); foreach ( array_merge( get_post_types(), get_taxonomies() ) as $name ) { if ( false !== strpos( $name, '-' ) ) @@ -1239,7 +1460,10 @@ function upgrade_350() { /** * Execute changes made in WordPress 3.7. * + * @ignore * @since 3.7.0 + * + * @global int $wp_current_db_version */ function upgrade_370() { global $wp_current_db_version; @@ -1250,8 +1474,11 @@ function upgrade_370() { /** * Execute changes made in WordPress 3.7.2. * + * @ignore * @since 3.7.2 * @since 3.8.0 + * + * @global int $wp_current_db_version */ function upgrade_372() { global $wp_current_db_version; @@ -1262,7 +1489,10 @@ function upgrade_372() { /** * Execute changes made in WordPress 3.8.0. * + * @ignore * @since 3.8.0 + * + * @global int $wp_current_db_version */ function upgrade_380() { global $wp_current_db_version; @@ -1270,28 +1500,221 @@ function upgrade_380() { deactivate_plugins( array( 'mp6/mp6.php' ), true ); } } + +/** + * Execute changes made in WordPress 4.0.0. + * + * @ignore + * @since 4.0.0 + * + * @global int $wp_current_db_version + */ +function upgrade_400() { + global $wp_current_db_version; + if ( $wp_current_db_version < 29630 ) { + if ( ! is_multisite() && false === get_option( 'WPLANG' ) ) { + if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && in_array( WPLANG, get_available_languages() ) ) { + update_option( 'WPLANG', WPLANG ); + } else { + update_option( 'WPLANG', '' ); + } + } + } +} + /** - * Execute network level changes + * Execute changes made in WordPress 4.2.0. + * + * @ignore + * @since 4.2.0 + * + * @global int $wp_current_db_version + * @global wpdb $wpdb + */ +function upgrade_420() {} + +/** + * Executes changes made in WordPress 4.3.0. + * + * @ignore + * @since 4.3.0 + * + * @global int $wp_current_db_version Current version. + * @global wpdb $wpdb WordPress database abstraction object. + */ +function upgrade_430() { + global $wp_current_db_version, $wpdb; + + if ( $wp_current_db_version < 32364 ) { + upgrade_430_fix_comments(); + } + + // Shared terms are split in a separate process. + if ( $wp_current_db_version < 32814 ) { + update_option( 'finished_splitting_shared_terms', 0 ); + wp_schedule_single_event( time() + ( 1 * MINUTE_IN_SECONDS ), 'wp_split_shared_term_batch' ); + } + + if ( $wp_current_db_version < 33055 && 'utf8mb4' === $wpdb->charset ) { + if ( is_multisite() ) { + $tables = $wpdb->tables( 'blog' ); + } else { + $tables = $wpdb->tables( 'all' ); + if ( ! wp_should_upgrade_global_tables() ) { + $global_tables = $wpdb->tables( 'global' ); + $tables = array_diff_assoc( $tables, $global_tables ); + } + } + + foreach ( $tables as $table ) { + maybe_convert_table_to_utf8mb4( $table ); + } + } +} + +/** + * Executes comments changes made in WordPress 4.3.0. + * + * @ignore + * @since 4.3.0 + * + * @global int $wp_current_db_version Current version. + * @global wpdb $wpdb WordPress database abstraction object. + */ +function upgrade_430_fix_comments() { + global $wp_current_db_version, $wpdb; + + $content_length = $wpdb->get_col_length( $wpdb->comments, 'comment_content' ); + + if ( is_wp_error( $content_length ) ) { + return; + } + + if ( false === $content_length ) { + $content_length = array( + 'type' => 'byte', + 'length' => 65535, + ); + } elseif ( ! is_array( $content_length ) ) { + $length = (int) $content_length > 0 ? (int) $content_length : 65535; + $content_length = array( + 'type' => 'byte', + 'length' => $length + ); + } + + if ( 'byte' !== $content_length['type'] || 0 === $content_length['length'] ) { + // Sites with malformed DB schemas are on their own. + return; + } + + $allowed_length = intval( $content_length['length'] ) - 10; + + $comments = $wpdb->get_results( + "SELECT `comment_ID` FROM `{$wpdb->comments}` + WHERE `comment_date_gmt` > '2015-04-26' + AND LENGTH( `comment_content` ) >= {$allowed_length} + AND ( `comment_content` LIKE '%<%' OR `comment_content` LIKE '%>%' )" + ); + + foreach ( $comments as $comment ) { + wp_delete_comment( $comment->comment_ID, true ); + } +} + +/** + * Executes changes made in WordPress 4.3.1. + * + * @ignore + * @since 4.3.1 + */ +function upgrade_431() { + // Fix incorrect cron entries for term splitting + $cron_array = _get_cron_array(); + if ( isset( $cron_array['wp_batch_split_terms'] ) ) { + unset( $cron_array['wp_batch_split_terms'] ); + _set_cron_array( $cron_array ); + } +} + +/** + * Executes changes made in WordPress 4.4.0. + * + * @ignore + * @since 4.4.0 + * + * @global int $wp_current_db_version Current version. + * @global wpdb $wpdb WordPress database abstraction object. + */ +function upgrade_440() { + global $wp_current_db_version, $wpdb; + + if ( $wp_current_db_version < 34030 ) { + $wpdb->query( "ALTER TABLE {$wpdb->options} MODIFY option_name VARCHAR(191)" ); + } + + // Remove the unused 'add_users' role. + $roles = wp_roles(); + foreach ( $roles->role_objects as $role ) { + if ( $role->has_cap( 'add_users' ) ) { + $role->remove_cap( 'add_users' ); + } + } +} + +/** + * Executes changes made in WordPress 4.5.0. + * + * @ignore + * @since 4.5.0 + * + * @global int $wp_current_db_version Current database version. + * @global wpdb $wpdb WordPress database abstraction object. + */ +function upgrade_450() { + global $wp_current_db_version, $wpdb; + + if ( $wp_current_db_version < 36180 ) { + wp_clear_scheduled_hook( 'wp_maybe_auto_update' ); + } + + // Remove unused email confirmation options, moved to usermeta. + if ( $wp_current_db_version < 36679 && is_multisite() ) { + $wpdb->query( "DELETE FROM $wpdb->options WHERE option_name REGEXP '^[0-9]+_new_email$'" ); + } + + // Remove unused user setting for wpLink. + delete_user_setting( 'wplink' ); +} + +/** + * Executes network-level upgrade routines. * * @since 3.0.0 + * + * @global int $wp_current_db_version + * @global wpdb $wpdb */ function upgrade_network() { global $wp_current_db_version, $wpdb; - // Always + // Always. if ( is_main_network() ) { - // Deletes all expired transients. - // The multi-table delete syntax is used to delete the transient record from table a, - // and the corresponding transient_timeout record from table b. + /* + * Deletes all expired transients. The multi-table delete syntax is used + * to delete the transient record from table a, and the corresponding + * transient_timeout record from table b. + */ $time = time(); - $wpdb->query("DELETE a, b FROM $wpdb->sitemeta a, $wpdb->sitemeta b WHERE - a.meta_key LIKE '\_site\_transient\_%' AND - a.meta_key NOT LIKE '\_site\_transient\_timeout\_%' AND - b.meta_key = CONCAT( '_site_transient_timeout_', SUBSTRING( a.meta_key, 17 ) ) - AND b.meta_value < $time"); + $sql = "DELETE a, b FROM $wpdb->sitemeta a, $wpdb->sitemeta b + WHERE a.meta_key LIKE %s + AND a.meta_key NOT LIKE %s + AND b.meta_key = CONCAT( '_site_transient_timeout_', SUBSTRING( a.meta_key, 17 ) ) + AND b.meta_value < %d"; + $wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_site_transient_' ) . '%', $wpdb->esc_like ( '_site_transient_timeout_' ) . '%', $time ) ); } - // 2.8 + // 2.8. if ( $wp_current_db_version < 11549 ) { $wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' ); $active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' ); @@ -1308,7 +1731,7 @@ function upgrade_network() { $start = 0; while( $rows = $wpdb->get_results( "SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20" ) ) { - foreach( $rows as $row ) { + foreach ( $rows as $row ) { $value = $row->meta_value; if ( !@unserialize( $value ) ) $value = stripslashes( $value ); @@ -1363,45 +1786,106 @@ function upgrade_network() { update_site_option( 'illegal_names', $illegal_names ); } } -} -// The functions we use to actually do stuff + // 4.2 + if ( $wp_current_db_version < 31351 && $wpdb->charset === 'utf8mb4' ) { + if ( wp_should_upgrade_global_tables() ) { + $wpdb->query( "ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" ); + $wpdb->query( "ALTER TABLE $wpdb->site DROP INDEX domain, ADD INDEX domain(domain(140),path(51))" ); + $wpdb->query( "ALTER TABLE $wpdb->sitemeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" ); + $wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))" ); -// General + $tables = $wpdb->tables( 'global' ); + + // sitecategories may not exist. + if ( ! $wpdb->get_var( "SHOW TABLES LIKE '{$tables['sitecategories']}'" ) ) { + unset( $tables['sitecategories'] ); + } + + foreach ( $tables as $table ) { + maybe_convert_table_to_utf8mb4( $table ); + } + } + } + + // 4.3 + if ( $wp_current_db_version < 33055 && 'utf8mb4' === $wpdb->charset ) { + if ( wp_should_upgrade_global_tables() ) { + $upgrade = false; + $indexes = $wpdb->get_results( "SHOW INDEXES FROM $wpdb->signups" ); + foreach ( $indexes as $index ) { + if ( 'domain_path' == $index->Key_name && 'domain' == $index->Column_name && 140 != $index->Sub_part ) { + $upgrade = true; + break; + } + } + + if ( $upgrade ) { + $wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))" ); + } + + $tables = $wpdb->tables( 'global' ); + + // sitecategories may not exist. + if ( ! $wpdb->get_var( "SHOW TABLES LIKE '{$tables['sitecategories']}'" ) ) { + unset( $tables['sitecategories'] ); + } + + foreach ( $tables as $table ) { + maybe_convert_table_to_utf8mb4( $table ); + } + } + } +} + +// +// General functions we use to actually do stuff +// /** - * {@internal Missing Short Description}} + * Creates a table in the database if it doesn't already exist. * - * {@internal Missing Long Description}} + * This method checks for an existing database and creates a new one if it's not + * already present. It doesn't rely on MySQL's "IF NOT EXISTS" statement, but chooses + * to query all tables first and then run the SQL statement creating the table. * * @since 1.0.0 * + * @global wpdb $wpdb + * * @param string $table_name Database table name to create. * @param string $create_ddl SQL statement to create table. * @return bool If table already exists or was created by function. */ function maybe_create_table($table_name, $create_ddl) { global $wpdb; - if ( $wpdb->get_var("SHOW TABLES LIKE '$table_name'") == $table_name ) + + $query = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $table_name ) ); + + if ( $wpdb->get_var( $query ) == $table_name ) { return true; - //didn't find it try to create it. - $q = $wpdb->query($create_ddl); - // we cannot directly tell that whether this succeeded! - if ( $wpdb->get_var("SHOW TABLES LIKE '$table_name'") == $table_name ) + } + + // Didn't find it try to create it.. + $wpdb->query($create_ddl); + + // We cannot directly tell that whether this succeeded! + if ( $wpdb->get_var( $query ) == $table_name ) { return true; + } return false; } /** - * {@internal Missing Short Description}} - * - * {@internal Missing Long Description}} + * Drops a specified index from a table. * * @since 1.0.1 * + * @global wpdb $wpdb + * * @param string $table Database table name. * @param string $index Index name to drop. - * @return bool True, when finished. + * @return true True, when finished. */ function drop_index($table, $index) { global $wpdb; @@ -1416,15 +1900,15 @@ function drop_index($table, $index) { } /** - * {@internal Missing Short Description}} - * - * {@internal Missing Long Description}} + * Adds an index to a specified table. * * @since 1.0.1 * + * @global wpdb $wpdb + * * @param string $table Database table name. * @param string $index Database table index column. - * @return bool True, when done with execution. + * @return true True, when done with execution. */ function add_clean_index($table, $index) { global $wpdb; @@ -1434,10 +1918,16 @@ function add_clean_index($table, $index) { } /** - ** maybe_add_column() - ** Add column to db table if it doesn't exist. - ** Returns: true if already exists or on successful completion - ** false on error + * Adds column to a database table if it doesn't already exist. + * + * @since 1.3.0 + * + * @global wpdb $wpdb + * + * @param string $table_name The table name to modify. + * @param string $column_name The column name to add to the table. + * @param string $create_ddl The SQL statement used to add the column. + * @return bool True if already exists or on successful completion, false on error. */ function maybe_add_column($table_name, $column_name, $create_ddl) { global $wpdb; @@ -1446,9 +1936,11 @@ function maybe_add_column($table_name, $column_name, $create_ddl) { return true; } } - //didn't find it try to create it. - $q = $wpdb->query($create_ddl); - // we cannot directly tell that whether this succeeded! + + // Didn't find it try to create it. + $wpdb->query($create_ddl); + + // We cannot directly tell that whether this succeeded! foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) { if ($column == $column_name) { return true; @@ -1457,12 +1949,57 @@ function maybe_add_column($table_name, $column_name, $create_ddl) { return false; } +/** + * If a table only contains utf8 or utf8mb4 columns, convert it to utf8mb4. + * + * @since 4.2.0 + * + * @global wpdb $wpdb + * + * @param string $table The table to convert. + * @return bool true if the table was converted, false if it wasn't. + */ +function maybe_convert_table_to_utf8mb4( $table ) { + global $wpdb; + + $results = $wpdb->get_results( "SHOW FULL COLUMNS FROM `$table`" ); + if ( ! $results ) { + return false; + } + + foreach ( $results as $column ) { + if ( $column->Collation ) { + list( $charset ) = explode( '_', $column->Collation ); + $charset = strtolower( $charset ); + if ( 'utf8' !== $charset && 'utf8mb4' !== $charset ) { + // Don't upgrade tables that have non-utf8 columns. + return false; + } + } + } + + $table_details = $wpdb->get_row( "SHOW TABLE STATUS LIKE '$table'" ); + if ( ! $table_details ) { + return false; + } + + list( $table_charset ) = explode( '_', $table_details->Collation ); + $table_charset = strtolower( $table_charset ); + if ( 'utf8mb4' === $table_charset ) { + return true; + } + + return $wpdb->query( "ALTER TABLE $table CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci" ); +} + /** * Retrieve all options as it was for 1.2. * * @since 1.2.0 * - * @return array List of options. + * @global wpdb $wpdb + * + * @return stdClass List of options. */ function get_alloptions_110() { global $wpdb; @@ -1478,11 +2015,14 @@ function get_alloptions_110() { } /** - * Version of get_option that is private to install/upgrade. + * Utility version of get_option that is private to install/upgrade. * + * @ignore * @since 1.5.1 * @access private * + * @global wpdb $wpdb + * * @param string $setting Option name. * @return mixed */ @@ -1507,24 +2047,26 @@ function __get_option($setting) { } /** - * {@internal Missing Short Description}} - * - * {@internal Missing Long Description}} + * Filters for content to remove unnecessary slashes. * * @since 1.5.0 * - * @param string $content - * @return string + * @param string $content The content to modify. + * @return string The de-slashed content. */ function deslash($content) { // Note: \\\ inside a regex denotes a single backslash. - // Replace one or more backslashes followed by a single quote with - // a single quote. + /* + * Replace one or more backslashes followed by a single quote with + * a single quote. + */ $content = preg_replace("/\\\+'/", "'", $content); - // Replace one or more backslashes followed by a double quote with - // a double quote. + /* + * Replace one or more backslashes followed by a double quote with + * a double quote. + */ $content = preg_replace('/\\\+"/', '"', $content); // Replace one or more backslashes with one backslash. @@ -1534,15 +2076,20 @@ function deslash($content) { } /** - * {@internal Missing Short Description}} + * Modifies the database based on specified SQL statements. * - * {@internal Missing Long Description}} + * Useful for creating new tables and updating existing tables to a new structure. * * @since 1.5.0 * - * @param unknown_type $queries - * @param unknown_type $execute - * @return unknown + * @global wpdb $wpdb + * + * @param string|array $queries Optional. The query to run. Can be multiple queries + * in an array, or a string of queries separated by + * semicolons. Default empty. + * @param bool $execute Optional. Whether or not to execute the query right away. + * Default true. + * @return array Strings containing the results of the various update queries. */ function dbDelta( $queries = '', $execute = true ) { global $wpdb; @@ -1555,8 +2102,8 @@ function dbDelta( $queries = '', $execute = true ) { $queries = explode( ';', $queries ); $queries = array_filter( $queries ); } - - /** + + /** * Filter the dbDelta SQL queries. * * @since 3.3.0 @@ -1570,37 +2117,37 @@ function dbDelta( $queries = '', $execute = true ) { $for_update = array(); // Create a tablename index for an array ($cqueries) of queries - foreach($queries as $qry) { - if (preg_match("|CREATE TABLE ([^ ]*)|", $qry, $matches)) { + foreach ($queries as $qry) { + if ( preg_match( "|CREATE TABLE ([^ ]*)|", $qry, $matches ) ) { $cqueries[ trim( $matches[1], '`' ) ] = $qry; $for_update[$matches[1]] = 'Created table '.$matches[1]; - } else if (preg_match("|CREATE DATABASE ([^ ]*)|", $qry, $matches)) { - array_unshift($cqueries, $qry); - } else if (preg_match("|INSERT INTO ([^ ]*)|", $qry, $matches)) { + } elseif ( preg_match( "|CREATE DATABASE ([^ ]*)|", $qry, $matches ) ) { + array_unshift( $cqueries, $qry ); + } elseif ( preg_match( "|INSERT INTO ([^ ]*)|", $qry, $matches ) ) { $iqueries[] = $qry; - } else if (preg_match("|UPDATE ([^ ]*)|", $qry, $matches)) { + } elseif ( preg_match( "|UPDATE ([^ ]*)|", $qry, $matches ) ) { $iqueries[] = $qry; } else { // Unrecognized query type } } - - /** + + /** * Filter the dbDelta SQL queries for creating tables and/or databases. * * Queries filterable via this hook contain "CREATE TABLE" or "CREATE DATABASE". - * + * * @since 3.3.0 * * @param array $cqueries An array of dbDelta create SQL queries. */ $cqueries = apply_filters( 'dbdelta_create_queries', $cqueries ); - /** + /** * Filter the dbDelta SQL queries for inserting or updating. * * Queries filterable via this hook contain "INSERT INTO" or "UPDATE". - * + * * @since 3.3.0 * * @param array $iqueries An array of dbDelta insert or update SQL queries. @@ -1609,8 +2156,8 @@ function dbDelta( $queries = '', $execute = true ) { $global_tables = $wpdb->tables( 'global' ); foreach ( $cqueries as $table => $qry ) { - // Upgrade global tables only for the main site. Don't upgrade at all if DO_NOT_UPGRADE_GLOBAL_TABLES is defined. - if ( in_array( $table, $global_tables ) && ( !is_main_site() || defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) ) { + // Upgrade global tables only for the main site. Don't upgrade at all if conditions are not optimal. + if ( in_array( $table, $global_tables ) && ! wp_should_upgrade_global_tables() ) { unset( $cqueries[ $table ], $for_update[ $table ] ); continue; } @@ -1623,24 +2170,27 @@ function dbDelta( $queries = '', $execute = true ) { if ( ! $tablefields ) continue; - // Clear the field and index arrays + // Clear the field and index arrays. $cfields = $indices = array(); - // Get all of the field names in the query from between the parens + + // Get all of the field names in the query from between the parentheses. preg_match("|$(.*)$|ms", $qry, $match2); $qryline = trim($match2[1]); - // Separate field lines into an array + // Separate field lines into an array. $flds = explode("\n", $qryline); + // todo: Remove this? //echo "

\n".print_r(strtolower($table), true).":\n".print_r($cqueries, true)."

"; - // For every field line specified in the query + // For every field line specified in the query. foreach ($flds as $fld) { - // Extract the field name + + // Extract the field name. preg_match("|^([^ ]*)|", trim($fld), $fvals); $fieldname = trim( $fvals[1], '`' ); - // Verify the found field name + // Verify the found field name. $validfield = true; switch (strtolower($fieldname)) { case '': @@ -1655,17 +2205,19 @@ function dbDelta( $queries = '', $execute = true ) { } $fld = trim($fld); - // If it's a valid field, add it to the field array + // If it's a valid field, add it to the field array. if ($validfield) { $cfields[strtolower($fieldname)] = trim($fld, ", \n"); } } - // For every field in the table + // For every field in the table. foreach ($tablefields as $tablefield) { - // If the table field exists in the field array... + + // If the table field exists in the field array ... if (array_key_exists(strtolower($tablefield->Field), $cfields)) { - // Get the field type from the query + + // Get the field type from the query. preg_match("|".$tablefield->Field." ([^ ]*( unsigned)?)|i", $cfields[strtolower($tablefield->Field)], $matches); $fieldtype = $matches[1]; @@ -1677,6 +2229,7 @@ function dbDelta( $queries = '', $execute = true ) { } // Get the default value from the array + // todo: Remove this? //echo "{$cfields[strtolower($tablefield->Field)]}
"; if (preg_match("| DEFAULT '(.*?)'|i", $cfields[strtolower($tablefield->Field)], $matches)) { $default_value = $matches[1]; @@ -1687,83 +2240,104 @@ function dbDelta( $queries = '', $execute = true ) { } } - // Remove the field from the array (so it's not added) + // Remove the field from the array (so it's not added). unset($cfields[strtolower($tablefield->Field)]); } else { // This field exists in the table, but not in the creation queries? } } - // For every remaining field specified for the table + // For every remaining field specified for the table. foreach ($cfields as $fieldname => $fielddef) { - // Push a query line into $cqueries that adds the field to that table + // Push a query line into $cqueries that adds the field to that table. $cqueries[] = "ALTER TABLE {$table} ADD COLUMN $fielddef"; $for_update[$table.'.'.$fieldname] = 'Added column '.$table.'.'.$fieldname; } - // Index stuff goes here - // Fetch the table index structure from the database + // Index stuff goes here. Fetch the table index structure from the database. $tableindices = $wpdb->get_results("SHOW INDEX FROM {$table};"); if ($tableindices) { - // Clear the index array - unset($index_ary); + // Clear the index array. + $index_ary = array(); - // For every index in the table + // For every index in the table. foreach ($tableindices as $tableindex) { - // Add the index to the index data array + + // Add the index to the index data array. $keyname = $tableindex->Key_name; $index_ary[$keyname]['columns'][] = array('fieldname' => $tableindex->Column_name, 'subpart' => $tableindex->Sub_part); $index_ary[$keyname]['unique'] = ($tableindex->Non_unique == 0)?true:false; + $index_ary[$keyname]['index_type'] = $tableindex->Index_type; } - // For each actual index in the index array + // For each actual index in the index array. foreach ($index_ary as $index_name => $index_data) { - // Build a create string to compare to the query + + // Build a create string to compare to the query. $index_string = ''; if ($index_name == 'PRIMARY') { $index_string .= 'PRIMARY '; - } else if($index_data['unique']) { + } elseif ( $index_data['unique'] ) { $index_string .= 'UNIQUE '; } + if ( 'FULLTEXT' === strtoupper( $index_data['index_type'] ) ) { + $index_string .= 'FULLTEXT '; + } $index_string .= 'KEY '; if ($index_name != 'PRIMARY') { $index_string .= $index_name; } $index_columns = ''; - // For each column in the index + + // For each column in the index. foreach ($index_data['columns'] as $column_data) { if ($index_columns != '') $index_columns .= ','; - // Add the field to the column list string + + // Add the field to the column list string. $index_columns .= $column_data['fieldname']; if ($column_data['subpart'] != '') { $index_columns .= '('.$column_data['subpart'].')'; } } - // Add the column list to the index create string - $index_string .= ' ('.$index_columns.')'; - if (!(($aindex = array_search($index_string, $indices)) === false)) { - unset($indices[$aindex]); - //echo "

{$table}:
Found index:".$index_string."

\n"; + + // The alternative index string doesn't care about subparts + $alt_index_columns = preg_replace( '/$[^)]*$/', '', $index_columns ); + + // Add the column list to the index create string. + $index_strings = array( + "$index_string ($index_columns)", + "$index_string ($alt_index_columns)", + ); + + foreach ( $index_strings as $index_string ) { + if ( ! ( ( $aindex = array_search( $index_string, $indices ) ) === false ) ) { + unset( $indices[ $aindex ] ); + break; + // todo: Remove this? + //echo "

{$table}:
Found index:".$index_string."

\n"; + } } + // todo: Remove this? //else echo "

{$table}:
Did not find index:".$index_string."
".print_r($indices, true)."

\n"; } } - // For every remaining index specified for the table + // For every remaining index specified for the table. foreach ( (array) $indices as $index ) { - // Push a query line into $cqueries that adds the index to that table + // Push a query line into $cqueries that adds the index to that table. $cqueries[] = "ALTER TABLE {$table} ADD $index"; $for_update[] = 'Added index ' . $table . ' ' . $index; } - // Remove the original table creation query from processing + // Remove the original table creation query from processing. unset( $cqueries[ $table ], $for_update[ $table ] ); } $allqueries = array_merge($cqueries, $iqueries); if ($execute) { foreach ($allqueries as $query) { + // todo: Remove this? //echo "

".print_r($query, true)."

\n"; $wpdb->query($query); } @@ -1773,40 +2347,50 @@ function dbDelta( $queries = '', $execute = true ) { } /** - * {@internal Missing Short Description}} + * Updates the database tables to a new schema. * - * {@internal Missing Long Description}} + * By default, updates all the tables to use the latest defined schema, but can also + * be used to update a specific set of tables in wp_get_db_schema(). * * @since 1.5.0 + * + * @uses dbDelta + * + * @param string $tables Optional. Which set of tables to update. Default is 'all'. */ function make_db_current( $tables = 'all' ) { $alterations = dbDelta( $tables ); echo "

$alteration
$alteration

\n"; } /** - * {@internal Missing Short Description}} + * Updates the database tables to a new schema, but without displaying results. * - * {@internal Missing Long Description}} + * By default, updates all the tables to use the latest defined schema, but can + * also be used to update a specific set of tables in wp_get_db_schema(). * * @since 1.5.0 + * + * @see make_db_current() + * + * @param string $tables Optional. Which set of tables to update. Default is 'all'. */ function make_db_current_silent( $tables = 'all' ) { - $alterations = dbDelta( $tables ); + dbDelta( $tables ); } /** - * {@internal Missing Short Description}} + * Creates a site theme from an existing theme. * * {@internal Missing Long Description}} * * @since 1.5.0 * - * @param unknown_type $theme_name - * @param unknown_type $template - * @return unknown + * @param string $theme_name The name of the theme. + * @param string $template The directory name of the theme. + * @return bool */ function make_site_theme_from_oldschool($theme_name, $template) { $home_path = get_home_path(); @@ -1815,9 +2399,10 @@ function make_site_theme_from_oldschool($theme_name, $template) { if (! file_exists("$home_path/index.php")) return false; - // Copy files from the old locations to the site theme. - // TODO: This does not copy arbitrary include dependencies. Only the - // standard WP files are copied. + /* + * Copy files from the old locations to the site theme. + * TODO: This does not copy arbitrary include dependencies. Only the standard WP files are copied. + */ $files = array('index.php' => 'index.php', 'wp-layout.css' => 'style.css', 'wp-comments.php' => 'comments.php', 'wp-comments-popup.php' => 'comments-popup.php'); foreach ($files as $oldfile => $newfile) { @@ -1826,13 +2411,16 @@ function make_site_theme_from_oldschool($theme_name, $template) { else $oldpath = ABSPATH; - if ($oldfile == 'index.php') { // Check to make sure it's not a new index + // Check to make sure it's not a new index. + if ($oldfile == 'index.php') { $index = implode('', file("$oldpath/$oldfile")); if (strpos($index, 'WP_USE_THEMES') !== false) { if (! @copy(WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile")) return false; - continue; // Don't copy anything - } + + // Don't copy anything. + continue; + } } if (! @copy("$oldpath/$oldfile", "$site_dir/$newfile")) @@ -1877,15 +2465,15 @@ function make_site_theme_from_oldschool($theme_name, $template) { } /** - * {@internal Missing Short Description}} + * Creates a site theme from the default theme. * * {@internal Missing Long Description}} * * @since 1.5.0 * - * @param unknown_type $theme_name - * @param unknown_type $template - * @return unknown + * @param string $theme_name The name of the theme. + * @param string $template The directory name of the theme. + * @return false|void */ function make_site_theme_from_default($theme_name, $template) { $site_dir = WP_CONTENT_DIR . "/themes/$template"; @@ -1941,15 +2529,14 @@ function make_site_theme_from_default($theme_name, $template) { @closedir($images_dir); } -// Create a site theme from the default theme. /** - * {@internal Missing Short Description}} + * Creates a site theme. * * {@internal Missing Long Description}} * * @since 1.5.0 * - * @return unknown + * @return false|string */ function make_site_theme() { // Name the theme after the blog. @@ -2022,11 +2609,11 @@ function translate_level_to_role($level) { } /** - * {@internal Missing Short Description}} - * - * {@internal Missing Long Description}} + * Checks the version of the installed MySQL binary. * * @since 2.1.0 + * + * @global wpdb $wpdb */ function wp_check_mysql_version() { global $wpdb; @@ -2053,9 +2640,12 @@ function maybe_disable_automattic_widgets() { } /** - * Disables the Link Manager on upgrade, if at the time of upgrade, no links exist in the DB. + * Disables the Link Manager on upgrade if, at the time of upgrade, no links exist in the DB. * * @since 3.5.0 + * + * @global int $wp_current_db_version + * @global wpdb $wpdb WordPress database abstraction object. */ function maybe_disable_link_manager() { global $wp_current_db_version, $wpdb; @@ -2068,6 +2658,9 @@ function maybe_disable_link_manager() { * Runs before the schema is upgraded. * * @since 2.9.0 + * + * @global int $wp_current_db_version + * @global wpdb $wpdb WordPress database abstraction object. */ function pre_schema_upgrade() { global $wp_current_db_version, $wpdb; @@ -2085,7 +2678,7 @@ function pre_schema_upgrade() { } // Multisite schema upgrades. - if ( $wp_current_db_version < 25448 && is_multisite() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) && is_main_network() ) { + if ( $wp_current_db_version < 25448 && is_multisite() && wp_should_upgrade_global_tables() ) { // Upgrade verions prior to 3.7 if ( $wp_current_db_version < 25179 ) { @@ -2100,6 +2693,27 @@ function pre_schema_upgrade() { $wpdb->query( "ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived tinyint(2) NOT NULL default 0" ); } } + + // Upgrade versions prior to 4.2. + if ( $wp_current_db_version < 31351 ) { + if ( ! is_multisite() && wp_should_upgrade_global_tables() ) { + $wpdb->query( "ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" ); + } + $wpdb->query( "ALTER TABLE $wpdb->terms DROP INDEX slug, ADD INDEX slug(slug(191))" ); + $wpdb->query( "ALTER TABLE $wpdb->terms DROP INDEX name, ADD INDEX name(name(191))" ); + $wpdb->query( "ALTER TABLE $wpdb->commentmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" ); + $wpdb->query( "ALTER TABLE $wpdb->postmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" ); + $wpdb->query( "ALTER TABLE $wpdb->posts DROP INDEX post_name, ADD INDEX post_name(post_name(191))" ); + } + + // Upgrade versions prior to 4.4. + if ( $wp_current_db_version < 34978 ) { + // If compatible termmeta table is found, use it, but enforce a proper index and update collation. + if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->termmeta}'" ) && $wpdb->get_results( "SHOW INDEX FROM {$wpdb->termmeta} WHERE Column_name = 'meta_key'" ) ) { + $wpdb->query( "ALTER TABLE $wpdb->termmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" ); + maybe_convert_table_to_utf8mb4( $wpdb->termmeta ); + } + } } /** @@ -2107,6 +2721,8 @@ function pre_schema_upgrade() { * * @since 3.0.0 * + * @global wpdb $wpdb + * @global string $charset_collate */ if ( !function_exists( 'install_global_terms' ) ) : function install_global_terms() { @@ -2126,3 +2742,49 @@ CREATE TABLE $wpdb->sitecategories ( dbDelta( $ms_queries ); } endif; + +/** + * Determine if global tables should be upgraded. + * + * This function performs a series of checks to ensure the environment allows + * for the safe upgrading of global WordPress database tables. It is necessary + * because global tables will commonly grow to millions of rows on large + * installations, and the ability to control their upgrade routines can be + * critical to the operation of large networks. + * + * In a future iteration, this function may use `wp_is_large_network()` to more- + * intelligently prevent global table upgrades. Until then, we make sure + * WordPress is on the main site of the main network, to avoid running queries + * more than once in multi-site or multi-network environments. + * + * @since 4.3.0 + * + * @return bool Whether to run the upgrade routines on global tables. + */ +function wp_should_upgrade_global_tables() { + + // Return false early if explicitly not upgrading + if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { + return false; + } + + // Assume global tables should be upgraded + $should_upgrade = true; + + // Set to false if not on main network (does not matter if not multi-network) + if ( ! is_main_network() ) { + $should_upgrade = false; + } + + // Set to false if not on main site of current network (does not matter if not multi-site) + if ( ! is_main_site() ) { + $should_upgrade = false; + } + + /** + * Filter if upgrade routines should be run on global tables. + * + * @param bool $should_upgrade Whether to run the upgrade routines on global tables. + */ + return apply_filters( 'wp_should_upgrade_global_tables', $should_upgrade ); +} diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php index 137afcd..d92d2ae 100644 --- a/wp-admin/includes/user.php +++ b/wp-admin/includes/user.php @@ -11,7 +11,7 @@ * * @since 2.0.0 * - * @return null|WP_Error|int Null when adding user, WP_Error or User ID integer when no parameters. + * @return int|WP_Error WP_Error or User ID. */ function add_user() { return edit_user(); @@ -25,10 +25,10 @@ function add_user() { * @since 2.0.0 * * @param int $user_id Optional. User ID. - * @return int user id of the updated user + * @return int|WP_Error user id of the updated user */ function edit_user( $user_id = 0 ) { - global $wp_roles, $wpdb; + $wp_roles = wp_roles(); $user = new stdClass; if ( $user_id ) { $update = true; @@ -63,7 +63,7 @@ function edit_user( $user_id = 0 ) { } if ( isset( $_POST['email'] )) - $user->user_email = sanitize_text_field( $_POST['email'] ); + $user->user_email = sanitize_text_field( wp_unslash( $_POST['email'] ) ); if ( isset( $_POST['url'] ) ) { if ( empty ( $_POST['url'] ) || $_POST['url'] == 'http://' ) { $user->user_url = ''; @@ -108,7 +108,11 @@ function edit_user( $user_id = 0 ) { if ( $user->user_login == '' ) $errors->add( 'user_login', __( 'ERROR: Please enter a username.' ) ); - /* checking the password has been typed twice */ + /* checking that nickname has been typed */ + if ( $update && empty( $user->nickname ) ) { + $errors->add( 'nickname', __( 'ERROR: Please enter a nickname.' ) ); + } + /** * Fires before the password and confirm password fields are checked for congruity. * @@ -120,25 +124,20 @@ function edit_user( $user_id = 0 ) { */ do_action_ref_array( 'check_passwords', array( $user->user_login, &$pass1, &$pass2 ) ); - if ( $update ) { - if ( empty($pass1) && !empty($pass2) ) - $errors->add( 'pass', __( 'ERROR: You entered your new password only once.' ), array( 'form-field' => 'pass1' ) ); - elseif ( !empty($pass1) && empty($pass2) ) - $errors->add( 'pass', __( 'ERROR: You entered your new password only once.' ), array( 'form-field' => 'pass2' ) ); - } else { - if ( empty($pass1) ) - $errors->add( 'pass', __( 'ERROR: Please enter your password.' ), array( 'form-field' => 'pass1' ) ); - elseif ( empty($pass2) ) - $errors->add( 'pass', __( 'ERROR: Please enter your password twice.' ), array( 'form-field' => 'pass2' ) ); + // Check for blank password when adding a user. + if ( ! $update && empty( $pass1 ) ) { + $errors->add( 'pass', __( 'ERROR: Please enter a password.' ), array( 'form-field' => 'pass1' ) ); } - /* Check for "\" in password */ - if ( false !== strpos( wp_unslash( $pass1 ), "\\" ) ) + // Check for "\" in password. + if ( false !== strpos( wp_unslash( $pass1 ), "\\" ) ) { $errors->add( 'pass', __( 'ERROR: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) ); + } - /* checking the password has been typed twice the same */ - if ( $pass1 != $pass2 ) - $errors->add( 'pass', __( 'ERROR: Please enter the same password in the two password fields.' ), array( 'form-field' => 'pass1' ) ); + // Checking the password has been typed twice the same. + if ( ( $update || ! empty( $pass1 ) ) && $pass1 != $pass2 ) { + $errors->add( 'pass', __( 'ERROR: Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) ); + } if ( !empty( $pass1 ) ) $user->user_pass = $pass1; @@ -149,9 +148,16 @@ function edit_user( $user_id = 0 ) { if ( !$update && username_exists( $user->user_login ) ) $errors->add( 'user_login', __( 'ERROR: This username is already registered. Please choose another one.' )); - /* checking e-mail address */ + /** This filter is documented in wp-includes/user.php */ + $illegal_logins = (array) apply_filters( 'illegal_user_logins', array() ); + + if ( in_array( strtolower( $user->user_login ), array_map( 'strtolower', $illegal_logins ) ) ) { + $errors->add( 'invalid_username', __( 'ERROR: Sorry, that username is not allowed.' ) ); + } + + /* checking email address */ if ( empty( $user->user_email ) ) { - $errors->add( 'empty_email', __( 'ERROR: Please enter an e-mail address.' ), array( 'form-field' => 'email' ) ); + $errors->add( 'empty_email', __( 'ERROR: Please enter an email address.' ), array( 'form-field' => 'email' ) ); } elseif ( !is_email( $user->user_email ) ) { $errors->add( 'invalid_email', __( 'ERROR: The email address isn’t correct.' ), array( 'form-field' => 'email' ) ); } elseif ( ( $owner_id = email_exists($user->user_email) ) && ( !$update || ( $owner_id != $user->ID ) ) ) { @@ -163,9 +169,9 @@ function edit_user( $user_id = 0 ) { * * @since 2.8.0 * - * @param array &$errors An array of user profile update errors, passed by reference. - * @param bool $update Whether this is a user update. - * @param WP_User &$user WP_User object, passed by reference. + * @param WP_Error &$errors WP_Error object, passed by reference. + * @param bool $update Whether this is a user update. + * @param WP_User &$user WP_User object, passed by reference. */ do_action_ref_array( 'user_profile_update_errors', array( &$errors, $update, &$user ) ); @@ -176,7 +182,18 @@ function edit_user( $user_id = 0 ) { $user_id = wp_update_user( $user ); } else { $user_id = wp_insert_user( $user ); - wp_new_user_notification( $user_id, isset( $_POST['send_password'] ) ? wp_unslash( $pass1 ) : '' ); + $notify = isset( $_POST['send_user_notification'] ) ? 'both' : 'admin'; + + /** + * Fires after a new user has been created. + * + * @since 4.4.0 + * + * @param int $user_id ID of the newly created user. + * @param string $notify Type of notification that should happen. See {@see wp_send_new_user_notifications()} + * for more information on possible values. + */ + do_action( 'edit_user_created_user', $user_id, $notify ); } return $user_id; } @@ -195,12 +212,10 @@ function edit_user( $user_id = 0 ) { * * @since 2.8.0 * - * @return unknown + * @return array */ function get_editable_roles() { - global $wp_roles; - - $all_roles = $wp_roles->roles; + $all_roles = wp_roles()->roles; /** * Filter the list of editable roles. @@ -236,6 +251,8 @@ function get_user_to_edit( $user_id ) { * * @since 2.0.0 * + * @global wpdb $wpdb WordPress database abstraction object. + * * @param int $user_id User ID. * @return array */ @@ -257,13 +274,15 @@ function get_users_drafts( $user_id ) { /** * Remove user and optionally reassign posts and links to another user. * - * If the $reassign parameter is not assigned to an User ID, then all posts will + * If the $reassign parameter is not assigned to a User ID, then all posts will * be deleted of that user. The action 'delete_user' that is passed the User ID * being deleted will be run after the posts are either reassigned or deleted. * The user meta will also be deleted that are for that User ID. * * @since 2.0.0 * + * @global wpdb $wpdb WordPress database abstraction object. + * * @param int $id User ID. * @param int $reassign Optional. Reassign posts and links to new User ID. * @return bool True when finished. @@ -271,6 +290,10 @@ function get_users_drafts( $user_id ) { function wp_delete_user( $id, $reassign = null ) { global $wpdb; + if ( ! is_numeric( $id ) ) { + return false; + } + $id = (int) $id; $user = new WP_User( $id ); @@ -384,53 +407,117 @@ function wp_revoke_user($id) { $user->remove_all_caps(); } -add_action('admin_init', 'default_password_nag_handler'); /** * @since 2.8.0 + * + * @global int $user_ID + * + * @param false $errors Deprecated. */ function default_password_nag_handler($errors = false) { global $user_ID; - if ( ! get_user_option('default_password_nag') ) //Short circuit it. + // Short-circuit it. + if ( ! get_user_option('default_password_nag') ) return; - //get_user_setting = JS saved UI setting. else no-js-fallback code. + // get_user_setting = JS saved UI setting. else no-js-fallback code. if ( 'hide' == get_user_setting('default_password_nag') || isset($_GET['default_password_nag']) && '0' == $_GET['default_password_nag'] ) { delete_user_setting('default_password_nag'); update_user_option($user_ID, 'default_password_nag', false, true); } } -add_action('profile_update', 'default_password_nag_edit_user', 10, 2); /** * @since 2.8.0 + * + * @param int $user_ID + * @param object $old_data */ function default_password_nag_edit_user($user_ID, $old_data) { - if ( ! get_user_option('default_password_nag', $user_ID) ) //Short circuit it. + // Short-circuit it. + if ( ! get_user_option('default_password_nag', $user_ID) ) return; $new_data = get_userdata($user_ID); - if ( $new_data->user_pass != $old_data->user_pass ) { //Remove the nag if the password has been changed. + // Remove the nag if the password has been changed. + if ( $new_data->user_pass != $old_data->user_pass ) { delete_user_setting('default_password_nag'); update_user_option($user_ID, 'default_password_nag', false, true); } } -add_action('admin_notices', 'default_password_nag'); /** * @since 2.8.0 + * + * @global string $pagenow */ function default_password_nag() { global $pagenow; - if ( 'profile.php' == $pagenow || ! get_user_option('default_password_nag') ) //Short circuit it. + // Short-circuit it. + if ( 'profile.php' == $pagenow || ! get_user_option('default_password_nag') ) return; echo '

'; echo '

'; echo '' . __('Notice:') . ' '; - _e('You’re using the auto-generated password for your account. Would you like to change it to something easier to remember?'); + _e('You’re using the auto-generated password for your account. Would you like to change it?'); echo '

'; printf( '' . __('Yes, take me to my profile page') . ' | ', get_edit_profile_url() . '#password' ); printf( '' . __('No thanks, do not remind me again') . '', '?default_password_nag=0' ); echo '

'; } + +/** + * @since 3.5.0 + * @access private + */ +function delete_users_add_js() { ?> + + + + + + +'; - if ( ! empty( $description ) ) { - echo '

' . $description . '

'; + ?> +

+ '; - dynamic_sidebar( $sidebar ); echo ''; } /** - * {@internal Missing Short Description}} + * Retrieves the widget control arguments. * * @since 2.5.0 * + * @global array $wp_registered_widgets + * + * @staticvar int $i + * * @param array $params * @return array */ @@ -123,7 +132,14 @@ function wp_list_widget_controls_dynamic_sidebar( $params ) { return $params; } -function next_widget_id_number($id_base) { +/** + * + * @global array $wp_registered_widgets + * + * @param string $id_base + * @return int + */ +function next_widget_id_number( $id_base ) { global $wp_registered_widgets; $number = 1; @@ -143,6 +159,10 @@ function next_widget_id_number($id_base) { * * @since 2.5.0 * + * @global array $wp_registered_widgets + * @global array $wp_registered_widget_controls + * @global array $sidebars_widgets + * * @param array $sidebar_args * @return array */ @@ -161,6 +181,11 @@ function wp_widget_control( $sidebar_args ) { $multi_number = isset($sidebar_args['_multi_num']) ? $sidebar_args['_multi_num'] : ''; $add_new = isset($sidebar_args['_add']) ? $sidebar_args['_add'] : ''; + $before_form = isset( $sidebar_args['before_form'] ) ? $sidebar_args['before_form'] : ''; + $after_form = isset( $sidebar_args['after_form'] ) ? $sidebar_args['after_form'] : ''; + $before_widget_content = isset( $sidebar_args['before_widget_content'] ) ? $sidebar_args['before_widget_content'] : ''; + $query_arg = array( 'editwidget' => $widget['id'] ); if ( $add_new ) { $query_arg['addnew'] = 1; @@ -173,11 +198,14 @@ function wp_widget_control( $sidebar_args ) { $query_arg['key'] = $key; } - // We aren't showing a widget control, we're outputting a template for a multi-widget control + /* + * We aren't showing a widget control, we're outputting a template + * for a multi-widget control. + */ if ( isset($sidebar_args['_display']) && 'template' == $sidebar_args['_display'] && $widget_number ) { // number == -1 implies a template where id numbers are replaced by a generic '__i__' $control['params'][0]['number'] = -1; - // with id_base widget id's are constructed like {$id_base}-{$id_number} + // With id_base widget id's are constructed like {$id_base}-{$id_number}. if ( isset($control['id_base']) ) $id_format = $control['id_base'] . '-__i__'; } @@ -198,18 +226,20 @@ function wp_widget_control( $sidebar_args ) { - +
- +

@@ -240,3 +270,12 @@ function wp_widget_control( $sidebar_args ) { return $sidebar_args; } + +/** + * + * @param string $classes + * @return string + */ +function wp_widgets_access_body_class($classes) { + return "$classes widgets_access "; +} \ No newline at end of file diff --git a/wp-admin/index.php b/wp-admin/index.php index 3bd4c7c..6a33d54 100644 --- a/wp-admin/index.php +++ b/wp-admin/index.php @@ -52,9 +52,9 @@ $screen->add_help_tab( array( ) ); $help = '

' . __( 'You can use the following controls to arrange your Dashboard screen to suit your workflow. This is true on most other administration screens as well.' ) . '

'; -$help .= '

' . __( 'Screen Options - Use the Screen Options tab to choose which Dashboard boxes to show.' ) . '

'; -$help .= '

' . __( 'Drag and Drop - To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box.' ) . '

'; -$help .= '

' . __( 'Box Controls - Click the title bar of the box to expand or collapse it. Some boxes added by plugins may have configurable content, and will show a “Configure” link in the title bar if you hover over it.' ) . '

'; +$help .= '

' . __( 'Screen Options — Use the Screen Options tab to choose which Dashboard boxes to show.' ) . '

'; +$help .= '

' . __( 'Drag and Drop — To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box.' ) . '

'; +$help .= '

' . __( 'Box Controls — Click the title bar of the box to expand or collapse it. Some boxes added by plugins may have configurable content, and will show a “Configure” link in the title bar if you hover over it.' ) . '

'; $screen->add_help_tab( array( 'id' => 'help-layout', @@ -64,16 +64,16 @@ $screen->add_help_tab( array( $help = '

' . __( 'The boxes on your Dashboard screen are:' ) . '

'; if ( current_user_can( 'edit_posts' ) ) - $help .= '

' . __( 'At A Glance - Displays a summary of the content on your site and identifies which theme and version of WordPress you are using.' ) . '

'; - $help .= '

' . __( 'Activity - Shows the upcoming scheduled posts, recently published posts, and the most recent comments on your posts and allows you to moderate them.' ) . '

'; + $help .= '

' . __( 'At A Glance — Displays a summary of the content on your site and identifies which theme and version of WordPress you are using.' ) . '

'; + $help .= '

' . __( 'Activity — Shows the upcoming scheduled posts, recently published posts, and the most recent comments on your posts and allows you to moderate them.' ) . '

'; if ( is_blog_admin() && current_user_can( 'edit_posts' ) ) - $help .= '

' . __( "Quick Draft - Allows you to create a new post and save it as a draft. Also displays links to the 5 most recent draft posts you've started." ) . '

'; + $help .= '

' . __( "Quick Draft — Allows you to create a new post and save it as a draft. Also displays links to the 5 most recent draft posts you've started." ) . '

'; if ( ! is_multisite() && current_user_can( 'install_plugins' ) ) - $help .= '

' . __( 'WordPress News - Latest news from the official WordPress project, the WordPress Planet, and popular and recent plugins.' ) . '

'; + $help .= '

' . __( 'WordPress News — Latest news from the official WordPress project, the WordPress Planet, and popular and recent plugins.' ) . '

'; else - $help .= '

' . __( 'WordPress News - Latest news from the official WordPress project, the WordPress Planet.' ) . '

'; + $help .= '

' . __( 'WordPress News — Latest news from the official WordPress project, the WordPress Planet.' ) . '

'; if ( current_user_can( 'edit_theme_options' ) ) - $help .= '

' . __( 'Welcome - Shows links for some of the most common tasks when setting up a new site.' ) . '

'; + $help .= '

' . __( 'Welcome — Shows links for some of the most common tasks when setting up a new site.' ) . '

'; $screen->add_help_tab( array( 'id' => 'help-content', @@ -85,7 +85,7 @@ unset( $help ); $screen->set_help_sidebar( '

' . __( 'For more information:' ) . '

' . - '

' . __( 'Documentation on Dashboard' ) . '

' . + '

' . __( 'Documentation on Dashboard' ) . '

' . '

' . __( 'Support Forums' ) . '

' ); @@ -93,7 +93,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' ); ?>

"> - + remove_action( 'welcome_panel', 'wp_welcome_panel' ); + * To remove the default welcome panel, use {@see remove_action()}: + * + * remove_action( 'welcome_panel', 'wp_welcome_panel' ); * * @since 3.5.0 */ diff --git a/wp-admin/install-helper.php b/wp-admin/install-helper.php index c654a92..42eb31e 100644 --- a/wp-admin/install-helper.php +++ b/wp-admin/install-helper.php @@ -10,26 +10,25 @@ * needing to use these functions a lot, you might experience time outs. If you * do, then it is advised to just write the SQL code yourself. * - *


- * check_column('wp_links', 'link_description', 'mediumtext');
- * if (check_column($wpdb->comments, 'comment_author', 'tinytext'))
- *     echo "ok\n";
- *
- * $error_count = 0;
- * $tablename = $wpdb->links;
- * // check the column
- * if (!check_column($wpdb->links, 'link_description', 'varchar(255)')) {
- *     $ddl = "ALTER TABLE $wpdb->links MODIFY COLUMN link_description varchar(255) NOT NULL DEFAULT '' ";
- *     $q = $wpdb->query($ddl);
- * }
- *
- * if (check_column($wpdb->links, 'link_description', 'varchar(255)')) {
- *     $res .= $tablename . ' - ok 
';
- * } else {
- *     $res .= 'There was a problem with ' . $tablename . '
';
- *     ++$error_count;
- * }
- *

+ * check_column( 'wp_links', 'link_description', 'mediumtext' ); + * if ( check_column( $wpdb->comments, 'comment_author', 'tinytext' ) ) { + * echo "ok\n"; + * } + * + * $error_count = 0; + * $tablename = $wpdb->links; + * // Check the column. + * if ( ! check_column($wpdb->links, 'link_description', 'varchar( 255 )' ) ) { + * $ddl = "ALTER TABLE $wpdb->links MODIFY COLUMN link_description varchar(255) NOT NULL DEFAULT '' "; + * $q = $wpdb->query( $ddl ); + * } + * + * if ( check_column( $wpdb->links, 'link_description', 'varchar( 255 )' ) ) { + * $res .= $tablename . ' - ok
'; + * } else { + * $res .= 'There was a problem with ' . $tablename . '
'; + * ++$error_count; + * } * * @package WordPress * @subpackage Plugin @@ -44,7 +43,7 @@ if ( ! function_exists('maybe_create_table') ) : * * @since 1.0.0 * - * @uses $wpdb + * @global wpdb $wpdb WordPress database abstraction object. * * @param string $table_name Database table name. * @param string $create_ddl Create database table SQL. @@ -57,9 +56,10 @@ function maybe_create_table($table_name, $create_ddl) { return true; } } - //didn't find it try to create it. + // Didn't find it, so try to create it. $wpdb->query($create_ddl); - // we cannot directly tell that whether this succeeded! + + // We cannot directly tell that whether this succeeded! foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) { if ($table == $table_name) { return true; @@ -75,7 +75,7 @@ if ( ! function_exists('maybe_add_column') ) : * * @since 1.0.0 * - * @uses $wpdb + * @global wpdb $wpdb WordPress database abstraction object. * * @param string $table_name Database table name * @param string $column_name Table column name @@ -90,9 +90,11 @@ function maybe_add_column($table_name, $column_name, $create_ddl) { return true; } } - //didn't find it try to create it. + + // Didn't find it, so try to create it. $wpdb->query($create_ddl); - // we cannot directly tell that whether this succeeded! + + // We cannot directly tell that whether this succeeded! foreach ($wpdb->get_col("DESC $table_name",0) as $column ) { if ($column == $column_name) { return true; @@ -107,7 +109,7 @@ endif; * * @since 1.0.0 * - * @uses $wpdb + * @global wpdb $wpdb WordPress database abstraction object. * * @param string $table_name Table name * @param string $column_name Column name @@ -118,9 +120,11 @@ function maybe_drop_column($table_name, $column_name, $drop_ddl) { global $wpdb; foreach ($wpdb->get_col("DESC $table_name",0) as $column ) { if ($column == $column_name) { - //found it try to drop it. + + // Found it, so try to drop it. $wpdb->query($drop_ddl); - // we cannot directly tell that whether this succeeded! + + // We cannot directly tell that whether this succeeded! foreach ($wpdb->get_col("DESC $table_name",0) as $column ) { if ($column == $column_name) { return false; @@ -128,7 +132,7 @@ function maybe_drop_column($table_name, $column_name, $drop_ddl) { } } } - // else didn't find it + // Else didn't find it. return true; } @@ -150,13 +154,15 @@ function maybe_drop_column($table_name, $column_name, $drop_ddl) { * * @since 1.0.0 * + * @global wpdb $wpdb WordPress database abstraction object. + * * @param string $table_name Table name - * @param string $col_name Column name - * @param string $col_type Column type - * @param bool $is_null Optional. Check is null. - * @param mixed $key Optional. Key info. - * @param mixed $default Optional. Default value. - * @param mixed $extra Optional. Extra value. + * @param string $col_name Column name + * @param string $col_type Column type + * @param bool $is_null Optional. Check is null. + * @param mixed $key Optional. Key info. + * @param mixed $default Optional. Default value. + * @param mixed $extra Optional. Extra value. * @return bool True, if matches. False, if not matching. */ function check_column($table_name, $col_name, $col_type, $is_null = null, $key = null, $default = null, $extra = null) { @@ -167,7 +173,8 @@ function check_column($table_name, $col_name, $col_type, $is_null = null, $key = foreach ($results as $row ) { if ($row->Field == $col_name) { - // got our column, check the params + + // Got our column, check the params. if (($col_type != null) && ($row->Type != $col_type)) { ++$diffs; } diff --git a/wp-admin/install.php b/wp-admin/install.php index d29c809..2403982 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -16,8 +16,8 @@ if ( false ) { Error: PHP is not running -

WordPress

Error: PHP is not running

WordPress

Error: PHP is not running

WordPress requires that your web server is running PHP. Your server does not have PHP installed, or PHP is turned off.

@@ -38,8 +38,13 @@ require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' ); /** Load WordPress Administration Upgrade API */ require_once( ABSPATH . 'wp-admin/includes/upgrade.php' ); +/** Load WordPress Translation Install API */ +require_once( ABSPATH . 'wp-admin/includes/translation-install.php' ); + /** Load wpdb */ -require_once( ABSPATH . 'wp-includes/wp-db.php' ); +require_once( ABSPATH . WPINC . '/wp-db.php' ); + +nocache_headers(); $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0; @@ -47,22 +52,32 @@ $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0; * Display install header. * * @since 2.5.0 + * + * @param string $body_classes */ -function display_header() { +function display_header( $body_classes = '' ) { header( 'Content-Type: text/html; charset=utf-8' ); + if ( is_rtl() ) { + $body_classes .= 'rtl'; + } + if ( $body_classes ) { + $body_classes = ' ' . $body_classes; + } ?> > + <?php _e( 'WordPress › Installation' ); ?> - -

+ +

get_var("SHOW TABLES LIKE '$wpdb->users'") != null ); - // Ensure that Blogs appear in search engines by default + $sql = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->users ) ); + $user_table = ( $wpdb->get_var( $sql ) != null ); + + // Ensure that Blogs appear in search engines by default. $blog_public = 1; - if ( ! empty( $_POST ) ) + if ( isset( $_POST['weblog_title'] ) ) { $blog_public = isset( $_POST['blog_public'] ); + } $weblog_title = isset( $_POST['weblog_title'] ) ? trim( wp_unslash( $_POST['weblog_title'] ) ) : ''; $user_name = isset($_POST['user_name']) ? trim( wp_unslash( $_POST['user_name'] ) ) : ''; - $admin_password = isset($_POST['admin_password']) ? trim( wp_unslash( $_POST['admin_password'] ) ) : ''; $admin_email = isset( $_POST['admin_email'] ) ? trim( wp_unslash( $_POST['admin_email'] ) ) : ''; if ( ! is_null( $error ) ) { ?> +

- +

+ @@ -481,11 +471,11 @@ function wp_comment_trashnotice() { } /** - * {@internal Missing Short Description}} + * Outputs a post's public meta data in the Custom Fields meta box. * * @since 1.2.0 * - * @param unknown_type $meta + * @param array $meta */ function list_meta( $meta ) { // Exit if no meta @@ -524,38 +514,36 @@ function list_meta( $meta ) { } /** - * {@internal Missing Short Description}} + * Outputs a single row of public meta data in the Custom Fields meta box. * * @since 2.5.0 * - * @param unknown_type $entry - * @param unknown_type $count - * @return unknown + * @staticvar string $update_nonce + * + * @param array $entry + * @param int $count + * @return string */ function _list_meta_row( $entry, &$count ) { - static $update_nonce = false; + static $update_nonce = ''; if ( is_protected_meta( $entry['meta_key'], 'post' ) ) - return; + return ''; - if ( !$update_nonce ) + if ( ! $update_nonce ) $update_nonce = wp_create_nonce( 'add-meta' ); $r = ''; ++ $count; - if ( $count % 2 ) - $style = 'alternate'; - else - $style = ''; if ( is_serialized( $entry['meta_value'] ) ) { if ( is_serialized_string( $entry['meta_value'] ) ) { - // this is a serialized string, so we should display it + // This is a serialized string, so we should display it. $entry['meta_value'] = maybe_unserialize( $entry['meta_value'] ); } else { - // this is a serialized array/object so we should NOT display it + // This is a serialized array/object so we should NOT display it. --$count; - return; + return ''; } } @@ -565,7 +553,7 @@ function _list_meta_row( $entry, &$count ) { $delete_nonce = wp_create_nonce( 'delete-meta_' . $entry['meta_id'] ); - $r .= "\n\t

"; $r .= "\n\t\t

"; @@ -585,6 +573,8 @@ function _list_meta_row( $entry, &$count ) { * * @since 1.2.0 * + * @global wpdb $wpdb WordPress database abstraction object. + * * @param WP_Post $post Optional. The post being edited. */ function meta_form( $post = null ) { @@ -592,21 +582,37 @@ function meta_form( $post = null ) { $post = get_post( $post ); /** - * Filter the number of custom fields to retrieve for the drop-down - * in the Custom Fields meta box. + * Filter values for the meta key dropdown in the Custom Fields meta box. * - * @since 2.1.0 + * Returning a non-null value will effectively short-circuit and avoid a + * potentially expensive query against postmeta. * - * @param int $limit Number of custom fields to retrieve. Default 30. + * @since 4.4.0 + * + * @param array|null $keys Pre-defined meta keys to be used in place of a postmeta query. Default null. + * @param WP_Post $post The current post object. */ - $limit = (int) apply_filters( 'postmeta_form_limit', 30 ); - $keys = $wpdb->get_col( " - SELECT meta_key - FROM $wpdb->postmeta - GROUP BY meta_key - HAVING meta_key NOT LIKE '\_%' - ORDER BY meta_key - LIMIT $limit" ); + $keys = apply_filters( 'postmeta_form_keys', null, $post ); + + if ( null === $keys ) { + /** + * Filter the number of custom fields to retrieve for the drop-down + * in the Custom Fields meta box. + * + * @since 2.1.0 + * + * @param int $limit Number of custom fields to retrieve. Default 30. + */ + $limit = apply_filters( 'postmeta_form_limit', 30 ); + $sql = "SELECT DISTINCT meta_key + FROM $wpdb->postmeta + WHERE meta_key NOT BETWEEN '_' AND '_z' + HAVING meta_key NOT LIKE %s + ORDER BY meta_key + LIMIT %d"; + $keys = $wpdb->get_col( $wpdb->prepare( $sql, $wpdb->esc_like( '_' ) . '%', $limit ) ); + } + if ( $keys ) { natcasesort( $keys ); $meta_key_input_id = 'metakeyselect'; @@ -665,15 +671,18 @@ function meta_form( $post = null ) { * Print out HTML form date elements for editing post or comment publish date. * * @since 0.71 + * @since 4.4.0 Converted to use get_comment() instead of the global `$comment`. + * + * @global WP_Locale $wp_locale * * @param int|bool $edit Accepts 1|true for editing the date, 0|false for adding the date. * @param int|bool $for_post Accepts 1|true for applying the date to a post, 0|false for a comment. - * @param int|bool $tab_index The tabindex attribute to add. Default 0. + * @param int $tab_index The tabindex attribute to add. Default 0. * @param int|bool $multi Optional. Whether the additional fields and buttons should be added. * Default 0|false. */ function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) { - global $wp_locale, $comment; + global $wp_locale; $post = get_post(); if ( $for_post ) @@ -683,10 +692,11 @@ function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) { if ( (int) $tab_index > 0 ) $tab_index_attribute = " tabindex=\"$tab_index\""; + // todo: Remove this? // echo ' '.__( 'Edit timestamp' ).'
'; $time_adj = current_time('timestamp'); - $post_date = ($for_post) ? $post->post_date : $comment->comment_date; + $post_date = ($for_post) ? $post->post_date : get_comment()->comment_date; $jj = ($edit) ? mysql2date( 'd', $post_date, false ) : gmdate( 'd', $time_adj ); $mm = ($edit) ? mysql2date( 'm', $post_date, false ) : gmdate( 'm', $time_adj ); $aa = ($edit) ? mysql2date( 'Y', $post_date, false ) : gmdate( 'Y', $time_adj ); @@ -700,33 +710,43 @@ function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) { $cur_hh = gmdate( 'H', $time_adj ); $cur_mn = gmdate( 'i', $time_adj ); - $month = "\n"; for ( $i = 1; $i < 13; $i = $i +1 ) { $monthnum = zeroise($i, 2); - $month .= "\t\t\t" . '\n"; + $month .= sprintf( __( '%1$s-%2$s' ), $monthnum, $monthtext ) . "\n"; } - $month .= ''; + $month .= ''; - $day = ''; - $year = ''; - $hour = ''; - $minute = ''; + $day = ''; + $year = ''; + $hour = ''; + $minute = ''; echo '

'; /* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute */ - printf( __( '%1$s %2$s, %3$s @ %4$s : %5$s' ), $month, $day, $year, $hour, $minute ); + printf( __( '%1$s %2$s, %3$s @ %4$s:%5$s' ), $month, $day, $year, $hour, $minute ); echo '

'; if ( $multi ) return; echo "\n\n"; - foreach ( array('mm', 'jj', 'aa', 'hh', 'mn') as $timeunit ) { - echo '' . "\n"; + $map = array( + 'mm' => array( $mm, $cur_mm ), + 'jj' => array( $jj, $cur_jj ), + 'aa' => array( $aa, $cur_aa ), + 'hh' => array( $hh, $cur_hh ), + 'mn' => array( $mn, $cur_mn ), + ); + foreach ( $map as $timeunit => $value ) { + list( $unit, $curr ) = $value; + + echo '' . "\n"; $cur_timeunit = 'cur_' . $timeunit; - echo '' . "\n"; + echo '' . "\n"; } ?> @@ -738,7 +758,7 @@ function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) { } /** - * Print out

' . $field['title'] . '

'; call_user_func($field['callback'], $field['args']); echo '

'; - - if ( ! current_user_can('update_plugins') ) - printf( __('There is a new version of %1$s available. View version %4$s details.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version ); - else if ( empty($r->package) ) - printf( __('There is a new version of %1$s available. View version %4$s details. Automatic update is unavailable for this plugin.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version ); - else - printf( __('There is a new version of %1$s available. View version %4$s details or update now.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version, wp_nonce_url( self_admin_url('update.php?action=upgrade-plugin&plugin=') . $file, 'upgrade-plugin_' . $file) ); + if ( is_network_admin() ) { + $active_class = is_plugin_active_for_network( $file ) ? ' active': ''; + } else { + $active_class = is_plugin_active( $file ) ? ' active' : ''; + } + echo '

'; + + if ( ! current_user_can( 'update_plugins' ) ) { + /* translators: 1: plugin name, 2: details URL, 3: accessibility text, 4: version number */ + printf( __( 'There is a new version of %1$s available. .' ), + $plugin_name, + esc_url( $details_url ), + /* translators: 1: plugin name, 2: version number */ + esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $r->new_version ) ), + $r->new_version + ); + } elseif ( empty( $r->package ) ) { + /* translators: 1: plugin name, 2: details URL, 3: accessibility text, 4: version number */ + printf( __( 'There is a new version of %1$s available. . Automatic update is unavailable for this plugin.' ), + $plugin_name, + esc_url( $details_url ), + /* translators: 1: plugin name, 2: version number */ + esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $r->new_version ) ), + $r->new_version + ); + } else { + /* translators: 1: plugin name, 2: details URL, 3: accessibility text, 4: version number, 5: update URL, 6: accessibility text */ + printf( __( 'There is a new version of %1$s available. or update now.' ), + $plugin_name, + esc_url( $details_url ), + /* translators: 1: plugin name, 2: version number */ + esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $r->new_version ) ), + $r->new_version, + wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $file, 'upgrade-plugin_' . $file ), + /* translators: %s: plugin name */ + esc_attr( sprintf( __( 'Update %s now' ), $plugin_name ) ) + ); + } /** * Fires at the end of the update message container in each * row of the plugins list table. * - * The dynamic portion of the hook name, $file, refers to the path + * The dynamic portion of the hook name, `$file`, refers to the path * of the plugin's primary file relative to the plugins directory. * * @since 2.8.0 @@ -331,8 +409,11 @@ function wp_plugin_update_row( $file, $plugin_data ) { } } +/** + * + * @return array + */ function get_theme_updates() { - $themes = wp_get_themes(); $current = get_site_transient('update_themes'); if ( ! isset( $current->response ) ) @@ -347,6 +428,9 @@ function get_theme_updates() { return $update_themes; } +/** + * @since 3.1.0 + */ function wp_theme_update_rows() { if ( !current_user_can('update_themes' ) ) return; @@ -355,38 +439,70 @@ function wp_theme_update_rows() { if ( isset($themes->response) && is_array($themes->response) ) { $themes = array_keys( $themes->response ); - foreach( $themes as $theme ) { + foreach ( $themes as $theme ) { add_action( "after_theme_row_$theme", 'wp_theme_update_row', 10, 2 ); } } } -add_action( 'admin_init', 'wp_theme_update_rows' ); +/** + * + * @param string $theme_key + * @param WP_Theme $theme + * @return false|void + */ function wp_theme_update_row( $theme_key, $theme ) { $current = get_site_transient( 'update_themes' ); if ( !isset( $current->response[ $theme_key ] ) ) return false; + $r = $current->response[ $theme_key ]; - $themes_allowedtags = array('a' => array('href' => array(),'title' => array()),'abbr' => array('title' => array()),'acronym' => array('title' => array()),'code' => array(),'em' => array(),'strong' => array()); - $theme_name = wp_kses( $theme['Name'], $themes_allowedtags ); + + $theme_name = $theme['Name']; $details_url = add_query_arg( array( 'TB_iframe' => 'true', 'width' => 1024, 'height' => 800 ), $current->response[ $theme_key ]['url'] ); $wp_list_table = _get_list_table('WP_MS_Themes_List_Table'); - echo '

'; - if ( ! current_user_can('update_themes') ) - printf( __('There is a new version of %1$s available. View version %4$s details.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r->new_version ); - else if ( empty( $r['package'] ) ) - printf( __('There is a new version of %1$s available. View version %4$s details. Automatic update is unavailable for this theme.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'] ); - else - printf( __('There is a new version of %1$s available. View version %4$s details or update now.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'], wp_nonce_url( self_admin_url('update.php?action=upgrade-theme&theme=') . $theme_key, 'upgrade-theme_' . $theme_key) ); - + $active = $theme->is_allowed( 'network' ) ? ' active': ''; + + echo '

'; + if ( ! current_user_can('update_themes') ) { + /* translators: 1: theme name, 2: details URL, 3: accessibility text, 4: version number */ + printf( __( 'There is a new version of %1$s available. .'), + $theme_name, + esc_url( $details_url ), + /* translators: 1: theme name, 2: version number */ + esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $r['new_version'] ) ), + $r['new_version'] + ); + } elseif ( empty( $r['package'] ) ) { + /* translators: 1: theme name, 2: details URL, 3: accessibility text, 4: version number */ + printf( __( 'There is a new version of %1$s available. . Automatic update is unavailable for this theme.' ), + $theme_name, + esc_url( $details_url ), + /* translators: 1: theme name, 2: version number */ + esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $r['new_version'] ) ), + $r['new_version'] + ); + } else { + /* translators: 1: theme name, 2: details URL, 3: accessibility text, 4: version number, 5: update URL, 6: accessibility text */ + printf( __( 'There is a new version of %1$s available. or update now.' ), + $theme_name, + esc_url( $details_url ), + /* translators: 1: theme name, 2: version number */ + esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $r['new_version'] ) ), + $r['new_version'], + wp_nonce_url( self_admin_url( 'update.php?action=upgrade-theme&theme=' ) . $theme_key, 'upgrade-theme_' . $theme_key ), + /* translators: %s: theme name */ + esc_attr( sprintf( __( 'Update %s now' ), $theme_name ) ) + ); + } /** * Fires at the end of the update message container in each * row of the themes list table. * - * The dynamic portion of the hook name, $theme_key, refers to + * The dynamic portion of the hook name, `$theme_key`, refers to * the theme slug as found in the WordPress.org themes repository. * * @since 3.1.0 @@ -405,8 +521,13 @@ function wp_theme_update_row( $theme_key, $theme ) { echo '

use_ssl); ?> />

@@ -105,36 +125,85 @@ function display_setup_form( $error = null ) { echo ''; } else { ?> -

- + + + + + + + + + - - + - - + +


+ + + +	+ + + + + + + + + + +
- - + + +	- - - - + +
	+ + + +
	+
	/>	+ + + + /> + + /> + + + + /> + + + + +

'submit' ) ); ?>

+ ' . __( 'Already Installed' ) . '

' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '

' . __( 'Log In' ) . '

' ); + die( + '

' . __( 'Already Installed' ) . '

' . + '

' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '

' . + '

' . __( 'Log In' ) . '

' . + '' + ); } +/** + * @global string $wp_version + * @global string $required_php_version + * @global string $required_mysql_version + * @global wpdb $wpdb + */ +global $wp_version, $required_php_version, $required_mysql_version; + $php_version = phpversion(); $mysql_version = $wpdb->db_version(); $php_compat = version_compare( $php_version, $required_php_version, '>=' ); $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' ); if ( !$mysql_compat && !$php_compat ) - $compat = sprintf( __( 'You cannot install because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.' ), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ); + $compat = sprintf( __( 'You cannot install because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.' ), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ); elseif ( !$php_compat ) - $compat = sprintf( __( 'You cannot install because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_php_version, $php_version ); + $compat = sprintf( __( 'You cannot install because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_php_version, $php_version ); elseif ( !$mysql_compat ) - $compat = sprintf( __( 'You cannot install because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_mysql_version, $mysql_version ); + $compat = sprintf( __( 'You cannot install because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_mysql_version, $mysql_version ); if ( !$mysql_compat || !$php_compat ) { display_header(); @@ -164,36 +246,100 @@ if ( !$mysql_compat || !$php_compat ) { if ( ! is_string( $wpdb->base_prefix ) || '' === $wpdb->base_prefix ) { display_header(); - die( '

' . __( 'Configuration Error' ) . '

' . __( 'Your wp-config.php file has an empty database table prefix, which is not supported.' ) . '

' ); + die( + '

' . __( 'Configuration Error' ) . '

' . + '

' . sprintf( + /* translators: %s: wp-config.php */ + __( 'Your %s file has an empty database table prefix, which is not supported.' ), + 'wp-config.php' + ) . '

' + ); +} + +// Set error message if DO_NOT_UPGRADE_GLOBAL_TABLES isn't set as it will break install. +if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { + display_header(); + die( + '

' . __( 'Configuration Error' ) . '

' . + '

' . sprintf( + /* translators: %s: DO_NOT_UPGRADE_GLOBAL_TABLES */ + __( 'The constant %s cannot be defined when installing WordPress.' ), + 'DO_NOT_UPGRADE_GLOBAL_TABLES' + ) . '

' + ); } +/** + * @global string $wp_local_package + * @global WP_Locale $wp_locale + */ +$language = ''; +if ( ! empty( $_REQUEST['language'] ) ) { + $language = preg_replace( '/[^a-zA-Z_]/', '', $_REQUEST['language'] ); +} elseif ( isset( $GLOBALS['wp_local_package'] ) ) { + $language = $GLOBALS['wp_local_package']; +} + +$scripts_to_print = array( 'jquery' ); + switch($step) { - case 0: // Step 1 - case 1: // Step 1, direct link. - display_header(); + case 0: // Step 0 + if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) { + $scripts_to_print[] = 'language-chooser'; + display_header( 'language-chooser' ); + echo ''; + break; + } + + // Deliberately fall through if we can't reach the translations API. + + case 1: // Step 1, direct link or from language chooser. + if ( ! empty( $language ) ) { + $loaded_language = wp_download_language_pack( $language ); + if ( $loaded_language ) { + load_default_textdomain( $loaded_language ); + $GLOBALS['wp_locale'] = new WP_Locale(); + } + } + + $scripts_to_print[] = 'user-profile'; + + display_header(); ?>

ReadMe documentation at your leisure. Otherwise, just fill in the information below and you’ll be on your way to using the most extendable and powerful personal publishing platform in the world.' ), '../readme.html' ); ?>

error ) ) wp_die( $wpdb->error->get_error_message() ); + $scripts_to_print[] = 'user-profile'; + display_header(); // Fill in the data we gathered $weblog_title = isset( $_POST['weblog_title'] ) ? trim( wp_unslash( $_POST['weblog_title'] ) ) : ''; $user_name = isset($_POST['user_name']) ? trim( wp_unslash( $_POST['user_name'] ) ) : ''; $admin_password = isset($_POST['admin_password']) ? wp_unslash( $_POST['admin_password'] ) : ''; $admin_password_check = isset($_POST['admin_password2']) ? wp_unslash( $_POST['admin_password2'] ) : ''; - $admin_email = isset( $_POST['admin_email'] ) ?trim( wp_unslash( $_POST['admin_email'] ) ) : ''; - $public = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 0; - // check e-mail address + $admin_email = isset( $_POST['admin_email'] ) ?trim( wp_unslash( $_POST['admin_email'] ) ) : ''; + $public = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 1; + + // Check email address. $error = false; if ( empty( $user_name ) ) { // TODO: poka-yoke @@ -206,7 +352,7 @@ switch($step) { // TODO: poka-yoke display_setup_form( __( 'Your passwords do not match. Please try again.' ) ); $error = true; - } else if ( empty( $admin_email ) ) { + } elseif ( empty( $admin_email ) ) { // TODO: poka-yoke display_setup_form( __( 'You must provide an email address.' ) ); $error = true; @@ -218,13 +364,12 @@ switch($step) { if ( $error === false ) { $wpdb->show_errors(); - $result = wp_install($weblog_title, $user_name, $admin_email, $public, '', wp_slash( $admin_password ) ); - extract( $result, EXTR_SKIP ); + $result = wp_install( $weblog_title, $user_name, $admin_email, $public, '', wp_slash( $admin_password ), $loaded_language ); ?>

@@ -234,23 +379,33 @@ switch($step) {

	'. esc_html($password) .' '; - echo " $password_message "; ?> + if ( ! empty( $result['password'] ) && empty( $admin_password_check ) ): ?> + + +

'. esc_html($password) .'
'; - echo "

$password_message

"; ?> + if ( ! empty( $result['password'] ) && empty( $admin_password_check ) ): ?> +
+ +

+ +if ( ! wp_is_mobile() ) { + ?> - - + + diff --git a/wp-admin/js/accordion.js b/wp-admin/js/accordion.js index 7bc99cc..af62815 100644 --- a/wp-admin/js/accordion.js +++ b/wp-admin/js/accordion.js @@ -1,55 +1,93 @@ +/** + * Accordion-folding functionality. + * + * Markup with the appropriate classes will be automatically hidden, + * with one section opening at a time when its title is clicked. + * Use the following markup structure for accordion behavior: + * + *

+ *

+ * + * Note that any appropriate tags may be used, as long as the above classes are present. + * + * @since 3.6.0. + */ + ( function( $ ){ $( document ).ready( function () { - // Expand/Collapse on click + // Expand/Collapse accordion sections on click. $( '.accordion-container' ).on( 'click keydown', '.accordion-section-title', function( e ) { - if ( e.type === 'keydown' && 13 !== e.which ) // "return" key - return; + if ( e.type === 'keydown' && 13 !== e.which ) { // "return" key + return; + } + e.preventDefault(); // Keep this AFTER the key filter above accordionSwitch( $( this ) ); }); - // Re-initialize accordion when screen options are toggled - $( '.hide-postbox-tog' ).click( function () { - accordionInit(); - }); - }); - var accordionOptions = $( '.accordion-container li.accordion-section' ), - sectionContent = $( '.accordion-section-content' ); - - function accordionInit () { - // Rounded corners - accordionOptions.removeClass( 'top bottom' ); - accordionOptions.filter( ':visible' ).first().addClass( 'top' ); - accordionOptions.filter( ':visible' ).last().addClass( 'bottom' ).find( sectionContent ).addClass( 'bottom' ); - } - + /** + * Close the current accordion section and open a new one. + * + * @param {Object} el Title element of the accordion section to toggle. + * @since 3.6.0 + */ function accordionSwitch ( el ) { var section = el.closest( '.accordion-section' ), - siblings = section.closest( '.accordion-container' ).find( '.open' ), - content = section.find( sectionContent ); + sectionToggleControl = section.find( '[aria-expanded]' ).first(), + container = section.closest( '.accordion-container' ), + siblings = container.find( '.open' ), + siblingsToggleControl = siblings.find( '[aria-expanded]' ).first(), + content = section.find( '.accordion-section-content' ); - if ( section.hasClass( 'cannot-expand' ) ) + // This section has no content and cannot be expanded. + if ( section.hasClass( 'cannot-expand' ) ) { return; + } + + // Add a class to the container to let us know something is happening inside. + // This helps in cases such as hiding a scrollbar while animations are executing. + container.addClass( 'opening' ); if ( section.hasClass( 'open' ) ) { section.toggleClass( 'open' ); content.toggle( true ).slideToggle( 150 ); } else { + siblingsToggleControl.attr( 'aria-expanded', 'false' ); siblings.removeClass( 'open' ); - siblings.find( sectionContent ).show().slideUp( 150 ); + siblings.find( '.accordion-section-content' ).show().slideUp( 150 ); content.toggle( false ).slideToggle( 150 ); section.toggleClass( 'open' ); } - accordionInit(); - } + // We have to wait for the animations to finish + setTimeout(function(){ + container.removeClass( 'opening' ); + }, 150); - // Initialize the accordion (currently just corner fixes) - accordionInit(); + // If there's an element with an aria-expanded attribute, assume it's a toggle control and toggle the aria-expanded value. + if ( sectionToggleControl ) { + sectionToggleControl.attr( 'aria-expanded', String( sectionToggleControl.attr( 'aria-expanded' ) === 'false' ) ); + } + } })(jQuery); diff --git a/wp-admin/js/accordion.min.js b/wp-admin/js/accordion.min.js index a67e757..cb2ae15 100644 --- a/wp-admin/js/accordion.min.js +++ b/wp-admin/js/accordion.min.js @@ -1 +1 @@ -!function(a){function b(){d.removeClass("top bottom"),d.filter(":visible").first().addClass("top"),d.filter(":visible").last().addClass("bottom").find(e).addClass("bottom")}function c(a){var c=a.closest(".accordion-section"),d=c.closest(".accordion-container").find(".open"),f=c.find(e);c.hasClass("cannot-expand")||(c.hasClass("open")?(c.toggleClass("open"),f.toggle(!0).slideToggle(150)):(d.removeClass("open"),d.find(e).show().slideUp(150),f.toggle(!1).slideToggle(150),c.toggleClass("open")),b())}a(document).ready(function(){a(".accordion-container").on("click keydown",".accordion-section-title",function(b){("keydown"!==b.type||13===b.which)&&(b.preventDefault(),c(a(this)))}),a(".hide-postbox-tog").click(function(){b()})});var d=a(".accordion-container li.accordion-section"),e=a(".accordion-section-content");b()}(jQuery); \ No newline at end of file +!function(a){function b(a){var b=a.closest(".accordion-section"),c=b.find("[aria-expanded]").first(),d=b.closest(".accordion-container"),e=d.find(".open"),f=e.find("[aria-expanded]").first(),g=b.find(".accordion-section-content");b.hasClass("cannot-expand")||(d.addClass("opening"),b.hasClass("open")?(b.toggleClass("open"),g.toggle(!0).slideToggle(150)):(f.attr("aria-expanded","false"),e.removeClass("open"),e.find(".accordion-section-content").show().slideUp(150),g.toggle(!1).slideToggle(150),b.toggleClass("open")),setTimeout(function(){d.removeClass("opening")},150),c&&c.attr("aria-expanded",String("false"===c.attr("aria-expanded"))))}a(document).ready(function(){a(".accordion-container").on("click keydown",".accordion-section-title",function(c){("keydown"!==c.type||13===c.which)&&(c.preventDefault(),b(a(this)))})})}(jQuery); \ No newline at end of file diff --git a/wp-admin/js/bookmarklet.js b/wp-admin/js/bookmarklet.js new file mode 100644 index 0000000..fe8e74a --- /dev/null +++ b/wp-admin/js/bookmarklet.js @@ -0,0 +1,156 @@ +( function( window, document, href, pt_url ) { + var encURI = window.encodeURIComponent, + form = document.createElement( 'form' ), + head = document.getElementsByTagName( 'head' )[0], + target = '_press_this_app', + canPost = true, + windowWidth, windowHeight, selection, + metas, links, content, images, iframes, img; + + if ( ! pt_url ) { + return; + } + + if ( href.match( /^https?:/ ) ) { + pt_url += '&u=' + encURI( href ); + if ( href.match( /^https:/ ) && pt_url.match( /^http:/ ) ) { + canPost = false; + } + } else { + top.location.href = pt_url; + return; + } + + if ( window.getSelection ) { + selection = window.getSelection() + ''; + } else if ( document.getSelection ) { + selection = document.getSelection() + ''; + } else if ( document.selection ) { + selection = document.selection.createRange().text || ''; + } + + pt_url += '&buster=' + ( new Date().getTime() ); + + if ( ! canPost ) { + if ( document.title ) { + pt_url += '&t=' + encURI( document.title.substr( 0, 256 ) ); + } + + if ( selection ) { + pt_url += '&s=' + encURI( selection.substr( 0, 512 ) ); + } + } + + windowWidth = window.outerWidth || document.documentElement.clientWidth || 600; + windowHeight = window.outerHeight || document.documentElement.clientHeight || 700; + + windowWidth = ( windowWidth < 800 || windowWidth > 5000 ) ? 600 : ( windowWidth * 0.7 ); + windowHeight = ( windowHeight < 800 || windowHeight > 3000 ) ? 700 : ( windowHeight * 0.9 ); + + if ( ! canPost ) { + window.open( pt_url, target, 'location,resizable,scrollbars,width=' + windowWidth + ',height=' + windowHeight ); + return; + } + + function add( name, value ) { + if ( typeof value === 'undefined' ) { + return; + } + + var input = document.createElement( 'input' ); + + input.name = name; + input.value = value; + input.type = 'hidden'; + + form.appendChild( input ); + } + + metas = head.getElementsByTagName( 'meta' ) || []; + + for ( var m = 0; m < metas.length; m++ ) { + if ( m > 200 ) { + break; + } + + var q = metas[ m ], + q_name = q.getAttribute( 'name' ), + q_prop = q.getAttribute( 'property' ), + q_cont = q.getAttribute( 'content' ); + + if ( q_cont ) { + if ( q_name ) { + add( '_meta[' + q_name + ']', q_cont ); + } else if ( q_prop ) { + add( '_meta[' + q_prop + ']', q_cont ); + } + } + } + + links = head.getElementsByTagName( 'link' ) || []; + + for ( var y = 0; y < links.length; y++ ) { + if ( y >= 50 ) { + break; + } + + var g = links[ y ], + g_rel = g.getAttribute( 'rel' ); + + if ( g_rel === 'canonical' || g_rel === 'icon' || g_rel === 'shortlink' ) { + add( '_links[' + g_rel + ']', g.getAttribute( 'href' ) ); + } + } + + if ( document.body.getElementsByClassName ) { + content = document.body.getElementsByClassName( 'hfeed' )[0]; + } + + content = document.getElementById( 'content' ) || content || document.body; + images = content.getElementsByTagName( 'img' ) || []; + + for ( var n = 0; n < images.length; n++ ) { + if ( n >= 100 ) { + break; + } + + img = images[ n ]; + + // If we know the image width and/or height, check them now and drop the "uninteresting" images. + if ( img.src.indexOf( 'avatar' ) > -1 || img.className.indexOf( 'avatar' ) > -1 || + ( img.width && img.width < 256 ) || ( img.height && img.height < 128 ) ) { + + continue; + } + + add( '_images[]', img.src ); + } + + iframes = document.body.getElementsByTagName( 'iframe' ) || []; + + for ( var p = 0; p < iframes.length; p++ ) { + if ( p >= 50 ) { + break; + } + + add( '_embeds[]', iframes[ p ].src ); + } + + if ( document.title ) { + add( 't', document.title ); + } + + if ( selection ) { + add( 's', selection ); + } + + form.setAttribute( 'method', 'POST' ); + form.setAttribute( 'action', pt_url ); + form.setAttribute( 'target', target ); + form.setAttribute( 'style', 'display: none;' ); + + window.open( 'about:blank', target, 'location,resizable,scrollbars,width=' + windowWidth + ',height=' + windowHeight ); + + document.body.appendChild( form ); + form.submit(); +} )( window, document, top.location.href, window.pt_url ); diff --git a/wp-admin/js/bookmarklet.min.js b/wp-admin/js/bookmarklet.min.js new file mode 100644 index 0000000..7f0a3d2 --- /dev/null +++ b/wp-admin/js/bookmarklet.min.js @@ -0,0 +1 @@ +(function(a,b,c,d){function e(a,c){if("undefined"!=typeof c){var d=b.createElement("input");d.name=a,d.value=c,d.type="hidden",p.appendChild(d)}}var f,g,h,i,j,k,l,m,n,o=a.encodeURIComponent,p=b.createElement("form"),q=b.getElementsByTagName("head")[0],r="_press_this_app",s=!0;if(d){if(!c.match(/^https?:/))return void(top.location.href=d);if(d+="&u="+o(c),c.match(/^https:/)&&d.match(/^http:/)&&(s=!1),a.getSelection?h=a.getSelection()+"":b.getSelection?h=b.getSelection()+"":b.selection&&(h=b.selection.createRange().text||""),d+="&buster="+(new Date).getTime(),s||(b.title&&(d+="&t="+o(b.title.substr(0,256))),h&&(d+="&s="+o(h.substr(0,512)))),f=a.outerWidth||b.documentElement.clientWidth||600,g=a.outerHeight||b.documentElement.clientHeight||700,f=800>f||f>5e3?600:.7*f,g=800>g||g>3e3?700:.9*g,!s)return void a.open(d,r,"location,resizable,scrollbars,width="+f+",height="+g);i=q.getElementsByTagName("meta")||[];for(var t=0;t200);t++){var u=i[t],v=u.getAttribute("name"),w=u.getAttribute("property"),x=u.getAttribute("content");x&&(v?e("_meta["+v+"]",x):w&&e("_meta["+w+"]",x))}j=q.getElementsByTagName("link")||[];for(var y=0;y=50);y++){var z=j[y],A=z.getAttribute("rel");("canonical"===A||"icon"===A||"shortlink"===A)&&e("_links["+A+"]",z.getAttribute("href"))}b.body.getElementsByClassName&&(k=b.body.getElementsByClassName("hfeed")[0]),k=b.getElementById("content")||k||b.body,l=k.getElementsByTagName("img")||[];for(var B=0;B=100);B++)n=l[B],n.src.indexOf("avatar")>-1||n.className.indexOf("avatar")>-1||n.width&&n.width<256||n.height&&n.height<128||e("_images[]",n.src);m=b.body.getElementsByTagName("iframe")||[];for(var C=0;C=50);C++)e("_embeds[]",m[C].src);b.title&&e("t",b.title),h&&e("s",h),p.setAttribute("method","POST"),p.setAttribute("action",d),p.setAttribute("target",r),p.setAttribute("style","display: none;"),a.open("about:blank",r,"location,resizable,scrollbars,width="+f+",height="+g),b.body.appendChild(p),p.submit()}})(window,document,top.location.href,window.pt_url); \ No newline at end of file diff --git a/wp-admin/js/color-picker.js b/wp-admin/js/color-picker.js index 1cc0a13..96f55da 100644 --- a/wp-admin/js/color-picker.js +++ b/wp-admin/js/color-picker.js @@ -1,4 +1,4 @@ -/* global wpColorPickerL10n:true */ +/* global wpColorPickerL10n */ ( function( $, undef ){ var ColorPicker, @@ -15,17 +15,24 @@ change: false, clear: false, hide: true, - palettes: true + palettes: true, + width: 255, + mode: 'hsv' }, _create: function() { // bail early for unsupported Iris. - if ( ! $.support.iris ) + if ( ! $.support.iris ) { return; + } + var self = this, el = self.element; $.extend( self.options, el.data() ); + // keep close bound so it can be attached to a body listener + self.close = $.proxy( self.close, self ); + self.initialValue = el.val(); // Set up HTML structure, hide things @@ -35,96 +42,114 @@ self.pickerContainer = $( _after ).insertAfter( el ); self.button = $( _button ); - if ( self.options.defaultColor ) + if ( self.options.defaultColor ) { self.button.addClass( 'wp-picker-default' ).val( wpColorPickerL10n.defaultString ); - else + } else { self.button.addClass( 'wp-picker-clear' ).val( wpColorPickerL10n.clear ); + } - el.wrap('').after(self.button); + el.wrap( '' ).after(self.button); el.iris( { target: self.pickerContainer, - hide: true, - width: 255, - mode: 'hsv', + hide: self.options.hide, + width: self.options.width, + mode: self.options.mode, palettes: self.options.palettes, change: function( event, ui ) { self.toggler.css( { backgroundColor: ui.color.toString() } ); // check for a custom cb - if ( $.isFunction( self.options.change ) ) + if ( $.isFunction( self.options.change ) ) { self.options.change.call( this, event, ui ); + } } } ); + el.val( self.initialValue ); self._addListeners(); - if ( ! self.options.hide ) + if ( ! self.options.hide ) { self.toggler.click(); + } }, _addListeners: function() { var self = this; - self.toggler.click( function( event ){ + // prevent any clicks inside this widget from leaking to the top and closing it + self.wrap.on( 'click.wpcolorpicker', function( event ) { event.stopPropagation(); - self.element.toggle().iris( 'toggle' ); - self.button.toggleClass('hidden'); - self.toggler.toggleClass( 'wp-picker-open' ); - - // close picker when you click outside it - if ( self.toggler.hasClass( 'wp-picker-open' ) ) - $( 'body' ).on( 'click', { wrap: self.wrap, toggler: self.toggler }, self._bodyListener ); - else - $( 'body' ).off( 'click', self._bodyListener ); }); - self.element.change(function( event ) { - var me = $(this), + self.toggler.click( function(){ + if ( self.toggler.hasClass( 'wp-picker-open' ) ) { + self.close(); + } else { + self.open(); + } + }); + + self.element.change( function( event ) { + var me = $( this ), val = me.val(); // Empty = clear if ( val === '' || val === '#' ) { - self.toggler.css('backgroundColor', ''); + self.toggler.css( 'backgroundColor', '' ); // fire clear callback if we have one - if ( $.isFunction( self.options.clear ) ) + if ( $.isFunction( self.options.clear ) ) { self.options.clear.call( this, event ); + } } }); // open a keyboard-focused closed picker with space or enter - self.toggler.on('keyup', function( e ) { - if ( e.keyCode === 13 || e.keyCode === 32 ) { - e.preventDefault(); - self.toggler.trigger('click').next().focus(); + self.toggler.on( 'keyup', function( event ) { + if ( event.keyCode === 13 || event.keyCode === 32 ) { + event.preventDefault(); + self.toggler.trigger( 'click' ).next().focus(); } }); self.button.click( function( event ) { - var me = $(this); + var me = $( this ); if ( me.hasClass( 'wp-picker-clear' ) ) { self.element.val( '' ); - self.toggler.css('backgroundColor', ''); - if ( $.isFunction( self.options.clear ) ) + self.toggler.css( 'backgroundColor', '' ); + if ( $.isFunction( self.options.clear ) ) { self.options.clear.call( this, event ); + } } else if ( me.hasClass( 'wp-picker-default' ) ) { self.element.val( self.options.defaultColor ).change(); } }); }, - _bodyListener: function( event ) { - if ( ! event.data.wrap.find( event.target ).length ) - event.data.toggler.click(); + open: function() { + this.element.show().iris( 'toggle' ).focus(); + this.button.removeClass( 'hidden' ); + this.wrap.addClass( 'wp-picker-active' ); + this.toggler.addClass( 'wp-picker-open' ); + $( 'body' ).trigger( 'click.wpcolorpicker' ).on( 'click.wpcolorpicker', this.close ); + }, + close: function() { + this.element.hide().iris( 'toggle' ); + this.button.addClass( 'hidden' ); + this.wrap.removeClass( 'wp-picker-active' ); + this.toggler.removeClass( 'wp-picker-open' ); + $( 'body' ).off( 'click.wpcolorpicker', this.close ); }, // $("#input").wpColorPicker('color') returns the current color // $("#input").wpColorPicker('color', '#bada55') to set color: function( newColor ) { - if ( newColor === undef ) + if ( newColor === undef ) { return this.element.iris( 'option', 'color' ); + } this.element.iris( 'option', 'color', newColor ); }, //$("#input").wpColorPicker('defaultColor') returns the current default color //$("#input").wpColorPicker('defaultColor', newDefaultColor) to set defaultColor: function( newDefaultColor ) { - if ( newDefaultColor === undef ) + if ( newDefaultColor === undef ) { return this.options.defaultColor; + } this.options.defaultColor = newDefaultColor; } diff --git a/wp-admin/js/color-picker.min.js b/wp-admin/js/color-picker.min.js index 92e935f..9ad833c 100644 --- a/wp-admin/js/color-picker.min.js +++ b/wp-admin/js/color-picker.min.js @@ -1 +1 @@ -!function(a,b){var c,d='',e='

',f='

',g='';c={options:{defaultColor:!1,change:!1,clear:!1,hide:!0,palettes:!0},_create:function(){if(a.support.iris){var b=this,c=b.element;a.extend(b.options,c.data()),b.initialValue=c.val(),c.addClass("wp-color-picker").hide().wrap(f),b.wrap=c.parent(),b.toggler=a(d).insertBefore(c).css({backgroundColor:b.initialValue}).attr("title",wpColorPickerL10n.pick).attr("data-current",wpColorPickerL10n.current),b.pickerContainer=a(e).insertAfter(c),b.button=a(g),b.options.defaultColor?b.button.addClass("wp-picker-default").val(wpColorPickerL10n.defaultString):b.button.addClass("wp-picker-clear").val(wpColorPickerL10n.clear),c.wrap('').after(b.button),c.iris({target:b.pickerContainer,hide:!0,width:255,mode:"hsv",palettes:b.options.palettes,change:function(c,d){b.toggler.css({backgroundColor:d.color.toString()}),a.isFunction(b.options.change)&&b.options.change.call(this,c,d)}}),c.val(b.initialValue),b._addListeners(),b.options.hide||b.toggler.click()}},_addListeners:function(){var b=this;b.toggler.click(function(c){c.stopPropagation(),b.element.toggle().iris("toggle"),b.button.toggleClass("hidden"),b.toggler.toggleClass("wp-picker-open"),b.toggler.hasClass("wp-picker-open")?a("body").on("click",{wrap:b.wrap,toggler:b.toggler},b._bodyListener):a("body").off("click",b._bodyListener)}),b.element.change(function(c){var d=a(this),e=d.val();(""===e||"#"===e)&&(b.toggler.css("backgroundColor",""),a.isFunction(b.options.clear)&&b.options.clear.call(this,c))}),b.toggler.on("keyup",function(a){(13===a.keyCode||32===a.keyCode)&&(a.preventDefault(),b.toggler.trigger("click").next().focus())}),b.button.click(function(c){var d=a(this);d.hasClass("wp-picker-clear")?(b.element.val(""),b.toggler.css("backgroundColor",""),a.isFunction(b.options.clear)&&b.options.clear.call(this,c)):d.hasClass("wp-picker-default")&&b.element.val(b.options.defaultColor).change()})},_bodyListener:function(a){a.data.wrap.find(a.target).length||a.data.toggler.click()},color:function(a){return a===b?this.element.iris("option","color"):void this.element.iris("option","color",a)},defaultColor:function(a){return a===b?this.options.defaultColor:void(this.options.defaultColor=a)}},a.widget("wp.wpColorPicker",c)}(jQuery); \ No newline at end of file +!function(a,b){var c,d='',e='

',f='

' ) - .appendTo( this.tabs.uploaded.target ); - } + // Update the icon in-browser. + $( 'link[sizes="32x32"]' ).attr( 'href', icon.url ); }, - thumbnailSrc: function( to ) { - if ( /^(https?:)?\/\//.test( to ) ) - this.thumbnail.prop( 'src', to ).show(); - else - this.thumbnail.hide(); + + /** + * Called when the "Remove" link is clicked. Empties the setting. + * + * @param {object} event jQuery Event object + */ + removeFile: function( event ) { + if ( api.utils.isKeydownButNotEnterEvent( event ) ) { + return; + } + event.preventDefault(); + + this.params.attachment = {}; + this.setting( '' ); + this.renderContent(); // Not bound to setting change when emptying. + $( 'link[rel="icon"]' ).attr( 'href', '' ); } }); + /** + * @class + * @augments wp.customize.Control + * @augments wp.customize.Class + */ api.HeaderControl = api.Control.extend({ ready: function() { - this.btnRemove = $('#customize-control-header_image .actions .remove'); - this.btnNew = $('#customize-control-header_image .actions .new'); + this.btnRemove = $('#customize-control-header_image .actions .remove'); + this.btnNew = $('#customize-control-header_image .actions .new'); _.bindAll(this, 'openMedia', 'removeImage'); this.btnNew.on( 'click', this.openMedia ); this.btnRemove.on( 'click', this.removeImage ); - api.HeaderTool.currentHeader = new api.HeaderTool.ImageModel(); + api.HeaderTool.currentHeader = this.getInitialHeaderImage(); new api.HeaderTool.CurrentView({ model: api.HeaderTool.currentHeader, - el: '.current .container' + el: '#customize-control-header_image .current .container' }); new api.HeaderTool.ChoiceListView({ collection: api.HeaderTool.UploadsList = new api.HeaderTool.ChoiceList(), - el: '.choices .uploaded .list' + el: '#customize-control-header_image .choices .uploaded .list' }); new api.HeaderTool.ChoiceListView({ collection: api.HeaderTool.DefaultsList = new api.HeaderTool.DefaultsList(), - el: '.choices .default .list' + el: '#customize-control-header_image .choices .default .list' }); api.HeaderTool.combinedList = api.HeaderTool.CombinedList = new api.HeaderTool.CombinedList([ api.HeaderTool.UploadsList, api.HeaderTool.DefaultsList ]); + + // Ensure custom-header-crop Ajax requests bootstrap the Customizer to activate the previewed theme. + wp.media.controller.Cropper.prototype.defaults.doCropArgs.wp_customize = 'on'; + wp.media.controller.Cropper.prototype.defaults.doCropArgs.theme = api.settings.theme.stylesheet; + }, + + /** + * Returns a new instance of api.HeaderTool.ImageModel based on the currently + * saved header image (if any). + * + * @since 4.2.0 + * + * @returns {Object} Options + */ + getInitialHeaderImage: function() { + if ( ! api.get().header_image || ! api.get().header_image_data || _.contains( [ 'remove-header', 'random-default-image', 'random-uploaded-image' ], api.get().header_image ) ) { + return new api.HeaderTool.ImageModel(); + } + + // Get the matching uploaded image object. + var currentHeaderObject = _.find( _wpCustomizeHeader.uploads, function( imageObj ) { + return ( imageObj.attachment_id === api.get().header_image_data.attachment_id ); + } ); + // Fall back to raw current header image. + if ( ! currentHeaderObject ) { + currentHeaderObject = { + url: api.get().header_image, + thumbnail_url: api.get().header_image, + attachment_id: api.get().header_image_data.attachment_id + }; + } + + return new api.HeaderTool.ImageModel({ + header: currentHeaderObject, + choice: currentHeaderObject.url.split( '/' ).pop() + }); }, /** @@ -433,6 +2487,7 @@ title: l10n.chooseImage, library: wp.media.query({ type: 'image' }), multiple: false, + date: false, priority: 20, suggestedWidth: _wpCustomizeHeader.data.width, suggestedHeight: _wpCustomizeHeader.data.height @@ -450,16 +2505,32 @@ this.frame.open(); }, + /** + * After an image is selected in the media modal, + * switch to the cropper state. + */ onSelect: function() { this.frame.setState('cropper'); }, + + /** + * After the image has been cropped, apply the cropped image data to the setting. + * + * @param {object} croppedImage Cropped attachment data. + */ onCropped: function(croppedImage) { - var url = croppedImage.post_content, + var url = croppedImage.url, attachmentId = croppedImage.attachment_id, w = croppedImage.width, h = croppedImage.height; this.setImageFromURL(url, attachmentId, w, h); }, + + /** + * If cropping was skipped, apply the image data directly to the setting. + * + * @param {object} selection + */ onSkippedCrop: function(selection) { var url = selection.get('url'), w = selection.get('width'), @@ -517,19 +2588,151 @@ }); + /** + * wp.customize.ThemeControl + * + * @constructor + * @augments wp.customize.Control + * @augments wp.customize.Class + */ + api.ThemeControl = api.Control.extend({ + + touchDrag: false, + isRendered: false, + + /** + * Defer rendering the theme control until the section is displayed. + * + * @since 4.2.0 + */ + renderContent: function () { + var control = this, + renderContentArgs = arguments; + + api.section( control.section(), function( section ) { + if ( section.expanded() ) { + api.Control.prototype.renderContent.apply( control, renderContentArgs ); + control.isRendered = true; + } else { + section.expanded.bind( function( expanded ) { + if ( expanded && ! control.isRendered ) { + api.Control.prototype.renderContent.apply( control, renderContentArgs ); + control.isRendered = true; + } + } ); + } + } ); + }, + + /** + * @since 4.2.0 + */ + ready: function() { + var control = this; + + control.container.on( 'touchmove', '.theme', function() { + control.touchDrag = true; + }); + + // Bind details view trigger. + control.container.on( 'click keydown touchend', '.theme', function( event ) { + if ( api.utils.isKeydownButNotEnterEvent( event ) ) { + return; + } + + // Bail if the user scrolled on a touch device. + if ( control.touchDrag === true ) { + return control.touchDrag = false; + } + + // Prevent the modal from showing when the user clicks the action button. + if ( $( event.target ).is( '.theme-actions .button' ) ) { + return; + } + + var previewUrl = $( this ).data( 'previewUrl' ); + + $( '.wp-full-overlay' ).addClass( 'customize-loading' ); + + window.parent.location = previewUrl; + }); + + control.container.on( 'click keydown', '.theme-actions .theme-details', function( event ) { + if ( api.utils.isKeydownButNotEnterEvent( event ) ) { + return; + } + + event.preventDefault(); // Keep this AFTER the key filter above + + api.section( control.section() ).showDetails( control.params.theme ); + }); + + control.container.on( 'render-screenshot', function() { + var $screenshot = $( this ).find( 'img' ), + source = $screenshot.data( 'src' ); + + if ( source ) { + $screenshot.attr( 'src', source ); + } + }); + }, + + /** + * Show or hide the theme based on the presence of the term in the title, description, and author. + * + * @since 4.2.0 + */ + filter: function( term ) { + var control = this, + haystack = control.params.theme.name + ' ' + + control.params.theme.description + ' ' + + control.params.theme.tags + ' ' + + control.params.theme.author; + haystack = haystack.toLowerCase().replace( '-', ' ' ); + if ( -1 !== haystack.search( term ) ) { + control.activate(); + } else { + control.deactivate(); + } + } + }); + // Change objects contained within the main customize object to Settings. api.defaultConstructor = api.Setting; - // Create the collection of Control objects. + // Create the collections for Controls, Sections and Panels. api.control = new api.Values({ defaultConstructor: api.Control }); + api.section = new api.Values({ defaultConstructor: api.Section }); + api.panel = new api.Values({ defaultConstructor: api.Panel }); + /** + * An object that fetches a preview in the background of the document, which + * allows for seamless replacement of an existing preview. + * + * @class + * @augments wp.customize.Messenger + * @augments wp.customize.Class + * @mixes wp.customize.Events + */ api.PreviewFrame = api.Messenger.extend({ sensitivity: 2000, + /** + * Initialize the PreviewFrame. + * + * @param {object} params.container + * @param {object} params.signature + * @param {object} params.previewUrl + * @param {object} params.query + * @param {object} options + */ initialize: function( params, options ) { var deferred = $.Deferred(); - // This is the promise object. + /* + * Make the instance of the PreviewFrame the promise object + * so other objects can easily interact with it. + */ deferred.promise( this ); this.container = params.container; @@ -546,23 +2749,61 @@ this.run( deferred ); }, + /** + * Run the preview request. + * + * @param {object} deferred jQuery Deferred object to be resolved with + * the request. + */ run: function( deferred ) { var self = this, loaded = false, ready = false; - if ( this._ready ) + if ( this._ready ) { this.unbind( 'ready', this._ready ); + } this._ready = function() { ready = true; - if ( loaded ) + if ( loaded ) { deferred.resolveWith( self ); + } }; this.bind( 'ready', this._ready ); + this.bind( 'ready', function ( data ) { + + this.container.addClass( 'iframe-ready' ); + + if ( ! data ) { + return; + } + + /* + * Walk over all panels, sections, and controls and set their + * respective active states to true if the preview explicitly + * indicates as such. + */ + var constructs = { + panel: data.activePanels, + section: data.activeSections, + control: data.activeControls + }; + _( constructs ).each( function ( activeConstructs, type ) { + api[ type ].each( function ( construct, id ) { + var active = !! ( activeConstructs && activeConstructs[ id ] ); + if ( active ) { + construct.activate(); + } else { + construct.deactivate(); + } + } ); + } ); + } ); + this.request = $.ajax( this.previewUrl(), { type: 'POST', data: this.query, @@ -582,7 +2823,7 @@ // Check if the location response header differs from the current URL. // If so, the request was redirected; try loading the requested page. - if ( location && location != self.previewUrl() ) { + if ( location && location !== self.previewUrl() ) { deferred.rejectWith( self, [ 'redirect', location ] ); return; } @@ -610,7 +2851,7 @@ response = response.slice( 0, index ) + response.slice( index + signature.length ); // Create the iframe and inject the html content. - self.iframe = $(' + if ( wp_verify_nonce( $_GET['_error_nonce'], 'plugin-activation-error_' . $file ) ) { + $iframe_url = add_query_arg( array( + 'action' => 'error_scrape', + 'plugin' => urlencode( $file ), + '_wpnonce' => urlencode( $_GET['_error_nonce'] ), + ), admin_url( 'plugins.php' ) ); + ?> +

%s (active)'), $file); - else - echo sprintf(__('Browsing %s (active)'), $file); + if ( is_plugin_active( $plugin ) ) { + if ( is_writeable( $real_file ) ) { + /* translators: %s: plugin file name */ + echo sprintf( __( 'Editing %s (active)' ), '' . $file . '' ); + } else { + /* translators: %s: plugin file name */ + echo sprintf( __( 'Browsing %s (active)' ), '' . $file . '' ); + } } else { - if ( is_writeable($real_file) ) - echo sprintf(__('Editing %s (inactive)'), $file); - else - echo sprintf(__('Browsing %s (inactive)'), $file); + if ( is_writeable( $real_file ) ) { + /* translators: %s: plugin file name */ + echo sprintf( __( 'Editing %s (inactive)' ), '' . $file . '' ); + } else { + /* translators: %s: plugin file name */ + echo sprintf( __( 'Browsing %s (inactive)' ), '' . $file . '' ); + } } ?>

@@ -218,7 +231,7 @@ default:

" />

@@ -264,7 +277,7 @@ foreach ( $plugin_files as $plugin_file ) : ?>

the Codex for more information.'); ?>

diff --git a/wp-admin/plugin-install.php b/wp-admin/plugin-install.php index b871939..c9f2b50 100644 --- a/wp-admin/plugin-install.php +++ b/wp-admin/plugin-install.php @@ -24,9 +24,28 @@ if ( is_multisite() && ! is_network_admin() ) { $wp_list_table = _get_list_table('WP_Plugin_Install_List_Table'); $pagenum = $wp_list_table->get_pagenum(); + +if ( ! empty( $_REQUEST['_wp_http_referer'] ) ) { + $location = remove_query_arg( '_wp_http_referer', wp_unslash( $_SERVER['REQUEST_URI'] ) ); + + if ( ! empty( $_REQUEST['paged'] ) ) { + $location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location ); + } + + wp_redirect( $location ); + exit; +} + $wp_list_table->prepare_items(); -$title = __('Install Plugins'); +$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' ); + +if ( $pagenum > $total_pages && $total_pages > 0 ) { + wp_redirect( add_query_arg( 'paged', $total_pages ) ); + exit; +} + +$title = __( 'Add Plugins' ); $parent_file = 'plugins.php'; wp_enqueue_script( 'plugin-install' ); @@ -35,10 +54,12 @@ if ( 'plugin-information' != $tab ) $body_id = $tab; +wp_enqueue_script( 'updates' ); + /** * Fires before each tab on the Install Plugins screen is loaded. * - * The dynamic portion of the action hook, $tab, allows for targeting + * The dynamic portion of the action hook, `$tab`, allows for targeting * individual tabs, for instance 'install_plugins_pre_plugin-information'. * * @since 2.7.0 @@ -56,43 +77,67 @@ get_current_screen()->add_help_tab( array( 'title' => __('Adding Plugins'), 'content' => '

' . __('If you know what you’re looking for, Search is your best bet. The Search screen has options to search the WordPress.org Plugin Directory for a particular Term, Author, or Tag. You can also search the directory by selecting popular tags. Tags in larger type mean more plugins have been labeled with that tag.') . '

' . - '

' . __('If you just want to get an idea of what’s available, you can browse Featured, Popular, and Newest plugins by using the links in the upper left of the screen. These sections rotate regularly.') . '

' . + '

' . __('If you just want to get an idea of what’s available, you can browse Featured and Popular plugins by using the links in the upper left of the screen. These sections rotate regularly.') . '

' . '

' . __('You can also browse a user’s favorite plugins, by using the Favorites link in the upper left of the screen and entering their WordPress.org username.') . '

' . '

' . __('If you want to install a plugin that you’ve downloaded elsewhere, click the Upload link in the upper left. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin.') . '

' ) ); get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Installing Plugins') . '

' . + '

' . __('Documentation on Installing Plugins') . '

' . '

' . __('Support Forums') . '

' ); +get_current_screen()->set_screen_reader_content( array( + 'heading_views' => __( 'Filter plugins list' ), + 'heading_pagination' => __( 'Plugins list navigation' ), + 'heading_list' => __( 'Plugins list' ), +) ); + /** * WordPress Administration Template Header. */ include(ABSPATH . 'wp-admin/admin-header.php'); ?>

+ ' . $text . ''; + } + ?> +

-views(); ?> - -
views(); + echo '
'; +} + /** * Fires after the plugins list table in each tab of the Install Plugins screen. * - * The dynamic portion of the action hook, $tab, allows for targeting + * The dynamic portion of the action hook, `$tab`, allows for targeting * individual tabs, for instance 'install_plugins_plugin-information'. * * @since 2.7.0 * * @param int $paged The current page number of the plugins list table. */ -?> - +do_action( "install_plugins_$tab", $paged ); ?>

+ get_pagenum(); $action = $wp_list_table->current_action(); $plugin = isset($_REQUEST['plugin']) ? $_REQUEST['plugin'] : ''; -$s = isset($_REQUEST['s']) ? urlencode($_REQUEST['s']) : ''; +$s = isset($_REQUEST['s']) ? urlencode( wp_unslash( $_REQUEST['s'] ) ) : ''; // Clean up request URI from temporary args for screen options/paging uri's to work as expected. $_SERVER['REQUEST_URI'] = remove_query_arg(array('error', 'deleted', 'activate', 'activate-multi', 'deactivate', 'deactivate-multi', '_error_nonce'), $_SERVER['REQUEST_URI']); +wp_enqueue_script( 'updates' ); + if ( $action ) { switch ( $action ) { @@ -52,6 +54,10 @@ if ( $action ) { $recent = (array) get_option( 'recently_activated' ); unset( $recent[ $plugin ] ); update_option( 'recently_activated', $recent ); + } else { + $recent = (array) get_site_option( 'recently_activated' ); + unset( $recent[ $plugin ] ); + update_site_option( 'recently_activated', $recent ); } if ( isset($_GET['from']) && 'import' == $_GET['from'] ) { @@ -60,7 +66,7 @@ if ( $action ) { wp_redirect( self_admin_url("plugins.php?activate=true&plugin_status=$status&paged=$page&s=$s") ); // overrides the ?error=true one above } exit; - break; + case 'activate-selected': if ( ! current_user_can('activate_plugins') ) wp_die(__('You do not have sufficient permissions to activate plugins for this site.')); @@ -94,14 +100,23 @@ if ( $action ) { if ( ! is_network_admin() ) { $recent = (array) get_option('recently_activated' ); - foreach ( $plugins as $plugin ) - unset( $recent[ $plugin ] ); + } else { + $recent = (array) get_site_option('recently_activated' ); + } + + foreach ( $plugins as $plugin ) { + unset( $recent[ $plugin ] ); + } + + if ( ! is_network_admin() ) { update_option( 'recently_activated', $recent ); + } else { + update_site_option( 'recently_activated', $recent ); } wp_redirect( self_admin_url("plugins.php?activate-multi=true&plugin_status=$status&paged=$page&s=$s") ); exit; - break; + case 'update-selected' : check_admin_referer( 'bulk-plugins' ); @@ -120,7 +135,7 @@ if ( $action ) { require_once(ABSPATH . 'wp-admin/admin-header.php'); echo '

'; - echo '

' . esc_html( $title ) . '

'; + echo '

' . esc_html( $title ) . '

'; $url = self_admin_url('update.php?action=update-selected&plugins=' . urlencode( join(',', $plugins) )); $url = wp_nonce_url($url, 'bulk-update-plugins'); @@ -129,7 +144,7 @@ if ( $action ) { echo '

'; require_once(ABSPATH . 'wp-admin/admin-footer.php'); exit; - break; + case 'error_scrape': if ( ! current_user_can('activate_plugins') ) wp_die(__('You do not have sufficient permissions to activate plugins for this site.')); @@ -146,15 +161,11 @@ if ( $action ) { @ini_set('display_errors', true); //Ensure that Fatal errors are displayed. // Go back to "sandbox" scope so we get the same errors as before - function plugin_sandbox_scrape( $plugin ) { - wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin ); - include( WP_PLUGIN_DIR . '/' . $plugin ); - } plugin_sandbox_scrape( $plugin ); - /** This action is documented in wp-admin/includes/plugins.php */ + /** This action is documented in wp-admin/includes/plugin.php */ do_action( "activate_{$plugin}" ); exit; - break; + case 'deactivate': if ( ! current_user_can('activate_plugins') ) wp_die(__('You do not have sufficient permissions to deactivate plugins for this site.')); @@ -167,14 +178,19 @@ if ( $action ) { } deactivate_plugins( $plugin, false, is_network_admin() ); - if ( ! is_network_admin() ) + + if ( ! is_network_admin() ) { update_option( 'recently_activated', array( $plugin => time() ) + (array) get_option( 'recently_activated' ) ); + } else { + update_site_option( 'recently_activated', array( $plugin => time() ) + (array) get_site_option( 'recently_activated' ) ); + } + if ( headers_sent() ) echo ""; else wp_redirect( self_admin_url("plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s") ); exit; - break; + case 'deactivate-selected': if ( ! current_user_can('activate_plugins') ) wp_die(__('You do not have sufficient permissions to deactivate plugins for this site.')); @@ -196,19 +212,24 @@ if ( $action ) { deactivate_plugins( $plugins, false, is_network_admin() ); + $deactivated = array(); + foreach ( $plugins as $plugin ) { + $deactivated[ $plugin ] = time(); + } + if ( ! is_network_admin() ) { - $deactivated = array(); - foreach ( $plugins as $plugin ) - $deactivated[ $plugin ] = time(); update_option( 'recently_activated', $deactivated + (array) get_option( 'recently_activated' ) ); + } else { + update_site_option( 'recently_activated', $deactivated + (array) get_site_option( 'recently_activated' ) ); } wp_redirect( self_admin_url("plugins.php?deactivate-multi=true&plugin_status=$status&paged=$page&s=$s") ); exit; - break; + case 'delete-selected': - if ( ! current_user_can('delete_plugins') ) + if ( ! current_user_can('delete_plugins') ) { wp_die(__('You do not have sufficient permissions to delete plugins for this site.')); + } check_admin_referer('bulk-plugins'); @@ -235,52 +256,58 @@ if ( $action ) { ?>

$data ) { + // Get plugins list from that folder. + if ( $folder_plugins = get_plugins( '/' . $plugin_slug ) ) { + foreach ( $folder_plugins as $plugin_file => $data ) { $plugin_info[ $plugin_file ] = _get_plugin_data_markup_translate( $plugin_file, $data ); $plugin_info[ $plugin_file ]['is_uninstallable'] = is_uninstallable_plugin( $plugin ); - if ( ! $plugin_info[ $plugin_file ]['Network'] ) + if ( ! $plugin_info[ $plugin_file ]['Network'] ) { $have_non_network_plugins = true; + } } } } } $plugins_to_delete = count( $plugin_info ); - echo '

' . _n( 'Delete Plugin', 'Delete Plugins', $plugins_to_delete ) . '

'; ?> - -

+ +

%1$s

%2$s

delete its data

', sprintf( __( '%1$s by %2$s (will also delete its data)' ), '' . $plugin['Name'] . '', '' . $plugin['AuthorName'] . '' ), '
', sprintf( __('%1$s by %2$s' ), esc_html($plugin['Name']), esc_html($plugin['AuthorName']) ), '
', sprintf( _x('%1$s by %2$s', 'plugin' ), '' . $plugin['Name'] . '', '' . $plugin['AuthorName'] ) . '', '

prepare_items(); wp_enqueue_script('plugin-install'); add_thickbox(); -add_screen_option( 'per_page', array('label' => _x( 'Plugins', 'plugins per page (screen options)' ), 'default' => 999 ) ); +add_screen_option( 'per_page', array( 'default' => 999 ) ); get_current_screen()->add_help_tab( array( 'id' => 'overview', 'title' => __('Overview'), 'content' => '

' . __('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.') . '

' . - '

' . sprintf(__('You can find additional plugins for your site by using the Plugin Browser/Installer functionality or by browsing the WordPress Plugin Directory directly and installing new plugins manually. To manually install a plugin you generally just need to upload the plugin file into your /wp-content/plugins directory. Once a plugin has been installed, you can activate it here.'), 'plugin-install.php', 'https://wordpress.org/plugins/') . '

' + '

' . sprintf( + /* translators: 1: Plugin Browser/Installer URL, 2: WordPress Plugin Directory URL 3: local plugin directory */ + __( 'You can find additional plugins for your site by using the Plugin Browser/Installer functionality or by browsing the WordPress Plugin Directory directly and installing new plugins manually. To manually install a plugin you generally just need to upload the plugin file into your %3$s directory. Once a plugin has been installed, you can activate it here.' ), + 'plugin-install.php', + 'https://wordpress.org/plugins/', + '/wp-content/plugins' + ) . '

' ) ); get_current_screen()->add_help_tab( array( 'id' => 'compatibility-problems', 'title' => __('Troubleshooting'), 'content' => '

' . __('Most of the time, plugins play nicely with the core of WordPress and with other plugins. Sometimes, though, a plugin’s code will get in the way of another plugin, causing compatibility issues. If your site starts doing strange things, this may be the problem. Try deactivating all your plugins and re-activating them in various combinations until you isolate which one(s) caused the issue.') . '

' . - '

' . sprintf( __('If something goes wrong with a plugin and you can’t use WordPress, delete or rename that file in the %s directory and it will be automatically deactivated.'), WP_PLUGIN_DIR) . '

' + '

' . sprintf( + /* translators: WP_PLUGIN_DIR constant value */ + __( 'If something goes wrong with a plugin and you can’t use WordPress, delete or rename that file in the %s directory and it will be automatically deactivated.' ), + '' . WP_PLUGIN_DIR . '' + ) . '

' ) ); get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Managing Plugins') . '

' . + '

' . __('Documentation on Managing Plugins') . '

' . '

' . __('Support Forums') . '

' ); +get_current_screen()->set_screen_reader_content( array( + 'heading_views' => __( 'Filter plugins list' ), + 'heading_pagination' => __( 'Plugins list navigation' ), + 'heading_list' => __( 'Plugins list' ), +) ); + $title = __('Plugins'); $parent_file = 'plugins.php'; require_once(ABSPATH . 'wp-admin/admin-header.php'); $invalid = validate_active_plugins(); -if ( !empty($invalid) ) - foreach ( $invalid as $plugin_file => $error ) - echo '

' . sprintf(__('The plugin %s has been deactivated due to an error: %s'), esc_html($plugin_file), $error->get_error_message()) . '

'; +if ( ! empty( $invalid ) ) { + foreach ( $invalid as $plugin_file => $error ) { + echo '

'; + printf( + /* translators: 1: plugin file 2: error message */ + __( 'The plugin %1$s has been deactivated due to an error: %2$s' ), + '' . esc_html( $plugin_file ) . '', + $error->get_error_message() ); + echo '

'; + } +} ?> fatal error.'); ?> -

- + if ( ! isset( $_GET['main'] ) && ! isset( $_GET['charsout'] ) && wp_verify_nonce( $_GET['_error_nonce'], 'plugin-activation-error_' . $plugin ) ) { + $iframe_url = add_query_arg( array( + 'action' => 'error_scrape', + 'plugin' => urlencode( $plugin ), + '_wpnonce' => urlencode( $_GET['_error_nonce'] ), + ), admin_url( 'plugins.php' ) ); + ?> + @@ -394,30 +451,45 @@ if ( !empty($invalid) ) delete_transient( 'plugins_delete_result_' . $user_ID ); if ( is_wp_error($delete_result) ) : ?> -

get_error_message() ); ?>

deleted.'); ?>

+ deleted.' ); + } else { + _e( 'The selected plugins have been deleted.' ); + } + ?> +

activated.') ?>

activated.'); ?>

deactivated.') ?>

deactivated.'); ?>

- -' . __('Search results for “%s”') . '', esc_html( $s ) ); ?> -

+ +' . __( 'Search results for “%s”' ) . '', esc_html( urldecode( $s ) ) ); +} +?> + views(); ?> - -

true ) ) ) ) +} elseif ( in_array( $_GET['post_type'], get_post_types( array('show_ui' => true ) ) ) ) { $post_type = $_GET['post_type']; -else +} else { wp_die( __('Invalid post type') ); - +} $post_type_object = get_post_type_object( $post_type ); if ( 'post' == $post_type ) { @@ -28,8 +35,16 @@ if ( 'post' == $post_type ) { $submenu_file = "post-new.php?post_type=$post_type"; if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true ) { $parent_file = $post_type_object->show_in_menu; - if ( ! isset( $_registered_pages[ get_plugin_page_hookname( "post-new.php?post_type=$post_type", $post_type_object->show_in_menu ) ] ) ) - $submenu_file = $parent_file; + // What if there isn't a post-new.php item for this post type? + if ( ! isset( $_registered_pages[ get_plugin_page_hookname( "post-new.php?post_type=$post_type", $post_type_object->show_in_menu ) ] ) ) { + if ( isset( $_registered_pages[ get_plugin_page_hookname( "edit.php?post_type=$post_type", $post_type_object->show_in_menu ) ] ) ) { + // Fall back to edit.php for that post type, if it exists + $submenu_file = "edit.php?post_type=$post_type"; + } else { + // Otherwise, give up and highlight the parent + $submenu_file = $parent_file; + } + } } else { $parent_file = "edit.php?post_type=$post_type"; } @@ -39,8 +54,13 @@ $title = $post_type_object->labels->add_new_item; $editing = true; -if ( ! current_user_can( $post_type_object->cap->edit_posts ) || ! current_user_can( $post_type_object->cap->create_posts ) ) - wp_die( __( 'Cheatin’ uh?' ) ); +if ( ! current_user_can( $post_type_object->cap->edit_posts ) || ! current_user_can( $post_type_object->cap->create_posts ) ) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'You are not allowed to create posts as this user.' ) . '

', + 403 + ); +} // Schedule auto-draft cleanup if ( ! wp_next_scheduled( 'wp_scheduled_auto_draft_delete' ) ) diff --git a/wp-admin/post.php b/wp-admin/post.php index f378c22..5333b5f 100644 --- a/wp-admin/post.php +++ b/wp-admin/post.php @@ -23,7 +23,12 @@ elseif ( isset( $_POST['post_ID'] ) ) else $post_id = $post_ID = 0; -$post = $post_type = $post_type_object = null; +/** + * @global string $post_type + * @global object $post_type_object + * @global WP_Post $post + */ +global $post_type, $post_type_object, $post; if ( $post_id ) $post = get_post( $post_id ); @@ -33,55 +38,6 @@ if ( $post ) { $post_type_object = get_post_type_object( $post_type ); } -/** - * Redirect to previous page. - * - * @param int $post_id Optional. Post ID. - */ -function redirect_post($post_id = '') { - if ( isset($_POST['save']) || isset($_POST['publish']) ) { - $status = get_post_status( $post_id ); - - if ( isset( $_POST['publish'] ) ) { - switch ( $status ) { - case 'pending': - $message = 8; - break; - case 'future': - $message = 9; - break; - default: - $message = 6; - } - } else { - $message = 'draft' == $status ? 10 : 1; - } - - $location = add_query_arg( 'message', $message, get_edit_post_link( $post_id, 'url' ) ); - } elseif ( isset($_POST['addmeta']) && $_POST['addmeta'] ) { - $location = add_query_arg( 'message', 2, wp_get_referer() ); - $location = explode('#', $location); - $location = $location[0] . '#postcustom'; - } elseif ( isset($_POST['deletemeta']) && $_POST['deletemeta'] ) { - $location = add_query_arg( 'message', 3, wp_get_referer() ); - $location = explode('#', $location); - $location = $location[0] . '#postcustom'; - } else { - $location = add_query_arg( 'message', 4, get_edit_post_link( $post_id, 'url' ) ); - } - - /** - * Filter the post redirect destination URL. - * - * @since 2.9.0 - * - * @param string $location The destination URL. - * @param int $post_id The post ID. - */ - wp_redirect( apply_filters( 'redirect_post_location', $location, $post_id ) ); - exit; -} - if ( isset( $_POST['deletepost'] ) ) $action = 'delete'; elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] ) @@ -95,7 +51,9 @@ if ( ! $sendback || $sendback = admin_url( 'upload.php' ); } else { $sendback = admin_url( 'edit.php' ); - $sendback .= ( ! empty( $post_type ) ) ? '?post_type=' . $post_type : ''; + if ( ! empty( $post_type ) ) { + $sendback = add_query_arg( 'post_type', $post_type, $sendback ); + } } } else { $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), $sendback ); @@ -113,8 +71,9 @@ case 'post-quickdraft-save': if ( ! wp_verify_nonce( $nonce, 'add-post' ) ) $error_msg = __( 'Unable to submit this form, please refresh and try again.' ); - if ( ! current_user_can( 'edit_posts' ) ) - $error_msg = __( 'Oops, you don’t have access to add new drafts.' ); + if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) { + exit; + } if ( $error_msg ) return wp_dashboard_quick_press( $error_msg ); @@ -122,13 +81,12 @@ case 'post-quickdraft-save': $post = get_post( $_REQUEST['post_ID'] ); check_admin_referer( 'add-' . $post->post_type ); - $_POST['comment_status'] = get_option( 'default_comment_status' ); - $_POST['ping_status'] = get_option( 'default_ping_status' ); + $_POST['comment_status'] = get_default_comment_status( $post->post_type ); + $_POST['ping_status'] = get_default_comment_status( $post->post_type, 'pingback' ); edit_post(); wp_dashboard_quick_press(); exit; - break; case 'postajaxpost': case 'post': @@ -136,7 +94,6 @@ case 'post': $post_id = 'postajaxpost' == $action ? edit_post() : write_post(); redirect_post( $post_id ); exit(); - break; case 'edit': $editing = true; @@ -152,6 +109,10 @@ case 'edit': if ( ! $post_type_object ) wp_die( __( 'Unknown post type.' ) ); + if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ) ) ) { + wp_die( __( 'You are not allowed to edit posts in this post type.' ) ); + } + if ( ! current_user_can( 'edit_post', $post_id ) ) wp_die( __( 'You are not allowed to edit this item.' ) ); @@ -159,6 +120,7 @@ case 'edit': wp_die( __( 'You can’t edit this item because it is in the Trash. Please restore it and try again.' ) ); if ( ! empty( $_GET['get-post-lock'] ) ) { + check_admin_referer( 'lock-post_' . $post_id ); wp_set_post_lock( $post_id ); wp_redirect( get_edit_post_link( $post_id, 'url' ) ); exit(); @@ -231,13 +193,13 @@ case 'editpost': $post_id = edit_post(); // Session cookie flag that the post was saved - if ( isset( $_COOKIE['wp-saving-post-' . $post_id] ) ) - setcookie( 'wp-saving-post-' . $post_id, 'saved' ); + if ( isset( $_COOKIE['wp-saving-post'] ) && $_COOKIE['wp-saving-post'] === $post_id . '-check' ) { + setcookie( 'wp-saving-post', $post_id . '-saved', time() + DAY_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, is_ssl() ); + } redirect_post($post_id); // Send user on their way while we keep working exit(); - break; case 'trash': check_admin_referer('trash-post_' . $post_id); @@ -261,7 +223,6 @@ case 'trash': wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) ); exit(); - break; case 'untrash': check_admin_referer('untrash-post_' . $post_id); @@ -273,14 +234,13 @@ case 'untrash': wp_die( __( 'Unknown post type.' ) ); if ( ! current_user_can( 'delete_post', $post_id ) ) - wp_die( __( 'You are not allowed to move this item out of the Trash.' ) ); + wp_die( __( 'You are not allowed to restore this item from the Trash.' ) ); if ( ! wp_untrash_post( $post_id ) ) wp_die( __( 'Error in restoring from Trash.' ) ); wp_redirect( add_query_arg('untrashed', 1, $sendback) ); exit(); - break; case 'delete': check_admin_referer('delete-post_' . $post_id); @@ -294,19 +254,17 @@ case 'delete': if ( ! current_user_can( 'delete_post', $post_id ) ) wp_die( __( 'You are not allowed to delete this item.' ) ); - $force = ! EMPTY_TRASH_DAYS; if ( $post->post_type == 'attachment' ) { - $force = ( $force || ! MEDIA_TRASH ); + $force = ( ! MEDIA_TRASH ); if ( ! wp_delete_attachment( $post_id, $force ) ) wp_die( __( 'Error in deleting.' ) ); } else { - if ( ! wp_delete_post( $post_id, $force ) ) + if ( ! wp_delete_post( $post_id, true ) ) wp_die( __( 'Error in deleting.' ) ); } wp_redirect( add_query_arg('deleted', 1, $sendback) ); exit(); - break; case 'preview': check_admin_referer( 'update-post_' . $post_id ); @@ -315,11 +273,9 @@ case 'preview': wp_redirect($url); exit(); - break; default: wp_redirect( admin_url('edit.php') ); exit(); - break; } // end switch include( ABSPATH . 'wp-admin/admin-footer.php' ); diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php index 1becc48..62da1d3 100644 --- a/wp-admin/press-this.php +++ b/wp-admin/press-this.php @@ -11,670 +11,19 @@ define('IFRAME_REQUEST' , true); /** WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); - -if ( ! current_user_can( 'edit_posts' ) || ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) - wp_die( __( 'Cheatin’ uh?' ) ); +if ( ! current_user_can( 'edit_posts' ) || ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'You are not allowed to create posts as this user.' ) . '

', + 403 + ); +} /** - * Press It form handler. - * - * @since 2.6.0 - * - * @return int Post ID + * @global WP_Press_This $wp_press_this */ -function press_it() { - - $post = get_default_post_to_edit(); - $post = get_object_vars($post); - $post_ID = $post['ID'] = (int) $_POST['post_id']; - - if ( !current_user_can('edit_post', $post_ID) ) - wp_die(__('You are not allowed to edit this post.')); - - $post['post_category'] = isset($_POST['post_category']) ? $_POST['post_category'] : ''; - $post['tax_input'] = isset($_POST['tax_input']) ? $_POST['tax_input'] : ''; - $post['post_title'] = isset($_POST['title']) ? $_POST['title'] : ''; - $content = isset($_POST['content']) ? $_POST['content'] : ''; - - $upload = false; - if ( !empty($_POST['photo_src']) && current_user_can('upload_files') ) { - foreach( (array) $_POST['photo_src'] as $key => $image) { - // see if files exist in content - we don't want to upload non-used selected files. - if ( strpos($_POST['content'], htmlspecialchars($image)) !== false ) { - $desc = isset($_POST['photo_description'][$key]) ? $_POST['photo_description'][$key] : ''; - $upload = media_sideload_image($image, $post_ID, $desc); - - // Replace the POSTED content with correct uploaded ones. Regex contains fix for Magic Quotes - if ( !is_wp_error($upload) ) - $content = preg_replace('/]*)src=\\\?(\"|\')'.preg_quote(htmlspecialchars($image), '/').'\\\?(\2)([^>\/]*)\/*>/is', $upload, $content); - } - } - } - // set the post_content and status - $post['post_content'] = $content; - if ( isset( $_POST['publish'] ) && current_user_can( 'publish_posts' ) ) - $post['post_status'] = 'publish'; - elseif ( isset( $_POST['review'] ) ) - $post['post_status'] = 'pending'; - else - $post['post_status'] = 'draft'; - - // error handling for media_sideload - if ( is_wp_error($upload) ) { - wp_delete_post($post_ID); - wp_die($upload); - } else { - // Post formats - if ( isset( $_POST['post_format'] ) ) { - if ( current_theme_supports( 'post-formats', $_POST['post_format'] ) ) - set_post_format( $post_ID, $_POST['post_format'] ); - elseif ( '0' == $_POST['post_format'] ) - set_post_format( $post_ID, false ); - } - - $post_ID = wp_update_post($post); - } - - return $post_ID; -} - -// For submitted posts. -if ( isset($_REQUEST['action']) && 'post' == $_REQUEST['action'] ) { - check_admin_referer('press-this'); - $posted = $post_ID = press_it(); -} else { - $post = get_default_post_to_edit('post', true); - $post_ID = $post->ID; -} - -// Set Variables -$title = isset( $_GET['t'] ) ? trim( strip_tags( html_entity_decode( wp_unslash( $_GET['t'] ) , ENT_QUOTES) ) ) : ''; - -$selection = ''; -if ( !empty($_GET['s']) ) { - $selection = str_replace(''', "'", wp_unslash($_GET['s'])); - $selection = trim( htmlspecialchars( html_entity_decode($selection, ENT_QUOTES) ) ); +if ( empty( $GLOBALS['wp_press_this'] ) ) { + include( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' ); } -if ( ! empty($selection) ) { - $selection = preg_replace('/(\r?\n|\r)/', '

', $selection); - $selection = '

' . str_replace('

', '', $selection) . '

'; -} - -$url = isset($_GET['u']) ? esc_url($_GET['u']) : ''; -$image = isset($_GET['i']) ? $_GET['i'] : ''; - -if ( !empty($_REQUEST['ajax']) ) { - switch ($_REQUEST['ajax']) { - case 'video': ?> - -

- -

- - -

- -

- - - - -

- -

- ]*)src=(\"|\')([^<>\'\"]+)(\2)([^>]*)\/*>/i'; - $content = str_replace(array("\n","\t","\r"), '', $content); - preg_match_all($pattern, $content, $matches); - if ( empty($matches[0]) ) - return ''; - $sources = array(); - foreach ($matches[3] as $src) { - // if no http in url - if (strpos($src, 'http') === false) - // if it doesn't have a relative uri - if ( strpos($src, '../') === false && strpos($src, './') === false && strpos($src, '/') === 0) - $src = 'http://'.str_replace('//','/', $host['host'].'/'.$src); - else - $src = 'http://'.str_replace('//','/', $host['host'].'/'.dirname($host['path']).'/'.$src); - $sources[] = esc_url($src); - } - return "'" . implode("','", $sources) . "'"; - } - $url = wp_kses(urldecode($url), null); - echo 'new Array('.get_images_from_uri($url).')'; - break; - - case 'photo_js': ?> - // gather images and load some default JS - var last = null - var img, img_tag, aspect, w, h, skip, i, strtoappend = ""; - if(photostorage == false) { - var my_src = eval( - jQuery.ajax({ - type: "GET", - url: "", - cache : false, - async : false, - data: "ajax=photo_images&u=", - dataType : "script" - }).responseText - ); - if(my_src.length == 0) { - var my_src = eval( - jQuery.ajax({ - type: "GET", - url: "", - cache : false, - async : false, - data: "ajax=photo_images&u=", - dataType : "script" - }).responseText - ); - if(my_src.length == 0) { - strtoappend = ''; - } - } - } - for (i = 0; i < my_src.length; i++) { - img = new Image(); - img.src = my_src[i]; - img_attr = 'id="img' + i + '"'; - skip = false; - - maybeappend = '

'; - - if (img.width && img.height) { - if (img.width >= 30 && img.height >= 30) { - aspect = img.width / img.height; - scale = (aspect > 1) ? (71 / img.width) : (71 / img.height); - - w = img.width; - h = img.height; - - if (scale < 1) { - w = parseInt(img.width * scale); - h = parseInt(img.height * scale); - } - img_attr += ' style="width: ' + w + 'px; height: ' + h + 'px;"'; - strtoappend += maybeappend; - } - } else { - strtoappend += maybeappend; - } - } - - function pick(img, desc) { - if (img) { - if('object' == typeof jQuery('.photolist input') && jQuery('.photolist input').length != 0) length = jQuery('.photolist input').length; - if(length == 0) length = 1; - jQuery('.photolist').append(''); - jQuery('.photolist').append(''); - insert_editor( "\n\n" + encodeURI('

')); - } - return false; - } - - function image_selector(el) { - var desc, src, parent = jQuery(el).closest('#photo-add-url-div'); - - if ( parent.length ) { - desc = parent.find('input.tb_this_photo_description').val() || ''; - src = parent.find('input.tb_this_photo').val() || '' - } else { - desc = jQuery('#tb_this_photo_description').val() || ''; - src = jQuery('#tb_this_photo').val() || '' - } - - tb_remove(); - pick(src, desc); - jQuery('#extra-fields').hide(); - jQuery('#extra-fields').html(''); - return false; - } - - jQuery('#extra-fields').html('

()

'); - jQuery('#img_container').html(strtoappend); - -<?php _e('Press This') ?> - - - - - - - - -

- - - - - - - - -

- -

- 'save' ) ); - if ( current_user_can('publish_posts') ) { - submit_button( __( 'Publish' ), 'primary', 'publish', false ); - } else { - echo '

'; - submit_button( __( 'Submit for Review' ), 'primary', 'review', false ); - } ?> - -

- -

- - -

- -

- - -

- -

labels->all_items; ?>

- - - -

- 'category', 'popular_cats' => $popular_ids ) ) ?> - -

- - cap->assign_terms) ) : ?> -

- - cap->edit_terms) ) : ?> -

- - labels->add_new_item ); ?> - -

- labels->add_new_item; ?> - - - labels->parent_item_colon; ?> - - 'category', 'hide_empty' => 0, 'name' => 'newcategory_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => '— ' . $tax->labels->parent_item . ' —' ) ); ?> - - - -

- -

- - -

- -

- - - -

- - -

- - | - |

- - -

- -

- - - - - -

- true, - 'textarea_rows' => '15' - ); - - $content = ''; - if ( $selection ) - $content .= $selection; - - if ( $url ) { - $content .= '

'; - - if ( $selection ) - $content .= __('via '); - - $content .= sprintf( "%s.

", esc_url( $url ), esc_html( $title ) ); - } - - remove_action( 'media_buttons', 'media_buttons' ); - add_action( 'media_buttons', 'press_this_media_buttons' ); - function press_this_media_buttons() { - _e( 'Add:' ); - - if ( current_user_can('upload_files') ) { - ?> - -

- -

- -

- - - - - - +$GLOBALS['wp_press_this']->html(); diff --git a/wp-admin/revision.php b/wp-admin/revision.php index e4cc0c7..4d86c53 100644 --- a/wp-admin/revision.php +++ b/wp-admin/revision.php @@ -29,7 +29,7 @@ if ( ! $revision_id ) $revision_id = absint( $to ); $redirect = 'edit.php'; -switch ( $action ) : +switch ( $action ) { case 'restore' : if ( ! $revision = wp_get_post_revision( $revision_id ) ) break; @@ -74,13 +74,13 @@ default : $post_edit_link = get_edit_post_link(); $post_title = '' . _draft_or_post_title() . ''; - $h2 = sprintf( __( 'Compare Revisions of “%1$s”' ), $post_title ); - $return_to_post = '' . __( '← Return to post editor' ) . ''; + $h1 = sprintf( __( 'Compare Revisions of “%1$s”' ), $post_title ); + $return_to_post = '' . __( '← Return to editor' ) . ''; $title = __( 'Revisions' ); $redirect = false; break; -endswitch; +} // Empty post_type means either malformed object found, or no valid parent was found. if ( ! $redirect && empty( $post->post_type ) ) @@ -116,7 +116,7 @@ get_current_screen()->add_help_tab( array( ) ); $revisions_sidebar = '

' . __( 'For more information:' ) . '

'; -$revisions_sidebar .= '

' . __( 'Revisions Management' ) . '

'; +$revisions_sidebar .= '

' . __( 'Revisions Management' ) . '

'; $revisions_sidebar .= '

' . __( 'Support Forums' ) . '

'; get_current_screen()->set_help_sidebar( $revisions_sidebar ); @@ -126,96 +126,10 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>

- - - - - - - - - - - - ' . sprintf( __( "The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try installing now." ), 'install.php' ) . '

' ); + wp_die( '

' . sprintf( + /* translators: %s: install.php */ + __( "The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try installing now." ), + 'install.php' + ) . '

' + ); // Check if wp-config.php exists above the root directory but is not part of another install -if ( file_exists(ABSPATH . '../wp-config.php' ) && ! file_exists( ABSPATH . '../wp-settings.php' ) ) - wp_die( '

' . sprintf( __( "The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try installing now."), 'install.php' ) . '

' ); +if ( @file_exists( ABSPATH . '../wp-config.php' ) && ! @file_exists( ABSPATH . '../wp-settings.php' ) ) { + wp_die( '

' . sprintf( + /* translators: %s: install.php */ + __( "The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try installing now." ), + 'install.php' + ) . '

' + ); +} -$step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0; +$step = isset( $_GET['step'] ) ? (int) $_GET['step'] : -1; /** * Display setup wp-config.php file header. * * @ignore * @since 2.3.0 + * + * @global string $wp_local_package + * @global WP_Locale $wp_locale + * + * @param string|array $body_classes */ -function setup_config_display_header() { - global $wp_version; +function setup_config_display_header( $body_classes = array() ) { + $body_classes = (array) $body_classes; + $body_classes[] = 'wp-core-ui'; + if ( is_rtl() ) { + $body_classes[] = 'rtl'; + } header( 'Content-Type: text/html; charset=utf-8' ); ?> > - - -<?php _e( 'WordPress › Setup Configuration File' ); ?> - - - + + + + <?php _e( 'WordPress › Setup Configuration File' ); ?> + - -

+ +

Select a default language'; + echo ''; + break; + } + + // Deliberately fall through if we can't reach the translations API. + case 0: + if ( ! empty( $language ) ) { + $loaded_language = wp_download_language_pack( $language ); + if ( $loaded_language ) { + load_default_textdomain( $loaded_language ); + $GLOBALS['wp_locale'] = new WP_Locale(); + } + } + setup_config_display_header(); + $step_1 = 'setup-config.php?step=1'; + if ( isset( $_REQUEST['noapi'] ) ) { + $step_1 .= '&noapi'; + } + if ( ! empty( $loaded_language ) ) { + $step_1 .= '&language=' . $loaded_language; + } ?> - +

wp-config-sample.php in a text editor, fill in your information, and save it as wp-config.php." ); ?>

- -

wp-config.php' + ); + ?> + wp-config-sample.php', + 'wp-config.php' + ); + ?> + We got it.' ), + __( 'https://codex.wordpress.org/Editing_wp-config.php' ) + ); +?>

+ +

- + - + - + - - + + - + @@ -160,16 +215,36 @@ switch($step) {





		localhost does not work.' ); ?>	localhost' ); + ?>

' . __( 'Try again' ) . ''; + if ( ! empty( $language ) ) { + $step_1 .= '&language=' . $language; + $install .= '?language=' . $language; + } else { + $install .= '?language=en_US'; + } + + $tryagain_link = '

' . __( 'Try again' ) . ''; if ( empty( $prefix ) ) wp_die( __( 'ERROR: "Table Prefix" must not be empty.' . $tryagain_link ) ); @@ -188,36 +263,47 @@ switch($step) { define('DB_HOST', $dbhost); /**#@-*/ - // We'll fail here if the values are no good. + // Re-construct $wpdb with these new values. + unset( $wpdb ); require_wp_db(); + + /* + * The wpdb constructor bails when WP_SETUP_CONFIG is set, so we must + * fire this manually. We'll fail here if the values are no good. + */ + $wpdb->db_connect(); + if ( ! empty( $wpdb->error ) ) wp_die( $wpdb->error->get_error_message() . $tryagain_link ); - // Fetch or generate keys and salts. - $no_api = isset( $_POST['noapi'] ); - if ( ! $no_api ) { - require_once( ABSPATH . WPINC . '/class-http.php' ); - require_once( ABSPATH . WPINC . '/http.php' ); - /**#@+ - * @ignore - */ - function get_bloginfo() { - return wp_guess_url(); + // Generate keys and salts using secure CSPRNG; fallback to API if enabled; further fallback to original wp_generate_password(). + try { + $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_ []{}<>~`+=,.;:/?|'; + $max = strlen($chars) - 1; + for ( $i = 0; $i < 8; $i++ ) { + $key = ''; + for ( $j = 0; $j < 64; $j++ ) { + $key .= substr( $chars, random_int( 0, $max ), 1 ); + } + $secret_keys[] = $key; } - /**#@-*/ - $secret_keys = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' ); - } + } catch ( Exception $ex ) { + $no_api = isset( $_POST['noapi'] ); - if ( $no_api || is_wp_error( $secret_keys ) ) { - $secret_keys = array(); - require_once( ABSPATH . WPINC . '/pluggable.php' ); - for ( $i = 0; $i < 8; $i++ ) { - $secret_keys[] = wp_generate_password( 64, true, true ); + if ( ! $no_api ) { + $secret_keys = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' ); } - } else { - $secret_keys = explode( "\n", wp_remote_retrieve_body( $secret_keys ) ); - foreach ( $secret_keys as $k => $v ) { - $secret_keys[$k] = substr( $v, 28, 64 ); + + if ( $no_api || is_wp_error( $secret_keys ) ) { + $secret_keys = array(); + for ( $i = 0; $i < 8; $i++ ) { + $secret_keys[] = wp_generate_password( 64, true, true ); + } + } else { + $secret_keys = explode( "\n", wp_remote_retrieve_body( $secret_keys ) ); + foreach ( $secret_keys as $k => $v ) { + $secret_keys[$k] = substr( $v, 28, 64 ); + } } } @@ -242,6 +328,11 @@ switch($step) { case 'DB_HOST' : $config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . addcslashes( constant( $constant ), "\\'" ) . "');\r\n"; break; + case 'DB_CHARSET' : + if ( 'utf8mb4' === $wpdb->charset || ( ! $wpdb->charset && $wpdb->has_cap( 'utf8mb4' ) ) ) { + $config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'utf8mb4');\r\n"; + } + break; case 'AUTH_KEY' : case 'SECURE_AUTH_KEY' : case 'LOGGED_IN_KEY' : @@ -259,46 +350,58 @@ switch($step) { if ( ! is_writable(ABSPATH) ) : setup_config_display_header(); ?> -

wp-config.php file." ); ?>

wp-config.php manually and paste the following text into it.' ); ?>

wp-config.php' ); +?>

<?php
-		foreach( $config_file as $line ) {
+		foreach ( $config_file as $line ) {
 			echo htmlentities($line, ENT_COMPAT, 'UTF-8');
 		}
 ?>

+ +

+ diff --git a/wp-admin/term.php b/wp-admin/term.php new file mode 100644 index 0000000..d541732 --- /dev/null +++ b/wp-admin/term.php @@ -0,0 +1,68 @@ + $taxnow ), $sendback ); + } + wp_redirect( esc_url( $sendback ) ); + exit; +} + +$tag_ID = absint( $_REQUEST['tag_ID'] ); +$tag = get_term( $tag_ID, '', OBJECT, 'edit' ); + +if ( ! $tag instanceof WP_Term ) { + wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) ); +} + +$tax = get_taxonomy( $tag->taxonomy ); +$taxonomy = $tax->name; +$title = $tax->labels->edit_item; + +if ( ! in_array( $taxonomy, get_taxonomies( array( 'show_ui' => true ) ) ) || + ! current_user_can( $tax->cap->manage_terms ) +) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'You are not allowed to manage this item.' ) . '

', + 403 + ); +} + +$post_type = get_current_screen()->post_type; + +// Default to the first object_type associated with the taxonomy if no post type was passed. +if ( empty( $post_type ) ) { + $post_type = reset( $tax->object_type ); +} + +if ( 'post' != $post_type ) { + $parent_file = ( 'attachment' == $post_type ) ? 'upload.php' : "edit.php?post_type=$post_type"; + $submenu_file = "edit-tags.php?taxonomy=$taxonomy&post_type=$post_type"; +} elseif ( 'link_category' == $taxonomy ) { + $parent_file = 'link-manager.php'; + $submenu_file = 'edit-tags.php?taxonomy=link_category'; +} else { + $parent_file = 'edit.php'; + $submenu_file = "edit-tags.php?taxonomy=$taxonomy"; +} + +get_current_screen()->set_screen_reader_content( array( + 'heading_pagination' => $tax->labels->items_list_navigation, + 'heading_list' => $tax->labels->items_list, +) ); + +require_once( ABSPATH . 'wp-admin/admin-header.php' ); +include( ABSPATH . 'wp-admin/edit-tag-form.php' ); +include( ABSPATH . 'wp-admin/admin-footer.php' ); diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php index 382e594..6fae2b7 100644 --- a/wp-admin/theme-editor.php +++ b/wp-admin/theme-editor.php @@ -25,44 +25,75 @@ get_current_screen()->add_help_tab( array( 'title' => __('Overview'), 'content' => '

' . __('You can use the Theme Editor to edit the individual CSS and PHP files which make up your theme.') . '

' . __('Begin by choosing a theme to edit from the dropdown menu and clicking Select. A list then appears of all the template files. Clicking once on any file name causes the file to appear in the large Editor box.') . '

' . __("Begin by choosing a theme to edit from the dropdown menu and clicking Select. A list then appears of the theme's template files. Clicking once on any file name causes the file to appear in the large Editor box.") . '

' . __('For PHP files, you can use the Documentation dropdown to select from functions recognized in that file. Look Up takes you to a web page with reference material about that particular function.') . '

' . __('In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key.') . '

' . __( 'In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue.' ) . '

' . __('After typing in your edits, click Update File.') . '

' . __('Advice: think very carefully about your site crashing if you are live-editing the theme currently in use.') . '

' . sprintf( __('Upgrading to a newer version of the same theme will override changes made here. To avoid this, consider creating a child theme instead.'), __('http://codex.wordpress.org/Child_Themes') ) . '

' . +

' . sprintf( __('Upgrading to a newer version of the same theme will override changes made here. To avoid this, consider creating a child theme instead.'), __('https://codex.wordpress.org/Child_Themes') ) . '

' . ( is_network_admin() ? '

' . __('Any edits to files from this screen will be reflected on all sites in the network.') . '

' : '' ) ) ); get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Theme Development') . '

' . - '

' . __('Documentation on Using Themes') . '

' . - '

' . __('Documentation on Editing Files') . '

' . - '

' . __('Documentation on Template Tags') . '

' . + '

' . __('Documentation on Theme Development') . '

' . + '

' . __('Documentation on Using Themes') . '

' . + '

' . __('Documentation on Editing Files') . '

' . + '

' . __('Documentation on Template Tags') . '

' . '

' . __('Support Forums') . '

' ); wp_reset_vars( array( 'action', 'error', 'file', 'theme' ) ); -if ( $theme ) +if ( $theme ) { $stylesheet = $theme; -else +} else { $stylesheet = get_stylesheet(); +} $theme = wp_get_theme( $stylesheet ); -if ( ! $theme->exists() ) +if ( ! $theme->exists() ) { wp_die( __( 'The requested theme does not exist.' ) ); +} -if ( $theme->errors() && 'theme_no_stylesheet' == $theme->errors()->get_error_code() ) +if ( $theme->errors() && 'theme_no_stylesheet' == $theme->errors()->get_error_code() ) { wp_die( __( 'The requested theme does not exist.' ) . ' ' . $theme->errors()->get_error_message() ); +} + +$allowed_files = $style_files = array(); +$has_templates = false; +$default_types = array( 'php', 'css' ); -$allowed_files = $theme->get_files( 'php', 1 ); -$has_templates = ! empty( $allowed_files ); -$style_files = $theme->get_files( 'css' ); -$allowed_files['style.css'] = $style_files['style.css']; -$allowed_files += $style_files; +/** + * Filter the list of file types allowed for editing in the Theme editor. + * + * @since 4.4.0 + * + * @param array $default_types List of file types. Default types include 'php' and 'css'. + * @param WP_Theme $theme The current Theme object. + */ +$file_types = apply_filters( 'wp_theme_editor_filetypes', $default_types, $theme ); + +// Ensure that default types are still there. +$file_types = array_unique( array_merge( $file_types, $default_types ) ); + +foreach ( $file_types as $type ) { + switch ( $type ) { + case 'php': + $allowed_files += $theme->get_files( 'php', 1 ); + $has_templates = ! empty( $allowed_files ); + break; + case 'css': + $style_files = $theme->get_files( 'css' ); + $allowed_files['style.css'] = $style_files['style.css']; + $allowed_files += $style_files; + break; + default: + $allowed_files += $theme->get_files( $type ); + break; + } +} if ( empty( $file ) ) { $relative_file = 'style.css'; @@ -81,7 +112,7 @@ case 'update': $newcontent = wp_unslash( $_POST['newcontent'] ); $location = 'theme-editor.php?file=' . urlencode( $relative_file ) . '&theme=' . urlencode( $stylesheet ) . '&scrollto=' . $scrollto; if ( is_writeable( $file ) ) { - //is_writable() not always reliable, check return value. see comments @ http://uk.php.net/is_writable + // is_writable() not always reliable, check return value. see comments @ http://uk.php.net/is_writable $f = fopen( $file, 'w+' ); if ( $f !== false ) { fwrite( $f, $newcontent ); @@ -92,7 +123,6 @@ case 'update': } wp_redirect( $location ); exit; -break; default: @@ -122,22 +152,21 @@ default: $content = esc_textarea( $content ); } - ?> - -

+ if ( isset( $_GET['updated'] ) ) : ?> +

(' . $file_show . ')'; ?>

display('Name'); if ( $description ) echo ': ' . $description; ?>

display( 'Name' ); if ( $description ) echo ': ' . $description; ?>

@@ -165,26 +194,52 @@ if ( $theme->errors() )

parent() ) : -?> -

- parent() ) : ?> -

get_template() ) ) . '">' . $theme->parent()->display('Name') . '' ); ?>

- -

- $absolute_filename ) : - if ( 'style.css' == $filename ) - echo "\t\n\t

" . _x( 'Styles', 'Theme stylesheets in theme editor' ) . "

\n\t

\n"; + $file_type = substr( $filename, strrpos( $filename, '.' ) ); - $file_description = get_file_description( $absolute_filename ); - if ( $file_description != basename( $filename ) ) + if ( $file_type !== $previous_file_type ) { + if ( '' !== $previous_file_type ) { + echo "\t\n"; + } + + switch ( $file_type ) { + case '.php': + if ( $has_templates || $theme->parent() ) : + echo "\t

" . __( 'Templates' ) . "

\n"; + if ( $theme->parent() ) { + echo '

' . sprintf( __( 'This child theme inherits templates from a parent theme, %s.' ), + sprintf( '%s', + self_admin_url( 'theme-editor.php?theme=' . urlencode( $theme->get_template() ) ), + $theme->parent()->display( 'Name' ) + ) + ) . "

\n"; + } + endif; + break; + case '.css': + echo "\t

" . _x( 'Styles', 'Theme stylesheets in theme editor' ) . "

\n"; + break; + default: + /* translators: %s: file extension */ + echo "\t

" . sprintf( __( '%s files' ), $file_type ) . "

\n"; + break; + } + + echo "\t

(' . $filename . ')

' . $file_description . '

- +

the Codex for more information.'); ?>

@@ -231,12 +286,10 @@ endif; // $error

__( 'Featured Themes' ), - 'popular' => __( 'Popular Themes' ), - 'new' => __( 'Newest Themes' ), -); - $installed_themes = search_theme_directories(); foreach ( $installed_themes as $k => $v ) { if ( false !== strpos( $k, '/' ) ) { @@ -50,37 +44,47 @@ wp_localize_script( 'theme', '_wpThemeSettings', array( ), 'l10n' => array( 'addNew' => __( 'Add New Theme' ), - 'search' => __( 'Search Themes' ), + 'search' => __( 'Search Themes' ), 'searchPlaceholder' => __( 'Search themes...' ), // placeholder (no ellipsis) 'upload' => __( 'Upload Theme' ), 'back' => __( 'Back' ), - 'error' => __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ) + 'error' => __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ), + 'themesFound' => __( 'Number of Themes found: %d' ), + 'noThemesFound' => __( 'No themes found. Try a different search.' ), + 'collapseSidebar' => __( 'Collapse Sidebar' ), + 'expandSidebar' => __( 'Expand Sidebar' ), ), 'installedThemes' => array_keys( $installed_themes ), - 'browse' => array( - 'sections' => $sections, - ), ) ); wp_enqueue_script( 'theme' ); -/** - * Fires before each of the tabs are rendered on the Install Themes page. - * - * The dynamic portion of the hook name, $tab, refers to the current - * theme install tab. Possible values are 'dashboard', 'search', 'upload', - * 'featured', 'new', or 'updated'. - * - * @since 2.8.0 - */ if ( $tab ) { + /** + * Fires before each of the tabs are rendered on the Install Themes page. + * + * The dynamic portion of the hook name, `$tab`, refers to the current + * theme install tab. Possible values are 'dashboard', 'search', 'upload', + * 'featured', 'new', or 'updated'. + * + * @since 2.8.0 + */ do_action( "install_themes_pre_{$tab}" ); } $help_overview = - '

' . sprintf(__('You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the WordPress.org Theme Directory. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.'), 'https://wordpress.org/themes/') . '

' . - '

' . __('You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter. Alternately, you can browse the themes that are Featured, Newest, or Recently Updated. When you find a theme you like, you can preview it or install it.') . '

' . - '

' . __('You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme’s folder via FTP into your /wp-content/themes directory.') . '

'; + '

' . sprintf( + /* translators: %s: Theme Directory URL */ + __( 'You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the WordPress.org Theme Directory. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.' ), + __( 'https://wordpress.org/themes/' ) + ) . '

' . + '

' . __( 'You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter.' ) . ' ' . __( 'The search results will be updated as you type.' ) . '

' . + '

' . __( 'Alternately, you can browse the themes that are Featured, Popular, or Latest. When you find a theme you like, you can preview it or install it.' ) . '

' . + '

' . sprintf( + /* translators: %s: /wp-content/themes */ + __( 'You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme’s folder via FTP into your %s directory.' ), + '/wp-content/themes' + ) . '

'; get_current_screen()->add_help_tab( array( 'id' => 'overview', @@ -100,7 +104,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Adding New Themes') . '

' . + '

' . __('Documentation on Adding New Themes') . '

' . '

' . __('Support Forums') . '

' ); @@ -108,77 +112,116 @@ include(ABSPATH . 'wp-admin/admin-header.php'); ?>

- - - -

__( 'Upload Theme' ) ) ); + if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_themes' ) ) { + echo ' ' . __( 'Upload Theme' ) . ''; + echo ' ' . _x( 'Browse', 'themes' ) . ''; + } + ?>

- - - - -

- - + + +

- - -
+ +

+ + + + + +

+ +

+ + + + +

+ +

+ + +

$features ) { - if ( $feature_name === 'Features' || $feature_name === __( 'Features' ) ) { // hack hack hack - echo '

'; - } else { - echo '

'; - } + echo '

'; + echo ''; } ?> -

+ +

-
@@ -202,16 +245,18 @@ if ( $tab ) {

<# if ( data.installed ) { #> -

<# } #> diff --git a/wp-admin/themes.php b/wp-admin/themes.php index 68463fc..67769ee 100644 --- a/wp-admin/themes.php +++ b/wp-admin/themes.php @@ -9,25 +9,57 @@ /** WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( !current_user_can('switch_themes') && !current_user_can('edit_theme_options') ) - wp_die( __( 'Cheatin’ uh?' ) ); +if ( ! current_user_can( 'switch_themes' ) && ! current_user_can( 'edit_theme_options' ) ) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'You are not allowed to edit theme options on this site.' ) . '

', + 403 + ); +} if ( current_user_can( 'switch_themes' ) && isset($_GET['action'] ) ) { if ( 'activate' == $_GET['action'] ) { check_admin_referer('switch-theme_' . $_GET['stylesheet']); $theme = wp_get_theme( $_GET['stylesheet'] ); - if ( ! $theme->exists() || ! $theme->is_allowed() ) - wp_die( __( 'Cheatin’ uh?' ) ); + + if ( ! $theme->exists() || ! $theme->is_allowed() ) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'The requested theme does not exist.' ) . '

', + 403 + ); + } + switch_theme( $theme->get_stylesheet() ); wp_redirect( admin_url('themes.php?activated=true') ); exit; } elseif ( 'delete' == $_GET['action'] ) { check_admin_referer('delete-theme_' . $_GET['stylesheet']); $theme = wp_get_theme( $_GET['stylesheet'] ); - if ( !current_user_can('delete_themes') || ! $theme->exists() ) - wp_die( __( 'Cheatin’ uh?' ) ); - delete_theme($_GET['stylesheet']); - wp_redirect( admin_url('themes.php?deleted=true') ); + + if ( ! current_user_can( 'delete_themes' ) ) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'You are not allowed to delete this item.' ) . '

', + 403 + ); + } + + if ( ! $theme->exists() ) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'The requested theme does not exist.' ) . '

', + 403 + ); + } + + $active = wp_get_theme(); + if ( $active->get( 'Template' ) == $_GET['stylesheet'] ) { + wp_redirect( admin_url( 'themes.php?delete-active-child=true' ) ); + } else { + delete_theme( $_GET['stylesheet'] ); + wp_redirect( admin_url( 'themes.php?deleted=true' ) ); + } exit; } } @@ -42,7 +74,8 @@ if ( current_user_can( 'switch_themes' ) ) { '

' . __( 'Hover or tap to see Activate and Live Preview buttons' ) . '
' . __( 'Click on the theme to see the theme name, version, author, description, tags, and the Delete link' ) . '
' . __( 'Click Customize for the current theme or Live Preview for any other theme to see a live preview' ) . '

' . - '

' . __( 'The current theme is displayed highlighted as the first theme.' ) . '

'; + '

' . __( 'The current theme is displayed highlighted as the first theme.' ) . '

' . + '

' . __( 'The search for installed themes will search for terms in their name, description, author, or tag.' ) . ' ' . __( 'The search results will be updated as you type.' ) . '

'; get_current_screen()->add_help_tab( array( 'id' => 'overview', @@ -67,7 +100,7 @@ if ( current_user_can( 'install_themes' ) ) { } // install_themes // Help tab: Previewing and Customizing -if ( current_user_can( 'edit_theme_options' ) ) { +if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { $help_customize = '

' . __( 'Tap or hover on any theme then click the Live Preview button to see a live preview of that theme and change theme options in a separate, full-screen view. You can also find a Live Preview button at the bottom of the theme details screen. Any installed theme can be previewed and customized in this way.' ) . '

'. '

' . __( 'The theme being previewed is fully interactive — navigate to different pages to see how the theme handles posts, archives, and other page templates. The settings may differ depending on what theme features the theme being previewed supports. To accept the new settings and activate the theme all in one step, click the Save & Activate button above the menu.' ) . '

' . @@ -78,11 +111,11 @@ if ( current_user_can( 'edit_theme_options' ) ) { 'title' => __( 'Previewing and Customizing' ), 'content' => $help_customize ) ); -} // edit_theme_options +} // edit_theme_options && customize get_current_screen()->set_help_sidebar( '

' . __( 'For more information:' ) . '

' . - '

' . __( 'Documentation on Using Themes' ) . '

' . + '

' . __( 'Documentation on Using Themes' ) . '

' . '

' . __( 'Support Forums' ) . '

' ); @@ -102,9 +135,11 @@ wp_localize_script( 'theme', '_wpThemeSettings', array( 'adminUrl' => parse_url( admin_url(), PHP_URL_PATH ), ), 'l10n' => array( - 'addNew' => __( 'Add New Theme' ), - 'search' => __( 'Search Installed Themes' ), + 'addNew' => __( 'Add New Theme' ), + 'search' => __( 'Search Installed Themes' ), 'searchPlaceholder' => __( 'Search installed themes...' ), // placeholder (no ellipsis) + 'themesFound' => __( 'Number of Themes found: %d' ), + 'noThemesFound' => __( 'No themes found. Try a different search.' ), ), ) ); @@ -116,23 +151,25 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>

- +

+ - + -

+ -

Visit site' ), home_url( '/' ) ); ?>

+ +

errors() || ( 1 == count( $ct->errors()->get_error_codes() ) if ( is_array( $submenu ) && isset( $submenu['themes.php'] ) ) { foreach ( (array) $submenu['themes.php'] as $item) { $class = ''; - if ( 'themes.php' == $item[2] || 'theme-editor.php' == $item[2] || 'customize.php' == $item[2] ) + if ( 'themes.php' == $item[2] || 'theme-editor.php' == $item[2] || 0 === strpos( $item[2], 'customize.php' ) ) continue; // 0 = name, 1 = capability, 2 = file if ( ( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file)) ) - $class = ' class="current"'; + $class = ' current'; if ( !empty($submenu[$item[2]]) ) { $submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index. $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]); if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook)) - $current_theme_actions[] = "{$item[0]}"; + $current_theme_actions[] = "{$item[0]}"; else - $current_theme_actions[] = "{$item[0]}"; - } else if ( current_user_can($item[1]) ) { + $current_theme_actions[] = "{$item[0]}"; + } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) { $menu_file = $item[2]; - if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) + + if ( current_user_can( 'customize' ) ) { + if ( 'custom-header' === $menu_file ) { + $current_theme_actions[] = "{$item[0]}"; + } elseif ( 'custom-background' === $menu_file ) { + $current_theme_actions[] = "{$item[0]}"; + } + } + + if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) { $menu_file = substr( $menu_file, 0, $pos ); + } + if ( file_exists( ABSPATH . "wp-admin/$menu_file" ) ) { - $current_theme_actions[] = "{$item[0]}"; + $current_theme_actions[] = "{$item[0]}"; } else { - $current_theme_actions[] = "{$item[0]}"; + $current_theme_actions[] = "{$item[0]}"; } } } @@ -181,7 +229,7 @@ if ( ! $ct->errors() || ( 1 == count( $ct->errors()->get_error_codes() ) ?>

+ Active: %s' ), $theme['name'] ); + ?> +

- + - - - + + + +

@@ -228,11 +282,12 @@ foreach ( $themes as $theme ) :

+ true ) ) ) { @@ -240,22 +295,58 @@ if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_

+ + + + + + + - - - - "; - } -?> + + + get_stylesheet(); + $delete_url = add_query_arg( array( + 'action' => 'delete', + 'stylesheet' => urlencode( $stylesheet ), + ), admin_url( 'themes.php' ) ); + $delete_url = wp_nonce_url( $delete_url, 'delete-theme_' . $stylesheet ); + ?> + + errors()->get_error_code() ) { + $parent_theme_name = $broken_theme->get( 'Template' ); + $parent_theme = themes_api( 'theme_information', array( 'slug' => urlencode( $parent_theme_name ) ) ); + + if ( ! is_wp_error( $parent_theme ) ) { + $install_url = add_query_arg( array( + 'action' => 'install-theme', + 'theme' => urlencode( $parent_theme_name ), + ), admin_url( 'update.php' ) ); + $install_url = wp_nonce_url( $install_url, 'install-theme_' . $parent_theme_name ); + ?> + + + +


" . ( $broken_theme->get( 'Name' ) ? $broken_theme->get( 'Name' ) : $broken_theme->get_stylesheet() ) . "	" . $broken_theme->errors()->get_error_message() . "
get( 'Name' ) ? $broken_theme->display( 'Name' ) : $broken_theme->get_stylesheet(); ?>	errors()->get_error_message(); ?>

@@ -281,21 +372,25 @@ if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_

<# if ( data.active ) { #> -

{{{ data.name }}}

+ Active: %s' ), '{{{ data.name }}}' ); + ?> +

<# } else { #> -

{{{ data.name }}}

<# } #>

<# if ( data.active ) { #> <# if ( data.actions.customize ) { #> - + <# } #> <# } else { #> - - - + + <# } #>

@@ -307,13 +402,13 @@ if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_ - +add_help_tab( array( get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Tools') . '

' . + '

' . __('Documentation on Tools') . '

' . '

' . __('Support Forums') . '

' ); @@ -33,20 +33,64 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>

- -

- +

+ + +

cap->manage_terms) || current_user_can($tags->cap->manage_terms) ) : ?> -

Categories and Tags Converter available from the Import screen.'), 'import.php' ); ?>

mysql_version, '>=' ); if ( !$mysql_compat && !$php_compat ) - $message = sprintf( __('You cannot update because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version ); + $message = sprintf( __('You cannot update because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version ); elseif ( !$php_compat ) - $message = sprintf( __('You cannot update because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $update->current, $update->php_version, $php_version ); + $message = sprintf( __('You cannot update because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $update->current, $update->php_version, $php_version ); elseif ( !$mysql_compat ) - $message = sprintf( __('You cannot update because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $update->current, $update->mysql_version, $mysql_version ); + $message = sprintf( __('You cannot update because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $update->current, $update->mysql_version, $mysql_version ); else - $message = sprintf(__('You can update to WordPress %2$s automatically or download the package and install it manually:'), $update->current, $version_string); + $message = sprintf(__('You can update to WordPress %2$s automatically or download the package and install it manually:'), $update->current, $version_string); if ( !$mysql_compat || !$php_compat ) $show_buttons = false; } @@ -104,6 +114,9 @@ function list_core_update( $update ) { } +/** + * @since 2.7.0 + */ function dismissed_updates() { $dismissed = get_core_updates( array( 'dismissed' => true, 'available' => false ) ); if ( $dismissed ) { @@ -122,7 +135,7 @@ function dismissed_updates() { '.__('Show hidden updates').'

'; echo '

'; list_core_update( $update ); echo '

'; + echo '

'; _e('You have the latest version of WordPress.'); if ( wp_http_supports( array( 'ssl' ) ) ) { @@ -160,27 +175,29 @@ function core_upgrade_preamble() { if ( $should_auto_update ) echo ' ' . __( 'Future security updates will be applied automatically.' ); } - echo '

'; - _e('Important: before updating, please back up your database and files. For help with updates, visit the Updating WordPress Codex page.'); + echo '

'; + _e('Important: before updating, please back up your database and files. For help with updates, visit the Updating WordPress Codex page.'); echo '

'; - echo '

'; + echo '

'; _e( 'An updated version of WordPress is available.' ); - echo '

'; + echo ''; } if ( isset( $updates[0] ) && $updates[0]->response == 'development' ) { require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; $upgrader = new WP_Automatic_Updater; - if ( wp_http_supports( 'ssl' ) && $upgrader->should_update( 'core', $updates[0], ABSPATH ) ) - echo '

BETA TESTERS: This site is set up to install updates of future beta versions automatically.

'; + if ( wp_http_supports( 'ssl' ) && $upgrader->should_update( 'core', $updates[0], ABSPATH ) ) { + echo '

'; + echo '' . __( 'BETA TESTERS:' ) . ' ' . __( 'This site is set up to install updates of future beta versions automatically.' ); + echo '

'; + } } echo '

'; list_core_update( $update ); echo '

' . __( 'Plugins' ) . '

' . __( 'Your plugins are all up to date.' ) . '

- +

- - + + - - - - - - $plugin_data) { - $info = plugins_api('plugin_information', array('slug' => $plugin_data->update->slug )); + foreach ( (array) $plugins as $plugin_file => $plugin_data ) { // Get plugin compat for running version of WordPress. - if ( isset($info->tested) && version_compare($info->tested, $cur_wp_version, '>=') ) { + if ( isset($plugin_data->update->tested) && version_compare($plugin_data->update->tested, $cur_wp_version, '>=') ) { $compat = '
' . sprintf(__('Compatibility with WordPress %1$s: 100%% (according to its author)'), $cur_wp_version); - } elseif ( isset($info->compatibility[$cur_wp_version][$plugin_data->update->new_version]) ) { - $compat = $info->compatibility[$cur_wp_version][$plugin_data->update->new_version]; - $compat = '
' . sprintf(__('Compatibility with WordPress %1$s: %2$d%% (%3$d "works" votes out of %4$d total)'), $cur_wp_version, $compat[0], $compat[2], $compat[1]); + } elseif ( isset($plugin_data->update->compatibility->{$cur_wp_version}) ) { + $compat = $plugin_data->update->compatibility->{$cur_wp_version}; + $compat = '
' . sprintf(__('Compatibility with WordPress %1$s: %2$d%% (%3$d "works" votes out of %4$d total)'), $cur_wp_version, $compat->percent, $compat->votes, $compat->total_votes); } else { $compat = '
' . sprintf(__('Compatibility with WordPress %1$s: Unknown'), $cur_wp_version); } // Get plugin compat for updated version of WordPress. if ( $core_update_version ) { - if ( isset($info->compatibility[$core_update_version][$plugin_data->update->new_version]) ) { - $update_compat = $info->compatibility[$core_update_version][$plugin_data->update->new_version]; - $compat .= '
' . sprintf(__('Compatibility with WordPress %1$s: %2$d%% (%3$d "works" votes out of %4$d total)'), $core_update_version, $update_compat[0], $update_compat[2], $update_compat[1]); + if ( isset( $plugin_data->update->tested ) && version_compare( $plugin_data->update->tested, $core_update_version, '>=' ) ) { + $compat .= '
' . sprintf( __( 'Compatibility with WordPress %1$s: 100%% (according to its author)' ), $core_update_version ); + } elseif ( isset( $plugin_data->update->compatibility->{$core_update_version} ) ) { + $update_compat = $plugin_data->update->compatibility->{$core_update_version}; + $compat .= '
' . sprintf(__('Compatibility with WordPress %1$s: %2$d%% (%3$d "works" votes out of %4$d total)'), $core_update_version, $update_compat->percent, $update_compat->votes, $update_compat->total_votes); } else { $compat .= '
' . sprintf(__('Compatibility with WordPress %1$s: Unknown'), $core_update_version); } @@ -265,76 +281,135 @@ function list_plugin_updates() { } $details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin=' . $plugin_data->update->slug . '§ion=changelog&TB_iframe=true&width=640&height=662'); - $details_text = sprintf(__('View version %1$s details'), $plugin_data->update->new_version); - $details = sprintf('%3$s.', esc_url($details_url), esc_attr($plugin_data->Name), $details_text); - - echo " - - - - "; + $details = sprintf( + '', + esc_url( $details_url ), + /* translators: 1: plugin name, 2: version number */ + esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_data->Name, $plugin_data->update->new_version ) ), + /* translators: %s: plugin version */ + sprintf( __( 'View version %s details.' ), $plugin_data->update->new_version ) + ); + + $checkbox_id = "checkbox_" . md5( $plugin_data->Name ); + ?> + + + + + + + + + + + +



	{$plugin_data->Name} " . sprintf(__('You have version %1$s installed. Update to %2$s.'), $plugin_data->Version, $plugin_data->update->new_version) . ' ' . $details . $compat . $upgrade_notice . "
+ + Name + ); + ?> +	+ Name; ?> + Version, + $plugin_data->update->new_version + ); + echo ' ' . $details . $compat . $upgrade_notice; + ?> +

' . __( 'Themes' ) . '

' . __( 'Your themes are all up to date.' ) . '

Please Note: Any customizations you have made to theme files will be lost. Please consider using child themes for modifications.' ), __( 'http://codex.wordpress.org/Child_Themes' ) ); ?>

Please Note: Any customizations you have made to theme files will be lost. Please consider using child themes for modifications.' ), __( 'https://codex.wordpress.org/Child_Themes' ) ); ?>

- +

- - + + - - - - - - $theme ) { - echo " - - - - "; + $checkbox_id = 'checkbox_' . md5( $theme->get( 'Name' ) ); + ?> + + + + + + + + + + + +



	" . $theme->display('Name') . ' ' . sprintf( __( 'You have version %1$s installed. Update to %2$s.' ), $theme->display('Version'), $theme->update['new_version'] ) . "
+ + display( 'Name' ) + ); + ?> +	+ + display( 'Name' ); ?> + display( 'Version' ), + $theme->update['new_version'] + ); + ?> +

' . __( 'Translations' ) . '

' . __( 'Your translations are all up to date.' ) . '

'; return; } - if ( ! WP_Filesystem( $credentials, ABSPATH ) ) { + if ( ! WP_Filesystem( $credentials, ABSPATH, $allow_relaxed_file_ownership ) ) { // Failed to connect, Error and request again - request_filesystem_credentials( $url, '', true, ABSPATH ); + request_filesystem_credentials( $url, '', true, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership ); echo '

' . __( 'On this screen, you can update to the latest version of WordPress, as well as update your themes, plugins, and translations from the WordPress.org repositories.' ) . '

' . __( 'If an update is available, you᾿ll see a notification appear in the Toolbar and navigation menu.' ) . ' ' . __( 'Keeping your site updated is important for security. It also makes the internet a safer place for you and your readers.' ) . '

' . __('For more information:') . '

' . __( 'Documentation on Updating WordPress' ) . '

' . __( 'Support Forums' ) . '

'; @@ -509,7 +598,7 @@ if ( 'upgrade-core' == $action ) { echo '

'; /* translators: %1 date, %2 time. */ - printf( __('Last checked on %1$s at %2$s.'), date_i18n( get_option( 'date_format' ) ), date_i18n( get_option( 'time_format' ) ) ); + printf( __( 'Last checked on %1$s at %2$s.' ), date_i18n( __( 'F j, Y' ) ), date_i18n( __( 'g:i a' ) ) ); echo ' ' . __( 'Check Again' ) . ''; echo '

'; @@ -538,8 +627,7 @@ if ( 'upgrade-core' == $action ) { check_admin_referer('upgrade-core'); - // do the (un)dismiss actions before headers, - // so that they can redirect + // Do the (un)dismiss actions before headers, so that they can redirect. if ( isset( $_POST['dismiss'] ) ) do_dismiss_core_update(); elseif ( isset( $_POST['undismiss'] ) ) @@ -579,8 +667,8 @@ if ( 'upgrade-core' == $action ) { require_once(ABSPATH . 'wp-admin/admin-header.php'); echo '

'; - echo '

' . esc_html__('Update Plugins') . '

'; - echo ""; + echo '

' . __( 'Update Plugins' ) . '

'; + echo ''; echo '

'; include(ABSPATH . 'wp-admin/admin-footer.php'); @@ -606,10 +694,12 @@ if ( 'upgrade-core' == $action ) { $title = __('Update Themes'); require_once(ABSPATH . 'wp-admin/admin-header.php'); - echo '

'; - echo '

' . esc_html__('Update Themes') . '

'; - echo ""; - echo '

'; + ?> +

+ +

+ $plugin, 'fields' => array('sections' => false) ) ); //Save on a bit of bandwidth. - - if ( is_wp_error($api) ) - wp_die($api); + include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api.. + + check_admin_referer( 'install-plugin_' . $plugin ); + $api = plugins_api( 'plugin_information', array( + 'slug' => $plugin, + 'fields' => array( + 'short_description' => false, + 'sections' => false, + 'requires' => false, + 'rating' => false, + 'ratings' => false, + 'downloaded' => false, + 'last_updated' => false, + 'added' => false, + 'tags' => false, + 'compatibility' => false, + 'homepage' => false, + 'donate_link' => false, + ), + ) ); + + if ( is_wp_error( $api ) ) { + wp_die( $api ); + } $title = __('Plugin Install'); $parent_file = 'plugins.php'; @@ -123,8 +140,9 @@ if ( isset($_GET['action']) ) { } elseif ( 'upload-plugin' == $action ) { - if ( ! current_user_can('install_plugins') ) + if ( ! current_user_can( 'upload_plugins' ) ) { wp_die( __( 'You do not have sufficient permissions to install plugins on this site.' ) ); + } check_admin_referer('plugin-upload'); @@ -200,7 +218,7 @@ if ( isset($_GET['action']) ) { if ( ! current_user_can('install_themes') ) wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) ); - include_once ABSPATH . 'wp-admin/includes/theme-install.php'; //for themes_api.. + include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); //for themes_api.. check_admin_referer( 'install-theme_' . $theme ); $api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth. @@ -227,8 +245,9 @@ if ( isset($_GET['action']) ) { } elseif ( 'upload-theme' == $action ) { - if ( ! current_user_can('install_themes') ) + if ( ! current_user_can( 'upload_themes' ) ) { wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) ); + } check_admin_referer('theme-upload'); @@ -259,7 +278,7 @@ if ( isset($_GET['action']) ) { /** * Fires when a custom plugin or theme update request is received. * - * The dynamic portion of the hook name, $action, refers to the action + * The dynamic portion of the hook name, `$action`, refers to the action * provided in the request for wp-admin/update.php. Can be used to * provide custom update functionality for themes and plugins. * diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php index 10c0413..03940b0 100644 --- a/wp-admin/upgrade.php +++ b/wp-admin/upgrade.php @@ -35,6 +35,14 @@ if ( 'upgrade_db' === $step ) { die( '0' ); } +/** + * @global string $wp_version + * @global string $required_php_version + * @global string $required_mysql_version + * @global wpdb $wpdb + */ +global $wp_version, $required_php_version, $required_mysql_version; + $step = (int) $step; $php_version = phpversion(); @@ -52,6 +60,7 @@ else + <?php _e( 'WordPress › Update' ); ?> -

WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ); + printf( __('You cannot update because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ); elseif ( !$php_compat ) - printf( __('You cannot update because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version ); + printf( __('You cannot update because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version ); elseif ( !$mysql_compat ) - printf( __('You cannot update because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version ); + printf( __('You cannot update because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version ); ?> -

diff --git a/wp-admin/upload.php b/wp-admin/upload.php index c38a0b6..a71280f 100644 --- a/wp-admin/upload.php +++ b/wp-admin/upload.php @@ -12,6 +12,88 @@ require_once( dirname( __FILE__ ) . '/admin.php' ); if ( !current_user_can('upload_files') ) wp_die( __( 'You do not have permission to upload files.' ) ); +$mode = get_user_option( 'media_library_mode', get_current_user_id() ) ? get_user_option( 'media_library_mode', get_current_user_id() ) : 'grid'; +$modes = array( 'grid', 'list' ); + +if ( isset( $_GET['mode'] ) && in_array( $_GET['mode'], $modes ) ) { + $mode = $_GET['mode']; + update_user_option( get_current_user_id(), 'media_library_mode', $mode ); +} + +if ( 'grid' === $mode ) { + wp_enqueue_media(); + wp_enqueue_script( 'media-grid' ); + wp_enqueue_script( 'media' ); + + remove_action( 'admin_head', 'wp_admin_canonical_url' ); + + $q = $_GET; + // let JS handle this + unset( $q['s'] ); + $vars = wp_edit_attachments_query_vars( $q ); + $ignore = array( 'mode', 'post_type', 'post_status', 'posts_per_page' ); + foreach ( $vars as $key => $value ) { + if ( ! $value || in_array( $key, $ignore ) ) { + unset( $vars[ $key ] ); + } + } + + wp_localize_script( 'media-grid', '_wpMediaGridSettings', array( + 'adminUrl' => parse_url( self_admin_url(), PHP_URL_PATH ), + 'queryVars' => (object) $vars + ) ); + + get_current_screen()->add_help_tab( array( + 'id' => 'overview', + 'title' => __( 'Overview' ), + 'content' => + '

' . __( 'All the files you’ve uploaded are listed in the Media Library, with the most recent uploads listed first.' ) . '

' . + '

' . __( 'You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.' ) . '

' . + '

' . __( 'To delete media items, click the Bulk Select button at the top of the screen. Select any items you wish to delete, then click the Delete Selected button. Clicking the Cancel Selection button takes you back to viewing your media.' ) . '

' + ) ); + + get_current_screen()->add_help_tab( array( + 'id' => 'attachment-details', + 'title' => __( 'Attachment Details' ), + 'content' => + '

' . __( 'Clicking an item will display an Attachment Details dialog, which allows you to preview media and make quick edits. Any changes you make to the attachment details will be automatically saved.' ) . '

' . + '

' . __( 'Use the arrow buttons at the top of the dialog, or the left and right arrow keys on your keyboard, to navigate between media items quickly.' ) . '

' . + '

' . __( 'You can also delete individual items and access the extended edit screen from the details dialog.' ) . '

' + ) ); + + get_current_screen()->set_help_sidebar( + '

' . __( 'For more information:' ) . '

' . + '

' . __( 'Documentation on Media Library' ) . '

' . + '

' . __( 'Support Forums' ) . '

' + ); + + $title = __('Media Library'); + $parent_file = 'upload.php'; + + require_once( ABSPATH . 'wp-admin/admin-header.php' ); + ?> +

+ + +

Switch to the list view.' ), + 'upload.php?mode=list' + ); ?>

+ get_pagenum(); @@ -37,69 +119,23 @@ if ( $doaction ) { } switch ( $doaction ) { - case 'find_detached': - if ( !current_user_can('edit_posts') ) - wp_die( __('You are not allowed to scan for lost attachments.') ); - - $lost = $wpdb->get_col( " - SELECT ID FROM $wpdb->posts - WHERE post_type = 'attachment' AND post_parent > '0' - AND post_parent NOT IN ( - SELECT ID FROM $wpdb->posts - WHERE post_type NOT IN ( 'attachment', '" . join( "', '", get_post_types( array( 'public' => false ) ) ) . "' ) - ) - " ); - - $_REQUEST['detached'] = 1; + case 'detach': + wp_media_attach_action( $_REQUEST['parent_post_id'], 'detach' ); break; - case 'attach': - $parent_id = (int) $_REQUEST['found_post_id']; - if ( !$parent_id ) - return; - - $parent = get_post( $parent_id ); - if ( !current_user_can( 'edit_post', $parent_id ) ) - wp_die( __( 'You are not allowed to edit this post.' ) ); - - $attach = array(); - foreach ( (array) $_REQUEST['media'] as $att_id ) { - $att_id = (int) $att_id; - - if ( !current_user_can( 'edit_post', $att_id ) ) - continue; - - $attach[] = $att_id; - } - - if ( ! empty( $attach ) ) { - $attach_string = implode( ',', $attach ); - $attached = $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_parent = %d WHERE post_type = 'attachment' AND ID IN ( $attach_string )", $parent_id ) ); - foreach ( $attach as $att_id ) { - clean_attachment_cache( $att_id ); - } - } - - if ( isset( $attached ) ) { - $location = 'upload.php'; - if ( $referer = wp_get_referer() ) { - if ( false !== strpos( $referer, 'upload.php' ) ) - $location = $referer; - } - $location = add_query_arg( array( 'attached' => $attached ) , $location ); - wp_redirect( $location ); - exit; - } + case 'attach': + wp_media_attach_action( $_REQUEST['found_post_id'] ); break; + case 'trash': if ( !isset( $post_ids ) ) break; foreach ( (array) $post_ids as $post_id ) { if ( !current_user_can( 'delete_post', $post_id ) ) - wp_die( __( 'You are not allowed to move this post to the trash.' ) ); + wp_die( __( 'You are not allowed to move this item to the Trash.' ) ); if ( !wp_trash_post( $post_id ) ) - wp_die( __( 'Error in moving to trash.' ) ); + wp_die( __( 'Error in moving to Trash.' ) ); } $location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location ); break; @@ -108,10 +144,10 @@ if ( $doaction ) { break; foreach ( (array) $post_ids as $post_id ) { if ( !current_user_can( 'delete_post', $post_id ) ) - wp_die( __( 'You are not allowed to move this post out of the trash.' ) ); + wp_die( __( 'You are not allowed to move this item out of the Trash.' ) ); if ( !wp_untrash_post( $post_id ) ) - wp_die( __( 'Error in restoring from trash.' ) ); + wp_die( __( 'Error in restoring from Trash.' ) ); } $location = add_query_arg( 'untrashed', count( $post_ids ), $location ); break; @@ -120,7 +156,7 @@ if ( $doaction ) { break; foreach ( (array) $post_ids as $post_id_del ) { if ( !current_user_can( 'delete_post', $post_id_del ) ) - wp_die( __( 'You are not allowed to delete this post.' ) ); + wp_die( __( 'You are not allowed to delete this item.' ) ); if ( !wp_delete_attachment( $post_id_del ) ) wp_die( __( 'Error in deleting.' ) ); @@ -143,14 +179,15 @@ $parent_file = 'upload.php'; wp_enqueue_script( 'media' ); -add_screen_option( 'per_page', array('label' => _x( 'Media items', 'items per page (screen options)' )) ); +add_screen_option( 'per_page' ); get_current_screen()->add_help_tab( array( 'id' => 'overview', 'title' => __('Overview'), 'content' => '

' . __( 'All the files you’ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen.' ) . '

' . - '

' . __( 'You can narrow the list by file type/status using the text link filters at the top of the screen. You also can refine the list by date using the dropdown menu above the media table.' ) . '

' + '

' . __( 'You can narrow the list by file type/status or by date using the dropdown menus above the media table.' ) . '

' . + '

' . __( 'You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.' ) . '

' ) ); get_current_screen()->add_help_tab( array( 'id' => 'actions-links', @@ -162,62 +199,106 @@ get_current_screen()->add_help_tab( array( 'id' => 'attaching-files', 'title' => __('Attaching Files'), 'content' => - '

' . __( 'If a media file has not been attached to any post, you will see that in the Attached To column, and can click on Attach File to launch a small popup that will allow you to search for a post and attach the file.' ) . '

' + '

' . __( 'If a media file has not been attached to any content, you will see that in the Uploaded To column, and can click on Attach to launch a small popup that will allow you to search for existing content and attach the file.' ) . '

' ) ); get_current_screen()->set_help_sidebar( '

' . __( 'For more information:' ) . '

' . - '

' . __( 'Documentation on Media Library' ) . '

' . + '

' . __( 'Documentation on Media Library' ) . '

' . '

' . __( 'Support Forums' ) . '

' ); +get_current_screen()->set_screen_reader_content( array( + 'heading_views' => __( 'Filter media items list' ), + 'heading_pagination' => __( 'Media items list navigation' ), + 'heading_list' => __( 'Media items list' ), +) ); + require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>

+

- " class="page-title-action">' . __('Search results for “%s”') . '', get_search_query() ); ?> -

+if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) { + /* translators: %s: search keywords */ + printf( '' . __( 'Search results for “%s”' ) . '', get_search_query() ); +} +?> + ' . __('Undo') . ''; $_SERVER['REQUEST_URI'] = remove_query_arg(array('trashed'), $_SERVER['REQUEST_URI']); } if ( ! empty( $_GET['untrashed'] ) && $untrashed = absint( $_GET['untrashed'] ) ) { - $message = sprintf( _n( 'Media attachment restored from the trash.', '%d media attachments restored from the trash.', $untrashed ), number_format_i18n( $_GET['untrashed'] ) ); + if ( 1 == $untrashed ) { + $message = __( 'Media file restored from the trash.' ); + } else { + /* translators: %s: number of media files */ + $message = _n( '%s media file restored from the trash.', '%s media files restored from the trash.', $untrashed ); + } + $message = sprintf( $message, number_format_i18n( $untrashed ) ); $_SERVER['REQUEST_URI'] = remove_query_arg(array('untrashed'), $_SERVER['REQUEST_URI']); } -$messages[1] = __('Media attachment updated.'); -$messages[2] = __('Media permanently deleted.'); -$messages[3] = __('Error saving media attachment.'); -$messages[4] = __('Media moved to the trash.') . ' ' . __('Undo') . ''; -$messages[5] = __('Media restored from the trash.'); +$messages[1] = __( 'Media file updated.' ); +$messages[2] = __( 'Media file permanently deleted.' ); +$messages[3] = __( 'Error saving media file.' ); +$messages[4] = __( 'Media file moved to the trash.' ) . ' ' . __( 'Undo' ) . ''; +$messages[5] = __( 'Media file restored from the trash.' ); if ( ! empty( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) { $message = $messages[ $_GET['message'] ]; @@ -225,19 +306,17 @@ if ( ! empty( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) { } if ( !empty($message) ) { ?> -

-views(); ?> - -

diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php index 2c064ba..04c19fb 100644 --- a/wp-admin/user-edit.php +++ b/wp-admin/user-edit.php @@ -39,6 +39,7 @@ else $profile_help = '

' . __('Your profile contains information about you (your “account”) as well as some personal options related to using WordPress.') . '

' . '

' . __('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens.') . '

' . '

' . __('Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts.') . '

' . + '

' . __( 'You can log out of other devices, such as your phone or a public computer, by clicking the Log Out Everywhere Else button.' ) . '

' . '

' . __('Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so.') . '

' . '

' . __('Remember to click the Update Profile button when you are finished.') . '

'; @@ -50,30 +51,14 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on User Profiles') . '

' . + '

' . __('Documentation on User Profiles') . '

' . '

' . __('Support Forums') . '

' ); -$wp_http_referer = remove_query_arg(array('update', 'delete_count'), $wp_http_referer ); +$wp_http_referer = remove_query_arg( array( 'update', 'delete_count', 'user_id' ), $wp_http_referer ); $user_can_edit = current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ); -/** - * Optional SSL preference that can be turned on by hooking to the 'personal_options' action. - * - * @since 2.7.0 - * - * @param object $user User data object - */ -function use_ssl_preference($user) { -?> - - - use_ssl); ?> /> - -ID ) { - $new_email = get_option( $current_user->ID . '_new_email' ); - if ( $new_email[ 'hash' ] == $_GET[ 'newuseremail' ] ) { + $new_email = get_user_meta( $current_user->ID, '_new_email', true ); + if ( $new_email && hash_equals( $new_email[ 'hash' ], $_GET[ 'newuseremail' ] ) ) { $user = new stdClass; $user->ID = $current_user->ID; $user->user_email = esc_html( trim( $new_email[ 'newemail' ] ) ); - if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) ) + if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) ) { $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login ) ); + } wp_update_user( $user ); - delete_option( $current_user->ID . '_new_email' ); - wp_redirect( add_query_arg( array('updated' => 'true'), self_admin_url( 'profile.php' ) ) ); + delete_user_meta( $current_user->ID, '_new_email' ); + wp_redirect( add_query_arg( array( 'updated' => 'true' ), self_admin_url( 'profile.php' ) ) ); die(); + } else { + wp_redirect( add_query_arg( array( 'error' => 'new-email' ), self_admin_url( 'profile.php' ) ) ); } -} elseif ( is_multisite() && IS_PROFILE_PAGE && !empty( $_GET['dismiss'] ) && $current_user->ID . '_new_email' == $_GET['dismiss'] ) { - delete_option( $current_user->ID . '_new_email' ); +} elseif ( is_multisite() && IS_PROFILE_PAGE && !empty( $_GET['dismiss'] ) && $current_user->ID . '_new_email' === $_GET['dismiss'] ) { + check_admin_referer( 'dismiss-' . $current_user->ID . '_new_email' ); + delete_user_meta( $current_user->ID, '_new_email' ); wp_redirect( add_query_arg( array('updated' => 'true'), self_admin_url( 'profile.php' ) ) ); die(); } @@ -145,32 +134,21 @@ if ( IS_PROFILE_PAGE ) { do_action( 'edit_user_profile_update', $user_id ); } -if ( !is_multisite() ) { - $errors = edit_user($user_id); -} else { +// Update the email address in signups, if present. +if ( is_multisite() ) { $user = get_userdata( $user_id ); - // Update the email address in signups, if present. - if ( $user->user_login && isset( $_POST[ 'email' ] ) && is_email( $_POST[ 'email' ] ) && $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $user->user_login ) ) ) + if ( $user->user_login && isset( $_POST[ 'email' ] ) && is_email( $_POST[ 'email' ] ) && $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $user->user_login ) ) ) { $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $_POST[ 'email' ], $user_login ) ); - - // We must delete the user from the current blog if WP added them after editing. - $delete_role = false; - $blog_prefix = $wpdb->get_blog_prefix(); - if ( $user_id != $current_user->ID ) { - $cap = $wpdb->get_var( "SELECT meta_value FROM {$wpdb->usermeta} WHERE user_id = '{$user_id}' AND meta_key = '{$blog_prefix}capabilities' AND meta_value = 'a:0:{}'" ); - if ( !is_network_admin() && null == $cap && $_POST[ 'role' ] == '' ) { - $_POST[ 'role' ] = 'contributor'; - $delete_role = true; - } } - if ( !isset( $errors ) || ( isset( $errors ) && is_object( $errors ) && false == $errors->get_error_codes() ) ) - $errors = edit_user($user_id); - if ( $delete_role ) // stops users being added to current blog when they are edited - delete_user_meta( $user_id, $blog_prefix . 'capabilities' ); +} - if ( is_multisite() && is_network_admin() && !IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) && empty( $_POST['super_admin'] ) == is_super_admin( $user_id ) ) - empty( $_POST['super_admin'] ) ? revoke_super_admin( $user_id ) : grant_super_admin( $user_id ); +// Update the user. +$errors = edit_user( $user_id ); + +// Grant or revoke super admin status if requested. +if ( is_multisite() && is_network_admin() && !IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) && empty( $_POST['super_admin'] ) == is_super_admin( $user_id ) ) { + empty( $_POST['super_admin'] ) ? revoke_super_admin( $user_id ) : grant_super_admin( $user_id ); } if ( !is_wp_error( $errors ) ) { @@ -187,48 +165,57 @@ $profileuser = get_user_to_edit($user_id); if ( !current_user_can('edit_user', $user_id) ) wp_die(__('You do not have permission to edit this user.')); -include (ABSPATH . 'wp-admin/admin-header.php'); +$sessions = WP_Session_Tokens::get_instance( $profileuser->ID ); + +include(ABSPATH . 'wp-admin/admin-header.php'); ?> ID ) && current_user_can( 'manage_network_options' ) ) { ?>

- +

+ +

", $errors->get_error_messages() ); ?>

+

- + - + -

- -

> + +> @@ -238,40 +225,43 @@ if ( ! IS_PROFILE_PAGE ) {

- - + + 1 && has_action('admin_color_scheme_picker') ) : ?> - + - - + - + - + - - + +


	rich_editing ) ) checked( 'false', $profileuser->rich_editing ); ?> />

	comment_shortcuts ) ) checked( 'true', $profileuser->comment_shortcuts ); ?> /> More information'); ?>	comment_shortcuts ) ) checked( 'true', $profileuser->comment_shortcuts ); ?> /> More information'); ?>

	ID ) ); ?> /> @@ -289,6 +279,7 @@ if ( !( IS_PROFILE_PAGE && !$user_can_edit ) ) : ?> */ do_action( 'personal_options', $profileuser ); ?> +

- + - + + - + - + - + - +





	user_email != get_site_option( 'admin_email' ) \|\| ! is_super_admin( $profileuser->ID ) ) : ?> ID ) ); ?> /> @@ -344,22 +335,22 @@ if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_c

- - - + + - + - + $desc ) { ?> - - - + +


	+
	ID . '_new_email' ); + $new_email = get_user_meta( $current_user->ID, '_new_email', true ); if ( $new_email && $new_email['newemail'] != $current_user->user_email && $profileuser->ID == $current_user->ID ) : ?> - %1$s. Cancel'), $new_email['newemail'], esc_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ) ) ); ?> + ' . esc_html( $new_email['newemail'] ) . '' + ); + printf( + ' %2$s', + esc_url( wp_nonce_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ), 'dismiss-' . $current_user->ID . '_new_email' ) ), + __( 'Cancel' ) + ); + ?>

+ +

- + - + + + + + + + + - +

	<?php echo $profileuser->description; // textarea_escaped ?> -	<?php echo $profileuser->description; // textarea_escaped ?> +
	+ + Gravatar.' ), + __( 'https://en.gravatar.com/' ) + ); + } else { + $description = ''; + } + + /** + * Filter the user profile picture description displayed under the Gravatar. + * + * @since 4.4.0 + * + * @param string $description The description that will be printed. + */ + echo apply_filters( 'user_profile_picture_description', $description ); + ?> +

+ +

+ + - + + + + + + + +get_all() ) === 1 ) : ?> + + + + +get_all() ) > 1 ) : ?> + + + + +get_all() ) : ?> + + + + +

	- - + + + + + + + + +
	- - - - - + +
	+ + + + +
	+ + + + +
	+ + + + +
	+ + + display_name ); + ?> + +

caps ) > count( $profileuser->roles ) && apply_filters( 'additional_capabilities_display', true, $profileuser ) ) : ?> -

- +',a=o.length-1,c=e.settings.textcolor_rows||5,i=e.settings.textcolor_cols||8,F=0;c>F;F++){for(l+="",n=0;i>n;n++)d=F*i+n,d>a?l+="":(r=o[d],l+='');l+=""}return l+="

' . __( 'Cheatin’ uh?' ) . '' . + '

' . __( 'You do not have sufficient permissions to add users to this network.' ) . '

', + 403 + ); + } } elseif ( ! current_user_can( 'create_users' ) ) { - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'You are not allowed to create users.' ) . '

', + 403 + ); } if ( is_multisite() ) { - function admin_created_user_email( $text ) { - $roles = get_editable_roles(); - $role = $roles[ $_REQUEST['role'] ]; - /* translators: 1: Site name, 2: site URL, 3: role */ - return sprintf( __( 'Hi, -You\'ve been invited to join \'%1$s\' at -%2$s with the role of %3$s. -If you do not want to join this site please ignore -this email. This invitation will expire in a few days. - -Please click the following link to activate your user account: -%%s' ), get_bloginfo( 'name' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ) ); - } add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' ); - - function admin_created_user_subject( $text ) { - return sprintf( __( '[%s] Your site invite' ), get_bloginfo( 'name' ) ); - } } if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) { check_admin_referer( 'add-user', '_wpnonce_add-user' ); $user_details = null; - if ( false !== strpos($_REQUEST[ 'email' ], '@') ) { - $user_details = get_user_by('email', $_REQUEST[ 'email' ]); + $user_email = wp_unslash( $_REQUEST['email'] ); + if ( false !== strpos( $user_email, '@' ) ) { + $user_details = get_user_by( 'email', $user_email ); } else { if ( is_super_admin() ) { - $user_details = get_user_by('login', $_REQUEST[ 'email' ]); + $user_details = get_user_by( 'login', $user_email ); } else { wp_redirect( add_query_arg( array('update' => 'enter_email'), 'user-new.php' ) ); die(); @@ -57,8 +50,13 @@ if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) { die(); } - if ( ! current_user_can('promote_user', $user_details->ID) ) - wp_die(__('Cheatin’ uh?')); + if ( ! current_user_can( 'promote_user', $user_details->ID ) ) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'You do not have sufficient permissions to add users to this network.' ) . '

', + 403 + ); + } // Adding an existing user to this blog $new_user_email = $user_details->user_email; @@ -68,15 +66,27 @@ if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) { if ( ( $username != null && !is_super_admin( $user_id ) ) && ( array_key_exists($blog_id, get_blogs_of_user($user_id)) ) ) { $redirect = add_query_arg( array('update' => 'addexisting'), 'user-new.php' ); } else { - if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) { + if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_network_users' ) ) { add_existing_user_to_blog( array( 'user_id' => $user_id, 'role' => $_REQUEST[ 'role' ] ) ); - $redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' ); + $redirect = add_query_arg( array( 'update' => 'addnoconfirmation' , 'user_id' => $user_id ), 'user-new.php' ); } else { $newuser_key = substr( md5( $user_id ), 0, 5 ); add_option( 'new_user_' . $newuser_key, array( 'user_id' => $user_id, 'email' => $user_details->user_email, 'role' => $_REQUEST[ 'role' ] ) ); $roles = get_editable_roles(); $role = $roles[ $_REQUEST['role'] ]; + + /** + * Fires immediately after a user is invited to join a site, but before the notification is sent. + * + * @since 4.4.0 + * + * @param int $user_id The invited user's ID. + * @param array $role The role of invited user. + * @param string $newuser_key The key of the invitation. + */ + do_action( 'invite_user', $user_id, $role, $newuser_key ); + /* translators: 1: Site name, 2: site URL, 3: role, 4: activation URL */ $message = __( 'Hi, @@ -94,8 +104,13 @@ Please click the following link to confirm the invite: } elseif ( isset($_REQUEST['action']) && 'createuser' == $_REQUEST['action'] ) { check_admin_referer( 'create-user', '_wpnonce_create-user' ); - if ( ! current_user_can('create_users') ) - wp_die(__('Cheatin’ uh?')); + if ( ! current_user_can( 'create_users' ) ) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'You are not allowed to create users.' ) . '

', + 403 + ); + } if ( ! is_multisite() ) { $user_id = edit_user(); @@ -112,7 +127,8 @@ Please click the following link to confirm the invite: } } else { // Adding a new user to this site - $user_details = wpmu_validate_user_signup( $_REQUEST[ 'user_login' ], $_REQUEST[ 'email' ] ); + $new_user_email = wp_unslash( $_REQUEST['email'] ); + $user_details = wpmu_validate_user_signup( $_REQUEST['user_login'], $new_user_email ); if ( is_wp_error( $user_details[ 'errors' ] ) && !empty( $user_details[ 'errors' ]->errors ) ) { $add_user_errors = $user_details[ 'errors' ]; } else { @@ -124,14 +140,19 @@ Please click the following link to confirm the invite: * @param string $user_login The sanitized username. */ $new_user_login = apply_filters( 'pre_user_login', sanitize_user( wp_unslash( $_REQUEST['user_login'] ), true ) ); - if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) { + if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_network_users' ) ) { add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation email + add_filter( 'wpmu_welcome_user_notification', '__return_false' ); // Disable welcome email } - wpmu_signup_user( $new_user_login, $_REQUEST[ 'email' ], array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST[ 'role' ] ) ); - if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) { - $key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $_REQUEST[ 'email' ] ) ); - wpmu_activate_signup( $key ); - $redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' ); + wpmu_signup_user( $new_user_login, $new_user_email, array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST['role'] ) ); + if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_network_users' ) ) { + $key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $new_user_email ) ); + $new_user = wpmu_activate_signup( $key ); + if ( ! is_wp_error( $new_user ) ) { + $redirect = add_query_arg( array( 'update' => 'addnoconfirmation' ), 'user-new.php' ); + } else { + $redirect = add_query_arg( array( 'update' => 'addnoconfirmation', 'user_id' => $new_user['user_id'] ), 'user-new.php' ); + } } else { $redirect = add_query_arg( array('update' => 'newuserconfirmation'), 'user-new.php' ); } @@ -171,22 +192,22 @@ get_current_screen()->add_help_tab( array( 'title' => __('User Roles'), 'content' => '

' . __('Here is a basic overview of the different user roles and the permissions associated with each one:') . '

' . '

' . __('Administrators have access to all the administration features.') . '
' . __('Editors can publish posts, manage posts as well as manage other people’s posts, etc.') . '
' . __('Authors can publish and manage their own posts, and are able to upload files.') . '
' . __('Contributors can write and manage their posts but not publish posts or upload media files.') . '
' . __('Subscribers can read comments/comment/receive newsletters, etc. but cannot create regular site content.') . '
' . __('Contributors can write and manage their posts but not publish posts or upload media files.') . '
' . __('Authors can publish and manage their own posts, and are able to upload files.') . '
' . __('Editors can publish posts, manage posts as well as manage other people’s posts, etc.') . '
' . __('Administrators have access to all the administration features.') . '

' ) ); get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Adding New Users') . '

' . + '

' . __('Documentation on Adding New Users') . '

' . '

' . __('Support Forums') . '

' ); wp_enqueue_script('wp-ajax-response'); -wp_enqueue_script('user-profile'); +wp_enqueue_script( 'user-profile' ); /** * Filter whether to enable user auto-complete for non-super admins in Multisite. @@ -206,6 +227,14 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); if ( isset($_GET['update']) ) { $messages = array(); if ( is_multisite() ) { + $edit_link = ''; + if ( ( isset( $_GET['user_id'] ) ) ) { + $user_id_new = absint( $_GET['user_id'] ); + if ( $user_id_new ) { + $edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user_id_new ) ) ); + } + } + switch ( $_GET['update'] ) { case "newuserconfirmation": $messages[] = __('Invitation email sent to new user. A confirmation link must be clicked before their account is created.'); @@ -214,7 +243,12 @@ if ( isset($_GET['update']) ) { $messages[] = __('Invitation email sent to user. A confirmation link must be clicked for them to be added to your site.'); break; case "addnoconfirmation": - $messages[] = __('User has been added to your site.'); + if ( empty( $edit_link ) ) { + $messages[] = __( 'User has been added to your site.' ); + } else { + /* translators: %s: edit page url */ + $messages[] = sprintf( __( 'User has been added to your site. Edit user' ), $edit_link ); + } break; case "addexisting": $messages[] = __('That user is already a member of this site.'); @@ -233,13 +267,13 @@ if ( isset($_GET['update']) ) { } ?>

-

@@ -254,7 +288,7 @@ if ( current_user_can( 'create_users' ) ) { if ( ! empty( $messages ) ) { foreach ( $messages as $msg ) - echo '

' . $msg . '

'; + echo '

' . $msg . '

'; } ?> @@ -270,30 +304,32 @@ if ( ! empty( $messages ) ) { ' . __('Add Existing User') . ''; + echo '

' . __( 'Add Existing User' ) . '

'; if ( !is_super_admin() ) { - _e( 'Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ); - $label = __('E-mail'); + echo '

' . __( 'Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '

'; + $label = __('Email'); + $type = 'email'; } else { - _e( 'Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ); - $label = __('E-mail or Username'); + echo '

' . __( 'Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '

'; + $label = __('Email or Username'); + $type = 'text'; } ?> - -> +> - + @@ -302,10 +338,10 @@ if ( is_multisite() ) { - + - +

@@ -323,42 +359,44 @@ if ( is_multisite() ) { */ do_action( 'user_new_form', 'add-existing-user' ); ?> - 'addusersub' ) ); ?> + 'addusersub' ) ); ?> ' . __( 'Add New User' ) . ''; + echo '

' . __( 'Add New User' ) . '

'; ?>

- -

> +> 'login', 'first_name' => 'firstname', 'last_name' => 'lastname', - 'email' => 'email', 'url' => 'uri', 'role' => 'role', 'send_password' => 'send_password', 'noconfirmation' => 'ignore_pass' ) as $post_field => $var ) { - $var = "new_user_$var"; - if( isset( $_POST['createuser'] ) ) { - if ( ! isset($$var) ) - $$var = isset( $_POST[$post_field] ) ? wp_unslash( $_POST[$post_field] ) : ''; - } else { - $$var = false; - } -} +$creating = isset( $_POST['createuser'] ); + +$new_user_login = $creating && isset( $_POST['user_login'] ) ? wp_unslash( $_POST['user_login'] ) : ''; +$new_user_firstname = $creating && isset( $_POST['first_name'] ) ? wp_unslash( $_POST['first_name'] ) : ''; +$new_user_lastname = $creating && isset( $_POST['last_name'] ) ? wp_unslash( $_POST['last_name'] ) : ''; +$new_user_email = $creating && isset( $_POST['email'] ) ? wp_unslash( $_POST['email'] ) : ''; +$new_user_uri = $creating && isset( $_POST['url'] ) ? wp_unslash( $_POST['url'] ) : ''; +$new_user_role = $creating && isset( $_POST['role'] ) ? wp_unslash( $_POST['role'] ) : ''; +$new_user_send_notification = $creating && ! isset( $_POST['send_user_notification'] ) ? false : true; +$new_user_ignore_pass = $creating && isset( $_POST['noconfirmation'] ) ? wp_unslash( $_POST['noconfirmation'] ) : ''; ?> - + - - + + @@ -371,38 +409,53 @@ foreach ( array( 'user_login' => 'login', 'first_name' => 'firstname', 'last_nam - + - - - + + - - + + + + + + - - + + - @@ -415,10 +468,10 @@ if ( apply_filters( 'show_password_fields', true ) ) : ?> - + - +





+ + + + +	- + + + + + + + + + +

	- - - +
	+ + + +
	/>		/>

	/>	/>

@@ -428,7 +481,7 @@ if ( apply_filters( 'show_password_fields', true ) ) : ?> do_action( 'user_new_form', 'add-new-user' ); ?> - 'createusersub' ) ); ?> + 'createusersub' ) ); ?>

diff --git a/wp-admin/user/index.php b/wp-admin/user/index.php index 15ee54e..7cff6a7 100644 --- a/wp-admin/user/index.php +++ b/wp-admin/user/index.php @@ -7,6 +7,7 @@ * @since 3.1.0 */ +/** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); require( ABSPATH . 'wp-admin/index.php' ); diff --git a/wp-admin/user/profile.php b/wp-admin/user/profile.php index ba059f9..2f70709 100644 --- a/wp-admin/user/profile.php +++ b/wp-admin/user/profile.php @@ -7,6 +7,7 @@ * @since 3.1.0 */ +/** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); require( ABSPATH . 'wp-admin/profile.php' ); diff --git a/wp-admin/user/user-edit.php b/wp-admin/user/user-edit.php index 24b50bf..0819573 100644 --- a/wp-admin/user/user-edit.php +++ b/wp-admin/user/user-edit.php @@ -7,6 +7,7 @@ * @since 3.1.0 */ +/** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); require( ABSPATH . 'wp-admin/user-edit.php' ); diff --git a/wp-admin/users.php b/wp-admin/users.php index 1dfd73c..789f34c 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -1,23 +1,29 @@ ' . __( 'Cheatin’ uh?' ) . '' . + '

' . __( 'You are not allowed to browse users.' ) . '

', + 403 + ); +} $wp_list_table = _get_list_table('WP_Users_List_Table'); $pagenum = $wp_list_table->get_pagenum(); $title = __('Users'); $parent_file = 'users.php'; -add_screen_option( 'per_page', array('label' => _x( 'Users', 'users per page (screen options)' )) ); +add_screen_option( 'per_page' ); // contextual help - choose Help on the top right of admin panel to preview this. get_current_screen()->add_help_tab( array( @@ -58,11 +64,17 @@ unset( $help ); get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Managing Users') . '

' . - '

' . __('Descriptions of Roles and Capabilities') . '

' . + '

' . __('Documentation on Managing Users') . '

' . + '

' . __('Descriptions of Roles and Capabilities') . '

' . '

' . __('Support Forums') . '

' ); +get_current_screen()->set_screen_reader_content( array( + 'heading_views' => __( 'Filter users list' ), + 'heading_pagination' => __( 'Users list navigation' ), + 'heading_list' => __( 'Users list' ), +) ); + if ( empty($_REQUEST) ) { $referer = ''; } elseif ( isset($_REQUEST['wp_http_referer']) ) { @@ -75,25 +87,6 @@ if ( empty($_REQUEST) ) { $update = ''; -/** - * @since 3.5.0 - * @access private - */ -function delete_users_add_js() { ?> - -current_action() ) { /* Bulk Dropdown menu Role changes */ @@ -109,8 +102,16 @@ case 'promote': } $editable_roles = get_editable_roles(); - if ( empty( $editable_roles[$_REQUEST['new_role']] ) ) - wp_die(__('You can’t give users that role.')); + $role = false; + if ( ! empty( $_REQUEST['new_role2'] ) ) { + $role = $_REQUEST['new_role2']; + } elseif ( ! empty( $_REQUEST['new_role'] ) ) { + $role = $_REQUEST['new_role']; + } + + if ( ! $role || empty( $editable_roles[ $role ] ) ) { + wp_die( __( 'You can’t give users that role.' ) ); + } $userids = $_REQUEST['users']; $update = 'promote'; @@ -120,25 +121,28 @@ case 'promote': if ( ! current_user_can('promote_user', $id) ) wp_die(__('You can’t edit that user.')); // The new role of the current user must also have the promote_users cap or be a multisite super admin - if ( $id == $current_user->ID && ! $wp_roles->role_objects[ $_REQUEST['new_role'] ]->has_cap('promote_users') + if ( $id == $current_user->ID && ! $wp_roles->role_objects[ $role ]->has_cap('promote_users') && ! ( is_multisite() && is_super_admin() ) ) { $update = 'err_admin_role'; continue; } // If the user doesn't already belong to the blog, bail. - if ( is_multisite() && !is_user_member_of_blog( $id ) ) - wp_die(__('Cheatin’ uh?')); + if ( is_multisite() && !is_user_member_of_blog( $id ) ) { + wp_die( + '

' . __( 'Cheatin’ uh?' ) . '

' . + '

' . __( 'One of the selected users is not a member of this site.' ) . '

', + 403 + ); + } $user = get_userdata( $id ); - $user->set_role($_REQUEST['new_role']); + $user->set_role( $role ); } wp_redirect(add_query_arg('update', $update, $redirect)); exit(); -break; - case 'dodelete': if ( is_multisite() ) wp_die( __('User deletion is not allowed from this screen.') ); @@ -188,8 +192,6 @@ case 'dodelete': wp_redirect($redirect); exit(); -break; - case 'delete': if ( is_multisite() ) wp_die( __('User deletion is not allowed from this screen.') ); @@ -209,47 +211,88 @@ case 'delete': else $userids = array_map( 'intval', (array) $_REQUEST['users'] ); - add_action( 'admin_head', 'delete_users_add_js' ); + $users_have_content = false; + if ( $wpdb->get_var( "SELECT ID FROM {$wpdb->posts} WHERE post_author IN( " . implode( ',', $userids ) . " ) LIMIT 1" ) ) { + $users_have_content = true; + } elseif ( $wpdb->get_var( "SELECT link_id FROM {$wpdb->links} WHERE link_owner IN( " . implode( ',', $userids ) . " ) LIMIT 1" ) ) { + $users_have_content = true; + } + + if ( $users_have_content ) { + add_action( 'admin_head', 'delete_users_add_js' ); + } include( ABSPATH . 'wp-admin/admin-header.php' ); ?> -

+ + +

+ +

" . sprintf(__('ID #%1$s: %2$s The current user will not be deleted.'), $id, $user->user_login) . "
" . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "

- -

-
- ' . __( 'Attribute all content to:' ) . ' '; - wp_dropdown_users( array( 'name' => 'reassign_user', 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?>

+ + + + +

+ +

+
+ ' . __( 'Attribute all content to:' ) . ' '; + wp_dropdown_users( array( + 'name' => 'reassign_user', + 'exclude' => array_diff( $userids, array( $current_user->ID ) ), + 'show' => 'display_name_with_login', + ) ); ?>

+ - +

@@ -293,8 +336,6 @@ case 'doremove': wp_redirect($redirect); exit; -break; - case 'remove': check_admin_referer('bulk-users'); @@ -317,13 +358,19 @@ case 'remove': include( ABSPATH . 'wp-admin/admin-header.php' ); ?> - +

+ + +

+ +

" . sprintf(__('ID #%1$s: %2$s The current user will not be removed.'), $id, $user->user_login) . "
" . sprintf(__('ID #%1$s: %2$s You don\'t have permission to remove this user.'), $id, $user->user_login) . "
" . sprintf(__('ID #%1$s: %2$s You don’t have permission to remove this user.'), $id, $user->user_login) . "
" . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "

- +

@@ -374,34 +425,40 @@ default: case 'del': case 'del_many': $delete_count = isset($_GET['delete_count']) ? (int) $_GET['delete_count'] : 0; - $messages[] = '

' . sprintf( _n( 'User deleted.', '%s users deleted.', $delete_count ), number_format_i18n( $delete_count ) ) . '

'; + if ( 1 == $delete_count ) { + $message = __( 'User deleted.' ); + } else { + $message = _n( '%s user deleted.', '%s users deleted.', $delete_count ); + } + $messages[] = '

' . sprintf( $message, number_format_i18n( $delete_count ) ) . '

'; break; case 'add': if ( isset( $_GET['id'] ) && ( $user_id = $_GET['id'] ) && current_user_can( 'edit_user', $user_id ) ) { - $messages[] = '

' . sprintf( __( 'New user created. Edit user' ), + /* translators: %s: edit page url */ + $messages[] = '

' . sprintf( __( 'New user created. Edit user' ), esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), self_admin_url( 'user-edit.php?user_id=' . $user_id ) ) ) ) . '

'; } else { - $messages[] = '

' . __( 'New user created.' ) . '

'; + $messages[] = '

' . __( 'New user created.' ) . '

'; } break; case 'promote': - $messages[] = '

' . __('Changed roles.') . '

'; + $messages[] = '

' . __('Changed roles.') . '

'; break; case 'err_admin_role': - $messages[] = '

' . __('The current user’s role must have user editing capabilities.') . '

'; - $messages[] = '

' . __('Other user roles have been changed.') . '

'; + $messages[] = '

' . __('The current user’s role must have user editing capabilities.') . '

'; + $messages[] = '

' . __('Other user roles have been changed.') . '

'; break; case 'err_admin_del': - $messages[] = '

' . __('You can’t delete the current user.') . '

'; - $messages[] = '

' . __('Other users have been deleted.') . '

'; + $messages[] = '

' . __('You can’t delete the current user.') . '

'; + $messages[] = '

' . __('Other users have been deleted.') . '

'; break; case 'remove': - $messages[] = '

' . __('User removed from this site.') . '

'; + $messages[] = '

' . __('User removed from this site.') . '

'; break; case 'err_admin_remove': - $messages[] = '

' . __("You can't remove the current user.") . '

'; - $messages[] = '

' . __('Other users have been removed.') . '

'; + $messages[] = '

' . __("You can't remove the current user.") . '

'; + $messages[] = '

' . __('Other users have been removed.') . '

'; break; } endif; ?> @@ -423,22 +480,25 @@ if ( ! empty($messages) ) { } ?>

+

- + - + ' . __('Search results for “%s”') . '', esc_html( $usersearch ) ); ?> -

+if ( strlen( $usersearch ) ) { + /* translators: %s: search keywords */ + printf( '' . __( 'Search results for “%s”' ) . '', esc_html( $usersearch ) ); +} +?> + views(); ?> - + search_box( __( 'Search Users' ), 'user' ); ?> diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php index 9383d74..91d611c 100644 --- a/wp-admin/widgets.php +++ b/wp-admin/widgets.php @@ -1,6 +1,6 @@ ' . __( 'Cheatin’ uh?' ) . '' . + '

' . __( 'You are not allowed to edit theme options on this site.' ) . '

', + 403 + ); +} $widgets_access = get_user_setting( 'widgets_access' ); if ( isset($_GET['widgets-access']) ) { @@ -21,10 +26,6 @@ if ( isset($_GET['widgets-access']) ) { set_user_setting( 'widgets_access', $widgets_access ); } -function wp_widgets_access_body_class($classes) { - return "$classes widgets_access "; -} - if ( 'on' == $widgets_access ) { add_filter( 'admin_body_class', 'wp_widgets_access_body_class' ); } else { @@ -70,12 +71,12 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Widgets') . '

' . + '

' . __('Documentation on Widgets') . '

' . '

' . __('Support Forums') . '

' ); if ( ! current_theme_supports( 'widgets' ) ) { - wp_die( __( 'The theme you are currently using isn’t widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please follow these instructions.' ) ); + wp_die( __( 'The theme you are currently using isn’t widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please follow these instructions.' ) ); } // These are the widgets grouped by sidebar @@ -88,7 +89,7 @@ foreach ( $sidebars_widgets as $sidebar_id => $widgets ) { if ( 'wp_inactive_widgets' == $sidebar_id ) continue; - if ( !isset( $wp_registered_sidebars[ $sidebar_id ] ) ) { + if ( ! is_registered_sidebar( $sidebar_id ) ) { if ( ! empty( $widgets ) ) { // register the inactive_widgets area as sidebar register_sidebar(array( 'name' => __( 'Inactive Sidebar (not used)' ), @@ -141,7 +142,7 @@ if ( isset($_POST['savewidget']) || isset($_POST['removewidget']) ) { $id_base = $_POST['id_base']; $sidebar = isset($sidebars_widgets[$sidebar_id]) ? $sidebars_widgets[$sidebar_id] : array(); - // delete + // Delete. if ( isset($_POST['removewidget']) && $_POST['removewidget'] ) { if ( !in_array($widget_id, $sidebar, true) ) { @@ -151,6 +152,17 @@ if ( isset($_POST['savewidget']) || isset($_POST['removewidget']) ) { $sidebar = array_diff( $sidebar, array($widget_id) ); $_POST = array('sidebar' => $sidebar_id, 'widget-' . $id_base => array(), 'the-widget-id' => $widget_id, 'delete_widget' => '1'); + + /** + * Fires immediately after a widget has been marked for deletion. + * + * @since 4.4.0 + * + * @param string $widget_id ID of the widget marked for deletion. + * @param string $sidebar_id ID of the sidebar the widget was deleted from. + * @param string $id_base ID base for the widget. + */ + do_action( 'delete_widget', $widget_id, $sidebar_id, $id_base ); } $_POST['widget-id'] = $sidebar; @@ -168,7 +180,7 @@ if ( isset($_POST['savewidget']) || isset($_POST['removewidget']) ) { $sidebars_widgets[$sidebar_id] = $sidebar; - // remove old position + // Remove old position. if ( !isset($_POST['delete_widget']) ) { foreach ( $sidebars_widgets as $key => $sb ) { if ( is_array($sb) ) @@ -182,6 +194,28 @@ if ( isset($_POST['savewidget']) || isset($_POST['removewidget']) ) { exit; } +// Remove inactive widgets without js +if ( isset( $_POST['removeinactivewidgets'] ) ) { + check_admin_referer( 'remove-inactive-widgets', '_wpnonce_remove_inactive_widgets' ); + + if ( $_POST['removeinactivewidgets'] ) { + foreach ( $sidebars_widgets['wp_inactive_widgets'] as $key => $widget_id ) { + $pieces = explode( '-', $widget_id ); + $multi_number = array_pop( $pieces ); + $id_base = implode( '-', $pieces ); + $widget = get_option( 'widget_' . $id_base ); + unset( $widget[$multi_number] ); + update_option( 'widget_' . $id_base, $widget ); + unset( $sidebars_widgets['wp_inactive_widgets'][$key] ); + } + + wp_set_sidebars_widgets( $sidebars_widgets ); + } + + wp_redirect( admin_url( 'widgets.php?message=0' ) ); + exit; +} + // Output the widget form without js if ( isset($_GET['editwidget']) && $_GET['editwidget'] ) { $widget_id = $_GET['editwidget']; @@ -189,7 +223,7 @@ if ( isset($_GET['editwidget']) && $_GET['editwidget'] ) { if ( isset($_GET['addnew']) ) { // Default to the first sidebar $keys = array_keys( $wp_registered_sidebars ); - $sidebar = array_shift( $keys ); + $sidebar = reset( $keys ); if ( isset($_GET['base']) && isset($_GET['num']) ) { // multi-widget // Copy minimal info from an existing instance of this widget to a new instance @@ -224,15 +258,15 @@ if ( isset($_GET['editwidget']) && $_GET['editwidget'] ) { $id_base = isset($control['id_base']) ? $control['id_base'] : $control['id']; - // show the widget form + // Show the widget form. $width = ' style="width:' . max($control['width'], 350) . 'px"'; $key = isset($_GET['key']) ? (int) $_GET['key'] : 0; require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>

> -

@@ -310,10 +344,27 @@ $errors = array( require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>

+%2$s', + esc_url( add_query_arg( + array( + array( 'autofocus' => array( 'panel' => 'widgets' ) ), + 'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ) + ), + admin_url( 'customize.php' ) + ) ), + __( 'Manage in Customizer' ) + ); + } +?> +

@@ -332,7 +383,7 @@ do_action( 'widgets_admin_page' ); ?>

@@ -355,12 +406,35 @@ foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) { if ( !empty( $registered_sidebar['class'] ) ) $wrap_class .= ' ' . $registered_sidebar['class']; + $is_inactive_widgets = 'wp_inactive_widgets' == $registered_sidebar['id']; ?>

+ +

1 ) { $split = ceil( $sidebars_count / 2 ); } else { - $single_sidebar_class = ' class="single-sidebar"'; + $single_sidebar_class = ' single-sidebar'; } ?>

> +

$registered_sidebar ) {

-
diff --git a/wp-blog-header.php b/wp-blog-header.php index 3e1b8ef..3a7cfb6 100644 --- a/wp-blog-header.php +++ b/wp-blog-header.php @@ -9,10 +9,13 @@ if ( !isset($wp_did_header) ) { $wp_did_header = true; + // Load the WordPress library. require_once( dirname(__FILE__) . '/wp-load.php' ); + // Set up the WordPress query. wp(); + // Load the theme template. require_once( ABSPATH . WPINC . '/template-loader.php' ); } diff --git a/wp-comments-post.php b/wp-comments-post.php index 6196c36..4fb249b 100644 --- a/wp-comments-post.php +++ b/wp-comments-post.php @@ -17,142 +17,37 @@ require( dirname(__FILE__) . '/wp-load.php' ); nocache_headers(); -$comment_post_ID = isset($_POST['comment_post_ID']) ? (int) $_POST['comment_post_ID'] : 0; - -$post = get_post($comment_post_ID); - -if ( empty( $post->comment_status ) ) { - /** - * Fires when a comment is attempted on a post that does not exist. - * - * @since 1.5.0 - * - * @param int $comment_post_ID Post ID. - */ - do_action( 'comment_id_not_found', $comment_post_ID ); - exit; -} - -// get_post_status() will get the parent status for attachments. -$status = get_post_status($post); - -$status_obj = get_post_status_object($status); - -if ( ! comments_open( $comment_post_ID ) ) { - /** - * Fires when a comment is attempted on a post that has comments closed. - * - * @since 1.5.0 - * - * @param int $comment_post_ID Post ID. - */ - do_action( 'comment_closed', $comment_post_ID ); - wp_die( __('Sorry, comments are closed for this item.') ); -} elseif ( 'trash' == $status ) { - /** - * Fires when a comment is attempted on a trashed post. - * - * @since 2.9.0 - * - * @param int $comment_post_ID Post ID. - */ - do_action( 'comment_on_trash', $comment_post_ID ); - exit; -} elseif ( ! $status_obj->public && ! $status_obj->private ) { - /** - * Fires when a comment is attempted on a post in draft mode. - * - * @since 1.5.1 - * - * @param int $comment_post_ID Post ID. - */ - do_action( 'comment_on_draft', $comment_post_ID ); - exit; -} elseif ( post_password_required( $comment_post_ID ) ) { - /** - * Fires when a comment is attempted on a password-protected post. - * - * @since 2.9.0 - * - * @param int $comment_post_ID Post ID. - */ - do_action( 'comment_on_password_protected', $comment_post_ID ); - exit; -} else { - /** - * Fires before a comment is posted. - * - * @since 2.8.0 - * - * @param int $comment_post_ID Post ID. - */ - do_action( 'pre_comment_on_post', $comment_post_ID ); -} - -$comment_author = ( isset($_POST['author']) ) ? trim(strip_tags($_POST['author'])) : null; -$comment_author_email = ( isset($_POST['email']) ) ? trim($_POST['email']) : null; -$comment_author_url = ( isset($_POST['url']) ) ? trim($_POST['url']) : null; -$comment_content = ( isset($_POST['comment']) ) ? trim($_POST['comment']) : null; - -// If the user is logged in -$user = wp_get_current_user(); -if ( $user->exists() ) { - if ( empty( $user->display_name ) ) - $user->display_name=$user->user_login; - $comment_author = wp_slash( $user->display_name ); - $comment_author_email = wp_slash( $user->user_email ); - $comment_author_url = wp_slash( $user->user_url ); - if ( current_user_can( 'unfiltered_html' ) ) { - if ( ! isset( $_POST['_wp_unfiltered_html_comment'] ) - || ! wp_verify_nonce( $_POST['_wp_unfiltered_html_comment'], 'unfiltered-html-comment_' . $comment_post_ID ) - ) { - kses_remove_filters(); // start with a clean slate - kses_init_filters(); // set up the filters - } +$comment = wp_handle_comment_submission( wp_unslash( $_POST ) ); +if ( is_wp_error( $comment ) ) { + $data = intval( $comment->get_error_data() ); + if ( ! empty( $data ) ) { + wp_die( '

' . $comment->get_error_message() . '

', __( 'Comment Submission Failure' ), array( 'response' => $data, 'back_link' => true ) ); + } else { + exit; } -} else { - if ( get_option('comment_registration') || 'private' == $status ) - wp_die( __('Sorry, you must be logged in to post a comment.') ); -} - -$comment_type = ''; - -if ( get_option('require_name_email') && !$user->exists() ) { - if ( 6 > strlen($comment_author_email) || '' == $comment_author ) - wp_die( __('ERROR: please fill the required fields (name, email).') ); - elseif ( !is_email($comment_author_email)) - wp_die( __('ERROR: please enter a valid email address.') ); } -if ( '' == $comment_content ) - wp_die( __('ERROR: please type a comment.') ); - -$comment_parent = isset($_POST['comment_parent']) ? absint($_POST['comment_parent']) : 0; - -$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'comment_parent', 'user_ID'); - -$comment_id = wp_new_comment( $commentdata ); -$comment = get_comment($comment_id); +$user = wp_get_current_user(); /** * Perform other actions when comment cookies are set. * * @since 3.4.0 * - * @param object $comment Comment object. - * @param WP_User $user User object. The user may not exist. + * @param WP_Comment $comment Comment object. + * @param WP_User $user User object. The user may not exist. */ do_action( 'set_comment_cookies', $comment, $user ); -$location = empty($_POST['redirect_to']) ? get_comment_link($comment_id) : $_POST['redirect_to'] . '#comment-' . $comment_id; +$location = empty( $_POST['redirect_to'] ) ? get_comment_link( $comment ) : $_POST['redirect_to'] . '#comment-' . $comment->comment_ID; /** * Filter the location URI to send the commenter after posting. * * @since 2.0.5 * - * @param string $location The 'redirect_to' URI sent via $_POST. - * @param object $comment Comment object. + * @param string $location The 'redirect_to' URI sent via $_POST. + * @param WP_Comment $comment Comment object. */ $location = apply_filters( 'comment_post_redirect', $location, $comment ); diff --git a/wp-config-sample.php b/wp-config-sample.php index 5a6acc6..7cfaf32 100644 --- a/wp-config-sample.php +++ b/wp-config-sample.php @@ -1,90 +1,89 @@ - - - -Genericons - - - - - -

- -

Genericons Usage

- -

Copy the font folder and the genericons.css file together into your project. Link the CSS in your HTML:

- -

<link href="path/to/genericons.css" rel="stylesheet">

- -

Drop in the following HTML with the name of the icon you want to display:

- -

<div class="genericon genericon-standard"></div>

- -

- - -

- -

- - -

- -

- - -

- -

If you want to insert an icon manually using the :before selector, you can setup CSS rules like the following example. Make sure to set the size to a multiple of 16px or the icons could end up looking fuzzy:

- -

.my-icon:before { - content: '\f408'; - display: inline-block; - -webkit-font-smoothing: antialiased; - font: normal 32px/1 'Genericons'; - vertical-align: middle; -}

- -

Add a matching class to your HTML:

- -

<div class="my-icon">You're a Star!</div>

- -

Here's the result: You're a Star!

- -

Examples

- -

Turn every icon a Salmon color:

- -

-.genericon { - color: #fa8072; -}

- -

Or turn the stars Gold:

- -

-.genericon-star { - color: #fa8072; -}

- -

Use icons for bulleted lists:

- -

One
Two
Three
Four

- -

-<ul class="my-checklist"> - <li>One</li> - <li>Two</li> - <li>Three</li> - <li>Four</li> -</ul>

- -

-.my-checklist { - list-style-type: none; - text-indent: -16px; -} -.my-checklist li:before { - padding-right: 16px; - content: '\f418'; - display: inline-block; - -webkit-font-smoothing: antialiased; - font: normal 16px/1 'Genericons'; - vertical-align: text-top; -}

- -

Use icons to style blockquotes:

- -

Sometimes I've believed as many as six impossible things before breakfast. —Lewis Carroll

`Twas brillig, and the slithy toves Did gyre and gimble in the wabe: All mimsy were the borogoves, And the mome raths outgrabe. "Beware the Jabberwock, my son! The jaws that bite, the claws that catch! Beware the Jubjub bird, and shun The frumious Bandersnatch!"

- -

<blockquote class="my-blockquote">Sometimes I've believed as many as six impossible things before breakfast. —<em>Lewis Carroll</em></blockquote>

- -

-.my-blockquote { - background: #eee; - border-left: 32px solid #ddd; - padding: 10px; -} -.my-blockquote:before { - margin-left: -42px; - padding-right: 10px; - content: '\f106'; - display: inline-block; - -webkit-font-smoothing: antialiased; - font: normal 32px/20px 'Genericons'; - vertical-align: bottom; -}

- -

Use icons to style buttons:

- - View - Listen - -

<a class="my-button" href="#"><i class="genericon genericon-show"></i> View</a> -<a class="my-button" href="#"><i class="genericon genericon-audio"></i> Listen</a>

- -

-.my-button { - font-family: Helvetica, sans-serif; - background: #e05d22; /* Old browsers */ - background: -webkit-linear-gradient(top, #e05d22 0%, #d94412 100%); /* Chrome10+,Safari5.1+ */ - background: -moz-linear-gradient( top, #e05d22 0%, #d94412 100%); /* FF3.6+ */ - background: -ms-linear-gradient( top, #e05d22 0%, #d94412 100%); /* IE10+ */ - background: -o-linear-gradient( top, #e05d22 0%, #d94412 100%); /* Opera 11.10+ */ - background: linear-gradient( to bottom, #e05d22 0%, #d94412 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e05d22', endColorstr='#d94412', GradientType=0); /* IE6-9 */ - display: inline-block; - padding: 10px 16px 6px 16px; - color: #fff; - text-decoration: none; - border: none; - border-bottom: 3px solid #b93207; - border-radius: 2px; -} - -.my-button:hover, -.my-button:focus { - background: #ed6a31; /* Old browsers */ - background: -webkit-linear-gradient(top, #ed6a31 0%, #e55627 100%); /* Chrome10+,Safari5.1+ */ - background: -moz-linear-gradient( top, #ed6a31 0%, #e55627 100%); /* FF3.6+ */ - background: -ms-linear-gradient( top, #ed6a31 0%, #e55627 100%); /* IE10+ */ - background: -o-linear-gradient( top, #ed6a31 0%, #e55627 100%); /* Opera 11.10+ */ - background: linear-gradient( to bottom, #ed6a31 0%, #e55627 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ed6a31', endColorstr='#e55627', GradientType=0); /* IE6-9 */ - outline: none; -} - -.my-button:active { - background: #d94412; /* Old browsers */ - background: -webkit-linear-gradient(top, #d94412 0%, #e05d22 100%); /* Chrome10+,Safari5.1+ */ - background: -moz-linear-gradient( top, #d94412 0%, #e05d22 100%); /* FF3.6+ */ - background: -ms-linear-gradient( top, #d94412 0%, #e05d22 100%); /* IE10+ */ - background: -o-linear-gradient( top, #d94412 0%, #e05d22 100%); /* Opera 11.10+ */ - background: linear-gradient( to bottom, #d94412 0%, #e05d22 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#d94412', endColorstr='#e05d22', GradientType=0); /* IE6-9 */ - border: none; - border-top: 3px solid #b93207; - padding: 6px 16px 10px 16px; -}/

- -

CSS Preprocessors

- -

Preprocessing extensions such as Sass (SCSS Syntax) or LESS can make it easier to manage CSS for a lot of things at once using things like variables and mixins.

- -

This example will seup the basic genericon rules and sets a color you can use for all icons using Sass:

- -

$icon-color: "#fa8072"; - -.genericon { - color: $icon-color; -} - -@mixin genericon-rules { - display: inline-block; - -webkit-font-smoothing: antialiased; - font: normal 16px/1 'Genericons'; - vertical-align: middle; -} - -.my-icon:before { - content: '\f408'; - @include genericon-rules; -}

- -

Here is a similar example for LESS:

- -

@icon-color: "#fa8072"; - -.genericon { - color: @icon-color; -} - -.genericon-rules { - display: inline-block; - -webkit-font-smoothing: antialiased; - font: normal 16px/1 'Genericons'; - vertical-align: middle; -} - -.my-icon:before { - content: '\f408'; - .genericon-rules; -}

- -

Fallback images for IE7 and below

- -

Genericons does not come with fallback icons by default -- therefore you have to create them yourself. If you are using HTML similar to this example: - -

<span class="genericon genericon-warning"></span>

- -

You can use the asterisk hack to serve a different icon to IE7 once you have saved the fallback icons to your project:

- -

.genericon-warning {
-        *background: url(fallback-icon.png) no-repeat center center;
-        *text-indent: 100%;
-}

- -

- - - diff --git a/wp-cron.php b/wp-cron.php index da2838c..15c6676 100644 --- a/wp-cron.php +++ b/wp-cron.php @@ -26,14 +26,25 @@ if ( !defined('ABSPATH') ) { require_once( dirname( __FILE__ ) . '/wp-load.php' ); } -// Uncached doing_cron transient fetch +/** + * Retrieves the cron lock. + * + * Returns the uncached `doing_cron` transient. + * + * @ignore + * @since 3.3.0 + * + * @return string|false Value of the `doing_cron` transient, 0|false otherwise. + */ function _get_cron_lock() { global $wpdb; $value = 0; if ( wp_using_ext_object_cache() ) { - // Skip local cache and force refetch of doing_cron transient in case - // another processs updated the cache + /* + * Skip local cache and force re-fetch of doing_cron transient + * in case another process updated the cache. + */ $value = wp_cache_get( 'doing_cron', 'transient', true ); } else { $row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", '_transient_doing_cron' ) ); @@ -53,7 +64,9 @@ $gmt_time = microtime( true ); if ( isset($keys[0]) && $keys[0] > $gmt_time ) die(); -$doing_cron_transient = get_transient( 'doing_cron'); + +// The cron lock: a unix timestamp from when the cron was spawned. +$doing_cron_transient = get_transient( 'doing_cron' ); // Use global $doing_wp_cron lock otherwise use the GET lock. If no lock, trying grabbing a new lock. if ( empty( $doing_wp_cron ) ) { @@ -68,7 +81,10 @@ if ( empty( $doing_wp_cron ) ) { } } -// Check lock +/* + * The cron lock (a unix timestamp set when the cron was spawned), + * must match $doing_wp_cron (the "key"). + */ if ( $doing_cron_transient != $doing_wp_cron ) return; @@ -92,10 +108,11 @@ foreach ( $crons as $timestamp => $cronhooks ) { /** * Fires scheduled events. * + * @ignore * @since 2.1.0 * * @param string $hook Name of the hook that was scheduled to be fired. - * @param array $v['args'] The arguments to be passed to the hook. + * @param array $args The arguments to be passed to the hook. */ do_action_ref_array( $hook, $v['args'] ); diff --git a/wp-includes/ID3/getid3.lib.php b/wp-includes/ID3/getid3.lib.php index f8df233..76e2854 100644 --- a/wp-includes/ID3/getid3.lib.php +++ b/wp-includes/ID3/getid3.lib.php @@ -3,6 +3,7 @@ /// getID3() by James Heinrich // // available at http://getid3.sourceforge.net // // or http://www.getid3.org // +// also https://github.com/JamesHeinrich/getID3 // ///////////////////////////////////////////////////////////////// // // // getid3.lib.php - part of getID3() // @@ -282,7 +283,6 @@ class getid3_lib } } else { throw new Exception('ERROR: Cannot have signed integers larger than '.(8 * PHP_INT_SIZE).'-bits ('.strlen($byteword).') in self::BigEndian2Int()'); - break; } } return self::CastAsInt($intvalue); @@ -519,11 +519,14 @@ class getid3_lib } public static function XML2array($XMLstring) { - if (function_exists('simplexml_load_string')) { - if (function_exists('get_object_vars')) { - $XMLobject = simplexml_load_string($XMLstring); - return self::SimpleXMLelement2array($XMLobject); - } + if (function_exists('simplexml_load_string') && function_exists('libxml_disable_entity_loader')) { + // http://websec.io/2012/08/27/Preventing-XEE-in-PHP.html + // https://core.trac.wordpress.org/changeset/29378 + $loader = libxml_disable_entity_loader(true); + $XMLobject = simplexml_load_string($XMLstring, 'SimpleXMLElement', LIBXML_NOENT); + $return = self::SimpleXMLelement2array($XMLobject); + libxml_disable_entity_loader($loader); + return $return; } return false; } @@ -634,7 +637,7 @@ class getid3_lib } if (is_readable($filename_source) && is_file($filename_source) && ($fp_src = fopen($filename_source, 'rb'))) { if (($fp_dest = fopen($filename_dest, 'wb'))) { - if (fseek($fp_src, $offset, SEEK_SET) == 0) { + if (fseek($fp_src, $offset) == 0) { $byteslefttowrite = $length; while (($byteslefttowrite > 0) && ($buffer = fread($fp_src, min($byteslefttowrite, getID3::FREAD_BUFFER_SIZE)))) { $byteswritten = fwrite($fp_dest, $buffer, $byteslefttowrite); @@ -985,6 +988,19 @@ class getid3_lib throw new Exception('PHP does not have iconv() support - cannot convert from '.$in_charset.' to '.$out_charset); } + public static function recursiveMultiByteCharString2HTML($data, $charset='ISO-8859-1') { + if (is_string($data)) { + return self::MultiByteCharString2HTML($data, $charset); + } elseif (is_array($data)) { + $return_data = array(); + foreach ($data as $key => $value) { + $return_data[$key] = self::recursiveMultiByteCharString2HTML($value, $charset); + } + return $return_data; + } + // integer, float, objects, resources, etc + return $data; + } public static function MultiByteCharString2HTML($string, $charset='ISO-8859-1') { $string = (string) $string; // in case trying to pass a numeric (float, int) string, would otherwise return an empty string @@ -1149,6 +1165,8 @@ class getid3_lib fwrite($tmp, $imgData); fclose($tmp); $GetDataImageSize = @getimagesize($tempfilename, $imageinfo); + $GetDataImageSize['height'] = $GetDataImageSize[0]; + $GetDataImageSize['width'] = $GetDataImageSize[1]; } unlink($tempfilename); } @@ -1209,16 +1227,21 @@ class getid3_lib $newvaluelength = strlen(trim($value)); foreach ($ThisFileInfo['comments'][$tagname] as $existingkey => $existingvalue) { $oldvaluelength = strlen(trim($existingvalue)); - if (($newvaluelength > $oldvaluelength) && (substr(trim($value), 0, strlen($existingvalue)) == $existingvalue)) { + if ((strlen($existingvalue) > 10) && ($newvaluelength > $oldvaluelength) && (substr(trim($value), 0, strlen($existingvalue)) == $existingvalue)) { $ThisFileInfo['comments'][$tagname][$existingkey] = trim($value); - break 2; + //break 2; + break; } } } if (is_array($value) || empty($ThisFileInfo['comments'][$tagname]) || !in_array(trim($value), $ThisFileInfo['comments'][$tagname])) { $value = (is_string($value) ? trim($value) : $value); - $ThisFileInfo['comments'][$tagname][] = $value; + if (!is_numeric($key)) { + $ThisFileInfo['comments'][$tagname][$key] = $value; + } else { + $ThisFileInfo['comments'][$tagname][] = $value; + } } } } @@ -1226,20 +1249,23 @@ class getid3_lib } // Copy to ['comments_html'] - foreach ($ThisFileInfo['comments'] as $field => $values) { - if ($field == 'picture') { - // pictures can take up a lot of space, and we don't need multiple copies of them - // let there be a single copy in [comments][picture], and not elsewhere - continue; - } - foreach ($values as $index => $value) { - if (is_array($value)) { - $ThisFileInfo['comments_html'][$field][$index] = $value; - } else { - $ThisFileInfo['comments_html'][$field][$index] = str_replace('�', '', self::MultiByteCharString2HTML($value, $ThisFileInfo['encoding'])); + if (!empty($ThisFileInfo['comments'])) { + foreach ($ThisFileInfo['comments'] as $field => $values) { + if ($field == 'picture') { + // pictures can take up a lot of space, and we don't need multiple copies of them + // let there be a single copy in [comments][picture], and not elsewhere + continue; + } + foreach ($values as $index => $value) { + if (is_array($value)) { + $ThisFileInfo['comments_html'][$field][$index] = $value; + } else { + $ThisFileInfo['comments_html'][$field][$index] = str_replace('�', '', self::MultiByteCharString2HTML($value, $ThisFileInfo['encoding'])); + } } } } + } return true; } @@ -1338,4 +1364,17 @@ class getid3_lib } return $filesize; } -} \ No newline at end of file + + + /** + * Workaround for Bug #37268 (https://bugs.php.net/bug.php?id=37268) + * @param string $path A path. + * @param string $suffix If the name component ends in suffix this will also be cut off. + * @return string + */ + public static function mb_basename($path, $suffix = null) { + $splited = preg_split('#/#', rtrim($path, '/ ')); + return substr(basename('X'.$splited[count($splited) - 1], $suffix), 1); + } + +} diff --git a/wp-includes/ID3/getid3.php b/wp-includes/ID3/getid3.php index 84b9cce..714fb02 100644 --- a/wp-includes/ID3/getid3.php +++ b/wp-includes/ID3/getid3.php @@ -3,6 +3,7 @@ /// getID3() by James Heinrich // // available at http://getid3.sourceforge.net // // or http://www.getid3.org // +// also https://github.com/JamesHeinrich/getID3 // ///////////////////////////////////////////////////////////////// // // // Please see readme.txt for more information // @@ -17,18 +18,21 @@ if (!defined('GETID3_OS_ISWINDOWS')) { if (!defined('GETID3_INCLUDEPATH')) { define('GETID3_INCLUDEPATH', dirname(__FILE__).DIRECTORY_SEPARATOR); } +// Workaround Bug #39923 (https://bugs.php.net/bug.php?id=39923) +if (!defined('IMG_JPG') && defined('IMAGETYPE_JPEG')) { + define('IMG_JPG', IMAGETYPE_JPEG); +} // attempt to define temp dir as something flexible but reliable $temp_dir = ini_get('upload_tmp_dir'); if ($temp_dir && (!is_dir($temp_dir) || !is_readable($temp_dir))) { $temp_dir = ''; } -if (!$temp_dir && function_exists('sys_get_temp_dir')) { - // PHP v5.2.1+ +if (!$temp_dir && function_exists('sys_get_temp_dir')) { // sys_get_temp_dir added in PHP v5.2.1 // sys_get_temp_dir() may give inaccessible temp dir, e.g. with open_basedir on virtual hosts $temp_dir = sys_get_temp_dir(); } -$temp_dir = realpath($temp_dir); +$temp_dir = @realpath($temp_dir); // see https://github.com/JamesHeinrich/getID3/pull/10 $open_basedir = ini_get('open_basedir'); if ($open_basedir) { // e.g. "/var/www/vhosts/getid3.org/httpdocs/:/tmp/" @@ -57,7 +61,9 @@ if (!$temp_dir) { $temp_dir = '*'; // invalid directory name should force tempnam() to use system default temp dir } // $temp_dir = '/something/else/'; // feel free to override temp dir here if it works better for your system -define('GETID3_TEMP_DIR', $temp_dir); +if (!defined('GETID3_TEMP_DIR')) { + define('GETID3_TEMP_DIR', $temp_dir); +} unset($open_basedir, $temp_dir); // End: Defines @@ -97,13 +103,13 @@ class getID3 public $fp; // Filepointer to file being analysed. public $info; // Result array. public $tempdir = GETID3_TEMP_DIR; + public $memory_limit = 0; // Protected variables protected $startup_error = ''; protected $startup_warning = ''; - protected $memory_limit = 0; - const VERSION = '1.9.7-20130705'; + const VERSION = '1.9.9-20141121'; const FREAD_BUFFER_SIZE = 32768; const ATTACHMENTS_NONE = false; @@ -112,13 +118,6 @@ class getID3 // public: constructor public function __construct() { - // Check for PHP version - $required_php_version = '5.0.5'; - if (version_compare(PHP_VERSION, $required_php_version, '<')) { - $this->startup_error .= 'getID3() requires PHP v'.$required_php_version.' or higher - you are running v'.PHP_VERSION; - return false; - } - // Check memory $this->memory_limit = ini_get('memory_limit'); if (preg_match('#([0-9]+)M#i', $this->memory_limit, $matches)) { @@ -250,7 +249,7 @@ class getID3 $this->filename = $filename; $this->info = array(); $this->info['GETID3_VERSION'] = $this->version(); - $this->info['php_memory_limit'] = $this->memory_limit; + $this->info['php_memory_limit'] = (($this->memory_limit > 0) ? $this->memory_limit : false); // remote files not supported if (preg_match('/^(ht|f)tp:\/\//', $filename)) { @@ -261,16 +260,32 @@ class getID3 $filename = preg_replace('#(.+)'.preg_quote(DIRECTORY_SEPARATOR).'{2,}#U', '\1'.DIRECTORY_SEPARATOR, $filename); // open local file - if (is_readable($filename) && is_file($filename) && ($this->fp = fopen($filename, 'rb'))) { + //if (is_readable($filename) && is_file($filename) && ($this->fp = fopen($filename, 'rb'))) { // see http://www.getid3.org/phpBB3/viewtopic.php?t=1720 + if ((is_readable($filename) || file_exists($filename)) && is_file($filename) && ($this->fp = fopen($filename, 'rb'))) { // great } else { - throw new getid3_exception('Could not open "'.$filename.'" (does not exist, or is not a file)'); + $errormessagelist = array(); + if (!is_readable($filename)) { + $errormessagelist[] = '!is_readable'; + } + if (!is_file($filename)) { + $errormessagelist[] = '!is_file'; + } + if (!file_exists($filename)) { + $errormessagelist[] = '!file_exists'; + } + if (empty($errormessagelist)) { + $errormessagelist[] = 'fopen failed'; + } + throw new getid3_exception('Could not open "'.$filename.'" ('.implode('; ', $errormessagelist).')'); } $this->info['filesize'] = filesize($filename); // set redundant parameters - might be needed in some include file - $this->info['filename'] = basename($filename); + // filenames / filepaths in getID3 are always expressed with forward slashes (unix-style) for both Windows and other to try and minimize confusion + $filename = str_replace('\\', '/', $filename); $this->info['filepath'] = str_replace('\\', '/', realpath(dirname($filename))); + $this->info['filename'] = getid3_lib::mb_basename($filename); $this->info['filenamepath'] = $this->info['filepath'].'/'.$this->info['filename']; @@ -352,7 +367,7 @@ class getID3 // ID3v2 detection (NOT parsing), even if ($this->option_tag_id3v2 == false) done to make fileformat easier if (!$this->option_tag_id3v2) { - fseek($this->fp, 0, SEEK_SET); + fseek($this->fp, 0); $header = fread($this->fp, 10); if ((substr($header, 0, 3) == 'ID3') && (strlen($header) == 10)) { $this->info['id3v2']['header'] = true; @@ -363,7 +378,7 @@ class getID3 } // read 32 kb file data - fseek($this->fp, $this->info['avdataoffset'], SEEK_SET); + fseek($this->fp, $this->info['avdataoffset']); $formattest = fread($this->fp, 32774); // determine format @@ -588,6 +603,14 @@ class getID3 'mime_type' => 'audio/basic', ), + // AMR - audio - Adaptive Multi Rate + 'amr' => array( + 'pattern' => '^\x23\x21AMR\x0A', // #!AMR[0A] + 'group' => 'audio', + 'module' => 'amr', + 'mime_type' => 'audio/amr', + ), + // AVR - audio - Audio Visual Research 'avr' => array( 'pattern' => '^2BIT', @@ -1161,6 +1184,7 @@ class getID3 'matroska' => array('matroska' , 'UTF-8'), 'flac' => array('vorbiscomment' , 'UTF-8'), 'divxtag' => array('divx' , 'ISO-8859-1'), + 'iptc' => array('iptc' , 'ISO-8859-1'), ); } @@ -1181,7 +1205,11 @@ class getID3 $value = trim($value, " \r\n\t"); // do not trim nulls from $value!! Unicode characters will get mangled if trailing nulls are removed! } if ($value) { - $this->info['tags'][trim($tag_name)][trim($tag_key)][] = $value; + if (!is_numeric($key)) { + $this->info['tags'][trim($tag_name)][trim($tag_key)][$key] = $value; + } else { + $this->info['tags'][trim($tag_name)][trim($tag_key)][] = $value; + } } } if ($tag_key == 'picture') { @@ -1196,14 +1224,7 @@ class getID3 if ($this->option_tags_html) { foreach ($this->info['tags'][$tag_name] as $tag_key => $valuearray) { - foreach ($valuearray as $key => $value) { - if (is_string($value)) { - //$this->info['tags_html'][$tag_name][$tag_key][$key] = getid3_lib::MultiByteCharString2HTML($value, $encoding); - $this->info['tags_html'][$tag_name][$tag_key][$key] = str_replace('�', '', trim(getid3_lib::MultiByteCharString2HTML($value, $encoding))); - } else { - $this->info['tags_html'][$tag_name][$tag_key][$key] = $value; - } - } + $this->info['tags_html'][$tag_name][$tag_key] = getid3_lib::recursiveMultiByteCharString2HTML($valuearray, $encoding); } } @@ -1259,7 +1280,6 @@ class getID3 return true; } - public function getHashdata($algorithm) { switch ($algorithm) { case 'md5': @@ -1565,8 +1585,11 @@ class getID3 } -abstract class getid3_handler -{ +abstract class getid3_handler { + + /** + * @var getID3 + */ protected $getid3; // pointer protected $data_string_flag = false; // analyzing filepointer or string @@ -1593,7 +1616,7 @@ abstract class getid3_handler // Analyze from string instead public function AnalyzeString($string) { // Enter string mode - $this->setStringMode($string); + $this->setStringMode($string); // Save info $saved_avdataoffset = $this->getid3->info['avdataoffset']; @@ -1634,10 +1657,10 @@ abstract class getid3_handler $this->data_string_position += $bytes; return substr($this->data_string, $this->data_string_position - $bytes, $bytes); } - $pos = $this->ftell() + $bytes; - if (!getid3_lib::intValueSupported($pos)) { + $pos = $this->ftell() + $bytes; + if (!getid3_lib::intValueSupported($pos)) { throw new getid3_exception('cannot fread('.$bytes.' from '.$this->ftell().') because beyond PHP filesystem limit', 10); - } + } return fread($this->getid3->fp, $bytes); } @@ -1657,14 +1680,14 @@ abstract class getid3_handler break; } return 0; - } else { - $pos = $bytes; - if ($whence == SEEK_CUR) { + } else { + $pos = $bytes; + if ($whence == SEEK_CUR) { $pos = $this->ftell() + $bytes; - } elseif ($whence == SEEK_END) { - $pos = $this->info['filesize'] + $bytes; - } - if (!getid3_lib::intValueSupported($pos)) { + } elseif ($whence == SEEK_END) { + $pos = $this->getid3->info['filesize'] + $bytes; + } + if (!getid3_lib::intValueSupported($pos)) { throw new getid3_exception('cannot fseek('.$pos.') because beyond PHP filesystem limit', 10); } } @@ -1682,20 +1705,17 @@ abstract class getid3_handler return $this->dependency_to == $module; } - protected function error($text) - { + protected function error($text) { $this->getid3->info['error'][] = $text; return false; } - protected function warning($text) - { + protected function warning($text) { return $this->getid3->warning($text); } - protected function notice($text) - { + protected function notice($text) { // does nothing for now } @@ -1773,4 +1793,4 @@ abstract class getid3_handler class getid3_exception extends Exception { public $message; -} \ No newline at end of file +} diff --git a/wp-includes/ID3/license.txt b/wp-includes/ID3/license.txt index 85f4356..205c7e6 100644 --- a/wp-includes/ID3/license.txt +++ b/wp-includes/ID3/license.txt @@ -2,6 +2,7 @@ /// getID3() by James Heinrich // // available at http://getid3.sourceforge.net // // or http://www.getid3.org // +// also https://github.com/JamesHeinrich/getID3 // ///////////////////////////////////////////////////////////////// ***************************************************************** diff --git a/wp-includes/ID3/module.audio-video.asf.php b/wp-includes/ID3/module.audio-video.asf.php index cfc60a7..ee61d7d 100644 --- a/wp-includes/ID3/module.audio-video.asf.php +++ b/wp-includes/ID3/module.audio-video.asf.php @@ -3,6 +3,7 @@ /// getID3() by James Heinrich // // available at http://getid3.sourceforge.net // // or http://www.getid3.org // +// also https://github.com/JamesHeinrich/getID3 // ///////////////////////////////////////////////////////////////// // See readme.txt for more details // ///////////////////////////////////////////////////////////////// @@ -15,8 +16,7 @@ getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, true); -class getid3_asf extends getid3_handler -{ +class getid3_asf extends getid3_handler { public function __construct(getID3 $getid3) { parent::__construct($getid3); // extends getid3_handler::__construct() @@ -66,25 +66,22 @@ class getid3_asf extends getid3_handler $info['fileformat'] = 'asf'; - fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET); - $HeaderObjectData = fread($this->getid3->fp, 30); + $this->fseek($info['avdataoffset']); + $HeaderObjectData = $this->fread(30); $thisfile_asf_headerobject['objectid'] = substr($HeaderObjectData, 0, 16); $thisfile_asf_headerobject['objectid_guid'] = $this->BytestringToGUID($thisfile_asf_headerobject['objectid']); if ($thisfile_asf_headerobject['objectid'] != GETID3_ASF_Header_Object) { - $info['warning'][] = 'ASF header GUID {'.$this->BytestringToGUID($thisfile_asf_headerobject['objectid']).'} does not match expected "GETID3_ASF_Header_Object" GUID {'.$this->BytestringToGUID(GETID3_ASF_Header_Object).'}'; - unset($info['fileformat']); - unset($info['asf']); - return false; - break; + unset($info['fileformat'], $info['asf']); + return $this->error('ASF header GUID {'.$this->BytestringToGUID($thisfile_asf_headerobject['objectid']).'} does not match expected "GETID3_ASF_Header_Object" GUID {'.$this->BytestringToGUID(GETID3_ASF_Header_Object).'}'); } $thisfile_asf_headerobject['objectsize'] = getid3_lib::LittleEndian2Int(substr($HeaderObjectData, 16, 8)); $thisfile_asf_headerobject['headerobjects'] = getid3_lib::LittleEndian2Int(substr($HeaderObjectData, 24, 4)); $thisfile_asf_headerobject['reserved1'] = getid3_lib::LittleEndian2Int(substr($HeaderObjectData, 28, 1)); $thisfile_asf_headerobject['reserved2'] = getid3_lib::LittleEndian2Int(substr($HeaderObjectData, 29, 1)); - $NextObjectOffset = ftell($this->getid3->fp); - $ASFHeaderData = fread($this->getid3->fp, $thisfile_asf_headerobject['objectsize'] - 30); + $NextObjectOffset = $this->ftell(); + $ASFHeaderData = $this->fread($thisfile_asf_headerobject['objectsize'] - 30); $offset = 0; for ($HeaderObjectsCounter = 0; $HeaderObjectsCounter < $thisfile_asf_headerobject['headerobjects']; $HeaderObjectsCounter++) { @@ -284,7 +281,7 @@ class getid3_asf extends getid3_handler $offset += 4; $thisfile_asf_headerextensionobject['extension_data'] = substr($ASFHeaderData, $offset, $thisfile_asf_headerextensionobject['extension_data_size']); $unhandled_sections = 0; - $thisfile_asf_headerextensionobject['extension_data_parsed'] = $this->ASF_HeaderExtensionObjectDataParse($thisfile_asf_headerextensionobject['extension_data'], $unhandled_sections); + $thisfile_asf_headerextensionobject['extension_data_parsed'] = $this->HeaderExtensionObjectDataParse($thisfile_asf_headerextensionobject['extension_data'], $unhandled_sections); if ($unhandled_sections === 0) { unset($thisfile_asf_headerextensionobject['extension_data']); } @@ -332,7 +329,7 @@ class getid3_asf extends getid3_handler $thisfile_asf_codeclistobject_codecentries_current['type_raw'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2)); $offset += 2; - $thisfile_asf_codeclistobject_codecentries_current['type'] = $this->ASFCodecListObjectTypeLookup($thisfile_asf_codeclistobject_codecentries_current['type_raw']); + $thisfile_asf_codeclistobject_codecentries_current['type'] = self::codecListObjectTypeLookup($thisfile_asf_codeclistobject_codecentries_current['type_raw']); $CodecNameLength = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2)) * 2; // 2 bytes per character $offset += 2; @@ -826,22 +823,14 @@ class getid3_asf extends getid3_handler break; case 'id3': - // id3v2 module might not be loaded - if (class_exists('getid3_id3v2')) { - $tempfile = tempnam(GETID3_TEMP_DIR, 'getID3'); - $tempfilehandle = fopen($tempfile, 'wb'); - $tempThisfileInfo = array('encoding'=>$info['encoding']); - fwrite($tempfilehandle, $thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']); - fclose($tempfilehandle); - - $getid3_temp = new getID3(); - $getid3_temp->openfile($tempfile); - $getid3_id3v2 = new getid3_id3v2($getid3_temp); - $getid3_id3v2->Analyze(); - $info['id3v2'] = $getid3_temp->info['id3v2']; - unset($getid3_temp, $getid3_id3v2); - - unlink($tempfile); + $this->getid3->include_module('tag.id3v2'); + + $getid3_id3v2 = new getid3_id3v2($this->getid3); + $getid3_id3v2->AnalyzeString($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']); + unset($getid3_id3v2); + + if ($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value_length'] > 1024) { + $thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value'] = ''; } break; @@ -860,7 +849,7 @@ class getid3_asf extends getid3_handler $wm_picture_offset = 0; $thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_type_id'] = getid3_lib::LittleEndian2Int(substr($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value'], $wm_picture_offset, 1)); $wm_picture_offset += 1; - $thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_type'] = $this->WMpictureTypeLookup($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_type_id']); + $thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_type'] = self::WMpictureTypeLookup($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_type_id']); $thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_size'] = getid3_lib::LittleEndian2Int(substr($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value'], $wm_picture_offset, 4)); $wm_picture_offset += 4; @@ -1156,8 +1145,8 @@ class getid3_asf extends getid3_handler } } - while (ftell($this->getid3->fp) < $info['avdataend']) { - $NextObjectDataHeader = fread($this->getid3->fp, 24); + while ($this->ftell() < $info['avdataend']) { + $NextObjectDataHeader = $this->fread(24); $offset = 0; $NextObjectGUID = substr($NextObjectDataHeader, 0, 16); $offset += 16; @@ -1179,7 +1168,7 @@ class getid3_asf extends getid3_handler $thisfile_asf['data_object'] = array(); $thisfile_asf_dataobject = &$thisfile_asf['data_object']; - $DataObjectData = $NextObjectDataHeader.fread($this->getid3->fp, 50 - 24); + $DataObjectData = $NextObjectDataHeader.$this->fread(50 - 24); $offset = 24; $thisfile_asf_dataobject['objectid'] = $NextObjectGUID; @@ -1207,9 +1196,9 @@ class getid3_asf extends getid3_handler // * * Error Correction Present bits 1 // If set, use Opaque Data Packet structure, else use Payload structure // * Error Correction Data - $info['avdataoffset'] = ftell($this->getid3->fp); - fseek($this->getid3->fp, ($thisfile_asf_dataobject['objectsize'] - 50), SEEK_CUR); // skip actual audio/video data - $info['avdataend'] = ftell($this->getid3->fp); + $info['avdataoffset'] = $this->ftell(); + $this->fseek(($thisfile_asf_dataobject['objectsize'] - 50), SEEK_CUR); // skip actual audio/video data + $info['avdataend'] = $this->ftell(); break; case GETID3_ASF_Simple_Index_Object: @@ -1229,7 +1218,7 @@ class getid3_asf extends getid3_handler $thisfile_asf['simple_index_object'] = array(); $thisfile_asf_simpleindexobject = &$thisfile_asf['simple_index_object']; - $SimpleIndexObjectData = $NextObjectDataHeader.fread($this->getid3->fp, 56 - 24); + $SimpleIndexObjectData = $NextObjectDataHeader.$this->fread(56 - 24); $offset = 24; $thisfile_asf_simpleindexobject['objectid'] = $NextObjectGUID; @@ -1246,7 +1235,7 @@ class getid3_asf extends getid3_handler $thisfile_asf_simpleindexobject['index_entries_count'] = getid3_lib::LittleEndian2Int(substr($SimpleIndexObjectData, $offset, 4)); $offset += 4; - $IndexEntriesData = $SimpleIndexObjectData.fread($this->getid3->fp, 6 * $thisfile_asf_simpleindexobject['index_entries_count']); + $IndexEntriesData = $SimpleIndexObjectData.$this->fread(6 * $thisfile_asf_simpleindexobject['index_entries_count']); for ($IndexEntriesCounter = 0; $IndexEntriesCounter < $thisfile_asf_simpleindexobject['index_entries_count']; $IndexEntriesCounter++) { $thisfile_asf_simpleindexobject['index_entries'][$IndexEntriesCounter]['packet_number'] = getid3_lib::LittleEndian2Int(substr($IndexEntriesData, $offset, 4)); $offset += 4; @@ -1283,7 +1272,7 @@ class getid3_asf extends getid3_handler $thisfile_asf['asf_index_object'] = array(); $thisfile_asf_asfindexobject = &$thisfile_asf['asf_index_object']; - $ASFIndexObjectData = $NextObjectDataHeader.fread($this->getid3->fp, 34 - 24); + $ASFIndexObjectData = $NextObjectDataHeader.$this->fread(34 - 24); $offset = 24; $thisfile_asf_asfindexobject['objectid'] = $NextObjectGUID; @@ -1297,7 +1286,7 @@ class getid3_asf extends getid3_handler $thisfile_asf_asfindexobject['index_blocks_count'] = getid3_lib::LittleEndian2Int(substr($ASFIndexObjectData, $offset, 4)); $offset += 4; - $ASFIndexObjectData .= fread($this->getid3->fp, 4 * $thisfile_asf_asfindexobject['index_specifiers_count']); + $ASFIndexObjectData .= $this->fread(4 * $thisfile_asf_asfindexobject['index_specifiers_count']); for ($IndexSpecifiersCounter = 0; $IndexSpecifiersCounter < $thisfile_asf_asfindexobject['index_specifiers_count']; $IndexSpecifiersCounter++) { $IndexSpecifierStreamNumber = getid3_lib::LittleEndian2Int(substr($ASFIndexObjectData, $offset, 2)); $offset += 2; @@ -1307,17 +1296,17 @@ class getid3_asf extends getid3_handler $thisfile_asf_asfindexobject['index_specifiers'][$IndexSpecifiersCounter]['index_type_text'] = $this->ASFIndexObjectIndexTypeLookup($thisfile_asf_asfindexobject['index_specifiers'][$IndexSpecifiersCounter]['index_type']); } - $ASFIndexObjectData .= fread($this->getid3->fp, 4); + $ASFIndexObjectData .= $this->fread(4); $thisfile_asf_asfindexobject['index_entry_count'] = getid3_lib::LittleEndian2Int(substr($ASFIndexObjectData, $offset, 4)); $offset += 4; - $ASFIndexObjectData .= fread($this->getid3->fp, 8 * $thisfile_asf_asfindexobject['index_specifiers_count']); + $ASFIndexObjectData .= $this->fread(8 * $thisfile_asf_asfindexobject['index_specifiers_count']); for ($IndexSpecifiersCounter = 0; $IndexSpecifiersCounter < $thisfile_asf_asfindexobject['index_specifiers_count']; $IndexSpecifiersCounter++) { $thisfile_asf_asfindexobject['block_positions'][$IndexSpecifiersCounter] = getid3_lib::LittleEndian2Int(substr($ASFIndexObjectData, $offset, 8)); $offset += 8; } - $ASFIndexObjectData .= fread($this->getid3->fp, 4 * $thisfile_asf_asfindexobject['index_specifiers_count'] * $thisfile_asf_asfindexobject['index_entry_count']); + $ASFIndexObjectData .= $this->fread(4 * $thisfile_asf_asfindexobject['index_specifiers_count'] * $thisfile_asf_asfindexobject['index_entry_count']); for ($IndexEntryCounter = 0; $IndexEntryCounter < $thisfile_asf_asfindexobject['index_entry_count']; $IndexEntryCounter++) { for ($IndexSpecifiersCounter = 0; $IndexSpecifiersCounter < $thisfile_asf_asfindexobject['index_specifiers_count']; $IndexSpecifiersCounter++) { $thisfile_asf_asfindexobject['offsets'][$IndexSpecifiersCounter][$IndexEntryCounter] = getid3_lib::LittleEndian2Int(substr($ASFIndexObjectData, $offset, 4)); @@ -1332,9 +1321,9 @@ class getid3_asf extends getid3_handler if ($this->GUIDname($NextObjectGUIDtext)) { $info['warning'][] = 'unhandled GUID "'.$this->GUIDname($NextObjectGUIDtext).'" {'.$NextObjectGUIDtext.'} in ASF body at offset '.($offset - 16 - 8); } else { - $info['warning'][] = 'unknown GUID {'.$NextObjectGUIDtext.'} in ASF body at offset '.(ftell($this->getid3->fp) - 16 - 8); + $info['warning'][] = 'unknown GUID {'.$NextObjectGUIDtext.'} in ASF body at offset '.($this->ftell() - 16 - 8); } - fseek($this->getid3->fp, ($NextObjectSize - 16 - 8), SEEK_CUR); + $this->fseek(($NextObjectSize - 16 - 8), SEEK_CUR); break; } } @@ -1433,10 +1422,10 @@ class getid3_asf extends getid3_handler $thisfile_video['dataformat'] = (!empty($thisfile_video['dataformat']) ? $thisfile_video['dataformat'] : 'asf'); } if (!empty($thisfile_video['streams'])) { - $thisfile_video['streams']['resolution_x'] = 0; - $thisfile_video['streams']['resolution_y'] = 0; + $thisfile_video['resolution_x'] = 0; + $thisfile_video['resolution_y'] = 0; foreach ($thisfile_video['streams'] as $key => $valuearray) { - if (($valuearray['resolution_x'] > $thisfile_video['streams']['resolution_x']) || ($valuearray['resolution_y'] > $thisfile_video['streams']['resolution_y'])) { + if (($valuearray['resolution_x'] > $thisfile_video['resolution_x']) || ($valuearray['resolution_y'] > $thisfile_video['resolution_y'])) { $thisfile_video['resolution_x'] = $valuearray['resolution_x']; $thisfile_video['resolution_y'] = $valuearray['resolution_y']; } @@ -1451,15 +1440,14 @@ class getid3_asf extends getid3_handler return true; } - public static function ASFCodecListObjectTypeLookup($CodecListType) { - static $ASFCodecListObjectTypeLookup = array(); - if (empty($ASFCodecListObjectTypeLookup)) { - $ASFCodecListObjectTypeLookup[0x0001] = 'Video Codec'; - $ASFCodecListObjectTypeLookup[0x0002] = 'Audio Codec'; - $ASFCodecListObjectTypeLookup[0xFFFF] = 'Unknown Codec'; - } + public static function codecListObjectTypeLookup($CodecListType) { + static $lookup = array( + 0x0001 => 'Video Codec', + 0x0002 => 'Audio Codec', + 0xFFFF => 'Unknown Codec' + ); - return (isset($ASFCodecListObjectTypeLookup[$CodecListType]) ? $ASFCodecListObjectTypeLookup[$CodecListType] : 'Invalid Codec Type'); + return (isset($lookup[$CodecListType]) ? $lookup[$CodecListType] : 'Invalid Codec Type'); } public static function KnownGUIDs() { @@ -1666,31 +1654,37 @@ class getid3_asf extends getid3_handler } public static function WMpictureTypeLookup($WMpictureType) { - static $WMpictureTypeLookup = array(); - if (empty($WMpictureTypeLookup)) { - $WMpictureTypeLookup[0x03] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Front Cover'); - $WMpictureTypeLookup[0x04] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Back Cover'); - $WMpictureTypeLookup[0x00] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'User Defined'); - $WMpictureTypeLookup[0x05] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Leaflet Page'); - $WMpictureTypeLookup[0x06] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Media Label'); - $WMpictureTypeLookup[0x07] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Lead Artist'); - $WMpictureTypeLookup[0x08] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Artist'); - $WMpictureTypeLookup[0x09] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Conductor'); - $WMpictureTypeLookup[0x0A] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Band'); - $WMpictureTypeLookup[0x0B] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Composer'); - $WMpictureTypeLookup[0x0C] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Lyricist'); - $WMpictureTypeLookup[0x0D] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Recording Location'); - $WMpictureTypeLookup[0x0E] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'During Recording'); - $WMpictureTypeLookup[0x0F] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'During Performance'); - $WMpictureTypeLookup[0x10] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Video Screen Capture'); - $WMpictureTypeLookup[0x12] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Illustration'); - $WMpictureTypeLookup[0x13] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Band Logotype'); - $WMpictureTypeLookup[0x14] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Publisher Logotype'); + static $lookup = null; + if ($lookup === null) { + $lookup = array( + 0x03 => 'Front Cover', + 0x04 => 'Back Cover', + 0x00 => 'User Defined', + 0x05 => 'Leaflet Page', + 0x06 => 'Media Label', + 0x07 => 'Lead Artist', + 0x08 => 'Artist', + 0x09 => 'Conductor', + 0x0A => 'Band', + 0x0B => 'Composer', + 0x0C => 'Lyricist', + 0x0D => 'Recording Location', + 0x0E => 'During Recording', + 0x0F => 'During Performance', + 0x10 => 'Video Screen Capture', + 0x12 => 'Illustration', + 0x13 => 'Band Logotype', + 0x14 => 'Publisher Logotype' + ); + $lookup = array_map(function($str) { + return getid3_lib::iconv_fallback('UTF-8', 'UTF-16LE', $str); + }, $lookup); } - return (isset($WMpictureTypeLookup[$WMpictureType]) ? $WMpictureTypeLookup[$WMpictureType] : ''); + + return (isset($lookup[$WMpictureType]) ? $lookup[$WMpictureType] : ''); } - public function ASF_HeaderExtensionObjectDataParse(&$asf_header_extension_object_data, &$unhandled_sections) { + public function HeaderExtensionObjectDataParse(&$asf_header_extension_object_data, &$unhandled_sections) { // http://msdn.microsoft.com/en-us/library/bb643323.aspx $offset = 0; @@ -1825,7 +1819,7 @@ class getid3_asf extends getid3_handler $descriptionRecord['data_type'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2)); $offset += 2; - $descriptionRecord['data_type_text'] = $this->ASFmetadataLibraryObjectDataTypeLookup($descriptionRecord['data_type']); + $descriptionRecord['data_type_text'] = self::metadataLibraryObjectDataTypeLookup($descriptionRecord['data_type']); $descriptionRecord['data_length'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4)); $offset += 4; @@ -1897,7 +1891,7 @@ class getid3_asf extends getid3_handler $descriptionRecord['data_type'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2)); $offset += 2; - $descriptionRecord['data_type_text'] = $this->ASFmetadataLibraryObjectDataTypeLookup($descriptionRecord['data_type']); + $descriptionRecord['data_type_text'] = self::metadataLibraryObjectDataTypeLookup($descriptionRecord['data_type']); $descriptionRecord['data_length'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4)); $offset += 4; @@ -1937,8 +1931,8 @@ class getid3_asf extends getid3_handler } - public static function ASFmetadataLibraryObjectDataTypeLookup($id) { - static $ASFmetadataLibraryObjectDataTypeLookup = array( + public static function metadataLibraryObjectDataTypeLookup($id) { + static $lookup = array( 0x0000 => 'Unicode string', // The data consists of a sequence of Unicode characters 0x0001 => 'BYTE array', // The type of the data is implementation-specific 0x0002 => 'BOOL', // The data is 2 bytes long and should be interpreted as a 16-bit unsigned integer. Only 0x0000 or 0x0001 are permitted values @@ -1947,7 +1941,7 @@ class getid3_asf extends getid3_handler 0x0005 => 'WORD', // The data is 2 bytes long and should be interpreted as a 16-bit unsigned integer 0x0006 => 'GUID', // The data is 16 bytes long and should be interpreted as a 128-bit GUID ); - return (isset($ASFmetadataLibraryObjectDataTypeLookup[$id]) ? $ASFmetadataLibraryObjectDataTypeLookup[$id] : 'invalid'); + return (isset($lookup[$id]) ? $lookup[$id] : 'invalid'); } public function ASF_WMpicture(&$data) { @@ -1964,7 +1958,7 @@ class getid3_asf extends getid3_handler $offset = 0; $WMpicture['image_type_id'] = getid3_lib::LittleEndian2Int(substr($data, $offset, 1)); $offset += 1; - $WMpicture['image_type'] = $this->WMpictureTypeLookup($WMpicture['image_type_id']); + $WMpicture['image_type'] = self::WMpictureTypeLookup($WMpicture['image_type_id']); $WMpicture['image_size'] = getid3_lib::LittleEndian2Int(substr($data, $offset, 4)); $offset += 4; diff --git a/wp-includes/ID3/module.audio-video.flv.php b/wp-includes/ID3/module.audio-video.flv.php index f9c4cf3..c5fbd4b 100644 --- a/wp-includes/ID3/module.audio-video.flv.php +++ b/wp-includes/ID3/module.audio-video.flv.php @@ -3,6 +3,7 @@ /// getID3() by James Heinrich // // available at http://getid3.sourceforge.net // // or http://www.getid3.org // +// also https://github.com/JamesHeinrich/getID3 // // // // FLV module by Seth Kaufman // // // @@ -38,6 +39,11 @@ // * version 0.6.1 (30 May 2011) // // prevent infinite loops in expGolombUe() // // // +// * version 0.7.0 (16 Jul 2013) // +// handle GETID3_FLV_VIDEO_VP6FLV_ALPHA // +// improved AVCSequenceParameterSetReader::readData() // +// by Xander Schouwerwou // +// // ///////////////////////////////////////////////////////////////// // // // module.audio-video.flv.php // @@ -67,38 +73,38 @@ define('H264_PROFILE_HIGH422', 122); define('H264_PROFILE_HIGH444', 144); define('H264_PROFILE_HIGH444_PREDICTIVE', 244); -class getid3_flv extends getid3_handler -{ +class getid3_flv extends getid3_handler { + + const magic = 'FLV'; + public $max_frames = 100000; // break out of the loop if too many frames have been scanned; only scan this many if meta frame does not contain useful duration public function Analyze() { $info = &$this->getid3->info; - fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET); + $this->fseek($info['avdataoffset']); $FLVdataLength = $info['avdataend'] - $info['avdataoffset']; - $FLVheader = fread($this->getid3->fp, 5); + $FLVheader = $this->fread(5); $info['fileformat'] = 'flv'; $info['flv']['header']['signature'] = substr($FLVheader, 0, 3); $info['flv']['header']['version'] = getid3_lib::BigEndian2Int(substr($FLVheader, 3, 1)); $TypeFlags = getid3_lib::BigEndian2Int(substr($FLVheader, 4, 1)); - $magic = 'FLV'; - if ($info['flv']['header']['signature'] != $magic) { - $info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($info['flv']['header']['signature']).'"'; - unset($info['flv']); - unset($info['fileformat']); + if ($info['flv']['header']['signature'] != self::magic) { + $info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes(self::magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($info['flv']['header']['signature']).'"'; + unset($info['flv'], $info['fileformat']); return false; } $info['flv']['header']['hasAudio'] = (bool) ($TypeFlags & 0x04); $info['flv']['header']['hasVideo'] = (bool) ($TypeFlags & 0x01); - $FrameSizeDataLength = getid3_lib::BigEndian2Int(fread($this->getid3->fp, 4)); + $FrameSizeDataLength = getid3_lib::BigEndian2Int($this->fread(4)); $FLVheaderFrameLength = 9; if ($FrameSizeDataLength > $FLVheaderFrameLength) { - fseek($this->getid3->fp, $FrameSizeDataLength - $FLVheaderFrameLength, SEEK_CUR); + $this->fseek($FrameSizeDataLength - $FLVheaderFrameLength, SEEK_CUR); } $Duration = 0; $found_video = false; @@ -108,15 +114,15 @@ class getid3_flv extends getid3_handler $tagParseCount = 0; $info['flv']['framecount'] = array('total'=>0, 'audio'=>0, 'video'=>0); $flv_framecount = &$info['flv']['framecount']; - while (((ftell($this->getid3->fp) + 16) < $info['avdataend']) && (($tagParseCount++ <= $this->max_frames) || !$found_valid_meta_playtime)) { - $ThisTagHeader = fread($this->getid3->fp, 16); + while ((($this->ftell() + 16) < $info['avdataend']) && (($tagParseCount++ <= $this->max_frames) || !$found_valid_meta_playtime)) { + $ThisTagHeader = $this->fread(16); $PreviousTagLength = getid3_lib::BigEndian2Int(substr($ThisTagHeader, 0, 4)); $TagType = getid3_lib::BigEndian2Int(substr($ThisTagHeader, 4, 1)); $DataLength = getid3_lib::BigEndian2Int(substr($ThisTagHeader, 5, 3)); $Timestamp = getid3_lib::BigEndian2Int(substr($ThisTagHeader, 8, 3)); $LastHeaderByte = getid3_lib::BigEndian2Int(substr($ThisTagHeader, 15, 1)); - $NextOffset = ftell($this->getid3->fp) - 1 + $DataLength; + $NextOffset = $this->ftell() - 1 + $DataLength; if ($Timestamp > $Duration) { $Duration = $Timestamp; } @@ -140,7 +146,7 @@ class getid3_flv extends getid3_handler $found_video = true; $info['flv']['video']['videoCodec'] = $LastHeaderByte & 0x07; - $FLVvideoHeader = fread($this->getid3->fp, 11); + $FLVvideoHeader = $this->fread(11); if ($info['flv']['video']['videoCodec'] == GETID3_FLV_VIDEO_H264) { // this code block contributed by: moysevichÃgmail*com @@ -160,7 +166,7 @@ class getid3_flv extends getid3_handler //$spsSize = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 9, 2)); $spsSize = getid3_lib::LittleEndian2Int(substr($FLVvideoHeader, 9, 2)); // read the first SequenceParameterSet - $sps = fread($this->getid3->fp, $spsSize); + $sps = $this->fread($spsSize); if (strlen($sps) == $spsSize) { // make sure that whole SequenceParameterSet was red $spsReader = new AVCSequenceParameterSetReader($sps); $spsReader->readData(); @@ -185,19 +191,15 @@ class getid3_flv extends getid3_handler //$PictureSizeEnc <<= 1; //$info['video']['resolution_y'] = ($PictureSizeEnc & 0xFF00) >> 8; - $PictureSizeEnc['x'] = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 4, 2)); - $PictureSizeEnc['y'] = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 5, 2)); - $PictureSizeEnc['x'] >>= 7; - $PictureSizeEnc['y'] >>= 7; + $PictureSizeEnc['x'] = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 4, 2)) >> 7; + $PictureSizeEnc['y'] = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 5, 2)) >> 7; $info['video']['resolution_x'] = $PictureSizeEnc['x'] & 0xFF; $info['video']['resolution_y'] = $PictureSizeEnc['y'] & 0xFF; break; case 1: - $PictureSizeEnc['x'] = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 4, 3)); - $PictureSizeEnc['y'] = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 6, 3)); - $PictureSizeEnc['x'] >>= 7; - $PictureSizeEnc['y'] >>= 7; + $PictureSizeEnc['x'] = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 4, 3)) >> 7; + $PictureSizeEnc['y'] = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 6, 3)) >> 7; $info['video']['resolution_x'] = $PictureSizeEnc['x'] & 0xFFFF; $info['video']['resolution_y'] = $PictureSizeEnc['y'] & 0xFFFF; break; @@ -233,8 +235,22 @@ class getid3_flv extends getid3_handler break; } + + } elseif ($info['flv']['video']['videoCodec'] == GETID3_FLV_VIDEO_VP6FLV_ALPHA) { + + /* contributed by schouwerwouÃgmail*com */ + if (!isset($info['video']['resolution_x'])) { // only when meta data isn't set + $PictureSizeEnc['x'] = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 6, 2)); + $PictureSizeEnc['y'] = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 7, 2)); + $info['video']['resolution_x'] = ($PictureSizeEnc['x'] & 0xFF) << 3; + $info['video']['resolution_y'] = ($PictureSizeEnc['y'] & 0xFF) << 3; + } + /* end schouwerwouÃgmail*com */ + + } + if (!empty($info['video']['resolution_x']) && !empty($info['video']['resolution_y'])) { + $info['video']['pixel_aspect_ratio'] = $info['video']['resolution_x'] / $info['video']['resolution_y']; } - $info['video']['pixel_aspect_ratio'] = $info['video']['resolution_x'] / $info['video']['resolution_y']; } break; @@ -242,8 +258,8 @@ class getid3_flv extends getid3_handler case GETID3_FLV_TAG_META: if (!$found_meta) { $found_meta = true; - fseek($this->getid3->fp, -1, SEEK_CUR); - $datachunk = fread($this->getid3->fp, $DataLength); + $this->fseek(-1, SEEK_CUR); + $datachunk = $this->fread($DataLength); $AMFstream = new AMFStream($datachunk); $reader = new AMFReader($AMFstream); $eventName = $reader->readData(); @@ -279,7 +295,7 @@ class getid3_flv extends getid3_handler // noop break; } - fseek($this->getid3->fp, $NextOffset, SEEK_SET); + $this->fseek($NextOffset); } $info['playtime_seconds'] = $Duration / 1000; @@ -288,16 +304,16 @@ class getid3_flv extends getid3_handler } if ($info['flv']['header']['hasAudio']) { - $info['audio']['codec'] = $this->FLVaudioFormat($info['flv']['audio']['audioFormat']); - $info['audio']['sample_rate'] = $this->FLVaudioRate($info['flv']['audio']['audioRate']); - $info['audio']['bits_per_sample'] = $this->FLVaudioBitDepth($info['flv']['audio']['audioSampleSize']); + $info['audio']['codec'] = self::audioFormatLookup($info['flv']['audio']['audioFormat']); + $info['audio']['sample_rate'] = self::audioRateLookup($info['flv']['audio']['audioRate']); + $info['audio']['bits_per_sample'] = self::audioBitDepthLookup($info['flv']['audio']['audioSampleSize']); $info['audio']['channels'] = $info['flv']['audio']['audioType'] + 1; // 0=mono,1=stereo $info['audio']['lossless'] = ($info['flv']['audio']['audioFormat'] ? false : true); // 0=uncompressed $info['audio']['dataformat'] = 'flv'; } if (!empty($info['flv']['header']['hasVideo'])) { - $info['video']['codec'] = $this->FLVvideoCodec($info['flv']['video']['videoCodec']); + $info['video']['codec'] = self::videoCodecLookup($info['flv']['video']['videoCodec']); $info['video']['dataformat'] = 'flv'; $info['video']['lossless'] = false; } @@ -308,17 +324,17 @@ class getid3_flv extends getid3_handler $info['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds']; } if (isset($info['flv']['meta']['onMetaData']['audiocodecid'])) { - $info['audio']['codec'] = $this->FLVaudioFormat($info['flv']['meta']['onMetaData']['audiocodecid']); + $info['audio']['codec'] = self::audioFormatLookup($info['flv']['meta']['onMetaData']['audiocodecid']); } if (isset($info['flv']['meta']['onMetaData']['videocodecid'])) { - $info['video']['codec'] = $this->FLVvideoCodec($info['flv']['meta']['onMetaData']['videocodecid']); + $info['video']['codec'] = self::videoCodecLookup($info['flv']['meta']['onMetaData']['videocodecid']); } return true; } - public function FLVaudioFormat($id) { - $FLVaudioFormat = array( + public static function audioFormatLookup($id) { + static $lookup = array( 0 => 'Linear PCM, platform endian', 1 => 'ADPCM', 2 => 'mp3', @@ -330,35 +346,35 @@ class getid3_flv extends getid3_handler 8 => 'G.711 mu-law logarithmic PCM', 9 => 'reserved', 10 => 'AAC', - 11 => false, // unknown? + 11 => 'Speex', 12 => false, // unknown? 13 => false, // unknown? 14 => 'mp3 8kHz', 15 => 'Device-specific sound', ); - return (isset($FLVaudioFormat[$id]) ? $FLVaudioFormat[$id] : false); + return (isset($lookup[$id]) ? $lookup[$id] : false); } - public function FLVaudioRate($id) { - $FLVaudioRate = array( + public static function audioRateLookup($id) { + static $lookup = array( 0 => 5500, 1 => 11025, 2 => 22050, 3 => 44100, ); - return (isset($FLVaudioRate[$id]) ? $FLVaudioRate[$id] : false); + return (isset($lookup[$id]) ? $lookup[$id] : false); } - public function FLVaudioBitDepth($id) { - $FLVaudioBitDepth = array( + public static function audioBitDepthLookup($id) { + static $lookup = array( 0 => 8, 1 => 16, ); - return (isset($FLVaudioBitDepth[$id]) ? $FLVaudioBitDepth[$id] : false); + return (isset($lookup[$id]) ? $lookup[$id] : false); } - public function FLVvideoCodec($id) { - $FLVvideoCodec = array( + public static function videoCodecLookup($id) { + static $lookup = array( GETID3_FLV_VIDEO_H263 => 'Sorenson H.263', GETID3_FLV_VIDEO_SCREEN => 'Screen video', GETID3_FLV_VIDEO_VP6FLV => 'On2 VP6', @@ -366,7 +382,7 @@ class getid3_flv extends getid3_handler GETID3_FLV_VIDEO_SCREENV2 => 'Screen video v2', GETID3_FLV_VIDEO_H264 => 'Sorenson H.264', ); - return (isset($FLVvideoCodec[$id]) ? $FLVvideoCodec[$id] : false); + return (isset($lookup[$id]) ? $lookup[$id] : false); } } @@ -374,7 +390,7 @@ class AMFStream { public $bytes; public $pos; - public function AMFStream(&$bytes) { + public function __construct(&$bytes) { $this->bytes =& $bytes; $this->pos = 0; } @@ -457,7 +473,7 @@ class AMFStream { class AMFReader { public $stream; - public function AMFReader(&$stream) { + public function __construct(&$stream) { $this->stream =& $stream; } @@ -619,60 +635,60 @@ class AVCSequenceParameterSetReader { public $width; public $height; - public function AVCSequenceParameterSetReader($sps) { + public function __construct($sps) { $this->sps = $sps; } public function readData() { $this->skipBits(8); $this->skipBits(8); - $profile = $this->getBits(8); // read profile - $this->skipBits(16); - $this->expGolombUe(); // read sps id - if (in_array($profile, array(H264_PROFILE_HIGH, H264_PROFILE_HIGH10, H264_PROFILE_HIGH422, H264_PROFILE_HIGH444, H264_PROFILE_HIGH444_PREDICTIVE))) { - if ($this->expGolombUe() == 3) { - $this->skipBits(1); - } - $this->expGolombUe(); - $this->expGolombUe(); - $this->skipBits(1); - if ($this->getBit()) { - for ($i = 0; $i < 8; $i++) { - if ($this->getBit()) { - $size = $i < 6 ? 16 : 64; - $lastScale = 8; - $nextScale = 8; - for ($j = 0; $j < $size; $j++) { - if ($nextScale != 0) { - $deltaScale = $this->expGolombUe(); - $nextScale = ($lastScale + $deltaScale + 256) % 256; - } - if ($nextScale != 0) { - $lastScale = $nextScale; - } - } - } + $profile = $this->getBits(8); // read profile + if ($profile > 0) { + $this->skipBits(8); + $level_idc = $this->getBits(8); // level_idc + $this->expGolombUe(); // seq_parameter_set_id // sps + $this->expGolombUe(); // log2_max_frame_num_minus4 + $picOrderType = $this->expGolombUe(); // pic_order_cnt_type + if ($picOrderType == 0) { + $this->expGolombUe(); // log2_max_pic_order_cnt_lsb_minus4 + } elseif ($picOrderType == 1) { + $this->skipBits(1); // delta_pic_order_always_zero_flag + $this->expGolombSe(); // offset_for_non_ref_pic + $this->expGolombSe(); // offset_for_top_to_bottom_field + $num_ref_frames_in_pic_order_cnt_cycle = $this->expGolombUe(); // num_ref_frames_in_pic_order_cnt_cycle + for ($i = 0; $i < $num_ref_frames_in_pic_order_cnt_cycle; $i++) { + $this->expGolombSe(); // offset_for_ref_frame[ i ] } } - } - $this->expGolombUe(); - $pocType = $this->expGolombUe(); - if ($pocType == 0) { - $this->expGolombUe(); - } elseif ($pocType == 1) { - $this->skipBits(1); - $this->expGolombSe(); - $this->expGolombSe(); - $pocCycleLength = $this->expGolombUe(); - for ($i = 0; $i < $pocCycleLength; $i++) { - $this->expGolombSe(); + $this->expGolombUe(); // num_ref_frames + $this->skipBits(1); // gaps_in_frame_num_value_allowed_flag + $pic_width_in_mbs_minus1 = $this->expGolombUe(); // pic_width_in_mbs_minus1 + $pic_height_in_map_units_minus1 = $this->expGolombUe(); // pic_height_in_map_units_minus1 + + $frame_mbs_only_flag = $this->getBits(1); // frame_mbs_only_flag + if ($frame_mbs_only_flag == 0) { + $this->skipBits(1); // mb_adaptive_frame_field_flag + } + $this->skipBits(1); // direct_8x8_inference_flag + $frame_cropping_flag = $this->getBits(1); // frame_cropping_flag + + $frame_crop_left_offset = 0; + $frame_crop_right_offset = 0; + $frame_crop_top_offset = 0; + $frame_crop_bottom_offset = 0; + + if ($frame_cropping_flag) { + $frame_crop_left_offset = $this->expGolombUe(); // frame_crop_left_offset + $frame_crop_right_offset = $this->expGolombUe(); // frame_crop_right_offset + $frame_crop_top_offset = $this->expGolombUe(); // frame_crop_top_offset + $frame_crop_bottom_offset = $this->expGolombUe(); // frame_crop_bottom_offset } + $this->skipBits(1); // vui_parameters_present_flag + // etc + + $this->width = (($pic_width_in_mbs_minus1 + 1) * 16) - ($frame_crop_left_offset * 2) - ($frame_crop_right_offset * 2); + $this->height = ((2 - $frame_mbs_only_flag) * ($pic_height_in_map_units_minus1 + 1) * 16) - ($frame_crop_top_offset * 2) - ($frame_crop_bottom_offset * 2); } - $this->expGolombUe(); - $this->skipBits(1); - $this->width = ($this->expGolombUe() + 1) * 16; - $heightMap = $this->expGolombUe() + 1; - $this->height = (2 - $this->getBit()) * $heightMap * 16; } public function skipBits($bits) { diff --git a/wp-includes/ID3/module.audio-video.matroska.php b/wp-includes/ID3/module.audio-video.matroska.php index fb0af72..f2cc5ac 100644 --- a/wp-includes/ID3/module.audio-video.matroska.php +++ b/wp-includes/ID3/module.audio-video.matroska.php @@ -3,6 +3,7 @@ /// getID3() by James Heinrich // // available at http://getid3.sourceforge.net // // or http://www.getid3.org // +// also https://github.com/JamesHeinrich/getID3 // ///////////////////////////////////////////////////////////////// // See readme.txt for more details // ///////////////////////////////////////////////////////////////// @@ -281,10 +282,8 @@ class getid3_matroska extends getid3_handler switch ($trackarray['CodecID']) { case 'V_MS/VFW/FOURCC': - if (!getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, false)) { - $this->warning('Unable to parse codec private data ['.basename(__FILE__).':'.__LINE__.'] because cannot include "module.audio-video.riff.php"'); - break; - } + getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, true); + $parsed = getid3_riff::ParseBITMAPINFOHEADER($trackarray['CodecPrivate']); $track_info['codec'] = getid3_riff::fourccLookup($parsed['fourcc']); $info['matroska']['track_codec_parsed'][$trackarray['TrackNumber']] = $parsed; @@ -335,10 +334,7 @@ class getid3_matroska extends getid3_handler case 'A_MPEG/L3': case 'A_MPEG/L2': case 'A_FLAC': - if (!getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.'.($track_info['dataformat'] == 'mp2' ? 'mp3' : $track_info['dataformat']).'.php', __FILE__, false)) { - $this->warning('Unable to parse audio data ['.basename(__FILE__).':'.__LINE__.'] because cannot include "module.audio.'.$track_info['dataformat'].'.php"'); - break; - } + getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.'.($track_info['dataformat'] == 'mp2' ? 'mp3' : $track_info['dataformat']).'.php', __FILE__, true); if (!isset($info['matroska']['track_data_offsets'][$trackarray['TrackNumber']])) { $this->warning('Unable to parse audio data ['.basename(__FILE__).':'.__LINE__.'] because $info[matroska][track_data_offsets]['.$trackarray['TrackNumber'].'] not set'); @@ -385,10 +381,6 @@ class getid3_matroska extends getid3_handler } if (!empty($getid3_temp->info['warning'])) { foreach ($getid3_temp->info['warning'] as $newerror) { - if ($track_info['dataformat'] == 'mp3' && preg_match('/^Probable truncated file: expecting \d+ bytes of audio data, only found \d+ $short by \d+ bytes$$/', $newerror)) { - // LAME/Xing header is probably set, but audio data is chunked into Matroska file and near-impossible to verify if audio stream is complete, so ignore useless warning - continue; - } $this->warning($class.'() says: ['.$newerror.']'); } } @@ -400,7 +392,7 @@ class getid3_matroska extends getid3_handler case 'A_AAC/MPEG2/LC/SBR': case 'A_AAC/MPEG4/LC': case 'A_AAC/MPEG4/LC/SBR': - $this->warning($trackarray['CodecID'].' audio data contains no header, audio/video bitrates can\'t be calculated'); + $this->warning($trackarray['CodecID'].' audio data contains no header, audio/video bitrates can\'t be calculated'); break; case 'A_VORBIS': @@ -415,10 +407,7 @@ class getid3_matroska extends getid3_handler } $vorbis_offset -= 1; - if (!getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.ogg.php', __FILE__, false)) { - $this->warning('Unable to parse audio data ['.basename(__FILE__).':'.__LINE__.'] because cannot include "module.audio.ogg.php"'); - break; - } + getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.ogg.php', __FILE__, true); // create temp instance $getid3_temp = new getID3(); @@ -455,10 +444,7 @@ class getid3_matroska extends getid3_handler break; case 'A_MS/ACM': - if (!getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, false)) { - $this->warning('Unable to parse audio data ['.basename(__FILE__).':'.__LINE__.'] because cannot include "module.audio-video.riff.php"'); - break; - } + getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, true); $parsed = getid3_riff::parseWAVEFORMATex($trackarray['CodecPrivate']); foreach ($parsed as $key => $value) { @@ -515,7 +501,6 @@ class getid3_matroska extends getid3_handler switch ($top_element['id']) { case EBML_ID_EBML: - $info['fileformat'] = 'matroska'; $info['matroska']['header']['offset'] = $top_element['offset']; $info['matroska']['header']['length'] = $top_element['length']; @@ -534,6 +519,7 @@ class getid3_matroska extends getid3_handler case EBML_ID_DOCTYPE: $element_data['data'] = getid3_lib::trimNullByte($element_data['data']); $info['matroska']['doctype'] = $element_data['data']; + $info['fileformat'] = $element_data['data']; break; default: @@ -1526,8 +1512,8 @@ class getid3_matroska extends getid3_handler $CodecIDlist['V_MPEG4/ISO/AVC'] = 'h264'; $CodecIDlist['V_MPEG4/ISO/SP'] = 'mpeg4'; $CodecIDlist['V_VP8'] = 'vp8'; - $CodecIDlist['V_MS/VFW/FOURCC'] = 'riff'; - $CodecIDlist['A_MS/ACM'] = 'riff'; + $CodecIDlist['V_MS/VFW/FOURCC'] = 'vcm'; // Microsoft (TM) Video Codec Manager (VCM) + $CodecIDlist['A_MS/ACM'] = 'acm'; // Microsoft (TM) Audio Codec Manager (ACM) } return (isset($CodecIDlist[$codecid]) ? $CodecIDlist[$codecid] : $codecid); } diff --git a/wp-includes/ID3/module.audio-video.quicktime.php b/wp-includes/ID3/module.audio-video.quicktime.php index 1b5ad5f..482c091 100644 --- a/wp-includes/ID3/module.audio-video.quicktime.php +++ b/wp-includes/ID3/module.audio-video.quicktime.php @@ -3,6 +3,7 @@ /// getID3() by James Heinrich // // available at http://getid3.sourceforge.net // // or http://www.getid3.org // +// also https://github.com/JamesHeinrich/getID3 // ///////////////////////////////////////////////////////////////// // See readme.txt for more details // ///////////////////////////////////////////////////////////////// @@ -30,25 +31,25 @@ class getid3_quicktime extends getid3_handler $info['quicktime']['hinting'] = false; $info['quicktime']['controller'] = 'standard'; // may be overridden if 'ctyp' atom is present - fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET); + $this->fseek($info['avdataoffset']); $offset = 0; $atomcounter = 0; - + $atom_data_read_buffer_size = ($info['php_memory_limit'] ? round($info['php_memory_limit'] / 2) : $this->getid3->option_fread_buffer_size * 1024); // allow [default: 32MB] if PHP configured with no memory_limit while ($offset < $info['avdataend']) { if (!getid3_lib::intValueSupported($offset)) { $info['error'][] = 'Unable to parse atom at offset '.$offset.' because beyond '.round(PHP_INT_MAX / 1073741824).'GB limit of PHP filesystem functions'; break; } - fseek($this->getid3->fp, $offset, SEEK_SET); - $AtomHeader = fread($this->getid3->fp, 8); + $this->fseek($offset); + $AtomHeader = $this->fread(8); $atomsize = getid3_lib::BigEndian2Int(substr($AtomHeader, 0, 4)); $atomname = substr($AtomHeader, 4, 4); // 64-bit MOV patch by jlegateÃktnc*com if ($atomsize == 1) { - $atomsize = getid3_lib::BigEndian2Int(fread($this->getid3->fp, 8)); + $atomsize = getid3_lib::BigEndian2Int($this->fread(8)); } $info['quicktime'][$atomname]['name'] = $atomname; @@ -66,58 +67,8 @@ class getid3_quicktime extends getid3_handler // to read user data atoms, you should allow for the terminating 0. break; } - switch ($atomname) { - case 'mdat': // Media DATa atom - // 'mdat' contains the actual data for the audio/video - if (($atomsize > 8) && (!isset($info['avdataend_tmp']) || ($info['quicktime'][$atomname]['size'] > ($info['avdataend_tmp'] - $info['avdataoffset'])))) { - - $info['avdataoffset'] = $info['quicktime'][$atomname]['offset'] + 8; - $OldAVDataEnd = $info['avdataend']; - $info['avdataend'] = $info['quicktime'][$atomname]['offset'] + $info['quicktime'][$atomname]['size']; - - $getid3_temp = new getID3(); - $getid3_temp->openfile($this->getid3->filename); - $getid3_temp->info['avdataoffset'] = $info['avdataoffset']; - $getid3_temp->info['avdataend'] = $info['avdataend']; - $getid3_mp3 = new getid3_mp3($getid3_temp); - if ($getid3_mp3->MPEGaudioHeaderValid($getid3_mp3->MPEGaudioHeaderDecode(fread($this->getid3->fp, 4)))) { - $getid3_mp3->getOnlyMPEGaudioInfo($getid3_temp->info['avdataoffset'], false); - if (!empty($getid3_temp->info['warning'])) { - foreach ($getid3_temp->info['warning'] as $value) { - $info['warning'][] = $value; - } - } - if (!empty($getid3_temp->info['mpeg'])) { - $info['mpeg'] = $getid3_temp->info['mpeg']; - if (isset($info['mpeg']['audio'])) { - $info['audio']['dataformat'] = 'mp3'; - $info['audio']['codec'] = (!empty($info['mpeg']['audio']['encoder']) ? $info['mpeg']['audio']['encoder'] : (!empty($info['mpeg']['audio']['codec']) ? $info['mpeg']['audio']['codec'] : (!empty($info['mpeg']['audio']['LAME']) ? 'LAME' :'mp3'))); - $info['audio']['sample_rate'] = $info['mpeg']['audio']['sample_rate']; - $info['audio']['channels'] = $info['mpeg']['audio']['channels']; - $info['audio']['bitrate'] = $info['mpeg']['audio']['bitrate']; - $info['audio']['bitrate_mode'] = strtolower($info['mpeg']['audio']['bitrate_mode']); - $info['bitrate'] = $info['audio']['bitrate']; - } - } - } - unset($getid3_mp3, $getid3_temp); - $info['avdataend'] = $OldAVDataEnd; - unset($OldAVDataEnd); - - } - break; - - case 'free': // FREE space atom - case 'skip': // SKIP atom - case 'wide': // 64-bit expansion placeholder atom - // 'free', 'skip' and 'wide' are just padding, contains no useful data at all - break; - - default: - $atomHierarchy = array(); - $info['quicktime'][$atomname] = $this->QuicktimeParseAtom($atomname, $atomsize, fread($this->getid3->fp, $atomsize), $offset, $atomHierarchy, $this->ParseAllPossibleAtoms); - break; - } + $atomHierarchy = array(); + $info['quicktime'][$atomname] = $this->QuicktimeParseAtom($atomname, $atomsize, $this->fread(min($atomsize, $atom_data_read_buffer_size)), $offset, $atomHierarchy, $this->ParseAllPossibleAtoms); $offset += $atomsize; $atomcounter++; @@ -172,15 +123,12 @@ class getid3_quicktime extends getid3_handler $info = &$this->getid3->info; - //$atom_parent = array_pop($atomHierarchy); - $atom_parent = end($atomHierarchy); // http://www.getid3.org/phpBB3/viewtopic.php?t=1717 + $atom_parent = end($atomHierarchy); // not array_pop($atomHierarchy); see http://www.getid3.org/phpBB3/viewtopic.php?t=1717 array_push($atomHierarchy, $atomname); $atom_structure['hierarchy'] = implode(' ', $atomHierarchy); $atom_structure['name'] = $atomname; $atom_structure['size'] = $atomsize; $atom_structure['offset'] = $baseoffset; -//echo getid3_lib::PrintHexBytes(substr($atom_data, 0, 8)).'
'; -//echo getid3_lib::PrintHexBytes(substr($atom_data, 0, 8), false).'

'; switch ($atomname) { case 'moov': // MOVie container atom case 'trak': // TRAcK container atom @@ -200,27 +148,27 @@ class getid3_quicktime extends getid3_handler break; case 'ilst': // Item LiST container atom - $atom_structure['subatoms'] = $this->QuicktimeParseContainerAtom($atom_data, $baseoffset + 8, $atomHierarchy, $ParseAllPossibleAtoms); - - // some "ilst" atoms contain data atoms that have a numeric name, and the data is far more accessible if the returned array is compacted - $allnumericnames = true; - foreach ($atom_structure['subatoms'] as $subatomarray) { - if (!is_integer($subatomarray['name']) || (count($subatomarray['subatoms']) != 1)) { - $allnumericnames = false; - break; - } - } - if ($allnumericnames) { - $newData = array(); + if ($atom_structure['subatoms'] = $this->QuicktimeParseContainerAtom($atom_data, $baseoffset + 8, $atomHierarchy, $ParseAllPossibleAtoms)) { + // some "ilst" atoms contain data atoms that have a numeric name, and the data is far more accessible if the returned array is compacted + $allnumericnames = true; foreach ($atom_structure['subatoms'] as $subatomarray) { - foreach ($subatomarray['subatoms'] as $newData_subatomarray) { - unset($newData_subatomarray['hierarchy'], $newData_subatomarray['name']); - $newData[$subatomarray['name']] = $newData_subatomarray; + if (!is_integer($subatomarray['name']) || (count($subatomarray['subatoms']) != 1)) { + $allnumericnames = false; break; } } - $atom_structure['data'] = $newData; - unset($atom_structure['subatoms']); + if ($allnumericnames) { + $newData = array(); + foreach ($atom_structure['subatoms'] as $subatomarray) { + foreach ($subatomarray['subatoms'] as $newData_subatomarray) { + unset($newData_subatomarray['hierarchy'], $newData_subatomarray['name']); + $newData[$subatomarray['name']] = $newData_subatomarray; + break; + } + } + $atom_structure['data'] = $newData; + unset($atom_structure['subatoms']); + } } break; @@ -308,46 +256,46 @@ class getid3_quicktime extends getid3_handler case 'geID': case 'plID': case 'sfID': // iTunes store country - case 'Â©alb': // ALBum - case 'Â©art': // ARTist - case 'Â©ART': - case 'Â©aut': - case 'Â©cmt': // CoMmenT - case 'Â©com': // COMposer - case 'Â©cpy': - case 'Â©day': // content created year - case 'Â©dir': - case 'Â©ed1': - case 'Â©ed2': - case 'Â©ed3': - case 'Â©ed4': - case 'Â©ed5': - case 'Â©ed6': - case 'Â©ed7': - case 'Â©ed8': - case 'Â©ed9': - case 'Â©enc': - case 'Â©fmt': - case 'Â©gen': // GENre - case 'Â©grp': // GRouPing - case 'Â©hst': - case 'Â©inf': - case 'Â©lyr': // LYRics - case 'Â©mak': - case 'Â©mod': - case 'Â©nam': // full NAMe - case 'Â©ope': - case 'Â©PRD': - case 'Â©prd': - case 'Â©prf': - case 'Â©req': - case 'Â©src': - case 'Â©swr': - case 'Â©too': // encoder - case 'Â©trk': // TRacK - case 'Â©url': - case 'Â©wrn': - case 'Â©wrt': // WRiTer + case "\xA9".'alb': // ALBum + case "\xA9".'art': // ARTist + case "\xA9".'ART': + case "\xA9".'aut': + case "\xA9".'cmt': // CoMmenT + case "\xA9".'com': // COMposer + case "\xA9".'cpy': + case "\xA9".'day': // content created year + case "\xA9".'dir': + case "\xA9".'ed1': + case "\xA9".'ed2': + case "\xA9".'ed3': + case "\xA9".'ed4': + case "\xA9".'ed5': + case "\xA9".'ed6': + case "\xA9".'ed7': + case "\xA9".'ed8': + case "\xA9".'ed9': + case "\xA9".'enc': + case "\xA9".'fmt': + case "\xA9".'gen': // GENre + case "\xA9".'grp': // GRouPing + case "\xA9".'hst': + case "\xA9".'inf': + case "\xA9".'lyr': // LYRics + case "\xA9".'mak': + case "\xA9".'mod': + case "\xA9".'nam': // full NAMe + case "\xA9".'ope': + case "\xA9".'PRD': + case "\xA9".'prd': + case "\xA9".'prf': + case "\xA9".'req': + case "\xA9".'src': + case "\xA9".'swr': + case "\xA9".'too': // encoder + case "\xA9".'trk': // TRacK + case "\xA9".'url': + case "\xA9".'wrn': + case "\xA9".'wrt': // WRiTer case '----': // itunes specific if ($atom_parent == 'udta') { // User data atom handler @@ -370,7 +318,7 @@ class getid3_quicktime extends getid3_handler $boxsmalltype = substr($atom_data, $atomoffset + 2, 2); $boxsmalldata = substr($atom_data, $atomoffset + 4, $boxsmallsize); if ($boxsmallsize <= 1) { - $info['warning'][] = 'Invalid QuickTime atom smallbox size "'.$boxsmallsize.'" in atom "'.$atomname.'" at offset: '.($atom_structure['offset'] + $atomoffset); + $info['warning'][] = 'Invalid QuickTime atom smallbox size "'.$boxsmallsize.'" in atom "'.preg_replace('#[^a-zA-Z0-9 _\\-]#', '?', $atomname).'" at offset: '.($atom_structure['offset'] + $atomoffset); $atom_structure['data'] = null; $atomoffset = strlen($atom_data); break; @@ -380,7 +328,7 @@ class getid3_quicktime extends getid3_handler $atom_structure['data'] = $boxsmalldata; break; default: - $info['warning'][] = 'Unknown QuickTime smallbox type: "'.getid3_lib::PrintHexBytes($boxsmalltype).'" at offset '.$baseoffset; + $info['warning'][] = 'Unknown QuickTime smallbox type: "'.preg_replace('#[^a-zA-Z0-9 _\\-]#', '?', $boxsmalltype).'" ('.trim(getid3_lib::PrintHexBytes($boxsmalltype)).') at offset '.$baseoffset; $atom_structure['data'] = $atom_data; break; } @@ -392,7 +340,7 @@ class getid3_quicktime extends getid3_handler $boxtype = substr($atom_data, $atomoffset + 4, 4); $boxdata = substr($atom_data, $atomoffset + 8, $boxsize - 8); if ($boxsize <= 1) { - $info['warning'][] = 'Invalid QuickTime atom box size "'.$boxsize.'" in atom "'.$atomname.'" at offset: '.($atom_structure['offset'] + $atomoffset); + $info['warning'][] = 'Invalid QuickTime atom box size "'.$boxsize.'" in atom "'.preg_replace('#[^a-zA-Z0-9 _\\-]#', '?', $atomname).'" at offset: '.($atom_structure['offset'] + $atomoffset); $atom_structure['data'] = null; $atomoffset = strlen($atom_data); break; @@ -409,7 +357,7 @@ class getid3_quicktime extends getid3_handler $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($boxdata, 0, 1)); $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($boxdata, 1, 3)); switch ($atom_structure['flags_raw']) { - case 0: // data flag + case 0: // data flag case 21: // tmpo/cpil flag switch ($atomname) { case 'cpil': @@ -460,17 +408,27 @@ class getid3_quicktime extends getid3_handler } break; - case 1: // text flag + case 1: // text flag case 13: // image flag default: $atom_structure['data'] = substr($boxdata, 8); + if ($atomname == 'covr') { + // not a foolproof check, but better than nothing + if (preg_match('#^\xFF\xD8\xFF#', $atom_structure['data'])) { + $atom_structure['image_mime'] = 'image/jpeg'; + } elseif (preg_match('#^\x89\x50\x4E\x47\x0D\x0A\x1A\x0A#', $atom_structure['data'])) { + $atom_structure['image_mime'] = 'image/png'; + } elseif (preg_match('#^GIF#', $atom_structure['data'])) { + $atom_structure['image_mime'] = 'image/gif'; + } + } break; } break; default: - $info['warning'][] = 'Unknown QuickTime box type: "'.getid3_lib::PrintHexBytes($boxtype).'" at offset '.$baseoffset; + $info['warning'][] = 'Unknown QuickTime box type: "'.preg_replace('#[^a-zA-Z0-9 _\\-]#', '?', $boxtype).'" ('.trim(getid3_lib::PrintHexBytes($boxtype)).') at offset '.$baseoffset; $atom_structure['data'] = $atom_data; } @@ -840,7 +798,12 @@ if (!empty($atom_structure['sample_description_table'][$i]['width']) && !empty($ $sttsEntriesDataOffset = 8; //$FrameRateCalculatorArray = array(); $frames_count = 0; - for ($i = 0; $i < $atom_structure['number_entries']; $i++) { + + $max_stts_entries_to_scan = ($info['php_memory_limit'] ? min(floor($this->getid3->memory_limit / 10000), $atom_structure['number_entries']) : $atom_structure['number_entries']); + if ($max_stts_entries_to_scan < $atom_structure['number_entries']) { + $info['warning'][] = 'QuickTime atom "stts" has '.$atom_structure['number_entries'].' but only scanning the first '.$max_stts_entries_to_scan.' entries due to limited PHP memory available ('.floor($atom_structure['number_entries'] / 1048576).'MB).'; + } + for ($i = 0; $i < $max_stts_entries_to_scan; $i++) { $atom_structure['time_to_sample_table'][$i]['sample_count'] = getid3_lib::BigEndian2Int(substr($atom_data, $sttsEntriesDataOffset, 4)); $sttsEntriesDataOffset += 4; $atom_structure['time_to_sample_table'][$i]['sample_duration'] = getid3_lib::BigEndian2Int(substr($atom_data, $sttsEntriesDataOffset, 4)); @@ -1086,8 +1049,8 @@ if (!empty($atom_structure['sample_description_table'][$i]['width']) && !empty($ case 'sync': // SYNChronization atom case 'scpt': // tranSCriPT atom case 'ssrc': // non-primary SouRCe atom - for ($i = 0; $i < (strlen($atom_data) % 4); $i++) { - $atom_structure['track_id'][$i] = getid3_lib::BigEndian2Int(substr($atom_data, $i * 4, 4)); + for ($i = 0; $i < strlen($atom_data); $i += 4) { + @$atom_structure['track_id'][] = getid3_lib::BigEndian2Int(substr($atom_data, $i, 4)); } break; @@ -1260,10 +1223,76 @@ if (!empty($atom_structure['sample_description_table'][$i]['width']) && !empty($ break; case 'mdat': // Media DATa atom + // 'mdat' contains the actual data for the audio/video, possibly also subtitles + +/* due to lack of known documentation, this is a kludge implementation. If you know of documentation on how mdat is properly structed, please send it to info@getid3.org */ + + // first, skip any 'wide' padding, and second 'mdat' header (with specified size of zero?) + $mdat_offset = 0; + while (true) { + if (substr($atom_data, $mdat_offset, 8) == "\x00\x00\x00\x08".'wide') { + $mdat_offset += 8; + } elseif (substr($atom_data, $mdat_offset, 8) == "\x00\x00\x00\x00".'mdat') { + $mdat_offset += 8; + } else { + break; + } + } + + // check to see if it looks like chapter titles, in the form of unterminated strings with a leading 16-bit size field + while (($chapter_string_length = getid3_lib::BigEndian2Int(substr($atom_data, $mdat_offset, 2))) + && ($chapter_string_length < 1000) + && ($chapter_string_length <= (strlen($atom_data) - $mdat_offset - 2)) + && preg_match('#^[\x20-\xFF]+$#', substr($atom_data, $mdat_offset + 2, $chapter_string_length), $chapter_matches)) { + $mdat_offset += (2 + $chapter_string_length); + @$info['quicktime']['comments']['chapters'][] = $chapter_matches[0]; + } + + + + if (($atomsize > 8) && (!isset($info['avdataend_tmp']) || ($info['quicktime'][$atomname]['size'] > ($info['avdataend_tmp'] - $info['avdataoffset'])))) { + + $info['avdataoffset'] = $atom_structure['offset'] + 8; // $info['quicktime'][$atomname]['offset'] + 8; + $OldAVDataEnd = $info['avdataend']; + $info['avdataend'] = $atom_structure['offset'] + $atom_structure['size']; // $info['quicktime'][$atomname]['offset'] + $info['quicktime'][$atomname]['size']; + + $getid3_temp = new getID3(); + $getid3_temp->openfile($this->getid3->filename); + $getid3_temp->info['avdataoffset'] = $info['avdataoffset']; + $getid3_temp->info['avdataend'] = $info['avdataend']; + $getid3_mp3 = new getid3_mp3($getid3_temp); + if ($getid3_mp3->MPEGaudioHeaderValid($getid3_mp3->MPEGaudioHeaderDecode($this->fread(4)))) { + $getid3_mp3->getOnlyMPEGaudioInfo($getid3_temp->info['avdataoffset'], false); + if (!empty($getid3_temp->info['warning'])) { + foreach ($getid3_temp->info['warning'] as $value) { + $info['warning'][] = $value; + } + } + if (!empty($getid3_temp->info['mpeg'])) { + $info['mpeg'] = $getid3_temp->info['mpeg']; + if (isset($info['mpeg']['audio'])) { + $info['audio']['dataformat'] = 'mp3'; + $info['audio']['codec'] = (!empty($info['mpeg']['audio']['encoder']) ? $info['mpeg']['audio']['encoder'] : (!empty($info['mpeg']['audio']['codec']) ? $info['mpeg']['audio']['codec'] : (!empty($info['mpeg']['audio']['LAME']) ? 'LAME' :'mp3'))); + $info['audio']['sample_rate'] = $info['mpeg']['audio']['sample_rate']; + $info['audio']['channels'] = $info['mpeg']['audio']['channels']; + $info['audio']['bitrate'] = $info['mpeg']['audio']['bitrate']; + $info['audio']['bitrate_mode'] = strtolower($info['mpeg']['audio']['bitrate_mode']); + $info['bitrate'] = $info['audio']['bitrate']; + } + } + } + unset($getid3_mp3, $getid3_temp); + $info['avdataend'] = $OldAVDataEnd; + unset($OldAVDataEnd); + + } + + unset($mdat_offset, $chapter_string_length, $chapter_matches); + break; + case 'free': // FREE space atom case 'skip': // SKIP atom case 'wide': // 64-bit expansion placeholder atom - // 'mdat' data is too big to deal with, contains no useful metadata // 'free', 'skip' and 'wide' are just padding, contains no useful data at all // When writing QuickTime files, it is sometimes necessary to update an atom's size. @@ -1329,7 +1358,7 @@ if (!empty($atom_structure['sample_description_table'][$i]['width']) && !empty($ //$atom_structure['data'] = $atom_data; break; - case 'Â©xyz': // GPS latitude+longitude+altitude + case "\xA9".'xyz': // GPS latitude+longitude+altitude $atom_structure['data'] = $atom_data; if (preg_match('#([\\+\\-][0-9\\.]+)([\\+\\-][0-9\\.]+)([\\+\\-][0-9\\.]+)?/$#i', $atom_data, $matches)) { @list($all, $latitude, $longitude, $altitude) = $matches; @@ -1358,23 +1387,19 @@ if (!empty($atom_structure['sample_description_table'][$i]['width']) && !empty($ $info['quicktime']['comments']['picture'][] = array('image_mime'=>$atom_structure['image_mime'], 'data'=>$atom_data, 'description'=>$atom_structure['description']); } break; - case 'NCHD': // MakerNoteVersion - // http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html - $atom_structure['data'] = $atom_data; - break; - case 'NCTG': // NikonTags - // http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html#NCTG + case 'NCTG': // Nikon - http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html#NCTG $atom_structure['data'] = $this->QuicktimeParseNikonNCTG($atom_data); break; - case 'NCDB': // NikonTags - // http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html + case 'NCHD': // Nikon:MakerNoteVersion - http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html + case 'NCDB': // Nikon - http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html + case 'CNCV': // Canon:CompressorVersion - http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Canon.html $atom_structure['data'] = $atom_data; break; case "\x00\x00\x00\x00": case 'meta': // METAdata atom // some kind of metacontainer, may contain a big data dump such as: - // mdta keys mdtacom.apple.quicktime.make (mdtacom.apple.quicktime.creationdate ,mdtacom.apple.quicktime.location.ISO6709 $mdtacom.apple.quicktime.software !mdtacom.apple.quicktime.model ilst data DEApple 0 (data DE2011-05-11T17:54:04+0200 2 *data DE+52.4936+013.3897+040.247/ data DE4.3.1 data DEiPhone 4 + // mdta keys \005 mdtacom.apple.quicktime.make (mdtacom.apple.quicktime.creationdate ,mdtacom.apple.quicktime.location.ISO6709 $mdtacom.apple.quicktime.software !mdtacom.apple.quicktime.model ilst \01D \001 \015data \001DE\010Apple 0 \002 (data \001DE\0102011-05-11T17:54:04+0200 2 \003 *data \001DE\010+52.4936+013.3897+040.247/ \01D \004 \015data \001DE\0104.3.1 \005 \018data \001DE\010iPhone 4 // http://www.geocities.com/xhelmboyx/quicktime/formats/qti-layout.txt $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1)); @@ -1391,7 +1416,7 @@ if (!empty($atom_structure['sample_description_table'][$i]['width']) && !empty($ break; default: - $info['warning'][] = 'Unknown QuickTime atom type: "'.$atomname.'" ('.trim(getid3_lib::PrintHexBytes($atomname)).') at offset '.$baseoffset; + $info['warning'][] = 'Unknown QuickTime atom type: "'.preg_replace('#[^a-zA-Z0-9 _\\-]#', '?', $atomname).'" ('.trim(getid3_lib::PrintHexBytes($atomname)).') at offset '.$baseoffset; $atom_structure['data'] = $atom_data; break; } @@ -2086,58 +2111,58 @@ echo 'QuicktimeParseNikonNCTG()::unknown $data_size_type: '.$data_size_type.'
// // available at http://getid3.sourceforge.net // // or http://www.getid3.org // +// also https://github.com/JamesHeinrich/getID3 // ///////////////////////////////////////////////////////////////// // See readme.txt for more details // ///////////////////////////////////////////////////////////////// @@ -26,8 +27,9 @@ getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.mp3.php', __FILE_ getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.ac3.php', __FILE__, true); getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.dts.php', __FILE__, true); -class getid3_riff extends getid3_handler -{ +class getid3_riff extends getid3_handler { + + protected $container = 'riff'; // default public function Analyze() { $info = &$this->getid3->info; @@ -58,7 +60,8 @@ class getid3_riff extends getid3_handler switch ($RIFFtype) { case 'FORM': // AIFF, AIFC - $info['fileformat'] = 'aiff'; + //$info['fileformat'] = 'aiff'; + $this->container = 'aiff'; $thisfile_riff['header_size'] = $this->EitherEndian2Int($RIFFsize); $thisfile_riff[$RIFFsubtype] = $this->ParseRIFF($offset, ($offset + $thisfile_riff['header_size'] - 4)); break; @@ -66,13 +69,18 @@ class getid3_riff extends getid3_handler case 'RIFF': // AVI, WAV, etc case 'SDSS': // SDSS is identical to RIFF, just renamed. Used by SmartSound QuickTracks (www.smartsound.com) case 'RMP3': // RMP3 is identical to RIFF, just renamed. Used by [unknown program] when creating RIFF-MP3s - $info['fileformat'] = 'riff'; + //$info['fileformat'] = 'riff'; + $this->container = 'riff'; $thisfile_riff['header_size'] = $this->EitherEndian2Int($RIFFsize); if ($RIFFsubtype == 'RMP3') { // RMP3 is identical to WAVE, just renamed. Used by [unknown program] when creating RIFF-MP3s $RIFFsubtype = 'WAVE'; } - $thisfile_riff[$RIFFsubtype] = $this->ParseRIFF($offset, ($offset + $thisfile_riff['header_size'] - 4)); + if ($RIFFsubtype != 'AMV ') { + // AMV files are RIFF-AVI files with parts of the spec deliberately broken, such as chunk size fields hardcoded to zero (because players known in hardware that these fields are always a certain size + // Handled separately in ParseRIFFAMV() + $thisfile_riff[$RIFFsubtype] = $this->ParseRIFF($offset, ($offset + $thisfile_riff['header_size'] - 4)); + } if (($info['avdataend'] - $info['filesize']) == 1) { // LiteWave appears to incorrectly *not* pad actual output file // to nearest WORD boundary so may appear to be short by one @@ -110,16 +118,19 @@ class getid3_riff extends getid3_handler $nextRIFFoffset = $chunkdata['offset'] + $chunkdata['size']; switch ($nextRIFFheaderID) { - case 'RIFF': $chunkdata['chunks'] = $this->ParseRIFF($chunkdata['offset'] + 4, $nextRIFFoffset); - if (!isset($thisfile_riff[$nextRIFFtype])) { $thisfile_riff[$nextRIFFtype] = array(); } $thisfile_riff[$nextRIFFtype][] = $chunkdata; break; + case 'AMV ': + unset($info['riff']); + $info['amv'] = $this->ParseRIFFAMV($chunkdata['offset'] + 4, $nextRIFFoffset); + break; + case 'JUNK': // ignore $thisfile_riff[$nextRIFFheaderID][] = $chunkdata; @@ -152,13 +163,17 @@ class getid3_riff extends getid3_handler default: $this->error('Cannot parse RIFF (this is maybe not a RIFF / WAV / AVI file?) - expecting "FORM|RIFF|SDSS|RMP3" found "'.$RIFFsubtype.'" instead'); - unset($info['fileformat']); + //unset($info['fileformat']); return false; } $streamindex = 0; switch ($RIFFsubtype) { + + // http://en.wikipedia.org/wiki/Wav case 'WAVE': + $info['fileformat'] = 'wav'; + if (empty($thisfile_audio['bitrate_mode'])) { $thisfile_audio['bitrate_mode'] = 'cbr'; } @@ -588,10 +603,13 @@ class getid3_riff extends getid3_handler } break; + // http://en.wikipedia.org/wiki/Audio_Video_Interleave case 'AVI ': + $info['fileformat'] = 'avi'; + $info['mime_type'] = 'video/avi'; + $thisfile_video['bitrate_mode'] = 'vbr'; // maybe not, but probably $thisfile_video['dataformat'] = 'avi'; - $info['mime_type'] = 'video/avi'; if (isset($thisfile_riff[$RIFFsubtype]['movi']['offset'])) { $info['avdataoffset'] = $thisfile_riff[$RIFFsubtype]['movi']['offset'] + 8; @@ -825,7 +843,7 @@ class getid3_riff extends getid3_handler switch ($strhfccType) { case 'vids': - $thisfile_riff_raw_strf_strhfccType_streamindex = self::ParseBITMAPINFOHEADER(substr($strfData, 0, 40), ($info['fileformat'] == 'riff')); + $thisfile_riff_raw_strf_strhfccType_streamindex = self::ParseBITMAPINFOHEADER(substr($strfData, 0, 40), ($this->container == 'riff')); $thisfile_video['bits_per_sample'] = $thisfile_riff_raw_strf_strhfccType_streamindex['biBitCount']; if ($thisfile_riff_video_current['codec'] == 'DV') { @@ -875,11 +893,28 @@ class getid3_riff extends getid3_handler } break; + + case 'AMV ': + $info['fileformat'] = 'amv'; + $info['mime_type'] = 'video/amv'; + + $thisfile_video['bitrate_mode'] = 'vbr'; // it's MJPEG, presumably contant-quality encoding, thereby VBR + $thisfile_video['dataformat'] = 'mjpeg'; + $thisfile_video['codec'] = 'mjpeg'; + $thisfile_video['lossless'] = false; + $thisfile_video['bits_per_sample'] = 24; + + $thisfile_audio['dataformat'] = 'adpcm'; + $thisfile_audio['lossless'] = false; + break; + + + // http://en.wikipedia.org/wiki/CD-DA case 'CDDA': - $thisfile_audio['bitrate_mode'] = 'cbr'; + $info['fileformat'] = 'cda'; + unset($info['mime_type']); + $thisfile_audio_dataformat = 'cda'; - $thisfile_audio['lossless'] = true; - unset($info['mime_type']); $info['avdataoffset'] = 44; @@ -901,6 +936,7 @@ class getid3_riff extends getid3_handler $info['playtime_seconds'] = $thisfile_riff_CDDA_fmt_0['playtime_seconds']; // hardcoded data for CD-audio + $thisfile_audio['lossless'] = true; $thisfile_audio['sample_rate'] = 44100; $thisfile_audio['channels'] = 2; $thisfile_audio['bits_per_sample'] = 16; @@ -909,13 +945,15 @@ class getid3_riff extends getid3_handler } break; - + // http://en.wikipedia.org/wiki/AIFF case 'AIFF': case 'AIFC': + $info['fileformat'] = 'aiff'; + $info['mime_type'] = 'audio/x-aiff'; + $thisfile_audio['bitrate_mode'] = 'cbr'; $thisfile_audio_dataformat = 'aiff'; $thisfile_audio['lossless'] = true; - $info['mime_type'] = 'audio/x-aiff'; if (isset($thisfile_riff[$RIFFsubtype]['SSND'][0]['offset'])) { $info['avdataoffset'] = $thisfile_riff[$RIFFsubtype]['SSND'][0]['offset'] + 8; @@ -1028,12 +1066,15 @@ class getid3_riff extends getid3_handler */ break; + // http://en.wikipedia.org/wiki/8SVX case '8SVX': + $info['fileformat'] = '8svx'; + $info['mime_type'] = 'audio/8svx'; + $thisfile_audio['bitrate_mode'] = 'cbr'; $thisfile_audio_dataformat = '8svx'; $thisfile_audio['bits_per_sample'] = 8; $thisfile_audio['channels'] = 1; // overridden below, if need be - $info['mime_type'] = 'audio/x-aiff'; if (isset($thisfile_riff[$RIFFsubtype]['BODY'][0]['offset'])) { $info['avdataoffset'] = $thisfile_riff[$RIFFsubtype]['BODY'][0]['offset'] + 8; @@ -1108,31 +1149,31 @@ class getid3_riff extends getid3_handler } break; - case 'CDXA': - $info['mime_type'] = 'video/mpeg'; + $info['fileformat'] = 'vcd'; // Asume Video CD + $info['mime_type'] = 'video/mpeg'; + if (!empty($thisfile_riff['CDXA']['data'][0]['size'])) { - if (getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.mpeg.php', __FILE__, false)) { - $getid3_temp = new getID3(); - $getid3_temp->openfile($this->getid3->filename); - $getid3_mpeg = new getid3_mpeg($getid3_temp); - $getid3_mpeg->Analyze(); - if (empty($getid3_temp->info['error'])) { - $info['audio'] = $getid3_temp->info['audio']; - $info['video'] = $getid3_temp->info['video']; - $info['mpeg'] = $getid3_temp->info['mpeg']; - $info['warning'] = $getid3_temp->info['warning']; - } - unset($getid3_temp, $getid3_mpeg); + getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.mpeg.php', __FILE__, true); + + $getid3_temp = new getID3(); + $getid3_temp->openfile($this->getid3->filename); + $getid3_mpeg = new getid3_mpeg($getid3_temp); + $getid3_mpeg->Analyze(); + if (empty($getid3_temp->info['error'])) { + $info['audio'] = $getid3_temp->info['audio']; + $info['video'] = $getid3_temp->info['video']; + $info['mpeg'] = $getid3_temp->info['mpeg']; + $info['warning'] = $getid3_temp->info['warning']; } + unset($getid3_temp, $getid3_mpeg); } break; default: $info['error'][] = 'Unknown RIFF type: expecting one of (WAVE|RMP3|AVI |CDDA|AIFF|AIFC|8SVX|CDXA), found "'.$RIFFsubtype.'" instead'; - unset($info['fileformat']); - break; + //unset($info['fileformat']); } switch ($RIFFsubtype) { @@ -1150,6 +1191,7 @@ class getid3_riff extends getid3_handler if (isset($thisfile_riff[$RIFFsubtype]['id3 '])) { getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v2.php', __FILE__, true); + $getid3_temp = new getID3(); $getid3_temp->openfile($this->getid3->filename); $getid3_id3v2 = new getid3_id3v2($getid3_temp); @@ -1278,6 +1320,115 @@ class getid3_riff extends getid3_handler return true; } + public function ParseRIFFAMV($startoffset, $maxoffset) { + // AMV files are RIFF-AVI files with parts of the spec deliberately broken, such as chunk size fields hardcoded to zero (because players known in hardware that these fields are always a certain size + + // https://code.google.com/p/amv-codec-tools/wiki/AmvDocumentation + //typedef struct _amvmainheader { + //FOURCC fcc; // 'amvh' + //DWORD cb; + //DWORD dwMicroSecPerFrame; + //BYTE reserve[28]; + //DWORD dwWidth; + //DWORD dwHeight; + //DWORD dwSpeed; + //DWORD reserve0; + //DWORD reserve1; + //BYTE bTimeSec; + //BYTE bTimeMin; + //WORD wTimeHour; + //} AMVMAINHEADER; + + $info = &$this->getid3->info; + $RIFFchunk = false; + + try { + + $this->fseek($startoffset); + $maxoffset = min($maxoffset, $info['avdataend']); + $AMVheader = $this->fread(284); + if (substr($AMVheader, 0, 8) != 'hdrlamvh') { + throw new Exception('expecting "hdrlamv" at offset '.($startoffset + 0).', found "'.substr($AMVheader, 0, 8).'"'); + } + if (substr($AMVheader, 8, 4) != "\x38\x00\x00\x00") { // "amvh" chunk size, hardcoded to 0x38 = 56 bytes + throw new Exception('expecting "0x38000000" at offset '.($startoffset + 8).', found "'.getid3_lib::PrintHexBytes(substr($AMVheader, 8, 4)).'"'); + } + $RIFFchunk = array(); + $RIFFchunk['amvh']['us_per_frame'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 12, 4)); + $RIFFchunk['amvh']['reserved28'] = substr($AMVheader, 16, 28); // null? reserved? + $RIFFchunk['amvh']['resolution_x'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 44, 4)); + $RIFFchunk['amvh']['resolution_y'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 48, 4)); + $RIFFchunk['amvh']['frame_rate_int'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 52, 4)); + $RIFFchunk['amvh']['reserved0'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 56, 4)); // 1? reserved? + $RIFFchunk['amvh']['reserved1'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 60, 4)); // 0? reserved? + $RIFFchunk['amvh']['runtime_sec'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 64, 1)); + $RIFFchunk['amvh']['runtime_min'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 65, 1)); + $RIFFchunk['amvh']['runtime_hrs'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 66, 2)); + + $info['video']['frame_rate'] = 1000000 / $RIFFchunk['amvh']['us_per_frame']; + $info['video']['resolution_x'] = $RIFFchunk['amvh']['resolution_x']; + $info['video']['resolution_y'] = $RIFFchunk['amvh']['resolution_y']; + $info['playtime_seconds'] = ($RIFFchunk['amvh']['runtime_hrs'] * 3600) + ($RIFFchunk['amvh']['runtime_min'] * 60) + $RIFFchunk['amvh']['runtime_sec']; + + // the rest is all hardcoded(?) and does not appear to be useful until you get to audio info at offset 256, even then everything is probably hardcoded + + if (substr($AMVheader, 68, 20) != 'LIST'."\x00\x00\x00\x00".'strlstrh'."\x38\x00\x00\x00") { + throw new Exception('expecting "LIST<0x00000000>strlstrh<0x38000000>" at offset '.($startoffset + 68).', found "'.getid3_lib::PrintHexBytes(substr($AMVheader, 68, 20)).'"'); + } + // followed by 56 bytes of null: substr($AMVheader, 88, 56) -> 144 + if (substr($AMVheader, 144, 8) != 'strf'."\x24\x00\x00\x00") { + throw new Exception('expecting "strf<0x24000000>" at offset '.($startoffset + 144).', found "'.getid3_lib::PrintHexBytes(substr($AMVheader, 144, 8)).'"'); + } + // followed by 36 bytes of null: substr($AMVheader, 144, 36) -> 180 + + if (substr($AMVheader, 188, 20) != 'LIST'."\x00\x00\x00\x00".'strlstrh'."\x30\x00\x00\x00") { + throw new Exception('expecting "LIST<0x00000000>strlstrh<0x30000000>" at offset '.($startoffset + 188).', found "'.getid3_lib::PrintHexBytes(substr($AMVheader, 188, 20)).'"'); + } + // followed by 48 bytes of null: substr($AMVheader, 208, 48) -> 256 + if (substr($AMVheader, 256, 8) != 'strf'."\x14\x00\x00\x00") { + throw new Exception('expecting "strf<0x14000000>" at offset '.($startoffset + 256).', found "'.getid3_lib::PrintHexBytes(substr($AMVheader, 256, 8)).'"'); + } + // followed by 20 bytes of a modified WAVEFORMATEX: + // typedef struct { + // WORD wFormatTag; //(Fixme: this is equal to PCM's 0x01 format code) + // WORD nChannels; //(Fixme: this is always 1) + // DWORD nSamplesPerSec; //(Fixme: for all known sample files this is equal to 22050) + // DWORD nAvgBytesPerSec; //(Fixme: for all known sample files this is equal to 44100) + // WORD nBlockAlign; //(Fixme: this seems to be 2 in AMV files, is this correct ?) + // WORD wBitsPerSample; //(Fixme: this seems to be 16 in AMV files instead of the expected 4) + // WORD cbSize; //(Fixme: this seems to be 0 in AMV files) + // WORD reserved; + // } WAVEFORMATEX; + $RIFFchunk['strf']['wformattag'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 264, 2)); + $RIFFchunk['strf']['nchannels'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 266, 2)); + $RIFFchunk['strf']['nsamplespersec'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 268, 4)); + $RIFFchunk['strf']['navgbytespersec'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 272, 4)); + $RIFFchunk['strf']['nblockalign'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 276, 2)); + $RIFFchunk['strf']['wbitspersample'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 278, 2)); + $RIFFchunk['strf']['cbsize'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 280, 2)); + $RIFFchunk['strf']['reserved'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 282, 2)); + + + $info['audio']['lossless'] = false; + $info['audio']['sample_rate'] = $RIFFchunk['strf']['nsamplespersec']; + $info['audio']['channels'] = $RIFFchunk['strf']['nchannels']; + $info['audio']['bits_per_sample'] = $RIFFchunk['strf']['wbitspersample']; + $info['audio']['bitrate'] = $info['audio']['sample_rate'] * $info['audio']['channels'] * $info['audio']['bits_per_sample']; + $info['audio']['bitrate_mode'] = 'cbr'; + + + } catch (getid3_exception $e) { + if ($e->getCode() == 10) { + $this->warning('RIFFAMV parser: '.$e->getMessage()); + } else { + throw $e; + } + } + + return $RIFFchunk; + } + + public function ParseRIFF($startoffset, $maxoffset) { $info = &$this->getid3->info; @@ -1329,7 +1480,7 @@ class getid3_riff extends getid3_handler $getid3_temp->openfile($this->getid3->filename); $getid3_temp->info['avdataoffset'] = $this->ftell() - 4; $getid3_temp->info['avdataend'] = $this->ftell() + $AudioChunkSize; - $getid3_mp3 = new getid3_mp3($getid3_temp); + $getid3_mp3 = new getid3_mp3($getid3_temp, __CLASS__); $getid3_mp3->getOnlyMPEGaudioInfo($getid3_temp->info['avdataoffset'], false); if (isset($getid3_temp->info['mpeg']['audio'])) { $info['mpeg']['audio'] = $getid3_temp->info['mpeg']['audio']; @@ -1412,7 +1563,7 @@ class getid3_riff extends getid3_handler $getid3_temp->openfile($this->getid3->filename); $getid3_temp->info['avdataoffset'] = $info['avdataoffset']; $getid3_temp->info['avdataend'] = $info['avdataend']; - $getid3_mp3 = new getid3_mp3($getid3_temp); + $getid3_mp3 = new getid3_mp3($getid3_temp, __CLASS__); $getid3_mp3->getOnlyMPEGaudioInfo($info['avdataoffset'], false); if (empty($getid3_temp->info['error'])) { $info['audio'] = $getid3_temp->info['audio']; @@ -2426,10 +2577,10 @@ class getid3_riff extends getid3_handler } private function EitherEndian2Int($byteword, $signed=false) { - if ($this->getid3->info['fileformat'] == 'riff') { + if ($this->container == 'riff') { return getid3_lib::LittleEndian2Int($byteword, $signed); } return getid3_lib::BigEndian2Int($byteword, false, $signed); } -} +} \ No newline at end of file diff --git a/wp-includes/ID3/module.audio.ac3.php b/wp-includes/ID3/module.audio.ac3.php index 9834feb..2dc52f4 100644 --- a/wp-includes/ID3/module.audio.ac3.php +++ b/wp-includes/ID3/module.audio.ac3.php @@ -3,6 +3,7 @@ /// getID3() by James Heinrich // // available at http://getid3.sourceforge.net // // or http://www.getid3.org // +// also https://github.com/JamesHeinrich/getID3 // ///////////////////////////////////////////////////////////////// // See readme.txt for more details // ///////////////////////////////////////////////////////////////// diff --git a/wp-includes/ID3/module.audio.dts.php b/wp-includes/ID3/module.audio.dts.php index 79982cc..bdc78f0 100644 --- a/wp-includes/ID3/module.audio.dts.php +++ b/wp-includes/ID3/module.audio.dts.php @@ -3,6 +3,7 @@ /// getID3() by James Heinrich // // available at http://getid3.sourceforge.net // // or http://www.getid3.org // +// also https://github.com/JamesHeinrich/getID3 // ///////////////////////////////////////////////////////////////// // See readme.txt for more details // ///////////////////////////////////////////////////////////////// diff --git a/wp-includes/ID3/module.audio.flac.php b/wp-includes/ID3/module.audio.flac.php index 6b9598c..348cce3 100644 --- a/wp-includes/ID3/module.audio.flac.php +++ b/wp-includes/ID3/module.audio.flac.php @@ -3,6 +3,7 @@ /// getID3() by James Heinrich // // available at http://getid3.sourceforge.net // // or http://www.getid3.org // +// also https://github.com/JamesHeinrich/getID3 // ///////////////////////////////////////////////////////////////// // See readme.txt for more details // ///////////////////////////////////////////////////////////////// @@ -134,7 +135,17 @@ class getid3_flac extends getid3_handler if (isset($info['flac']['PICTURE']) && ($this->getid3->option_save_attachments !== getID3::ATTACHMENTS_NONE)) { foreach ($info['flac']['PICTURE'] as $entry) { if (!empty($entry['data'])) { - $info['flac']['comments']['picture'][] = array('image_mime'=>$entry['image_mime'], 'data'=>$entry['data']); + if (!isset($info['flac']['comments']['picture'])) { + $info['flac']['comments']['picture'] = array(); + } + $comments_picture_data = array(); + foreach (array('data', 'image_mime', 'image_width', 'image_height', 'imagetype', 'picturetype', 'description', 'datalength') as $picture_key) { + if (isset($entry[$picture_key])) { + $comments_picture_data[$picture_key] = $entry[$picture_key]; + } + } + $info['flac']['comments']['picture'][] = $comments_picture_data; + unset($comments_picture_data); } } } @@ -342,25 +353,25 @@ class getid3_flac extends getid3_handler $info = &$this->getid3->info; $picture['typeid'] = getid3_lib::BigEndian2Int($this->fread(4)); - $picture['type'] = self::pictureTypeLookup($picture['typeid']); + $picture['picturetype'] = self::pictureTypeLookup($picture['typeid']); $picture['image_mime'] = $this->fread(getid3_lib::BigEndian2Int($this->fread(4))); $descr_length = getid3_lib::BigEndian2Int($this->fread(4)); if ($descr_length) { $picture['description'] = $this->fread($descr_length); } - $picture['width'] = getid3_lib::BigEndian2Int($this->fread(4)); - $picture['height'] = getid3_lib::BigEndian2Int($this->fread(4)); + $picture['image_width'] = getid3_lib::BigEndian2Int($this->fread(4)); + $picture['image_height'] = getid3_lib::BigEndian2Int($this->fread(4)); $picture['color_depth'] = getid3_lib::BigEndian2Int($this->fread(4)); $picture['colors_indexed'] = getid3_lib::BigEndian2Int($this->fread(4)); - $data_length = getid3_lib::BigEndian2Int($this->fread(4)); + $picture['datalength'] = getid3_lib::BigEndian2Int($this->fread(4)); if ($picture['image_mime'] == '-->') { - $picture['data'] = $this->fread($data_length); + $picture['data'] = $this->fread($picture['datalength']); } else { $picture['data'] = $this->saveAttachment( - str_replace('/', '_', $picture['type']).'_'.$this->ftell(), + str_replace('/', '_', $picture['picturetype']).'_'.$this->ftell(), $this->ftell(), - $data_length, + $picture['datalength'], $picture['image_mime']); } diff --git a/wp-includes/ID3/module.audio.mp3.php b/wp-includes/ID3/module.audio.mp3.php index e6ffea9..329f7a6 100644 --- a/wp-includes/ID3/module.audio.mp3.php +++ b/wp-includes/ID3/module.audio.mp3.php @@ -3,6 +3,7 @@ /// getID3() by James Heinrich // // available at http://getid3.sourceforge.net // // or http://www.getid3.org // +// also https://github.com/JamesHeinrich/getID3 // ///////////////////////////////////////////////////////////////// // See readme.txt for more details // ///////////////////////////////////////////////////////////////// @@ -95,8 +96,8 @@ class getid3_mp3 extends getid3_handler // Not sure what version of LAME this is - look in padding of last frame for longer version string $PossibleLAMEversionStringOffset = $info['avdataend'] - $PossiblyLongerLAMEversion_FrameLength; - fseek($this->getid3->fp, $PossibleLAMEversionStringOffset); - $PossiblyLongerLAMEversion_Data = fread($this->getid3->fp, $PossiblyLongerLAMEversion_FrameLength); + $this->fseek($PossibleLAMEversionStringOffset); + $PossiblyLongerLAMEversion_Data = $this->fread($PossiblyLongerLAMEversion_FrameLength); switch (substr($CurrentDataLAMEversionString, -1)) { case 'a': case 'b': @@ -422,12 +423,12 @@ class getid3_mp3 extends getid3_handler $MPEGaudioEmphasisLookup = self::MPEGaudioEmphasisArray(); } - if (fseek($this->getid3->fp, $offset, SEEK_SET) != 0) { + if ($this->fseek($offset) != 0) { $info['error'][] = 'decodeMPEGaudioHeader() failed to seek to next offset at '.$offset; return false; } - //$headerstring = fread($this->getid3->fp, 1441); // worst-case max length = 32kHz @ 320kbps layer 3 = 1441 bytes/frame - $headerstring = fread($this->getid3->fp, 226); // LAME header at offset 36 + 190 bytes of Xing/LAME data + //$headerstring = $this->fread(1441); // worst-case max length = 32kHz @ 320kbps layer 3 = 1441 bytes/frame + $headerstring = $this->fread(226); // LAME header at offset 36 + 190 bytes of Xing/LAME data // MP3 audio frame structure: // $aa $aa $aa $aa [$bb $bb] $cc... @@ -890,19 +891,21 @@ class getid3_mp3 extends getid3_handler if (($ExpectedNumberOfAudioBytes > 0) && ($ExpectedNumberOfAudioBytes != ($info['avdataend'] - $info['avdataoffset']))) { if ($ExpectedNumberOfAudioBytes > ($info['avdataend'] - $info['avdataoffset'])) { - if (isset($info['fileformat']) && ($info['fileformat'] == 'riff')) { + if ($this->isDependencyFor('matroska') || $this->isDependencyFor('riff')) { // ignore, audio data is broken into chunks so will always be data "missing" - } elseif (($ExpectedNumberOfAudioBytes - ($info['avdataend'] - $info['avdataoffset'])) == 1) { - $info['warning'][] = 'Last byte of data truncated (this is a known bug in Meracl ID3 Tag Writer before v1.3.5)'; - } else { - $info['warning'][] = 'Probable truncated file: expecting '.$ExpectedNumberOfAudioBytes.' bytes of audio data, only found '.($info['avdataend'] - $info['avdataoffset']).' (short by '.($ExpectedNumberOfAudioBytes - ($info['avdataend'] - $info['avdataoffset'])).' bytes)'; + } + elseif (($ExpectedNumberOfAudioBytes - ($info['avdataend'] - $info['avdataoffset'])) == 1) { + $this->warning('Last byte of data truncated (this is a known bug in Meracl ID3 Tag Writer before v1.3.5)'); + } + else { + $this->warning('Probable truncated file: expecting '.$ExpectedNumberOfAudioBytes.' bytes of audio data, only found '.($info['avdataend'] - $info['avdataoffset']).' (short by '.($ExpectedNumberOfAudioBytes - ($info['avdataend'] - $info['avdataoffset'])).' bytes)'); } } else { if ((($info['avdataend'] - $info['avdataoffset']) - $ExpectedNumberOfAudioBytes) == 1) { - // $prenullbytefileoffset = ftell($this->getid3->fp); - // fseek($this->getid3->fp, $info['avdataend'], SEEK_SET); - // $PossibleNullByte = fread($this->getid3->fp, 1); - // fseek($this->getid3->fp, $prenullbytefileoffset, SEEK_SET); + // $prenullbytefileoffset = $this->ftell(); + // $this->fseek($info['avdataend']); + // $PossibleNullByte = $this->fread(1); + // $this->fseek($prenullbytefileoffset); // if ($PossibleNullByte === "\x00") { $info['avdataend']--; // $info['warning'][] = 'Extra null byte at end of MP3 data assumed to be RIFF padding and therefore ignored'; @@ -1118,8 +1121,8 @@ class getid3_mp3 extends getid3_handler public function FreeFormatFrameLength($offset, $deepscan=false) { $info = &$this->getid3->info; - fseek($this->getid3->fp, $offset, SEEK_SET); - $MPEGaudioData = fread($this->getid3->fp, 32768); + $this->fseek($offset); + $MPEGaudioData = $this->fread(32768); $SyncPattern1 = substr($MPEGaudioData, 0, 4); // may be different pattern due to padding @@ -1166,8 +1169,8 @@ class getid3_mp3 extends getid3_handler $ActualFrameLengthValues = array(); $nextoffset = $offset + $framelength; while ($nextoffset < ($info['avdataend'] - 6)) { - fseek($this->getid3->fp, $nextoffset - 1, SEEK_SET); - $NextSyncPattern = fread($this->getid3->fp, 6); + $this->fseek($nextoffset - 1); + $NextSyncPattern = $this->fread(6); if ((substr($NextSyncPattern, 1, strlen($SyncPattern1)) == $SyncPattern1) || (substr($NextSyncPattern, 1, strlen($SyncPattern2)) == $SyncPattern2)) { // good - found where expected $ActualFrameLengthValues[] = $framelength; @@ -1215,22 +1218,22 @@ class getid3_mp3 extends getid3_handler $Distribution['padding'] = array(); $info = &$this->getid3->info; - fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET); + $this->fseek($info['avdataoffset']); $max_frames_scan = 5000; $frames_scanned = 0; $previousvalidframe = $info['avdataoffset']; - while (ftell($this->getid3->fp) < $info['avdataend']) { + while ($this->ftell() < $info['avdataend']) { set_time_limit(30); - $head4 = fread($this->getid3->fp, 4); + $head4 = $this->fread(4); if (strlen($head4) < 4) { break; } if ($head4{0} != "\xFF") { for ($i = 1; $i < 4; $i++) { if ($head4{$i} == "\xFF") { - fseek($this->getid3->fp, $i - 4, SEEK_CUR); + $this->fseek($i - 4, SEEK_CUR); continue 2; } } @@ -1258,9 +1261,9 @@ class getid3_mp3 extends getid3_handler $LongMPEGfrequencyLookup[$head4]); } if ($MPEGaudioHeaderLengthCache[$head4] > 4) { - $WhereWeWere = ftell($this->getid3->fp); - fseek($this->getid3->fp, $MPEGaudioHeaderLengthCache[$head4] - 4, SEEK_CUR); - $next4 = fread($this->getid3->fp, 4); + $WhereWeWere = $this->ftell(); + $this->fseek($MPEGaudioHeaderLengthCache[$head4] - 4, SEEK_CUR); + $next4 = $this->fread(4); if ($next4{0} == "\xFF") { if (!isset($MPEGaudioHeaderDecodeCache[$next4])) { $MPEGaudioHeaderDecodeCache[$next4] = self::MPEGaudioHeaderDecode($next4); @@ -1269,7 +1272,7 @@ class getid3_mp3 extends getid3_handler $MPEGaudioHeaderValidCache[$next4] = self::MPEGaudioHeaderValid($MPEGaudioHeaderDecodeCache[$next4], false, false); } if ($MPEGaudioHeaderValidCache[$next4]) { - fseek($this->getid3->fp, -4, SEEK_CUR); + $this->fseek(-4, SEEK_CUR); getid3_lib::safe_inc($Distribution['bitrate'][$LongMPEGbitrateLookup[$head4]]); getid3_lib::safe_inc($Distribution['layer'][$LongMPEGlayerLookup[$head4]]); @@ -1277,7 +1280,7 @@ class getid3_mp3 extends getid3_handler getid3_lib::safe_inc($Distribution['padding'][intval($LongMPEGpaddingLookup[$head4])]); getid3_lib::safe_inc($Distribution['frequency'][$LongMPEGfrequencyLookup[$head4]]); if ($max_frames_scan && (++$frames_scanned >= $max_frames_scan)) { - $pct_data_scanned = (ftell($this->getid3->fp) - $info['avdataoffset']) / ($info['avdataend'] - $info['avdataoffset']); + $pct_data_scanned = ($this->ftell() - $info['avdataoffset']) / ($info['avdataend'] - $info['avdataoffset']); $info['warning'][] = 'too many MPEG audio frames to scan, only scanned first '.$max_frames_scan.' frames ('.number_format($pct_data_scanned * 100, 1).'% of file) and extrapolated distribution, playtime and bitrate may be incorrect.'; foreach ($Distribution as $key1 => $value1) { foreach ($value1 as $key2 => $value2) { @@ -1290,7 +1293,7 @@ class getid3_mp3 extends getid3_handler } } unset($next4); - fseek($this->getid3->fp, $WhereWeWere - 3, SEEK_SET); + $this->fseek($WhereWeWere - 3); } } @@ -1355,13 +1358,13 @@ class getid3_mp3 extends getid3_handler } - fseek($this->getid3->fp, $avdataoffset, SEEK_SET); + $this->fseek($avdataoffset); $sync_seek_buffer_size = min(128 * 1024, $info['avdataend'] - $avdataoffset); if ($sync_seek_buffer_size <= 0) { $info['error'][] = 'Invalid $sync_seek_buffer_size at offset '.$avdataoffset; return false; } - $header = fread($this->getid3->fp, $sync_seek_buffer_size); + $header = $this->fread($sync_seek_buffer_size); $sync_seek_buffer_size = strlen($header); $SynchSeekOffset = 0; while ($SynchSeekOffset < $sync_seek_buffer_size) { @@ -1473,7 +1476,7 @@ class getid3_mp3 extends getid3_handler $dummy = array('error'=>$info['error'], 'warning'=>$info['warning'], 'avdataend'=>$info['avdataend'], 'avdataoffset'=>$info['avdataoffset']); $synchstartoffset = $info['avdataoffset']; - fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET); + $this->fseek($info['avdataoffset']); // you can play with these numbers: $max_frames_scan = 50000; @@ -1488,13 +1491,13 @@ class getid3_mp3 extends getid3_handler $pct_data_scanned = 0; for ($current_segment = 0; $current_segment < $max_scan_segments; $current_segment++) { $frames_scanned_this_segment = 0; - if (ftell($this->getid3->fp) >= $info['avdataend']) { + if ($this->ftell() >= $info['avdataend']) { break; } - $scan_start_offset[$current_segment] = max(ftell($this->getid3->fp), $info['avdataoffset'] + round($current_segment * (($info['avdataend'] - $info['avdataoffset']) / $max_scan_segments))); + $scan_start_offset[$current_segment] = max($this->ftell(), $info['avdataoffset'] + round($current_segment * (($info['avdataend'] - $info['avdataoffset']) / $max_scan_segments))); if ($current_segment > 0) { - fseek($this->getid3->fp, $scan_start_offset[$current_segment], SEEK_SET); - $buffer_4k = fread($this->getid3->fp, 4096); + $this->fseek($scan_start_offset[$current_segment]); + $buffer_4k = $this->fread(4096); for ($j = 0; $j < (strlen($buffer_4k) - 4); $j++) { if (($buffer_4k{$j} == "\xFF") && ($buffer_4k{($j + 1)} > "\xE0")) { // synch detected if ($this->decodeMPEGaudioHeader($scan_start_offset[$current_segment] + $j, $dummy, false, false, $FastMode)) { @@ -1523,7 +1526,7 @@ class getid3_mp3 extends getid3_handler } $frames_scanned++; if ($frames_scan_per_segment && (++$frames_scanned_this_segment >= $frames_scan_per_segment)) { - $this_pct_scanned = (ftell($this->getid3->fp) - $scan_start_offset[$current_segment]) / ($info['avdataend'] - $info['avdataoffset']); + $this_pct_scanned = ($this->ftell() - $scan_start_offset[$current_segment]) / ($info['avdataend'] - $info['avdataoffset']); if (($current_segment == 0) && (($this_pct_scanned * $max_scan_segments) >= 1)) { // file likely contains < $max_frames_scan, just scan as one segment $max_scan_segments = 1; diff --git a/wp-includes/ID3/module.audio.ogg.php b/wp-includes/ID3/module.audio.ogg.php index a2a35aa..2a77768 100644 --- a/wp-includes/ID3/module.audio.ogg.php +++ b/wp-includes/ID3/module.audio.ogg.php @@ -3,6 +3,7 @@ /// getID3() by James Heinrich // // available at http://getid3.sourceforge.net // // or http://www.getid3.org // +// also https://github.com/JamesHeinrich/getID3 // ///////////////////////////////////////////////////////////////// // See readme.txt for more details // ///////////////////////////////////////////////////////////////// @@ -62,6 +63,12 @@ class getid3_ogg extends getid3_handler $this->ParseVorbisPageHeader($filedata, $filedataoffset, $oggpageinfo); + } elseif (substr($filedata, 0, 8) == 'OpusHead') { + + if( $this->ParseOpusPageHeader($filedata, $filedataoffset, $oggpageinfo) == false ) { + return false; + } + } elseif (substr($filedata, 0, 8) == 'Speex ') { // http://www.speex.org/manual/node10.html @@ -114,6 +121,66 @@ class getid3_ogg extends getid3_handler $info['audio']['bitrate_mode'] = 'vbr'; } + } elseif (substr($filedata, 0, 7) == "\x80".'theora') { + + // http://www.theora.org/doc/Theora.pdf (section 6.2) + + $info['ogg']['pageheader']['theora']['theora_magic'] = substr($filedata, $filedataoffset, 7); // hard-coded to "\x80.'theora' + $filedataoffset += 7; + $info['ogg']['pageheader']['theora']['version_major'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 1)); + $filedataoffset += 1; + $info['ogg']['pageheader']['theora']['version_minor'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 1)); + $filedataoffset += 1; + $info['ogg']['pageheader']['theora']['version_revision'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 1)); + $filedataoffset += 1; + $info['ogg']['pageheader']['theora']['frame_width_macroblocks'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 2)); + $filedataoffset += 2; + $info['ogg']['pageheader']['theora']['frame_height_macroblocks'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 2)); + $filedataoffset += 2; + $info['ogg']['pageheader']['theora']['resolution_x'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 3)); + $filedataoffset += 3; + $info['ogg']['pageheader']['theora']['resolution_y'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 3)); + $filedataoffset += 3; + $info['ogg']['pageheader']['theora']['picture_offset_x'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 1)); + $filedataoffset += 1; + $info['ogg']['pageheader']['theora']['picture_offset_y'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 1)); + $filedataoffset += 1; + $info['ogg']['pageheader']['theora']['frame_rate_numerator'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 4)); + $filedataoffset += 4; + $info['ogg']['pageheader']['theora']['frame_rate_denominator'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 4)); + $filedataoffset += 4; + $info['ogg']['pageheader']['theora']['pixel_aspect_numerator'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 3)); + $filedataoffset += 3; + $info['ogg']['pageheader']['theora']['pixel_aspect_denominator'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 3)); + $filedataoffset += 3; + $info['ogg']['pageheader']['theora']['color_space_id'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 1)); + $filedataoffset += 1; + $info['ogg']['pageheader']['theora']['nominal_bitrate'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 3)); + $filedataoffset += 3; + $info['ogg']['pageheader']['theora']['flags'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 2)); + $filedataoffset += 2; + + $info['ogg']['pageheader']['theora']['quality'] = ($info['ogg']['pageheader']['theora']['flags'] & 0xFC00) >> 10; + $info['ogg']['pageheader']['theora']['kfg_shift'] = ($info['ogg']['pageheader']['theora']['flags'] & 0x03E0) >> 5; + $info['ogg']['pageheader']['theora']['pixel_format_id'] = ($info['ogg']['pageheader']['theora']['flags'] & 0x0018) >> 3; + $info['ogg']['pageheader']['theora']['reserved'] = ($info['ogg']['pageheader']['theora']['flags'] & 0x0007) >> 0; // should be 0 + $info['ogg']['pageheader']['theora']['color_space'] = self::TheoraColorSpace($info['ogg']['pageheader']['theora']['color_space_id']); + $info['ogg']['pageheader']['theora']['pixel_format'] = self::TheoraPixelFormat($info['ogg']['pageheader']['theora']['pixel_format_id']); + + $info['video']['dataformat'] = 'theora'; + $info['mime_type'] = 'video/ogg'; + //$info['audio']['bitrate_mode'] = 'abr'; + //$info['audio']['lossless'] = false; + $info['video']['resolution_x'] = $info['ogg']['pageheader']['theora']['resolution_x']; + $info['video']['resolution_y'] = $info['ogg']['pageheader']['theora']['resolution_y']; + if ($info['ogg']['pageheader']['theora']['frame_rate_denominator'] > 0) { + $info['video']['frame_rate'] = (float) $info['ogg']['pageheader']['theora']['frame_rate_numerator'] / $info['ogg']['pageheader']['theora']['frame_rate_denominator']; + } + if ($info['ogg']['pageheader']['theora']['pixel_aspect_denominator'] > 0) { + $info['video']['pixel_aspect_ratio'] = (float) $info['ogg']['pageheader']['theora']['pixel_aspect_numerator'] / $info['ogg']['pageheader']['theora']['pixel_aspect_denominator']; + } +$info['warning'][] = 'Ogg Theora (v3) not fully supported in this version of getID3 ['.$this->getid3->version().'] -- bitrate, playtime and all audio data are currently unavailable'; + } elseif (substr($filedata, 0, 8) == "fishead\x00") { @@ -172,8 +239,8 @@ class getid3_ogg extends getid3_handler } elseif (substr($filedata, 1, 6) == 'theora') { - $info['video']['dataformat'] = 'theora'; - $info['error'][] = 'Ogg Theora not correctly handled in this version of getID3 ['.$this->getid3->version().']'; + $info['video']['dataformat'] = 'theora1'; + $info['error'][] = 'Ogg Theora (v1) not correctly handled in this version of getID3 ['.$this->getid3->version().']'; //break; } elseif (substr($filedata, 1, 6) == 'vorbis') { @@ -194,7 +261,7 @@ class getid3_ogg extends getid3_handler } else { - $info['error'][] = 'Expecting either "Speex " or "vorbis" identifier strings, found "'.substr($filedata, 0, 8).'"'; + $info['error'][] = 'Expecting either "Speex ", "OpusHead" or "vorbis" identifier strings, found "'.substr($filedata, 0, 8).'"'; unset($info['ogg']); unset($info['mime_type']); return false; @@ -227,8 +294,19 @@ class getid3_ogg extends getid3_handler $this->fseek($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length'], SEEK_CUR); $this->ParseVorbisComments(); break; - } + case 'opus': + $filedata = $this->fread($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']); + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['stream_type'] = substr($filedata, 0, 8); // hard-coded to 'OpusTags' + if(substr($filedata, 0, 8) != 'OpusTags') { + $info['error'][] = 'Expected "OpusTags" as header but got "'.substr($filedata, 0, 8).'"'; + return false; + } + + $this->ParseVorbisComments(); + break; + + } // Last Page - Number of Samples if (!getid3_lib::intValueSupported($info['avdataend'])) { @@ -348,6 +426,57 @@ class getid3_ogg extends getid3_handler return true; } + // http://tools.ietf.org/html/draft-ietf-codec-oggopus-03 + public function ParseOpusPageHeader(&$filedata, &$filedataoffset, &$oggpageinfo) { + $info = &$this->getid3->info; + $info['audio']['dataformat'] = 'opus'; + $info['mime_type'] = 'audio/ogg; codecs=opus'; + + /** @todo find a usable way to detect abr (vbr that is padded to be abr) */ + $info['audio']['bitrate_mode'] = 'vbr'; + + $info['audio']['lossless'] = false; + + $info['ogg']['pageheader']['opus']['opus_magic'] = substr($filedata, $filedataoffset, 8); // hard-coded to 'OpusHead' + $filedataoffset += 8; + $info['ogg']['pageheader']['opus']['version'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1)); + $filedataoffset += 1; + + if ($info['ogg']['pageheader']['opus']['version'] < 1 || $info['ogg']['pageheader']['opus']['version'] > 15) { + $info['error'][] = 'Unknown opus version number (only accepting 1-15)'; + return false; + } + + $info['ogg']['pageheader']['opus']['out_channel_count'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1)); + $filedataoffset += 1; + + if ($info['ogg']['pageheader']['opus']['out_channel_count'] == 0) { + $info['error'][] = 'Invalid channel count in opus header (must not be zero)'; + return false; + } + + $info['ogg']['pageheader']['opus']['pre_skip'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 2)); + $filedataoffset += 2; + + $info['ogg']['pageheader']['opus']['sample_rate'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4)); + $filedataoffset += 4; + + //$info['ogg']['pageheader']['opus']['output_gain'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 2)); + //$filedataoffset += 2; + + //$info['ogg']['pageheader']['opus']['channel_mapping_family'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1)); + //$filedataoffset += 1; + + $info['opus']['opus_version'] = $info['ogg']['pageheader']['opus']['version']; + $info['opus']['sample_rate'] = $info['ogg']['pageheader']['opus']['sample_rate']; + $info['opus']['out_channel_count'] = $info['ogg']['pageheader']['opus']['out_channel_count']; + + $info['audio']['channels'] = $info['opus']['out_channel_count']; + $info['audio']['sample_rate'] = $info['opus']['sample_rate']; + return true; + } + + public function ParseOggPageHeader() { // http://xiph.org/ogg/vorbis/doc/framing.html $oggheader['page_start_offset'] = $this->ftell(); // where we started from in the file @@ -410,6 +539,7 @@ class getid3_ogg extends getid3_handler switch ($info['audio']['dataformat']) { case 'vorbis': case 'speex': + case 'opus': $CommentStartOffset = $info['ogg']['pageheader'][$VorbisCommentPage]['page_start_offset']; // Second Ogg page, after header block $this->fseek($CommentStartOffset); $commentdataoffset = 27 + $info['ogg']['pageheader'][$VorbisCommentPage]['page_segments']; @@ -418,6 +548,10 @@ class getid3_ogg extends getid3_handler if ($info['audio']['dataformat'] == 'vorbis') { $commentdataoffset += (strlen('vorbis') + 1); } + else if ($info['audio']['dataformat'] == 'opus') { + $commentdataoffset += strlen('OpusTags'); + } + break; case 'flac': @@ -444,6 +578,12 @@ class getid3_ogg extends getid3_handler $ThisFileInfo_ogg_comments_raw = &$info['ogg']['comments_raw']; for ($i = 0; $i < $CommentsCount; $i++) { + if ($i >= 10000) { + // https://github.com/owncloud/music/issues/212#issuecomment-43082336 + $info['warning'][] = 'Unexpectedly large number ('.$CommentsCount.') of Ogg comments - breaking after reading '.$i.' comments'; + break; + } + $ThisFileInfo_ogg_comments_raw[$i]['dataoffset'] = $CommentStartOffset + $commentdataoffset; if ($this->ftell() < ($ThisFileInfo_ogg_comments_raw[$i]['dataoffset'] + 4)) { @@ -554,8 +694,12 @@ class getid3_ogg extends getid3_handler $ogg = new self($this->getid3); $ogg->setStringMode($data); $info['ogg']['comments']['picture'][] = array( - 'image_mime' => $imageinfo['mime'], - 'data' => $ogg->saveAttachment('coverart', 0, strlen($data), $imageinfo['mime']), + 'image_mime' => $imageinfo['mime'], + 'datalength' => strlen($data), + 'picturetype' => 'cover art', + 'image_height' => $imageinfo['height'], + 'image_width' => $imageinfo['width'], + 'data' => $ogg->saveAttachment('coverart', 0, strlen($data), $imageinfo['mime']), ); unset($ogg); @@ -668,4 +812,28 @@ class getid3_ogg extends getid3_handler return round($qval, 1); // 5 or 4.9 } + public static function TheoraColorSpace($colorspace_id) { + // http://www.theora.org/doc/Theora.pdf (table 6.3) + static $TheoraColorSpaceLookup = array(); + if (empty($TheoraColorSpaceLookup)) { + $TheoraColorSpaceLookup[0] = 'Undefined'; + $TheoraColorSpaceLookup[1] = 'Rec. 470M'; + $TheoraColorSpaceLookup[2] = 'Rec. 470BG'; + $TheoraColorSpaceLookup[3] = 'Reserved'; + } + return (isset($TheoraColorSpaceLookup[$colorspace_id]) ? $TheoraColorSpaceLookup[$colorspace_id] : null); + } + + public static function TheoraPixelFormat($pixelformat_id) { + // http://www.theora.org/doc/Theora.pdf (table 6.4) + static $TheoraPixelFormatLookup = array(); + if (empty($TheoraPixelFormatLookup)) { + $TheoraPixelFormatLookup[0] = '4:2:0'; + $TheoraPixelFormatLookup[1] = 'Reserved'; + $TheoraPixelFormatLookup[2] = '4:2:2'; + $TheoraPixelFormatLookup[3] = '4:4:4'; + } + return (isset($TheoraPixelFormatLookup[$pixelformat_id]) ? $TheoraPixelFormatLookup[$pixelformat_id] : null); + } + } diff --git a/wp-includes/ID3/module.tag.apetag.php b/wp-includes/ID3/module.tag.apetag.php index afeede7..724b8b0 100644 --- a/wp-includes/ID3/module.tag.apetag.php +++ b/wp-includes/ID3/module.tag.apetag.php @@ -3,6 +3,7 @@ /// getID3() by James Heinrich // // available at http://getid3.sourceforge.net // // or http://www.getid3.org // +// also https://github.com/JamesHeinrich/getID3 // ///////////////////////////////////////////////////////////////// // See readme.txt for more details // ///////////////////////////////////////////////////////////////// @@ -32,8 +33,8 @@ class getid3_apetag extends getid3_handler if ($this->overrideendoffset == 0) { - fseek($this->getid3->fp, 0 - $id3v1tagsize - $apetagheadersize - $lyrics3tagsize, SEEK_END); - $APEfooterID3v1 = fread($this->getid3->fp, $id3v1tagsize + $apetagheadersize + $lyrics3tagsize); + $this->fseek(0 - $id3v1tagsize - $apetagheadersize - $lyrics3tagsize, SEEK_END); + $APEfooterID3v1 = $this->fread($id3v1tagsize + $apetagheadersize + $lyrics3tagsize); //if (preg_match('/APETAGEX.{24}TAG.{125}$/i', $APEfooterID3v1)) { if (substr($APEfooterID3v1, strlen($APEfooterID3v1) - $id3v1tagsize - $apetagheadersize, 8) == 'APETAGEX') { @@ -51,8 +52,8 @@ class getid3_apetag extends getid3_handler } else { - fseek($this->getid3->fp, $this->overrideendoffset - $apetagheadersize, SEEK_SET); - if (fread($this->getid3->fp, 8) == 'APETAGEX') { + $this->fseek($this->overrideendoffset - $apetagheadersize); + if ($this->fread(8) == 'APETAGEX') { $info['ape']['tag_offset_end'] = $this->overrideendoffset; } @@ -68,21 +69,21 @@ class getid3_apetag extends getid3_handler // shortcut $thisfile_ape = &$info['ape']; - fseek($this->getid3->fp, $thisfile_ape['tag_offset_end'] - $apetagheadersize, SEEK_SET); - $APEfooterData = fread($this->getid3->fp, 32); + $this->fseek($thisfile_ape['tag_offset_end'] - $apetagheadersize); + $APEfooterData = $this->fread(32); if (!($thisfile_ape['footer'] = $this->parseAPEheaderFooter($APEfooterData))) { $info['error'][] = 'Error parsing APE footer at offset '.$thisfile_ape['tag_offset_end']; return false; } if (isset($thisfile_ape['footer']['flags']['header']) && $thisfile_ape['footer']['flags']['header']) { - fseek($this->getid3->fp, $thisfile_ape['tag_offset_end'] - $thisfile_ape['footer']['raw']['tagsize'] - $apetagheadersize, SEEK_SET); - $thisfile_ape['tag_offset_start'] = ftell($this->getid3->fp); - $APEtagData = fread($this->getid3->fp, $thisfile_ape['footer']['raw']['tagsize'] + $apetagheadersize); + $this->fseek($thisfile_ape['tag_offset_end'] - $thisfile_ape['footer']['raw']['tagsize'] - $apetagheadersize); + $thisfile_ape['tag_offset_start'] = $this->ftell(); + $APEtagData = $this->fread($thisfile_ape['footer']['raw']['tagsize'] + $apetagheadersize); } else { $thisfile_ape['tag_offset_start'] = $thisfile_ape['tag_offset_end'] - $thisfile_ape['footer']['raw']['tagsize']; - fseek($this->getid3->fp, $thisfile_ape['tag_offset_start'], SEEK_SET); - $APEtagData = fread($this->getid3->fp, $thisfile_ape['footer']['raw']['tagsize']); + $this->fseek($thisfile_ape['tag_offset_start']); + $APEtagData = $this->fread($thisfile_ape['footer']['raw']['tagsize']); } $info['avdataend'] = $thisfile_ape['tag_offset_start']; @@ -137,58 +138,88 @@ class getid3_apetag extends getid3_handler $thisfile_ape_items_current['flags'] = $this->parseAPEtagFlags($item_flags); switch ($thisfile_ape_items_current['flags']['item_contents_raw']) { case 0: // UTF-8 - case 3: // Locator (URL, filename, etc), UTF-8 encoded - $thisfile_ape_items_current['data'] = explode("\x00", trim($thisfile_ape_items_current['data'])); + case 2: // Locator (URL, filename, etc), UTF-8 encoded + $thisfile_ape_items_current['data'] = explode("\x00", $thisfile_ape_items_current['data']); break; - default: // binary data + case 1: // binary data + default: break; } switch (strtolower($item_key)) { + // http://wiki.hydrogenaud.io/index.php?title=ReplayGain#MP3Gain case 'replaygain_track_gain': - $thisfile_replaygain['track']['adjustment'] = (float) str_replace(',', '.', $thisfile_ape_items_current['data'][0]); // float casting will see "0,95" as zero! - $thisfile_replaygain['track']['originator'] = 'unspecified'; + if (preg_match('#^[\\-\\+][0-9\\.,]{8}$#', $thisfile_ape_items_current['data'][0])) { + $thisfile_replaygain['track']['adjustment'] = (float) str_replace(',', '.', $thisfile_ape_items_current['data'][0]); // float casting will see "0,95" as zero! + $thisfile_replaygain['track']['originator'] = 'unspecified'; + } else { + $info['warning'][] = 'MP3gainTrackGain value in APEtag appears invalid: "'.$thisfile_ape_items_current['data'][0].'"'; + } break; case 'replaygain_track_peak': - $thisfile_replaygain['track']['peak'] = (float) str_replace(',', '.', $thisfile_ape_items_current['data'][0]); // float casting will see "0,95" as zero! - $thisfile_replaygain['track']['originator'] = 'unspecified'; - if ($thisfile_replaygain['track']['peak'] <= 0) { - $info['warning'][] = 'ReplayGain Track peak from APEtag appears invalid: '.$thisfile_replaygain['track']['peak'].' (original value = "'.$thisfile_ape_items_current['data'][0].'")'; + if (preg_match('#^[0-9\\.,]{8}$#', $thisfile_ape_items_current['data'][0])) { + $thisfile_replaygain['track']['peak'] = (float) str_replace(',', '.', $thisfile_ape_items_current['data'][0]); // float casting will see "0,95" as zero! + $thisfile_replaygain['track']['originator'] = 'unspecified'; + if ($thisfile_replaygain['track']['peak'] <= 0) { + $info['warning'][] = 'ReplayGain Track peak from APEtag appears invalid: '.$thisfile_replaygain['track']['peak'].' (original value = "'.$thisfile_ape_items_current['data'][0].'")'; + } + } else { + $info['warning'][] = 'MP3gainTrackPeak value in APEtag appears invalid: "'.$thisfile_ape_items_current['data'][0].'"'; } break; case 'replaygain_album_gain': - $thisfile_replaygain['album']['adjustment'] = (float) str_replace(',', '.', $thisfile_ape_items_current['data'][0]); // float casting will see "0,95" as zero! - $thisfile_replaygain['album']['originator'] = 'unspecified'; + if (preg_match('#^[\\-\\+][0-9\\.,]{8}$#', $thisfile_ape_items_current['data'][0])) { + $thisfile_replaygain['album']['adjustment'] = (float) str_replace(',', '.', $thisfile_ape_items_current['data'][0]); // float casting will see "0,95" as zero! + $thisfile_replaygain['album']['originator'] = 'unspecified'; + } else { + $info['warning'][] = 'MP3gainAlbumGain value in APEtag appears invalid: "'.$thisfile_ape_items_current['data'][0].'"'; + } break; case 'replaygain_album_peak': - $thisfile_replaygain['album']['peak'] = (float) str_replace(',', '.', $thisfile_ape_items_current['data'][0]); // float casting will see "0,95" as zero! - $thisfile_replaygain['album']['originator'] = 'unspecified'; - if ($thisfile_replaygain['album']['peak'] <= 0) { - $info['warning'][] = 'ReplayGain Album peak from APEtag appears invalid: '.$thisfile_replaygain['album']['peak'].' (original value = "'.$thisfile_ape_items_current['data'][0].'")'; + if (preg_match('#^[0-9\\.,]{8}$#', $thisfile_ape_items_current['data'][0])) { + $thisfile_replaygain['album']['peak'] = (float) str_replace(',', '.', $thisfile_ape_items_current['data'][0]); // float casting will see "0,95" as zero! + $thisfile_replaygain['album']['originator'] = 'unspecified'; + if ($thisfile_replaygain['album']['peak'] <= 0) { + $info['warning'][] = 'ReplayGain Album peak from APEtag appears invalid: '.$thisfile_replaygain['album']['peak'].' (original value = "'.$thisfile_ape_items_current['data'][0].'")'; + } + } else { + $info['warning'][] = 'MP3gainAlbumPeak value in APEtag appears invalid: "'.$thisfile_ape_items_current['data'][0].'"'; } break; case 'mp3gain_undo': - list($mp3gain_undo_left, $mp3gain_undo_right, $mp3gain_undo_wrap) = explode(',', $thisfile_ape_items_current['data'][0]); - $thisfile_replaygain['mp3gain']['undo_left'] = intval($mp3gain_undo_left); - $thisfile_replaygain['mp3gain']['undo_right'] = intval($mp3gain_undo_right); - $thisfile_replaygain['mp3gain']['undo_wrap'] = (($mp3gain_undo_wrap == 'Y') ? true : false); + if (preg_match('#^[\\-\\+][0-9]{3},[\\-\\+][0-9]{3},[NW]$#', $thisfile_ape_items_current['data'][0])) { + list($mp3gain_undo_left, $mp3gain_undo_right, $mp3gain_undo_wrap) = explode(',', $thisfile_ape_items_current['data'][0]); + $thisfile_replaygain['mp3gain']['undo_left'] = intval($mp3gain_undo_left); + $thisfile_replaygain['mp3gain']['undo_right'] = intval($mp3gain_undo_right); + $thisfile_replaygain['mp3gain']['undo_wrap'] = (($mp3gain_undo_wrap == 'Y') ? true : false); + } else { + $info['warning'][] = 'MP3gainUndo value in APEtag appears invalid: "'.$thisfile_ape_items_current['data'][0].'"'; + } break; case 'mp3gain_minmax': - list($mp3gain_globalgain_min, $mp3gain_globalgain_max) = explode(',', $thisfile_ape_items_current['data'][0]); - $thisfile_replaygain['mp3gain']['globalgain_track_min'] = intval($mp3gain_globalgain_min); - $thisfile_replaygain['mp3gain']['globalgain_track_max'] = intval($mp3gain_globalgain_max); + if (preg_match('#^[0-9]{3},[0-9]{3}$#', $thisfile_ape_items_current['data'][0])) { + list($mp3gain_globalgain_min, $mp3gain_globalgain_max) = explode(',', $thisfile_ape_items_current['data'][0]); + $thisfile_replaygain['mp3gain']['globalgain_track_min'] = intval($mp3gain_globalgain_min); + $thisfile_replaygain['mp3gain']['globalgain_track_max'] = intval($mp3gain_globalgain_max); + } else { + $info['warning'][] = 'MP3gainMinMax value in APEtag appears invalid: "'.$thisfile_ape_items_current['data'][0].'"'; + } break; case 'mp3gain_album_minmax': - list($mp3gain_globalgain_album_min, $mp3gain_globalgain_album_max) = explode(',', $thisfile_ape_items_current['data'][0]); - $thisfile_replaygain['mp3gain']['globalgain_album_min'] = intval($mp3gain_globalgain_album_min); - $thisfile_replaygain['mp3gain']['globalgain_album_max'] = intval($mp3gain_globalgain_album_max); + if (preg_match('#^[0-9]{3},[0-9]{3}$#', $thisfile_ape_items_current['data'][0])) { + list($mp3gain_globalgain_album_min, $mp3gain_globalgain_album_max) = explode(',', $thisfile_ape_items_current['data'][0]); + $thisfile_replaygain['mp3gain']['globalgain_album_min'] = intval($mp3gain_globalgain_album_min); + $thisfile_replaygain['mp3gain']['globalgain_album_max'] = intval($mp3gain_globalgain_album_max); + } else { + $info['warning'][] = 'MP3gainAlbumMinMax value in APEtag appears invalid: "'.$thisfile_ape_items_current['data'][0].'"'; + } break; case 'tracknumber': @@ -221,6 +252,10 @@ class getid3_apetag extends getid3_handler case 'cover art (recording)': case 'cover art (studio)': // list of possible cover arts from http://taglib-sharp.sourcearchive.com/documentation/2.0.3.0-2/Ape_2Tag_8cs-source.html + if (is_array($thisfile_ape_items_current['data'])) { + $info['warning'][] = 'APEtag "'.$item_key.'" should be flagged as Binary data, but was incorrectly flagged as UTF-8'; + $thisfile_ape_items_current['data'] = implode("\x00", $thisfile_ape_items_current['data']); + } list($thisfile_ape_items_current['filename'], $thisfile_ape_items_current['data']) = explode("\x00", $thisfile_ape_items_current['data'], 2); $thisfile_ape_items_current['data_offset'] = $thisfile_ape_items_current['offset'] + strlen($thisfile_ape_items_current['filename']."\x00"); $thisfile_ape_items_current['data_length'] = strlen($thisfile_ape_items_current['data']); @@ -268,7 +303,14 @@ class getid3_apetag extends getid3_handler if (!isset($info['ape']['comments']['picture'])) { $info['ape']['comments']['picture'] = array(); } - $info['ape']['comments']['picture'][] = array('data'=>$thisfile_ape_items_current['data'], 'image_mime'=>$thisfile_ape_items_current['image_mime']); + $comments_picture_data = array(); + foreach (array('data', 'image_mime', 'image_width', 'image_height', 'imagetype', 'picturetype', 'description', 'datalength') as $picture_key) { + if (isset($thisfile_ape_items_current[$picture_key])) { + $comments_picture_data[$picture_key] = $thisfile_ape_items_current[$picture_key]; + } + } + $info['ape']['comments']['picture'][] = $comments_picture_data; + unset($comments_picture_data); } } while (false); break; @@ -316,7 +358,7 @@ class getid3_apetag extends getid3_handler public function parseAPEtagFlags($rawflagint) { // "Note: APE Tags 1.0 do not use any of the APE Tag flags. // All are set to zero on creation and ignored on reading." - // http://www.uni-jena.de/~pfk/mpp/sv8/apetagflags.html + // http://wiki.hydrogenaud.io/index.php?title=Ape_Tags_Flags $flags['header'] = (bool) ($rawflagint & 0x80000000); $flags['footer'] = (bool) ($rawflagint & 0x40000000); $flags['this_is_header'] = (bool) ($rawflagint & 0x20000000); diff --git a/wp-includes/ID3/module.tag.id3v1.php b/wp-includes/ID3/module.tag.id3v1.php index fd9069e..3b4edfd 100644 --- a/wp-includes/ID3/module.tag.id3v1.php +++ b/wp-includes/ID3/module.tag.id3v1.php @@ -3,6 +3,7 @@ /// getID3() by James Heinrich // // available at http://getid3.sourceforge.net // // or http://www.getid3.org // +// also https://github.com/JamesHeinrich/getID3 // ///////////////////////////////////////////////////////////////// // See readme.txt for more details // ///////////////////////////////////////////////////////////////// @@ -25,9 +26,9 @@ class getid3_id3v1 extends getid3_handler return false; } - fseek($this->getid3->fp, -256, SEEK_END); - $preid3v1 = fread($this->getid3->fp, 128); - $id3v1tag = fread($this->getid3->fp, 128); + $this->fseek(-256, SEEK_END); + $preid3v1 = $this->fread(128); + $id3v1tag = $this->fread(128); if (substr($id3v1tag, 0, 3) == 'TAG') { diff --git a/wp-includes/ID3/module.tag.id3v2.php b/wp-includes/ID3/module.tag.id3v2.php index b08f9f9..7092504 100644 --- a/wp-includes/ID3/module.tag.id3v2.php +++ b/wp-includes/ID3/module.tag.id3v2.php @@ -3,6 +3,7 @@ /// getID3() by James Heinrich // // available at http://getid3.sourceforge.net // // or http://www.getid3.org // +// also https://github.com/JamesHeinrich/getID3 // ///////////////////////////////////////////////////////////////// // See readme.txt for more details // ///////////////////////////////////////////////////////////////// @@ -51,8 +52,8 @@ class getid3_id3v2 extends getid3_handler $thisfile_id3v2_flags = &$thisfile_id3v2['flags']; - fseek($this->getid3->fp, $this->StartingOffset, SEEK_SET); - $header = fread($this->getid3->fp, 10); + $this->fseek($this->StartingOffset); + $header = $this->fread(10); if (substr($header, 0, 3) == 'ID3' && strlen($header) == 10) { $thisfile_id3v2['majorversion'] = ord($header{3}); @@ -131,7 +132,7 @@ class getid3_id3v2 extends getid3_handler } if ($sizeofframes > 0) { - $framedata = fread($this->getid3->fp, $sizeofframes); // read all frames from file into $framedata variable + $framedata = $this->fread($sizeofframes); // read all frames from file into $framedata variable // if entire frame data is unsynched, de-unsynch it now (ID3v2.3.x) if (!empty($thisfile_id3v2_flags['unsynch']) && ($id3v2_majorversion <= 3)) { @@ -423,7 +424,7 @@ class getid3_id3v2 extends getid3_handler // ID3v2 size 4 * %0xxxxxxx if (isset($thisfile_id3v2_flags['isfooter']) && $thisfile_id3v2_flags['isfooter']) { - $footer = fread($this->getid3->fp, 10); + $footer = $this->fread(10); if (substr($footer, 0, 3) == '3DI') { $thisfile_id3v2['footer'] = true; $thisfile_id3v2['majorversion_footer'] = ord($footer{3}); @@ -624,12 +625,13 @@ class getid3_id3v2 extends getid3_handler $frame_offset = 0; $frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1)); - + $frame_textencoding_terminator = $this->TextEncodingTerminatorLookup($frame_textencoding); if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) { $info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding'; + $frame_textencoding_terminator = "\x00"; } - $frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset); - if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) { + $frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset); + if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) { $frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00 } $frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset); @@ -639,10 +641,15 @@ class getid3_id3v2 extends getid3_handler $parsedFrame['encodingid'] = $frame_textencoding; $parsedFrame['encoding'] = $this->TextEncodingNameLookup($frame_textencoding); - $parsedFrame['description'] = $frame_description; - $parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding))); + $parsedFrame['description'] = trim(getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $frame_description)); + $parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator)); if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) { - $info['id3v2']['comments'][$parsedFrame['framenameshort']][] = trim(getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data'])); + $commentkey = ($parsedFrame['description'] ? $parsedFrame['description'] : (isset($info['id3v2']['comments'][$parsedFrame['framenameshort']]) ? count($info['id3v2']['comments'][$parsedFrame['framenameshort']]) : 0)); + if (!isset($info['id3v2']['comments'][$parsedFrame['framenameshort']]) || !array_key_exists($commentkey, $info['id3v2']['comments'][$parsedFrame['framenameshort']])) { + $info['id3v2']['comments'][$parsedFrame['framenameshort']][$commentkey] = trim(getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data'])); + } else { + $info['id3v2']['comments'][$parsedFrame['framenameshort']][] = trim(getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data'])); + } } //unset($parsedFrame['data']); do not unset, may be needed elsewhere, e.g. for replaygain @@ -711,11 +718,13 @@ class getid3_id3v2 extends getid3_handler $frame_offset = 0; $frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1)); + $frame_textencoding_terminator = $this->TextEncodingTerminatorLookup($frame_textencoding); if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) { $info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding'; + $frame_textencoding_terminator = "\x00"; } - $frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset); - if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) { + $frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset); + if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) { $frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00 } $frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset); @@ -723,10 +732,10 @@ class getid3_id3v2 extends getid3_handler if (ord($frame_description) === 0) { $frame_description = ''; } - $parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding))); + $parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator)); - $frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding)); - if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) { + $frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator); + if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) { $frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00 } if ($frame_terminatorpos) { @@ -950,20 +959,22 @@ class getid3_id3v2 extends getid3_handler $frame_offset = 0; $frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1)); + $frame_textencoding_terminator = $this->TextEncodingTerminatorLookup($frame_textencoding); if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) { $info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding'; + $frame_textencoding_terminator = "\x00"; } $frame_language = substr($parsedFrame['data'], $frame_offset, 3); $frame_offset += 3; - $frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset); - if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) { + $frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset); + if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) { $frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00 } $frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset); if (ord($frame_description) === 0) { $frame_description = ''; } - $parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding))); + $parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator)); $parsedFrame['encodingid'] = $frame_textencoding; $parsedFrame['encoding'] = $this->TextEncodingNameLookup($frame_textencoding); @@ -996,8 +1007,10 @@ class getid3_id3v2 extends getid3_handler $frame_offset = 0; $frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1)); + $frame_textencoding_terminator = $this->TextEncodingTerminatorLookup($frame_textencoding); if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) { $info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding'; + $frame_textencoding_terminator = "\x00"; } $frame_language = substr($parsedFrame['data'], $frame_offset, 3); $frame_offset += 3; @@ -1014,16 +1027,16 @@ class getid3_id3v2 extends getid3_handler $frame_remainingdata = substr($parsedFrame['data'], $frame_offset); while (strlen($frame_remainingdata)) { $frame_offset = 0; - $frame_terminatorpos = strpos($frame_remainingdata, $this->TextEncodingTerminatorLookup($frame_textencoding)); + $frame_terminatorpos = strpos($frame_remainingdata, $frame_textencoding_terminator); if ($frame_terminatorpos === false) { $frame_remainingdata = ''; } else { - if (ord(substr($frame_remainingdata, $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) { + if (ord(substr($frame_remainingdata, $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) { $frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00 } $parsedFrame['lyrics'][$timestampindex]['data'] = substr($frame_remainingdata, $frame_offset, $frame_terminatorpos - $frame_offset); - $frame_remainingdata = substr($frame_remainingdata, $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding))); + $frame_remainingdata = substr($frame_remainingdata, $frame_terminatorpos + strlen($frame_textencoding_terminator)); if (($timestampindex == 0) && (ord($frame_remainingdata{0}) != 0)) { // timestamp probably omitted for first data item } else { @@ -1054,20 +1067,22 @@ class getid3_id3v2 extends getid3_handler $frame_offset = 0; $frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1)); + $frame_textencoding_terminator = $this->TextEncodingTerminatorLookup($frame_textencoding); if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) { $info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding'; + $frame_textencoding_terminator = "\x00"; } $frame_language = substr($parsedFrame['data'], $frame_offset, 3); $frame_offset += 3; - $frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset); - if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) { + $frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset); + if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) { $frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00 } $frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset); if (ord($frame_description) === 0) { $frame_description = ''; } - $frame_text = (string) substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding))); + $frame_text = (string) substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator)); $parsedFrame['encodingid'] = $frame_textencoding; $parsedFrame['encoding'] = $this->TextEncodingNameLookup($frame_textencoding); @@ -1077,7 +1092,12 @@ class getid3_id3v2 extends getid3_handler $parsedFrame['description'] = $frame_description; $parsedFrame['data'] = $frame_text; if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) { - $info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']); + $commentkey = ($parsedFrame['description'] ? $parsedFrame['description'] : (!empty($info['id3v2']['comments'][$parsedFrame['framenameshort']]) ? count($info['id3v2']['comments'][$parsedFrame['framenameshort']]) : 0)); + if (!isset($info['id3v2']['comments'][$parsedFrame['framenameshort']]) || !array_key_exists($commentkey, $info['id3v2']['comments'][$parsedFrame['framenameshort']])) { + $info['id3v2']['comments'][$parsedFrame['framenameshort']][$commentkey] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']); + } else { + $info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']); + } } } @@ -1319,8 +1339,10 @@ class getid3_id3v2 extends getid3_handler $frame_offset = 0; $frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1)); + $frame_textencoding_terminator = $this->TextEncodingTerminatorLookup($frame_textencoding); if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) { $info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding'; + $frame_textencoding_terminator = "\x00"; } if ($id3v2_majorversion == 2 && strlen($parsedFrame['data']) > $frame_offset) { @@ -1356,8 +1378,8 @@ class getid3_id3v2 extends getid3_handler if ($frame_offset >= $parsedFrame['datalength']) { $info['warning'][] = 'data portion of APIC frame is missing at offset '.($parsedFrame['dataoffset'] + 8 + $frame_offset); } else { - $frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset); - if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) { + $frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset); + if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) { $frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00 } $frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset); @@ -1375,7 +1397,7 @@ class getid3_id3v2 extends getid3_handler $parsedFrame['picturetypeid'] = $frame_picturetype; $parsedFrame['picturetype'] = $this->APICPictureTypeLookup($frame_picturetype); $parsedFrame['description'] = $frame_description; - $parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding))); + $parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator)); $parsedFrame['datalength'] = strlen($parsedFrame['data']); $parsedFrame['image_mime'] = ''; @@ -1432,7 +1454,14 @@ class getid3_id3v2 extends getid3_handler if (!isset($info['id3v2']['comments']['picture'])) { $info['id3v2']['comments']['picture'] = array(); } - $info['id3v2']['comments']['picture'][] = array('data'=>$parsedFrame['data'], 'image_mime'=>$parsedFrame['image_mime']); + $comments_picture_data = array(); + foreach (array('data', 'image_mime', 'image_width', 'image_height', 'imagetype', 'picturetype', 'description', 'datalength') as $picture_key) { + if (isset($parsedFrame[$picture_key])) { + $comments_picture_data[$picture_key] = $parsedFrame[$picture_key]; + } + } + $info['id3v2']['comments']['picture'][] = $comments_picture_data; + unset($comments_picture_data); } } } while (false); @@ -1451,8 +1480,10 @@ class getid3_id3v2 extends getid3_handler $frame_offset = 0; $frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1)); + $frame_textencoding_terminator = $this->TextEncodingTerminatorLookup($frame_textencoding); if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) { $info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding'; + $frame_textencoding_terminator = "\x00"; } $frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset); $frame_mimetype = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset); @@ -1461,25 +1492,25 @@ class getid3_id3v2 extends getid3_handler } $frame_offset = $frame_terminatorpos + strlen("\x00"); - $frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset); - if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) { + $frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset); + if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) { $frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00 } $frame_filename = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset); if (ord($frame_filename) === 0) { $frame_filename = ''; } - $frame_offset = $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)); + $frame_offset = $frame_terminatorpos + strlen($frame_textencoding_terminator); - $frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset); - if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) { + $frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset); + if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) { $frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00 } $frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset); if (ord($frame_description) === 0) { $frame_description = ''; } - $frame_offset = $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)); + $frame_offset = $frame_terminatorpos + strlen($frame_textencoding_terminator); $parsedFrame['objectdata'] = (string) substr($parsedFrame['data'], $frame_offset); $parsedFrame['encodingid'] = $frame_textencoding; @@ -1596,7 +1627,7 @@ class getid3_id3v2 extends getid3_handler } elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'LINK')) || // 4.20 LINK Linked information - (($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'LNK'))) { // 4.22 LNK Linked information + (($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'LNK'))) { // 4.22 LNK Linked information // There may be more than one 'LINK' frame in a tag, // but only one with the same contents //

@@ -1624,7 +1655,7 @@ class getid3_id3v2 extends getid3_handler $parsedFrame['additionaldata'] = (string) substr($parsedFrame['data'], $frame_offset); if (!empty($parsedFrame['framenameshort']) && $parsedFrame['url']) { - $info['id3v2']['comments'][$parsedFrame['framenameshort']][] = utf8_encode($parsedFrame['url']); + $info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback_iso88591_utf8($parsedFrame['url']); } unset($parsedFrame['data']); @@ -1718,8 +1749,10 @@ class getid3_id3v2 extends getid3_handler $frame_offset = 0; $frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1)); + $frame_textencoding_terminator = $this->TextEncodingTerminatorLookup($frame_textencoding); if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) { $info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding'; + $frame_textencoding_terminator = "\x00"; } $frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset); @@ -1741,25 +1774,25 @@ class getid3_id3v2 extends getid3_handler $frame_receivedasid = ord(substr($parsedFrame['data'], $frame_offset++, 1)); - $frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset); - if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) { + $frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset); + if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) { $frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00 } $frame_sellername = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset); if (ord($frame_sellername) === 0) { $frame_sellername = ''; } - $frame_offset = $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)); + $frame_offset = $frame_terminatorpos + strlen($frame_textencoding_terminator); - $frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset); - if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) { + $frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset); + if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) { $frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00 } $frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset); if (ord($frame_description) === 0) { $frame_description = ''; } - $frame_offset = $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)); + $frame_offset = $frame_terminatorpos + strlen($frame_textencoding_terminator); $frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset); $frame_mimetype = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset); @@ -1885,7 +1918,7 @@ class getid3_id3v2 extends getid3_handler $frame_offset += 2; $parsedFrame['bitsperpoint'] = ord(substr($parsedFrame['data'], $frame_offset++, 1)); $frame_bytesperpoint = ceil($parsedFrame['bitsperpoint'] / 8); - for ($i = 0; $i < $frame_indexpoints; $i++) { + for ($i = 0; $i < $parsedFrame['indexpoints']; $i++) { $parsedFrame['indexes'][$i] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, $frame_bytesperpoint)); $frame_offset += $frame_bytesperpoint; } @@ -1933,6 +1966,186 @@ class getid3_id3v2 extends getid3_handler unset($parsedFrame['data']); + } elseif (($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'CHAP')) { // CHAP Chapters frame (ID3v2.3+ only) + // http://id3.org/id3v2-chapters-1.0 + // (10 bytes) + // Element ID $00 + // Start time $xx xx xx xx + // End time $xx xx xx xx + // Start offset $xx xx xx xx + // End offset $xx xx xx xx + // + + $frame_offset = 0; + @list($parsedFrame['element_id']) = explode("\x00", $parsedFrame['data'], 2); + $frame_offset += strlen($parsedFrame['element_id']."\x00"); + $parsedFrame['time_begin'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4)); + $frame_offset += 4; + $parsedFrame['time_end'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4)); + $frame_offset += 4; + if (substr($parsedFrame['data'], $frame_offset, 4) != "\xFF\xFF\xFF\xFF") { + // "If these bytes are all set to 0xFF then the value should be ignored and the start time value should be utilized." + $parsedFrame['offset_begin'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4)); + } + $frame_offset += 4; + if (substr($parsedFrame['data'], $frame_offset, 4) != "\xFF\xFF\xFF\xFF") { + // "If these bytes are all set to 0xFF then the value should be ignored and the start time value should be utilized." + $parsedFrame['offset_end'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4)); + } + $frame_offset += 4; + + if ($frame_offset < strlen($parsedFrame['data'])) { + $parsedFrame['subframes'] = array(); + while ($frame_offset < strlen($parsedFrame['data'])) { + // + $subframe = array(); + $subframe['name'] = substr($parsedFrame['data'], $frame_offset, 4); + $frame_offset += 4; + $subframe['size'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4)); + $frame_offset += 4; + $subframe['flags_raw'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 2)); + $frame_offset += 2; + if ($subframe['size'] > (strlen($parsedFrame['data']) - $frame_offset)) { + $info['warning'][] = 'CHAP subframe "'.$subframe['name'].'" at frame offset '.$frame_offset.' claims to be "'.$subframe['size'].'" bytes, which is more than the available data ('.(strlen($parsedFrame['data']) - $frame_offset).' bytes)'; + break; + } + $subframe_rawdata = substr($parsedFrame['data'], $frame_offset, $subframe['size']); + $frame_offset += $subframe['size']; + + $subframe['encodingid'] = ord(substr($subframe_rawdata, 0, 1)); + $subframe['text'] = substr($subframe_rawdata, 1); + $subframe['encoding'] = $this->TextEncodingNameLookup($subframe['encodingid']); + $encoding_converted_text = trim(getid3_lib::iconv_fallback($subframe['encoding'], $info['encoding'], $subframe['text']));; + switch (substr($encoding_converted_text, 0, 2)) { + case "\xFF\xFE": + case "\xFE\xFF": + switch (strtoupper($info['id3v2']['encoding'])) { + case 'ISO-8859-1': + case 'UTF-8': + $encoding_converted_text = substr($encoding_converted_text, 2); + // remove unwanted byte-order-marks + break; + default: + // ignore + break; + } + break; + default: + // do not remove BOM + break; + } + + if (($subframe['name'] == 'TIT2') || ($subframe['name'] == 'TIT3')) { + if ($subframe['name'] == 'TIT2') { + $parsedFrame['chapter_name'] = $encoding_converted_text; + } elseif ($subframe['name'] == 'TIT3') { + $parsedFrame['chapter_description'] = $encoding_converted_text; + } + $parsedFrame['subframes'][] = $subframe; + } else { + $info['warning'][] = 'ID3v2.CHAP subframe "'.$subframe['name'].'" not handled (only TIT2 and TIT3)'; + } + } + unset($subframe_rawdata, $subframe, $encoding_converted_text); + } + + $id3v2_chapter_entry = array(); + foreach (array('id', 'time_begin', 'time_end', 'offset_begin', 'offset_end', 'chapter_name', 'chapter_description') as $id3v2_chapter_key) { + if (isset($parsedFrame[$id3v2_chapter_key])) { + $id3v2_chapter_entry[$id3v2_chapter_key] = $parsedFrame[$id3v2_chapter_key]; + } + } + if (!isset($info['id3v2']['chapters'])) { + $info['id3v2']['chapters'] = array(); + } + $info['id3v2']['chapters'][] = $id3v2_chapter_entry; + unset($id3v2_chapter_entry, $id3v2_chapter_key); + + + } elseif (($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'CTOC')) { // CTOC Chapters Table Of Contents frame (ID3v2.3+ only) + // http://id3.org/id3v2-chapters-1.0 + // (10 bytes) + // Element ID $00 + // CTOC flags %xx + // Entry count $xx + // Child Element ID $00 /* zero or more child CHAP or CTOC entries */ + // + + $frame_offset = 0; + @list($parsedFrame['element_id']) = explode("\x00", $parsedFrame['data'], 2); + $frame_offset += strlen($parsedFrame['element_id']."\x00"); + $ctoc_flags_raw = ord(substr($parsedFrame['data'], $frame_offset, 1)); + $frame_offset += 1; + $parsedFrame['entry_count'] = ord(substr($parsedFrame['data'], $frame_offset, 1)); + $frame_offset += 1; + + $terminator_position = null; + for ($i = 0; $i < $parsedFrame['entry_count']; $i++) { + $terminator_position = strpos($parsedFrame['data'], "\x00", $frame_offset); + $parsedFrame['child_element_ids'][$i] = substr($parsedFrame['data'], $frame_offset, $terminator_position - $frame_offset); + $frame_offset = $terminator_position + 1; + } + + $parsedFrame['ctoc_flags']['ordered'] = (bool) ($ctoc_flags_raw & 0x01); + $parsedFrame['ctoc_flags']['top_level'] = (bool) ($ctoc_flags_raw & 0x03); + + unset($ctoc_flags_raw, $terminator_position); + + if ($frame_offset < strlen($parsedFrame['data'])) { + $parsedFrame['subframes'] = array(); + while ($frame_offset < strlen($parsedFrame['data'])) { + // + $subframe = array(); + $subframe['name'] = substr($parsedFrame['data'], $frame_offset, 4); + $frame_offset += 4; + $subframe['size'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4)); + $frame_offset += 4; + $subframe['flags_raw'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 2)); + $frame_offset += 2; + if ($subframe['size'] > (strlen($parsedFrame['data']) - $frame_offset)) { + $info['warning'][] = 'CTOS subframe "'.$subframe['name'].'" at frame offset '.$frame_offset.' claims to be "'.$subframe['size'].'" bytes, which is more than the available data ('.(strlen($parsedFrame['data']) - $frame_offset).' bytes)'; + break; + } + $subframe_rawdata = substr($parsedFrame['data'], $frame_offset, $subframe['size']); + $frame_offset += $subframe['size']; + + $subframe['encodingid'] = ord(substr($subframe_rawdata, 0, 1)); + $subframe['text'] = substr($subframe_rawdata, 1); + $subframe['encoding'] = $this->TextEncodingNameLookup($subframe['encodingid']); + $encoding_converted_text = trim(getid3_lib::iconv_fallback($subframe['encoding'], $info['encoding'], $subframe['text']));; + switch (substr($encoding_converted_text, 0, 2)) { + case "\xFF\xFE": + case "\xFE\xFF": + switch (strtoupper($info['id3v2']['encoding'])) { + case 'ISO-8859-1': + case 'UTF-8': + $encoding_converted_text = substr($encoding_converted_text, 2); + // remove unwanted byte-order-marks + break; + default: + // ignore + break; + } + break; + default: + // do not remove BOM + break; + } + + if (($subframe['name'] == 'TIT2') || ($subframe['name'] == 'TIT3')) { + if ($subframe['name'] == 'TIT2') { + $parsedFrame['toc_name'] = $encoding_converted_text; + } elseif ($subframe['name'] == 'TIT3') { + $parsedFrame['toc_description'] = $encoding_converted_text; + } + $parsedFrame['subframes'][] = $subframe; + } else { + $info['warning'][] = 'ID3v2.CTOC subframe "'.$subframe['name'].'" not handled (only TIT2 and TIT3)'; + } + } + unset($subframe_rawdata, $subframe, $encoding_converted_text); + } + } return true; @@ -3333,7 +3546,7 @@ class getid3_id3v2 extends getid3_handler 3 => "\x00", // $03 UTF-8 encoded Unicode. Terminated with $00. 255 => "\x00\x00" ); - return (isset($TextEncodingTerminatorLookup[$encoding]) ? $TextEncodingTerminatorLookup[$encoding] : ''); + return (isset($TextEncodingTerminatorLookup[$encoding]) ? $TextEncodingTerminatorLookup[$encoding] : "\x00"); } public static function TextEncodingNameLookup($encoding) { diff --git a/wp-includes/ID3/module.tag.lyrics3.php b/wp-includes/ID3/module.tag.lyrics3.php index 108d7ae..419888b 100644 --- a/wp-includes/ID3/module.tag.lyrics3.php +++ b/wp-includes/ID3/module.tag.lyrics3.php @@ -3,6 +3,7 @@ /// getID3() by James Heinrich // // available at http://getid3.sourceforge.net // // or http://www.getid3.org // +// also https://github.com/JamesHeinrich/getID3 // ///////////////////////////////////////////////////////////////// // See readme.txt for more details // ///////////////////////////////////////////////////////////////// @@ -27,8 +28,8 @@ class getid3_lyrics3 extends getid3_handler return false; } - fseek($this->getid3->fp, (0 - 128 - 9 - 6), SEEK_END); // end - ID3v1 - "LYRICSEND" - [Lyrics3size] - $lyrics3_id3v1 = fread($this->getid3->fp, 128 + 9 + 6); + $this->fseek((0 - 128 - 9 - 6), SEEK_END); // end - ID3v1 - "LYRICSEND" - [Lyrics3size] + $lyrics3_id3v1 = $this->fread(128 + 9 + 6); $lyrics3lsz = substr($lyrics3_id3v1, 0, 6); // Lyrics3size $lyrics3end = substr($lyrics3_id3v1, 6, 9); // LYRICSEND or LYRICS200 $id3v1tag = substr($lyrics3_id3v1, 15, 128); // ID3v1 @@ -68,9 +69,9 @@ class getid3_lyrics3 extends getid3_handler if (isset($info['ape']['tag_offset_start']) && ($info['ape']['tag_offset_start'] > 15)) { - fseek($this->getid3->fp, $info['ape']['tag_offset_start'] - 15, SEEK_SET); - $lyrics3lsz = fread($this->getid3->fp, 6); - $lyrics3end = fread($this->getid3->fp, 9); + $this->fseek($info['ape']['tag_offset_start'] - 15); + $lyrics3lsz = $this->fread(6); + $lyrics3end = $this->fread(9); if ($lyrics3end == 'LYRICSEND') { // Lyrics3v1, APE, maybe ID3v1 @@ -100,8 +101,9 @@ class getid3_lyrics3 extends getid3_handler $this->getLyrics3Data($lyrics3offset, $lyrics3version, $lyrics3size); if (!isset($info['ape'])) { - $GETID3_ERRORARRAY = &$info['warning']; - if (getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.apetag.php', __FILE__, false)) { + if (isset($info['lyrics3']['tag_offset_start'])) { + $GETID3_ERRORARRAY = &$info['warning']; + getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.apetag.php', __FILE__, true); $getid3_temp = new getID3(); $getid3_temp->openfile($this->getid3->filename); $getid3_apetag = new getid3_apetag($getid3_temp); @@ -114,6 +116,8 @@ class getid3_lyrics3 extends getid3_handler $info['replay_gain'] = $getid3_temp->info['replay_gain']; } unset($getid3_temp, $getid3_apetag); + } else { + $info['warning'][] = 'Lyrics3 and APE tags appear to have become entangled (most likely due to updating the APE tags with a non-Lyrics3-aware tagger)'; } } @@ -132,11 +136,11 @@ class getid3_lyrics3 extends getid3_handler return false; } - fseek($this->getid3->fp, $endoffset, SEEK_SET); + $this->fseek($endoffset); if ($length <= 0) { return false; } - $rawdata = fread($this->getid3->fp, $length); + $rawdata = $this->fread($length); $ParsedLyrics3['raw']['lyrics3version'] = $version; $ParsedLyrics3['raw']['lyrics3tagsize'] = $length; @@ -169,7 +173,7 @@ class getid3_lyrics3 extends getid3_handler $ParsedLyrics3['raw']['LYR'] = trim(substr($rawdata, 11, strlen($rawdata) - 11 - 9)); $this->Lyrics3LyricsTimestampParse($ParsedLyrics3); } else { - $info['error'][] = '"LYRICSEND" expected at '.(ftell($this->getid3->fp) - 11 + $length - 9).' but found "'.substr($rawdata, strlen($rawdata) - 9, 9).'" instead'; + $info['error'][] = '"LYRICSEND" expected at '.($this->ftell() - 11 + $length - 9).' but found "'.substr($rawdata, strlen($rawdata) - 9, 9).'" instead'; return false; } break; @@ -217,7 +221,7 @@ class getid3_lyrics3 extends getid3_handler $this->Lyrics3LyricsTimestampParse($ParsedLyrics3); } } else { - $info['error'][] = '"LYRICS200" expected at '.(ftell($this->getid3->fp) - 11 + $length - 9).' but found "'.substr($rawdata, strlen($rawdata) - 9, 9).'" instead'; + $info['error'][] = '"LYRICS200" expected at '.($this->ftell() - 11 + $length - 9).' but found "'.substr($rawdata, strlen($rawdata) - 9, 9).'" instead'; return false; } break; diff --git a/wp-includes/ID3/readme.txt b/wp-includes/ID3/readme.txt index 337e84f..b627cc2 100644 --- a/wp-includes/ID3/readme.txt +++ b/wp-includes/ID3/readme.txt @@ -2,6 +2,7 @@ /// getID3() by James Heinrich // // available at http://getid3.sourceforge.net // // or http://www.getid3.org // +// also https://github.com/JamesHeinrich/getID3 // ///////////////////////////////////////////////////////////////// ***************************************************************** @@ -67,13 +68,13 @@ What does getID3() do? =========================================================================== Reads & parses (to varying degrees): -# tags: + Â¤ tags: * APE (v1 and v2) * ID3v1 (& ID3v1.1) * ID3v2 (v2.4, v2.3, v2.2) * Lyrics3 (v1 & v2) -# audio-lossy: + Â¤ audio-lossy: * MP3/MP2/MP1 * MPC / Musepack * Ogg (Vorbis, OggFLAC, Speex) @@ -85,7 +86,7 @@ Reads & parses (to varying degrees): * DSS * VQF -# audio-lossless: + Â¤ audio-lossless: * AIFF * AU * Bonk @@ -104,7 +105,7 @@ Reads & parses (to varying degrees): * WAV (RIFF) * WavPack -# audio-video: + Â¤ audio-video: * ASF: ASF, Windows Media Audio (WMA), Windows Media Video (WMV) * AVI (RIFF) * Flash @@ -114,7 +115,7 @@ Reads & parses (to varying degrees): * Quicktime (including MP4) * RealVideo -# still image: + Â¤ still image: * BMP * GIF * JPEG @@ -123,7 +124,7 @@ Reads & parses (to varying degrees): * SWF (Flash) * PhotoCD -# data: + Â¤ data: * ISO-9660 CD-ROM image (directory structure) * SZIP (limited support) * ZIP (directory structure) @@ -309,7 +310,7 @@ http://www.getid3.org/phpBB3/viewforum.php?f=7 (http://web.inter.nl.net/users/hvdh/lossless/lossless.htm) * Support for RIFF-INFO chunks * http://lotto.st-andrews.ac.uk/~njh/tag_interchange.html - (thanks Nick Humfrey ) + (thanks Nick Humfrey ) * http://abcavi.narod.ru/sof/abcavi/infotags.htm (thanks Kibi) * Better support for Bink video @@ -324,23 +325,23 @@ http://www.getid3.org/phpBB3/viewforum.php?f=7 * Support for IFF * Support for ICO * Support for ANI -* Support for EXE (comments, author, etc) (thanks p*quaedackers@planet*nl) +* Support for EXE (comments, author, etc) (thanks p*quaedackersÃplanet*nl) * Support for DVD-IFO (region, subtitles, aspect ratio, etc) - (thanks p*quaedackers@planet*nl) + (thanks p*quaedackersÃplanet*nl) * More complete support for SWF - parsing encapsulated MP3 and/or JPEG content - (thanks n8n8@yahoo*com) + (thanks n8n8Ãyahoo*com) * Support for a2b * Optional scan-through-frames for AVI verification - (thanks rockcohen@massive-interactive*nl) -* Support for TTF (thanks info@butterflyx*com) + (thanks rockcohenÃmassive-interactive*nl) +* Support for TTF (thanks infoÃbutterflyx*com) * Support for DSS (http://www.getid3.org/phpBB3/viewtopic.php?t=171) * Support for SMAF (http://smaf-yamaha.com/what/demo.html) http://www.getid3.org/phpBB3/viewtopic.php?t=182 * Support for AMR (http://www.getid3.org/phpBB3/viewtopic.php?t=195) * Support for 3gpp (http://www.getid3.org/phpBB3/viewtopic.php?t=195) -* Support for ID4 (http://www.wackysoft.cjb.net grizlyY2K@hotmail*com) +* Support for ID4 (http://www.wackysoft.cjb.net grizlyY2KÃhotmail*com) * Parse XML data returned in Ogg comments -* Parse XML data from Quicktime SMIL metafiles (klausrath@mac*com) +* Parse XML data from Quicktime SMIL metafiles (klausrathÃmac*com) * ID3v2 genre string creator function * More complete parsing of JPG * Support for all old-style ASF packets @@ -424,7 +425,7 @@ http://www.getid3.org/phpBB3/viewtopic.php?t=25 "movi" chunk that fits in the first 2GB, should issue error to show that playtime is incorrect. Other data should be mostly correct, assuming that data is constant throughout the file) - +* PHP <= v5 on Windows cannot read UTF-8 filenames Known Bugs/Issues in other programs @@ -600,4 +601,4 @@ Reference material: * http://cpansearch.perl.org/src/RGIBSON/Audio-DSS-0.02/lib/Audio/DSS.pm * http://trac.musepack.net/trac/wiki/SV8Specification * http://wyday.com/cuesharp/specification.php -* http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html +* http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html \ No newline at end of file diff --git a/wp-includes/SimplePie/Parse/Date.php b/wp-includes/SimplePie/Parse/Date.php index d51f500..88e46e0 100644 --- a/wp-includes/SimplePie/Parse/Date.php +++ b/wp-includes/SimplePie/Parse/Date.php @@ -331,6 +331,7 @@ class SimplePie_Parse_Date 'CCT' => 23400, 'CDT' => -18000, 'CEDT' => 7200, + 'CEST' => 7200, 'CET' => 3600, 'CGST' => -7200, 'CGT' => -10800, @@ -613,7 +614,7 @@ class SimplePie_Parse_Date * * @final * @access public - * @param callback $callback + * @param callable $callback */ public function add_callback($callback) { diff --git a/wp-includes/Text/Diff.php b/wp-includes/Text/Diff.php index dc24b67..edcdd3a 100644 --- a/wp-includes/Text/Diff.php +++ b/wp-includes/Text/Diff.php @@ -33,7 +33,7 @@ class Text_Diff { * Normally an array of two arrays, each * containing the lines from a file. */ - function Text_Diff($engine, $params) + function __construct( $engine, $params ) { // Backward compatibility workaround. if (!is_string($engine)) { @@ -55,6 +55,13 @@ class Text_Diff { $this->_edits = call_user_func_array(array($diff_engine, 'diff'), $params); } + /** + * PHP4 constructor. + */ + public function Text_Diff( $engine, $params ) { + self::__construct( $engine, $params ); + } + /** * Returns the array of differences. */ @@ -304,7 +311,7 @@ class Text_MappedDiff extends Text_Diff { * @param array $mapped_to_lines This array should have the same number * of elements as $to_lines. */ - function Text_MappedDiff($from_lines, $to_lines, + function __construct($from_lines, $to_lines, $mapped_from_lines, $mapped_to_lines) { assert(count($from_lines) == count($mapped_from_lines)); @@ -328,6 +335,15 @@ class Text_MappedDiff extends Text_Diff { } } + /** + * PHP4 constructor. + */ + public function Text_MappedDiff( $from_lines, $to_lines, + $mapped_from_lines, $mapped_to_lines ) { + self::__construct( $from_lines, $to_lines, + $mapped_from_lines, $mapped_to_lines ); + } + } /** @@ -366,7 +382,10 @@ class Text_Diff_Op { */ class Text_Diff_Op_copy extends Text_Diff_Op { - function Text_Diff_Op_copy($orig, $final = false) + /** + * PHP5 constructor. + */ + function __construct( $orig, $final = false ) { if (!is_array($final)) { $final = $orig; @@ -375,6 +394,13 @@ class Text_Diff_Op_copy extends Text_Diff_Op { $this->final = $final; } + /** + * PHP4 constructor. + */ + public function Text_Diff_Op_copy( $orig, $final = false ) { + self::__construct( $orig, $final ); + } + function &reverse() { $reverse = new Text_Diff_Op_copy($this->final, $this->orig); @@ -391,12 +417,22 @@ class Text_Diff_Op_copy extends Text_Diff_Op { */ class Text_Diff_Op_delete extends Text_Diff_Op { - function Text_Diff_Op_delete($lines) + /** + * PHP5 constructor. + */ + function __construct( $lines ) { $this->orig = $lines; $this->final = false; } + /** + * PHP4 constructor. + */ + public function Text_Diff_Op_delete( $lines ) { + self::__construct( $lines ); + } + function &reverse() { $reverse = new Text_Diff_Op_add($this->orig); @@ -413,12 +449,22 @@ class Text_Diff_Op_delete extends Text_Diff_Op { */ class Text_Diff_Op_add extends Text_Diff_Op { - function Text_Diff_Op_add($lines) + /** + * PHP5 constructor. + */ + function __construct( $lines ) { $this->final = $lines; $this->orig = false; } + /** + * PHP4 constructor. + */ + public function Text_Diff_Op_add( $lines ) { + self::__construct( $lines ); + } + function &reverse() { $reverse = new Text_Diff_Op_delete($this->final); @@ -435,12 +481,22 @@ class Text_Diff_Op_add extends Text_Diff_Op { */ class Text_Diff_Op_change extends Text_Diff_Op { - function Text_Diff_Op_change($orig, $final) + /** + * PHP5 constructor. + */ + function __construct( $orig, $final ) { $this->orig = $orig; $this->final = $final; } + /** + * PHP4 constructor. + */ + public function Text_Diff_Op_change( $orig, $final ) { + self::__construct( $orig, $final ); + } + function &reverse() { $reverse = new Text_Diff_Op_change($this->final, $this->orig); diff --git a/wp-includes/Text/Diff/Engine/string.php b/wp-includes/Text/Diff/Engine/string.php index 0f3b374..76a1111 100644 --- a/wp-includes/Text/Diff/Engine/string.php +++ b/wp-includes/Text/Diff/Engine/string.php @@ -10,13 +10,13 @@ * echo $renderer->render($diff); * * - * Copyright 2005 Örjan Persson + * Copyright 2005 Ãrjan Persson * Copyright 2005-2010 The Horde Project (http://www.horde.org/) * * See the enclosed file COPYING for license information (LGPL). If you did * not receive this file, see http://opensource.org/licenses/lgpl-license.php. * - * @author Örjan Persson + * @author Ãrjan Persson * @package Text_Diff * @since 0.2.0 */ diff --git a/wp-includes/Text/Diff/Renderer.php b/wp-includes/Text/Diff/Renderer.php index 95c6db4..712d985 100644 --- a/wp-includes/Text/Diff/Renderer.php +++ b/wp-includes/Text/Diff/Renderer.php @@ -33,7 +33,7 @@ class Text_Diff_Renderer { /** * Constructor. */ - function Text_Diff_Renderer($params = array()) + function __construct( $params = array() ) { foreach ($params as $param => $value) { $v = '_' . $param; @@ -43,6 +43,13 @@ class Text_Diff_Renderer { } } + /** + * PHP4 constructor. + */ + public function Text_Diff_Renderer( $params = array() ) { + self::__construct( $params ); + } + /** * Get any renderer parameters. * diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php index 2a5c3b1..c043aef 100644 --- a/wp-includes/admin-bar.php +++ b/wp-includes/admin-bar.php @@ -1,8 +1,10 @@ menu member var. @@ -58,12 +60,14 @@ add_action( 'admin_init', '_wp_admin_bar_init' ); * right before the admin bar is rendered. This also gives you access to the $post global, among others. * * @since 3.1.0 + * + * @global WP_Admin_Bar $wp_admin_bar */ function wp_admin_bar_render() { global $wp_admin_bar; if ( ! is_admin_bar_showing() || ! is_object( $wp_admin_bar ) ) - return false; + return; /** * Load all necessary admin bar items. @@ -92,8 +96,6 @@ function wp_admin_bar_render() { */ do_action( 'wp_after_admin_bar_render' ); } -add_action( 'wp_footer', 'wp_admin_bar_render', 1000 ); -add_action( 'in_admin_header', 'wp_admin_bar_render', 0 ); /** * Add the WordPress logo menu. @@ -105,11 +107,8 @@ add_action( 'in_admin_header', 'wp_admin_bar_render', 0 ); function wp_admin_bar_wp_menu( $wp_admin_bar ) { $wp_admin_bar->add_menu( array( 'id' => 'wp-logo', - 'title' => '', + 'title' => '', 'href' => self_admin_url( 'about.php' ), - 'meta' => array( - 'title' => __('About WordPress'), - ), ) ); if ( is_user_logged_in() ) { @@ -118,7 +117,7 @@ function wp_admin_bar_wp_menu( $wp_admin_bar ) { 'parent' => 'wp-logo', 'id' => 'about', 'title' => __('About WordPress'), - 'href' => self_admin_url( 'about.php' ), + 'href' => self_admin_url( 'about.php' ), ) ); } @@ -135,7 +134,7 @@ function wp_admin_bar_wp_menu( $wp_admin_bar ) { 'parent' => 'wp-logo-external', 'id' => 'documentation', 'title' => __('Documentation'), - 'href' => __('http://codex.wordpress.org/'), + 'href' => __('https://codex.wordpress.org/'), ) ); // Add forums link @@ -182,11 +181,18 @@ function wp_admin_bar_sidebar_toggle( $wp_admin_bar ) { function wp_admin_bar_my_account_item( $wp_admin_bar ) { $user_id = get_current_user_id(); $current_user = wp_get_current_user(); - $profile_url = get_edit_profile_url( $user_id ); if ( ! $user_id ) return; + if ( current_user_can( 'read' ) ) { + $profile_url = get_edit_profile_url( $user_id ); + } elseif ( is_multisite() ) { + $profile_url = get_dashboard_url( $user_id, 'profile.php' ); + } else { + $profile_url = false; + } + $avatar = get_avatar( $user_id, 26 ); $howdy = sprintf( __('Howdy, %1$s'), $current_user->display_name ); $class = empty( $avatar ) ? '' : 'with-avatar'; @@ -198,7 +204,6 @@ function wp_admin_bar_my_account_item( $wp_admin_bar ) { 'href' => $profile_url, 'meta' => array( 'class' => $class, - 'title' => __('My Account'), ), ) ); } @@ -213,11 +218,18 @@ function wp_admin_bar_my_account_item( $wp_admin_bar ) { function wp_admin_bar_my_account_menu( $wp_admin_bar ) { $user_id = get_current_user_id(); $current_user = wp_get_current_user(); - $profile_url = get_edit_profile_url( $user_id ); if ( ! $user_id ) return; + if ( current_user_can( 'read' ) ) { + $profile_url = get_edit_profile_url( $user_id ); + } elseif ( is_multisite() ) { + $profile_url = get_dashboard_url( $user_id, 'profile.php' ); + } else { + $profile_url = false; + } + $wp_admin_bar->add_group( array( 'parent' => 'my-account', 'id' => 'user-actions', @@ -238,12 +250,16 @@ function wp_admin_bar_my_account_menu( $wp_admin_bar ) { 'tabindex' => -1, ), ) ); - $wp_admin_bar->add_menu( array( - 'parent' => 'user-actions', - 'id' => 'edit-profile', - 'title' => __( 'Edit My Profile' ), - 'href' => $profile_url, - ) ); + + if ( false !== $profile_url ) { + $wp_admin_bar->add_menu( array( + 'parent' => 'user-actions', + 'id' => 'edit-profile', + 'title' => __( 'Edit My Profile' ), + 'href' => $profile_url, + ) ); + } + $wp_admin_bar->add_menu( array( 'parent' => 'user-actions', 'id' => 'logout', @@ -270,13 +286,14 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) { $blogname = get_bloginfo('name'); - if ( empty( $blogname ) ) + if ( ! $blogname ) { $blogname = preg_replace( '#^(https?://)?(www.)?#', '', get_home_url() ); + } if ( is_network_admin() ) { $blogname = sprintf( __('Network Admin: %s'), esc_html( get_current_site()->site_name ) ); } elseif ( is_user_admin() ) { - $blogname = sprintf( __('Global Dashboard: %s'), esc_html( get_current_site()->site_name ) ); + $blogname = sprintf( __('User Dashboard: %s'), esc_html( get_current_site()->site_name ) ); } $title = wp_html_excerpt( $blogname, 40, '…' ); @@ -284,7 +301,7 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) { $wp_admin_bar->add_menu( array( 'id' => 'site-name', 'title' => $title, - 'href' => is_admin() ? home_url( '/' ) : admin_url(), + 'href' => ( is_admin() || ! current_user_can( 'read' ) ) ? home_url( '/' ) : admin_url(), ) ); // Create submenu items. @@ -307,7 +324,7 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) { ) ); } - } else { + } else if ( current_user_can( 'read' ) ) { // We're on the front end, link to the Dashboard. $wp_admin_bar->add_menu( array( 'parent' => 'site-name', @@ -321,6 +338,33 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) { } } +/** + * Adds the "Customize" link to the Toolbar. + * + * @since 4.3.0 + * + * @param WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance. + */ +function wp_admin_bar_customize_menu( $wp_admin_bar ) { + // Don't show for users who can't access the customizer or when in the admin. + if ( ! current_user_can( 'customize' ) || is_admin() ) { + return; + } + + $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; + $customize_url = add_query_arg( 'url', urlencode( $current_url ), wp_customize_url() ); + + $wp_admin_bar->add_menu( array( + 'id' => 'customize', + 'title' => __( 'Customize' ), + 'href' => $customize_url, + 'meta' => array( + 'class' => 'hide-if-no-customize', + ), + ) ); + add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' ); +} + /** * Add the "My Sites/[Site Name]" menu and all submenus. * @@ -337,10 +381,16 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) { if ( count( $wp_admin_bar->user->blogs ) < 1 && ! is_super_admin() ) return; + if ( $wp_admin_bar->user->active_blog ) { + $my_sites_url = get_admin_url( $wp_admin_bar->user->active_blog->blog_id, 'my-sites.php' ); + } else { + $my_sites_url = admin_url( 'my-sites.php' ); + } + $wp_admin_bar->add_menu( array( 'id' => 'my-sites', 'title' => __( 'My Sites' ), - 'href' => admin_url( 'my-sites.php' ), + 'href' => $my_sites_url, ) ); if ( is_super_admin() ) { @@ -386,6 +436,12 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) { 'title' => __( 'Plugins' ), 'href' => network_admin_url( 'plugins.php' ), ) ); + $wp_admin_bar->add_menu( array( + 'parent' => 'network-admin', + 'id' => 'network-admin-o', + 'title' => __( 'Settings' ), + 'href' => network_admin_url( 'settings.php' ), + ) ); } // Add site links @@ -402,7 +458,12 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) { $blavatar = '

'; - $blogname = empty( $blog->blogname ) ? $blog->domain : $blog->blogname; + $blogname = $blog->blogname; + + if ( ! $blogname ) { + $blogname = preg_replace( '#^(https?://)?(www.)?#', '', get_home_url() ); + } + $menu_id = 'blog-' . $blog->userblog_id; $wp_admin_bar->add_menu( array( @@ -477,6 +538,9 @@ function wp_admin_bar_shortlink_menu( $wp_admin_bar ) { * * @since 3.1.0 * + * @global WP_Term $tag + * @global WP_Query $wp_the_query + * * @param WP_Admin_Bar $wp_admin_bar */ function wp_admin_bar_edit_menu( $wp_admin_bar ) { @@ -493,13 +557,23 @@ function wp_admin_bar_edit_menu( $wp_admin_bar ) { && ( $post_type_object->public ) && ( $post_type_object->show_in_admin_bar ) ) { - $wp_admin_bar->add_menu( array( - 'id' => 'view', - 'title' => $post_type_object->labels->view_item, - 'href' => get_permalink( $post->ID ) - ) ); - } elseif ( 'edit-tags' == $current_screen->base - && isset( $tag ) && is_object( $tag ) + if ( 'draft' == $post->post_status ) { + $preview_link = get_preview_post_link( $post ); + $wp_admin_bar->add_menu( array( + 'id' => 'preview', + 'title' => $post_type_object->labels->view_item, + 'href' => esc_url( $preview_link ), + 'meta' => array( 'target' => 'wp-preview-' . $post->ID ), + ) ); + } else { + $wp_admin_bar->add_menu( array( + 'id' => 'view', + 'title' => $post_type_object->labels->view_item, + 'href' => get_permalink( $post->ID ) + ) ); + } + } elseif ( 'term' == $current_screen->base + && isset( $tag ) && is_object( $tag ) && ! is_wp_error( $tag ) && ( $tax = get_taxonomy( $tag->taxonomy ) ) && $tax->public ) { @@ -518,22 +592,23 @@ function wp_admin_bar_edit_menu( $wp_admin_bar ) { if ( ! empty( $current_object->post_type ) && ( $post_type_object = get_post_type_object( $current_object->post_type ) ) && current_user_can( 'edit_post', $current_object->ID ) - && $post_type_object->show_ui && $post_type_object->show_in_admin_bar ) + && $post_type_object->show_in_admin_bar + && $edit_post_link = get_edit_post_link( $current_object->ID ) ) { $wp_admin_bar->add_menu( array( 'id' => 'edit', 'title' => $post_type_object->labels->edit_item, - 'href' => get_edit_post_link( $current_object->ID ) + 'href' => $edit_post_link ) ); } elseif ( ! empty( $current_object->taxonomy ) && ( $tax = get_taxonomy( $current_object->taxonomy ) ) && current_user_can( $tax->cap->edit_terms ) - && $tax->show_ui ) + && $edit_term_link = get_edit_term_link( $current_object->term_id, $current_object->taxonomy ) ) { $wp_admin_bar->add_menu( array( 'id' => 'edit', 'title' => $tax->labels->edit_item, - 'href' => get_edit_term_link( $current_object->term_id, $current_object->taxonomy ) + 'href' => $edit_term_link ) ); } } @@ -589,9 +664,6 @@ function wp_admin_bar_new_content_menu( $wp_admin_bar ) { 'id' => 'new-content', 'title' => $title, 'href' => admin_url( current( array_keys( $actions ) ) ), - 'meta' => array( - 'title' => _x( 'Add New', 'admin bar menu group label' ), - ), ) ); foreach ( $actions as $link => $action ) { @@ -619,16 +691,16 @@ function wp_admin_bar_comments_menu( $wp_admin_bar ) { $awaiting_mod = wp_count_comments(); $awaiting_mod = $awaiting_mod->moderated; - $awaiting_title = esc_attr( sprintf( _n( '%s comment awaiting moderation', '%s comments awaiting moderation', $awaiting_mod ), number_format_i18n( $awaiting_mod ) ) ); + $awaiting_text = sprintf( _n( '%s comment awaiting moderation', '%s comments awaiting moderation', $awaiting_mod ), number_format_i18n( $awaiting_mod ) ); $icon = ''; - $title = '' . number_format_i18n( $awaiting_mod ) . ''; + $title = ''; + $title .= ''; $wp_admin_bar->add_menu( array( 'id' => 'comments', 'title' => $icon . $title, 'href' => admin_url('edit-comments.php'), - 'meta' => array( 'title' => $awaiting_title ), ) ); } @@ -642,35 +714,55 @@ function wp_admin_bar_comments_menu( $wp_admin_bar ) { function wp_admin_bar_appearance_menu( $wp_admin_bar ) { $wp_admin_bar->add_group( array( 'parent' => 'site-name', 'id' => 'appearance' ) ); - if ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) ) - $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'themes', 'title' => __('Themes'), 'href' => admin_url('themes.php') ) ); + if ( current_user_can( 'switch_themes' ) ) { + $wp_admin_bar->add_menu( array( + 'parent' => 'appearance', + 'id' => 'themes', + 'title' => __( 'Themes' ), + 'href' => admin_url( 'themes.php' ), + ) ); + } - if ( ! current_user_can( 'edit_theme_options' ) ) + if ( ! current_user_can( 'edit_theme_options' ) ) { return; + } - $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; - $wp_admin_bar->add_menu( array( - 'parent' => 'appearance', - 'id' => 'customize', - 'title' => __('Customize'), - 'href' => add_query_arg( 'url', urlencode( $current_url ), wp_customize_url() ), - 'meta' => array( - 'class' => 'hide-if-no-customize', - ), - ) ); - add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' ); - - if ( current_theme_supports( 'widgets' ) ) - $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'widgets', 'title' => __('Widgets'), 'href' => admin_url('widgets.php') ) ); + if ( current_theme_supports( 'widgets' ) ) { + $wp_admin_bar->add_menu( array( + 'parent' => 'appearance', + 'id' => 'widgets', + 'title' => __( 'Widgets' ), + 'href' => admin_url( 'widgets.php' ), + ) ); + } if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) ) $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'menus', 'title' => __('Menus'), 'href' => admin_url('nav-menus.php') ) ); - if ( current_theme_supports( 'custom-background' ) ) - $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'background', 'title' => __('Background'), 'href' => admin_url('themes.php?page=custom-background') ) ); + if ( current_theme_supports( 'custom-background' ) ) { + $wp_admin_bar->add_menu( array( + 'parent' => 'appearance', + 'id' => 'background', + 'title' => __( 'Background' ), + 'href' => admin_url( 'themes.php?page=custom-background' ), + 'meta' => array( + 'class' => 'hide-if-customize', + ), + ) ); + } + + if ( current_theme_supports( 'custom-header' ) ) { + $wp_admin_bar->add_menu( array( + 'parent' => 'appearance', + 'id' => 'header', + 'title' => __( 'Header' ), + 'href' => admin_url( 'themes.php?page=custom-header' ), + 'meta' => array( + 'class' => 'hide-if-customize', + ), + ) ); + } - if ( current_theme_supports( 'custom-header' ) ) - $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'header', 'title' => __('Header'), 'href' => admin_url('themes.php?page=custom-header') ) ); } /** @@ -713,6 +805,7 @@ function wp_admin_bar_search_menu( $wp_admin_bar ) { $form = ''; @@ -785,8 +878,9 @@ function _admin_bar_bump_cb() { ?> * * @since 3.1.0 * + * @global bool $show_admin_bar + * * @param bool $show Whether to allow the admin bar to show. - * @return void */ function show_admin_bar( $show ) { global $show_admin_bar; @@ -798,6 +892,9 @@ function show_admin_bar( $show ) { * * @since 3.1.0 * + * @global bool $show_admin_bar + * @global string $pagenow + * * @return bool Whether the admin bar should be showing. */ function is_admin_bar_showing() { @@ -807,6 +904,10 @@ function is_admin_bar_showing() { if ( defined('XMLRPC_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') ) return false; + if ( is_embed() ) { + return false; + } + // Integrated into the admin. if ( is_admin() ) return true; diff --git a/wp-includes/atomlib.php b/wp-includes/atomlib.php index 9d34276..271635f 100644 --- a/wp-includes/atomlib.php +++ b/wp-includes/atomlib.php @@ -87,7 +87,10 @@ class AtomParser { var $feed; var $current; - function AtomParser() { + /** + * PHP5 constructor. + */ + function __construct() { $this->feed = new AtomFeed(); $this->current = null; @@ -95,6 +98,13 @@ class AtomParser { $this->map_xmlns_func = create_function('$p,$n', '$xd = "xmlns"; if(strlen($n[0])>0) $xd .= ":{$n[0]}"; return "{$xd}=\"{$n[1]}\"";'); } + /** + * PHP4 constructor. + */ + public function AtomParser() { + self::__construct(); + } + function _p($msg) { if($this->debug) { print str_repeat(" ", $this->depth * $this->indent) . $msg ."\n"; @@ -130,7 +140,8 @@ class AtomParser { if($this->debug) $this->content .= $data; if(!xml_parse($parser, $data, feof($fp))) { - trigger_error(sprintf(__('XML error: %s at line %d')."\n", + /* translators: 1: error message, 2: line number */ + trigger_error(sprintf(__('XML Error: %1$s at line %2$s')."\n", xml_error_string(xml_get_error_code($parser)), xml_get_current_line_number($parser))); $ret = false; diff --git a/wp-includes/author-template.php b/wp-includes/author-template.php index dd225c0..ba609ab 100644 --- a/wp-includes/author-template.php +++ b/wp-includes/author-template.php @@ -4,7 +4,7 @@ * * These functions must be used within the WordPress Loop. * - * @link http://codex.wordpress.org/Author_Templates + * @link https://codex.wordpress.org/Author_Templates * * @package WordPress * @subpackage Template @@ -15,11 +15,10 @@ * * @since 1.5.0 * - * @uses $authordata The current author's DB object. - * @uses apply_filters() Calls 'the_author' hook on the author display name. + * @global object $authordata The current author's DB object. * * @param string $deprecated Deprecated. - * @return string The author's display name. + * @return string|null The author's display name. */ function get_the_author($deprecated = '') { global $authordata; @@ -50,19 +49,30 @@ function get_the_author($deprecated = '') { * * @since 0.71 * @see get_the_author() - * @link http://codex.wordpress.org/Template_Tags/the_author + * @link https://codex.wordpress.org/Template_Tags/the_author * * @param string $deprecated Deprecated. * @param string $deprecated_echo Deprecated. Use get_the_author(). Echo the string or return it. - * @return string The author's display name, from get_the_author(). + * @return string|null The author's display name, from get_the_author(). */ function the_author( $deprecated = '', $deprecated_echo = true ) { - if ( !empty( $deprecated ) ) + if ( ! empty( $deprecated ) ) { _deprecated_argument( __FUNCTION__, '2.1' ); - if ( $deprecated_echo !== true ) - _deprecated_argument( __FUNCTION__, '1.5', __('Use get_the_author() instead if you do not want the value echoed.') ); - if ( $deprecated_echo ) + } + + if ( true !== $deprecated_echo ) { + _deprecated_argument( __FUNCTION__, '1.5', + /* translators: %s: get_the_author() */ + sprintf( __( 'Use %s instead if you do not want the value echoed.' ), + 'get_the_author()' + ) + ); + } + + if ( $deprecated_echo ) { echo get_the_author(); + } + return get_the_author(); } @@ -71,11 +81,7 @@ function the_author( $deprecated = '', $deprecated_echo = true ) { * * @since 2.8.0 * - * @uses $post The current post's DB object. - * @uses get_post_meta() Retrieves the ID of the author who last edited the current post. - * @uses get_userdata() Retrieves the author's DB object. - * @uses apply_filters() Calls 'the_modified_author' hook on the author display name. - * @return string The author's display name. + * @return string|void The author's display name. */ function get_the_modified_author() { if ( $last_id = get_post_meta( get_post()->ID, '_edit_last', true) ) { @@ -93,12 +99,12 @@ function get_the_modified_author() { } /** - * Display the name of the author who last edited the current post. + * Display the name of the author who last edited the current post, + * if the author's ID is available. * * @since 2.8.0 * * @see get_the_author() - * @return string The author's display name, from get_the_modified_author(). */ function the_modified_author() { echo get_the_modified_author(); @@ -106,14 +112,18 @@ function the_modified_author() { /** * Retrieve the requested data of the author of the current post. - * @link http://codex.wordpress.org/Template_Tags/the_author_meta + * @link https://codex.wordpress.org/Template_Tags/the_author_meta * @since 2.8.0 - * @uses $authordata The current author's DB object (if $user_id not specified). + * + * @global object $authordata The current author's DB object. + * * @param string $field selects the field of the users record. * @param int $user_id Optional. User ID. * @return string The author's field from the current author's DB object. */ function get_the_author_meta( $field = '', $user_id = false ) { + $original_user_id = $user_id; + if ( ! $user_id ) { global $authordata; $user_id = isset( $authordata->ID ) ? $authordata->ID : 0; @@ -132,20 +142,24 @@ function get_the_author_meta( $field = '', $user_id = false ) { * The filter name is dynamic and depends on the $field parameter of the function. * * @since 2.8.0 + * @since 4.3.0 The `$original_user_id` parameter was added. * - * @param string $value The value of the metadata. - * @param int $user_id The user ID. + * @param string $value The value of the metadata. + * @param int $user_id The user ID for the value. + * @param int|bool $original_user_id The original user ID, as passed to the function. */ - return apply_filters( 'get_the_author_' . $field, $value, $user_id ); + return apply_filters( 'get_the_author_' . $field, $value, $user_id, $original_user_id ); } /** - * Retrieve the requested data of the author of the current post. - * @link http://codex.wordpress.org/Template_Tags/the_author_meta + * Outputs the field from the user's DB object. Defaults to current post's author. + * + * @link https://codex.wordpress.org/Template_Tags/the_author_meta + * * @since 2.8.0 + * * @param string $field selects the field of the users record. * @param int $user_id Optional. User ID. - * @echo string The author's field from the current author's DB object. */ function the_author_meta( $field = '', $user_id = false ) { $author_meta = get_the_author_meta( $field, $user_id ); @@ -169,8 +183,8 @@ function the_author_meta( $field = '', $user_id = false ) { * If the author has a home page set, return an HTML link, otherwise just return the * author's name. * - * @uses get_the_author_meta() - * @uses get_the_author() + * @return string|null An HTML link if the author's url exist in user meta, + * else the result of get_the_author(). */ function get_the_author_link() { if ( get_the_author_meta('url') ) { @@ -186,11 +200,9 @@ function get_the_author_link() { * If the author has a home page set, echo an HTML link, otherwise just echo the * author's name. * - * @link http://codex.wordpress.org/Template_Tags/the_author_link + * @link https://codex.wordpress.org/Template_Tags/the_author_link * * @since 2.1.0 - * - * @uses get_the_author_link() */ function the_author_link() { echo get_the_author_link(); @@ -201,46 +213,43 @@ function the_author_link() { * * @since 1.5.0 * - * @uses $post The current post in the Loop's DB object. - * @uses count_user_posts() * @return int The number of posts by the author. */ function get_the_author_posts() { - return count_user_posts( get_post()->post_author ); + $post = get_post(); + if ( ! $post ) { + return 0; + } + return count_user_posts( $post->post_author, $post->post_type ); } /** * Display the number of posts by the author of the current post. * - * @link http://codex.wordpress.org/Template_Tags/the_author_posts + * @link https://codex.wordpress.org/Template_Tags/the_author_posts * @since 0.71 - * @uses get_the_author_posts() Echoes returned value from function. */ function the_author_posts() { echo get_the_author_posts(); } /** - * Display an HTML link to the author page of the author of the current post. + * Retrieves an HTML link to the author page of the current post's author. * - * Does just echo get_author_posts_url() function, like the others do. The - * reason for this, is that another function is used to help in printing the - * link to the author's posts. + * Returns an HTML-formatted link using get_author_posts_url(). * - * @link http://codex.wordpress.org/Template_Tags/the_author_posts_link - * @since 1.2.0 - * @uses $authordata The current author's DB object. - * @uses get_author_posts_url() - * @uses get_the_author() - * @param string $deprecated Deprecated. + * @since 4.4.0 + * + * @global object $authordata The current author's DB object. + * + * @return string An HTML link to the author page. */ -function the_author_posts_link($deprecated = '') { - if ( !empty( $deprecated ) ) - _deprecated_argument( __FUNCTION__, '2.1' ); - +function get_the_author_posts_link() { global $authordata; - if ( !is_object( $authordata ) ) - return false; + if ( ! is_object( $authordata ) ) { + return; + } + $link = sprintf( '%3$s', esc_url( get_author_posts_url( $authordata->ID, $authordata->user_nicename ) ), @@ -255,17 +264,36 @@ function the_author_posts_link($deprecated = '') { * * @param string $link HTML link. */ - echo apply_filters( 'the_author_posts_link', $link ); + return apply_filters( 'the_author_posts_link', $link ); +} + +/** + * Displays an HTML link to the author page of the current post's author. + * + * @since 1.2.0 + * @since 4.4.0 Converted into a wrapper for get_the_author_posts_link() + * + * @param string $deprecated Unused. + */ +function the_author_posts_link( $deprecated = '' ) { + if ( ! empty( $deprecated ) ) { + _deprecated_argument( __FUNCTION__, '2.1' ); + } + echo get_the_author_posts_link(); } /** * Retrieve the URL to the author page for the user with the ID provided. * * @since 2.1.0 - * @uses $wp_rewrite WP_Rewrite + * + * @global WP_Rewrite $wp_rewrite + * + * @param int $author_id Author ID. + * @param string $author_nicename Optional. The author's nicename (slug). Default empty. * @return string The URL to the author's page. */ -function get_author_posts_url($author_id, $author_nicename = '') { +function get_author_posts_url( $author_id, $author_nicename = '' ) { global $wp_rewrite; $auth_ID = (int) $author_id; $link = $wp_rewrite->get_author_permastruct(); @@ -298,34 +326,41 @@ function get_author_posts_url($author_id, $author_nicename = '') { } /** - * List all the authors of the blog, with several options available. - * - *

optioncount (boolean) (false): Show the count in parenthesis next to the - * author's name.
exclude_admin (boolean) (true): Exclude the 'admin' user that is - * installed by default.
show_fullname (boolean) (false): Show their full names.
hide_empty (boolean) (true): Don't show authors without any posts.
feed (string) (''): If isn't empty, show links to author's feeds.
feed_image (string) (''): If isn't empty, use this image to link to - * feeds.
echo (boolean) (true): Set to false to return the output, instead of - * echoing.
style (string) ('list'): Whether to display list of authors in list form - * or as a string.
html (bool) (true): Whether to list the items in html form or plaintext. - *
exclude (array): Array of user IDs to explicitly exclude.
include (array): Array of user IDs to explicitly include.

- * - * @link http://codex.wordpress.org/Template_Tags/wp_list_authors + * List all the authors of the site, with several options available. + * + * @link https://codex.wordpress.org/Template_Tags/wp_list_authors + * * @since 1.2.0 - * @param array $args The argument array. - * @return null|string The output, if echo is set to false. + * + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string|array $args { + * Optional. Array or string of default arguments. + * + * @type string $orderby How to sort the authors. Accepts 'nicename', 'email', 'url', 'registered', + * 'user_nicename', 'user_email', 'user_url', 'user_registered', 'name', + * 'display_name', 'post_count', 'ID', 'meta_value', 'user_login'. Default 'name'. + * @type string $order Sorting direction for $orderby. Accepts 'ASC', 'DESC'. Default 'ASC'. + * @type int $number Maximum authors to return or display. Default empty (all authors). + * @type bool $optioncount Show the count in parenthesis next to the author's name. Default false. + * @type bool $exclude_admin Whether to exclude the 'admin' account, if it exists. Default false. + * @type bool $show_fullname Whether to show the author's full name. Default false. + * @type bool $hide_empty Whether to hide any authors with no posts. Default true. + * @type string $feed If not empty, show a link to the author's feed and use this text as the alt + * parameter of the link. Default empty. + * @type string $feed_image If not empty, show a link to the author's feed and use this image URL as + * clickable anchor. Default empty. + * @type string $feed_type The feed type to link to, such as 'rss2'. Defaults to default feed type. + * @type bool $echo Whether to output the result or instead return it. Default true. + * @type string $style If 'list', each author is wrapped in an `

` element, otherwise the authors + * will be separated by commas. + * @type bool $html Whether to list the items in HTML form or plaintext. Default true. + * @type string $exclude An array, comma-, or space-separated list of author IDs to exclude. Default empty. + * @type string $exclude An array, comma-, or space-separated list of author IDs to include. Default empty. + * } + * @return string|void The output, if echo is set to false. */ -function wp_list_authors($args = '') { +function wp_list_authors( $args = '' ) { global $wpdb; $defaults = array( @@ -337,7 +372,6 @@ function wp_list_authors($args = '') { ); $args = wp_parse_args( $args, $defaults ); - extract( $args, EXTR_SKIP ); $return = ''; @@ -346,78 +380,82 @@ function wp_list_authors($args = '') { $authors = get_users( $query_args ); $author_count = array(); - foreach ( (array) $wpdb->get_results("SELECT DISTINCT post_author, COUNT(ID) AS count FROM $wpdb->posts WHERE post_type = 'post' AND " . get_private_posts_cap_sql( 'post' ) . " GROUP BY post_author") as $row ) + foreach ( (array) $wpdb->get_results( "SELECT DISTINCT post_author, COUNT(ID) AS count FROM $wpdb->posts WHERE " . get_private_posts_cap_sql( 'post' ) . " GROUP BY post_author" ) as $row ) { $author_count[$row->post_author] = $row->count; - + } foreach ( $authors as $author_id ) { $author = get_userdata( $author_id ); - if ( $exclude_admin && 'admin' == $author->display_name ) + if ( $args['exclude_admin'] && 'admin' == $author->display_name ) { continue; + } $posts = isset( $author_count[$author->ID] ) ? $author_count[$author->ID] : 0; - if ( !$posts && $hide_empty ) + if ( ! $posts && $args['hide_empty'] ) { continue; + } - $link = ''; - - if ( $show_fullname && $author->first_name && $author->last_name ) + if ( $args['show_fullname'] && $author->first_name && $author->last_name ) { $name = "$author->first_name $author->last_name"; - else + } else { $name = $author->display_name; + } - if ( !$html ) { + if ( ! $args['html'] ) { $return .= $name . ', '; continue; // No need to go further to process HTML. } - if ( 'list' == $style ) { + if ( 'list' == $args['style'] ) { $return .= '

'; } $link = 'display_name) ) . '">' . $name . ''; - if ( !empty( $feed_image ) || !empty( $feed ) ) { + if ( ! empty( $args['feed_image'] ) || ! empty( $args['feed'] ) ) { $link .= ' '; - if ( empty( $feed_image ) ) { + if ( empty( $args['feed_image'] ) ) { $link .= '('; } - $link .= 'ID, $args['feed_type'] ) . '"'; $alt = ''; - if ( !empty( $feed ) ) { - $alt = ' alt="' . esc_attr( $feed ) . '"'; - $name = $feed; + if ( ! empty( $args['feed'] ) ) { + $alt = ' alt="' . esc_attr( $args['feed'] ) . '"'; + $name = $args['feed']; } $link .= '>'; - if ( !empty( $feed_image ) ) - $link .= '

'; - else + if ( ! empty( $args['feed_image'] ) ) { + $link .= '

'; + } else { $link .= $name; + } $link .= ''; - if ( empty( $feed_image ) ) + if ( empty( $args['feed_image'] ) ) { $link .= ')'; + } } - if ( $optioncount ) + if ( $args['optioncount'] ) { $link .= ' ('. $posts . ')'; + } $return .= $link; - $return .= ( 'list' == $style ) ? '

' : ', '; + $return .= ( 'list' == $args['style'] ) ? '' : ', '; } - $return = rtrim($return, ', '); + $return = rtrim( $return, ', ' ); - if ( !$echo ) + if ( ! $args['echo'] ) { return $return; - + } echo $return; } @@ -427,6 +465,9 @@ function wp_list_authors($args = '') { * Checks to see if more than one author has published posts. * * @since 3.2.0 + * + * @global wpdb $wpdb WordPress database abstraction object. + * * @return bool Whether or not we have more than one author */ function is_multi_author() { @@ -456,4 +497,3 @@ function is_multi_author() { function __clear_multi_author_cache() { delete_transient( 'is_multi_author' ); } -add_action('transition_post_status', '__clear_multi_author_cache'); diff --git a/wp-includes/bookmark-template.php b/wp-includes/bookmark-template.php index 1724590..47bfb4a 100644 --- a/wp-includes/bookmark-template.php +++ b/wp-includes/bookmark-template.php @@ -19,35 +19,36 @@ * This function is used internally by wp_list_bookmarks() and should not be * used by themes. * - * The defaults for overwriting are: - * 'show_updated' - Default is 0 (integer). Will show the time of when the - * bookmark was last updated. - * 'show_description' - Default is 0 (integer). Whether to show the description - * of the bookmark. - * 'show_images' - Default is 1 (integer). Whether to show link image if - * available. - * 'show_name' - Default is 0 (integer). Whether to show link name if - * available. - * 'before' - Default is '

' (string). The html or text to prepend to each - * bookmarks. - * 'after' - Default is '

' (string). The html or text to append to each - * bookmarks. - * 'link_before' - Default is '' (string). The html or text to prepend to each - * bookmarks inside the tag. - * 'link_after' - Default is '' (string). The html or text to append to each - * bookmarks inside the tag. - * 'between' - Default is '\n' (string). The string for use in between the link, - * description, and image. - * 'show_rating' - Default is 0 (integer). Whether to show the link rating. - * * @since 2.1.0 * @access private * - * @param array $bookmarks List of bookmarks to traverse - * @param string|array $args Optional. Overwrite the defaults. + * @param array $bookmarks List of bookmarks to traverse. + * @param string|array $args { + * Optional. Bookmarks arguments. + * + * @type int|bool $show_updated Whether to show the time the bookmark was last updated. + * Accepts 1|true or 0|false. Default 0|false. + * @type int|bool $show_description Whether to show the bookmakr description. Accepts 1|true, + * Accepts 1|true or 0|false. Default 0|false. + * @type int|bool $show_images Whether to show the link image if available. Accepts 1|true + * or 0|false. Default 1|true. + * @type int|bool $show_name Whether to show link name if available. Accepts 1|true or + * 0|false. Default 0|false. + * @type string $before The HTML or text to prepend to each bookmark. Default `

`. + * @type string $after The HTML or text to append to each bookmark. Default `

`. + * @type string $link_before The HTML or text to prepend to each bookmark inside the anchor + * tags. Default empty. + * @type string $link_after The HTML or text to append to each bookmark inside the anchor + * tags. Default empty. + * @type string $between The string for use in between the link, description, and image. + * Default "\n". + * @type int|bool $show_rating Whether to show the link rating. Accepts 1|true or 0|false. + * Default 0|false. + * + * } * @return string Formatted output in HTML */ -function _walk_bookmarks($bookmarks, $args = '' ) { +function _walk_bookmarks( $bookmarks, $args = '' ) { $defaults = array( 'show_updated' => 0, 'show_description' => 0, 'show_images' => 1, 'show_name' => 0, @@ -56,75 +57,89 @@ function _walk_bookmarks($bookmarks, $args = '' ) { ); $r = wp_parse_args( $args, $defaults ); - extract( $r, EXTR_SKIP ); $output = ''; // Blank string to start with. foreach ( (array) $bookmarks as $bookmark ) { - if ( !isset($bookmark->recently_updated) ) + if ( ! isset( $bookmark->recently_updated ) ) { $bookmark->recently_updated = false; - $output .= $before; - if ( $show_updated && $bookmark->recently_updated ) + } + $output .= $r['before']; + if ( $r['show_updated'] && $bookmark->recently_updated ) { $output .= ''; - + } $the_link = '#'; - if ( !empty($bookmark->link_url) ) - $the_link = esc_url($bookmark->link_url); - - $desc = esc_attr(sanitize_bookmark_field('link_description', $bookmark->link_description, $bookmark->link_id, 'display')); - $name = esc_attr(sanitize_bookmark_field('link_name', $bookmark->link_name, $bookmark->link_id, 'display')); + if ( ! empty( $bookmark->link_url ) ) { + $the_link = esc_url( $bookmark->link_url ); + } + $desc = esc_attr( sanitize_bookmark_field( 'link_description', $bookmark->link_description, $bookmark->link_id, 'display' ) ); + $name = esc_attr( sanitize_bookmark_field( 'link_name', $bookmark->link_name, $bookmark->link_id, 'display' ) ); $title = $desc; - if ( $show_updated ) - if ( '00' != substr($bookmark->link_updated_f, 0, 2) ) { + if ( $r['show_updated'] ) { + if ( '00' != substr( $bookmark->link_updated_f, 0, 2 ) ) { $title .= ' ('; - $title .= sprintf(__('Last updated: %s'), date(get_option('links_updated_date_format'), $bookmark->link_updated_f + (get_option('gmt_offset') * HOUR_IN_SECONDS))); + $title .= sprintf( + __('Last updated: %s'), + date( + get_option( 'links_updated_date_format' ), + $bookmark->link_updated_f + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) + ) + ); $title .= ')'; } + } + $alt = ' alt="' . $name . ( $r['show_description'] ? ' ' . $title : '' ) . '"'; - $alt = ' alt="' . $name . ( $show_description ? ' ' . $title : '' ) . '"'; - - if ( '' != $title ) + if ( '' != $title ) { $title = ' title="' . $title . '"'; - + } $rel = $bookmark->link_rel; - if ( '' != $rel ) + if ( '' != $rel ) { $rel = ' rel="' . esc_attr($rel) . '"'; - + } $target = $bookmark->link_target; - if ( '' != $target ) + if ( '' != $target ) { $target = ' target="' . $target . '"'; - + } $output .= ''; - $output .= $link_before; + $output .= $r['link_before']; - if ( $bookmark->link_image != null && $show_images ) { - if ( strpos($bookmark->link_image, 'http') === 0 ) + if ( $bookmark->link_image != null && $r['show_images'] ) { + if ( strpos( $bookmark->link_image, 'http' ) === 0 ) { $output .= "link_image\" $alt $title />"; - else // If it's a relative path + } else { // If it's a relative path $output .= "link_image\" $alt $title />"; - - if ( $show_name ) + } + if ( $r['show_name'] ) { $output .= " $name"; + } } else { $output .= $name; } - $output .= $link_after; + $output .= $r['link_after']; $output .= ''; - if ( $show_updated && $bookmark->recently_updated ) + if ( $r['show_updated'] && $bookmark->recently_updated ) { $output .= ''; + } - if ( $show_description && '' != $desc ) - $output .= $between . $desc; - - if ( $show_rating ) - $output .= $between . sanitize_bookmark_field('link_rating', $bookmark->link_rating, $bookmark->link_id, 'display'); + if ( $r['show_description'] && '' != $desc ) { + $output .= $r['between'] . $desc; + } - $output .= "$after\n"; + if ( $r['show_rating'] ) { + $output .= $r['between'] . sanitize_bookmark_field( + 'link_rating', + $bookmark->link_rating, + $bookmark->link_id, + 'display' + ); + } + $output .= $r['after'] . "\n"; } // end while return $output; @@ -134,69 +149,55 @@ function _walk_bookmarks($bookmarks, $args = '' ) { * Retrieve or echo all of the bookmarks. * * List of default arguments are as follows: - * 'orderby' - Default is 'name' (string). How to order the links by. String is - * based off of the bookmark scheme. - * 'order' - Default is 'ASC' (string). Either 'ASC' or 'DESC'. Orders in either - * ascending or descending order. - * 'limit' - Default is -1 (integer) or show all. The amount of bookmarks to - * display. - * 'category' - Default is empty string (string). Include the links in what - * category ID(s). - * 'category_name' - Default is empty string (string). Get links by category - * name. - * 'hide_invisible' - Default is 1 (integer). Whether to show (default) or hide - * links marked as 'invisible'. - * 'show_updated' - Default is 0 (integer). Will show the time of when the - * bookmark was last updated. - * 'echo' - Default is 1 (integer). Whether to echo (default) or return the - * formatted bookmarks. - * 'categorize' - Default is 1 (integer). Whether to show links listed by - * category (default) or show links in one column. - * 'show_description' - Default is 0 (integer). Whether to show the description - * of the bookmark. * * These options define how the Category name will appear before the category * links are displayed, if 'categorize' is 1. If 'categorize' is 0, then it will * display for only the 'title_li' string and only if 'title_li' is not empty. - * 'title_li' - Default is 'Bookmarks' (translatable string). What to show - * before the links appear. - * 'title_before' - Default is '

' (string). The HTML or text to show before - * the 'title_li' string. - * 'title_after' - Default is '

' (string). The HTML or text to show after - * the 'title_li' string. - * 'class' - Default is 'linkcat' (string). The CSS class to use for the - * 'title_li'. - * - * 'category_before' - Default is '

'. String must - * contain '%id' and '%class' to get - * the id of the category and the 'class' argument. These are used for - * formatting in themes. - * Argument will be displayed before the 'title_before' argument. - * 'category_after' - Default is '

' (string). The HTML or text that will - * appear after the list of links. * - * These are only used if 'categorize' is set to 1 or true. - * 'category_orderby' - Default is 'name'. How to order the bookmark category - * based on term scheme. - * 'category_order' - Default is 'ASC'. Set the order by either ASC (ascending) - * or DESC (descending). + * @since 2.1.0 * - * @see _walk_bookmarks() For other arguments that can be set in this function - * and passed to _walk_bookmarks(). - * @see get_bookmarks() For other arguments that can be set in this function and - * passed to get_bookmarks(). - * @link http://codex.wordpress.org/Template_Tags/wp_list_bookmarks + * @see _walk_bookmarks() * - * @since 2.1.0 - * @uses _walk_bookmarks() Used to iterate over all of the bookmarks and return - * the html - * @uses get_terms() Gets all of the categories that are for links. + * @param string|array $args { + * Optional. String or array of arguments to list bookmarks. * - * @param string|array $args Optional. Overwrite the defaults of the function - * @return string|null Will only return if echo option is set to not echo. - * Default is not return anything. + * @type string $orderby How to order the links by. Accepts post fields. Default 'name'. + * @type string $order Whether to order bookmarks in ascending or descending order. + * Accepts 'ASC' (ascending) or 'DESC' (descending). Default 'ASC'. + * @type int $limit Amount of bookmarks to display. Accepts 1+ or -1 for all. + * Default -1. + * @type string $category Comma-separated list of category ids to include links from. + * Default empty. + * @type string $category_name Category to retrieve links for by name. Default empty. + * @type int|bool $hide_invisible Whether to show or hide links marked as 'invisible'. Accepts + * 1|true or 0|false. Default 1|true. + * @type int|bool $show_updated Whether to display the time the bookmark was last updated. + * Accepts 1|true or 0|false. Default 0|false. + * @type int|bool $echo Whether to echo or return the formatted bookmarks. Accepts + * 1|true (echo) or 0|false (return). Default 1|true. + * @type int|bool $categorize Whether to show links listed by category or in a single column. + * Accepts 1|true (by category) or 0|false (one column). Default 1|true. + * @type int|bool $show_description Whether to show the bookmark descriptions. Accepts 1|true or 0|false. + * Default 0|false. + * @type string $title_li What to show before the links appear. Default 'Bookmarks'. + * @type string $title_before The HTML or text to prepend to the $title_li string. Default '

'. + * @type string $title_after The HTML or text to append to the $title_li string. Default '

'. + * @type string $class The CSS class to use for the $title_li. Default 'linkcat'. + * @type string $category_before The HTML or text to prepend to $title_before if $categorize is true. + * String must contain '%id' and '%class' to inherit the category ID and + * the $class argument used for formatting in themes. + * Default '

'. + * @type string $category_after The HTML or text to append to $title_after if $categorize is true. + * Default '

'. + * @type string $category_orderby How to order the bookmark category based on term scheme if $categorize + * is true. Default 'name'. + * @type string $category_order Whether to order categories in ascending or descending order if + * $categorize is true. Accepts 'ASC' (ascending) or 'DESC' (descending). + * Default 'ASC'. + * } + * @return string|void Will only return if echo option is set to not echo. Default is not return anything. */ -function wp_list_bookmarks($args = '') { +function wp_list_bookmarks( $args = '' ) { $defaults = array( 'orderby' => 'name', 'order' => 'ASC', 'limit' => -1, 'category' => '', 'exclude_category' => '', @@ -210,24 +211,42 @@ function wp_list_bookmarks($args = '') { ); $r = wp_parse_args( $args, $defaults ); - extract( $r, EXTR_SKIP ); $output = ''; - if ( $categorize ) { - $cats = get_terms( 'link_category', array( 'name__like' => $category_name, 'include' => $category, 'exclude' => $exclude_category, 'orderby' => $category_orderby, 'order' => $category_order, 'hierarchical' => 0 ) ); - if ( empty( $cats ) ) - $categorize = false; + if ( ! is_array( $r['class'] ) ) { + $r['class'] = explode( ' ', $r['class'] ); } + $r['class'] = array_map( 'sanitize_html_class', $r['class'] ); + $r['class'] = trim( join( ' ', $r['class'] ) ); - if ( $categorize ) { + if ( $r['categorize'] ) { + $cats = get_terms( 'link_category', array( + 'name__like' => $r['category_name'], + 'include' => $r['category'], + 'exclude' => $r['exclude_category'], + 'orderby' => $r['category_orderby'], + 'order' => $r['category_order'], + 'hierarchical' => 0 + ) ); + if ( empty( $cats ) ) { + $r['categorize'] = false; + } + } + + if ( $r['categorize'] ) { // Split the bookmarks into ul's for each category foreach ( (array) $cats as $cat ) { - $params = array_merge($r, array('category'=>$cat->term_id)); - $bookmarks = get_bookmarks($params); - if ( empty($bookmarks) ) + $params = array_merge( $r, array( 'category' => $cat->term_id ) ); + $bookmarks = get_bookmarks( $params ); + if ( empty( $bookmarks ) ) { continue; - $output .= str_replace(array('%id', '%class'), array("linkcat-$cat->term_id", $class), $category_before); + } + $output .= str_replace( + array( '%id', '%class' ), + array( "linkcat-$cat->term_id", $r['class'] ), + $r['category_before'] + ); /** * Filter the bookmarks category name. * @@ -237,22 +256,34 @@ function wp_list_bookmarks($args = '') { */ $catname = apply_filters( 'link_category', $cat->name ); - $output .= "$title_before$catname$title_after\n\t\n$category_after\n"; + $output .= $r['title_before']; + $output .= $catname; + $output .= $r['title_after']; + $output .= "\n\t\n"; + $output .= $r['category_after'] . "\n"; } } else { //output one single list using title_li for the title - $bookmarks = get_bookmarks($r); + $bookmarks = get_bookmarks( $r ); - if ( !empty($bookmarks) ) { - if ( !empty( $title_li ) ){ - $output .= str_replace(array('%id', '%class'), array("linkcat-$category", $class), $category_before); - $output .= "$title_before$title_li$title_after\n\t\n$category_after\n"; + if ( ! empty( $bookmarks ) ) { + if ( ! empty( $r['title_li'] ) ) { + $output .= str_replace( + array( '%id', '%class' ), + array( "linkcat-" . $r['category'], $r['class'] ), + $r['category_before'] + ); + $output .= $r['title_before']; + $output .= $r['title_li']; + $output .= $r['title_after']; + $output .= "\n\t\n"; + $output .= $r['category_after'] . "\n"; } else { - $output .= _walk_bookmarks($bookmarks, $r); + $output .= _walk_bookmarks( $bookmarks, $r ); } } } @@ -262,11 +293,12 @@ function wp_list_bookmarks($args = '') { * * @since 2.5.0 * - * @param string $output The HTML list of bookmarks. + * @param string $html The HTML list of bookmarks. */ - $output = apply_filters( 'wp_list_bookmarks', $output ); + $html = apply_filters( 'wp_list_bookmarks', $output ); - if ( !$echo ) - return $output; - echo $output; + if ( ! $r['echo'] ) { + return $html; + } + echo $html; } diff --git a/wp-includes/bookmark.php b/wp-includes/bookmark.php index 86ea3d2..140f5fd 100644 --- a/wp-includes/bookmark.php +++ b/wp-includes/bookmark.php @@ -10,12 +10,13 @@ * Retrieve Bookmark data * * @since 2.1.0 - * @uses $wpdb Database Object * - * @param mixed $bookmark + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param int|stdClass $bookmark * @param string $output Optional. Either OBJECT, ARRAY_N, or ARRAY_A constant * @param string $filter Optional, default is 'raw'. - * @return array|object Type returned depends on $output value. + * @return array|object|null Type returned depends on $output value. */ function get_bookmark($bookmark, $output = OBJECT, $filter = 'raw') { global $wpdb; @@ -60,13 +61,11 @@ function get_bookmark($bookmark, $output = OBJECT, $filter = 'raw') { * Retrieve single bookmark data item or field. * * @since 2.3.0 - * @uses get_bookmark() Gets bookmark object using $bookmark as ID - * @uses sanitize_bookmark_field() Sanitizes Bookmark field based on $context. * * @param string $field The name of the data field to return * @param int $bookmark The bookmark ID to get field * @param string $context Optional. The context of how the field will be used. - * @return string + * @return string|WP_Error */ function get_bookmark_field( $field, $bookmark, $context = 'display' ) { $bookmark = (int) $bookmark; @@ -91,34 +90,31 @@ function get_bookmark_field( $field, $bookmark, $context = 'display' ) { * that fails, then the query will be built from the arguments and executed. The * results will be stored to the cache. * - * List of default arguments are as follows: - * 'orderby' - Default is 'name' (string). How to order the links by. String is - * based off of the bookmark scheme. - * 'order' - Default is 'ASC' (string). Either 'ASC' or 'DESC'. Orders in either - * ascending or descending order. - * 'limit' - Default is -1 (integer) or show all. The amount of bookmarks to - * display. - * 'category' - Default is empty string (string). Include the links in what - * category ID(s). - * 'category_name' - Default is empty string (string). Get links by category - * name. - * 'hide_invisible' - Default is 1 (integer). Whether to show (default) or hide - * links marked as 'invisible'. - * 'show_updated' - Default is 0 (integer). Will show the time of when the - * bookmark was last updated. - * 'include' - Default is empty string (string). Include bookmark ID(s) - * separated by commas. - * 'exclude' - Default is empty string (string). Exclude bookmark ID(s) - * separated by commas. - * * @since 2.1.0 - * @uses $wpdb Database Object - * @link http://codex.wordpress.org/Template_Tags/get_bookmarks * - * @param string|array $args List of arguments to overwrite the defaults - * @return array List of bookmark row objects + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string|array $args { + * Optional. String or array of arguments to retrieve bookmarks. + * + * @type string $orderby How to order the links by. Accepts post fields. Default 'name'. + * @type string $order Whether to order bookmarks in ascending or descending order. + * Accepts 'ASC' (ascending) or 'DESC' (descending). Default 'ASC'. + * @type int $limit Amount of bookmarks to display. Accepts 1+ or -1 for all. + * Default -1. + * @type string $category Comma-separated list of category ids to include links from. + * Default empty. + * @type string $category_name Category to retrieve links for by name. Default empty. + * @type int|bool $hide_invisible Whether to show or hide links marked as 'invisible'. Accepts + * 1|true or 0|false. Default 1|true. + * @type int|bool $show_updated Whether to display the time the bookmark was last updated. + * Accepts 1|true or 0|false. Default 0|false. + * @type string $include Comma-separated list of bookmark IDs to include. Default empty. + * @type string $exclude Comma-separated list of bookmark IDs to exclude. Default empty. + * } + * @return array List of bookmark row objects. */ -function get_bookmarks($args = '') { +function get_bookmarks( $args = '' ) { global $wpdb; $defaults = array( @@ -130,12 +126,10 @@ function get_bookmarks($args = '') { ); $r = wp_parse_args( $args, $defaults ); - extract( $r, EXTR_SKIP ); - $cache = array(); $key = md5( serialize( $r ) ); if ( $cache = wp_cache_get( 'get_bookmarks', 'bookmark' ) ) { - if ( is_array($cache) && isset( $cache[ $key ] ) ) { + if ( is_array( $cache ) && isset( $cache[ $key ] ) ) { $bookmarks = $cache[ $key ]; /** * Filter the returned list of bookmarks. @@ -156,45 +150,50 @@ function get_bookmarks($args = '') { } } - if ( !is_array($cache) ) + if ( ! is_array( $cache ) ) { $cache = array(); + } $inclusions = ''; - if ( !empty($include) ) { - $exclude = ''; //ignore exclude, category, and category_name params if using include - $category = ''; - $category_name = ''; - $inclinks = preg_split('/[\s,]+/',$include); - if ( count($inclinks) ) { + if ( ! empty( $r['include'] ) ) { + $r['exclude'] = ''; //ignore exclude, category, and category_name params if using include + $r['category'] = ''; + $r['category_name'] = ''; + $inclinks = preg_split( '/[\s,]+/', $r['include'] ); + if ( count( $inclinks ) ) { foreach ( $inclinks as $inclink ) { - if (empty($inclusions)) - $inclusions = ' AND ( link_id = ' . intval($inclink) . ' '; - else - $inclusions .= ' OR link_id = ' . intval($inclink) . ' '; + if ( empty( $inclusions ) ) { + $inclusions = ' AND ( link_id = ' . intval( $inclink ) . ' '; + } else { + $inclusions .= ' OR link_id = ' . intval( $inclink ) . ' '; + } } } } - if (!empty($inclusions)) + if (! empty( $inclusions ) ) { $inclusions .= ')'; + } $exclusions = ''; - if ( !empty($exclude) ) { - $exlinks = preg_split('/[\s,]+/',$exclude); - if ( count($exlinks) ) { + if ( ! empty( $r['exclude'] ) ) { + $exlinks = preg_split( '/[\s,]+/', $r['exclude'] ); + if ( count( $exlinks ) ) { foreach ( $exlinks as $exlink ) { - if (empty($exclusions)) - $exclusions = ' AND ( link_id <> ' . intval($exlink) . ' '; - else - $exclusions .= ' AND link_id <> ' . intval($exlink) . ' '; + if ( empty( $exclusions ) ) { + $exclusions = ' AND ( link_id <> ' . intval( $exlink ) . ' '; + } else { + $exclusions .= ' AND link_id <> ' . intval( $exlink ) . ' '; + } } } } - if (!empty($exclusions)) + if ( ! empty( $exclusions ) ) { $exclusions .= ')'; + } - if ( !empty($category_name) ) { - if ( $category = get_term_by('name', $category_name, 'link_category') ) { - $category = $category->term_id; + if ( ! empty( $r['category_name'] ) ) { + if ( $r['category'] = get_term_by('name', $r['category_name'], 'link_category') ) { + $r['category'] = $r['category']->term_id; } else { $cache[ $key ] = array(); wp_cache_set( 'get_bookmarks', $cache, 'bookmark' ); @@ -203,38 +202,40 @@ function get_bookmarks($args = '') { } } - if ( ! empty($search) ) { - $search = esc_sql( like_escape( $search ) ); - $search = " AND ( (link_url LIKE '%$search%') OR (link_name LIKE '%$search%') OR (link_description LIKE '%$search%') ) "; + $search = ''; + if ( ! empty( $r['search'] ) ) { + $like = '%' . $wpdb->esc_like( $r['search'] ) . '%'; + $search = $wpdb->prepare(" AND ( (link_url LIKE %s) OR (link_name LIKE %s) OR (link_description LIKE %s) ) ", $like, $like, $like ); } $category_query = ''; $join = ''; - if ( !empty($category) ) { - $incategories = preg_split('/[\s,]+/',$category); + if ( ! empty( $r['category'] ) ) { + $incategories = preg_split( '/[\s,]+/', $r['category'] ); if ( count($incategories) ) { foreach ( $incategories as $incat ) { - if (empty($category_query)) - $category_query = ' AND ( tt.term_id = ' . intval($incat) . ' '; - else - $category_query .= ' OR tt.term_id = ' . intval($incat) . ' '; + if ( empty( $category_query ) ) { + $category_query = ' AND ( tt.term_id = ' . intval( $incat ) . ' '; + } else { + $category_query .= ' OR tt.term_id = ' . intval( $incat ) . ' '; + } } } } - if (!empty($category_query)) { + if ( ! empty( $category_query ) ) { $category_query .= ") AND taxonomy = 'link_category'"; $join = " INNER JOIN $wpdb->term_relationships AS tr ON ($wpdb->links.link_id = tr.object_id) INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_taxonomy_id = tr.term_taxonomy_id"; } - if ( $show_updated ) { + if ( $r['show_updated'] ) { $recently_updated_test = ", IF (DATE_ADD(link_updated, INTERVAL 120 MINUTE) >= NOW(), 1,0) as recently_updated "; } else { $recently_updated_test = ''; } - $get_updated = ( $show_updated ) ? ', UNIX_TIMESTAMP(link_updated) AS link_updated_f ' : ''; + $get_updated = ( $r['show_updated'] ) ? ', UNIX_TIMESTAMP(link_updated) AS link_updated_f ' : ''; - $orderby = strtolower($orderby); + $orderby = strtolower( $r['orderby'] ); $length = ''; switch ( $orderby ) { case 'length': @@ -248,35 +249,41 @@ function get_bookmarks($args = '') { break; default: $orderparams = array(); - foreach ( explode(',', $orderby) as $ordparam ) { - $ordparam = trim($ordparam); - $keys = array( 'link_id', 'link_name', 'link_url', 'link_visible', 'link_rating', 'link_owner', 'link_updated', 'link_notes' ); - if ( in_array( 'link_' . $ordparam, $keys ) ) + $keys = array( 'link_id', 'link_name', 'link_url', 'link_visible', 'link_rating', 'link_owner', 'link_updated', 'link_notes', 'link_description' ); + foreach ( explode( ',', $orderby ) as $ordparam ) { + $ordparam = trim( $ordparam ); + + if ( in_array( 'link_' . $ordparam, $keys ) ) { $orderparams[] = 'link_' . $ordparam; - elseif ( in_array( $ordparam, $keys ) ) + } elseif ( in_array( $ordparam, $keys ) ) { $orderparams[] = $ordparam; + } } - $orderby = implode(',', $orderparams); + $orderby = implode( ',', $orderparams ); } - if ( empty( $orderby ) ) + if ( empty( $orderby ) ) { $orderby = 'link_name'; + } - $order = strtoupper( $order ); - if ( '' !== $order && !in_array( $order, array( 'ASC', 'DESC' ) ) ) + $order = strtoupper( $r['order'] ); + if ( '' !== $order && ! in_array( $order, array( 'ASC', 'DESC' ) ) ) { $order = 'ASC'; + } $visible = ''; - if ( $hide_invisible ) + if ( $r['hide_invisible'] ) { $visible = "AND link_visible = 'Y'"; + } $query = "SELECT * $length $recently_updated_test $get_updated FROM $wpdb->links $join WHERE 1=1 $visible $category_query"; $query .= " $exclusions $inclusions $search"; $query .= " ORDER BY $orderby $order"; - if ($limit != -1) - $query .= " LIMIT $limit"; + if ( $r['limit'] != -1 ) { + $query .= ' LIMIT ' . $r['limit']; + } - $results = $wpdb->get_results($query); + $results = $wpdb->get_results( $query ); $cache[ $key ] = $results; wp_cache_set( 'get_bookmarks', $cache, 'bookmark' ); @@ -356,7 +363,7 @@ function sanitize_bookmark_field($field, $value, $bookmark_id, $context) { // We return here so that the categories aren't filtered. // The 'link_category' filter is for the name of a link category, not an array of a link's link categories return $value; - break; + case 'link_visible' : // bool stored as Y|N $value = preg_replace('/[^YNyn]/', '', $value); break; @@ -379,27 +386,29 @@ function sanitize_bookmark_field($field, $value, $bookmark_id, $context) { } else { $value = esc_attr($value); } - } else if ( 'db' == $context ) { + } elseif ( 'db' == $context ) { /** This filter is documented in wp-includes/post.php */ $value = apply_filters( "pre_$field", $value ); } else { /** This filter is documented in wp-includes/post.php */ $value = apply_filters( $field, $value, $bookmark_id, $context ); - if ( 'attribute' == $context ) - $value = esc_attr($value); - else if ( 'js' == $context ) - $value = esc_js($value); + if ( 'attribute' == $context ) { + $value = esc_attr( $value ); + } elseif ( 'js' == $context ) { + $value = esc_js( $value ); + } } return $value; } /** - * Deletes bookmark cache + * Deletes the bookmark cache. * * @since 2.7.0 - * @uses wp_cache_delete() Deletes the contents of 'get_bookmarks' + * + * @param int $bookmark_id Bookmark ID. */ function clean_bookmark_cache( $bookmark_id ) { wp_cache_delete( $bookmark_id, 'bookmark' ); diff --git a/wp-includes/cache.php b/wp-includes/cache.php index bcc9aca..a1a6e6c 100644 --- a/wp-includes/cache.php +++ b/wp-includes/cache.php @@ -2,7 +2,7 @@ /** * Object Cache API * - * @link http://codex.wordpress.org/Function_Reference/WP_Cache + * @link https://codex.wordpress.org/Function_Reference/WP_Cache * * @package WordPress * @subpackage Cache @@ -12,14 +12,17 @@ * Adds data to the cache, if the cache key doesn't already exist. * * @since 2.0.0 - * @uses $wp_object_cache Object Cache Class - * @see WP_Object_Cache::add() * - * @param int|string $key The cache key to use for retrieval later - * @param mixed $data The data to add to the cache store - * @param string $group The group to add the cache to - * @param int $expire When the cache data should be expired - * @return bool False if cache key and group already exist, true on success + * @see WP_Object_Cache::add() + * @global WP_Object_Cache $wp_object_cache Object cache global instance. + * + * @param int|string $key The cache key to use for retrieval later. + * @param mixed $data The data to add to the cache. + * @param string $group Optional. The group to add the cache to. Enables the same key + * to be used across groups. Default empty. + * @param int $expire Optional. When the cache data should expire, in seconds. + * Default 0 (no expiration). + * @return bool False if cache key and group already exist, true on success. */ function wp_cache_add( $key, $data, $group = '', $expire = 0 ) { global $wp_object_cache; @@ -31,28 +34,30 @@ function wp_cache_add( $key, $data, $group = '', $expire = 0 ) { * Closes the cache. * * This function has ceased to do anything since WordPress 2.5. The - * functionality was removed along with the rest of the persistent cache. This - * does not mean that plugins can't implement this function when they need to - * make sure that the cache is cleaned up after WordPress no longer needs it. + * functionality was removed along with the rest of the persistent cache. + * + * This does not mean that plugins can't implement this function when they need + * to make sure that the cache is cleaned up after WordPress no longer needs it. * * @since 2.0.0 * - * @return bool Always returns True + * @return true Always returns true. */ function wp_cache_close() { return true; } /** - * Decrement numeric cache item's value + * Decrements numeric cache item's value. * * @since 3.3.0 - * @uses $wp_object_cache Object Cache Class + * * @see WP_Object_Cache::decr() + * @global WP_Object_Cache $wp_object_cache Object cache global instance. * - * @param int|string $key The cache key to increment - * @param int $offset The amount by which to decrement the item's value. Default is 1. - * @param string $group The group the key is in. + * @param int|string $key The cache key to decrement. + * @param int $offset Optional. The amount by which to decrement the item's value. Default 1. + * @param string $group Optional. The group the key is in. Default empty. * @return false|int False on failure, the item's new value on success. */ function wp_cache_decr( $key, $offset = 1, $group = '' ) { @@ -65,14 +70,15 @@ function wp_cache_decr( $key, $offset = 1, $group = '' ) { * Removes the cache contents matching key and group. * * @since 2.0.0 - * @uses $wp_object_cache Object Cache Class + * * @see WP_Object_Cache::delete() + * @global WP_Object_Cache $wp_object_cache Object cache global instance. * - * @param int|string $key What the contents in the cache are called - * @param string $group Where the cache contents are grouped - * @return bool True on successful removal, false on failure + * @param int|string $key What the contents in the cache are called. + * @param string $group Optional. Where the cache contents are grouped. Default empty. + * @return bool True on successful removal, false on failure. */ -function wp_cache_delete($key, $group = '') { +function wp_cache_delete( $key, $group = '' ) { global $wp_object_cache; return $wp_object_cache->delete($key, $group); @@ -82,8 +88,9 @@ function wp_cache_delete($key, $group = '') { * Removes all cache items. * * @since 2.0.0 - * @uses $wp_object_cache Object Cache Class + * * @see WP_Object_Cache::flush() + * @global WP_Object_Cache $wp_object_cache Object cache global instance. * * @return bool False on failure, true on success */ @@ -97,15 +104,18 @@ function wp_cache_flush() { * Retrieves the cache contents from the cache by key and group. * * @since 2.0.0 - * @uses $wp_object_cache Object Cache Class - * @see WP_Object_Cache::get() * - * @param int|string $key What the contents in the cache are called - * @param string $group Where the cache contents are grouped - * @param bool $force Whether to force an update of the local cache from the persistent cache (default is false) - * @param &bool $found Whether key was found in the cache. Disambiguates a return of false, a storable value. + * @see WP_Object_Cache::get() + * @global WP_Object_Cache $wp_object_cache Object cache global instance. + * + * @param int|string $key The key under which the cache contents are stored. + * @param string $group Optional. Where the cache contents are grouped. Default empty. + * @param bool $force Optional. Whether to force an update of the local cache from the persistent + * cache. Default false. + * @param bool $found Optional. Whether the key was found in the cache. Disambiguates a return of false, + * a storable value. Passed by reference. Default null. * @return bool|mixed False on failure to retrieve contents or the cache - * contents on success + * contents on success */ function wp_cache_get( $key, $group = '', $force = false, &$found = null ) { global $wp_object_cache; @@ -117,12 +127,13 @@ function wp_cache_get( $key, $group = '', $force = false, &$found = null ) { * Increment numeric cache item's value * * @since 3.3.0 - * @uses $wp_object_cache Object Cache Class + * * @see WP_Object_Cache::incr() + * @global WP_Object_Cache $wp_object_cache Object cache global instance. * - * @param int|string $key The cache key to increment - * @param int $offset The amount by which to increment the item's value. Default is 1. - * @param string $group The group the key is in. + * @param int|string $key The key for the cache contents that should be incremented. + * @param int $offset Optional. The amount by which to increment the item's value. Default 1. + * @param string $group Optional. The group the key is in. Default empty. * @return false|int False on failure, the item's new value on success. */ function wp_cache_incr( $key, $offset = 1, $group = '' ) { @@ -135,7 +146,8 @@ function wp_cache_incr( $key, $offset = 1, $group = '' ) { * Sets up Object Cache Global and assigns it. * * @since 2.0.0 - * @global WP_Object_Cache $wp_object_cache WordPress Object Cache + * + * @global WP_Object_Cache $wp_object_cache */ function wp_cache_init() { $GLOBALS['wp_object_cache'] = new WP_Object_Cache(); @@ -145,14 +157,17 @@ function wp_cache_init() { * Replaces the contents of the cache with new data. * * @since 2.0.0 - * @uses $wp_object_cache Object Cache Class - * @see WP_Object_Cache::replace() * - * @param int|string $key What to call the contents in the cache - * @param mixed $data The contents to store in the cache - * @param string $group Where to group the cache contents - * @param int $expire When to expire the cache contents - * @return bool False if not exists, true if contents were replaced + * @see WP_Object_Cache::replace() + * @global WP_Object_Cache $wp_object_cache Object cache global instance. + * + * @param int|string $key The key for the cache data that should be replaced. + * @param mixed $data The new data to store in the cache. + * @param string $group Optional. The group for the cache data that should be replaced. + * Default empty. + * @param int $expire Optional. When to expire the cache contents, in seconds. + * Default 0 (no expiration). + * @return bool False if original value does not exist, true if contents were replaced */ function wp_cache_replace( $key, $data, $group = '', $expire = 0 ) { global $wp_object_cache; @@ -163,15 +178,19 @@ function wp_cache_replace( $key, $data, $group = '', $expire = 0 ) { /** * Saves the data to the cache. * + * Differs from wp_cache_add() and wp_cache_replace() in that it will always write data. + * * @since 2.0.0 * - * @uses $wp_object_cache Object Cache Class * @see WP_Object_Cache::set() - * - * @param int|string $key What to call the contents in the cache - * @param mixed $data The contents to store in the cache - * @param string $group Where to group the cache contents - * @param int $expire When to expire the cache contents + * @global WP_Object_Cache $wp_object_cache Object cache global instance. + * + * @param int|string $key The cache key to use for retrieval later. + * @param mixed $data The contents to store in the cache. + * @param string $group Optional. Where to group the cache contents. Enables the same key + * to be used across groups. Default empty. + * @param int $expire Optional. When to expire the cache contents, in seconds. + * Default 0 (no expiration). * @return bool False on failure, true on success */ function wp_cache_set( $key, $data, $group = '', $expire = 0 ) { @@ -181,18 +200,21 @@ function wp_cache_set( $key, $data, $group = '', $expire = 0 ) { } /** - * Switch the interal blog id. + * Switches the interal blog ID. * * This changes the blog id used to create keys in blog specific groups. * * @since 3.5.0 * - * @param int $blog_id Blog ID + * @see WP_Object_Cache::switch_to_blog() + * @global WP_Object_Cache $wp_object_cache Object cache global instance. + * + * @param int $blog_id Site ID. */ function wp_cache_switch_to_blog( $blog_id ) { global $wp_object_cache; - return $wp_object_cache->switch_to_blog( $blog_id ); + $wp_object_cache->switch_to_blog( $blog_id ); } /** @@ -200,12 +222,15 @@ function wp_cache_switch_to_blog( $blog_id ) { * * @since 2.6.0 * - * @param string|array $groups A group or an array of groups to add + * @see WP_Object_Cache::add_global_groups() + * @global WP_Object_Cache $wp_object_cache Object cache global instance. + * + * @param string|array $groups A group or an array of groups to add. */ function wp_cache_add_global_groups( $groups ) { global $wp_object_cache; - return $wp_object_cache->add_global_groups( $groups ); + $wp_object_cache->add_global_groups( $groups ); } /** @@ -213,18 +238,18 @@ function wp_cache_add_global_groups( $groups ) { * * @since 2.6.0 * - * @param string|array $groups A group or an array of groups to add + * @param string|array $groups A group or an array of groups to add. */ function wp_cache_add_non_persistent_groups( $groups ) { // Default cache doesn't persist so nothing to do here. - return; } /** - * Reset internal cache keys and structures. If the cache backend uses global - * blog or site IDs as part of its cache keys, this function instructs the - * backend to reset those keys and perform any cleanup since blog or site IDs - * have changed since cache init. + * Reset internal cache keys and structures. + * + * If the cache back end uses global blog or site IDs as part of its cache keys, + * this function instructs the back end to reset those keys and perform any cleanup + * since blog or site IDs have changed since cache init. * * This function is deprecated. Use wp_cache_switch_to_blog() instead of this * function when preparing the cache for a blog switch. For clearing the cache @@ -233,18 +258,21 @@ function wp_cache_add_non_persistent_groups( $groups ) { * high. * * @since 2.6.0 - * @deprecated 3.5.0 + * @deprecated 3.5.0 WP_Object_Cache::reset() + * @see WP_Object_Cache::reset() + * + * @global WP_Object_Cache $wp_object_cache Object cache global instance. */ function wp_cache_reset() { _deprecated_function( __FUNCTION__, '3.5' ); global $wp_object_cache; - return $wp_object_cache->reset(); + $wp_object_cache->reset(); } /** - * WordPress Object Cache + * Core class that implements an object cache. * * The WordPress Object Cache is used to save on trips to the database. The * Object Cache stores all of the cache data to memory and makes the cache @@ -262,13 +290,13 @@ function wp_cache_reset() { class WP_Object_Cache { /** - * Holds the cached objects + * Holds the cached objects. * - * @var array - * @access private * @since 2.0.0 + * @access private + * @var array */ - var $cache = array (); + private $cache = array(); /** * The amount of times the cache data was already stored in the cache. @@ -277,51 +305,113 @@ class WP_Object_Cache { * @access private * @var int */ - var $cache_hits = 0; + private $cache_hits = 0; /** - * Amount of times the cache did not have the request in cache + * Amount of times the cache did not have the request in cache. * - * @var int - * @access public * @since 2.0.0 + * @access public + * @var int */ - var $cache_misses = 0; + public $cache_misses = 0; /** - * List of global groups + * List of global cache groups. * - * @var array - * @access protected * @since 3.0.0 + * @access protected + * @var array */ - var $global_groups = array(); + protected $global_groups = array(); /** * The blog prefix to prepend to keys in non-global groups. * - * @var int + * @since 3.5.0 * @access private + * @var int + */ + private $blog_prefix; + + /** + * Holds the value of is_multisite(). + * * @since 3.5.0 + * @access private + * @var bool */ - var $blog_prefix; + private $multisite; /** - * Adds data to the cache if it doesn't already exist. + * Makes private properties readable for backwards compatibility. * - * @uses WP_Object_Cache::_exists Checks to see if the cache already has data. - * @uses WP_Object_Cache::set Sets the data after the checking the cache - * contents existence. + * @since 4.0.0 + * @access public + * + * @param string $name Property to get. + * @return mixed Property. + */ + public function __get( $name ) { + return $this->$name; + } + + /** + * Makes private properties settable for backwards compatibility. + * + * @since 4.0.0 + * @access public + * + * @param string $name Property to set. + * @param mixed $value Property value. + * @return mixed Newly-set property. + */ + public function __set( $name, $value ) { + return $this->$name = $value; + } + + /** + * Makes private properties checkable for backwards compatibility. + * + * @since 4.0.0 + * @access public + * + * @param string $name Property to check if set. + * @return bool Whether the property is set. + */ + public function __isset( $name ) { + return isset( $this->$name ); + } + + /** + * Makes private properties un-settable for backwards compatibility. + * + * @since 4.0.0 + * @access public + * + * @param string $name Property to unset. + */ + public function __unset( $name ) { + unset( $this->$name ); + } + + /** + * Adds data to the cache if it doesn't already exist. * * @since 2.0.0 + * @access public + * + * @uses WP_Object_Cache::_exists() Checks to see if the cache already has data. + * @uses WP_Object_Cache::set() Sets the data after the checking the cache + * contents existence. * - * @param int|string $key What to call the contents in the cache - * @param mixed $data The contents to store in the cache - * @param string $group Where to group the cache contents - * @param int $expire When to expire the cache contents + * @param int|string $key What to call the contents in the cache. + * @param mixed $data The contents to store in the cache. + * @param string $group Optional. Where to group the cache contents. Default 'default'. + * @param int $expire Optional. When to expire the cache contents. Default 0 (no expiration). * @return bool False if cache key and group already exist, true on success */ - function add( $key, $data, $group = 'default', $expire = 0 ) { + public function add( $key, $data, $group = 'default', $expire = 0 ) { if ( wp_suspend_cache_addition() ) return false; @@ -339,13 +429,14 @@ class WP_Object_Cache { } /** - * Sets the list of global groups. + * Sets the list of global cache groups. * * @since 3.0.0 + * @access public * * @param array $groups List of groups that are global. */ - function add_global_groups( $groups ) { + public function add_global_groups( $groups ) { $groups = (array) $groups; $groups = array_fill_keys( $groups, true ); @@ -353,16 +444,17 @@ class WP_Object_Cache { } /** - * Decrement numeric cache item's value + * Decrements numeric cache item's value. * * @since 3.3.0 + * @access public * - * @param int|string $key The cache key to increment - * @param int $offset The amount by which to decrement the item's value. Default is 1. - * @param string $group The group the key is in. + * @param int|string $key The cache key to decrement. + * @param int $offset Optional. The amount by which to decrement the item's value. Default 1. + * @param string $group Optional. The group the key is in. Default 'default'. * @return false|int False on failure, the item's new value on success. */ - function decr( $key, $offset = 1, $group = 'default' ) { + public function decr( $key, $offset = 1, $group = 'default' ) { if ( empty( $group ) ) $group = 'default'; @@ -386,19 +478,19 @@ class WP_Object_Cache { } /** - * Remove the contents of the cache key in the group + * Removes the contents of the cache key in the group. * * If the cache key does not exist in the group, then nothing will happen. * * @since 2.0.0 + * @access public * - * @param int|string $key What the contents in the cache are called - * @param string $group Where the cache contents are grouped - * @param bool $deprecated Deprecated. - * - * @return bool False if the contents weren't deleted and true on success + * @param int|string $key What the contents in the cache are called. + * @param string $group Optional. Where the cache contents are grouped. Default 'default'. + * @param bool $deprecated Optional. Unused. Default false. + * @return bool False if the contents weren't deleted and true on success. */ - function delete( $key, $group = 'default', $deprecated = false ) { + public function delete( $key, $group = 'default', $deprecated = false ) { if ( empty( $group ) ) $group = 'default'; @@ -413,20 +505,21 @@ class WP_Object_Cache { } /** - * Clears the object cache of all data + * Clears the object cache of all data. * * @since 2.0.0 + * @access public * - * @return bool Always returns true + * @return true Always returns true. */ - function flush() { - $this->cache = array (); + public function flush() { + $this->cache = array(); return true; } /** - * Retrieves the cache contents, if it exists + * Retrieves the cache contents, if it exists. * * The contents will be first attempted to be retrieved by searching by the * key in the cache group. If the cache is hit (success) then the contents @@ -435,14 +528,17 @@ class WP_Object_Cache { * On failure, the number of cache misses will be incremented. * * @since 2.0.0 + * @access public * - * @param int|string $key What the contents in the cache are called - * @param string $group Where the cache contents are grouped - * @param string $force Whether to force a refetch rather than relying on the local cache (default is false) - * @return bool|mixed False on failure to retrieve contents or the cache - * contents on success + * @param int|string $key What the contents in the cache are called. + * @param string $group Optional. Where the cache contents are grouped. Default 'default'. + * @param string $force Optional. Unused. Whether to force a refetch rather than relying on the local + * cache. Default false. + * @param bool $found Optional. Whether the key was found in the cache. Disambiguates a return of + * false, a storable value. Passed by reference. Default null. + * @return false|mixed False on failure to retrieve contents or the cache contents on success. */ - function get( $key, $group = 'default', $force = false, &$found = null ) { + public function get( $key, $group = 'default', $force = false, &$found = null ) { if ( empty( $group ) ) $group = 'default'; @@ -464,16 +560,17 @@ class WP_Object_Cache { } /** - * Increment numeric cache item's value + * Increments numeric cache item's value. * * @since 3.3.0 + * @access public * - * @param int|string $key The cache key to increment - * @param int $offset The amount by which to increment the item's value. Default is 1. - * @param string $group The group the key is in. + * @param int|string $key The cache key to increment + * @param int $offset Optional. The amount by which to increment the item's value. Default 1. + * @param string $group Optional. The group the key is in. Default 'default'. * @return false|int False on failure, the item's new value on success. */ - function incr( $key, $offset = 1, $group = 'default' ) { + public function incr( $key, $offset = 1, $group = 'default' ) { if ( empty( $group ) ) $group = 'default'; @@ -497,18 +594,20 @@ class WP_Object_Cache { } /** - * Replace the contents in the cache, if contents already exist + * Replaces the contents in the cache, if contents already exist. * * @since 2.0.0 + * @access public + * * @see WP_Object_Cache::set() * - * @param int|string $key What to call the contents in the cache - * @param mixed $data The contents to store in the cache - * @param string $group Where to group the cache contents - * @param int $expire When to expire the cache contents - * @return bool False if not exists, true if contents were replaced + * @param int|string $key What to call the contents in the cache. + * @param mixed $data The contents to store in the cache. + * @param string $group Optional. Where to group the cache contents. Default 'default'. + * @param int $expire Optional. When to expire the cache contents. Default 0 (no expiration). + * @return bool False if not exists, true if contents were replaced. */ - function replace( $key, $data, $group = 'default', $expire = 0 ) { + public function replace( $key, $data, $group = 'default', $expire = 0 ) { if ( empty( $group ) ) $group = 'default'; @@ -523,12 +622,15 @@ class WP_Object_Cache { } /** - * Reset keys + * Resets cache keys. * * @since 3.0.0 - * @deprecated 3.5.0 + * @access public + * + * @deprecated 3.5.0 Use switch_to_blog() + * @see switch_to_blog() */ - function reset() { + public function reset() { _deprecated_function( __FUNCTION__, '3.5', 'switch_to_blog()' ); // Clear out non-global caches since the blog ID has changed. @@ -539,7 +641,7 @@ class WP_Object_Cache { } /** - * Sets the data contents into the cache + * Sets the data contents into the cache. * * The cache contents is grouped by the $group parameter followed by the * $key. This allows for duplicate ids in unique groups. Therefore, naming of @@ -551,14 +653,15 @@ class WP_Object_Cache { * more for cache plugins which use files. * * @since 2.0.0 + * @access public * - * @param int|string $key What to call the contents in the cache - * @param mixed $data The contents to store in the cache - * @param string $group Where to group the cache contents - * @param int $expire Not Used - * @return bool Always returns true + * @param int|string $key What to call the contents in the cache. + * @param mixed $data The contents to store in the cache. + * @param string $group Optional. Where to group the cache contents. Default 'default'. + * @param int $expire Not Used. + * @return true Always returns true. */ - function set( $key, $data, $group = 'default', $expire = 0 ) { + public function set( $key, $data, $group = 'default', $expire = 0 ) { if ( empty( $group ) ) $group = 'default'; @@ -579,51 +682,57 @@ class WP_Object_Cache { * key and the data. * * @since 2.0.0 + * @access public */ - function stats() { + public function stats() { echo "

"; echo "Cache Hits: {$this->cache_hits}
"; echo "Cache Misses: {$this->cache_misses}
"; echo "

"; echo '

Group: $group - ( " . number_format( strlen( serialize( $cache ) ) / 1024, 2 ) . 'k )
Group: $group - ( " . number_format( strlen( serialize( $cache ) ) / KB_IN_BYTES, 2 ) . 'k )

'; } /** - * Switch the interal blog id. + * Switches the interal blog ID. * - * This changes the blog id used to create keys in blog specific groups. + * This changes the blog ID used to create keys in blog specific groups. * * @since 3.5.0 + * @access public * - * @param int $blog_id Blog ID + * @param int $blog_id Blog ID. */ - function switch_to_blog( $blog_id ) { + public function switch_to_blog( $blog_id ) { $blog_id = (int) $blog_id; $this->blog_prefix = $this->multisite ? $blog_id . ':' : ''; } /** - * Utility function to determine whether a key exists in the cache. + * Serves as a utility function to determine whether a key exists in the cache. * * @since 3.4.0 - * * @access protected + * + * @param int|string $key Cache key to check for existence. + * @param string $group Cache group for the key existence check. + * @return bool Whether the key exists in the cache for the given group. */ protected function _exists( $key, $group ) { return isset( $this->cache[ $group ] ) && ( isset( $this->cache[ $group ][ $key ] ) || array_key_exists( $key, $this->cache[ $group ] ) ); } /** - * Sets up object properties; PHP 5 style constructor + * Sets up object properties; PHP 5 style constructor. * * @since 2.0.8 - * @return null|WP_Object_Cache If cache is disabled, returns null. + * + * @global int $blog_id Global blog ID. */ - function __construct() { + public function __construct() { global $blog_id; $this->multisite = is_multisite(); @@ -638,15 +747,15 @@ class WP_Object_Cache { } /** - * Will save the object cache before object is completely destroyed. + * Saves the object cache before object is completely destroyed. * * Called upon object destruction, which should be when PHP ends. * - * @since 2.0.8 + * @since 2.0.8 * - * @return bool True value. Won't be used by PHP + * @return true Always returns true. */ - function __destruct() { + public function __destruct() { return true; } } diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php index 5aefe2b..87afcce 100644 --- a/wp-includes/canonical.php +++ b/wp-includes/canonical.php @@ -17,7 +17,7 @@ * prevents penalty for duplicate content by redirecting all incoming links to * one or the other. * - * Prevents redirection for feeds, trackbacks, searches, comment popup, and + * Prevents redirection for feeds, trackbacks, searches, and * admin URLs. Does not redirect on non-pretty-permalink-supporting IIS 7+, * page/post previews, WP admin, Trackbacks, robots.txt, searches, or on POST * requests. @@ -27,22 +27,39 @@ * or query in an attempt to figure the correct page to go to. * * @since 2.3.0 - * @uses $wp_rewrite - * @uses $is_IIS + * + * @global WP_Rewrite $wp_rewrite + * @global bool $is_IIS + * @global WP_Query $wp_query + * @global wpdb $wpdb WordPress database abstraction object. * * @param string $requested_url Optional. The URL that was requested, used to * figure if redirect is needed. * @param bool $do_redirect Optional. Redirect to the new URL. - * @return null|false|string Null, if redirect not needed. False, if redirect - * not needed or the string of the URL + * @return string|void The string of the URL, if redirect needed. */ function redirect_canonical( $requested_url = null, $do_redirect = true ) { - global $wp_rewrite, $is_IIS, $wp_query, $wpdb; + global $wp_rewrite, $is_IIS, $wp_query, $wpdb, $wp; + + if ( isset( $_SERVER['REQUEST_METHOD'] ) && ! in_array( strtoupper( $_SERVER['REQUEST_METHOD'] ), array( 'GET', 'HEAD' ) ) ) { + return; + } + + // If we're not in wp-admin and the post has been published and preview nonce + // is non-existent or invalid then no need for preview in query + if ( is_preview() && get_query_var( 'p' ) && 'publish' == get_post_status( get_query_var( 'p' ) ) ) { + if ( ! isset( $_GET['preview_id'] ) + || ! isset( $_GET['preview_nonce'] ) + || ! wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . (int) $_GET['preview_id'] ) ) { + $wp_query->is_preview = false; + } + } - if ( is_trackback() || is_search() || is_comments_popup() || is_admin() || !empty($_POST) || is_preview() || is_robots() || ( $is_IIS && !iis7_supports_permalinks() ) ) + if ( is_trackback() || is_search() || is_admin() || is_preview() || is_robots() || ( $is_IIS && !iis7_supports_permalinks() ) ) { return; + } - if ( !$requested_url ) { + if ( ! $requested_url && isset( $_SERVER['HTTP_HOST'] ) ) { // build the URL in the address bar $requested_url = is_ssl() ? 'https://' : 'http://'; $requested_url .= $_SERVER['HTTP_HOST']; @@ -50,14 +67,9 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) { } $original = @parse_url($requested_url); - if ( false === $original ) + if ( false === $original ) { return; - - // Some PHP setups turn requests for / into /index.php in REQUEST_URI - // See: http://trac.wordpress.org/ticket/5017 - // See: http://trac.wordpress.org/ticket/7173 - // Disabled, for now: - // $original['path'] = preg_replace('|/index\.php$|', '/', $original['path']); + } $redirect = $original; $redirect_url = false; @@ -68,6 +80,16 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) { if ( !isset($redirect['query']) ) $redirect['query'] = ''; + // If the original URL ended with non-breaking spaces, they were almost + // certainly inserted by accident. Let's remove them, so the reader doesn't + // see a 404 error with no obvious cause. + $redirect['path'] = preg_replace( '|(%C2%A0)+$|i', '', $redirect['path'] ); + + // It's not a preview, so remove it from URL + if ( get_query_var( 'preview' ) ) { + $redirect['query'] = remove_query_arg( 'preview', $redirect['query'] ); + } + if ( is_feed() && ( $id = get_query_var( 'p' ) ) ) { if ( $redirect_url = get_post_comments_feed_link( $id, get_query_var( 'feed' ) ) ) { $redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type', 'feed'), $redirect_url ); @@ -95,7 +117,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) { $id = max( get_query_var('p'), get_query_var('page_id'), get_query_var('attachment_id') ); if ( $id && $redirect_post = get_post($id) ) { $post_type_obj = get_post_type_object($redirect_post->post_type); - if ( $post_type_obj->public ) { + if ( $post_type_obj->public && 'auto-draft' != $redirect_post->post_status ) { $redirect_url = get_permalink($redirect_post); $redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type' ), $redirect_url ); } @@ -121,11 +143,26 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) { } } + if ( get_query_var( 'page' ) && $wp_query->post && + false !== strpos( $wp_query->post->post_content, '' ) ) { + $redirect['path'] = rtrim( $redirect['path'], (int) get_query_var( 'page' ) . '/' ); + $redirect['query'] = remove_query_arg( 'page', $redirect['query'] ); + $redirect_url = get_permalink( $wp_query->post->ID ); + } + } elseif ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() ) { // rewriting of old ?p=X, ?m=2004, ?m=200401, ?m=20040101 - if ( is_attachment() && !empty($_GET['attachment_id']) && ! $redirect_url ) { - if ( $redirect_url = get_attachment_link(get_query_var('attachment_id')) ) - $redirect['query'] = remove_query_arg('attachment_id', $redirect['query']); + if ( is_attachment() && + ! array_diff( array_keys( $wp->query_vars ), array( 'attachment', 'attachment_id' ) ) && + ! $redirect_url ) { + if ( ! empty( $_GET['attachment_id'] ) ) { + $redirect_url = get_attachment_link( get_query_var( 'attachment_id' ) ); + if ( $redirect_url ) { + $redirect['query'] = remove_query_arg( 'attachment_id', $redirect['query'] ); + } + } else { + $redirect_url = get_attachment_link(); + } } elseif ( is_single() && !empty($_GET['p']) && ! $redirect_url ) { if ( $redirect_url = get_permalink(get_query_var('p')) ) $redirect['query'] = remove_query_arg(array('p', 'post_type'), $redirect['query']); @@ -135,7 +172,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) { } elseif ( is_page() && !empty($_GET['page_id']) && ! $redirect_url ) { if ( $redirect_url = get_permalink(get_query_var('page_id')) ) $redirect['query'] = remove_query_arg('page_id', $redirect['query']); - } elseif ( is_page() && !is_feed() && isset($wp_query->queried_object) && 'page' == get_option('show_on_front') && $wp_query->queried_object->ID == get_option('page_on_front') && ! $redirect_url ) { + } elseif ( is_page() && !is_feed() && 'page' == get_option('show_on_front') && get_queried_object_id() == get_option('page_on_front') && ! $redirect_url ) { $redirect_url = home_url('/'); } elseif ( is_home() && !empty($_GET['page_id']) && 'page' == get_option('show_on_front') && get_query_var('page_id') == get_option('page_for_posts') && ! $redirect_url ) { if ( $redirect_url = get_permalink(get_option('page_for_posts')) ) @@ -174,7 +211,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) { } elseif ( is_category() || is_tag() || is_tax() ) { // Terms (Tags/categories) $term_count = 0; - foreach ( $wp_query->tax_query->queries as $tax_query ) + foreach ( $wp_query->tax_query->queried_terms as $tax_query ) $term_count += count( $tax_query['terms'] ); $obj = $wp_query->get_queried_object(); @@ -225,20 +262,28 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) { } // Post Paging - if ( is_singular() && ! is_front_page() && get_query_var('page') ) { + if ( is_singular() && get_query_var('page') ) { if ( !$redirect_url ) $redirect_url = get_permalink( get_queried_object_id() ); - $redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' ); + + $page = get_query_var( 'page' ); + if ( $page > 1 ) { + if ( is_front_page() ) { + $redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( "$wp_rewrite->pagination_base/$page", 'paged' ); + } else { + $redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( $page, 'single_paged' ); + } + } $redirect['query'] = remove_query_arg( 'page', $redirect['query'] ); } // paging and feeds if ( get_query_var('paged') || is_feed() || get_query_var('cpage') ) { - while ( preg_match( "#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", $redirect['path'] ) || preg_match( '#/(comments/?)?(feed|rss|rdf|atom|rss2)(/+)?$#', $redirect['path'] ) || preg_match( '#/comment-page-[0-9]+(/+)?$#', $redirect['path'] ) ) { + while ( preg_match( "#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", $redirect['path'] ) || preg_match( '#/(comments/?)?(feed|rss|rdf|atom|rss2)(/+)?$#', $redirect['path'] ) || preg_match( "#/{$wp_rewrite->comments_pagination_base}-[0-9]+(/+)?$#", $redirect['path'] ) ) { // Strip off paging and feed $redirect['path'] = preg_replace("#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", '/', $redirect['path']); // strip off any existing paging $redirect['path'] = preg_replace('#/(comments/?)?(feed|rss2?|rdf|atom)(/+|$)#', '/', $redirect['path']); // strip off feed endings - $redirect['path'] = preg_replace('#/comment-page-[0-9]+?(/+)?$#', '/', $redirect['path']); // strip off any existing comment paging + $redirect['path'] = preg_replace("#/{$wp_rewrite->comments_pagination_base}-[0-9]+?(/+)?$#", '/', $redirect['path']); // strip off any existing comment paging } $addl_path = ''; @@ -281,8 +326,11 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) { } } - if ( get_option('page_comments') && ( ( 'newest' == get_option('default_comments_page') && get_query_var('cpage') > 0 ) || ( 'newest' != get_option('default_comments_page') && get_query_var('cpage') > 1 ) ) ) { - $addl_path = ( !empty( $addl_path ) ? trailingslashit($addl_path) : '' ) . user_trailingslashit( 'comment-page-' . get_query_var('cpage'), 'commentpaged' ); + if ( get_option( 'page_comments' ) && ( + ( 'newest' == get_option( 'default_comments_page' ) && get_query_var( 'cpage' ) > 0 ) || + ( 'newest' != get_option( 'default_comments_page' ) && get_query_var( 'cpage' ) > 1 ) + ) ) { + $addl_path = ( !empty( $addl_path ) ? trailingslashit($addl_path) : '' ) . user_trailingslashit( $wp_rewrite->comments_pagination_base . '-' . get_query_var('cpage'), 'commentpaged' ); $redirect['query'] = remove_query_arg( 'cpage', $redirect['query'] ); } @@ -295,11 +343,13 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) { } if ( 'wp-register.php' == basename( $redirect['path'] ) ) { - if ( is_multisite() ) + if ( is_multisite() ) { /** This filter is documented in wp-login.php */ $redirect_url = apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) ); - else - $redirect_url = site_url( 'wp-login.php?action=register' ); + } else { + $redirect_url = wp_registration_url(); + } + wp_redirect( $redirect_url, 301 ); die(); } @@ -395,7 +445,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) { ( strtolower($original['host']) != 'www.' . strtolower($redirect['host']) && 'www.' . strtolower($original['host']) != strtolower($redirect['host']) ) ) $redirect['host'] = $original['host']; - $compare_original = array($original['host'], $original['path']); + $compare_original = array( $original['host'], $original['path'] ); if ( !empty( $original['port'] ) ) $compare_original[] = $original['port']; @@ -403,7 +453,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) { if ( !empty( $original['query'] ) ) $compare_original[] = $original['query']; - $compare_redirect = array($redirect['host'], $redirect['path']); + $compare_redirect = array( $redirect['host'], $redirect['path'] ); if ( !empty( $redirect['port'] ) ) $compare_redirect[] = $redirect['port']; @@ -420,8 +470,9 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) { $redirect_url .= '?' . $redirect['query']; } - if ( !$redirect_url || $redirect_url == $requested_url ) - return false; + if ( ! $redirect_url || $redirect_url == $requested_url ) { + return; + } // Hex encoded octets are case-insensitive. if ( false !== strpos($requested_url, '%') ) { @@ -445,8 +496,10 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) { */ $redirect_url = apply_filters( 'redirect_canonical', $redirect_url, $requested_url ); - if ( !$redirect_url || $redirect_url == $requested_url ) // yes, again -- in case the filter aborted the request - return false; + // yes, again -- in case the filter aborted the request + if ( ! $redirect_url || strip_fragment_from_url( $redirect_url ) == strip_fragment_from_url( $requested_url ) ) { + return; + } if ( $do_redirect ) { // protect against chained redirects @@ -456,7 +509,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) { } else { // Debug // die("1: $redirect_url
2: " . redirect_canonical( $redirect_url, false ) ); - return false; + return; } } else { return $redirect_url; @@ -470,6 +523,9 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) { * @since 3.4.0 * @access private * + * @param string $query_string + * @param array $args_to_check + * @param string $url * @return string The altered query string */ function _remove_qs_args_if_not_in_url( $query_string, Array $args_to_check, $url ) { @@ -486,19 +542,45 @@ function _remove_qs_args_if_not_in_url( $query_string, Array $args_to_check, $ur return $query_string; } +/** + * Strips the #fragment from a URL, if one is present. + * + * @since 4.4.0 + * + * @param string $url The URL to strip. + * @return string The altered URL. + */ +function strip_fragment_from_url( $url ) { + $parsed_url = @parse_url( $url ); + if ( ! empty( $parsed_url['host'] ) ) { + // This mirrors code in redirect_canonical(). It does not handle every case. + $url = $parsed_url['scheme'] . '://' . $parsed_url['host']; + if ( ! empty( $parsed_url['port'] ) ) { + $url .= ':' . $parsed_url['port']; + } + $url .= $parsed_url['path']; + if ( ! empty( $parsed_url['query'] ) ) { + $url .= '?' . $parsed_url['query']; + } + } + + return $url; +} + /** * Attempts to guess the correct URL based on query vars * * @since 2.3.0 - * @uses $wpdb * - * @return bool|string The correct URL if one is found. False on failure. + * @global wpdb $wpdb WordPress database abstraction object. + * + * @return false|string The correct URL if one is found. False on failure. */ function redirect_guess_404_permalink() { - global $wpdb, $wp_rewrite; + global $wpdb; if ( get_query_var('name') ) { - $where = $wpdb->prepare("post_name LIKE %s", like_escape( get_query_var('name') ) . '%'); + $where = $wpdb->prepare("post_name LIKE %s", $wpdb->esc_like( get_query_var('name') ) . '%'); // if any of post_type, year, monthnum, or day are set, use them to refine the query if ( get_query_var('post_type') ) @@ -518,7 +600,7 @@ function redirect_guess_404_permalink() { return false; if ( get_query_var( 'feed' ) ) return get_post_comments_feed_link( $post_id, get_query_var( 'feed' ) ); - elseif ( get_query_var( 'page' ) ) + elseif ( get_query_var( 'page' ) && 1 < get_query_var( 'page' ) ) return trailingslashit( get_permalink( $post_id ) ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' ); else return get_permalink( $post_id ); @@ -527,8 +609,16 @@ function redirect_guess_404_permalink() { return false; } -add_action('template_redirect', 'redirect_canonical'); - +/** + * Redirects a variety of shorthand URLs to the admin. + * + * If a user visits example.com/admin, they'll be redirected to /wp-admin. + * Visiting /login redirects to /wp-login.php, and so on. + * + * @since 3.4.0 + * + * @global WP_Rewrite $wp_rewrite + */ function wp_redirect_admin_locations() { global $wp_rewrite; if ( ! ( is_404() && $wp_rewrite->using_permalinks() ) ) @@ -552,9 +642,7 @@ function wp_redirect_admin_locations() { site_url( 'login', 'relative' ), ); if ( in_array( untrailingslashit( $_SERVER['REQUEST_URI'] ), $logins ) ) { - wp_redirect( site_url( 'wp-login.php', 'login' ) ); + wp_redirect( wp_login_url() ); exit; } } - -add_action( 'template_redirect', 'wp_redirect_admin_locations', 1000 ); diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php index 89e854b..9ed3447 100644 --- a/wp-includes/capabilities.php +++ b/wp-includes/capabilities.php @@ -1,1021 +1,11 @@ - * array ( - * 'rolename' => array ( - * 'name' => 'rolename', - * 'capabilities' => array() - * ) - * ) - * - * - * @since 2.0.0 - * @package WordPress - * @subpackage User - */ -class WP_Roles { - /** - * List of roles and capabilities. - * - * @since 2.0.0 - * @access public - * @var array - */ - var $roles; - - /** - * List of the role objects. - * - * @since 2.0.0 - * @access public - * @var array - */ - var $role_objects = array(); - - /** - * List of role names. - * - * @since 2.0.0 - * @access public - * @var array - */ - var $role_names = array(); - - /** - * Option name for storing role list. - * - * @since 2.0.0 - * @access public - * @var string - */ - var $role_key; - - /** - * Whether to use the database for retrieval and storage. - * - * @since 2.1.0 - * @access public - * @var bool - */ - var $use_db = true; - - /** - * Constructor - * - * @since 2.0.0 - */ - function __construct() { - $this->_init(); - } - - /** - * Set up the object properties. - * - * The role key is set to the current prefix for the $wpdb object with - * 'user_roles' appended. If the $wp_user_roles global is set, then it will - * be used and the role option will not be updated or used. - * - * @since 2.1.0 - * @access protected - * @uses $wpdb Used to get the database prefix. - * @global array $wp_user_roles Used to set the 'roles' property value. - */ - function _init () { - global $wpdb, $wp_user_roles; - $this->role_key = $wpdb->get_blog_prefix() . 'user_roles'; - if ( ! empty( $wp_user_roles ) ) { - $this->roles = $wp_user_roles; - $this->use_db = false; - } else { - $this->roles = get_option( $this->role_key ); - } - - if ( empty( $this->roles ) ) - return; - - $this->role_objects = array(); - $this->role_names = array(); - foreach ( array_keys( $this->roles ) as $role ) { - $this->role_objects[$role] = new WP_Role( $role, $this->roles[$role]['capabilities'] ); - $this->role_names[$role] = $this->roles[$role]['name']; - } - } - - /** - * Reinitialize the object - * - * Recreates the role objects. This is typically called only by switch_to_blog() - * after switching wpdb to a new blog ID. - * - * @since 3.5.0 - * @access public - */ - function reinit() { - // There is no need to reinit if using the wp_user_roles global. - if ( ! $this->use_db ) - return; - - global $wpdb, $wp_user_roles; - - // Duplicated from _init() to avoid an extra function call. - $this->role_key = $wpdb->get_blog_prefix() . 'user_roles'; - $this->roles = get_option( $this->role_key ); - if ( empty( $this->roles ) ) - return; - - $this->role_objects = array(); - $this->role_names = array(); - foreach ( array_keys( $this->roles ) as $role ) { - $this->role_objects[$role] = new WP_Role( $role, $this->roles[$role]['capabilities'] ); - $this->role_names[$role] = $this->roles[$role]['name']; - } - } - - /** - * Add role name with capabilities to list. - * - * Updates the list of roles, if the role doesn't already exist. - * - * The capabilities are defined in the following format `array( 'read' => true );` - * To explicitly deny a role a capability you set the value for that capability to false. - * - * @since 2.0.0 - * @access public - * - * @param string $role Role name. - * @param string $display_name Role display name. - * @param array $capabilities List of role capabilities in the above format. - * @return WP_Role|null WP_Role object if role is added, null if already exists. - */ - function add_role( $role, $display_name, $capabilities = array() ) { - if ( isset( $this->roles[$role] ) ) - return; - - $this->roles[$role] = array( - 'name' => $display_name, - 'capabilities' => $capabilities - ); - if ( $this->use_db ) - update_option( $this->role_key, $this->roles ); - $this->role_objects[$role] = new WP_Role( $role, $capabilities ); - $this->role_names[$role] = $display_name; - return $this->role_objects[$role]; - } - - /** - * Remove role by name. - * - * @since 2.0.0 - * @access public - * - * @param string $role Role name. - */ - function remove_role( $role ) { - if ( ! isset( $this->role_objects[$role] ) ) - return; - - unset( $this->role_objects[$role] ); - unset( $this->role_names[$role] ); - unset( $this->roles[$role] ); - - if ( $this->use_db ) - update_option( $this->role_key, $this->roles ); - - if ( get_option( 'default_role' ) == $role ) - update_option( 'default_role', 'subscriber' ); - } - - /** - * Add capability to role. - * - * @since 2.0.0 - * @access public - * - * @param string $role Role name. - * @param string $cap Capability name. - * @param bool $grant Optional, default is true. Whether role is capable of performing capability. - */ - function add_cap( $role, $cap, $grant = true ) { - if ( ! isset( $this->roles[$role] ) ) - return; - - $this->roles[$role]['capabilities'][$cap] = $grant; - if ( $this->use_db ) - update_option( $this->role_key, $this->roles ); - } - - /** - * Remove capability from role. - * - * @since 2.0.0 - * @access public - * - * @param string $role Role name. - * @param string $cap Capability name. - */ - function remove_cap( $role, $cap ) { - if ( ! isset( $this->roles[$role] ) ) - return; - - unset( $this->roles[$role]['capabilities'][$cap] ); - if ( $this->use_db ) - update_option( $this->role_key, $this->roles ); - } - - /** - * Retrieve role object by name. - * - * @since 2.0.0 - * @access public - * - * @param string $role Role name. - * @return WP_Role|null WP_Role object if found, null if the role does not exist. - */ - function get_role( $role ) { - if ( isset( $this->role_objects[$role] ) ) - return $this->role_objects[$role]; - else - return null; - } - - /** - * Retrieve list of role names. - * - * @since 2.0.0 - * @access public - * - * @return array List of role names. - */ - function get_names() { - return $this->role_names; - } - - /** - * Whether role name is currently in the list of available roles. - * - * @since 2.0.0 - * @access public - * - * @param string $role Role name to look up. - * @return bool - */ - function is_role( $role ) { - return isset( $this->role_names[$role] ); - } -} - -/** - * WordPress Role class. - * - * @since 2.0.0 - * @package WordPress - * @subpackage User - */ -class WP_Role { - /** - * Role name. - * - * @since 2.0.0 - * @access public - * @var string - */ - var $name; - - /** - * List of capabilities the role contains. - * - * @since 2.0.0 - * @access public - * @var array - */ - var $capabilities; - - /** - * Constructor - Set up object properties. - * - * The list of capabilities, must have the key as the name of the capability - * and the value a boolean of whether it is granted to the role. - * - * @since 2.0.0 - * @access public - * - * @param string $role Role name. - * @param array $capabilities List of capabilities. - */ - function __construct( $role, $capabilities ) { - $this->name = $role; - $this->capabilities = $capabilities; - } - - /** - * Assign role a capability. - * - * @see WP_Roles::add_cap() Method uses implementation for role. - * @since 2.0.0 - * @access public - * - * @param string $cap Capability name. - * @param bool $grant Whether role has capability privilege. - */ - function add_cap( $cap, $grant = true ) { - global $wp_roles; - - if ( ! isset( $wp_roles ) ) - $wp_roles = new WP_Roles(); - - $this->capabilities[$cap] = $grant; - $wp_roles->add_cap( $this->name, $cap, $grant ); - } - - /** - * Remove capability from role. - * - * This is a container for {@link WP_Roles::remove_cap()} to remove the - * capability from the role. That is to say, that {@link - * WP_Roles::remove_cap()} implements the functionality, but it also makes - * sense to use this class, because you don't need to enter the role name. - * - * @since 2.0.0 - * @access public - * - * @param string $cap Capability name. - */ - function remove_cap( $cap ) { - global $wp_roles; - - if ( ! isset( $wp_roles ) ) - $wp_roles = new WP_Roles(); - - unset( $this->capabilities[$cap] ); - $wp_roles->remove_cap( $this->name, $cap ); - } - - /** - * Whether role has capability. - * - * The capabilities is passed through the 'role_has_cap' filter. The first - * parameter for the hook is the list of capabilities the class has - * assigned. The second parameter is the capability name to look for. The - * third and final parameter for the hook is the role name. - * - * @since 2.0.0 - * @access public - * - * @param string $cap Capability name. - * @return bool True, if user has capability. False, if doesn't have capability. - */ - function has_cap( $cap ) { - /** - * Filter which capabilities a role has. - * - * @since 2.0.0 - * - * @param array $capabilities Array of role capabilities. - * @param string $cap Capability name. - * @param string $name Role name. - */ - $capabilities = apply_filters( 'role_has_cap', $this->capabilities, $cap, $this->name ); - if ( !empty( $capabilities[$cap] ) ) - return $capabilities[$cap]; - else - return false; - } - -} - -/** - * WordPress User class. - * - * @since 2.0.0 - * @package WordPress - * @subpackage User - */ -class WP_User { - /** - * User data container. - * - * @since 2.0.0 - * @access private - * @var array - */ - var $data; - - /** - * The user's ID. - * - * @since 2.1.0 - * @access public - * @var int - */ - var $ID = 0; - - /** - * The individual capabilities the user has been given. - * - * @since 2.0.0 - * @access public - * @var array - */ - var $caps = array(); - - /** - * User metadata option name. - * - * @since 2.0.0 - * @access public - * @var string - */ - var $cap_key; - - /** - * The roles the user is part of. - * - * @since 2.0.0 - * @access public - * @var array - */ - var $roles = array(); - - /** - * All capabilities the user has, including individual and role based. - * - * @since 2.0.0 - * @access public - * @var array - */ - var $allcaps = array(); - - /** - * The filter context applied to user data fields. - * - * @since 2.9.0 - * @access private - * @var string - */ - var $filter = null; - - private static $back_compat_keys; - - /** - * Constructor - * - * Retrieves the userdata and passes it to {@link WP_User::init()}. - * - * @since 2.0.0 - * @access public - * - * @param int|string|stdClass|WP_User $id User's ID, a WP_User object, or a user object from the DB. - * @param string $name Optional. User's username - * @param int $blog_id Optional Blog ID, defaults to current blog. - * @return WP_User - */ - function __construct( $id = 0, $name = '', $blog_id = '' ) { - if ( ! isset( self::$back_compat_keys ) ) { - $prefix = $GLOBALS['wpdb']->prefix; - self::$back_compat_keys = array( - 'user_firstname' => 'first_name', - 'user_lastname' => 'last_name', - 'user_description' => 'description', - 'user_level' => $prefix . 'user_level', - $prefix . 'usersettings' => $prefix . 'user-settings', - $prefix . 'usersettingstime' => $prefix . 'user-settings-time', - ); - } - - if ( is_a( $id, 'WP_User' ) ) { - $this->init( $id->data, $blog_id ); - return; - } elseif ( is_object( $id ) ) { - $this->init( $id, $blog_id ); - return; - } - - if ( ! empty( $id ) && ! is_numeric( $id ) ) { - $name = $id; - $id = 0; - } - - if ( $id ) - $data = self::get_data_by( 'id', $id ); - else - $data = self::get_data_by( 'login', $name ); - - if ( $data ) - $this->init( $data, $blog_id ); - } - - /** - * Sets up object properties, including capabilities. - * - * @param object $data User DB row object - * @param int $blog_id Optional. The blog id to initialize for - */ - function init( $data, $blog_id = '' ) { - $this->data = $data; - $this->ID = (int) $data->ID; - - $this->for_blog( $blog_id ); - } - - /** - * Return only the main user fields - * - * @since 3.3.0 - * - * @param string $field The field to query against: 'id', 'slug', 'email' or 'login' - * @param string|int $value The field value - * @return object Raw user object - */ - static function get_data_by( $field, $value ) { - global $wpdb; - - if ( 'id' == $field ) { - // Make sure the value is numeric to avoid casting objects, for example, - // to int 1. - if ( ! is_numeric( $value ) ) - return false; - $value = intval( $value ); - if ( $value < 1 ) - return false; - } else { - $value = trim( $value ); - } - - if ( !$value ) - return false; - - switch ( $field ) { - case 'id': - $user_id = $value; - $db_field = 'ID'; - break; - case 'slug': - $user_id = wp_cache_get($value, 'userslugs'); - $db_field = 'user_nicename'; - break; - case 'email': - $user_id = wp_cache_get($value, 'useremail'); - $db_field = 'user_email'; - break; - case 'login': - $value = sanitize_user( $value ); - $user_id = wp_cache_get($value, 'userlogins'); - $db_field = 'user_login'; - break; - default: - return false; - } - - if ( false !== $user_id ) { - if ( $user = wp_cache_get( $user_id, 'users' ) ) - return $user; - } - - if ( !$user = $wpdb->get_row( $wpdb->prepare( - "SELECT * FROM $wpdb->users WHERE $db_field = %s", $value - ) ) ) - return false; - - update_user_caches( $user ); - - return $user; - } - - /** - * Magic method for checking the existence of a certain custom field - * - * @since 3.3.0 - */ - function __isset( $key ) { - if ( 'id' == $key ) { - _deprecated_argument( 'WP_User->id', '2.1', __( 'Use WP_User->ID instead.' ) ); - $key = 'ID'; - } - - if ( isset( $this->data->$key ) ) - return true; - - if ( isset( self::$back_compat_keys[ $key ] ) ) - $key = self::$back_compat_keys[ $key ]; - - return metadata_exists( 'user', $this->ID, $key ); - } - - /** - * Magic method for accessing custom fields - * - * @since 3.3.0 - */ - function __get( $key ) { - if ( 'id' == $key ) { - _deprecated_argument( 'WP_User->id', '2.1', __( 'Use WP_User->ID instead.' ) ); - return $this->ID; - } - - if ( isset( $this->data->$key ) ) { - $value = $this->data->$key; - } else { - if ( isset( self::$back_compat_keys[ $key ] ) ) - $key = self::$back_compat_keys[ $key ]; - $value = get_user_meta( $this->ID, $key, true ); - } - - if ( $this->filter ) { - $value = sanitize_user_field( $key, $value, $this->ID, $this->filter ); - } - - return $value; - } - - /** - * Magic method for setting custom fields - * - * @since 3.3.0 - */ - function __set( $key, $value ) { - if ( 'id' == $key ) { - _deprecated_argument( 'WP_User->id', '2.1', __( 'Use WP_User->ID instead.' ) ); - $this->ID = $value; - return; - } - - $this->data->$key = $value; - } - - /** - * Determine whether the user exists in the database. - * - * @since 3.4.0 - * @access public - * - * @return bool True if user exists in the database, false if not. - */ - function exists() { - return ! empty( $this->ID ); - } - - /** - * Retrieve the value of a property or meta key. - * - * Retrieves from the users and usermeta table. - * - * @since 3.3.0 - * - * @param string $key Property - */ - function get( $key ) { - return $this->__get( $key ); - } - - /** - * Determine whether a property or meta key is set - * - * Consults the users and usermeta tables. - * - * @since 3.3.0 - * - * @param string $key Property - */ - function has_prop( $key ) { - return $this->__isset( $key ); - } - - /** - * Return an array representation. - * - * @since 3.5.0 - * - * @return array Array representation. - */ - function to_array() { - return get_object_vars( $this->data ); - } - - /** - * Set up capability object properties. - * - * Will set the value for the 'cap_key' property to current database table - * prefix, followed by 'capabilities'. Will then check to see if the - * property matching the 'cap_key' exists and is an array. If so, it will be - * used. - * - * @access protected - * @since 2.1.0 - * - * @param string $cap_key Optional capability key - */ - function _init_caps( $cap_key = '' ) { - global $wpdb; - - if ( empty($cap_key) ) - $this->cap_key = $wpdb->get_blog_prefix() . 'capabilities'; - else - $this->cap_key = $cap_key; - - $this->caps = get_user_meta( $this->ID, $this->cap_key, true ); - - if ( ! is_array( $this->caps ) ) - $this->caps = array(); - - $this->get_role_caps(); - } - - /** - * Retrieve all of the role capabilities and merge with individual capabilities. - * - * All of the capabilities of the roles the user belongs to are merged with - * the users individual roles. This also means that the user can be denied - * specific roles that their role might have, but the specific user isn't - * granted permission to. - * - * @since 2.0.0 - * @uses $wp_roles - * @access public - * - * @return array List of all capabilities for the user. - */ - function get_role_caps() { - global $wp_roles; - - if ( ! isset( $wp_roles ) ) - $wp_roles = new WP_Roles(); - - //Filter out caps that are not role names and assign to $this->roles - if ( is_array( $this->caps ) ) - $this->roles = array_filter( array_keys( $this->caps ), array( $wp_roles, 'is_role' ) ); - - //Build $allcaps from role caps, overlay user's $caps - $this->allcaps = array(); - foreach ( (array) $this->roles as $role ) { - $the_role = $wp_roles->get_role( $role ); - $this->allcaps = array_merge( (array) $this->allcaps, (array) $the_role->capabilities ); - } - $this->allcaps = array_merge( (array) $this->allcaps, (array) $this->caps ); - - return $this->allcaps; - } - - /** - * Add role to user. - * - * Updates the user's meta data option with capabilities and roles. - * - * @since 2.0.0 - * @access public - * - * @param string $role Role name. - */ - function add_role( $role ) { - $this->caps[$role] = true; - update_user_meta( $this->ID, $this->cap_key, $this->caps ); - $this->get_role_caps(); - $this->update_user_level_from_caps(); - } - - /** - * Remove role from user. - * - * @since 2.0.0 - * @access public - * - * @param string $role Role name. - */ - function remove_role( $role ) { - if ( !in_array($role, $this->roles) ) - return; - unset( $this->caps[$role] ); - update_user_meta( $this->ID, $this->cap_key, $this->caps ); - $this->get_role_caps(); - $this->update_user_level_from_caps(); - } - - /** - * Set the role of the user. - * - * This will remove the previous roles of the user and assign the user the - * new one. You can set the role to an empty string and it will remove all - * of the roles from the user. - * - * @since 2.0.0 - * @access public - * - * @param string $role Role name. - */ - function set_role( $role ) { - if ( 1 == count( $this->roles ) && $role == current( $this->roles ) ) - return; - - foreach ( (array) $this->roles as $oldrole ) - unset( $this->caps[$oldrole] ); - - $old_roles = $this->roles; - if ( !empty( $role ) ) { - $this->caps[$role] = true; - $this->roles = array( $role => true ); - } else { - $this->roles = false; - } - update_user_meta( $this->ID, $this->cap_key, $this->caps ); - $this->get_role_caps(); - $this->update_user_level_from_caps(); - - /** - * Fires after the user's role has changed. - * - * @since 2.9.0 - * @since 3.6.0 Added $old_roles to include an array of the user's previous roles. - * - * @param int $user_id The user ID. - * @param string $role The new role. - * @param array $old_roles An array of the user's previous roles. - */ - do_action( 'set_user_role', $this->ID, $role, $old_roles ); - } - - /** - * Choose the maximum level the user has. - * - * Will compare the level from the $item parameter against the $max - * parameter. If the item is incorrect, then just the $max parameter value - * will be returned. - * - * Used to get the max level based on the capabilities the user has. This - * is also based on roles, so if the user is assigned the Administrator role - * then the capability 'level_10' will exist and the user will get that - * value. - * - * @since 2.0.0 - * @access public - * - * @param int $max Max level of user. - * @param string $item Level capability name. - * @return int Max Level. - */ - function level_reduction( $max, $item ) { - if ( preg_match( '/^level_(10|[0-9])$/i', $item, $matches ) ) { - $level = intval( $matches[1] ); - return max( $max, $level ); - } else { - return $max; - } - } - - /** - * Update the maximum user level for the user. - * - * Updates the 'user_level' user metadata (includes prefix that is the - * database table prefix) with the maximum user level. Gets the value from - * the all of the capabilities that the user has. - * - * @since 2.0.0 - * @access public - */ - function update_user_level_from_caps() { - global $wpdb; - $this->user_level = array_reduce( array_keys( $this->allcaps ), array( $this, 'level_reduction' ), 0 ); - update_user_meta( $this->ID, $wpdb->get_blog_prefix() . 'user_level', $this->user_level ); - } - - /** - * Add capability and grant or deny access to capability. - * - * @since 2.0.0 - * @access public - * - * @param string $cap Capability name. - * @param bool $grant Whether to grant capability to user. - */ - function add_cap( $cap, $grant = true ) { - $this->caps[$cap] = $grant; - update_user_meta( $this->ID, $this->cap_key, $this->caps ); - } - - /** - * Remove capability from user. - * - * @since 2.0.0 - * @access public - * - * @param string $cap Capability name. - */ - function remove_cap( $cap ) { - if ( ! isset( $this->caps[$cap] ) ) - return; - unset( $this->caps[$cap] ); - update_user_meta( $this->ID, $this->cap_key, $this->caps ); - } - - /** - * Remove all of the capabilities of the user. - * - * @since 2.1.0 - * @access public - */ - function remove_all_caps() { - global $wpdb; - $this->caps = array(); - delete_user_meta( $this->ID, $this->cap_key ); - delete_user_meta( $this->ID, $wpdb->get_blog_prefix() . 'user_level' ); - $this->get_role_caps(); - } - - /** - * Whether user has capability or role name. - * - * This is useful for looking up whether the user has a specific role - * assigned to the user. The second optional parameter can also be used to - * check for capabilities against a specific object, such as a post or user. - * - * @since 2.0.0 - * @access public - * - * @param string|int $cap Capability or role name to search. - * @return bool True, if user has capability; false, if user does not have capability. - */ - function has_cap( $cap ) { - if ( is_numeric( $cap ) ) { - _deprecated_argument( __FUNCTION__, '2.0', __('Usage of user levels by plugins and themes is deprecated. Use roles and capabilities instead.') ); - $cap = $this->translate_level_to_cap( $cap ); - } - - $args = array_slice( func_get_args(), 1 ); - $args = array_merge( array( $cap, $this->ID ), $args ); - $caps = call_user_func_array( 'map_meta_cap', $args ); - - // Multisite super admin has all caps by definition, Unless specifically denied. - if ( is_multisite() && is_super_admin( $this->ID ) ) { - if ( in_array('do_not_allow', $caps) ) - return false; - return true; - } - - /** - * Dynamically filter a user's capabilities. - * - * @since 2.0.0 - * @since 3.7.0 Added the user object. - * - * @param array $allcaps An array of all the role's capabilities. - * @param array $caps Actual capabilities for meta capability. - * @param array $args Optional parameters passed to has_cap(), typically object ID. - * @param WP_User $user The user object. - */ - // Must have ALL requested caps - $capabilities = apply_filters( 'user_has_cap', $this->allcaps, $caps, $args, $this ); - $capabilities['exist'] = true; // Everyone is allowed to exist - foreach ( (array) $caps as $cap ) { - if ( empty( $capabilities[ $cap ] ) ) - return false; - } - - return true; - } - - /** - * Convert numeric level to level capability name. - * - * Prepends 'level_' to level number. - * - * @since 2.0.0 - * @access public - * - * @param int $level Level number, 1 to 10. - * @return string - */ - function translate_level_to_cap( $level ) { - return 'level_' . $level; - } - - /** - * Set the blog to operate on. Defaults to the current blog. - * - * @since 3.0.0 - * - * @param int $blog_id Optional Blog ID, defaults to current blog. - */ - function for_blog( $blog_id = '' ) { - global $wpdb; - if ( ! empty( $blog_id ) ) - $cap_key = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities'; - else - $cap_key = ''; - $this->_init_caps( $cap_key ); - } -} - /** * Map meta capabilities to primitive capabilities. * @@ -1026,8 +16,14 @@ class WP_User { * * @since 2.0.0 * - * @param string $cap Capability name. - * @param int $user_id User ID. + * @global array $post_type_meta_caps Used to get post type meta capabilities. + * + * @param string $cap Capability name. + * @param int $user_id User ID. + * @param int $object_id Optional. ID of the specific object to check against if `$cap` is a "meta" cap. + * "Meta" capabilities, e.g. 'edit_post', 'edit_user', etc., are capabilities used + * by map_meta_cap() to map to other "primitive" capabilities, e.g. 'edit_posts', + * 'edit_others_posts', etc. The parameter is accessed via func_get_args(). * @return array Actual capabilities for meta capability. */ function map_meta_cap( $cap, $user_id ) { @@ -1039,6 +35,7 @@ function map_meta_cap( $cap, $user_id ) { $caps[] = 'remove_users'; break; case 'promote_user': + case 'add_users': $caps[] = 'promote_users'; break; case 'edit_user': @@ -1047,21 +44,36 @@ function map_meta_cap( $cap, $user_id ) { if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] ) break; - // If multisite these caps are allowed only for super admins. - if ( is_multisite() && !is_super_admin( $user_id ) ) + // In multisite the user must have manage_network_users caps. If editing a super admin, the user must be a super admin. + if ( is_multisite() && ( ( ! is_super_admin( $user_id ) && 'edit_user' === $cap && is_super_admin( $args[0] ) ) || ! user_can( $user_id, 'manage_network_users' ) ) ) { $caps[] = 'do_not_allow'; - else + } else { $caps[] = 'edit_users'; // edit_user maps to edit_users. + } break; case 'delete_post': case 'delete_page': $post = get_post( $args[0] ); + if ( ! $post ) { + $caps[] = 'do_not_allow'; + break; + } if ( 'revision' == $post->post_type ) { $post = get_post( $post->post_parent ); + if ( ! $post ) { + $caps[] = 'do_not_allow'; + break; + } } $post_type = get_post_type_object( $post->post_type ); + if ( ! $post_type ) { + /* translators: 1: post type, 2: capability name */ + _doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' ); + $caps[] = 'edit_others_posts'; + break; + } if ( ! $post_type->map_meta_cap ) { $caps[] = $post_type->cap->$cap; @@ -1073,12 +85,15 @@ function map_meta_cap( $cap, $user_id ) { // If the post author is set and the user is the author... if ( $post->post_author && $user_id == $post->post_author ) { - // If the post is published... - if ( 'publish' == $post->post_status ) { + // If the post is published or scheduled... + if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) { $caps[] = $post_type->cap->delete_published_posts; } elseif ( 'trash' == $post->post_status ) { - if ( 'publish' == get_post_meta( $post->ID, '_wp_trash_meta_status', true ) ) { + $status = get_post_meta( $post->ID, '_wp_trash_meta_status', true ); + if ( in_array( $status, array( 'publish', 'future' ), true ) ) { $caps[] = $post_type->cap->delete_published_posts; + } else { + $caps[] = $post_type->cap->delete_posts; } } else { // If the post is draft... @@ -1087,8 +102,8 @@ function map_meta_cap( $cap, $user_id ) { } else { // The user is trying to edit someone else's post. $caps[] = $post_type->cap->delete_others_posts; - // The post is published, extra cap required. - if ( 'publish' == $post->post_status ) { + // The post is published or scheduled, extra cap required. + if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) { $caps[] = $post_type->cap->delete_published_posts; } elseif ( 'private' == $post->post_status ) { $caps[] = $post_type->cap->delete_private_posts; @@ -1100,14 +115,26 @@ function map_meta_cap( $cap, $user_id ) { case 'edit_post': case 'edit_page': $post = get_post( $args[0] ); - if ( empty( $post ) ) + if ( ! $post ) { + $caps[] = 'do_not_allow'; break; + } if ( 'revision' == $post->post_type ) { $post = get_post( $post->post_parent ); + if ( ! $post ) { + $caps[] = 'do_not_allow'; + break; + } } $post_type = get_post_type_object( $post->post_type ); + if ( ! $post_type ) { + /* translators: 1: post type, 2: capability name */ + _doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' ); + $caps[] = 'edit_others_posts'; + break; + } if ( ! $post_type->map_meta_cap ) { $caps[] = $post_type->cap->$cap; @@ -1119,12 +146,15 @@ function map_meta_cap( $cap, $user_id ) { // If the post author is set and the user is the author... if ( $post->post_author && $user_id == $post->post_author ) { - // If the post is published... - if ( 'publish' == $post->post_status ) { + // If the post is published or scheduled... + if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) { $caps[] = $post_type->cap->edit_published_posts; } elseif ( 'trash' == $post->post_status ) { - if ( 'publish' == get_post_meta( $post->ID, '_wp_trash_meta_status', true ) ) { + $status = get_post_meta( $post->ID, '_wp_trash_meta_status', true ); + if ( in_array( $status, array( 'publish', 'future' ), true ) ) { $caps[] = $post_type->cap->edit_published_posts; + } else { + $caps[] = $post_type->cap->edit_posts; } } else { // If the post is draft... @@ -1133,8 +163,8 @@ function map_meta_cap( $cap, $user_id ) { } else { // The user is trying to edit someone else's post. $caps[] = $post_type->cap->edit_others_posts; - // The post is published, extra cap required. - if ( 'publish' == $post->post_status ) { + // The post is published or scheduled, extra cap required. + if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) { $caps[] = $post_type->cap->edit_published_posts; } elseif ( 'private' == $post->post_status ) { $caps[] = $post_type->cap->edit_private_posts; @@ -1144,12 +174,26 @@ function map_meta_cap( $cap, $user_id ) { case 'read_post': case 'read_page': $post = get_post( $args[0] ); + if ( ! $post ) { + $caps[] = 'do_not_allow'; + break; + } if ( 'revision' == $post->post_type ) { $post = get_post( $post->post_parent ); + if ( ! $post ) { + $caps[] = 'do_not_allow'; + break; + } } $post_type = get_post_type_object( $post->post_type ); + if ( ! $post_type ) { + /* translators: 1: post type, 2: capability name */ + _doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' ); + $caps[] = 'edit_others_posts'; + break; + } if ( ! $post_type->map_meta_cap ) { $caps[] = $post_type->cap->$cap; @@ -1175,7 +219,18 @@ function map_meta_cap( $cap, $user_id ) { break; case 'publish_post': $post = get_post( $args[0] ); + if ( ! $post ) { + $caps[] = 'do_not_allow'; + break; + } + $post_type = get_post_type_object( $post->post_type ); + if ( ! $post_type ) { + /* translators: 1: post type, 2: capability name */ + _doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' ); + $caps[] = 'edit_others_posts'; + break; + } $caps[] = $post_type->cap->publish_posts; break; @@ -1183,6 +238,11 @@ function map_meta_cap( $cap, $user_id ) { case 'delete_post_meta': case 'add_post_meta': $post = get_post( $args[0] ); + if ( ! $post ) { + $caps[] = 'do_not_allow'; + break; + } + $caps = map_meta_cap( 'edit_post', $user_id, $post->ID ); $meta_key = isset( $args[ 1 ] ) ? $args[ 1 ] : false; @@ -1191,8 +251,8 @@ function map_meta_cap( $cap, $user_id ) { /** * Filter whether the user is allowed to add post meta to a post. * - * The dynamic portion of the hook name, $meta_key, refers to the - * meta key passed to map_meta_cap(). + * The dynamic portion of the hook name, `$meta_key`, refers to the + * meta key passed to {@see map_meta_cap()}. * * @since 3.3.0 * @@ -1212,10 +272,22 @@ function map_meta_cap( $cap, $user_id ) { break; case 'edit_comment': $comment = get_comment( $args[0] ); - if ( empty( $comment ) ) + if ( ! $comment ) { + $caps[] = 'do_not_allow'; break; + } + $post = get_post( $comment->comment_post_ID ); - $caps = map_meta_cap( 'edit_post', $user_id, $post->ID ); + + /* + * If the post doesn't exist, we have an orphaned comment. + * Fall back to the edit_posts capability, instead. + */ + if ( $post ) { + $caps = map_meta_cap( 'edit_post', $user_id, $post->ID ); + } else { + $caps = map_meta_cap( 'edit_posts', $user_id ); + } break; case 'unfiltered_upload': if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) ) ) @@ -1248,18 +320,25 @@ function map_meta_cap( $cap, $user_id ) { case 'update_plugins': case 'delete_plugins': case 'install_plugins': + case 'upload_plugins': case 'update_themes': case 'delete_themes': case 'install_themes': + case 'upload_themes': case 'update_core': // Disallow anything that creates, deletes, or updates core, plugin, or theme files. // Files in uploads are excepted. - if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) + if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) { $caps[] = 'do_not_allow'; - elseif ( is_multisite() && ! is_super_admin( $user_id ) ) + } elseif ( is_multisite() && ! is_super_admin( $user_id ) ) { $caps[] = 'do_not_allow'; - else + } elseif ( 'upload_themes' === $cap ) { + $caps[] = 'install_themes'; + } elseif ( 'upload_plugins' === $cap ) { + $caps[] = 'install_plugins'; + } else { $caps[] = $cap; + } break; case 'activate_plugins': $caps[] = $cap; @@ -1281,7 +360,7 @@ function map_meta_cap( $cap, $user_id ) { case 'create_users': if ( !is_multisite() ) $caps[] = $cap; - elseif ( is_super_admin() || get_site_option( 'add_new_users' ) ) + elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) ) $caps[] = $cap; else $caps[] = 'do_not_allow'; @@ -1292,9 +371,15 @@ function map_meta_cap( $cap, $user_id ) { else $caps[] = 'do_not_allow'; break; + case 'customize' : + $caps[] = 'edit_theme_options'; + break; + case 'delete_site': + $caps[] = 'manage_options'; + break; default: // Handle meta capabilities for custom post types. - $post_type_meta_caps = _post_type_meta_capabilities(); + global $post_type_meta_caps; if ( isset( $post_type_meta_caps[ $cap ] ) ) { $args = array_merge( array( $post_type_meta_caps[ $cap ], $user_id ), $args ); return call_user_func_array( 'map_meta_cap', $args ); @@ -1318,12 +403,26 @@ function map_meta_cap( $cap, $user_id ) { } /** - * Whether current user has capability or role. + * Whether the current user has a specific capability. + * + * While checking against particular roles in place of a capability is supported + * in part, this practice is discouraged as it may produce unreliable results. + * + * Note: Will always return true if the current user is a super admin, unless specifically denied. * * @since 2.0.0 * - * @param string $capability Capability or role name. - * @return bool + * @see WP_User::has_cap() + * @see map_meta_cap() + * + * @param string $capability Capability name. + * @param int $object_id Optional. ID of the specific object to check against if `$capability` is a "meta" cap. + * "Meta" capabilities, e.g. 'edit_post', 'edit_user', etc., are capabilities used + * by map_meta_cap() to map to other "primitive" capabilities, e.g. 'edit_posts', + * 'edit_others_posts', etc. Accessed via func_get_args() and passed to WP_User::has_cap(), + * then map_meta_cap(). + * @return bool Whether the current user has the given capability. If `$capability` is a meta cap and `$object_id` is + * passed, whether the current user has the given meta capability for the given object. */ function current_user_can( $capability ) { $current_user = wp_get_current_user(); @@ -1338,30 +437,34 @@ function current_user_can( $capability ) { } /** - * Whether current user has a capability or role for a given blog. + * Whether current user has a capability or role for a given site. * * @since 3.0.0 * - * @param int $blog_id Blog ID + * @param int $blog_id Site ID. * @param string $capability Capability or role name. * @return bool */ function current_user_can_for_blog( $blog_id, $capability ) { - if ( is_multisite() ) - switch_to_blog( $blog_id ); + $switched = is_multisite() ? switch_to_blog( $blog_id ) : false; $current_user = wp_get_current_user(); - if ( empty( $current_user ) ) + if ( empty( $current_user ) ) { + if ( $switched ) { + restore_current_blog(); + } return false; + } $args = array_slice( func_get_args(), 2 ); $args = array_merge( array( $capability ), $args ); $can = call_user_func_array( array( $current_user, 'has_cap' ), $args ); - if ( is_multisite() ) + if ( $switched ) { restore_current_blog(); + } return $can; } @@ -1412,28 +515,39 @@ function user_can( $user, $capability ) { return call_user_func_array( array( $user, 'has_cap' ), $args ); } +/** + * Retrieves the global WP_Roles instance and instantiates it if necessary. + * + * @since 4.3.0 + * + * @global WP_Roles $wp_roles WP_Roles global instance. + * + * @return WP_Roles WP_Roles global instance if not already instantiated. + */ +function wp_roles() { + global $wp_roles; + + if ( ! isset( $wp_roles ) ) { + $wp_roles = new WP_Roles(); + } + return $wp_roles; +} + /** * Retrieve role object. * - * @see WP_Roles::get_role() Uses method to retrieve role object. * @since 2.0.0 * * @param string $role Role name. * @return WP_Role|null WP_Role object if found, null if the role does not exist. */ function get_role( $role ) { - global $wp_roles; - - if ( ! isset( $wp_roles ) ) - $wp_roles = new WP_Roles(); - - return $wp_roles->get_role( $role ); + return wp_roles()->get_role( $role ); } /** * Add role, if it does not exist. * - * @see WP_Roles::add_role() Uses method to add role. * @since 2.0.0 * * @param string $role Role name. @@ -1442,29 +556,21 @@ function get_role( $role ) { * @return WP_Role|null WP_Role object if role is added, null if already exists. */ function add_role( $role, $display_name, $capabilities = array() ) { - global $wp_roles; - - if ( ! isset( $wp_roles ) ) - $wp_roles = new WP_Roles(); - - return $wp_roles->add_role( $role, $display_name, $capabilities ); + if ( empty( $role ) ) { + return; + } + return wp_roles()->add_role( $role, $display_name, $capabilities ); } /** * Remove role, if it exists. * - * @see WP_Roles::remove_role() Uses method to remove role. * @since 2.0.0 * * @param string $role Role name. */ function remove_role( $role ) { - global $wp_roles; - - if ( ! isset( $wp_roles ) ) - $wp_roles = new WP_Roles(); - - $wp_roles->remove_role( $role ); + wp_roles()->remove_role( $role ); } /** @@ -1472,7 +578,7 @@ function remove_role( $role ) { * * @since 3.0.0 * - * @uses $super_admins Super admins global variable, if set. + * @global array $super_admins * * @return array List of super admin logins */ diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php index e627bdc..35d6c82 100644 --- a/wp-includes/category-template.php +++ b/wp-includes/category-template.php @@ -1,9 +1,10 @@ term_id ) ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $parent->name ) ) . '">'.$name.'' . $separator; + $chain .= ''.$name.'' . $separator; else $chain .= $name.$separator; return $chain; @@ -65,11 +66,15 @@ function get_category_parents( $id, $link = false, $separator = '/', $nicename = /** * Retrieve post categories. * + * This tag may be used outside The Loop by passing a post id as the parameter. + * + * Note: This function only returns results from the default "category" taxonomy. + * For custom taxonomies use get_the_terms(). + * * @since 0.71 - * @uses $post * * @param int $id Optional, default to current post ID. The post ID. - * @return array + * @return array Array of objects, one for each category assigned to the post. */ function get_the_category( $id = false ) { $categories = get_the_terms( $id, 'category' ); @@ -86,10 +91,12 @@ function get_the_category( $id = false ) { * Filter the array of categories to return for a post. * * @since 3.1.0 + * @since 4.4.0 Added `$id` parameter. * * @param array $categories An array of categories to return for the post. + * @param int $id ID of the post. */ - return apply_filters( 'get_the_categories', $categories ); + return apply_filters( 'get_the_categories', $categories, $id ); } /** @@ -154,6 +161,8 @@ function get_the_category_by_ID( $cat_ID ) { * * @since 1.5.1 * + * @global WP_Rewrite $wp_rewrite + * * @param string $separator Optional, default is empty string. Separator for between the categories. * @param string $parents Optional. How to display the parents. * @param int $post_id Optional. Post ID to retrieve categories. @@ -166,7 +175,17 @@ function get_the_category_list( $separator = '', $parents='', $post_id = false ) return apply_filters( 'the_category', '', $separator, $parents ); } - $categories = get_the_category( $post_id ); + /** + * Filter the categories before building the category list. + * + * @since 4.4.0 + * + * @param array $categories An array of the post's categories. + * @param int|bool $post_id ID of the post we're retrieving categories for. When `false`, we assume the + * current post in the loop. + */ + $categories = apply_filters( 'the_category_list', get_the_category( $post_id ), $post_id ); + if ( empty( $categories ) ) { /** This filter is documented in wp-includes/category-template.php */ return apply_filters( 'the_category', __( 'Uncategorized' ), $separator, $parents ); @@ -183,17 +202,17 @@ function get_the_category_list( $separator = '', $parents='', $post_id = false ) case 'multiple': if ( $category->parent ) $thelist .= get_category_parents( $category->parent, true, $separator ); - $thelist .= 'name ) ) . '" ' . $rel . '>' . $category->name.''; + $thelist .= '' . $category->name.''; break; case 'single': - $thelist .= 'name ) ) . '" ' . $rel . '>'; + $thelist .= ''; if ( $category->parent ) $thelist .= get_category_parents( $category->parent, false, $separator ); $thelist .= $category->name.''; break; case '': default: - $thelist .= 'name ) ) . '" ' . $rel . '>' . $category->name.''; + $thelist .= '' . $category->name.''; } } $thelist .= ''; @@ -206,17 +225,17 @@ function get_the_category_list( $separator = '', $parents='', $post_id = false ) case 'multiple': if ( $category->parent ) $thelist .= get_category_parents( $category->parent, true, $separator ); - $thelist .= 'name ) ) . '" ' . $rel . '>' . $category->name.''; + $thelist .= '' . $category->name.''; break; case 'single': - $thelist .= 'name ) ) . '" ' . $rel . '>'; + $thelist .= ''; if ( $category->parent ) $thelist .= get_category_parents( $category->parent, false, $separator ); $thelist .= "$category->name"; break; case '': default: - $thelist .= 'name ) ) . '" ' . $rel . '>' . $category->name.''; + $thelist .= '' . $category->name.''; } ++$i; } @@ -248,7 +267,6 @@ function get_the_category_list( $separator = '', $parents='', $post_id = false ) * As of 2.7, the function can be used anywhere if it is provided a post ID or post object. * * @since 1.2.0 - * @uses has_category() * * @param int|string|array $category Category ID, name or slug, or array of said. * @param int|object $post Optional. Post to check instead of the current post. (since 2.7.0) @@ -289,35 +307,51 @@ function category_description( $category = 0 ) { /** * Display or retrieve the HTML dropdown list of categories. * - * The list of arguments is below: - * 'show_option_all' (string) - Text to display for showing all categories. - * 'show_option_none' (string) - Text to display for showing no categories. - * 'orderby' (string) default is 'ID' - What column to use for ordering the - * categories. - * 'order' (string) default is 'ASC' - What direction to order categories. - * 'show_count' (bool|int) default is 0 - Whether to show how many posts are - * in the category. - * 'hide_empty' (bool|int) default is 1 - Whether to hide categories that - * don't have any posts attached to them. - * 'child_of' (int) default is 0 - See {@link get_categories()}. - * 'exclude' (string) - See {@link get_categories()}. - * 'echo' (bool|int) default is 1 - Whether to display or retrieve content. - * 'depth' (int) - The max depth. - * 'tab_index' (int) - Tab index for select element. - * 'name' (string) - The name attribute value for select element. - * 'id' (string) - The ID attribute value for select element. Defaults to name if omitted. - * 'class' (string) - The class attribute value for select element. - * 'selected' (int) - Which category ID is selected. - * 'taxonomy' (string) - The name of the taxonomy to retrieve. Defaults to category. - * * The 'hierarchical' argument, which is disabled by default, will override the * depth argument, unless it is true. When the argument is false, it will * display all of the categories. When it is enabled it will use the value in * the 'depth' argument. * * @since 2.1.0 - * - * @param string|array $args Optional. Override default arguments. + * @since 4.2.0 Introduced the `value_field` argument. + * + * @param string|array $args { + * Optional. Array or string of arguments to generate a categories drop-down element. + * + * @type string $show_option_all Text to display for showing all categories. Default empty. + * @type string $show_option_none Text to display for showing no categories. Default empty. + * @type string $option_none_value Value to use when no category is selected. Default empty. + * @type string $orderby Which column to use for ordering categories. See get_terms() for a list + * of accepted values. Default 'id' (term_id). + * @type string $order Whether to order terms in ascending or descending order. Accepts 'ASC' + * or 'DESC'. Default 'ASC'. + * @type bool $pad_counts See get_terms() for an argument description. Default false. + * @type bool|int $show_count Whether to include post counts. Accepts 0, 1, or their bool equivalents. + * Default 0. + * @type bool|int $hide_empty Whether to hide categories that don't have any posts. Accepts 0, 1, or + * their bool equivalents. Default 1. + * @type int $child_of Term ID to retrieve child terms of. See get_terms(). Default 0. + * @type array|string $exclude Array or comma/space-separated string of term ids to exclude. + * If `$include` is non-empty, `$exclude` is ignored. Default empty array. + * @type bool|int $echo Whether to echo or return the generated markup. Accepts 0, 1, or their + * bool equivalents. Default 1. + * @type bool|int $hierarchical Whether to traverse the taxonomy hierarchy. Accepts 0, 1, or their bool + * equivalents. Default 0. + * @type int $depth Maximum depth. Default 0. + * @type int $tab_index Tab index for the select element. Default 0 (no tabindex). + * @type string $name Value for the 'name' attribute of the select element. Default 'cat'. + * @type string $id Value for the 'id' attribute of the select element. Defaults to the value + * of `$name`. + * @type string $class Value for the 'class' attribute of the select element. Default 'postform'. + * @type int|string $selected Value of the option that should be selected. Default 0. + * @type string $value_field Term field that should be used to populate the 'value' attribute + * of the option elements. Accepts any valid term field: 'term_id', 'name', + * 'slug', 'term_group', 'term_taxonomy_id', 'taxonomy', 'description', + * 'parent', 'count'. Default 'term_id'. + * @type string|array $taxonomy Name of the category or categories to retrieve. Default 'category'. + * @type bool $hide_if_empty True to skip generating markup if no categories are found. + * Default false (create select element even if no categories are found). + * } * @return string HTML content only if 'echo' argument is 0. */ function wp_dropdown_categories( $args = '' ) { @@ -331,40 +365,53 @@ function wp_dropdown_categories( $args = '' ) { 'name' => 'cat', 'id' => '', 'class' => 'postform', 'depth' => 0, 'tab_index' => 0, 'taxonomy' => 'category', - 'hide_if_empty' => false + 'hide_if_empty' => false, 'option_none_value' => -1, + 'value_field' => 'term_id', ); $defaults['selected'] = ( is_category() ) ? get_query_var( 'cat' ) : 0; // Back compat. if ( isset( $args['type'] ) && 'link' == $args['type'] ) { - _deprecated_argument( __FUNCTION__, '3.0', '' ); + /* translators: 1: "type => link", 2: "taxonomy => link_category" alternative */ + _deprecated_argument( __FUNCTION__, '3.0', + sprintf( __( '%1$s is deprecated. Use %2$s instead.' ), + 'type => link', + 'taxonomy => link_category' + ) + ); $args['taxonomy'] = 'link_category'; } $r = wp_parse_args( $args, $defaults ); + $option_none_value = $r['option_none_value']; - if ( !isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] ) { + if ( ! isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] ) { $r['pad_counts'] = true; } - extract( $r ); + $tab_index = $r['tab_index']; $tab_index_attribute = ''; - if ( (int) $tab_index > 0 ) + if ( (int) $tab_index > 0 ) { $tab_index_attribute = " tabindex=\"$tab_index\""; + } - $categories = get_terms( $taxonomy, $r ); - $name = esc_attr( $name ); - $class = esc_attr( $class ); - $id = $id ? esc_attr( $id ) : $name; + // Avoid clashes with the 'name' param of get_terms(). + $get_terms_args = $r; + unset( $get_terms_args['name'] ); + $categories = get_terms( $r['taxonomy'], $get_terms_args ); - if ( ! $r['hide_if_empty'] || ! empty($categories) ) + $name = esc_attr( $r['name'] ); + $class = esc_attr( $r['class'] ); + $id = $r['id'] ? esc_attr( $r['id'] ) : $name; + + if ( ! $r['hide_if_empty'] || ! empty( $categories ) ) { $output = "\n"; - + } /** * Filter the taxonomy drop-down output. * @@ -423,56 +470,84 @@ function wp_dropdown_categories( $args = '' ) { */ $output = apply_filters( 'wp_dropdown_cats', $output, $r ); - if ( $echo ) + if ( $r['echo'] ) { echo $output; - + } return $output; } /** * Display or retrieve the HTML list of categories. * - * The list of arguments is below: - * 'show_option_all' (string) - Text to display for showing all categories. - * 'orderby' (string) default is 'ID' - What column to use for ordering the - * categories. - * 'order' (string) default is 'ASC' - What direction to order categories. - * 'show_count' (bool|int) default is 0 - Whether to show how many posts are - * in the category. - * 'hide_empty' (bool|int) default is 1 - Whether to hide categories that - * don't have any posts attached to them. - * 'use_desc_for_title' (bool|int) default is 1 - Whether to use the - * description instead of the category title. - * 'feed' - See {@link get_categories()}. - * 'feed_type' - See {@link get_categories()}. - * 'feed_image' - See {@link get_categories()}. - * 'child_of' (int) default is 0 - See {@link get_categories()}. - * 'exclude' (string) - See {@link get_categories()}. - * 'exclude_tree' (string) - See {@link get_categories()}. - * 'echo' (bool|int) default is 1 - Whether to display or retrieve content. - * 'current_category' (int) - See {@link get_categories()}. - * 'hierarchical' (bool) - See {@link get_categories()}. - * 'title_li' (string) - See {@link get_categories()}. - * 'depth' (int) - The max depth. - * * @since 2.1.0 - * - * @param string|array $args Optional. Override default arguments. - * @return string HTML content only if 'echo' argument is 0. + * @since 4.4.0 Introduced the `hide_title_if_empty` and `separator` arguments. The `current_category` argument was modified to + * optionally accept an array of values. + * + * @param string|array $args { + * Array of optional arguments. + * + * @type string $show_option_all Text to display for showing all categories. Default empty string. + * @type string $show_option_none Text to display for the 'no categories' option. + * Default 'No categories'. + * @type string $orderby The column to use for ordering categories. Default 'ID'. + * @type string $order Which direction to order categories. Accepts 'ASC' or 'DESC'. + * Default 'ASC'. + * @type bool|int $show_count Whether to show how many posts are in the category. Default 0. + * @type bool|int $hide_empty Whether to hide categories that don't have any posts attached to them. + * Default 1. + * @type bool|int $use_desc_for_title Whether to use the category description as the title attribute. + * Default 1. + * @type string $feed Text to use for the feed link. Default 'Feed for all posts filed + * under [cat name]'. + * @type string $feed_type Feed type. Used to build feed link. See {@link get_term_feed_link()}. + * Default empty string (default feed). + * @type string $feed_image URL of an image to use for the feed link. Default empty string. + * @type int $child_of Term ID to retrieve child terms of. See {@link get_terms()}. Default 0. + * @type array|string $exclude Array or comma/space-separated string of term IDs to exclude. + * If `$hierarchical` is true, descendants of `$exclude` terms will also + * be excluded; see `$exclude_tree`. See {@link get_terms()}. + * Default empty string. + * @type array|string $exclude_tree Array or comma/space-separated string of term IDs to exclude, along + * with their descendants. See {@link get_terms()}. Default empty string. + * @type bool|int $echo True to echo markup, false to return it. Default 1. + * @type int|array $current_category ID of category, or array of IDs of categories, that should get the + * 'current-cat' class. Default 0. + * @type bool $hierarchical Whether to include terms that have non-empty descendants. + * See {@link get_terms()}. Default true. + * @type string $title_li Text to use for the list title `

` element. Pass an empty string + * to disable. Default 'Categories'. + * @type bool $hide_title_if_empty Whether to hide the `$title_li` element if there are no terms in + * the list. Default false (title will always be shown). + * @type int $depth Category depth. Used for tab indentation. Default 0. + * @type string $taxonomy Taxonomy name. Default 'category'. + * @type string $separator Separator between links. Default '
'. + * } + * @return false|string HTML content only if 'echo' argument is 0. */ function wp_list_categories( $args = '' ) { $defaults = array( - 'show_option_all' => '', 'show_option_none' => __('No categories'), - 'orderby' => 'name', 'order' => 'ASC', - 'style' => 'list', - 'show_count' => 0, 'hide_empty' => 1, - 'use_desc_for_title' => 1, 'child_of' => 0, - 'feed' => '', 'feed_type' => '', - 'feed_image' => '', 'exclude' => '', - 'exclude_tree' => '', 'current_category' => 0, - 'hierarchical' => true, 'title_li' => __( 'Categories' ), - 'echo' => 1, 'depth' => 0, - 'taxonomy' => 'category' + 'child_of' => 0, + 'current_category' => 0, + 'depth' => 0, + 'echo' => 1, + 'exclude' => '', + 'exclude_tree' => '', + 'feed' => '', + 'feed_image' => '', + 'feed_type' => '', + 'hide_empty' => 1, + 'hide_title_if_empty' => false, + 'hierarchical' => true, + 'order' => 'ASC', + 'orderby' => 'name', + 'separator' => '
', + 'show_count' => 0, + 'show_option_all' => '', + 'show_option_none' => __( 'No categories' ), + 'style' => 'list', + 'taxonomy' => 'category', + 'title_li' => __( 'Categories' ), + 'use_desc_for_title' => 1, ); $r = wp_parse_args( $args, $defaults ); @@ -480,57 +555,98 @@ function wp_list_categories( $args = '' ) { if ( !isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] ) $r['pad_counts'] = true; + // Descendants of exclusions should be excluded too. if ( true == $r['hierarchical'] ) { - $r['exclude_tree'] = $r['exclude']; + $exclude_tree = array(); + + if ( $r['exclude_tree'] ) { + $exclude_tree = array_merge( $exclude_tree, wp_parse_id_list( $r['exclude_tree'] ) ); + } + + if ( $r['exclude'] ) { + $exclude_tree = array_merge( $exclude_tree, wp_parse_id_list( $r['exclude'] ) ); + } + + $r['exclude_tree'] = $exclude_tree; $r['exclude'] = ''; } - if ( !isset( $r['class'] ) ) + if ( ! isset( $r['class'] ) ) $r['class'] = ( 'category' == $r['taxonomy'] ) ? 'categories' : $r['taxonomy']; - extract( $r ); - - if ( !taxonomy_exists($taxonomy) ) + if ( ! taxonomy_exists( $r['taxonomy'] ) ) { return false; + } + + $show_option_all = $r['show_option_all']; + $show_option_none = $r['show_option_none']; $categories = get_categories( $r ); $output = ''; - if ( $title_li && 'list' == $style ) - $output = '

' . $title_li . '

' . $r['title_li'] . '
- ' . $show_option_none . '
- $show_option_all

$tag_name

" . esc_html( $tag_data['name'] ) . "

\n"; - } - - /** - * Ends the list of after the elements are added. - * - * @see Walker::end_lvl() - * - * @since 2.1.0 - * - * @param string $output Passed by reference. Used to append additional content. - * @param int $depth Depth of category. Used for tab indentation. - * @param array $args An array of arguments. Will only append content if style argument value is 'list'. - * @wsee wp_list_categories() - */ - function end_lvl( &$output, $depth = 0, $args = array() ) { - if ( 'list' != $args['style'] ) - return; - - $indent = str_repeat("\t", $depth); - $output .= "$indent

description) ) { - $link .= 'title="' . esc_attr( sprintf(__( 'View all posts filed under %s' ), $cat_name) ) . '"'; - } else { - /** - * Filter the category description for display. - * - * @since 1.2.0 - * - * @param string $description Category description. - * @param object $category Category object. - */ - $link .= 'title="' . esc_attr( strip_tags( apply_filters( 'category_description', $category->description, $category ) ) ) . '"'; - } - - $link .= '>'; - $link .= $cat_name . '

'; - - $link .= '

term_id; - if ( !empty($current_category) ) { - $_current_category = get_term( $current_category, $category->taxonomy ); - if ( $category->term_id == $current_category ) - $class .= ' current-cat'; - elseif ( $category->term_id == $_current_category->parent ) - $class .= ' current-cat-parent'; - } - $output .= ' class="' . $class . '"'; - $output .= ">$link\n"; - } else { - $output .= "\t$link
\n"; - } - } - - /** - * Ends the element output, if needed. - * - * @see Walker::end_el() - * - * @since 2.1.0 - * - * @param string $output Passed by reference. Used to append additional content. - * @param object $page Not used. - * @param int $depth Depth of category. Not used. - * @param array $args An array of arguments. Only uses 'list' for whether should append to output. @see wp_list_categories() - */ - function end_el( &$output, $page, $depth = 0, $args = array() ) { - if ( 'list' != $args['style'] ) - return; - - $output .= "\n"; - } - -} - -/** - * Create HTML dropdown list of Categories. - * - * @package WordPress - * @since 2.1.0 - * @uses Walker - */ -class Walker_CategoryDropdown extends Walker { - /** - * @see Walker::$tree_type - * @since 2.1.0 - * @var string - */ - var $tree_type = 'category'; - - /** - * @see Walker::$db_fields - * @since 2.1.0 - * @todo Decouple this - * @var array - */ - var $db_fields = array ('parent' => 'parent', 'id' => 'term_id'); - - /** - * Start the element output. - * - * @see Walker::start_el() - * @since 2.1.0 - * - * @param string $output Passed by reference. Used to append additional content. - * @param object $category Category data object. - * @param int $depth Depth of category. Used for padding. - * @param array $args Uses 'selected' and 'show_count' keys, if they exist. @see wp_dropdown_categories() - */ - function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) { - $pad = str_repeat(' ', $depth * 3); - - /** This filter is documented in wp-includes/category-template.php */ - $cat_name = apply_filters( 'list_cats', $category->name, $category ); - - $output .= "\t\n"; } + return call_user_func_array( array( $walker, 'walk' ), $args ); } // @@ -1135,7 +1062,7 @@ function get_tag_link( $tag ) { * @since 2.3.0 * * @param int $id Post ID. - * @return array|bool Array of tag objects on success, false on failure. + * @return array|false|WP_Error Array of tag objects on success, false on failure. */ function get_the_tags( $id = 0 ) { @@ -1160,7 +1087,7 @@ function get_the_tags( $id = 0 ) { * @param string $sep Optional. Between tags. * @param string $after Optional. After tags. * @param int $id Optional. Post ID. Defaults to the current post. - * @return string|bool|WP_Error A list of tags on success, false or WP_Error on failure. + * @return string|false|WP_Error A list of tags on success, false if there are no terms, WP_Error on failure. */ function get_the_tag_list( $before = '', $sep = '', $after = '', $id = 0 ) { @@ -1233,7 +1160,8 @@ function term_description( $term = 0, $taxonomy = 'post_tag' ) { * * @param int|object $post Post ID or object. * @param string $taxonomy Taxonomy name. - * @return array|bool|WP_Error Array of term objects on success, false or WP_Error on failure. + * @return array|false|WP_Error Array of term objects on success, false if there are no terms + * or the post does not exist, WP_Error on failure. */ function get_the_terms( $post, $taxonomy ) { if ( ! $post = get_post( $post ) ) @@ -1242,7 +1170,17 @@ function get_the_terms( $post, $taxonomy ) { $terms = get_object_term_cache( $post->ID, $taxonomy ); if ( false === $terms ) { $terms = wp_get_object_terms( $post->ID, $taxonomy ); - wp_cache_add($post->ID, $terms, $taxonomy . '_relationships'); + if ( ! is_wp_error( $terms ) ) { + $to_cache = array(); + foreach ( $terms as $key => $term ) { + $to_cache[ $key ] = $term->data; + } + wp_cache_add( $post->ID, $to_cache, $taxonomy . '_relationships' ); + } + } + + if ( ! is_wp_error( $terms ) ) { + $terms = array_map( 'get_term', $terms ); } /** @@ -1250,9 +1188,9 @@ function get_the_terms( $post, $taxonomy ) { * * @since 3.1.0 * - * @param array $terms List of attached terms. - * @param int $post_id Post ID. - * @param string $taxonomy Name of the taxonomy. + * @param array|WP_Error $terms List of attached terms, or WP_Error on failure. + * @param int $post_id Post ID. + * @param string $taxonomy Name of the taxonomy. */ $terms = apply_filters( 'get_the_terms', $terms, $post->ID, $taxonomy ); @@ -1272,7 +1210,7 @@ function get_the_terms( $post, $taxonomy ) { * @param string $before Optional. Before list. * @param string $sep Optional. Separate items using this. * @param string $after Optional. After list. - * @return string|bool|WP_Error A list of terms on success, false or WP_Error on failure. + * @return string|false|WP_Error A list of terms on success, false if there are no terms, WP_Error on failure. */ function get_the_term_list( $id, $taxonomy, $before = '', $sep = '', $after = '' ) { $terms = get_the_terms( $id, $taxonomy ); @@ -1283,24 +1221,27 @@ function get_the_term_list( $id, $taxonomy, $before = '', $sep = '', $after = '' if ( empty( $terms ) ) return false; + $links = array(); + foreach ( $terms as $term ) { $link = get_term_link( $term, $taxonomy ); - if ( is_wp_error( $link ) ) + if ( is_wp_error( $link ) ) { return $link; - $term_links[] = '' . $term->name . ''; + } + $links[] = '' . $term->name . ''; } /** * Filter the term links for a given taxonomy. * - * The dynamic portion of the filter name, $taxonomy, refers + * The dynamic portion of the filter name, `$taxonomy`, refers * to the taxonomy slug. * * @since 2.5.0 * - * @param array $term_links An array of term links. + * @param array $links An array of term links. */ - $term_links = apply_filters( "term_links-$taxonomy", $term_links ); + $term_links = apply_filters( "term_links-$taxonomy", $links ); return $before . join( $sep, $term_links ) . $after; } @@ -1315,7 +1256,7 @@ function get_the_term_list( $id, $taxonomy, $before = '', $sep = '', $after = '' * @param string $before Optional. Before list. * @param string $sep Optional. Separate items using this. * @param string $after Optional. After list. - * @return null|bool False on WordPress error. Returns null when displaying. + * @return false|void False on WordPress error. */ function the_terms( $id, $taxonomy, $before = '', $sep = ', ', $after = '' ) { $term_list = get_the_term_list( $id, $taxonomy, $before, $sep, $after ); diff --git a/wp-includes/category.php b/wp-includes/category.php index 24cf6e8..a89b410 100644 --- a/wp-includes/category.php +++ b/wp-includes/category.php @@ -1,27 +1,11 @@ 'ids', 'get' => 'all') ); - wp_cache_add( 'all_category_ids', $cat_ids, 'category' ); - } - - return $cat_ids; -} - /** * Retrieve list of category objects. * @@ -31,9 +15,12 @@ function get_all_category_ids() { * * @since 2.1.0 * @see get_terms() Type of arguments that can be changed. - * @link http://codex.wordpress.org/Function_Reference/get_categories * - * @param string|array $args Optional. Change the defaults retrieving categories. + * @param string|array $args { + * Optional. Arguments to retrieve categories. See {@see get_terms()} for additional options. + * + * @type string $taxonomy Taxonomy to retrieve terms for. In this case, default 'category'. + * } * @return array List of categories. */ function get_categories( $args = '' ) { @@ -41,26 +28,39 @@ function get_categories( $args = '' ) { $args = wp_parse_args( $args, $defaults ); $taxonomy = $args['taxonomy']; + /** - * Filter the taxonomy used to retrieve terms when calling get_categories(). + * Filter the taxonomy used to retrieve terms when calling {@see get_categories()}. * * @since 2.7.0 * * @param string $taxonomy Taxonomy to retrieve terms from. - * @param array $args An array of arguments. @see get_terms() + * @param array $args An array of arguments. See {@see get_terms()}. */ $taxonomy = apply_filters( 'get_categories_taxonomy', $taxonomy, $args ); // Back compat if ( isset($args['type']) && 'link' == $args['type'] ) { - _deprecated_argument( __FUNCTION__, '3.0', '' ); + /* translators: 1: "type => link", 2: "taxonomy => link_category" alternative */ + _deprecated_argument( __FUNCTION__, '3.0', + sprintf( __( '%1$s is deprecated. Use %2$s instead.' ), + 'type => link', + 'taxonomy => link_category' + ) + ); $taxonomy = $args['taxonomy'] = 'link_category'; } - $categories = (array) get_terms( $taxonomy, $args ); + $categories = get_terms( $taxonomy, $args ); - foreach ( array_keys( $categories ) as $k ) - _make_cat_compat( $categories[$k] ); + if ( is_wp_error( $categories ) ) { + $categories = array(); + } else { + $categories = (array) $categories; + foreach ( array_keys( $categories ) as $k ) { + _make_cat_compat( $categories[ $k ] ); + } + } return $categories; } @@ -80,12 +80,12 @@ function get_categories( $args = '' ) { * The category will converted to maintain backwards compatibility. * * @since 1.5.1 - * @uses get_term() Used to get the category data from the taxonomy. * * @param int|object $category Category ID or Category row object * @param string $output Optional. Constant OBJECT, ARRAY_A, or ARRAY_N * @param string $filter Optional. Default is raw or no WordPress defined filter will applied. - * @return object|array|WP_Error|null Category data in type defined by $output parameter. WP_Error if $category is empty, null if it does not exist. + * @return object|array|WP_Error|null Category data in type defined by $output parameter. + * WP_Error if $category is empty, null if it does not exist. */ function get_category( $category, $output = OBJECT, $filter = 'raw' ) { $category = get_term( $category, 'category', $output, $filter ); @@ -115,7 +115,7 @@ function get_category( $category, $output = OBJECT, $filter = 'raw' ) { * @param string $category_path URL containing category slugs. * @param bool $full_match Optional. Whether full path should be matched. * @param string $output Optional. Constant OBJECT, ARRAY_A, or ARRAY_N - * @return null|object|array Null on failure. Type is based on $output value. + * @return object|array|WP_Error|void Type is based on $output value. */ function get_category_by_path( $category_path, $full_match = true, $output = OBJECT ) { $category_path = rawurlencode( urldecode( $category_path ) ); @@ -125,21 +125,23 @@ function get_category_by_path( $category_path, $full_match = true, $output = OBJ $leaf_path = sanitize_title( basename( $category_paths ) ); $category_paths = explode( '/', $category_paths ); $full_path = ''; - foreach ( (array) $category_paths as $pathdir ) + foreach ( (array) $category_paths as $pathdir ) { $full_path .= ( $pathdir != '' ? '/' : '' ) . sanitize_title( $pathdir ); - + } $categories = get_terms( 'category', array('get' => 'all', 'slug' => $leaf_path) ); - if ( empty( $categories ) ) - return null; + if ( empty( $categories ) ) { + return; + } foreach ( $categories as $category ) { $path = '/' . $leaf_path; $curcategory = $category; while ( ( $curcategory->parent != 0 ) && ( $curcategory->parent != $curcategory->term_id ) ) { $curcategory = get_term( $curcategory->parent, 'category' ); - if ( is_wp_error( $curcategory ) ) + if ( is_wp_error( $curcategory ) ) { return $curcategory; + } $path = '/' . $curcategory->slug . $path; } @@ -156,8 +158,6 @@ function get_category_by_path( $category_path, $full_match = true, $output = OBJ _make_cat_compat( $category ); return $category; } - - return null; } /** @@ -227,7 +227,6 @@ function cat_is_ancestor_of( $cat1, $cat2 ) { * Sanitizes category data based on context. * * @since 2.3.0 - * @uses sanitize_term() See this function for what context are supported. * * @param object|array $category Category data * @param string $context Optional. Default is 'display'. @@ -241,7 +240,6 @@ function sanitize_category( $category, $context = 'display' ) { * Sanitizes data in single category key field. * * @since 2.3.0 - * @uses sanitize_term_field() See function for more details. * * @param string $field Category key to sanitize * @param mixed $value Category value to sanitize @@ -260,7 +258,6 @@ function sanitize_category_field( $field, $value, $cat_id, $context ) { * * @since 2.3.0 * @see get_terms() For list of arguments to pass. - * @uses apply_filters() Calls 'get_tags' hook on array of tags and with $args. * * @param string|array $args Tag arguments to use when retrieving tags. * @return array List of tags. @@ -314,7 +311,6 @@ function get_tag( $tag, $output = OBJECT, $filter = 'raw' ) { * Remove the category cache data based on ID. * * @since 2.1.0 - * @uses clean_term_cache() Clears the cache for the category based on ID * * @param int $id Category ID */ @@ -337,18 +333,19 @@ function clean_category_cache( $id ) { * pass to it. This is one of the features with using pass by reference in PHP. * * @since 2.3.0 + * @since 4.4.0 The `$category` parameter now also accepts a WP_Term object. * @access private * - * @param array|object $category Category Row object or array + * @param array|object|WP_Term $category Category Row object or array */ function _make_cat_compat( &$category ) { - if ( is_object( $category ) ) { - $category->cat_ID = &$category->term_id; - $category->category_count = &$category->count; - $category->category_description = &$category->description; - $category->cat_name = &$category->name; - $category->category_nicename = &$category->slug; - $category->category_parent = &$category->parent; + if ( is_object( $category ) && ! is_wp_error( $category ) ) { + $category->cat_ID = $category->term_id; + $category->category_count = $category->count; + $category->category_description = $category->description; + $category->cat_name = $category->name; + $category->category_nicename = $category->slug; + $category->category_parent = $category->parent; } elseif ( is_array( $category ) && isset( $category['term_id'] ) ) { $category['cat_ID'] = &$category['term_id']; $category['category_count'] = &$category['count']; diff --git a/wp-includes/certificates/ca-bundle.crt b/wp-includes/certificates/ca-bundle.crt index d89dd2c..6031cc6 100644 --- a/wp-includes/certificates/ca-bundle.crt +++ b/wp-includes/certificates/ca-bundle.crt @@ -1,43 +1,23 @@ ## -## src/wp-includes/certificates/ca-bundle.crt -- Bundle of CA Root Certificates +## Bundle of CA Root Certificates ## -## Certificate data from Mozilla as of: Tue Jan 28 09:38:07 2014 +## Certificate data from Mozilla as of: Wed Sep 16 08:58:11 2015 +## Includes a WordPress Modification - We include the 'legacy' 1024bit certificates +## for backwards compatibility. See https://core.trac.wordpress.org/ticket/34935#comment:10 ## ## This is a bundle of X.509 certificates of public Certificate Authorities ## (CA). These were automatically extracted from Mozilla's root certificates ## file (certdata.txt). This file can be found in the mozilla source tree: -## http://mxr.mozilla.org/mozilla-release/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1 +## http://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt ## ## It contains the certificates in PEM format and therefore ## can be directly used with curl / libcurl / php_curl, or with ## an Apache+mod_ssl webserver for SSL client authentication. ## Just configure this file as the SSLCACertificateFile. ## - - -EE Certification Centre Root CA -=============================== ------BEGIN CERTIFICATE----- -MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG -EwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2Vy -dGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIw -MTAxMDMwMTAxMDMwWhgPMjAzMDEyMTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlB -UyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRy -ZSBSb290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IB -DwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUyeuuOF0+W2Ap7kaJjbMeM -TC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvObntl8jixwKIy72KyaOBhU8E2lf/slLo2 -rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIwWFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw -93X2PaRka9ZP585ArQ/dMtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtN -P2MbRMNE1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYDVR0T -AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/zQas8fElyalL1BSZ -MEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEF -BQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEFBQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+Rj -xY6hUFaTlrg4wCQiZrxTFGGVv9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqM -lIpPnTX/dqQGE5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u -uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIWiAYLtqZLICjU -3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/vGVCJYMzpJJUPwssd8m92kMfM -dcGWxZ0= ------END CERTIFICATE----- +## Conversion done with mk-ca-bundle.pl version 1.25. +## SHA1: ed3c0bbfb7912bcc00cd2033b0cb85c98d10559c +## GTE CyberTrust Global Root ========================== @@ -192,6 +172,7 @@ BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg== -----END CERTIFICATE----- + ValiCert Class 1 VA =================== -----BEGIN CERTIFICATE----- @@ -648,6 +629,7 @@ gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS -----END CERTIFICATE----- + America Online Root Certification Authority 1 ============================================= -----BEGIN CERTIFICATE----- @@ -977,30 +959,6 @@ nGQI0DvDKcWy7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw== -----END CERTIFICATE----- -TDC Internet Root CA -==================== ------BEGIN CERTIFICATE----- -MIIEKzCCAxOgAwIBAgIEOsylTDANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJESzEVMBMGA1UE -ChMMVERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTAeFw0wMTA0MDUx -NjMzMTdaFw0yMTA0MDUxNzAzMTdaMEMxCzAJBgNVBAYTAkRLMRUwEwYDVQQKEwxUREMgSW50ZXJu -ZXQxHTAbBgNVBAsTFFREQyBJbnRlcm5ldCBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A -MIIBCgKCAQEAxLhAvJHVYx/XmaCLDEAedLdInUaMArLgJF/wGROnN4NrXceO+YQwzho7+vvOi20j -xsNuZp+Jpd/gQlBn+h9sHvTQBda/ytZO5GhgbEaqHF1j4QeGDmUApy6mcca8uYGoOn0a0vnRrEvL -znWv3Hv6gXPU/Lq9QYjUdLP5Xjg6PEOo0pVOd20TDJ2PeAG3WiAfAzc14izbSysseLlJ28TQx5yc -5IogCSEWVmb/Bexb4/DPqyQkXsN/cHoSxNK1EKC2IeGNeGlVRGn1ypYcNIUXJXfi9i8nmHj9eQY6 -otZaQ8H/7AQ77hPv01ha/5Lr7K7a8jcDR0G2l8ktCkEiu7vmpwIDAQABo4IBJTCCASEwEQYJYIZI -AYb4QgEBBAQDAgAHMGUGA1UdHwReMFwwWqBYoFakVDBSMQswCQYDVQQGEwJESzEVMBMGA1UEChMM -VERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTENMAsGA1UEAxMEQ1JM -MTArBgNVHRAEJDAigA8yMDAxMDQwNTE2MzMxN1qBDzIwMjEwNDA1MTcwMzE3WjALBgNVHQ8EBAMC -AQYwHwYDVR0jBBgwFoAUbGQBx/2FbazI2p5QCIUItTxWqFAwHQYDVR0OBBYEFGxkAcf9hW2syNqe -UAiFCLU8VqhQMAwGA1UdEwQFMAMBAf8wHQYJKoZIhvZ9B0EABBAwDhsIVjUuMDo0LjADAgSQMA0G -CSqGSIb3DQEBBQUAA4IBAQBOQ8zR3R0QGwZ/t6T609lN+yOfI1Rb5osvBCiLtSdtiaHsmGnc540m -gwV5dOy0uaOXwTUA/RXaOYE6lTGQ3pfphqiZdwzlWqCE/xIWrG64jcN7ksKsLtB9KOy282A4aW8+ -2ARVPp7MVdK6/rtHBNcK2RYKNCn1WBPVT8+PVkuzHu7TmHnaCB4Mb7j4Fifvwm899qNLPg7kbWzb -O0ESm70NRyN/PErQr8Cv9u8btRXE64PECV90i9kR+8JWsTz4cMo0jUNAE4z9mQNUecYu6oah9jrU -Cbz0vGbMPVjQV0kK7iXiQe4T+Zs4NNEA9X7nlB38aQNiuJkFBT1reBK9sG9l ------END CERTIFICATE----- - UTN DATACorp SGC Root CA ======================== -----BEGIN CERTIFICATE----- @@ -1141,6 +1099,7 @@ KuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK8CtmdWOMovsEPoMOmzbwGOQmIMOM 8CgHrTwXZoi1/baI -----END CERTIFICATE----- + NetLock Business (Class B) Root =============================== -----BEGIN CERTIFICATE----- @@ -1342,31 +1301,6 @@ CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy +fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS -----END CERTIFICATE----- -Firmaprofesional Root CA -======================== ------BEGIN CERTIFICATE----- -MIIEVzCCAz+gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCRVMxIjAgBgNVBAcT -GUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1dG9yaWRhZCBkZSBDZXJ0aWZp -Y2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FA -ZmlybWFwcm9mZXNpb25hbC5jb20wHhcNMDExMDI0MjIwMDAwWhcNMTMxMDI0MjIwMDAwWjCBnTEL -MAkGA1UEBhMCRVMxIjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMT -OUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2 -ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20wggEiMA0GCSqGSIb3DQEB -AQUAA4IBDwAwggEKAoIBAQDnIwNvbyOlXnjOlSztlB5uCp4Bx+ow0Syd3Tfom5h5VtP8c9/Qit5V -j1H5WuretXDE7aTt/6MNbg9kUDGvASdYrv5sp0ovFy3Tc9UTHI9ZpTQsHVQERc1ouKDAA6XPhUJH -lShbz++AbOCQl4oBPB3zhxAwJkh91/zpnZFx/0GaqUC1N5wpIE8fUuOgfRNtVLcK3ulqTgesrBlf -3H5idPayBQC6haD9HThuy1q7hryUZzM1gywfI834yJFxzJeL764P3CkDG8A563DtwW4O2GcLiam8 -NeTvtjS0pbbELaW+0MOUJEjb35bTALVmGotmBQ/dPz/LP6pemkr4tErvlTcbAgMBAAGjgZ8wgZww -KgYDVR0RBCMwIYYfaHR0cDovL3d3dy5maXJtYXByb2Zlc2lvbmFsLmNvbTASBgNVHRMBAf8ECDAG -AQH/AgEBMCsGA1UdEAQkMCKADzIwMDExMDI0MjIwMDAwWoEPMjAxMzEwMjQyMjAwMDBaMA4GA1Ud -DwEB/wQEAwIBBjAdBgNVHQ4EFgQUMwugZtHq2s7eYpMEKFK1FH84aLcwDQYJKoZIhvcNAQEFBQAD -ggEBAEdz/o0nVPD11HecJ3lXV7cVVuzH2Fi3AQL0M+2TUIiefEaxvT8Ub/GzR0iLjJcG1+p+o1wq -u00vR+L4OQbJnC4xGgN49Lw4xiKLMzHwFgQEffl25EvXwOaD7FnMP97/T2u3Z36mhoEyIwOdyPdf -wUpgpZKpsaSgYMN4h7Mi8yrrW6ntBas3D7Hi05V2Y1Z0jFhyGzflZKG+TQyTmAyX9odtsz/ny4Cm -7YjHX1BiAuiZdBbQ5rQ58SfLyEDW44YQqSMSkuBpQWOnryULwMWSyx6Yo1q6xTMPoJcB3X/ge9YG -VM+h4k0460tQtcsm9MracEpqoeJ5quGnM/b9Sh/22WA= ------END CERTIFICATE----- - Swisscom Root CA 1 ================== -----BEGIN CERTIFICATE----- @@ -1978,40 +1912,6 @@ PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg== -----END CERTIFICATE----- -AC Ra\xC3\xADz Certic\xC3\xA1mara S.A. -====================================== ------BEGIN CERTIFICATE----- -MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNVBAYT -AkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRpZmljYWNpw7NuIERpZ2l0YWwg -LSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwaQUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4w -HhcNMDYxMTI3MjA0NjI5WhcNMzAwNDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+ -U29jaWVkYWQgQ2FtZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJh -IFMuQS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkqhkiG9w0B -AQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeGqentLhM0R7LQcNzJPNCN -yu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzLfDe3fezTf3MZsGqy2IiKLUV0qPezuMDU -2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQY5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU3 -4ojC2I+GdV75LaeHM/J4Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP -2yYe68yQ54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+bMMCm -8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48jilSH5L887uvDdUhf -HjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++EjYfDIJss2yKHzMI+ko6Kh3VOz3vCa -Mh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/ztA/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK -5lw1omdMEWux+IBkAC1vImHFrEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1b -czwmPS9KvqfJpxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE -AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCBlTCBkgYEVR0g -ADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFyYS5jb20vZHBjLzBaBggrBgEF -BQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW507WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2Ug -cHVlZGVuIGVuY29udHJhciBlbiBsYSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEf -AygPU3zmpFmps4p6xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuX -EpBcunvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/Jre7Ir5v -/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dpezy4ydV/NgIlqmjCMRW3 -MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42gzmRkBDI8ck1fj+404HGIGQatlDCIaR4 -3NAvO2STdPCWkPHv+wlaNECW8DYSwaN0jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wk -eZBWN7PGKX6jD/EpOe9+XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f -/RWmnkJDW2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/RL5h -RqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35rMDOhYil/SrnhLecU -Iw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxkBYn8eNZcLCZDqQ== ------END CERTIFICATE----- - TC TrustCenter Class 2 CA II ============================ -----BEGIN CERTIFICATE----- @@ -2039,33 +1939,6 @@ JOzHdiEoZa5X6AeIdUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfk vQ== -----END CERTIFICATE----- -TC TrustCenter Class 3 CA II -============================ ------BEGIN CERTIFICATE----- -MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC -REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy -IENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYw -MTEyMTQ0MTU3WhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1 -c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UE -AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC -AQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJWHt4bNwcwIi9v8Qbxq63W -yKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+QVl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo -6SI7dYnWRBpl8huXJh0obazovVkdKyT21oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZ -uV3bOx4a+9P/FRQI2AlqukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk -2ZyqBwi1Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1UdEwEB -/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NXXAek0CSnwPIA1DCB -7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90 -Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU -cnVzdENlbnRlciUyMENsYXNzJTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i -SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u -TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlNirTzwppVMXzE -O2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8TtXqluJucsG7Kv5sbviRmEb8 -yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9 -IJqDnxrcOfHFcqMRA/07QlIp2+gB95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal -092Y+tTmBvTwtiBjS+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc -5A== ------END CERTIFICATE----- - TC TrustCenter Universal CA I ============================= -----BEGIN CERTIFICATE----- @@ -2699,28 +2572,6 @@ yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi LXpUq3DDfSJlgnCW -----END CERTIFICATE----- -E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi -=================================================== ------BEGIN CERTIFICATE----- -MIIDtjCCAp6gAwIBAgIQRJmNPMADJ72cdpW56tustTANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG -EwJUUjEoMCYGA1UEChMfRWxla3Ryb25payBCaWxnaSBHdXZlbmxpZ2kgQS5TLjE8MDoGA1UEAxMz -ZS1HdXZlbiBLb2sgRWxla3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhZ2xheWljaXNpMB4XDTA3 -MDEwNDExMzI0OFoXDTE3MDEwNDExMzI0OFowdTELMAkGA1UEBhMCVFIxKDAmBgNVBAoTH0VsZWt0 -cm9uaWsgQmlsZ2kgR3V2ZW5saWdpIEEuUy4xPDA6BgNVBAMTM2UtR3V2ZW4gS29rIEVsZWt0cm9u -aWsgU2VydGlmaWthIEhpem1ldCBTYWdsYXlpY2lzaTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC -AQoCggEBAMMSIJ6wXgBljU5Gu4Bc6SwGl9XzcslwuedLZYDBS75+PNdUMZTe1RK6UxYC6lhj71vY -8+0qGqpxSKPcEC1fX+tcS5yWCEIlKBHMilpiAVDV6wlTL/jDj/6z/P2douNffb7tC+Bg62nsM+3Y -jfsSSYMAyYuXjDtzKjKzEve5TfL0TW3H5tYmNwjy2f1rXKPlSFxYvEK+A1qBuhw1DADT9SN+cTAI -JjjcJRFHLfO6IxClv7wC90Nex/6wN1CZew+TzuZDLMN+DfIcQ2Zgy2ExR4ejT669VmxMvLz4Bcpk -9Ok0oSy1c+HCPujIyTQlCFzz7abHlJ+tiEMl1+E5YP6sOVkCAwEAAaNCMEAwDgYDVR0PAQH/BAQD -AgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ/uRLOU1fqRTy7ZVZoEVtstxNulMA0GCSqG -SIb3DQEBBQUAA4IBAQB/X7lTW2M9dTLn+sR0GstG30ZpHFLPqk/CaOv/gKlR6D1id4k9CnU58W5d -F4dvaAXBlGzZXd/aslnLpRCKysw5zZ/rTt5S/wzw9JKp8mxTq5vSR6AfdPebmvEvFZ96ZDAYBzwq -D2fK/A+JYZ1lpTzlvBNbCNvj/+27BrtqBrF6T2XGgv0enIu1De5Iu7i9qgi0+6N8y5/NkHZchpZ4 -Vwpm+Vganf2XKWDeEaaQHBkc7gGWIjQ0LpH5t8Qn0Xvmv/uARFoW5evg1Ao4vOSR49XrXMGs3xtq -fJ7lddK2l4fbzIcrQzqECK+rPNv3PGYxhrCdU3nt+CPeQuMtgvEP5fqX ------END CERTIFICATE----- - GlobalSign Root CA - R3 ======================= -----BEGIN CERTIFICATE----- @@ -3783,3 +3634,694 @@ i4TWnsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5jwa19hAM8 EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWzaGHQRiapIVJpLesux+t3 zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmyKwbQBM0= -----END CERTIFICATE----- + +TeliaSonera Root CA v1 +====================== +-----BEGIN CERTIFICATE----- +MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAwNzEUMBIGA1UE +CgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJvb3QgQ0EgdjEwHhcNMDcxMDE4 +MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwW +VGVsaWFTb25lcmEgUm9vdCBDQSB2MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+ +6yfwIaPzaSZVfp3FVRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA +3GV17CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+XZ75Ljo1k +B1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+/jXh7VB7qTCNGdMJjmhn +Xb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxH +oLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkmdtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3 +F0fUTPHSiXk+TT2YqGHeOh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJ +oWjiUIMusDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4pgd7 +gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fsslESl1MpWtTwEhDc +TwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQarMCpgKIv7NHfirZ1fpoeDVNAgMB +AAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qW +DNXr+nuqF+gTEjANBgkqhkiG9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNm +zqjMDfz1mgbldxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx +0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1TjTQpgcmLNkQfW +pb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBedY2gea+zDTYa4EzAvXUYNR0PV +G6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpc +c41teyWRyu5FrgZLAMzTsVlQ2jqIOylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOT +JsjrDNYmiLbAJM+7vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2 +qReWt88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcnHL/EVlP6 +Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVxSK236thZiNSQvxaz2ems +WWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY= +-----END CERTIFICATE----- + +EE Certification Centre Root CA +=============================== +-----BEGIN CERTIFICATE----- +MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG +EwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2Vy +dGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIw +MTAxMDMwMTAxMDMwWhgPMjAzMDEyMTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlB +UyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRy +ZSBSb290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IB +DwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUyeuuOF0+W2Ap7kaJjbMeM +TC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvObntl8jixwKIy72KyaOBhU8E2lf/slLo2 +rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIwWFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw +93X2PaRka9ZP585ArQ/dMtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtN +P2MbRMNE1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYDVR0T +AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/zQas8fElyalL1BSZ +MEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEF +BQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEFBQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+Rj +xY6hUFaTlrg4wCQiZrxTFGGVv9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqM +lIpPnTX/dqQGE5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u +uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIWiAYLtqZLICjU +3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/vGVCJYMzpJJUPwssd8m92kMfM +dcGWxZ0= +-----END CERTIFICATE----- + +E-Tugra Certification Authority +=============================== +-----BEGIN CERTIFICATE----- +MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNVBAYTAlRSMQ8w +DQYDVQQHDAZBbmthcmExQDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamls +ZXJpIHZlIEhpem1ldGxlcmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBN +ZXJrZXppMSgwJgYDVQQDDB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMDMw +NTEyMDk0OFoXDTIzMDMwMzEyMDk0OFowgbIxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmEx +QDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhpem1ldGxl +cmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBNZXJrZXppMSgwJgYDVQQD +DB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A +MIICCgKCAgEA4vU/kwVRHoViVF56C/UYB4Oufq9899SKa6VjQzm5S/fDxmSJPZQuVIBSOTkHS0vd +hQd2h8y/L5VMzH2nPbxHD5hw+IyFHnSOkm0bQNGZDbt1bsipa5rAhDGvykPL6ys06I+XawGb1Q5K +CKpbknSFQ9OArqGIW66z6l7LFpp3RMih9lRozt6Plyu6W0ACDGQXwLWTzeHxE2bODHnv0ZEoq1+g +ElIwcxmOj+GMB6LDu0rw6h8VqO4lzKRG+Bsi77MOQ7osJLjFLFzUHPhdZL3Dk14opz8n8Y4e0ypQ +BaNV2cvnOVPAmJ6MVGKLJrD3fY185MaeZkJVgkfnsliNZvcHfC425lAcP9tDJMW/hkd5s3kc91r0 +E+xs+D/iWR+V7kI+ua2oMoVJl0b+SzGPWsutdEcf6ZG33ygEIqDUD13ieU/qbIWGvaimzuT6w+Gz +rt48Ue7LE3wBf4QOXVGUnhMMti6lTPk5cDZvlsouDERVxcr6XQKj39ZkjFqzAQqptQpHF//vkUAq +jqFGOjGY5RH8zLtJVor8udBhmm9lbObDyz51Sf6Pp+KJxWfXnUYTTjF2OySznhFlhqt/7x3U+Lzn +rFpct1pHXFXOVbQicVtbC/DP3KBhZOqp12gKY6fgDT+gr9Oq0n7vUaDmUStVkhUXU8u3Zg5mTPj5 +dUyQ5xJwx0UCAwEAAaNjMGEwHQYDVR0OBBYEFC7j27JJ0JxUeVz6Jyr+zE7S6E5UMA8GA1UdEwEB +/wQFMAMBAf8wHwYDVR0jBBgwFoAULuPbsknQnFR5XPonKv7MTtLoTlQwDgYDVR0PAQH/BAQDAgEG +MA0GCSqGSIb3DQEBCwUAA4ICAQAFNzr0TbdF4kV1JI+2d1LoHNgQk2Xz8lkGpD4eKexd0dCrfOAK +kEh47U6YA5n+KGCRHTAduGN8qOY1tfrTYXbm1gdLymmasoR6d5NFFxWfJNCYExL/u6Au/U5Mh/jO +XKqYGwXgAEZKgoClM4so3O0409/lPun++1ndYYRP0lSWE2ETPo+Aab6TR7U1Q9Jauz1c77NCR807 +VRMGsAnb/WP2OogKmW9+4c4bU2pEZiNRCHu8W1Ki/QY3OEBhj0qWuJA3+GbHeJAAFS6LrVE1Uweo +a2iu+U48BybNCAVwzDk/dr2l02cmAYamU9JgO3xDf1WKvJUawSg5TB9D0pH0clmKuVb8P7Sd2nCc +dlqMQ1DujjByTd//SffGqWfZbawCEeI6FiWnWAjLb1NBnEg4R2gz0dfHj9R0IdTDBZB6/86WiLEV +KV0jq9BgoRJP3vQXzTLlyb/IQ639Lo7xr+L0mPoSHyDYwKcMhcWQ9DstliaxLL5Mq+ux0orJ23gT +Dx4JnW2PAJ8C2sH6H3p6CcRK5ogql5+Ji/03X186zjhZhkuvcQu02PJwT58yE+Owp1fl2tpDy4Q0 +8ijE6m30Ku/Ba3ba+367hTzSU8JNvnHhRdH9I2cNE3X7z2VnIp2usAnRCf8dNL/+I5c30jn6PQ0G +C7TbO6Orb1wdtn7os4I07QZcJA== +-----END CERTIFICATE----- + +T-TeleSec GlobalRoot Class 2 +============================ +-----BEGIN CERTIFICATE----- +MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM +IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU +cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwHhcNMDgx +MDAxMTA0MDE0WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz +dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD +ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwggEiMA0GCSqGSIb3 +DQEBAQUAA4IBDwAwggEKAoIBAQCqX9obX+hzkeXaXPSi5kfl82hVYAUdAqSzm1nzHoqvNK38DcLZ +SBnuaY/JIPwhqgcZ7bBcrGXHX+0CfHt8LRvWurmAwhiCFoT6ZrAIxlQjgeTNuUk/9k9uN0goOA/F +vudocP05l03Sx5iRUKrERLMjfTlH6VJi1hKTXrcxlkIF+3anHqP1wvzpesVsqXFP6st4vGCvx970 +2cu+fjOlbpSD8DT6IavqjnKgP6TeMFvvhk1qlVtDRKgQFRzlAVfFmPHmBiiRqiDFt1MmUUOyCxGV +WOHAD3bZwI18gfNycJ5v/hqO2V81xrJvNHy+SE/iWjnX2J14np+GPgNeGYtEotXHAgMBAAGjQjBA +MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS/WSA2AHmgoCJrjNXy +YdK4LMuCSjANBgkqhkiG9w0BAQsFAAOCAQEAMQOiYQsfdOhyNsZt+U2e+iKo4YFWz827n+qrkRk4 +r6p8FU3ztqONpfSO9kSpp+ghla0+AGIWiPACuvxhI+YzmzB6azZie60EI4RYZeLbK4rnJVM3YlNf +vNoBYimipidx5joifsFvHZVwIEoHNN/q/xWA5brXethbdXwFeilHfkCoMRN3zUA7tFFHei4R40cR +3p1m0IvVVGb6g1XqfMIpiRvpb7PO4gWEyS8+eIVibslfwXhjdFjASBgMmTnrpMwatXlajRWc2BQN +9noHV8cigwUtPJslJj0Ys6lDfMjIq2SPDqO/nBudMNva0Bkuqjzx+zOAduTNrRlPBSeOE6Fuwg== +-----END CERTIFICATE----- + +Atos TrustedRoot 2011 +===================== +-----BEGIN CERTIFICATE----- +MIIDdzCCAl+gAwIBAgIIXDPLYixfszIwDQYJKoZIhvcNAQELBQAwPDEeMBwGA1UEAwwVQXRvcyBU +cnVzdGVkUm9vdCAyMDExMQ0wCwYDVQQKDARBdG9zMQswCQYDVQQGEwJERTAeFw0xMTA3MDcxNDU4 +MzBaFw0zMDEyMzEyMzU5NTlaMDwxHjAcBgNVBAMMFUF0b3MgVHJ1c3RlZFJvb3QgMjAxMTENMAsG +A1UECgwEQXRvczELMAkGA1UEBhMCREUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCV +hTuXbyo7LjvPpvMpNb7PGKw+qtn4TaA+Gke5vJrf8v7MPkfoepbCJI419KkM/IL9bcFyYie96mvr +54rMVD6QUM+A1JX76LWC1BTFtqlVJVfbsVD2sGBkWXppzwO3bw2+yj5vdHLqqjAqc2K+SZFhyBH+ +DgMq92og3AIVDV4VavzjgsG1xZ1kCWyjWZgHJ8cblithdHFsQ/H3NYkQ4J7sVaE3IqKHBAUsR320 +HLliKWYoyrfhk/WklAOZuXCFteZI6o1Q/NnezG8HDt0Lcp2AMBYHlT8oDv3FdU9T1nSatCQujgKR +z3bFmx5VdJx4IbHwLfELn8LVlhgf8FQieowHAgMBAAGjfTB7MB0GA1UdDgQWBBSnpQaxLKYJYO7R +l+lwrrw7GWzbITAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKelBrEspglg7tGX6XCuvDsZ +bNshMBgGA1UdIAQRMA8wDQYLKwYBBAGwLQMEAQEwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB +CwUAA4IBAQAmdzTblEiGKkGdLD4GkGDEjKwLVLgfuXvTBznk+j57sj1O7Z8jvZfza1zv7v1Apt+h +k6EKhqzvINB5Ab149xnYJDE0BAGmuhWawyfc2E8PzBhj/5kPDpFrdRbhIfzYJsdHt6bPWHJxfrrh +TZVHO8mvbaG0weyJ9rQPOLXiZNwlz6bb65pcmaHFCN795trV1lpFDMS3wrUU77QR/w4VtfX128a9 +61qn8FYiqTxlVMYVqL2Gns2Dlmh6cYGJ4Qvh6hEbaAjMaZ7snkGeRDImeuKHCnE96+RapNLbxc3G +3mB/ufNPRJLvKrcYPqcZ2Qt9sTdBQrC6YB3y/gkRsPCHe6ed +-----END CERTIFICATE----- + +QuoVadis Root CA 1 G3 +===================== +-----BEGIN CERTIFICATE----- +MIIFYDCCA0igAwIBAgIUeFhfLq0sGUvjNwc1NBMotZbUZZMwDQYJKoZIhvcNAQELBQAwSDELMAkG +A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv +b3QgQ0EgMSBHMzAeFw0xMjAxMTIxNzI3NDRaFw00MjAxMTIxNzI3NDRaMEgxCzAJBgNVBAYTAkJN +MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDEg +RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCgvlAQjunybEC0BJyFuTHK3C3kEakE +PBtVwedYMB0ktMPvhd6MLOHBPd+C5k+tR4ds7FtJwUrVu4/sh6x/gpqG7D0DmVIB0jWerNrwU8lm +PNSsAgHaJNM7qAJGr6Qc4/hzWHa39g6QDbXwz8z6+cZM5cOGMAqNF34168Xfuw6cwI2H44g4hWf6 +Pser4BOcBRiYz5P1sZK0/CPTz9XEJ0ngnjybCKOLXSoh4Pw5qlPafX7PGglTvF0FBM+hSo+LdoIN +ofjSxxR3W5A2B4GbPgb6Ul5jxaYA/qXpUhtStZI5cgMJYr2wYBZupt0lwgNm3fME0UDiTouG9G/l +g6AnhF4EwfWQvTA9xO+oabw4m6SkltFi2mnAAZauy8RRNOoMqv8hjlmPSlzkYZqn0ukqeI1RPToV +7qJZjqlc3sX5kCLliEVx3ZGZbHqfPT2YfF72vhZooF6uCyP8Wg+qInYtyaEQHeTTRCOQiJ/GKubX +9ZqzWB4vMIkIG1SitZgj7Ah3HJVdYdHLiZxfokqRmu8hqkkWCKi9YSgxyXSthfbZxbGL0eUQMk1f +iyA6PEkfM4VZDdvLCXVDaXP7a3F98N/ETH3Goy7IlXnLc6KOTk0k+17kBL5yG6YnLUlamXrXXAkg +t3+UuU/xDRxeiEIbEbfnkduebPRq34wGmAOtzCjvpUfzUwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD +AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUo5fW816iEOGrRZ88F2Q87gFwnMwwDQYJKoZI +hvcNAQELBQADggIBABj6W3X8PnrHX3fHyt/PX8MSxEBd1DKquGrX1RUVRpgjpeaQWxiZTOOtQqOC +MTaIzen7xASWSIsBx40Bz1szBpZGZnQdT+3Btrm0DWHMY37XLneMlhwqI2hrhVd2cDMT/uFPpiN3 +GPoajOi9ZcnPP/TJF9zrx7zABC4tRi9pZsMbj/7sPtPKlL92CiUNqXsCHKnQO18LwIE6PWThv6ct +Tr1NxNgpxiIY0MWscgKCP6o6ojoilzHdCGPDdRS5YCgtW2jgFqlmgiNR9etT2DGbe+m3nUvriBbP ++V04ikkwj+3x6xn0dxoxGE1nVGwvb2X52z3sIexe9PSLymBlVNFxZPT5pqOBMzYzcfCkeF9OrYMh +3jRJjehZrJ3ydlo28hP0r+AJx2EqbPfgna67hkooby7utHnNkDPDs3b69fBsnQGQ+p6Q9pxyz0fa +wx/kNSBT8lTR32GDpgLiJTjehTItXnOQUl1CxM49S+H5GYQd1aJQzEH7QRTDvdbJWqNjZgKAvQU6 +O0ec7AAmTPWIUb+oI38YB7AL7YsmoWTTYUrrXJ/es69nA7Mf3W1daWhpq1467HxpvMc7hU6eFbm0 +FU/DlXpY18ls6Wy58yljXrQs8C097Vpl4KlbQMJImYFtnh8GKjwStIsPm6Ik8KaN1nrgS7ZklmOV +hMJKzRwuJIczYOXD +-----END CERTIFICATE----- + +QuoVadis Root CA 2 G3 +===================== +-----BEGIN CERTIFICATE----- +MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQELBQAwSDELMAkG +A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv +b3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJN +MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIg +RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFh +ZiFfqq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMWn4rjyduY +NM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ymc5GQYaYDFCDy54ejiK2t +oIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+O7q414AB+6XrW7PFXmAqMaCvN+ggOp+o +MiwMzAkd056OXbxMmO7FGmh77FOm6RQ1o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+l +V0POKa2Mq1W/xPtbAd0jIaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZo +L1NesNKqIcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz8eQQ +sSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43ehvNURG3YBZwjgQQvD +6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l7ZizlWNof/k19N+IxWA1ksB8aRxh +lRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALGcC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTAD +AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZI +hvcNAQELBQADggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66 +AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RCroijQ1h5fq7K +pVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0GaW/ZZGYjeVYg3UQt4XAoeo0L9 +x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4nlv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgz +dWqTHBLmYF5vHX/JHyPLhGGfHoJE+V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6X +U/IyAgkwo1jwDQHVcsaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+Nw +mNtddbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNgKCLjsZWD +zYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeMHVOyToV7BjjHLPj4sHKN +JeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4WSr2Rz0ZiC3oheGe7IUIarFsNMkd7Egr +O3jtZsSOeWmD3n+M +-----END CERTIFICATE----- + +QuoVadis Root CA 3 G3 +===================== +-----BEGIN CERTIFICATE----- +MIIFYDCCA0igAwIBAgIULvWbAiin23r/1aOp7r0DoM8Sah0wDQYJKoZIhvcNAQELBQAwSDELMAkG +A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv +b3QgQ0EgMyBHMzAeFw0xMjAxMTIyMDI2MzJaFw00MjAxMTIyMDI2MzJaMEgxCzAJBgNVBAYTAkJN +MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDMg +RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCzyw4QZ47qFJenMioKVjZ/aEzHs286 +IxSR/xl/pcqs7rN2nXrpixurazHb+gtTTK/FpRp5PIpM/6zfJd5O2YIyC0TeytuMrKNuFoM7pmRL +Mon7FhY4futD4tN0SsJiCnMK3UmzV9KwCoWdcTzeo8vAMvMBOSBDGzXRU7Ox7sWTaYI+FrUoRqHe +6okJ7UO4BUaKhvVZR74bbwEhELn9qdIoyhA5CcoTNs+cra1AdHkrAj80//ogaX3T7mH1urPnMNA3 +I4ZyYUUpSFlob3emLoG+B01vr87ERRORFHAGjx+f+IdpsQ7vw4kZ6+ocYfx6bIrc1gMLnia6Et3U +VDmrJqMz6nWB2i3ND0/kA9HvFZcba5DFApCTZgIhsUfei5pKgLlVj7WiL8DWM2fafsSntARE60f7 +5li59wzweyuxwHApw0BiLTtIadwjPEjrewl5qW3aqDCYz4ByA4imW0aucnl8CAMhZa634RylsSqi +Md5mBPfAdOhx3v89WcyWJhKLhZVXGqtrdQtEPREoPHtht+KPZ0/l7DxMYIBpVzgeAVuNVejH38DM +dyM0SXV89pgR6y3e7UEuFAUCf+D+IOs15xGsIs5XPd7JMG0QA4XN8f+MFrXBsj6IbGB/kE+V9/Yt +rQE5BwT6dYB9v0lQ7e/JxHwc64B+27bQ3RP+ydOc17KXqQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD +AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUxhfQvKjqAkPyGwaZXSuQILnXnOQwDQYJKoZI +hvcNAQELBQADggIBADRh2Va1EodVTd2jNTFGu6QHcrxfYWLopfsLN7E8trP6KZ1/AvWkyaiTt3px +KGmPc+FSkNrVvjrlt3ZqVoAh313m6Tqe5T72omnHKgqwGEfcIHB9UqM+WXzBusnIFUBhynLWcKzS +t/Ac5IYp8M7vaGPQtSCKFWGafoaYtMnCdvvMujAWzKNhxnQT5WvvoxXqA/4Ti2Tk08HS6IT7SdEQ +TXlm66r99I0xHnAUrdzeZxNMgRVhvLfZkXdxGYFgu/BYpbWcC/ePIlUnwEsBbTuZDdQdm2NnL9Du +DcpmvJRPpq3t/O5jrFc/ZSXPsoaP0Aj/uHYUbt7lJ+yreLVTubY/6CD50qi+YUbKh4yE8/nxoGib +Ih6BJpsQBJFxwAYf3KDTuVan45gtf4Od34wrnDKOMpTwATwiKp9Dwi7DmDkHOHv8XgBCH/MyJnmD +hPbl8MFREsALHgQjDFSlTC9JxUrRtm5gDWv8a4uFJGS3iQ6rJUdbPM9+Sb3H6QrG2vd+DhcI00iX +0HGS8A85PjRqHH3Y8iKuu2n0M7SmSFXRDw4m6Oy2Cy2nhTXN/VnIn9HNPlopNLk9hM6xZdRZkZFW +dSHBd575euFgndOtBBj0fOtek49TSiIp+EgrPk2GrFt/ywaZWWDYWGWVjUTR939+J399roD1B0y2 +PpxxVJkES/1Y+Zj0 +-----END CERTIFICATE----- + +DigiCert Assured ID Root G2 +=========================== +-----BEGIN CERTIFICATE----- +MIIDljCCAn6gAwIBAgIQC5McOtY5Z+pnI7/Dr5r0SzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQG +EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw +IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIwHhcNMTMwODAxMTIwMDAwWhcNMzgw +MTE1MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL +ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIw +ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5ygvUj82ckmIkzTz+GoeMVSAn61UQbVH +35ao1K+ALbkKz3X9iaV9JPrjIgwrvJUXCzO/GU1BBpAAvQxNEP4HteccbiJVMWWXvdMX0h5i89vq +bFCMP4QMls+3ywPgym2hFEwbid3tALBSfK+RbLE4E9HpEgjAALAcKxHad3A2m67OeYfcgnDmCXRw +VWmvo2ifv922ebPynXApVfSr/5Vh88lAbx3RvpO704gqu52/clpWcTs/1PPRCv4o76Pu2ZmvA9OP +YLfykqGxvYmJHzDNw6YuYjOuFgJ3RFrngQo8p0Quebg/BLxcoIfhG69Rjs3sLPr4/m3wOnyqi+Rn +lTGNAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTO +w0q5mVXyuNtgv6l+vVa1lzan1jANBgkqhkiG9w0BAQsFAAOCAQEAyqVVjOPIQW5pJ6d1Ee88hjZv +0p3GeDgdaZaikmkuOGybfQTUiaWxMTeKySHMq2zNixya1r9I0jJmwYrA8y8678Dj1JGG0VDjA9tz +d29KOVPt3ibHtX2vK0LRdWLjSisCx1BL4GnilmwORGYQRI+tBev4eaymG+g3NJ1TyWGqolKvSnAW +hsI6yLETcDbYz+70CjTVW0z9B5yiutkBclzzTcHdDrEcDcRjvq30FPuJ7KJBDkzMyFdA0G4Dqs0M +jomZmWzwPDCvON9vvKO+KSAnq3T/EyJ43pdSVR6DtVQgA+6uwE9W3jfMw3+qBCe703e4YtsXfJwo +IhNzbM8m9Yop5w== +-----END CERTIFICATE----- + +DigiCert Assured ID Root G3 +=========================== +-----BEGIN CERTIFICATE----- +MIICRjCCAc2gAwIBAgIQC6Fa+h3foLVJRK/NJKBs7DAKBggqhkjOPQQDAzBlMQswCQYDVQQGEwJV +UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYD +VQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1 +MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwdjAQ +BgcqhkjOPQIBBgUrgQQAIgNiAAQZ57ysRGXtzbg/WPuNsVepRC0FFfLvC/8QdJ+1YlJfZn4f5dwb +RXkLzMZTCp2NXQLZqVneAlr2lSoOjThKiknGvMYDOAdfVdp+CW7if17QRSAPWXYQ1qAk8C3eNvJs +KTmjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTL0L2p4ZgF +UaFNN6KDec6NHSrkhDAKBggqhkjOPQQDAwNnADBkAjAlpIFFAmsSS3V0T8gj43DydXLefInwz5Fy +YZ5eEJJZVrmDxxDnOOlYJjZ91eQ0hjkCMHw2U/Aw5WJjOpnitqM7mzT6HtoQknFekROn3aRukswy +1vUhZscv6pZjamVFkpUBtA== +-----END CERTIFICATE----- + +DigiCert Global Root G2 +======================= +-----BEGIN CERTIFICATE----- +MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG +EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw +HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUx +MjAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3 +dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkq +hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI2/Ou8jqJ +kTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx1x7e/dfgy5SDN67sH0NO +3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQq2EGnI/yuum06ZIya7XzV+hdG82MHauV +BJVJ8zUtluNJbd134/tJS7SsVQepj5WztCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyM +UNGPHgm+F6HmIcr9g+UQvIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQAB +o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV5uNu +5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY1Yl9PMWLSn/pvtsr +F9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4NeF22d+mQrvHRAiGfzZ0JFrabA0U +WTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NGFdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBH +QRFXGU7Aj64GxJUTFy8bJZ918rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/ +iyK5S9kJRaTepLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl +MrY= +-----END CERTIFICATE----- + +DigiCert Global Root G3 +======================= +-----BEGIN CERTIFICATE----- +MIICPzCCAcWgAwIBAgIQBVVWvPJepDU1w6QP1atFcjAKBggqhkjOPQQDAzBhMQswCQYDVQQGEwJV +UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAwHgYD +VQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAw +MDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5k +aWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEczMHYwEAYHKoZIzj0C +AQYFK4EEACIDYgAE3afZu4q4C/sLfyHS8L6+c/MzXRq8NOrexpu80JX28MzQC7phW1FGfp4tn+6O +YwwX7Adw9c+ELkCDnOg/QW07rdOkFFk2eJ0DQ+4QE2xy3q6Ip6FrtUPOZ9wj/wMco+I+o0IwQDAP +BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUs9tIpPmhxdiuNkHMEWNp +Yim8S8YwCgYIKoZIzj0EAwMDaAAwZQIxAK288mw/EkrRLTnDCgmXc/SINoyIJ7vmiI1Qhadj+Z4y +3maTD/HMsQmP3Wyr+mt/oAIwOWZbwmSNuJ5Q3KjVSaLtx9zRSX8XAbjIho9OjIgrqJqpisXRAL34 +VOKa5Vt8sycX +-----END CERTIFICATE----- + +DigiCert Trusted Root G4 +======================== +-----BEGIN CERTIFICATE----- +MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBiMQswCQYDVQQG +EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSEw +HwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1 +MTIwMDAwWjBiMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0G +CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3yithZwuEp +pz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1Ifxp4VpX6+n6lXFllVcq9o +k3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDVySAdYyktzuxeTsiT+CFhmzTrBcZe7Fsa +vOvJz82sNEBfsXpm7nfISKhmV1efVFiODCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGY +QJB5w3jHtrHEtWoYOAMQjdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6 +MUSaM0C/CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCiEhtm +mnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADMfRyVw4/3IbKyEbe7 +f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QYuKZ3AeEPlAwhHbJUKSWJbOUOUlFH +dL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXKchYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8 +oR7FwI+isX4KJpn15GkvmB0t9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud +DwEB/wQEAwIBhjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD +ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2SV1EY+CtnJYY +ZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd+SeuMIW59mdNOj6PWTkiU0Tr +yF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWcfFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy +7zBZLq7gcfJW5GqXb5JQbZaNaHqasjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iah +ixTXTBmyUEFxPT9NcCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN +5r5N0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie4u1Ki7wb +/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mIr/OSmbaz5mEP0oUA51Aa +5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tK +G48BtieVU+i2iW1bvGjUI+iLUaJW+fCmgKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP +82Z+ +-----END CERTIFICATE----- + +WoSign +====== +-----BEGIN CERTIFICATE----- +MIIFdjCCA16gAwIBAgIQXmjWEXGUY1BWAGjzPsnFkTANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQG +EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxKjAoBgNVBAMTIUNlcnRpZmljYXRpb24g +QXV0aG9yaXR5IG9mIFdvU2lnbjAeFw0wOTA4MDgwMTAwMDFaFw0zOTA4MDgwMTAwMDFaMFUxCzAJ +BgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEqMCgGA1UEAxMhQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkgb2YgV29TaWduMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA +vcqNrLiRFVaXe2tcesLea9mhsMMQI/qnobLMMfo+2aYpbxY94Gv4uEBf2zmoAHqLoE1UfcIiePyO +CbiohdfMlZdLdNiefvAA5A6JrkkoRBoQmTIPJYhTpA2zDxIIFgsDcSccf+Hb0v1naMQFXQoOXXDX +2JegvFNBmpGN9J42Znp+VsGQX+axaCA2pIwkLCxHC1l2ZjC1vt7tj/id07sBMOby8w7gLJKA84X5 +KIq0VC6a7fd2/BVoFutKbOsuEo/Uz/4Mx1wdC34FMr5esAkqQtXJTpCzWQ27en7N1QhatH/YHGkR ++ScPewavVIMYe+HdVHpRaG53/Ma/UkpmRqGyZxq7o093oL5d//xWC0Nyd5DKnvnyOfUNqfTq1+ez +EC8wQjchzDBwyYaYD8xYTYO7feUapTeNtqwylwA6Y3EkHp43xP901DfA4v6IRmAR3Qg/UDaruHqk +lWJqbrDKaiFaafPz+x1wOZXzp26mgYmhiMU7ccqjUu6Du/2gd/Tkb+dC221KmYo0SLwX3OSACCK2 +8jHAPwQ+658geda4BmRkAjHXqc1S+4RFaQkAKtxVi8QGRkvASh0JWzko/amrzgD5LkhLJuYwTKVY +yrREgk/nkR4zw7CT/xH8gdLKH3Ep3XZPkiWvHYG3Dy+MwwbMLyejSuQOmbp8HkUff6oZRZb9/D0C +AwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFOFmzw7R +8bNLtwYgFP6HEtX2/vs+MA0GCSqGSIb3DQEBBQUAA4ICAQCoy3JAsnbBfnv8rWTjMnvMPLZdRtP1 +LOJwXcgu2AZ9mNELIaCJWSQBnfmvCX0KI4I01fx8cpm5o9dU9OpScA7F9dY74ToJMuYhOZO9sxXq +T2r09Ys/L3yNWC7F4TmgPsc9SnOeQHrAK2GpZ8nzJLmzbVUsWh2eJXLOC62qx1ViC777Y7NhRCOj +y+EaDveaBk3e1CNOIZZbOVtXHS9dCF4Jef98l7VNg64N1uajeeAz0JmWAjCnPv/So0M/BVoG6kQC +2nz4SNAzqfkHx5Xh9T71XXG68pWpdIhhWeO/yloTunK0jF02h+mmxTwTv97QRCbut+wucPrXnbes +5cVAWubXbHssw1abR80LzvobtCHXt2a49CUwi1wNuepnsvRtrtWhnk/Yn+knArAdBtaP4/tIEp9/ +EaEQPkxROpaw0RPxx9gmrjrKkcRpnd8BKWRRb2jaFOwIQZeQjdCygPLPwj2/kWjFgGcexGATVdVh +mVd8upUPYUk6ynW8yQqTP2cOEvIo4jEbwFcW3wh8GcF+Dx+FHgo2fFt+J7x6v+Db9NpSvd4MVHAx +kUOVyLzwPt0JfjBkUO1/AaQzZ01oT74V77D2AhGiGxMlOtzCWfHjXEa7ZywCRuoeSKbmW9m1vFGi +kpbbqsY3Iqb+zCB0oy2pLmvLwIIRIbWTee5Ehr7XHuQe+w== +-----END CERTIFICATE----- + +WoSign China +============ +-----BEGIN CERTIFICATE----- +MIIFWDCCA0CgAwIBAgIQUHBrzdgT/BtOOzNy0hFIjTANBgkqhkiG9w0BAQsFADBGMQswCQYDVQQG +EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxGzAZBgNVBAMMEkNBIOayg+mAmuagueiv +geS5pjAeFw0wOTA4MDgwMTAwMDFaFw0zOTA4MDgwMTAwMDFaMEYxCzAJBgNVBAYTAkNOMRowGAYD +VQQKExFXb1NpZ24gQ0EgTGltaXRlZDEbMBkGA1UEAwwSQ0Eg5rKD6YCa5qC56K+B5LmmMIICIjAN +BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0EkhHiX8h8EqwqzbdoYGTufQdDTc7WU1/FDWiD+k +8H/rD195L4mx/bxjWDeTmzj4t1up+thxx7S8gJeNbEvxUNUqKaqoGXqW5pWOdO2XCld19AXbbQs5 +uQF/qvbW2mzmBeCkTVL829B0txGMe41P/4eDrv8FAxNXUDf+jJZSEExfv5RxadmWPgxDT74wwJ85 +dE8GRV2j1lY5aAfMh09Qd5Nx2UQIsYo06Yms25tO4dnkUkWMLhQfkWsZHWgpLFbE4h4TV2TwYeO5 +Ed+w4VegG63XX9Gv2ystP9Bojg/qnw+LNVgbExz03jWhCl3W6t8Sb8D7aQdGctyB9gQjF+BNdeFy +b7Ao65vh4YOhn0pdr8yb+gIgthhid5E7o9Vlrdx8kHccREGkSovrlXLp9glk3Kgtn3R46MGiCWOc +76DbT52VqyBPt7D3h1ymoOQ3OMdc4zUPLK2jgKLsLl3Az+2LBcLmc272idX10kaO6m1jGx6KyX2m ++Jzr5dVjhU1zZmkR/sgO9MHHZklTfuQZa/HpelmjbX7FF+Ynxu8b22/8DU0GAbQOXDBGVWCvOGU6 +yke6rCzMRh+yRpY/8+0mBe53oWprfi1tWFxK1I5nuPHa1UaKJ/kR8slC/k7e3x9cxKSGhxYzoacX +GKUN5AXlK8IrC6KVkLn9YDxOiT7nnO4fuwECAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1Ud +EwEB/wQFMAMBAf8wHQYDVR0OBBYEFOBNv9ybQV0T6GTwp+kVpOGBwboxMA0GCSqGSIb3DQEBCwUA +A4ICAQBqinA4WbbaixjIvirTthnVZil6Xc1bL3McJk6jfW+rtylNpumlEYOnOXOvEESS5iVdT2H6 +yAa+Tkvv/vMx/sZ8cApBWNromUuWyXi8mHwCKe0JgOYKOoICKuLJL8hWGSbueBwj/feTZU7n85iY +r83d2Z5AiDEoOqsuC7CsDCT6eiaY8xJhEPRdF/d+4niXVOKM6Cm6jBAyvd0zaziGfjk9DgNyp115 +j0WKWa5bIW4xRtVZjc8VX90xJc/bYNaBRHIpAlf2ltTW/+op2znFuCyKGo3Oy+dCMYYFaA6eFN0A +kLppRQjbbpCBhqcqBT/mhDn4t/lXX0ykeVoQDF7Va/81XwVRHmyjdanPUIPTfPRm94KNPQx96N97 +qA4bLJyuQHCH2u2nFoJavjVsIE4iYdm8UXrNemHcSxH5/mc0zy4EZmFcV5cjjPOGG0jfKq+nwf/Y +jj4Du9gqsPoUJbJRa4ZDhS4HIxaAjUz7tGM7zMN07RujHv41D198HRaG9Q7DlfEvr10lO1Hm13ZB +ONFLAzkopR6RctR9q5czxNM+4Gm2KHmgCY0c0f9BckgG/Jou5yD5m6Leie2uPAmvylezkolwQOQv +T8Jwg0DXJCxr5wkf09XHwQj02w47HAcLQxGEIYbpgNR12KvxAmLBsX5VYc8T1yaw15zLKYs4SgsO +kI26oQ== +-----END CERTIFICATE----- + +COMODO RSA Certification Authority +================================== +-----BEGIN CERTIFICATE----- +MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCBhTELMAkGA1UE +BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG +A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlv +biBBdXRob3JpdHkwHhcNMTAwMTE5MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMC +R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE +ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBB +dXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR6FSS0gpWsawNJN3Fz0Rn +dJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8Xpz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZ +FGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+ +5eNu/Nio5JIk2kNrYrhV/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pG +x8cgoLEfZd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z+pUX +2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7wqP/0uK3pN/u6uPQL +OvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZahSL0896+1DSJMwBGB7FY79tOi4lu3 +sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVICu9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+C +GCe01a60y1Dma/RMhnEw6abfFobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5 +WdYgGq/yapiqcrxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E +FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w +DQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvlwFTPoCWOAvn9sKIN9SCYPBMt +rFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+ +nq6PK7o9mfjYcwlYRm6mnPTXJ9OV2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSg +tZx8jb8uk2IntznaFxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwW +sRqZCuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiKboHGhfKp +pC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmckejkk9u+UJueBPSZI9FoJA +zMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yLS0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHq +ZJx64SIDqZxubw5lT2yHh17zbqD5daWbQOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk52 +7RH89elWsn2/x20Kk4yl0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7I +LaZRfyHBNVOFBkpdn627G190 +-----END CERTIFICATE----- + +USERTrust RSA Certification Authority +===================================== +-----BEGIN CERTIFICATE----- +MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCBiDELMAkGA1UE +BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK +ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UE +BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK +ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCAEmUXNg7D2wiz +0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2j +Y0K2dvKpOyuR+OJv0OwWIJAJPuLodMkYtJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFn +RghRy4YUVD+8M/5+bJz/Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat//O ++T23LLb2VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT79uq +/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6c0Plfg6lZrEpfDKE +Y1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmTYo61Zs8liM2EuLE/pDkP2QKe6xJM +lXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97lc6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8 +yexDJtC/QV9AqURE9JnnV4eeUB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+ +eLf8ZxXhyVeEHg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd +BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF +MAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPFUp/L+M+ZBn8b2kMVn54CVVeW +FPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KOVWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ +7l8wXEskEVX/JJpuXior7gtNn3/3ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQ +Eg9zKC7F4iRO/Fjs8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM +8WcRiQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYzeSf7dNXGi +FSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZXHlKYC6SQK5MNyosycdi +yA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9c +J2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRBVXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGw +sAvgnEzDHNb842m1R0aBL6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gx +Q+6IHdfGjjxDah2nGN59PRbxYvnKkKj9 +-----END CERTIFICATE----- + +USERTrust ECC Certification Authority +===================================== +-----BEGIN CERTIFICATE----- +MIICjzCCAhWgAwIBAgIQXIuZxVqUxdJxVt7NiYDMJjAKBggqhkjOPQQDAzCBiDELMAkGA1UEBhMC +VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU +aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv +biBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMC +VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU +aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv +biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQarFRaqfloI+d61SRvU8Za2EurxtW2 +0eZzca7dnNYMYf3boIkDuAUU7FfO7l0/4iGzzvfUinngo4N+LZfQYcTxmdwlkWOrfzCjtHDix6Ez +nPO/LlxTsV+zfTJ/ijTjeXmjQjBAMB0GA1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1xmNjmjAOBgNV +HQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjA2Z6EWCNzklwBB +HU6+4WMBzzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbWRNZu +9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg= +-----END CERTIFICATE----- + +GlobalSign ECC Root CA - R4 +=========================== +-----BEGIN CERTIFICATE----- +MIIB4TCCAYegAwIBAgIRKjikHJYKBN5CsiilC+g0mAIwCgYIKoZIzj0EAwIwUDEkMCIGA1UECxMb +R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD +EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb +R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD +EwpHbG9iYWxTaWduMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuMZ5049sJQ6fLjkZHAOkrprl +OQcJFspjsbmG+IpXwVfOQvpzofdlQv8ewQCybnMO/8ch5RikqtlxP6jUuc6MHaNCMEAwDgYDVR0P +AQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFSwe61FuOJAf/sKbvu+M8k8o4TV +MAoGCCqGSM49BAMCA0gAMEUCIQDckqGgE6bPA7DmxCGXkPoUVy0D7O48027KqGx2vKLeuwIgJ6iF +JzWbVsaj8kfSt24bAgAXqmemFZHe+pTsewv4n4Q= +-----END CERTIFICATE----- + +GlobalSign ECC Root CA - R5 +=========================== +-----BEGIN CERTIFICATE----- +MIICHjCCAaSgAwIBAgIRYFlJ4CYuu1X5CneKcflK2GwwCgYIKoZIzj0EAwMwUDEkMCIGA1UECxMb +R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD +EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb +R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD +EwpHbG9iYWxTaWduMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAER0UOlvt9Xb/pOdEh+J8LttV7HpI6 +SFkc8GIxLcB6KP4ap1yztsyX50XUWPrRd21DosCHZTQKH3rd6zwzocWdTaRvQZU4f8kehOvRnkmS +h5SHDDqFSmafnVmTTZdhBoZKo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd +BgNVHQ4EFgQUPeYpSJvqB8ohREom3m7e0oPQn1kwCgYIKoZIzj0EAwMDaAAwZQIxAOVpEslu28Yx +uglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7 +yFz9SO8NdCKoCOJuxUnOxwy8p2Fp8fc74SrL+SvzZpA3 +-----END CERTIFICATE----- + +Staat der Nederlanden Root CA - G3 +================================== +-----BEGIN CERTIFICATE----- +MIIFdDCCA1ygAwIBAgIEAJiiOTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE +CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g +Um9vdCBDQSAtIEczMB4XDTEzMTExNDExMjg0MloXDTI4MTExMzIzMDAwMFowWjELMAkGA1UEBhMC +TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l +ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL4y +olQPcPssXFnrbMSkUeiFKrPMSjTysF/zDsccPVMeiAho2G89rcKezIJnByeHaHE6n3WWIkYFsO2t +x1ueKt6c/DrGlaf1F2cY5y9JCAxcz+bMNO14+1Cx3Gsy8KL+tjzk7FqXxz8ecAgwoNzFs21v0IJy +EavSgWhZghe3eJJg+szeP4TrjTgzkApyI/o1zCZxMdFyKJLZWyNtZrVtB0LrpjPOktvA9mxjeM3K +Tj215VKb8b475lRgsGYeCasH/lSJEULR9yS6YHgamPfJEf0WwTUaVHXvQ9Plrk7O53vDxk5hUUur +mkVLoR9BvUhTFXFkC4az5S6+zqQbwSmEorXLCCN2QyIkHxcE1G6cxvx/K2Ya7Irl1s9N9WMJtxU5 +1nus6+N86U78dULI7ViVDAZCopz35HCz33JvWjdAidiFpNfxC95DGdRKWCyMijmev4SH8RY7Ngzp +07TKbBlBUgmhHbBqv4LvcFEhMtwFdozL92TkA1CvjJFnq8Xy7ljY3r735zHPbMk7ccHViLVlvMDo +FxcHErVc0qsgk7TmgoNwNsXNo42ti+yjwUOH5kPiNL6VizXtBznaqB16nzaeErAMZRKQFWDZJkBE +41ZgpRDUajz9QdwOWke275dhdU/Z/seyHdTtXUmzqWrLZoQT1Vyg3N9udwbRcXXIV2+vD3dbAgMB +AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRUrfrHkleu +yjWcLhL75LpdINyUVzANBgkqhkiG9w0BAQsFAAOCAgEAMJmdBTLIXg47mAE6iqTnB/d6+Oea31BD +U5cqPco8R5gu4RV78ZLzYdqQJRZlwJ9UXQ4DO1t3ApyEtg2YXzTdO2PCwyiBwpwpLiniyMMB8jPq +KqrMCQj3ZWfGzd/TtiunvczRDnBfuCPRy5FOCvTIeuXZYzbB1N/8Ipf3YF3qKS9Ysr1YvY2WTxB1 +v0h7PVGHoTx0IsL8B3+A3MSs/mrBcDCw6Y5p4ixpgZQJut3+TcCDjJRYwEYgr5wfAvg1VUkvRtTA +8KCWAg8zxXHzniN9lLf9OtMJgwYh/WA9rjLA0u6NpvDntIJ8CsxwyXmA+P5M9zWEGYox+wrZ13+b +8KKaa8MFSu1BYBQw0aoRQm7TIwIEC8Zl3d1Sd9qBa7Ko+gE4uZbqKmxnl4mUnrzhVNXkanjvSr0r +mj1AfsbAddJu+2gw7OyLnflJNZoaLNmzlTnVHpL3prllL+U9bTpITAjc5CgSKL59NVzq4BZ+Extq +1z7XnvwtdbLBFNUjA9tbbws+eC8N3jONFrdI54OagQ97wUNNVQQXOEpR1VmiiXTTn74eS9fGbbeI +JG9gkaSChVtWQbzQRKtqE77RLFi3EjNYsjdj3BP1lB0/QFH1T/U67cjF68IeHRaVesd+QnGTbksV +tzDfqu1XhUisHWrdOWnk4Xl4vs4Fv6EM94B7IWcnMFk= +-----END CERTIFICATE----- + +Staat der Nederlanden EV Root CA +================================ +-----BEGIN CERTIFICATE----- +MIIFcDCCA1igAwIBAgIEAJiWjTANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJOTDEeMBwGA1UE +CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSkwJwYDVQQDDCBTdGFhdCBkZXIgTmVkZXJsYW5kZW4g +RVYgUm9vdCBDQTAeFw0xMDEyMDgxMTE5MjlaFw0yMjEyMDgxMTEwMjhaMFgxCzAJBgNVBAYTAk5M +MR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xKTAnBgNVBAMMIFN0YWF0IGRlciBOZWRl +cmxhbmRlbiBFViBSb290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA48d+ifkk +SzrSM4M1LGns3Amk41GoJSt5uAg94JG6hIXGhaTK5skuU6TJJB79VWZxXSzFYGgEt9nCUiY4iKTW +O0Cmws0/zZiTs1QUWJZV1VD+hq2kY39ch/aO5ieSZxeSAgMs3NZmdO3dZ//BYY1jTw+bbRcwJu+r +0h8QoPnFfxZpgQNH7R5ojXKhTbImxrpsX23Wr9GxE46prfNeaXUmGD5BKyF/7otdBwadQ8QpCiv8 +Kj6GyzyDOvnJDdrFmeK8eEEzduG/L13lpJhQDBXd4Pqcfzho0LKmeqfRMb1+ilgnQ7O6M5HTp5gV +XJrm0w912fxBmJc+qiXbj5IusHsMX/FjqTf5m3VpTCgmJdrV8hJwRVXj33NeN/UhbJCONVrJ0yPr +08C+eKxCKFhmpUZtcALXEPlLVPxdhkqHz3/KRawRWrUgUY0viEeXOcDPusBCAUCZSCELa6fS/ZbV +0b5GnUngC6agIk440ME8MLxwjyx1zNDFjFE7PZQIZCZhfbnDZY8UnCHQqv0XcgOPvZuM5l5Tnrmd +74K74bzickFbIZTTRTeU0d8JOV3nI6qaHcptqAqGhYqCvkIH1vI4gnPah1vlPNOePqc7nvQDs/nx +fRN0Av+7oeX6AHkcpmZBiFxgV6YuCcS6/ZrPpx9Aw7vMWgpVSzs4dlG4Y4uElBbmVvMCAwEAAaNC +MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFP6rAJCYniT8qcwa +ivsnuL8wbqg7MA0GCSqGSIb3DQEBCwUAA4ICAQDPdyxuVr5Os7aEAJSrR8kN0nbHhp8dB9O2tLsI +eK9p0gtJ3jPFrK3CiAJ9Brc1AsFgyb/E6JTe1NOpEyVa/m6irn0F3H3zbPB+po3u2dfOWBfoqSmu +c0iH55vKbimhZF8ZE/euBhD/UcabTVUlT5OZEAFTdfETzsemQUHSv4ilf0X8rLiltTMMgsT7B/Zq +5SWEXwbKwYY5EdtYzXc7LMJMD16a4/CrPmEbUCTCwPTxGfARKbalGAKb12NMcIxHowNDXLldRqAN +b/9Zjr7dn3LDWyvfjFvO5QxGbJKyCqNMVEIYFRIYvdr8unRu/8G2oGTYqV9Vrp9canaW2HNnh/tN +f1zuacpzEPuKqf2evTY4SUmH9A4U8OmHuD+nT3pajnnUk+S7aFKErGzp85hwVXIy+TSrK0m1zSBi +5Dp6Z2Orltxtrpfs/J92VoguZs9btsmksNcFuuEnL5O7Jiqik7Ab846+HUCjuTaPPoIaGl6I6lD4 +WeKDRikL40Rc4ZW2aZCaFG+XroHPaO+Zmr615+F/+PoTRxZMzG0IQOeLeG9QgkRQP2YGiqtDhFZK +DyAthg710tvSeopLzaXoTvFeJiUBWSOgftL2fiFX1ye8FVdMpEbB4IMeDExNH08GGeL5qPQ6gqGy +eUN51q1veieQA6TqJIc/2b3Z6fJfUEkc7uzXLg== +-----END CERTIFICATE----- + +IdenTrust Commercial Root CA 1 +============================== +-----BEGIN CERTIFICATE----- +MIIFYDCCA0igAwIBAgIQCgFCgAAAAUUjyES1AAAAAjANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQG +EwJVUzESMBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBS +b290IENBIDEwHhcNMTQwMTE2MTgxMjIzWhcNMzQwMTE2MTgxMjIzWjBKMQswCQYDVQQGEwJVUzES +MBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBSb290IENB +IDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnUBneP5k91DNG8W9RYYKyqU+PZ4ld +hNlT3Qwo2dfw/66VQ3KZ+bVdfIrBQuExUHTRgQ18zZshq0PirK1ehm7zCYofWjK9ouuU+ehcCuz/ +mNKvcbO0U59Oh++SvL3sTzIwiEsXXlfEU8L2ApeN2WIrvyQfYo3fw7gpS0l4PJNgiCL8mdo2yMKi +1CxUAGc1bnO/AljwpN3lsKImesrgNqUZFvX9t++uP0D1bVoE/c40yiTcdCMbXTMTEl3EASX2MN0C +XZ/g1Ue9tOsbobtJSdifWwLziuQkkORiT0/Br4sOdBeo0XKIanoBScy0RnnGF7HamB4HWfp1IYVl +3ZBWzvurpWCdxJ35UrCLvYf5jysjCiN2O/cz4ckA82n5S6LgTrx+kzmEB/dEcH7+B1rlsazRGMzy +NeVJSQjKVsk9+w8YfYs7wRPCTY/JTw436R+hDmrfYi7LNQZReSzIJTj0+kuniVyc0uMNOYZKdHzV +WYfCP04MXFL0PfdSgvHqo6z9STQaKPNBiDoT7uje/5kdX7rL6B7yuVBgwDHTc+XvvqDtMwt0viAg +xGds8AgDelWAf0ZOlqf0Hj7h9tgJ4TNkK2PXMl6f+cB7D3hvl7yTmvmcEpB4eoCHFddydJxVdHix +uuFucAS6T6C6aMN7/zHwcz09lCqxC0EOoP5NiGVreTO01wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC +AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU7UQZwNPwBovupHu+QucmVMiONnYwDQYJKoZI +hvcNAQELBQADggIBAA2ukDL2pkt8RHYZYR4nKM1eVO8lvOMIkPkp165oCOGUAFjvLi5+U1KMtlwH +6oi6mYtQlNeCgN9hCQCTrQ0U5s7B8jeUeLBfnLOic7iPBZM4zY0+sLj7wM+x8uwtLRvM7Kqas6pg +ghstO8OEPVeKlh6cdbjTMM1gCIOQ045U8U1mwF10A0Cj7oV+wh93nAbowacYXVKV7cndJZ5t+qnt +ozo00Fl72u1Q8zW/7esUTTHHYPTa8Yec4kjixsU3+wYQ+nVZZjFHKdp2mhzpgq7vmrlR94gjmmmV +YjzlVYA211QC//G5Xc7UI2/YRYRKW2XviQzdFKcgyxilJbQN+QHwotL0AMh0jqEqSI5l2xPE4iUX +feu+h1sXIFRRk0pTAwvsXcoz7WL9RccvW9xYoIA55vrX/hMUpu09lEpCdNTDd1lzzY9GvlU47/ro +kTLql1gEIt44w8y8bckzOmoKaT+gyOpyj4xjhiO9bTyWnpXgSUyqorkqG5w2gXjtw+hG4iZZRHUe +2XWJUc0QhJ1hYMtd+ZciTY6Y5uN/9lu7rs3KSoFrXgvzUeF0K+l+J6fZmUlO+KWA2yUPHGNiiskz +Z2s8EIPGrd6ozRaOjfAHN3Gf8qv8QfXBi+wAN10J5U6A7/qxXDgGpRtK4dw4LTzcqx+QGtVKnO7R +cGzM7vRX+Bi6hG6H +-----END CERTIFICATE----- + +IdenTrust Public Sector Root CA 1 +================================= +-----BEGIN CERTIFICATE----- +MIIFZjCCA06gAwIBAgIQCgFCgAAAAUUjz0Z8AAAAAjANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQG +EwJVUzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3Rv +ciBSb290IENBIDEwHhcNMTQwMTE2MTc1MzMyWhcNMzQwMTE2MTc1MzMyWjBNMQswCQYDVQQGEwJV +UzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBS +b290IENBIDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2IpT8pEiv6EdrCvsnduTy +P4o7ekosMSqMjbCpwzFrqHd2hCa2rIFCDQjrVVi7evi8ZX3yoG2LqEfpYnYeEe4IFNGyRBb06tD6 +Hi9e28tzQa68ALBKK0CyrOE7S8ItneShm+waOh7wCLPQ5CQ1B5+ctMlSbdsHyo+1W/CD80/HLaXI +rcuVIKQxKFdYWuSNG5qrng0M8gozOSI5Cpcu81N3uURF/YTLNiCBWS2ab21ISGHKTN9T0a9SvESf +qy9rg3LvdYDaBjMbXcjaY8ZNzaxmMc3R3j6HEDbhuaR672BQssvKplbgN6+rNBM5Jeg5ZuSYeqoS +mJxZZoY+rfGwyj4GD3vwEUs3oERte8uojHH01bWRNszwFcYr3lEXsZdMUD2xlVl8BX0tIdUAvwFn +ol57plzy9yLxkA2T26pEUWbMfXYD62qoKjgZl3YNa4ph+bz27nb9cCvdKTz4Ch5bQhyLVi9VGxyh +LrXHFub4qjySjmm2AcG1hp2JDws4lFTo6tyePSW8Uybt1as5qsVATFSrsrTZ2fjXctscvG29ZV/v +iDUqZi/u9rNl8DONfJhBaUYPQxxp+pu10GFqzcpL2UyQRqsVWaFHVCkugyhfHMKiq3IXAAaOReyL +4jM9f9oZRORicsPfIsbyVtTdX5Vy7W1f90gDW/3FKqD2cyOEEBsB5wIDAQABo0IwQDAOBgNVHQ8B +Af8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU43HgntinQtnbcZFrlJPrw6PRFKMw +DQYJKoZIhvcNAQELBQADggIBAEf63QqwEZE4rU1d9+UOl1QZgkiHVIyqZJnYWv6IAcVYpZmxI1Qj +t2odIFflAWJBF9MJ23XLblSQdf4an4EKwt3X9wnQW3IV5B4Jaj0z8yGa5hV+rVHVDRDtfULAj+7A +mgjVQdZcDiFpboBhDhXAuM/FSRJSzL46zNQuOAXeNf0fb7iAaJg9TaDKQGXSc3z1i9kKlT/YPyNt +GtEqJBnZhbMX73huqVjRI9PHE+1yJX9dsXNw0H8GlwmEKYBhHfpe/3OsoOOJuBxxFcbeMX8S3OFt +m6/n6J91eEyrRjuazr8FGF1NFTwWmhlQBJqymm9li1JfPFgEKCXAZmExfrngdbkaqIHWchezxQMx +NRF4eKLg6TCMf4DfWN88uieW4oA0beOY02QnrEh+KHdcxiVhJfiFDGX6xDIvpZgF5PgLZxYWxoK4 +Mhn5+bl53B/N66+rDt0b20XkeucC4pVd/GnwU2lhlXV5C15V5jgclKlZM57IcXR5f1GJtshquDDI +ajjDbp7hNxbqBWJMWxJH7ae0s1hWx0nzfxJoCTFx8G34Tkf71oXuxVhAGaQdp/lLQzfcaFpPz+vC +ZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ +3Wl9af0AVqW3rLatt8o+Ae+c +-----END CERTIFICATE----- + +Entrust Root Certification Authority - G2 +========================================= +-----BEGIN CERTIFICATE----- +MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMCVVMxFjAUBgNV +BAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVy +bXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ug +b25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIw +HhcNMDkwNzA3MTcyNTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoT +DUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMx +OTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25s +eTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP +/vaCeb9zYQYKpSfYs1/TRU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXz +HHfV1IWNcCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hWwcKU +s/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1U1+cPvQXLOZprE4y +TGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0jaWvYkxN4FisZDQSA/i2jZRjJKRx +AgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ6 +0B7vfec7aVHUbI2fkBJmqzANBgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5Z +iXMRrEPR9RP/jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ +Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v1fN2D807iDgi +nWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4RnAuknZoh8/CbCzB428Hch0P+ +vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmHVHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xO +e4pIb4tF9g== +-----END CERTIFICATE----- + +Entrust Root Certification Authority - EC1 +========================================== +-----BEGIN CERTIFICATE----- +MIIC+TCCAoCgAwIBAgINAKaLeSkAAAAAUNCR+TAKBggqhkjOPQQDAzCBvzELMAkGA1UEBhMCVVMx +FjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVn +YWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEyIEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXpl +ZCB1c2Ugb25seTEzMDEGA1UEAxMqRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5 +IC0gRUMxMB4XDTEyMTIxODE1MjUzNloXDTM3MTIxODE1NTUzNlowgb8xCzAJBgNVBAYTAlVTMRYw +FAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2Fs +LXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxMiBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQg +dXNlIG9ubHkxMzAxBgNVBAMTKkVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt +IEVDMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABIQTydC6bUF74mzQ61VfZgIaJPRbiWlH47jCffHy +AsWfoPZb1YsGGYZPUxBtByQnoaD41UcZYUx9ypMn6nQM72+WCf5j7HBdNq1nd67JnXxVRDqiY1Ef +9eNi1KlHBz7MIKNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE +FLdj5xrdjekIplWDpOBqUEFlEUJJMAoGCCqGSM49BAMDA2cAMGQCMGF52OVCR98crlOZF7ZvHH3h +vxGU0QOIdeSNiaSKd0bebWHvAvX7td/M/k7//qnmpwIwW5nXhTcGtXsI/esni0qU+eH6p44mCOh8 +kmhtc9hvJqwhAriZtyZBWyVgrtBIGu4G +-----END CERTIFICATE----- + +CFCA EV ROOT +============ +-----BEGIN CERTIFICATE----- +MIIFjTCCA3WgAwIBAgIEGErM1jANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJDTjEwMC4GA1UE +CgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQDDAxDRkNB +IEVWIFJPT1QwHhcNMTIwODA4MDMwNzAxWhcNMjkxMjMxMDMwNzAxWjBWMQswCQYDVQQGEwJDTjEw +MC4GA1UECgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQD +DAxDRkNBIEVWIFJPT1QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDXXWvNED8fBVnV +BU03sQ7smCuOFR36k0sXgiFxEFLXUWRwFsJVaU2OFW2fvwwbwuCjZ9YMrM8irq93VCpLTIpTUnrD +7i7es3ElweldPe6hL6P3KjzJIx1qqx2hp/Hz7KDVRM8Vz3IvHWOX6Jn5/ZOkVIBMUtRSqy5J35DN +uF++P96hyk0g1CXohClTt7GIH//62pCfCqktQT+x8Rgp7hZZLDRJGqgG16iI0gNyejLi6mhNbiyW +ZXvKWfry4t3uMCz7zEasxGPrb382KzRzEpR/38wmnvFyXVBlWY9ps4deMm/DGIq1lY+wejfeWkU7 +xzbh72fROdOXW3NiGUgthxwG+3SYIElz8AXSG7Ggo7cbcNOIabla1jj0Ytwli3i/+Oh+uFzJlU9f +py25IGvPa931DfSCt/SyZi4QKPaXWnuWFo8BGS1sbn85WAZkgwGDg8NNkt0yxoekN+kWzqotaK8K +gWU6cMGbrU1tVMoqLUuFG7OA5nBFDWteNfB/O7ic5ARwiRIlk9oKmSJgamNgTnYGmE69g60dWIol +hdLHZR4tjsbftsbhf4oEIRUpdPA+nJCdDC7xij5aqgwJHsfVPKPtl8MeNPo4+QgO48BdK4PRVmrJ +tqhUUy54Mmc9gn900PvhtgVguXDbjgv5E1hvcWAQUhC5wUEJ73IfZzF4/5YFjQIDAQABo2MwYTAf +BgNVHSMEGDAWgBTj/i39KNALtbq2osS/BqoFjJP7LzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB +/wQEAwIBBjAdBgNVHQ4EFgQU4/4t/SjQC7W6tqLEvwaqBYyT+y8wDQYJKoZIhvcNAQELBQADggIB +ACXGumvrh8vegjmWPfBEp2uEcwPenStPuiB/vHiyz5ewG5zz13ku9Ui20vsXiObTej/tUxPQ4i9q +ecsAIyjmHjdXNYmEwnZPNDatZ8POQQaIxffu2Bq41gt/UP+TqhdLjOztUmCypAbqTuv0axn96/Ua +4CUqmtzHQTb3yHQFhDmVOdYLO6Qn+gjYXB74BGBSESgoA//vU2YApUo0FmZ8/Qmkrp5nGm9BC2sG +E5uPhnEFtC+NiWYzKXZUmhH4J/qyP5Hgzg0b8zAarb8iXRvTvyUFTeGSGn+ZnzxEk8rUQElsgIfX +BDrDMlI1Dlb4pd19xIsNER9Tyx6yF7Zod1rg1MvIB671Oi6ON7fQAUtDKXeMOZePglr4UeWJoBjn +aH9dCi77o0cOPaYjesYBx4/IXr9tgFa+iiS6M+qf4TIRnvHST4D2G0CvOJ4RUHlzEhLN5mydLIhy +PDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe/v5WOaHIz16eGWRGENoX +kbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+ZAAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3C +ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su +-----END CERTIFICATE----- diff --git a/wp-includes/class-IXR.php b/wp-includes/class-IXR.php index 7264db6..2fee046 100644 --- a/wp-includes/class-IXR.php +++ b/wp-includes/class-IXR.php @@ -49,7 +49,10 @@ class IXR_Value { var $data; var $type; - function IXR_Value($data, $type = false) + /** + * PHP5 constructor. + */ + function __construct( $data, $type = false ) { $this->data = $data; if (!$type) { @@ -69,6 +72,13 @@ class IXR_Value { } } + /** + * PHP4 constructor. + */ + public function IXR_Value( $data, $type = false ) { + self::__construct( $data, $type ); + } + function calculateType() { if ($this->data === true || $this->data === false) { @@ -151,8 +161,8 @@ class IXR_Value { /** * Checks whether or not the supplied array is a struct or not * - * @param unknown_type $array - * @return boolean + * @param array $array + * @return bool */ function isStruct($array) { @@ -194,20 +204,63 @@ class IXR_Message // The XML parser var $_parser; - function IXR_Message($message) + /** + * PHP5 constructor. + */ + function __construct( $message ) { $this->message =& $message; } + /** + * PHP4 constructor. + */ + public function IXR_Message( $message ) { + self::__construct( $message ); + } + function parse() { // first remove the XML declaration // merged from WP #10698 - this method avoids the RAM usage of preg_replace on very large messages - $header = preg_replace( '/<\?xml.*?\?'.'>/', '', substr($this->message, 0, 100), 1); - $this->message = substr_replace($this->message, $header, 0, 100); - if (trim($this->message) == '') { + $header = preg_replace( '/<\?xml.*?\?'.'>/s', '', substr( $this->message, 0, 100 ), 1 ); + $this->message = trim( substr_replace( $this->message, $header, 0, 100 ) ); + if ( '' == $this->message ) { + return false; + } + + // Then remove the DOCTYPE + $header = preg_replace( '/^]*+>/i', '', substr( $this->message, 0, 200 ), 1 ); + $this->message = trim( substr_replace( $this->message, $header, 0, 200 ) ); + if ( '' == $this->message ) { + return false; + } + + // Check that the root tag is valid + $root_tag = substr( $this->message, 0, strcspn( substr( $this->message, 0, 20 ), "> \t\r\n" ) ); + if ( 'message, '<' ) ) { return false; } + $this->_parser = xml_parser_create(); // Set XML parser to take the case of tags in to account xml_parser_set_option($this->_parser, XML_OPTION_CASE_FOLDING, false); @@ -215,7 +268,19 @@ class IXR_Message xml_set_object($this->_parser, $this); xml_set_element_handler($this->_parser, 'tag_open', 'tag_close'); xml_set_character_data_handler($this->_parser, 'cdata'); - $chunk_size = 262144; // 256Kb, parse in chunks to avoid the RAM usage on very large messages + + // 256Kb, parse in chunks to avoid the RAM usage on very large messages + $chunk_size = 262144; + + /** + * Filter the chunk size that can be used to parse an XML-RPC reponse message. + * + * @since 4.4.0 + * + * @param int $chunk_size Chunk size to parse in bytes. + */ + $chunk_size = apply_filters( 'xmlrpc_chunk_parsing_size', $chunk_size ); + $final = false; do { if (strlen($this->message) <= $chunk_size) { @@ -332,7 +397,7 @@ class IXR_Message $this->_arraystructs[count($this->_arraystructs)-1][] = $value; } } else { - // Just add as a paramater + // Just add as a parameter $this->params[] = $value; } } @@ -353,7 +418,10 @@ class IXR_Server var $message; var $capabilities; - function IXR_Server($callbacks = false, $data = false, $wait = false) + /** + * PHP5 constructor. + */ + function __construct( $callbacks = false, $data = false, $wait = false ) { $this->setCapabilities(); if ($callbacks) { @@ -365,11 +433,22 @@ class IXR_Server } } + /** + * PHP4 constructor. + */ + public function IXR_Server( $callbacks = false, $data = false, $wait = false ) { + self::__construct( $callbacks, $data, $wait ); + } + function serve($data = false) { if (!$data) { if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] !== 'POST') { - header('Content-Type: text/plain'); // merged from WP #9093 + if ( function_exists( 'status_header' ) ) { + status_header( 405 ); // WP #20986 + header( 'Allow: POST' ); + } + header('Content-Type: text/plain'); // merged from WP #9093 die('XML-RPC server accepts POST requests only.'); } @@ -425,7 +504,7 @@ EOD; // Perform the callback and send the response if (count($args) == 1) { - // If only one paramater just send that instead of the whole array + // If only one parameter just send that instead of the whole array $args = $args[0]; } @@ -473,7 +552,6 @@ EOD; $xml = ''."\n".$xml; $length = strlen($xml); header('Connection: close'); - header('Content-Length: '.$length); if ($charset) header('Content-Type: text/xml; charset='.$charset); else @@ -563,7 +641,10 @@ class IXR_Request var $args; var $xml; - function IXR_Request($method, $args) + /** + * PHP5 constructor. + */ + function __construct($method, $args) { $this->method = $method; $this->args = $args; @@ -583,6 +664,13 @@ EOD; $this->xml .= ''; } + /** + * PHP4 constructor. + */ + public function IXR_Request( $method, $args ) { + self::__construct( $method, $args ); + } + function getLength() { return strlen($this->xml); @@ -616,7 +704,10 @@ class IXR_Client // Storage place for an error message var $error = false; - function IXR_Client($server, $path = false, $port = 80, $timeout = 15) + /** + * PHP5 constructor. + */ + function __construct( $server, $path = false, $port = 80, $timeout = 15 ) { if (!$path) { // Assume we have been given a URL instead @@ -642,6 +733,13 @@ class IXR_Client $this->timeout = $timeout; } + /** + * PHP4 constructor. + */ + public function IXR_Client( $server, $path = false, $port = 80, $timeout = 15 ) { + self::__construct( $server, $path, $port, $timeout ); + } + function query() { $args = func_get_args(); @@ -761,12 +859,22 @@ class IXR_Error var $code; var $message; - function IXR_Error($code, $message) + /** + * PHP5 constructor. + */ + function __construct( $code, $message ) { $this->code = $code; $this->message = htmlspecialchars($message); } + /** + * PHP4 constructor. + */ + public function IXR_Error( $code, $message ) { + self::__construct( $code, $message ); + } + function getXml() { $xml = <<year = date('Y', $timestamp); @@ -865,11 +983,21 @@ class IXR_Base64 { var $data; - function IXR_Base64($data) + /** + * PHP5 constructor. + */ + function __construct( $data ) { $this->data = $data; } + /** + * PHP4 constructor. + */ + public function IXR_Base64( $data ) { + self::__construct( $data ); + } + function getXml() { return ''.base64_encode($this->data).''; @@ -887,7 +1015,10 @@ class IXR_IntrospectionServer extends IXR_Server var $signatures; var $help; - function IXR_IntrospectionServer() + /** + * PHP5 constructor. + */ + function __construct() { $this->setCallbacks(); $this->setCapabilities(); @@ -921,6 +1052,13 @@ class IXR_IntrospectionServer extends IXR_Server ); } + /** + * PHP4 constructor. + */ + public function IXR_IntrospectionServer() { + self::__construct(); + } + function addCallback($method, $callback, $args, $help) { $this->callbacks[$method] = $callback; @@ -1049,12 +1187,22 @@ class IXR_ClientMulticall extends IXR_Client { var $calls = array(); - function IXR_ClientMulticall($server, $path = false, $port = 80) + /** + * PHP5 constructor. + */ + function __construct( $server, $path = false, $port = 80 ) { parent::IXR_Client($server, $path, $port); $this->useragent = 'The Incutio XML-RPC PHP Library (multicall client)'; } + /** + * PHP4 constructor. + */ + public function IXR_ClientMulticall( $server, $path = false, $port = 80 ) { + self::__construct( $server, $path, $port ); + } + function addCall() { $args = func_get_args(); diff --git a/wp-includes/class-feed.php b/wp-includes/class-feed.php index c33b302..f0ae196 100644 --- a/wp-includes/class-feed.php +++ b/wp-includes/class-feed.php @@ -1,6 +1,6 @@ name = 'feed_' . $filename; $this->mod_name = 'feed_mod_' . $filename; @@ -36,28 +48,47 @@ class WP_Feed_Cache_Transient { $this->lifetime = apply_filters( 'wp_feed_cache_transient_lifetime', $lifetime, $filename); } - function save($data) { - if ( is_a($data, 'SimplePie') ) + /** + * @access public + * + * @param SimplePie $data Data to save. + * @return true Always true. + */ + public function save($data) { + if ( $data instanceof SimplePie ) { $data = $data->data; + } set_transient($this->name, $data, $this->lifetime); set_transient($this->mod_name, time(), $this->lifetime); return true; } - function load() { + /** + * @access public + */ + public function load() { return get_transient($this->name); } - function mtime() { + /** + * @access public + */ + public function mtime() { return get_transient($this->mod_name); } - function touch() { + /** + * @access public + */ + public function touch() { return set_transient($this->mod_name, time(), $this->lifetime); } - function unlink() { + /** + * @access public + */ + public function unlink() { delete_transient($this->name); delete_transient($this->mod_name); return true; @@ -66,7 +97,7 @@ class WP_Feed_Cache_Transient { class WP_SimplePie_File extends SimplePie_File { - function __construct($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false) { + public function __construct($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false) { $this->url = $url; $this->timeout = $timeout; $this->redirects = $redirects; diff --git a/wp-includes/class-http.php b/wp-includes/class-http.php index 13cf144..838fbe8 100644 --- a/wp-includes/class-http.php +++ b/wp-includes/class-http.php @@ -1,11 +1,6 @@ block_request( $url ) ) return new WP_Error( 'http_request_failed', __( 'User has blocked requests through HTTP.' ) ); - // Determine if this is a https call and pass that on to the transport functions - // so that we can blacklist the transports that do not support ssl verification + /* + * Determine if this is a https call and pass that on to the transport functions + * so that we can blacklist the transports that do not support ssl verification + */ $r['ssl'] = $arrURL['scheme'] == 'https' || $arrURL['scheme'] == 'ssl'; - // Determine if this request is to OUR install of WordPress + // Determine if this request is to OUR install of WordPress. $homeURL = parse_url( get_bloginfo( 'url' ) ); - $r['local'] = $homeURL['host'] == $arrURL['host'] || 'localhost' == $arrURL['host']; + $r['local'] = 'localhost' == $arrURL['host'] || ( isset( $homeURL['host'] ) && $homeURL['host'] == $arrURL['host'] ); unset( $homeURL ); - // If we are streaming to a file but no filename was given drop it in the WP temp dir - // and pick its name using the basename of the $url - if ( $r['stream'] && empty( $r['filename'] ) ) - $r['filename'] = get_temp_dir() . basename( $url ); + /* + * If we are streaming to a file but no filename was given drop it in the WP temp dir + * and pick its name using the basename of the $url. + */ + if ( $r['stream'] && empty( $r['filename'] ) ) { + $r['filename'] = get_temp_dir() . wp_unique_filename( get_temp_dir(), basename( $url ) ); + } - // Force some settings if we are streaming to a file and check for existence and perms of destination directory + /* + * Force some settings if we are streaming to a file and check for existence and perms + * of destination directory. + */ if ( $r['stream'] ) { $r['blocking'] = true; if ( ! wp_is_writable( dirname( $r['filename'] ) ) ) @@ -202,7 +295,7 @@ class WP_Http { $r['headers'] = array(); if ( ! is_array( $r['headers'] ) ) { - $processedHeaders = WP_Http::processHeaders( $r['headers'], $url ); + $processedHeaders = self::processHeaders( $r['headers'], $url ); $r['headers'] = $processedHeaders['headers']; } @@ -220,10 +313,10 @@ class WP_Http { $r['headers']['connection'] = 'close'; } - // Construct Cookie: header if any cookies are set - WP_Http::buildCookieHeader( $r ); + // Construct Cookie: header if any cookies are set. + self::buildCookieHeader( $r ); - // Avoid issues where mbstring.func_overload is enabled + // Avoid issues where mbstring.func_overload is enabled. mbstring_binary_safe_encoding(); if ( ! isset( $r['headers']['Accept-Encoding'] ) ) { @@ -270,31 +363,36 @@ class WP_Http { * Tests which transports are capable of supporting the request. * * @since 3.2.0 - * @access private + * @access public * * @param array $args Request arguments * @param string $url URL to Request * - * @return string|bool Class name for the first transport that claims to support the request. False if no transport claims to support the request. + * @return string|false Class name for the first transport that claims to support the request. False if no transport claims to support the request. */ public function _get_first_available_transport( $args, $url = null ) { + $transports = array( 'curl', 'streams' ); + /** * Filter which HTTP transports are available and in what order. * * @since 3.7.0 * - * @param array $value Array of HTTP transports to check. Default array contains - * 'curl', and 'streams', in that order. - * @param array $args HTTP request arguments. - * @param string $url The URL to request. + * @param array $transports Array of HTTP transports to check. Default array contains + * 'curl', and 'streams', in that order. + * @param array $args HTTP request arguments. + * @param string $url The URL to request. */ - $request_order = apply_filters( 'http_api_transports', array( 'curl', 'streams' ), $args, $url ); + $request_order = apply_filters( 'http_api_transports', $transports, $args, $url ); - // Loop over each transport on each HTTP request looking for one which will serve this request's needs + // Loop over each transport on each HTTP request looking for one which will serve this request's needs. foreach ( $request_order as $transport ) { - $class = 'WP_HTTP_' . $transport; + if ( in_array( $transport, $transports ) ) { + $transport = ucfirst( $transport ); + } + $class = 'WP_Http_' . $transport; - // Check to see if this transport is a possibility, calls the transport statically + // Check to see if this transport is a possibility, calls the transport statically. if ( !call_user_func( array( $class, 'test' ), $args, $url ) ) continue; @@ -313,11 +411,13 @@ class WP_Http { * The order for requests is cURL, and then PHP Streams. * * @since 3.2.0 + * + * @static * @access private * * @param string $url URL to Request * @param array $args Request arguments - * @return array|object Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error + * @return array|WP_Error Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error */ private function _dispatch_request( $url, $args ) { static $transports = array(); @@ -337,11 +437,11 @@ class WP_Http { * * @since 2.8.0 * - * @param mixed $response HTTP Response or WP_Error object. - * @param string $context Context under which the hook is fired. - * @param string $class HTTP transport used. - * @param array $args HTTP request arguments. - * @param string $url The request URL. + * @param array|WP_Error $response HTTP response or WP_Error object. + * @param string $context Context under which the hook is fired. + * @param string $class HTTP transport used. + * @param array $args HTTP request arguments. + * @param string $url The request URL. */ do_action( 'http_api_debug', $response, 'response', $class, $args, $url ); @@ -353,9 +453,9 @@ class WP_Http { * * @since 2.9.0 * - * @param array|obj $response HTTP Response. - * @param array $args HTTP request arguments. - * @param string $url The request URL. + * @param array $response HTTP response. + * @param array $args HTTP request arguments. + * @param string $url The request URL. */ return apply_filters( 'http_response', $response, $args, $url ); } @@ -368,11 +468,11 @@ class WP_Http { * @access public * @since 2.7.0 * - * @param string $url URI resource. + * @param string $url The request URL. * @param string|array $args Optional. Override the defaults. - * @return array|object Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error + * @return array|WP_Error Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error */ - function post($url, $args = array()) { + public function post($url, $args = array()) { $defaults = array('method' => 'POST'); $r = wp_parse_args( $args, $defaults ); return $this->request($url, $r); @@ -386,11 +486,11 @@ class WP_Http { * @access public * @since 2.7.0 * - * @param string $url URI resource. - * @param str|array $args Optional. Override the defaults. - * @return array|object Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error + * @param string $url The request URL. + * @param string|array $args Optional. Override the defaults. + * @return array|WP_Error Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error */ - function get($url, $args = array()) { + public function get($url, $args = array()) { $defaults = array('method' => 'GET'); $r = wp_parse_args( $args, $defaults ); return $this->request($url, $r); @@ -404,11 +504,11 @@ class WP_Http { * @access public * @since 2.7.0 * - * @param string $url URI resource. - * @param str|array $args Optional. Override the defaults. - * @return array|object Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error + * @param string $url The request URL. + * @param string|array $args Optional. Override the defaults. + * @return array|WP_Error Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error */ - function head($url, $args = array()) { + public function head($url, $args = array()) { $defaults = array('method' => 'HEAD'); $r = wp_parse_args( $args, $defaults ); return $this->request($url, $r); @@ -446,20 +546,25 @@ class WP_Http { * Then a numbered array is returned as the value of that header-key. */ public static function processHeaders( $headers, $url = '' ) { - // split headers, one per array element + // Split headers, one per array element. if ( is_string($headers) ) { - // tolerate line terminator: CRLF = LF (RFC 2616 19.3) + // Tolerate line terminator: CRLF = LF (RFC 2616 19.3). $headers = str_replace("\r\n", "\n", $headers); - // unfold folded header fields. LWS = [CRLF] 1*( SP | HT ) , (RFC 2616 2.2) + /* + * Unfold folded header fields. LWS = [CRLF] 1*( SP | HT ) , + * (RFC 2616 2.2). + */ $headers = preg_replace('/\n[ \t]/', ' ', $headers); - // create the headers array + // Create the headers array. $headers = explode("\n", $headers); } $response = array('code' => 0, 'message' => ''); - // If a redirection has taken place, The headers for each page request may have been passed. - // In this case, determine the final HTTP header and parse from there. + /* + * If a redirection has taken place, The headers for each page request may have been passed. + * In this case, determine the final HTTP header and parse from there. + */ for ( $i = count($headers)-1; $i >= 0; $i-- ) { if ( !empty($headers[$i]) && false === strpos($headers[$i], ':') ) { $headers = array_splice($headers, $i); @@ -496,6 +601,9 @@ class WP_Http { $cookies[] = new WP_Http_Cookie( $value, $url ); } + // Cast the Response Code to an int + $response['code'] = intval( $response['code'] ); + return array('response' => $response, 'headers' => $newheaders, 'cookies' => $cookies); } @@ -514,10 +622,10 @@ class WP_Http { */ public static function buildCookieHeader( &$r ) { if ( ! empty($r['cookies']) ) { - // Upgrade any name => value cookie pairs to WP_HTTP_Cookie instances + // Upgrade any name => value cookie pairs to WP_HTTP_Cookie instances. foreach ( $r['cookies'] as $name => $value ) { if ( ! is_object( $value ) ) - $r['cookies'][ $name ] = new WP_HTTP_Cookie( array( 'name' => $name, 'value' => $value ) ); + $r['cookies'][ $name ] = new WP_Http_Cookie( array( 'name' => $name, 'value' => $value ) ); } $cookies_header = ''; @@ -550,7 +658,9 @@ class WP_Http { return $body; $parsed_body = ''; - $body_original = $body; // We'll be altering $body, so need a backup in case of error + + // We'll be altering $body, so need a backup in case of error. + $body_original = $body; while ( true ) { $has_chunk = (bool) preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', $body, $match ); @@ -560,13 +670,13 @@ class WP_Http { $length = hexdec( $match[1] ); $chunk_length = strlen( $match[0] ); - // Parse out the chunk of data + // Parse out the chunk of data. $parsed_body .= substr( $body, $chunk_length, $length ); - // Remove the chunk from the raw data + // Remove the chunk from the raw data. $body = substr( $body, $length + $chunk_length ); - // End of document + // End of the document. if ( '0' === trim( $body ) ) return $parsed_body; } @@ -579,19 +689,22 @@ class WP_Http { * prevent plugins from working and core functionality, if you don't include api.wordpress.org. * * You block external URL requests by defining WP_HTTP_BLOCK_EXTERNAL as true in your wp-config.php - * file and this will only allow localhost and your blog to make requests. The constant + * file and this will only allow localhost and your site to make requests. The constant * WP_ACCESSIBLE_HOSTS will allow additional hosts to go through for requests. The format of the * WP_ACCESSIBLE_HOSTS constant is a comma separated list of hostnames to allow, wildcard domains * are supported, eg *.wordpress.org will allow for all subdomains of wordpress.org to be contacted. * * @since 2.8.0 - * @link http://core.trac.wordpress.org/ticket/8927 Allow preventing external requests. - * @link http://core.trac.wordpress.org/ticket/14636 Allow wildcard domains in WP_ACCESSIBLE_HOSTS + * @link https://core.trac.wordpress.org/ticket/8927 Allow preventing external requests. + * @link https://core.trac.wordpress.org/ticket/14636 Allow wildcard domains in WP_ACCESSIBLE_HOSTS + * + * @staticvar array|null $accessible_hosts + * @staticvar array $wildcard_regex * * @param string $uri URI of url. * @return bool True to block, false to allow. */ - function block_request($uri) { + public function block_request($uri) { // We don't need to block requests, because nothing is blocked. if ( ! defined( 'WP_HTTP_BLOCK_EXTERNAL' ) || ! WP_HTTP_BLOCK_EXTERNAL ) return false; @@ -602,8 +715,8 @@ class WP_Http { $home = parse_url( get_option('siteurl') ); - // Don't block requests back to ourselves by default - if ( $check['host'] == 'localhost' || $check['host'] == $home['host'] ) { + // Don't block requests back to ourselves by default. + if ( 'localhost' == $check['host'] || ( isset( $home['host'] ) && $home['host'] == $check['host'] ) ) { /** * Filter whether to block local requests through the proxy. * @@ -618,9 +731,9 @@ class WP_Http { if ( !defined('WP_ACCESSIBLE_HOSTS') ) return true; - static $accessible_hosts; - static $wildcard_regex = false; - if ( null == $accessible_hosts ) { + static $accessible_hosts = null; + static $wildcard_regex = array(); + if ( null === $accessible_hosts ) { $accessible_hosts = preg_split('|,\s*|', WP_ACCESSIBLE_HOSTS); if ( false !== strpos(WP_ACCESSIBLE_HOSTS, '*') ) { @@ -638,49 +751,91 @@ class WP_Http { } - static function make_absolute_url( $maybe_relative_path, $url ) { + /** + * Used as a wrapper for PHP's parse_url() function that handles edgecases in < PHP 5.4.7. + * + * @access protected + * @deprecated 4.4.0 Use wp_parse_url() + * @see wp_parse_url() + * + * @param string $url The URL to parse. + * @return bool|array False on failure; Array of URL components on success; + * See parse_url()'s return values. + */ + protected static function parse_url( $url ) { + _deprecated_function( __METHOD__, '4.4.0', 'wp_parse_url()' ); + return wp_parse_url( $url ); + } + + /** + * Converts a relative URL to an absolute URL relative to a given URL. + * + * If an Absolute URL is provided, no processing of that URL is done. + * + * @since 3.4.0 + * + * @static + * @access public + * + * @param string $maybe_relative_path The URL which might be relative + * @param string $url The URL which $maybe_relative_path is relative to + * @return string An Absolute URL, in a failure condition where the URL cannot be parsed, the relative URL will be returned. + */ + public static function make_absolute_url( $maybe_relative_path, $url ) { if ( empty( $url ) ) return $maybe_relative_path; - // Check for a scheme - if ( false !== strpos( $maybe_relative_path, '://' ) ) + if ( ! $url_parts = wp_parse_url( $url ) ) { return $maybe_relative_path; + } - if ( ! $url_parts = @parse_url( $url ) ) + if ( ! $relative_url_parts = wp_parse_url( $maybe_relative_path ) ) { return $maybe_relative_path; + } - if ( ! $relative_url_parts = @parse_url( $maybe_relative_path ) ) + // Check for a scheme on the 'relative' url + if ( ! empty( $relative_url_parts['scheme'] ) ) { return $maybe_relative_path; + } + + $absolute_path = $url_parts['scheme'] . '://'; - $absolute_path = $url_parts['scheme'] . '://' . $url_parts['host']; - if ( isset( $url_parts['port'] ) ) - $absolute_path .= ':' . $url_parts['port']; + // Schemeless URL's will make it this far, so we check for a host in the relative url and convert it to a protocol-url + if ( isset( $relative_url_parts['host'] ) ) { + $absolute_path .= $relative_url_parts['host']; + if ( isset( $relative_url_parts['port'] ) ) + $absolute_path .= ':' . $relative_url_parts['port']; + } else { + $absolute_path .= $url_parts['host']; + if ( isset( $url_parts['port'] ) ) + $absolute_path .= ':' . $url_parts['port']; + } - // Start off with the Absolute URL path + // Start off with the Absolute URL path. $path = ! empty( $url_parts['path'] ) ? $url_parts['path'] : '/'; - // If it's a root-relative path, then great + // If it's a root-relative path, then great. if ( ! empty( $relative_url_parts['path'] ) && '/' == $relative_url_parts['path'][0] ) { $path = $relative_url_parts['path']; - // Else it's a relative path + // Else it's a relative path. } elseif ( ! empty( $relative_url_parts['path'] ) ) { - // Strip off any file components from the absolute path + // Strip off any file components from the absolute path. $path = substr( $path, 0, strrpos( $path, '/' ) + 1 ); - // Build the new path + // Build the new path. $path .= $relative_url_parts['path']; - // Strip all /path/../ out of the path + // Strip all /path/../ out of the path. while ( strpos( $path, '../' ) > 1 ) { $path = preg_replace( '![^/]+/\.\./!', '', $path ); } - // Strip any final leading ../ from the path + // Strip any final leading ../ from the path. $path = preg_replace( '!^/(\.\./)+!', '', $path ); } - // Add the Query string + // Add the Query string. if ( ! empty( $relative_url_parts['query'] ) ) $path .= '?' . $relative_url_parts['query']; @@ -692,39 +847,41 @@ class WP_Http { * * @since 3.7.0 * + * @static + * * @param string $url The URL which was requested. - * @param array $args The Arguements which were used to make the request. + * @param array $args The Arguments which were used to make the request. * @param array $response The Response of the HTTP request. * @return false|object False if no redirect is present, a WP_HTTP or WP_Error result otherwise. */ - static function handle_redirects( $url, $args, $response ) { + public static function handle_redirects( $url, $args, $response ) { // If no redirects are present, or, redirects were not requested, perform no action. if ( ! isset( $response['headers']['location'] ) || 0 === $args['_redirection'] ) return false; - // Only perform redirections on redirection http codes + // Only perform redirections on redirection http codes. if ( $response['response']['code'] > 399 || $response['response']['code'] < 300 ) return false; - // Don't redirect if we've run out of redirects + // Don't redirect if we've run out of redirects. if ( $args['redirection']-- <= 0 ) return new WP_Error( 'http_request_failed', __('Too many redirects.') ); $redirect_location = $response['headers']['location']; - // If there were multiple Location headers, use the last header specified + // If there were multiple Location headers, use the last header specified. if ( is_array( $redirect_location ) ) $redirect_location = array_pop( $redirect_location ); - $redirect_location = WP_HTTP::make_absolute_url( $redirect_location, $url ); + $redirect_location = WP_Http::make_absolute_url( $redirect_location, $url ); - // POST requests should not POST to a redirected location + // POST requests should not POST to a redirected location. if ( 'POST' == $args['method'] ) { if ( in_array( $response['response']['code'], array( 302, 303 ) ) ) $args['method'] = 'GET'; } - // Include valid cookies in the redirect process + // Include valid cookies in the redirect process. if ( ! empty( $response['cookies'] ) ) { foreach ( $response['cookies'] as $cookie ) { if ( $cookie->test( $redirect_location ) ) @@ -743,7 +900,7 @@ class WP_Http { * This does not verify if the IP is a valid IP, only that it appears to be * an IP address. * - * @see http://home.deds.nl/~aeron/regex/ for IPv6 regex + * @link http://home.deds.nl/~aeron/regex/ for IPv6 regex * * @since 3.7.0 * @static @@ -751,7 +908,7 @@ class WP_Http { * @param string $maybe_ip A suspected IP address * @return integer|bool Upon success, '4' or '6' to represent a IPv4 or IPv6 address, false upon failure */ - static function is_ip_address( $maybe_ip ) { + public static function is_ip_address( $maybe_ip ) { if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $maybe_ip ) ) return 4; @@ -762,1360 +919,3 @@ class WP_Http { } } - -/** - * HTTP request method uses PHP Streams to retrieve the url. - * - * @since 2.7.0 - * @since 3.7.0 Combined with the fsockopen transport and switched to stream_socket_client(). - */ -class WP_Http_Streams { - /** - * Send a HTTP request to a URI using PHP Streams. - * - * @see WP_Http::request For default options descriptions. - * - * @since 2.7.0 - * @since 3.7.0 Combined with the fsockopen transport and switched to stream_socket_client(). - * - * @access public - * @param string $url URI resource. - * @param string|array $args Optional. Override the defaults. - * @return array 'headers', 'body', 'response', 'cookies' and 'filename' keys. - */ - function request($url, $args = array()) { - $defaults = array( - 'method' => 'GET', 'timeout' => 5, - 'redirection' => 5, 'httpversion' => '1.0', - 'blocking' => true, - 'headers' => array(), 'body' => null, 'cookies' => array() - ); - - $r = wp_parse_args( $args, $defaults ); - - if ( isset($r['headers']['User-Agent']) ) { - $r['user-agent'] = $r['headers']['User-Agent']; - unset($r['headers']['User-Agent']); - } else if ( isset($r['headers']['user-agent']) ) { - $r['user-agent'] = $r['headers']['user-agent']; - unset($r['headers']['user-agent']); - } - - // Construct Cookie: header if any cookies are set - WP_Http::buildCookieHeader( $r ); - - $arrURL = parse_url($url); - - $connect_host = $arrURL['host']; - - $secure_transport = ( $arrURL['scheme'] == 'ssl' || $arrURL['scheme'] == 'https' ); - if ( ! isset( $arrURL['port'] ) ) { - if ( $arrURL['scheme'] == 'ssl' || $arrURL['scheme'] == 'https' ) { - $arrURL['port'] = 443; - $secure_transport = true; - } else { - $arrURL['port'] = 80; - } - } - - if ( isset( $r['headers']['Host'] ) || isset( $r['headers']['host'] ) ) { - if ( isset( $r['headers']['Host'] ) ) - $arrURL['host'] = $r['headers']['Host']; - else - $arrURL['host'] = $r['headers']['host']; - unset( $r['headers']['Host'], $r['headers']['host'] ); - } - - // Certain versions of PHP have issues with 'localhost' and IPv6, It attempts to connect to ::1, - // which fails when the server is not set up for it. For compatibility, always connect to the IPv4 address. - if ( 'localhost' == strtolower( $connect_host ) ) - $connect_host = '127.0.0.1'; - - $connect_host = $secure_transport ? 'ssl://' . $connect_host : 'tcp://' . $connect_host; - - $is_local = isset( $r['local'] ) && $r['local']; - $ssl_verify = isset( $r['sslverify'] ) && $r['sslverify']; - if ( $is_local ) { - /** - * Filter whether SSL should be verified for local requests. - * - * @since 2.8.0 - * - * @param bool $ssl_verify Whether to verify the SSL connection. Default true. - */ - $ssl_verify = apply_filters( 'https_local_ssl_verify', $ssl_verify ); - } elseif ( ! $is_local ) { - /** - * Filter whether SSL should be verified for non-local requests. - * - * @since 2.8.0 - * - * @param bool $ssl_verify Whether to verify the SSL connection. Default true. - */ - $ssl_verify = apply_filters( 'https_ssl_verify', $ssl_verify ); - } - - $proxy = new WP_HTTP_Proxy(); - - $context = stream_context_create( array( - 'ssl' => array( - 'verify_peer' => $ssl_verify, - //'CN_match' => $arrURL['host'], // This is handled by self::verify_ssl_certificate() - 'capture_peer_cert' => $ssl_verify, - 'SNI_enabled' => true, - 'cafile' => $r['sslcertificates'], - 'allow_self_signed' => ! $ssl_verify, - ) - ) ); - - $timeout = (int) floor( $r['timeout'] ); - $utimeout = $timeout == $r['timeout'] ? 0 : 1000000 * $r['timeout'] % 1000000; - $connect_timeout = max( $timeout, 1 ); - - $connection_error = null; // Store error number - $connection_error_str = null; // Store error string - - if ( !WP_DEBUG ) { - // In the event that the SSL connection fails, silence the many PHP Warnings - if ( $secure_transport ) - $error_reporting = error_reporting(0); - - if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) - $handle = @stream_socket_client( 'tcp://' . $proxy->host() . ':' . $proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context ); - else - $handle = @stream_socket_client( $connect_host . ':' . $arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context ); - - if ( $secure_transport ) - error_reporting( $error_reporting ); - - } else { - if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) - $handle = stream_socket_client( 'tcp://' . $proxy->host() . ':' . $proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context ); - else - $handle = stream_socket_client( $connect_host . ':' . $arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context ); - } - - if ( false === $handle ) { - // SSL connection failed due to expired/invalid cert, or, OpenSSL configuration is broken - if ( $secure_transport && 0 === $connection_error && '' === $connection_error_str ) - return new WP_Error( 'http_request_failed', __( 'The SSL certificate for the host could not be verified.' ) ); - - return new WP_Error('http_request_failed', $connection_error . ': ' . $connection_error_str ); - } - - // Verify that the SSL certificate is valid for this request - if ( $secure_transport && $ssl_verify && ! $proxy->is_enabled() ) { - if ( ! self::verify_ssl_certificate( $handle, $arrURL['host'] ) ) - return new WP_Error( 'http_request_failed', __( 'The SSL certificate for the host could not be verified.' ) ); - } - - stream_set_timeout( $handle, $timeout, $utimeout ); - - if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) //Some proxies require full URL in this field. - $requestPath = $url; - else - $requestPath = $arrURL['path'] . ( isset($arrURL['query']) ? '?' . $arrURL['query'] : '' ); - - if ( empty($requestPath) ) - $requestPath .= '/'; - - $strHeaders = strtoupper($r['method']) . ' ' . $requestPath . ' HTTP/' . $r['httpversion'] . "\r\n"; - - if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) - $strHeaders .= 'Host: ' . $arrURL['host'] . ':' . $arrURL['port'] . "\r\n"; - else - $strHeaders .= 'Host: ' . $arrURL['host'] . "\r\n"; - - if ( isset($r['user-agent']) ) - $strHeaders .= 'User-agent: ' . $r['user-agent'] . "\r\n"; - - if ( is_array($r['headers']) ) { - foreach ( (array) $r['headers'] as $header => $headerValue ) - $strHeaders .= $header . ': ' . $headerValue . "\r\n"; - } else { - $strHeaders .= $r['headers']; - } - - if ( $proxy->use_authentication() ) - $strHeaders .= $proxy->authentication_header() . "\r\n"; - - $strHeaders .= "\r\n"; - - if ( ! is_null($r['body']) ) - $strHeaders .= $r['body']; - - fwrite($handle, $strHeaders); - - if ( ! $r['blocking'] ) { - stream_set_blocking( $handle, 0 ); - fclose( $handle ); - return array( 'headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array() ); - } - - $strResponse = ''; - $bodyStarted = false; - $keep_reading = true; - $block_size = 4096; - if ( isset( $r['limit_response_size'] ) ) - $block_size = min( $block_size, $r['limit_response_size'] ); - - // If streaming to a file setup the file handle - if ( $r['stream'] ) { - if ( ! WP_DEBUG ) - $stream_handle = @fopen( $r['filename'], 'w+' ); - else - $stream_handle = fopen( $r['filename'], 'w+' ); - if ( ! $stream_handle ) - return new WP_Error( 'http_request_failed', sprintf( __( 'Could not open handle for fopen() to %s' ), $r['filename'] ) ); - - $bytes_written = 0; - while ( ! feof($handle) && $keep_reading ) { - $block = fread( $handle, $block_size ); - if ( ! $bodyStarted ) { - $strResponse .= $block; - if ( strpos( $strResponse, "\r\n\r\n" ) ) { - $process = WP_Http::processResponse( $strResponse ); - $bodyStarted = true; - $block = $process['body']; - unset( $strResponse ); - $process['body'] = ''; - } - } - - $this_block_size = strlen( $block ); - - if ( isset( $r['limit_response_size'] ) && ( $bytes_written + $this_block_size ) > $r['limit_response_size'] ) - $block = substr( $block, 0, ( $r['limit_response_size'] - $bytes_written ) ); - - $bytes_written_to_file = fwrite( $stream_handle, $block ); - - if ( $bytes_written_to_file != $this_block_size ) { - fclose( $handle ); - fclose( $stream_handle ); - return new WP_Error( 'http_request_failed', __( 'Failed to write request to temporary file.' ) ); - } - - $bytes_written += $bytes_written_to_file; - - $keep_reading = !isset( $r['limit_response_size'] ) || $bytes_written < $r['limit_response_size']; - } - - fclose( $stream_handle ); - - } else { - $header_length = 0; - while ( ! feof( $handle ) && $keep_reading ) { - $block = fread( $handle, $block_size ); - $strResponse .= $block; - if ( ! $bodyStarted && strpos( $strResponse, "\r\n\r\n" ) ) { - $header_length = strpos( $strResponse, "\r\n\r\n" ) + 4; - $bodyStarted = true; - } - $keep_reading = ( ! $bodyStarted || !isset( $r['limit_response_size'] ) || strlen( $strResponse ) < ( $header_length + $r['limit_response_size'] ) ); - } - - $process = WP_Http::processResponse( $strResponse ); - unset( $strResponse ); - - } - - fclose( $handle ); - - $arrHeaders = WP_Http::processHeaders( $process['headers'], $url ); - - $response = array( - 'headers' => $arrHeaders['headers'], - 'body' => null, // Not yet processed - 'response' => $arrHeaders['response'], - 'cookies' => $arrHeaders['cookies'], - 'filename' => $r['filename'] - ); - - // Handle redirects - if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) ) - return $redirect_response; - - // If the body was chunk encoded, then decode it. - if ( ! empty( $process['body'] ) && isset( $arrHeaders['headers']['transfer-encoding'] ) && 'chunked' == $arrHeaders['headers']['transfer-encoding'] ) - $process['body'] = WP_Http::chunkTransferDecode($process['body']); - - if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($arrHeaders['headers']) ) - $process['body'] = WP_Http_Encoding::decompress( $process['body'] ); - - if ( isset( $r['limit_response_size'] ) && strlen( $process['body'] ) > $r['limit_response_size'] ) - $process['body'] = substr( $process['body'], 0, $r['limit_response_size'] ); - - $response['body'] = $process['body']; - - return $response; - } - - /** - * Verifies the received SSL certificate against it's Common Names and subjectAltName fields - * - * PHP's SSL verifications only verify that it's a valid Certificate, it doesn't verify if - * the certificate is valid for the hostname which was requested. - * This function verifies the requested hostname against certificate's subjectAltName field, - * if that is empty, or contains no DNS entries, a fallback to the Common Name field is used. - * - * IP Address support is included if the request is being made to an IP address. - * - * @since 3.7.0 - * @static - * - * @param stream $stream The PHP Stream which the SSL request is being made over - * @param string $host The hostname being requested - * @return bool If the cerficiate presented in $stream is valid for $host - */ - static function verify_ssl_certificate( $stream, $host ) { - $context_options = stream_context_get_options( $stream ); - - if ( empty( $context_options['ssl']['peer_certificate'] ) ) - return false; - - $cert = openssl_x509_parse( $context_options['ssl']['peer_certificate'] ); - if ( ! $cert ) - return false; - - // If the request is being made to an IP address, we'll validate against IP fields in the cert (if they exist) - $host_type = ( WP_HTTP::is_ip_address( $host ) ? 'ip' : 'dns' ); - - $certificate_hostnames = array(); - if ( ! empty( $cert['extensions']['subjectAltName'] ) ) { - $match_against = preg_split( '/,\s*/', $cert['extensions']['subjectAltName'] ); - foreach ( $match_against as $match ) { - list( $match_type, $match_host ) = explode( ':', $match ); - if ( $host_type == strtolower( trim( $match_type ) ) ) // IP: or DNS: - $certificate_hostnames[] = strtolower( trim( $match_host ) ); - } - } elseif ( !empty( $cert['subject']['CN'] ) ) { - // Only use the CN when the certificate includes no subjectAltName extension - $certificate_hostnames[] = strtolower( $cert['subject']['CN'] ); - } - - // Exact hostname/IP matches - if ( in_array( strtolower( $host ), $certificate_hostnames ) ) - return true; - - // IP's can't be wildcards, Stop processing - if ( 'ip' == $host_type ) - return false; - - // Test to see if the domain is at least 2 deep for wildcard support - if ( substr_count( $host, '.' ) < 2 ) - return false; - - // Wildcard subdomains certs (*.example.com) are valid for a.example.com but not a.b.example.com - $wildcard_host = preg_replace( '/^[^.]+\./', '*.', $host ); - - return in_array( strtolower( $wildcard_host ), $certificate_hostnames ); - } - - /** - * Whether this class can be used for retrieving a URL. - * - * @static - * @access public - * @since 2.7.0 - * @since 3.7.0 Combined with the fsockopen transport and switched to stream_socket_client(). - * - * @return boolean False means this class can not be used, true means it can. - */ - public static function test( $args = array() ) { - if ( ! function_exists( 'stream_socket_client' ) ) - return false; - - $is_ssl = isset( $args['ssl'] ) && $args['ssl']; - - if ( $is_ssl ) { - if ( ! extension_loaded( 'openssl' ) ) - return false; - if ( ! function_exists( 'openssl_x509_parse' ) ) - return false; - } - - /** - * Filter whether streams can be used as a transport for retrieving a URL. - * - * @since 2.7.0 - * - * @param bool $use_class Whether the class can be used. Default true. - * @param array $args Request arguments. - */ - return apply_filters( 'use_streams_transport', true, $args ); - } -} - -/** - * Deprecated HTTP Transport method which used fsockopen. - * - * This class is not used, and is included for backwards compatibility only. - * All code should make use of WP_HTTP directly through it's API. - * - * @see WP_HTTP::request - * - * @since 2.7.0 - * @deprecated 3.7.0 Please use WP_HTTP::request() directly - */ -class WP_HTTP_Fsockopen extends WP_HTTP_Streams { - // For backwards compatibility for users who are using the class directly -} - -/** - * HTTP request method uses Curl extension to retrieve the url. - * - * Requires the Curl extension to be installed. - * - * @package WordPress - * @subpackage HTTP - * @since 2.7.0 - */ -class WP_Http_Curl { - - /** - * Temporary header storage for during requests. - * - * @since 3.2.0 - * @access private - * @var string - */ - private $headers = ''; - - /** - * Temporary body storage for during requests. - * - * @since 3.6.0 - * @access private - * @var string - */ - private $body = ''; - - /** - * The maximum amount of data to receive from the remote server. - * - * @since 3.6.0 - * @access private - * @var int - */ - private $max_body_length = false; - - /** - * The file resource used for streaming to file. - * - * @since 3.6.0 - * @access private - * @var resource - */ - private $stream_handle = false; - - /** - * Send a HTTP request to a URI using cURL extension. - * - * @access public - * @since 2.7.0 - * - * @param string $url - * @param str|array $args Optional. Override the defaults. - * @return array 'headers', 'body', 'response', 'cookies' and 'filename' keys. - */ - function request($url, $args = array()) { - $defaults = array( - 'method' => 'GET', 'timeout' => 5, - 'redirection' => 5, 'httpversion' => '1.0', - 'blocking' => true, - 'headers' => array(), 'body' => null, 'cookies' => array() - ); - - $r = wp_parse_args( $args, $defaults ); - - if ( isset($r['headers']['User-Agent']) ) { - $r['user-agent'] = $r['headers']['User-Agent']; - unset($r['headers']['User-Agent']); - } else if ( isset($r['headers']['user-agent']) ) { - $r['user-agent'] = $r['headers']['user-agent']; - unset($r['headers']['user-agent']); - } - - // Construct Cookie: header if any cookies are set. - WP_Http::buildCookieHeader( $r ); - - $handle = curl_init(); - - // cURL offers really easy proxy support. - $proxy = new WP_HTTP_Proxy(); - - if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) { - - curl_setopt( $handle, CURLOPT_PROXYTYPE, CURLPROXY_HTTP ); - curl_setopt( $handle, CURLOPT_PROXY, $proxy->host() ); - curl_setopt( $handle, CURLOPT_PROXYPORT, $proxy->port() ); - - if ( $proxy->use_authentication() ) { - curl_setopt( $handle, CURLOPT_PROXYAUTH, CURLAUTH_ANY ); - curl_setopt( $handle, CURLOPT_PROXYUSERPWD, $proxy->authentication() ); - } - } - - $is_local = isset($r['local']) && $r['local']; - $ssl_verify = isset($r['sslverify']) && $r['sslverify']; - if ( $is_local ) { - /** This filter is documented in wp-includes/class-http.php */ - $ssl_verify = apply_filters( 'https_local_ssl_verify', $ssl_verify ); - } elseif ( ! $is_local ) { - /** This filter is documented in wp-includes/class-http.php */ - $ssl_verify = apply_filters( 'https_ssl_verify', $ssl_verify ); - } - - // CURLOPT_TIMEOUT and CURLOPT_CONNECTTIMEOUT expect integers. Have to use ceil since - // a value of 0 will allow an unlimited timeout. - $timeout = (int) ceil( $r['timeout'] ); - curl_setopt( $handle, CURLOPT_CONNECTTIMEOUT, $timeout ); - curl_setopt( $handle, CURLOPT_TIMEOUT, $timeout ); - - curl_setopt( $handle, CURLOPT_URL, $url); - curl_setopt( $handle, CURLOPT_RETURNTRANSFER, true ); - curl_setopt( $handle, CURLOPT_SSL_VERIFYHOST, ( $ssl_verify === true ) ? 2 : false ); - curl_setopt( $handle, CURLOPT_SSL_VERIFYPEER, $ssl_verify ); - curl_setopt( $handle, CURLOPT_CAINFO, $r['sslcertificates'] ); - curl_setopt( $handle, CURLOPT_USERAGENT, $r['user-agent'] ); - // The option doesn't work with safe mode or when open_basedir is set, and there's a - // bug #17490 with redirected POST requests, so handle redirections outside Curl. - curl_setopt( $handle, CURLOPT_FOLLOWLOCATION, false ); - if ( defined( 'CURLOPT_PROTOCOLS' ) ) // PHP 5.2.10 / cURL 7.19.4 - curl_setopt( $handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS ); - - switch ( $r['method'] ) { - case 'HEAD': - curl_setopt( $handle, CURLOPT_NOBODY, true ); - break; - case 'POST': - curl_setopt( $handle, CURLOPT_POST, true ); - curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] ); - break; - case 'PUT': - curl_setopt( $handle, CURLOPT_CUSTOMREQUEST, 'PUT' ); - curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] ); - break; - default: - curl_setopt( $handle, CURLOPT_CUSTOMREQUEST, $r['method'] ); - if ( ! is_null( $r['body'] ) ) - curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] ); - break; - } - - if ( true === $r['blocking'] ) { - curl_setopt( $handle, CURLOPT_HEADERFUNCTION, array( $this, 'stream_headers' ) ); - curl_setopt( $handle, CURLOPT_WRITEFUNCTION, array( $this, 'stream_body' ) ); - } - - curl_setopt( $handle, CURLOPT_HEADER, false ); - - if ( isset( $r['limit_response_size'] ) ) - $this->max_body_length = intval( $r['limit_response_size'] ); - else - $this->max_body_length = false; - - // If streaming to a file open a file handle, and setup our curl streaming handler - if ( $r['stream'] ) { - if ( ! WP_DEBUG ) - $this->stream_handle = @fopen( $r['filename'], 'w+' ); - else - $this->stream_handle = fopen( $r['filename'], 'w+' ); - if ( ! $this->stream_handle ) - return new WP_Error( 'http_request_failed', sprintf( __( 'Could not open handle for fopen() to %s' ), $r['filename'] ) ); - } else { - $this->stream_handle = false; - } - - if ( !empty( $r['headers'] ) ) { - // cURL expects full header strings in each element - $headers = array(); - foreach ( $r['headers'] as $name => $value ) { - $headers[] = "{$name}: $value"; - } - curl_setopt( $handle, CURLOPT_HTTPHEADER, $headers ); - } - - if ( $r['httpversion'] == '1.0' ) - curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0 ); - else - curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1 ); - - /** - * Fires before the cURL request is executed. - * - * Cookies are not currently handled by the HTTP API. This action allows - * plugins to handle cookies themselves. - * - * @since 2.8.0 - * - * @param resource &$handle The cURL handle returned by curl_init(). - * @param array $r The HTTP request arguments. - * @param string $url The destination URL. - */ - do_action_ref_array( 'http_api_curl', array( &$handle, $r, $url ) ); - - // We don't need to return the body, so don't. Just execute request and return. - if ( ! $r['blocking'] ) { - curl_exec( $handle ); - - if ( $curl_error = curl_error( $handle ) ) { - curl_close( $handle ); - return new WP_Error( 'http_request_failed', $curl_error ); - } - if ( in_array( curl_getinfo( $handle, CURLINFO_HTTP_CODE ), array( 301, 302 ) ) ) { - curl_close( $handle ); - return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) ); - } - - curl_close( $handle ); - return array( 'headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array() ); - } - - $theResponse = curl_exec( $handle ); - $theHeaders = WP_Http::processHeaders( $this->headers, $url ); - $theBody = $this->body; - - $this->headers = ''; - $this->body = ''; - - $curl_error = curl_errno( $handle ); - - // If an error occured, or, no response - if ( $curl_error || ( 0 == strlen( $theBody ) && empty( $theHeaders['headers'] ) ) ) { - if ( CURLE_WRITE_ERROR /* 23 */ == $curl_error && $r['stream'] ) { - fclose( $this->stream_handle ); - return new WP_Error( 'http_request_failed', __( 'Failed to write request to temporary file.' ) ); - } - if ( $curl_error = curl_error( $handle ) ) { - curl_close( $handle ); - return new WP_Error( 'http_request_failed', $curl_error ); - } - if ( in_array( curl_getinfo( $handle, CURLINFO_HTTP_CODE ), array( 301, 302 ) ) ) { - curl_close( $handle ); - return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) ); - } - } - - $response = array(); - $response['code'] = curl_getinfo( $handle, CURLINFO_HTTP_CODE ); - $response['message'] = get_status_header_desc($response['code']); - - curl_close( $handle ); - - if ( $r['stream'] ) - fclose( $this->stream_handle ); - - $response = array( - 'headers' => $theHeaders['headers'], - 'body' => null, - 'response' => $response, - 'cookies' => $theHeaders['cookies'], - 'filename' => $r['filename'] - ); - - // Handle redirects - if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) ) - return $redirect_response; - - if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($theHeaders['headers']) ) - $theBody = WP_Http_Encoding::decompress( $theBody ); - - $response['body'] = $theBody; - - return $response; - } - - /** - * Grab the headers of the cURL request - * - * Each header is sent individually to this callback, so we append to the $header property for temporary storage - * - * @since 3.2.0 - * @access private - * @return int - */ - private function stream_headers( $handle, $headers ) { - $this->headers .= $headers; - return strlen( $headers ); - } - - /** - * Grab the body of the cURL request - * - * The contents of the document are passed in chunks, so we append to the $body property for temporary storage. - * Returning a length shorter than the length of $data passed in will cause cURL to abort the request as "completed" - * - * @since 3.6.0 - * @access private - * @return int - */ - private function stream_body( $handle, $data ) { - $data_length = strlen( $data ); - - if ( $this->max_body_length && ( strlen( $this->body ) + $data_length ) > $this->max_body_length ) - $data = substr( $data, 0, ( $this->max_body_length - $data_length ) ); - - if ( $this->stream_handle ) { - $bytes_written = fwrite( $this->stream_handle, $data ); - } else { - $this->body .= $data; - $bytes_written = $data_length; - } - - // Upon event of this function returning less than strlen( $data ) curl will error with CURLE_WRITE_ERROR - return $bytes_written; - } - - /** - * Whether this class can be used for retrieving an URL. - * - * @static - * @since 2.7.0 - * - * @return boolean False means this class can not be used, true means it can. - */ - public static function test( $args = array() ) { - if ( ! function_exists( 'curl_init' ) || ! function_exists( 'curl_exec' ) ) - return false; - - $is_ssl = isset( $args['ssl'] ) && $args['ssl']; - - if ( $is_ssl ) { - $curl_version = curl_version(); - if ( ! (CURL_VERSION_SSL & $curl_version['features']) ) // Does this cURL version support SSL requests? - return false; - } - - /** - * Filter whether cURL can be used as a transport for retrieving a URL. - * - * @since 2.7.0 - * - * @param bool $use_class Whether the class can be used. Default true. - * @param array $args An array of request arguments. - */ - return apply_filters( 'use_curl_transport', true, $args ); - } -} - -/** - * Adds Proxy support to the WordPress HTTP API. - * - * There are caveats to proxy support. It requires that defines be made in the wp-config.php file to - * enable proxy support. There are also a few filters that plugins can hook into for some of the - * constants. - * - * Please note that only BASIC authentication is supported by most transports. - * cURL MAY support more methods (such as NTLM authentication) depending on your environment. - * - * The constants are as follows: - *

WP_PROXY_HOST - Enable proxy support and host for connecting.
WP_PROXY_PORT - Proxy port for connection. No default, must be defined.
WP_PROXY_USERNAME - Proxy username, if it requires authentication.
WP_PROXY_PASSWORD - Proxy password, if it requires authentication.
WP_PROXY_BYPASS_HOSTS - Will prevent the hosts in this list from going through the proxy. - * You do not need to have localhost and the blog host in this list, because they will not be passed - * through the proxy. The list should be presented in a comma separated list, wildcards using * are supported, eg. *.wordpress.org

- * - * An example can be as seen below. - *


- * define('WP_PROXY_HOST', '192.168.84.101');
- * define('WP_PROXY_PORT', '8080');
- * define('WP_PROXY_BYPASS_HOSTS', 'localhost, www.example.com, *.wordpress.org');
- *

- * - * @link http://core.trac.wordpress.org/ticket/4011 Proxy support ticket in WordPress. - * @link http://core.trac.wordpress.org/ticket/14636 Allow wildcard domains in WP_PROXY_BYPASS_HOSTS - * @since 2.8.0 - */ -class WP_HTTP_Proxy { - - /** - * Whether proxy connection should be used. - * - * @since 2.8.0 - * - * @use WP_PROXY_HOST - * @use WP_PROXY_PORT - * - * @return bool - */ - function is_enabled() { - return defined('WP_PROXY_HOST') && defined('WP_PROXY_PORT'); - } - - /** - * Whether authentication should be used. - * - * @since 2.8.0 - * - * @use WP_PROXY_USERNAME - * @use WP_PROXY_PASSWORD - * - * @return bool - */ - function use_authentication() { - return defined('WP_PROXY_USERNAME') && defined('WP_PROXY_PASSWORD'); - } - - /** - * Retrieve the host for the proxy server. - * - * @since 2.8.0 - * - * @return string - */ - function host() { - if ( defined('WP_PROXY_HOST') ) - return WP_PROXY_HOST; - - return ''; - } - - /** - * Retrieve the port for the proxy server. - * - * @since 2.8.0 - * - * @return string - */ - function port() { - if ( defined('WP_PROXY_PORT') ) - return WP_PROXY_PORT; - - return ''; - } - - /** - * Retrieve the username for proxy authentication. - * - * @since 2.8.0 - * - * @return string - */ - function username() { - if ( defined('WP_PROXY_USERNAME') ) - return WP_PROXY_USERNAME; - - return ''; - } - - /** - * Retrieve the password for proxy authentication. - * - * @since 2.8.0 - * - * @return string - */ - function password() { - if ( defined('WP_PROXY_PASSWORD') ) - return WP_PROXY_PASSWORD; - - return ''; - } - - /** - * Retrieve authentication string for proxy authentication. - * - * @since 2.8.0 - * - * @return string - */ - function authentication() { - return $this->username() . ':' . $this->password(); - } - - /** - * Retrieve header string for proxy authentication. - * - * @since 2.8.0 - * - * @return string - */ - function authentication_header() { - return 'Proxy-Authorization: Basic ' . base64_encode( $this->authentication() ); - } - - /** - * Whether URL should be sent through the proxy server. - * - * We want to keep localhost and the blog URL from being sent through the proxy server, because - * some proxies can not handle this. We also have the constant available for defining other - * hosts that won't be sent through the proxy. - * - * @uses WP_PROXY_BYPASS_HOSTS - * @since 2.8.0 - * - * @param string $uri URI to check. - * @return bool True, to send through the proxy and false if, the proxy should not be used. - */ - function send_through_proxy( $uri ) { - // parse_url() only handles http, https type URLs, and will emit E_WARNING on failure. - // This will be displayed on blogs, which is not reasonable. - $check = @parse_url($uri); - - // Malformed URL, can not process, but this could mean ssl, so let through anyway. - if ( $check === false ) - return true; - - $home = parse_url( get_option('siteurl') ); - - /** - * Filter whether to preempt sending the request through the proxy server. - * - * Returning false will bypass the proxy; returning true will send - * the request through the proxy. Returning null bypasses the filter. - * - * @since 3.5.0 - * - * @param null $override Whether to override the request result. Default null. - * @param string $uri URL to check. - * @param array $check Associative array result of parsing the URI. - * @param array $home Associative array result of parsing the site URL. - */ - $result = apply_filters( 'pre_http_send_through_proxy', null, $uri, $check, $home ); - if ( ! is_null( $result ) ) - return $result; - - if ( $check['host'] == 'localhost' || $check['host'] == $home['host'] ) - return false; - - if ( !defined('WP_PROXY_BYPASS_HOSTS') ) - return true; - - static $bypass_hosts; - static $wildcard_regex = false; - if ( null == $bypass_hosts ) { - $bypass_hosts = preg_split('|,\s*|', WP_PROXY_BYPASS_HOSTS); - - if ( false !== strpos(WP_PROXY_BYPASS_HOSTS, '*') ) { - $wildcard_regex = array(); - foreach ( $bypass_hosts as $host ) - $wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) ); - $wildcard_regex = '/^(' . implode('|', $wildcard_regex) . ')$/i'; - } - } - - if ( !empty($wildcard_regex) ) - return !preg_match($wildcard_regex, $check['host']); - else - return !in_array( $check['host'], $bypass_hosts ); - } -} -/** - * Internal representation of a single cookie. - * - * Returned cookies are represented using this class, and when cookies are set, if they are not - * already a WP_Http_Cookie() object, then they are turned into one. - * - * @todo The WordPress convention is to use underscores instead of camelCase for function and method - * names. Need to switch to use underscores instead for the methods. - * - * @package WordPress - * @subpackage HTTP - * @since 2.8.0 - */ -class WP_Http_Cookie { - - /** - * Cookie name. - * - * @since 2.8.0 - * @var string - */ - var $name; - - /** - * Cookie value. - * - * @since 2.8.0 - * @var string - */ - var $value; - - /** - * When the cookie expires. - * - * @since 2.8.0 - * @var string - */ - var $expires; - - /** - * Cookie URL path. - * - * @since 2.8.0 - * @var string - */ - var $path; - - /** - * Cookie Domain. - * - * @since 2.8.0 - * @var string - */ - var $domain; - - /** - * Sets up this cookie object. - * - * The parameter $data should be either an associative array containing the indices names below - * or a header string detailing it. - * - * If it's an array, it should include the following elements: - *

Name
Value - should NOT be urlencoded already.
Expires - (optional) String or int (UNIX timestamp).
Path (optional)
Domain (optional)
Port (optional)

- * - * @access public - * @since 2.8.0 - * - * @param string|array $data Raw cookie data. - * @param string $requested_url The URL which the cookie was set on, used for default 'domain' and 'port' values - */ - function __construct( $data, $requested_url = '' ) { - if ( $requested_url ) - $arrURL = @parse_url( $requested_url ); - if ( isset( $arrURL['host'] ) ) - $this->domain = $arrURL['host']; - $this->path = isset( $arrURL['path'] ) ? $arrURL['path'] : '/'; - if ( '/' != substr( $this->path, -1 ) ) - $this->path = dirname( $this->path ) . '/'; - - if ( is_string( $data ) ) { - // Assume it's a header string direct from a previous request - $pairs = explode( ';', $data ); - - // Special handling for first pair; name=value. Also be careful of "=" in value - $name = trim( substr( $pairs[0], 0, strpos( $pairs[0], '=' ) ) ); - $value = substr( $pairs[0], strpos( $pairs[0], '=' ) + 1 ); - $this->name = $name; - $this->value = urldecode( $value ); - array_shift( $pairs ); //Removes name=value from items. - - // Set everything else as a property - foreach ( $pairs as $pair ) { - $pair = rtrim($pair); - if ( empty($pair) ) //Handles the cookie ending in ; which results in a empty final pair - continue; - - list( $key, $val ) = strpos( $pair, '=' ) ? explode( '=', $pair ) : array( $pair, '' ); - $key = strtolower( trim( $key ) ); - if ( 'expires' == $key ) - $val = strtotime( $val ); - $this->$key = $val; - } - } else { - if ( !isset( $data['name'] ) ) - return false; - - // Set properties based directly on parameters - foreach ( array( 'name', 'value', 'path', 'domain', 'port' ) as $field ) { - if ( isset( $data[ $field ] ) ) - $this->$field = $data[ $field ]; - } - - if ( isset( $data['expires'] ) ) - $this->expires = is_int( $data['expires'] ) ? $data['expires'] : strtotime( $data['expires'] ); - else - $this->expires = null; - } - } - - /** - * Confirms that it's OK to send this cookie to the URL checked against. - * - * Decision is based on RFC 2109/2965, so look there for details on validity. - * - * @access public - * @since 2.8.0 - * - * @param string $url URL you intend to send this cookie to - * @return boolean true if allowed, false otherwise. - */ - function test( $url ) { - if ( is_null( $this->name ) ) - return false; - - // Expires - if expired then nothing else matters - if ( isset( $this->expires ) && time() > $this->expires ) - return false; - - // Get details on the URL we're thinking about sending to - $url = parse_url( $url ); - $url['port'] = isset( $url['port'] ) ? $url['port'] : ( 'https' == $url['scheme'] ? 443 : 80 ); - $url['path'] = isset( $url['path'] ) ? $url['path'] : '/'; - - // Values to use for comparison against the URL - $path = isset( $this->path ) ? $this->path : '/'; - $port = isset( $this->port ) ? $this->port : null; - $domain = isset( $this->domain ) ? strtolower( $this->domain ) : strtolower( $url['host'] ); - if ( false === stripos( $domain, '.' ) ) - $domain .= '.local'; - - // Host - very basic check that the request URL ends with the domain restriction (minus leading dot) - $domain = substr( $domain, 0, 1 ) == '.' ? substr( $domain, 1 ) : $domain; - if ( substr( $url['host'], -strlen( $domain ) ) != $domain ) - return false; - - // Port - supports "port-lists" in the format: "80,8000,8080" - if ( !empty( $port ) && !in_array( $url['port'], explode( ',', $port) ) ) - return false; - - // Path - request path must start with path restriction - if ( substr( $url['path'], 0, strlen( $path ) ) != $path ) - return false; - - return true; - } - - /** - * Convert cookie name and value back to header string. - * - * @access public - * @since 2.8.0 - * - * @return string Header encoded cookie name and value. - */ - function getHeaderValue() { - if ( ! isset( $this->name ) || ! isset( $this->value ) ) - return ''; - - /** - * Filter the header-encoded cookie value. - * - * @since 3.4.0 - * - * @param string $value The cookie value. - * @param string $name The cookie name. - */ - return $this->name . '=' . apply_filters( 'wp_http_cookie_value', $this->value, $this->name ); - } - - /** - * Retrieve cookie header for usage in the rest of the WordPress HTTP API. - * - * @access public - * @since 2.8.0 - * - * @return string - */ - function getFullHeader() { - return 'Cookie: ' . $this->getHeaderValue(); - } -} - -/** - * Implementation for deflate and gzip transfer encodings. - * - * Includes RFC 1950, RFC 1951, and RFC 1952. - * - * @since 2.8.0 - * @package WordPress - * @subpackage HTTP - */ -class WP_Http_Encoding { - - /** - * Compress raw string using the deflate format. - * - * Supports the RFC 1951 standard. - * - * @since 2.8.0 - * - * @param string $raw String to compress. - * @param int $level Optional, default is 9. Compression level, 9 is highest. - * @param string $supports Optional, not used. When implemented it will choose the right compression based on what the server supports. - * @return string|bool False on failure. - */ - public static function compress( $raw, $level = 9, $supports = null ) { - return gzdeflate( $raw, $level ); - } - - /** - * Decompression of deflated string. - * - * Will attempt to decompress using the RFC 1950 standard, and if that fails - * then the RFC 1951 standard deflate will be attempted. Finally, the RFC - * 1952 standard gzip decode will be attempted. If all fail, then the - * original compressed string will be returned. - * - * @since 2.8.0 - * - * @param string $compressed String to decompress. - * @param int $length The optional length of the compressed data. - * @return string|bool False on failure. - */ - public static function decompress( $compressed, $length = null ) { - - if ( empty($compressed) ) - return $compressed; - - if ( false !== ( $decompressed = @gzinflate( $compressed ) ) ) - return $decompressed; - - if ( false !== ( $decompressed = WP_Http_Encoding::compatible_gzinflate( $compressed ) ) ) - return $decompressed; - - if ( false !== ( $decompressed = @gzuncompress( $compressed ) ) ) - return $decompressed; - - if ( function_exists('gzdecode') ) { - $decompressed = @gzdecode( $compressed ); - - if ( false !== $decompressed ) - return $decompressed; - } - - return $compressed; - } - - /** - * Decompression of deflated string while staying compatible with the majority of servers. - * - * Certain Servers will return deflated data with headers which PHP's gzinflate() - * function cannot handle out of the box. The following function has been created from - * various snippets on the gzinflate() PHP documentation. - * - * Warning: Magic numbers within. Due to the potential different formats that the compressed - * data may be returned in, some "magic offsets" are needed to ensure proper decompression - * takes place. For a simple progmatic way to determine the magic offset in use, see: - * http://core.trac.wordpress.org/ticket/18273 - * - * @since 2.8.1 - * @link http://core.trac.wordpress.org/ticket/18273 - * @link http://au2.php.net/manual/en/function.gzinflate.php#70875 - * @link http://au2.php.net/manual/en/function.gzinflate.php#77336 - * - * @param string $gzData String to decompress. - * @return string|bool False on failure. - */ - public static function compatible_gzinflate($gzData) { - - // Compressed data might contain a full header, if so strip it for gzinflate() - if ( substr($gzData, 0, 3) == "\x1f\x8b\x08" ) { - $i = 10; - $flg = ord( substr($gzData, 3, 1) ); - if ( $flg > 0 ) { - if ( $flg & 4 ) { - list($xlen) = unpack('v', substr($gzData, $i, 2) ); - $i = $i + 2 + $xlen; - } - if ( $flg & 8 ) - $i = strpos($gzData, "\0", $i) + 1; - if ( $flg & 16 ) - $i = strpos($gzData, "\0", $i) + 1; - if ( $flg & 2 ) - $i = $i + 2; - } - $decompressed = @gzinflate( substr($gzData, $i, -8) ); - if ( false !== $decompressed ) - return $decompressed; - } - - // Compressed data from java.util.zip.Deflater amongst others. - $decompressed = @gzinflate( substr($gzData, 2) ); - if ( false !== $decompressed ) - return $decompressed; - - return false; - } - - /** - * What encoding types to accept and their priority values. - * - * @since 2.8.0 - * - * @return string Types of encoding to accept. - */ - public static function accept_encoding( $url, $args ) { - $type = array(); - $compression_enabled = WP_Http_Encoding::is_available(); - - if ( ! $args['decompress'] ) // decompression specifically disabled - $compression_enabled = false; - elseif ( $args['stream'] ) // disable when streaming to file - $compression_enabled = false; - elseif ( isset( $args['limit_response_size'] ) ) // If only partial content is being requested, we won't be able to decompress it - $compression_enabled = false; - - if ( $compression_enabled ) { - if ( function_exists( 'gzinflate' ) ) - $type[] = 'deflate;q=1.0'; - - if ( function_exists( 'gzuncompress' ) ) - $type[] = 'compress;q=0.5'; - - if ( function_exists( 'gzdecode' ) ) - $type[] = 'gzip;q=0.5'; - } - - /** - * Filter the allowed encoding types. - * - * @since 3.6.0 - * - * @param array $type Encoding types allowed. Accepts 'gzinflate', - * 'gzuncompress', 'gzdecode'. - * @param string $url URL of the HTTP request. - * @param array $args HTTP request arguments. - */ - $type = apply_filters( 'wp_http_accept_encoding', $type, $url, $args ); - - return implode(', ', $type); - } - - /** - * What encoding the content used when it was compressed to send in the headers. - * - * @since 2.8.0 - * - * @return string Content-Encoding string to send in the header. - */ - public static function content_encoding() { - return 'deflate'; - } - - /** - * Whether the content be decoded based on the headers. - * - * @since 2.8.0 - * - * @param array|string $headers All of the available headers. - * @return bool - */ - public static function should_decode($headers) { - if ( is_array( $headers ) ) { - if ( array_key_exists('content-encoding', $headers) && ! empty( $headers['content-encoding'] ) ) - return true; - } else if ( is_string( $headers ) ) { - return ( stripos($headers, 'content-encoding:') !== false ); - } - - return false; - } - - /** - * Whether decompression and compression are supported by the PHP version. - * - * Each function is tested instead of checking for the zlib extension, to - * ensure that the functions all exist in the PHP version and aren't - * disabled. - * - * @since 2.8.0 - * - * @return bool - */ - public static function is_available() { - return ( function_exists('gzuncompress') || function_exists('gzdeflate') || function_exists('gzinflate') ); - } -} diff --git a/wp-includes/class-json.php b/wp-includes/class-json.php index 417592f..7f34d3f 100644 --- a/wp-includes/class-json.php +++ b/wp-includes/class-json.php @@ -136,17 +136,24 @@ class Services_JSON * from encode() should be checked with isError() * - SERVICES_JSON_USE_TO_JSON: call toJSON when serializing objects * It serializes the return value from the toJSON call rather - * than the object it'self, toJSON can return associative arrays, + * than the object itself, toJSON can return associative arrays, * strings or numbers, if you return an object, make sure it does * not have a toJSON method, otherwise an error will occur. */ - function Services_JSON($use = 0) + function __construct( $use = 0 ) { $this->use = $use; $this->_mb_strlen = function_exists('mb_strlen'); $this->_mb_convert_encoding = function_exists('mb_convert_encoding'); $this->_mb_substr = function_exists('mb_substr'); } + + /** + * PHP4 constructor. + */ + public function Services_JSON( $use = 0 ) { + self::__construct( $use ); + } // private - cache the mbstring lookup results.. var $_mb_strlen = false; var $_mb_substr = false; @@ -438,7 +445,7 @@ class Services_JSON case 'array': /* * As per JSON spec if any array key is not an integer - * we must treat the the whole array as an object. We + * we must treat the whole array as an object. We * also try to catch a sparsely populated associative * array with numeric keys here because some JS engines * will create an array with empty indexes up to @@ -910,11 +917,17 @@ if (class_exists('PEAR_Error')) { class Services_JSON_Error extends PEAR_Error { - function Services_JSON_Error($message = 'unknown error', $code = null, + function __construct($message = 'unknown error', $code = null, $mode = null, $options = null, $userinfo = null) { parent::PEAR_Error($message, $code, $mode, $options, $userinfo); } + + public function Services_JSON_Error($message = 'unknown error', $code = null, + $mode = null, $options = null, $userinfo = null) { + self::__construct($message = 'unknown error', $code = null, + $mode = null, $options = null, $userinfo = null); + } } } else { @@ -924,11 +937,22 @@ if (class_exists('PEAR_Error')) { */ class Services_JSON_Error { - function Services_JSON_Error($message = 'unknown error', $code = null, - $mode = null, $options = null, $userinfo = null) + /** + * PHP5 constructor. + */ + function __construct( $message = 'unknown error', $code = null, + $mode = null, $options = null, $userinfo = null ) { } + + /** + * PHP4 constructor. + */ + public function Services_JSON_Error( $message = 'unknown error', $code = null, + $mode = null, $options = null, $userinfo = null ) { + self::__construct( $message, $code, $mode, $options, $userinfo ); + } } } diff --git a/wp-includes/class-oembed.php b/wp-includes/class-oembed.php index 353837f..909524b 100644 --- a/wp-includes/class-oembed.php +++ b/wp-includes/class-oembed.php @@ -1,9 +1,10 @@ array( 'http://www.youtube.com/oembed', true ), - '#https://(www\.)?youtube\.com/watch.*#i' => array( 'http://www.youtube.com/oembed?scheme=https', true ), - '#http://youtu\.be/.*#i' => array( 'http://www.youtube.com/oembed', true ), - '#https://youtu\.be/.*#i' => array( 'http://www.youtube.com/oembed?scheme=https', true ), - 'http://blip.tv/*' => array( 'http://blip.tv/oembed/', false ), - '#https?://(.+\.)?vimeo\.com/.*#i' => array( 'http://vimeo.com/api/oembed.{format}', true ), - '#https?://(www\.)?dailymotion\.com/.*#i' => array( 'http://www.dailymotion.com/services/oembed', true ), - 'http://dai.ly/*' => array( 'http://www.dailymotion.com/services/oembed', false ), - '#https?://(www\.)?flickr\.com/.*#i' => array( 'http://www.flickr.com/services/oembed/', true ), - 'http://flic.kr/*' => array( 'http://www.flickr.com/services/oembed/', false ), - '#https?://(.+\.)?smugmug\.com/.*#i' => array( 'http://api.smugmug.com/services/oembed/', true ), - '#https?://(www\.)?hulu\.com/watch/.*#i' => array( 'http://www.hulu.com/api/oembed.{format}', true ), - '#https?://(www\.)?viddler\.com/.*#i' => array( 'http://lab.viddler.com/services/oembed/', true ), - 'http://revision3.com/*' => array( 'http://revision3.com/api/oembed/', false ), - 'http://i*.photobucket.com/albums/*' => array( 'http://photobucket.com/oembed', false ), - 'http://gi*.photobucket.com/groups/*' => array( 'http://photobucket.com/oembed', false ), - '#https?://(www\.)?scribd\.com/.*#i' => array( 'http://www.scribd.com/services/oembed', true ), - 'http://wordpress.tv/*' => array( 'http://wordpress.tv/oembed/', false ), - '#https?://(.+\.)?polldaddy\.com/.*#i' => array( 'http://polldaddy.com/oembed/', true ), - '#https?://(www\.)?funnyordie\.com/videos/.*#i' => array( 'http://www.funnyordie.com/oembed', true ), - '#https?://(www\.)?twitter\.com/.+?/status(es)?/.*#i' => array( 'https://api.twitter.com/1/statuses/oembed.{format}', true ), - '#https?://(www\.)?soundcloud\.com/.*#i' => array( 'http://soundcloud.com/oembed', true ), - '#https?://(www\.)?slideshare\.net/*#' => array( 'http://www.slideshare.net/api/oembed/2', true ), - '#http://instagr(\.am|am\.com)/p/.*#i' => array( 'http://api.instagram.com/oembed', true ), - '#https?://(www\.)?rdio\.com/.*#i' => array( 'http://www.rdio.com/api/oembed/', true ), - '#https?://rd\.io/x/.*#i' => array( 'http://www.rdio.com/api/oembed/', true ), - '#https?://(open|play)\.spotify\.com/.*#i' => array( 'https://embed.spotify.com/oembed/', true ), - '#https?://(.+\.)?imgur\.com/.*#i' => array( 'http://api.imgur.com/oembed', true ), - '#https?://(www\.)?meetu(\.ps|p\.com)/.*#i' => array( 'http://api.meetup.com/oembed', true ), + '#http://((m|www)\.)?youtube\.com/watch.*#i' => array( 'http://www.youtube.com/oembed', true ), + '#https://((m|www)\.)?youtube\.com/watch.*#i' => array( 'http://www.youtube.com/oembed?scheme=https', true ), + '#http://((m|www)\.)?youtube\.com/playlist.*#i' => array( 'http://www.youtube.com/oembed', true ), + '#https://((m|www)\.)?youtube\.com/playlist.*#i' => array( 'http://www.youtube.com/oembed?scheme=https', true ), + '#http://youtu\.be/.*#i' => array( 'http://www.youtube.com/oembed', true ), + '#https://youtu\.be/.*#i' => array( 'http://www.youtube.com/oembed?scheme=https', true ), + '#https?://(.+\.)?vimeo\.com/.*#i' => array( 'http://vimeo.com/api/oembed.{format}', true ), + '#https?://(www\.)?dailymotion\.com/.*#i' => array( 'https://www.dailymotion.com/services/oembed', true ), + '#https?://dai.ly/.*#i' => array( 'https://www.dailymotion.com/services/oembed', true ), + '#https?://(www\.)?flickr\.com/.*#i' => array( 'https://www.flickr.com/services/oembed/', true ), + '#https?://flic\.kr/.*#i' => array( 'https://www.flickr.com/services/oembed/', true ), + '#https?://(.+\.)?smugmug\.com/.*#i' => array( 'http://api.smugmug.com/services/oembed/', true ), + '#https?://(www\.)?hulu\.com/watch/.*#i' => array( 'http://www.hulu.com/api/oembed.{format}', true ), + 'http://i*.photobucket.com/albums/*' => array( 'http://api.photobucket.com/oembed', false ), + 'http://gi*.photobucket.com/groups/*' => array( 'http://api.photobucket.com/oembed', false ), + '#https?://(www\.)?scribd\.com/doc/.*#i' => array( 'http://www.scribd.com/services/oembed', true ), + '#https?://wordpress.tv/.*#i' => array( 'http://wordpress.tv/oembed/', true ), + '#https?://(.+\.)?polldaddy\.com/.*#i' => array( 'https://polldaddy.com/oembed/', true ), + '#https?://poll\.fm/.*#i' => array( 'https://polldaddy.com/oembed/', true ), + '#https?://(www\.)?funnyordie\.com/videos/.*#i' => array( 'http://www.funnyordie.com/oembed', true ), + '#https?://(www\.)?twitter\.com/.+?/status(es)?/.*#i' => array( 'https://publish.twitter.com/oembed', true ), + '#https?://(www\.)?twitter\.com/.+?/timelines/.*#i' => array( 'https://publish.twitter.com/oembed', true ), + '#https?://(www\.)?twitter\.com/i/moments/.*#i' => array( 'https://publish.twitter.com/oembed', true ), + '#https?://vine.co/v/.*#i' => array( 'https://vine.co/oembed.{format}', true ), + '#https?://(www\.)?soundcloud\.com/.*#i' => array( 'http://soundcloud.com/oembed', true ), + '#https?://(.+?\.)?slideshare\.net/.*#i' => array( 'https://www.slideshare.net/api/oembed/2', true ), + '#https?://(www\.)?instagr(\.am|am\.com)/p/.*#i' => array( 'https://api.instagram.com/oembed', true ), + '#https?://(open|play)\.spotify\.com/.*#i' => array( 'https://embed.spotify.com/oembed/', true ), + '#https?://(.+\.)?imgur\.com/.*#i' => array( 'http://api.imgur.com/oembed', true ), + '#https?://(www\.)?meetu(\.ps|p\.com)/.*#i' => array( 'http://api.meetup.com/oembed', true ), + '#https?://(www\.)?issuu\.com/.+/docs/.+#i' => array( 'http://issuu.com/oembed_wp', true ), + '#https?://(www\.)?collegehumor\.com/video/.*#i' => array( 'http://www.collegehumor.com/oembed.{format}', true ), + '#https?://(www\.)?mixcloud\.com/.*#i' => array( 'http://www.mixcloud.com/oembed', true ), + '#https?://(www\.|embed\.)?ted\.com/talks/.*#i' => array( 'http://www.ted.com/talks/oembed.{format}', true ), + '#https?://(www\.)?(animoto|video214)\.com/play/.*#i' => array( 'https://animoto.com/oembeds/create', true ), + '#https?://(.+)\.tumblr\.com/post/.*#i' => array( 'https://www.tumblr.com/oembed/1.0', true ), + '#https?://(www\.)?kickstarter\.com/projects/.*#i' => array( 'https://www.kickstarter.com/services/oembed', true ), + '#https?://kck\.st/.*#i' => array( 'https://www.kickstarter.com/services/oembed', true ), + '#https?://cloudup\.com/.*#i' => array( 'https://cloudup.com/oembed', true ), + '#https?://(www\.)?reverbnation\.com/.*#i' => array( 'https://www.reverbnation.com/oembed', true ), + '#https?://videopress.com/v/.*#' => array( 'https://public-api.wordpress.com/oembed/1.0/?for=' . $host, true ), + '#https?://(www\.)?reddit\.com/r/[^/]+/comments/.*#i' => array( 'https://www.reddit.com/oembed', true ), + '#https?://(www\.)?speakerdeck\.com/.*#i' => array( 'https://speakerdeck.com/oembed.{format}', true ), ); + if ( ! empty( self::$early_providers['add'] ) ) { + foreach ( self::$early_providers['add'] as $format => $data ) { + $providers[ $format ] = $data; + } + } + + if ( ! empty( self::$early_providers['remove'] ) ) { + foreach ( self::$early_providers['remove'] as $format ) { + unset( $providers[ $format ] ); + } + } + + self::$early_providers = array(); + /** - * Filter the list of oEmbed providers. + * Filter the list of whitelisted oEmbed providers. + * + * Since WordPress 4.4, oEmbed discovery is enabled for all users and allows embedding of sanitized + * iframes. The providers in this list are whitelisted, meaning they are trusted and allowed to + * embed any content, such as iframes, videos, JavaScript, and arbitrary HTML. + * + * Supported providers: + * + * | Provider | Flavor | Supports HTTPS | Since | + * | ------------ | --------------------- | :------------: | --------- | + * | Dailymotion | dailymotion.com | Yes | 2.9.0 | + * | Flickr | flickr.com | Yes | 2.9.0 | + * | Hulu | hulu.com | Yes | 2.9.0 | + * | Photobucket | photobucket.com | No | 2.9.0 | + * | Scribd | scribd.com | Yes | 2.9.0 | + * | Vimeo | vimeo.com | Yes | 2.9.0 | + * | WordPress.tv | wordpress.tv | Yes | 2.9.0 | + * | YouTube | youtube.com/watch | Yes | 2.9.0 | + * | Funny or Die | funnyordie.com | Yes | 3.0.0 | + * | Polldaddy | polldaddy.com | Yes | 3.0.0 | + * | SmugMug | smugmug.com | Yes | 3.0.0 | + * | YouTube | youtu.be | Yes | 3.0.0 | + * | Twitter | twitter.com | Yes | 3.4.0 | + * | Instagram | instagram.com | Yes | 3.5.0 | + * | Instagram | instagr.am | Yes | 3.5.0 | + * | Slideshare | slideshare.net | Yes | 3.5.0 | + * | SoundCloud | soundcloud.com | Yes | 3.5.0 | + * | Dailymotion | dai.ly | Yes | 3.6.0 | + * | Flickr | flic.kr | Yes | 3.6.0 | + * | Spotify | spotify.com | Yes | 3.6.0 | + * | Imgur | imgur.com | Yes | 3.9.0 | + * | Meetup.com | meetup.com | Yes | 3.9.0 | + * | Meetup.com | meetu.ps | Yes | 3.9.0 | + * | Animoto | animoto.com | Yes | 4.0.0 | + * | Animoto | video214.com | Yes | 4.0.0 | + * | CollegeHumor | collegehumor.com | Yes | 4.0.0 | + * | Issuu | issuu.com | Yes | 4.0.0 | + * | Mixcloud | mixcloud.com | Yes | 4.0.0 | + * | Polldaddy | poll.fm | Yes | 4.0.0 | + * | TED | ted.com | Yes | 4.0.0 | + * | YouTube | youtube.com/playlist | Yes | 4.0.0 | + * | Vine | vine.co | Yes | 4.1.0 | + * | Tumblr | tumblr.com | Yes | 4.2.0 | + * | Kickstarter | kickstarter.com | Yes | 4.2.0 | + * | Kickstarter | kck.st | Yes | 4.2.0 | + * | Cloudup | cloudup.com | Yes | 4.4.0 | + * | ReverbNation | reverbnation.com | Yes | 4.4.0 | + * | VideoPress | videopress.com | Yes | 4.4.0 | + * | Reddit | reddit.com | Yes | 4.4.0 | + * | Speaker Deck | speakerdeck.com | Yes | 4.4.0 | + * | Twitter | twitter.com/timelines | Yes | 4.5.0 | + * | Twitter | twitter.com/moments | Yes | 4.5.0 | * - * Discovery is disabled for users lacking the unfiltered_html capability. - * Only providers in this array will be used for those users. + * No longer supported providers: + * + * | Provider | Flavor | Supports HTTPS | Since | Removed | + * | ------------ | -------------------- | :------------: | --------- | --------- | + * | Qik | qik.com | Yes | 2.9.0 | 3.9.0 | + * | Viddler | viddler.com | Yes | 2.9.0 | 4.0.0 | + * | Revision3 | revision3.com | No | 2.9.0 | 4.2.0 | + * | Blip | blip.tv | No | 2.9.0 | 4.4.0 | + * | Rdio | rdio.com | Yes | 3.6.0 | 4.4.1 | + * | Rdio | rd.io | Yes | 3.6.0 | 4.4.1 | * * @see wp_oembed_add_provider() * @@ -77,17 +192,36 @@ class WP_oEmbed { } /** - * The do-it-all function that takes a URL and attempts to return the HTML. + * Exposes private/protected methods for backwards compatibility. + * + * @since 4.0.0 + * @access public + * + * @param callable $name Method to call. + * @param array $arguments Arguments to pass when calling. + * @return mixed|bool Return value of the callback, false otherwise. + */ + public function __call( $name, $arguments ) { + if ( in_array( $name, $this->compat_methods ) ) { + return call_user_func_array( array( $this, $name ), $arguments ); + } + return false; + } + + /** + * Takes a URL and returns the corresponding oEmbed provider's URL, if there is one. + * + * @since 4.0.0 + * @access public * * @see WP_oEmbed::discover() - * @see WP_oEmbed::fetch() - * @see WP_oEmbed::data2html() * - * @param string $url The URL to the content that should be attempted to be embedded. - * @param array $args Optional arguments. Usually passed from a shortcode. - * @return bool|string False on failure, otherwise the UNSANITIZED (and potentially unsafe) HTML that should be used to embed. + * @param string $url The URL to the content. + * @param string|array $args Optional provider arguments. + * @return false|string False on failure, otherwise the oEmbed provider URL. */ - function get_html( $url, $args = '' ) { + public function get_provider( $url, $args = '' ) { + $provider = false; if ( !isset($args['discover']) ) @@ -111,6 +245,78 @@ class WP_oEmbed { if ( !$provider && $args['discover'] ) $provider = $this->discover( $url ); + return $provider; + } + + /** + * Adds an oEmbed provider. + * + * The provider is removed just-in-time when wp_oembed_add_provider() is called before + * the {@see 'plugins_loaded'} hook. + * + * The just-in-time addition is for the benefit of the {@see 'oembed_providers'} filter. + * + * @static + * @since 4.0.0 + * @access public + * + * @see wp_oembed_add_provider() + * + * @param string $format Format of URL that this provider can handle. You can use + * asterisks as wildcards. + * @param string $provider The URL to the oEmbed provider.. + * @param bool $regex Optional. Whether the $format parameter is in a regex format. + * Default false. + */ + public static function _add_provider_early( $format, $provider, $regex = false ) { + if ( empty( self::$early_providers['add'] ) ) { + self::$early_providers['add'] = array(); + } + + self::$early_providers['add'][ $format ] = array( $provider, $regex ); + } + + /** + * Removes an oEmbed provider. + * + * The provider is removed just-in-time when wp_oembed_remove_provider() is called before + * the {@see 'plugins_loaded'} hook. + * + * The just-in-time removal is for the benefit of the {@see 'oembed_providers'} filter. + * + * @since 4.0.0 + * @access public + * @static + * + * @see wp_oembed_remove_provider() + * + * @param string $format The format of URL that this provider can handle. You can use + * asterisks as wildcards. + */ + public static function _remove_provider_early( $format ) { + if ( empty( self::$early_providers['remove'] ) ) { + self::$early_providers['remove'] = array(); + } + + self::$early_providers['remove'][] = $format; + } + + /** + * The do-it-all function that takes a URL and attempts to return the HTML. + * + * @see WP_oEmbed::fetch() + * @see WP_oEmbed::data2html() + * + * @since 2.9.0 + * @access public + * + * @param string $url The URL to the content that should be attempted to be embedded. + * @param array|string $args Optional. Arguments, usually passed from a shortcode. Default empty. + * @return false|string False on failure, otherwise the UNSANITIZED (and potentially unsafe) HTML that should be used to embed. + */ + public function get_html( $url, $args = '' ) { + $provider = $this->get_provider( $url, $args ); + if ( !$provider || false === $data = $this->fetch( $provider, $url, $args ) ) return false; @@ -127,16 +333,34 @@ class WP_oEmbed { } /** - * Attempts to find oEmbed provider discovery tags at the given URL. + * Attempts to discover link tags at the given URL for an oEmbed provider. + * + * @since 2.9.0 + * @access public * - * @param string $url The URL that should be inspected for discovery tags. - * @return bool|string False on failure, otherwise the oEmbed provider URL. + * @param string $url The URL that should be inspected for discovery `` tags. + * @return false|string False on failure, otherwise the oEmbed provider URL. */ - function discover( $url ) { + public function discover( $url ) { $providers = array(); + $args = array( + 'limit_response_size' => 153600, // 150 KB + ); + + /** + * Filter oEmbed remote get arguments. + * + * @since 4.0.0 + * + * @see WP_Http::request() + * + * @param array $args oEmbed remote get arguments. + * @param string $url URL to be inspected. + */ + $args = apply_filters( 'oembed_remote_get_args', $args, $url ); // Fetch URL content - $request = wp_safe_remote_get( $url ); + $request = wp_safe_remote_get( $url, $args ); if ( $html = wp_remote_retrieve_body( $request ) ) { /** @@ -155,7 +379,9 @@ class WP_oEmbed { ) ); // Strip - $html = substr( $html, 0, stripos( $html, '' ) ); + if ( $html_head_end = stripos( $html, '' ) ) { + $html = substr( $html, 0, $html_head_end ); + } // Do a quick check $tagfound = false; @@ -166,12 +392,12 @@ class WP_oEmbed { } } - if ( $tagfound && preg_match_all( '/]+)>/i', $html, $links ) ) { + if ( $tagfound && preg_match_all( '#]+)/?>#iU', $html, $links ) ) { foreach ( $links[1] as $link ) { $atts = shortcode_parse_atts( $link ); if ( !empty($atts['type']) && !empty($linktypes[$atts['type']]) && !empty($atts['href']) ) { - $providers[$linktypes[$atts['type']]] = $atts['href']; + $providers[$linktypes[$atts['type']]] = htmlspecialchars_decode( $atts['href'] ); // Stop here if it's JSON (that's all we need) if ( 'json' == $linktypes[$atts['type']] ) @@ -193,13 +419,16 @@ class WP_oEmbed { /** * Connects to a oEmbed provider and returns the result. * - * @param string $provider The URL to the oEmbed provider. - * @param string $url The URL to the content that is desired to be embedded. - * @param array $args Optional arguments. Usually passed from a shortcode. - * @return bool|object False on failure, otherwise the result in the form of an object. + * @since 2.9.0 + * @access public + * + * @param string $provider The URL to the oEmbed provider. + * @param string $url The URL to the content that is desired to be embedded. + * @param array|string $args Optional. Arguments, usually passed from a shortcode. Default empty. + * @return false|object False on failure, otherwise the result in the form of an object. */ - function fetch( $provider, $url, $args = '' ) { - $args = wp_parse_args( $args, wp_embed_defaults() ); + public function fetch( $provider, $url, $args = '' ) { + $args = wp_parse_args( $args, wp_embed_defaults( $url ) ); $provider = add_query_arg( 'maxwidth', (int) $args['width'], $provider ); $provider = add_query_arg( 'maxheight', (int) $args['height'], $provider ); @@ -216,7 +445,7 @@ class WP_oEmbed { */ $provider = apply_filters( 'oembed_fetch_url', $provider, $url, $args ); - foreach( array( 'json', 'xml' ) as $format ) { + foreach ( array( 'json', 'xml' ) as $format ) { $result = $this->_fetch_with_format( $provider, $format ); if ( is_wp_error( $result ) && 'not-implemented' == $result->get_error_code() ) continue; @@ -230,13 +459,18 @@ class WP_oEmbed { * * @since 3.0.0 * @access private + * * @param string $provider_url_with_args URL to the provider with full arguments list (url, maxheight, etc.) * @param string $format Format to use - * @return bool|object False on failure, otherwise the result in the form of an object. + * @return false|object|WP_Error False on failure, otherwise the result in the form of an object. */ - function _fetch_with_format( $provider_url_with_args, $format ) { + private function _fetch_with_format( $provider_url_with_args, $format ) { $provider_url_with_args = add_query_arg( 'format', $format, $provider_url_with_args ); - $response = wp_safe_remote_get( $provider_url_with_args ); + + /** This filter is documented in wp-includes/class-oembed.php */ + $args = apply_filters( 'oembed_remote_get_args', array(), $provider_url_with_args ); + + $response = wp_safe_remote_get( $provider_url_with_args, $args ); if ( 501 == wp_remote_retrieve_response_code( $response ) ) return new WP_Error( 'not-implemented' ); if ( ! $body = wp_remote_retrieve_body( $response ) ) @@ -250,9 +484,13 @@ class WP_oEmbed { * * @since 3.0.0 * @access private + * + * @param string $response_body + * @return object|false */ - function _parse_json( $response_body ) { - return ( ( $data = json_decode( trim( $response_body ) ) ) && is_object( $data ) ) ? $data : false; + private function _parse_json( $response_body ) { + $data = json_decode( trim( $response_body ) ); + return ( $data && is_object( $data ) ) ? $data : false; } /** @@ -260,8 +498,11 @@ class WP_oEmbed { * * @since 3.0.0 * @access private + * + * @param string $response_body + * @return object|false */ - function _parse_xml( $response_body ) { + private function _parse_xml( $response_body ) { if ( ! function_exists( 'libxml_disable_entity_loader' ) ) return false; @@ -277,13 +518,16 @@ class WP_oEmbed { } /** - * Helper function for parsing an XML response body. + * Serves as a helper function for parsing an XML response body. * * @since 3.6.0 * @access private + * + * @param string $response_body + * @return object|false */ private function _parse_xml_body( $response_body ) { - if ( ! function_exists( 'simplexml_import_dom' ) || ! class_exists( 'DOMDocument' ) ) + if ( ! function_exists( 'simplexml_import_dom' ) || ! class_exists( 'DOMDocument', false ) ) return false; $dom = new DOMDocument; @@ -312,13 +556,16 @@ class WP_oEmbed { } /** - * Converts a data object from {@link WP_oEmbed::fetch()} and returns the HTML. + * Converts a data object from WP_oEmbed::fetch() and returns the HTML. + * + * @since 2.9.0 + * @access public * * @param object $data A data object result from an oEmbed provider. * @param string $url The URL to the content that is desired to be embedded. - * @return bool|string False on error, otherwise the HTML needed to embed. + * @return false|string False on error, otherwise the HTML needed to embed. */ - function data2html( $data, $url ) { + public function data2html( $data, $url ) { if ( ! is_object( $data ) || empty( $data->type ) ) return false; @@ -365,38 +612,62 @@ class WP_oEmbed { } /** - * Strip any new lines from the HTML. + * Strips any new lines from the HTML. + * + * @since 2.9.0 as strip_scribd_newlines() + * @since 3.0.0 + * @access public * - * @access private * @param string $html Existing HTML. * @param object $data Data object from WP_oEmbed::data2html() * @param string $url The original URL passed to oEmbed. * @return string Possibly modified $html */ - function _strip_newlines( $html, $data, $url ) { - if ( false !== strpos( $html, "\n" ) ) - $html = str_replace( array( "\r\n", "\n" ), '', $html ); + public function _strip_newlines( $html, $data, $url ) { + if ( false === strpos( $html, "\n" ) ) { + return $html; + } + + $count = 1; + $found = array(); + $token = '__PRE__'; + $search = array( "\t", "\n", "\r", ' ' ); + $replace = array( '__TAB__', '__NL__', '__CR__', '__SPACE__' ); + $tokenized = str_replace( $search, $replace, $html ); - return $html; + preg_match_all( '#(]*>.+?)#i', $tokenized, $matches, PREG_SET_ORDER ); + foreach ( $matches as $i => $match ) { + $tag_html = str_replace( $replace, $search, $match[0] ); + $tag_token = $token . $i; + + $found[ $tag_token ] = $tag_html; + $html = str_replace( $tag_html, $tag_token, $html, $count ); + } + + $replaced = str_replace( $replace, $search, $html ); + $stripped = str_replace( array( "\r\n", "\n" ), '', $replaced ); + $pre = array_values( $found ); + $tokens = array_keys( $found ); + + return str_replace( $tokens, $pre, $stripped ); } } /** - * Returns the initialized {@link WP_oEmbed} object + * Returns the initialized WP_oEmbed object. * * @since 2.9.0 * @access private * - * @see WP_oEmbed - * @uses WP_oEmbed + * @staticvar WP_oEmbed $wp_oembed * * @return WP_oEmbed object. */ function _wp_oembed_get_object() { - static $wp_oembed; + static $wp_oembed = null; - if ( is_null($wp_oembed) ) + if ( is_null( $wp_oembed ) ) { $wp_oembed = new WP_oEmbed(); - + } return $wp_oembed; } diff --git a/wp-includes/class-phpass.php b/wp-includes/class-phpass.php index 1970ae9..8b8b113 100644 --- a/wp-includes/class-phpass.php +++ b/wp-includes/class-phpass.php @@ -39,7 +39,10 @@ class PasswordHash { var $portable_hashes; var $random_state; - function PasswordHash($iteration_count_log2, $portable_hashes) + /** + * PHP5 constructor. + */ + function __construct( $iteration_count_log2, $portable_hashes ) { $this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'; @@ -52,6 +55,13 @@ class PasswordHash { $this->random_state = microtime() . uniqid(rand(), TRUE); // removed getmypid() for compatibility reasons } + /** + * PHP4 constructor. + */ + public function PasswordHash( $iteration_count_log2, $portable_hashes ) { + self::__construct( $iteration_count_log2, $portable_hashes ); + } + function get_random_bytes($count) { $output = ''; @@ -214,6 +224,10 @@ class PasswordHash { function HashPassword($password) { + if ( strlen( $password ) > 4096 ) { + return '*'; + } + $random = ''; if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) { @@ -249,12 +263,14 @@ class PasswordHash { function CheckPassword($password, $stored_hash) { + if ( strlen( $password ) > 4096 ) { + return false; + } + $hash = $this->crypt_private($password, $stored_hash); if ($hash[0] == '*') $hash = crypt($password, $stored_hash); return $hash === $stored_hash; } -} - -?> +} \ No newline at end of file diff --git a/wp-includes/class-phpmailer.php b/wp-includes/class-phpmailer.php index c38632a..b28c4ef 100644 --- a/wp-includes/class-phpmailer.php +++ b/wp-includes/class-phpmailer.php @@ -1,15 +1,14 @@ + * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project + * @author Marcus Bointon (Synchro/coolbru) * @author Jim Jagielski (jimjag) * @author Andy Prevost (codeworxtech) * @author Brent R. Matzelle (original founder) - * @copyright 2013 Marcus Bointon + * @copyright 2012 - 2014 Marcus Bointon * @copyright 2010 - 2012 Jim Jagielski * @copyright 2004 - 2009 Andy Prevost * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License @@ -18,98 +17,94 @@ * FITNESS FOR A PARTICULAR PURPOSE. */ -if (version_compare(PHP_VERSION, '5.0.0', '<')) { - exit("Sorry, PHPMailer will only run on PHP version 5 or greater!\n"); -} - /** * PHPMailer - PHP email creation and transport class. - * PHP Version 5.0.0 * @package PHPMailer - * @author Marcus Bointon (coolbru) + * @author Marcus Bointon (Synchro/coolbru) * @author Jim Jagielski (jimjag) * @author Andy Prevost (codeworxtech) * @author Brent R. Matzelle (original founder) - * @copyright 2013 Marcus Bointon - * @copyright 2010 - 2012 Jim Jagielski - * @copyright 2004 - 2009 Andy Prevost */ class PHPMailer { /** * The PHPMailer Version number. - * @type string + * @var string */ - public $Version = '5.2.7'; + public $Version = '5.2.14'; /** * Email priority. - * Options: 1 = High, 3 = Normal, 5 = low. - * @type int + * Options: null (default), 1 = High, 3 = Normal, 5 = low. + * When null, the header is not set at all. + * @var integer */ - public $Priority = 3; + public $Priority = null; /** * The character set of the message. - * @type string + * @var string */ public $CharSet = 'iso-8859-1'; /** * The MIME Content-type of the message. - * @type string + * @var string */ public $ContentType = 'text/plain'; /** * The message encoding. * Options: "8bit", "7bit", "binary", "base64", and "quoted-printable". - * @type string + * @var string */ public $Encoding = '8bit'; /** * Holds the most recent mailer error message. - * @type string + * @var string */ public $ErrorInfo = ''; /** * The From email address for the message. - * @type string + * @var string */ public $From = 'root@localhost'; /** * The From name of the message. - * @type string + * @var string */ public $FromName = 'Root User'; /** * The Sender email (Return-Path) of the message. * If not empty, will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode. - * @type string + * @var string */ public $Sender = ''; /** * The Return-Path of the message. * If empty, it will be set to either From or Sender. - * @type string + * @var string + * @deprecated Email senders should never set a return-path header; + * it's the receiver's job (RFC5321 section 4.4), so this no longer does anything. + * @link https://tools.ietf.org/html/rfc5321#section-4.4 RFC5321 reference */ public $ReturnPath = ''; /** * The Subject of the message. - * @type string + * @var string */ public $Subject = ''; /** * An HTML or plain text message body. * If HTML then call isHTML(true). - * @type string + * @var string */ public $Body = ''; @@ -118,7 +113,7 @@ class PHPMailer * This body can be read by mail clients that do not have HTML email * capability such as mutt & Eudora. * Clients that can read HTML will view the normal Body. - * @type string + * @var string */ public $AltBody = ''; @@ -128,91 +123,92 @@ class PHPMailer * To generate iCal events, use the bundled extras/EasyPeasyICS.php class or iCalcreator * @link http://sprain.ch/blog/downloads/php-class-easypeasyics-create-ical-files-with-php/ * @link http://kigkonsult.se/iCalcreator/ - * @type string + * @var string */ public $Ical = ''; /** * The complete compiled MIME message body. * @access protected - * @type string + * @var string */ protected $MIMEBody = ''; /** * The complete compiled MIME message headers. - * @type string + * @var string * @access protected */ protected $MIMEHeader = ''; /** * Extra headers that createHeader() doesn't fold in. - * @type string + * @var string * @access protected */ protected $mailHeader = ''; /** * Word-wrap the message body to this number of chars. - * @type int + * Set to 0 to not wrap. A useful value here is 78, for RFC2822 section 2.1.1 compliance. + * @var integer */ public $WordWrap = 0; /** * Which method to use to send mail. * Options: "mail", "sendmail", or "smtp". - * @type string + * @var string */ public $Mailer = 'mail'; /** * The path to the sendmail program. - * @type string + * @var string */ public $Sendmail = '/usr/sbin/sendmail'; /** * Whether mail() uses a fully sendmail-compatible MTA. * One which supports sendmail's "-oi -f" options. - * @type bool + * @var boolean */ public $UseSendmailOptions = true; /** * Path to PHPMailer plugins. * Useful if the SMTP class is not in the PHP include path. - * @type string + * @var string * @deprecated Should not be needed now there is an autoloader. */ public $PluginDir = ''; /** - * The email address that a reading confirmation should be sent to. - * @type string + * The email address that a reading confirmation should be sent to, also known as read receipt. + * @var string */ public $ConfirmReadingTo = ''; /** - * The hostname to use in Message-Id and Received headers - * and as default HELO string. - * If empty, the value returned - * by SERVER_NAME is used or 'localhost.localdomain'. - * @type string + * The hostname to use in the Message-ID header and as default HELO string. + * If empty, PHPMailer attempts to find one with, in order, + * $_SERVER['SERVER_NAME'], gethostname(), php_uname('n'), or the value + * 'localhost.localdomain'. + * @var string */ public $Hostname = ''; /** - * An ID to be used in the Message-Id header. + * An ID to be used in the Message-ID header. * If empty, a unique id will be generated. - * @type string + * @var string */ public $MessageID = ''; /** * The message Date to be used in the Date header. * If empty, the current date will be added. - * @type string + * @var string */ public $MessageDate = ''; @@ -222,130 +218,163 @@ class PHPMailer * You can also specify a different port * for each host by using this format: [hostname:port] * (e.g. "smtp1.example.com:25;smtp2.example.com"). + * You can also specify encryption type, for example: + * (e.g. "tls://smtp1.example.com:587;ssl://smtp2.example.com:465"). * Hosts will be tried in order. - * @type string + * @var string */ public $Host = 'localhost'; /** * The default SMTP server port. - * @type int - * @Todo Why is this needed when the SMTP class takes care of it? + * @var integer + * @TODO Why is this needed when the SMTP class takes care of it? */ public $Port = 25; /** * The SMTP HELO of the message. - * Default is $Hostname. - * @type string + * Default is $Hostname. If $Hostname is empty, PHPMailer attempts to find + * one with the same method described above for $Hostname. + * @var string * @see PHPMailer::$Hostname */ public $Helo = ''; /** - * The secure connection prefix. - * Options: "", "ssl" or "tls" - * @type string + * What kind of encryption to use on the SMTP connection. + * Options: '', 'ssl' or 'tls' + * @var string */ public $SMTPSecure = ''; + /** + * Whether to enable TLS encryption automatically if a server supports it, + * even if `SMTPSecure` is not set to 'tls'. + * Be aware that in PHP >= 5.6 this requires that the server's certificates are valid. + * @var boolean + */ + public $SMTPAutoTLS = true; + /** * Whether to use SMTP authentication. * Uses the Username and Password properties. - * @type bool + * @var boolean * @see PHPMailer::$Username * @see PHPMailer::$Password */ public $SMTPAuth = false; + /** + * Options array passed to stream_context_create when connecting via SMTP. + * @var array + */ + public $SMTPOptions = array(); + /** * SMTP username. - * @type string + * @var string */ public $Username = ''; /** * SMTP password. - * @type string + * @var string */ public $Password = ''; /** * SMTP auth type. * Options are LOGIN (default), PLAIN, NTLM, CRAM-MD5 - * @type string + * @var string */ public $AuthType = ''; /** * SMTP realm. * Used for NTLM auth - * @type string + * @var string */ public $Realm = ''; /** * SMTP workstation. * Used for NTLM auth - * @type string + * @var string */ public $Workstation = ''; /** * The SMTP server timeout in seconds. - * @type int + * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2 + * @var integer */ - public $Timeout = 10; + public $Timeout = 300; /** * SMTP class debug output mode. - * Options: 0 = off, 1 = commands, 2 = commands and data - * @type int + * Debug output level. + * Options: + * * `0` No output + * * `1` Commands + * * `2` Data and commands + * * `3` As 2 plus connection status + * * `4` Low-level data output + * @var integer * @see SMTP::$do_debug */ public $SMTPDebug = 0; /** - * The function/method to use for debugging output. - * Options: "echo" or "error_log" - * @type string + * How to handle debug output. + * Options: + * * `echo` Output plain-text as-is, appropriate for CLI + * * `html` Output escaped, line breaks converted to `
`, appropriate for browser output + * * `error_log` Output to error log as configured in php.ini + * + * Alternatively, you can provide a callable expecting two params: a message string and the debug level: + *


+     * $mail->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
+     *

+ * @var string|callable * @see SMTP::$Debugoutput */ - public $Debugoutput = "echo"; + public $Debugoutput = 'echo'; /** * Whether to keep SMTP connection open after each message. * If this is set to true then to close the connection * requires an explicit call to smtpClose(). - * @type bool + * @var boolean */ public $SMTPKeepAlive = false; /** * Whether to split multiple to addresses into multiple messages * or send them all in one message. - * @type bool + * @var boolean */ public $SingleTo = false; /** * Storage for addresses when SingleTo is enabled. - * @type array - * @todo This should really not be public + * @var array + * @TODO This should really not be public */ public $SingleToArray = array(); /** * Whether to generate VERP addresses on send. * Only applicable when sending via SMTP. - * @link http://en.wikipedia.org/wiki/Variable_envelope_return_path - * @type bool + * @link https://en.wikipedia.org/wiki/Variable_envelope_return_path + * @link http://www.postfix.org/VERP_README.html Postfix VERP info + * @var boolean */ public $do_verp = false; /** * Whether to allow sending messages with an empty body. - * @type bool + * @var boolean */ public $AllowEmpty = false; @@ -353,40 +382,40 @@ class PHPMailer * The default line ending. * @note The default remains "\n". We force CRLF where we know * it must be used via self::CRLF. - * @type string + * @var string */ public $LE = "\n"; /** * DKIM selector. - * @type string + * @var string */ public $DKIM_selector = ''; /** * DKIM Identity. * Usually the email address used as the source of the email - * @type string + * @var string */ public $DKIM_identity = ''; /** * DKIM passphrase. * Used if your key is encrypted. - * @type string + * @var string */ public $DKIM_passphrase = ''; /** * DKIM signing domain name. * @example 'example.com' - * @type string + * @var string */ public $DKIM_domain = ''; /** * DKIM private key file path. - * @type string + * @var string */ public $DKIM_private = ''; @@ -396,180 +425,218 @@ class PHPMailer * The function that handles the result of the send email action. * It is called out by send() for each email sent. * - * Value can be: - * - 'function_name' for function names - * - 'Class::Method' for static method calls - * - array($object, 'Method') for calling methods on $object - * See http://php.net/is_callable manual page for more details. + * Value can be any php callable: http://www.php.net/is_callable * * Parameters: - * bool $result result of the send action + * boolean $result result of the send action * string $to email address of the recipient * string $cc cc email addresses * string $bcc bcc email addresses * string $subject the subject * string $body the email body * string $from email address of sender - * - * @type string + * @var string */ public $action_function = ''; /** - * What to use in the X-Mailer header. - * Options: null for default, whitespace for none, or a string to use - * @type string + * What to put in the X-Mailer header. + * Options: An empty string for PHPMailer default, whitespace for none, or a string to use + * @var string */ public $XMailer = ''; /** * An instance of the SMTP sender class. - * @type SMTP + * @var SMTP * @access protected */ protected $smtp = null; /** - * The array of 'to' addresses. - * @type array + * The array of 'to' names and addresses. + * @var array * @access protected */ protected $to = array(); /** - * The array of 'cc' addresses. - * @type array + * The array of 'cc' names and addresses. + * @var array * @access protected */ protected $cc = array(); /** - * The array of 'bcc' addresses. - * @type array + * The array of 'bcc' names and addresses. + * @var array * @access protected */ protected $bcc = array(); /** * The array of reply-to names and addresses. - * @type array + * @var array * @access protected */ protected $ReplyTo = array(); /** * An array of all kinds of addresses. - * Includes all of $to, $cc, $bcc, $replyto - * @type array + * Includes all of $to, $cc, $bcc + * @var array * @access protected + * @see PHPMailer::$to @see PHPMailer::$cc @see PHPMailer::$bcc */ protected $all_recipients = array(); + /** + * An array of names and addresses queued for validation. + * In send(), valid and non duplicate entries are moved to $all_recipients + * and one of $to, $cc, or $bcc. + * This array is used only for addresses with IDN. + * @var array + * @access protected + * @see PHPMailer::$to @see PHPMailer::$cc @see PHPMailer::$bcc + * @see PHPMailer::$all_recipients + */ + protected $RecipientsQueue = array(); + + /** + * An array of reply-to names and addresses queued for validation. + * In send(), valid and non duplicate entries are moved to $ReplyTo. + * This array is used only for addresses with IDN. + * @var array + * @access protected + * @see PHPMailer::$ReplyTo + */ + protected $ReplyToQueue = array(); + /** * The array of attachments. - * @type array + * @var array * @access protected */ protected $attachment = array(); /** * The array of custom headers. - * @type array + * @var array * @access protected */ protected $CustomHeader = array(); /** * The most recent Message-ID (including angular brackets). - * @type string + * @var string * @access protected */ protected $lastMessageID = ''; /** * The message's MIME type. - * @type string + * @var string * @access protected */ protected $message_type = ''; /** * The array of MIME boundary strings. - * @type array + * @var array * @access protected */ protected $boundary = array(); /** * The array of available languages. - * @type array + * @var array * @access protected */ protected $language = array(); /** * The number of errors encountered. - * @type integer + * @var integer * @access protected */ protected $error_count = 0; /** * The S/MIME certificate file path. - * @type string + * @var string * @access protected */ protected $sign_cert_file = ''; /** * The S/MIME key file path. - * @type string + * @var string * @access protected */ protected $sign_key_file = ''; + /** + * The optional S/MIME extra certificates ("CA Chain") file path. + * @var string + * @access protected + */ + protected $sign_extracerts_file = ''; + /** * The S/MIME password for the key. * Used only if the key is encrypted. - * @type string + * @var string * @access protected */ protected $sign_key_pass = ''; /** * Whether to throw exceptions for errors. - * @type bool + * @var boolean * @access protected */ protected $exceptions = false; /** - * Error severity: message only, continue processing + * Unique ID used for message ID and boundaries. + * @var string + * @access protected + */ + protected $uniqueid = ''; + + /** + * Error severity: message only, continue processing. */ const STOP_MESSAGE = 0; /** - * Error severity: message, likely ok to continue processing + * Error severity: message, likely ok to continue processing. */ const STOP_CONTINUE = 1; /** - * Error severity: message, plus full stop, critical error reached + * Error severity: message, plus full stop, critical error reached. */ const STOP_CRITICAL = 2; /** - * SMTP RFC standard line ending + * SMTP RFC standard line ending. */ const CRLF = "\r\n"; /** - * Constructor - * @param bool $exceptions Should we throw external exceptions? + * The maximum line length allowed by RFC 2822 section 2.1.1 + * @var integer + */ + const MAX_LINE_LENGTH = 998; + + /** + * Constructor. + * @param boolean $exceptions Should we throw external exceptions? */ public function __construct($exceptions = false) { - $this->exceptions = ($exceptions == true); + $this->exceptions = (boolean)$exceptions; } /** @@ -577,7 +644,8 @@ class PHPMailer */ public function __destruct() { - if ($this->Mailer == 'smtp') { //close any open SMTP connection nicely + //Close any open SMTP connection nicely + if ($this->Mailer == 'smtp') { $this->smtpClose(); } } @@ -593,53 +661,75 @@ class PHPMailer * @param string $header Additional Header(s) * @param string $params Params * @access private - * @return bool + * @return boolean */ private function mailPassthru($to, $subject, $body, $header, $params) { + //Check overloading of mail function to avoid double-encoding + if (ini_get('mbstring.func_overload') & 1) { + $subject = $this->secureHeader($subject); + } else { + $subject = $this->encodeHeader($this->secureHeader($subject)); + } if (ini_get('safe_mode') || !($this->UseSendmailOptions)) { - $rt = @mail($to, $this->encodeHeader($this->secureHeader($subject)), $body, $header); + $result = @mail($to, $subject, $body, $header); } else { - $rt = @mail($to, $this->encodeHeader($this->secureHeader($subject)), $body, $header, $params); + $result = @mail($to, $subject, $body, $header, $params); } - return $rt; + return $result; } /** * Output debugging info via user-defined method. - * Only if debug output is enabled. + * Only generates output if SMTP debug output is enabled (@see SMTP::$do_debug). * @see PHPMailer::$Debugoutput * @see PHPMailer::$SMTPDebug * @param string $str */ protected function edebug($str) { - if (!$this->SMTPDebug) { + if ($this->SMTPDebug <= 0) { + return; + } + //Avoid clash with built-in function names + if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) { + call_user_func($this->Debugoutput, $str, $this->SMTPDebug); return; } switch ($this->Debugoutput) { case 'error_log': + //Don't output, just log error_log($str); break; case 'html': - //Cleans up output a bit for a better looking display that's HTML-safe - echo htmlentities(preg_replace('/[\r\n]+/', '', $str), ENT_QUOTES, $this->CharSet) . "
\n"; + //Cleans up output a bit for a better looking, HTML-safe output + echo htmlentities( + preg_replace('/[\r\n]+/', '', $str), + ENT_QUOTES, + 'UTF-8' + ) + . "
\n"; break; case 'echo': default: - //Just echoes exactly what was received - echo $str; + //Normalize line breaks + $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str); + echo gmdate('Y-m-d H:i:s') . "\t" . str_replace( + "\n", + "\n \t ", + trim($str) + ) . "\n"; } } /** * Sets message type to HTML or plain. - * @param bool $ishtml True for HTML mode. + * @param boolean $isHtml True for HTML mode. * @return void */ - public function isHTML($ishtml = true) + public function isHTML($isHtml = true) { - if ($ishtml) { + if ($isHtml) { $this->ContentType = 'text/html'; } else { $this->ContentType = 'text/plain'; @@ -670,8 +760,12 @@ class PHPMailer */ public function isSendmail() { - if (!stristr(ini_get('sendmail_path'), 'sendmail')) { - $this->Sendmail = '/var/qmail/bin/sendmail'; + $ini_sendmail_path = ini_get('sendmail_path'); + + if (!stristr($ini_sendmail_path, 'sendmail')) { + $this->Sendmail = '/usr/sbin/sendmail'; + } else { + $this->Sendmail = $ini_sendmail_path; } $this->Mailer = 'sendmail'; } @@ -682,90 +776,140 @@ class PHPMailer */ public function isQmail() { - if (stristr(ini_get('sendmail_path'), 'qmail')) { - $this->Sendmail = '/var/qmail/bin/sendmail'; + $ini_sendmail_path = ini_get('sendmail_path'); + + if (!stristr($ini_sendmail_path, 'qmail')) { + $this->Sendmail = '/var/qmail/bin/qmail-inject'; + } else { + $this->Sendmail = $ini_sendmail_path; } - $this->Mailer = 'sendmail'; + $this->Mailer = 'qmail'; } /** * Add a "To" address. - * @param string $address + * @param string $address The email address to send to * @param string $name - * @return bool true on success, false if address already used + * @return boolean true on success, false if address already used or invalid in some way */ public function addAddress($address, $name = '') { - return $this->addAnAddress('to', $address, $name); + return $this->addOrEnqueueAnAddress('to', $address, $name); } /** * Add a "CC" address. * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer. - * @param string $address + * @param string $address The email address to send to * @param string $name - * @return bool true on success, false if address already used + * @return boolean true on success, false if address already used or invalid in some way */ public function addCC($address, $name = '') { - return $this->addAnAddress('cc', $address, $name); + return $this->addOrEnqueueAnAddress('cc', $address, $name); } /** * Add a "BCC" address. * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer. - * @param string $address + * @param string $address The email address to send to * @param string $name - * @return bool true on success, false if address already used + * @return boolean true on success, false if address already used or invalid in some way */ public function addBCC($address, $name = '') { - return $this->addAnAddress('bcc', $address, $name); + return $this->addOrEnqueueAnAddress('bcc', $address, $name); } /** - * Add a "Reply-to" address. - * @param string $address + * Add a "Reply-To" address. + * @param string $address The email address to reply to * @param string $name - * @return bool + * @return boolean true on success, false if address already used or invalid in some way */ public function addReplyTo($address, $name = '') { - return $this->addAnAddress('Reply-To', $address, $name); + return $this->addOrEnqueueAnAddress('Reply-To', $address, $name); } /** - * Add an address to one of the recipient arrays. - * Addresses that have been added already return false, but do not throw exceptions - * @param string $kind One of 'to', 'cc', 'bcc', 'ReplyTo' - * @param string $address The email address to send to + * Add an address to one of the recipient arrays or to the ReplyTo array. Because PHPMailer + * can't validate addresses with an IDN without knowing the PHPMailer::$CharSet (that can still + * be modified after calling this function), addition of such addresses is delayed until send(). + * Addresses that have been added already return false, but do not throw exceptions. + * @param string $kind One of 'to', 'cc', 'bcc', or 'ReplyTo' + * @param string $address The email address to send, resp. to reply to * @param string $name * @throws phpmailerException - * @return bool true on success, false if address already used or invalid in some way + * @return boolean true on success, false if address already used or invalid in some way + * @access protected + */ + protected function addOrEnqueueAnAddress($kind, $address, $name) + { + $address = trim($address); + $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim + if (($pos = strrpos($address, '@')) === false) { + // At-sign is misssing. + $error_message = $this->lang('invalid_address') . $address; + $this->setError($error_message); + $this->edebug($error_message); + if ($this->exceptions) { + throw new phpmailerException($error_message); + } + return false; + } + $params = array($kind, $address, $name); + // Enqueue addresses with IDN until we know the PHPMailer::$CharSet. + if ($this->has8bitChars(substr($address, ++$pos)) and $this->idnSupported()) { + if ($kind != 'Reply-To') { + if (!array_key_exists($address, $this->RecipientsQueue)) { + $this->RecipientsQueue[$address] = $params; + return true; + } + } else { + if (!array_key_exists($address, $this->ReplyToQueue)) { + $this->ReplyToQueue[$address] = $params; + return true; + } + } + return false; + } + // Immediately add standard addresses without IDN. + return call_user_func_array(array($this, 'addAnAddress'), $params); + } + + /** + * Add an address to one of the recipient arrays or to the ReplyTo array. + * Addresses that have been added already return false, but do not throw exceptions. + * @param string $kind One of 'to', 'cc', 'bcc', or 'ReplyTo' + * @param string $address The email address to send, resp. to reply to + * @param string $name + * @throws phpmailerException + * @return boolean true on success, false if address already used or invalid in some way * @access protected */ protected function addAnAddress($kind, $address, $name = '') { - if (!preg_match('/^(to|cc|bcc|Reply-To)$/', $kind)) { - $this->setError($this->lang('Invalid recipient array') . ': ' . $kind); + if (!in_array($kind, array('to', 'cc', 'bcc', 'Reply-To'))) { + $error_message = $this->lang('Invalid recipient kind: ') . $kind; + $this->setError($error_message); + $this->edebug($error_message); if ($this->exceptions) { - throw new phpmailerException('Invalid recipient array: ' . $kind); + throw new phpmailerException($error_message); } - $this->edebug($this->lang('Invalid recipient array') . ': ' . $kind); return false; } - $address = trim($address); - $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim if (!$this->validateAddress($address)) { - $this->setError($this->lang('invalid_address') . ': ' . $address); + $error_message = $this->lang('invalid_address') . $address; + $this->setError($error_message); + $this->edebug($error_message); if ($this->exceptions) { - throw new phpmailerException($this->lang('invalid_address') . ': ' . $address); + throw new phpmailerException($error_message); } - $this->edebug($this->lang('invalid_address') . ': ' . $address); return false; } if ($kind != 'Reply-To') { - if (!isset($this->all_recipients[strtolower($address)])) { + if (!array_key_exists(strtolower($address), $this->all_recipients)) { array_push($this->$kind, array($address, $name)); $this->all_recipients[strtolower($address)] = true; return true; @@ -783,20 +927,24 @@ class PHPMailer * Set the From and FromName properties. * @param string $address * @param string $name - * @param bool $auto Whether to also set the Sender address, defaults to true + * @param boolean $auto Whether to also set the Sender address, defaults to true * @throws phpmailerException - * @return bool + * @return boolean */ public function setFrom($address, $name = '', $auto = true) { $address = trim($address); $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim - if (!$this->validateAddress($address)) { - $this->setError($this->lang('invalid_address') . ': ' . $address); + // Don't validate now addresses with IDN. Will be done in send(). + if (($pos = strrpos($address, '@')) === false or + (!$this->has8bitChars(substr($address, ++$pos)) or !$this->idnSupported()) and + !$this->validateAddress($address)) { + $error_message = $this->lang('invalid_address') . $address; + $this->setError($error_message); + $this->edebug($error_message); if ($this->exceptions) { - throw new phpmailerException($this->lang('invalid_address') . ': ' . $address); + throw new phpmailerException($error_message); } - $this->edebug($this->lang('invalid_address') . ': ' . $address); return false; } $this->From = $address; @@ -825,27 +973,35 @@ class PHPMailer * Check that a string looks like an email address. * @param string $address The email address to check * @param string $patternselect A selector for the validation pattern to use : - * 'auto' - pick best one automatically; - * 'pcre8' - use the squiloople.com pattern, requires PCRE > 8.0, PHP >= 5.3.2, 5.2.14; - * 'pcre' - use old PCRE implementation; - * 'php' - use PHP built-in FILTER_VALIDATE_EMAIL; faster, less thorough; - * 'noregex' - super fast, really dumb. - * @return bool + * * `auto` Pick best pattern automatically; + * * `pcre8` Use the squiloople.com pattern, requires PCRE > 8.0, PHP >= 5.3.2, 5.2.14; + * * `pcre` Use old PCRE implementation; + * * `php` Use PHP built-in FILTER_VALIDATE_EMAIL; + * * `html5` Use the pattern given by the HTML5 spec for 'email' type form input elements. + * * `noregex` Don't use a regex: super fast, really dumb. + * @return boolean * @static * @access public */ public static function validateAddress($address, $patternselect = 'auto') { - if ($patternselect == 'auto') { - if (defined( - 'PCRE_VERSION' - ) - ) { //Check this instead of extension_loaded so it works when that function is disabled - if (version_compare(PCRE_VERSION, '8.0') >= 0) { + //Reject line breaks in addresses; it's valid RFC5322, but not RFC5321 + if (strpos($address, "\n") !== false or strpos($address, "\r") !== false) { + return false; + } + if (!$patternselect or $patternselect == 'auto') { + //Check this constant first so it works when extension_loaded() is disabled by safe mode + //Constant was added in PHP 5.2.4 + if (defined('PCRE_VERSION')) { + //This pattern can get stuck in a recursive loop in PCRE <= 8.0.2 + if (version_compare(PCRE_VERSION, '8.0.3') >= 0) { $patternselect = 'pcre8'; } else { $patternselect = 'pcre'; } + } elseif (function_exists('extension_loaded') and extension_loaded('pcre')) { + //Fall back to older PCRE + $patternselect = 'pcre'; } else { //Filter_var appeared in PHP 5.2.0 and does not require the PCRE extension if (version_compare(PHP_VERSION, '5.2.0') >= 0) { @@ -858,14 +1014,12 @@ class PHPMailer switch ($patternselect) { case 'pcre8': /** - * Conforms to RFC5322: Uses *correct* regex on which FILTER_VALIDATE_EMAIL is - * based; So why not use FILTER_VALIDATE_EMAIL? Because it was broken to - * not allow a@b type valid addresses :( + * Uses the same RFC5322 regex on which FILTER_VALIDATE_EMAIL is based, but allows dotless domains. * @link http://squiloople.com/2009/12/20/email-address-validation/ * @copyright 2009-2010 Michael Rushton * Feel free to use and redistribute this code. But please keep this copyright notice. */ - return (bool)preg_match( + return (boolean)preg_match( '/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)' . '((?>(?>(?>((?>(?>(?>\x0D\x0A)?[\t ])+|(?>[\t ]*\x0D\x0A)?[\t ]+)?)($(?>(?2)' . '(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)$))+(?2))|(?2))?)' . @@ -877,10 +1031,9 @@ class PHPMailer '|[1-9]?[0-9])(?>\.(?9)){3}))\])(?1)$/isD', $address ); - break; case 'pcre': //An older regex that doesn't need a recent PCRE - return (bool)preg_match( + return (boolean)preg_match( '/^(?!(?>"?(?>\\\[ -~]|[^"])"?){255,})(?!(?>"?(?>\\\[ -~]|[^"])"?){65,}@)(?>' . '[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*")' . '(?>\.(?>[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*"))*' . @@ -893,27 +1046,75 @@ class PHPMailer '|[1-9]?[0-9])(?>\.(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}))\])$/isD', $address ); - break; - case 'php': - default: - return (bool)filter_var($address, FILTER_VALIDATE_EMAIL); - break; + case 'html5': + /** + * This is the pattern used in the HTML5 spec for validation of 'email' type form input elements. + * @link http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email) + */ + return (boolean)preg_match( + '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}' . + '[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/sD', + $address + ); case 'noregex': //No PCRE! Do something _very_ approximate! //Check the address is 3 chars or longer and contains an @ that's not the first or last char return (strlen($address) >= 3 and strpos($address, '@') >= 1 and strpos($address, '@') != strlen($address) - 1); - break; + case 'php': + default: + return (boolean)filter_var($address, FILTER_VALIDATE_EMAIL); + } + } + + /** + * Tells whether IDNs (Internationalized Domain Names) are supported or not. This requires the + * "intl" and "mbstring" PHP extensions. + * @return bool "true" if required functions for IDN support are present + */ + public function idnSupported() + { + // @TODO: Write our own "idn_to_ascii" function for PHP <= 5.2. + return function_exists('idn_to_ascii') and function_exists('mb_convert_encoding'); + } + + /** + * Converts IDN in given email address to its ASCII form, also known as punycode, if possible. + * Important: Address must be passed in same encoding as currently set in PHPMailer::$CharSet. + * This function silently returns unmodified address if: + * - No conversion is necessary (i.e. domain name is not an IDN, or is already in ASCII form) + * - Conversion to punycode is impossible (e.g. required PHP functions are not available) + * or fails for any reason (e.g. domain has characters not allowed in an IDN) + * @see PHPMailer::$CharSet + * @param string $address The email address to convert + * @return string The encoded address in ASCII form + */ + public function punyencodeAddress($address) + { + // Verify we have required functions, CharSet, and at-sign. + if ($this->idnSupported() and + !empty($this->CharSet) and + ($pos = strrpos($address, '@')) !== false) { + $domain = substr($address, ++$pos); + // Verify CharSet string is a valid one, and domain properly encoded in this CharSet. + if ($this->has8bitChars($domain) and @mb_check_encoding($domain, $this->CharSet)) { + $domain = mb_convert_encoding($domain, 'UTF-8', $this->CharSet); + if (($punycode = defined('INTL_IDNA_VARIANT_UTS46') ? + idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46) : + idn_to_ascii($domain)) !== false) { + return substr($address, 0, $pos) . $punycode; + } + } } + return $address; } /** * Create a message and send it. * Uses the sending method specified by $Mailer. - * Returns false on error - Use the ErrorInfo variable to view description of the error. * @throws phpmailerException - * @return bool + * @return boolean false on error - See the ErrorInfo property for details of the error. */ public function send() { @@ -922,11 +1123,11 @@ class PHPMailer return false; } return $this->postSend(); - } catch (phpmailerException $e) { + } catch (phpmailerException $exc) { $this->mailHeader = ''; - $this->setError($e->getMessage()); + $this->setError($exc->getMessage()); if ($this->exceptions) { - throw $e; + throw $exc; } return false; } @@ -935,38 +1136,67 @@ class PHPMailer /** * Prepare a message for sending. * @throws phpmailerException - * @return bool + * @return boolean */ public function preSend() { try { - $this->mailHeader = ""; + $this->error_count = 0; // Reset errors + $this->mailHeader = ''; + + // Dequeue recipient and Reply-To addresses with IDN + foreach (array_merge($this->RecipientsQueue, $this->ReplyToQueue) as $params) { + $params[1] = $this->punyencodeAddress($params[1]); + call_user_func_array(array($this, 'addAnAddress'), $params); + } if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) { throw new phpmailerException($this->lang('provide_address'), self::STOP_CRITICAL); } + // Validate From, Sender, and ConfirmReadingTo addresses + foreach (array('From', 'Sender', 'ConfirmReadingTo') as $address_kind) { + $this->$address_kind = trim($this->$address_kind); + if (empty($this->$address_kind)) { + continue; + } + $this->$address_kind = $this->punyencodeAddress($this->$address_kind); + if (!$this->validateAddress($this->$address_kind)) { + $error_message = $this->lang('invalid_address') . $this->$address_kind; + $this->setError($error_message); + $this->edebug($error_message); + if ($this->exceptions) { + throw new phpmailerException($error_message); + } + return false; + } + } + // Set whether the message is multipart/alternative if (!empty($this->AltBody)) { $this->ContentType = 'multipart/alternative'; } - $this->error_count = 0; // reset errors $this->setMessageType(); // Refuse to send an empty message unless we are specifically allowing it if (!$this->AllowEmpty and empty($this->Body)) { throw new phpmailerException($this->lang('empty_message'), self::STOP_CRITICAL); } - $this->MIMEHeader = $this->createHeader(); + // Create body before headers in case body makes changes to headers (e.g. altering transfer encoding) + $this->MIMEHeader = ''; $this->MIMEBody = $this->createBody(); + // createBody may have added some headers, so retain them + $tempheaders = $this->MIMEHeader; + $this->MIMEHeader = $this->createHeader(); + $this->MIMEHeader .= $tempheaders; // To capture the complete message when using mail(), create // an extra header list which createHeader() doesn't fold in if ($this->Mailer == 'mail') { if (count($this->to) > 0) { - $this->mailHeader .= $this->addrAppend("To", $this->to); + $this->mailHeader .= $this->addrAppend('To', $this->to); } else { - $this->mailHeader .= $this->headerLine("To", "undisclosed-recipients:;"); + $this->mailHeader .= $this->headerLine('To', 'undisclosed-recipients:;'); } $this->mailHeader .= $this->headerLine( 'Subject', @@ -978,7 +1208,6 @@ class PHPMailer if (!empty($this->DKIM_domain) && !empty($this->DKIM_private) && !empty($this->DKIM_selector) - && !empty($this->DKIM_domain) && file_exists($this->DKIM_private)) { $header_dkim = $this->DKIM_Add( $this->MIMEHeader . $this->mailHeader, @@ -989,11 +1218,10 @@ class PHPMailer str_replace("\r\n", "\n", $header_dkim) . self::CRLF; } return true; - - } catch (phpmailerException $e) { - $this->setError($e->getMessage()); + } catch (phpmailerException $exc) { + $this->setError($exc->getMessage()); if ($this->exceptions) { - throw $e; + throw $exc; } return false; } @@ -1003,7 +1231,7 @@ class PHPMailer * Actually send a message. * Send the email via the selected mechanism * @throws phpmailerException - * @return bool + * @return boolean */ public function postSend() { @@ -1011,20 +1239,26 @@ class PHPMailer // Choose the mailer and send through it switch ($this->Mailer) { case 'sendmail': + case 'qmail': return $this->sendmailSend($this->MIMEHeader, $this->MIMEBody); case 'smtp': return $this->smtpSend($this->MIMEHeader, $this->MIMEBody); case 'mail': return $this->mailSend($this->MIMEHeader, $this->MIMEBody); default: + $sendMethod = $this->Mailer.'Send'; + if (method_exists($this, $sendMethod)) { + return $this->$sendMethod($this->MIMEHeader, $this->MIMEBody); + } + return $this->mailSend($this->MIMEHeader, $this->MIMEBody); } - } catch (phpmailerException $e) { - $this->setError($e->getMessage()); + } catch (phpmailerException $exc) { + $this->setError($exc->getMessage()); + $this->edebug($exc->getMessage()); if ($this->exceptions) { - throw $e; + throw $exc; } - $this->edebug($e->getMessage() . "\n"); } return false; } @@ -1036,27 +1270,41 @@ class PHPMailer * @see PHPMailer::$Sendmail * @throws phpmailerException * @access protected - * @return bool + * @return boolean */ protected function sendmailSend($header, $body) { if ($this->Sender != '') { - $sendmail = sprintf("%s -oi -f%s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender)); + if ($this->Mailer == 'qmail') { + $sendmail = sprintf('%s -f%s', escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender)); + } else { + $sendmail = sprintf('%s -oi -f%s -t', escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender)); + } } else { - $sendmail = sprintf("%s -oi -t", escapeshellcmd($this->Sendmail)); + if ($this->Mailer == 'qmail') { + $sendmail = sprintf('%s', escapeshellcmd($this->Sendmail)); + } else { + $sendmail = sprintf('%s -oi -t', escapeshellcmd($this->Sendmail)); + } } - if ($this->SingleTo === true) { - foreach ($this->SingleToArray as $val) { + if ($this->SingleTo) { + foreach ($this->SingleToArray as $toAddr) { if (!@$mail = popen($sendmail, 'w')) { throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL); } - fputs($mail, "To: " . $val . "\n"); + fputs($mail, 'To: ' . $toAddr . "\n"); fputs($mail, $header); fputs($mail, $body); $result = pclose($mail); - // implement call back function if it exists - $isSent = ($result == 0) ? 1 : 0; - $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body, $this->From); + $this->doCallback( + ($result == 0), + array($toAddr), + $this->cc, + $this->bcc, + $this->Subject, + $body, + $this->From + ); if ($result != 0) { throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL); } @@ -1068,9 +1316,15 @@ class PHPMailer fputs($mail, $header); fputs($mail, $body); $result = pclose($mail); - // implement call back function if it exists - $isSent = ($result == 0) ? 1 : 0; - $this->doCallback($isSent, $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From); + $this->doCallback( + ($result == 0), + $this->to, + $this->cc, + $this->bcc, + $this->Subject, + $body, + $this->From + ); if ($result != 0) { throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL); } @@ -1085,43 +1339,39 @@ class PHPMailer * @link http://www.php.net/manual/en/book.mail.php * @throws phpmailerException * @access protected - * @return bool + * @return boolean */ protected function mailSend($header, $body) { $toArr = array(); - foreach ($this->to as $t) { - $toArr[] = $this->addrFormat($t); + foreach ($this->to as $toaddr) { + $toArr[] = $this->addrFormat($toaddr); } $to = implode(', ', $toArr); if (empty($this->Sender)) { - $params = " "; + $params = ' '; } else { - $params = sprintf("-f%s", $this->Sender); + $params = sprintf('-f%s', $this->Sender); } if ($this->Sender != '' and !ini_get('safe_mode')) { $old_from = ini_get('sendmail_from'); ini_set('sendmail_from', $this->Sender); } - $rt = false; - if ($this->SingleTo === true && count($toArr) > 1) { - foreach ($toArr as $val) { - $rt = $this->mailPassthru($val, $this->Subject, $body, $header, $params); - // implement call back function if it exists - $isSent = ($rt == 1) ? 1 : 0; - $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body, $this->From); + $result = false; + if ($this->SingleTo && count($toArr) > 1) { + foreach ($toArr as $toAddr) { + $result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params); + $this->doCallback($result, array($toAddr), $this->cc, $this->bcc, $this->Subject, $body, $this->From); } } else { - $rt = $this->mailPassthru($to, $this->Subject, $body, $header, $params); - // implement call back function if it exists - $isSent = ($rt == 1) ? 1 : 0; - $this->doCallback($isSent, $to, $this->cc, $this->bcc, $this->Subject, $body, $this->From); + $result = $this->mailPassthru($to, $this->Subject, $body, $header, $params); + $this->doCallback($result, $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From); } if (isset($old_from)) { ini_set('sendmail_from', $old_from); } - if (!$rt) { + if (!$result) { throw new phpmailerException($this->lang('instantiate'), self::STOP_CRITICAL); } return true; @@ -1135,7 +1385,7 @@ class PHPMailer public function getSMTPInstance() { if (!is_object($this->smtp)) { - require_once 'class-smtp.php'; + require_once( 'class-smtp.php' ); $this->smtp = new SMTP; } return $this->smtp; @@ -1151,62 +1401,59 @@ class PHPMailer * @throws phpmailerException * @uses SMTP * @access protected - * @return bool + * @return boolean */ protected function smtpSend($header, $body) { $bad_rcpt = array(); - - if (!$this->smtpConnect()) { + if (!$this->smtpConnect($this->SMTPOptions)) { throw new phpmailerException($this->lang('smtp_connect_failed'), self::STOP_CRITICAL); } - $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender; + if ('' == $this->Sender) { + $smtp_from = $this->From; + } else { + $smtp_from = $this->Sender; + } if (!$this->smtp->mail($smtp_from)) { $this->setError($this->lang('from_failed') . $smtp_from . ' : ' . implode(',', $this->smtp->getError())); throw new phpmailerException($this->ErrorInfo, self::STOP_CRITICAL); } - // Attempt to send attach all recipients - foreach ($this->to as $to) { - if (!$this->smtp->recipient($to[0])) { - $bad_rcpt[] = $to[0]; - $isSent = 0; - } else { - $isSent = 1; - } - $this->doCallback($isSent, $to[0], '', '', $this->Subject, $body, $this->From); - } - foreach ($this->cc as $cc) { - if (!$this->smtp->recipient($cc[0])) { - $bad_rcpt[] = $cc[0]; - $isSent = 0; - } else { - $isSent = 1; - } - $this->doCallback($isSent, '', $cc[0], '', $this->Subject, $body, $this->From); - } - foreach ($this->bcc as $bcc) { - if (!$this->smtp->recipient($bcc[0])) { - $bad_rcpt[] = $bcc[0]; - $isSent = 0; - } else { - $isSent = 1; + // Attempt to send to all recipients + foreach (array($this->to, $this->cc, $this->bcc) as $togroup) { + foreach ($togroup as $to) { + if (!$this->smtp->recipient($to[0])) { + $error = $this->smtp->getError(); + $bad_rcpt[] = array('to' => $to[0], 'error' => $error['detail']); + $isSent = false; + } else { + $isSent = true; + } + $this->doCallback($isSent, array($to[0]), array(), array(), $this->Subject, $body, $this->From); } - $this->doCallback($isSent, '', '', $bcc[0], $this->Subject, $body, $this->From); } - if (count($bad_rcpt) > 0) { //Create error message for any bad addresses - throw new phpmailerException($this->lang('recipients_failed') . implode(', ', $bad_rcpt)); - } - if (!$this->smtp->data($header . $body)) { + // Only send the DATA command if we have viable recipients + if ((count($this->all_recipients) > count($bad_rcpt)) and !$this->smtp->data($header . $body)) { throw new phpmailerException($this->lang('data_not_accepted'), self::STOP_CRITICAL); } - if ($this->SMTPKeepAlive == true) { + if ($this->SMTPKeepAlive) { $this->smtp->reset(); } else { $this->smtp->quit(); $this->smtp->close(); } + //Create error message for any bad addresses + if (count($bad_rcpt) > 0) { + $errstr = ''; + foreach ($bad_rcpt as $bad) { + $errstr .= $bad['to'] . ': ' . $bad['error']; + } + throw new phpmailerException( + $this->lang('recipients_failed') . $errstr, + self::STOP_CONTINUE + ); + } return true; } @@ -1217,7 +1464,7 @@ class PHPMailer * @uses SMTP * @access public * @throws phpmailerException - * @return bool + * @return boolean */ public function smtpConnect($options = array()) { @@ -1225,7 +1472,7 @@ class PHPMailer $this->smtp = $this->getSMTPInstance(); } - //Already connected? + // Already connected? if ($this->smtp->connected()) { return true; } @@ -1234,25 +1481,47 @@ class PHPMailer $this->smtp->setDebugLevel($this->SMTPDebug); $this->smtp->setDebugOutput($this->Debugoutput); $this->smtp->setVerp($this->do_verp); - $tls = ($this->SMTPSecure == 'tls'); - $ssl = ($this->SMTPSecure == 'ssl'); $hosts = explode(';', $this->Host); $lastexception = null; foreach ($hosts as $hostentry) { $hostinfo = array(); - $host = $hostentry; + if (!preg_match('/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*):?([0-9]*)$/', trim($hostentry), $hostinfo)) { + // Not a valid host entry + continue; + } + // $hostinfo[2]: optional ssl or tls prefix + // $hostinfo[3]: the hostname + // $hostinfo[4]: optional port number + // The host string prefix can temporarily override the current setting for SMTPSecure + // If it's not specified, the default value is used + $prefix = ''; + $secure = $this->SMTPSecure; + $tls = ($this->SMTPSecure == 'tls'); + if ('ssl' == $hostinfo[2] or ('' == $hostinfo[2] and 'ssl' == $this->SMTPSecure)) { + $prefix = 'ssl://'; + $tls = false; // Can't have SSL and TLS at the same time + $secure = 'ssl'; + } elseif ($hostinfo[2] == 'tls') { + $tls = true; + // tls doesn't use a prefix + $secure = 'tls'; + } + //Do we need the OpenSSL extension? + $sslext = defined('OPENSSL_ALGO_SHA1'); + if ('tls' === $secure or 'ssl' === $secure) { + //Check for an OpenSSL constant rather than using extension_loaded, which is sometimes disabled + if (!$sslext) { + throw new phpmailerException($this->lang('extension_missing').'openssl', self::STOP_CRITICAL); + } + } + $host = $hostinfo[3]; $port = $this->Port; - if (preg_match( - '/^(.+):([0-9]+)$/', - $hostentry, - $hostinfo - ) - ) { //If $hostentry contains 'address:port', override default - $host = $hostinfo[1]; - $port = $hostinfo[2]; + $tport = (integer)$hostinfo[4]; + if ($tport > 0 and $tport < 65536) { + $port = $tport; } - if ($this->smtp->connect(($ssl ? 'ssl://' : '') . $host, $port, $this->Timeout, $options)) { + if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) { try { if ($this->Helo) { $hello = $this->Helo; @@ -1260,12 +1529,19 @@ class PHPMailer $hello = $this->serverHostname(); } $this->smtp->hello($hello); - + //Automatically enable TLS encryption if: + // * it's not disabled + // * we have openssl extension + // * we are not already using SSL + // * the server offers STARTTLS + if ($this->SMTPAutoTLS and $sslext and $secure != 'ssl' and $this->smtp->getServerExt('STARTTLS')) { + $tls = true; + } if ($tls) { if (!$this->smtp->startTLS()) { throw new phpmailerException($this->lang('connect_host')); } - //We must resend HELO after tls negotiation + // We must resend HELO after tls negotiation $this->smtp->hello($hello); } if ($this->SMTPAuth) { @@ -1281,16 +1557,17 @@ class PHPMailer } } return true; - } catch (phpmailerException $e) { - $lastexception = $e; - //We must have connected, but then failed TLS or Auth, so close connection nicely + } catch (phpmailerException $exc) { + $lastexception = $exc; + $this->edebug($exc->getMessage()); + // We must have connected, but then failed TLS or Auth, so close connection nicely $this->smtp->quit(); } } } - //If we get here, all connection attempts have failed, so close connection hard + // If we get here, all connection attempts have failed, so close connection hard $this->smtp->close(); - //As we've caught all exceptions, just report whatever the last one was + // As we've caught all exceptions, just report whatever the last one was if ($this->exceptions and !is_null($lastexception)) { throw $lastexception; } @@ -1317,12 +1594,12 @@ class PHPMailer * The default language is English. * @param string $langcode ISO 639-1 2-character language code (e.g. French is "fr") * @param string $lang_path Path to the language file directory, with trailing separator (slash) - * @return bool + * @return boolean * @access public */ - public function setLanguage($langcode = 'en', $lang_path = 'language/') + public function setLanguage($langcode = 'en', $lang_path = '') { - //Define full set of translatable strings + // Define full set of translatable strings in English $PHPMAILER_LANG = array( 'authenticate' => 'SMTP Error: Could not authenticate.', 'connect_host' => 'SMTP Error: Could not connect to SMTP host.', @@ -1334,23 +1611,35 @@ class PHPMailer 'file_open' => 'File Error: Could not open file: ', 'from_failed' => 'The following From address failed: ', 'instantiate' => 'Could not instantiate mail function.', - 'invalid_address' => 'Invalid address', + 'invalid_address' => 'Invalid address: ', 'mailer_not_supported' => ' mailer is not supported.', 'provide_address' => 'You must provide at least one recipient email address.', 'recipients_failed' => 'SMTP Error: The following recipients failed: ', 'signing' => 'Signing Error: ', 'smtp_connect_failed' => 'SMTP connect() failed.', 'smtp_error' => 'SMTP server error: ', - 'variable_set' => 'Cannot set or reset variable: ' + 'variable_set' => 'Cannot set or reset variable: ', + 'extension_missing' => 'Extension missing: ' ); - //Overwrite language-specific strings. - //This way we'll never have missing translations - no more "language string failed to load"! - $l = true; - if ($langcode != 'en') { //There is no English translation file - $l = @include $lang_path . 'phpmailer.lang-' . $langcode . '.php'; + if (empty($lang_path)) { + // Calculate an absolute path so it can work if CWD is not here + $lang_path = dirname(__FILE__). DIRECTORY_SEPARATOR . 'language'. DIRECTORY_SEPARATOR; + } + $foundlang = true; + $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php'; + // There is no English translation file + if ($langcode != 'en') { + // Make sure language file path is readable + if (!is_readable($lang_file)) { + $foundlang = false; + } else { + // Overwrite language-specific strings. + // This way we'll never have missing translation keys. + $foundlang = include $lang_file; + } } $this->language = $PHPMAILER_LANG; - return ($l == true); //Returns false if language not found + return (boolean)$foundlang; // Returns false if language not found } /** @@ -1375,8 +1664,8 @@ class PHPMailer public function addrAppend($type, $addr) { $addresses = array(); - foreach ($addr as $a) { - $addresses[] = $this->addrFormat($a); + foreach ($addr as $address) { + $addresses[] = $this->addrFormat($address); } return $type . ': ' . implode(', ', $addresses) . $this->LE; } @@ -1393,9 +1682,9 @@ class PHPMailer if (empty($addr[1])) { // No name provided return $this->secureHeader($addr[0]); } else { - return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') . " <" . $this->secureHeader( + return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') . ' <' . $this->secureHeader( $addr[0] - ) . ">"; + ) . '>'; } } @@ -1406,47 +1695,54 @@ class PHPMailer * Original written by philippe. * @param string $message The message to wrap * @param integer $length The line length to wrap to - * @param bool $qp_mode Whether to run in Quoted-Printable mode + * @param boolean $qp_mode Whether to run in Quoted-Printable mode * @access public * @return string */ public function wrapText($message, $length, $qp_mode = false) { - $soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE; + if ($qp_mode) { + $soft_break = sprintf(' =%s', $this->LE); + } else { + $soft_break = $this->LE; + } // If utf-8 encoding is used, we will need to make sure we don't // split multibyte characters when we wrap - $is_utf8 = (strtolower($this->CharSet) == "utf-8"); + $is_utf8 = (strtolower($this->CharSet) == 'utf-8'); $lelen = strlen($this->LE); $crlflen = strlen(self::CRLF); $message = $this->fixEOL($message); + //Remove a trailing line break if (substr($message, -$lelen) == $this->LE) { $message = substr($message, 0, -$lelen); } - $line = explode($this->LE, $message); // Magic. We know fixEOL uses $LE + //Split message into lines + $lines = explode($this->LE, $message); + //Message will be rebuilt in here $message = ''; - for ($i = 0; $i < count($line); $i++) { - $line_part = explode(' ', $line[$i]); + foreach ($lines as $line) { + $words = explode(' ', $line); $buf = ''; - for ($e = 0; $e < count($line_part); $e++) { - $word = $line_part[$e]; + $firstword = true; + foreach ($words as $word) { if ($qp_mode and (strlen($word) > $length)) { $space_left = $length - strlen($buf) - $crlflen; - if ($e != 0) { + if (!$firstword) { if ($space_left > 20) { $len = $space_left; if ($is_utf8) { $len = $this->utf8CharBoundary($word, $len); - } elseif (substr($word, $len - 1, 1) == "=") { + } elseif (substr($word, $len - 1, 1) == '=') { $len--; - } elseif (substr($word, $len - 2, 1) == "=") { + } elseif (substr($word, $len - 2, 1) == '=') { $len -= 2; } $part = substr($word, 0, $len); $word = substr($word, $len); $buf .= ' ' . $part; - $message .= $buf . sprintf("=%s", self::CRLF); + $message .= $buf . sprintf('=%s', self::CRLF); } else { $message .= $buf . $soft_break; } @@ -1459,29 +1755,33 @@ class PHPMailer $len = $length; if ($is_utf8) { $len = $this->utf8CharBoundary($word, $len); - } elseif (substr($word, $len - 1, 1) == "=") { + } elseif (substr($word, $len - 1, 1) == '=') { $len--; - } elseif (substr($word, $len - 2, 1) == "=") { + } elseif (substr($word, $len - 2, 1) == '=') { $len -= 2; } $part = substr($word, 0, $len); $word = substr($word, $len); if (strlen($word) > 0) { - $message .= $part . sprintf("=%s", self::CRLF); + $message .= $part . sprintf('=%s', self::CRLF); } else { $buf = $part; } } } else { $buf_o = $buf; - $buf .= ($e == 0) ? $word : (' ' . $word); + if (!$firstword) { + $buf .= ' '; + } + $buf .= $word; if (strlen($buf) > $length and $buf_o != '') { $message .= $buf_o . $soft_break; $buf = $word; } } + $firstword = false; } $message .= $buf . self::CRLF; } @@ -1491,12 +1791,12 @@ class PHPMailer /** * Find the last character boundary prior to $maxLength in a utf-8 - * quoted (printable) encoded string. + * quoted-printable encoded string. * Original written by Colin Brown. * @access public * @param string $encodedText utf-8 QP text - * @param int $maxLength find last character boundary prior to this length - * @return int + * @param integer $maxLength Find the last character boundary prior to this length + * @return integer */ public function utf8CharBoundary($encodedText, $maxLength) { @@ -1504,23 +1804,27 @@ class PHPMailer $lookBack = 3; while (!$foundSplitPos) { $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack); - $encodedCharPos = strpos($lastChunk, "="); - if ($encodedCharPos !== false) { + $encodedCharPos = strpos($lastChunk, '='); + if (false !== $encodedCharPos) { // Found start of encoded character byte within $lookBack block. // Check the encoded byte value (the 2 chars after the '=') $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2); $dec = hexdec($hex); - if ($dec < 128) { // Single byte character. + if ($dec < 128) { + // Single byte character. // If the encoded char was found at pos 0, it will fit // otherwise reduce maxLength to start of the encoded char - $maxLength = ($encodedCharPos == 0) ? $maxLength : - $maxLength - ($lookBack - $encodedCharPos); + if ($encodedCharPos > 0) { + $maxLength = $maxLength - ($lookBack - $encodedCharPos); + } $foundSplitPos = true; - } elseif ($dec >= 192) { // First byte of a multi byte character + } elseif ($dec >= 192) { + // First byte of a multi byte character // Reduce maxLength to split at start of character $maxLength = $maxLength - ($lookBack - $encodedCharPos); $foundSplitPos = true; - } elseif ($dec < 192) { // Middle byte of a multi byte character, look further back + } elseif ($dec < 192) { + // Middle byte of a multi byte character, look further back $lookBack += 3; } } else { @@ -1531,9 +1835,11 @@ class PHPMailer return $maxLength; } - /** - * Set the body wrapping. + * Apply word wrapping to the message body. + * Wraps the message body to the number of chars set in the WordWrap property. + * You should only do this to plain-text bodies as wrapping HTML tags may break them. + * This is called automatically by createBody(), so you don't need to call it yourself. * @access public * @return void */ @@ -1565,38 +1871,25 @@ class PHPMailer { $result = ''; - // Set the boundaries - $uniq_id = md5(uniqid(time())); - $this->boundary[1] = 'b1_' . $uniq_id; - $this->boundary[2] = 'b2_' . $uniq_id; - $this->boundary[3] = 'b3_' . $uniq_id; - if ($this->MessageDate == '') { - $result .= $this->headerLine('Date', self::rfcDate()); - } else { - $result .= $this->headerLine('Date', $this->MessageDate); - } - - if ($this->ReturnPath) { - $result .= $this->headerLine('Return-Path', '<' . trim($this->ReturnPath) . '>'); - } elseif ($this->Sender == '') { - $result .= $this->headerLine('Return-Path', '<' . trim($this->From) . '>'); - } else { - $result .= $this->headerLine('Return-Path', '<' . trim($this->Sender) . '>'); + $this->MessageDate = self::rfcDate(); } + $result .= $this->headerLine('Date', $this->MessageDate); // To be created automatically by mail() - if ($this->Mailer != 'mail') { - if ($this->SingleTo === true) { - foreach ($this->to as $t) { - $this->SingleToArray[] = $this->addrFormat($t); + if ($this->SingleTo) { + if ($this->Mailer != 'mail') { + foreach ($this->to as $toaddr) { + $this->SingleToArray[] = $this->addrFormat($toaddr); } - } else { - if (count($this->to) > 0) { + } + } else { + if (count($this->to) > 0) { + if ($this->Mailer != 'mail') { $result .= $this->addrAppend('To', $this->to); - } elseif (count($this->cc) == 0) { - $result .= $this->headerLine('To', 'undisclosed-recipients:;'); } + } elseif (count($this->cc) == 0) { + $result .= $this->headerLine('To', 'undisclosed-recipients:;'); } } @@ -1608,7 +1901,11 @@ class PHPMailer } // sendmail and mail() extract Bcc from the header before sending - if ((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) { + if (( + $this->Mailer == 'sendmail' or $this->Mailer == 'qmail' or $this->Mailer == 'mail' + ) + and count($this->bcc) > 0 + ) { $result .= $this->addrAppend('Bcc', $this->bcc); } @@ -1624,14 +1921,16 @@ class PHPMailer if ($this->MessageID != '') { $this->lastMessageID = $this->MessageID; } else { - $this->lastMessageID = sprintf("<%s@%s>", $uniq_id, $this->ServerHostname()); + $this->lastMessageID = sprintf('<%s@%s>', $this->uniqueid, $this->serverHostname()); + } + $result .= $this->headerLine('Message-ID', $this->lastMessageID); + if (!is_null($this->Priority)) { + $result .= $this->headerLine('X-Priority', $this->Priority); } - $result .= $this->HeaderLine('Message-ID', $this->lastMessageID); - $result .= $this->headerLine('X-Priority', $this->Priority); if ($this->XMailer == '') { $result .= $this->headerLine( 'X-Mailer', - 'PHPMailer ' . $this->Version . ' (https://github.com/PHPMailer/PHPMailer/)' + 'PHPMailer ' . $this->Version . ' (https://github.com/PHPMailer/PHPMailer)' ); } else { $myXmailer = trim($this->XMailer); @@ -1641,14 +1940,14 @@ class PHPMailer } if ($this->ConfirmReadingTo != '') { - $result .= $this->headerLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>'); + $result .= $this->headerLine('Disposition-Notification-To', '<' . $this->ConfirmReadingTo . '>'); } // Add custom headers - for ($index = 0; $index < count($this->CustomHeader); $index++) { + foreach ($this->CustomHeader as $header) { $result .= $this->headerLine( - trim($this->CustomHeader[$index][0]), - $this->encodeHeader(trim($this->CustomHeader[$index][1])) + trim($header[0]), + $this->encodeHeader(trim($header[1])) ); } if (!$this->sign_key_file) { @@ -1667,6 +1966,7 @@ class PHPMailer public function getMailMIME() { $result = ''; + $ismultipart = true; switch ($this->message_type) { case 'inline': $result .= $this->headerLine('Content-Type', 'multipart/related;'); @@ -1687,11 +1987,20 @@ class PHPMailer default: // Catches case 'plain': and case '': $result .= $this->textLine('Content-Type: ' . $this->ContentType . '; charset=' . $this->CharSet); + $ismultipart = false; break; } - //RFC1341 part 5 says 7bit is assumed if not specified + // RFC1341 part 5 says 7bit is assumed if not specified if ($this->Encoding != '7bit') { - $result .= $this->headerLine('Content-Transfer-Encoding', $this->Encoding); + // RFC 2045 section 6.4 says multipart MIME parts may only use 7bit, 8bit or binary CTE + if ($ismultipart) { + if ($this->Encoding == '8bit') { + $result .= $this->headerLine('Content-Transfer-Encoding', '8bit'); + } + // The only remaining alternatives are quoted-printable and base64, which are both 7bit compatible + } else { + $result .= $this->headerLine('Content-Transfer-Encoding', $this->Encoding); + } } if ($this->Mailer != 'mail') { @@ -1704,8 +2013,8 @@ class PHPMailer /** * Returns the whole MIME message. * Includes complete headers and body. - * Only valid post PreSend(). - * @see PHPMailer::PreSend() + * Only valid post preSend(). + * @see PHPMailer::preSend() * @access public * @return string */ @@ -1714,7 +2023,6 @@ class PHPMailer return $this->MIMEHeader . $this->mailHeader . self::CRLF . $this->MIMEBody; } - /** * Assemble the message body. * Returns an empty string on failure. @@ -1725,6 +2033,11 @@ class PHPMailer public function createBody() { $body = ''; + //Create unique IDs and preset boundaries + $this->uniqueid = md5(uniqid(time())); + $this->boundary[1] = 'b1_' . $this->uniqueid; + $this->boundary[2] = 'b2_' . $this->uniqueid; + $this->boundary[3] = 'b3_' . $this->uniqueid; if ($this->sign_key_file) { $body .= $this->getMailMIME() . $this->LE; @@ -1732,37 +2045,67 @@ class PHPMailer $this->setWordWrap(); + $bodyEncoding = $this->Encoding; + $bodyCharSet = $this->CharSet; + //Can we do a 7-bit downgrade? + if ($bodyEncoding == '8bit' and !$this->has8bitChars($this->Body)) { + $bodyEncoding = '7bit'; + $bodyCharSet = 'us-ascii'; + } + //If lines are too long, change to quoted-printable transfer encoding + if (self::hasLineLongerThanMax($this->Body)) { + $this->Encoding = 'quoted-printable'; + $bodyEncoding = 'quoted-printable'; + } + + $altBodyEncoding = $this->Encoding; + $altBodyCharSet = $this->CharSet; + //Can we do a 7-bit downgrade? + if ($altBodyEncoding == '8bit' and !$this->has8bitChars($this->AltBody)) { + $altBodyEncoding = '7bit'; + $altBodyCharSet = 'us-ascii'; + } + //If lines are too long, change to quoted-printable transfer encoding + if (self::hasLineLongerThanMax($this->AltBody)) { + $altBodyEncoding = 'quoted-printable'; + } + //Use this as a preamble in all multipart message types + $mimepre = "This is a multi-part message in MIME format." . $this->LE . $this->LE; switch ($this->message_type) { case 'inline': - $body .= $this->getBoundary($this->boundary[1], '', '', ''); - $body .= $this->encodeString($this->Body, $this->Encoding); + $body .= $mimepre; + $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding); + $body .= $this->encodeString($this->Body, $bodyEncoding); $body .= $this->LE . $this->LE; $body .= $this->attachAll('inline', $this->boundary[1]); break; case 'attach': - $body .= $this->getBoundary($this->boundary[1], '', '', ''); - $body .= $this->encodeString($this->Body, $this->Encoding); + $body .= $mimepre; + $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding); + $body .= $this->encodeString($this->Body, $bodyEncoding); $body .= $this->LE . $this->LE; $body .= $this->attachAll('attachment', $this->boundary[1]); break; case 'inline_attach': + $body .= $mimepre; $body .= $this->textLine('--' . $this->boundary[1]); $body .= $this->headerLine('Content-Type', 'multipart/related;'); $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"'); $body .= $this->LE; - $body .= $this->getBoundary($this->boundary[2], '', '', ''); - $body .= $this->encodeString($this->Body, $this->Encoding); + $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, '', $bodyEncoding); + $body .= $this->encodeString($this->Body, $bodyEncoding); $body .= $this->LE . $this->LE; $body .= $this->attachAll('inline', $this->boundary[2]); $body .= $this->LE; $body .= $this->attachAll('attachment', $this->boundary[1]); break; case 'alt': - $body .= $this->getBoundary($this->boundary[1], '', 'text/plain', ''); - $body .= $this->encodeString($this->AltBody, $this->Encoding); + $body .= $mimepre; + $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding); + $body .= $this->encodeString($this->AltBody, $altBodyEncoding); $body .= $this->LE . $this->LE; - $body .= $this->getBoundary($this->boundary[1], '', 'text/html', ''); - $body .= $this->encodeString($this->Body, $this->Encoding); + $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, 'text/html', $bodyEncoding); + $body .= $this->encodeString($this->Body, $bodyEncoding); $body .= $this->LE . $this->LE; if (!empty($this->Ical)) { $body .= $this->getBoundary($this->boundary[1], '', 'text/calendar; method=REQUEST', ''); @@ -1772,49 +2115,52 @@ class PHPMailer $body .= $this->endBoundary($this->boundary[1]); break; case 'alt_inline': - $body .= $this->getBoundary($this->boundary[1], '', 'text/plain', ''); - $body .= $this->encodeString($this->AltBody, $this->Encoding); + $body .= $mimepre; + $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding); + $body .= $this->encodeString($this->AltBody, $altBodyEncoding); $body .= $this->LE . $this->LE; $body .= $this->textLine('--' . $this->boundary[1]); $body .= $this->headerLine('Content-Type', 'multipart/related;'); $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"'); $body .= $this->LE; - $body .= $this->getBoundary($this->boundary[2], '', 'text/html', ''); - $body .= $this->encodeString($this->Body, $this->Encoding); + $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding); + $body .= $this->encodeString($this->Body, $bodyEncoding); $body .= $this->LE . $this->LE; $body .= $this->attachAll('inline', $this->boundary[2]); $body .= $this->LE; $body .= $this->endBoundary($this->boundary[1]); break; case 'alt_attach': + $body .= $mimepre; $body .= $this->textLine('--' . $this->boundary[1]); $body .= $this->headerLine('Content-Type', 'multipart/alternative;'); $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"'); $body .= $this->LE; - $body .= $this->getBoundary($this->boundary[2], '', 'text/plain', ''); - $body .= $this->encodeString($this->AltBody, $this->Encoding); + $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding); + $body .= $this->encodeString($this->AltBody, $altBodyEncoding); $body .= $this->LE . $this->LE; - $body .= $this->getBoundary($this->boundary[2], '', 'text/html', ''); - $body .= $this->encodeString($this->Body, $this->Encoding); + $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding); + $body .= $this->encodeString($this->Body, $bodyEncoding); $body .= $this->LE . $this->LE; $body .= $this->endBoundary($this->boundary[2]); $body .= $this->LE; $body .= $this->attachAll('attachment', $this->boundary[1]); break; case 'alt_inline_attach': + $body .= $mimepre; $body .= $this->textLine('--' . $this->boundary[1]); $body .= $this->headerLine('Content-Type', 'multipart/alternative;'); $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"'); $body .= $this->LE; - $body .= $this->getBoundary($this->boundary[2], '', 'text/plain', ''); - $body .= $this->encodeString($this->AltBody, $this->Encoding); + $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding); + $body .= $this->encodeString($this->AltBody, $altBodyEncoding); $body .= $this->LE . $this->LE; $body .= $this->textLine('--' . $this->boundary[2]); $body .= $this->headerLine('Content-Type', 'multipart/related;'); $body .= $this->textLine("\tboundary=\"" . $this->boundary[3] . '"'); $body .= $this->LE; - $body .= $this->getBoundary($this->boundary[3], '', 'text/html', ''); - $body .= $this->encodeString($this->Body, $this->Encoding); + $body .= $this->getBoundary($this->boundary[3], $bodyCharSet, 'text/html', $bodyEncoding); + $body .= $this->encodeString($this->Body, $bodyEncoding); $body .= $this->LE . $this->LE; $body .= $this->attachAll('inline', $this->boundary[3]); $body .= $this->LE; @@ -1824,7 +2170,7 @@ class PHPMailer break; default: // catch case 'plain' and case '' - $body .= $this->encodeString($this->Body, $this->Encoding); + $body .= $this->encodeString($this->Body, $bodyEncoding); break; } @@ -1833,31 +2179,51 @@ class PHPMailer } elseif ($this->sign_key_file) { try { if (!defined('PKCS7_TEXT')) { - throw new phpmailerException($this->lang('signing') . ' OpenSSL extension missing.'); + throw new phpmailerException($this->lang('extension_missing') . 'openssl'); } + // @TODO would be nice to use php://temp streams here, but need to wrap for PHP < 5.1 $file = tempnam(sys_get_temp_dir(), 'mail'); - file_put_contents($file, $body); //TODO check this worked + if (false === file_put_contents($file, $body)) { + throw new phpmailerException($this->lang('signing') . ' Could not write temp file'); + } $signed = tempnam(sys_get_temp_dir(), 'signed'); - if (@openssl_pkcs7_sign( - $file, - $signed, - 'file://' . realpath($this->sign_cert_file), - array('file://' . realpath($this->sign_key_file), $this->sign_key_pass), - null - ) - ) { + //Workaround for PHP bug https://bugs.php.net/bug.php?id=69197 + if (empty($this->sign_extracerts_file)) { + $sign = @openssl_pkcs7_sign( + $file, + $signed, + 'file://' . realpath($this->sign_cert_file), + array('file://' . realpath($this->sign_key_file), $this->sign_key_pass), + null + ); + } else { + $sign = @openssl_pkcs7_sign( + $file, + $signed, + 'file://' . realpath($this->sign_cert_file), + array('file://' . realpath($this->sign_key_file), $this->sign_key_pass), + null, + PKCS7_DETACHED, + $this->sign_extracerts_file + ); + } + if ($sign) { @unlink($file); $body = file_get_contents($signed); @unlink($signed); + //The message returned by openssl contains both headers and body, so need to split them up + $parts = explode("\n\n", $body, 2); + $this->MIMEHeader .= $parts[0] . $this->LE . $this->LE; + $body = $parts[1]; } else { @unlink($file); @unlink($signed); throw new phpmailerException($this->lang('signing') . openssl_error_string()); } - } catch (phpmailerException $e) { + } catch (phpmailerException $exc) { $body = ''; if ($this->exceptions) { - throw $e; + throw $exc; } } } @@ -1886,9 +2252,12 @@ class PHPMailer $encoding = $this->Encoding; } $result .= $this->textLine('--' . $boundary); - $result .= sprintf("Content-Type: %s; charset=%s", $contentType, $charSet); + $result .= sprintf('Content-Type: %s; charset=%s', $contentType, $charSet); $result .= $this->LE; - $result .= $this->headerLine('Content-Transfer-Encoding', $encoding); + // RFC1341 part 5 says 7bit is assumed if not specified + if ($encoding != '7bit') { + $result .= $this->headerLine('Content-Transfer-Encoding', $encoding); + } $result .= $this->LE; return $result; @@ -1914,19 +2283,19 @@ class PHPMailer */ protected function setMessageType() { - $this->message_type = array(); + $type = array(); if ($this->alternativeExists()) { - $this->message_type[] = "alt"; + $type[] = 'alt'; } if ($this->inlineImageExists()) { - $this->message_type[] = "inline"; + $type[] = 'inline'; } if ($this->attachmentExists()) { - $this->message_type[] = "attach"; + $type[] = 'attach'; } - $this->message_type = implode("_", $this->message_type); - if ($this->message_type == "") { - $this->message_type = "plain"; + $this->message_type = implode('_', $type); + if ($this->message_type == '') { + $this->message_type = 'plain'; } } @@ -1962,7 +2331,7 @@ class PHPMailer * @param string $type File extension (MIME) type. * @param string $disposition Disposition to use * @throws phpmailerException - * @return bool + * @return boolean */ public function addAttachment($path, $name = '', $encoding = 'base64', $type = '', $disposition = 'attachment') { @@ -1971,7 +2340,7 @@ class PHPMailer throw new phpmailerException($this->lang('file_access') . $path, self::STOP_CONTINUE); } - //If a MIME type is not specified, try to work it out from the file name + // If a MIME type is not specified, try to work it out from the file name if ($type == '') { $type = self::filenameToType($path); } @@ -1992,12 +2361,12 @@ class PHPMailer 7 => 0 ); - } catch (phpmailerException $e) { - $this->setError($e->getMessage()); + } catch (phpmailerException $exc) { + $this->setError($exc->getMessage()); + $this->edebug($exc->getMessage()); if ($this->exceptions) { - throw $e; + throw $exc; } - $this->edebug($e->getMessage() . "\n"); return false; } return true; @@ -2051,22 +2420,34 @@ class PHPMailer $type = $attachment[4]; $disposition = $attachment[6]; $cid = $attachment[7]; - if ($disposition == 'inline' && isset($cidUniq[$cid])) { + if ($disposition == 'inline' && array_key_exists($cid, $cidUniq)) { continue; } $cidUniq[$cid] = true; - $mime[] = sprintf("--%s%s", $boundary, $this->LE); - $mime[] = sprintf( - "Content-Type: %s; name=\"%s\"%s", - $type, - $this->encodeHeader($this->secureHeader($name)), - $this->LE - ); - $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE); + $mime[] = sprintf('--%s%s', $boundary, $this->LE); + //Only include a filename property if we have one + if (!empty($name)) { + $mime[] = sprintf( + 'Content-Type: %s; name="%s"%s', + $type, + $this->encodeHeader($this->secureHeader($name)), + $this->LE + ); + } else { + $mime[] = sprintf( + 'Content-Type: %s%s', + $type, + $this->LE + ); + } + // RFC1341 part 5 says 7bit is assumed if not specified + if ($encoding != '7bit') { + $mime[] = sprintf('Content-Transfer-Encoding: %s%s', $encoding, $this->LE); + } if ($disposition == 'inline') { - $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE); + $mime[] = sprintf('Content-ID: <%s>%s', $cid, $this->LE); } // If a filename contains any of these chars, it should be quoted, @@ -2074,20 +2455,29 @@ class PHPMailer // Fixes a warning in IETF's msglint MIME checker // Allow for bypassing the Content-Disposition header totally if (!(empty($disposition))) { - if (preg_match('/[ <>@,;:\\"\/\[\]\?=]/', $name)) { + $encoded_name = $this->encodeHeader($this->secureHeader($name)); + if (preg_match('/[ <>@,;:\\"\/\[\]\?=]/', $encoded_name)) { $mime[] = sprintf( - "Content-Disposition: %s; filename=\"%s\"%s", + 'Content-Disposition: %s; filename="%s"%s', $disposition, - $this->encodeHeader($this->secureHeader($name)), + $encoded_name, $this->LE . $this->LE ); } else { - $mime[] = sprintf( - "Content-Disposition: %s; filename=%s%s", - $disposition, - $this->encodeHeader($this->secureHeader($name)), - $this->LE . $this->LE - ); + if (!empty($encoded_name)) { + $mime[] = sprintf( + 'Content-Disposition: %s; filename=%s%s', + $disposition, + $encoded_name, + $this->LE . $this->LE + ); + } else { + $mime[] = sprintf( + 'Content-Disposition: %s%s', + $disposition, + $this->LE . $this->LE + ); + } } } else { $mime[] = $this->LE; @@ -2110,9 +2500,9 @@ class PHPMailer } } - $mime[] = sprintf("--%s--%s", $boundary, $this->LE); + $mime[] = sprintf('--%s--%s', $boundary, $this->LE); - return implode("", $mime); + return implode('', $mime); } /** @@ -2121,7 +2511,6 @@ class PHPMailer * @param string $path The full path to the file * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable' * @throws phpmailerException - * @see EncodeFile(encodeFile * @access protected * @return string */ @@ -2134,9 +2523,12 @@ class PHPMailer $magic_quotes = get_magic_quotes_runtime(); if ($magic_quotes) { if (version_compare(PHP_VERSION, '5.3.0', '<')) { - set_magic_quotes_runtime(0); + set_magic_quotes_runtime(false); } else { - ini_set('magic_quotes_runtime', 0); + //Doesn't exist in PHP 5.4, but we don't need to check because + //get_magic_quotes_runtime always returns false in 5.4+ + //so it will never get here + ini_set('magic_quotes_runtime', false); } } $file_buffer = file_get_contents($path); @@ -2149,8 +2541,8 @@ class PHPMailer } } return $file_buffer; - } catch (Exception $e) { - $this->setError($e->getMessage()); + } catch (Exception $exc) { + $this->setError($exc->getMessage()); return ''; } } @@ -2173,7 +2565,7 @@ class PHPMailer case '7bit': case '8bit': $encoded = $this->fixEOL($str); - //Make sure it ends with a line break + // Make sure it ends with a line break if (substr($encoded, -(strlen($this->LE))) != $this->LE) { $encoded .= $this->LE; } @@ -2201,11 +2593,11 @@ class PHPMailer */ public function encodeHeader($str, $position = 'text') { - $x = 0; + $matchcount = 0; switch (strtolower($position)) { case 'phrase': if (!preg_match('/[\200-\377]/', $str)) { - // Can't use addslashes as we don't know what value has magic_quotes_sybase + // Can't use addslashes as we don't know the value of magic_quotes_sybase $encoded = addcslashes($str, "\0..\37\177\\\""); if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) { return ($encoded); @@ -2213,26 +2605,27 @@ class PHPMailer return ("\"$encoded\""); } } - $x = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches); + $matchcount = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches); break; /** @noinspection PhpMissingBreakStatementInspection */ case 'comment': - $x = preg_match_all('/[()"]/', $str, $matches); + $matchcount = preg_match_all('/[()"]/', $str, $matches); // Intentional fall-through case 'text': default: - $x += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches); + $matchcount += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches); break; } - if ($x == 0) { //There are no chars that need encoding + //There are no chars that need encoding + if ($matchcount == 0) { return ($str); } $maxlen = 75 - 7 - strlen($this->CharSet); // Try to select the encoding which should produce the shortest output - if ($x > strlen($str) / 3) { - //More than a third of the content will need encoding, so B encoding will be most efficient + if ($matchcount > strlen($str) / 3) { + // More than a third of the content will need encoding, so B encoding will be most efficient $encoding = 'B'; if (function_exists('mb_strlen') && $this->hasMultiBytes($str)) { // Use a custom function which correctly encodes and wraps long @@ -2250,7 +2643,7 @@ class PHPMailer $encoded = str_replace('=' . self::CRLF, "\n", trim($encoded)); } - $encoded = preg_replace('/^(.*)$/m', " =?" . $this->CharSet . "?$encoding?\\1?=", $encoded); + $encoded = preg_replace('/^(.*)$/m', ' =?' . $this->CharSet . "?$encoding?\\1?=", $encoded); $encoded = trim(str_replace("\n", $this->LE, $encoded)); return $encoded; @@ -2260,7 +2653,7 @@ class PHPMailer * Check if a string contains multi-byte characters. * @access public * @param string $str multi-byte text to wrap encode - * @return bool + * @return boolean */ public function hasMultiBytes($str) { @@ -2271,22 +2664,33 @@ class PHPMailer } } + /** + * Does a string contain any 8-bit chars (in any charset)? + * @param string $text + * @return boolean + */ + public function has8bitChars($text) + { + return (boolean)preg_match('/[\x80-\xFF]/', $text); + } + /** * Encode and wrap long multibyte strings for mail headers * without breaking lines within a character. - * Adapted from a function by paravoid at http://uk.php.net/manual/en/function.mb-encode-mimeheader.php + * Adapted from a function by paravoid + * @link http://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283 * @access public * @param string $str multi-byte text to wrap encode - * @param string $lf string to use as linefeed/end-of-line + * @param string $linebreak string to use as linefeed/end-of-line * @return string */ - public function base64EncodeWrapMB($str, $lf = null) + public function base64EncodeWrapMB($str, $linebreak = null) { - $start = "=?" . $this->CharSet . "?B?"; - $end = "?="; - $encoded = ""; - if ($lf === null) { - $lf = $this->LE; + $start = '=?' . $this->CharSet . '?B?'; + $end = '?='; + $encoded = ''; + if ($linebreak === null) { + $linebreak = $this->LE; } $mb_length = mb_strlen($str, $this->CharSet); @@ -2305,11 +2709,11 @@ class PHPMailer $chunk = base64_encode($chunk); $lookBack++; } while (strlen($chunk) > $length); - $encoded .= $chunk . $lf; + $encoded .= $chunk . $linebreak; } // Chomp the last linefeed - $encoded = substr($encoded, 0, -strlen($lf)); + $encoded = substr($encoded, 0, -strlen($linebreak)); return $encoded; } @@ -2320,21 +2724,21 @@ class PHPMailer * @param string $string The text to encode * @param integer $line_max Number of chars allowed on a line before wrapping * @return string - * @link PHP version adapted from http://www.php.net/manual/en/function.quoted-printable-decode.php#89417 + * @link http://www.php.net/manual/en/function.quoted-printable-decode.php#89417 Adapted from this comment */ public function encodeQP($string, $line_max = 76) { - if (function_exists('quoted_printable_encode')) { //Use native function if it's available (>= PHP5.3) + // Use native function if it's available (>= PHP5.3) + if (function_exists('quoted_printable_encode')) { return quoted_printable_encode($string); } - //Fall back to a pure PHP implementation + // Fall back to a pure PHP implementation $string = str_replace( array('%20', '%0D%0A.', '%0D%0A', '%'), array(' ', "\r\n=2E", "\r\n", '='), rawurlencode($string) ); - $string = preg_replace('/[^\r\n]{' . ($line_max - 3) . '}[^=\r\n]{2}/', "$0=\r\n", $string); - return $string; + return preg_replace('/[^\r\n]{' . ($line_max - 3) . '}[^=\r\n]{2}/', "$0=\r\n", $string); } /** @@ -2343,7 +2747,7 @@ class PHPMailer * @access public * @param string $string * @param integer $line_max - * @param bool $space_conv + * @param boolean $space_conv * @return string * @deprecated Use encodeQP instead. */ @@ -2365,45 +2769,44 @@ class PHPMailer */ public function encodeQ($str, $position = 'text') { - //There should not be any EOL in the string + // There should not be any EOL in the string $pattern = ''; $encoded = str_replace(array("\r", "\n"), '', $str); switch (strtolower($position)) { case 'phrase': - //RFC 2047 section 5.3 + // RFC 2047 section 5.3 $pattern = '^A-Za-z0-9!*+\/ -'; break; /** @noinspection PhpMissingBreakStatementInspection */ case 'comment': - //RFC 2047 section 5.2 + // RFC 2047 section 5.2 $pattern = '"'; - //intentional fall-through - //for this reason we build the $pattern without including delimiters and [] + // intentional fall-through + // for this reason we build the $pattern without including delimiters and [] case 'text': default: - //RFC 2047 section 5.1 - //Replace every high ascii, control, =, ? and _ characters + // RFC 2047 section 5.1 + // Replace every high ascii, control, =, ? and _ characters $pattern = '\000-\011\013\014\016-\037\075\077\137\177-\377' . $pattern; break; } $matches = array(); if (preg_match_all("/[{$pattern}]/", $encoded, $matches)) { - //If the string contains an '=', make sure it's the first thing we replace - //so as to avoid double-encoding - $s = array_search('=', $matches[0]); - if ($s !== false) { - unset($matches[0][$s]); + // If the string contains an '=', make sure it's the first thing we replace + // so as to avoid double-encoding + $eqkey = array_search('=', $matches[0]); + if (false !== $eqkey) { + unset($matches[0][$eqkey]); array_unshift($matches[0], '='); } foreach (array_unique($matches[0]) as $char) { $encoded = str_replace($char, '=' . sprintf('%02X', ord($char)), $encoded); } } - //Replace every spaces to _ (more readable than =20) + // Replace every spaces to _ (more readable than =20) return str_replace(' ', '_', $encoded); } - /** * Add a string or binary attachment (non-filesystem). * This method can be used to attach ascii or binary data, @@ -2422,7 +2825,7 @@ class PHPMailer $type = '', $disposition = 'attachment' ) { - //If a MIME type is not specified, try to work it out from the file name + // If a MIME type is not specified, try to work it out from the file name if ($type == '') { $type = self::filenameToType($filename); } @@ -2442,7 +2845,7 @@ class PHPMailer /** * Add an embedded (inline) attachment from a file. * This can include images, sounds, and just about any other document type. - * These differ from 'regular' attachmants in that they are intended to be + * These differ from 'regular' attachments in that they are intended to be * displayed inline with the message, not just attached for download. * This is used in HTML messages that embed the images * the HTML refers to using the $cid value. @@ -2453,7 +2856,7 @@ class PHPMailer * @param string $encoding File encoding (see $Encoding). * @param string $type File MIME type. * @param string $disposition Disposition to use - * @return bool True on successfully adding an attachment + * @return boolean True on successfully adding an attachment */ public function addEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = '', $disposition = 'inline') { @@ -2462,7 +2865,7 @@ class PHPMailer return false; } - //If a MIME type is not specified, try to work it out from the file name + // If a MIME type is not specified, try to work it out from the file name if ($type == '') { $type = self::filenameToType($path); } @@ -2498,7 +2901,7 @@ class PHPMailer * @param string $encoding File encoding (see $Encoding). * @param string $type MIME type. * @param string $disposition Disposition to use - * @return bool True on successfully adding an attachment + * @return boolean True on successfully adding an attachment */ public function addStringEmbeddedImage( $string, @@ -2508,8 +2911,8 @@ class PHPMailer $type = '', $disposition = 'inline' ) { - //If a MIME type is not specified, try to work it out from the name - if ($type == '') { + // If a MIME type is not specified, try to work it out from the name + if ($type == '' and !empty($name)) { $type = self::filenameToType($name); } @@ -2530,7 +2933,7 @@ class PHPMailer /** * Check if an inline attachment is present. * @access public - * @return bool + * @return boolean */ public function inlineImageExists() { @@ -2544,7 +2947,7 @@ class PHPMailer /** * Check if an attachment (non-inline) is present. - * @return bool + * @return boolean */ public function attachmentExists() { @@ -2558,13 +2961,29 @@ class PHPMailer /** * Check if this message has an alternative body set. - * @return bool + * @return boolean */ public function alternativeExists() { return !empty($this->AltBody); } + /** + * Clear queued addresses of given kind. + * @access protected + * @param string $kind 'to', 'cc', or 'bcc' + * @return void + */ + public function clearQueuedAddresses($kind) + { + $RecipientsQueue = $this->RecipientsQueue; + foreach ($RecipientsQueue as $address => $params) { + if ($params[0] == $kind) { + unset($this->RecipientsQueue[$address]); + } + } + } + /** * Clear all To recipients. * @return void @@ -2575,6 +2994,7 @@ class PHPMailer unset($this->all_recipients[strtolower($to[0])]); } $this->to = array(); + $this->clearQueuedAddresses('to'); } /** @@ -2587,6 +3007,7 @@ class PHPMailer unset($this->all_recipients[strtolower($cc[0])]); } $this->cc = array(); + $this->clearQueuedAddresses('cc'); } /** @@ -2599,6 +3020,7 @@ class PHPMailer unset($this->all_recipients[strtolower($bcc[0])]); } $this->bcc = array(); + $this->clearQueuedAddresses('bcc'); } /** @@ -2608,6 +3030,7 @@ class PHPMailer public function clearReplyTos() { $this->ReplyTo = array(); + $this->ReplyToQueue = array(); } /** @@ -2620,6 +3043,7 @@ class PHPMailer $this->cc = array(); $this->bcc = array(); $this->all_recipients = array(); + $this->RecipientsQueue = array(); } /** @@ -2651,8 +3075,17 @@ class PHPMailer $this->error_count++; if ($this->Mailer == 'smtp' and !is_null($this->smtp)) { $lasterror = $this->smtp->getError(); - if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) { - $msg .= '

' . $this->lang('smtp_error') . $lasterror['smtp_msg'] . "

\n"; + if (!empty($lasterror['error'])) { + $msg .= $this->lang('smtp_error') . $lasterror['error']; + if (!empty($lasterror['detail'])) { + $msg .= ' Detail: '. $lasterror['detail']; + } + if (!empty($lasterror['smtp_code'])) { + $msg .= ' SMTP code: ' . $lasterror['smtp_code']; + } + if (!empty($lasterror['smtp_code_ex'])) { + $msg .= ' Additional SMTP info: ' . $lasterror['smtp_code_ex']; + } } } $this->ErrorInfo = $msg; @@ -2666,8 +3099,8 @@ class PHPMailer */ public static function rfcDate() { - //Set the time zone to whatever the default is to avoid 500 errors - //Will default to UTC if it's not set properly in php.ini + // Set the time zone to whatever the default is to avoid 500 errors + // Will default to UTC if it's not set properly in php.ini date_default_timezone_set(@date_default_timezone_get()); return date('D, j M Y H:i:s O'); } @@ -2680,14 +3113,16 @@ class PHPMailer */ protected function serverHostname() { + $result = 'localhost.localdomain'; if (!empty($this->Hostname)) { $result = $this->Hostname; - } elseif (isset($_SERVER['SERVER_NAME'])) { + } elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) { $result = $_SERVER['SERVER_NAME']; - } else { - $result = 'localhost.localdomain'; + } elseif (function_exists('gethostname') && gethostname() !== false) { + $result = gethostname(); + } elseif (php_uname('n') !== false) { + $result = php_uname('n'); } - return $result; } @@ -2703,17 +3138,24 @@ class PHPMailer $this->setLanguage('en'); // set the default language } - if (isset($this->language[$key])) { + if (array_key_exists($key, $this->language)) { + if ($key == 'smtp_connect_failed') { + //Include a link to troubleshooting docs on SMTP connection failure + //this is by far the biggest cause of support questions + //but it's usually not PHPMailer's fault. + return $this->language[$key] . ' https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting'; + } return $this->language[$key]; } else { - return 'Language string failed to load: ' . $key; + //Return the key as a fallback + return $key; } } /** * Check if an error occurred. * @access public - * @return bool True if an error did occur. + * @return boolean True if an error did occur. */ public function isError() { @@ -2757,6 +3199,15 @@ class PHPMailer } } + /** + * Returns all custom headers. + * @return array + */ + public function getCustomHeaders() + { + return $this->CustomHeader; + } + /** * Create a message from an HTML string. * Automatically makes modifications for inline images and backgrounds @@ -2765,22 +3216,40 @@ class PHPMailer * @access public * @param string $message HTML message string * @param string $basedir baseline directory for path - * @param bool $advanced Whether to use the advanced HTML to text converter + * @param boolean|callable $advanced Whether to use the internal HTML to text converter + * or your own custom converter @see PHPMailer::html2text() * @return string $message */ public function msgHTML($message, $basedir = '', $advanced = false) { - preg_match_all("/(src|background)=[\"'](.*)[\"']/Ui", $message, $images); - if (isset($images[2])) { - foreach ($images[2] as $i => $url) { - // do not change urls for absolute images (thanks to corvuscorax) - if (!preg_match('#^[A-z]+://#', $url)) { + preg_match_all('/(src|background)=["\'](.*)["\']/Ui', $message, $images); + if (array_key_exists(2, $images)) { + foreach ($images[2] as $imgindex => $url) { + // Convert data URIs into embedded images + if (preg_match('#^data:(image[^;,]*)(;base64)?,#', $url, $match)) { + $data = substr($url, strpos($url, ',')); + if ($match[2]) { + $data = base64_decode($data); + } else { + $data = rawurldecode($data); + } + $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2 + if ($this->addStringEmbeddedImage($data, $cid, 'embed' . $imgindex, 'base64', $match[1])) { + $message = str_replace( + $images[0][$imgindex], + $images[1][$imgindex] . '="cid:' . $cid . '"', + $message + ); + } + } elseif (substr($url, 0, 4) !== 'cid:' && !preg_match('#^[A-z]+://#', $url)) { + // Do not change urls for absolute images (thanks to corvuscorax) + // Do not change urls that are already inline images $filename = basename($url); $directory = dirname($url); if ($directory == '.') { $directory = ''; } - $cid = md5($url) . '@phpmailer.0'; //RFC2392 S 2 + $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2 if (strlen($basedir) > 1 && substr($basedir, -1) != '/') { $basedir .= '/'; } @@ -2792,12 +3261,12 @@ class PHPMailer $cid, $filename, 'base64', - self::_mime_types(self::mb_pathinfo($filename, PATHINFO_EXTENSION)) + self::_mime_types((string)self::mb_pathinfo($filename, PATHINFO_EXTENSION)) ) ) { $message = preg_replace( - "/" . $images[1][$i] . "=[\"']" . preg_quote($url, '/') . "[\"']/Ui", - $images[1][$i] . "=\"cid:" . $cid . "\"", + '/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui', + $images[1][$imgindex] . '="cid:' . $cid . '"', $message ); } @@ -2805,27 +3274,40 @@ class PHPMailer } } $this->isHTML(true); - if (empty($this->AltBody)) { - $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . "\n\n"; - } - //Convert all message body line breaks to CRLF, makes quoted-printable encoding work much better + // Convert all message body line breaks to CRLF, makes quoted-printable encoding work much better $this->Body = $this->normalizeBreaks($message); $this->AltBody = $this->normalizeBreaks($this->html2text($message, $advanced)); + if (empty($this->AltBody)) { + $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . + self::CRLF . self::CRLF; + } return $this->Body; } /** * Convert an HTML string into plain text. + * This is used by msgHTML(). + * Note - older versions of this function used a bundled advanced converter + * which was been removed for license reasons in #232 + * Example usage: + *


+     * // Use default conversion
+     * $plain = $mail->html2text($html);
+     * // Use your own custom converter
+     * $plain = $mail->html2text($html, function($html) {
+     *     $converter = new MyHtml2text($html);
+     *     return $converter->get_text();
+     * });
+     *

* @param string $html The HTML text to convert - * @param bool $advanced Should this use the more complex html2text converter or just a simple one? + * @param boolean|callable $advanced Any boolean value to use the internal converter, + * or provide your own callable for custom conversion. * @return string */ public function html2text($html, $advanced = false) { - if ($advanced) { - require_once 'extras/class.html2text.php'; - $h = new html2text($html); - return $h->get_text(); + if (is_callable($advanced)) { + return call_user_func($advanced, $html); } return html_entity_decode( trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/si', '', $html))), @@ -2844,94 +3326,109 @@ class PHPMailer public static function _mime_types($ext = '') { $mimes = array( - 'xl' => 'application/excel', - 'hqx' => 'application/mac-binhex40', - 'cpt' => 'application/mac-compactpro', - 'bin' => 'application/macbinary', - 'doc' => 'application/msword', - 'word' => 'application/msword', + 'xl' => 'application/excel', + 'js' => 'application/javascript', + 'hqx' => 'application/mac-binhex40', + 'cpt' => 'application/mac-compactpro', + 'bin' => 'application/macbinary', + 'doc' => 'application/msword', + 'word' => 'application/msword', + 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + 'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template', + 'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template', + 'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow', + 'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation', + 'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide', + 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', + 'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template', + 'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12', + 'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12', 'class' => 'application/octet-stream', - 'dll' => 'application/octet-stream', - 'dms' => 'application/octet-stream', - 'exe' => 'application/octet-stream', - 'lha' => 'application/octet-stream', - 'lzh' => 'application/octet-stream', - 'psd' => 'application/octet-stream', - 'sea' => 'application/octet-stream', - 'so' => 'application/octet-stream', - 'oda' => 'application/oda', - 'pdf' => 'application/pdf', - 'ai' => 'application/postscript', - 'eps' => 'application/postscript', - 'ps' => 'application/postscript', - 'smi' => 'application/smil', - 'smil' => 'application/smil', - 'mif' => 'application/vnd.mif', - 'xls' => 'application/vnd.ms-excel', - 'ppt' => 'application/vnd.ms-powerpoint', + 'dll' => 'application/octet-stream', + 'dms' => 'application/octet-stream', + 'exe' => 'application/octet-stream', + 'lha' => 'application/octet-stream', + 'lzh' => 'application/octet-stream', + 'psd' => 'application/octet-stream', + 'sea' => 'application/octet-stream', + 'so' => 'application/octet-stream', + 'oda' => 'application/oda', + 'pdf' => 'application/pdf', + 'ai' => 'application/postscript', + 'eps' => 'application/postscript', + 'ps' => 'application/postscript', + 'smi' => 'application/smil', + 'smil' => 'application/smil', + 'mif' => 'application/vnd.mif', + 'xls' => 'application/vnd.ms-excel', + 'ppt' => 'application/vnd.ms-powerpoint', 'wbxml' => 'application/vnd.wap.wbxml', - 'wmlc' => 'application/vnd.wap.wmlc', - 'dcr' => 'application/x-director', - 'dir' => 'application/x-director', - 'dxr' => 'application/x-director', - 'dvi' => 'application/x-dvi', - 'gtar' => 'application/x-gtar', - 'php3' => 'application/x-httpd-php', - 'php4' => 'application/x-httpd-php', - 'php' => 'application/x-httpd-php', + 'wmlc' => 'application/vnd.wap.wmlc', + 'dcr' => 'application/x-director', + 'dir' => 'application/x-director', + 'dxr' => 'application/x-director', + 'dvi' => 'application/x-dvi', + 'gtar' => 'application/x-gtar', + 'php3' => 'application/x-httpd-php', + 'php4' => 'application/x-httpd-php', + 'php' => 'application/x-httpd-php', 'phtml' => 'application/x-httpd-php', - 'phps' => 'application/x-httpd-php-source', - 'js' => 'application/x-javascript', - 'swf' => 'application/x-shockwave-flash', - 'sit' => 'application/x-stuffit', - 'tar' => 'application/x-tar', - 'tgz' => 'application/x-tar', - 'xht' => 'application/xhtml+xml', + 'phps' => 'application/x-httpd-php-source', + 'swf' => 'application/x-shockwave-flash', + 'sit' => 'application/x-stuffit', + 'tar' => 'application/x-tar', + 'tgz' => 'application/x-tar', + 'xht' => 'application/xhtml+xml', 'xhtml' => 'application/xhtml+xml', - 'zip' => 'application/zip', - 'mid' => 'audio/midi', - 'midi' => 'audio/midi', - 'mp2' => 'audio/mpeg', - 'mp3' => 'audio/mpeg', - 'mpga' => 'audio/mpeg', - 'aif' => 'audio/x-aiff', - 'aifc' => 'audio/x-aiff', - 'aiff' => 'audio/x-aiff', - 'ram' => 'audio/x-pn-realaudio', - 'rm' => 'audio/x-pn-realaudio', - 'rpm' => 'audio/x-pn-realaudio-plugin', - 'ra' => 'audio/x-realaudio', - 'wav' => 'audio/x-wav', - 'bmp' => 'image/bmp', - 'gif' => 'image/gif', - 'jpeg' => 'image/jpeg', - 'jpe' => 'image/jpeg', - 'jpg' => 'image/jpeg', - 'png' => 'image/png', - 'tiff' => 'image/tiff', - 'tif' => 'image/tiff', - 'eml' => 'message/rfc822', - 'css' => 'text/css', - 'html' => 'text/html', - 'htm' => 'text/html', + 'zip' => 'application/zip', + 'mid' => 'audio/midi', + 'midi' => 'audio/midi', + 'mp2' => 'audio/mpeg', + 'mp3' => 'audio/mpeg', + 'mpga' => 'audio/mpeg', + 'aif' => 'audio/x-aiff', + 'aifc' => 'audio/x-aiff', + 'aiff' => 'audio/x-aiff', + 'ram' => 'audio/x-pn-realaudio', + 'rm' => 'audio/x-pn-realaudio', + 'rpm' => 'audio/x-pn-realaudio-plugin', + 'ra' => 'audio/x-realaudio', + 'wav' => 'audio/x-wav', + 'bmp' => 'image/bmp', + 'gif' => 'image/gif', + 'jpeg' => 'image/jpeg', + 'jpe' => 'image/jpeg', + 'jpg' => 'image/jpeg', + 'png' => 'image/png', + 'tiff' => 'image/tiff', + 'tif' => 'image/tiff', + 'eml' => 'message/rfc822', + 'css' => 'text/css', + 'html' => 'text/html', + 'htm' => 'text/html', 'shtml' => 'text/html', - 'log' => 'text/plain', - 'text' => 'text/plain', - 'txt' => 'text/plain', - 'rtx' => 'text/richtext', - 'rtf' => 'text/rtf', - 'xml' => 'text/xml', - 'xsl' => 'text/xml', - 'mpeg' => 'video/mpeg', - 'mpe' => 'video/mpeg', - 'mpg' => 'video/mpeg', - 'mov' => 'video/quicktime', - 'qt' => 'video/quicktime', - 'rv' => 'video/vnd.rn-realvideo', - 'avi' => 'video/x-msvideo', + 'log' => 'text/plain', + 'text' => 'text/plain', + 'txt' => 'text/plain', + 'rtx' => 'text/richtext', + 'rtf' => 'text/rtf', + 'vcf' => 'text/vcard', + 'vcard' => 'text/vcard', + 'xml' => 'text/xml', + 'xsl' => 'text/xml', + 'mpeg' => 'video/mpeg', + 'mpe' => 'video/mpeg', + 'mpg' => 'video/mpeg', + 'mov' => 'video/quicktime', + 'qt' => 'video/quicktime', + 'rv' => 'video/vnd.rn-realvideo', + 'avi' => 'video/x-msvideo', 'movie' => 'video/x-sgi-movie' ); - return (array_key_exists(strtolower($ext), $mimes) ? $mimes[strtolower($ext)]: 'application/octet-stream'); + if (array_key_exists(strtolower($ext), $mimes)) { + return $mimes[strtolower($ext)]; + } + return 'application/octet-stream'; } /** @@ -2943,9 +3440,9 @@ class PHPMailer */ public static function filenameToType($filename) { - //In case the path is a URL, strip any query string before getting extension + // In case the path is a URL, strip any query string before getting extension $qpos = strpos($filename, '?'); - if ($qpos !== false) { + if (false !== $qpos) { $filename = substr($filename, 0, $qpos); } $pathinfo = self::mb_pathinfo($filename); @@ -2966,37 +3463,34 @@ class PHPMailer public static function mb_pathinfo($path, $options = null) { $ret = array('dirname' => '', 'basename' => '', 'extension' => '', 'filename' => ''); - $m = array(); - preg_match('%^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^\.\\\\/]+?)|))[\\\\/\.]*$%im', $path, $m); - if (array_key_exists(1, $m)) { - $ret['dirname'] = $m[1]; - } - if (array_key_exists(2, $m)) { - $ret['basename'] = $m[2]; - } - if (array_key_exists(5, $m)) { - $ret['extension'] = $m[5]; - } - if (array_key_exists(3, $m)) { - $ret['filename'] = $m[3]; + $pathinfo = array(); + if (preg_match('%^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^\.\\\\/]+?)|))[\\\\/\.]*$%im', $path, $pathinfo)) { + if (array_key_exists(1, $pathinfo)) { + $ret['dirname'] = $pathinfo[1]; + } + if (array_key_exists(2, $pathinfo)) { + $ret['basename'] = $pathinfo[2]; + } + if (array_key_exists(5, $pathinfo)) { + $ret['extension'] = $pathinfo[5]; + } + if (array_key_exists(3, $pathinfo)) { + $ret['filename'] = $pathinfo[3]; + } } switch ($options) { case PATHINFO_DIRNAME: case 'dirname': return $ret['dirname']; - break; case PATHINFO_BASENAME: case 'basename': return $ret['basename']; - break; case PATHINFO_EXTENSION: case 'extension': return $ret['extension']; - break; case PATHINFO_FILENAME: case 'filename': return $ret['filename']; - break; default: return $ret; } @@ -3004,33 +3498,27 @@ class PHPMailer /** * Set or reset instance properties. - * + * You should avoid this function - it's more verbose, less efficient, more error-prone and + * harder to debug than setting properties directly. * Usage Example: - * $page->set('X-Priority', '3'); - * + * `$mail->set('SMTPSecure', 'tls');` + * is the same as: + * `$mail->SMTPSecure = 'tls';` * @access public - * @param string $name - * @param mixed $value - * NOTE: will not work with arrays, there are no arrays to set/reset - * @throws phpmailerException - * @return bool - * @todo Should this not be using __set() magic function? + * @param string $name The property name to set + * @param mixed $value The value to set the property to + * @return boolean + * @TODO Should this not be using the __set() magic function? */ public function set($name, $value = '') { - try { - if (isset($this->$name)) { - $this->$name = $value; - } else { - throw new phpmailerException($this->lang('variable_set') . $name, self::STOP_CRITICAL); - } - } catch (Exception $e) { - $this->setError($e->getMessage()); - if ($e->getCode() == self::STOP_CRITICAL) { - return false; - } + if (property_exists($this, $name)) { + $this->$name = $value; + return true; + } else { + $this->setError($this->lang('variable_set') . $name); + return false; } - return true; } /** @@ -3059,19 +3547,20 @@ class PHPMailer return preg_replace('/(\r\n|\r|\n)/ms', $breaktype, $text); } - /** - * Set the private key file and password for S/MIME signing. + * Set the public and private key files and password for S/MIME signing. * @access public * @param string $cert_filename * @param string $key_filename * @param string $key_pass Password for private key + * @param string $extracerts_filename Optional path to chain certificate */ - public function sign($cert_filename, $key_filename, $key_pass) + public function sign($cert_filename, $key_filename, $key_pass, $extracerts_filename = '') { $this->sign_cert_file = $cert_filename; $this->sign_key_file = $key_filename; $this->sign_key_pass = $key_pass; + $this->sign_extracerts_file = $extracerts_filename; } /** @@ -3088,7 +3577,7 @@ class PHPMailer if (((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E))) { $line .= $txt[$i]; } else { - $line .= "=" . sprintf("%02X", $ord); + $line .= '=' . sprintf('%02X', $ord); } } return $line; @@ -3097,15 +3586,15 @@ class PHPMailer /** * Generate a DKIM signature. * @access public - * @param string $s Header + * @param string $signHeader * @throws phpmailerException * @return string */ - public function DKIM_Sign($s) + public function DKIM_Sign($signHeader) { if (!defined('PKCS7_TEXT')) { if ($this->exceptions) { - throw new phpmailerException($this->lang("signing") . ' OpenSSL extension missing.'); + throw new phpmailerException($this->lang('extension_missing') . 'openssl'); } return ''; } @@ -3115,7 +3604,7 @@ class PHPMailer } else { $privKey = $privKeyStr; } - if (openssl_sign($s, $signature, $privKey)) { + if (openssl_sign($signHeader, $signature, $privKey)) { return base64_encode($signature); } return ''; @@ -3124,21 +3613,21 @@ class PHPMailer /** * Generate a DKIM canonicalization header. * @access public - * @param string $s Header + * @param string $signHeader Header * @return string */ - public function DKIM_HeaderC($s) + public function DKIM_HeaderC($signHeader) { - $s = preg_replace("/\r\n\s+/", " ", $s); - $lines = explode("\r\n", $s); + $signHeader = preg_replace('/\r\n\s+/', ' ', $signHeader); + $lines = explode("\r\n", $signHeader); foreach ($lines as $key => $line) { - list($heading, $value) = explode(":", $line, 2); + list($heading, $value) = explode(':', $line, 2); $heading = strtolower($heading); - $value = preg_replace("/\s+/", " ", $value); // Compress useless spaces - $lines[$key] = $heading . ":" . trim($value); // Don't forget to remove WSP around the value + $value = preg_replace('/\s+/', ' ', $value); // Compress useless spaces + $lines[$key] = $heading . ':' . trim($value); // Don't forget to remove WSP around the value } - $s = implode("\r\n", $lines); - return $s; + $signHeader = implode("\r\n", $lines); + return $signHeader; } /** @@ -3189,8 +3678,8 @@ class PHPMailer $to_header = $header; $current = 'to_header'; } else { - if ($current && strpos($header, ' =?') === 0) { - $current .= $header; + if (!empty($$current) && strpos($header, ' =?') === 0) { + $$current .= $header; } else { $current = ''; } @@ -3205,40 +3694,114 @@ class PHPMailer ); // Copied header fields (dkim-quoted-printable) $body = $this->DKIM_BodyC($body); $DKIMlen = strlen($body); // Length of body - $DKIMb64 = base64_encode(pack("H*", sha1($body))); // Base64 of packed binary SHA-1 hash of body - $ident = ($this->DKIM_identity == '') ? '' : " i=" . $this->DKIM_identity . ";"; - $dkimhdrs = "DKIM-Signature: v=1; a=" . - $DKIMsignatureType . "; q=" . - $DKIMquery . "; l=" . - $DKIMlen . "; s=" . + $DKIMb64 = base64_encode(pack('H*', sha1($body))); // Base64 of packed binary SHA-1 hash of body + if ('' == $this->DKIM_identity) { + $ident = ''; + } else { + $ident = ' i=' . $this->DKIM_identity . ';'; + } + $dkimhdrs = 'DKIM-Signature: v=1; a=' . + $DKIMsignatureType . '; q=' . + $DKIMquery . '; l=' . + $DKIMlen . '; s=' . $this->DKIM_selector . ";\r\n" . - "\tt=" . $DKIMtime . "; c=" . $DKIMcanonicalization . ";\r\n" . + "\tt=" . $DKIMtime . '; c=' . $DKIMcanonicalization . ";\r\n" . "\th=From:To:Subject;\r\n" . - "\td=" . $this->DKIM_domain . ";" . $ident . "\r\n" . + "\td=" . $this->DKIM_domain . ';' . $ident . "\r\n" . "\tz=$from\r\n" . "\t|$to\r\n" . "\t|$subject;\r\n" . "\tbh=" . $DKIMb64 . ";\r\n" . "\tb="; $toSign = $this->DKIM_HeaderC( - $from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs + $from_header . "\r\n" . + $to_header . "\r\n" . + $subject_header . "\r\n" . + $dkimhdrs ); $signed = $this->DKIM_Sign($toSign); return $dkimhdrs . $signed . "\r\n"; } + /** + * Detect if a string contains a line longer than the maximum line length allowed. + * @param string $str + * @return boolean + * @static + */ + public static function hasLineLongerThanMax($str) + { + //+2 to include CRLF line break for a 1000 total + return (boolean)preg_match('/^(.{'.(self::MAX_LINE_LENGTH + 2).',})/m', $str); + } + + /** + * Allows for public read access to 'to' property. + * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included. + * @access public + * @return array + */ + public function getToAddresses() + { + return $this->to; + } + + /** + * Allows for public read access to 'cc' property. + * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included. + * @access public + * @return array + */ + public function getCcAddresses() + { + return $this->cc; + } + + /** + * Allows for public read access to 'bcc' property. + * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included. + * @access public + * @return array + */ + public function getBccAddresses() + { + return $this->bcc; + } + + /** + * Allows for public read access to 'ReplyTo' property. + * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included. + * @access public + * @return array + */ + public function getReplyToAddresses() + { + return $this->ReplyTo; + } + + /** + * Allows for public read access to 'all_recipients' property. + * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included. + * @access public + * @return array + */ + public function getAllRecipientAddresses() + { + return $this->all_recipients; + } + /** * Perform a callback. - * @param bool $isSent - * @param string $to - * @param string $cc - * @param string $bcc + * @param boolean $isSent + * @param array $to + * @param array $cc + * @param array $bcc * @param string $subject * @param string $body * @param string $from */ - protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from = null) + protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from) { if (!empty($this->action_function) && is_callable($this->action_function)) { $params = array($isSent, $to, $cc, $bcc, $subject, $body, $from); diff --git a/wp-includes/class-pop3.php b/wp-includes/class-pop3.php index d0455d7..ffbc377 100644 --- a/wp-includes/class-pop3.php +++ b/wp-includes/class-pop3.php @@ -44,7 +44,10 @@ class POP3 { // This must be set to true // manually - function POP3 ( $server = '', $timeout = '' ) { + /** + * PHP5 constructor. + */ + function __construct ( $server = '', $timeout = '' ) { settype($this->BUFFER,"integer"); if( !empty($server) ) { // Do not allow programs to alter MAILSERVER @@ -62,6 +65,13 @@ class POP3 { return true; } + /** + * PHP4 constructor. + */ + public function POP3( $server = '', $timeout = '' ) { + self::__construct( $server, $timeout ); + } + function update_timer () { if (!ini_get('safe_mode')) set_time_limit($this->TIMEOUT); @@ -72,7 +82,7 @@ class POP3 { // Opens a socket to the specified server. Unless overridden, // port defaults to 110. Returns true on success, false on fail - // If MAILSERVER is set, override $server with it's value + // If MAILSERVER is set, override $server with its value. if (!isset($port) || !$port) {$port = 110;} if(!empty($this->MAILSERVER)) diff --git a/wp-includes/class-simplepie.php b/wp-includes/class-simplepie.php index ba6f28d..958ba46 100644 --- a/wp-includes/class-simplepie.php +++ b/wp-includes/class-simplepie.php @@ -1,5 +1,5 @@ + * PHP Version 5 + * @package PHPMailer + * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project + * @author Marcus Bointon (Synchro/coolbru) * @author Jim Jagielski (jimjag) * @author Andy Prevost (codeworxtech) - * @copyright 2013 Marcus Bointon - * @copyright 2004 - 2008 Andy Prevost + * @author Brent R. Matzelle (original founder) + * @copyright 2014 Marcus Bointon * @copyright 2010 - 2012 Jim Jagielski - * @license http://www.gnu.org/copyleft/lesser.html Distributed under the Lesser General Public License (LGPL) + * @copyright 2004 - 2009 Andy Prevost + * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @note This program is distributed in the hope that it will be useful - WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. */ /** * PHPMailer RFC821 SMTP email transport class. - * - * Implements RFC 821 SMTP commands - * and provides some utility methods for sending mail to an SMTP server. - * - * PHP Version 5.0.0 - * - * @category PHP - * @package PHPMailer - * @link https://github.com/PHPMailer/PHPMailer/blob/master/class.smtp.php - * @author Chris Ryan - * @author Marcus Bointon - * @license http://www.gnu.org/copyleft/lesser.html Distributed under the Lesser General Public License (LGPL) + * Implements RFC 821 SMTP commands and provides some utility methods for sending mail to an SMTP server. + * @package PHPMailer + * @author Chris Ryan + * @author Marcus Bointon */ - class SMTP { /** - * The PHPMailer SMTP Version number. + * The PHPMailer SMTP version number. + * @var string */ - const VERSION = '5.2.7'; + const VERSION = '5.2.14'; /** * SMTP line break constant. + * @var string */ const CRLF = "\r\n"; /** * The SMTP port to use if one is not specified. + * @var integer */ const DEFAULT_SMTP_PORT = 25; + /** + * The maximum line length allowed by RFC 2822 section 2.1.1 + * @var integer + */ + const MAX_LINE_LENGTH = 998; + + /** + * Debug level for no output + */ + const DEBUG_OFF = 0; + + /** + * Debug level to show client -> server messages + */ + const DEBUG_CLIENT = 1; + + /** + * Debug level to show client -> server and server -> client messages + */ + const DEBUG_SERVER = 2; + + /** + * Debug level to show connection status, client -> server and server -> client messages + */ + const DEBUG_CONNECTION = 3; + + /** + * Debug level to show all messages + */ + const DEBUG_LOWLEVEL = 4; + /** * The PHPMailer SMTP Version number. - * @type string - * @deprecated This should be a constant + * @var string + * @deprecated Use the `VERSION` constant instead * @see SMTP::VERSION */ - public $Version = '5.2.7'; + public $Version = '5.2.14'; /** * SMTP server port number. - * @type int - * @deprecated This is only ever ued as default value, so should be a constant + * @var integer + * @deprecated This is only ever used as a default value, so use the `DEFAULT_SMTP_PORT` constant instead * @see SMTP::DEFAULT_SMTP_PORT */ public $SMTP_PORT = 25; /** - * SMTP reply line ending - * @type string - * @deprecated Use the class constant instead + * SMTP reply line ending. + * @var string + * @deprecated Use the `CRLF` constant instead * @see SMTP::CRLF */ public $CRLF = "\r\n"; /** * Debug output level. - * Options: 0 for no output, 1 for commands, 2 for data and commands - * @type int + * Options: + * * self::DEBUG_OFF (`0`) No debug output, default + * * self::DEBUG_CLIENT (`1`) Client commands + * * self::DEBUG_SERVER (`2`) Client commands and server responses + * * self::DEBUG_CONNECTION (`3`) As DEBUG_SERVER plus connection status + * * self::DEBUG_LOWLEVEL (`4`) Low-level data output, all messages + * @var integer */ - public $do_debug = 0; + public $do_debug = self::DEBUG_OFF; /** - * The function/method to use for debugging output. - * Options: 'echo', 'html' or 'error_log' - * @type string + * How to handle debug output. + * Options: + * * `echo` Output plain-text as-is, appropriate for CLI + * * `html` Output escaped, line breaks converted to `
`, appropriate for browser output + * * `error_log` Output to error log as configured in php.ini + * + * Alternatively, you can provide a callable expecting two params: a message string and the debug level: + *


+     * $smtp->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
+     *

+ * @var string|callable */ public $Debugoutput = 'echo'; /** * Whether to use VERP. - * @type bool + * @link http://en.wikipedia.org/wiki/Variable_envelope_return_path + * @link http://www.postfix.org/VERP_README.html Info on VERP + * @var boolean */ public $do_verp = false; /** - * The SMTP timeout value for reads, in seconds. - * @type int + * The timeout value for connection, in seconds. + * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2 + * This needs to be quite high to function correctly with hosts using greetdelay as an anti-spam measure. + * @link http://tools.ietf.org/html/rfc2821#section-4.5.3.2 + * @var integer */ - public $Timeout = 15; + public $Timeout = 300; /** - * The SMTP timelimit value for reads, in seconds. - * @type int + * How long to wait for commands to complete, in seconds. + * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2 + * @var integer */ - public $Timelimit = 30; + public $Timelimit = 300; /** * The socket for the server connection. - * @type resource + * @var resource */ protected $smtp_conn; /** - * Error message, if any, for the last call. - * @type string + * Error information, if any, for the last SMTP command. + * @var array */ - protected $error = ''; + protected $error = array( + 'error' => '', + 'detail' => '', + 'smtp_code' => '', + 'smtp_code_ex' => '' + ); /** * The reply the server sent to us for HELO. - * @type string + * If null, no HELO string has yet been received. + * @var string|null */ - protected $helo_rply = ''; + protected $helo_rply = null; /** - * The most recent reply received from the server. - * @type string + * The set of SMTP extensions sent in reply to EHLO command. + * Indexes of the array are extension names. + * Value at index 'HELO' or 'EHLO' (according to command that was sent) + * represents the server name. In case of HELO it is the only element of the array. + * Other values can be boolean TRUE or an array containing extension options. + * If null, no HELO/EHLO string has yet been received. + * @var array|null */ - protected $last_reply = ''; + protected $server_caps = null; /** - * Constructor. - * @access public + * The most recent reply received from the server. + * @var string */ - public function __construct() - { - $this->smtp_conn = 0; - $this->error = null; - $this->helo_rply = null; - - $this->do_debug = 0; - } + protected $last_reply = ''; /** * Output debugging info via a user-selected method. + * @see SMTP::$Debugoutput + * @see SMTP::$do_debug * @param string $str Debug string to output + * @param integer $level The debug level of this message; see DEBUG_* constants * @return void */ - protected function edebug($str) + protected function edebug($str, $level = 0) { + if ($level > $this->do_debug) { + return; + } + //Avoid clash with built-in function names + if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) { + call_user_func($this->Debugoutput, $str, $this->do_debug); + return; + } switch ($this->Debugoutput) { case 'error_log': //Don't output, just log @@ -164,94 +225,115 @@ class SMTP break; case 'echo': default: - //Just echoes whatever was received - echo $str; + //Normalize line breaks + $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str); + echo gmdate('Y-m-d H:i:s') . "\t" . str_replace( + "\n", + "\n \t ", + trim($str) + )."\n"; } } /** * Connect to an SMTP server. - * @param string $host SMTP server IP or host name - * @param int $port The port number to connect to - * @param int $timeout How long to wait for the connection to open + * @param string $host SMTP server IP or host name + * @param integer $port The port number to connect to + * @param integer $timeout How long to wait for the connection to open * @param array $options An array of options for stream_context_create() * @access public - * @return bool + * @return boolean */ public function connect($host, $port = null, $timeout = 30, $options = array()) { + static $streamok; + //This is enabled by default since 5.0.0 but some providers disable it + //Check this once and cache the result + if (is_null($streamok)) { + $streamok = function_exists('stream_socket_client'); + } // Clear errors to avoid confusion - $this->error = null; - + $this->setError(''); // Make sure we are __not__ connected if ($this->connected()) { // Already connected, generate error - $this->error = array('error' => 'Already connected to a server'); + $this->setError('Already connected to a server'); return false; } - if (empty($port)) { $port = self::DEFAULT_SMTP_PORT; } - // Connect to the SMTP server + $this->edebug( + "Connection: opening to $host:$port, timeout=$timeout, options=".var_export($options, true), + self::DEBUG_CONNECTION + ); $errno = 0; $errstr = ''; - $socket_context = stream_context_create($options); - //Suppress errors; connection failures are handled at a higher level - $this->smtp_conn = @stream_socket_client( - $host . ":" . $port, - $errno, - $errstr, - $timeout, - STREAM_CLIENT_CONNECT, - $socket_context - ); - + if ($streamok) { + $socket_context = stream_context_create($options); + //Suppress errors; connection failures are handled at a higher level + $this->smtp_conn = @stream_socket_client( + $host . ":" . $port, + $errno, + $errstr, + $timeout, + STREAM_CLIENT_CONNECT, + $socket_context + ); + } else { + //Fall back to fsockopen which should work in more places, but is missing some features + $this->edebug( + "Connection: stream_socket_client not available, falling back to fsockopen", + self::DEBUG_CONNECTION + ); + $this->smtp_conn = fsockopen( + $host, + $port, + $errno, + $errstr, + $timeout + ); + } // Verify we connected properly - if (empty($this->smtp_conn)) { - $this->error = array( - 'error' => 'Failed to connect to server', - 'errno' => $errno, - 'errstr' => $errstr + if (!is_resource($this->smtp_conn)) { + $this->setError( + 'Failed to connect to server', + $errno, + $errstr + ); + $this->edebug( + 'SMTP ERROR: ' . $this->error['error'] + . ": $errstr ($errno)", + self::DEBUG_CLIENT ); - if ($this->do_debug >= 1) { - $this->edebug( - 'SMTP -> ERROR: ' . $this->error['error'] - . ": $errstr ($errno)" - ); - } return false; } - + $this->edebug('Connection: opened', self::DEBUG_CONNECTION); // SMTP server can take longer to respond, give longer timeout for first read // Windows does not have support for this timeout function if (substr(PHP_OS, 0, 3) != 'WIN') { $max = ini_get('max_execution_time'); - if ($max != 0 && $timeout > $max) { // Don't bother if unlimited + // Don't bother if unlimited + if ($max != 0 && $timeout > $max) { @set_time_limit($timeout); } stream_set_timeout($this->smtp_conn, $timeout, 0); } - // Get any announcement $announce = $this->get_lines(); - - if ($this->do_debug >= 2) { - $this->edebug('SMTP -> FROM SERVER:' . $announce); - } - + $this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER); return true; } /** * Initiate a TLS (encrypted) session. * @access public - * @return bool + * @return boolean */ public function startTLS() { - if (!$this->sendCommand("STARTTLS", "STARTTLS", 220)) { + if (!$this->sendCommand('STARTTLS', 'STARTTLS', 220)) { return false; } // Begin encrypted connection @@ -259,8 +341,7 @@ class SMTP $this->smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT - ) - ) { + )) { return false; } return true; @@ -270,25 +351,64 @@ class SMTP * Perform SMTP authentication. * Must be run after hello(). * @see hello() - * @param string $username The user name - * @param string $password The password - * @param string $authtype The auth type (PLAIN, LOGIN, NTLM, CRAM-MD5) - * @param string $realm The auth realm for NTLM + * @param string $username The user name + * @param string $password The password + * @param string $authtype The auth type (PLAIN, LOGIN, NTLM, CRAM-MD5, XOAUTH2) + * @param string $realm The auth realm for NTLM * @param string $workstation The auth workstation for NTLM - * @access public - * @return bool True if successfully authenticated. + * @param null|OAuth $OAuth An optional OAuth instance (@see PHPMailerOAuth) + * @return bool True if successfully authenticated.* @access public */ public function authenticate( $username, $password, - $authtype = 'LOGIN', + $authtype = null, $realm = '', - $workstation = '' + $workstation = '', + $OAuth = null ) { - if (empty($authtype)) { - $authtype = 'LOGIN'; + if (!$this->server_caps) { + $this->setError('Authentication is not allowed before HELO/EHLO'); + return false; } + if (array_key_exists('EHLO', $this->server_caps)) { + // SMTP extensions are available. Let's try to find a proper authentication method + + if (!array_key_exists('AUTH', $this->server_caps)) { + $this->setError('Authentication is not allowed at this stage'); + // 'at this stage' means that auth may be allowed after the stage changes + // e.g. after STARTTLS + return false; + } + + self::edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL); + self::edebug( + 'Auth methods available on the server: ' . implode(',', $this->server_caps['AUTH']), + self::DEBUG_LOWLEVEL + ); + + if (empty($authtype)) { + foreach (array('LOGIN', 'CRAM-MD5', 'PLAIN') as $method) { + if (in_array($method, $this->server_caps['AUTH'])) { + $authtype = $method; + break; + } + } + if (empty($authtype)) { + $this->setError('No supported authentication methods found'); + return false; + } + self::edebug('Auth method selected: '.$authtype, self::DEBUG_LOWLEVEL); + } + + if (!in_array($authtype, $this->server_caps['AUTH'])) { + $this->setError("The requested authentication method \"$authtype\" is not supported by the server"); + return false; + } + } elseif (empty($authtype)) { + $authtype = 'LOGIN'; + } switch ($authtype) { case 'PLAIN': // Start authentication @@ -317,59 +437,6 @@ class SMTP return false; } break; - case 'NTLM': - /* - * ntlm_sasl_client.php - * Bundled with Permission - * - * How to telnet in windows: - * http://technet.microsoft.com/en-us/library/aa995718%28EXCHG.65%29.aspx - * PROTOCOL Docs http://curl.haxx.se/rfc/ntlm.html#ntlmSmtpAuthentication - */ - require_once 'extras/ntlm_sasl_client.php'; - $temp = new stdClass(); - $ntlm_client = new ntlm_sasl_client_class; - //Check that functions are available - if (!$ntlm_client->Initialize($temp)) { - $this->error = array('error' => $temp->error); - if ($this->do_debug >= 1) { - $this->edebug( - 'You need to enable some modules in your php.ini file: ' - . $this->error['error'] - ); - } - return false; - } - //msg1 - $msg1 = $ntlm_client->TypeMsg1($realm, $workstation); //msg1 - - if (!$this->sendCommand( - 'AUTH NTLM', - 'AUTH NTLM ' . base64_encode($msg1), - 334 - ) - ) { - return false; - } - - //Though 0 based, there is a white space after the 3 digit number - //msg2 - $challenge = substr($this->last_reply, 3); - $challenge = base64_decode($challenge); - $ntlm_res = $ntlm_client->NTLMResponse( - substr($challenge, 24, 8), - $password - ); - //msg3 - $msg3 = $ntlm_client->TypeMsg3( - $ntlm_res, - $username, - $realm, - $workstation - ); - // send encoded username - return $this->sendCommand('Username', base64_encode($msg3), 235); - break; case 'CRAM-MD5': // Start authentication if (!$this->sendCommand('AUTH CRAM-MD5', 'AUTH CRAM-MD5', 334)) { @@ -383,7 +450,9 @@ class SMTP // send encoded credentials return $this->sendCommand('Username', base64_encode($response), 235); - break; + default: + $this->setError("Authentication method \"$authtype\" is not supported"); + return false; } return true; } @@ -409,15 +478,15 @@ class SMTP // RFC 2104 HMAC implementation for php. // Creates an md5 HMAC. // Eliminates the need to install mhash to compute a HMAC - // Hacked by Lance Rushing + // by Lance Rushing - $b = 64; // byte length for md5 - if (strlen($key) > $b) { + $bytelen = 64; // byte length for md5 + if (strlen($key) > $bytelen) { $key = pack('H*', md5($key)); } - $key = str_pad($key, $b, chr(0x00)); - $ipad = str_pad('', $b, chr(0x36)); - $opad = str_pad('', $b, chr(0x5c)); + $key = str_pad($key, $bytelen, chr(0x00)); + $ipad = str_pad('', $bytelen, chr(0x36)); + $opad = str_pad('', $bytelen, chr(0x5c)); $k_ipad = $key ^ $ipad; $k_opad = $key ^ $opad; @@ -427,19 +496,18 @@ class SMTP /** * Check connection state. * @access public - * @return bool True if connected. + * @return boolean True if connected. */ public function connected() { - if (!empty($this->smtp_conn)) { + if (is_resource($this->smtp_conn)) { $sock_status = stream_get_meta_data($this->smtp_conn); if ($sock_status['eof']) { - // the socket is valid but we are not connected - if ($this->do_debug >= 1) { - $this->edebug( - 'SMTP -> NOTICE: EOF caught while checking if connected' - ); - } + // The socket is valid but we are not connected + $this->edebug( + 'SMTP NOTICE: EOF caught while checking if connected', + self::DEBUG_CLIENT + ); $this->close(); return false; } @@ -457,12 +525,14 @@ class SMTP */ public function close() { - $this->error = null; // so there is no confusion + $this->setError(''); + $this->server_caps = null; $this->helo_rply = null; - if (!empty($this->smtp_conn)) { + if (is_resource($this->smtp_conn)) { // close the connection and cleanup fclose($this->smtp_conn); - $this->smtp_conn = 0; + $this->smtp_conn = null; //Makes for cleaner serialization + $this->edebug('Connection: closed', self::DEBUG_CONNECTION); } } @@ -476,111 +546,101 @@ class SMTP * Implements rfc 821: DATA * @param string $msg_data Message data to send * @access public - * @return bool + * @return boolean */ public function data($msg_data) { + //This will use the standard timelimit if (!$this->sendCommand('DATA', 'DATA', 354)) { return false; } /* The server is ready to accept data! - * according to rfc821 we should not send more than 1000 - * including the CRLF - * characters on a single line so we will break the data up - * into lines by \r and/or \n then if needed we will break - * each of those into smaller lines to fit within the limit. - * in addition we will be looking for lines that start with - * a period '.' and append and additional period '.' to that - * line. NOTE: this does not count towards limit. + * According to rfc821 we should not send more than 1000 characters on a single line (including the CRLF) + * so we will break the data up into lines by \r and/or \n then if needed we will break each of those into + * smaller lines to fit within the limit. + * We will also look for lines that start with a '.' and prepend an additional '.'. + * NOTE: this does not count towards line-length limit. */ - // Normalize the line breaks before exploding - $msg_data = str_replace("\r\n", "\n", $msg_data); - $msg_data = str_replace("\r", "\n", $msg_data); - $lines = explode("\n", $msg_data); - - /* We need to find a good way to determine if headers are - * in the msg_data or if it is a straight msg body - * currently I am assuming rfc822 definitions of msg headers - * and if the first field of the first line (':' separated) - * does not contain a space then it _should_ be a header - * and we can process all lines before a blank "" line as - * headers. + // Normalize line breaks before exploding + $lines = explode("\n", str_replace(array("\r\n", "\r"), "\n", $msg_data)); + + /* To distinguish between a complete RFC822 message and a plain message body, we check if the first field + * of the first line (':' separated) does not contain a space then it _should_ be a header and we will + * process all lines before a blank line as headers. */ $field = substr($lines[0], 0, strpos($lines[0], ':')); $in_headers = false; - if (!empty($field) && !strstr($field, ' ')) { + if (!empty($field) && strpos($field, ' ') === false) { $in_headers = true; } - //RFC 2822 section 2.1.1 limit - $max_line_length = 998; - foreach ($lines as $line) { - $lines_out = null; - if ($line == '' && $in_headers) { + $lines_out = array(); + if ($in_headers and $line == '') { $in_headers = false; } - // ok we need to break this line up into several smaller lines - while (strlen($line) > $max_line_length) { - $pos = strrpos(substr($line, 0, $max_line_length), ' '); - - // Patch to fix DOS attack + //Break this line up into several smaller lines if it's too long + //Micro-optimisation: isset($str[$len]) is faster than (strlen($str) > $len), + while (isset($line[self::MAX_LINE_LENGTH])) { + //Working backwards, try to find a space within the last MAX_LINE_LENGTH chars of the line to break on + //so as to avoid breaking in the middle of a word + $pos = strrpos(substr($line, 0, self::MAX_LINE_LENGTH), ' '); + //Deliberately matches both false and 0 if (!$pos) { - $pos = $max_line_length - 1; + //No nice break found, add a hard break + $pos = self::MAX_LINE_LENGTH - 1; $lines_out[] = substr($line, 0, $pos); $line = substr($line, $pos); } else { + //Break at the found point $lines_out[] = substr($line, 0, $pos); + //Move along by the amount we dealt with $line = substr($line, $pos + 1); } - - /* If processing headers add a LWSP-char to the front of new line - * rfc822 on long msg headers - */ + //If processing headers add a LWSP-char to the front of new line RFC822 section 3.1.1 if ($in_headers) { $line = "\t" . $line; } } $lines_out[] = $line; - // send the lines to the server - while (list(, $line_out) = @each($lines_out)) { - if (strlen($line_out) > 0) { - if (substr($line_out, 0, 1) == '.') { - $line_out = '.' . $line_out; - } + //Send the lines to the server + foreach ($lines_out as $line_out) { + //RFC2821 section 4.5.2 + if (!empty($line_out) and $line_out[0] == '.') { + $line_out = '.' . $line_out; } $this->client_send($line_out . self::CRLF); } } - // Message data has been sent, complete the command - return $this->sendCommand('DATA END', '.', 250); + //Message data has been sent, complete the command + //Increase timelimit for end of DATA command + $savetimelimit = $this->Timelimit; + $this->Timelimit = $this->Timelimit * 2; + $result = $this->sendCommand('DATA END', '.', 250); + //Restore timelimit + $this->Timelimit = $savetimelimit; + return $result; } /** * Send an SMTP HELO or EHLO command. * Used to identify the sending server to the receiving server. * This makes sure that client and server are in a known state. - * Implements from RFC 821: HELO + * Implements RFC 821: HELO * and RFC 2821 EHLO. * @param string $host The host name or IP to connect to * @access public - * @return bool + * @return boolean */ public function hello($host = '') { - // Try extended hello first (RFC 2821) - if (!$this->sendHello('EHLO', $host)) { - if (!$this->sendHello('HELO', $host)) { - return false; - } - } - - return true; + //Try extended hello first (RFC 2821) + return (boolean)($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host)); } /** @@ -588,17 +648,64 @@ class SMTP * Low-level implementation used by hello() * @see hello() * @param string $hello The HELO string - * @param string $host The hostname to say we are + * @param string $host The hostname to say we are * @access protected - * @return bool + * @return boolean */ protected function sendHello($hello, $host) { $noerror = $this->sendCommand($hello, $hello . ' ' . $host, 250); $this->helo_rply = $this->last_reply; + if ($noerror) { + $this->parseHelloFields($hello); + } else { + $this->server_caps = null; + } return $noerror; } + /** + * Parse a reply to HELO/EHLO command to discover server extensions. + * In case of HELO, the only parameter that can be discovered is a server name. + * @access protected + * @param string $type - 'HELO' or 'EHLO' + */ + protected function parseHelloFields($type) + { + $this->server_caps = array(); + $lines = explode("\n", $this->last_reply); + + foreach ($lines as $n => $s) { + //First 4 chars contain response code followed by - or space + $s = trim(substr($s, 4)); + if (empty($s)) { + continue; + } + $fields = explode(' ', $s); + if (!empty($fields)) { + if (!$n) { + $name = $type; + $fields = $fields[0]; + } else { + $name = array_shift($fields); + switch ($name) { + case 'SIZE': + $fields = ($fields ? $fields[0] : 0); + break; + case 'AUTH': + if (!is_array($fields)) { + $fields = array(); + } + break; + default: + $fields = true; + } + } + $this->server_caps[$name] = $fields; + } + } + } + /** * Send an SMTP MAIL command. * Starts a mail transaction from the email address specified in @@ -608,7 +715,7 @@ class SMTP * Implements rfc 821: MAIL FROM: * @param string $from Source address of this message * @access public - * @return bool + * @return boolean */ public function mail($from) { @@ -624,35 +731,35 @@ class SMTP * Send an SMTP QUIT command. * Closes the socket if there is no error or the $close_on_error argument is true. * Implements from rfc 821: QUIT - * @param bool $close_on_error Should the connection close if an error occurs? + * @param boolean $close_on_error Should the connection close if an error occurs? * @access public - * @return bool + * @return boolean */ public function quit($close_on_error = true) { $noerror = $this->sendCommand('QUIT', 'QUIT', 221); - $e = $this->error; //Save any error + $err = $this->error; //Save any error if ($noerror or $close_on_error) { $this->close(); - $this->error = $e; //Restore any error from the quit command + $this->error = $err; //Restore any error from the quit command } return $noerror; } /** * Send an SMTP RCPT command. - * Sets the TO argument to $to. + * Sets the TO argument to $toaddr. * Returns true if the recipient was accepted false if it was rejected. * Implements from rfc 821: RCPT TO: - * @param string $to The address the message is being sent to + * @param string $address The address the message is being sent to * @access public - * @return bool + * @return boolean */ - public function recipient($to) + public function recipient($address) { return $this->sendCommand( - 'RCPT TO ', - 'RCPT TO:<' . $to . '>', + 'RCPT TO', + 'RCPT TO:<' . $address . '>', array(250, 251) ); } @@ -662,7 +769,7 @@ class SMTP * Abort any transaction that is currently in progress. * Implements rfc 821: RSET * @access public - * @return bool True on success. + * @return boolean True on success. */ public function reset() { @@ -671,46 +778,61 @@ class SMTP /** * Send a command to an SMTP server and check its return code. - * @param string $command The command name - not sent to the server + * @param string $command The command name - not sent to the server * @param string $commandstring The actual command to send - * @param int|array $expect One or more expected integer success codes + * @param integer|array $expect One or more expected integer success codes * @access protected - * @return bool True on success. + * @return boolean True on success. */ protected function sendCommand($command, $commandstring, $expect) { if (!$this->connected()) { - $this->error = array( - "error" => "Called $command without being connected" - ); + $this->setError("Called $command without being connected"); + return false; + } + //Reject line breaks in all commands + if (strpos($commandstring, "\n") !== false or strpos($commandstring, "\r") !== false) { + $this->setError("Command '$command' contained line breaks"); return false; } $this->client_send($commandstring . self::CRLF); - $reply = $this->get_lines(); - $code = substr($reply, 0, 3); - - if ($this->do_debug >= 2) { - $this->edebug('SMTP -> FROM SERVER:' . $reply); + $this->last_reply = $this->get_lines(); + // Fetch SMTP code and possible error code explanation + $matches = array(); + if (preg_match("/^([0-9]{3})[ -](?:([0-9]\\.[0-9]\\.[0-9]) )?/", $this->last_reply, $matches)) { + $code = $matches[1]; + $code_ex = (count($matches) > 2 ? $matches[2] : null); + // Cut off error code from each response line + $detail = preg_replace( + "/{$code}[ -]".($code_ex ? str_replace('.', '\\.', $code_ex).' ' : '')."/m", + '', + $this->last_reply + ); + } else { + // Fall back to simple parsing if regex fails + $code = substr($this->last_reply, 0, 3); + $code_ex = null; + $detail = substr($this->last_reply, 4); } + $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER); + if (!in_array($code, (array)$expect)) { - $this->last_reply = null; - $this->error = array( - "error" => "$command command failed", - "smtp_code" => $code, - "detail" => substr($reply, 4) + $this->setError( + "$command command failed", + $detail, + $code, + $code_ex + ); + $this->edebug( + 'SMTP ERROR: ' . $this->error['error'] . ': ' . $this->last_reply, + self::DEBUG_CLIENT ); - if ($this->do_debug >= 1) { - $this->edebug( - 'SMTP -> ERROR: ' . $this->error['error'] . ': ' . $reply - ); - } return false; } - $this->last_reply = $reply; - $this->error = null; + $this->setError(''); return true; } @@ -725,52 +847,48 @@ class SMTP * Implements rfc 821: SAML FROM: * @param string $from The address the message is from * @access public - * @return bool + * @return boolean */ public function sendAndMail($from) { - return $this->sendCommand("SAML", "SAML FROM:$from", 250); + return $this->sendCommand('SAML', "SAML FROM:$from", 250); } /** * Send an SMTP VRFY command. * @param string $name The name to verify * @access public - * @return bool + * @return boolean */ public function verify($name) { - return $this->sendCommand("VRFY", "VRFY $name", array(250, 251)); + return $this->sendCommand('VRFY', "VRFY $name", array(250, 251)); } /** * Send an SMTP NOOP command. * Used to keep keep-alives alive, doesn't actually do anything * @access public - * @return bool + * @return boolean */ public function noop() { - return $this->sendCommand("NOOP", "NOOP", 250); + return $this->sendCommand('NOOP', 'NOOP', 250); } /** * Send an SMTP TURN command. * This is an optional command for SMTP that this class does not support. - * This method is here to make the RFC821 Definition - * complete for this class and __may__ be implemented in future + * This method is here to make the RFC821 Definition complete for this class + * and _may_ be implemented in future * Implements from rfc 821: TURN * @access public - * @return bool + * @return boolean */ public function turn() { - $this->error = array( - 'error' => 'The SMTP TURN command is not implemented' - ); - if ($this->do_debug >= 1) { - $this->edebug('SMTP -> NOTICE: ' . $this->error['error']); - } + $this->setError('The SMTP TURN command is not implemented'); + $this->edebug('SMTP NOTICE: ' . $this->error['error'], self::DEBUG_CLIENT); return false; } @@ -778,13 +896,11 @@ class SMTP * Send raw data to the server. * @param string $data The data to send * @access public - * @return int|bool The number of bytes sent to the server or FALSE on error + * @return integer|boolean The number of bytes sent to the server or false on error */ public function client_send($data) { - if ($this->do_debug >= 1) { - $this->edebug("CLIENT -> SMTP: $data"); - } + $this->edebug("CLIENT -> SERVER: $data", self::DEBUG_CLIENT); return fwrite($this->smtp_conn, $data); } @@ -798,6 +914,57 @@ class SMTP return $this->error; } + /** + * Get SMTP extensions available on the server + * @access public + * @return array|null + */ + public function getServerExtList() + { + return $this->server_caps; + } + + /** + * A multipurpose method + * The method works in three ways, dependent on argument value and current state + * 1. HELO/EHLO was not sent - returns null and set up $this->error + * 2. HELO was sent + * $name = 'HELO': returns server name + * $name = 'EHLO': returns boolean false + * $name = any string: returns null and set up $this->error + * 3. EHLO was sent + * $name = 'HELO'|'EHLO': returns server name + * $name = any string: if extension $name exists, returns boolean True + * or its options. Otherwise returns boolean False + * In other words, one can use this method to detect 3 conditions: + * - null returned: handshake was not or we don't know about ext (refer to $this->error) + * - false returned: the requested feature exactly not exists + * - positive value returned: the requested feature exists + * @param string $name Name of SMTP extension or 'HELO'|'EHLO' + * @return mixed + */ + public function getServerExt($name) + { + if (!$this->server_caps) { + $this->setError('No HELO/EHLO was sent'); + return null; + } + + // the tight logic knot ;) + if (!array_key_exists($name, $this->server_caps)) { + if ($name == 'HELO') { + return $this->server_caps['EHLO']; + } + if ($name == 'EHLO' || array_key_exists('EHLO', $this->server_caps)) { + return false; + } + $this->setError('HELO handshake was used. Client knows nothing about server extensions'); + return null; + } + + return $this->server_caps[$name]; + } + /** * Get the last reply from the server. * @access public @@ -819,51 +986,42 @@ class SMTP */ protected function get_lines() { - $data = ''; - $endtime = 0; - // If the connection is bad, give up now + // If the connection is bad, give up straight away if (!is_resource($this->smtp_conn)) { - return $data; + return ''; } + $data = ''; + $endtime = 0; stream_set_timeout($this->smtp_conn, $this->Timeout); if ($this->Timelimit > 0) { $endtime = time() + $this->Timelimit; } while (is_resource($this->smtp_conn) && !feof($this->smtp_conn)) { $str = @fgets($this->smtp_conn, 515); - if ($this->do_debug >= 4) { - $this->edebug("SMTP -> get_lines(): \$data was \"$data\""); - $this->edebug("SMTP -> get_lines(): \$str is \"$str\""); - } + $this->edebug("SMTP -> get_lines(): \$data is \"$data\"", self::DEBUG_LOWLEVEL); + $this->edebug("SMTP -> get_lines(): \$str is \"$str\"", self::DEBUG_LOWLEVEL); $data .= $str; - if ($this->do_debug >= 4) { - $this->edebug("SMTP -> get_lines(): \$data is \"$data\""); - } - // if 4th character is a space, we are done reading, break the loop - if (substr($str, 3, 1) == ' ') { + // If 4th character is a space, we are done reading, break the loop, micro-optimisation over strlen + if ((isset($str[3]) and $str[3] == ' ')) { break; } // Timed-out? Log and break $info = stream_get_meta_data($this->smtp_conn); if ($info['timed_out']) { - if ($this->do_debug >= 4) { - $this->edebug( - 'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)' - ); - } + $this->edebug( + 'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)', + self::DEBUG_LOWLEVEL + ); break; } // Now check if reads took too long - if ($endtime) { - if (time() > $endtime) { - if ($this->do_debug >= 4) { - $this->edebug( - 'SMTP -> get_lines(): timelimit reached (' - . $this->Timelimit . ' sec)' - ); - } - break; - } + if ($endtime and time() > $endtime) { + $this->edebug( + 'SMTP -> get_lines(): timelimit reached ('. + $this->Timelimit . ' sec)', + self::DEBUG_LOWLEVEL + ); + break; } } return $data; @@ -871,7 +1029,7 @@ class SMTP /** * Enable or disable VERP address generation. - * @param bool $enabled + * @param boolean $enabled */ public function setVerp($enabled = false) { @@ -880,16 +1038,33 @@ class SMTP /** * Get VERP address generation mode. - * @return bool + * @return boolean */ public function getVerp() { return $this->do_verp; } + /** + * Set error messages and codes. + * @param string $message The error message + * @param string $detail Further detail on the error + * @param string $smtp_code An associated SMTP error code + * @param string $smtp_code_ex Extended SMTP code + */ + protected function setError($message, $detail = '', $smtp_code = '', $smtp_code_ex = '') + { + $this->error = array( + 'error' => $message, + 'detail' => $detail, + 'smtp_code' => $smtp_code, + 'smtp_code_ex' => $smtp_code_ex + ); + } + /** * Set debug output method. - * @param string $method The function/method to use for debugging output. + * @param string|callable $method The name of the mechanism to use for debugging output, or a callable to handle it. */ public function setDebugOutput($method = 'echo') { @@ -907,7 +1082,7 @@ class SMTP /** * Set debug output level. - * @param int $level + * @param integer $level */ public function setDebugLevel($level = 0) { @@ -916,7 +1091,7 @@ class SMTP /** * Get debug output level. - * @return int + * @return integer */ public function getDebugLevel() { @@ -925,7 +1100,7 @@ class SMTP /** * Set SMTP timeout. - * @param int $timeout + * @param integer $timeout */ public function setTimeout($timeout = 0) { @@ -934,7 +1109,7 @@ class SMTP /** * Get SMTP timeout. - * @return int + * @return integer */ public function getTimeout() { diff --git a/wp-includes/class-snoopy.php b/wp-includes/class-snoopy.php index 2c59c48..7b39406 100644 --- a/wp-includes/class-snoopy.php +++ b/wp-includes/class-snoopy.php @@ -1,11 +1,11 @@ user) || !empty($this->pass)) $headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass); - for($curr_header = 0; $curr_header < count($headers); $curr_header++) { - $safer_header = strtr( $headers[$curr_header], "\"", " " ); - $cmdline_params .= " -H \"".$safer_header."\""; + $headerfile = tempnam( $this->temp_dir, "sno" ); + $cmdline_params = '-k -D ' . escapeshellarg( $headerfile ); + + foreach ( $headers as $header ) { + $cmdline_params .= ' -H ' . escapeshellarg( $header ); } - if(!empty($body)) - $cmdline_params .= " -d \"$body\""; + if ( ! empty( $body ) ) { + $cmdline_params .= ' -d ' . escapeshellarg( $body ); + } - if($this->read_timeout > 0) - $cmdline_params .= " -m ".$this->read_timeout; + if ( $this->read_timeout > 0 ) { + $cmdline_params .= ' -m ' . escapeshellarg( $this->read_timeout ); + } - $headerfile = tempnam($this->temp_dir, "sno"); - exec($this->curl_path." -k -D \"$headerfile\"".$cmdline_params." \"".escapeshellcmd($URI)."\"",$results,$return); + exec( $this->curl_path . ' ' . $cmdline_params . ' ' . escapeshellarg( $URI ), $results, $return ); if($return) { diff --git a/wp-includes/class-walker-category-dropdown.php b/wp-includes/class-walker-category-dropdown.php new file mode 100644 index 0000000..7d89dc8 --- /dev/null +++ b/wp-includes/class-walker-category-dropdown.php @@ -0,0 +1,80 @@ + 'parent', 'id' => 'term_id'); + + /** + * Starts the element output. + * + * @since 2.1.0 + * @access public + * + * @see Walker::start_el() + * + * @param string $output Passed by reference. Used to append additional content. + * @param object $category Category data object. + * @param int $depth Depth of category. Used for padding. + * @param array $args Uses 'selected', 'show_count', and 'value_field' keys, if they exist. + * See wp_dropdown_categories(). + * @param int $id Optional. ID of the current category. Default 0 (unused). + */ + public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) { + $pad = str_repeat(' ', $depth * 3); + + /** This filter is documented in wp-includes/category-template.php */ + $cat_name = apply_filters( 'list_cats', $category->name, $category ); + + if ( isset( $args['value_field'] ) && isset( $category->{$args['value_field']} ) ) { + $value_field = $args['value_field']; + } else { + $value_field = 'term_id'; + } + + $output .= "\t\n"; + } +} diff --git a/wp-includes/class-walker-category.php b/wp-includes/class-walker-category.php new file mode 100644 index 0000000..bd17a14 --- /dev/null +++ b/wp-includes/class-walker-category.php @@ -0,0 +1,235 @@ + 'parent', 'id' => 'term_id'); + + /** + * Starts the list before the elements are added. + * + * @since 2.1.0 + * @access public + * + * @see Walker::start_lvl() + * + * @param string $output Used to append additional content. Passed by reference. + * @param int $depth Optional. Depth of category. Used for tab indentation. Default 0. + * @param array $args Optional. An array of arguments. Will only append content if style argument + * value is 'list'. See wp_list_categories(). Default empty array. + */ + public function start_lvl( &$output, $depth = 0, $args = array() ) { + if ( 'list' != $args['style'] ) + return; + + $indent = str_repeat("\t", $depth); + $output .= "$indent

\n"; + } + + /** + * Ends the list of after the elements are added. + * + * @since 2.1.0 + * @access public + * + * @see Walker::end_lvl() + * + * @param string $output Used to append additional content. Passed by reference. + * @param int $depth Optional. Depth of category. Used for tab indentation. Default 0. + * @param array $args Optional. An array of arguments. Will only append content if style argument + * value is 'list'. See wp_list_categories(). Default empty array. + */ + public function end_lvl( &$output, $depth = 0, $args = array() ) { + if ( 'list' != $args['style'] ) + return; + + $indent = str_repeat("\t", $depth); + $output .= "$indent\n"; + } + + /** + * Starts the element output. + * + * @since 2.1.0 + * @access public + * + * @see Walker::start_el() + * + * @param string $output Passed by reference. Used to append additional content. + * @param object $category Category data object. + * @param int $depth Optional. Depth of category in reference to parents. Default 0. + * @param array $args Optional. An array of arguments. See wp_list_categories(). Default empty array. + * @param int $id Optional. ID of the current category. Default 0. + */ + public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) { + /** This filter is documented in wp-includes/category-template.php */ + $cat_name = apply_filters( + 'list_cats', + esc_attr( $category->name ), + $category + ); + + // Don't generate an element if the category name is empty. + if ( ! $cat_name ) { + return; + } + + $link = 'description ) ) { + /** + * Filter the category description for display. + * + * @since 1.2.0 + * + * @param string $description Category description. + * @param object $category Category object. + */ + $link .= 'title="' . esc_attr( strip_tags( apply_filters( 'category_description', $category->description, $category ) ) ) . '"'; + } + + $link .= '>'; + $link .= $cat_name . ''; + + if ( ! empty( $args['feed_image'] ) || ! empty( $args['feed'] ) ) { + $link .= ' '; + + if ( empty( $args['feed_image'] ) ) { + $link .= '('; + } + + $link .= ''; + } + $link .= ''; + + if ( empty( $args['feed_image'] ) ) { + $link .= ')'; + } + } + + if ( ! empty( $args['show_count'] ) ) { + $link .= ' (' . number_format_i18n( $category->count ) . ')'; + } + if ( 'list' == $args['style'] ) { + $output .= "\tterm_id, + ); + + if ( ! empty( $args['current_category'] ) ) { + // 'current_category' can be an array, so we use `get_terms()`. + $_current_terms = get_terms( $category->taxonomy, array( + 'include' => $args['current_category'], + 'hide_empty' => false, + ) ); + + foreach ( $_current_terms as $_current_term ) { + if ( $category->term_id == $_current_term->term_id ) { + $css_classes[] = 'current-cat'; + } elseif ( $category->term_id == $_current_term->parent ) { + $css_classes[] = 'current-cat-parent'; + } + while ( $_current_term->parent ) { + if ( $category->term_id == $_current_term->parent ) { + $css_classes[] = 'current-cat-ancestor'; + break; + } + $_current_term = get_term( $_current_term->parent, $category->taxonomy ); + } + } + } + + /** + * Filter the list of CSS classes to include with each category in the list. + * + * @since 4.2.0 + * + * @see wp_list_categories() + * + * @param array $css_classes An array of CSS classes to be applied to each list item. + * @param object $category Category data object. + * @param int $depth Depth of page, used for padding. + * @param array $args An array of wp_list_categories() arguments. + */ + $css_classes = implode( ' ', apply_filters( 'category_css_class', $css_classes, $category, $depth, $args ) ); + + $output .= ' class="' . $css_classes . '"'; + $output .= ">$link\n"; + } elseif ( isset( $args['separator'] ) ) { + $output .= "\t$link" . $args['separator'] . "\n"; + } else { + $output .= "\t$link
\n"; + } + } + + /** + * Ends the element output, if needed. + * + * @since 2.1.0 + * @access public + * + * @see Walker::end_el() + * + * @param string $output Passed by reference. Used to append additional content. + * @param object $page Not used. + * @param int $depth Optional. Depth of category. Not used. + * @param array $args Optional. An array of arguments. Only uses 'list' for whether should append + * to output. See wp_list_categories(). Default empty array. + */ + public function end_el( &$output, $page, $depth = 0, $args = array() ) { + if ( 'list' != $args['style'] ) + return; + + $output .= "\n"; + } + +} diff --git a/wp-includes/class-walker-comment.php b/wp-includes/class-walker-comment.php new file mode 100644 index 0000000..3065744 --- /dev/null +++ b/wp-includes/class-walker-comment.php @@ -0,0 +1,364 @@ + 'comment_parent', 'id' => 'comment_ID'); + + /** + * Starts the list before the elements are added. + * + * @since 2.7.0 + * @access public + * + * @see Walker::start_lvl() + * @global int $comment_depth + * + * @param string $output Passed by reference. Used to append additional content. + * @param int $depth Optional. Depth of the current comment. Default 0. + * @param array $args Optional. Uses 'style' argument for type of HTML list. Default empty array. + */ + public function start_lvl( &$output, $depth = 0, $args = array() ) { + $GLOBALS['comment_depth'] = $depth + 1; + + switch ( $args['style'] ) { + case 'div': + break; + case 'ol': + $output .= '

' . "\n"; + break; + } + } + + /** + * Ends the list of items after the elements are added. + * + * @since 2.7.0 + * @access public + * + * @see Walker::end_lvl() + * @global int $comment_depth + * + * @param string $output Passed by reference. Used to append additional content. + * @param int $depth Optional. Depth of the current comment. Default 0. + * @param array $args Optional. Will only append content if style argument value is 'ol' or 'ul'. + * Default empty array. + */ + public function end_lvl( &$output, $depth = 0, $args = array() ) { + $GLOBALS['comment_depth'] = $depth + 1; + + switch ( $args['style'] ) { + case 'div': + break; + case 'ol': + $output .= "

\n"; + break; + case 'ul': + default: + $output .= "

\n"; + break; + } + } + + /** + * Traverses elements to create list from elements. + * + * This function is designed to enhance Walker::display_element() to + * display children of higher nesting levels than selected inline on + * the highest depth level displayed. This prevents them being orphaned + * at the end of the comment list. + * + * Example: max_depth = 2, with 5 levels of nested content. + * 1 + * 1.1 + * 1.1.1 + * 1.1.1.1 + * 1.1.1.1.1 + * 1.1.2 + * 1.1.2.1 + * 2 + * 2.2 + * + * @since 2.7.0 + * @access public + * + * @see Walker::display_element() + * @see wp_list_comments() + * + * @param WP_Comment $element Comment data object. + * @param array $children_elements List of elements to continue traversing. Passed by reference. + * @param int $max_depth Max depth to traverse. + * @param int $depth Depth of the current element. + * @param array $args An array of arguments. + * @param string $output Used to append additional content. Passed by reference. + */ + public function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) { + if ( !$element ) + return; + + $id_field = $this->db_fields['id']; + $id = $element->$id_field; + + parent::display_element( $element, $children_elements, $max_depth, $depth, $args, $output ); + + /* + * If at the max depth, and the current element still has children, loop over those + * and display them at this level. This is to prevent them being orphaned to the end + * of the list. + */ + if ( $max_depth <= $depth + 1 && isset( $children_elements[$id]) ) { + foreach ( $children_elements[ $id ] as $child ) + $this->display_element( $child, $children_elements, $max_depth, $depth, $args, $output ); + + unset( $children_elements[ $id ] ); + } + + } + + /** + * Starts the element output. + * + * @since 2.7.0 + * @access public + * + * @see Walker::start_el() + * @see wp_list_comments() + * @global int $comment_depth + * @global WP_Comment $comment + * + * @param string $output Used to append additional content. Passed by reference. + * @param WP_Comment $comment Comment data object. + * @param int $depth Optional. Depth of the current comment in reference to parents. Default 0. + * @param array $args Optional. An array of arguments. Default empty array. + * @param int $id Optional. ID of the current comment. Default 0 (unused). + */ + public function start_el( &$output, $comment, $depth = 0, $args = array(), $id = 0 ) { + $depth++; + $GLOBALS['comment_depth'] = $depth; + $GLOBALS['comment'] = $comment; + + if ( !empty( $args['callback'] ) ) { + ob_start(); + call_user_func( $args['callback'], $comment, $args, $depth ); + $output .= ob_get_clean(); + return; + } + + if ( ( 'pingback' == $comment->comment_type || 'trackback' == $comment->comment_type ) && $args['short_ping'] ) { + ob_start(); + $this->ping( $comment, $depth, $args ); + $output .= ob_get_clean(); + } elseif ( 'html5' === $args['format'] ) { + ob_start(); + $this->html5_comment( $comment, $depth, $args ); + $output .= ob_get_clean(); + } else { + ob_start(); + $this->comment( $comment, $depth, $args ); + $output .= ob_get_clean(); + } + } + + /** + * Ends the element output, if needed. + * + * @since 2.7.0 + * @access public + * + * @see Walker::end_el() + * @see wp_list_comments() + * + * @param string $output Used to append additional content. Passed by reference. + * @param WP_Comment $comment The current comment object. Default current comment. + * @param int $depth Optional. Depth of the current comment. Default 0. + * @param array $args Optional. An array of arguments. Default empty array. + */ + public function end_el( &$output, $comment, $depth = 0, $args = array() ) { + if ( !empty( $args['end-callback'] ) ) { + ob_start(); + call_user_func( $args['end-callback'], $comment, $args, $depth ); + $output .= ob_get_clean(); + return; + } + if ( 'div' == $args['style'] ) + $output .= "

\n"; + else + $output .= "\n"; + } + + /** + * Outputs a pingback comment. + * + * @since 3.6.0 + * @access protected + * + * @see wp_list_comments() + * + * @param WP_Comment $comment The comment object. + * @param int $depth Depth of the current comment. + * @param array $args An array of arguments. + */ + protected function ping( $comment, $depth, $args ) { + $tag = ( 'div' == $args['style'] ) ? 'div' : 'li'; +?> + < id="comment-" > +

+ ', '' ); ?> +

+ + < has_children ? 'parent' : '', $comment ); ?> id="comment-"> + +

+ +

+ + %s says:' ), get_comment_author_link( $comment ) ); ?> +

+ comment_approved ) : ?> + +
+ + +

+ +

+ + $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?> + + $add_below, + 'depth' => $depth, + 'max_depth' => $args['max_depth'], + 'before' => '

', + 'after' => '

' + ) ) ); + ?> + + +

+ + + < id="comment-" has_children ? 'parent' : '', $comment ); ?>> +

+ + +

+ +

+ + 'div-comment', + 'depth' => $depth, + 'max_depth' => $args['max_depth'], + 'before' => '

', + 'after' => '

' + ) ) ); + ?> +

+ 'post_parent', 'id' => 'ID' ); + + /** + * Starts the element output. + * + * @since 2.1.0 + * @access public + * + * @see Walker::start_el() + * + * @param string $output Used to append additional content. Passed by reference. + * @param WP_Post $page Page data object. + * @param int $depth Optional. Depth of page in reference to parent pages. Used for padding. + * Default 0. + * @param array $args Optional. Uses 'selected' argument for selected page to set selected HTML + * attribute for option element. Uses 'value_field' argument to fill "value" + * attribute. See wp_dropdown_pages(). Default empty array. + * @param int $id Optional. ID of the current page. Default 0 (unused). + */ + public function start_el( &$output, $page, $depth = 0, $args = array(), $id = 0 ) { + $pad = str_repeat(' ', $depth * 3); + + if ( ! isset( $args['value_field'] ) || ! isset( $page->{$args['value_field']} ) ) { + $args['value_field'] = 'ID'; + } + + $output .= "\t\n"; + } +} diff --git a/wp-includes/class-walker-page.php b/wp-includes/class-walker-page.php new file mode 100644 index 0000000..f4667c5 --- /dev/null +++ b/wp-includes/class-walker-page.php @@ -0,0 +1,181 @@ + 'post_parent', 'id' => 'ID' ); + + /** + * Outputs the beginning of the current level in the tree before elements are output. + * + * @since 2.1.0 + * @access public + * + * @see Walker::start_lvl() + * + * @param string $output Passed by reference. Used to append additional content. + * @param int $depth Optional. Depth of page. Used for padding. Default 0. + * @param array $args Optional. Arguments for outputing the next level. + * Default empty array. + */ + public function start_lvl( &$output, $depth = 0, $args = array() ) { + $indent = str_repeat("\t", $depth); + $output .= "\n$indent

\n"; + } + + /** + * Outputs the end of the current level in the tree after elements are output. + * + * @since 2.1.0 + * @access public + * + * @see Walker::end_lvl() + * + * @param string $output Passed by reference. Used to append additional content. + * @param int $depth Optional. Depth of page. Used for padding. Default 0. + * @param array $args Optional. Arguments for outputting the end of the current level. + * Default empty array. + */ + public function end_lvl( &$output, $depth = 0, $args = array() ) { + $indent = str_repeat("\t", $depth); + $output .= "$indent\n"; + } + + /** + * Outputs the beginning of the current element in the tree. + * + * @see Walker::start_el() + * @since 2.1.0 + * @access public + * + * @param string $output Used to append additional content. Passed by reference. + * @param WP_Post $page Page data object. + * @param int $depth Optional. Depth of page. Used for padding. Default 0. + * @param array $args Optional. Array of arguments. Default empty array. + * @param int $current_page Optional. Page ID. Default 0. + */ + public function start_el( &$output, $page, $depth = 0, $args = array(), $current_page = 0 ) { + if ( $depth ) { + $indent = str_repeat( "\t", $depth ); + } else { + $indent = ''; + } + + $css_class = array( 'page_item', 'page-item-' . $page->ID ); + + if ( isset( $args['pages_with_children'][ $page->ID ] ) ) { + $css_class[] = 'page_item_has_children'; + } + + if ( ! empty( $current_page ) ) { + $_current_page = get_post( $current_page ); + if ( $_current_page && in_array( $page->ID, $_current_page->ancestors ) ) { + $css_class[] = 'current_page_ancestor'; + } + if ( $page->ID == $current_page ) { + $css_class[] = 'current_page_item'; + } elseif ( $_current_page && $page->ID == $_current_page->post_parent ) { + $css_class[] = 'current_page_parent'; + } + } elseif ( $page->ID == get_option('page_for_posts') ) { + $css_class[] = 'current_page_parent'; + } + + /** + * Filter the list of CSS classes to include with each page item in the list. + * + * @since 2.8.0 + * + * @see wp_list_pages() + * + * @param array $css_class An array of CSS classes to be applied + * to each list item. + * @param WP_Post $page Page data object. + * @param int $depth Depth of page, used for padding. + * @param array $args An array of arguments. + * @param int $current_page ID of the current page. + */ + $css_classes = implode( ' ', apply_filters( 'page_css_class', $css_class, $page, $depth, $args, $current_page ) ); + + if ( '' === $page->post_title ) { + /* translators: %d: ID of a post */ + $page->post_title = sprintf( __( '#%d (no title)' ), $page->ID ); + } + + $args['link_before'] = empty( $args['link_before'] ) ? '' : $args['link_before']; + $args['link_after'] = empty( $args['link_after'] ) ? '' : $args['link_after']; + + $output .= $indent . sprintf( + '

%s%s%s', + $css_classes, + get_permalink( $page->ID ), + $args['link_before'], + /** This filter is documented in wp-includes/post-template.php */ + apply_filters( 'the_title', $page->post_title, $page->ID ), + $args['link_after'] + ); + + if ( ! empty( $args['show_date'] ) ) { + if ( 'modified' == $args['show_date'] ) { + $time = $page->post_modified; + } else { + $time = $page->post_date; + } + + $date_format = empty( $args['date_format'] ) ? '' : $args['date_format']; + $output .= " " . mysql2date( $date_format, $time ); + } + } + + /** + * Outputs the end of the current element in the tree. + * + * @since 2.1.0 + * @access public + * + * @see Walker::end_el() + * + * @param string $output Used to append additional content. Passed by reference. + * @param WP_Post $page Page data object. Not used. + * @param int $depth Optional. Depth of page. Default 0 (unused). + * @param array $args Optional. Array of arguments. Default empty array. + */ + public function end_el( &$output, $page, $depth = 0, $args = array() ) { + $output .= "

\n"; + } + +} diff --git a/wp-includes/class-wp-admin-bar.php b/wp-includes/class-wp-admin-bar.php index 050b0f1..b89c654 100644 --- a/wp-includes/class-wp-admin-bar.php +++ b/wp-includes/class-wp-admin-bar.php @@ -1,29 +1,40 @@ menu property.' ); return array(); // Sorry, folks. - break; } } + /** + * @access public + */ public function initialize() { $this->user = new stdClass; @@ -70,16 +81,26 @@ class WP_Admin_Bar { do_action( 'admin_bar_init' ); } + /** + * @param array $node + */ public function add_menu( $node ) { $this->add_node( $node ); } + /** + * @param string $id + */ public function remove_menu( $id ) { $this->remove_node( $id ); } /** - * Add a node to the menu. + * Adds a node to the menu. + * + * @since 3.1.0 + * @since 4.5.0 Added the ability to pass 'lang' and 'dir' meta data. + * @access public * * @param array $args { * Arguments for adding a node. @@ -89,7 +110,7 @@ class WP_Admin_Bar { * @type string $parent Optional. ID of the parent node. * @type string $href Optional. Link for the item. * @type bool $group Optional. Whether or not the node is a group. Default false. - * @type array $meta Meta data including the following keys: 'html', 'class', 'rel', + * @type array $meta Meta data including the following keys: 'html', 'class', 'rel', 'lang', 'dir', * 'onclick', 'target', 'title', 'tabindex'. Default empty. * } */ @@ -144,6 +165,9 @@ class WP_Admin_Bar { $this->_set_node( $args ); } + /** + * @param array $args + */ final protected function _set_node( $args ) { $this->nodes[ $args['id'] ] = (object) $args; } @@ -151,6 +175,7 @@ class WP_Admin_Bar { /** * Gets a node. * + * @param string $id * @return object Node. */ final public function get_node( $id ) { @@ -158,6 +183,10 @@ class WP_Admin_Bar { return clone $node; } + /** + * @param string $id + * @return object|void + */ final protected function _get_node( $id ) { if ( $this->bound ) return; @@ -169,6 +198,9 @@ class WP_Admin_Bar { return $this->nodes[ $id ]; } + /** + * @return array|void + */ final public function get_nodes() { if ( ! $nodes = $this->_get_nodes() ) return; @@ -179,6 +211,9 @@ class WP_Admin_Bar { return $nodes; } + /** + * @return array|void + */ final protected function _get_nodes() { if ( $this->bound ) return; @@ -209,22 +244,31 @@ class WP_Admin_Bar { /** * Remove a node. * - * @param string The ID of the item. + * @param string $id The ID of the item. */ public function remove_node( $id ) { $this->_unset_node( $id ); } + /** + * @param string $id + */ final protected function _unset_node( $id ) { unset( $this->nodes[ $id ] ); } + /** + * @access public + */ public function render() { $root = $this->_bind(); if ( $root ) $this->_render( $root ); } + /** + * @return object|void + */ final protected function _bind() { if ( $this->bound ) return; @@ -346,6 +390,11 @@ class WP_Admin_Bar { return $root; } + /** + * + * @global bool $is_IE + * @param object $root + */ final protected function _render( $root ) { global $is_IE; @@ -364,9 +413,11 @@ class WP_Admin_Bar { } ?> -

- -

+ + + + type == 'container' ) - return $this->_render_container( $node ); - + if ( $node->type == 'container' ) { + $this->_render_container( $node ); + return; + } if ( $node->type != 'group' || empty( $node->children ) ) return; @@ -409,6 +467,9 @@ class WP_Admin_Bar { ?>type != 'item' ) return; @@ -449,12 +510,24 @@ class WP_Admin_Bar { if ( ! empty( $node->meta['rel'] ) ) : ?> rel="meta['rel'] ); ?>"meta['lang'] ) ) : + ?> lang="meta['lang'] ); ?>"meta['dir'] ) ) : + ?> dir="meta['dir'] ); ?>">

meta['title'] ) ) : ?> title="meta['title'] ); ?>"meta['lang'] ) ) : + ?> lang="meta['lang'] ); ?>"meta['dir'] ) ) : + ?> dir="meta['dir'] ); ?>">_render_item( $node ); } + /** + * @access public + */ public function add_menus() { // User related, aligned right. add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_menu', 0 ); @@ -497,7 +577,8 @@ class WP_Admin_Bar { add_action( 'admin_bar_menu', 'wp_admin_bar_wp_menu', 10 ); add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 ); add_action( 'admin_bar_menu', 'wp_admin_bar_site_menu', 30 ); - add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 40 ); + add_action( 'admin_bar_menu', 'wp_admin_bar_customize_menu', 40 ); + add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 50 ); // Content related. if ( ! is_network_admin() && ! is_user_admin() ) { diff --git a/wp-includes/class-wp-ajax-response.php b/wp-includes/class-wp-ajax-response.php index 24eb687..ee2901f 100644 --- a/wp-includes/class-wp-ajax-response.php +++ b/wp-includes/class-wp-ajax-response.php @@ -11,9 +11,8 @@ class WP_Ajax_Response { * * @since 2.1.0 * @var array - * @access private */ - var $responses = array(); + public $responses = array(); /** * Constructor - Passes args to {@link WP_Ajax_Response::add()}. @@ -22,37 +21,48 @@ class WP_Ajax_Response { * @see WP_Ajax_Response::add() * * @param string|array $args Optional. Will be passed to add() method. - * @return WP_Ajax_Response */ - function __construct( $args = '' ) { + public function __construct( $args = '' ) { if ( !empty($args) ) $this->add($args); } /** - * Append to XML response based on given arguments. + * Appends data to an XML response based on given arguments. * - * The arguments that can be passed in the $args parameter are below. It is - * also possible to pass a WP_Error object in either the 'id' or 'data' - * argument. The parameter isn't actually optional, content should be given - * in order to send the correct response. + * With `$args` defaults, extra data output would be: * - * 'what' argument is a string that is the XMLRPC response type. - * 'action' argument is a boolean or string that acts like a nonce. - * 'id' argument can be WP_Error or an integer. - * 'old_id' argument is false by default or an integer of the previous ID. - * 'position' argument is an integer or a string with -1 = top, 1 = bottom, - * html ID = after, -html ID = before. - * 'data' argument is a string with the content or message. - * 'supplemental' argument is an array of strings that will be children of - * the supplemental element. + * + * <$what id='$id' position='$position'> + * + * + * * * @since 2.1.0 + * @access public * - * @param string|array $args Override defaults. + * @param string|array $args { + * Optional. An array or string of XML response arguments. + * + * @type string $what XML-RPC response type. Used as a child element of ``. + * Default 'object' (`

|', '', $pee ); $pee = preg_replace( '%\s*(]*>)\s*%', '$1', $pee ); } + /* + * Collapse line breaks inside

"}function r(t){var o,r=this.parent();(o=t.target.getAttribute("data-mce-color"))&&(this.lastId&&document.getElementById(this.lastId).setAttribute("aria-selected",!1),t.target.setAttribute("aria-selected",!0),this.lastId=t.target.id,r.hidePanel(),o="#"+o,r.color(o),e.execCommand(r.settings.selectcmd,!1,o))}function l(){var t=this;t._color&&e.execCommand(t.settings.selectcmd,!1,t._color)}e.addButton("forecolor",{type:"colorbutton",tooltip:"Text color",selectcmd:"ForeColor",panel:{role:"application",ariaRemember:!0,html:o,onclick:r},onclick:l}),e.addButton("backcolor",{type:"colorbutton",tooltip:"Background color",selectcmd:"HiliteColor",panel:{role:"application",ariaRemember:!0,html:o,onclick:r},onclick:l})}); \ No newline at end of file +tinymce.PluginManager.add("textcolor",function(a){function b(b){var c;return a.dom.getParents(a.selection.getStart(),function(a){var d;(d=a.style["forecolor"==b?"color":"background-color"])&&(c=d)}),c}function c(b){var c,d,e=[];for(d=["000000","Black","993300","Burnt orange","333300","Dark olive","003300","Dark green","003366","Dark azure","000080","Navy Blue","333399","Indigo","333333","Very dark gray","800000","Maroon","FF6600","Orange","808000","Olive","008000","Green","008080","Teal","0000FF","Blue","666699","Grayish blue","808080","Gray","FF0000","Red","FF9900","Amber","99CC00","Yellow green","339966","Sea green","33CCCC","Turquoise","3366FF","Royal blue","800080","Purple","999999","Medium gray","FF00FF","Magenta","FFCC00","Gold","FFFF00","Yellow","00FF00","Lime","00FFFF","Aqua","00CCFF","Sky blue","993366","Red violet","FFFFFF","White","FF99CC","Pink","FFCC99","Peach","FFFF99","Light yellow","CCFFCC","Pale green","CCFFFF","Pale cyan","99CCFF","Light sky blue","CC99FF","Plum"],d=a.settings.textcolor_map||d,d=a.settings[b+"_map"]||d,c=0;c"}var d,e,f,g,h,k,l,m,n=this,o=n._id,p=0;for(m=n.settings.origin,d=c(m),d.push({text:tinymce.translate("No color"),color:"transparent"}),f='',g=d.length-1,k=0;k",h=0;hg?f+="":(e=d[l],f+=b(e.color,e.text));f+=""}if(a.settings.color_picker_callback){for(f+='",f+="",h=0;h 0 ) { if ( state === 'hide' ) { toolbar.hide(); @@ -38,8 +47,11 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { }); if ( pixels && ! initial ) { - iframe = editor.getContentAreaContainer().firstChild; - DOM.setStyle( iframe, 'height', iframe.clientHeight + pixels ); // Resize iframe + // Resize iframe, not needed in iOS + if ( ! tinymce.Env.iOS ) { + iframe = editor.getContentAreaContainer().firstChild; + DOM.setStyle( iframe, 'height', iframe.clientHeight + pixels ); + } if ( state === 'hide' ) { setUserSetting('hidetb', '0'); @@ -49,6 +61,8 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { wpAdvButton && wpAdvButton.active( true ); } } + + editor.fire( 'wp-toolbar-toggle' ); } // Add the kitchen sink button :) @@ -77,20 +91,41 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { }); // Replace Read More/Next Page tags with images - editor.on( 'BeforeSetContent', function( e ) { - if ( e.content ) { - if ( e.content.indexOf( '/g, function( match, moretext ) { - return '

'; + editor.on( 'BeforeSetContent', function( event ) { + var title; + + if ( event.content ) { + if ( event.content.indexOf( '/g, function( match, moretext ) { + return '

'; }); } - if ( e.content.indexOf( '' ) !== -1 ) { - e.content = e.content.replace( //g, - '

' ); + if ( event.content.indexOf( '' ) !== -1 ) { + title = __( 'Page break' ); + + event.content = event.content.replace( //g, + '

' ); } + + if ( event.load && event.format !== 'raw' && hasWpautop ) { + event.content = wp.editor.autop( event.content ); + } + + // Remove spaces from empty paragraphs. + // Avoid backtracking, can freeze the editor. See #35890. + // (This is also quite faster than using only one regex.) + event.content = event.content.replace( /

([^<>]+)<\/p>/gi, function( tag, text ) { + if ( /^( |\s|\u00a0|\ufeff)+$/i.test( text ) ) { + return '

'; + } + + return tag; + }); } }); @@ -100,16 +135,14 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { e.content = e.content.replace(/]+>/g, function( image ) { var match, moretext = ''; - if ( image.indexOf('wp-more-tag') !== -1 ) { - if ( image.indexOf('mce-wp-more') !== -1 ) { - if ( match = image.match( /data-wp-more="([^"]+)"/ ) ) { - moretext = match[1]; - } - - image = ''; - } else if ( image.indexOf('mce-wp-nextpage') !== -1 ) { - image = ''; + if ( image.indexOf( 'data-wp-more="more"' ) !== -1 ) { + if ( match = image.match( /data-wp-more-text="([^"]+)"/ ) ) { + moretext = match[1]; } + + image = ''; + } else if ( image.indexOf( 'data-wp-more="nextpage"' ) !== -1 ) { + image = ''; } return image; @@ -118,16 +151,11 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { }); // Display the tag name instead of img in element path - editor.on( 'ResolveName', function( e ) { - var dom = editor.dom, - target = e.target; - - if ( target.nodeName === 'IMG' && dom.hasClass( target, 'wp-more-tag' ) ) { - if ( dom.hasClass( target, 'mce-wp-more' ) ) { - e.name = 'more'; - } else if ( dom.hasClass( target, 'mce-wp-nextpage' ) ) { - e.name = 'nextpage'; - } + editor.on( 'ResolveName', function( event ) { + var attr; + + if ( event.target.nodeName === 'IMG' && ( attr = editor.dom.getAttrib( event.target, 'data-wp-more' ) ) ) { + event.name = attr; } }); @@ -140,9 +168,10 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { tag = tag || 'more'; classname += ' mce-wp-' + tag; - title = tag === 'more' ? 'More...' : 'Next Page'; - html = '

'; + title = tag === 'more' ? 'Read more...' : 'Next page'; + title = __( title ); + html = '

'; // Most common case if ( node.nodeName === 'BODY' || ( node.nodeName === 'P' && node.parentNode.nodeName === 'BODY' ) ) { @@ -179,18 +208,138 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { }); editor.addCommand( 'WP_Help', function() { - editor.windowManager.open({ - url: tinymce.baseURL + '/wp-mce-help.php', + var access = tinymce.Env.mac ? __( 'Ctrl + Alt + letter:' ) : __( 'Shift + Alt + letter:' ), + meta = tinymce.Env.mac ? __( 'Cmd + letter:' ) : __( 'Ctrl + letter:' ), + table1 = [], + table2 = [], + header, html, dialog, $wrap; + + each( [ + { c: 'Copy', x: 'Cut' }, + { v: 'Paste', a: 'Select all' }, + { z: 'Undo', y: 'Redo' }, + { b: 'Bold', i: 'Italic' }, + { u: 'Underline', k: 'Insert/edit link' } + ], function( row ) { + table1.push( tr( row ) ); + } ); + + each( [ + { 1: 'Heading 1', 2: 'Heading 2' }, + { 3: 'Heading 3', 4: 'Heading 4' }, + { 5: 'Heading 5', 6: 'Heading 6' }, + { l: 'Align left', c: 'Align center' }, + { r: 'Align right', j: 'Justify' }, + { d: 'Strikethrough', q: 'Blockquote' }, + { u: 'Bullet list', o: 'Numbered list' }, + { a: 'Insert/edit link', s: 'Remove link' }, + { m: 'Insert/edit image', t: 'Insert Read More tag' }, + { h: 'Keyboard Shortcuts', x: 'Code' }, + { p: 'Insert Page Break tag', w: 'Distraction-free writing mode' } + ], function( row ) { + table2.push( tr( row ) ); + } ); + + function tr( row ) { + var out = ''; + + each( row, function( text, key ) { + if ( ! text ) { + out += ''; + } else { + out += ''; + } + }); + + return out + ''; + } + + header = [ __( 'Letter' ), __( 'Action' ), __( 'Letter' ), __( 'Action' ) ]; + header = ''; + + html = '

'; + + // Main section, default and additional shortcuts + html = html + + '

' + __( 'Default shortcuts,' ) + ' ' + meta + '

' + + '

' + header.join( '	' ) + '


		`' + key + '`	' + __( text ) + '

' + + header + + table1.join('') + + '

' + + '

' + __( 'Additional shortcuts,' ) + ' ' + access + '

' + + '' + + header + + table2.join('') + + '

'; + + if ( editor.plugins.wptextpattern && ( ! tinymce.Env.ie || tinymce.Env.ie > 8 ) ) { + // Text pattern section + html = html + + '

' + __( 'When starting a new paragraph with one of these formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' ) + '

' + + '' + + tr({ '*': 'Bullet list', '1.': 'Numbered list' }) + + tr({ '-': 'Bullet list', '1)': 'Numbered list' }) + + '

'; + + html = html + + '

' + __( 'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' ) + '

' + + '' + + tr({ '>': 'Blockquote' }) + + tr({ '##': 'Heading 2' }) + + tr({ '###': 'Heading 3' }) + + tr({ '####': 'Heading 4' }) + + tr({ '#####': 'Heading 5' }) + + tr({ '######': 'Heading 6' }) + + tr({ '---': 'Horizontal line' }) + + '

'; + } + + // Focus management section + html = html + + '

' + __( 'Focus shortcuts:' ) + '

' + + '' + + tr({ 'Alt + F8': 'Inline toolbar (when an image, link or preview is selected)' }) + + tr({ 'Alt + F9': 'Editor menu (when enabled)' }) + + tr({ 'Alt + F10': 'Editor toolbar' }) + + tr({ 'Alt + F11': 'Elements path' }) + + '

' + + '

' + __( 'To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.' ) + '

'; + + html += '

'; + + dialog = editor.windowManager.open( { title: 'Keyboard Shortcuts', - width: 450, - height: 420, - inline: 1, - classes: 'wp-help' - }); - }); + items: { + type: 'container', + classes: 'wp-help', + html: html + }, + buttons: { + text: 'Close', + onclick: 'close' + } + } ); + + if ( dialog.$el ) { + dialog.$el.find( 'div[role="application"]' ).attr( 'role', 'document' ); + $wrap = dialog.$el.find( '.mce-wp-help' ); + + if ( $wrap[0] ) { + $wrap.attr( 'tabindex', '0' ); + $wrap[0].focus(); + $wrap.on( 'keydown', function( event ) { + // Prevent use of: page up, page down, end, home, left arrow, up arrow, right arrow, down arrow + // in the dialog keydown handler. + if ( event.keyCode >= 33 && event.keyCode <= 40 ) { + event.stopPropagation(); + } + }); + } + } + } ); editor.addCommand( 'WP_Medialib', function() { - if ( typeof wp !== 'undefined' && wp.media && wp.media.editor ) { + if ( wp && wp.media && wp.media.editor ) { wp.media.editor.open( editor.id ); } }); @@ -223,7 +372,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { // Menubar // Insert->Add Media - if ( typeof wp !== 'undefined' && wp.media && wp.media.editor ) { + if ( wp && wp.media && wp.media.editor ) { editor.addMenuItem( 'add_media', { text: 'Add Media', icon: 'wp-media-library', @@ -277,11 +426,17 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { doc = editor.getDoc(), dom = editor.dom; + if ( env.iOS ) { + dom.addClass( doc.documentElement, 'ios' ); + } + if ( editor.getParam( 'directionality' ) === 'rtl' ) { bodyClass.push('rtl'); dom.setAttrib( doc.documentElement, 'dir', 'rtl' ); } + dom.setAttrib( doc.documentElement, 'lang', editor.getParam( 'wp_lang_attr' ) ); + if ( env.ie ) { if ( parseInt( env.ie, 10 ) === 9 ) { bodyClass.push('ie9'); @@ -290,180 +445,502 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { } else if ( env.ie < 8 ) { bodyClass.push('ie7'); } + } else if ( env.webkit ) { + bodyClass.push('webkit'); } bodyClass.push('wp-editor'); - tinymce.each( bodyClass, function( cls ) { + each( bodyClass, function( cls ) { if ( cls ) { dom.addClass( doc.body, cls ); } }); // Remove invalid parent paragraphs when inserting HTML - // TODO: still needed? - editor.on( 'BeforeSetContent', function( e ) { - if ( e.content ) { - e.content = e.content.replace(/

\s*<(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)( [^>]*)?>/gi, '<$1$2>'); - e.content = e.content.replace(/<\/(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)>\s*<\/p>/gi, ''); + editor.on( 'BeforeSetContent', function( event ) { + if ( event.content ) { + event.content = event.content.replace( /

\s*<(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre)( [^>]*)?>/gi, '<$1$2>' ) + .replace( /<\/(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre)>\s*<\/p>/gi, '' ); } }); - if ( typeof window.jQuery !== 'undefined' ) { - window.jQuery( document ).triggerHandler( 'tinymce-editor-init', [editor] ); + if ( $ ) { + $( document ).triggerHandler( 'tinymce-editor-init', [editor] ); } if ( window.tinyMCEPreInit && window.tinyMCEPreInit.dragDropUpload ) { dom.bind( doc, 'dragstart dragend dragover drop', function( event ) { - if ( typeof window.jQuery !== 'undefined' ) { + if ( $ ) { // Trigger the jQuery handlers. - window.jQuery( document ).trigger( new window.jQuery.Event( event ) ); + $( document ).trigger( new $.Event( event ) ); } }); } - }); - // Word count - if ( typeof window.jQuery !== 'undefined' ) { - editor.on( 'keyup', function( e ) { - var key = e.keyCode || e.charCode; + if ( editor.getParam( 'wp_paste_filters', true ) ) { + editor.on( 'PastePreProcess', function( event ) { + // Remove trailing
added by WebKit browsers to the clipboard + event.content = event.content.replace( /
/gi, '' ); - if ( key === last ) { - return; - } + // In WebKit this is handled by removeWebKitStyles() + if ( ! tinymce.Env.webkit ) { + // Remove all inline styles + event.content = event.content.replace( /(<[^>]+) style="[^"]*"([^>]*>)/gi, '$1$2' ); - if ( 13 === key || 8 === last || 46 === last ) { - window.jQuery( document ).triggerHandler( 'wpcountwords', [ editor.getContent({ format : 'raw' }) ] ); - } + // Put back the internal styles + event.content = event.content.replace(/(<[^>]+) data-mce-style=([^>]+>)/gi, '$1 style=$2' ); + } + }); - last = key; - }); - } + editor.on( 'PastePostProcess', function( event ) { + // Remove empty paragraphs + each( dom.select( 'p', event.node ), function( node ) { + if ( dom.isEmpty( node ) ) { + dom.remove( node ); + } + }); + }); + } + }); - editor.on( 'SaveContent', function( e ) { + editor.on( 'SaveContent', function( event ) { // If editor is hidden, we just want the textarea's value to be saved - if ( editor.isHidden() ) { - e.content = e.element.value; + if ( ! editor.inline && editor.isHidden() ) { + event.content = event.element.value; return; } // Keep empty paragraphs :( - e.content = e.content.replace( /

(
|\u00a0|\uFEFF)?<\/p>/g, '

' ); + event.content = event.content.replace( /

(?:
|\u00a0|\uFEFF| )*<\/p>/g, '

' ); - if ( editor.getParam( 'wpautop', true ) && typeof window.switchEditors !== 'undefined' ) { - e.content = window.switchEditors.pre_wpautop( e.content ); + if ( hasWpautop ) { + event.content = wp.editor.removep( event.content ); } }); editor.on( 'preInit', function() { - // Don't replace with and with and don't remove them when empty - editor.schema.addValidElements( '@[id|accesskey|class|dir|lang|style|tabindex|title|contenteditable|draggable|dropzone|hidden|spellcheck|translate],i,b' ); - }); + var validElementsSetting = '@[id|accesskey|class|dir|lang|style|tabindex|' + + 'title|contenteditable|draggable|dropzone|hidden|spellcheck|translate],' + // Global attributes. + 'i,' + // Don't replace with and with and don't remove them when empty. + 'b,' + + 'script[src|async|defer|type|charset|crossorigin|integrity]'; // Add support for - -
- -
-
- - - - - - - - - - - - -
c v
a x
z y
b i
u 1
2 3
4 5
6 9
k
- -
- - - - - - - - - - - -
n l
j c
d r
u • a
o 1. s
q m
w t
p h
x
- -
- - - - -
Alt +Ctrl + Alt -Ctrl -
Alt 0Ctrl 0
-
- -
- - diff --git a/wp-includes/js/tinymce/wp-tinymce.js.gz b/wp-includes/js/tinymce/wp-tinymce.js.gz index 31e96a8..f7e1b55 100644 Binary files a/wp-includes/js/tinymce/wp-tinymce.js.gz and b/wp-includes/js/tinymce/wp-tinymce.js.gz differ diff --git a/wp-includes/js/tinymce/wp-tinymce.php b/wp-includes/js/tinymce/wp-tinymce.php index 03abd2d..ea58e68 100644 --- a/wp-includes/js/tinymce/wp-tinymce.php +++ b/wp-includes/js/tinymce/wp-tinymce.php @@ -2,7 +2,7 @@ /** * Disable error reporting * - * Set this to error_reporting( E_ALL ) or error_reporting( E_ALL | E_STRICT ) for debugging + * Set this to error_reporting( -1 ) for debugging. */ error_reporting(0); @@ -21,7 +21,7 @@ function get_file($path) { $expires_offset = 31536000; // 1 year -header('Content-Type: application/x-javascript; charset=UTF-8'); +header('Content-Type: application/javascript; charset=UTF-8'); header('Vary: Accept-Encoding'); // Handle proxies header('Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expires_offset ) . ' GMT'); header("Cache-Control: public, max-age=$expires_offset"); diff --git a/wp-includes/js/tw-sack.min.js b/wp-includes/js/tw-sack.min.js index 075e918..6f7812b 100644 --- a/wp-includes/js/tw-sack.min.js +++ b/wp-includes/js/tw-sack.min.js @@ -1 +1 @@ -function sack(file){this.xmlhttp=null,this.resetData=function(){this.method="POST",this.queryStringSeparator="?",this.argumentSeparator="&",this.URLString="",this.encodeURIString=!0,this.execute=!1,this.element=null,this.elementObj=null,this.requestFile=file,this.vars=new Object,this.responseStatus=new Array(2)},this.resetFunctions=function(){this.onLoading=function(){},this.onLoaded=function(){},this.onInteractive=function(){},this.onCompletion=function(){},this.onError=function(){},this.onFail=function(){}},this.reset=function(){this.resetFunctions(),this.resetData()},this.createAJAX=function(){try{this.xmlhttp=new ActiveXObject("Msxml2.XMLHTTP")}catch(a){try{this.xmlhttp=new ActiveXObject("Microsoft.XMLHTTP")}catch(b){this.xmlhttp=null}}this.xmlhttp||("undefined"!=typeof XMLHttpRequest?this.xmlhttp=new XMLHttpRequest:this.failed=!0)},this.setVar=function(a,b){this.vars[a]=Array(b,!1)},this.encVar=function(a,b,c){return 1==c?Array(encodeURIComponent(a),encodeURIComponent(b)):void(this.vars[encodeURIComponent(a)]=Array(encodeURIComponent(b),!0))},this.processURLString=function(a,b){for(encoded=encodeURIComponent(this.argumentSeparator),regexp=new RegExp(this.argumentSeparator+"|"+encoded),varArray=a.split(regexp),i=0;i tags or HTMLImage nodes. + * "emojify" a generic text or DOM Element. + * + * @overloads + * + * String replacement for `innerHTML` or server side operations + * twemoji.parse(string); + * twemoji.parse(string, Function); + * twemoji.parse(string, Object); + * + * HTMLElement tree parsing for safer operations over existing DOM + * twemoji.parse(HTMLElement); + * twemoji.parse(HTMLElement, Function); + * twemoji.parse(HTMLElement, Object); + * + * @param string|HTMLElement the source to parse and enrich with emoji. + * + * string replace emoji matches with tags. + * Mainly used to inject emoji via `innerHTML` + * It does **not** parse the string or validate it, + * it simply replaces found emoji with a tag. + * NOTE: be sure this won't affect security. + * + * HTMLElement walk through the DOM tree and find emoji + * that are inside **text node only** (nodeType === 3) + * Mainly used to put emoji in already generated DOM + * without compromising surrounding nodes and + * **avoiding** the usage of `innerHTML`. + * NOTE: Using DOM elements instead of strings should + * improve security without compromising too much + * performance compared with a less safe `innerHTML`. + * + * @param Function|Object [optional] + * either the callback that will be invoked or an object + * with all properties to use per each found emoji. + * + * Function if specified, this will be invoked per each emoji + * that has been found through the RegExp except + * those follwed by the invariant \uFE0E ("as text"). + * Once invoked, parameters will be: + * + * iconId:string the lower case HEX code point + * i.e. "1f4a9" + * + * options:Object all info for this parsing operation + * + * variant:char the optional \uFE0F ("as image") + * variant, in case this info + * is anyhow meaningful. + * By default this is ignored. + * + * If such callback will return a falsy value instead + * of a valid `src` to use for the image, nothing will + * actually change for that specific emoji. + * + * + * Object if specified, an object containing the following properties + * + * callback Function the callback to invoke per each found emoji. + * base string the base url, by default twemoji.base + * ext string the image extension, by default twemoji.ext + * size string the assets size, by default twemoji.size + * + * @example + * + * twemoji.parse("I \u2764\uFE0F emoji!"); + * // I emoji! + * + * + * twemoji.parse("I \u2764\uFE0F emoji!", function(iconId, options) { + * return '/assets/' + iconId + '.gif'; + * }); + * // I emoji! + * + * + * twemoji.parse("I \u2764\uFE0F emoji!", { + * size: 72, + * callback: function(iconId, options) { + * return '/assets/' + options.size + '/' + iconId + options.ext; + * } + * }); + * // I emoji! + * + */ + parse: parse, + + /** + * Given a string, invokes the callback argument + * per each emoji found in such string. + * This is the most raw version used by + * the .parse(string) method itself. + * + * @param string generic string to parse + * @param Function a generic callback that will be + * invoked to replace the content. + * This calback wil receive standard + * String.prototype.replace(str, callback) + * arguments such: + * callback( + * rawText, // the emoji match + * ); + * + * and others commonly received via replace. + */ + replace: replace, + + /** + * Simplify string tests against emoji. + * + * @param string some text that might contain emoji + * @return boolean true if any emoji was found, false otherwise. + * + * @example + * + * if (twemoji.test(someContent)) { + * console.log("emoji All The Things!"); + * } + */ + test: test + }, + + // used to escape HTML special chars in attributes + escaper = { + '&': '&', + '<': '<', + '>': '>', + "'": ''', + '"': '"' + }, + + // RegExp based on emoji's official Unicode standards + // http://www.unicode.org/Public/UNIDATA/EmojiSources.txt + re = /\ud83d\udc68\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68|\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d\udc66\u200d\ud83d\udc66|\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d\udc67\u200d\ud83d[\udc66\udc67]|\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc66\u200d\ud83d\udc66|\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc67\u200d\ud83d[\udc66\udc67]|\ud83d\udc69\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d[\udc68\udc69]|\ud83d\udc69\u200d\ud83d\udc69\u200d\ud83d\udc66\u200d\ud83d\udc66|\ud83d\udc69\u200d\ud83d\udc69\u200d\ud83d\udc67\u200d\ud83d[\udc66\udc67]|\ud83d\udc68\u200d\u2764\ufe0f\u200d\ud83d\udc68|\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d[\udc66\udc67]|\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d[\udc66\udc67]|\ud83d\udc69\u200d\u2764\ufe0f\u200d\ud83d[\udc68\udc69]|\ud83d\udc69\u200d\ud83d\udc69\u200d\ud83d[\udc66\udc67]|\ud83d\udc41\u200d\ud83d\udde8|(?:[\u0023\u002a\u0030-\u0039])\ufe0f?\u20e3|(?:(?:[\u261d\u270c])(?:\ufe0f|(?!\ufe0e))|\ud83c[\udf85\udfc2-\udfc4\udfc7\udfca\udfcb]|\ud83d[\udc42\udc43\udc46-\udc50\udc66-\udc69\udc6e\udc70-\udc78\udc7c\udc81-\udc83\udc85-\udc87\udcaa\udd75\udd90\udd95\udd96\ude45-\ude47\ude4b-\ude4f\udea3\udeb4-\udeb6\udec0]|\ud83e\udd18|[\u26f9\u270a\u270b\u270d])(?:\ud83c[\udffb-\udfff]|)|\ud83c\udde6\ud83c[\udde8-\uddec\uddee\uddf1\uddf2\uddf4\uddf6-\uddfa\uddfc\uddfd\uddff]|\ud83c\udde7\ud83c[\udde6\udde7\udde9-\uddef\uddf1-\uddf4\uddf6-\uddf9\uddfb\uddfc\uddfe\uddff]|\ud83c\udde8\ud83c[\udde6\udde8\udde9\uddeb-\uddee\uddf0-\uddf5\uddf7\uddfa-\uddff]|\ud83c\udde9\ud83c[\uddea\uddec\uddef\uddf0\uddf2\uddf4\uddff]|\ud83c\uddea\ud83c[\udde6\udde8\uddea\uddec\udded\uddf7-\uddfa]|\ud83c\uddeb\ud83c[\uddee-\uddf0\uddf2\uddf4\uddf7]|\ud83c\uddec\ud83c[\udde6\udde7\udde9-\uddee\uddf1-\uddf3\uddf5-\uddfa\uddfc\uddfe]|\ud83c\udded\ud83c[\uddf0\uddf2\uddf3\uddf7\uddf9\uddfa]|\ud83c\uddee\ud83c[\udde8-\uddea\uddf1-\uddf4\uddf6-\uddf9]|\ud83c\uddef\ud83c[\uddea\uddf2\uddf4\uddf5]|\ud83c\uddf0\ud83c[\uddea\uddec-\uddee\uddf2\uddf3\uddf5\uddf7\uddfc\uddfe\uddff]|\ud83c\uddf1\ud83c[\udde6-\udde8\uddee\uddf0\uddf7-\uddfb\uddfe]|\ud83c\uddf2\ud83c[\udde6\udde8-\udded\uddf0-\uddff]|\ud83c\uddf3\ud83c[\udde6\udde8\uddea-\uddec\uddee\uddf1\uddf4\uddf5\uddf7\uddfa\uddff]|\ud83c\uddf4\ud83c\uddf2|\ud83c\uddf5\ud83c[\udde6\uddea-\udded\uddf0-\uddf3\uddf7-\uddf9\uddfc\uddfe]|\ud83c\uddf6\ud83c\udde6|\ud83c\uddf7\ud83c[\uddea\uddf4\uddf8\uddfa\uddfc]|\ud83c\uddf8\ud83c[\udde6-\uddea\uddec-\uddf4\uddf7-\uddf9\uddfb\uddfd-\uddff]|\ud83c\uddf9\ud83c[\udde6\udde8\udde9\uddeb-\udded\uddef-\uddf4\uddf7\uddf9\uddfb\uddfc\uddff]|\ud83c\uddfa\ud83c[\udde6\uddec\uddf2\uddf8\uddfe\uddff]|\ud83c\uddfb\ud83c[\udde6\udde8\uddea\uddec\uddee\uddf3\uddfa]|\ud83c\uddfc\ud83c[\uddeb\uddf8]|\ud83c\uddfd\ud83c\uddf0|\ud83c\uddfe\ud83c[\uddea\uddf9]|\ud83c\uddff\ud83c[\udde6\uddf2\uddfc]|\ud83c[\udccf\udd8e\udd91-\udd9a\udde6-\uddff\ude01\ude32-\ude36\ude38-\ude3a\ude50\ude51\udf00-\udf21\udf24-\udf84\udf86-\udf93\udf96\udf97\udf99-\udf9b\udf9e-\udfc1\udfc5\udfc6\udfc8\udfc9\udfcc-\udff0\udff3-\udff5\udff7-\udfff]|\ud83d[\udc00-\udc41\udc44\udc45\udc51-\udc65\udc6a-\udc6d\udc6f\udc79-\udc7b\udc7d-\udc80\udc84\udc88-\udca9\udcab-\udcfd\udcff-\udd3d\udd49-\udd4e\udd50-\udd67\udd6f\udd70\udd73\udd74\udd76-\udd79\udd87\udd8a-\udd8d\udda5\udda8\uddb1\uddb2\uddbc\uddc2-\uddc4\uddd1-\uddd3\udddc-\uddde\udde1\udde3\udde8\uddef\uddf3\uddfa-\ude44\ude48-\ude4a\ude80-\udea2\udea4-\udeb3\udeb7-\udebf\udec1-\udec5\udecb-\uded0\udee0-\udee5\udee9\udeeb\udeec\udef0\udef3]|\ud83e[\udd10-\udd17\udd80-\udd84\uddc0]|[\u2328\u23cf\u23e9-\u23f3\u23f8-\u23fa\u2602-\u2604\u2618\u2620\u2622\u2623\u2626\u262a\u262e\u262f\u2638\u2692\u2694\u2696\u2697\u2699\u269b\u269c\u26b0\u26b1\u26c8\u26ce\u26cf\u26d1\u26d3\u26e9\u26f0\u26f1\u26f4\u26f7\u26f8\u2705\u271d\u2721\u2728\u274c\u274e\u2753-\u2755\u2763\u2795-\u2797\u27b0\u27bf\ue50a]|(?:\ud83c[\udc04\udd70\udd71\udd7e\udd7f\ude02\ude1a\ude2f\ude37]|[\u00a9\u00ae\u203c\u2049\u2122\u2139\u2194-\u2199\u21a9\u21aa\u231a\u231b\u24c2\u25aa\u25ab\u25b6\u25c0\u25fb-\u25fe\u2600\u2601\u260e\u2611\u2614\u2615\u2639\u263a\u2648-\u2653\u2660\u2663\u2665\u2666\u2668\u267b\u267f\u2693\u26a0\u26a1\u26aa\u26ab\u26bd\u26be\u26c4\u26c5\u26d4\u26ea\u26f2\u26f3\u26f5\u26fa\u26fd\u2702\u2708\u2709\u270f\u2712\u2714\u2716\u2733\u2734\u2744\u2747\u2757\u2764\u27a1\u2934\u2935\u2b05-\u2b07\u2b1b\u2b1c\u2b50\u2b55\u3030\u303d\u3297\u3299])(?:\ufe0f|(?!\ufe0e))/g, + + // avoid runtime RegExp creation for not so smart, + // not JIT based, and old browsers / engines + UFE0Fg = /\uFE0F/g, + + // avoid using a string literal like '\u200D' here because minifiers expand it inline + U200D = String.fromCharCode(0x200D), + + // used to find HTML special chars in attributes + rescaper = /[&<>'"]/g, + + // nodes with type 1 which should **not** be parsed (including lower case svg) + shouldntBeParsed = /IFRAME|NOFRAMES|NOSCRIPT|SCRIPT|SELECT|STYLE|TEXTAREA|[a-z]/, + + // just a private shortcut + fromCharCode = String.fromCharCode; + + return twemoji; + + + ///////////////////////// + // private functions // + // declaration // + ///////////////////////// + + /** + * Shortcut to create text nodes + * @param string text used to create DOM text node + * @return Node a DOM node with that text + */ + function createText(text) { + return document.createTextNode(text); + } + + /** + * Utility function to escape html attribute text + * @param string text use in HTML attribute + * @return string text encoded to use in HTML attribute + */ + function escapeHTML(s) { + return s.replace(rescaper, replacer); + } + + /** + * Default callback used to generate emoji src + * based on Twitter CDN + * @param string the emoji codepoint string + * @param string the default size to use, i.e. "36x36" + * @return string the image source to use + */ + function defaultImageSrcGenerator(icon, options) { + return ''.concat(options.base, options.size, '/', icon, options.ext); + } + + /** + * Given a generic DOM nodeType 1, walk through all children + * and store every nodeType 3 (#text) found in the tree. + * @param Element a DOM Element with probably some text in it + * @param Array the list of previously discovered text nodes + * @return Array same list with new discovered nodes, if any + */ + function grabAllTextNodes(node, allText) { + var + childNodes = node.childNodes, + length = childNodes.length, + subnode, + nodeType; + while (length--) { + subnode = childNodes[length]; + nodeType = subnode.nodeType; + // parse emoji only in text nodes + if (nodeType === 3) { + // collect them to process emoji later + allText.push(subnode); + } + // ignore all nodes that are not type 1 or that + // should not be parsed as script, style, and others + else if (nodeType === 1 && !shouldntBeParsed.test(subnode.nodeName)) { + grabAllTextNodes(subnode, allText); + } + } + return allText; + } + + /** + * Used to both remove the possible variant + * and to convert utf16 into code points. + * If there is a zero-width-joiner (U+200D), leave the variants in. + * @param string the raw text of the emoji match + */ + function grabTheRightIcon(rawText) { + // if variant is present as \uFE0F + return toCodePoint(rawText.indexOf(U200D) < 0 ? + rawText.replace(UFE0Fg, '') : + rawText + ); + } + + /** + * DOM version of the same logic / parser: + * emojify all found sub-text nodes placing images node instead. + * @param Element generic DOM node with some text in some child node + * @param Object options containing info about how to parse + * + * .callback Function the callback to invoke per each found emoji. + * .base string the base url, by default twemoji.base + * .ext string the image extension, by default twemoji.ext + * .size string the assets size, by default twemoji.size + * + * @return Element same generic node with emoji in place, if any. + */ + function parseNode(node, options) { + var + allText = grabAllTextNodes(node, []), + length = allText.length, + attrib, + attrname, + modified, + fragment, + subnode, + text, + match, + i, + index, + img, + rawText, + iconId, + src; + while (length--) { + modified = false; + fragment = document.createDocumentFragment(); + subnode = allText[length]; + text = subnode.nodeValue; + i = 0; + while ((match = re.exec(text))) { + index = match.index; + if (index !== i) { + fragment.appendChild( + createText(text.slice(i, index)) + ); + } + rawText = match[0]; + iconId = grabTheRightIcon(rawText); + i = index + rawText.length; + src = options.callback(iconId, options); + if (src) { + img = new Image(); + img.onerror = options.onerror; + img.setAttribute('draggable', 'false'); + attrib = options.attributes(rawText, iconId); + for (attrname in attrib) { + if ( + attrib.hasOwnProperty(attrname) && + // don't allow any handlers to be set + don't allow overrides + attrname.indexOf('on') !== 0 && + !img.hasAttribute(attrname) + ) { + img.setAttribute(attrname, attrib[attrname]); + } + } + img.className = options.className; + img.alt = rawText; + img.src = src; + modified = true; + fragment.appendChild(img); + } + if (!img) fragment.appendChild(createText(rawText)); + img = null; + } + // is there actually anything to replace in here ? + if (modified) { + // any text left to be added ? + if (i < text.length) { + fragment.appendChild( + createText(text.slice(i)) + ); + } + // replace the text node only, leave intact + // anything else surrounding such text + subnode.parentNode.replaceChild(fragment, subnode); + } + } + return node; + } + + /** + * String/HTML version of the same logic / parser: + * emojify a generic text placing images tags instead of surrogates pair. + * @param string generic string with possibly some emoji in it + * @param Object options containing info about how to parse + * + * .callback Function the callback to invoke per each found emoji. + * .base string the base url, by default twemoji.base + * .ext string the image extension, by default twemoji.ext + * .size string the assets size, by default twemoji.size + * + * @return the string with replacing all found and parsed emoji + */ + function parseString(str, options) { + return replace(str, function (rawText) { + var + ret = rawText, + iconId = grabTheRightIcon(rawText), + src = options.callback(iconId, options), + attrib, + attrname; + if (src) { + // recycle the match string replacing the emoji + // with its image counter part + ret = ''); + } + return ret; + }); + } + + /** + * Function used to actually replace HTML special chars + * @param string HTML special char + * @return string encoded HTML special char + */ + function replacer(m) { + return escaper[m]; + } + + /** + * Default options.attribute callback + * @return null + */ + function returnNull() { + return null; + } + + /** + * Given a generic value, creates its squared counterpart if it's a number. + * As example, number 36 will return '36x36'. + * @param any a generic value. + * @return any a string representing asset size, i.e. "36x36" + * only in case the value was a number. + * Returns initial value otherwise. + */ + function toSizeSquaredAsset(value) { + return typeof value === 'number' ? + value + 'x' + value : + value; + } + + + ///////////////////////// + // exported functions // + // declaration // + ///////////////////////// + + function fromCodePoint(codepoint) { + var code = typeof codepoint === 'string' ? + parseInt(codepoint, 16) : codepoint; + if (code < 0x10000) { + return fromCharCode(code); + } + code -= 0x10000; + return fromCharCode( + 0xD800 + (code >> 10), + 0xDC00 + (code & 0x3FF) + ); + } + + function parse(what, how) { + if (!how || typeof how === 'function') { + how = {callback: how}; + } + // if first argument is string, inject html tags + // otherwise use the DOM tree and parse text nodes only + return (typeof what === 'string' ? parseString : parseNode)(what, { + callback: how.callback || defaultImageSrcGenerator, + attributes: typeof how.attributes === 'function' ? how.attributes : returnNull, + base: typeof how.base === 'string' ? how.base : twemoji.base, + ext: how.ext || twemoji.ext, + size: how.folder || toSizeSquaredAsset(how.size || twemoji.size), + className: how.className || twemoji.className, + onerror: how.onerror || twemoji.onerror + }); + } + + function replace(text, callback) { + return String(text).replace(re, callback); + } + + function test(text) { + // IE6 needs a reset before too + re.lastIndex = 0; + var result = re.test(text); + re.lastIndex = 0; + return result; + } + + function toCodePoint(unicodeSurrogates, sep) { + var + r = [], + c = 0, + p = 0, + i = 0; + while (i < unicodeSurrogates.length) { + c = unicodeSurrogates.charCodeAt(i++); + if (p) { + r.push((0x10000 + ((p - 0xD800) << 10) + (c - 0xDC00)).toString(16)); + p = 0; + } else if (0xD800 <= c && c <= 0xDBFF) { + p = c; + } else { + r.push(c.toString(16)); + } + } + return r.join(sep || '-'); + } + +}()); diff --git a/wp-includes/js/twemoji.min.js b/wp-includes/js/twemoji.min.js new file mode 100644 index 0000000..df8a493 --- /dev/null +++ b/wp-includes/js/twemoji.min.js @@ -0,0 +1 @@ +var twemoji=function(){"use strict";function a(a){return document.createTextNode(a)}function b(a){return a.replace(u,h)}function c(a,b){return"".concat(b.base,b.size,"/",a,b.ext)}function d(a,b){for(var c,e,f=a.childNodes,g=f.length;g--;)c=f[g],e=c.nodeType,3===e?b.push(c):1!==e||v.test(c.nodeName)||d(c,b);return b}function e(a){return o(a.indexOf(t)<0?a.replace(s,""):a)}function f(b,c){for(var f,g,h,i,j,k,l,m,n,o,p,q,s,t=d(b,[]),u=t.length;u--;){for(h=!1,i=document.createDocumentFragment(),j=t[u],k=j.nodeValue,m=0;l=r.exec(k);){if(n=l.index,n!==m&&i.appendChild(a(k.slice(m,n))),p=l[0],q=e(p),m=n+p.length,s=c.callback(q,c)){o=new Image,o.onerror=c.onerror,o.setAttribute("draggable","false"),f=c.attributes(p,q);for(g in f)f.hasOwnProperty(g)&&0!==g.indexOf("on")&&!o.hasAttribute(g)&&o.setAttribute(g,f[g]);o.className=c.className,o.alt=p,o.src=s,h=!0,i.appendChild(o)}o||i.appendChild(a(p)),o=null}h&&(m")}return g})}function h(a){return q[a]}function i(){return null}function j(a){return"number"==typeof a?a+"x"+a:a}function k(a){var b="string"==typeof a?parseInt(a,16):a;return 65536>b?w(b):(b-=65536,w(55296+(b>>10),56320+(1023&b)))}function l(a,b){return b&&"function"!=typeof b||(b={callback:b}),("string"==typeof a?g:f)(a,{callback:b.callback||c,attributes:"function"==typeof b.attributes?b.attributes:i,base:"string"==typeof b.base?b.base:p.base,ext:b.ext||p.ext,size:b.folder||j(b.size||p.size),className:b.className||p.className,onerror:b.onerror||p.onerror})}function m(a,b){return String(a).replace(r,b)}function n(a){r.lastIndex=0;var b=r.test(a);return r.lastIndex=0,b}function o(a,b){for(var c=[],d=0,e=0,f=0;f=55296&&56319>=d?e=d:c.push(d.toString(16));return c.join(b||"-")}var p={base:"https://twemoji.maxcdn.com/2/",ext:".png",size:"72x72",className:"emoji",convert:{fromCodePoint:k,toCodePoint:o},onerror:function(){this.parentNode&&this.parentNode.replaceChild(a(this.alt),this)},parse:l,replace:m,test:n},q={"&":"&","<":"<",">":">","'":"'",'"':"""},r=/\ud83d\udc68\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68|\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d\udc66\u200d\ud83d\udc66|\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d\udc67\u200d\ud83d[\udc66\udc67]|\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc66\u200d\ud83d\udc66|\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc67\u200d\ud83d[\udc66\udc67]|\ud83d\udc69\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d[\udc68\udc69]|\ud83d\udc69\u200d\ud83d\udc69\u200d\ud83d\udc66\u200d\ud83d\udc66|\ud83d\udc69\u200d\ud83d\udc69\u200d\ud83d\udc67\u200d\ud83d[\udc66\udc67]|\ud83d\udc68\u200d\u2764\ufe0f\u200d\ud83d\udc68|\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d[\udc66\udc67]|\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d[\udc66\udc67]|\ud83d\udc69\u200d\u2764\ufe0f\u200d\ud83d[\udc68\udc69]|\ud83d\udc69\u200d\ud83d\udc69\u200d\ud83d[\udc66\udc67]|\ud83d\udc41\u200d\ud83d\udde8|(?:[\u0023\u002a\u0030-\u0039])\ufe0f?\u20e3|(?:(?:[\u261d\u270c])(?:\ufe0f|(?!\ufe0e))|\ud83c[\udf85\udfc2-\udfc4\udfc7\udfca\udfcb]|\ud83d[\udc42\udc43\udc46-\udc50\udc66-\udc69\udc6e\udc70-\udc78\udc7c\udc81-\udc83\udc85-\udc87\udcaa\udd75\udd90\udd95\udd96\ude45-\ude47\ude4b-\ude4f\udea3\udeb4-\udeb6\udec0]|\ud83e\udd18|[\u26f9\u270a\u270b\u270d])(?:\ud83c[\udffb-\udfff]|)|\ud83c\udde6\ud83c[\udde8-\uddec\uddee\uddf1\uddf2\uddf4\uddf6-\uddfa\uddfc\uddfd\uddff]|\ud83c\udde7\ud83c[\udde6\udde7\udde9-\uddef\uddf1-\uddf4\uddf6-\uddf9\uddfb\uddfc\uddfe\uddff]|\ud83c\udde8\ud83c[\udde6\udde8\udde9\uddeb-\uddee\uddf0-\uddf5\uddf7\uddfa-\uddff]|\ud83c\udde9\ud83c[\uddea\uddec\uddef\uddf0\uddf2\uddf4\uddff]|\ud83c\uddea\ud83c[\udde6\udde8\uddea\uddec\udded\uddf7-\uddfa]|\ud83c\uddeb\ud83c[\uddee-\uddf0\uddf2\uddf4\uddf7]|\ud83c\uddec\ud83c[\udde6\udde7\udde9-\uddee\uddf1-\uddf3\uddf5-\uddfa\uddfc\uddfe]|\ud83c\udded\ud83c[\uddf0\uddf2\uddf3\uddf7\uddf9\uddfa]|\ud83c\uddee\ud83c[\udde8-\uddea\uddf1-\uddf4\uddf6-\uddf9]|\ud83c\uddef\ud83c[\uddea\uddf2\uddf4\uddf5]|\ud83c\uddf0\ud83c[\uddea\uddec-\uddee\uddf2\uddf3\uddf5\uddf7\uddfc\uddfe\uddff]|\ud83c\uddf1\ud83c[\udde6-\udde8\uddee\uddf0\uddf7-\uddfb\uddfe]|\ud83c\uddf2\ud83c[\udde6\udde8-\udded\uddf0-\uddff]|\ud83c\uddf3\ud83c[\udde6\udde8\uddea-\uddec\uddee\uddf1\uddf4\uddf5\uddf7\uddfa\uddff]|\ud83c\uddf4\ud83c\uddf2|\ud83c\uddf5\ud83c[\udde6\uddea-\udded\uddf0-\uddf3\uddf7-\uddf9\uddfc\uddfe]|\ud83c\uddf6\ud83c\udde6|\ud83c\uddf7\ud83c[\uddea\uddf4\uddf8\uddfa\uddfc]|\ud83c\uddf8\ud83c[\udde6-\uddea\uddec-\uddf4\uddf7-\uddf9\uddfb\uddfd-\uddff]|\ud83c\uddf9\ud83c[\udde6\udde8\udde9\uddeb-\udded\uddef-\uddf4\uddf7\uddf9\uddfb\uddfc\uddff]|\ud83c\uddfa\ud83c[\udde6\uddec\uddf2\uddf8\uddfe\uddff]|\ud83c\uddfb\ud83c[\udde6\udde8\uddea\uddec\uddee\uddf3\uddfa]|\ud83c\uddfc\ud83c[\uddeb\uddf8]|\ud83c\uddfd\ud83c\uddf0|\ud83c\uddfe\ud83c[\uddea\uddf9]|\ud83c\uddff\ud83c[\udde6\uddf2\uddfc]|\ud83c[\udccf\udd8e\udd91-\udd9a\udde6-\uddff\ude01\ude32-\ude36\ude38-\ude3a\ude50\ude51\udf00-\udf21\udf24-\udf84\udf86-\udf93\udf96\udf97\udf99-\udf9b\udf9e-\udfc1\udfc5\udfc6\udfc8\udfc9\udfcc-\udff0\udff3-\udff5\udff7-\udfff]|\ud83d[\udc00-\udc41\udc44\udc45\udc51-\udc65\udc6a-\udc6d\udc6f\udc79-\udc7b\udc7d-\udc80\udc84\udc88-\udca9\udcab-\udcfd\udcff-\udd3d\udd49-\udd4e\udd50-\udd67\udd6f\udd70\udd73\udd74\udd76-\udd79\udd87\udd8a-\udd8d\udda5\udda8\uddb1\uddb2\uddbc\uddc2-\uddc4\uddd1-\uddd3\udddc-\uddde\udde1\udde3\udde8\uddef\uddf3\uddfa-\ude44\ude48-\ude4a\ude80-\udea2\udea4-\udeb3\udeb7-\udebf\udec1-\udec5\udecb-\uded0\udee0-\udee5\udee9\udeeb\udeec\udef0\udef3]|\ud83e[\udd10-\udd17\udd80-\udd84\uddc0]|[\u2328\u23cf\u23e9-\u23f3\u23f8-\u23fa\u2602-\u2604\u2618\u2620\u2622\u2623\u2626\u262a\u262e\u262f\u2638\u2692\u2694\u2696\u2697\u2699\u269b\u269c\u26b0\u26b1\u26c8\u26ce\u26cf\u26d1\u26d3\u26e9\u26f0\u26f1\u26f4\u26f7\u26f8\u2705\u271d\u2721\u2728\u274c\u274e\u2753-\u2755\u2763\u2795-\u2797\u27b0\u27bf\ue50a]|(?:\ud83c[\udc04\udd70\udd71\udd7e\udd7f\ude02\ude1a\ude2f\ude37]|[\u00a9\u00ae\u203c\u2049\u2122\u2139\u2194-\u2199\u21a9\u21aa\u231a\u231b\u24c2\u25aa\u25ab\u25b6\u25c0\u25fb-\u25fe\u2600\u2601\u260e\u2611\u2614\u2615\u2639\u263a\u2648-\u2653\u2660\u2663\u2665\u2666\u2668\u267b\u267f\u2693\u26a0\u26a1\u26aa\u26ab\u26bd\u26be\u26c4\u26c5\u26d4\u26ea\u26f2\u26f3\u26f5\u26fa\u26fd\u2702\u2708\u2709\u270f\u2712\u2714\u2716\u2733\u2734\u2744\u2747\u2757\u2764\u27a1\u2934\u2935\u2b05-\u2b07\u2b1b\u2b1c\u2b50\u2b55\u3030\u303d\u3297\u3299])(?:\ufe0f|(?!\ufe0e))/g,s=/\uFE0F/g,t=String.fromCharCode(8205),u=/[&<>'"]/g,v=/IFRAME|NOFRAMES|NOSCRIPT|SCRIPT|SELECT|STYLE|TEXTAREA|[a-z]/,w=String.fromCharCode;return p}(); \ No newline at end of file diff --git a/wp-includes/js/underscore.min.js b/wp-includes/js/underscore.min.js index 5c6742f..3c3eec0 100644 --- a/wp-includes/js/underscore.min.js +++ b/wp-includes/js/underscore.min.js @@ -1 +1,5 @@ -(function(){var a=this,b=a._,c={},d=Array.prototype,e=Object.prototype,f=Function.prototype,g=d.push,h=d.slice,i=d.concat,j=e.toString,k=e.hasOwnProperty,l=d.forEach,m=d.map,n=d.reduce,o=d.reduceRight,p=d.filter,q=d.every,r=d.some,s=d.indexOf,t=d.lastIndexOf,u=Array.isArray,v=Object.keys,w=f.bind,x=function(a){return a instanceof x?a:this instanceof x?void(this._wrapped=a):new x(a)};"undefined"!=typeof exports?("undefined"!=typeof module&&module.exports&&(exports=module.exports=x),exports._=x):a._=x,x.VERSION="1.6.0";var y=x.each=x.forEach=function(a,b,d){if(null==a)return a;if(l&&a.forEach===l)a.forEach(b,d);else if(a.length===+a.length){for(var e=0,f=a.length;f>e;e++)if(b.call(d,a[e],e,a)===c)return}else for(var g=x.keys(a),e=0,f=g.length;f>e;e++)if(b.call(d,a[g[e]],g[e],a)===c)return;return a};x.map=x.collect=function(a,b,c){var d=[];return null==a?d:m&&a.map===m?a.map(b,c):(y(a,function(a,e,f){d.push(b.call(c,a,e,f))}),d)};var z="Reduce of empty array with no initial value";x.reduce=x.foldl=x.inject=function(a,b,c,d){var e=arguments.length>2;if(null==a&&(a=[]),n&&a.reduce===n)return d&&(b=x.bind(b,d)),e?a.reduce(b,c):a.reduce(b);if(y(a,function(a,f,g){e?c=b.call(d,c,a,f,g):(c=a,e=!0)}),!e)throw new TypeError(z);return c},x.reduceRight=x.foldr=function(a,b,c,d){var e=arguments.length>2;if(null==a&&(a=[]),o&&a.reduceRight===o)return d&&(b=x.bind(b,d)),e?a.reduceRight(b,c):a.reduceRight(b);var f=a.length;if(f!==+f){var g=x.keys(a);f=g.length}if(y(a,function(h,i,j){i=g?g[--f]:--f,e?c=b.call(d,c,a[i],i,j):(c=a[i],e=!0)}),!e)throw new TypeError(z);return c},x.find=x.detect=function(a,b,c){var d;return A(a,function(a,e,f){return b.call(c,a,e,f)?(d=a,!0):void 0}),d},x.filter=x.select=function(a,b,c){var d=[];return null==a?d:p&&a.filter===p?a.filter(b,c):(y(a,function(a,e,f){b.call(c,a,e,f)&&d.push(a)}),d)},x.reject=function(a,b,c){return x.filter(a,function(a,d,e){return!b.call(c,a,d,e)},c)},x.every=x.all=function(a,b,d){b||(b=x.identity);var e=!0;return null==a?e:q&&a.every===q?a.every(b,d):(y(a,function(a,f,g){return(e=e&&b.call(d,a,f,g))?void 0:c}),!!e)};var A=x.some=x.any=function(a,b,d){b||(b=x.identity);var e=!1;return null==a?e:r&&a.some===r?a.some(b,d):(y(a,function(a,f,g){return e||(e=b.call(d,a,f,g))?c:void 0}),!!e)};x.contains=x.include=function(a,b){return null==a?!1:s&&a.indexOf===s?-1!=a.indexOf(b):A(a,function(a){return a===b})},x.invoke=function(a,b){var c=h.call(arguments,2),d=x.isFunction(b);return x.map(a,function(a){return(d?b:a[b]).apply(a,c)})},x.pluck=function(a,b){return x.map(a,x.property(b))},x.where=function(a,b){return x.filter(a,x.matches(b))},x.findWhere=function(a,b){return x.find(a,x.matches(b))},x.max=function(a,b,c){if(!b&&x.isArray(a)&&a[0]===+a[0]&&a.length<65535)return Math.max.apply(Math,a);var d=-1/0,e=-1/0;return y(a,function(a,f,g){var h=b?b.call(c,a,f,g):a;h>e&&(d=a,e=h)}),d},x.min=function(a,b,c){if(!b&&x.isArray(a)&&a[0]===+a[0]&&a.length<65535)return Math.min.apply(Math,a);var d=1/0,e=1/0;return y(a,function(a,f,g){var h=b?b.call(c,a,f,g):a;e>h&&(d=a,e=h)}),d},x.shuffle=function(a){var b,c=0,d=[];return y(a,function(a){b=x.random(c++),d[c-1]=d[b],d[b]=a}),d},x.sample=function(a,b,c){return null==b||c?(a.length!==+a.length&&(a=x.values(a)),a[x.random(a.length-1)]):x.shuffle(a).slice(0,Math.max(0,b))};var B=function(a){return null==a?x.identity:x.isFunction(a)?a:x.property(a)};x.sortBy=function(a,b,c){return b=B(b),x.pluck(x.map(a,function(a,d,e){return{value:a,index:d,criteria:b.call(c,a,d,e)}}).sort(function(a,b){var c=a.criteria,d=b.criteria;if(c!==d){if(c>d||void 0===c)return 1;if(d>c||void 0===d)return-1}return a.index-b.index}),"value")};var C=function(a){return function(b,c,d){var e={};return c=B(c),y(b,function(f,g){var h=c.call(d,f,g,b);a(e,h,f)}),e}};x.groupBy=C(function(a,b,c){x.has(a,b)?a[b].push(c):a[b]=[c]}),x.indexBy=C(function(a,b,c){a[b]=c}),x.countBy=C(function(a,b){x.has(a,b)?a[b]++:a[b]=1}),x.sortedIndex=function(a,b,c,d){c=B(c);for(var e=c.call(d,b),f=0,g=a.length;g>f;){var h=f+g>>>1;c.call(d,a[h])b?[]:h.call(a,0,b)},x.initial=function(a,b,c){return h.call(a,0,a.length-(null==b||c?1:b))},x.last=function(a,b,c){return null==a?void 0:null==b||c?a[a.length-1]:h.call(a,Math.max(a.length-b,0))},x.rest=x.tail=x.drop=function(a,b,c){return h.call(a,null==b||c?1:b)},x.compact=function(a){return x.filter(a,x.identity)};var D=function(a,b,c){return b&&x.every(a,x.isArray)?i.apply(c,a):(y(a,function(a){x.isArray(a)||x.isArguments(a)?b?g.apply(c,a):D(a,b,c):c.push(a)}),c)};x.flatten=function(a,b){return D(a,b,[])},x.without=function(a){return x.difference(a,h.call(arguments,1))},x.partition=function(a,b){var c=[],d=[];return y(a,function(a){(b(a)?c:d).push(a)}),[c,d]},x.uniq=x.unique=function(a,b,c,d){x.isFunction(b)&&(d=c,c=b,b=!1);var e=c?x.map(a,c,d):a,f=[],g=[];return y(e,function(c,d){(b?d&&g[g.length-1]===c:x.contains(g,c))||(g.push(c),f.push(a[d]))}),f},x.union=function(){return x.uniq(x.flatten(arguments,!0))},x.intersection=function(a){var b=h.call(arguments,1);return x.filter(x.uniq(a),function(a){return x.every(b,function(b){return x.contains(b,a)})})},x.difference=function(a){var b=i.apply(d,h.call(arguments,1));return x.filter(a,function(a){return!x.contains(b,a)})},x.zip=function(){for(var a=x.max(x.pluck(arguments,"length").concat(0)),b=new Array(a),c=0;a>c;c++)b[c]=x.pluck(arguments,""+c);return b},x.object=function(a,b){if(null==a)return{};for(var c={},d=0,e=a.length;e>d;d++)b?c[a[d]]=b[d]:c[a[d][0]]=a[d][1];return c},x.indexOf=function(a,b,c){if(null==a)return-1;var d=0,e=a.length;if(c){if("number"!=typeof c)return d=x.sortedIndex(a,b),a[d]===b?d:-1;d=0>c?Math.max(0,e+c):c}if(s&&a.indexOf===s)return a.indexOf(b,c);for(;e>d;d++)if(a[d]===b)return d;return-1},x.lastIndexOf=function(a,b,c){if(null==a)return-1;var d=null!=c;if(t&&a.lastIndexOf===t)return d?a.lastIndexOf(b,c):a.lastIndexOf(b);for(var e=d?c:a.length;e--;)if(a[e]===b)return e;return-1},x.range=function(a,b,c){arguments.length<=1&&(b=a||0,a=0),c=arguments[2]||1;for(var d=Math.max(Math.ceil((b-a)/c),0),e=0,f=new Array(d);d>e;)f[e++]=a,a+=c;return f};var E=function(){};x.bind=function(a,b){var c,d;if(w&&a.bind===w)return w.apply(a,h.call(arguments,1));if(!x.isFunction(a))throw new TypeError;return c=h.call(arguments,2),d=function(){if(!(this instanceof d))return a.apply(b,c.concat(h.call(arguments)));E.prototype=a.prototype;var e=new E;E.prototype=null;var f=a.apply(e,c.concat(h.call(arguments)));return Object(f)===f?f:e}},x.partial=function(a){var b=h.call(arguments,1);return function(){for(var c=0,d=b.slice(),e=0,f=d.length;f>e;e++)d[e]===x&&(d[e]=arguments[c++]);for(;c=k?(clearTimeout(g),g=null,h=j,f=a.apply(d,e),d=e=null):g||c.trailing===!1||(g=setTimeout(i,k)),f}},x.debounce=function(a,b,c){var d,e,f,g,h,i=function(){var j=x.now()-g;b>j?d=setTimeout(i,b-j):(d=null,c||(h=a.apply(f,e),f=e=null))};return function(){f=this,e=arguments,g=x.now();var j=c&&!d;return d||(d=setTimeout(i,b)),j&&(h=a.apply(f,e),f=e=null),h}},x.once=function(a){var b,c=!1;return function(){return c?b:(c=!0,b=a.apply(this,arguments),a=null,b)}},x.wrap=function(a,b){return x.partial(b,a)},x.compose=function(){var a=arguments;return function(){for(var b=arguments,c=a.length-1;c>=0;c--)b=[a[c].apply(this,b)];return b[0]}},x.after=function(a,b){return function(){return--a<1?b.apply(this,arguments):void 0}},x.keys=function(a){if(!x.isObject(a))return[];if(v)return v(a);var b=[];for(var c in a)x.has(a,c)&&b.push(c);return b},x.values=function(a){for(var b=x.keys(a),c=b.length,d=new Array(c),e=0;c>e;e++)d[e]=a[b[e]];return d},x.pairs=function(a){for(var b=x.keys(a),c=b.length,d=new Array(c),e=0;c>e;e++)d[e]=[b[e],a[b[e]]];return d},x.invert=function(a){for(var b={},c=x.keys(a),d=0,e=c.length;e>d;d++)b[a[c[d]]]=c[d];return b},x.functions=x.methods=function(a){var b=[];for(var c in a)x.isFunction(a[c])&&b.push(c);return b.sort()},x.extend=function(a){return y(h.call(arguments,1),function(b){if(b)for(var c in b)a[c]=b[c]}),a},x.pick=function(a){var b={},c=i.apply(d,h.call(arguments,1));return y(c,function(c){c in a&&(b[c]=a[c])}),b},x.omit=function(a){var b={},c=i.apply(d,h.call(arguments,1));for(var e in a)x.contains(c,e)||(b[e]=a[e]);return b},x.defaults=function(a){return y(h.call(arguments,1),function(b){if(b)for(var c in b)void 0===a[c]&&(a[c]=b[c])}),a},x.clone=function(a){return x.isObject(a)?x.isArray(a)?a.slice():x.extend({},a):a},x.tap=function(a,b){return b(a),a};var F=function(a,b,c,d){if(a===b)return 0!==a||1/a==1/b;if(null==a||null==b)return a===b;a instanceof x&&(a=a._wrapped),b instanceof x&&(b=b._wrapped);var e=j.call(a);if(e!=j.call(b))return!1;switch(e){case"[object String]":return a==String(b);case"[object Number]":return a!=+a?b!=+b:0==a?1/a==1/b:a==+b;case"[object Date]":case"[object Boolean]":return+a==+b;case"[object RegExp]":return a.source==b.source&&a.global==b.global&&a.multiline==b.multiline&&a.ignoreCase==b.ignoreCase}if("object"!=typeof a||"object"!=typeof b)return!1;for(var f=c.length;f--;)if(c[f]==a)return d[f]==b;var g=a.constructor,h=b.constructor;if(g!==h&&!(x.isFunction(g)&&g instanceof g&&x.isFunction(h)&&h instanceof h)&&"constructor"in a&&"constructor"in b)return!1;c.push(a),d.push(b);var i=0,k=!0;if("[object Array]"==e){if(i=a.length,k=i==b.length)for(;i--&&(k=F(a[i],b[i],c,d)););}else{for(var l in a)if(x.has(a,l)&&(i++,!(k=x.has(b,l)&&F(a[l],b[l],c,d))))break;if(k){for(l in b)if(x.has(b,l)&&!i--)break;k=!i}}return c.pop(),d.pop(),k};x.isEqual=function(a,b){return F(a,b,[],[])},x.isEmpty=function(a){if(null==a)return!0;if(x.isArray(a)||x.isString(a))return 0===a.length;for(var b in a)if(x.has(a,b))return!1;return!0},x.isElement=function(a){return!(!a||1!==a.nodeType)},x.isArray=u||function(a){return"[object Array]"==j.call(a)},x.isObject=function(a){return a===Object(a)},y(["Arguments","Function","String","Number","Date","RegExp"],function(a){x["is"+a]=function(b){return j.call(b)=="[object "+a+"]"}}),x.isArguments(arguments)||(x.isArguments=function(a){return!(!a||!x.has(a,"callee"))}),"function"!=typeof/./&&(x.isFunction=function(a){return"function"==typeof a}),x.isFinite=function(a){return isFinite(a)&&!isNaN(parseFloat(a))},x.isNaN=function(a){return x.isNumber(a)&&a!=+a},x.isBoolean=function(a){return a===!0||a===!1||"[object Boolean]"==j.call(a)},x.isNull=function(a){return null===a},x.isUndefined=function(a){return void 0===a},x.has=function(a,b){return k.call(a,b)},x.noConflict=function(){return a._=b,this},x.identity=function(a){return a},x.constant=function(a){return function(){return a}},x.property=function(a){return function(b){return b[a]}},x.matches=function(a){return function(b){if(b===a)return!0;for(var c in a)if(a[c]!==b[c])return!1;return!0}},x.times=function(a,b,c){for(var d=Array(Math.max(0,a)),e=0;a>e;e++)d[e]=b.call(c,e);return d},x.random=function(a,b){return null==b&&(b=a,a=0),a+Math.floor(Math.random()*(b-a+1))},x.now=Date.now||function(){return(new Date).getTime()};var G={escape:{"&":"&","<":"<",">":">",'"':""","'":"'"}};G.unescape=x.invert(G.escape);var H={escape:new RegExp("["+x.keys(G.escape).join("")+"]","g"),unescape:new RegExp("("+x.keys(G.unescape).join("|")+")","g")};x.each(["escape","unescape"],function(a){x[a]=function(b){return null==b?"":(""+b).replace(H[a],function(b){return G[a][b]})}}),x.result=function(a,b){if(null==a)return void 0;var c=a[b];return x.isFunction(c)?c.call(a):c},x.mixin=function(a){y(x.functions(a),function(b){var c=x[b]=a[b];x.prototype[b]=function(){var a=[this._wrapped];return g.apply(a,arguments),M.call(this,c.apply(x,a))}})};var I=0;x.uniqueId=function(a){var b=++I+"";return a?a+b:b},x.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var J=/(.)^/,K={"'":"'","\\":"\\","\r":"r","\n":"n"," ":"t","\u2028":"u2028","\u2029":"u2029"},L=/\\|'|\r|\n|\t|\u2028|\u2029/g;x.template=function(a,b,c){var d;c=x.defaults({},c,x.templateSettings);var e=new RegExp([(c.escape||J).source,(c.interpolate||J).source,(c.evaluate||J).source].join("|")+"|$","g"),f=0,g="__p+='";a.replace(e,function(b,c,d,e,h){return g+=a.slice(f,h).replace(L,function(a){return"\\"+K[a]}),c&&(g+="'+\n((__t=("+c+"))==null?'':_.escape(__t))+\n'"),d&&(g+="'+\n((__t=("+d+"))==null?'':__t)+\n'"),e&&(g+="';\n"+e+"\n__p+='"),f=h+b.length,b}),g+="';\n",c.variable||(g="with(obj||{}){\n"+g+"}\n"),g="var __t,__p='',__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,'');};\n"+g+"return __p;\n";try{d=new Function(c.variable||"obj","_",g)}catch(h){throw h.source=g,h}if(b)return d(b,x);var i=function(a){return d.call(this,a,x)};return i.source="function("+(c.variable||"obj")+"){\n"+g+"}",i},x.chain=function(a){return x(a).chain()};var M=function(a){return this._chain?x(a).chain():a};x.mixin(x),y(["pop","push","reverse","shift","sort","splice","unshift"],function(a){var b=d[a];x.prototype[a]=function(){var c=this._wrapped;return b.apply(c,arguments),"shift"!=a&&"splice"!=a||0!==c.length||delete c[0],M.call(this,c)}}),y(["concat","join","slice"],function(a){var b=d[a];x.prototype[a]=function(){return M.call(this,b.apply(this._wrapped,arguments))}}),x.extend(x.prototype,{chain:function(){return this._chain=!0,this},value:function(){return this._wrapped}}),"function"==typeof define&&define.amd&&define("underscore",[],function(){return x})}).call(this); \ No newline at end of file +// Underscore.js 1.8.3 +// http://underscorejs.org +// (c) 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors +// Underscore may be freely distributed under the MIT license. +(function(){function n(n){function t(t,r,e,u,i,o){for(;i>=0&&o>i;i+=n){var a=u?u[i]:i;e=r(e,t[a],a,t)}return e}return function(r,e,u,i){e=b(e,i,4);var o=!k(r)&&m.keys(r),a=(o||r).length,c=n>0?0:a-1;return arguments.length<3&&(u=r[o?o[c]:c],c+=n),t(r,e,u,o,c,a)}}function t(n){return function(t,r,e){r=x(r,e);for(var u=O(t),i=n>0?0:u-1;i>=0&&u>i;i+=n)if(r(t[i],i,t))return i;return-1}}function r(n,t,r){return function(e,u,i){var o=0,a=O(e);if("number"==typeof i)n>0?o=i>=0?i:Math.max(i+a,o):a=i>=0?Math.min(i+1,a):i+a+1;else if(r&&i&&a)return i=r(e,u),e[i]===u?i:-1;if(u!==u)return i=t(l.call(e,o,a),m.isNaN),i>=0?i+o:-1;for(i=n>0?o:a-1;i>=0&&a>i;i+=n)if(e[i]===u)return i;return-1}}function e(n,t){var r=I.length,e=n.constructor,u=m.isFunction(e)&&e.prototype||a,i="constructor";for(m.has(n,i)&&!m.contains(t,i)&&t.push(i);r--;)i=I[r],i in n&&n[i]!==u[i]&&!m.contains(t,i)&&t.push(i)}var u=this,i=u._,o=Array.prototype,a=Object.prototype,c=Function.prototype,f=o.push,l=o.slice,s=a.toString,p=a.hasOwnProperty,h=Array.isArray,v=Object.keys,g=c.bind,y=Object.create,d=function(){},m=function(n){return n instanceof m?n:this instanceof m?void(this._wrapped=n):new m(n)};"undefined"!=typeof exports?("undefined"!=typeof module&&module.exports&&(exports=module.exports=m),exports._=m):u._=m,m.VERSION="1.8.3";var b=function(n,t,r){if(t===void 0)return n;switch(null==r?3:r){case 1:return function(r){return n.call(t,r)};case 2:return function(r,e){return n.call(t,r,e)};case 3:return function(r,e,u){return n.call(t,r,e,u)};case 4:return function(r,e,u,i){return n.call(t,r,e,u,i)}}return function(){return n.apply(t,arguments)}},x=function(n,t,r){return null==n?m.identity:m.isFunction(n)?b(n,t,r):m.isObject(n)?m.matcher(n):m.property(n)};m.iteratee=function(n,t){return x(n,t,1/0)};var _=function(n,t){return function(r){var e=arguments.length;if(2>e||null==r)return r;for(var u=1;e>u;u++)for(var i=arguments[u],o=n(i),a=o.length,c=0;a>c;c++){var f=o[c];t&&r[f]!==void 0||(r[f]=i[f])}return r}},j=function(n){if(!m.isObject(n))return{};if(y)return y(n);d.prototype=n;var t=new d;return d.prototype=null,t},w=function(n){return function(t){return null==t?void 0:t[n]}},A=Math.pow(2,53)-1,O=w("length"),k=function(n){var t=O(n);return"number"==typeof t&&t>=0&&A>=t};m.each=m.forEach=function(n,t,r){t=b(t,r);var e,u;if(k(n))for(e=0,u=n.length;u>e;e++)t(n[e],e,n);else{var i=m.keys(n);for(e=0,u=i.length;u>e;e++)t(n[i[e]],i[e],n)}return n},m.map=m.collect=function(n,t,r){t=x(t,r);for(var e=!k(n)&&m.keys(n),u=(e||n).length,i=Array(u),o=0;u>o;o++){var a=e?e[o]:o;i[o]=t(n[a],a,n)}return i},m.reduce=m.foldl=m.inject=n(1),m.reduceRight=m.foldr=n(-1),m.find=m.detect=function(n,t,r){var e;return e=k(n)?m.findIndex(n,t,r):m.findKey(n,t,r),e!==void 0&&e!==-1?n[e]:void 0},m.filter=m.select=function(n,t,r){var e=[];return t=x(t,r),m.each(n,function(n,r,u){t(n,r,u)&&e.push(n)}),e},m.reject=function(n,t,r){return m.filter(n,m.negate(x(t)),r)},m.every=m.all=function(n,t,r){t=x(t,r);for(var e=!k(n)&&m.keys(n),u=(e||n).length,i=0;u>i;i++){var o=e?e[i]:i;if(!t(n[o],o,n))return!1}return!0},m.some=m.any=function(n,t,r){t=x(t,r);for(var e=!k(n)&&m.keys(n),u=(e||n).length,i=0;u>i;i++){var o=e?e[i]:i;if(t(n[o],o,n))return!0}return!1},m.contains=m.includes=m.include=function(n,t,r,e){return k(n)||(n=m.values(n)),("number"!=typeof r||e)&&(r=0),m.indexOf(n,t,r)>=0},m.invoke=function(n,t){var r=l.call(arguments,2),e=m.isFunction(t);return m.map(n,function(n){var u=e?t:n[t];return null==u?u:u.apply(n,r)})},m.pluck=function(n,t){return m.map(n,m.property(t))},m.where=function(n,t){return m.filter(n,m.matcher(t))},m.findWhere=function(n,t){return m.find(n,m.matcher(t))},m.max=function(n,t,r){var e,u,i=-1/0,o=-1/0;if(null==t&&null!=n){n=k(n)?n:m.values(n);for(var a=0,c=n.length;c>a;a++)e=n[a],e>i&&(i=e)}else t=x(t,r),m.each(n,function(n,r,e){u=t(n,r,e),(u>o||u===-1/0&&i===-1/0)&&(i=n,o=u)});return i},m.min=function(n,t,r){var e,u,i=1/0,o=1/0;if(null==t&&null!=n){n=k(n)?n:m.values(n);for(var a=0,c=n.length;c>a;a++)e=n[a],i>e&&(i=e)}else t=x(t,r),m.each(n,function(n,r,e){u=t(n,r,e),(o>u||1/0===u&&1/0===i)&&(i=n,o=u)});return i},m.shuffle=function(n){for(var t,r=k(n)?n:m.values(n),e=r.length,u=Array(e),i=0;e>i;i++)t=m.random(0,i),t!==i&&(u[i]=u[t]),u[t]=r[i];return u},m.sample=function(n,t,r){return null==t||r?(k(n)||(n=m.values(n)),n[m.random(n.length-1)]):m.shuffle(n).slice(0,Math.max(0,t))},m.sortBy=function(n,t,r){return t=x(t,r),m.pluck(m.map(n,function(n,r,e){return{value:n,index:r,criteria:t(n,r,e)}}).sort(function(n,t){var r=n.criteria,e=t.criteria;if(r!==e){if(r>e||r===void 0)return 1;if(e>r||e===void 0)return-1}return n.index-t.index}),"value")};var F=function(n){return function(t,r,e){var u={};return r=x(r,e),m.each(t,function(e,i){var o=r(e,i,t);n(u,e,o)}),u}};m.groupBy=F(function(n,t,r){m.has(n,r)?n[r].push(t):n[r]=[t]}),m.indexBy=F(function(n,t,r){n[r]=t}),m.countBy=F(function(n,t,r){m.has(n,r)?n[r]++:n[r]=1}),m.toArray=function(n){return n?m.isArray(n)?l.call(n):k(n)?m.map(n,m.identity):m.values(n):[]},m.size=function(n){return null==n?0:k(n)?n.length:m.keys(n).length},m.partition=function(n,t,r){t=x(t,r);var e=[],u=[];return m.each(n,function(n,r,i){(t(n,r,i)?e:u).push(n)}),[e,u]},m.first=m.head=m.take=function(n,t,r){return null==n?void 0:null==t||r?n[0]:m.initial(n,n.length-t)},m.initial=function(n,t,r){return l.call(n,0,Math.max(0,n.length-(null==t||r?1:t)))},m.last=function(n,t,r){return null==n?void 0:null==t||r?n[n.length-1]:m.rest(n,Math.max(0,n.length-t))},m.rest=m.tail=m.drop=function(n,t,r){return l.call(n,null==t||r?1:t)},m.compact=function(n){return m.filter(n,m.identity)};var S=function(n,t,r,e){for(var u=[],i=0,o=e||0,a=O(n);a>o;o++){var c=n[o];if(k(c)&&(m.isArray(c)||m.isArguments(c))){t||(c=S(c,t,r));var f=0,l=c.length;for(u.length+=l;l>f;)u[i++]=c[f++]}else r||(u[i++]=c)}return u};m.flatten=function(n,t){return S(n,t,!1)},m.without=function(n){return m.difference(n,l.call(arguments,1))},m.uniq=m.unique=function(n,t,r,e){m.isBoolean(t)||(e=r,r=t,t=!1),null!=r&&(r=x(r,e));for(var u=[],i=[],o=0,a=O(n);a>o;o++){var c=n[o],f=r?r(c,o,n):c;t?(o&&i===f||u.push(c),i=f):r?m.contains(i,f)||(i.push(f),u.push(c)):m.contains(u,c)||u.push(c)}return u},m.union=function(){return m.uniq(S(arguments,!0,!0))},m.intersection=function(n){for(var t=[],r=arguments.length,e=0,u=O(n);u>e;e++){var i=n[e];if(!m.contains(t,i)){for(var o=1;r>o&&m.contains(arguments[o],i);o++);o===r&&t.push(i)}}return t},m.difference=function(n){var t=S(arguments,!0,!0,1);return m.filter(n,function(n){return!m.contains(t,n)})},m.zip=function(){return m.unzip(arguments)},m.unzip=function(n){for(var t=n&&m.max(n,O).length||0,r=Array(t),e=0;t>e;e++)r[e]=m.pluck(n,e);return r},m.object=function(n,t){for(var r={},e=0,u=O(n);u>e;e++)t?r[n[e]]=t[e]:r[n[e][0]]=n[e][1];return r},m.findIndex=t(1),m.findLastIndex=t(-1),m.sortedIndex=function(n,t,r,e){r=x(r,e,1);for(var u=r(t),i=0,o=O(n);o>i;){var a=Math.floor((i+o)/2);r(n[a])i;i++,n+=r)u[i]=n;return u};var E=function(n,t,r,e,u){if(!(e instanceof t))return n.apply(r,u);var i=j(n.prototype),o=n.apply(i,u);return m.isObject(o)?o:i};m.bind=function(n,t){if(g&&n.bind===g)return g.apply(n,l.call(arguments,1));if(!m.isFunction(n))throw new TypeError("Bind must be called on a function");var r=l.call(arguments,2),e=function(){return E(n,e,t,this,r.concat(l.call(arguments)))};return e},m.partial=function(n){var t=l.call(arguments,1),r=function(){for(var e=0,u=t.length,i=Array(u),o=0;u>o;o++)i[o]=t[o]===m?arguments[e++]:t[o];for(;e=e)throw new Error("bindAll must be passed function names");for(t=1;e>t;t++)r=arguments[t],n[r]=m.bind(n[r],n);return n},m.memoize=function(n,t){var r=function(e){var u=r.cache,i=""+(t?t.apply(this,arguments):e);return m.has(u,i)||(u[i]=n.apply(this,arguments)),u[i]};return r.cache={},r},m.delay=function(n,t){var r=l.call(arguments,2);return setTimeout(function(){return n.apply(null,r)},t)},m.defer=m.partial(m.delay,m,1),m.throttle=function(n,t,r){var e,u,i,o=null,a=0;r||(r={});var c=function(){a=r.leading===!1?0:m.now(),o=null,i=n.apply(e,u),o||(e=u=null)};return function(){var f=m.now();a||r.leading!==!1||(a=f);var l=t-(f-a);return e=this,u=arguments,0>=l||l>t?(o&&(clearTimeout(o),o=null),a=f,i=n.apply(e,u),o||(e=u=null)):o||r.trailing===!1||(o=setTimeout(c,l)),i}},m.debounce=function(n,t,r){var e,u,i,o,a,c=function(){var f=m.now()-o;t>f&&f>=0?e=setTimeout(c,t-f):(e=null,r||(a=n.apply(i,u),e||(i=u=null)))};return function(){i=this,u=arguments,o=m.now();var f=r&&!e;return e||(e=setTimeout(c,t)),f&&(a=n.apply(i,u),i=u=null),a}},m.wrap=function(n,t){return m.partial(t,n)},m.negate=function(n){return function(){return!n.apply(this,arguments)}},m.compose=function(){var n=arguments,t=n.length-1;return function(){for(var r=t,e=n[t].apply(this,arguments);r--;)e=n[r].call(this,e);return e}},m.after=function(n,t){return function(){return--n<1?t.apply(this,arguments):void 0}},m.before=function(n,t){var r;return function(){return--n>0&&(r=t.apply(this,arguments)),1>=n&&(t=null),r}},m.once=m.partial(m.before,2);var M=!{toString:null}.propertyIsEnumerable("toString"),I=["valueOf","isPrototypeOf","toString","propertyIsEnumerable","hasOwnProperty","toLocaleString"];m.keys=function(n){if(!m.isObject(n))return[];if(v)return v(n);var t=[];for(var r in n)m.has(n,r)&&t.push(r);return M&&e(n,t),t},m.allKeys=function(n){if(!m.isObject(n))return[];var t=[];for(var r in n)t.push(r);return M&&e(n,t),t},m.values=function(n){for(var t=m.keys(n),r=t.length,e=Array(r),u=0;r>u;u++)e[u]=n[t[u]];return e},m.mapObject=function(n,t,r){t=x(t,r);for(var e,u=m.keys(n),i=u.length,o={},a=0;i>a;a++)e=u[a],o[e]=t(n[e],e,n);return o},m.pairs=function(n){for(var t=m.keys(n),r=t.length,e=Array(r),u=0;r>u;u++)e[u]=[t[u],n[t[u]]];return e},m.invert=function(n){for(var t={},r=m.keys(n),e=0,u=r.length;u>e;e++)t[n[r[e]]]=r[e];return t},m.functions=m.methods=function(n){var t=[];for(var r in n)m.isFunction(n[r])&&t.push(r);return t.sort()},m.extend=_(m.allKeys),m.extendOwn=m.assign=_(m.keys),m.findKey=function(n,t,r){t=x(t,r);for(var e,u=m.keys(n),i=0,o=u.length;o>i;i++)if(e=u[i],t(n[e],e,n))return e},m.pick=function(n,t,r){var e,u,i={},o=n;if(null==o)return i;m.isFunction(t)?(u=m.allKeys(o),e=b(t,r)):(u=S(arguments,!1,!1,1),e=function(n,t,r){return t in r},o=Object(o));for(var a=0,c=u.length;c>a;a++){var f=u[a],l=o[f];e(l,f,o)&&(i[f]=l)}return i},m.omit=function(n,t,r){if(m.isFunction(t))t=m.negate(t);else{var e=m.map(S(arguments,!1,!1,1),String);t=function(n,t){return!m.contains(e,t)}}return m.pick(n,t,r)},m.defaults=_(m.allKeys,!0),m.create=function(n,t){var r=j(n);return t&&m.extendOwn(r,t),r},m.clone=function(n){return m.isObject(n)?m.isArray(n)?n.slice():m.extend({},n):n},m.tap=function(n,t){return t(n),n},m.isMatch=function(n,t){var r=m.keys(t),e=r.length;if(null==n)return!e;for(var u=Object(n),i=0;e>i;i++){var o=r[i];if(t[o]!==u[o]||!(o in u))return!1}return!0};var N=function(n,t,r,e){if(n===t)return 0!==n||1/n===1/t;if(null==n||null==t)return n===t;n instanceof m&&(n=n._wrapped),t instanceof m&&(t=t._wrapped);var u=s.call(n);if(u!==s.call(t))return!1;switch(u){case"[object RegExp]":case"[object String]":return""+n==""+t;case"[object Number]":return+n!==+n?+t!==+t:0===+n?1/+n===1/t:+n===+t;case"[object Date]":case"[object Boolean]":return+n===+t}var i="[object Array]"===u;if(!i){if("object"!=typeof n||"object"!=typeof t)return!1;var o=n.constructor,a=t.constructor;if(o!==a&&!(m.isFunction(o)&&o instanceof o&&m.isFunction(a)&&a instanceof a)&&"constructor"in n&&"constructor"in t)return!1}r=r||[],e=e||[];for(var c=r.length;c--;)if(r[c]===n)return e[c]===t;if(r.push(n),e.push(t),i){if(c=n.length,c!==t.length)return!1;for(;c--;)if(!N(n[c],t[c],r,e))return!1}else{var f,l=m.keys(n);if(c=l.length,m.keys(t).length!==c)return!1;for(;c--;)if(f=l[c],!m.has(t,f)||!N(n[f],t[f],r,e))return!1}return r.pop(),e.pop(),!0};m.isEqual=function(n,t){return N(n,t)},m.isEmpty=function(n){return null==n?!0:k(n)&&(m.isArray(n)||m.isString(n)||m.isArguments(n))?0===n.length:0===m.keys(n).length},m.isElement=function(n){return!(!n||1!==n.nodeType)},m.isArray=h||function(n){return"[object Array]"===s.call(n)},m.isObject=function(n){var t=typeof n;return"function"===t||"object"===t&&!!n},m.each(["Arguments","Function","String","Number","Date","RegExp","Error"],function(n){m["is"+n]=function(t){return s.call(t)==="[object "+n+"]"}}),m.isArguments(arguments)||(m.isArguments=function(n){return m.has(n,"callee")}),"function"!=typeof/./&&"object"!=typeof Int8Array&&(m.isFunction=function(n){return"function"==typeof n||!1}),m.isFinite=function(n){return isFinite(n)&&!isNaN(parseFloat(n))},m.isNaN=function(n){return m.isNumber(n)&&n!==+n},m.isBoolean=function(n){return n===!0||n===!1||"[object Boolean]"===s.call(n)},m.isNull=function(n){return null===n},m.isUndefined=function(n){return n===void 0},m.has=function(n,t){return null!=n&&p.call(n,t)},m.noConflict=function(){return u._=i,this},m.identity=function(n){return n},m.constant=function(n){return function(){return n}},m.noop=function(){},m.property=w,m.propertyOf=function(n){return null==n?function(){}:function(t){return n[t]}},m.matcher=m.matches=function(n){return n=m.extendOwn({},n),function(t){return m.isMatch(t,n)}},m.times=function(n,t,r){var e=Array(Math.max(0,n));t=b(t,r,1);for(var u=0;n>u;u++)e[u]=t(u);return e},m.random=function(n,t){return null==t&&(t=n,n=0),n+Math.floor(Math.random()*(t-n+1))},m.now=Date.now||function(){return(new Date).getTime()};var B={"&":"&","<":"<",">":">",'"':""","'":"'","`":"`"},T=m.invert(B),R=function(n){var t=function(t){return n[t]},r="(?:"+m.keys(n).join("|")+")",e=RegExp(r),u=RegExp(r,"g");return function(n){return n=null==n?"":""+n,e.test(n)?n.replace(u,t):n}};m.escape=R(B),m.unescape=R(T),m.result=function(n,t,r){var e=null==n?void 0:n[t];return e===void 0&&(e=r),m.isFunction(e)?e.call(n):e};var q=0;m.uniqueId=function(n){var t=++q+"";return n?n+t:t},m.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var K=/(.)^/,z={"'":"'","\\":"\\","\r":"r","\n":"n","\u2028":"u2028","\u2029":"u2029"},D=/\\|'|\r|\n|\u2028|\u2029/g,L=function(n){return"\\"+z[n]};m.template=function(n,t,r){!t&&r&&(t=r),t=m.defaults({},t,m.templateSettings);var e=RegExp([(t.escape||K).source,(t.interpolate||K).source,(t.evaluate||K).source].join("|")+"|$","g"),u=0,i="__p+='";n.replace(e,function(t,r,e,o,a){return i+=n.slice(u,a).replace(D,L),u=a+t.length,r?i+="'+\n((__t=("+r+"))==null?'':_.escape(__t))+\n'":e?i+="'+\n((__t=("+e+"))==null?'':__t)+\n'":o&&(i+="';\n"+o+"\n__p+='"),t}),i+="';\n",t.variable||(i="with(obj||{}){\n"+i+"}\n"),i="var __t,__p='',__j=Array.prototype.join,"+"print=function(){__p+=__j.call(arguments,'');};\n"+i+"return __p;\n";try{var o=new Function(t.variable||"obj","_",i)}catch(a){throw a.source=i,a}var c=function(n){return o.call(this,n,m)},f=t.variable||"obj";return c.source="function("+f+"){\n"+i+"}",c},m.chain=function(n){var t=m(n);return t._chain=!0,t};var P=function(n,t){return n._chain?m(t).chain():t};m.mixin=function(n){m.each(m.functions(n),function(t){var r=m[t]=n[t];m.prototype[t]=function(){var n=[this._wrapped];return f.apply(n,arguments),P(this,r.apply(m,n))}})},m.mixin(m),m.each(["pop","push","reverse","shift","sort","splice","unshift"],function(n){var t=o[n];m.prototype[n]=function(){var r=this._wrapped;return t.apply(r,arguments),"shift"!==n&&"splice"!==n||0!==r.length||delete r[0],P(this,r)}}),m.each(["concat","join","slice"],function(n){var t=o[n];m.prototype[n]=function(){return P(this,t.apply(this._wrapped,arguments))}}),m.prototype.value=function(){return this._wrapped},m.prototype.valueOf=m.prototype.toJSON=m.prototype.value,m.prototype.toString=function(){return""+this._wrapped},"function"==typeof define&&define.amd&&define("underscore",[],function(){return m})}).call(this); diff --git a/wp-includes/js/utils.js b/wp-includes/js/utils.js index 4b30bb0..60c2746 100644 --- a/wp-includes/js/utils.js +++ b/wp-includes/js/utils.js @@ -3,25 +3,27 @@ // utility functions var wpCookies = { -// The following functions are from Cookie.js class in TinyMCE, Moxiecode, used under LGPL. +// The following functions are from Cookie.js class in TinyMCE 3, Moxiecode, used under LGPL. - each : function(obj, cb, scope) { + each: function( obj, cb, scope ) { var n, l; - if ( !obj ) + if ( ! obj ) { return 0; + } scope = scope || obj; - if ( typeof(obj.length) != 'undefined' ) { + if ( typeof( obj.length ) !== 'undefined' ) { for ( n = 0, l = obj.length; n < l; n++ ) { - if ( cb.call(scope, obj[n], n, obj) === false ) + if ( cb.call( scope, obj[n], n, obj ) === false ) { return 0; + } } } else { for ( n in obj ) { if ( obj.hasOwnProperty(n) ) { - if ( cb.call(scope, obj[n], n, obj) === false ) { + if ( cb.call( scope, obj[n], n, obj ) === false ) { return 0; } } @@ -34,17 +36,18 @@ var wpCookies = { * Get a multi-values cookie. * Returns a JS object with the name: 'value' pairs. */ - getHash : function(name) { - var all = this.get(name), ret; + getHash: function( name ) { + var cookie = this.get( name ), values; - if ( all ) { - this.each( all.split('&'), function(pair) { + if ( cookie ) { + this.each( cookie.split('&'), function( pair ) { pair = pair.split('='); - ret = ret || {}; - ret[pair[0]] = pair[1]; + values = values || {}; + values[pair[0]] = pair[1]; }); } - return ret; + + return values; }, /** @@ -52,45 +55,47 @@ var wpCookies = { * * 'values_obj' is the JS object that is stored. It is encoded as URI in wpCookies.set(). */ - setHash : function(name, values_obj, expires, path, domain, secure) { + setHash: function( name, values_obj, expires, path, domain, secure ) { var str = ''; - this.each(values_obj, function(val, key) { - str += (!str ? '' : '&') + key + '=' + val; + this.each( values_obj, function( val, key ) { + str += ( ! str ? '' : '&' ) + key + '=' + val; }); - this.set(name, str, expires, path, domain, secure); + this.set( name, str, expires, path, domain, secure ); }, /** * Get a cookie. */ - get : function(name) { + get: function( name ) { var e, b, cookie = document.cookie, p = name + '='; - if ( !cookie ) + if ( ! cookie ) { return; + } - b = cookie.indexOf('; ' + p); + b = cookie.indexOf( '; ' + p ); - if ( b == -1 ) { + if ( b === -1 ) { b = cookie.indexOf(p); - if ( b !== 0 ) + if ( b !== 0 ) { return null; - + } } else { b += 2; } e = cookie.indexOf( ';', b ); - if ( e == -1 ) + if ( e === -1 ) { e = cookie.length; + } - return decodeURIComponent( cookie.substring(b + p.length, e) ); + return decodeURIComponent( cookie.substring( b + p.length, e ) ); }, /** @@ -99,13 +104,13 @@ var wpCookies = { * The 'expires' arg can be either a JS Date() object set to the expiration date (back-compat) * or the number of seconds until expiration */ - set : function(name, value, expires, path, domain, secure) { + set: function( name, value, expires, path, domain, secure ) { var d = new Date(); - if ( typeof(expires) == 'object' && expires.toGMTString ) { + if ( typeof( expires ) === 'object' && expires.toGMTString ) { expires = expires.toGMTString(); - } else if ( parseInt(expires, 10) ) { - d.setTime( d.getTime() + ( parseInt(expires, 10) * 1000 ) ); // time must be in miliseconds + } else if ( parseInt( expires, 10 ) ) { + d.setTime( d.getTime() + ( parseInt( expires, 10 ) * 1000 ) ); // time must be in miliseconds expires = d.toGMTString(); } else { expires = ''; @@ -123,41 +128,57 @@ var wpCookies = { * * This is done by setting it to an empty value and setting the expiration time in the past. */ - remove : function(name, path) { - this.set(name, '', -1000, path); + remove: function( name, path, domain, secure ) { + this.set( name, '', -1000, path, domain, secure ); } }; // Returns the value as string. Second arg or empty string is returned when value is not set. function getUserSetting( name, def ) { - var obj = getAllUserSettings(); + var settings = getAllUserSettings(); - if ( obj.hasOwnProperty(name) ) - return obj[name]; + if ( settings.hasOwnProperty( name ) ) { + return settings[name]; + } - if ( typeof def != 'undefined' ) + if ( typeof def !== 'undefined' ) { return def; + } return ''; } // Both name and value must be only ASCII letters, numbers or underscore // and the shorter, the better (cookies can store maximum 4KB). Not suitable to store text. +// The value is converted and stored as string. function setUserSetting( name, value, _del ) { - if ( 'object' !== typeof userSettings ) + if ( 'object' !== typeof userSettings ) { return false; + } + + var uid = userSettings.uid, + settings = wpCookies.getHash( 'wp-settings-' + uid ), + path = userSettings.url, + secure = !! userSettings.secure; + + name = name.toString().replace( /[^A-Za-z0-9_-]/g, '' ); - var cookie = 'wp-settings-' + userSettings.uid, all = wpCookies.getHash(cookie) || {}, path = userSettings.url, - n = name.toString().replace(/[^A-Za-z0-9_]/, ''), v = value.toString().replace(/[^A-Za-z0-9_]/, ''); + if ( typeof value === 'number' ) { + value = parseInt( value, 10 ); + } else { + value = value.toString().replace( /[^A-Za-z0-9_-]/g, '' ); + } + + settings = settings || {}; if ( _del ) { - delete all[n]; + delete settings[name]; } else { - all[n] = v; + settings[name] = value; } - wpCookies.setHash(cookie, all, 31536000, path); - wpCookies.set('wp-settings-time-'+userSettings.uid, userSettings.time, 31536000, path); + wpCookies.setHash( 'wp-settings-' + uid, settings, 31536000, path, '', secure ); + wpCookies.set( 'wp-settings-time-' + uid, userSettings.time, 31536000, path, '', secure ); return name; } @@ -168,8 +189,9 @@ function deleteUserSetting( name ) { // Returns all settings as js object. function getAllUserSettings() { - if ( 'object' !== typeof userSettings ) + if ( 'object' !== typeof userSettings ) { return {}; + } - return wpCookies.getHash('wp-settings-' + userSettings.uid) || {}; + return wpCookies.getHash( 'wp-settings-' + userSettings.uid ) || {}; } diff --git a/wp-includes/js/utils.min.js b/wp-includes/js/utils.min.js index cdc637a..744c9fa 100644 --- a/wp-includes/js/utils.min.js +++ b/wp-includes/js/utils.min.js @@ -1 +1 @@ -function getUserSetting(a,b){var c=getAllUserSettings();return c.hasOwnProperty(a)?c[a]:"undefined"!=typeof b?b:""}function setUserSetting(a,b,c){if("object"!=typeof userSettings)return!1;var d="wp-settings-"+userSettings.uid,e=wpCookies.getHash(d)||{},f=userSettings.url,g=a.toString().replace(/[^A-Za-z0-9_]/,""),h=b.toString().replace(/[^A-Za-z0-9_]/,"");return c?delete e[g]:e[g]=h,wpCookies.setHash(d,e,31536e3,f),wpCookies.set("wp-settings-time-"+userSettings.uid,userSettings.time,31536e3,f),a}function deleteUserSetting(a){return setUserSetting(a,"",1)}function getAllUserSettings(){return"object"!=typeof userSettings?{}:wpCookies.getHash("wp-settings-"+userSettings.uid)||{}}var wpCookies={each:function(a,b,c){var d,e;if(!a)return 0;if(c=c||a,"undefined"!=typeof a.length){for(d=0,e=a.length;e>d;d++)if(b.call(c,a[d],d,a)===!1)return 0}else for(d in a)if(a.hasOwnProperty(d)&&b.call(c,a[d],d,a)===!1)return 0;return 1},getHash:function(a){var b,c=this.get(a);return c&&this.each(c.split("&"),function(a){a=a.split("="),b=b||{},b[a[0]]=a[1]}),b},setHash:function(a,b,c,d,e,f){var g="";this.each(b,function(a,b){g+=(g?"&":"")+b+"="+a}),this.set(a,g,c,d,e,f)},get:function(a){var b,c,d=document.cookie,e=a+"=";if(d){if(c=d.indexOf("; "+e),-1==c){if(c=d.indexOf(e),0!==c)return null}else c+=2;return b=d.indexOf(";",c),-1==b&&(b=d.length),decodeURIComponent(d.substring(c+e.length,b))}},set:function(a,b,c,d,e,f){var g=new Date;"object"==typeof c&&c.toGMTString?c=c.toGMTString():parseInt(c,10)?(g.setTime(g.getTime()+1e3*parseInt(c,10)),c=g.toGMTString()):c="",document.cookie=a+"="+encodeURIComponent(b)+(c?"; expires="+c:"")+(d?"; path="+d:"")+(e?"; domain="+e:"")+(f?"; secure":"")},remove:function(a,b){this.set(a,"",-1e3,b)}}; \ No newline at end of file +function getUserSetting(a,b){var c=getAllUserSettings();return c.hasOwnProperty(a)?c[a]:"undefined"!=typeof b?b:""}function setUserSetting(a,b,c){if("object"!=typeof userSettings)return!1;var d=userSettings.uid,e=wpCookies.getHash("wp-settings-"+d),f=userSettings.url,g=!!userSettings.secure;return a=a.toString().replace(/[^A-Za-z0-9_-]/g,""),b="number"==typeof b?parseInt(b,10):b.toString().replace(/[^A-Za-z0-9_-]/g,""),e=e||{},c?delete e[a]:e[a]=b,wpCookies.setHash("wp-settings-"+d,e,31536e3,f,"",g),wpCookies.set("wp-settings-time-"+d,userSettings.time,31536e3,f,"",g),a}function deleteUserSetting(a){return setUserSetting(a,"",1)}function getAllUserSettings(){return"object"!=typeof userSettings?{}:wpCookies.getHash("wp-settings-"+userSettings.uid)||{}}var wpCookies={each:function(a,b,c){var d,e;if(!a)return 0;if(c=c||a,"undefined"!=typeof a.length){for(d=0,e=a.length;e>d;d++)if(b.call(c,a[d],d,a)===!1)return 0}else for(d in a)if(a.hasOwnProperty(d)&&b.call(c,a[d],d,a)===!1)return 0;return 1},getHash:function(a){var b,c=this.get(a);return c&&this.each(c.split("&"),function(a){a=a.split("="),b=b||{},b[a[0]]=a[1]}),b},setHash:function(a,b,c,d,e,f){var g="";this.each(b,function(a,b){g+=(g?"&":"")+b+"="+a}),this.set(a,g,c,d,e,f)},get:function(a){var b,c,d=document.cookie,e=a+"=";if(d){if(c=d.indexOf("; "+e),-1===c){if(c=d.indexOf(e),0!==c)return null}else c+=2;return b=d.indexOf(";",c),-1===b&&(b=d.length),decodeURIComponent(d.substring(c+e.length,b))}},set:function(a,b,c,d,e,f){var g=new Date;"object"==typeof c&&c.toGMTString?c=c.toGMTString():parseInt(c,10)?(g.setTime(g.getTime()+1e3*parseInt(c,10)),c=g.toGMTString()):c="",document.cookie=a+"="+encodeURIComponent(b)+(c?"; expires="+c:"")+(d?"; path="+d:"")+(e?"; domain="+e:"")+(f?"; secure":"")},remove:function(a,b,c,d){this.set(a,"",-1e3,b,c,d)}}; \ No newline at end of file diff --git a/wp-includes/js/wp-a11y.js b/wp-includes/js/wp-a11y.js new file mode 100644 index 0000000..14f419a --- /dev/null +++ b/wp-includes/js/wp-a11y.js @@ -0,0 +1,88 @@ +window.wp = window.wp || {}; + +( function ( wp, $ ) { + 'use strict'; + + var $containerPolite, + $containerAssertive, + role; + + /** + * Update the ARIA live notification area text node. + * + * @since 4.2.0 + * @since 4.3.0 Introduced the 'ariaLive' argument. + * + * @param {String} message The message to be announced by Assistive Technologies. + * @param {String} ariaLive Optional. The politeness level for aria-live. Possible values: + * polite or assertive. Default polite. + */ + function speak( message, ariaLive ) { + // Clear previous messages to allow repeated strings being read out. + clear(); + + if ( $containerAssertive && 'assertive' === ariaLive ) { + $containerAssertive.text( message ); + } else if ( $containerPolite ) { + $containerPolite.text( message ); + } + } + + /** + * Build the live regions markup. + * + * @since 4.3.0 + * + * @param {String} ariaLive Optional. Value for the 'aria-live' attribute, default 'polite'. + * + * @return {Object} $container The ARIA live region jQuery object. + */ + function addContainer( ariaLive ) { + ariaLive = ariaLive || 'polite'; + role = 'assertive' === ariaLive ? 'alert' : 'status'; + + var $container = $( '
', { + 'id': 'wp-a11y-speak-' + ariaLive, + 'role': role, + 'aria-live': ariaLive, + 'aria-relevant': 'additions text', + 'aria-atomic': 'true', + 'class': 'screen-reader-text wp-a11y-speak-region' + }); + + $( document.body ).append( $container ); + return $container; + } + + /** + * Clear the live regions. + * + * @since 4.3.0 + */ + function clear() { + $( '.wp-a11y-speak-region' ).text( '' ); + } + + /** + * Initialize wp.a11y and define ARIA live notification area. + * + * @since 4.2.0 + * @since 4.3.0 Added the assertive live region. + */ + $( document ).ready( function() { + $containerPolite = $( '#wp-a11y-speak-polite' ); + $containerAssertive = $( '#wp-a11y-speak-assertive' ); + + if ( ! $containerPolite.length ) { + $containerPolite = addContainer( 'polite' ); + } + + if ( ! $containerAssertive.length ) { + $containerAssertive = addContainer( 'assertive' ); + } + }); + + wp.a11y = wp.a11y || {}; + wp.a11y.speak = speak; + +}( window.wp, window.jQuery )); diff --git a/wp-includes/js/wp-a11y.min.js b/wp-includes/js/wp-a11y.min.js new file mode 100644 index 0000000..736d664 --- /dev/null +++ b/wp-includes/js/wp-a11y.min.js @@ -0,0 +1 @@ +window.wp=window.wp||{},function(a,b){"use strict";function c(a,b){e(),g&&"assertive"===b?g.text(a):f&&f.text(a)}function d(a){a=a||"polite",h="assertive"===a?"alert":"status";var c=b("
",{id:"wp-a11y-speak-"+a,role:h,"aria-live":a,"aria-relevant":"additions text","aria-atomic":"true","class":"screen-reader-text wp-a11y-speak-region"});return b(document.body).append(c),c}function e(){b(".wp-a11y-speak-region").text("")}var f,g,h;b(document).ready(function(){f=b("#wp-a11y-speak-polite"),g=b("#wp-a11y-speak-assertive"),f.length||(f=d("polite")),g.length||(g=d("assertive"))}),a.a11y=a.a11y||{},a.a11y.speak=c}(window.wp,window.jQuery); \ No newline at end of file diff --git a/wp-includes/js/wp-ajax-response.js b/wp-includes/js/wp-ajax-response.js index eb46267..d356321 100644 --- a/wp-includes/js/wp-ajax-response.js +++ b/wp-includes/js/wp-ajax-response.js @@ -12,7 +12,7 @@ var wpAjax = jQuery.extend( { return r; }, parseAjaxResponse: function( x, r, e ) { // 1 = good, 0 = strange (bad data?), -1 = you lack permission - var parsed = {}, re = jQuery('#' + r).html(''), err = ''; + var parsed = {}, re = jQuery('#' + r).empty(), err = ''; if ( x && typeof x == 'object' && x.getElementsByTagName('wp_ajax') ) { parsed.responses = []; @@ -24,7 +24,7 @@ var wpAjax = jQuery.extend( { response.supplemental = {}; if ( !jQuery( 'supplemental', child ).children().each( function() { response.supplemental[this.nodeName] = jQuery(this).text(); - } ).size() ) { response.supplemental = false; } + } ).length ) { response.supplemental = false; } response.errors = []; if ( !jQuery('wp_error', child).each( function() { var code = jQuery(this).attr('code'), anError, errorData, formField; @@ -37,7 +37,7 @@ var wpAjax = jQuery.extend( { err += '
' + anError.message + '
'; response.errors.push( anError ); parsed.errors = true; - } ).size() ) { response.errors = false; } + } ).length ) { response.errors = false; } parsed.responses.push( response ); } ); if ( err.length ) { re.html( '
' + err + '
' ); } @@ -50,11 +50,11 @@ var wpAjax = jQuery.extend( { return true; }, invalidateForm: function ( selector ) { - return jQuery( selector ).addClass( 'form-invalid' ).find('input:visible').change( function() { jQuery(this).closest('.form-invalid').removeClass( 'form-invalid' ); } ); + return jQuery( selector ).addClass( 'form-invalid' ).find('input').one( 'change wp-check-valid-field', function() { jQuery(this).closest('.form-invalid').removeClass( 'form-invalid' ); } ); }, validateForm: function( selector ) { selector = jQuery( selector ); - return !wpAjax.invalidateForm( selector.find('.form-required').filter( function() { return jQuery('input:visible', this).val() === ''; } ) ).size(); + return !wpAjax.invalidateForm( selector.find('.form-required').filter( function() { return jQuery('input:visible', this).val() === ''; } ) ).length; } }, wpAjax || { noPerm: 'You do not have permission to do that.', broken: 'An unidentified error has occurred.' } ); diff --git a/wp-includes/js/wp-ajax-response.min.js b/wp-includes/js/wp-ajax-response.min.js index 32da06b..054fb2c 100644 --- a/wp-includes/js/wp-ajax-response.min.js +++ b/wp-includes/js/wp-ajax-response.min.js @@ -1 +1 @@ -var wpAjax=jQuery.extend({unserialize:function(a){var b,c,d,e,f={};if(!a)return f;b=a.split("?"),b[1]&&(a=b[1]),c=a.split("&");for(d in c)(!jQuery.isFunction(c.hasOwnProperty)||c.hasOwnProperty(d))&&(e=c[d].split("="),f[e[0]]=e[1]);return f},parseAjaxResponse:function(a,b,c){var d={},e=jQuery("#"+b).html(""),f="";return a&&"object"==typeof a&&a.getElementsByTagName("wp_ajax")?(d.responses=[],d.errors=!1,jQuery("response",a).each(function(){var b,e=jQuery(this),g=jQuery(this.firstChild);b={action:e.attr("action"),what:g.get(0).nodeName,id:g.attr("id"),oldId:g.attr("old_id"),position:g.attr("position")},b.data=jQuery("response_data",g).text(),b.supplemental={},jQuery("supplemental",g).children().each(function(){b.supplemental[this.nodeName]=jQuery(this).text()}).size()||(b.supplemental=!1),b.errors=[],jQuery("wp_error",g).each(function(){var e,g,h,i=jQuery(this).attr("code");e={code:i,message:this.firstChild.nodeValue,data:!1},g=jQuery('wp_error_data[code="'+i+'"]',a),g&&(e.data=g.get()),h=jQuery("form-field",g).text(),h&&(i=h),c&&wpAjax.invalidateForm(jQuery("#"+c+' :input[name="'+i+'"]').parents(".form-field:first")),f+="
"+e.message+"
",b.errors.push(e),d.errors=!0}).size()||(b.errors=!1),d.responses.push(b)}),f.length&&e.html('
'+f+"
"),d):isNaN(a)?!e.html('
'+a+"
"):(a=parseInt(a,10),-1==a?!e.html('
'+wpAjax.noPerm+"
"):0===a?!e.html('
'+wpAjax.broken+"
"):!0)},invalidateForm:function(a){return jQuery(a).addClass("form-invalid").find("input:visible").change(function(){jQuery(this).closest(".form-invalid").removeClass("form-invalid")})},validateForm:function(a){return a=jQuery(a),!wpAjax.invalidateForm(a.find(".form-required").filter(function(){return""===jQuery("input:visible",this).val()})).size()}},wpAjax||{noPerm:"You do not have permission to do that.",broken:"An unidentified error has occurred."});jQuery(document).ready(function(a){a("form.validate").submit(function(){return wpAjax.validateForm(a(this))})}); \ No newline at end of file +var wpAjax=jQuery.extend({unserialize:function(a){var b,c,d,e,f={};if(!a)return f;b=a.split("?"),b[1]&&(a=b[1]),c=a.split("&");for(d in c)(!jQuery.isFunction(c.hasOwnProperty)||c.hasOwnProperty(d))&&(e=c[d].split("="),f[e[0]]=e[1]);return f},parseAjaxResponse:function(a,b,c){var d={},e=jQuery("#"+b).empty(),f="";return a&&"object"==typeof a&&a.getElementsByTagName("wp_ajax")?(d.responses=[],d.errors=!1,jQuery("response",a).each(function(){var b,e=jQuery(this),g=jQuery(this.firstChild);b={action:e.attr("action"),what:g.get(0).nodeName,id:g.attr("id"),oldId:g.attr("old_id"),position:g.attr("position")},b.data=jQuery("response_data",g).text(),b.supplemental={},jQuery("supplemental",g).children().each(function(){b.supplemental[this.nodeName]=jQuery(this).text()}).length||(b.supplemental=!1),b.errors=[],jQuery("wp_error",g).each(function(){var e,g,h,i=jQuery(this).attr("code");e={code:i,message:this.firstChild.nodeValue,data:!1},g=jQuery('wp_error_data[code="'+i+'"]',a),g&&(e.data=g.get()),h=jQuery("form-field",g).text(),h&&(i=h),c&&wpAjax.invalidateForm(jQuery("#"+c+' :input[name="'+i+'"]').parents(".form-field:first")),f+="
"+e.message+"
",b.errors.push(e),d.errors=!0}).length||(b.errors=!1),d.responses.push(b)}),f.length&&e.html('
'+f+"
"),d):isNaN(a)?!e.html('
'+a+"
"):(a=parseInt(a,10),-1==a?!e.html('
'+wpAjax.noPerm+"
"):0===a?!e.html('
'+wpAjax.broken+"
"):!0)},invalidateForm:function(a){return jQuery(a).addClass("form-invalid").find("input").one("change wp-check-valid-field",function(){jQuery(this).closest(".form-invalid").removeClass("form-invalid")})},validateForm:function(a){return a=jQuery(a),!wpAjax.invalidateForm(a.find(".form-required").filter(function(){return""===jQuery("input:visible",this).val()})).length}},wpAjax||{noPerm:"You do not have permission to do that.",broken:"An unidentified error has occurred."});jQuery(document).ready(function(a){a("form.validate").submit(function(){return wpAjax.validateForm(a(this))})}); \ No newline at end of file diff --git a/wp-includes/js/wp-auth-check.js b/wp-includes/js/wp-auth-check.js index e58a27d..9448a47 100644 --- a/wp-includes/js/wp-auth-check.js +++ b/wp-includes/js/wp-auth-check.js @@ -16,10 +16,12 @@ }); frame = $('').attr( 'title', noframe.text() ); - frame.load( function() { + frame.on( 'load', function() { var height, body; loaded = true; + // Remove the spinner to avoid unnecessary CPU/GPU usage. + form.removeClass( 'loading' ); try { body = $(this).contents().find('body'); @@ -46,9 +48,10 @@ } }).attr( 'src', form.data('src') ); - $('#wp-auth-check-form').append( frame ); + form.append( frame ); } + $( 'body' ).addClass( 'modal-open' ); wrap.removeClass('hidden'); if ( frame ) { @@ -74,12 +77,14 @@ if ( typeof adminpage !== 'undefined' && ( adminpage === 'post-php' || adminpage === 'post-new-php' ) && typeof wp !== 'undefined' && wp.heartbeat ) { + $(document).off( 'heartbeat-tick.wp-auth-check' ); wp.heartbeat.connectNow(); } wrap.fadeOut( 200, function() { wrap.addClass('hidden').css('display', ''); $('#wp-auth-check-frame').remove(); + $( 'body' ).removeClass( 'modal-open' ); }); } diff --git a/wp-includes/js/wp-auth-check.min.js b/wp-includes/js/wp-auth-check.min.js index fc7b25c..9a80b3e 100644 --- a/wp-includes/js/wp-auth-check.min.js +++ b/wp-includes/js/wp-auth-check.min.js @@ -1 +1 @@ -!function(a){function b(){var b,d=a("#wp-auth-check"),f=a("#wp-auth-check-form"),g=e.find(".wp-auth-fallback-expired"),h=!1;f.length&&(a(window).on("beforeunload.wp-auth-check",function(a){a.originalEvent.returnValue=window.authcheckL10n.beforeunload}),b=a('<iframe id="wp-auth-check-frame" frameborder="0">').attr("title",g.text()),b.load(function(){var b,i;h=!0;try{i=a(this).contents().find("body"),b=i.height()}catch(j){return e.addClass("fallback"),d.css("max-height",""),f.remove(),void g.focus()}b?i&&i.hasClass("interim-login-success")?c():d.css("max-height",b+40+"px"):i&&i.length||(e.addClass("fallback"),d.css("max-height",""),f.remove(),g.focus())}).attr("src",f.data("src")),a("#wp-auth-check-form").append(b)),e.removeClass("hidden"),b?(b.focus(),setTimeout(function(){h||(e.addClass("fallback"),f.remove(),g.focus())},1e4)):g.focus()}function c(){a(window).off("beforeunload.wp-auth-check"),"undefined"==typeof adminpage||"post-php"!==adminpage&&"post-new-php"!==adminpage||"undefined"==typeof wp||!wp.heartbeat||wp.heartbeat.connectNow(),e.fadeOut(200,function(){e.addClass("hidden").css("display",""),a("#wp-auth-check-frame").remove()})}function d(){var a=parseInt(window.authcheckL10n.interval,10)||180;f=(new Date).getTime()+1e3*a}var e,f;a(document).on("heartbeat-tick.wp-auth-check",function(a,f){"wp-auth-check"in f&&(d(),!f["wp-auth-check"]&&e.hasClass("hidden")?b():f["wp-auth-check"]&&!e.hasClass("hidden")&&c())}).on("heartbeat-send.wp-auth-check",function(a,b){(new Date).getTime()>f&&(b["wp-auth-check"]=!0)}).ready(function(){d(),e=a("#wp-auth-check-wrap"),e.find(".wp-auth-check-close").on("click",function(){c()})})}(jQuery); \ No newline at end of file +!function(a){function b(){var b,d=a("#wp-auth-check"),f=a("#wp-auth-check-form"),g=e.find(".wp-auth-fallback-expired"),h=!1;f.length&&(a(window).on("beforeunload.wp-auth-check",function(a){a.originalEvent.returnValue=window.authcheckL10n.beforeunload}),b=a('<iframe id="wp-auth-check-frame" frameborder="0">').attr("title",g.text()),b.on("load",function(){var b,i;h=!0,f.removeClass("loading");try{i=a(this).contents().find("body"),b=i.height()}catch(j){return e.addClass("fallback"),d.css("max-height",""),f.remove(),void g.focus()}b?i&&i.hasClass("interim-login-success")?c():d.css("max-height",b+40+"px"):i&&i.length||(e.addClass("fallback"),d.css("max-height",""),f.remove(),g.focus())}).attr("src",f.data("src")),f.append(b)),a("body").addClass("modal-open"),e.removeClass("hidden"),b?(b.focus(),setTimeout(function(){h||(e.addClass("fallback"),f.remove(),g.focus())},1e4)):g.focus()}function c(){a(window).off("beforeunload.wp-auth-check"),"undefined"==typeof adminpage||"post-php"!==adminpage&&"post-new-php"!==adminpage||"undefined"==typeof wp||!wp.heartbeat||(a(document).off("heartbeat-tick.wp-auth-check"),wp.heartbeat.connectNow()),e.fadeOut(200,function(){e.addClass("hidden").css("display",""),a("#wp-auth-check-frame").remove(),a("body").removeClass("modal-open")})}function d(){var a=parseInt(window.authcheckL10n.interval,10)||180;f=(new Date).getTime()+1e3*a}var e,f;a(document).on("heartbeat-tick.wp-auth-check",function(a,f){"wp-auth-check"in f&&(d(),!f["wp-auth-check"]&&e.hasClass("hidden")?b():f["wp-auth-check"]&&!e.hasClass("hidden")&&c())}).on("heartbeat-send.wp-auth-check",function(a,b){(new Date).getTime()>f&&(b["wp-auth-check"]=!0)}).ready(function(){d(),e=a("#wp-auth-check-wrap"),e.find(".wp-auth-check-close").on("click",function(){c()})})}(jQuery); \ No newline at end of file diff --git a/wp-includes/js/wp-backbone.js b/wp-includes/js/wp-backbone.js index 0db9161..8cbfe6f 100644 --- a/wp-includes/js/wp-backbone.js +++ b/wp-includes/js/wp-backbone.js @@ -21,7 +21,7 @@ window.wp = window.wp || {}; // // Returns an array of all subviews. all: function() { - return _.flatten( this._views ); + return _.flatten( _.values( this._views ) ); }, // ### Get a selector's subviews diff --git a/wp-includes/js/wp-backbone.min.js b/wp-includes/js/wp-backbone.min.js index 1edeedf..48ef2d5 100644 --- a/wp-includes/js/wp-backbone.min.js +++ b/wp-includes/js/wp-backbone.min.js @@ -1 +1 @@ -window.wp=window.wp||{},function(a){wp.Backbone={},wp.Backbone.Subviews=function(a,b){this.view=a,this._views=_.isArray(b)?{"":b}:b||{}},wp.Backbone.Subviews.extend=Backbone.Model.extend,_.extend(wp.Backbone.Subviews.prototype,{all:function(){return _.flatten(this._views)},get:function(a){return a=a||"",this._views[a]},first:function(a){var b=this.get(a);return b&&b.length?b[0]:null},set:function(a,b,c){var d,e;return _.isString(a)||(c=b,b=a,a=""),c=c||{},b=_.isArray(b)?b:[b],d=this.get(a),e=b,d&&(c.add?_.isUndefined(c.at)?e=d.concat(b):(e=d,e.splice.apply(e,[c.at,0].concat(b))):(_.each(e,function(a){a.__detach=!0}),_.each(d,function(a){a.__detach?a.$el.detach():a.remove()}),_.each(e,function(a){delete a.__detach}))),this._views[a]=e,_.each(b,function(b){var c=b.Views||wp.Backbone.Subviews,d=b.views=b.views||new c(b);d.parent=this.view,d.selector=a},this),c.silent||this._attach(a,b,_.extend({ready:this._isReady()},c)),this},add:function(a,b,c){return _.isString(a)||(c=b,b=a,a=""),this.set(a,b,_.extend({add:!0},c))},unset:function(a,b,c){var d;return _.isString(a)||(c=b,b=a,a=""),b=b||[],(d=this.get(a))&&(b=_.isArray(b)?b:[b],this._views[a]=b.length?_.difference(d,b):[]),c&&c.silent||_.invoke(b,"remove"),this},detach:function(){return a(_.pluck(this.all(),"el")).detach(),this},render:function(){var a={ready:this._isReady()};return _.each(this._views,function(b,c){this._attach(c,b,a)},this),this.rendered=!0,this},remove:function(a){return a&&a.silent||(this.parent&&this.parent.views&&this.parent.views.unset(this.selector,this.view,{silent:!0}),delete this.parent,delete this.selector),_.invoke(this.all(),"remove"),this._views=[],this},replace:function(a,b){return a.html(b),this},insert:function(a,b,c){var d,e=c&&c.at;return _.isNumber(e)&&(d=a.children()).length>e?d.eq(e).before(b):a.append(b),this},ready:function(){this.view.trigger("ready"),_.chain(this.all()).map(function(a){return a.views}).flatten().where({attached:!0}).invoke("ready")},_attach:function(a,b,c){var d,e=a?this.view.$(a):this.view.$el;return e.length?(d=_.chain(b).pluck("views").flatten().value(),_.each(d,function(a){a.rendered||(a.view.render(),a.rendered=!0)},this),this[c.add?"insert":"replace"](e,_.pluck(b,"el"),c),_.each(d,function(a){a.attached=!0,c.ready&&a.ready()},this),this):this},_isReady:function(){for(var a=this.view.el;a;){if(a===document.body)return!0;a=a.parentNode}return!1}}),wp.Backbone.View=Backbone.View.extend({Subviews:wp.Backbone.Subviews,constructor:function(a){this.views=new this.Subviews(this,this.views),this.on("ready",this.ready,this),this.options=a||{},Backbone.View.apply(this,arguments)},remove:function(){var a=Backbone.View.prototype.remove.apply(this,arguments);return this.views&&this.views.remove(),a},render:function(){var a;return this.prepare&&(a=this.prepare()),this.views.detach(),this.template&&(a=a||{},this.trigger("prepare",a),this.$el.html(this.template(a))),this.views.render(),this},prepare:function(){return this.options},ready:function(){}})}(jQuery); \ No newline at end of file +window.wp=window.wp||{},function(a){wp.Backbone={},wp.Backbone.Subviews=function(a,b){this.view=a,this._views=_.isArray(b)?{"":b}:b||{}},wp.Backbone.Subviews.extend=Backbone.Model.extend,_.extend(wp.Backbone.Subviews.prototype,{all:function(){return _.flatten(_.values(this._views))},get:function(a){return a=a||"",this._views[a]},first:function(a){var b=this.get(a);return b&&b.length?b[0]:null},set:function(a,b,c){var d,e;return _.isString(a)||(c=b,b=a,a=""),c=c||{},b=_.isArray(b)?b:[b],d=this.get(a),e=b,d&&(c.add?_.isUndefined(c.at)?e=d.concat(b):(e=d,e.splice.apply(e,[c.at,0].concat(b))):(_.each(e,function(a){a.__detach=!0}),_.each(d,function(a){a.__detach?a.$el.detach():a.remove()}),_.each(e,function(a){delete a.__detach}))),this._views[a]=e,_.each(b,function(b){var c=b.Views||wp.Backbone.Subviews,d=b.views=b.views||new c(b);d.parent=this.view,d.selector=a},this),c.silent||this._attach(a,b,_.extend({ready:this._isReady()},c)),this},add:function(a,b,c){return _.isString(a)||(c=b,b=a,a=""),this.set(a,b,_.extend({add:!0},c))},unset:function(a,b,c){var d;return _.isString(a)||(c=b,b=a,a=""),b=b||[],(d=this.get(a))&&(b=_.isArray(b)?b:[b],this._views[a]=b.length?_.difference(d,b):[]),c&&c.silent||_.invoke(b,"remove"),this},detach:function(){return a(_.pluck(this.all(),"el")).detach(),this},render:function(){var a={ready:this._isReady()};return _.each(this._views,function(b,c){this._attach(c,b,a)},this),this.rendered=!0,this},remove:function(a){return a&&a.silent||(this.parent&&this.parent.views&&this.parent.views.unset(this.selector,this.view,{silent:!0}),delete this.parent,delete this.selector),_.invoke(this.all(),"remove"),this._views=[],this},replace:function(a,b){return a.html(b),this},insert:function(a,b,c){var d,e=c&&c.at;return _.isNumber(e)&&(d=a.children()).length>e?d.eq(e).before(b):a.append(b),this},ready:function(){this.view.trigger("ready"),_.chain(this.all()).map(function(a){return a.views}).flatten().where({attached:!0}).invoke("ready")},_attach:function(a,b,c){var d,e=a?this.view.$(a):this.view.$el;return e.length?(d=_.chain(b).pluck("views").flatten().value(),_.each(d,function(a){a.rendered||(a.view.render(),a.rendered=!0)},this),this[c.add?"insert":"replace"](e,_.pluck(b,"el"),c),_.each(d,function(a){a.attached=!0,c.ready&&a.ready()},this),this):this},_isReady:function(){for(var a=this.view.el;a;){if(a===document.body)return!0;a=a.parentNode}return!1}}),wp.Backbone.View=Backbone.View.extend({Subviews:wp.Backbone.Subviews,constructor:function(a){this.views=new this.Subviews(this,this.views),this.on("ready",this.ready,this),this.options=a||{},Backbone.View.apply(this,arguments)},remove:function(){var a=Backbone.View.prototype.remove.apply(this,arguments);return this.views&&this.views.remove(),a},render:function(){var a;return this.prepare&&(a=this.prepare()),this.views.detach(),this.template&&(a=a||{},this.trigger("prepare",a),this.$el.html(this.template(a))),this.views.render(),this},prepare:function(){return this.options},ready:function(){}})}(jQuery); \ No newline at end of file diff --git a/wp-includes/js/wp-embed-template.js b/wp-includes/js/wp-embed-template.js new file mode 100644 index 0000000..60ea47d --- /dev/null +++ b/wp-includes/js/wp-embed-template.js @@ -0,0 +1,204 @@ +(function ( window, document ) { + 'use strict'; + + var supportedBrowser = ( document.querySelector && window.addEventListener ), + loaded = false, + secret, + secretTimeout, + resizing; + + function sendEmbedMessage( message, value ) { + window.parent.postMessage( { + message: message, + value: value, + secret: secret + }, '*' ); + } + + function onLoad() { + if ( loaded ) { + return; + } + loaded = true; + + var share_dialog = document.querySelector( '.wp-embed-share-dialog' ), + share_dialog_open = document.querySelector( '.wp-embed-share-dialog-open' ), + share_dialog_close = document.querySelector( '.wp-embed-share-dialog-close' ), + share_input = document.querySelectorAll( '.wp-embed-share-input' ), + share_dialog_tabs = document.querySelectorAll( '.wp-embed-share-tab-button button' ), + i; + + if ( share_input ) { + for ( i = 0; i < share_input.length; i++ ) { + share_input[ i ].addEventListener( 'click', function ( e ) { + e.target.select(); + } ); + } + } + + function openSharingDialog() { + share_dialog.className = share_dialog.className.replace( 'hidden', '' ); + // Initial focus should go on the currently selected tab in the dialog. + document.querySelector( '.wp-embed-share-tab-button [aria-selected="true"]' ).focus(); + } + + function closeSharingDialog() { + share_dialog.className += ' hidden'; + document.querySelector( '.wp-embed-share-dialog-open' ).focus(); + } + + if ( share_dialog_open ) { + share_dialog_open.addEventListener( 'click', function () { + openSharingDialog(); + } ); + } + + if ( share_dialog_close ) { + share_dialog_close.addEventListener( 'click', function () { + closeSharingDialog(); + } ); + } + + function shareClickHandler( e ) { + var currentTab = document.querySelector( '.wp-embed-share-tab-button [aria-selected="true"]' ); + currentTab.setAttribute( 'aria-selected', 'false' ); + document.querySelector( '#' + currentTab.getAttribute( 'aria-controls' ) ).setAttribute( 'aria-hidden', 'true' ); + + e.target.setAttribute( 'aria-selected', 'true' ); + document.querySelector( '#' + e.target.getAttribute( 'aria-controls' ) ).setAttribute( 'aria-hidden', 'false' ); + } + + function shareKeyHandler( e ) { + var target = e.target, + previousSibling = target.parentElement.previousElementSibling, + nextSibling = target.parentElement.nextElementSibling, + newTab, newTabChild; + + if ( 37 === e.keyCode ) { + newTab = previousSibling; + } else if ( 39 === e.keyCode ) { + newTab = nextSibling; + } else { + return false; + } + + if ( 'rtl' === document.documentElement.getAttribute( 'dir' ) ) { + newTab = ( newTab === previousSibling ) ? nextSibling : previousSibling; + } + + if ( newTab ) { + newTabChild = newTab.firstElementChild; + + target.setAttribute( 'tabindex', '-1' ); + target.setAttribute( 'aria-selected', false ); + document.querySelector( '#' + target.getAttribute( 'aria-controls' ) ).setAttribute( 'aria-hidden', 'true' ); + + newTabChild.setAttribute( 'tabindex', '0' ); + newTabChild.setAttribute( 'aria-selected', 'true' ); + newTabChild.focus(); + document.querySelector( '#' + newTabChild.getAttribute( 'aria-controls' ) ).setAttribute( 'aria-hidden', 'false' ); + } + } + + if ( share_dialog_tabs ) { + for ( i = 0; i < share_dialog_tabs.length; i++ ) { + share_dialog_tabs[ i ].addEventListener( 'click', shareClickHandler ); + + share_dialog_tabs[ i ].addEventListener( 'keydown', shareKeyHandler ); + } + } + + document.addEventListener( 'keydown', function ( e ) { + if ( 27 === e.keyCode && -1 === share_dialog.className.indexOf( 'hidden' ) ) { + closeSharingDialog(); + } else if ( 9 === e.keyCode ) { + constrainTabbing( e ); + } + }, false ); + + function constrainTabbing( e ) { + // Need to re-get the selected tab each time. + var firstFocusable = document.querySelector( '.wp-embed-share-tab-button [aria-selected="true"]' ); + + if ( share_dialog_close === e.target && ! e.shiftKey ) { + firstFocusable.focus(); + e.preventDefault(); + } else if ( firstFocusable === e.target && e.shiftKey ) { + share_dialog_close.focus(); + e.preventDefault(); + } + } + + if ( window.self === window.top ) { + return; + } + + /** + * Send this document's height to the parent (embedding) site. + */ + sendEmbedMessage( 'height', Math.ceil( document.body.getBoundingClientRect().height ) ); + + /** + * Detect clicks to external (_top) links. + */ + function linkClickHandler( e ) { + var target = e.target, + href; + if ( target.hasAttribute( 'href' ) ) { + href = target.getAttribute( 'href' ); + } else { + href = target.parentElement.getAttribute( 'href' ); + } + + /** + * Send link target to the parent (embedding) site. + */ + if ( href ) { + sendEmbedMessage( 'link', href ); + e.preventDefault(); + } + } + + document.addEventListener( 'click', linkClickHandler ); + } + + /** + * Iframe resize handler. + */ + function onResize() { + if ( window.self === window.top ) { + return; + } + + clearTimeout( resizing ); + + resizing = setTimeout( function () { + sendEmbedMessage( 'height', Math.ceil( document.body.getBoundingClientRect().height ) ); + }, 100 ); + } + + /** + * Re-get the secret when it was added later on. + */ + function getSecret() { + if ( window.self === window.top || !!secret ) { + return; + } + + secret = window.location.hash.replace( /.*secret=([\d\w]{10}).*/, '$1' ); + + clearTimeout( secretTimeout ); + + secretTimeout = setTimeout( function () { + getSecret(); + }, 100 ); + } + + if ( supportedBrowser ) { + getSecret(); + document.documentElement.className = document.documentElement.className.replace( /\bno-js\b/, '' ) + ' js'; + document.addEventListener( 'DOMContentLoaded', onLoad, false ); + window.addEventListener( 'load', onLoad, false ); + window.addEventListener( 'resize', onResize, false ); + } +})( window, document ); diff --git a/wp-includes/js/wp-embed-template.min.js b/wp-includes/js/wp-embed-template.min.js new file mode 100644 index 0000000..1713216 --- /dev/null +++ b/wp-includes/js/wp-embed-template.min.js @@ -0,0 +1 @@ +!function(a,b){"use strict";function c(b,c){a.parent.postMessage({message:b,value:c,secret:g},"*")}function d(){function d(){l.className=l.className.replace("hidden",""),b.querySelector('.wp-embed-share-tab-button [aria-selected="true"]').focus()}function e(){l.className+=" hidden",b.querySelector(".wp-embed-share-dialog-open").focus()}function f(a){var c=b.querySelector('.wp-embed-share-tab-button [aria-selected="true"]');c.setAttribute("aria-selected","false"),b.querySelector("#"+c.getAttribute("aria-controls")).setAttribute("aria-hidden","true"),a.target.setAttribute("aria-selected","true"),b.querySelector("#"+a.target.getAttribute("aria-controls")).setAttribute("aria-hidden","false")}function g(a){var c,d,e=a.target,f=e.parentElement.previousElementSibling,g=e.parentElement.nextElementSibling;if(37===a.keyCode)c=f;else{if(39!==a.keyCode)return!1;c=g}"rtl"===b.documentElement.getAttribute("dir")&&(c=c===f?g:f),c&&(d=c.firstElementChild,e.setAttribute("tabindex","-1"),e.setAttribute("aria-selected",!1),b.querySelector("#"+e.getAttribute("aria-controls")).setAttribute("aria-hidden","true"),d.setAttribute("tabindex","0"),d.setAttribute("aria-selected","true"),d.focus(),b.querySelector("#"+d.getAttribute("aria-controls")).setAttribute("aria-hidden","false"))}function h(a){var c=b.querySelector('.wp-embed-share-tab-button [aria-selected="true"]');n!==a.target||a.shiftKey?c===a.target&&a.shiftKey&&(n.focus(),a.preventDefault()):(c.focus(),a.preventDefault())}function i(a){var b,d=a.target;b=d.hasAttribute("href")?d.getAttribute("href"):d.parentElement.getAttribute("href"),b&&(c("link",b),a.preventDefault())}if(!k){k=!0;var j,l=b.querySelector(".wp-embed-share-dialog"),m=b.querySelector(".wp-embed-share-dialog-open"),n=b.querySelector(".wp-embed-share-dialog-close"),o=b.querySelectorAll(".wp-embed-share-input"),p=b.querySelectorAll(".wp-embed-share-tab-button button");if(o)for(j=0;j<o.length;j++)o[j].addEventListener("click",function(a){a.target.select()});if(m&&m.addEventListener("click",function(){d()}),n&&n.addEventListener("click",function(){e()}),p)for(j=0;j<p.length;j++)p[j].addEventListener("click",f),p[j].addEventListener("keydown",g);b.addEventListener("keydown",function(a){27===a.keyCode&&-1===l.className.indexOf("hidden")?e():9===a.keyCode&&h(a)},!1),a.self!==a.top&&(c("height",Math.ceil(b.body.getBoundingClientRect().height)),b.addEventListener("click",i))}}function e(){a.self!==a.top&&(clearTimeout(i),i=setTimeout(function(){c("height",Math.ceil(b.body.getBoundingClientRect().height))},100))}function f(){a.self===a.top||g||(g=a.location.hash.replace(/.*secret=([\d\w]{10}).*/,"$1"),clearTimeout(h),h=setTimeout(function(){f()},100))}var g,h,i,j=b.querySelector&&a.addEventListener,k=!1;j&&(f(),b.documentElement.className=b.documentElement.className.replace(/\bno-js\b/,"")+" js",b.addEventListener("DOMContentLoaded",d,!1),a.addEventListener("load",d,!1),a.addEventListener("resize",e,!1))}(window,document); \ No newline at end of file diff --git a/wp-includes/js/wp-embed.js b/wp-includes/js/wp-embed.js new file mode 100644 index 0000000..966a41f --- /dev/null +++ b/wp-includes/js/wp-embed.js @@ -0,0 +1,123 @@ +/** + * WordPress inline HTML embed + * + * @since 4.4.0 + * + * This file cannot have ampersands in it. This is to ensure + * it can be embedded in older versions of WordPress. + * See https://core.trac.wordpress.org/changeset/35708. + */ +(function ( window, document ) { + 'use strict'; + + var supportedBrowser = false, + loaded = false; + + if ( document.querySelector ) { + if ( window.addEventListener ) { + supportedBrowser = true; + } + } + + window.wp = window.wp || {}; + + if ( !! window.wp.receiveEmbedMessage ) { + return; + } + + window.wp.receiveEmbedMessage = function( e ) { + var data = e.data; + if ( ! ( data.secret || data.message || data.value ) ) { + return; + } + + if ( /[^a-zA-Z0-9]/.test( data.secret ) ) { + return; + } + + var iframes = document.querySelectorAll( 'iframe[data-secret="' + data.secret + '"]' ), + blockquotes = document.querySelectorAll( 'blockquote[data-secret="' + data.secret + '"]' ), + i, source, height, sourceURL, targetURL; + + for ( i = 0; i < blockquotes.length; i++ ) { + blockquotes[ i ].style.display = 'none'; + } + + for ( i = 0; i < iframes.length; i++ ) { + source = iframes[ i ]; + + if ( e.source !== source.contentWindow ) { + continue; + } + + source.removeAttribute( 'style' ); + + /* Resize the iframe on request. */ + if ( 'height' === data.message ) { + height = parseInt( data.value, 10 ); + if ( height > 1000 ) { + height = 1000; + } else if ( ~~height < 200 ) { + height = 200; + } + + source.height = height; + } + + /* Link to a specific URL on request. */ + if ( 'link' === data.message ) { + sourceURL = document.createElement( 'a' ); + targetURL = document.createElement( 'a' ); + + sourceURL.href = source.getAttribute( 'src' ); + targetURL.href = data.value; + + /* Only continue if link hostname matches iframe's hostname. */ + if ( targetURL.host === sourceURL.host ) { + if ( document.activeElement === source ) { + window.top.location.href = data.value; + } + } + } + } + }; + + function onLoad() { + if ( loaded ) { + return; + } + + loaded = true; + + var isIE10 = -1 !== navigator.appVersion.indexOf( 'MSIE 10' ), + isIE11 = !!navigator.userAgent.match( /Trident.*rv:11\./ ), + iframes = document.querySelectorAll( 'iframe.wp-embedded-content' ), + iframeClone, i, source, secret; + + for ( i = 0; i < iframes.length; i++ ) { + source = iframes[ i ]; + + if ( source.getAttribute( 'data-secret' ) ) { + continue; + } + + /* Add secret to iframe */ + secret = Math.random().toString( 36 ).substr( 2, 10 ); + source.src += '#?secret=' + secret; + source.setAttribute( 'data-secret', secret ); + + /* Remove security attribute from iframes in IE10 and IE11. */ + if ( ( isIE10 || isIE11 ) ) { + iframeClone = source.cloneNode( true ); + iframeClone.removeAttribute( 'security' ); + source.parentNode.replaceChild( iframeClone, source ); + } + } + } + + if ( supportedBrowser ) { + window.addEventListener( 'message', window.wp.receiveEmbedMessage, false ); + document.addEventListener( 'DOMContentLoaded', onLoad, false ); + window.addEventListener( 'load', onLoad, false ); + } +})( window, document ); diff --git a/wp-includes/js/wp-embed.min.js b/wp-includes/js/wp-embed.min.js new file mode 100644 index 0000000..10cf4f1 --- /dev/null +++ b/wp-includes/js/wp-embed.min.js @@ -0,0 +1 @@ +!function(a,b){"use strict";function c(){if(!e){e=!0;var a,c,d,f,g=-1!==navigator.appVersion.indexOf("MSIE 10"),h=!!navigator.userAgent.match(/Trident.*rv:11\./),i=b.querySelectorAll("iframe.wp-embedded-content");for(c=0;c<i.length;c++)if(d=i[c],!d.getAttribute("data-secret")){if(f=Math.random().toString(36).substr(2,10),d.src+="#?secret="+f,d.setAttribute("data-secret",f),g||h)a=d.cloneNode(!0),a.removeAttribute("security"),d.parentNode.replaceChild(a,d)}else;}}var d=!1,e=!1;if(b.querySelector)if(a.addEventListener)d=!0;if(a.wp=a.wp||{},!a.wp.receiveEmbedMessage)if(a.wp.receiveEmbedMessage=function(c){var d=c.data;if(d.secret||d.message||d.value)if(!/[^a-zA-Z0-9]/.test(d.secret)){var e,f,g,h,i,j=b.querySelectorAll('iframe[data-secret="'+d.secret+'"]'),k=b.querySelectorAll('blockquote[data-secret="'+d.secret+'"]');for(e=0;e<k.length;e++)k[e].style.display="none";for(e=0;e<j.length;e++)if(f=j[e],c.source===f.contentWindow){if(f.removeAttribute("style"),"height"===d.message){if(g=parseInt(d.value,10),g>1e3)g=1e3;else if(200>~~g)g=200;f.height=g}if("link"===d.message)if(h=b.createElement("a"),i=b.createElement("a"),h.href=f.getAttribute("src"),i.href=d.value,i.host===h.host)if(b.activeElement===f)a.top.location.href=d.value}else;}},d)a.addEventListener("message",a.wp.receiveEmbedMessage,!1),b.addEventListener("DOMContentLoaded",c,!1),a.addEventListener("load",c,!1)}(window,document); \ No newline at end of file diff --git a/wp-includes/js/wp-emoji-loader.js b/wp-includes/js/wp-emoji-loader.js new file mode 100644 index 0000000..f242a12 --- /dev/null +++ b/wp-includes/js/wp-emoji-loader.js @@ -0,0 +1,140 @@ +( function( window, document, settings ) { + var src, ready, ii, tests; + + /** + * Detect if the browser supports rendering emoji or flag emoji. Flag emoji are a single glyph + * made of two characters, so some browsers (notably, Firefox OS X) don't support them. + * + * @since 4.2.0 + * + * @param type {String} Whether to test for support of "simple", "flag", "diversity" or "unicode8" emoji. + * @return {Boolean} True if the browser can render emoji, false if it cannot. + */ + function browserSupportsEmoji( type ) { + var canvas = document.createElement( 'canvas' ), + context = canvas.getContext && canvas.getContext( '2d' ), + stringFromCharCode = String.fromCharCode, + tonedata, tone, tone2; + + if ( ! context || ! context.fillText ) { + return false; + } + + /* + * Chrome on OS X added native emoji rendering in M41. Unfortunately, + * it doesn't work when the font is bolder than 500 weight. So, we + * check for bold rendering support to avoid invisible emoji in Chrome. + */ + context.textBaseline = 'top'; + context.font = '600 32px Arial'; + + switch ( type ) { + case 'flag': + /* + * This works because the image will be one of three things: + * - Two empty squares, if the browser doesn't render emoji + * - Two squares with 'A' and 'U' in them, if the browser doesn't render flag emoji + * - The Australian flag + * + * The first two will encode to small images (1-2KB data URLs), the third will encode + * to a larger image (4-5KB data URL). + */ + context.fillText( stringFromCharCode( 55356, 56806, 55356, 56826 ), 0, 0 ); + return canvas.toDataURL().length > 3000; + case 'diversity': + /* + * This tests if the browser supports the Emoji Diversity specification, by rendering an + * emoji with no skin tone specified (in this case, Santa). It then adds a skin tone, and + * compares if the emoji rendering has changed. + */ + context.fillText( stringFromCharCode( 55356, 57221 ), 0, 0 ); + tonedata = context.getImageData( 16, 16, 1, 1 ).data; + tone = tonedata[0] + ',' + tonedata[1] + ',' + tonedata[2] + ',' + tonedata[3]; + + context.fillText( stringFromCharCode( 55356, 57221, 55356, 57343 ), 0, 0 ); + // Chrome has issues comparing arrays, and Safari has issues converting arrays to strings. + // So, we create our own string and compare that, instead. + tonedata = context.getImageData( 16, 16, 1, 1 ).data; + tone2 = tonedata[0] + ',' + tonedata[1] + ',' + tonedata[2] + ',' + tonedata[3]; + + return tone !== tone2; + case 'simple': + /* + * This creates a smiling emoji, and checks to see if there is any image data in the + * center pixel. In browsers that don't support emoji, the character will be rendered + * as an empty square, so the center pixel will be blank. + */ + context.fillText( stringFromCharCode( 55357, 56835 ), 0, 0 ); + return context.getImageData( 16, 16, 1, 1 ).data[0] !== 0; + case 'unicode8': + /* + * To check for Unicode 8 support, let's try rendering the most important advancement + * that the Unicode Consortium have made in years: the burrito. + */ + context.fillText( stringFromCharCode( 55356, 57135 ), 0, 0 ); + return context.getImageData( 16, 16, 1, 1 ).data[0] !== 0; + } + + return false; + } + + function addScript( src ) { + var script = document.createElement( 'script' ); + + script.src = src; + script.type = 'text/javascript'; + document.getElementsByTagName( 'head' )[0].appendChild( script ); + } + + tests = Array( 'simple', 'flag', 'unicode8', 'diversity' ); + + settings.supports = { + everything: true, + everythingExceptFlag: true + }; + + for( ii = 0; ii < tests.length; ii++ ) { + settings.supports[ tests[ ii ] ] = browserSupportsEmoji( tests[ ii ] ); + + settings.supports.everything = settings.supports.everything && settings.supports[ tests[ ii ] ]; + + if ( 'flag' !== tests[ ii ] ) { + settings.supports.everythingExceptFlag = settings.supports.everythingExceptFlag && settings.supports[ tests[ ii ] ]; + } + } + + settings.supports.everythingExceptFlag = settings.supports.everythingExceptFlag && ! settings.supports.flag; + + settings.DOMReady = false; + settings.readyCallback = function() { + settings.DOMReady = true; + }; + + if ( ! settings.supports.everything ) { + ready = function() { + settings.readyCallback(); + }; + + if ( document.addEventListener ) { + document.addEventListener( 'DOMContentLoaded', ready, false ); + window.addEventListener( 'load', ready, false ); + } else { + window.attachEvent( 'onload', ready ); + document.attachEvent( 'onreadystatechange', function() { + if ( 'complete' === document.readyState ) { + settings.readyCallback(); + } + } ); + } + + src = settings.source || {}; + + if ( src.concatemoji ) { + addScript( src.concatemoji ); + } else if ( src.wpemoji && src.twemoji ) { + addScript( src.twemoji ); + addScript( src.wpemoji ); + } + } + +} )( window, document, window._wpemojiSettings ); diff --git a/wp-includes/js/wp-emoji-loader.min.js b/wp-includes/js/wp-emoji-loader.min.js new file mode 100644 index 0000000..937787f --- /dev/null +++ b/wp-includes/js/wp-emoji-loader.min.js @@ -0,0 +1 @@ +!function(a,b,c){function d(a){var c,d,e,f=b.createElement("canvas"),g=f.getContext&&f.getContext("2d"),h=String.fromCharCode;if(!g||!g.fillText)return!1;switch(g.textBaseline="top",g.font="600 32px Arial",a){case"flag":return g.fillText(h(55356,56806,55356,56826),0,0),f.toDataURL().length>3e3;case"diversity":return g.fillText(h(55356,57221),0,0),c=g.getImageData(16,16,1,1).data,d=c[0]+","+c[1]+","+c[2]+","+c[3],g.fillText(h(55356,57221,55356,57343),0,0),c=g.getImageData(16,16,1,1).data,e=c[0]+","+c[1]+","+c[2]+","+c[3],d!==e;case"simple":return g.fillText(h(55357,56835),0,0),0!==g.getImageData(16,16,1,1).data[0];case"unicode8":return g.fillText(h(55356,57135),0,0),0!==g.getImageData(16,16,1,1).data[0]}return!1}function e(a){var c=b.createElement("script");c.src=a,c.type="text/javascript",b.getElementsByTagName("head")[0].appendChild(c)}var f,g,h,i;for(i=Array("simple","flag","unicode8","diversity"),c.supports={everything:!0,everythingExceptFlag:!0},h=0;h<i.length;h++)c.supports[i[h]]=d(i[h]),c.supports.everything=c.supports.everything&&c.supports[i[h]],"flag"!==i[h]&&(c.supports.everythingExceptFlag=c.supports.everythingExceptFlag&&c.supports[i[h]]);c.supports.everythingExceptFlag=c.supports.everythingExceptFlag&&!c.supports.flag,c.DOMReady=!1,c.readyCallback=function(){c.DOMReady=!0},c.supports.everything||(g=function(){c.readyCallback()},b.addEventListener?(b.addEventListener("DOMContentLoaded",g,!1),a.addEventListener("load",g,!1)):(a.attachEvent("onload",g),b.attachEvent("onreadystatechange",function(){"complete"===b.readyState&&c.readyCallback()})),f=c.source||{},f.concatemoji?e(f.concatemoji):f.wpemoji&&f.twemoji&&(e(f.twemoji),e(f.wpemoji)))}(window,document,window._wpemojiSettings); \ No newline at end of file diff --git a/wp-includes/js/wp-emoji-release.min.js b/wp-includes/js/wp-emoji-release.min.js new file mode 100644 index 0000000..12792b8 --- /dev/null +++ b/wp-includes/js/wp-emoji-release.min.js @@ -0,0 +1,4 @@ +// Source: wp-includes/js/twemoji.min.js +var twemoji=function(){"use strict";function a(a){return document.createTextNode(a)}function b(a){return a.replace(u,h)}function c(a,b){return"".concat(b.base,b.size,"/",a,b.ext)}function d(a,b){for(var c,e,f=a.childNodes,g=f.length;g--;)c=f[g],e=c.nodeType,3===e?b.push(c):1!==e||v.test(c.nodeName)||d(c,b);return b}function e(a){return o(a.indexOf(t)<0?a.replace(s,""):a)}function f(b,c){for(var f,g,h,i,j,k,l,m,n,o,p,q,s,t=d(b,[]),u=t.length;u--;){for(h=!1,i=document.createDocumentFragment(),j=t[u],k=j.nodeValue,m=0;l=r.exec(k);){if(n=l.index,n!==m&&i.appendChild(a(k.slice(m,n))),p=l[0],q=e(p),m=n+p.length,s=c.callback(q,c)){o=new Image,o.onerror=c.onerror,o.setAttribute("draggable","false"),f=c.attributes(p,q);for(g in f)f.hasOwnProperty(g)&&0!==g.indexOf("on")&&!o.hasAttribute(g)&&o.setAttribute(g,f[g]);o.className=c.className,o.alt=p,o.src=s,h=!0,i.appendChild(o)}o||i.appendChild(a(p)),o=null}h&&(m<k.length&&i.appendChild(a(k.slice(m))),j.parentNode.replaceChild(i,j))}return b}function g(a,c){return m(a,function(a){var d,f,g=a,h=e(a),i=c.callback(h,c);if(i){g="<img ".concat('class="',c.className,'" ','draggable="false" ','alt="',a,'"',' src="',i,'"'),d=c.attributes(a,h);for(f in d)d.hasOwnProperty(f)&&0!==f.indexOf("on")&&-1===g.indexOf(" "+f+"=")&&(g=g.concat(" ",f,'="',b(d[f]),'"'));g=g.concat(">")}return g})}function h(a){return q[a]}function i(){return null}function j(a){return"number"==typeof a?a+"x"+a:a}function k(a){var b="string"==typeof a?parseInt(a,16):a;return 65536>b?w(b):(b-=65536,w(55296+(b>>10),56320+(1023&b)))}function l(a,b){return b&&"function"!=typeof b||(b={callback:b}),("string"==typeof a?g:f)(a,{callback:b.callback||c,attributes:"function"==typeof b.attributes?b.attributes:i,base:"string"==typeof b.base?b.base:p.base,ext:b.ext||p.ext,size:b.folder||j(b.size||p.size),className:b.className||p.className,onerror:b.onerror||p.onerror})}function m(a,b){return String(a).replace(r,b)}function n(a){r.lastIndex=0;var b=r.test(a);return r.lastIndex=0,b}function o(a,b){for(var c=[],d=0,e=0,f=0;f<a.length;)d=a.charCodeAt(f++),e?(c.push((65536+(e-55296<<10)+(d-56320)).toString(16)),e=0):d>=55296&&56319>=d?e=d:c.push(d.toString(16));return c.join(b||"-")}var p={base:"https://twemoji.maxcdn.com/2/",ext:".png",size:"72x72",className:"emoji",convert:{fromCodePoint:k,toCodePoint:o},onerror:function(){this.parentNode&&this.parentNode.replaceChild(a(this.alt),this)},parse:l,replace:m,test:n},q={"&":"&","<":"<",">":">","'":"'",'"':"""},r=/\ud83d\udc68\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68|\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d\udc66\u200d\ud83d\udc66|\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d\udc67\u200d\ud83d[\udc66\udc67]|\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc66\u200d\ud83d\udc66|\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc67\u200d\ud83d[\udc66\udc67]|\ud83d\udc69\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d[\udc68\udc69]|\ud83d\udc69\u200d\ud83d\udc69\u200d\ud83d\udc66\u200d\ud83d\udc66|\ud83d\udc69\u200d\ud83d\udc69\u200d\ud83d\udc67\u200d\ud83d[\udc66\udc67]|\ud83d\udc68\u200d\u2764\ufe0f\u200d\ud83d\udc68|\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d[\udc66\udc67]|\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d[\udc66\udc67]|\ud83d\udc69\u200d\u2764\ufe0f\u200d\ud83d[\udc68\udc69]|\ud83d\udc69\u200d\ud83d\udc69\u200d\ud83d[\udc66\udc67]|\ud83d\udc41\u200d\ud83d\udde8|(?:[\u0023\u002a\u0030-\u0039])\ufe0f?\u20e3|(?:(?:[\u261d\u270c])(?:\ufe0f|(?!\ufe0e))|\ud83c[\udf85\udfc2-\udfc4\udfc7\udfca\udfcb]|\ud83d[\udc42\udc43\udc46-\udc50\udc66-\udc69\udc6e\udc70-\udc78\udc7c\udc81-\udc83\udc85-\udc87\udcaa\udd75\udd90\udd95\udd96\ude45-\ude47\ude4b-\ude4f\udea3\udeb4-\udeb6\udec0]|\ud83e\udd18|[\u26f9\u270a\u270b\u270d])(?:\ud83c[\udffb-\udfff]|)|\ud83c\udde6\ud83c[\udde8-\uddec\uddee\uddf1\uddf2\uddf4\uddf6-\uddfa\uddfc\uddfd\uddff]|\ud83c\udde7\ud83c[\udde6\udde7\udde9-\uddef\uddf1-\uddf4\uddf6-\uddf9\uddfb\uddfc\uddfe\uddff]|\ud83c\udde8\ud83c[\udde6\udde8\udde9\uddeb-\uddee\uddf0-\uddf5\uddf7\uddfa-\uddff]|\ud83c\udde9\ud83c[\uddea\uddec\uddef\uddf0\uddf2\uddf4\uddff]|\ud83c\uddea\ud83c[\udde6\udde8\uddea\uddec\udded\uddf7-\uddfa]|\ud83c\uddeb\ud83c[\uddee-\uddf0\uddf2\uddf4\uddf7]|\ud83c\uddec\ud83c[\udde6\udde7\udde9-\uddee\uddf1-\uddf3\uddf5-\uddfa\uddfc\uddfe]|\ud83c\udded\ud83c[\uddf0\uddf2\uddf3\uddf7\uddf9\uddfa]|\ud83c\uddee\ud83c[\udde8-\uddea\uddf1-\uddf4\uddf6-\uddf9]|\ud83c\uddef\ud83c[\uddea\uddf2\uddf4\uddf5]|\ud83c\uddf0\ud83c[\uddea\uddec-\uddee\uddf2\uddf3\uddf5\uddf7\uddfc\uddfe\uddff]|\ud83c\uddf1\ud83c[\udde6-\udde8\uddee\uddf0\uddf7-\uddfb\uddfe]|\ud83c\uddf2\ud83c[\udde6\udde8-\udded\uddf0-\uddff]|\ud83c\uddf3\ud83c[\udde6\udde8\uddea-\uddec\uddee\uddf1\uddf4\uddf5\uddf7\uddfa\uddff]|\ud83c\uddf4\ud83c\uddf2|\ud83c\uddf5\ud83c[\udde6\uddea-\udded\uddf0-\uddf3\uddf7-\uddf9\uddfc\uddfe]|\ud83c\uddf6\ud83c\udde6|\ud83c\uddf7\ud83c[\uddea\uddf4\uddf8\uddfa\uddfc]|\ud83c\uddf8\ud83c[\udde6-\uddea\uddec-\uddf4\uddf7-\uddf9\uddfb\uddfd-\uddff]|\ud83c\uddf9\ud83c[\udde6\udde8\udde9\uddeb-\udded\uddef-\uddf4\uddf7\uddf9\uddfb\uddfc\uddff]|\ud83c\uddfa\ud83c[\udde6\uddec\uddf2\uddf8\uddfe\uddff]|\ud83c\uddfb\ud83c[\udde6\udde8\uddea\uddec\uddee\uddf3\uddfa]|\ud83c\uddfc\ud83c[\uddeb\uddf8]|\ud83c\uddfd\ud83c\uddf0|\ud83c\uddfe\ud83c[\uddea\uddf9]|\ud83c\uddff\ud83c[\udde6\uddf2\uddfc]|\ud83c[\udccf\udd8e\udd91-\udd9a\udde6-\uddff\ude01\ude32-\ude36\ude38-\ude3a\ude50\ude51\udf00-\udf21\udf24-\udf84\udf86-\udf93\udf96\udf97\udf99-\udf9b\udf9e-\udfc1\udfc5\udfc6\udfc8\udfc9\udfcc-\udff0\udff3-\udff5\udff7-\udfff]|\ud83d[\udc00-\udc41\udc44\udc45\udc51-\udc65\udc6a-\udc6d\udc6f\udc79-\udc7b\udc7d-\udc80\udc84\udc88-\udca9\udcab-\udcfd\udcff-\udd3d\udd49-\udd4e\udd50-\udd67\udd6f\udd70\udd73\udd74\udd76-\udd79\udd87\udd8a-\udd8d\udda5\udda8\uddb1\uddb2\uddbc\uddc2-\uddc4\uddd1-\uddd3\udddc-\uddde\udde1\udde3\udde8\uddef\uddf3\uddfa-\ude44\ude48-\ude4a\ude80-\udea2\udea4-\udeb3\udeb7-\udebf\udec1-\udec5\udecb-\uded0\udee0-\udee5\udee9\udeeb\udeec\udef0\udef3]|\ud83e[\udd10-\udd17\udd80-\udd84\uddc0]|[\u2328\u23cf\u23e9-\u23f3\u23f8-\u23fa\u2602-\u2604\u2618\u2620\u2622\u2623\u2626\u262a\u262e\u262f\u2638\u2692\u2694\u2696\u2697\u2699\u269b\u269c\u26b0\u26b1\u26c8\u26ce\u26cf\u26d1\u26d3\u26e9\u26f0\u26f1\u26f4\u26f7\u26f8\u2705\u271d\u2721\u2728\u274c\u274e\u2753-\u2755\u2763\u2795-\u2797\u27b0\u27bf\ue50a]|(?:\ud83c[\udc04\udd70\udd71\udd7e\udd7f\ude02\ude1a\ude2f\ude37]|[\u00a9\u00ae\u203c\u2049\u2122\u2139\u2194-\u2199\u21a9\u21aa\u231a\u231b\u24c2\u25aa\u25ab\u25b6\u25c0\u25fb-\u25fe\u2600\u2601\u260e\u2611\u2614\u2615\u2639\u263a\u2648-\u2653\u2660\u2663\u2665\u2666\u2668\u267b\u267f\u2693\u26a0\u26a1\u26aa\u26ab\u26bd\u26be\u26c4\u26c5\u26d4\u26ea\u26f2\u26f3\u26f5\u26fa\u26fd\u2702\u2708\u2709\u270f\u2712\u2714\u2716\u2733\u2734\u2744\u2747\u2757\u2764\u27a1\u2934\u2935\u2b05-\u2b07\u2b1b\u2b1c\u2b50\u2b55\u3030\u303d\u3297\u3299])(?:\ufe0f|(?!\ufe0e))/g,s=/\uFE0F/g,t=String.fromCharCode(8205),u=/[&<>'"]/g,v=/IFRAME|NOFRAMES|NOSCRIPT|SCRIPT|SELECT|STYLE|TEXTAREA|[a-z]/,w=String.fromCharCode;return p}(); +// Source: wp-includes/js/wp-emoji.min.js +!function(a,b){function c(){function c(){if(!i){if("undefined"==typeof a.twemoji){if(j>600)return;return a.clearTimeout(g),g=a.setTimeout(c,50),void j++}f=a.twemoji,i=!0,h&&new h(function(a){for(var b,c,f,g,h=a.length;h--;){if(b=a[h].addedNodes,c=a[h].removedNodes,f=b.length,1===f&&1===c.length&&3===b[0].nodeType&&"IMG"===c[0].nodeName&&b[0].data===c[0].alt&&"load-failed"===c[0].getAttribute("data-error"))return;for(;f--;){if(g=b[f],3===g.nodeType){if(!g.parentNode)continue;if(k)for(;g.nextSibling&&3===g.nextSibling.nodeType;)g.nodeValue=g.nodeValue+g.nextSibling.nodeValue,g.parentNode.removeChild(g.nextSibling);g=g.parentNode}!g||1!==g.nodeType||g.className&&"string"==typeof g.className&&-1!==g.className.indexOf("wp-exclude-emoji")||d(g.textContent)&&e(g)}}}).observe(document.body,{childList:!0,subtree:!0}),e(document.body)}}function d(a){var b=/[\u203C\u2049\u20E3\u2122\u2139\u2194-\u2199\u21A9\u21AA\u2300\u231A\u231B\u2328\u2388\u23CF\u23E9-\u23F3\u23F8-\u23FA\u24C2\u25AA\u25AB\u25B6\u25C0\u25FB-\u25FE\u2600-\u2604\u260E\u2611\u2614\u2615\u2618\u261D\u2620\u2622\u2623\u2626\u262A\u262E\u262F\u2638\u2639\u263A\u2648-\u2653\u2660\u2663\u2665\u2666\u2668\u267B\u267F\u2692\u2693\u2694\u2696\u2697\u2699\u269B\u269C\u26A0\u26A1\u26AA\u26AB\u26B0\u26B1\u26BD\u26BE\u26C4\u26C5\u26C8\u26CE\u26CF\u26D1\u26D3\u26D4\u26E9\u26EA\u26F0-\u26F5\u26F7-\u26FA\u26FD\u2702\u2705\u2708-\u270D\u270F\u2712\u2714\u2716\u271D\u2721\u2728\u2733\u2734\u2744\u2747\u274C\u274E\u2753\u2754\u2755\u2757\u2763\u2764\u2795\u2796\u2797\u27A1\u27B0\u27BF\u2934\u2935\u2B05\u2B06\u2B07\u2B1B\u2B1C\u2B50\u2B55\u3030\u303D\u3297\u3299]/,c=/[\uDC00-\uDFFF]/;return a?c.test(a)||b.test(a):!1}function e(a,c){var d;return!b.supports.everything&&f&&a&&("string"==typeof a||a.childNodes&&a.childNodes.length)?(c=c||{},d={base:b.baseUrl,ext:b.ext,className:c.className||"emoji",callback:function(a,c){switch(a){case"a9":case"ae":case"2122":case"2194":case"2660":case"2663":case"2665":case"2666":return!1}return b.supports.everythingExceptFlag&&!/^1f1(?:e[6-9a-f]|f[0-9a-f])-1f1(?:e[6-9a-f]|f[0-9a-f])$/.test(a)?!1:"".concat(c.base,a,c.ext)},onerror:function(){f.parentNode&&(this.setAttribute("data-error","load-failed"),f.parentNode.replaceChild(document.createTextNode(f.alt),f))}},"object"==typeof c.imgAttr&&(d.attributes=function(){return c.imgAttr}),f.parse(a,d)):a}var f,g,h=a.MutationObserver||a.WebKitMutationObserver||a.MozMutationObserver,i=!1,j=0,k=a.navigator.userAgent.indexOf("Trident/7.0")>0;return b&&(b.DOMReady?c():b.readyCallback=c),{parse:e,test:d}}a.wp=a.wp||{},a.wp.emoji=new c}(window,window._wpemojiSettings); \ No newline at end of file diff --git a/wp-includes/js/wp-emoji.js b/wp-includes/js/wp-emoji.js new file mode 100644 index 0000000..dafcc36 --- /dev/null +++ b/wp-includes/js/wp-emoji.js @@ -0,0 +1,205 @@ + +( function( window, settings ) { + function wpEmoji() { + var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver, + + // Private + twemoji, timer, + loaded = false, + count = 0, + ie11 = window.navigator.userAgent.indexOf( 'Trident/7.0' ) > 0; + + /** + * Runs when the document load event is fired, so we can do our first parse of the page. + * + * @since 4.2.0 + */ + function load() { + if ( loaded ) { + return; + } + + if ( typeof window.twemoji === 'undefined' ) { + // Break if waiting for longer than 30 sec. + if ( count > 600 ) { + return; + } + + // Still waiting. + window.clearTimeout( timer ); + timer = window.setTimeout( load, 50 ); + count++; + + return; + } + + twemoji = window.twemoji; + loaded = true; + + if ( MutationObserver ) { + new MutationObserver( function( mutationRecords ) { + var i = mutationRecords.length, + addedNodes, removedNodes, ii, node; + + while ( i-- ) { + addedNodes = mutationRecords[ i ].addedNodes; + removedNodes = mutationRecords[ i ].removedNodes; + ii = addedNodes.length; + + if ( + ii === 1 && removedNodes.length === 1 && + addedNodes[0].nodeType === 3 && + removedNodes[0].nodeName === 'IMG' && + addedNodes[0].data === removedNodes[0].alt && + 'load-failed' === removedNodes[0].getAttribute( 'data-error' ) + ) { + return; + } + + while ( ii-- ) { + node = addedNodes[ ii ]; + + if ( node.nodeType === 3 ) { + if ( ! node.parentNode ) { + continue; + } + + if ( ie11 ) { + /* + * IE 11's implementation of MutationObserver is buggy. + * It unnecessarily splits text nodes when it encounters a HTML + * template interpolation symbol ( "{{", for example ). So, we + * join the text nodes back together as a work-around. + */ + while( node.nextSibling && 3 === node.nextSibling.nodeType ) { + node.nodeValue = node.nodeValue + node.nextSibling.nodeValue; + node.parentNode.removeChild( node.nextSibling ); + } + } + + node = node.parentNode; + } + + if ( ! node || node.nodeType !== 1 || + ( node.className && typeof node.className === 'string' && node.className.indexOf( 'wp-exclude-emoji' ) !== -1 ) ) { + + continue; + } + + if ( test( node.textContent ) ) { + parse( node ); + } + } + } + } ).observe( document.body, { + childList: true, + subtree: true + } ); + } + + parse( document.body ); + } + + /** + * Test if a text string contains emoji characters. + * + * @since 4.3.0 + * + * @param {String} text The string to test + * + * @return {Boolean} Whether the string contains emoji characters. + */ + function test( text ) { + // Single char. U+20E3 to detect keycaps. U+00A9 "copyright sign" and U+00AE "registered sign" not included. + var single = /[\u203C\u2049\u20E3\u2122\u2139\u2194-\u2199\u21A9\u21AA\u2300\u231A\u231B\u2328\u2388\u23CF\u23E9-\u23F3\u23F8-\u23FA\u24C2\u25AA\u25AB\u25B6\u25C0\u25FB-\u25FE\u2600-\u2604\u260E\u2611\u2614\u2615\u2618\u261D\u2620\u2622\u2623\u2626\u262A\u262E\u262F\u2638\u2639\u263A\u2648-\u2653\u2660\u2663\u2665\u2666\u2668\u267B\u267F\u2692\u2693\u2694\u2696\u2697\u2699\u269B\u269C\u26A0\u26A1\u26AA\u26AB\u26B0\u26B1\u26BD\u26BE\u26C4\u26C5\u26C8\u26CE\u26CF\u26D1\u26D3\u26D4\u26E9\u26EA\u26F0-\u26F5\u26F7-\u26FA\u26FD\u2702\u2705\u2708-\u270D\u270F\u2712\u2714\u2716\u271D\u2721\u2728\u2733\u2734\u2744\u2747\u274C\u274E\u2753\u2754\u2755\u2757\u2763\u2764\u2795\u2796\u2797\u27A1\u27B0\u27BF\u2934\u2935\u2B05\u2B06\u2B07\u2B1B\u2B1C\u2B50\u2B55\u3030\u303D\u3297\u3299]/, + // Surrogate pair range. Only tests for the second half. + pair = /[\uDC00-\uDFFF]/; + + if ( text ) { + return pair.test( text ) || single.test( text ); + } + + return false; + } + + /** + * Given an element or string, parse any emoji characters into Twemoji images. + * + * @since 4.2.0 + * + * @param {HTMLElement|String} object The element or string to parse. + * @param {Object} args Additional options for Twemoji. + */ + function parse( object, args ) { + var params; + + if ( settings.supports.everything || ! twemoji || ! object || + ( 'string' !== typeof object && ( ! object.childNodes || ! object.childNodes.length ) ) ) { + + return object; + } + + args = args || {}; + params = { + base: settings.baseUrl, + ext: settings.ext, + className: args.className || 'emoji', + callback: function( icon, options ) { + // Ignore some standard characters that TinyMCE recommends in its character map. + switch ( icon ) { + case 'a9': + case 'ae': + case '2122': + case '2194': + case '2660': + case '2663': + case '2665': + case '2666': + return false; + } + + if ( settings.supports.everythingExceptFlag && ! /^1f1(?:e[6-9a-f]|f[0-9a-f])-1f1(?:e[6-9a-f]|f[0-9a-f])$/.test( icon ) ) { + + return false; + } + + return ''.concat( options.base, icon, options.ext ); + }, + onerror: function() { + if ( twemoji.parentNode ) { + this.setAttribute( 'data-error', 'load-failed' ); + twemoji.parentNode.replaceChild( document.createTextNode( twemoji.alt ), twemoji ); + } + } + }; + + if ( typeof args.imgAttr === 'object' ) { + params.attributes = function() { + return args.imgAttr; + }; + } + + return twemoji.parse( object, params ); + } + + /** + * Initialize our emoji support, and set up listeners. + */ + if ( settings ) { + if ( settings.DOMReady ) { + load(); + } else { + settings.readyCallback = load; + } + } + + return { + parse: parse, + test: test + }; + } + + window.wp = window.wp || {}; + window.wp.emoji = new wpEmoji(); + +} )( window, window._wpemojiSettings ); diff --git a/wp-includes/js/wp-emoji.min.js b/wp-includes/js/wp-emoji.min.js new file mode 100644 index 0000000..74f0150 --- /dev/null +++ b/wp-includes/js/wp-emoji.min.js @@ -0,0 +1 @@ +!function(a,b){function c(){function c(){if(!i){if("undefined"==typeof a.twemoji){if(j>600)return;return a.clearTimeout(g),g=a.setTimeout(c,50),void j++}f=a.twemoji,i=!0,h&&new h(function(a){for(var b,c,f,g,h=a.length;h--;){if(b=a[h].addedNodes,c=a[h].removedNodes,f=b.length,1===f&&1===c.length&&3===b[0].nodeType&&"IMG"===c[0].nodeName&&b[0].data===c[0].alt&&"load-failed"===c[0].getAttribute("data-error"))return;for(;f--;){if(g=b[f],3===g.nodeType){if(!g.parentNode)continue;if(k)for(;g.nextSibling&&3===g.nextSibling.nodeType;)g.nodeValue=g.nodeValue+g.nextSibling.nodeValue,g.parentNode.removeChild(g.nextSibling);g=g.parentNode}!g||1!==g.nodeType||g.className&&"string"==typeof g.className&&-1!==g.className.indexOf("wp-exclude-emoji")||d(g.textContent)&&e(g)}}}).observe(document.body,{childList:!0,subtree:!0}),e(document.body)}}function d(a){var b=/[\u203C\u2049\u20E3\u2122\u2139\u2194-\u2199\u21A9\u21AA\u2300\u231A\u231B\u2328\u2388\u23CF\u23E9-\u23F3\u23F8-\u23FA\u24C2\u25AA\u25AB\u25B6\u25C0\u25FB-\u25FE\u2600-\u2604\u260E\u2611\u2614\u2615\u2618\u261D\u2620\u2622\u2623\u2626\u262A\u262E\u262F\u2638\u2639\u263A\u2648-\u2653\u2660\u2663\u2665\u2666\u2668\u267B\u267F\u2692\u2693\u2694\u2696\u2697\u2699\u269B\u269C\u26A0\u26A1\u26AA\u26AB\u26B0\u26B1\u26BD\u26BE\u26C4\u26C5\u26C8\u26CE\u26CF\u26D1\u26D3\u26D4\u26E9\u26EA\u26F0-\u26F5\u26F7-\u26FA\u26FD\u2702\u2705\u2708-\u270D\u270F\u2712\u2714\u2716\u271D\u2721\u2728\u2733\u2734\u2744\u2747\u274C\u274E\u2753\u2754\u2755\u2757\u2763\u2764\u2795\u2796\u2797\u27A1\u27B0\u27BF\u2934\u2935\u2B05\u2B06\u2B07\u2B1B\u2B1C\u2B50\u2B55\u3030\u303D\u3297\u3299]/,c=/[\uDC00-\uDFFF]/;return a?c.test(a)||b.test(a):!1}function e(a,c){var d;return!b.supports.everything&&f&&a&&("string"==typeof a||a.childNodes&&a.childNodes.length)?(c=c||{},d={base:b.baseUrl,ext:b.ext,className:c.className||"emoji",callback:function(a,c){switch(a){case"a9":case"ae":case"2122":case"2194":case"2660":case"2663":case"2665":case"2666":return!1}return b.supports.everythingExceptFlag&&!/^1f1(?:e[6-9a-f]|f[0-9a-f])-1f1(?:e[6-9a-f]|f[0-9a-f])$/.test(a)?!1:"".concat(c.base,a,c.ext)},onerror:function(){f.parentNode&&(this.setAttribute("data-error","load-failed"),f.parentNode.replaceChild(document.createTextNode(f.alt),f))}},"object"==typeof c.imgAttr&&(d.attributes=function(){return c.imgAttr}),f.parse(a,d)):a}var f,g,h=a.MutationObserver||a.WebKitMutationObserver||a.MozMutationObserver,i=!1,j=0,k=a.navigator.userAgent.indexOf("Trident/7.0")>0;return b&&(b.DOMReady?c():b.readyCallback=c),{parse:e,test:d}}a.wp=a.wp||{},a.wp.emoji=new c}(window,window._wpemojiSettings); \ No newline at end of file diff --git a/wp-includes/js/wp-lists.js b/wp-includes/js/wp-lists.js index f31db9b..117e892 100644 --- a/wp-includes/js/wp-lists.js +++ b/wp-includes/js/wp-lists.js @@ -22,6 +22,13 @@ wpList = { return s.nonce || url._ajax_nonce || $('#' + s.element + ' input[name="_ajax_nonce"]').val() || url._wpnonce || $('#' + s.element + ' input[name="_wpnonce"]').val() || 0; }, + /** + * Extract list item data from a DOM element. + * + * @param {HTMLElement} e The DOM element. + * @param {string} t + * @return {array} + */ parseData: function(e,t) { var d = [], wpListsData; @@ -145,6 +152,13 @@ wpList = { return false; }, + /** + * Delete an item in the list via AJAX. + * + * @param {HTMLElement} e A DOM element containing item data. + * @param {Object} s + * @return {boolean} + */ ajaxDel: function( e, s ) { e = $(e); s = s || {}; @@ -322,16 +336,16 @@ wpList = { s = $.extend(_s, this.wpList.settings, s); - if ( !e.size() || !s.what ) + if ( !e.length || !s.what ) return false; if ( s.oldId ) old = $('#' + s.what + '-' + s.oldId); - if ( s.id && ( s.id != s.oldId || !old || !old.size() ) ) + if ( s.id && ( s.id != s.oldId || !old || !old.length ) ) $('#' + s.what + '-' + s.id).remove(); - if ( old && old.size() ) { + if ( old && old.length ) { old.before(e); old.remove(); } else if ( isNaN(s.pos) ) { @@ -344,7 +358,7 @@ wpList = { ref = list.find( '#' + s.pos ); - if ( 1 === ref.size() ) + if ( 1 === ref.length ) ref[ba](e); else list.append(e); @@ -375,11 +389,11 @@ wpList = { e = $(e); - if ( list.wpList && e.parents( '#' + list.id ).size() ) + if ( list.wpList && e.parents( '#' + list.id ).length ) return; e.find(':input').each( function() { - if ( $(this).parents('.form-no-clear').size() ) + if ( $(this).parents('.form-no-clear').length ) return; t = this.type.toLowerCase(); @@ -423,7 +437,7 @@ wpList = { items = $('.list-item:visible', list); - if ( !items.size() ) + if ( !items.length ) items = $(list).children(':visible'); eo = [':even',':odd']; diff --git a/wp-includes/js/wp-lists.min.js b/wp-includes/js/wp-lists.min.js index f19cc22..be53c4b 100644 --- a/wp-includes/js/wp-lists.min.js +++ b/wp-includes/js/wp-lists.min.js @@ -1 +1 @@ -!function(a){var b,c={add:"ajaxAdd",del:"ajaxDel",dim:"ajaxDim",process:"process",recolor:"recolor"};b={settings:{url:ajaxurl,type:"POST",response:"ajax-response",what:"",alt:"alternate",altOffset:0,addColor:null,delColor:null,dimAddColor:null,dimDelColor:null,confirm:null,addBefore:null,addAfter:null,delBefore:null,delAfter:null,dimBefore:null,dimAfter:null},nonce:function(b,c){var d=wpAjax.unserialize(b.attr("href"));return c.nonce||d._ajax_nonce||a("#"+c.element+' input[name="_ajax_nonce"]').val()||d._wpnonce||a("#"+c.element+' input[name="_wpnonce"]').val()||0},parseData:function(b,c){var d,e=[];try{d=a(b).attr("data-wp-lists")||"",d=d.match(new RegExp(c+":[\\S]+")),d&&(e=d[0].split(":"))}catch(f){}return e},pre:function(b,c,d){var e,f;return c=a.extend({},this.wpList.settings,{element:null,nonce:0,target:b.get(0)},c||{}),a.isFunction(c.confirm)&&("add"!=d&&(e=a("#"+c.element).css("backgroundColor"),a("#"+c.element).css("backgroundColor","#FF9966")),f=c.confirm.call(this,b,c,d,e),"add"!=d&&a("#"+c.element).css("backgroundColor",e),!f)?!1:c},ajaxAdd:function(c,d){c=a(c),d=d||{};var e,f,g,h,i,j=this,k=b.parseData(c,"add");return d=b.pre.call(j,c,d,"add"),d.element=k[2]||c.attr("id")||d.element||null,d.addColor=k[3]?"#"+k[3]:d.addColor||"#FFFF33",d?c.is('[id="'+d.element+'-submit"]')?d.element?(d.action="add-"+d.what,d.nonce=b.nonce(c,d),e=a("#"+d.element+" :input").not('[name="_ajax_nonce"], [name="_wpnonce"], [name="action"]'),(f=wpAjax.validateForm("#"+d.element))?(d.data=a.param(a.extend({_ajax_nonce:d.nonce,action:d.action},wpAjax.unserialize(k[4]||""))),g=a.isFunction(e.fieldSerialize)?e.fieldSerialize():e.serialize(),g&&(d.data+="&"+g),a.isFunction(d.addBefore)&&(d=d.addBefore(d),!d)?!0:d.data.match(/_ajax_nonce=[a-f0-9]+/)?(d.success=function(c){return h=wpAjax.parseAjaxResponse(c,d.response,d.element),i=c,!h||h.errors?!1:!0===h?!0:(jQuery.each(h.responses,function(){b.add.call(j,this.data,a.extend({},d,{pos:this.position||0,id:this.id||0,oldId:this.oldId||null}))}),j.wpList.recolor(),a(j).trigger("wpListAddEnd",[d,j.wpList]),void b.clear.call(j,"#"+d.element))},d.complete=function(b,c){if(a.isFunction(d.addAfter)){var e=a.extend({xml:b,status:c,parsed:h},d);d.addAfter(i,e)}},a.ajax(d),!1):!0):!1):!0:!b.add.call(j,c,d):!1},ajaxDel:function(c,d){c=a(c),d=d||{};var e,f,g,h=this,i=b.parseData(c,"delete");return d=b.pre.call(h,c,d,"delete"),d.element=i[2]||d.element||null,d.delColor=i[3]?"#"+i[3]:d.delColor||"#faa",d&&d.element?(d.action="delete-"+d.what,d.nonce=b.nonce(c,d),d.data=a.extend({action:d.action,id:d.element.split("-").pop(),_ajax_nonce:d.nonce},wpAjax.unserialize(i[4]||"")),a.isFunction(d.delBefore)&&(d=d.delBefore(d,h),!d)?!0:d.data._ajax_nonce?(e=a("#"+d.element),"none"!=d.delColor?e.css("backgroundColor",d.delColor).fadeOut(350,function(){h.wpList.recolor(),a(h).trigger("wpListDelEnd",[d,h.wpList])}):(h.wpList.recolor(),a(h).trigger("wpListDelEnd",[d,h.wpList])),d.success=function(b){return f=wpAjax.parseAjaxResponse(b,d.response,d.element),g=b,!f||f.errors?(e.stop().stop().css("backgroundColor","#faa").show().queue(function(){h.wpList.recolor(),a(this).dequeue()}),!1):void 0},d.complete=function(b,c){a.isFunction(d.delAfter)&&e.queue(function(){var e=a.extend({xml:b,status:c,parsed:f},d);d.delAfter(g,e)}).dequeue()},a.ajax(d),!1):!0):!1},ajaxDim:function(c,d){if("none"==a(c).parent().css("display"))return!1;c=a(c),d=d||{};var e,f,g,h,i,j,k=this,l=b.parseData(c,"dim");return d=b.pre.call(k,c,d,"dim"),d.element=l[2]||d.element||null,d.dimClass=l[3]||d.dimClass||null,d.dimAddColor=l[4]?"#"+l[4]:d.dimAddColor||"#FFFF33",d.dimDelColor=l[5]?"#"+l[5]:d.dimDelColor||"#FF3333",d&&d.element&&d.dimClass?(d.action="dim-"+d.what,d.nonce=b.nonce(c,d),d.data=a.extend({action:d.action,id:d.element.split("-").pop(),dimClass:d.dimClass,_ajax_nonce:d.nonce},wpAjax.unserialize(l[6]||"")),a.isFunction(d.dimBefore)&&(d=d.dimBefore(d),!d)?!0:(e=a("#"+d.element),f=e.toggleClass(d.dimClass).is("."+d.dimClass),g=b.getColor(e),e.toggleClass(d.dimClass),h=f?d.dimAddColor:d.dimDelColor,"none"!=h?e.animate({backgroundColor:h},"fast").queue(function(){e.toggleClass(d.dimClass),a(this).dequeue()}).animate({backgroundColor:g},{complete:function(){a(this).css("backgroundColor",""),a(k).trigger("wpListDimEnd",[d,k.wpList])}}):a(k).trigger("wpListDimEnd",[d,k.wpList]),d.data._ajax_nonce?(d.success=function(b){return i=wpAjax.parseAjaxResponse(b,d.response,d.element),j=b,!i||i.errors?(e.stop().stop().css("backgroundColor","#FF3333")[f?"removeClass":"addClass"](d.dimClass).show().queue(function(){k.wpList.recolor(),a(this).dequeue()}),!1):void 0},d.complete=function(b,c){a.isFunction(d.dimAfter)&&e.queue(function(){var e=a.extend({xml:b,status:c,parsed:i},d);d.dimAfter(j,e)}).dequeue()},a.ajax(d),!1):!0)):!0},getColor:function(a){var b=jQuery(a).css("backgroundColor");return b||"#ffffff"},add:function(c,d){c=a("string"==typeof c?a.trim(c):c);var e,f,g,h=a(this),i=!1,j={pos:0,id:0,oldId:null};return"string"==typeof d&&(d={what:d}),d=a.extend(j,this.wpList.settings,d),c.size()&&d.what?(d.oldId&&(i=a("#"+d.what+"-"+d.oldId)),!d.id||d.id==d.oldId&&i&&i.size()||a("#"+d.what+"-"+d.id).remove(),i&&i.size()?(i.before(c),i.remove()):isNaN(d.pos)?(e="after","-"==d.pos.substr(0,1)&&(d.pos=d.pos.substr(1),e="before"),f=h.find("#"+d.pos),1===f.size()?f[e](c):h.append(c)):("comment"!=d.what||0===a("#"+d.element).length)&&(d.pos<0?h.prepend(c):h.append(c)),d.alt&&((h.children(":visible").index(c[0])+d.altOffset)%2?c.removeClass(d.alt):c.addClass(d.alt)),"none"!=d.addColor&&(g=b.getColor(c),c.css("backgroundColor",d.addColor).animate({backgroundColor:g},{complete:function(){a(this).css("backgroundColor","")}})),h.each(function(){this.wpList.process(c)}),c):!1},clear:function(b){var c,d,e=this;b=a(b),e.wpList&&b.parents("#"+e.id).size()||b.find(":input").each(function(){a(this).parents(".form-no-clear").size()||(c=this.type.toLowerCase(),d=this.tagName.toLowerCase(),"text"==c||"password"==c||"textarea"==d?this.value="":"checkbox"==c||"radio"==c?this.checked=!1:"select"==d&&(this.selectedIndex=null))})},process:function(b){var c=this,d=a(b||document);d.delegate('form[data-wp-lists^="add:'+c.id+':"]',"submit",function(){return c.wpList.add(this)}),d.delegate('a[data-wp-lists^="add:'+c.id+':"], input[data-wp-lists^="add:'+c.id+':"]',"click",function(){return c.wpList.add(this)}),d.delegate('[data-wp-lists^="delete:'+c.id+':"]',"click",function(){return c.wpList.del(this)}),d.delegate('[data-wp-lists^="dim:'+c.id+':"]',"click",function(){return c.wpList.dim(this)})},recolor:function(){var b,c,d=this;d.wpList.settings.alt&&(b=a(".list-item:visible",d),b.size()||(b=a(d).children(":visible")),c=[":even",":odd"],d.wpList.settings.altOffset%2&&c.reverse(),b.filter(c[0]).addClass(d.wpList.settings.alt).end().filter(c[1]).removeClass(d.wpList.settings.alt))},init:function(){var a=this;a.wpList.process=function(b){a.each(function(){this.wpList.process(b)})},a.wpList.recolor=function(){a.each(function(){this.wpList.recolor()})}}},a.fn.wpList=function(d){return this.each(function(){var e=this;this.wpList={settings:a.extend({},b.settings,{what:b.parseData(this,"list")[1]||""},d)},a.each(c,function(a,c){e.wpList[a]=function(a,d){return b[c].call(e,a,d)}})}),b.init.call(this),this.wpList.process(),this}}(jQuery); \ No newline at end of file +!function(a){var b,c={add:"ajaxAdd",del:"ajaxDel",dim:"ajaxDim",process:"process",recolor:"recolor"};b={settings:{url:ajaxurl,type:"POST",response:"ajax-response",what:"",alt:"alternate",altOffset:0,addColor:null,delColor:null,dimAddColor:null,dimDelColor:null,confirm:null,addBefore:null,addAfter:null,delBefore:null,delAfter:null,dimBefore:null,dimAfter:null},nonce:function(b,c){var d=wpAjax.unserialize(b.attr("href"));return c.nonce||d._ajax_nonce||a("#"+c.element+' input[name="_ajax_nonce"]').val()||d._wpnonce||a("#"+c.element+' input[name="_wpnonce"]').val()||0},parseData:function(b,c){var d,e=[];try{d=a(b).attr("data-wp-lists")||"",d=d.match(new RegExp(c+":[\\S]+")),d&&(e=d[0].split(":"))}catch(f){}return e},pre:function(b,c,d){var e,f;return c=a.extend({},this.wpList.settings,{element:null,nonce:0,target:b.get(0)},c||{}),a.isFunction(c.confirm)&&("add"!=d&&(e=a("#"+c.element).css("backgroundColor"),a("#"+c.element).css("backgroundColor","#FF9966")),f=c.confirm.call(this,b,c,d,e),"add"!=d&&a("#"+c.element).css("backgroundColor",e),!f)?!1:c},ajaxAdd:function(c,d){c=a(c),d=d||{};var e,f,g,h,i,j=this,k=b.parseData(c,"add");return d=b.pre.call(j,c,d,"add"),d.element=k[2]||c.attr("id")||d.element||null,k[3]?d.addColor="#"+k[3]:d.addColor=d.addColor||"#FFFF33",d?c.is('[id="'+d.element+'-submit"]')?d.element?(d.action="add-"+d.what,d.nonce=b.nonce(c,d),e=a("#"+d.element+" :input").not('[name="_ajax_nonce"], [name="_wpnonce"], [name="action"]'),(f=wpAjax.validateForm("#"+d.element))?(d.data=a.param(a.extend({_ajax_nonce:d.nonce,action:d.action},wpAjax.unserialize(k[4]||""))),g=a.isFunction(e.fieldSerialize)?e.fieldSerialize():e.serialize(),g&&(d.data+="&"+g),a.isFunction(d.addBefore)&&(d=d.addBefore(d),!d)?!0:d.data.match(/_ajax_nonce=[a-f0-9]+/)?(d.success=function(c){return h=wpAjax.parseAjaxResponse(c,d.response,d.element),i=c,!h||h.errors?!1:!0===h?!0:(jQuery.each(h.responses,function(){b.add.call(j,this.data,a.extend({},d,{pos:this.position||0,id:this.id||0,oldId:this.oldId||null}))}),j.wpList.recolor(),a(j).trigger("wpListAddEnd",[d,j.wpList]),void b.clear.call(j,"#"+d.element))},d.complete=function(b,c){if(a.isFunction(d.addAfter)){var e=a.extend({xml:b,status:c,parsed:h},d);d.addAfter(i,e)}},a.ajax(d),!1):!0):!1):!0:!b.add.call(j,c,d):!1},ajaxDel:function(c,d){c=a(c),d=d||{};var e,f,g,h=this,i=b.parseData(c,"delete");return d=b.pre.call(h,c,d,"delete"),d.element=i[2]||d.element||null,i[3]?d.delColor="#"+i[3]:d.delColor=d.delColor||"#faa",d&&d.element?(d.action="delete-"+d.what,d.nonce=b.nonce(c,d),d.data=a.extend({action:d.action,id:d.element.split("-").pop(),_ajax_nonce:d.nonce},wpAjax.unserialize(i[4]||"")),a.isFunction(d.delBefore)&&(d=d.delBefore(d,h),!d)?!0:d.data._ajax_nonce?(e=a("#"+d.element),"none"!=d.delColor?e.css("backgroundColor",d.delColor).fadeOut(350,function(){h.wpList.recolor(),a(h).trigger("wpListDelEnd",[d,h.wpList])}):(h.wpList.recolor(),a(h).trigger("wpListDelEnd",[d,h.wpList])),d.success=function(b){return f=wpAjax.parseAjaxResponse(b,d.response,d.element),g=b,!f||f.errors?(e.stop().stop().css("backgroundColor","#faa").show().queue(function(){h.wpList.recolor(),a(this).dequeue()}),!1):void 0},d.complete=function(b,c){a.isFunction(d.delAfter)&&e.queue(function(){var e=a.extend({xml:b,status:c,parsed:f},d);d.delAfter(g,e)}).dequeue()},a.ajax(d),!1):!0):!1},ajaxDim:function(c,d){if("none"==a(c).parent().css("display"))return!1;c=a(c),d=d||{};var e,f,g,h,i,j,k=this,l=b.parseData(c,"dim");return d=b.pre.call(k,c,d,"dim"),d.element=l[2]||d.element||null,d.dimClass=l[3]||d.dimClass||null,l[4]?d.dimAddColor="#"+l[4]:d.dimAddColor=d.dimAddColor||"#FFFF33",l[5]?d.dimDelColor="#"+l[5]:d.dimDelColor=d.dimDelColor||"#FF3333",d&&d.element&&d.dimClass?(d.action="dim-"+d.what,d.nonce=b.nonce(c,d),d.data=a.extend({action:d.action,id:d.element.split("-").pop(),dimClass:d.dimClass,_ajax_nonce:d.nonce},wpAjax.unserialize(l[6]||"")),a.isFunction(d.dimBefore)&&(d=d.dimBefore(d),!d)?!0:(e=a("#"+d.element),f=e.toggleClass(d.dimClass).is("."+d.dimClass),g=b.getColor(e),e.toggleClass(d.dimClass),h=f?d.dimAddColor:d.dimDelColor,"none"!=h?e.animate({backgroundColor:h},"fast").queue(function(){e.toggleClass(d.dimClass),a(this).dequeue()}).animate({backgroundColor:g},{complete:function(){a(this).css("backgroundColor",""),a(k).trigger("wpListDimEnd",[d,k.wpList])}}):a(k).trigger("wpListDimEnd",[d,k.wpList]),d.data._ajax_nonce?(d.success=function(b){return i=wpAjax.parseAjaxResponse(b,d.response,d.element),j=b,!i||i.errors?(e.stop().stop().css("backgroundColor","#FF3333")[f?"removeClass":"addClass"](d.dimClass).show().queue(function(){k.wpList.recolor(),a(this).dequeue()}),!1):void 0},d.complete=function(b,c){a.isFunction(d.dimAfter)&&e.queue(function(){var e=a.extend({xml:b,status:c,parsed:i},d);d.dimAfter(j,e)}).dequeue()},a.ajax(d),!1):!0)):!0},getColor:function(a){var b=jQuery(a).css("backgroundColor");return b||"#ffffff"},add:function(c,d){c=a("string"==typeof c?a.trim(c):c);var e,f,g,h=a(this),i=!1,j={pos:0,id:0,oldId:null};return"string"==typeof d&&(d={what:d}),d=a.extend(j,this.wpList.settings,d),c.length&&d.what?(d.oldId&&(i=a("#"+d.what+"-"+d.oldId)),!d.id||d.id==d.oldId&&i&&i.length||a("#"+d.what+"-"+d.id).remove(),i&&i.length?(i.before(c),i.remove()):isNaN(d.pos)?(e="after","-"==d.pos.substr(0,1)&&(d.pos=d.pos.substr(1),e="before"),f=h.find("#"+d.pos),1===f.length?f[e](c):h.append(c)):("comment"!=d.what||0===a("#"+d.element).length)&&(d.pos<0?h.prepend(c):h.append(c)),d.alt&&((h.children(":visible").index(c[0])+d.altOffset)%2?c.removeClass(d.alt):c.addClass(d.alt)),"none"!=d.addColor&&(g=b.getColor(c),c.css("backgroundColor",d.addColor).animate({backgroundColor:g},{complete:function(){a(this).css("backgroundColor","")}})),h.each(function(){this.wpList.process(c)}),c):!1},clear:function(b){var c,d,e=this;b=a(b),e.wpList&&b.parents("#"+e.id).length||b.find(":input").each(function(){a(this).parents(".form-no-clear").length||(c=this.type.toLowerCase(),d=this.tagName.toLowerCase(),"text"==c||"password"==c||"textarea"==d?this.value="":"checkbox"==c||"radio"==c?this.checked=!1:"select"==d&&(this.selectedIndex=null))})},process:function(b){var c=this,d=a(b||document);d.delegate('form[data-wp-lists^="add:'+c.id+':"]',"submit",function(){return c.wpList.add(this)}),d.delegate('a[data-wp-lists^="add:'+c.id+':"], input[data-wp-lists^="add:'+c.id+':"]',"click",function(){return c.wpList.add(this)}),d.delegate('[data-wp-lists^="delete:'+c.id+':"]',"click",function(){return c.wpList.del(this)}),d.delegate('[data-wp-lists^="dim:'+c.id+':"]',"click",function(){return c.wpList.dim(this)})},recolor:function(){var b,c,d=this;d.wpList.settings.alt&&(b=a(".list-item:visible",d),b.length||(b=a(d).children(":visible")),c=[":even",":odd"],d.wpList.settings.altOffset%2&&c.reverse(),b.filter(c[0]).addClass(d.wpList.settings.alt).end().filter(c[1]).removeClass(d.wpList.settings.alt))},init:function(){var a=this;a.wpList.process=function(b){a.each(function(){this.wpList.process(b)})},a.wpList.recolor=function(){a.each(function(){this.wpList.recolor()})}}},a.fn.wpList=function(d){return this.each(function(){var e=this;this.wpList={settings:a.extend({},b.settings,{what:b.parseData(this,"list")[1]||""},d)},a.each(c,function(a,c){e.wpList[a]=function(a,d){return b[c].call(e,a,d)}})}),b.init.call(this),this.wpList.process(),this}}(jQuery); \ No newline at end of file diff --git a/wp-includes/js/wp-util.js b/wp-includes/js/wp-util.js index 867d3a0..84cb551 100644 --- a/wp-includes/js/wp-util.js +++ b/wp-includes/js/wp-util.js @@ -8,7 +8,7 @@ window.wp = window.wp || {}; /** * wp.template( id ) * - * Fetches a template by id. + * Fetch a JavaScript template for an id, and return a templating function for it. * * @param {string} id A string that corresponds to a DOM element with an id prefixed with "tmpl-". * For example, "attachment" maps to "tmpl-attachment". @@ -16,6 +16,12 @@ window.wp = window.wp || {}; */ wp.template = _.memoize(function ( id ) { var compiled, + /* + * Underscore's default ERB-style templates are incompatible with PHP + * when asp_tags is enabled, so WordPress uses Mustache-inspired templating syntax. + * + * @see trac ticket #22344. + */ options = { evaluate: /<#([\s\S]+?)#>/g, interpolate: /\{\{\{([\s\S]+?)\}\}\}/g, @@ -44,7 +50,8 @@ window.wp = window.wp || {}; * * @param {string} action The slug of the action to fire in WordPress. * @param {object} data The data to populate $_POST with. - * @return {$.promise} A jQuery promise that represents the request. + * @return {$.promise} A jQuery promise that represents the request, + * decorated with an abort() method. */ post: function( action, data ) { return wp.ajax.send({ @@ -59,9 +66,11 @@ window.wp = window.wp || {}; * * @param {string} action The slug of the action to fire in WordPress. * @param {object} options The options passed to jQuery.ajax. - * @return {$.promise} A jQuery promise that represents the request. + * @return {$.promise} A jQuery promise that represents the request, + * decorated with an abort() method. */ send: function( action, options ) { + var promise, deferred; if ( _.isObject( action ) ) { options = action; } else { @@ -75,7 +84,7 @@ window.wp = window.wp || {}; context: this }); - return $.Deferred( function( deferred ) { + deferred = $.Deferred( function( deferred ) { // Transfer success/error callbacks. if ( options.success ) deferred.done( options.success ); @@ -86,7 +95,7 @@ window.wp = window.wp || {}; delete options.error; // Use with PHP's wp_send_json_success() and wp_send_json_error() - $.ajax( options ).done( function( response ) { + deferred.jqXHR = $.ajax( options ).done( function( response ) { // Treat a response of `1` as successful for backwards // compatibility with existing handlers. if ( response === '1' || response === 1 ) @@ -99,7 +108,15 @@ window.wp = window.wp || {}; }).fail( function() { deferred.rejectWith( this, arguments ); }); - }).promise(); + }); + + promise = deferred.promise(); + promise.abort = function() { + deferred.jqXHR.abort(); + return this; + }; + + return promise; } }; diff --git a/wp-includes/js/wp-util.min.js b/wp-includes/js/wp-util.min.js index a74a80f..18db830 100644 --- a/wp-includes/js/wp-util.min.js +++ b/wp-includes/js/wp-util.min.js @@ -1 +1 @@ -window.wp=window.wp||{},function(a){var b="undefined"==typeof _wpUtilSettings?{}:_wpUtilSettings;wp.template=_.memoize(function(b){var c,d={evaluate:/<#([\s\S]+?)#>/g,interpolate:/\{\{\{([\s\S]+?)\}\}\}/g,escape:/\{\{([^\}]+?)\}\}(?!\})/g,variable:"data"};return function(e){return(c=c||_.template(a("#tmpl-"+b).html(),null,d))(e)}}),wp.ajax={settings:b.ajax||{},post:function(a,b){return wp.ajax.send({data:_.isObject(a)?a:_.extend(b||{},{action:a})})},send:function(b,c){return _.isObject(b)?c=b:(c=c||{},c.data=_.extend(c.data||{},{action:b})),c=_.defaults(c||{},{type:"POST",url:wp.ajax.settings.url,context:this}),a.Deferred(function(b){c.success&&b.done(c.success),c.error&&b.fail(c.error),delete c.success,delete c.error,a.ajax(c).done(function(a){("1"===a||1===a)&&(a={success:!0}),_.isObject(a)&&!_.isUndefined(a.success)?b[a.success?"resolveWith":"rejectWith"](this,[a.data]):b.rejectWith(this,[a])}).fail(function(){b.rejectWith(this,arguments)})}).promise()}}}(jQuery); \ No newline at end of file +window.wp=window.wp||{},function(a){var b="undefined"==typeof _wpUtilSettings?{}:_wpUtilSettings;wp.template=_.memoize(function(b){var c,d={evaluate:/<#([\s\S]+?)#>/g,interpolate:/\{\{\{([\s\S]+?)\}\}\}/g,escape:/\{\{([^\}]+?)\}\}(?!\})/g,variable:"data"};return function(e){return(c=c||_.template(a("#tmpl-"+b).html(),null,d))(e)}}),wp.ajax={settings:b.ajax||{},post:function(a,b){return wp.ajax.send({data:_.isObject(a)?a:_.extend(b||{},{action:a})})},send:function(b,c){var d,e;return _.isObject(b)?c=b:(c=c||{},c.data=_.extend(c.data||{},{action:b})),c=_.defaults(c||{},{type:"POST",url:wp.ajax.settings.url,context:this}),e=a.Deferred(function(b){c.success&&b.done(c.success),c.error&&b.fail(c.error),delete c.success,delete c.error,b.jqXHR=a.ajax(c).done(function(a){("1"===a||1===a)&&(a={success:!0}),_.isObject(a)&&!_.isUndefined(a.success)?b[a.success?"resolveWith":"rejectWith"](this,[a.data]):b.rejectWith(this,[a])}).fail(function(){b.rejectWith(this,arguments)})}),d=e.promise(),d.abort=function(){return e.jqXHR.abort(),this},d}}}(jQuery); \ No newline at end of file diff --git a/wp-includes/js/wplink.js b/wp-includes/js/wplink.js index 7d1c677..39925e5 100644 --- a/wp-includes/js/wplink.js +++ b/wp-includes/js/wplink.js @@ -1,8 +1,16 @@ -/* global ajaxurl, tinymce, wpLinkL10n, setUserSetting, wpActiveEditor */ var wpLink; -( function( $ ) { - var inputs = {}, rivers = {}, editor, searchTimer, River, Query; +( function( $, wpLinkL10n, wp ) { + var editor, searchTimer, River, Query, correctedURL, linkNode, + emailRegexp = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i, + urlRegexp = /^(https?|ftp):\/\/[A-Z0-9.-]+\.[A-Z]{2,4}[^ "]*$/i, + inputs = {}, + rivers = {}, + isTouch = ( 'ontouchend' in document ); + + function getLink() { + return linkNode || editor.dom.getParent( editor.selection.getNode(), 'a[href]' ); + } wpLink = { timeToTriggerRiver: 150, @@ -18,19 +26,24 @@ var wpLink; inputs.backdrop = $( '#wp-link-backdrop' ); inputs.submit = $( '#wp-link-submit' ); inputs.close = $( '#wp-link-close' ); - // URL - inputs.url = $( '#url-field' ); + + // Input + inputs.text = $( '#wp-link-text' ); + inputs.url = $( '#wp-link-url' ); inputs.nonce = $( '#_ajax_linking_nonce' ); - // Secondary options - inputs.title = $( '#link-title-field' ); - // Advanced Options - inputs.openInNewTab = $( '#link-target-checkbox' ); - inputs.search = $( '#search-field' ); + inputs.openInNewTab = $( '#wp-link-target' ); + inputs.search = $( '#wp-link-search' ); + // Build Rivers rivers.search = new River( $( '#search-results' ) ); rivers.recent = new River( $( '#most-recent-results' ) ); rivers.elements = inputs.dialog.find( '.query-results' ); + // Get search notice text + inputs.queryNotice = $( '#query-notice-message' ); + inputs.queryNoticeTextDefault = inputs.queryNotice.find( '.query-notice-default' ); + inputs.queryNoticeTextHint = inputs.queryNotice.find( '.query-notice-hint' ); + // Bind event handlers inputs.dialog.keydown( wpLink.keydown ); inputs.dialog.keyup( wpLink.keyup ); @@ -38,28 +51,54 @@ var wpLink; event.preventDefault(); wpLink.update(); }); - inputs.close.add( inputs.backdrop ).add( '#wp-link-cancel a' ).click( function( event ) { + + inputs.close.add( inputs.backdrop ).add( '#wp-link-cancel button' ).click( function( event ) { event.preventDefault(); wpLink.close(); }); - $( '#wp-link-search-toggle' ).click( wpLink.toggleInternalLinking ); - rivers.elements.on( 'river-select', wpLink.updateFields ); - inputs.search.keyup( function() { - var self = this; + // Display 'hint' message when search field or 'query-results' box are focused + inputs.search.on( 'focus.wplink', function() { + inputs.queryNoticeTextDefault.hide(); + inputs.queryNoticeTextHint.removeClass( 'screen-reader-text' ).show(); + } ).on( 'blur.wplink', function() { + inputs.queryNoticeTextDefault.show(); + inputs.queryNoticeTextHint.addClass( 'screen-reader-text' ).hide(); + } ); + inputs.search.on( 'keyup input', function() { window.clearTimeout( searchTimer ); searchTimer = window.setTimeout( function() { - wpLink.searchInternalLinks.call( self ); + wpLink.searchInternalLinks(); }, 500 ); }); + + inputs.url.on( 'paste', function() { + setTimeout( wpLink.correctURL, 0 ); + } ); + + inputs.url.on( 'blur', wpLink.correctURL ); }, - open: function( editorId ) { - var ed; - + // If URL wasn't corrected last time and doesn't start with http:, https:, ? # or /, prepend http:// + correctURL: function () { + var url = $.trim( inputs.url.val() ); + + if ( url && correctedURL !== url && ! /^(?:[a-z]+:|#|\?|\.|\/)/.test( url ) ) { + inputs.url.val( 'http://' + url ); + correctedURL = url; + } + }, + + open: function( editorId, url, text, node ) { + var ed, + $body = $( document.body ); + + $body.addClass( 'modal-open' ); + linkNode = node; + wpLink.range = null; if ( editorId ) { @@ -72,8 +111,12 @@ var wpLink; this.textarea = $( '#' + window.wpActiveEditor ).get( 0 ); - if ( typeof tinymce !== 'undefined' ) { - ed = tinymce.get( wpActiveEditor ); + if ( typeof window.tinymce !== 'undefined' ) { + // Make sure the link wrapper is the last element in the body, + // or the inline editor toolbar may show above the backdrop. + $body.append( inputs.backdrop, inputs.wrap ); + + ed = window.tinymce.get( window.wpActiveEditor ); if ( ed && ! ed.isHidden() ) { editor = ed; @@ -81,8 +124,8 @@ var wpLink; editor = null; } - if ( editor && tinymce.isIE ) { - editor.windowManager.bookmark = editor.selection.getBookmark(); + if ( editor && window.tinymce.isIE ) { + editor.windowManager.wplinkBookmark = editor.selection.getBookmark(); } } @@ -94,108 +137,213 @@ var wpLink; inputs.wrap.show(); inputs.backdrop.show(); - wpLink.refresh(); + wpLink.refresh( url, text ); + + $( document ).trigger( 'wplink-open', inputs.wrap ); }, isMCE: function() { return editor && ! editor.isHidden(); }, - refresh: function() { + refresh: function( url, text ) { + var linkText = ''; + // Refresh rivers (clear links, check visibility) rivers.search.refresh(); rivers.recent.refresh(); - if ( wpLink.isMCE() ) - wpLink.mceRefresh(); - else + if ( wpLink.isMCE() ) { + wpLink.mceRefresh( url, text ); + } else { + // For the Text editor the "Link text" field is always shown + if ( ! inputs.wrap.hasClass( 'has-text-field' ) ) { + inputs.wrap.addClass( 'has-text-field' ); + } + + if ( document.selection ) { + // Old IE + linkText = document.selection.createRange().text || text || ''; + } else if ( typeof this.textarea.selectionStart !== 'undefined' && + ( this.textarea.selectionStart !== this.textarea.selectionEnd ) ) { + // W3C + text = this.textarea.value.substring( this.textarea.selectionStart, this.textarea.selectionEnd ) || text || ''; + } + + inputs.text.val( text ); wpLink.setDefaultValues(); + } + + if ( isTouch ) { + // Close the onscreen keyboard + inputs.url.focus().blur(); + } else { + // Focus the URL field and highlight its contents. + // If this is moved above the selection changes, + // IE will show a flashing cursor over the dialog. + window.setTimeout( function() { + inputs.url[0].select(); + inputs.url.focus(); + } ); + } - // Focus the URL field and highlight its contents. - // If this is moved above the selection changes, - // IE will show a flashing cursor over the dialog. - inputs.url.focus()[0].select(); // Load the most recent results if this is the first time opening the panel. - if ( ! rivers.recent.ul.children().length ) + if ( ! rivers.recent.ul.children().length ) { rivers.recent.ajax(); + } + + correctedURL = inputs.url.val().replace( /^http:\/\//, '' ); }, - mceRefresh: function() { - var e; + hasSelectedText: function( linkNode ) { + var node, nodes, i, html = editor.selection.getContent(); - // If link exists, select proper values. - if ( e = editor.dom.getParent( editor.selection.getNode(), 'A' ) ) { - // Set URL and description. - inputs.url.val( editor.dom.getAttrib( e, 'href' ) ); - inputs.title.val( editor.dom.getAttrib( e, 'title' ) ); - // Set open in new tab. - inputs.openInNewTab.prop( 'checked', ( '_blank' === editor.dom.getAttrib( e, 'target' ) ) ); - // Update save prompt. - inputs.submit.val( wpLinkL10n.update ); + // Partial html and not a fully selected anchor element + if ( /</.test( html ) && ( ! /^<a [^>]+>[^<]+<\/a>$/.test( html ) || html.indexOf('href=') === -1 ) ) { + return false; + } - // If there's no link, set the default values. - } else { - wpLink.setDefaultValues(); + if ( linkNode ) { + nodes = linkNode.childNodes; + + if ( nodes.length === 0 ) { + return false; + } + + for ( i = nodes.length - 1; i >= 0; i-- ) { + node = nodes[i]; + + if ( node.nodeType != 3 && ! window.tinymce.dom.BookmarkManager.isBookmarkNode( node ) ) { + return false; + } + } } + + return true; }, - close: function() { - if ( ! wpLink.isMCE() ) { - wpLink.textarea.focus(); + mceRefresh: function( searchStr, text ) { + var linkText, href, + linkNode = getLink(), + onlyText = this.hasSelectedText( linkNode ); + + if ( linkNode ) { + linkText = linkNode.innerText || linkNode.textContent; + href = editor.dom.getAttrib( linkNode, 'href' ); - if ( wpLink.range ) { - wpLink.range.moveToBookmark( wpLink.range.getBookmark() ); - wpLink.range.select(); + if ( ! $.trim( linkText ) ) { + linkText = text || ''; } + + if ( searchStr && ( urlRegexp.test( searchStr ) || emailRegexp.test( searchStr ) ) ) { + href = searchStr; + } + + if ( href !== '_wp_link_placeholder' ) { + inputs.url.val( href ); + inputs.openInNewTab.prop( 'checked', '_blank' === editor.dom.getAttrib( linkNode, 'target' ) ); + inputs.submit.val( wpLinkL10n.update ); + } else { + this.setDefaultValues( linkText ); + } + + if ( searchStr && searchStr !== href ) { + // The user has typed something in the inline dialog. Trigger a search with it. + inputs.search.val( searchStr ); + } else { + inputs.search.val( '' ); + } + + // Always reset the search + window.setTimeout( function() { + wpLink.searchInternalLinks(); + } ); } else { - editor.focus(); + linkText = editor.selection.getContent({ format: 'text' }) || text || ''; + this.setDefaultValues( linkText ); + } + + if ( onlyText ) { + inputs.text.val( linkText ); + inputs.wrap.addClass( 'has-text-field' ); + } else { + inputs.text.val( '' ); + inputs.wrap.removeClass( 'has-text-field' ); + } + }, + + close: function( reset ) { + $( document.body ).removeClass( 'modal-open' ); + + if ( reset !== 'noReset' ) { + if ( ! wpLink.isMCE() ) { + wpLink.textarea.focus(); + + if ( wpLink.range ) { + wpLink.range.moveToBookmark( wpLink.range.getBookmark() ); + wpLink.range.select(); + } + } else { + if ( editor.plugins.wplink ) { + editor.plugins.wplink.close(); + } + + editor.focus(); + } } inputs.backdrop.hide(); inputs.wrap.hide(); + + correctedURL = false; + + $( document ).trigger( 'wplink-close', inputs.wrap ); }, getAttrs: function() { + wpLink.correctURL(); + return { - href: inputs.url.val(), - title: inputs.title.val(), + href: $.trim( inputs.url.val() ), target: inputs.openInNewTab.prop( 'checked' ) ? '_blank' : '' }; }, + buildHtml: function(attrs) { + var html = '<a href="' + attrs.href + '"'; + + if ( attrs.target ) { + html += ' target="' + attrs.target + '"'; + } + + return html + '>'; + }, + update: function() { - if ( wpLink.isMCE() ) + if ( wpLink.isMCE() ) { wpLink.mceUpdate(); - else + } else { wpLink.htmlUpdate(); + } }, htmlUpdate: function() { - var attrs, html, begin, end, cursor, title, selection, + var attrs, text, html, begin, end, cursor, selection, textarea = wpLink.textarea; - if ( ! textarea ) + if ( ! textarea ) { return; + } attrs = wpLink.getAttrs(); + text = inputs.text.val(); // If there's no href, return. - if ( ! attrs.href || attrs.href == 'http://' ) + if ( ! attrs.href ) { return; - - // Build HTML - html = '<a href="' + attrs.href + '"'; - - if ( attrs.title ) { - title = attrs.title.replace( /</g, '<' ).replace( />/g, '>' ).replace( /"/g, '"' ); - html += ' title="' + title + '"'; - } - - if ( attrs.target ) { - html += ' target="' + attrs.target + '"'; } - html += '>'; + html = wpLink.buildHtml(attrs); // Insert HTML if ( document.selection && wpLink.range ) { @@ -203,25 +351,29 @@ var wpLink; // Note: If no text is selected, IE will not place the cursor // inside the closing tag. textarea.focus(); - wpLink.range.text = html + wpLink.range.text + '</a>'; + wpLink.range.text = html + ( text || wpLink.range.text ) + '</a>'; wpLink.range.moveToBookmark( wpLink.range.getBookmark() ); wpLink.range.select(); wpLink.range = null; } else if ( typeof textarea.selectionStart !== 'undefined' ) { // W3C - begin = textarea.selectionStart; - end = textarea.selectionEnd; - selection = textarea.value.substring( begin, end ); - html = html + selection + '</a>'; - cursor = begin + html.length; + begin = textarea.selectionStart; + end = textarea.selectionEnd; + selection = text || textarea.value.substring( begin, end ); + html = html + selection + '</a>'; + cursor = begin + html.length; // If no text is selected, place the cursor inside the closing tag. - if ( begin == end ) - cursor -= '</a>'.length; + if ( begin === end && ! selection ) { + cursor -= 4; + } - textarea.value = textarea.value.substring( 0, begin ) + html + - textarea.value.substring( end, textarea.value.length ); + textarea.value = ( + textarea.value.substring( 0, begin ) + + html + + textarea.value.substring( end, textarea.value.length ) + ); // Update cursor position textarea.selectionStart = textarea.selectionEnd = cursor; @@ -229,57 +381,102 @@ var wpLink; wpLink.close(); textarea.focus(); + + // Audible confirmation message when a link has been inserted in the Editor. + wp.a11y.speak( wpLinkL10n.linkInserted ); }, mceUpdate: function() { - var link, - attrs = wpLink.getAttrs(); - - wpLink.close(); - editor.focus(); + var attrs = wpLink.getAttrs(), + link, text; - if ( tinymce.isIE ) { - editor.selection.moveToBookmark( editor.windowManager.bookmark ); + if ( window.tinymce.isIE && editor.windowManager.wplinkBookmark ) { + editor.selection.moveToBookmark( editor.windowManager.wplinkBookmark ); + editor.windowManager.wplinkBookmark = null; } - link = editor.dom.getParent( editor.selection.getNode(), 'a[href]' ); - - // If the values are empty, unlink and return - if ( ! attrs.href || attrs.href == 'http://' ) { + if ( ! attrs.href ) { editor.execCommand( 'unlink' ); + wpLink.close(); return; } + link = getLink(); + + if ( inputs.wrap.hasClass( 'has-text-field' ) ) { + text = inputs.text.val() || attrs.href; + } + if ( link ) { + if ( text ) { + if ( 'innerText' in link ) { + link.innerText = text; + } else { + link.textContent = text; + } + } + + // Not editing any more + attrs['data-wplink-edit'] = null; editor.dom.setAttribs( link, attrs ); } else { - editor.execCommand( 'mceInsertLink', false, attrs ); + if ( text ) { + editor.selection.setNode( editor.dom.create( 'a', attrs, editor.dom.encode( text ) ) ); + } else { + editor.execCommand( 'mceInsertLink', false, attrs ); + } } - // Move the cursor to the end of the selection - editor.selection.collapse(); + wpLink.close( 'noReset' ); + editor.focus(); + editor.nodeChanged(); + + // Audible confirmation message when a link has been inserted in the Editor. + wp.a11y.speak( wpLinkL10n.linkInserted ); }, - updateFields: function( e, li, originalEvent ) { + updateFields: function( e, li ) { inputs.url.val( li.children( '.item-permalink' ).val() ); - inputs.title.val( li.hasClass( 'no-title' ) ? '' : li.children( '.item-title' ).text() ); - if ( originalEvent && originalEvent.type == 'click' ) - inputs.url.focus(); }, - setDefaultValues: function() { - // Set URL and description to defaults. - // Leave the new tab setting as-is. - inputs.url.val( 'http://' ); - inputs.title.val( '' ); + getUrlFromSelection: function( selection ) { + if ( ! selection ) { + if ( this.isMCE() ) { + selection = editor.selection.getContent({ format: 'text' }); + } else if ( document.selection && wpLink.range ) { + selection = wpLink.range.text; + } else if ( typeof this.textarea.selectionStart !== 'undefined' ) { + selection = this.textarea.value.substring( this.textarea.selectionStart, this.textarea.selectionEnd ); + } + } + + selection = $.trim( selection ); + + if ( selection && emailRegexp.test( selection ) ) { + // Selection is email address + return 'mailto:' + selection; + } else if ( selection && urlRegexp.test( selection ) ) { + // Selection is URL + return selection.replace( /&|&#0?38;/gi, '&' ); + } + + return ''; + }, + + setDefaultValues: function( selection ) { + inputs.url.val( this.getUrlFromSelection( selection ) ); + + // Empty the search field and swap the "rivers". + inputs.search.val(''); + wpLink.searchInternalLinks(); // Update save prompt. inputs.submit.val( wpLinkL10n.save ); }, searchInternalLinks: function() { - var t = $( this ), waiting, - search = t.val(); + var waiting, + search = inputs.search.val() || ''; if ( search.length > 2 ) { rivers.recent.hide(); @@ -290,11 +487,11 @@ var wpLink; return; wpLink.lastSearch = search; - waiting = t.parent().find('.spinner').show(); + waiting = inputs.search.parent().find( '.spinner' ).addClass( 'is-active' ); rivers.search.change( search ); rivers.search.ajax( function() { - waiting.hide(); + waiting.removeClass( 'is-active' ); }); } else { rivers.search.hide(); @@ -313,15 +510,18 @@ var wpLink; }, keydown: function( event ) { - var fn, id, - key = $.ui.keyCode; + var fn, id; - if ( key.ESCAPE === event.keyCode ) { + // Escape key. + if ( 27 === event.keyCode ) { wpLink.close(); event.stopImmediatePropagation(); - } else if ( key.TAB === event.keyCode ) { + // Tab key. + } else if ( 9 === event.keyCode ) { id = event.target.id; + // wp-link-submit must always be the last focusable element in the dialog. + // following focusable elements will be skipped on keyboard navigation. if ( id === 'wp-link-submit' && ! event.shiftKey ) { inputs.close.focus(); event.preventDefault(); @@ -331,11 +531,18 @@ var wpLink; } } - if ( event.keyCode !== key.UP && event.keyCode !== key.DOWN ) { + // Up Arrow and Down Arrow keys. + if ( 38 !== event.keyCode && 40 !== event.keyCode ) { return; } - fn = event.keyCode === key.UP ? 'prev' : 'next'; + if ( document.activeElement && + ( document.activeElement.id === 'link-title-field' || document.activeElement.id === 'url-field' ) ) { + return; + } + + // Up Arrow key. + fn = 38 === event.keyCode ? 'prev' : 'next'; clearInterval( wpLink.keyInterval ); wpLink[ fn ](); wpLink.keyInterval = setInterval( wpLink[ fn ], wpLink.keySensitivity ); @@ -343,9 +550,8 @@ var wpLink; }, keyup: function( event ) { - var key = $.ui.keyCode; - - if ( event.which === key.UP || event.which === key.DOWN ) { + // Up Arrow and Down Arrow keys. + if ( 38 === event.keyCode || 40 === event.keyCode ) { clearInterval( wpLink.keyInterval ); event.preventDefault(); } @@ -372,14 +578,6 @@ var wpLink; funcContext = this; funcTriggered = true; }; - }, - - toggleInternalLinking: function() { - var visible = inputs.wrap.hasClass( 'search-panel-visible' ); - - inputs.wrap.toggleClass( 'search-panel-visible', ! visible ); - setUserSetting( 'wplink', visible ? '0' : '1' ); - inputs[ ! visible ? 'search' : 'url' ].focus(); } }; @@ -489,7 +687,7 @@ var wpLink; if ( ! results ) { if ( firstPage ) { - list += '<li class="unselectable"><span class="item-title"><em>' + + list += '<li class="unselectable no-matches-found"><span class="item-title"><em>' + wpLinkL10n.noMatchesFound + '</em></span></li>'; } } else { @@ -522,11 +720,11 @@ var wpLink; if ( ! self.query.ready() || newBottom < self.contentHeight.height() - wpLink.riverBottomThreshold ) return; - self.waiting.show(); + self.waiting.addClass( 'is-active' ); el.scrollTop( newTop + self.waiting.outerHeight() ); self.ajax( function() { - self.waiting.hide(); + self.waiting.removeClass( 'is-active' ); }); }, wpLink.timeToTriggerRiver ); } @@ -556,7 +754,7 @@ var wpLink; this.querying = true; - $.post( ajaxurl, query, function( r ) { + $.post( window.ajaxurl, query, function( r ) { self.page++; self.querying = false; self.allLoaded = ! r; @@ -566,4 +764,4 @@ var wpLink; }); $( document ).ready( wpLink.init ); -})( jQuery ); +})( jQuery, window.wpLinkL10n, window.wp ); diff --git a/wp-includes/js/wplink.min.js b/wp-includes/js/wplink.min.js index 5aaeeef..bbdd026 100644 --- a/wp-includes/js/wplink.min.js +++ b/wp-includes/js/wplink.min.js @@ -1 +1 @@ -var wpLink;!function(a){var b,c,d,e,f={},g={};wpLink={timeToTriggerRiver:150,minRiverAJAXDuration:200,riverBottomThreshold:5,keySensitivity:100,lastSearch:"",textarea:"",init:function(){f.wrap=a("#wp-link-wrap"),f.dialog=a("#wp-link"),f.backdrop=a("#wp-link-backdrop"),f.submit=a("#wp-link-submit"),f.close=a("#wp-link-close"),f.url=a("#url-field"),f.nonce=a("#_ajax_linking_nonce"),f.title=a("#link-title-field"),f.openInNewTab=a("#link-target-checkbox"),f.search=a("#search-field"),g.search=new d(a("#search-results")),g.recent=new d(a("#most-recent-results")),g.elements=f.dialog.find(".query-results"),f.dialog.keydown(wpLink.keydown),f.dialog.keyup(wpLink.keyup),f.submit.click(function(a){a.preventDefault(),wpLink.update()}),f.close.add(f.backdrop).add("#wp-link-cancel a").click(function(a){a.preventDefault(),wpLink.close()}),a("#wp-link-search-toggle").click(wpLink.toggleInternalLinking),g.elements.on("river-select",wpLink.updateFields),f.search.keyup(function(){var a=this;window.clearTimeout(c),c=window.setTimeout(function(){wpLink.searchInternalLinks.call(a)},500)})},open:function(c){var d;wpLink.range=null,c&&(window.wpActiveEditor=c),window.wpActiveEditor&&(this.textarea=a("#"+window.wpActiveEditor).get(0),"undefined"!=typeof tinymce&&(d=tinymce.get(wpActiveEditor),b=d&&!d.isHidden()?d:null,b&&tinymce.isIE&&(b.windowManager.bookmark=b.selection.getBookmark())),!wpLink.isMCE()&&document.selection&&(this.textarea.focus(),this.range=document.selection.createRange()),f.wrap.show(),f.backdrop.show(),wpLink.refresh())},isMCE:function(){return b&&!b.isHidden()},refresh:function(){g.search.refresh(),g.recent.refresh(),wpLink.isMCE()?wpLink.mceRefresh():wpLink.setDefaultValues(),f.url.focus()[0].select(),g.recent.ul.children().length||g.recent.ajax()},mceRefresh:function(){var a;(a=b.dom.getParent(b.selection.getNode(),"A"))?(f.url.val(b.dom.getAttrib(a,"href")),f.title.val(b.dom.getAttrib(a,"title")),f.openInNewTab.prop("checked","_blank"===b.dom.getAttrib(a,"target")),f.submit.val(wpLinkL10n.update)):wpLink.setDefaultValues()},close:function(){wpLink.isMCE()?b.focus():(wpLink.textarea.focus(),wpLink.range&&(wpLink.range.moveToBookmark(wpLink.range.getBookmark()),wpLink.range.select())),f.backdrop.hide(),f.wrap.hide()},getAttrs:function(){return{href:f.url.val(),title:f.title.val(),target:f.openInNewTab.prop("checked")?"_blank":""}},update:function(){wpLink.isMCE()?wpLink.mceUpdate():wpLink.htmlUpdate()},htmlUpdate:function(){var a,b,c,d,e,f,g,h=wpLink.textarea;h&&(a=wpLink.getAttrs(),a.href&&"http://"!=a.href&&(b='<a href="'+a.href+'"',a.title&&(f=a.title.replace(/</g,"<").replace(/>/g,">").replace(/"/g,"""),b+=' title="'+f+'"'),a.target&&(b+=' target="'+a.target+'"'),b+=">",document.selection&&wpLink.range?(h.focus(),wpLink.range.text=b+wpLink.range.text+"</a>",wpLink.range.moveToBookmark(wpLink.range.getBookmark()),wpLink.range.select(),wpLink.range=null):"undefined"!=typeof h.selectionStart&&(c=h.selectionStart,d=h.selectionEnd,g=h.value.substring(c,d),b=b+g+"</a>",e=c+b.length,c==d&&(e-="</a>".length),h.value=h.value.substring(0,c)+b+h.value.substring(d,h.value.length),h.selectionStart=h.selectionEnd=e),wpLink.close(),h.focus()))},mceUpdate:function(){var a,c=wpLink.getAttrs();return wpLink.close(),b.focus(),tinymce.isIE&&b.selection.moveToBookmark(b.windowManager.bookmark),a=b.dom.getParent(b.selection.getNode(),"a[href]"),c.href&&"http://"!=c.href?(a?b.dom.setAttribs(a,c):b.execCommand("mceInsertLink",!1,c),void b.selection.collapse()):void b.execCommand("unlink")},updateFields:function(a,b,c){f.url.val(b.children(".item-permalink").val()),f.title.val(b.hasClass("no-title")?"":b.children(".item-title").text()),c&&"click"==c.type&&f.url.focus()},setDefaultValues:function(){f.url.val("http://"),f.title.val(""),f.submit.val(wpLinkL10n.save)},searchInternalLinks:function(){var b,c=a(this),d=c.val();if(d.length>2){if(g.recent.hide(),g.search.show(),wpLink.lastSearch==d)return;wpLink.lastSearch=d,b=c.parent().find(".spinner").show(),g.search.change(d),g.search.ajax(function(){b.hide()})}else g.search.hide(),g.recent.show()},next:function(){g.search.next(),g.recent.next()},prev:function(){g.search.prev(),g.recent.prev()},keydown:function(b){var c,d,e=a.ui.keyCode;e.ESCAPE===b.keyCode?(wpLink.close(),b.stopImmediatePropagation()):e.TAB===b.keyCode&&(d=b.target.id,"wp-link-submit"!==d||b.shiftKey?"wp-link-close"===d&&b.shiftKey&&(f.submit.focus(),b.preventDefault()):(f.close.focus(),b.preventDefault())),(b.keyCode===e.UP||b.keyCode===e.DOWN)&&(c=b.keyCode===e.UP?"prev":"next",clearInterval(wpLink.keyInterval),wpLink[c](),wpLink.keyInterval=setInterval(wpLink[c],wpLink.keySensitivity),b.preventDefault())},keyup:function(b){var c=a.ui.keyCode;(b.which===c.UP||b.which===c.DOWN)&&(clearInterval(wpLink.keyInterval),b.preventDefault())},delayedCallback:function(a,b){var c,d,e,f;return b?(setTimeout(function(){return d?a.apply(f,e):void(c=!0)},b),function(){return c?a.apply(this,arguments):(e=arguments,f=this,void(d=!0))}):a},toggleInternalLinking:function(){var a=f.wrap.hasClass("search-panel-visible");f.wrap.toggleClass("search-panel-visible",!a),setUserSetting("wplink",a?"0":"1"),f[a?"url":"search"].focus()}},d=function(b,c){var d=this;this.element=b,this.ul=b.children("ul"),this.contentHeight=b.children("#link-selector-height"),this.waiting=b.find(".river-waiting"),this.change(c),this.refresh(),a("#wp-link .query-results, #wp-link #link-selector").scroll(function(){d.maybeLoad()}),b.on("click","li",function(b){d.select(a(this),b)})},a.extend(d.prototype,{refresh:function(){this.deselect(),this.visible=this.element.is(":visible")},show:function(){this.visible||(this.deselect(),this.element.show(),this.visible=!0)},hide:function(){this.element.hide(),this.visible=!1},select:function(a,b){var c,d,e,f;a.hasClass("unselectable")||a==this.selected||(this.deselect(),this.selected=a.addClass("selected"),c=a.outerHeight(),d=this.element.height(),e=a.position().top,f=this.element.scrollTop(),0>e?this.element.scrollTop(f+e):e+c>d&&this.element.scrollTop(f+e-d+c),this.element.trigger("river-select",[a,b,this]))},deselect:function(){this.selected&&this.selected.removeClass("selected"),this.selected=!1},prev:function(){if(this.visible){var a;this.selected&&(a=this.selected.prev("li"),a.length&&this.select(a))}},next:function(){if(this.visible){var b=this.selected?this.selected.next("li"):a("li:not(.unselectable):first",this.element);b.length&&this.select(b)}},ajax:function(a){var b=this,c=1==this.query.page?0:wpLink.minRiverAJAXDuration,d=wpLink.delayedCallback(function(c,d){b.process(c,d),a&&a(c,d)},c);this.query.ajax(d)},change:function(a){this.query&&this._search==a||(this._search=a,this.query=new e(a),this.element.scrollTop(0))},process:function(b,c){var d="",e=!0,f="",g=1==c.page;b?a.each(b,function(){f=e?"alternate":"",f+=this.title?"":" no-title",d+=f?'<li class="'+f+'">':"<li>",d+='<input type="hidden" class="item-permalink" value="'+this.permalink+'" />',d+='<span class="item-title">',d+=this.title?this.title:wpLinkL10n.noTitle,d+='</span><span class="item-info">'+this.info+"</span></li>",e=!e}):g&&(d+='<li class="unselectable"><span class="item-title"><em>'+wpLinkL10n.noMatchesFound+"</em></span></li>"),this.ul[g?"html":"append"](d)},maybeLoad:function(){var a=this,b=this.element,c=b.scrollTop()+b.height();!this.query.ready()||c<this.contentHeight.height()-wpLink.riverBottomThreshold||setTimeout(function(){var c=b.scrollTop(),d=c+b.height();!a.query.ready()||d<a.contentHeight.height()-wpLink.riverBottomThreshold||(a.waiting.show(),b.scrollTop(c+a.waiting.outerHeight()),a.ajax(function(){a.waiting.hide()}))},wpLink.timeToTriggerRiver)}}),e=function(a){this.page=1,this.allLoaded=!1,this.querying=!1,this.search=a},a.extend(e.prototype,{ready:function(){return!(this.querying||this.allLoaded)},ajax:function(b){var c=this,d={action:"wp-link-ajax",page:this.page,_ajax_linking_nonce:f.nonce.val()};this.search&&(d.search=this.search),this.querying=!0,a.post(ajaxurl,d,function(a){c.page++,c.querying=!1,c.allLoaded=!a,b(a,d)},"json")}}),a(document).ready(wpLink.init)}(jQuery); \ No newline at end of file +var wpLink;!function(a,b,c){function d(){return j||e.dom.getParent(e.selection.getNode(),"a[href]")}var e,f,g,h,i,j,k=/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i,l=/^(https?|ftp):\/\/[A-Z0-9.-]+\.[A-Z]{2,4}[^ "]*$/i,m={},n={},o="ontouchend"in document;wpLink={timeToTriggerRiver:150,minRiverAJAXDuration:200,riverBottomThreshold:5,keySensitivity:100,lastSearch:"",textarea:"",init:function(){m.wrap=a("#wp-link-wrap"),m.dialog=a("#wp-link"),m.backdrop=a("#wp-link-backdrop"),m.submit=a("#wp-link-submit"),m.close=a("#wp-link-close"),m.text=a("#wp-link-text"),m.url=a("#wp-link-url"),m.nonce=a("#_ajax_linking_nonce"),m.openInNewTab=a("#wp-link-target"),m.search=a("#wp-link-search"),n.search=new g(a("#search-results")),n.recent=new g(a("#most-recent-results")),n.elements=m.dialog.find(".query-results"),m.queryNotice=a("#query-notice-message"),m.queryNoticeTextDefault=m.queryNotice.find(".query-notice-default"),m.queryNoticeTextHint=m.queryNotice.find(".query-notice-hint"),m.dialog.keydown(wpLink.keydown),m.dialog.keyup(wpLink.keyup),m.submit.click(function(a){a.preventDefault(),wpLink.update()}),m.close.add(m.backdrop).add("#wp-link-cancel button").click(function(a){a.preventDefault(),wpLink.close()}),n.elements.on("river-select",wpLink.updateFields),m.search.on("focus.wplink",function(){m.queryNoticeTextDefault.hide(),m.queryNoticeTextHint.removeClass("screen-reader-text").show()}).on("blur.wplink",function(){m.queryNoticeTextDefault.show(),m.queryNoticeTextHint.addClass("screen-reader-text").hide()}),m.search.on("keyup input",function(){window.clearTimeout(f),f=window.setTimeout(function(){wpLink.searchInternalLinks()},500)}),m.url.on("paste",function(){setTimeout(wpLink.correctURL,0)}),m.url.on("blur",wpLink.correctURL)},correctURL:function(){var b=a.trim(m.url.val());b&&i!==b&&!/^(?:[a-z]+:|#|\?|\.|\/)/.test(b)&&(m.url.val("http://"+b),i=b)},open:function(b,c,d,f){var g,h=a(document.body);h.addClass("modal-open"),j=f,wpLink.range=null,b&&(window.wpActiveEditor=b),window.wpActiveEditor&&(this.textarea=a("#"+window.wpActiveEditor).get(0),"undefined"!=typeof window.tinymce&&(h.append(m.backdrop,m.wrap),g=window.tinymce.get(window.wpActiveEditor),e=g&&!g.isHidden()?g:null,e&&window.tinymce.isIE&&(e.windowManager.wplinkBookmark=e.selection.getBookmark())),!wpLink.isMCE()&&document.selection&&(this.textarea.focus(),this.range=document.selection.createRange()),m.wrap.show(),m.backdrop.show(),wpLink.refresh(c,d),a(document).trigger("wplink-open",m.wrap))},isMCE:function(){return e&&!e.isHidden()},refresh:function(a,b){var c="";n.search.refresh(),n.recent.refresh(),wpLink.isMCE()?wpLink.mceRefresh(a,b):(m.wrap.hasClass("has-text-field")||m.wrap.addClass("has-text-field"),document.selection?c=document.selection.createRange().text||b||"":"undefined"!=typeof this.textarea.selectionStart&&this.textarea.selectionStart!==this.textarea.selectionEnd&&(b=this.textarea.value.substring(this.textarea.selectionStart,this.textarea.selectionEnd)||b||""),m.text.val(b),wpLink.setDefaultValues()),o?m.url.focus().blur():window.setTimeout(function(){m.url[0].select(),m.url.focus()}),n.recent.ul.children().length||n.recent.ajax(),i=m.url.val().replace(/^http:\/\//,"")},hasSelectedText:function(a){var b,c,d,f=e.selection.getContent();if(/</.test(f)&&(!/^<a [^>]+>[^<]+<\/a>$/.test(f)||-1===f.indexOf("href=")))return!1;if(a){if(c=a.childNodes,0===c.length)return!1;for(d=c.length-1;d>=0;d--)if(b=c[d],3!=b.nodeType&&!window.tinymce.dom.BookmarkManager.isBookmarkNode(b))return!1}return!0},mceRefresh:function(c,f){var g,h,i=d(),j=this.hasSelectedText(i);i?(g=i.innerText||i.textContent,h=e.dom.getAttrib(i,"href"),a.trim(g)||(g=f||""),c&&(l.test(c)||k.test(c))&&(h=c),"_wp_link_placeholder"!==h?(m.url.val(h),m.openInNewTab.prop("checked","_blank"===e.dom.getAttrib(i,"target")),m.submit.val(b.update)):this.setDefaultValues(g),c&&c!==h?m.search.val(c):m.search.val(""),window.setTimeout(function(){wpLink.searchInternalLinks()})):(g=e.selection.getContent({format:"text"})||f||"",this.setDefaultValues(g)),j?(m.text.val(g),m.wrap.addClass("has-text-field")):(m.text.val(""),m.wrap.removeClass("has-text-field"))},close:function(b){a(document.body).removeClass("modal-open"),"noReset"!==b&&(wpLink.isMCE()?(e.plugins.wplink&&e.plugins.wplink.close(),e.focus()):(wpLink.textarea.focus(),wpLink.range&&(wpLink.range.moveToBookmark(wpLink.range.getBookmark()),wpLink.range.select()))),m.backdrop.hide(),m.wrap.hide(),i=!1,a(document).trigger("wplink-close",m.wrap)},getAttrs:function(){return wpLink.correctURL(),{href:a.trim(m.url.val()),target:m.openInNewTab.prop("checked")?"_blank":""}},buildHtml:function(a){var b='<a href="'+a.href+'"';return a.target&&(b+=' target="'+a.target+'"'),b+">"},update:function(){wpLink.isMCE()?wpLink.mceUpdate():wpLink.htmlUpdate()},htmlUpdate:function(){var a,d,e,f,g,h,i,j=wpLink.textarea;j&&(a=wpLink.getAttrs(),d=m.text.val(),a.href&&(e=wpLink.buildHtml(a),document.selection&&wpLink.range?(j.focus(),wpLink.range.text=e+(d||wpLink.range.text)+"</a>",wpLink.range.moveToBookmark(wpLink.range.getBookmark()),wpLink.range.select(),wpLink.range=null):"undefined"!=typeof j.selectionStart&&(f=j.selectionStart,g=j.selectionEnd,i=d||j.value.substring(f,g),e=e+i+"</a>",h=f+e.length,f!==g||i||(h-=4),j.value=j.value.substring(0,f)+e+j.value.substring(g,j.value.length),j.selectionStart=j.selectionEnd=h),wpLink.close(),j.focus(),c.a11y.speak(b.linkInserted)))},mceUpdate:function(){var a,f,g=wpLink.getAttrs();return window.tinymce.isIE&&e.windowManager.wplinkBookmark&&(e.selection.moveToBookmark(e.windowManager.wplinkBookmark),e.windowManager.wplinkBookmark=null),g.href?(a=d(),m.wrap.hasClass("has-text-field")&&(f=m.text.val()||g.href),a?(f&&("innerText"in a?a.innerText=f:a.textContent=f),g["data-wplink-edit"]=null,e.dom.setAttribs(a,g)):f?e.selection.setNode(e.dom.create("a",g,e.dom.encode(f))):e.execCommand("mceInsertLink",!1,g),wpLink.close("noReset"),e.focus(),e.nodeChanged(),void c.a11y.speak(b.linkInserted)):(e.execCommand("unlink"),void wpLink.close())},updateFields:function(a,b){m.url.val(b.children(".item-permalink").val())},getUrlFromSelection:function(b){return b||(this.isMCE()?b=e.selection.getContent({format:"text"}):document.selection&&wpLink.range?b=wpLink.range.text:"undefined"!=typeof this.textarea.selectionStart&&(b=this.textarea.value.substring(this.textarea.selectionStart,this.textarea.selectionEnd))),b=a.trim(b),b&&k.test(b)?"mailto:"+b:b&&l.test(b)?b.replace(/&|&#0?38;/gi,"&"):""},setDefaultValues:function(a){m.url.val(this.getUrlFromSelection(a)),m.search.val(""),wpLink.searchInternalLinks(),m.submit.val(b.save)},searchInternalLinks:function(){var a,b=m.search.val()||"";if(b.length>2){if(n.recent.hide(),n.search.show(),wpLink.lastSearch==b)return;wpLink.lastSearch=b,a=m.search.parent().find(".spinner").addClass("is-active"),n.search.change(b),n.search.ajax(function(){a.removeClass("is-active")})}else n.search.hide(),n.recent.show()},next:function(){n.search.next(),n.recent.next()},prev:function(){n.search.prev(),n.recent.prev()},keydown:function(a){var b,c;27===a.keyCode?(wpLink.close(),a.stopImmediatePropagation()):9===a.keyCode&&(c=a.target.id,"wp-link-submit"!==c||a.shiftKey?"wp-link-close"===c&&a.shiftKey&&(m.submit.focus(),a.preventDefault()):(m.close.focus(),a.preventDefault())),(38===a.keyCode||40===a.keyCode)&&(!document.activeElement||"link-title-field"!==document.activeElement.id&&"url-field"!==document.activeElement.id)&&(b=38===a.keyCode?"prev":"next",clearInterval(wpLink.keyInterval),wpLink[b](),wpLink.keyInterval=setInterval(wpLink[b],wpLink.keySensitivity),a.preventDefault())},keyup:function(a){(38===a.keyCode||40===a.keyCode)&&(clearInterval(wpLink.keyInterval),a.preventDefault())},delayedCallback:function(a,b){var c,d,e,f;return b?(setTimeout(function(){return d?a.apply(f,e):void(c=!0)},b),function(){return c?a.apply(this,arguments):(e=arguments,f=this,void(d=!0))}):a}},g=function(b,c){var d=this;this.element=b,this.ul=b.children("ul"),this.contentHeight=b.children("#link-selector-height"),this.waiting=b.find(".river-waiting"),this.change(c),this.refresh(),a("#wp-link .query-results, #wp-link #link-selector").scroll(function(){d.maybeLoad()}),b.on("click","li",function(b){d.select(a(this),b)})},a.extend(g.prototype,{refresh:function(){this.deselect(),this.visible=this.element.is(":visible")},show:function(){this.visible||(this.deselect(),this.element.show(),this.visible=!0)},hide:function(){this.element.hide(),this.visible=!1},select:function(a,b){var c,d,e,f;a.hasClass("unselectable")||a==this.selected||(this.deselect(),this.selected=a.addClass("selected"),c=a.outerHeight(),d=this.element.height(),e=a.position().top,f=this.element.scrollTop(),0>e?this.element.scrollTop(f+e):e+c>d&&this.element.scrollTop(f+e-d+c),this.element.trigger("river-select",[a,b,this]))},deselect:function(){this.selected&&this.selected.removeClass("selected"),this.selected=!1},prev:function(){if(this.visible){var a;this.selected&&(a=this.selected.prev("li"),a.length&&this.select(a))}},next:function(){if(this.visible){var b=this.selected?this.selected.next("li"):a("li:not(.unselectable):first",this.element);b.length&&this.select(b)}},ajax:function(a){var b=this,c=1==this.query.page?0:wpLink.minRiverAJAXDuration,d=wpLink.delayedCallback(function(c,d){b.process(c,d),a&&a(c,d)},c);this.query.ajax(d)},change:function(a){this.query&&this._search==a||(this._search=a,this.query=new h(a),this.element.scrollTop(0))},process:function(c,d){var e="",f=!0,g="",h=1==d.page;c?a.each(c,function(){g=f?"alternate":"",g+=this.title?"":" no-title",e+=g?'<li class="'+g+'">':"<li>",e+='<input type="hidden" class="item-permalink" value="'+this.permalink+'" />',e+='<span class="item-title">',e+=this.title?this.title:b.noTitle,e+='</span><span class="item-info">'+this.info+"</span></li>",f=!f}):h&&(e+='<li class="unselectable no-matches-found"><span class="item-title"><em>'+b.noMatchesFound+"</em></span></li>"),this.ul[h?"html":"append"](e)},maybeLoad:function(){var a=this,b=this.element,c=b.scrollTop()+b.height();!this.query.ready()||c<this.contentHeight.height()-wpLink.riverBottomThreshold||setTimeout(function(){var c=b.scrollTop(),d=c+b.height();!a.query.ready()||d<a.contentHeight.height()-wpLink.riverBottomThreshold||(a.waiting.addClass("is-active"),b.scrollTop(c+a.waiting.outerHeight()),a.ajax(function(){a.waiting.removeClass("is-active")}))},wpLink.timeToTriggerRiver)}}),h=function(a){this.page=1,this.allLoaded=!1,this.querying=!1,this.search=a},a.extend(h.prototype,{ready:function(){return!(this.querying||this.allLoaded)},ajax:function(b){var c=this,d={action:"wp-link-ajax",page:this.page,_ajax_linking_nonce:m.nonce.val()};this.search&&(d.search=this.search),this.querying=!0,a.post(window.ajaxurl,d,function(a){c.page++,c.querying=!1,c.allLoaded=!a,b(a,d)},"json")}}),a(document).ready(wpLink.init)}(jQuery,window.wpLinkL10n,window.wp); \ No newline at end of file diff --git a/wp-includes/kses.php b/wp-includes/kses.php index 9d8d6fe..b16a128 100644 --- a/wp-includes/kses.php +++ b/wp-includes/kses.php @@ -44,6 +44,10 @@ if ( ! defined( 'CUSTOM_TAGS' ) ) define( 'CUSTOM_TAGS', false ); +// Ensure that these variables are added to the global namespace +// (e.g. if using namespaces / autoload in the current PHP environment). +global $allowedposttags, $allowedtags, $allowedentitynames; + if ( ! CUSTOM_TAGS ) { /** * Kses global for default allowable HTML tags. @@ -84,7 +88,18 @@ if ( ! CUSTOM_TAGS ) { 'lang' => true, 'xml:lang' => true, ), + 'audio' => array( + 'autoplay' => true, + 'controls' => true, + 'loop' => true, + 'muted' => true, + 'preload' => true, + 'src' => true, + ), 'b' => array(), + 'bdo' => array( + 'dir' => true, + ), 'big' => array(), 'blockquote' => array( 'cite' => true, @@ -115,6 +130,14 @@ if ( ! CUSTOM_TAGS ) { 'valign' => true, 'width' => true, ), + 'colgroup' => array( + 'align' => true, + 'char' => true, + 'charoff' => true, + 'span' => true, + 'valign' => true, + 'width' => true, + ), 'del' => array( 'datetime' => true, ), @@ -360,6 +383,13 @@ if ( ! CUSTOM_TAGS ) { 'charoff' => true, 'valign' => true, ), + 'track' => array( + 'default' => true, + 'kind' => true, + 'label' => true, + 'src' => true, + 'srclang' => true, + ), 'tt' => array(), 'u' => array(), 'ul' => array( @@ -368,8 +398,20 @@ if ( ! CUSTOM_TAGS ) { 'ol' => array( 'start' => true, 'type' => true, + 'reversed' => true, ), 'var' => array(), + 'video' => array( + 'autoplay' => true, + 'controls' => true, + 'height' => true, + 'loop' => true, + 'muted' => true, + 'poster' => true, + 'preload' => true, + 'src' => true, + 'width' => true, + ), ); /** @@ -403,6 +445,7 @@ if ( ! CUSTOM_TAGS ) { 'q' => array( 'cite' => true, ), + 's' => array(), 'strike' => array(), 'strong' => array(), ); @@ -474,28 +517,108 @@ if ( ! CUSTOM_TAGS ) { * * @since 1.0.0 * - * @param string $string Content to filter through kses - * @param array $allowed_html List of allowed HTML elements - * @param array $allowed_protocols Optional. Allowed protocol in links. + * @param string $string Content to filter through kses + * @param array $allowed_html List of allowed HTML elements + * @param array $allowed_protocols Optional. Allowed protocol in links. * @return string Filtered content with only allowed HTML elements */ function wp_kses( $string, $allowed_html, $allowed_protocols = array() ) { if ( empty( $allowed_protocols ) ) $allowed_protocols = wp_allowed_protocols(); - $string = wp_kses_no_null($string); + $string = wp_kses_no_null( $string, array( 'slash_zero' => 'keep' ) ); $string = wp_kses_js_entities($string); $string = wp_kses_normalize_entities($string); $string = wp_kses_hook($string, $allowed_html, $allowed_protocols); // WP changed the order of these funcs and added args to wp_kses_hook return wp_kses_split($string, $allowed_html, $allowed_protocols); } +/** + * Filters one attribute only and ensures its value is allowed. + * + * This function has the advantage of being more secure than esc_attr() and can + * escape data in some situations where wp_kses() must strip the whole attribute. + * + * @since 4.2.3 + * + * @param string $string The 'whole' attribute, including name and value. + * @param string $element The element name to which the attribute belongs. + * @return string Filtered attribute. + */ +function wp_kses_one_attr( $string, $element ) { + $uris = array('xmlns', 'profile', 'href', 'src', 'cite', 'classid', 'codebase', 'data', 'usemap', 'longdesc', 'action'); + $allowed_html = wp_kses_allowed_html( 'post' ); + $allowed_protocols = wp_allowed_protocols(); + $string = wp_kses_no_null( $string, array( 'slash_zero' => 'keep' ) ); + $string = wp_kses_js_entities( $string ); + + // Preserve leading and trailing whitespace. + $matches = array(); + preg_match('/^\s*/', $string, $matches); + $lead = $matches[0]; + preg_match('/\s*$/', $string, $matches); + $trail = $matches[0]; + if ( empty( $trail ) ) { + $string = substr( $string, strlen( $lead ) ); + } else { + $string = substr( $string, strlen( $lead ), -strlen( $trail ) ); + } + + // Parse attribute name and value from input. + $split = preg_split( '/\s*=\s*/', $string, 2 ); + $name = $split[0]; + if ( count( $split ) == 2 ) { + $value = $split[1]; + + // Remove quotes surrounding $value. + // Also guarantee correct quoting in $string for this one attribute. + if ( '' == $value ) { + $quote = ''; + } else { + $quote = $value[0]; + } + if ( '"' == $quote || "'" == $quote ) { + if ( substr( $value, -1 ) != $quote ) { + return ''; + } + $value = substr( $value, 1, -1 ); + } else { + $quote = '"'; + } + + // Sanitize quotes, angle braces, and entities. + $value = esc_attr( $value ); + + // Sanitize URI values. + if ( in_array( strtolower( $name ), $uris ) ) { + $value = wp_kses_bad_protocol( $value, $allowed_protocols ); + } + + $string = "$name=$quote$value$quote"; + $vless = 'n'; + } else { + $value = ''; + $vless = 'y'; + } + + // Sanitize attribute by name. + wp_kses_attr_check( $name, $value, $string, $vless, $element, $allowed_html ); + + // Restore whitespace. + return $lead . $string . $trail; +} + /** * Return a list of allowed tags and attributes for a given context. * * @since 3.5.0 * - * @param string $context The context for which to retrieve tags. Allowed values are - * post | strip | data | entities or the name of a field filter such as pre_user_description. + * @global array $allowedposttags + * @global array $allowedtags + * @global array $allowedentitynames + * + * @param string $context The context for which to retrieve tags. + * Allowed values are post, strip, data,entities, or + * the name of a field filter such as pre_user_description. * @return array List of allowed tags and their allowed attributes. */ function wp_kses_allowed_html( $context = '' ) { @@ -518,22 +641,22 @@ function wp_kses_allowed_html( $context = '' ) { case 'post': /** This filter is documented in wp-includes/kses.php */ return apply_filters( 'wp_kses_allowed_html', $allowedposttags, $context ); - break; + case 'user_description': case 'pre_user_description': $tags = $allowedtags; $tags['a']['rel'] = true; /** This filter is documented in wp-includes/kses.php */ return apply_filters( 'wp_kses_allowed_html', $tags, $context ); - break; + case 'strip': /** This filter is documented in wp-includes/kses.php */ return apply_filters( 'wp_kses_allowed_html', array(), $context ); - break; + case 'entities': /** This filter is documented in wp-includes/kses.php */ return apply_filters( 'wp_kses_allowed_html', $allowedentitynames, $context); - break; + case 'data': default: /** This filter is documented in wp-includes/kses.php */ @@ -549,9 +672,9 @@ function wp_kses_allowed_html( $context = '' ) { * * @since 1.0.0 * - * @param string $string Content to filter through kses - * @param array $allowed_html List of allowed HTML elements - * @param array $allowed_protocols Allowed protocol in links + * @param string $string Content to filter through kses + * @param array $allowed_html List of allowed HTML elements + * @param array $allowed_protocols Allowed protocol in links * @return string Filtered content through 'pre_kses' hook */ function wp_kses_hook( $string, $allowed_html, $allowed_protocols ) { @@ -564,8 +687,7 @@ function wp_kses_hook( $string, $allowed_html, $allowed_protocols ) { * @param array $allowed_html Allowed HTML elements. * @param array $allowed_protocols Allowed protocol in links. */ - $string = apply_filters( 'pre_kses', $string, $allowed_html, $allowed_protocols ); - return $string; + return apply_filters( 'pre_kses', $string, $allowed_html, $allowed_protocols ); } /** @@ -586,9 +708,12 @@ function wp_kses_version() { * * @since 1.0.0 * - * @param string $string Content to filter - * @param array $allowed_html Allowed HTML elements - * @param array $allowed_protocols Allowed protocols to keep + * @global array $pass_allowed_html + * @global array $pass_allowed_protocols + * + * @param string $string Content to filter + * @param array $allowed_html Allowed HTML elements + * @param array $allowed_protocols Allowed protocols to keep * @return string Content with fixed HTML tags */ function wp_kses_split( $string, $allowed_html, $allowed_protocols ) { @@ -603,6 +728,11 @@ function wp_kses_split( $string, $allowed_html, $allowed_protocols ) { * * @since 3.1.0 * @access private + * + * @global array $pass_allowed_html + * @global array $pass_allowed_protocols + * + * @return string */ function _wp_kses_split_callback( $match ) { global $pass_allowed_html, $pass_allowed_protocols; @@ -623,11 +753,10 @@ function _wp_kses_split_callback( $match ) { * * @access private * @since 1.0.0 - * @uses wp_kses_attr() * - * @param string $string Content to filter - * @param array $allowed_html Allowed HTML elements - * @param array $allowed_protocols Allowed protocols to keep + * @param string $string Content to filter + * @param array $allowed_html Allowed HTML elements + * @param array $allowed_protocols Allowed protocols to keep * @return string Fixed HTML element */ function wp_kses_split2($string, $allowed_html, $allowed_protocols) { @@ -635,7 +764,7 @@ function wp_kses_split2($string, $allowed_html, $allowed_protocols) { if (substr($string, 0, 1) != '<') return '>'; - # It matched a ">" character + // It matched a ">" character if ( ''), '', $string ); @@ -649,11 +778,11 @@ function wp_kses_split2($string, $allowed_html, $allowed_protocols) { $string = preg_replace('/-$/', '', $string); return ""; } - # Allow HTML comments + // Allow HTML comments if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches)) return ''; - # It's seriously malformed + // It's seriously malformed $slash = trim($matches[1]); $elem = $matches[2]; @@ -664,11 +793,11 @@ function wp_kses_split2($string, $allowed_html, $allowed_protocols) { if ( ! isset($allowed_html[strtolower($elem)]) ) return ''; - # They are using a not allowed HTML element + // They are using a not allowed HTML element if ($slash != '') return "</$elem>"; - # No attributes are allowed for closing elements + // No attributes are allowed for closing elements return wp_kses_attr( $elem, $attrlist, $allowed_html, $allowed_protocols ); } @@ -684,76 +813,88 @@ function wp_kses_split2($string, $allowed_html, $allowed_protocols) { * * @since 1.0.0 * - * @param string $element HTML element/tag - * @param string $attr HTML attributes from HTML element to closing HTML element tag - * @param array $allowed_html Allowed HTML elements - * @param array $allowed_protocols Allowed protocols to keep + * @param string $element HTML element/tag + * @param string $attr HTML attributes from HTML element to closing HTML element tag + * @param array $allowed_html Allowed HTML elements + * @param array $allowed_protocols Allowed protocols to keep * @return string Sanitized HTML element */ function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) { - # Is there a closing XHTML slash at the end of the attributes? - if ( ! is_array( $allowed_html ) ) $allowed_html = wp_kses_allowed_html( $allowed_html ); + // Is there a closing XHTML slash at the end of the attributes? $xhtml_slash = ''; if (preg_match('%\s*/\s*$%', $attr)) $xhtml_slash = ' /'; - # Are any attributes allowed at all for this element? + // Are any attributes allowed at all for this element? if ( ! isset($allowed_html[strtolower($element)]) || count($allowed_html[strtolower($element)]) == 0 ) return "<$element$xhtml_slash>"; - # Split it + // Split it $attrarr = wp_kses_hair($attr, $allowed_protocols); - # Go through $attrarr, and save the allowed attributes for this element - # in $attr2 + // Go through $attrarr, and save the allowed attributes for this element + // in $attr2 $attr2 = ''; + foreach ( $attrarr as $arreach ) { + if ( wp_kses_attr_check( $arreach['name'], $arreach['value'], $arreach['whole'], $arreach['vless'], $element, $allowed_html ) ) { + $attr2 .= ' '.$arreach['whole']; + } + } - $allowed_attr = $allowed_html[strtolower($element)]; - foreach ($attrarr as $arreach) { - if ( ! isset( $allowed_attr[strtolower($arreach['name'])] ) ) - continue; # the attribute is not allowed + // Remove any "<" or ">" characters + $attr2 = preg_replace('/[<>]/', '', $attr2); - $current = $allowed_attr[strtolower($arreach['name'])]; - if ( $current == '' ) - continue; # the attribute is not allowed + return "<$element$attr2$xhtml_slash>"; +} - if ( strtolower( $arreach['name'] ) == 'style' ) { - $orig_value = $arreach['value']; - $value = safecss_filter_attr( $orig_value ); +/** + * Determine whether an attribute is allowed. + * + * @since 4.2.3 + * + * @param string $name The attribute name. Returns empty string when not allowed. + * @param string $value The attribute value. Returns a filtered value. + * @param string $whole The name=value input. Returns filtered input. + * @param string $vless 'y' when attribute like "enabled", otherwise 'n'. + * @param string $element The name of the element to which this attribute belongs. + * @param array $allowed_html The full list of allowed elements and attributes. + * @return bool Is the attribute allowed? + */ +function wp_kses_attr_check( &$name, &$value, &$whole, $vless, $element, $allowed_html ) { + $allowed_attr = $allowed_html[strtolower( $element )]; - if ( empty( $value ) ) - continue; + $name_low = strtolower( $name ); + if ( ! isset( $allowed_attr[$name_low] ) || '' == $allowed_attr[$name_low] ) { + $name = $value = $whole = ''; + return false; + } - $arreach['value'] = $value; - $arreach['whole'] = str_replace( $orig_value, $value, $arreach['whole'] ); + if ( 'style' == $name_low ) { + $new_value = safecss_filter_attr( $value ); + + if ( empty( $new_value ) ) { + $name = $value = $whole = ''; + return false; } - if ( ! is_array($current) ) { - $attr2 .= ' '.$arreach['whole']; - # there are no checks + $whole = str_replace( $value, $new_value, $whole ); + $value = $new_value; + } - } else { - # there are some checks - $ok = true; - foreach ($current as $currkey => $currval) { - if ( ! wp_kses_check_attr_val($arreach['value'], $arreach['vless'], $currkey, $currval) ) { - $ok = false; - break; - } + if ( is_array( $allowed_attr[$name_low] ) ) { + // there are some checks + foreach ( $allowed_attr[$name_low] as $currkey => $currval ) { + if ( ! wp_kses_check_attr_val( $value, $vless, $currkey, $currval ) ) { + $name = $value = $whole = ''; + return false; } + } + } - if ( $ok ) - $attr2 .= ' '.$arreach['whole']; # it passed them - } # if !is_array($current) - } # foreach - - # Remove any "<" or ">" characters - $attr2 = preg_replace('/[<>]/', '', $attr2); - - return "<$element$attr2$xhtml_slash>"; + return true; } /** @@ -769,8 +910,8 @@ function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) { * * @since 1.0.0 * - * @param string $attr Attribute list from HTML element to closing HTML element tag - * @param array $allowed_protocols Allowed protocols to keep + * @param string $attr Attribute list from HTML element to closing HTML element tag + * @param array $allowed_protocols Allowed protocols to keep * @return array List of attributes after parsing */ function wp_kses_hair($attr, $allowed_protocols) { @@ -779,13 +920,13 @@ function wp_kses_hair($attr, $allowed_protocols) { $attrname = ''; $uris = array('xmlns', 'profile', 'href', 'src', 'cite', 'classid', 'codebase', 'data', 'usemap', 'longdesc', 'action'); - # Loop through the whole attribute list + // Loop through the whole attribute list while (strlen($attr) != 0) { - $working = 0; # Was the last operation successful? + $working = 0; // Was the last operation successful? switch ($mode) { - case 0 : # attribute name, href for instance + case 0 : // attribute name, href for instance if ( preg_match('/^([-a-zA-Z:]+)/', $attr, $match ) ) { $attrname = $match[1]; @@ -795,9 +936,9 @@ function wp_kses_hair($attr, $allowed_protocols) { break; - case 1 : # equals sign or valueless ("selected") + case 1 : // equals sign or valueless ("selected") - if (preg_match('/^\s*=\s*/', $attr)) # equals sign + if (preg_match('/^\s*=\s*/', $attr)) // equals sign { $working = 1; $mode = 2; @@ -805,7 +946,7 @@ function wp_kses_hair($attr, $allowed_protocols) { break; } - if (preg_match('/^\s+/', $attr)) # valueless + if (preg_match('/^\s+/', $attr)) // valueless { $working = 1; $mode = 0; @@ -817,10 +958,10 @@ function wp_kses_hair($attr, $allowed_protocols) { break; - case 2 : # attribute value, a URL after href= for instance + case 2 : // attribute value, a URL after href= for instance if (preg_match('%^"([^"]*)"(\s+|/?$)%', $attr, $match)) - # "value" + // "value" { $thisval = $match[1]; if ( in_array(strtolower($attrname), $uris) ) @@ -836,7 +977,7 @@ function wp_kses_hair($attr, $allowed_protocols) { } if (preg_match("%^'([^']*)'(\s+|/?$)%", $attr, $match)) - # 'value' + // 'value' { $thisval = $match[1]; if ( in_array(strtolower($attrname), $uris) ) @@ -852,7 +993,7 @@ function wp_kses_hair($attr, $allowed_protocols) { } if (preg_match("%^([^\s\"']+)(\s+|/?$)%", $attr, $match)) - # value + // value { $thisval = $match[1]; if ( in_array(strtolower($attrname), $uris) ) @@ -861,30 +1002,133 @@ function wp_kses_hair($attr, $allowed_protocols) { if(false === array_key_exists($attrname, $attrarr)) { $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n'); } - # We add quotes to conform to W3C's HTML spec. + // We add quotes to conform to W3C's HTML spec. $working = 1; $mode = 0; $attr = preg_replace("%^[^\s\"']+(\s+|$)%", '', $attr); } break; - } # switch + } // switch - if ($working == 0) # not well formed, remove and try again + if ($working == 0) // not well formed, remove and try again { $attr = wp_kses_html_error($attr); $mode = 0; } - } # while + } // while if ($mode == 1 && false === array_key_exists($attrname, $attrarr)) - # special case, for when the attribute list ends with a valueless - # attribute like "selected" + // special case, for when the attribute list ends with a valueless + // attribute like "selected" $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y'); return $attrarr; } +/** + * Finds all attributes of an HTML element. + * + * Does not modify input. May return "evil" output. + * + * Based on wp_kses_split2() and wp_kses_attr() + * + * @since 4.2.3 + * + * @param string $element HTML element/tag + * @return array|bool List of attributes found in $element. Returns false on failure. + */ +function wp_kses_attr_parse( $element ) { + $valid = preg_match('%^(<\s*)(/\s*)?([a-zA-Z0-9]+\s*)([^>]*)(>?)$%', $element, $matches); + if ( 1 !== $valid ) { + return false; + } + + $begin = $matches[1]; + $slash = $matches[2]; + $elname = $matches[3]; + $attr = $matches[4]; + $end = $matches[5]; + + if ( '' !== $slash ) { + // Closing elements do not get parsed. + return false; + } + + // Is there a closing XHTML slash at the end of the attributes? + if ( 1 === preg_match( '%\s*/\s*$%', $attr, $matches ) ) { + $xhtml_slash = $matches[0]; + $attr = substr( $attr, 0, -strlen( $xhtml_slash ) ); + } else { + $xhtml_slash = ''; + } + + // Split it + $attrarr = wp_kses_hair_parse( $attr ); + if ( false === $attrarr ) { + return false; + } + + // Make sure all input is returned by adding front and back matter. + array_unshift( $attrarr, $begin . $slash . $elname ); + array_push( $attrarr, $xhtml_slash . $end ); + + return $attrarr; +} + +/** + * Builds an attribute list from string containing attributes. + * + * Does not modify input. May return "evil" output. + * In case of unexpected input, returns false instead of stripping things. + * + * Based on wp_kses_hair() but does not return a multi-dimensional array. + * + * @since 4.2.3 + * + * @param string $attr Attribute list from HTML element to closing HTML element tag + * @return array|bool List of attributes found in $attr. Returns false on failure. + */ +function wp_kses_hair_parse( $attr ) { + if ( '' === $attr ) { + return array(); + } + + $regex = + '(?:' + . '[-a-zA-Z:]+' // Attribute name. + . '|' + . '\[\[?[^\[\]]+\]\]?' // Shortcode in the name position implies unfiltered_html. + . ')' + . '(?:' // Attribute value. + . '\s*=\s*' // All values begin with '=' + . '(?:' + . '"[^"]*"' // Double-quoted + . '|' + . "'[^']*'" // Single-quoted + . '|' + . '[^\s"\']+' // Non-quoted + . '(?:\s|$)' // Must have a space + . ')' + . '|' + . '(?:\s|$)' // If attribute has no value, space is required. + . ')' + . '\s*'; // Trailing space is optional except as mentioned above. + + // Although it is possible to reduce this procedure to a single regexp, + // we must run that regexp twice to get exactly the expected result. + + $validation = "%^($regex)+$%"; + $extraction = "%$regex%"; + + if ( 1 === preg_match( $validation, $attr ) ) { + preg_match_all( $extraction, $attr, $attrarr ); + return $attrarr[0]; + } else { + return false; + } +} + /** * Performs different checks for attribute values. * @@ -893,10 +1137,10 @@ function wp_kses_hair($attr, $allowed_protocols) { * * @since 1.0.0 * - * @param string $value Attribute value - * @param string $vless Whether the value is valueless. Use 'y' or 'n' - * @param string $checkname What $checkvalue is checking for. - * @param mixed $checkvalue What constraint the value should pass + * @param string $value Attribute value + * @param string $vless Whether the value is valueless. Use 'y' or 'n' + * @param string $checkname What $checkvalue is checking for. + * @param mixed $checkvalue What constraint the value should pass * @return bool Whether check passes */ function wp_kses_check_attr_val($value, $vless, $checkname, $checkvalue) { @@ -904,28 +1148,28 @@ function wp_kses_check_attr_val($value, $vless, $checkname, $checkvalue) { switch (strtolower($checkname)) { case 'maxlen' : - # The maxlen check makes sure that the attribute value has a length not - # greater than the given value. This can be used to avoid Buffer Overflows - # in WWW clients and various Internet servers. + // The maxlen check makes sure that the attribute value has a length not + // greater than the given value. This can be used to avoid Buffer Overflows + // in WWW clients and various Internet servers. if (strlen($value) > $checkvalue) $ok = false; break; case 'minlen' : - # The minlen check makes sure that the attribute value has a length not - # smaller than the given value. + // The minlen check makes sure that the attribute value has a length not + // smaller than the given value. if (strlen($value) < $checkvalue) $ok = false; break; case 'maxval' : - # The maxval check does two things: it checks that the attribute value is - # an integer from 0 and up, without an excessive amount of zeroes or - # whitespace (to avoid Buffer Overflows). It also checks that the attribute - # value is not greater than the given value. - # This check can be used to avoid Denial of Service attacks. + // The maxval check does two things: it checks that the attribute value is + // an integer from 0 and up, without an excessive amount of zeroes or + // whitespace (to avoid Buffer Overflows). It also checks that the attribute + // value is not greater than the given value. + // This check can be used to avoid Denial of Service attacks. if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value)) $ok = false; @@ -934,8 +1178,8 @@ function wp_kses_check_attr_val($value, $vless, $checkname, $checkvalue) { break; case 'minval' : - # The minval check makes sure that the attribute value is a positive integer, - # and that it is not smaller than the given value. + // The minval check makes sure that the attribute value is a positive integer, + // and that it is not smaller than the given value. if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value)) $ok = false; @@ -944,15 +1188,15 @@ function wp_kses_check_attr_val($value, $vless, $checkname, $checkvalue) { break; case 'valueless' : - # The valueless check makes sure if the attribute has a value - # (like <a href="blah">) or not (<option selected>). If the given value - # is a "y" or a "Y", the attribute must not have a value. - # If the given value is an "n" or an "N", the attribute must have one. + // The valueless check makes sure if the attribute has a value + // (like <a href="blah">) or not (<option selected>). If the given value + // is a "y" or a "Y", the attribute must not have a value. + // If the given value is an "n" or an "N", the attribute must have one. if (strtolower($checkvalue) != $vless) $ok = false; break; - } # switch + } // switch return $ok; } @@ -967,8 +1211,8 @@ function wp_kses_check_attr_val($value, $vless, $checkname, $checkvalue) { * * @since 1.0.0 * - * @param string $string Content to filter bad protocols from - * @param array $allowed_protocols Allowed protocols to keep + * @param string $string Content to filter bad protocols from + * @param array $allowed_protocols Allowed protocols to keep * @return string Filtered content */ function wp_kses_bad_protocol($string, $allowed_protocols) { @@ -987,16 +1231,25 @@ function wp_kses_bad_protocol($string, $allowed_protocols) { } /** - * Removes any null characters in $string. + * Removes any invalid control characters in $string. + * + * Also removes any instance of the '\0' string. * * @since 1.0.0 * * @param string $string + * @param array $options Set 'slash_zero' => 'keep' when '\0' is allowed. Default is 'remove'. * @return string */ -function wp_kses_no_null($string) { - $string = preg_replace('/\0+/', '', $string); - $string = preg_replace('/(\\\\0)+/', '', $string); +function wp_kses_no_null( $string, $options = null ) { + if ( ! isset( $options['slash_zero'] ) ) { + $options = array( 'slash_zero' => 'remove' ); + } + + $string = preg_replace( '/[\x00-\x08\x0B\x0C\x0E-\x1F]/', '', $string ); + if ( 'remove' == $options['slash_zero'] ) { + $string = preg_replace( '/\\\\+0+/', '', $string ); + } return $string; } @@ -1035,8 +1288,8 @@ function wp_kses_array_lc($inarray) { foreach ( (array) $inval as $inkey2 => $inval2) { $outkey2 = strtolower($inkey2); $outarray[$outkey][$outkey2] = $inval2; - } # foreach $inval - } # foreach $inarray + } // foreach $inval + } // foreach $inarray return $outarray; } @@ -1076,7 +1329,7 @@ function wp_kses_html_error($string) { * * @since 1.0.0 * - * @param string $string Content to check for bad protocols + * @param string $string Content to check for bad protocols * @param string $allowed_protocols Allowed protocols * @return string Sanitized content */ @@ -1107,7 +1360,7 @@ function wp_kses_bad_protocol_once($string, $allowed_protocols, $count = 1 ) { * @access private * @since 1.0.0 * - * @param string $string URI scheme to check against the whitelist + * @param string $string URI scheme to check against the whitelist * @param string $allowed_protocols Allowed protocols * @return string Sanitized content */ @@ -1133,8 +1386,8 @@ function wp_kses_bad_protocol_once2( $string, $allowed_protocols ) { /** * Converts and fixes HTML entities. * - * This function normalizes HTML entities. It will convert "AT&T" to the correct - * "AT&T", ":" to ":", "&#XYZZY;" to "&#XYZZY;" and so on. + * This function normalizes HTML entities. It will convert `AT&T` to the correct + * `AT&T`, `:` to `:`, `&#XYZZY;` to `&#XYZZY;` and so on. * * @since 1.0.0 * @@ -1142,12 +1395,10 @@ function wp_kses_bad_protocol_once2( $string, $allowed_protocols ) { * @return string Content with normalized entities */ function wp_kses_normalize_entities($string) { - # Disarm all entities by converting & to & - + // Disarm all entities by converting & to & $string = str_replace('&', '&', $string); - # Change back the allowed entities in our entity whitelist - + // Change back the allowed entities in our entity whitelist $string = preg_replace_callback('/&([A-Za-z]{2,8}[0-9]{0,2});/', 'wp_kses_named_entities', $string); $string = preg_replace_callback('/&#(0*[0-9]{1,7});/', 'wp_kses_normalize_entities2', $string); $string = preg_replace_callback('/&#[Xx](0*[0-9A-Fa-f]{1,6});/', 'wp_kses_normalize_entities3', $string); @@ -1163,6 +1414,8 @@ function wp_kses_normalize_entities($string) { * * @since 3.0.0 * + * @global array $allowedentitynames + * * @param array $matches preg_replace_callback() matches array * @return string Correctly encoded entity */ @@ -1173,14 +1426,14 @@ function wp_kses_named_entities($matches) { return ''; $i = $matches[1]; - return ( ( ! in_array($i, $allowedentitynames) ) ? "&$i;" : "&$i;" ); + return ( ! in_array( $i, $allowedentitynames ) ) ? "&$i;" : "&$i;"; } /** * Callback for wp_kses_normalize_entities() regular expression. * - * This function helps wp_kses_normalize_entities() to only accept 16-bit values - * and nothing more for &#number; entities. + * This function helps {@see wp_kses_normalize_entities()} to only accept 16-bit + * values and nothing more for `&#number;` entities. * * @access private * @since 1.0.0 @@ -1219,7 +1472,7 @@ function wp_kses_normalize_entities3($matches) { return ''; $hexchars = $matches[1]; - return ( ( ! valid_unicode(hexdec($hexchars)) ) ? "&#x$hexchars;" : '&#x'.ltrim($hexchars,'0').';' ); + return ( ! valid_unicode( hexdec( $hexchars ) ) ) ? "&#x$hexchars;" : '&#x'.ltrim($hexchars,'0').';'; } /** @@ -1238,9 +1491,9 @@ function valid_unicode($i) { /** * Convert all entities to their character counterparts. * - * This function decodes numeric HTML entities (A and A). It doesn't do - * anything with other entities like ä, but we don't need them in the URL - * protocol whitelisting system anyway. + * This function decodes numeric HTML entities (`A` and `A`). + * It doesn't do anything with other entities like ä, but we don't + * need them in the URL protocol whitelisting system anyway. * * @since 1.0.0 * @@ -1278,7 +1531,6 @@ function _wp_kses_decode_entities_chr_hexdec( $match ) { * Sanitize content with allowed HTML Kses rules. * * @since 1.0.0 - * @uses $allowedtags * * @param string $data Content to filter, expected to be escaped with slashes * @return string Filtered content @@ -1291,13 +1543,12 @@ function wp_filter_kses( $data ) { * Sanitize content with allowed HTML Kses rules. * * @since 2.9.0 - * @uses $allowedtags * * @param string $data Content to filter, expected to not be escaped * @return string Filtered content */ function wp_kses_data( $data ) { - return wp_kses( $data , current_filter() ); + return wp_kses( $data, current_filter() ); } /** @@ -1311,8 +1562,8 @@ function wp_kses_data( $data ) { * @param string $data Post content to filter, expected to be escaped with slashes * @return string Filtered post content with allowed HTML tags and attributes intact. */ -function wp_filter_post_kses($data) { - return addslashes ( wp_kses( stripslashes( $data ), 'post' ) ); +function wp_filter_post_kses( $data ) { + return addslashes( wp_kses( stripslashes( $data ), 'post' ) ); } /** @@ -1326,8 +1577,23 @@ function wp_filter_post_kses($data) { * @param string $data Post content to filter * @return string Filtered post content with allowed HTML tags and attributes intact. */ -function wp_kses_post($data) { - return wp_kses( $data , 'post' ); +function wp_kses_post( $data ) { + return wp_kses( $data, 'post' ); +} + +/** + * Navigates through an array, object, or scalar, and sanitizes content for + * allowed HTML tags for post content. + * + * @since 4.4.2 + * + * @see map_deep() + * + * @param mixed $data The array, object, or scalar value to inspect. + * @return mixed The filtered content. + */ +function wp_kses_post_deep( $data ) { + return map_deep( $data, 'wp_kses_post' ); } /** @@ -1339,7 +1605,7 @@ function wp_kses_post($data) { * @return string Filtered content without any HTML */ function wp_filter_nohtml_kses( $data ) { - return addslashes ( wp_kses( stripslashes( $data ), 'strip' ) ); + return addslashes( wp_kses( stripslashes( $data ), 'strip' ) ); } /** @@ -1352,7 +1618,6 @@ function wp_filter_nohtml_kses( $data ) { * 'excerpt_save_pre', and 'content_filtered_save_pre' hooks. * * @since 2.0.0 - * @uses add_filter() See description for what functions are added to what hooks. */ function kses_init_filters() { // Normal filtering @@ -1407,25 +1672,24 @@ function kses_remove_filters() { * to have Kses filter the content. If the user does not have unfiltered_html * capability, then Kses filters are added. * - * @uses kses_remove_filters() Removes the Kses filters - * @uses kses_init_filters() Adds the Kses filters back if the user - * does not have unfiltered HTML capability. * @since 2.0.0 */ function kses_init() { kses_remove_filters(); - if (current_user_can('unfiltered_html') == false) + if ( ! current_user_can( 'unfiltered_html' ) ) { kses_init_filters(); + } } -add_action('init', 'kses_init'); -add_action('set_current_user', 'kses_init'); - /** * Inline CSS filter * * @since 2.8.1 + * + * @param string $css A string of CSS rules. + * @param string $deprecated Not used. + * @return string Filtered string of CSS rules. */ function safecss_filter_attr( $css, $deprecated = '' ) { if ( !empty( $deprecated ) ) @@ -1434,7 +1698,7 @@ function safecss_filter_attr( $css, $deprecated = '' ) { $css = wp_kses_no_null($css); $css = str_replace(array("\n","\r","\t"), '', $css); - if ( preg_match( '%[\\(&=}]|/\*%', $css ) ) // remove any inline css containing \ ( & } = or comments + if ( preg_match( '%[\\\\(&=}]|/\*%', $css ) ) // remove any inline css containing \ ( & } = or comments return ''; $css_array = explode( ';', trim( $css ) ); @@ -1453,10 +1717,10 @@ function safecss_filter_attr( $css, $deprecated = '' ) { 'border-right-style', 'border-right-width', 'border-spacing', 'border-style', 'border-top', 'border-top-color', 'border-top-style', 'border-top-width', 'border-width', 'caption-side', 'clear', 'cursor', 'direction', 'font', 'font-family', 'font-size', 'font-style', - 'font-variant', 'font-weight', 'height', 'letter-spacing', 'line-height', 'margin-bottom', + 'font-variant', 'font-weight', 'height', 'min-height','max-height' , 'letter-spacing', 'line-height', 'margin-bottom', 'margin-left', 'margin-right', 'margin-top', 'overflow', 'padding', 'padding-bottom', 'padding-left', 'padding-right', 'padding-top', 'text-decoration', 'text-indent', 'vertical-align', - 'width' ) ); + 'width', 'min-width', 'max-width' ) ); if ( empty($allowed_attr) ) return $css; diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php index 541cb15..bfc6598 100644 --- a/wp-includes/l10n.php +++ b/wp-includes/l10n.php @@ -1,32 +1,36 @@ <?php /** - * WordPress Translation API + * Core Translation API * * @package WordPress * @subpackage i18n + * @since 1.2.0 */ /** - * Get the current locale. + * Retrieves the current locale. * - * If the locale is set, then it will filter the locale in the 'locale' filter - * hook and return the value. + * If the locale is set, then it will filter the locale in the {@see 'locale'} + * filter hook and return the value. * * If the locale is not set already, then the WPLANG constant is used if it is - * defined. Then it is filtered through the 'locale' filter hook and the value - * for the locale global set and the locale is returned. + * defined. Then it is filtered through the {@see 'locale'} filter hook and + * the value for the locale global set and the locale is returned. * * The process to get the locale should only be done once, but the locale will - * always be filtered using the 'locale' hook. + * always be filtered using the {@see 'locale'} hook. * * @since 1.5.0 * - * @return string The locale of the blog or from the 'locale' hook. + * @global string $locale + * @global string $wp_local_package + * + * @return string The locale of the blog or from the {@see 'locale'} hook. */ function get_locale() { - global $locale; + global $locale, $wp_local_package; - if ( isset( $locale ) ) + if ( isset( $locale ) ) { /** * Filter WordPress install's locale ID. * @@ -35,23 +39,37 @@ function get_locale() { * @param string $locale The locale ID. */ return apply_filters( 'locale', $locale ); + } - // WPLANG is defined in wp-config. - if ( defined( 'WPLANG' ) ) + if ( isset( $wp_local_package ) ) { + $locale = $wp_local_package; + } + + // WPLANG was defined in wp-config. + if ( defined( 'WPLANG' ) ) { $locale = WPLANG; + } // If multisite, check options. if ( is_multisite() ) { // Don't check blog option when installing. - if ( defined( 'WP_INSTALLING' ) || ( false === $ms_locale = get_option( 'WPLANG' ) ) ) - $ms_locale = get_site_option('WPLANG'); + if ( wp_installing() || ( false === $ms_locale = get_option( 'WPLANG' ) ) ) { + $ms_locale = get_site_option( 'WPLANG' ); + } - if ( $ms_locale !== false ) + if ( $ms_locale !== false ) { $locale = $ms_locale; + } + } else { + $db_locale = get_option( 'WPLANG' ); + if ( $db_locale !== false ) { + $locale = $db_locale; + } } - if ( empty( $locale ) ) + if ( empty( $locale ) ) { $locale = 'en_US'; + } /** This filter is documented in wp-includes/l10n.php */ return apply_filters( 'locale', $locale ); @@ -62,17 +80,19 @@ function get_locale() { * * If there is no translation, or the text domain isn't loaded, the original text is returned. * - * <strong>Note:</strong> Don't use translate() directly, use __() or related functions. + * *Note:* Don't use translate() directly, use __() or related functions. * * @since 2.2.0 * * @param string $text Text to translate. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. + * Default 'default'. * @return string Translated text */ function translate( $text, $domain = 'default' ) { $translations = get_translations_for_domain( $domain ); $translations = $translations->translate( $text ); + /** * Filter text with its translation. * @@ -98,10 +118,11 @@ function translate( $text, $domain = 'default' ) { */ function before_last_bar( $string ) { $last_bar = strrpos( $string, '|' ); - if ( false == $last_bar ) + if ( false === $last_bar ) { return $string; - else + } else { return substr( $string, 0, $last_bar ); + } } /** @@ -110,11 +131,14 @@ function before_last_bar( $string ) { * If there is no translation, or the text domain isn't loaded the original * text is returned. * + * *Note:* Don't use translate_with_gettext_context() directly, use _x() or related functions. + * * @since 2.8.0 * * @param string $text Text to translate. * @param string $context Context information for the translators. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. + * Default 'default'. * @return string Translated text on success, original text on failure. */ function translate_with_gettext_context( $text, $context, $domain = 'default' ) { @@ -134,13 +158,15 @@ function translate_with_gettext_context( $text, $context, $domain = 'default' ) } /** - * Retrieve the translation of $text. If there is no translation, - * or the text domain isn't loaded, the original text is returned. + * Retrieve the translation of $text. + * + * If there is no translation, or the text domain isn't loaded, the original text is returned. * * @since 2.1.0 * * @param string $text Text to translate. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. + * Default 'default'. * @return string Translated text. */ function __( $text, $domain = 'default' ) { @@ -156,6 +182,7 @@ function __( $text, $domain = 'default' ) { * * @param string $text Text to translate. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. + * Default 'default'. * @return string Translated text on success, original text on failure. */ function esc_attr__( $text, $domain = 'default' ) { @@ -171,6 +198,7 @@ function esc_attr__( $text, $domain = 'default' ) { * * @param string $text Text to translate. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. + * Default 'default'. * @return string Translated text */ function esc_html__( $text, $domain = 'default' ) { @@ -184,6 +212,7 @@ function esc_html__( $text, $domain = 'default' ) { * * @param string $text Text to translate. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. + * Default 'default'. */ function _e( $text, $domain = 'default' ) { echo translate( $text, $domain ); @@ -196,6 +225,7 @@ function _e( $text, $domain = 'default' ) { * * @param string $text Text to translate. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. + * Default 'default'. */ function esc_attr_e( $text, $domain = 'default' ) { echo esc_attr( translate( $text, $domain ) ); @@ -208,6 +238,7 @@ function esc_attr_e( $text, $domain = 'default' ) { * * @param string $text Text to translate. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. + * Default 'default'. */ function esc_html_e( $text, $domain = 'default' ) { echo esc_html( translate( $text, $domain ) ); @@ -227,6 +258,7 @@ function esc_html_e( $text, $domain = 'default' ) { * @param string $text Text to translate. * @param string $context Context information for the translators. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. + * Default 'default'. * @return string Translated context string without pipe. */ function _x( $text, $context, $domain = 'default' ) { @@ -241,6 +273,7 @@ function _x( $text, $context, $domain = 'default' ) { * @param string $text Text to translate. * @param string $context Context information for the translators. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. + * Default 'default'. * @return string Translated context string without pipe. */ function _ex( $text, $context, $domain = 'default' ) { @@ -255,6 +288,7 @@ function _ex( $text, $context, $domain = 'default' ) { * @param string $text Text to translate. * @param string $context Context information for the translators. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. + * Default 'default'. * @return string Translated text */ function esc_attr_x( $text, $context, $domain = 'default' ) { @@ -269,6 +303,7 @@ function esc_attr_x( $text, $context, $domain = 'default' ) { * @param string $text Text to translate. * @param string $context Context information for the translators. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. + * Default 'default'. * @return string Translated text. */ function esc_html_x( $text, $context, $domain = 'default' ) { @@ -276,67 +311,77 @@ function esc_html_x( $text, $context, $domain = 'default' ) { } /** - * Retrieve the plural or single form based on the supplied amount. + * Translates and retrieves the singular or plural form based on the supplied number. * - * If the text domain is not set in the $l10n list, then a comparison will be made - * and either $plural or $single parameters returned. + * Used when you want to use the appropriate form of a string based on whether a + * number is singular or plural. * - * If the text domain does exist, then the parameters $single, $plural, and $number - * will first be passed to the text domain's ngettext method. Then it will be passed - * to the 'ngettext' filter hook along with the same parameters. The expected - * type will be a string. + * Example: + * + * $people = sprintf( _n( '%s person', '%s people', $count, 'text-domain' ), number_format_i18n( $count ) ); * * @since 2.8.0 * - * @param string $single The text that will be used if $number is 1. - * @param string $plural The text that will be used if $number is not 1. - * @param int $number The number to compare against to use either $single or $plural. + * @param string $single The text to be used if the number is singular. + * @param string $plural The text to be used if the number is plural. + * @param int $number The number to compare against to use either the singular or plural form. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. - * @return string Either $single or $plural translated text. + * Default 'default'. + * @return string The translated singular or plural form. */ function _n( $single, $plural, $number, $domain = 'default' ) { $translations = get_translations_for_domain( $domain ); $translation = $translations->translate_plural( $single, $plural, $number ); + /** - * Filter text with its translation when plural option is available. + * Filter the singular or plural form of a string. * * @since 2.2.0 * * @param string $translation Translated text. - * @param string $single The text that will be used if $number is 1. - * @param string $plural The text that will be used if $number is not 1. - * @param string $number The number to compare against to use either $single or $plural. + * @param string $single The text to be used if the number is singular. + * @param string $plural The text to be used if the number is plural. + * @param string $number The number to compare against to use either the singular or plural form. * @param string $domain Text domain. Unique identifier for retrieving translated strings. */ return apply_filters( 'ngettext', $translation, $single, $plural, $number, $domain ); } /** - * Retrieve the plural or single form based on the supplied amount with gettext context. + * Translates and retrieves the singular or plural form based on the supplied number, with gettext context. + * + * This is a hybrid of _n() and _x(). It supports context and plurals. * - * This is a hybrid of _n() and _x(). It supports contexts and plurals. + * Used when you want to use the appropriate form of a string with context based on whether a + * number is singular or plural. + * + * Example: + * + * $people = sprintf( _n( '%s person', '%s people', $count, 'context', 'text-domain' ), number_format_i18n( $count ) ); * * @since 2.8.0 * - * @param string $single The text that will be used if $number is 1. - * @param string $plural The text that will be used if $number is not 1. - * @param int $number The number to compare against to use either $single or $plural. + * @param string $single The text to be used if the number is singular. + * @param string $plural The text to be used if the number is plural. + * @param int $number The number to compare against to use either the singular or plural form. * @param string $context Context information for the translators. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. - * @return string Either $single or $plural translated text with context. + * Default 'default'. + * @return string The translated singular or plural form. */ function _nx($single, $plural, $number, $context, $domain = 'default') { $translations = get_translations_for_domain( $domain ); $translation = $translations->translate_plural( $single, $plural, $number, $context ); + /** - * Filter text with its translation while plural option and context are available. + * Filter the singular or plural form of a string with gettext context. * * @since 2.8.0 * * @param string $translation Translated text. - * @param string $single The text that will be used if $number is 1. - * @param string $plural The text that will be used if $number is not 1. - * @param string $number The number to compare against to use either $single or $plural. + * @param string $single The text to be used if the number is singular. + * @param string $plural The text to be used if the number is plural. + * @param string $number The number to compare against to use either the singular or plural form. * @param string $context Context information for the translators. * @param string $domain Text domain. Unique identifier for retrieving translated strings. */ @@ -344,51 +389,103 @@ function _nx($single, $plural, $number, $context, $domain = 'default') { } /** - * Register plural strings in POT file, but don't translate them. + * Registers plural strings in POT file, but does not translate them. * * Used when you want to keep structures with translatable plural - * strings and use them later. + * strings and use them later when the number is known. * * Example: - * <code> - * $messages = array( - * 'post' => _n_noop('%s post', '%s posts'), - * 'page' => _n_noop('%s pages', '%s pages') - * ); - * ... - * $message = $messages[$type]; - * $usable_text = sprintf( translate_nooped_plural( $message, $count ), $count ); - * </code> + * + * $messages = array( + * 'post' => _n_noop( '%s post', '%s posts', 'text-domain' ), + * 'page' => _n_noop( '%s pages', '%s pages', 'text-domain' ), + * ); + * ... + * $message = $messages[ $type ]; + * $usable_text = sprintf( translate_nooped_plural( $message, $count, 'text-domain' ), number_format_i18n( $count ) ); * * @since 2.5.0 * - * @param string $singular Single form to be i18ned. - * @param string $plural Plural form to be i18ned. + * @param string $singular Singular form to be localized. + * @param string $plural Plural form to be localized. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. - * @return array array($singular, $plural) + * Default null. + * @return array { + * Array of translation information for the strings. + * + * @type string $0 Singular form to be localized. No longer used. + * @type string $1 Plural form to be localized. No longer used. + * @type string $singular Singular form to be localized. + * @type string $plural Plural form to be localized. + * @type null $context Context information for the translators. + * @type string $domain Text domain. + * } */ function _n_noop( $singular, $plural, $domain = null ) { return array( 0 => $singular, 1 => $plural, 'singular' => $singular, 'plural' => $plural, 'context' => null, 'domain' => $domain ); } /** - * Register plural strings with context in POT file, but don't translate them. + * Registers plural strings with gettext context in POT file, but does not translate them. + * + * Used when you want to keep structures with translatable plural + * strings and use them later when the number is known. + * + * Example: + * + * $messages = array( + * 'post' => _n_noop( '%s post', '%s posts', 'context', 'text-domain' ), + * 'page' => _n_noop( '%s pages', '%s pages', 'context', 'text-domain' ), + * ); + * ... + * $message = $messages[ $type ]; + * $usable_text = sprintf( translate_nooped_plural( $message, $count, 'text-domain' ), number_format_i18n( $count ) ); * * @since 2.8.0 + * + * @param string $singular Singular form to be localized. + * @param string $plural Plural form to be localized. + * @param string $context Context information for the translators. + * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. + * Default null. + * @return array { + * Array of translation information for the strings. + * + * @type string $0 Singular form to be localized. No longer used. + * @type string $1 Plural form to be localized. No longer used. + * @type string $2 Context information for the translators. No longer used. + * @type string $singular Singular form to be localized. + * @type string $plural Plural form to be localized. + * @type string $context Context information for the translators. + * @type string $domain Text domain. + * } */ function _nx_noop( $singular, $plural, $context, $domain = null ) { return array( 0 => $singular, 1 => $plural, 2 => $context, 'singular' => $singular, 'plural' => $plural, 'context' => $context, 'domain' => $domain ); } /** - * Translate the result of _n_noop() or _nx_noop(). + * Translates and retrieves the singular or plural form of a string that's been registered + * with _n_noop() or _nx_noop(). + * + * Used when you want to use a translatable plural string once the number is known. + * + * Example: + * + * $messages = array( + * 'post' => _n_noop( '%s post', '%s posts', 'text-domain' ), + * 'page' => _n_noop( '%s pages', '%s pages', 'text-domain' ), + * ); + * ... + * $message = $messages[ $type ]; + * $usable_text = sprintf( translate_nooped_plural( $message, $count, 'text-domain' ), number_format_i18n( $count ) ); * * @since 3.1.0 * - * @param array $nooped_plural Array with singular, plural and context keys, usually the result of _n_noop() or _nx_noop() - * @param int $count Number of objects + * @param array $nooped_plural Array with singular, plural, and context keys, usually the result of _n_noop() or _nx_noop(). + * @param int $count Number of objects. * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. If $nooped_plural contains - * a text domain passed to _n_noop() or _nx_noop(), it will override this value. + * a text domain passed to _n_noop() or _nx_noop(), it will override this value. Default 'default'. * @return string Either $single or $plural translated text. */ function translate_nooped_plural( $nooped_plural, $count, $domain = 'default' ) { @@ -412,6 +509,8 @@ function translate_nooped_plural( $nooped_plural, $count, $domain = 'default' ) * * @since 1.5.0 * + * @global array $l10n + * * @param string $domain Text domain. Unique identifier for retrieving translated strings. * @param string $mofile Path to the .mo file. * @return bool True on success, false on failure. @@ -472,6 +571,8 @@ function load_textdomain( $domain, $mofile ) { * * @since 3.0.0 * + * @global array $l10n + * * @param string $domain Text domain. Unique identifier for retrieving translated strings. * @return bool Whether textdomain was unloaded. */ @@ -517,23 +618,33 @@ function unload_textdomain( $domain ) { * @see load_textdomain() * * @since 1.5.0 + * + * @param string $locale Optional. Locale to load. Default is the value of {@see get_locale()}. + * @return bool Whether the textdomain was loaded. */ -function load_default_textdomain() { - $locale = get_locale(); +function load_default_textdomain( $locale = null ) { + if ( null === $locale ) { + $locale = get_locale(); + } + + // Unload previously loaded strings so we can switch translations. + unload_textdomain( 'default' ); - load_textdomain( 'default', WP_LANG_DIR . "/$locale.mo" ); + $return = load_textdomain( 'default', WP_LANG_DIR . "/$locale.mo" ); if ( ( is_multisite() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK ) ) && ! file_exists( WP_LANG_DIR . "/admin-$locale.mo" ) ) { load_textdomain( 'default', WP_LANG_DIR . "/ms-$locale.mo" ); - return; + return $return; } - if ( is_admin() || ( defined( 'WP_REPAIRING' ) && WP_REPAIRING ) ) + if ( is_admin() || wp_installing() || ( defined( 'WP_REPAIRING' ) && WP_REPAIRING ) ) { load_textdomain( 'default', WP_LANG_DIR . "/admin-$locale.mo" ); + } if ( is_network_admin() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK ) ) load_textdomain( 'default', WP_LANG_DIR . "/admin-network-$locale.mo" ); + return $return; } /** @@ -548,6 +659,8 @@ function load_default_textdomain() { * @param string $domain Unique identifier for retrieving translated strings * @param string $deprecated Use the $plugin_rel_path parameter instead. * @param string $plugin_rel_path Optional. Relative path to WP_PLUGIN_DIR where the .mo file resides. + * Default false. + * @return bool True when textdomain is successfully loaded, false otherwise. */ function load_plugin_textdomain( $domain, $deprecated = false, $plugin_rel_path = false ) { $locale = get_locale(); @@ -563,7 +676,7 @@ function load_plugin_textdomain( $domain, $deprecated = false, $plugin_rel_path if ( false !== $plugin_rel_path ) { $path = WP_PLUGIN_DIR . '/' . trim( $plugin_rel_path, '/' ); - } else if ( false !== $deprecated ) { + } elseif ( false !== $deprecated ) { _deprecated_argument( __FUNCTION__, '2.7' ); $path = ABSPATH . trim( $deprecated, '/' ); } else { @@ -636,7 +749,7 @@ function load_theme_textdomain( $domain, $path = false ) { $path = get_template_directory(); // Load the textdomain according to the theme - $mofile = "{$path}/{$locale}.mo"; + $mofile = untrailingslashit( $path ) . "/{$locale}.mo"; if ( $loaded = load_textdomain( $domain, $mofile ) ) return $loaded; @@ -656,6 +769,8 @@ function load_theme_textdomain( $domain, $path = false ) { * @since 2.9.0 * * @param string $domain Text domain. Unique identifier for retrieving translated strings. + * @param string $path Optional. Path to the directory containing the .mo file. + * Default false. * @return bool True when the theme textdomain is successfully loaded, false otherwise. */ function load_child_theme_textdomain( $domain, $path = false ) { @@ -669,27 +784,40 @@ function load_child_theme_textdomain( $domain, $path = false ) { * * If there isn't one, returns empty Translations instance. * + * @since 2.8.0 + * + * @global array $l10n + * * @param string $domain Text domain. Unique identifier for retrieving translated strings. - * @return Translations A Translations instance. + * @return NOOP_Translations A Translations instance. */ function get_translations_for_domain( $domain ) { global $l10n; - if ( !isset( $l10n[$domain] ) ) { - $l10n[$domain] = new NOOP_Translations; + if ( isset( $l10n[ $domain ] ) ) { + return $l10n[ $domain ]; + } + + static $noop_translations = null; + if ( null === $noop_translations ) { + $noop_translations = new NOOP_Translations; } - return $l10n[$domain]; + + return $noop_translations; } /** * Whether there are translations for the text domain. * * @since 3.0.0 + * + * @global array $l10n + * * @param string $domain Text domain. Unique identifier for retrieving translated strings. * @return bool Whether there are translations. */ function is_textdomain_loaded( $domain ) { global $l10n; - return isset( $l10n[$domain] ); + return isset( $l10n[ $domain ] ); } /** @@ -727,11 +855,15 @@ function translate_user_role( $name ) { function get_available_languages( $dir = null ) { $languages = array(); - foreach( (array)glob( ( is_null( $dir) ? WP_LANG_DIR : $dir ) . '/*.mo' ) as $lang_file ) { - $lang_file = basename($lang_file, '.mo'); - if ( 0 !== strpos( $lang_file, 'continents-cities' ) && 0 !== strpos( $lang_file, 'ms-' ) && - 0 !== strpos( $lang_file, 'admin-' )) - $languages[] = $lang_file; + $lang_files = glob( ( is_null( $dir) ? WP_LANG_DIR : $dir ) . '/*.mo' ); + if ( $lang_files ) { + foreach ( $lang_files as $lang_file ) { + $lang_file = basename( $lang_file, '.mo' ); + if ( 0 !== strpos( $lang_file, 'continents-cities' ) && 0 !== strpos( $lang_file, 'ms-' ) && + 0 !== strpos( $lang_file, 'admin-' ) ) { + $languages[] = $lang_file; + } + } } return $languages; @@ -767,16 +899,23 @@ function wp_get_installed_translations( $type ) { $language_data = array(); foreach ( $files as $file ) { - if ( '.' === $file[0] || is_dir( $file ) ) + if ( '.' === $file[0] || is_dir( WP_LANG_DIR . "$dir/$file" ) ) { + continue; + } + if ( substr( $file, -3 ) !== '.po' ) { continue; - if ( substr( $file, -3 ) !== '.po' ) + } + if ( ! preg_match( '/(?:(.+)-)?([a-z]{2,3}(?:_[A-Z]{2})?(?:_[a-z0-9]+)?).po/', $file, $match ) ) { continue; - if ( ! preg_match( '/(?:(.+)-)?([A-Za-z_]{2,6}).po/', $file, $match ) ) + } + if ( ! in_array( substr( $file, 0, -3 ) . '.mo', $files ) ) { continue; + } list( , $textdomain, $language ) = $match; - if ( '' === $textdomain ) + if ( '' === $textdomain ) { $textdomain = 'default'; + } $language_data[ $textdomain ][ $language ] = wp_get_pomo_file_data( WP_LANG_DIR . "$dir/$file" ); } return $language_data; @@ -803,3 +942,122 @@ function wp_get_pomo_file_data( $po_file ) { } return $headers; } + +/** + * Language selector. + * + * @since 4.0.0 + * @since 4.3.0 Introduced the `echo` argument. + * + * @see get_available_languages() + * @see wp_get_available_translations() + * + * @param string|array $args { + * Optional. Array or string of arguments for outputting the language selector. + * + * @type string $id ID attribute of the select element. Default empty. + * @type string $name Name attribute of the select element. Default empty. + * @type array $languages List of installed languages, contain only the locales. + * Default empty array. + * @type array $translations List of available translations. Default result of + * wp_get_available_translations(). + * @type string $selected Language which should be selected. Default empty. + * @type bool|int $echo Whether to echo the generated markup. Accepts 0, 1, or their + * boolean equivalents. Default 1. + * @type bool $show_available_translations Whether to show available translations. Default true. + * } + * @return string HTML content + */ +function wp_dropdown_languages( $args = array() ) { + + $args = wp_parse_args( $args, array( + 'id' => '', + 'name' => '', + 'languages' => array(), + 'translations' => array(), + 'selected' => '', + 'echo' => 1, + 'show_available_translations' => true, + ) ); + + $translations = $args['translations']; + if ( empty( $translations ) ) { + require_once( ABSPATH . 'wp-admin/includes/translation-install.php' ); + $translations = wp_get_available_translations(); + } + + /* + * $args['languages'] should only contain the locales. Find the locale in + * $translations to get the native name. Fall back to locale. + */ + $languages = array(); + foreach ( $args['languages'] as $locale ) { + if ( isset( $translations[ $locale ] ) ) { + $translation = $translations[ $locale ]; + $languages[] = array( + 'language' => $translation['language'], + 'native_name' => $translation['native_name'], + 'lang' => current( $translation['iso'] ), + ); + + // Remove installed language from available translations. + unset( $translations[ $locale ] ); + } else { + $languages[] = array( + 'language' => $locale, + 'native_name' => $locale, + 'lang' => '', + ); + } + } + + $translations_available = ( ! empty( $translations ) && $args['show_available_translations'] ); + + $output = sprintf( '<select name="%s" id="%s">', esc_attr( $args['name'] ), esc_attr( $args['id'] ) ); + + // Holds the HTML markup. + $structure = array(); + + // List installed languages. + if ( $translations_available ) { + $structure[] = '<optgroup label="' . esc_attr_x( 'Installed', 'translations' ) . '">'; + } + $structure[] = '<option value="" lang="en" data-installed="1">English (United States)</option>'; + foreach ( $languages as $language ) { + $structure[] = sprintf( + '<option value="%s" lang="%s"%s data-installed="1">%s</option>', + esc_attr( $language['language'] ), + esc_attr( $language['lang'] ), + selected( $language['language'], $args['selected'], false ), + esc_html( $language['native_name'] ) + ); + } + if ( $translations_available ) { + $structure[] = '</optgroup>'; + } + + // List available translations. + if ( $translations_available ) { + $structure[] = '<optgroup label="' . esc_attr_x( 'Available', 'translations' ) . '">'; + foreach ( $translations as $translation ) { + $structure[] = sprintf( + '<option value="%s" lang="%s"%s>%s</option>', + esc_attr( $translation['language'] ), + esc_attr( current( $translation['iso'] ) ), + selected( $translation['language'], $args['selected'], false ), + esc_html( $translation['native_name'] ) + ); + } + $structure[] = '</optgroup>'; + } + + $output .= join( "\n", $structure ); + + $output .= '</select>'; + + if ( $args['echo'] ) { + echo $output; + } + + return $output; +} diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php index 07f260d..11c4e40 100644 --- a/wp-includes/link-template.php +++ b/wp-includes/link-template.php @@ -10,32 +10,37 @@ * Display the permalink for the current post. * * @since 1.2.0 + * @since 4.4.0 Added the `$post` parameter. + * + * @param int|WP_Post $post Optional. Post ID or post object. Default is the global `$post`. */ -function the_permalink() { +function the_permalink( $post = 0 ) { /** * Filter the display of the permalink for the current post. * * @since 1.5.0 + * @since 4.4.0 Added the `$post` parameter. * - * @param string $permalink The permalink for the current post. + * @param string $permalink The permalink for the current post. + * @param int|WP_Post $post Post ID, WP_Post object, or 0. Default 0. */ - echo esc_url( apply_filters( 'the_permalink', get_permalink() ) ); + echo esc_url( apply_filters( 'the_permalink', get_permalink( $post ), $post ) ); } /** - * Retrieve trailing slash string, if blog set for adding trailing slashes. + * Retrieve trailing slash string, if site is set for adding trailing slashes. * * Conditionally adds a trailing slash if the permalink structure has a trailing * slash, strips the trailing slash if not. The string is passed through the * 'user_trailingslashit' filter. Will remove trailing slash from string, if - * blog is not set to have them. + * site is not set to have them. * * @since 2.2.0 - * @uses $wp_rewrite + * @global WP_Rewrite $wp_rewrite * * @param string $string URL with or without a trailing slash. * @param string $type_of_url The type of URL being considered (e.g. single, category, etc) for use in the filter. - * @return string + * @return string The URL with the trailing slash appended or stripped. */ function user_trailingslashit($string, $type_of_url = '') { global $wp_rewrite; @@ -55,8 +60,7 @@ function user_trailingslashit($string, $type_of_url = '') { * 'single_feed', 'single_paged', 'feed', 'category', 'page', 'year', * 'month', 'day', 'paged', 'post_type_archive'. */ - $string = apply_filters( 'user_trailingslashit', $string, $type_of_url ); - return $string; + return apply_filters( 'user_trailingslashit', $string, $type_of_url ); } /** @@ -92,12 +96,13 @@ function permalink_anchor( $mode = 'id' ) { * * @see get_permalink() * - * @param int|WP_Post $id Optional. Post ID or post object. Default is the current post. + * @param int|WP_Post $post Optional. Post ID or post object. Default is the global `$post`. * @param bool $leavename Optional. Whether to keep post name or page name. Default false. - * @return string|bool The permalink URL or false if post does not exist. + * + * @return string|false The permalink URL or false if post does not exist. */ -function get_the_permalink( $id = 0, $leavename = false ) { - return get_permalink( $id, $leavename ); +function get_the_permalink( $post = 0, $leavename = false ) { + return get_permalink( $post, $leavename ); } /** @@ -105,11 +110,11 @@ function get_the_permalink( $id = 0, $leavename = false ) { * * @since 1.0.0 * - * @param int|WP_Post $id Optional. Post ID or post object. Default current post. + * @param int|WP_Post $post Optional. Post ID or post object. Default is the global `$post`. * @param bool $leavename Optional. Whether to keep post name or page name. Default false. - * @return string|bool The permalink URL or false if post does not exist. + * @return string|false The permalink URL or false if post does not exist. */ -function get_permalink( $id = 0, $leavename = false ) { +function get_permalink( $post = 0, $leavename = false ) { $rewritecode = array( '%year%', '%monthnum%', @@ -124,11 +129,10 @@ function get_permalink( $id = 0, $leavename = false ) { $leavename? '' : '%pagename%', ); - if ( is_object($id) && isset($id->filter) && 'sample' == $id->filter ) { - $post = $id; + if ( is_object( $post ) && isset( $post->filter ) && 'sample' == $post->filter ) { $sample = true; } else { - $post = get_post($id); + $post = get_post( $post ); $sample = false; } @@ -136,11 +140,11 @@ function get_permalink( $id = 0, $leavename = false ) { return false; if ( $post->post_type == 'page' ) - return get_page_link($post->ID, $leavename, $sample); + return get_page_link($post, $leavename, $sample); elseif ( $post->post_type == 'attachment' ) - return get_attachment_link( $post->ID, $leavename ); + return get_attachment_link( $post, $leavename ); elseif ( in_array($post->post_type, get_post_types( array('_builtin' => false) ) ) ) - return get_post_permalink($post->ID, $leavename, $sample); + return get_post_permalink($post, $leavename, $sample); $permalink = get_option('permalink_structure'); @@ -157,7 +161,7 @@ function get_permalink( $id = 0, $leavename = false ) { */ $permalink = apply_filters( 'pre_post_link', $permalink, $post, $leavename ); - if ( '' != $permalink && !in_array($post->post_status, array('draft', 'pending', 'auto-draft')) ) { + if ( '' != $permalink && !in_array( $post->post_status, array( 'draft', 'pending', 'auto-draft', 'future' ) ) ) { $unixtime = strtotime($post->post_date); $category = ''; @@ -236,10 +240,12 @@ function get_permalink( $id = 0, $leavename = false ) { * * @since 3.0.0 * - * @param int $id Optional. Post ID. + * @global WP_Rewrite $wp_rewrite + * + * @param int $id Optional. Post ID. * @param bool $leavename Optional, defaults to false. Whether to keep post name. - * @param bool $sample Optional, defaults to false. Is it a sample permalink. - * @return string + * @param bool $sample Optional, defaults to false. Is it a sample permalink. + * @return string|WP_Error The post permalink. */ function get_post_permalink( $id = 0, $leavename = false, $sample = false ) { global $wp_rewrite; @@ -253,14 +259,16 @@ function get_post_permalink( $id = 0, $leavename = false, $sample = false ) { $slug = $post->post_name; - $draft_or_pending = isset($post->post_status) && in_array( $post->post_status, array( 'draft', 'pending', 'auto-draft' ) ); + $draft_or_pending = get_post_status( $id ) && in_array( get_post_status( $id ), array( 'draft', 'pending', 'auto-draft', 'future' ) ); $post_type = get_post_type_object($post->post_type); + if ( $post_type->hierarchical ) { + $slug = get_page_uri( $id ); + } + if ( !empty($post_link) && ( !$draft_or_pending || $sample ) ) { if ( ! $leavename ) { - if ( $post_type->hierarchical ) - $slug = get_page_uri($id); $post_link = str_replace("%$post->post_type%", $slug, $post_link); } $post_link = home_url( user_trailingslashit($post_link) ); @@ -285,22 +293,6 @@ function get_post_permalink( $id = 0, $leavename = false, $sample = false ) { return apply_filters( 'post_type_link', $post_link, $post, $leavename, $sample ); } -/** - * Retrieve permalink from post ID. - * - * @since 1.0.0 - * - * @param int $post_id Optional. Post ID. - * @param mixed $deprecated Not used. - * @return string - */ -function post_permalink( $post_id = 0, $deprecated = '' ) { - if ( !empty( $deprecated ) ) - _deprecated_argument( __FUNCTION__, '1.3' ); - - return get_permalink($post_id); -} - /** * Retrieve the permalink for current page or page ID. * @@ -308,10 +300,10 @@ function post_permalink( $post_id = 0, $deprecated = '' ) { * * @since 1.5.0 * - * @param int|object $post Optional. Post ID or object. - * @param bool $leavename Optional, defaults to false. Whether to keep page name. - * @param bool $sample Optional, defaults to false. Is it a sample permalink. - * @return string + * @param int|object $post Optional. Post ID or object. + * @param bool $leavename Optional, defaults to false. Whether to keep page name. + * @param bool $sample Optional, defaults to false. Is it a sample permalink. + * @return string The page permalink. */ function get_page_link( $post = false, $leavename = false, $sample = false ) { $post = get_post( $post ); @@ -341,10 +333,12 @@ function get_page_link( $post = false, $leavename = false, $sample = false ) { * @since 2.1.0 * @access private * - * @param int|object $post Optional. Post ID or object. - * @param bool $leavename Optional. Leave name. - * @param bool $sample Optional. Sample permalink. - * @return string + * @global WP_Rewrite $wp_rewrite + * + * @param int|object $post Optional. Post ID or object. + * @param bool $leavename Optional. Leave name. + * @param bool $sample Optional. Sample permalink. + * @return string The page permalink. */ function _get_page_link( $post = false, $leavename = false, $sample = false ) { global $wp_rewrite; @@ -384,9 +378,11 @@ function _get_page_link( $post = false, $leavename = false, $sample = false ) { * * @since 2.0.0 * - * @param int|object $post Optional. Post ID or object. - * @param bool $leavename Optional. Leave name. - * @return string + * @global WP_Rewrite $wp_rewrite + * + * @param int|object $post Optional. Post ID or object. + * @param bool $leavename Optional. Leave name. + * @return string The attachment permalink. */ function get_attachment_link( $post = null, $leavename = false ) { global $wp_rewrite; @@ -395,6 +391,9 @@ function get_attachment_link( $post = null, $leavename = false ) { $post = get_post( $post ); $parent = ( $post->post_parent > 0 && $post->post_parent != $post->ID ) ? get_post( $post->post_parent ) : false; + if ( $parent && ! in_array( $parent->post_type, get_post_types() ) ) { + $parent = false; + } if ( $wp_rewrite->using_permalinks() && $parent ) { if ( 'page' == $parent->post_type ) @@ -412,6 +411,8 @@ function get_attachment_link( $post = null, $leavename = false ) { if ( ! $leavename ) $link = str_replace( '%postname%', $name, $link ); + } elseif ( $wp_rewrite->using_permalinks() && ! $leavename ) { + $link = home_url( user_trailingslashit( $post->post_name ) ); } if ( ! $link ) @@ -433,8 +434,10 @@ function get_attachment_link( $post = null, $leavename = false ) { * * @since 1.5.0 * + * @global WP_Rewrite $wp_rewrite + * * @param int|bool $year False for current year or year for permalink. - * @return string + * @return string The permalink for the specified year archive. */ function get_year_link($year) { global $wp_rewrite; @@ -464,9 +467,11 @@ function get_year_link($year) { * * @since 1.0.0 * - * @param bool|int $year False for current year. Integer of year. + * @global WP_Rewrite $wp_rewrite + * + * @param bool|int $year False for current year. Integer of year. * @param bool|int $month False for current month. Integer of month. - * @return string + * @return string The permalink for the specified month and year archive. */ function get_month_link($year, $month) { global $wp_rewrite; @@ -500,10 +505,12 @@ function get_month_link($year, $month) { * * @since 1.0.0 * - * @param bool|int $year False for current year. Integer of year. + * @global WP_Rewrite $wp_rewrite + * + * @param bool|int $year False for current year. Integer of year. * @param bool|int $month False for current month. Integer of month. - * @param bool|int $day False for current day. Integer of day. - * @return string + * @param bool|int $day False for current day. Integer of day. + * @return string The permalink for the specified day, month, and year archive. */ function get_day_link($year, $month, $day) { global $wp_rewrite; @@ -543,7 +550,7 @@ function get_day_link($year, $month, $day) { * @since 3.0.0 * * @param string $anchor The link's anchor text. - * @param string $feed Optional, defaults to default feed. Feed type. + * @param string $feed Optional, defaults to default feed. Feed type. */ function the_feed_link( $anchor, $feed = '' ) { $link = '<a href="' . esc_url( get_feed_link( $feed ) ) . '">' . $anchor . '</a>'; @@ -565,8 +572,10 @@ function the_feed_link( $anchor, $feed = '' ) { * * @since 1.5.0 * + * @global WP_Rewrite $wp_rewrite + * * @param string $feed Optional, defaults to default feed. Feed type. - * @return string + * @return string The feed permalink. */ function get_feed_link($feed = '') { global $wp_rewrite; @@ -610,9 +619,9 @@ function get_feed_link($feed = '') { * * @since 2.2.0 * - * @param int $post_id Optional. Post ID. - * @param string $feed Optional. Feed type. - * @return string + * @param int $post_id Optional. Post ID. + * @param string $feed Optional. Feed type. + * @return string The permalink for the comments feed for the given post. */ function get_post_comments_feed_link($post_id = 0, $feed = '') { $post_id = absint( $post_id ); @@ -623,22 +632,35 @@ function get_post_comments_feed_link($post_id = 0, $feed = '') { if ( empty( $feed ) ) $feed = get_default_feed(); + $post = get_post( $post_id ); + $unattached = 'attachment' === $post->post_type && 0 === (int) $post->post_parent; + if ( '' != get_option('permalink_structure') ) { if ( 'page' == get_option('show_on_front') && $post_id == get_option('page_on_front') ) $url = _get_page_link( $post_id ); else $url = get_permalink($post_id); - $url = trailingslashit($url) . 'feed'; - if ( $feed != get_default_feed() ) - $url .= "/$feed"; - $url = user_trailingslashit($url, 'single_feed'); + if ( $unattached ) { + $url = home_url( '/feed/' ); + if ( $feed !== get_default_feed() ) { + $url .= "$feed/"; + } + $url = add_query_arg( 'attachment_id', $post_id, $url ); + } else { + $url = trailingslashit($url) . 'feed'; + if ( $feed != get_default_feed() ) + $url .= "/$feed"; + $url = user_trailingslashit($url, 'single_feed'); + } } else { - $type = get_post_field('post_type', $post_id); - if ( 'page' == $type ) + if ( $unattached ) { + $url = add_query_arg( array( 'feed' => $feed, 'attachment_id' => $post_id ), home_url( '/' ) ); + } elseif ( 'page' == $post->post_type ) { $url = add_query_arg( array( 'feed' => $feed, 'page_id' => $post_id ), home_url( '/' ) ); - else + } else { $url = add_query_arg( array( 'feed' => $feed, 'p' => $post_id ), home_url( '/' ) ); + } } /** @@ -661,15 +683,16 @@ function get_post_comments_feed_link($post_id = 0, $feed = '') { * @since 2.5.0 * * @param string $link_text Descriptive text. - * @param int $post_id Optional post ID. Default to current post. - * @param string $feed Optional. Feed format. - * @return string Link to the comment feed for the current post. -*/ + * @param int $post_id Optional post ID. Default to current post. + * @param string $feed Optional. Feed format. + */ function post_comments_feed_link( $link_text = '', $post_id = '', $feed = '' ) { - $url = esc_url( get_post_comments_feed_link( $post_id, $feed ) ); - if ( empty($link_text) ) + $url = get_post_comments_feed_link( $post_id, $feed ); + if ( empty( $link_text ) ) { $link_text = __('Comments Feed'); + } + $link = '<a href="' . esc_url( $url ) . '">' . $link_text . '</a>'; /** * Filter the post comment feed link anchor tag. * @@ -679,7 +702,7 @@ function post_comments_feed_link( $link_text = '', $post_id = '', $feed = '' ) { * @param int $post_id Post ID. * @param string $feed The feed type, or an empty string for the default feed type. */ - echo apply_filters( 'post_comments_feed_link_html', "<a href='$url'>$link_text</a>", $post_id, $feed ); + echo apply_filters( 'post_comments_feed_link_html', $link, $post_id, $feed ); } /** @@ -690,10 +713,10 @@ function post_comments_feed_link( $link_text = '', $post_id = '', $feed = '' ) { * * @since 2.5.0 * - * @param int $author_id ID of an author. - * @param string $feed Optional. Feed type. + * @param int $author_id ID of an author. + * @param string $feed Optional. Feed type. * @return string Link to the feed for the author specified by $author_id. -*/ + */ function get_author_feed_link( $author_id, $feed = '' ) { $author_id = (int) $author_id; $permalink_structure = get_option('permalink_structure'); @@ -734,12 +757,12 @@ function get_author_feed_link( $author_id, $feed = '' ) { * * @since 2.5.0 * - * @param int $cat_id ID of a category. - * @param string $feed Optional. Feed type. + * @param int $cat_id ID of a category. + * @param string $feed Optional. Feed type. * @return string Link to the feed for the category specified by $cat_id. -*/ -function get_category_feed_link($cat_id, $feed = '') { - return get_term_feed_link($cat_id, 'category', $feed); + */ +function get_category_feed_link( $cat_id, $feed = '' ) { + return get_term_feed_link( $cat_id, 'category', $feed ); } /** @@ -750,11 +773,11 @@ function get_category_feed_link($cat_id, $feed = '') { * * @since 3.0.0 * - * @param int $term_id ID of a category. + * @param int $term_id ID of a category. * @param string $taxonomy Optional. Taxonomy of $term_id - * @param string $feed Optional. Feed type. - * @return string Link to the feed for the term specified by $term_id and $taxonomy. -*/ + * @param string $feed Optional. Feed type. + * @return string|false Link to the feed for the term specified by $term_id and $taxonomy. + */ function get_term_feed_link( $term_id, $taxonomy = 'category', $feed = '' ) { $term_id = ( int ) $term_id; @@ -829,12 +852,12 @@ function get_term_feed_link( $term_id, $taxonomy = 'category', $feed = '' ) { * * @since 2.3.0 * - * @param int $tag_id Tag ID. - * @param string $feed Optional. Feed type. - * @return string + * @param int $tag_id Tag ID. + * @param string $feed Optional. Feed type. + * @return string The feed permalink for the given tag. */ -function get_tag_feed_link($tag_id, $feed = '') { - return get_term_feed_link($tag_id, 'post_tag', $feed); +function get_tag_feed_link( $tag_id, $feed = '' ) { + return get_term_feed_link( $tag_id, 'post_tag', $feed ); } /** @@ -842,9 +865,9 @@ function get_tag_feed_link($tag_id, $feed = '') { * * @since 2.7.0 * - * @param int $tag_id Tag ID + * @param int $tag_id Tag ID * @param string $taxonomy Taxonomy - * @return string + * @return string The edit tag link URL for the given tag. */ function get_edit_tag_link( $tag_id, $taxonomy = 'post_tag' ) { /** @@ -862,11 +885,10 @@ function get_edit_tag_link( $tag_id, $taxonomy = 'post_tag' ) { * * @since 2.7.0 * - * @param string $link Optional. Anchor text. + * @param string $link Optional. Anchor text. * @param string $before Optional. Display before edit link. - * @param string $after Optional. Display after edit link. - * @param object $tag Tag object. - * @return string HTML content. + * @param string $after Optional. Display after edit link. + * @param object $tag Tag object. */ function edit_tag_link( $link = '', $before = '', $after = '', $tag = null ) { $link = edit_term_link( $link, '', '', $tag, false ); @@ -882,32 +904,44 @@ function edit_tag_link( $link = '', $before = '', $after = '', $tag = null ) { } /** - * Retrieve edit term url. + * Retrieves the URL for editing a given term. * * @since 3.1.0 + * @since 4.5.0 The `$taxonomy` argument was made optional. * - * @param int $term_id Term ID - * @param string $taxonomy Taxonomy - * @param string $object_type The object type - * @return string + * @param int $term_id Term ID. + * @param string $taxonomy Optional. Taxonomy. Defaults to the taxonomy of the term identified by `$term_id`. + * @param string $object_type Optional. The object type. Used to highlight the proper post type menu on the linked page. + * Defaults to the first object_type associated with the taxonomy. + * @return string|null The edit term link URL for the given term, or null on failure. */ -function get_edit_term_link( $term_id, $taxonomy, $object_type = '' ) { - $tax = get_taxonomy( $taxonomy ); - if ( !current_user_can( $tax->cap->edit_terms ) ) +function get_edit_term_link( $term_id, $taxonomy = '', $object_type = '' ) { + $term = get_term( $term_id, $taxonomy ); + if ( ! $term || is_wp_error( $term ) ) { return; + } - $term = get_term( $term_id, $taxonomy ); + $tax = get_taxonomy( $term->taxonomy ); + if ( ! $tax || ! current_user_can( $tax->cap->edit_terms ) ) { + return; + } $args = array( - 'action' => 'edit', 'taxonomy' => $taxonomy, - 'tag_ID' => $term->term_id, + 'tag_ID' => $term->term_id, ); - if ( $object_type ) + if ( $object_type ) { $args['post_type'] = $object_type; + } elseif ( ! empty( $tax->object_type ) ) { + $args['post_type'] = reset( $tax->object_type ); + } - $location = add_query_arg( $args, admin_url( 'edit-tags.php' ) ); + if ( $tax->show_ui ) { + $location = add_query_arg( $args, admin_url( 'term.php' ) ); + } else { + $location = ''; + } /** * Filter the edit link for a term. @@ -927,11 +961,12 @@ function get_edit_term_link( $term_id, $taxonomy, $object_type = '' ) { * * @since 3.1.0 * - * @param string $link Optional. Anchor text. - * @param string $before Optional. Display before edit link. - * @param string $after Optional. Display after edit link. - * @param object $term Term object. - * @return string HTML content. + * @param string $link Optional. Anchor text. Default empty. + * @param string $before Optional. Display before edit link. Default empty. + * @param string $after Optional. Display after edit link. Default empty. + * @param object $term Optional. Term object. If null, the queried object will be inspected. Default null. + * @param bool $echo Optional. Whether or not to echo the return. Default true. + * @return string|void HTML content. */ function edit_term_link( $link = '', $before = '', $after = '', $term = null, $echo = true ) { if ( is_null( $term ) ) @@ -970,8 +1005,10 @@ function edit_term_link( $link = '', $before = '', $after = '', $term = null, $e * * @since 3.0.0 * + * @global WP_Rewrite $wp_rewrite + * * @param string $query Optional. The query string to use. If empty the current query is used. - * @return string + * @return string The search permalink. */ function get_search_link( $query = '' ) { global $wp_rewrite; @@ -987,7 +1024,7 @@ function get_search_link( $query = '' ) { $link = home_url('?s=' . urlencode($search) ); } else { $search = urlencode($search); - $search = str_replace('%2F', '/', $search); // %2F(/) is not valid within a URL, send it unencoded. + $search = str_replace('%2F', '/', $search); // %2F(/) is not valid within a URL, send it un-encoded. $link = str_replace( '%search%', $search, $permastruct ); $link = home_url( user_trailingslashit( $link, 'search' ) ); } @@ -1008,9 +1045,11 @@ function get_search_link( $query = '' ) { * * @since 2.5.0 * + * @global WP_Rewrite $wp_rewrite + * * @param string $search_query Optional. Search query. - * @param string $feed Optional. Feed type. - * @return string + * @param string $feed Optional. Feed type. + * @return string The search results feed permalink. */ function get_search_feed_link($search_query = '', $feed = '') { global $wp_rewrite; @@ -1037,9 +1076,7 @@ function get_search_feed_link($search_query = '', $feed = '') { * @param string $feed Feed type. * @param string $type The search type. One of 'posts' or 'comments'. */ - $link = apply_filters( 'search_feed_link', $link, $feed, 'posts' ); - - return $link; + return apply_filters( 'search_feed_link', $link, $feed, 'posts' ); } /** @@ -1047,9 +1084,11 @@ function get_search_feed_link($search_query = '', $feed = '') { * * @since 2.5.0 * + * @global WP_Rewrite $wp_rewrite + * * @param string $search_query Optional. Search query. - * @param string $feed Optional. Feed type. - * @return string + * @param string $feed Optional. Feed type. + * @return string The comments feed search results permalink. */ function get_search_comments_feed_link($search_query = '', $feed = '') { global $wp_rewrite; @@ -1067,24 +1106,38 @@ function get_search_comments_feed_link($search_query = '', $feed = '') { $link = add_query_arg('withcomments', 1, $link); /** This filter is documented in wp-includes/link-template.php */ - $link = apply_filters('search_feed_link', $link, $feed, 'comments'); - - return $link; + return apply_filters( 'search_feed_link', $link, $feed, 'comments' ); } /** - * Retrieve the permalink for a post type archive. + * Retrieves the permalink for a post type archive. * * @since 3.1.0 + * @since 4.5.0 Support for posts was added. * - * @param string $post_type Post type - * @return string + * @global WP_Rewrite $wp_rewrite + * + * @param string $post_type Post type. + * @return string|false The post type archive permalink. */ function get_post_type_archive_link( $post_type ) { global $wp_rewrite; if ( ! $post_type_obj = get_post_type_object( $post_type ) ) return false; + if ( 'post' === $post_type ) { + $show_on_front = get_option( 'show_on_front' ); + $page_for_posts = get_option( 'page_for_posts' ); + + if ( 'page' == $show_on_front && $page_for_posts ) { + $link = get_permalink( $page_for_posts ); + } else { + $link = get_home_url(); + } + /** This filter is documented in wp-includes/link-template.php */ + return apply_filters( 'post_type_archive_link', $link, $post_type ); + } + if ( ! $post_type_obj->has_archive ) return false; @@ -1116,8 +1169,8 @@ function get_post_type_archive_link( $post_type ) { * @since 3.1.0 * * @param string $post_type Post type - * @param string $feed Optional. Feed type - * @return string + * @param string $feed Optional. Feed type + * @return string|false The post type feed permalink. */ function get_post_type_archive_feed_link( $post_type, $feed = '' ) { $default_feed = get_default_feed(); @@ -1148,6 +1201,46 @@ function get_post_type_archive_feed_link( $post_type, $feed = '' ) { return apply_filters( 'post_type_archive_feed_link', $link, $feed ); } +/** + * Retrieve URL used for the post preview. + * + * Get the preview post URL. Allows additional query args to be appended. + * + * @since 4.4.0 + * + * @param int|WP_Post $post Optional. Post ID or `WP_Post` object. Defaults to global post. + * @param array $query_args Optional. Array of additional query args to be appended to the link. + * @param string $preview_link Optional. Base preview link to be used if it should differ from the post permalink. + * @return string URL used for the post preview. + */ +function get_preview_post_link( $post = null, $query_args = array(), $preview_link = '' ) { + $post = get_post( $post ); + if ( ! $post ) { + return; + } + + $post_type_object = get_post_type_object( $post->post_type ); + if ( is_post_type_viewable( $post_type_object ) ) { + if ( ! $preview_link ) { + $preview_link = set_url_scheme( get_permalink( $post ) ); + } + + $query_args['preview'] = 'true'; + $preview_link = add_query_arg( $query_args, $preview_link ); + } + + /** + * Filter the URL used for a post preview. + * + * @since 2.0.5 + * @since 4.0.0 Added the `$post` parameter. + * + * @param string $preview_link URL used for the post preview. + * @param WP_Post $post Post object. + */ + return apply_filters( 'preview_post_link', $preview_link, $post ); +} + /** * Retrieve edit posts link for post. * @@ -1156,9 +1249,10 @@ function get_post_type_archive_feed_link( $post_type, $feed = '' ) { * * @since 2.3.0 * - * @param int $id Optional. Post ID. + * @param int $id Optional. Post ID. * @param string $context Optional, defaults to display. How to write the '&', defaults to '&'. - * @return string + * @return string|null The edit post link for the given post. null if the post type is invalid or does + * not allow an editing UI. */ function get_edit_post_link( $id = 0, $context = 'display' ) { if ( ! $post = get_post( $id ) ) @@ -1178,6 +1272,12 @@ function get_edit_post_link( $id = 0, $context = 'display' ) { if ( !current_user_can( 'edit_post', $post->ID ) ) return; + if ( $post_type_object->_edit_link ) { + $link = admin_url( sprintf( $post_type_object->_edit_link . $action, $post->ID ) ); + } else { + $link = ''; + } + /** * Filter the post edit link. * @@ -1188,31 +1288,35 @@ function get_edit_post_link( $id = 0, $context = 'display' ) { * @param string $context The link context. If set to 'display' then ampersands * are encoded. */ - return apply_filters( 'get_edit_post_link', admin_url( sprintf( $post_type_object->_edit_link . $action, $post->ID ) ), $post->ID, $context ); + return apply_filters( 'get_edit_post_link', $link, $post->ID, $context ); } /** * Display edit post link for post. * * @since 1.0.0 + * @since 4.4.0 The `$class` argument was added. * - * @param string $link Optional. Anchor text. + * @param string $text Optional. Anchor text. * @param string $before Optional. Display before edit link. - * @param string $after Optional. Display after edit link. - * @param int $id Optional. Post ID. + * @param string $after Optional. Display after edit link. + * @param int $id Optional. Post ID. + * @param string $class Optional. Add custom class to link. */ -function edit_post_link( $link = null, $before = '', $after = '', $id = 0 ) { - if ( !$post = get_post( $id ) ) +function edit_post_link( $text = null, $before = '', $after = '', $id = 0, $class = 'post-edit-link' ) { + if ( ! $post = get_post( $id ) ) { return; + } - if ( !$url = get_edit_post_link( $post->ID ) ) + if ( ! $url = get_edit_post_link( $post->ID ) ) { return; + } - if ( null === $link ) - $link = __('Edit This'); + if ( null === $text ) { + $text = __( 'Edit This' ); + } - $post_type_obj = get_post_type_object( $post->post_type ); - $link = '<a class="post-edit-link" href="' . $url . '">' . $link . '</a>'; + $link = '<a class="' . esc_attr( $class ) . '" href="' . esc_url( $url ) . '">' . $text . '</a>'; /** * Filter the post edit link anchor tag. @@ -1221,8 +1325,9 @@ function edit_post_link( $link = null, $before = '', $after = '', $id = 0 ) { * * @param string $link Anchor tag for the edit link. * @param int $post_id Post ID. + * @param string $text Anchor text. */ - echo $before . apply_filters( 'edit_post_link', $link, $post->ID ) . $after; + echo $before . apply_filters( 'edit_post_link', $link, $post->ID, $text ) . $after; } /** @@ -1232,10 +1337,10 @@ function edit_post_link( $link = null, $before = '', $after = '', $id = 0 ) { * * @since 2.9.0 * - * @param int $id Optional. Post ID. - * @param string $deprecated Not used. - * @param bool $force_delete Whether to bypass trash and force deletion. Default is false. - * @return string + * @param int $id Optional. Post ID. + * @param string $deprecated Not used. + * @param bool $force_delete Whether to bypass trash and force deletion. Default is false. + * @return string|void The delete post link URL for the given post. */ function get_delete_post_link( $id = 0, $deprecated = '', $force_delete = false ) { if ( ! empty( $deprecated ) ) @@ -1272,8 +1377,8 @@ function get_delete_post_link( $id = 0, $deprecated = '', $force_delete = false * * @since 2.3.0 * - * @param int $comment_id Optional. Comment ID. - * @return string + * @param int|WP_Comment $comment_id Optional. Comment ID or WP_Comment object. + * @return string|void The edit comment link URL for the given comment. */ function get_edit_comment_link( $comment_id = 0 ) { $comment = get_comment( $comment_id ); @@ -1298,20 +1403,22 @@ function get_edit_comment_link( $comment_id = 0 ) { * * @since 1.0.0 * - * @param string $link Optional. Anchor text. + * @param string $text Optional. Anchor text. * @param string $before Optional. Display before edit link. - * @param string $after Optional. Display after edit link. + * @param string $after Optional. Display after edit link. */ -function edit_comment_link( $link = null, $before = '', $after = '' ) { - global $comment; +function edit_comment_link( $text = null, $before = '', $after = '' ) { + $comment = get_comment(); - if ( !current_user_can( 'edit_comment', $comment->comment_ID ) ) + if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) { return; + } - if ( null === $link ) - $link = __('Edit This'); + if ( null === $text ) { + $text = __( 'Edit This' ); + } - $link = '<a class="comment-edit-link" href="' . get_edit_comment_link( $comment->comment_ID ) . '">' . $link . '</a>'; + $link = '<a class="comment-edit-link" href="' . esc_url( get_edit_comment_link( $comment ) ) . '">' . $text . '</a>'; /** * Filter the comment edit link anchor tag. @@ -1320,17 +1427,18 @@ function edit_comment_link( $link = null, $before = '', $after = '' ) { * * @param string $link Anchor tag for the edit link. * @param int $comment_id Comment ID. + * @param string $text Anchor text. */ - echo $before . apply_filters( 'edit_comment_link', $link, $comment->comment_ID ) . $after; + echo $before . apply_filters( 'edit_comment_link', $link, $comment->comment_ID, $text ) . $after; } /** - * Display edit bookmark (literally a URL external to blog) link. + * Display edit bookmark link. * * @since 2.7.0 * - * @param int $link Optional. Bookmark ID. - * @return string + * @param int|stdClass $link Optional. Bookmark ID. + * @return string|void The edit bookmark link URL. */ function get_edit_bookmark_link( $link = 0 ) { $link = get_bookmark( $link ); @@ -1341,7 +1449,7 @@ function get_edit_bookmark_link( $link = 0 ) { $location = admin_url('link.php?action=edit&link_id=') . $link->link_id; /** - * Filter the bookmark (link) edit link. + * Filter the bookmark edit link. * * @since 2.7.0 * @@ -1352,14 +1460,14 @@ function get_edit_bookmark_link( $link = 0 ) { } /** - * Display edit bookmark (literally a URL external to blog) link anchor content. + * Display edit bookmark link anchor content. * * @since 2.7.0 * - * @param string $link Optional. Anchor text. - * @param string $before Optional. Display before edit link. - * @param string $after Optional. Display after edit link. - * @param int $bookmark Optional. Bookmark ID. + * @param string $link Optional. Anchor text. + * @param string $before Optional. Display before edit link. + * @param string $after Optional. Display after edit link. + * @param int $bookmark Optional. Bookmark ID. */ function edit_bookmark_link( $link = '', $before = '', $after = '', $bookmark = null ) { $bookmark = get_bookmark($bookmark); @@ -1370,7 +1478,7 @@ function edit_bookmark_link( $link = '', $before = '', $after = '', $bookmark = if ( empty($link) ) $link = __('Edit This'); - $link = '<a href="' . get_edit_bookmark_link( $bookmark ) . '">' . $link . '</a>'; + $link = '<a href="' . esc_url( get_edit_bookmark_link( $bookmark ) ) . '">' . $link . '</a>'; /** * Filter the bookmark edit link anchor tag. @@ -1429,7 +1537,7 @@ function get_edit_user_link( $user_id = null ) { * @param bool $in_same_term Optional. Whether post should be in a same taxonomy term. * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. * @param string $taxonomy Optional. Taxonomy, if $in_same_term is true. Default 'category'. - * @return mixed Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists. + * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists. */ function get_previous_post( $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) { return get_adjacent_post( $in_same_term, $excluded_terms, true, $taxonomy ); @@ -1443,7 +1551,7 @@ function get_previous_post( $in_same_term = false, $excluded_terms = '', $taxono * @param bool $in_same_term Optional. Whether post should be in a same taxonomy term. * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. * @param string $taxonomy Optional. Taxonomy, if $in_same_term is true. Default 'category'. - * @return mixed Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists. + * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists. */ function get_next_post( $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) { return get_adjacent_post( $in_same_term, $excluded_terms, false, $taxonomy ); @@ -1456,11 +1564,13 @@ function get_next_post( $in_same_term = false, $excluded_terms = '', $taxonomy = * * @since 2.5.0 * + * @global wpdb $wpdb WordPress database abstraction object. + * * @param bool $in_same_term Optional. Whether post should be in a same taxonomy term. * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. * @param bool $previous Optional. Whether to retrieve previous post. * @param string $taxonomy Optional. Taxonomy, if $in_same_term is true. Default 'category'. - * @return mixed Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists. + * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists. */ function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) { global $wpdb; @@ -1471,87 +1581,137 @@ function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previo $current_post_date = $post->post_date; $join = ''; - $posts_in_ex_terms_sql = ''; + $where = ''; + $adjacent = $previous ? 'previous' : 'next'; + if ( $in_same_term || ! empty( $excluded_terms ) ) { - $join = " INNER JOIN $wpdb->term_relationships AS tr ON p.ID = tr.object_id INNER JOIN $wpdb->term_taxonomy tt ON tr.term_taxonomy_id = tt.term_taxonomy_id"; + if ( ! empty( $excluded_terms ) && ! is_array( $excluded_terms ) ) { + // back-compat, $excluded_terms used to be $excluded_terms with IDs separated by " and " + if ( false !== strpos( $excluded_terms, ' and ' ) ) { + _deprecated_argument( __FUNCTION__, '3.3', sprintf( __( 'Use commas instead of %s to separate excluded terms.' ), "'and'" ) ); + $excluded_terms = explode( ' and ', $excluded_terms ); + } else { + $excluded_terms = explode( ',', $excluded_terms ); + } + + $excluded_terms = array_map( 'intval', $excluded_terms ); + } if ( $in_same_term ) { + $join .= " INNER JOIN $wpdb->term_relationships AS tr ON p.ID = tr.object_id INNER JOIN $wpdb->term_taxonomy tt ON tr.term_taxonomy_id = tt.term_taxonomy_id"; + $where .= $wpdb->prepare( "AND tt.taxonomy = %s", $taxonomy ); + if ( ! is_object_in_taxonomy( $post->post_type, $taxonomy ) ) return ''; $term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) ); + + // Remove any exclusions from the term array to include. + $term_array = array_diff( $term_array, (array) $excluded_terms ); + $term_array = array_map( 'intval', $term_array ); + if ( ! $term_array || is_wp_error( $term_array ) ) return ''; - $join .= $wpdb->prepare( " AND tt.taxonomy = %s AND tt.term_id IN (" . implode( ',', array_map( 'intval', $term_array ) ) . ")", $taxonomy ); + + $where .= " AND tt.term_id IN (" . implode( ',', $term_array ) . ")"; } - $posts_in_ex_terms_sql = $wpdb->prepare( "AND tt.taxonomy = %s", $taxonomy ); + /** + * Filter the IDs of terms excluded from adjacent post queries. + * + * The dynamic portion of the hook name, `$adjacent`, refers to the type + * of adjacency, 'next' or 'previous'. + * + * @since 4.4.0 + * + * @param string $excluded_terms Array of excluded term IDs. + */ + $excluded_terms = apply_filters( "get_{$adjacent}_post_excluded_terms", $excluded_terms ); + if ( ! empty( $excluded_terms ) ) { - if ( ! is_array( $excluded_terms ) ) { - // back-compat, $excluded_terms used to be $excluded_terms with IDs separated by " and " - if ( false !== strpos( $excluded_terms, ' and ' ) ) { - _deprecated_argument( __FUNCTION__, '3.3', sprintf( __( 'Use commas instead of %s to separate excluded terms.' ), "'and'" ) ); - $excluded_terms = explode( ' and ', $excluded_terms ); - } else { - $excluded_terms = explode( ',', $excluded_terms ); - } - } + $where .= " AND p.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships tr LEFT JOIN $wpdb->term_taxonomy tt ON (tr.term_taxonomy_id = tt.term_taxonomy_id) WHERE tt.term_id IN (" . implode( ',', array_map( 'intval', $excluded_terms ) ) . ') )'; + } + } - $excluded_terms = array_map( 'intval', $excluded_terms ); + // 'post_status' clause depends on the current user. + if ( is_user_logged_in() ) { + $user_id = get_current_user_id(); - if ( ! empty( $term_array ) ) { - $excluded_terms = array_diff( $excluded_terms, $term_array ); - $posts_in_ex_terms_sql = ''; - } + $post_type_object = get_post_type_object( $post->post_type ); + if ( empty( $post_type_object ) ) { + $post_type_cap = $post->post_type; + $read_private_cap = 'read_private_' . $post_type_cap . 's'; + } else { + $read_private_cap = $post_type_object->cap->read_private_posts; + } - if ( ! empty( $excluded_terms ) ) { - $posts_in_ex_terms_sql = $wpdb->prepare( " AND tt.taxonomy = %s AND tt.term_id NOT IN (" . implode( $excluded_terms, ',' ) . ')', $taxonomy ); + /* + * Results should include private posts belonging to the current user, or private posts where the + * current user has the 'read_private_posts' cap. + */ + $private_states = get_post_stati( array( 'private' => true ) ); + $where .= " AND ( p.post_status = 'publish'"; + foreach ( (array) $private_states as $state ) { + if ( current_user_can( $read_private_cap ) ) { + $where .= $wpdb->prepare( " OR p.post_status = %s", $state ); + } else { + $where .= $wpdb->prepare( " OR (p.post_author = %d AND p.post_status = %s)", $user_id, $state ); } } + $where .= " )"; + } else { + $where .= " AND p.post_status = 'publish'"; } - $adjacent = $previous ? 'previous' : 'next'; $op = $previous ? '<' : '>'; $order = $previous ? 'DESC' : 'ASC'; /** * Filter the JOIN clause in the SQL for an adjacent post query. * - * The dynamic portion of the hook name, $adjacent, refers to the type + * The dynamic portion of the hook name, `$adjacent`, refers to the type * of adjacency, 'next' or 'previous'. * * @since 2.5.0 + * @since 4.4.0 Added the `$taxonomy` and `$post` parameters. * - * @param string $join The JOIN clause in the SQL. - * @param bool $in_same_term Whether post should be in a same taxonomy term. - * @param array $excluded_terms Array of excluded term IDs. + * @param string $join The JOIN clause in the SQL. + * @param bool $in_same_term Whether post should be in a same taxonomy term. + * @param array $excluded_terms Array of excluded term IDs. + * @param string $taxonomy Taxonomy. Used to identify the term used when `$in_same_term` is true. + * @param WP_Post $post WP_Post object. */ - $join = apply_filters( "get_{$adjacent}_post_join", $join, $in_same_term, $excluded_terms ); + $join = apply_filters( "get_{$adjacent}_post_join", $join, $in_same_term, $excluded_terms, $taxonomy, $post ); /** * Filter the WHERE clause in the SQL for an adjacent post query. * - * The dynamic portion of the hook name, $adjacent, refers to the type + * The dynamic portion of the hook name, `$adjacent`, refers to the type * of adjacency, 'next' or 'previous'. * * @since 2.5.0 + * @since 4.4.0 Added the `$taxonomy` and `$post` parameters. * - * @param string $where The WHERE clause in the SQL. + * @param string $where The `WHERE` clause in the SQL. * @param bool $in_same_term Whether post should be in a same taxonomy term. * @param array $excluded_terms Array of excluded term IDs. + * @param string $taxonomy Taxonomy. Used to identify the term used when `$in_same_term` is true. + * @param WP_Post $post WP_Post object. */ - $where = apply_filters( "get_{$adjacent}_post_where", $wpdb->prepare( "WHERE p.post_date $op %s AND p.post_type = %s AND p.post_status = 'publish' $posts_in_ex_terms_sql", $current_post_date, $post->post_type), $in_same_term, $excluded_terms ); + $where = apply_filters( "get_{$adjacent}_post_where", $wpdb->prepare( "WHERE p.post_date $op %s AND p.post_type = %s $where", $current_post_date, $post->post_type ), $in_same_term, $excluded_terms, $taxonomy, $post ); /** * Filter the ORDER BY clause in the SQL for an adjacent post query. * - * The dynamic portion of the hook name, $adjacent, refers to the type + * The dynamic portion of the hook name, `$adjacent`, refers to the type * of adjacency, 'next' or 'previous'. * * @since 2.5.0 + * @since 4.4.0 Added the `$post` parameter. * - * @param string $order_by The ORDER BY clause in the SQL. + * @param string $order_by The `ORDER BY` clause in the SQL. + * @param WP_Post $post WP_Post object. */ - $sort = apply_filters( "get_{$adjacent}_post_sort", "ORDER BY p.post_date $order LIMIT 1" ); + $sort = apply_filters( "get_{$adjacent}_post_sort", "ORDER BY p.post_date $order LIMIT 1", $post ); $query = "SELECT p.ID FROM $wpdb->posts AS p $join $where $sort"; $query_key = 'adjacent_post_' . md5( $query ); @@ -1586,7 +1746,7 @@ function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previo * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. * @param bool $previous Optional. Whether to display link to previous or next post. Default true. * @param string $taxonomy Optional. Taxonomy, if $in_same_term is true. Default 'category'. - * @return string + * @return string|void The adjacent post relational link URL. */ function get_adjacent_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) { if ( $previous && is_attachment() && $post = get_post() ) @@ -1616,7 +1776,7 @@ function get_adjacent_post_rel_link( $title = '%title', $in_same_term = false, $ /** * Filter the adjacent post relational link. * - * The dynamic portion of the hook name, $adjacent, refers to the type + * The dynamic portion of the hook name, `$adjacent`, refers to the type * of adjacency, 'next' or 'previous'. * * @since 2.8.0 @@ -1649,8 +1809,9 @@ function adjacent_posts_rel_link( $title = '%title', $in_same_term = false, $exc * */ function adjacent_posts_rel_link_wp_head() { - if ( !is_singular() || is_attachment() ) + if ( ! is_single() || is_attachment() ) { return; + } adjacent_posts_rel_link(); } @@ -1694,7 +1855,7 @@ function prev_post_rel_link( $title = '%title', $in_same_term = false, $excluded * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. * @param bool $start Optional. Whether to retrieve first or last post. * @param string $taxonomy Optional. Taxonomy, if $in_same_term is true. Default 'category'. - * @return mixed Array containing the boundary post object if successful, null otherwise. + * @return null|array Array containing the boundary post object if successful, null otherwise. */ function get_boundary_post( $in_same_term = false, $excluded_terms = '', $start = true, $taxonomy = 'category' ) { $post = get_post(); @@ -1740,7 +1901,7 @@ function get_boundary_post( $in_same_term = false, $excluded_terms = '', $start return get_posts( $query_args ); } -/* +/** * Get previous post link that is adjacent to the current post. * * @since 3.7.0 @@ -1750,10 +1911,10 @@ function get_boundary_post( $in_same_term = false, $excluded_terms = '', $start * @param bool $in_same_term Optional. Whether link should be in a same taxonomy term. * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. * @param string $taxonomy Optional. Taxonomy, if $in_same_term is true. Default 'category'. - * @return string + * @return string The link URL of the previous post in relation to the current post. */ -function get_previous_post_link( $format = '« %link', $link = '%title', $in_same_cat = false, $excluded_terms = '', $taxonomy = 'category' ) { - return get_adjacent_post_link( $format, $link, $in_same_cat, $excluded_terms, true, $taxonomy ); +function get_previous_post_link( $format = '« %link', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) { + return get_adjacent_post_link( $format, $link, $in_same_term, $excluded_terms, true, $taxonomy ); } /** @@ -1768,8 +1929,8 @@ function get_previous_post_link( $format = '« %link', $link = '%title', $i * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. * @param string $taxonomy Optional. Taxonomy, if $in_same_term is true. Default 'category'. */ -function previous_post_link( $format = '« %link', $link = '%title', $in_same_cat = false, $excluded_terms = '', $taxonomy = 'category' ) { - echo get_previous_post_link( $format, $link, $in_same_cat, $excluded_terms, $taxonomy ); +function previous_post_link( $format = '« %link', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) { + echo get_previous_post_link( $format, $link, $in_same_term, $excluded_terms, $taxonomy ); } /** @@ -1782,10 +1943,10 @@ function previous_post_link( $format = '« %link', $link = '%title', $in_sa * @param bool $in_same_term Optional. Whether link should be in a same taxonomy term. * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. * @param string $taxonomy Optional. Taxonomy, if $in_same_term is true. Default 'category'. - * @return string + * @return string The link URL of the next post in relation to the current post. */ -function get_next_post_link( $format = '%link »', $link = '%title', $in_same_cat = false, $excluded_terms = '', $taxonomy = 'category' ) { - return get_adjacent_post_link( $format, $link, $in_same_cat, $excluded_terms, false, $taxonomy ); +function get_next_post_link( $format = '%link »', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) { + return get_adjacent_post_link( $format, $link, $in_same_term, $excluded_terms, false, $taxonomy ); } /** @@ -1800,8 +1961,8 @@ function get_next_post_link( $format = '%link »', $link = '%title', $in_sa * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. * @param string $taxonomy Optional. Taxonomy, if $in_same_term is true. Default 'category'. */ -function next_post_link( $format = '%link »', $link = '%title', $in_same_cat = false, $excluded_terms = '', $taxonomy = 'category' ) { - echo get_next_post_link( $format, $link, $in_same_cat, $excluded_terms, $taxonomy ); +function next_post_link( $format = '%link »', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) { + echo get_next_post_link( $format, $link, $in_same_term, $excluded_terms, $taxonomy ); } /** @@ -1817,13 +1978,13 @@ function next_post_link( $format = '%link »', $link = '%title', $in_same_c * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded terms IDs. * @param bool $previous Optional. Whether to display link to previous or next post. Default true. * @param string $taxonomy Optional. Taxonomy, if $in_same_term is true. Default 'category'. - * @return string + * @return string The link URL of the previous or next post in relation to the current post. */ -function get_adjacent_post_link( $format, $link, $in_same_cat = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) { +function get_adjacent_post_link( $format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) { if ( $previous && is_attachment() ) $post = get_post( get_post()->post_parent ); else - $post = get_adjacent_post( $in_same_cat, $excluded_terms, $previous, $taxonomy ); + $post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy ); if ( ! $post ) { $output = ''; @@ -1852,17 +2013,19 @@ function get_adjacent_post_link( $format, $link, $in_same_cat = false, $excluded /** * Filter the adjacent post link. * - * The dynamic portion of the hook name, $adjacent, refers to the type + * The dynamic portion of the hook name, `$adjacent`, refers to the type * of adjacency, 'next' or 'previous'. * * @since 2.6.0 + * @since 4.2.0 Added the `$adjacent` parameter. * - * @param string $output The adjacent post link. - * @param string $format Link anchor format. - * @param string $link Link permalink format. - * @param WP_Post $post The adjacent post. + * @param string $output The adjacent post link. + * @param string $format Link anchor format. + * @param string $link Link permalink format. + * @param WP_Post $post The adjacent post. + * @param string $adjacent Whether the post is previous or next. */ - return apply_filters( "{$adjacent}_post_link", $output, $format, $link, $post ); + return apply_filters( "{$adjacent}_post_link", $output, $format, $link, $post, $adjacent ); } /** @@ -1871,18 +2034,16 @@ function get_adjacent_post_link( $format, $link, $in_same_cat = false, $excluded * Can be either next post link or previous. * * @since 2.5.0 - * @uses get_adjacent_post_link() * * @param string $format Link anchor format. * @param string $link Link permalink format. - * @param bool $in_same_cat Optional. Whether link should be in a same category. + * @param bool $in_same_term Optional. Whether link should be in a same taxonomy term. * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded category IDs. * @param bool $previous Optional. Whether to display link to previous or next post. Default true. * @param string $taxonomy Optional. Taxonomy, if $in_same_term is true. Default 'category'. - * @return string */ -function adjacent_post_link( $format, $link, $in_same_cat = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) { - echo get_adjacent_post_link( $format, $link, $in_same_cat, $excluded_terms, $previous, $taxonomy ); +function adjacent_post_link( $format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) { + echo get_adjacent_post_link( $format, $link, $in_same_term, $excluded_terms, $previous, $taxonomy ); } /** @@ -1890,10 +2051,12 @@ function adjacent_post_link( $format, $link, $in_same_cat = false, $excluded_ter * * @since 1.5.0 * - * @param int $pagenum Optional. Page ID. - * @param bool $escape Optional. Whether to escape the URL for display, with esc_url(). Defaults to true. -* Otherwise, prepares the URL with esc_url_raw(). - * @return string + * @global WP_Rewrite $wp_rewrite + * + * @param int $pagenum Optional. Page ID. + * @param bool $escape Optional. Whether to escape the URL for display, with esc_url(). Defaults to true. + * Otherwise, prepares the URL with esc_url_raw(). + * @return string The link URL for the given page number. */ function get_pagenum_link($pagenum = 1, $escape = true ) { global $wp_rewrite; @@ -1966,8 +2129,10 @@ function get_pagenum_link($pagenum = 1, $escape = true ) { * * @since 2.0.10 * + * @global int $paged + * * @param int $max_page Optional. Max pages. - * @return string + * @return string|void The link URL for next posts page. */ function get_next_posts_page_link($max_page = 0) { global $paged; @@ -1986,8 +2151,9 @@ function get_next_posts_page_link($max_page = 0) { * * @since 0.71 * - * @param int $max_page Optional. Max pages. - * @param boolean $echo Optional. Echo or return; + * @param int $max_page Optional. Max pages. + * @param bool $echo Optional. Echo or return; + * @return string|void The link URL for next posts page if `$echo = false`. */ function next_posts( $max_page = 0, $echo = true ) { $output = esc_url( get_next_posts_page_link( $max_page ) ); @@ -2003,9 +2169,12 @@ function next_posts( $max_page = 0, $echo = true ) { * * @since 2.7.0 * - * @param string $label Content for link text. - * @param int $max_page Optional. Max pages. - * @return string|null + * @global int $paged + * @global WP_Query $wp_query + * + * @param string $label Content for link text. + * @param int $max_page Optional. Max pages. + * @return string|void HTML-formatted next posts page link. */ function get_next_posts_link( $label = null, $max_page = 0 ) { global $paged, $wp_query; @@ -2039,10 +2208,9 @@ function get_next_posts_link( $label = null, $max_page = 0 ) { * Display the next posts page link. * * @since 0.71 - * @uses get_next_posts_link() * - * @param string $label Content for link text. - * @param int $max_page Optional. Max pages. + * @param string $label Content for link text. + * @param int $max_page Optional. Max pages. */ function next_posts_link( $label = null, $max_page = 0 ) { echo get_next_posts_link( $label, $max_page ); @@ -2057,7 +2225,9 @@ function next_posts_link( $label = null, $max_page = 0 ) { * * @since 2.0.10 * - * @return string|null + * @global int $paged + * + * @return string|void The link for the previous posts page. */ function get_previous_posts_page_link() { global $paged; @@ -2075,7 +2245,8 @@ function get_previous_posts_page_link() { * * @since 0.71 * - * @param boolean $echo Optional. Echo or return; + * @param bool $echo Optional. Echo or return; + * @return string|void The previous posts page link if `$echo = false`. */ function previous_posts( $echo = true ) { $output = esc_url( get_previous_posts_page_link() ); @@ -2091,8 +2262,10 @@ function previous_posts( $echo = true ) { * * @since 2.7.0 * + * @global int $paged + * * @param string $label Optional. Previous page link text. - * @return string|null + * @return string|void HTML-formatted previous page link. */ function get_previous_posts_link( $label = null ) { global $paged; @@ -2117,7 +2290,6 @@ function get_previous_posts_link( $label = null ) { * Display the previous posts page link. * * @since 0.71 - * @uses get_previous_posts_link() * * @param string $label Optional. Previous page link text. */ @@ -2130,6 +2302,8 @@ function previous_posts_link( $label = null ) { * * @since 2.8.0 * + * @global WP_Query $wp_query + * * @param string|array $args Optional args. * @return string The posts link navigation. */ @@ -2169,7 +2343,7 @@ function get_posts_nav_link( $args = array() ) { * * @since 0.71 * - * @param string $sep Optional. Separator for posts navigation links. + * @param string $sep Optional. Separator for posts navigation links. * @param string $prelabel Optional. Label for previous pages. * @param string $nxtlabel Optional Label for next pages. */ @@ -2178,13 +2352,241 @@ function posts_nav_link( $sep = '', $prelabel = '', $nxtlabel = '' ) { echo get_posts_nav_link($args); } +/** + * Return navigation to next/previous post when applicable. + * + * @since 4.1.0 + * @since 4.4.0 Introduced the `in_same_term`, `excluded_terms`, and `taxonomy` arguments. + * + * @param array $args { + * Optional. Default post navigation arguments. Default empty array. + * + * @type string $prev_text Anchor text to display in the previous post link. Default '%title'. + * @type string $next_text Anchor text to display in the next post link. Default '%title'. + * @type bool $in_same_term Whether link should be in a same taxonomy term. Default false. + * @type array|string $excluded_terms Array or comma-separated list of excluded term IDs. Default empty. + * @type string $taxonomy Taxonomy, if `$in_same_term` is true. Default 'category'. + * @type string $screen_reader_text Screen reader text for nav element. Default 'Post navigation'. + * } + * @return string Markup for post links. + */ +function get_the_post_navigation( $args = array() ) { + $args = wp_parse_args( $args, array( + 'prev_text' => '%title', + 'next_text' => '%title', + 'in_same_term' => false, + 'excluded_terms' => '', + 'taxonomy' => 'category', + 'screen_reader_text' => __( 'Post navigation' ), + ) ); + + $navigation = ''; + + $previous = get_previous_post_link( + '<div class="nav-previous">%link</div>', + $args['prev_text'], + $args['in_same_term'], + $args['excluded_terms'], + $args['taxonomy'] + ); + + $next = get_next_post_link( + '<div class="nav-next">%link</div>', + $args['next_text'], + $args['in_same_term'], + $args['excluded_terms'], + $args['taxonomy'] + ); + + // Only add markup if there's somewhere to navigate to. + if ( $previous || $next ) { + $navigation = _navigation_markup( $previous . $next, 'post-navigation', $args['screen_reader_text'] ); + } + + return $navigation; +} + +/** + * Display navigation to next/previous post when applicable. + * + * @since 4.1.0 + * + * @param array $args Optional. See {@see get_the_post_navigation()} for available + * arguments. Default empty array. + */ +function the_post_navigation( $args = array() ) { + echo get_the_post_navigation( $args ); +} + +/** + * Return navigation to next/previous set of posts when applicable. + * + * @since 4.1.0 + * + * @global WP_Query $wp_query WordPress Query object. + * + * @param array $args { + * Optional. Default posts navigation arguments. Default empty array. + * + * @type string $prev_text Anchor text to display in the previous posts link. + * Default 'Older posts'. + * @type string $next_text Anchor text to display in the next posts link. + * Default 'Newer posts'. + * @type string $screen_reader_text Screen reader text for nav element. + * Default 'Posts navigation'. + * } + * @return string Markup for posts links. + */ +function get_the_posts_navigation( $args = array() ) { + $navigation = ''; + + // Don't print empty markup if there's only one page. + if ( $GLOBALS['wp_query']->max_num_pages > 1 ) { + $args = wp_parse_args( $args, array( + 'prev_text' => __( 'Older posts' ), + 'next_text' => __( 'Newer posts' ), + 'screen_reader_text' => __( 'Posts navigation' ), + ) ); + + $next_link = get_previous_posts_link( $args['next_text'] ); + $prev_link = get_next_posts_link( $args['prev_text'] ); + + if ( $prev_link ) { + $navigation .= '<div class="nav-previous">' . $prev_link . '</div>'; + } + + if ( $next_link ) { + $navigation .= '<div class="nav-next">' . $next_link . '</div>'; + } + + $navigation = _navigation_markup( $navigation, 'posts-navigation', $args['screen_reader_text'] ); + } + + return $navigation; +} + +/** + * Display navigation to next/previous set of posts when applicable. + * + * @since 4.1.0 + * + * @param array $args Optional. See {@see get_the_posts_navigation()} for available + * arguments. Default empty array. + */ +function the_posts_navigation( $args = array() ) { + echo get_the_posts_navigation( $args ); +} + +/** + * Return a paginated navigation to next/previous set of posts, + * when applicable. + * + * @since 4.1.0 + * + * @param array $args { + * Optional. Default pagination arguments, {@see paginate_links()}. + * + * @type string $screen_reader_text Screen reader text for navigation element. + * Default 'Posts navigation'. + * } + * @return string Markup for pagination links. + */ +function get_the_posts_pagination( $args = array() ) { + $navigation = ''; + + // Don't print empty markup if there's only one page. + if ( $GLOBALS['wp_query']->max_num_pages > 1 ) { + $args = wp_parse_args( $args, array( + 'mid_size' => 1, + 'prev_text' => _x( 'Previous', 'previous post' ), + 'next_text' => _x( 'Next', 'next post' ), + 'screen_reader_text' => __( 'Posts navigation' ), + ) ); + + // Make sure we get a string back. Plain is the next best thing. + if ( isset( $args['type'] ) && 'array' == $args['type'] ) { + $args['type'] = 'plain'; + } + + // Set up paginated links. + $links = paginate_links( $args ); + + if ( $links ) { + $navigation = _navigation_markup( $links, 'pagination', $args['screen_reader_text'] ); + } + } + + return $navigation; +} + +/** + * Display a paginated navigation to next/previous set of posts, + * when applicable. + * + * @since 4.1.0 + * + * @param array $args Optional. See {@see get_the_posts_pagination()} for available arguments. + * Default empty array. + */ +function the_posts_pagination( $args = array() ) { + echo get_the_posts_pagination( $args ); +} + +/** + * Wraps passed links in navigational markup. + * + * @since 4.1.0 + * @access private + * + * @param string $links Navigational links. + * @param string $class Optional. Custom class for nav element. Default: 'posts-navigation'. + * @param string $screen_reader_text Optional. Screen reader text for nav element. Default: 'Posts navigation'. + * @return string Navigation template tag. + */ +function _navigation_markup( $links, $class = 'posts-navigation', $screen_reader_text = '' ) { + if ( empty( $screen_reader_text ) ) { + $screen_reader_text = __( 'Posts navigation' ); + } + + $template = ' + <nav class="navigation %1$s" role="navigation"> + <h2 class="screen-reader-text">%2$s</h2> + <div class="nav-links">%3$s</div> + </nav>'; + + /** + * Filter the navigation markup template. + * + * Note: The filtered template HTML must contain specifiers for the navigation + * class (%1$s), the screen-reader-text value (%2$s), and placement of the + * navigation links (%3$s): + * + * <nav class="navigation %1$s" role="navigation"> + * <h2 class="screen-reader-text">%2$s</h2> + * <div class="nav-links">%3$s</div> + * </nav> + * + * @since 4.4.0 + * + * @param string $template The default template. + * @param string $class The class passed by the calling function. + * @return string Navigation template. + */ + $template = apply_filters( 'navigation_markup_template', $template, $class ); + + return sprintf( $template, sanitize_html_class( $class ), esc_html( $screen_reader_text ), $links ); +} + /** * Retrieve comments page number link. * * @since 2.7.0 * - * @param int $pagenum Optional. Page number. - * @return string + * @global WP_Rewrite $wp_rewrite + * + * @param int $pagenum Optional. Page number. + * @param int $max_page Optional. The maximum number of comment pages. + * @return string The comments page number link URL. */ function get_comments_pagenum_link( $pagenum = 1, $max_page = 0 ) { global $wp_rewrite; @@ -2196,13 +2598,13 @@ function get_comments_pagenum_link( $pagenum = 1, $max_page = 0 ) { if ( 'newest' == get_option('default_comments_page') ) { if ( $pagenum != $max_page ) { if ( $wp_rewrite->using_permalinks() ) - $result = user_trailingslashit( trailingslashit($result) . 'comment-page-' . $pagenum, 'commentpaged'); + $result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged'); else $result = add_query_arg( 'cpage', $pagenum, $result ); } } elseif ( $pagenum > 1 ) { if ( $wp_rewrite->using_permalinks() ) - $result = user_trailingslashit( trailingslashit($result) . 'comment-page-' . $pagenum, 'commentpaged'); + $result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged'); else $result = add_query_arg( 'cpage', $pagenum, $result ); } @@ -2216,9 +2618,7 @@ function get_comments_pagenum_link( $pagenum = 1, $max_page = 0 ) { * * @param string $result The comments page number link. */ - $result = apply_filters( 'get_comments_pagenum_link', $result ); - - return $result; + return apply_filters( 'get_comments_pagenum_link', $result ); } /** @@ -2226,18 +2626,24 @@ function get_comments_pagenum_link( $pagenum = 1, $max_page = 0 ) { * * @since 2.7.1 * - * @param string $label Optional. Label for link text. - * @param int $max_page Optional. Max page. - * @return string|null + * @global WP_Query $wp_query + * + * @param string $label Optional. Label for link text. + * @param int $max_page Optional. Max page. + * @return string|void HTML-formatted link for the next page of comments. */ function get_next_comments_link( $label = '', $max_page = 0 ) { global $wp_query; - if ( !is_singular() || !get_option('page_comments') ) + if ( ! is_singular() ) return; $page = get_query_var('cpage'); + if ( ! $page ) { + $page = 1; + } + $nextpage = intval($page) + 1; if ( empty($max_page) ) @@ -2267,8 +2673,8 @@ function get_next_comments_link( $label = '', $max_page = 0 ) { * * @since 2.7.0 * - * @param string $label Optional. Label for link text. - * @param int $max_page Optional. Max page. + * @param string $label Optional. Label for link text. + * @param int $max_page Optional. Max page. */ function next_comments_link( $label = '', $max_page = 0 ) { echo get_next_comments_link( $label, $max_page ); @@ -2280,10 +2686,10 @@ function next_comments_link( $label = '', $max_page = 0 ) { * @since 2.7.1 * * @param string $label Optional. Label for comments link text. - * @return string|null + * @return string|void HTML-formatted link for the previous page of comments. */ function get_previous_comments_link( $label = '' ) { - if ( !is_singular() || !get_option('page_comments') ) + if ( ! is_singular() ) return; $page = get_query_var('cpage'); @@ -2323,13 +2729,15 @@ function previous_comments_link( $label = '' ) { * @see paginate_links() * @since 2.7.0 * + * @global WP_Rewrite $wp_rewrite + * * @param string|array $args Optional args. See paginate_links(). - * @return string Markup for pagination links. -*/ + * @return string|void Markup for pagination links. + */ function paginate_comments_links($args = array()) { global $wp_rewrite; - if ( !is_singular() || !get_option('page_comments') ) + if ( ! is_singular() ) return; $page = get_query_var('cpage'); @@ -2345,7 +2753,7 @@ function paginate_comments_links($args = array()) { 'add_fragment' => '#comments' ); if ( $wp_rewrite->using_permalinks() ) - $defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()) . 'comment-page-%#%', 'commentpaged'); + $defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()) . $wp_rewrite->comments_pagination_base . '-%#%', 'commentpaged'); $args = wp_parse_args( $args, $defaults ); $page_links = paginate_links( $args ); @@ -2356,6 +2764,105 @@ function paginate_comments_links($args = array()) { return $page_links; } +/** + * Returns navigation to next/previous set of comments when applicable. + * + * @since 4.4.0 + * + * @param array $args { + * Optional. Default comments navigation arguments. + * + * @type string $prev_text Anchor text to display in the previous comments link. Default 'Older comments'. + * @type string $next_text Anchor text to display in the next comments link. Default 'Newer comments'. + * @type string $screen_reader_text Screen reader text for nav element. Default 'Comments navigation'. + * } + * @return string Markup for comments links. + */ +function get_the_comments_navigation( $args = array() ) { + $navigation = ''; + + // Are there comments to navigate through? + if ( get_comment_pages_count() > 1 ) { + $args = wp_parse_args( $args, array( + 'prev_text' => __( 'Older comments' ), + 'next_text' => __( 'Newer comments' ), + 'screen_reader_text' => __( 'Comments navigation' ), + ) ); + + $prev_link = get_previous_comments_link( $args['prev_text'] ); + $next_link = get_next_comments_link( $args['next_text'] ); + + if ( $prev_link ) { + $navigation .= '<div class="nav-previous">' . $prev_link . '</div>'; + } + + if ( $next_link ) { + $navigation .= '<div class="nav-next">' . $next_link . '</div>'; + } + + $navigation = _navigation_markup( $navigation, 'comment-navigation', $args['screen_reader_text'] ); + } + + return $navigation; +} + +/** + * Displays navigation to next/previous set of comments when applicable. + * + * @since 4.4.0 + * + * @param array $args See {@see get_the_comments_navigation()} for available arguments. + */ +function the_comments_navigation( $args = array() ) { + echo get_the_comments_navigation( $args ); +} + +/** + * Returns a paginated navigation to next/previous set of comments, + * when applicable. + * + * @since 4.4.0 + * + * @see paginate_comments_links() + * + * @param array $args { + * Optional. Default pagination arguments. + * + * @type string $screen_reader_text Screen reader text for nav element. Default 'Comments navigation'. + * } + * @return string Markup for pagination links. + */ +function get_the_comments_pagination( $args = array() ) { + $navigation = ''; + $args = wp_parse_args( $args, array( + 'screen_reader_text' => __( 'Comments navigation' ), + ) ); + $args['echo'] = false; + + // Make sure we get plain links, so we get a string we can work with. + $args['type'] = 'plain'; + + $links = paginate_comments_links( $args ); + + if ( $links ) { + $navigation = _navigation_markup( $links, 'comments-pagination', $args['screen_reader_text'] ); + } + + return $navigation; +} + +/** + * Displays a paginated navigation to next/previous set of comments, + * when applicable. + * + * @since 4.4.0 + * + * @param array $args See {@see get_the_comments_pagination()} for available arguments. + */ +function the_comments_pagination( $args = array() ) { + echo get_the_comments_pagination( $args ); +} + /** * Retrieve the Press This bookmarklet link. * @@ -2363,26 +2870,50 @@ function paginate_comments_links($args = array()) { * * @since 2.6.0 * - * @return string + * @global bool $is_IE + * @global string $wp_version + * @global WP_Press_This $wp_press_this + * + * @return string The Press This bookmarklet link URL. */ function get_shortcut_link() { - // In case of breaking changes, version this. #WP20071 - $link = "javascript: - var d=document, - w=window, - e=w.getSelection, - k=d.getSelection, - x=d.selection, - s=(e?e():(k)?k():(x?x.createRange().text:0)), - f='" . admin_url('press-this.php') . "', - l=d.location, - e=encodeURIComponent, - u=f+'?u='+e(l.href)+'&t='+e(d.title)+'&s='+e(s)+'&v=4'; - a=function(){if(!w.open(u,'t','toolbar=0,resizable=1,scrollbars=1,status=1,width=720,height=570'))l.href=u;}; - if (/Firefox/.test(navigator.userAgent)) setTimeout(a, 0); else a(); - void(0)"; - - $link = str_replace(array("\r", "\n", "\t"), '', $link); + global $is_IE, $wp_version; + + include_once( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' ); + $bookmarklet_version = $GLOBALS['wp_press_this']->version; + $link = ''; + + if ( $is_IE ) { + /** + * Return the old/shorter bookmarklet code for MSIE 8 and lower, + * since they only support a max length of ~2000 characters for + * bookmark[let] URLs, which is way to small for our smarter one. + * Do update the version number so users do not get the "upgrade your + * bookmarklet" notice when using PT in those browsers. + */ + $ua = $_SERVER['HTTP_USER_AGENT']; + + if ( ! empty( $ua ) && preg_match( '/\bMSIE (\d)/', $ua, $matches ) && (int) $matches[1] <= 8 ) { + $url = wp_json_encode( admin_url( 'press-this.php' ) ); + + $link = 'javascript:var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,' . + 's=(e?e():(k)?k():(x?x.createRange().text:0)),f=' . $url . ',l=d.location,e=encodeURIComponent,' . + 'u=f+"?u="+e(l.href)+"&t="+e(d.title)+"&s="+e(s)+"&v=' . $bookmarklet_version . '";' . + 'a=function(){if(!w.open(u,"t","toolbar=0,resizable=1,scrollbars=1,status=1,width=600,height=700"))l.href=u;};' . + 'if(/Firefox/.test(navigator.userAgent))setTimeout(a,0);else a();void(0)'; + } + } + + if ( empty( $link ) ) { + $src = @file_get_contents( ABSPATH . 'wp-admin/js/bookmarklet.min.js' ); + + if ( $src ) { + $url = wp_json_encode( admin_url( 'press-this.php' ) . '?v=' . $bookmarklet_version ); + $link = 'javascript:' . str_replace( 'window.pt_url', $url, $src ); + } + } + + $link = str_replace( array( "\r", "\n", "\t" ), '', $link ); /** * Filter the Press This bookmarklet link. @@ -2395,39 +2926,44 @@ function get_shortcut_link() { } /** - * Retrieve the home url for the current site. + * Retrieve the URL for the current site where the front end is accessible. * * Returns the 'home' option with the appropriate protocol, 'https' if - * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is - * overridden. + * {@see is_ssl()} and 'http' otherwise. If `$scheme` is 'http' or 'https', + * `is_ssl()` is overridden. * * @since 3.0.0 * - * @uses get_home_url() - * - * @param string $path (optional) Path relative to the home url. - * @param string $scheme (optional) Scheme to give the home url context. Currently 'http', 'https', or 'relative'. + * @param string $path Optional. Path relative to the home url. Default empty. + * @param string|null $scheme Optional. Scheme to give the home url context. Accepts + * 'http', 'https', 'relative', 'rest', or null. Default null. * @return string Home url link with optional path appended. -*/ + */ function home_url( $path = '', $scheme = null ) { return get_home_url( null, $path, $scheme ); } /** - * Retrieve the home url for a given site. + * Retrieve the URL for a given site where the front end is accessible. * * Returns the 'home' option with the appropriate protocol, 'https' if - * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is + * {@see is_ssl()} and 'http' otherwise. If `$scheme` is 'http' or 'https', + * `is_ssl()` is * overridden. * * @since 3.0.0 * - * @param int $blog_id (optional) Blog ID. Defaults to current blog. - * @param string $path (optional) Path relative to the home url. - * @param string $scheme (optional) Scheme to give the home url context. Currently 'http', 'https', or 'relative'. - * @return string Home url link with optional path appended. -*/ + * @global string $pagenow + * + * @param int $blog_id Optional. Site ID. Default null (current site). + * @param string $path Optional. Path relative to the home URL. Default empty. + * @param string|null $scheme Optional. Scheme to give the home URL context. Accepts + * 'http', 'https', 'relative', 'rest', or null. Default null. + * @return string Home URL link with optional path appended. + */ function get_home_url( $blog_id = null, $path = '', $scheme = null ) { + global $pagenow; + $orig_scheme = $scheme; if ( empty( $blog_id ) || !is_multisite() ) { @@ -2439,7 +2975,7 @@ function get_home_url( $blog_id = null, $path = '', $scheme = null ) { } if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) { - if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $GLOBALS['pagenow'] ) + if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $pagenow ) $scheme = 'https'; else $scheme = parse_url( $url, PHP_URL_SCHEME ); @@ -2457,14 +2993,16 @@ function get_home_url( $blog_id = null, $path = '', $scheme = null ) { * * @param string $url The complete home URL including scheme and path. * @param string $path Path relative to the home URL. Blank string if no path is specified. - * @param string|null $orig_scheme Scheme to give the home URL context. Accepts 'http', 'https', 'relative' or null. - * @param int|null $blog_id Blog ID, or null for the current blog. + * @param string|null $orig_scheme Scheme to give the home URL context. Accepts 'http', 'https', + * 'relative', 'rest', or null. + * @param int|null $blog_id Site ID, or null for the current site. */ return apply_filters( 'home_url', $url, $path, $orig_scheme, $blog_id ); } /** - * Retrieve the site url for the current site. + * Retrieve the URL for the current site where WordPress application files + * (e.g. wp-blog-header.php or the wp-admin/ folder) are accessible. * * Returns the 'site_url' option with the appropriate protocol, 'https' if * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is @@ -2472,30 +3010,31 @@ function get_home_url( $blog_id = null, $path = '', $scheme = null ) { * * @since 3.0.0 * - * @uses get_site_url() - * - * @param string $path Optional. Path relative to the site url. + * @param string $path Optional. Path relative to the site url. * @param string $scheme Optional. Scheme to give the site url context. See set_url_scheme(). * @return string Site url link with optional path appended. -*/ + */ function site_url( $path = '', $scheme = null ) { return get_site_url( null, $path, $scheme ); } /** - * Retrieve the site url for a given site. + * Retrieve the URL for a given site where WordPress application files + * (e.g. wp-blog-header.php or the wp-admin/ folder) are accessible. * * Returns the 'site_url' option with the appropriate protocol, 'https' if - * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is - * overridden. + * {@see is_ssl()} and 'http' otherwise. If `$scheme` is 'http' or 'https', + * `is_ssl()` is overridden. * * @since 3.0.0 * - * @param int $blog_id (optional) Blog ID. Defaults to current blog. - * @param string $path Optional. Path relative to the site url. - * @param string $scheme Optional. Scheme to give the site url context. Currently 'http', 'https', 'login', 'login_post', 'admin', or 'relative'. + * @param int $blog_id Optional. Site ID. Default null (current site). + * @param string $path Optional. Path relative to the site url. Default empty. + * @param string $scheme Optional. Scheme to give the site url context. Accepts + * 'http', 'https', 'login', 'login_post', 'admin', or + * 'relative'. Default null. * @return string Site url link with optional path appended. -*/ + */ function get_site_url( $blog_id = null, $path = '', $scheme = null ) { if ( empty( $blog_id ) || !is_multisite() ) { $url = get_option( 'siteurl' ); @@ -2519,7 +3058,7 @@ function get_site_url( $blog_id = null, $path = '', $scheme = null ) { * @param string $path Path relative to the site URL. Blank string if no path is specified. * @param string|null $scheme Scheme to give the site URL context. Accepts 'http', 'https', 'login', * 'login_post', 'admin', 'relative' or null. - * @param int|null $blog_id Blog ID, or null for the current blog. + * @param int|null $blog_id Site ID, or null for the current site. */ return apply_filters( 'site_url', $url, $path, $scheme, $blog_id ); } @@ -2529,24 +3068,26 @@ function get_site_url( $blog_id = null, $path = '', $scheme = null ) { * * @since 2.6.0 * - * @param string $path Optional path relative to the admin url. + * @param string $path Optional path relative to the admin url. * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes. * @return string Admin url link with optional path appended. -*/ + */ function admin_url( $path = '', $scheme = 'admin' ) { return get_admin_url( null, $path, $scheme ); } /** - * Retrieve the url to the admin area for a given site. + * Retrieves the url to the admin area for a given site. * * @since 3.0.0 * - * @param int $blog_id (optional) Blog ID. Defaults to current blog. - * @param string $path Optional path relative to the admin url. - * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes. + * @param int $blog_id Optional. Site ID. Default null (current site). + * @param string $path Optional. Path relative to the admin url. Default empty. + * @param string $scheme Optional. The scheme to use. Accepts 'http' or 'https', + * to force those schemes. Default 'admin', which obeys + * {@see force_ssl_admin()} and {@see is_ssl()}. * @return string Admin url link with optional path appended. -*/ + */ function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) { $url = get_site_url($blog_id, 'wp-admin/', $scheme); @@ -2560,7 +3101,7 @@ function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) { * * @param string $url The complete admin area URL including scheme and path. * @param string $path Path relative to the admin area URL. Blank string if no path is specified. - * @param int|null $blog_id Blog ID, or null for the current blog. + * @param int|null $blog_id Site ID, or null for the current site. */ return apply_filters( 'admin_url', $url, $path, $blog_id ); } @@ -2570,10 +3111,10 @@ function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) { * * @since 2.6.0 * - * @param string $path Optional. Path relative to the includes url. + * @param string $path Optional. Path relative to the includes url. * @param string $scheme Optional. Scheme to give the includes url context. * @return string Includes url link with optional path appended. -*/ + */ function includes_url( $path = '', $scheme = null ) { $url = site_url( '/' . WPINC . '/', $scheme ); @@ -2599,7 +3140,7 @@ function includes_url( $path = '', $scheme = null ) { * * @param string $path Optional. Path relative to the content url. * @return string Content url link with optional path appended. -*/ + */ function content_url($path = '') { $url = set_url_scheme( WP_CONTENT_URL ); @@ -2619,22 +3160,24 @@ function content_url($path = '') { } /** - * Retrieve the url to the plugins directory or to a specific file within that directory. - * You can hardcode the plugin slug in $path or pass __FILE__ as a second argument to get the correct folder name. + * Retrieve a URL within the plugins or mu-plugins directory. + * + * Defaults to the plugins directory URL if no arguments are supplied. * * @since 2.6.0 * - * @param string $path Optional. Path relative to the plugins url. - * @param string $plugin Optional. The plugin file that you want to be relative to - i.e. pass in __FILE__ - * @return string Plugins url link with optional path appended. -*/ -function plugins_url($path = '', $plugin = '') { + * @param string $path Optional. Extra path appended to the end of the URL, including + * the relative directory if $plugin is supplied. Default empty. + * @param string $plugin Optional. A full path to a file inside a plugin or mu-plugin. + * The URL will be relative to its directory. Default empty. + * Typically this is done by passing `__FILE__` as the argument. + * @return string Plugins URL link with optional paths appended. + */ +function plugins_url( $path = '', $plugin = '' ) { - $mu_plugin_dir = WPMU_PLUGIN_DIR; - foreach ( array('path', 'plugin', 'mu_plugin_dir') as $var ) { - $$var = str_replace('\\' ,'/', $$var); // sanitize for Win32 installs - $$var = preg_replace('|/+|', '/', $$var); - } + $path = wp_normalize_path( $path ); + $plugin = wp_normalize_path( $plugin ); + $mu_plugin_dir = wp_normalize_path( WPMU_PLUGIN_DIR ); if ( !empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir) ) $url = WPMU_PLUGIN_URL; @@ -2676,10 +3219,10 @@ function plugins_url($path = '', $plugin = '') { * * @since 3.0.0 * - * @param string $path Optional. Path relative to the site url. + * @param string $path Optional. Path relative to the site url. * @param string $scheme Optional. Scheme to give the site url context. See set_url_scheme(). * @return string Site url link with optional path appended. -*/ + */ function network_site_url( $path = '', $scheme = null ) { if ( ! is_multisite() ) return site_url($path, $scheme); @@ -2709,18 +3252,19 @@ function network_site_url( $path = '', $scheme = null ) { } /** - * Retrieve the home url for the current network. + * Retrieves the home url for the current network. * - * Returns the home url with the appropriate protocol, 'https' if - * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is + * Returns the home url with the appropriate protocol, 'https' {@see is_ssl()} + * and 'http' otherwise. If `$scheme` is 'http' or 'https', `is_ssl()` is * overridden. * * @since 3.0.0 * - * @param string $path (optional) Path relative to the home url. - * @param string $scheme (optional) Scheme to give the home url context. Currently 'http', 'https', or 'relative'. + * @param string $path Optional. Path relative to the home url. Default empty. + * @param string $scheme Optional. Scheme to give the home url context. Accepts + * 'http', 'https', or 'relative'. Default null. * @return string Home url link with optional path appended. -*/ + */ function network_home_url( $path = '', $scheme = null ) { if ( ! is_multisite() ) return home_url($path, $scheme); @@ -2758,10 +3302,10 @@ function network_home_url( $path = '', $scheme = null ) { * * @since 3.0.0 * - * @param string $path Optional path relative to the admin url. + * @param string $path Optional path relative to the admin url. * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes. * @return string Admin url link with optional path appended. -*/ + */ function network_admin_url( $path = '', $scheme = 'admin' ) { if ( ! is_multisite() ) return admin_url( $path, $scheme ); @@ -2788,10 +3332,10 @@ function network_admin_url( $path = '', $scheme = 'admin' ) { * * @since 3.0.0 * - * @param string $path Optional path relative to the admin url. + * @param string $path Optional path relative to the admin url. * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes. * @return string Admin url link with optional path appended. -*/ + */ function user_admin_url( $path = '', $scheme = 'admin' ) { $url = network_site_url('wp-admin/user/', $scheme); @@ -2811,14 +3355,14 @@ function user_admin_url( $path = '', $scheme = 'admin' ) { } /** - * Retrieve the url to the admin area for either the current blog or the network depending on context. + * Retrieve the url to the admin area for either the current site or the network depending on context. * * @since 3.1.0 * - * @param string $path Optional path relative to the admin url. + * @param string $path Optional path relative to the admin url. * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes. * @return string Admin url link with optional path appended. -*/ + */ function self_admin_url($path = '', $scheme = 'admin') { if ( is_network_admin() ) return network_admin_url($path, $scheme); @@ -2829,25 +3373,25 @@ function self_admin_url($path = '', $scheme = 'admin') { } /** - * Set the scheme for a URL + * Sets the scheme for a URL. * * @since 3.4.0 + * @since 4.4.0 The 'rest' scheme was added. * - * @param string $url Absolute url that includes a scheme - * @param string $scheme Optional. Scheme to give $url. Currently 'http', 'https', 'login', 'login_post', 'admin', or 'relative'. + * @param string $url Absolute url that includes a scheme + * @param string|null $scheme Optional. Scheme to give $url. Currently 'http', 'https', 'login', + * 'login_post', 'admin', 'relative', 'rest', 'rpc', or null. Default null. * @return string $url URL with chosen scheme. */ function set_url_scheme( $url, $scheme = null ) { $orig_scheme = $scheme; - if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) { - if ( ( 'login_post' == $scheme || 'rpc' == $scheme ) && ( force_ssl_login() || force_ssl_admin() ) ) - $scheme = 'https'; - elseif ( ( 'login' == $scheme ) && force_ssl_admin() ) - $scheme = 'https'; - elseif ( ( 'admin' == $scheme ) && force_ssl_admin() ) - $scheme = 'https'; - else - $scheme = ( is_ssl() ? 'https' : 'http' ); + + if ( ! $scheme ) { + $scheme = is_ssl() ? 'https' : 'http'; + } elseif ( $scheme === 'admin' || $scheme === 'login' || $scheme === 'login_post' || $scheme === 'rpc' ) { + $scheme = is_ssl() || force_ssl_admin() ? 'https' : 'http'; + } elseif ( $scheme !== 'http' && $scheme !== 'https' && $scheme !== 'relative' ) { + $scheme = is_ssl() ? 'https' : 'http'; } $url = trim( $url ); @@ -2867,10 +3411,10 @@ function set_url_scheme( $url, $scheme = null ) { * * @since 3.4.0 * - * @param string $url The complete URL including scheme and path. - * @param string $scheme Scheme applied to the URL. One of 'http', 'https', or 'relative'. - * @param string $orig_scheme Scheme requested for the URL. One of 'http', 'https', 'login', - * 'login_post', 'admin', 'rpc', or 'relative'. + * @param string $url The complete URL including scheme and path. + * @param string $scheme Scheme applied to the URL. One of 'http', 'https', or 'relative'. + * @param string|null $orig_scheme Scheme requested for the URL. One of 'http', 'https', 'login', + * 'login_post', 'admin', 'relative', 'rest', 'rpc', or null. */ return apply_filters( 'set_url_scheme', $url, $scheme, $orig_scheme ); } @@ -2880,13 +3424,13 @@ function set_url_scheme( $url, $scheme = null ) { * * If a user does not belong to any site, the global user dashboard is used. If the user belongs to the current site, * the dashboard for the current site is returned. If the user cannot edit the current site, the dashboard to the user's - * primary blog is returned. + * primary site is returned. * * @since 3.1.0 * - * @param int $user_id Optional. User ID. Defaults to current user. - * @param string $path Optional path relative to the dashboard. Use only paths known to both blog and user admins. - * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes. + * @param int $user_id Optional. User ID. Defaults to current user. + * @param string $path Optional path relative to the dashboard. Use only paths known to both site and user admins. + * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes. * @return string Dashboard url link with optional path appended. */ function get_dashboard_url( $user_id = 0, $path = '', $scheme = 'admin' ) { @@ -2961,25 +3505,36 @@ function get_edit_profile_url( $user_id = 0, $scheme = 'admin' ) { * Output rel=canonical for singular queries. * * @since 2.9.0 -*/ + */ function rel_canonical() { - if ( !is_singular() ) + if ( ! is_singular() ) { return; + } - global $wp_the_query; - if ( !$id = $wp_the_query->get_queried_object_id() ) + if ( ! $id = get_queried_object_id() ) { return; + } - $link = get_permalink( $id ); + $url = get_permalink( $id ); - if ( $page = get_query_var('cpage') ) - $link = get_comments_pagenum_link( $page ); + $page = get_query_var( 'page' ); + if ( $page >= 2 ) { + if ( '' == get_option( 'permalink_structure' ) ) { + $url = add_query_arg( 'page', $page, $url ); + } else { + $url = trailingslashit( $url ) . user_trailingslashit( $page, 'single_paged' ); + } + } - echo "<link rel='canonical' href='$link' />\n"; + $cpage = get_query_var( 'cpage' ); + if ( $cpage ) { + $url = get_comments_pagenum_link( $cpage ); + } + echo '<link rel="canonical" href="' . esc_url( $url ) . "\" />\n"; } /** - * Return a shortlink for a post, page, attachment, or blog. + * Return a shortlink for a post, page, attachment, or a site. * * This function exists to provide a shortlink tag that all themes and plugins can target. A plugin must hook in to * provide the actual shortlinks. Default shortlink support is limited to providing ?p= style links for posts. @@ -2988,9 +3543,12 @@ function rel_canonical() { * * @since 3.0.0. * - * @param int $id A post or blog id. Default is 0, which means the current post or blog. - * @param string $context Whether the id is a 'blog' id, 'post' id, or 'media' id. If 'post', the post_type of the post is consulted. If 'query', the current query is consulted to determine the id and context. Default is 'post'. - * @param bool $allow_slugs Whether to allow post slugs in the shortlink. It is up to the plugin how and whether to honor this. + * @param int $id A post or site id. Default is 0, which means the current post or site. + * @param string $context Whether the id is a 'site' id, 'post' id, or 'media' id. + * If 'post', the post_type of the post is consulted. + * If 'query', the current query is consulted to determine the id and context. + * Default is 'post'. + * @param bool $allow_slugs Whether to allow post slugs in the shortlink. It is up to the plugin how and whether to honor this. * @return string A shortlink or an empty string if no shortlink exists for the requested resource or if shortlinks are not enabled. */ function wp_get_shortlink($id = 0, $context = 'post', $allow_slugs = true) { @@ -3009,13 +3567,13 @@ function wp_get_shortlink($id = 0, $context = 'post', $allow_slugs = true) { */ $shortlink = apply_filters( 'pre_get_shortlink', false, $id, $context, $allow_slugs ); - if ( false !== $shortlink ) + if ( false !== $shortlink ) { return $shortlink; + } - global $wp_query; $post_id = 0; if ( 'query' == $context && is_singular() ) { - $post_id = $wp_query->get_queried_object_id(); + $post_id = get_queried_object_id(); $post = get_post( $post_id ); } elseif ( 'post' == $context ) { $post = get_post( $id ); @@ -3055,8 +3613,6 @@ function wp_get_shortlink($id = 0, $context = 'post', $allow_slugs = true) { * Attached to the wp_head action. * * @since 3.0.0 - * - * @uses wp_get_shortlink() */ function wp_shortlink_wp_head() { $shortlink = wp_get_shortlink( 0, 'query' ); @@ -3073,8 +3629,6 @@ function wp_shortlink_wp_head() { * Attached to the wp action. * * @since 3.0.0 - * - * @uses wp_get_shortlink() */ function wp_shortlink_header() { if ( headers_sent() ) @@ -3097,10 +3651,10 @@ function wp_shortlink_header() { * * @since 3.0.0 * - * @param string $text Optional The link text or HTML to be displayed. Defaults to 'This is the short link.' - * @param string $title Optional The tooltip for the link. Must be sanitized. Defaults to the sanitized post title. + * @param string $text Optional The link text or HTML to be displayed. Defaults to 'This is the short link.' + * @param string $title Optional The tooltip for the link. Must be sanitized. Defaults to the sanitized post title. * @param string $before Optional HTML to display before the link. - * @param string $after Optional HTML to display after the link. + * @param string $after Optional HTML to display after the link. */ function the_shortlink( $text = '', $title = '', $before = '', $after = '' ) { $post = get_post(); @@ -3130,3 +3684,259 @@ function the_shortlink( $text = '', $title = '', $before = '', $after = '' ) { echo $before, $link, $after; } } + + +/** + * Retrieve the avatar URL. + * + * @since 4.2.0 + * + * @param mixed $id_or_email The Gravatar to retrieve a URL for. Accepts a user_id, gravatar md5 hash, + * user email, WP_User object, WP_Post object, or WP_Comment object. + * @param array $args { + * Optional. Arguments to return instead of the default arguments. + * + * @type int $size Height and width of the avatar in pixels. Default 96. + * @type string $default URL for the default image or a default type. Accepts '404' (return + * a 404 instead of a default image), 'retro' (8bit), 'monsterid' (monster), + * 'wavatar' (cartoon face), 'indenticon' (the "quilt"), 'mystery', 'mm', + * or 'mysteryman' (The Oyster Man), 'blank' (transparent GIF), or + * 'gravatar_default' (the Gravatar logo). Default is the value of the + * 'avatar_default' option, with a fallback of 'mystery'. + * @type bool $force_default Whether to always show the default image, never the Gravatar. Default false. + * @type string $rating What rating to display avatars up to. Accepts 'G', 'PG', 'R', 'X', and are + * judged in that order. Default is the value of the 'avatar_rating' option. + * @type string $scheme URL scheme to use. See set_url_scheme() for accepted values. + * Default null. + * @type array $processed_args When the function returns, the value will be the processed/sanitized $args + * plus a "found_avatar" guess. Pass as a reference. Default null. + * } + * @return false|string The URL of the avatar we found, or false if we couldn't find an avatar. + */ +function get_avatar_url( $id_or_email, $args = null ) { + $args = get_avatar_data( $id_or_email, $args ); + return $args['url']; +} + +/** + * Retrieve default data about the avatar. + * + * @since 4.2.0 + * + * @param mixed $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash, + * user email, WP_User object, WP_Post object, or WP_Comment object. + * @param array $args { + * Optional. Arguments to return instead of the default arguments. + * + * @type int $size Height and width of the avatar image file in pixels. Default 96. + * @type int $height Display height of the avatar in pixels. Defaults to $size. + * @type int $width Display width of the avatar in pixels. Defaults to $size. + * @type string $default URL for the default image or a default type. Accepts '404' (return + * a 404 instead of a default image), 'retro' (8bit), 'monsterid' (monster), + * 'wavatar' (cartoon face), 'indenticon' (the "quilt"), 'mystery', 'mm', + * or 'mysteryman' (The Oyster Man), 'blank' (transparent GIF), or + * 'gravatar_default' (the Gravatar logo). Default is the value of the + * 'avatar_default' option, with a fallback of 'mystery'. + * @type bool $force_default Whether to always show the default image, never the Gravatar. Default false. + * @type string $rating What rating to display avatars up to. Accepts 'G', 'PG', 'R', 'X', and are + * judged in that order. Default is the value of the 'avatar_rating' option. + * @type string $scheme URL scheme to use. See set_url_scheme() for accepted values. + * Default null. + * @type array $processed_args When the function returns, the value will be the processed/sanitized $args + * plus a "found_avatar" guess. Pass as a reference. Default null. + * @type string $extra_attr HTML attributes to insert in the IMG element. Is not sanitized. Default empty. + * } + * @return array $processed_args { + * Along with the arguments passed in `$args`, this will contain a couple of extra arguments. + * + * @type bool $found_avatar True if we were able to find an avatar for this user, + * false or not set if we couldn't. + * @type string $url The URL of the avatar we found. + * } + */ +function get_avatar_data( $id_or_email, $args = null ) { + $args = wp_parse_args( $args, array( + 'size' => 96, + 'height' => null, + 'width' => null, + 'default' => get_option( 'avatar_default', 'mystery' ), + 'force_default' => false, + 'rating' => get_option( 'avatar_rating' ), + 'scheme' => null, + 'processed_args' => null, // if used, should be a reference + 'extra_attr' => '', + ) ); + + if ( is_numeric( $args['size'] ) ) { + $args['size'] = absint( $args['size'] ); + if ( ! $args['size'] ) { + $args['size'] = 96; + } + } else { + $args['size'] = 96; + } + + if ( is_numeric( $args['height'] ) ) { + $args['height'] = absint( $args['height'] ); + if ( ! $args['height'] ) { + $args['height'] = $args['size']; + } + } else { + $args['height'] = $args['size']; + } + + if ( is_numeric( $args['width'] ) ) { + $args['width'] = absint( $args['width'] ); + if ( ! $args['width'] ) { + $args['width'] = $args['size']; + } + } else { + $args['width'] = $args['size']; + } + + if ( empty( $args['default'] ) ) { + $args['default'] = get_option( 'avatar_default', 'mystery' ); + } + + switch ( $args['default'] ) { + case 'mm' : + case 'mystery' : + case 'mysteryman' : + $args['default'] = 'mm'; + break; + case 'gravatar_default' : + $args['default'] = false; + break; + } + + $args['force_default'] = (bool) $args['force_default']; + + $args['rating'] = strtolower( $args['rating'] ); + + $args['found_avatar'] = false; + + /** + * Filter whether to retrieve the avatar URL early. + * + * Passing a non-null value in the 'url' member of the return array will + * effectively short circuit get_avatar_data(), passing the value through + * the {@see 'get_avatar_data'} filter and returning early. + * + * @since 4.2.0 + * + * @param array $args Arguments passed to get_avatar_data(), after processing. + * @param mixed $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash, + * user email, WP_User object, WP_Post object, or WP_Comment object. + */ + $args = apply_filters( 'pre_get_avatar_data', $args, $id_or_email ); + + if ( isset( $args['url'] ) && ! is_null( $args['url'] ) ) { + /** This filter is documented in wp-includes/link-template.php */ + return apply_filters( 'get_avatar_data', $args, $id_or_email ); + } + + $email_hash = ''; + $user = $email = false; + + if ( is_object( $id_or_email ) && isset( $id_or_email->comment_ID ) ) { + $id_or_email = get_comment( $id_or_email ); + } + + // Process the user identifier. + if ( is_numeric( $id_or_email ) ) { + $user = get_user_by( 'id', absint( $id_or_email ) ); + } elseif ( is_string( $id_or_email ) ) { + if ( strpos( $id_or_email, '@md5.gravatar.com' ) ) { + // md5 hash + list( $email_hash ) = explode( '@', $id_or_email ); + } else { + // email address + $email = $id_or_email; + } + } elseif ( $id_or_email instanceof WP_User ) { + // User Object + $user = $id_or_email; + } elseif ( $id_or_email instanceof WP_Post ) { + // Post Object + $user = get_user_by( 'id', (int) $id_or_email->post_author ); + } elseif ( $id_or_email instanceof WP_Comment ) { + /** + * Filter the list of allowed comment types for retrieving avatars. + * + * @since 3.0.0 + * + * @param array $types An array of content types. Default only contains 'comment'. + */ + $allowed_comment_types = apply_filters( 'get_avatar_comment_types', array( 'comment' ) ); + if ( ! empty( $id_or_email->comment_type ) && ! in_array( $id_or_email->comment_type, (array) $allowed_comment_types ) ) { + $args['url'] = false; + /** This filter is documented in wp-includes/link-template.php */ + return apply_filters( 'get_avatar_data', $args, $id_or_email ); + } + + if ( ! empty( $id_or_email->user_id ) ) { + $user = get_user_by( 'id', (int) $id_or_email->user_id ); + } + if ( ( ! $user || is_wp_error( $user ) ) && ! empty( $id_or_email->comment_author_email ) ) { + $email = $id_or_email->comment_author_email; + } + } + + if ( ! $email_hash ) { + if ( $user ) { + $email = $user->user_email; + } + + if ( $email ) { + $email_hash = md5( strtolower( trim( $email ) ) ); + } + } + + if ( $email_hash ) { + $args['found_avatar'] = true; + $gravatar_server = hexdec( $email_hash[0] ) % 3; + } else { + $gravatar_server = rand( 0, 2 ); + } + + $url_args = array( + 's' => $args['size'], + 'd' => $args['default'], + 'f' => $args['force_default'] ? 'y' : false, + 'r' => $args['rating'], + ); + + if ( is_ssl() ) { + $url = 'https://secure.gravatar.com/avatar/' . $email_hash; + } else { + $url = sprintf( 'http://%d.gravatar.com/avatar/%s', $gravatar_server, $email_hash ); + } + + $url = add_query_arg( + rawurlencode_deep( array_filter( $url_args ) ), + set_url_scheme( $url, $args['scheme'] ) + ); + + /** + * Filter the avatar URL. + * + * @since 4.2.0 + * + * @param string $url The URL of the avatar. + * @param mixed $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash, + * user email, WP_User object, WP_Post object, or WP_Comment object. + * @param array $args Arguments passed to get_avatar_data(), after processing. + */ + $args['url'] = apply_filters( 'get_avatar_url', $url, $id_or_email, $args ); + + /** + * Filter the avatar data. + * + * @since 4.2.0 + * + * @param array $args Arguments passed to get_avatar_data(), after processing. + * @param mixed $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash, + * user email, WP_User object, WP_Post object, or WP_Comment object. + */ + return apply_filters( 'get_avatar_data', $args, $id_or_email ); +} diff --git a/wp-includes/load.php b/wp-includes/load.php index f46572e..2f2d95b 100644 --- a/wp-includes/load.php +++ b/wp-includes/load.php @@ -7,12 +7,26 @@ * @package WordPress */ +/** + * Return the HTTP protocol sent by the server. + * + * @since 4.4.0 + * + * @return string The HTTP protocol. Default: HTTP/1.0. + */ +function wp_get_server_protocol() { + $protocol = $_SERVER['SERVER_PROTOCOL']; + if ( ! in_array( $protocol, array( 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0' ) ) ) { + $protocol = 'HTTP/1.0'; + } + return $protocol; +} + /** * Turn register globals off. * - * @access private * @since 2.1.0 - * @return null Will return null if register_globals PHP directive was disabled + * @access private */ function wp_unregister_GLOBALS() { if ( !ini_get( 'register_globals' ) ) @@ -32,10 +46,13 @@ function wp_unregister_GLOBALS() { } /** - * Fix $_SERVER variables for various setups. + * Fix `$_SERVER` variables for various setups. * - * @access private * @since 3.0.0 + * @access private + * + * @global string $PHP_SELF The filename of the currently executing script, + * relative to the document root. */ function wp_fix_server_vars() { global $PHP_SELF; @@ -48,14 +65,14 @@ function wp_fix_server_vars() { $_SERVER = array_merge( $default_server_values, $_SERVER ); // Fix for IIS when running with PHP ISAPI - if ( empty( $_SERVER['REQUEST_URI'] ) || ( php_sapi_name() != 'cgi-fcgi' && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) { + if ( empty( $_SERVER['REQUEST_URI'] ) || ( PHP_SAPI != 'cgi-fcgi' && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) { // IIS Mod-Rewrite if ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ) { $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_ORIGINAL_URL']; } // IIS Isapi_Rewrite - else if ( isset( $_SERVER['HTTP_X_REWRITE_URL'] ) ) { + elseif ( isset( $_SERVER['HTTP_X_REWRITE_URL'] ) ) { $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL']; } else { // Use ORIG_PATH_INFO if there is no PATH_INFO @@ -92,31 +109,43 @@ function wp_fix_server_vars() { } /** - * Check for the required PHP version, and the MySQL extension or a database drop-in. + * Check for the required PHP version, and the MySQL extension or + * a database drop-in. * * Dies if requirements are not met. * - * @access private * @since 3.0.0 + * @access private + * + * @global string $required_php_version The required PHP version string. + * @global string $wp_version The WordPress version string. */ function wp_check_php_mysql_versions() { global $required_php_version, $wp_version; $php_version = phpversion(); + if ( version_compare( $required_php_version, $php_version, '>' ) ) { wp_load_translations_early(); + + $protocol = wp_get_server_protocol(); + header( sprintf( '%s 500 Internal Server Error', $protocol ), true, 500 ); header( 'Content-Type: text/html; charset=utf-8' ); die( sprintf( __( 'Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.' ), $php_version, $wp_version, $required_php_version ) ); } - if ( ! extension_loaded( 'mysql' ) && ! extension_loaded( 'mysqli' ) && ! file_exists( WP_CONTENT_DIR . '/db.php' ) ) { + if ( ! extension_loaded( 'mysql' ) && ! extension_loaded( 'mysqli' ) && ! extension_loaded( 'mysqlnd' ) && ! file_exists( WP_CONTENT_DIR . '/db.php' ) ) { wp_load_translations_early(); - header( 'Content-Type: text/html; charset=utf-8' ); + + $protocol = wp_get_server_protocol(); + header( sprintf( '%s 500 Internal Server Error', $protocol ), true, 500 ); + header( 'Content-Type: text/html; charset=utf-8' ); die( __( 'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.' ) ); } } /** * Don't load all of WordPress when handling a favicon.ico request. + * * Instead, send the headers for a zero-length favicon and bail. * * @since 3.0.0 @@ -124,13 +153,12 @@ function wp_check_php_mysql_versions() { function wp_favicon_request() { if ( '/favicon.ico' == $_SERVER['REQUEST_URI'] ) { header('Content-Type: image/vnd.microsoft.icon'); - header('Content-Length: 0'); exit; } } /** - * Dies with a maintenance message when conditions are met. + * Die with a maintenance message when conditions are met. * * Checks for a file in the WordPress root directory named ".maintenance". * This file will contain the variable $upgrading, set to the time the file @@ -140,11 +168,13 @@ function wp_favicon_request() { * The default message can be replaced by using a drop-in (maintenance.php in * the wp-content directory). * - * @access private * @since 3.0.0 + * @access private + * + * @global int $upgrading the unix timestamp marking when upgrading WordPress began. */ function wp_maintenance() { - if ( !file_exists( ABSPATH . '.maintenance' ) || defined( 'WP_INSTALLING' ) ) + if ( ! file_exists( ABSPATH . '.maintenance' ) || wp_installing() ) return; global $upgrading; @@ -161,9 +191,7 @@ function wp_maintenance() { wp_load_translations_early(); - $protocol = $_SERVER["SERVER_PROTOCOL"]; - if ( 'HTTP/1.1' != $protocol && 'HTTP/1.0' != $protocol ) - $protocol = 'HTTP/1.0'; + $protocol = wp_get_server_protocol(); header( "$protocol 503 Service Unavailable", true, 503 ); header( 'Content-Type: text/html; charset=utf-8' ); header( 'Retry-After: 600' ); @@ -184,11 +212,14 @@ function wp_maintenance() { } /** - * PHP 5 standard microtime start capture. + * Start the WordPress micro-timer. * - * @access private * @since 0.71 - * @global float $timestart Seconds from when function is called. + * @access private + * + * @global float $timestart Unix timestamp set at the beginning of the page load. + * @see timer_stop() + * * @return bool Always returns true. */ function timer_start() { @@ -202,13 +233,13 @@ function timer_start() { * * @since 0.71 * - * @global float $timestart Seconds from when timer_start() is called. - * @global float $timeend Seconds from when function is called. + * @global float $timestart Seconds from when timer_start() is called. + * @global float $timeend Seconds from when function is called. * - * @param int $display Whether to echo or return the results. Accepts 0|false for return, - * 1|true for echo. Default 0|false. - * @param int $precision The number of digits from the right of the decimal to display. - * Default 3. + * @param int|bool $display Whether to echo or return the results. Accepts 0|false for return, + * 1|true for echo. Default 0|false. + * @param int $precision The number of digits from the right of the decimal to display. + * Default 3. * @return string The "second.microsecond" finished time calculation. The number is formatted * for human consumption, both localized and rounded. */ @@ -223,33 +254,35 @@ function timer_stop( $display = 0, $precision = 3 ) { } /** - * Sets PHP error handling and handles WordPress debug mode. + * Set PHP error reporting based on WordPress debug settings. * - * Uses three constants: WP_DEBUG, WP_DEBUG_DISPLAY, and WP_DEBUG_LOG. All three can be - * defined in wp-config.php. Example: <code> define( 'WP_DEBUG', true ); </code> + * Uses three constants: `WP_DEBUG`, `WP_DEBUG_DISPLAY`, and `WP_DEBUG_LOG`. + * All three can be defined in wp-config.php. By default, `WP_DEBUG` and + * `WP_DEBUG_LOG` are set to false, and `WP_DEBUG_DISPLAY` is set to true. * - * WP_DEBUG_DISPLAY and WP_DEBUG_LOG perform no function unless WP_DEBUG is true. - * WP_DEBUG defaults to false. + * When `WP_DEBUG` is true, all PHP notices are reported. WordPress will also + * display internal notices: when a deprecated WordPress function, function + * argument, or file is used. Deprecated code may be removed from a later + * version. * - * When WP_DEBUG is true, all PHP notices are reported. WordPress will also display - * notices, including one when a deprecated WordPress function, function argument, - * or file is used. Deprecated code may be removed from a later version. + * It is strongly recommended that plugin and theme developers use `WP_DEBUG` + * in their development environments. * - * It is strongly recommended that plugin and theme developers use WP_DEBUG in their - * development environments. + * `WP_DEBUG_DISPLAY` and `WP_DEBUG_LOG` perform no function unless `WP_DEBUG` + * is true. * - * When WP_DEBUG_DISPLAY is true, WordPress will force errors to be displayed. - * WP_DEBUG_DISPLAY defaults to true. Defining it as null prevents WordPress from - * changing the global configuration setting. Defining WP_DEBUG_DISPLAY as false - * will force errors to be hidden. + * When `WP_DEBUG_DISPLAY` is true, WordPress will force errors to be displayed. + * `WP_DEBUG_DISPLAY` defaults to true. Defining it as null prevents WordPress + * from changing the global configuration setting. Defining `WP_DEBUG_DISPLAY` + * as false will force errors to be hidden. * - * When WP_DEBUG_LOG is true, errors will be logged to wp-content/debug.log. - * WP_DEBUG_LOG defaults to false. + * When `WP_DEBUG_LOG` is true, errors will be logged to debug.log in the content + * directory. * - * Errors are never displayed for XML-RPC requests. + * Errors are never displayed for XML-RPC, REST, and Ajax requests. * - * @access private * @since 3.0.0 + * @access private */ function wp_debug_mode() { if ( WP_DEBUG ) { @@ -267,35 +300,49 @@ function wp_debug_mode() { } else { error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR ); } - if ( defined( 'XMLRPC_REQUEST' ) ) + + if ( defined( 'XMLRPC_REQUEST' ) || defined( 'REST_REQUEST' ) || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) { ini_set( 'display_errors', 0 ); + } } /** - * Sets the location of the language directory. + * Set the location of the language directory. * - * To set directory manually, define <code>WP_LANG_DIR</code> in wp-config.php. - * - * If the language directory exists within WP_CONTENT_DIR, that is used. - * Otherwise if the language directory exists within WPINC, that's used. - * Finally, if neither of the preceding directories are found, - * WP_CONTENT_DIR/languages is used. + * To set directory manually, define the `WP_LANG_DIR` constant + * in wp-config.php. * - * The WP_LANG_DIR constant was introduced in 2.1.0. + * If the language directory exists within `WP_CONTENT_DIR`, it + * is used. Otherwise the language directory is assumed to live + * in `WPINC`. * - * @access private * @since 3.0.0 + * @access private */ function wp_set_lang_dir() { if ( !defined( 'WP_LANG_DIR' ) ) { if ( file_exists( WP_CONTENT_DIR . '/languages' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) || !@is_dir(ABSPATH . WPINC . '/languages') ) { - define( 'WP_LANG_DIR', WP_CONTENT_DIR . '/languages' ); // no leading slash, no trailing slash, full path, not relative to ABSPATH + /** + * Server path of the language directory. + * + * No leading slash, no trailing slash, full path, not relative to ABSPATH + * + * @since 2.1.0 + */ + define( 'WP_LANG_DIR', WP_CONTENT_DIR . '/languages' ); if ( !defined( 'LANGDIR' ) ) { // Old static relative path maintained for limited backwards compatibility - won't work in some cases define( 'LANGDIR', 'wp-content/languages' ); } } else { - define( 'WP_LANG_DIR', ABSPATH . WPINC . '/languages' ); // no leading slash, no trailing slash, full path, not relative to ABSPATH + /** + * Server path of the language directory. + * + * No leading slash, no trailing slash, full path, not relative to `ABSPATH`. + * + * @since 2.1.0 + */ + define( 'WP_LANG_DIR', ABSPATH . WPINC . '/languages' ); if ( !defined( 'LANGDIR' ) ) { // Old relative path maintained for backwards compatibility define( 'LANGDIR', WPINC . '/languages' ); @@ -305,14 +352,11 @@ function wp_set_lang_dir() { } /** - * Load the correct database class file. - * - * This function is used to load the database class file either at runtime or by - * wp-admin/setup-config.php. We must globalize $wpdb to ensure that it is - * defined globally by the inline code in wp-db.php. + * Load the database class file and instantiate the `$wpdb` global. * * @since 2.5.0 - * @global $wpdb WordPress Database Object + * + * @global wpdb $wpdb The WordPress database class. */ function require_wp_db() { global $wpdb; @@ -328,18 +372,16 @@ function require_wp_db() { } /** - * Sets the database table prefix and the format specifiers for database table columns. + * Set the database table prefix and the format specifiers for database + * table columns. * - * Columns not listed here default to %s. + * Columns not listed here default to `%s`. * - * @see wpdb::$field_types Since 2.8.0 - * @see wpdb::prepare() - * @see wpdb::insert() - * @see wpdb::update() - * @see wpdb::set_prefix() - * - * @access private * @since 3.0.0 + * @access private + * + * @global wpdb $wpdb The WordPress database class. + * @global string $table_prefix The database table prefix. */ function wp_set_wpdb_vars() { global $wpdb, $table_prefix; @@ -358,19 +400,26 @@ function wp_set_wpdb_vars() { if ( is_wp_error( $prefix ) ) { wp_load_translations_early(); - wp_die( __( '<strong>ERROR</strong>: <code>$table_prefix</code> in <code>wp-config.php</code> can only contain numbers, letters, and underscores.' ) ); + wp_die( + /* translators: 1: $table_prefix 2: wp-config.php */ + sprintf( __( '<strong>ERROR</strong>: %1$s in %2$s can only contain numbers, letters, and underscores.' ), + '<code>$table_prefix</code>', + '<code>wp-config.php</code>' + ) + ); } } /** - * Access/Modify private global variable $_wp_using_ext_object_cache - * - * Toggle $_wp_using_ext_object_cache on and off without directly touching global + * Toggle `$_wp_using_ext_object_cache` on and off without directly + * touching global. * * @since 3.7.0 * - * @param bool $using Whether external object cache is being used - * @return bool The current 'using' setting + * @global bool $_wp_using_ext_object_cache + * + * @param bool $using Whether external object cache is being used. + * @return bool The current 'using' setting. */ function wp_using_ext_object_cache( $using = null ) { global $_wp_using_ext_object_cache; @@ -381,13 +430,15 @@ function wp_using_ext_object_cache( $using = null ) { } /** - * Starts the WordPress object cache. + * Start the WordPress object cache. * * If an object-cache.php file exists in the wp-content directory, * it uses that drop-in as an external object cache. * - * @access private * @since 3.0.0 + * @access private + * + * @global int $blog_id Blog ID. */ function wp_start_object_cache() { global $blog_id; @@ -401,43 +452,53 @@ function wp_start_object_cache() { } $first_init = true; - } else if ( ! wp_using_ext_object_cache() && file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) { - // Sometimes advanced-cache.php can load object-cache.php before it is loaded here. - // This breaks the function_exists check above and can result in $_wp_using_ext_object_cache - // being set incorrectly. Double check if an external cache exists. + } elseif ( ! wp_using_ext_object_cache() && file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) { + /* + * Sometimes advanced-cache.php can load object-cache.php before + * it is loaded here. This breaks the function_exists check above + * and can result in `$_wp_using_ext_object_cache` being set + * incorrectly. Double check if an external cache exists. + */ wp_using_ext_object_cache( true ); } if ( ! wp_using_ext_object_cache() ) require_once ( ABSPATH . WPINC . '/cache.php' ); - // If cache supports reset, reset instead of init if already initialized. - // Reset signals to the cache that global IDs have changed and it may need to update keys - // and cleanup caches. + /* + * If cache supports reset, reset instead of init if already + * initialized. Reset signals to the cache that global IDs + * have changed and it may need to update keys and cleanup caches. + */ if ( ! $first_init && function_exists( 'wp_cache_switch_to_blog' ) ) wp_cache_switch_to_blog( $blog_id ); elseif ( function_exists( 'wp_cache_init' ) ) wp_cache_init(); if ( function_exists( 'wp_cache_add_global_groups' ) ) { - wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache' ) ); + wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites' ) ); wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) ); } } /** - * Redirects to the installer if WordPress is not installed. + * Redirect to the installer if WordPress is not installed. * - * Dies with an error message when multisite is enabled. + * Dies with an error message when Multisite is enabled. * - * @access private * @since 3.0.0 + * @access private */ function wp_not_installed() { if ( is_multisite() ) { - if ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) ) + if ( ! is_blog_installed() && ! wp_installing() ) { + nocache_headers(); + wp_die( __( 'The site you have requested is not installed properly. Please contact the system administrator.' ) ); - } elseif ( ! is_blog_installed() && false === strpos( $_SERVER['PHP_SELF'], 'install.php' ) && !defined( 'WP_INSTALLING' ) ) { + } + } elseif ( ! is_blog_installed() && ! wp_installing() ) { + nocache_headers(); + require( ABSPATH . WPINC . '/kses.php' ); require( ABSPATH . WPINC . '/pluggable.php' ); require( ABSPATH . WPINC . '/formatting.php' ); @@ -450,15 +511,16 @@ function wp_not_installed() { } /** - * Returns array of must-use plugin files to be included in global scope. + * Retrieve an array of must-use plugin files. * - * The default directory is wp-content/mu-plugins. To change the default directory - * manually, define <code>WPMU_PLUGIN_DIR</code> and <code>WPMU_PLUGIN_URL</code> + * The default directory is wp-content/mu-plugins. To change the default + * directory manually, define `WPMU_PLUGIN_DIR` and `WPMU_PLUGIN_URL` * in wp-config.php. * - * @access private * @since 3.0.0 - * @return array Files to include + * @access private + * + * @return array Files to include. */ function wp_get_mu_plugins() { $mu_plugins = array(); @@ -477,15 +539,18 @@ function wp_get_mu_plugins() { } /** - * Returns array of plugin files to be included in global scope. + * Retrieve an array of active and valid plugin files. + * + * While upgrading or installing WordPress, no plugins are returned. * - * The default directory is wp-content/plugins. To change the default directory - * manually, define <code>WP_PLUGIN_DIR</code> and <code>WP_PLUGIN_URL</code> + * The default directory is wp-content/plugins. To change the default + * directory manually, define `WP_PLUGIN_DIR` and `WP_PLUGIN_URL` * in wp-config.php. * - * @access private * @since 3.0.0 - * @return array Files to include + * @access private + * + * @return array Files. */ function wp_get_active_and_valid_plugins() { $plugins = array(); @@ -497,7 +562,7 @@ function wp_get_active_and_valid_plugins() { array_unshift( $plugins, ABSPATH . 'my-hacks.php' ); } - if ( empty( $active_plugins ) || defined( 'WP_INSTALLING' ) ) + if ( empty( $active_plugins ) || wp_installing() ) return $plugins; $network_plugins = is_multisite() ? wp_get_active_network_plugins() : false; @@ -515,13 +580,13 @@ function wp_get_active_and_valid_plugins() { } /** - * Sets internal encoding using mb_internal_encoding(). + * Set internal encoding. * - * In most cases the default internal encoding is latin1, which is of no use, - * since we want to use the mb_ functions for utf-8 strings. + * In most cases the default internal encoding is latin1, which is + * of no use, since we want to use the `mb_` functions for `utf-8` strings. * - * @access private * @since 3.0.0 + * @access private */ function wp_set_internal_encoding() { if ( function_exists( 'mb_internal_encoding' ) ) { @@ -532,13 +597,13 @@ function wp_set_internal_encoding() { } /** - * Add magic quotes to $_GET, $_POST, $_COOKIE, and $_SERVER. + * Add magic quotes to `$_GET`, `$_POST`, `$_COOKIE`, and `$_SERVER`. * - * Also forces $_REQUEST to be $_GET + $_POST. If $_SERVER, $_COOKIE, - * or $_ENV are needed, use those superglobals directly. + * Also forces `$_REQUEST` to be `$_GET + $_POST`. If `$_SERVER`, + * `$_COOKIE`, or `$_ENV` are needed, use those superglobals directly. * - * @access private * @since 3.0.0 + * @access private */ function wp_magic_quotes() { // If already slashed, strip. @@ -561,8 +626,8 @@ function wp_magic_quotes() { /** * Runs just before PHP shuts down execution. * - * @access private * @since 1.2.0 + * @access private */ function shutdown_action_hook() { /** @@ -571,6 +636,7 @@ function shutdown_action_hook() { * @since 1.2.0 */ do_action( 'shutdown' ); + wp_cache_close(); } @@ -578,26 +644,27 @@ function shutdown_action_hook() { * Copy an object. * * @since 2.7.0 - * @deprecated 3.2 + * @deprecated 3.2.0 * - * @param object $object The object to clone - * @return object The cloned object + * @param object $object The object to clone. + * @return object The cloned object. */ - function wp_clone( $object ) { // Use parens for clone to accommodate PHP 4. See #17880 return clone( $object ); } /** - * Whether the current request is for a network or blog admin page + * Whether the current request is for an administrative interface page. * - * Does not inform on whether the user is an admin! Use capability checks to - * tell if the user should be accessing a section or not. + * Does not check if the user is an administrator; {@see current_user_can()} + * for checking roles and capabilities. * * @since 1.5.1 * - * @return bool True if inside WordPress administration pages. + * @global WP_Screen $current_screen + * + * @return bool True if inside WordPress administration interface, false otherwise. */ function is_admin() { if ( isset( $GLOBALS['current_screen'] ) ) @@ -609,14 +676,18 @@ function is_admin() { } /** - * Whether the current request is for a blog admin screen /wp-admin/ + * Whether the current request is for a site's admininstrative interface. * - * Does not inform on whether the user is a blog admin! Use capability checks to - * tell if the user should be accessing a section or not. + * e.g. `/wp-admin/` + * + * Does not check if the user is an administrator; {@see current_user_can()} + * for checking roles and capabilities. * * @since 3.1.0 * - * @return bool True if inside WordPress network administration pages. + * @global WP_Screen $current_screen + * + * @return bool True if inside WordPress blog administration pages. */ function is_blog_admin() { if ( isset( $GLOBALS['current_screen'] ) ) @@ -628,13 +699,17 @@ function is_blog_admin() { } /** - * Whether the current request is for a network admin screen /wp-admin/network/ + * Whether the current request is for the network administrative interface. * - * Does not inform on whether the user is a network admin! Use capability checks to - * tell if the user should be accessing a section or not. + * e.g. `/wp-admin/network/` + * + * Does not check if the user is an administrator; {@see current_user_can()} + * for checking roles and capabilities. * * @since 3.1.0 * + * @global WP_Screen $current_screen + * * @return bool True if inside WordPress network administration pages. */ function is_network_admin() { @@ -647,13 +722,18 @@ function is_network_admin() { } /** - * Whether the current request is for a user admin screen /wp-admin/user/ + * Whether the current request is for a user admin screen. + * + * e.g. `/wp-admin/user/` * - * Does not inform on whether the user is an admin! Use capability checks to - * tell if the user should be accessing a section or not. + * Does not inform on whether the user is an admin! Use capability + * checks to tell if the user should be accessing a section or not + * {@see current_user_can()}. * * @since 3.1.0 * + * @global WP_Screen $current_screen + * * @return bool True if inside WordPress user administration pages. */ function is_user_admin() { @@ -666,11 +746,11 @@ function is_user_admin() { } /** - * Whether Multisite support is enabled + * If Multisite is enabled. * * @since 3.0.0 * - * @return bool True if multisite is enabled, false otherwise. + * @return bool True if Multisite is enabled, false otherwise. */ function is_multisite() { if ( defined( 'MULTISITE' ) ) @@ -683,11 +763,13 @@ function is_multisite() { } /** - * Retrieve the current blog id + * Retrieve the current site ID. * * @since 3.1.0 * - * @return int Blog id + * @global int $blog_id + * + * @return int Site ID. */ function get_current_blog_id() { global $blog_id; @@ -695,16 +777,22 @@ function get_current_blog_id() { } /** - * Attempts an early load of translations. + * Attempt an early load of translations. * - * Used for errors encountered during the initial loading process, before the locale has been - * properly detected and loaded. + * Used for errors encountered during the initial loading process, before + * the locale has been properly detected and loaded. * - * Designed for unusual load sequences (like setup-config.php) or for when the script will then - * terminate with an error, otherwise there is a risk that a file can be double-included. + * Designed for unusual load sequences (like setup-config.php) or for when + * the script will then terminate with an error, otherwise there is a risk + * that a file can be double-included. * * @since 3.4.0 * @access private + * + * @global string $text_direction + * @global WP_Locale $wp_locale The WordPress date and time locale object. + * + * @staticvar bool $loaded */ function wp_load_translations_early() { global $text_direction, $wp_locale; @@ -776,3 +864,34 @@ function wp_load_translations_early() { $wp_locale = new WP_Locale(); } + +/** + * Check or set whether WordPress is in "installation" mode. + * + * If the `WP_INSTALLING` constant is defined during the bootstrap, `wp_installing()` will default to `true`. + * + * @since 4.4.0 + * + * @staticvar bool $installing + * + * @param bool $is_installing Optional. True to set WP into Installing mode, false to turn Installing mode off. + * Omit this parameter if you only want to fetch the current status. + * @return bool True if WP is installing, otherwise false. When a `$is_installing` is passed, the function will + * report whether WP was in installing mode prior to the change to `$is_installing`. + */ +function wp_installing( $is_installing = null ) { + static $installing = null; + + // Support for the `WP_INSTALLING` constant, defined before WP is loaded. + if ( is_null( $installing ) ) { + $installing = defined( 'WP_INSTALLING' ) && WP_INSTALLING; + } + + if ( ! is_null( $is_installing ) ) { + $old_installing = $installing; + $installing = $is_installing; + return (bool) $old_installing; + } + + return (bool) $installing; +} diff --git a/wp-includes/locale.php b/wp-includes/locale.php index 0def276..cfca86e 100644 --- a/wp-includes/locale.php +++ b/wp-includes/locale.php @@ -17,9 +17,8 @@ class WP_Locale { * * @since 2.1.0 * @var array - * @access private */ - var $weekday; + public $weekday; /** * Stores the translated strings for the one character weekday names. @@ -31,36 +30,40 @@ class WP_Locale { * * @since 2.1.0 * @var array - * @access private */ - var $weekday_initial; + public $weekday_initial; /** * Stores the translated strings for the abbreviated weekday names. * * @since 2.1.0 * @var array - * @access private */ - var $weekday_abbrev; + public $weekday_abbrev; + + /** + * Stores the default start of the week. + * + * @since 4.4.0 + * @var string + */ + public $start_of_week; /** * Stores the translated strings for the full month names. * * @since 2.1.0 * @var array - * @access private */ - var $month; + public $month; /** * Stores the translated strings for the abbreviated month names. * * @since 2.1.0 * @var array - * @access private */ - var $month_abbrev; + public $month_abbrev; /** * Stores the translated strings for 'am' and 'pm'. @@ -69,9 +72,8 @@ class WP_Locale { * * @since 2.1.0 * @var array - * @access private */ - var $meridiem; + public $meridiem; /** * The text direction of the locale language. @@ -80,9 +82,17 @@ class WP_Locale { * * @since 2.1.0 * @var string - * @access private */ - var $text_direction = 'ltr'; + public $text_direction = 'ltr'; + + /** + * The thousands separator and decimal point values used for localizing numbers. + * + * @since 2.3.0 + * @access public + * @var array + */ + public $number_format; /** * Sets up the translated strings and object properties. @@ -93,8 +103,11 @@ class WP_Locale { * * @since 2.1.0 * @access private + * + * @global string $text_direction + * @global string $wp_version */ - function init() { + public function init() { // The Weekdays $this->weekday[0] = /* translators: weekday */ __('Sunday'); $this->weekday[1] = /* translators: weekday */ __('Monday'); @@ -104,19 +117,14 @@ class WP_Locale { $this->weekday[5] = /* translators: weekday */ __('Friday'); $this->weekday[6] = /* translators: weekday */ __('Saturday'); - // The first letter of each day. The _%day%_initial suffix is a hack to make - // sure the day initials are unique. - $this->weekday_initial[__('Sunday')] = /* translators: one-letter abbreviation of the weekday */ __('S_Sunday_initial'); - $this->weekday_initial[__('Monday')] = /* translators: one-letter abbreviation of the weekday */ __('M_Monday_initial'); - $this->weekday_initial[__('Tuesday')] = /* translators: one-letter abbreviation of the weekday */ __('T_Tuesday_initial'); - $this->weekday_initial[__('Wednesday')] = /* translators: one-letter abbreviation of the weekday */ __('W_Wednesday_initial'); - $this->weekday_initial[__('Thursday')] = /* translators: one-letter abbreviation of the weekday */ __('T_Thursday_initial'); - $this->weekday_initial[__('Friday')] = /* translators: one-letter abbreviation of the weekday */ __('F_Friday_initial'); - $this->weekday_initial[__('Saturday')] = /* translators: one-letter abbreviation of the weekday */ __('S_Saturday_initial'); - - foreach ($this->weekday_initial as $weekday_ => $weekday_initial_) { - $this->weekday_initial[$weekday_] = preg_replace('/_.+_initial$/', '', $weekday_initial_); - } + // The first letter of each day. + $this->weekday_initial[ __( 'Sunday' ) ] = /* translators: one-letter abbreviation of the weekday */ _x( 'S', 'Sunday initial' ); + $this->weekday_initial[ __( 'Monday' ) ] = /* translators: one-letter abbreviation of the weekday */ _x( 'M', 'Monday initial' ); + $this->weekday_initial[ __( 'Tuesday' ) ] = /* translators: one-letter abbreviation of the weekday */ _x( 'T', 'Tuesday initial' ); + $this->weekday_initial[ __( 'Wednesday' ) ] = /* translators: one-letter abbreviation of the weekday */ _x( 'W', 'Wednesday initial' ); + $this->weekday_initial[ __( 'Thursday' ) ] = /* translators: one-letter abbreviation of the weekday */ _x( 'T', 'Thursday initial' ); + $this->weekday_initial[ __( 'Friday' ) ] = /* translators: one-letter abbreviation of the weekday */ _x( 'F', 'Friday initial' ); + $this->weekday_initial[ __( 'Saturday' ) ] = /* translators: one-letter abbreviation of the weekday */ _x( 'S', 'Saturday initial' ); // Abbreviations for each day. $this->weekday_abbrev[__('Sunday')] = /* translators: three-letter abbreviation of the weekday */ __('Sun'); @@ -128,37 +136,46 @@ class WP_Locale { $this->weekday_abbrev[__('Saturday')] = /* translators: three-letter abbreviation of the weekday */ __('Sat'); // The Months - $this->month['01'] = /* translators: month name */ __('January'); - $this->month['02'] = /* translators: month name */ __('February'); - $this->month['03'] = /* translators: month name */ __('March'); - $this->month['04'] = /* translators: month name */ __('April'); - $this->month['05'] = /* translators: month name */ __('May'); - $this->month['06'] = /* translators: month name */ __('June'); - $this->month['07'] = /* translators: month name */ __('July'); - $this->month['08'] = /* translators: month name */ __('August'); - $this->month['09'] = /* translators: month name */ __('September'); - $this->month['10'] = /* translators: month name */ __('October'); - $this->month['11'] = /* translators: month name */ __('November'); - $this->month['12'] = /* translators: month name */ __('December'); - - // Abbreviations for each month. Uses the same hack as above to get around the - // 'May' duplication. - $this->month_abbrev[__('January')] = /* translators: three-letter abbreviation of the month */ __('Jan_January_abbreviation'); - $this->month_abbrev[__('February')] = /* translators: three-letter abbreviation of the month */ __('Feb_February_abbreviation'); - $this->month_abbrev[__('March')] = /* translators: three-letter abbreviation of the month */ __('Mar_March_abbreviation'); - $this->month_abbrev[__('April')] = /* translators: three-letter abbreviation of the month */ __('Apr_April_abbreviation'); - $this->month_abbrev[__('May')] = /* translators: three-letter abbreviation of the month */ __('May_May_abbreviation'); - $this->month_abbrev[__('June')] = /* translators: three-letter abbreviation of the month */ __('Jun_June_abbreviation'); - $this->month_abbrev[__('July')] = /* translators: three-letter abbreviation of the month */ __('Jul_July_abbreviation'); - $this->month_abbrev[__('August')] = /* translators: three-letter abbreviation of the month */ __('Aug_August_abbreviation'); - $this->month_abbrev[__('September')] = /* translators: three-letter abbreviation of the month */ __('Sep_September_abbreviation'); - $this->month_abbrev[__('October')] = /* translators: three-letter abbreviation of the month */ __('Oct_October_abbreviation'); - $this->month_abbrev[__('November')] = /* translators: three-letter abbreviation of the month */ __('Nov_November_abbreviation'); - $this->month_abbrev[__('December')] = /* translators: three-letter abbreviation of the month */ __('Dec_December_abbreviation'); - - foreach ($this->month_abbrev as $month_ => $month_abbrev_) { - $this->month_abbrev[$month_] = preg_replace('/_.+_abbreviation$/', '', $month_abbrev_); - } + $this->month['01'] = /* translators: month name */ __( 'January' ); + $this->month['02'] = /* translators: month name */ __( 'February' ); + $this->month['03'] = /* translators: month name */ __( 'March' ); + $this->month['04'] = /* translators: month name */ __( 'April' ); + $this->month['05'] = /* translators: month name */ __( 'May' ); + $this->month['06'] = /* translators: month name */ __( 'June' ); + $this->month['07'] = /* translators: month name */ __( 'July' ); + $this->month['08'] = /* translators: month name */ __( 'August' ); + $this->month['09'] = /* translators: month name */ __( 'September' ); + $this->month['10'] = /* translators: month name */ __( 'October' ); + $this->month['11'] = /* translators: month name */ __( 'November' ); + $this->month['12'] = /* translators: month name */ __( 'December' ); + + // The Months, genitive + $this->month_genitive['01'] = /* translators: month name, genitive */ _x( 'January', 'genitive' ); + $this->month_genitive['02'] = /* translators: month name, genitive */ _x( 'February', 'genitive' ); + $this->month_genitive['03'] = /* translators: month name, genitive */ _x( 'March', 'genitive' ); + $this->month_genitive['04'] = /* translators: month name, genitive */ _x( 'April', 'genitive' ); + $this->month_genitive['05'] = /* translators: month name, genitive */ _x( 'May', 'genitive' ); + $this->month_genitive['06'] = /* translators: month name, genitive */ _x( 'June', 'genitive' ); + $this->month_genitive['07'] = /* translators: month name, genitive */ _x( 'July', 'genitive' ); + $this->month_genitive['08'] = /* translators: month name, genitive */ _x( 'August', 'genitive' ); + $this->month_genitive['09'] = /* translators: month name, genitive */ _x( 'September', 'genitive' ); + $this->month_genitive['10'] = /* translators: month name, genitive */ _x( 'October', 'genitive' ); + $this->month_genitive['11'] = /* translators: month name, genitive */ _x( 'November', 'genitive' ); + $this->month_genitive['12'] = /* translators: month name, genitive */ _x( 'December', 'genitive' ); + + // Abbreviations for each month. + $this->month_abbrev[ __( 'January' ) ] = /* translators: three-letter abbreviation of the month */ _x( 'Jan', 'January abbreviation' ); + $this->month_abbrev[ __( 'February' ) ] = /* translators: three-letter abbreviation of the month */ _x( 'Feb', 'February abbreviation' ); + $this->month_abbrev[ __( 'March' ) ] = /* translators: three-letter abbreviation of the month */ _x( 'Mar', 'March abbreviation' ); + $this->month_abbrev[ __( 'April' ) ] = /* translators: three-letter abbreviation of the month */ _x( 'Apr', 'April abbreviation' ); + $this->month_abbrev[ __( 'May' ) ] = /* translators: three-letter abbreviation of the month */ _x( 'May', 'May abbreviation' ); + $this->month_abbrev[ __( 'June' ) ] = /* translators: three-letter abbreviation of the month */ _x( 'Jun', 'June abbreviation' ); + $this->month_abbrev[ __( 'July' ) ] = /* translators: three-letter abbreviation of the month */ _x( 'Jul', 'July abbreviation' ); + $this->month_abbrev[ __( 'August' ) ] = /* translators: three-letter abbreviation of the month */ _x( 'Aug', 'August abbreviation' ); + $this->month_abbrev[ __( 'September' ) ] = /* translators: three-letter abbreviation of the month */ _x( 'Sep', 'September abbreviation' ); + $this->month_abbrev[ __( 'October' ) ] = /* translators: three-letter abbreviation of the month */ _x( 'Oct', 'October abbreviation' ); + $this->month_abbrev[ __( 'November' ) ] = /* translators: three-letter abbreviation of the month */ _x( 'Nov', 'November abbreviation' ); + $this->month_abbrev[ __( 'December' ) ] = /* translators: three-letter abbreviation of the month */ _x( 'Dec', 'December abbreviation' ); // The Meridiems $this->meridiem['am'] = __('am'); @@ -170,12 +187,22 @@ class WP_Locale { // See http://php.net/number_format /* translators: $thousands_sep argument for http://php.net/number_format, default is , */ - $trans = __('number_format_thousands_sep'); - $this->number_format['thousands_sep'] = ('number_format_thousands_sep' == $trans) ? ',' : $trans; + $thousands_sep = __( 'number_format_thousands_sep' ); + + if ( version_compare( PHP_VERSION, '5.4', '>=' ) ) { + // Replace space with a non-breaking space to avoid wrapping. + $thousands_sep = str_replace( ' ', ' ', $thousands_sep ); + } else { + // PHP < 5.4.0 does not support multiple bytes in thousands separator. + $thousands_sep = str_replace( array( ' ', ' ' ), ' ', $thousands_sep ); + } + + $this->number_format['thousands_sep'] = ( 'number_format_thousands_sep' === $thousands_sep ) ? ',' : $thousands_sep; /* translators: $dec_point argument for http://php.net/number_format, default is . */ - $trans = __('number_format_decimal_point'); - $this->number_format['decimal_point'] = ('number_format_decimal_point' == $trans) ? '.' : $trans; + $decimal_point = __( 'number_format_decimal_point' ); + + $this->number_format['decimal_point'] = ( 'number_format_decimal_point' === $decimal_point ) ? '.' : $decimal_point; // Set text direction. if ( isset( $GLOBALS['text_direction'] ) ) @@ -190,8 +217,15 @@ class WP_Locale { } } - function rtl_src_admin_notice() { - echo '<div class="error"><p>' . 'The <code>build</code> directory of the develop repository must be used for RTL.' . '</p></div>'; + /** + * Outputs an admin notice if the /build directory must be used for RTL. + * + * @since 3.8.0 + * @access public + */ + public function rtl_src_admin_notice() { + /* translators: %s: Name of the directory (build) */ + echo '<div class="error"><p>' . sprintf( __( 'The %s directory of the develop repository must be used for RTL.' ), '<code>build</code>' ) . '</p></div>'; } /** @@ -207,7 +241,7 @@ class WP_Locale { * @param int $weekday_number 0 for Sunday through 6 Saturday * @return string Full translated weekday */ - function get_weekday($weekday_number) { + public function get_weekday($weekday_number) { return $this->weekday[$weekday_number]; } @@ -225,7 +259,7 @@ class WP_Locale { * @param string $weekday_name * @return string */ - function get_weekday_initial($weekday_name) { + public function get_weekday_initial($weekday_name) { return $this->weekday_initial[$weekday_name]; } @@ -241,7 +275,7 @@ class WP_Locale { * @param string $weekday_name Full translated weekday word * @return string Translated weekday abbreviation */ - function get_weekday_abbrev($weekday_name) { + public function get_weekday_abbrev($weekday_name) { return $this->weekday_abbrev[$weekday_name]; } @@ -262,7 +296,7 @@ class WP_Locale { * @param string|int $month_number '01' through '12' * @return string Translated full month name */ - function get_month($month_number) { + public function get_month($month_number) { return $this->month[zeroise($month_number, 2)]; } @@ -278,7 +312,7 @@ class WP_Locale { * @param string $month_name Translated month to get abbreviated version * @return string Translated abbreviated month */ - function get_month_abbrev($month_name) { + public function get_month_abbrev($month_name) { return $this->month_abbrev[$month_name]; } @@ -293,7 +327,7 @@ class WP_Locale { * @param string $meridiem Either 'am', 'pm', 'AM', or 'PM'. Not translated version. * @return string Translated version */ - function get_meridiem($meridiem) { + public function get_meridiem($meridiem) { return $this->meridiem[$meridiem]; } @@ -303,9 +337,15 @@ class WP_Locale { * @deprecated For backwards compatibility only. * @access private * + * @global array $weekday + * @global array $weekday_initial + * @global array $weekday_abbrev + * @global array $month + * @global array $month_abbrev + * * @since 2.1.0 */ - function register_globals() { + public function register_globals() { $GLOBALS['weekday'] = $this->weekday; $GLOBALS['weekday_initial'] = $this->weekday_initial; $GLOBALS['weekday_abbrev'] = $this->weekday_abbrev; @@ -316,13 +356,9 @@ class WP_Locale { /** * Constructor which calls helper methods to set up object variables * - * @uses WP_Locale::init() - * @uses WP_Locale::register_globals() * @since 2.1.0 - * - * @return WP_Locale */ - function __construct() { + public function __construct() { $this->init(); $this->register_globals(); } @@ -333,7 +369,7 @@ class WP_Locale { * @since 3.0.0 * @return bool Whether locale is RTL. */ - function is_rtl() { + public function is_rtl() { return 'rtl' == $this->text_direction; } @@ -346,7 +382,7 @@ class WP_Locale { * * @since 3.6.0 */ - function _strings_for_pot() { + public function _strings_for_pot() { /* translators: localized date format, see http://php.net/date */ __( 'F j, Y' ); /* translators: localized time format, see http://php.net/date */ @@ -360,6 +396,9 @@ class WP_Locale { * Checks if current locale is RTL. * * @since 3.0.0 + * + * @global WP_Locale $wp_locale + * * @return bool Whether locale is RTL. */ function is_rtl() { diff --git a/wp-includes/media-template.php b/wp-includes/media-template.php index 2535461..8d7c758 100644 --- a/wp-includes/media-template.php +++ b/wp-includes/media-template.php @@ -50,8 +50,14 @@ function wp_underscore_audio_template() { function wp_underscore_video_template() { $video_types = wp_get_video_extensions(); ?> -<# var w, h, settings = wp.media.view.settings, - isYouTube = ! _.isEmpty( data.model.src ) && data.model.src.match(/youtube|youtu\.be/); +<# var w_rule = '', classes = [], + w, h, settings = wp.media.view.settings, + isYouTube = isVimeo = false; + + if ( ! _.isEmpty( data.model.src ) ) { + isYouTube = data.model.src.match(/youtube|youtu\.be/); + isVimeo = -1 !== data.model.src.indexOf('vimeo'); + } if ( settings.contentWidth && data.model.width >= settings.contentWidth ) { w = settings.contentWidth; @@ -60,16 +66,29 @@ function wp_underscore_video_template() { } if ( w !== data.model.width ) { - h = Math.ceil( ( h * w ) / data.model.width ); + h = Math.ceil( ( data.model.height * w ) / data.model.width ); } else { h = data.model.height; + } + + if ( w ) { + w_rule = 'width: ' + w + 'px; '; } + + if ( isYouTube ) { + classes.push( 'youtube-video' ); + } + + if ( isVimeo ) { + classes.push( 'vimeo-video' ); + } + #> -<div style="max-width: 100%; width: {{ w }}px"> +<div style="{{ w_rule }}" class="wp-video"> <video controls - class="wp-video-shortcode{{ isYouTube ? ' youtube-video' : '' }}" - width="{{ w }}" - height="{{ h }}" + class="wp-video-shortcode {{ classes.join( ' ' ) }}" + <# if ( w ) { #>width="{{ w }}"<# } #> + <# if ( h ) { #>height="{{ h }}"<# } #> <?php $props = array( 'poster' => '', 'preload' => 'metadata' ); foreach ( $props as $key => $value ): @@ -92,6 +111,8 @@ function wp_underscore_video_template() { <# if ( ! _.isEmpty( data.model.src ) ) { if ( isYouTube ) { #> <source src="{{ data.model.src }}" type="video/youtube" /> + <# } else if ( isVimeo ) { #> + <source src="{{ data.model.src }}" type="video/vimeo" /> <# } else { #> <source src="{{ data.model.src }}" type="{{ settings.embedMimes[ data.model.src.split('.').pop() ] }}" /> <# } @@ -112,6 +133,8 @@ function wp_underscore_video_template() { * Prints the templates used in the media manager. * * @since 3.5.0 + * + * @global bool $is_IE */ function wp_print_media_templates() { global $is_IE; @@ -119,6 +142,16 @@ function wp_print_media_templates() { if ( $is_IE && strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7') !== false ) $class .= ' ie7'; ?> +  <script type="text/html" id="tmpl-media-frame"> <div class="media-frame-menu"></div> <div class="media-frame-title"></div> @@ -130,7 +163,7 @@ function wp_print_media_templates() { <script type="text/html" id="tmpl-media-modal"> <div class="<?php echo $class; ?>"> - <a class="media-modal-close" href="#" title="<?php esc_attr_e('Close'); ?>"><span class="media-modal-icon"></span></a> + <button type="button" class="button-link media-modal-close"><span class="media-modal-icon"><span class="screen-reader-text"><?php _e( 'Close media panel' ); ?></span></span></button> <div class="media-modal-content"></div> </div> <div class="media-modal-backdrop"></div> @@ -138,7 +171,7 @@ function wp_print_media_templates() { <script type="text/html" id="tmpl-uploader-window"> <div class="uploader-window-content"> - <h3><?php _e( 'Drop files to upload' ); ?></h3> + <h1><?php _e( 'Drop files to upload' ); ?></h1> </div> </script> @@ -150,22 +183,26 @@ function wp_print_media_templates() { <script type="text/html" id="tmpl-uploader-inline"> <# var messageClass = data.message ? 'has-upload-message' : 'no-upload-message'; #> + <# if ( data.canClose ) { #> + <button class="close dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Close uploader' ); ?></span></button> + <# } #> <div class="uploader-inline-content {{ messageClass }}"> <# if ( data.message ) { #> - <h3 class="upload-message">{{ data.message }}</h3> + <h2 class="upload-message">{{ data.message }}</h2> <# } #> <?php if ( ! _device_can_upload() ) : ?> - <h3 class="upload-instructions"><?php printf( __('The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.'), 'https://wordpress.org/mobile/' ); ?></h3> + <h2 class="upload-instructions"><?php printf( __( 'The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.' ), 'https://apps.wordpress.org/' ); ?></h2> <?php elseif ( is_multisite() && ! is_upload_space_available() ) : ?> - <h3 class="upload-instructions"><?php _e( 'Upload Limit Exceeded' ); ?></h3> + <h2 class="upload-instructions"><?php _e( 'Upload Limit Exceeded' ); ?></h2> <?php /** This action is documented in wp-admin/includes/media.php */ do_action( 'upload_ui_over_quota' ); ?> <?php else : ?> <div class="upload-ui"> - <h3 class="upload-instructions drop-instructions"><?php _e( 'Drop files anywhere to upload' ); ?></h3> - <a href="#" class="browser button button-hero"><?php _e( 'Select Files' ); ?></a> + <h2 class="upload-instructions drop-instructions"><?php _e( 'Drop files anywhere to upload' ); ?></h2> + <p class="upload-instructions drop-instructions"><?php _ex( 'or', 'Uploader: Drop files here - or - Select Files' ); ?></p> + <button type="button" class="browser button button-hero"><?php _e( 'Select Files' ); ?></button> </div> <div class="upload-inline-status"></div> @@ -186,24 +223,14 @@ function wp_print_media_templates() { do_action( 'post-plupload-upload-ui' ); } - $upload_size_unit = $max_upload_size = wp_max_upload_size(); - $byte_sizes = array( 'KB', 'MB', 'GB' ); - - for ( $u = -1; $upload_size_unit > 1024 && $u < count( $byte_sizes ) - 1; $u++ ) { - $upload_size_unit /= 1024; - } - - if ( $u < 0 ) { - $upload_size_unit = 0; - $u = 0; - } else { - $upload_size_unit = (int) $upload_size_unit; + $max_upload_size = wp_max_upload_size(); + if ( ! $max_upload_size ) { + $max_upload_size = 0; } - ?> <p class="max-upload-size"><?php - printf( __( 'Maximum upload file size: %d%s.' ), esc_html($upload_size_unit), esc_html($byte_sizes[$u]) ); + printf( __( 'Maximum upload file size: %s.' ), esc_html( size_format( $max_upload_size ) ) ); ?></p> <# if ( data.suggestedWidth && data.suggestedHeight ) { #> @@ -220,9 +247,18 @@ function wp_print_media_templates() { </div> </script> + <script type="text/html" id="tmpl-media-library-view-switcher"> + <a href="<?php echo esc_url( add_query_arg( 'mode', 'list', $_SERVER['REQUEST_URI'] ) ) ?>" class="view-list"> + <span class="screen-reader-text"><?php _e( 'List View' ); ?></span> + </a> + <a href="<?php echo esc_url( add_query_arg( 'mode', 'grid', $_SERVER['REQUEST_URI'] ) ) ?>" class="view-grid current"> + <span class="screen-reader-text"><?php _e( 'Grid View' ); ?></span> + </a> + </script> + <script type="text/html" id="tmpl-uploader-status"> - <h3><?php _e( 'Uploading' ); ?></h3> - <a class="upload-dismiss-errors" href="#"><?php _e('Dismiss Errors'); ?></a> + <h2><?php _e( 'Uploading' ); ?></h2> + <button type="button" class="button-link upload-dismiss-errors"><span class="screen-reader-text"><?php _e( 'Dismiss Errors' ); ?></span></button> <div class="media-progress-bar"><div></div></div> <div class="upload-details"> @@ -236,40 +272,208 @@ function wp_print_media_templates() { </script> <script type="text/html" id="tmpl-uploader-status-error"> - <span class="upload-error-label"><?php _e('Error'); ?></span> <span class="upload-error-filename">{{{ data.filename }}}</span> <span class="upload-error-message">{{ data.message }}</span> </script> - <script type="text/html" id="tmpl-attachment"> - <div class="attachment-preview type-{{ data.type }} subtype-{{ data.subtype }} {{ data.orientation }}"> - <# if ( data.uploading ) { #> - <div class="media-progress-bar"><div></div></div> - <# } else if ( 'image' === data.type ) { #> - <div class="thumbnail"> - <div class="centered"> - <img src="{{ data.size.url }}" draggable="false" /> - </div> + <script type="text/html" id="tmpl-edit-attachment-frame"> + <div class="edit-media-header"> + <button class="left dashicons <# if ( ! data.hasPrevious ) { #> disabled <# } #>"><span class="screen-reader-text"><?php _e( 'Edit previous media item' ); ?></span></button> + <button class="right dashicons <# if ( ! data.hasNext ) { #> disabled <# } #>"><span class="screen-reader-text"><?php _e( 'Edit next media item' ); ?></span></button> + </div> + <div class="media-frame-title"></div> + <div class="media-frame-content"></div> + </script> + + <script type="text/html" id="tmpl-attachment-details-two-column"> + <div class="attachment-media-view {{ data.orientation }}"> + <div class="thumbnail thumbnail-{{ data.type }}"> + <# if ( data.uploading ) { #> + <div class="media-progress-bar"><div></div></div> + <# } else if ( 'image' === data.type && data.sizes && data.sizes.large ) { #> + <img class="details-image" src="{{ data.sizes.large.url }}" draggable="false" alt="" /> + <# } else if ( 'image' === data.type && data.sizes && data.sizes.full ) { #> + <img class="details-image" src="{{ data.sizes.full.url }}" draggable="false" alt="" /> + <# } else if ( -1 === jQuery.inArray( data.type, [ 'audio', 'video' ] ) ) { #> + <img class="details-image icon" src="{{ data.icon }}" draggable="false" alt="" /> + <# } #> + + <# if ( 'audio' === data.type ) { #> + <div class="wp-media-wrapper"> + <audio style="visibility: hidden" controls class="wp-audio-shortcode" width="100%" preload="none"> + <source type="{{ data.mime }}" src="{{ data.url }}"/> + </audio> </div> - <# } else { #> - <img src="{{ data.icon }}" class="icon" draggable="false" /> - <div class="filename"> - <div>{{ data.filename }}</div> + <# } else if ( 'video' === data.type ) { + var w_rule = ''; + if ( data.width ) { + w_rule = 'width: ' + data.width + 'px;'; + } else if ( wp.media.view.settings.contentWidth ) { + w_rule = 'width: ' + wp.media.view.settings.contentWidth + 'px;'; + } + #> + <div style="{{ w_rule }}" class="wp-media-wrapper wp-video"> + <video controls="controls" class="wp-video-shortcode" preload="metadata" + <# if ( data.width ) { #>width="{{ data.width }}"<# } #> + <# if ( data.height ) { #>height="{{ data.height }}"<# } #> + <# if ( data.image && data.image.src !== data.icon ) { #>poster="{{ data.image.src }}"<# } #>> + <source type="{{ data.mime }}" src="{{ data.url }}"/> + </video> </div> - <# } #> + <# } #> - <# if ( data.buttons.close ) { #> - <a class="close media-modal-icon" href="#" title="<?php esc_attr_e('Remove'); ?>"></a> - <# } #> + <div class="attachment-actions"> + <# if ( 'image' === data.type && ! data.uploading && data.sizes && data.can.save ) { #> + <button type="button" class="button edit-attachment"><?php _e( 'Edit Image' ); ?></button> + <# } #> + </div> + </div> + </div> + <div class="attachment-info"> + <span class="settings-save-status"> + <span class="spinner"></span> + <span class="saved"><?php esc_html_e('Saved.'); ?></span> + </span> + <div class="details"> + <div class="filename"><strong><?php _e( 'File name:' ); ?></strong> {{ data.filename }}</div> + <div class="filename"><strong><?php _e( 'File type:' ); ?></strong> {{ data.mime }}</div> + <div class="uploaded"><strong><?php _e( 'Uploaded on:' ); ?></strong> {{ data.dateFormatted }}</div> + + <div class="file-size"><strong><?php _e( 'File size:' ); ?></strong> {{ data.filesizeHumanReadable }}</div> + <# if ( 'image' === data.type && ! data.uploading ) { #> + <# if ( data.width && data.height ) { #> + <div class="dimensions"><strong><?php _e( 'Dimensions:' ); ?></strong> {{ data.width }} × {{ data.height }}</div> + <# } #> + <# } #> - <# if ( data.buttons.check ) { #> - <a class="check" href="#" title="<?php esc_attr_e('Deselect'); ?>"><div class="media-modal-icon"></div></a> + <# if ( data.fileLength ) { #> + <div class="file-length"><strong><?php _e( 'Length:' ); ?></strong> {{ data.fileLength }}</div> + <# } #> + + <# if ( 'audio' === data.type && data.meta.bitrate ) { #> + <div class="bitrate"> + <strong><?php _e( 'Bitrate:' ); ?></strong> {{ Math.round( data.meta.bitrate / 1000 ) }}kb/s + <# if ( data.meta.bitrate_mode ) { #> + {{ ' ' + data.meta.bitrate_mode.toUpperCase() }} + <# } #> + </div> + <# } #> + + <div class="compat-meta"> + <# if ( data.compat && data.compat.meta ) { #> + {{{ data.compat.meta }}} + <# } #> + </div> + </div> + + <div class="settings"> + <label class="setting" data-setting="url"> + <span class="name"><?php _e('URL'); ?></span> + <input type="text" value="{{ data.url }}" readonly /> + </label> + <# var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly'; #> + <?php if ( post_type_supports( 'attachment', 'title' ) ) : ?> + <label class="setting" data-setting="title"> + <span class="name"><?php _e('Title'); ?></span> + <input type="text" value="{{ data.title }}" {{ maybeReadOnly }} /> + </label> + <?php endif; ?> + <# if ( 'audio' === data.type ) { #> + <?php foreach ( array( + 'artist' => __( 'Artist' ), + 'album' => __( 'Album' ), + ) as $key => $label ) : ?> + <label class="setting" data-setting="<?php echo esc_attr( $key ) ?>"> + <span class="name"><?php echo $label ?></span> + <input type="text" value="{{ data.<?php echo $key ?> || data.meta.<?php echo $key ?> || '' }}" /> + </label> + <?php endforeach; ?> + <# } #> + <label class="setting" data-setting="caption"> + <span class="name"><?php _e( 'Caption' ); ?></span> + <textarea {{ maybeReadOnly }}>{{ data.caption }}</textarea> + </label> + <# if ( 'image' === data.type ) { #> + <label class="setting" data-setting="alt"> + <span class="name"><?php _e( 'Alt Text' ); ?></span> + <input type="text" value="{{ data.alt }}" {{ maybeReadOnly }} /> + </label> + <# } #> + <label class="setting" data-setting="description"> + <span class="name"><?php _e('Description'); ?></span> + <textarea {{ maybeReadOnly }}>{{ data.description }}</textarea> + </label> + <label class="setting"> + <span class="name"><?php _e( 'Uploaded By' ); ?></span> + <span class="value">{{ data.authorName }}</span> + </label> + <# if ( data.uploadedToTitle ) { #> + <label class="setting"> + <span class="name"><?php _e( 'Uploaded To' ); ?></span> + <# if ( data.uploadedToLink ) { #> + <span class="value"><a href="{{ data.uploadedToLink }}">{{ data.uploadedToTitle }}</a></span> + <# } else { #> + <span class="value">{{ data.uploadedToTitle }}</span> + <# } #> + </label> + <# } #> + <div class="attachment-compat"></div> + </div> + + <div class="actions"> + <a class="view-attachment" href="{{ data.link }}"><?php _e( 'View attachment page' ); ?></a> + <# if ( data.can.save ) { #> | + <a href="post.php?post={{ data.id }}&action=edit"><?php _e( 'Edit more details' ); ?></a> + <# } #> + <# if ( ! data.uploading && data.can.remove ) { #> | + <?php if ( MEDIA_TRASH ): ?> + <# if ( 'trash' === data.status ) { #> + <button type="button" class="button-link untrash-attachment"><?php _e( 'Untrash' ); ?></button> + <# } else { #> + <button type="button" class="button-link trash-attachment"><?php _ex( 'Trash', 'verb' ); ?></button> + <# } #> + <?php else: ?> + <button type="button" class="button-link delete-attachment"><?php _e( 'Delete Permanently' ); ?></button> + <?php endif; ?> + <# } #> + </div> + + </div> + </script> + + <script type="text/html" id="tmpl-attachment"> + <div class="attachment-preview js--select-attachment type-{{ data.type }} subtype-{{ data.subtype }} {{ data.orientation }}"> + <div class="thumbnail"> + <# if ( data.uploading ) { #> + <div class="media-progress-bar"><div style="width: {{ data.percent }}%"></div></div> + <# } else if ( 'image' === data.type && data.sizes ) { #> + <div class="centered"> + <img src="{{ data.size.url }}" draggable="false" alt="" /> + </div> + <# } else { #> + <div class="centered"> + <# if ( data.image && data.image.src && data.image.src !== data.icon ) { #> + <img src="{{ data.image.src }}" class="thumbnail" draggable="false" alt="" /> + <# } else { #> + <img src="{{ data.icon }}" class="icon" draggable="false" alt="" /> + <# } #> + </div> + <div class="filename"> + <div>{{ data.filename }}</div> + </div> + <# } #> + </div> + <# if ( data.buttons.close ) { #> + <button type="button" class="button-link attachment-close media-modal-icon"><span class="screen-reader-text"><?php _e( 'Remove' ); ?></span></button> <# } #> </div> + <# if ( data.buttons.check ) { #> + <button type="button" class="button-link check" tabindex="-1"><span class="media-modal-icon"></span><span class="screen-reader-text"><?php _e( 'Deselect' ); ?></span></button> + <# } #> <# var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly'; - if ( data.describe ) { #> - <# if ( 'image' === data.type ) { #> + if ( data.describe ) { + if ( 'image' === data.type ) { #> <input type="text" value="{{ data.caption }}" class="describe" data-setting="caption" placeholder="<?php esc_attr_e('Caption this image…'); ?>" {{ maybeReadOnly }} /> <# } else { #> @@ -281,41 +485,40 @@ function wp_print_media_templates() { <# } else { #> placeholder="<?php esc_attr_e('Describe this media file…'); ?>" <# } #> {{ maybeReadOnly }} /> - <# } #> - <# } #> + <# } + } #> </script> <script type="text/html" id="tmpl-attachment-details"> - <h3> - <?php _e('Attachment Details'); ?> - + <h2> + <?php _e( 'Attachment Details' ); ?> <span class="settings-save-status"> <span class="spinner"></span> <span class="saved"><?php esc_html_e('Saved.'); ?></span> </span> - </h3> + </h2> <div class="attachment-info"> - <div class="thumbnail"> + <div class="thumbnail thumbnail-{{ data.type }}"> <# if ( data.uploading ) { #> <div class="media-progress-bar"><div></div></div> - <# } else if ( 'image' === data.type ) { #> - <img src="{{ data.size.url }}" draggable="false" /> + <# } else if ( 'image' === data.type && data.sizes ) { #> + <img src="{{ data.size.url }}" draggable="false" alt="" /> <# } else { #> - <img src="{{ data.icon }}" class="icon" draggable="false" /> + <img src="{{ data.icon }}" class="icon" draggable="false" alt="" /> <# } #> </div> <div class="details"> <div class="filename">{{ data.filename }}</div> <div class="uploaded">{{ data.dateFormatted }}</div> + <div class="file-size">{{ data.filesizeHumanReadable }}</div> <# if ( 'image' === data.type && ! data.uploading ) { #> <# if ( data.width && data.height ) { #> <div class="dimensions">{{ data.width }} × {{ data.height }}</div> <# } #> - <# if ( data.can.save ) { #> + <# if ( data.can.save && data.sizes ) { #> <a class="edit-attachment" href="{{ data.editLink }}&image-editor" target="_blank"><?php _e( 'Edit Image' ); ?></a> - <a class="refresh-attachment" href="#"><?php _e( 'Refresh' ); ?></a> <# } #> <# } #> @@ -325,9 +528,13 @@ function wp_print_media_templates() { <# if ( ! data.uploading && data.can.remove ) { #> <?php if ( MEDIA_TRASH ): ?> - <a class="trash-attachment" href="#"><?php _e( 'Trash' ); ?></a> + <# if ( 'trash' === data.status ) { #> + <button type="button" class="button-link untrash-attachment"><?php _e( 'Untrash' ); ?></button> + <# } else { #> + <button type="button" class="button-link trash-attachment"><?php _ex( 'Trash', 'verb' ); ?></button> + <# } #> <?php else: ?> - <a class="delete-attachment" href="#"><?php _e( 'Delete Permanently' ); ?></a> + <button type="button" class="button-link delete-attachment"><?php _e( 'Delete Permanently' ); ?></button> <?php endif; ?> <# } #> @@ -339,42 +546,59 @@ function wp_print_media_templates() { </div> </div> + <label class="setting" data-setting="url"> + <span class="name"><?php _e('URL'); ?></span> + <input type="text" value="{{ data.url }}" readonly /> + </label> <# var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly'; #> - <label class="setting" data-setting="title"> - <span><?php _e('Title'); ?></span> - <input type="text" value="{{ data.title }}" {{ maybeReadOnly }} /> - </label> - <label class="setting" data-setting="caption"> - <span><?php _e('Caption'); ?></span> - <textarea {{ maybeReadOnly }}>{{ data.caption }}</textarea> - </label> + <?php if ( post_type_supports( 'attachment', 'title' ) ) : ?> + <label class="setting" data-setting="title"> + <span class="name"><?php _e('Title'); ?></span> + <input type="text" value="{{ data.title }}" {{ maybeReadOnly }} /> + </label> + <?php endif; ?> + <# if ( 'audio' === data.type ) { #> + <?php foreach ( array( + 'artist' => __( 'Artist' ), + 'album' => __( 'Album' ), + ) as $key => $label ) : ?> + <label class="setting" data-setting="<?php echo esc_attr( $key ) ?>"> + <span class="name"><?php echo $label ?></span> + <input type="text" value="{{ data.<?php echo $key ?> || data.meta.<?php echo $key ?> || '' }}" /> + </label> + <?php endforeach; ?> + <# } #> + <label class="setting" data-setting="caption"> + <span class="name"><?php _e('Caption'); ?></span> + <textarea {{ maybeReadOnly }}>{{ data.caption }}</textarea> + </label> <# if ( 'image' === data.type ) { #> <label class="setting" data-setting="alt"> - <span><?php _e('Alt Text'); ?></span> + <span class="name"><?php _e('Alt Text'); ?></span> <input type="text" value="{{ data.alt }}" {{ maybeReadOnly }} /> </label> <# } #> - <label class="setting" data-setting="description"> - <span><?php _e('Description'); ?></span> - <textarea {{ maybeReadOnly }}>{{ data.description }}</textarea> - </label> + <label class="setting" data-setting="description"> + <span class="name"><?php _e('Description'); ?></span> + <textarea {{ maybeReadOnly }}>{{ data.description }}</textarea> + </label> </script> <script type="text/html" id="tmpl-media-selection"> <div class="selection-info"> <span class="count"></span> <# if ( data.editable ) { #> - <a class="edit-selection" href="#"><?php _e('Edit'); ?></a> + <button type="button" class="button-link edit-selection"><?php _e( 'Edit Selection' ); ?></button> <# } #> <# if ( data.clearable ) { #> - <a class="clear-selection" href="#"><?php _e('Clear'); ?></a> + <button type="button" class="button-link clear-selection"><?php _e( 'Clear' ); ?></button> <# } #> </div> <div class="selection-view"></div> </script> <script type="text/html" id="tmpl-attachment-display-settings"> - <h3><?php _e('Attachment Display Settings'); ?></h3> + <h2><?php _e( 'Attachment Display Settings' ); ?></h2> <# if ( 'image' === data.type ) { #> <label class="setting"> @@ -421,7 +645,10 @@ function wp_print_media_templates() { </option> <option value="file"> <# } else { #> - <option value="file" selected> + <option value="none" selected> + <?php esc_attr_e('None'); ?> + </option> + <option value="file"> <# } #> <# if ( data.model.canEmbed ) { #> <?php esc_attr_e('Link to Media File'); ?> @@ -440,9 +667,6 @@ function wp_print_media_templates() { <option value="custom"> <?php esc_attr_e('Custom URL'); ?> </option> - <option value="none"> - <?php esc_attr_e('None'); ?> - </option> <# } #> </select> </label> @@ -481,7 +705,7 @@ function wp_print_media_templates() { </script> <script type="text/html" id="tmpl-gallery-settings"> - <h3><?php _e('Gallery Settings'); ?></h3> + <h2><?php _e( 'Gallery Settings' ); ?></h2> <label class="setting"> <span><?php _e('Link To'); ?></span> @@ -491,13 +715,15 @@ function wp_print_media_templates() { data-user-setting="urlbutton" <# } #>> - <option value="post" selected> + <option value="post" <# if ( ! wp.media.galleryDefaults.link || 'post' == wp.media.galleryDefaults.link ) { + #>selected="selected"<# } + #>> <?php esc_attr_e('Attachment Page'); ?> </option> - <option value="file"> + <option value="file" <# if ( 'file' == wp.media.galleryDefaults.link ) { #>selected="selected"<# } #>> <?php esc_attr_e('Media File'); ?> </option> - <option value="none"> + <option value="none" <# if ( 'none' == wp.media.galleryDefaults.link ) { #>selected="selected"<# } #>> <?php esc_attr_e('None'); ?> </option> </select> @@ -508,7 +734,9 @@ function wp_print_media_templates() { <select class="columns" name="columns" data-setting="columns"> <?php for ( $i = 1; $i <= 9; $i++ ) : ?> - <option value="<?php echo esc_attr( $i ); ?>" <?php selected( $i, 3 ); ?>> + <option value="<?php echo esc_attr( $i ); ?>" <# + if ( <?php echo $i ?> == wp.media.galleryDefaults.columns ) { #>selected="selected"<# } + #>> <?php echo esc_html( $i ); ?> </option> <?php endfor; ?> @@ -519,10 +747,35 @@ function wp_print_media_templates() { <span><?php _e( 'Random Order' ); ?></span> <input type="checkbox" data-setting="_orderbyRandom" /> </label> + + <label class="setting size"> + <span><?php _e( 'Size' ); ?></span> + <select class="size" name="size" + data-setting="size" + <# if ( data.userSettings ) { #> + data-user-setting="imgsize" + <# } #> + > + <?php + // This filter is documented in wp-admin/includes/media.php + $size_names = apply_filters( 'image_size_names_choose', array( + 'thumbnail' => __( 'Thumbnail' ), + 'medium' => __( 'Medium' ), + 'large' => __( 'Large' ), + 'full' => __( 'Full Size' ), + ) ); + + foreach ( $size_names as $size => $label ) : ?> + <option value="<?php echo esc_attr( $size ); ?>"> + <?php echo esc_html( $label ); ?> + </option> + <?php endforeach; ?> + </select> + </label> </script> <script type="text/html" id="tmpl-playlist-settings"> - <h3><?php _e( 'Playlist Settings' ); ?></h3> + <h2><?php _e( 'Playlist Settings' ); ?></h2> <# var emptyModel = _.isEmpty( data.model ), isVideo = 'video' === data.controller.get('library').props.get('type'); #> @@ -556,15 +809,18 @@ function wp_print_media_templates() { </script> <script type="text/html" id="tmpl-embed-link-settings"> - <label class="setting"> - <span><?php _e('Title'); ?></span> - <input type="text" class="alignment" data-setting="title" /> + <label class="setting link-text"> + <span><?php _e( 'Link Text' ); ?></span> + <input type="text" class="alignment" data-setting="linkText" /> </label> + <div class="embed-container" style="display: none;"> + <div class="embed-preview"></div> + </div> </script> <script type="text/html" id="tmpl-embed-image-settings"> <div class="thumbnail"> - <img src="{{ data.model.url }}" draggable="false" /> + <img src="{{ data.model.url }}" draggable="false" alt="" /> </div> <?php @@ -616,41 +872,12 @@ function wp_print_media_templates() { </div> </script> - <script type="text/html" id="tmpl-attachments-css"> - <style type="text/css" id="{{ data.id }}-css"> - #{{ data.id }} { - padding: 0 {{ data.gutter }}px; - } - - #{{ data.id }} .attachment { - margin: {{ data.gutter }}px; - width: {{ data.edge }}px; - } - - #{{ data.id }} .attachment-preview, - #{{ data.id }} .attachment-preview .thumbnail { - width: {{ data.edge }}px; - height: {{ data.edge }}px; - } - - #{{ data.id }} .portrait .thumbnail img { - max-width: {{ data.edge }}px; - height: auto; - } - - #{{ data.id }} .landscape .thumbnail img { - width: auto; - max-height: {{ data.edge }}px; - } - </style> - </script> - <script type="text/html" id="tmpl-image-details"> <div class="media-embed"> <div class="embed-media-settings"> <div class="column-image"> <div class="image"> - <img src="{{ data.model.url }}" draggable="false" /> + <img src="{{ data.model.url }}" draggable="false" alt="" /> <# if ( data.attachment && window.imageEdit ) { #> <div class="actions"> @@ -675,7 +902,7 @@ function wp_print_media_templates() { <input type="text" data-setting="alt" value="{{ data.model.alt }}" /> </label> - <h3><?php _e( 'Display Settings' ); ?></h3> + <h2><?php _e( 'Display Settings' ); ?></h2> <div class="setting align"> <span><?php _e('Align'); ?></span> <div class="button-group button-large" data-setting="align"> @@ -757,7 +984,7 @@ function wp_print_media_templates() { <input type="text" class="link-to-custom" data-setting="linkUrl" /> </div> <div class="advanced-section"> - <h3><a class="advanced-toggle" href="#"><?php _e('Advanced Options'); ?></a></h3> + <h2><button type="button" class="button-link advanced-toggle"><?php _e( 'Advanced Options' ); ?></button></h2> <div class="advanced-settings hidden"> <div class="advanced-image"> <label class="setting title-text"> @@ -771,7 +998,7 @@ function wp_print_media_templates() { </div> <div class="advanced-link"> <div class="setting link-target"> - <label><input type="checkbox" data-setting="linkTargetBlank" value="_blank" <# if ( data.model.linkTargetBlank ) { #>checked="checked"<# } #>><?php _e( 'Open link in a new window/tab' ); ?></label> + <label><input type="checkbox" data-setting="linkTargetBlank" value="_blank" <# if ( data.model.linkTargetBlank ) { #>checked="checked"<# } #>><?php _e( 'Open link in a new tab' ); ?></label> </div> <label class="setting link-rel"> <span><?php _e('Link Rel'); ?></span> @@ -814,7 +1041,7 @@ function wp_print_media_templates() { <label class="setting"> <span>SRC</span> <input type="text" disabled="disabled" data-setting="src" value="{{ data.model.src }}" /> - <a class="remove-setting"><?php _e( 'Remove' ); ?></a> + <button type="button" class="button-link remove-setting"><?php _e( 'Remove audio source' ); ?></button> </label> <# } #> <?php @@ -828,7 +1055,7 @@ function wp_print_media_templates() { <label class="setting"> <span><?php echo strtoupper( $type ) ?></span> <input type="text" disabled="disabled" data-setting="<?php echo $type ?>" value="{{ data.model.<?php echo $type ?> }}" /> - <a class="remove-setting"><?php _e( 'Remove' ); ?></a> + <button type="button" class="button-link remove-setting"><?php _e( 'Remove audio source' ); ?></button> </label> <# } #> <?php endforeach ?> @@ -878,8 +1105,7 @@ function wp_print_media_templates() { <div class="embed-media-settings embed-video-settings"> <div class="wp-video-holder"> <# - var isYouTube = ! _.isEmpty( data.model.src ) && data.model.src.match(/youtube|youtu\.be/); - w = ! data.model.width || data.model.width > 640 ? 640 : data.model.width, + var w = ! data.model.width || data.model.width > 640 ? 640 : data.model.width, h = ! data.model.height ? 360 : data.model.height; if ( data.model.width && w !== data.model.width ) { @@ -898,7 +1124,7 @@ function wp_print_media_templates() { <label class="setting"> <span>SRC</span> <input type="text" disabled="disabled" data-setting="src" value="{{ data.model.src }}" /> - <a class="remove-setting"><?php _e( 'Remove' ); ?></a> + <button type="button" class="button-link remove-setting"><?php _e( 'Remove video source' ); ?></button> </label> <# } #> <?php foreach ( $video_types as $type ): @@ -910,7 +1136,7 @@ function wp_print_media_templates() { <label class="setting"> <span><?php echo strtoupper( $type ) ?></span> <input type="text" disabled="disabled" data-setting="<?php echo $type ?>" value="{{ data.model.<?php echo $type ?> }}" /> - <a class="remove-setting"><?php _e( 'Remove' ); ?></a> + <button type="button" class="button-link remove-setting"><?php _e( 'Remove video source' ); ?></button> </label> <# } #> <?php endforeach ?> @@ -931,7 +1157,7 @@ function wp_print_media_templates() { <label class="setting"> <span><?php _e( 'Poster Image' ); ?></span> <input type="text" disabled="disabled" data-setting="poster" value="{{ data.model.poster }}" /> - <a class="remove-setting"><?php _e( 'Remove' ); ?></a> + <button type="button" class="button-link remove-setting"><?php _e( 'Remove poster image' ); ?></button> </label> <# } #> <div class="setting preload"> @@ -963,7 +1189,7 @@ function wp_print_media_templates() { content += track.outerHTML; #> <p> <input class="content-track" type="text" value="{{ track.outerHTML }}" /> - <a class="remove-setting remove-track"><?php _e( 'Remove' ); ?></a> + <button type="button" class="button-link remove-setting remove-track"><?php _ex( 'Remove video track', 'media' ); ?></button> </p> <# } ); #> <# } else { #> @@ -976,23 +1202,22 @@ function wp_print_media_templates() { </script> <script type="text/html" id="tmpl-editor-gallery"> - <div class="toolbar"> - <div class="dashicons dashicons-edit edit"></div><div class="dashicons dashicons-no-alt remove"></div> - </div> - <# if ( data.attachments ) { #> + <# if ( data.attachments.length ) { #> <div class="gallery gallery-columns-{{ data.columns }}"> <# _.each( data.attachments, function( attachment, index ) { #> <dl class="gallery-item"> <dt class="gallery-icon"> <# if ( attachment.thumbnail ) { #> - <img src="{{ attachment.thumbnail.url }}" width="{{ attachment.thumbnail.width }}" height="{{ attachment.thumbnail.height }}" /> + <img src="{{ attachment.thumbnail.url }}" width="{{ attachment.thumbnail.width }}" height="{{ attachment.thumbnail.height }}" alt="" /> <# } else { #> - <img src="{{ attachment.url }}" /> + <img src="{{ attachment.url }}" alt="" /> <# } #> </dt> - <dd class="wp-caption-text gallery-caption"> - {{ attachment.caption }} - </dd> + <# if ( attachment.caption ) { #> + <dd class="wp-caption-text gallery-caption"> + {{{ data.verifyHTML( attachment.caption ) }}} + </dd> + <# } #> </dl> <# if ( index % data.columns === data.columns - 1 ) { #> <br style="clear: both;"> @@ -1006,53 +1231,27 @@ function wp_print_media_templates() { <# } #> </script> - <script type="text/html" id="tmpl-editor-audio"> - <div class="toolbar"> - <div class="dashicons dashicons-edit edit"></div> - <div class="dashicons dashicons-no-alt remove"></div> - </div> - <?php wp_underscore_audio_template() ?> - <div class="wpview-overlay"></div> - </script> - - <script type="text/html" id="tmpl-editor-video"> - <div class="toolbar"> - <div class="dashicons dashicons-edit edit"></div> - <div class="dashicons dashicons-no-alt remove"></div> - </div> - <?php wp_underscore_video_template() ?> - <div class="wpview-overlay"></div> + <script type="text/html" id="tmpl-crop-content"> + <img class="crop-image" src="{{ data.url }}" alt=""> + <div class="upload-errors"></div> </script> - <?php wp_underscore_playlist_templates() ?> + <script type="text/html" id="tmpl-site-icon-preview"> + <h2><?php _e( 'Preview' ); ?></h2> + <strong><?php _e( 'As a browser icon' ); ?></strong> + <div class="favicon-preview"> + <img src="images/browser.png" class="browser-preview" width="182" height="" alt="" /> - <script type="text/html" id="tmpl-editor-playlist"> - <div class="toolbar"> - <div class="dashicons dashicons-edit edit"></div> - <div class="dashicons dashicons-no-alt remove"></div> - </div> - <# if ( data.tracks ) { #> - <div class="wp-playlist wp-{{ data.type }}-playlist wp-playlist-{{ data.style }}"> - <# if ( 'audio' === data.type ){ #> - <div class="wp-playlist-current-item"></div> - <# } #> - <{{ data.type }} controls="controls" preload="none" <# - if ( data.width ) { #> width="{{ data.width }}"<# } - #><# if ( data.height ) { #> height="{{ data.height }}"<# } #>></{{ data.type }}> - <div class="wp-playlist-next"></div> - <div class="wp-playlist-prev"></div> + <div class="favicon"> + <img id="preview-favicon" src="{{ data.url }}" alt="<?php esc_attr_e( 'Preview as a browser icon' ); ?>"/> </div> - <div class="wpview-overlay"></div> - <# } else { #> - <div class="wpview-error"> - <div class="dashicons dashicons-video-alt3"></div><p><?php _e( 'No items found.' ); ?></p> - </div> - <# } #> - </script> + <span class="browser-title"><?php bloginfo( 'name' ); ?></span> + </div> - <script type="text/html" id="tmpl-crop-content"> - <img class="crop-image" src="{{ data.url }}"> - <div class="upload-errors"></div> + <strong><?php _e( 'As an app icon' ); ?></strong> + <div class="app-icon-preview"> + <img id="preview-app-icon" src="{{ data.url }}" alt="<?php esc_attr_e( 'Preview as an app icon' ); ?>"/> + </div> </script> <?php diff --git a/wp-includes/media.php b/wp-includes/media.php index 974aa79..9f35f79 100644 --- a/wp-includes/media.php +++ b/wp-includes/media.php @@ -11,29 +11,34 @@ * * This is so that the image is a better fit for the editor and theme. * - * The $size parameter accepts either an array or a string. The supported string + * The `$size` parameter accepts either an array or a string. The supported string * values are 'thumb' or 'thumbnail' for the given thumbnail size or defaults at * 128 width and 96 height in pixels. Also supported for the string value is - * 'medium' and 'full'. The 'full' isn't actually supported, but any value other + * 'medium', 'medium_large' and 'full'. The 'full' isn't actually supported, but any value other * than the supported will result in the content_width size or 500 if that is * not set. * - * Finally, there is a filter named 'editor_max_image_size', that will be called - * on the calculated array for width and height, respectively. The second + * Finally, there is a filter named {@see 'editor_max_image_size'}, that will be + * called on the calculated array for width and height, respectively. The second * parameter will be the value that was in the $size parameter. The returned * type for the hook is an array with the width as the first element and the * height as the second element. * * @since 2.5.0 - * @uses wp_constrain_dimensions() This function passes the widths and the heights. * - * @param int $width Width of the image - * @param int $height Height of the image - * @param string|array $size Size of what the result image should be. - * @param context Could be 'display' (like in a theme) or 'edit' (like inserting into an editor) + * @global int $content_width + * @global array $_wp_additional_image_sizes + * + * @param int $width Width of the image in pixels. + * @param int $height Height of the image in pixels. + * @param string|array $size Optional. Image size. Accepts any valid image size, or an array + * of width and height values in pixels (in that order). + * Default 'medium'. + * @param string $context Optional. Could be 'display' (like in a theme) or 'edit' + * (like inserting into an editor). Default null. * @return array Width and height of what the result image should resize to. */ -function image_constrain_size_for_editor($width, $height, $size = 'medium', $context = null ) { +function image_constrain_size_for_editor( $width, $height, $size = 'medium', $context = null ) { global $content_width, $_wp_additional_image_sizes; if ( ! $context ) @@ -55,17 +60,28 @@ function image_constrain_size_for_editor($width, $height, $size = 'medium', $con elseif ( $size == 'medium' ) { $max_width = intval(get_option('medium_size_w')); $max_height = intval(get_option('medium_size_h')); - // if no width is set, default to the theme content width if available + + } + elseif ( $size == 'medium_large' ) { + $max_width = intval( get_option( 'medium_large_size_w' ) ); + $max_height = intval( get_option( 'medium_large_size_h' ) ); + + if ( intval( $content_width ) > 0 ) { + $max_width = min( intval( $content_width ), $max_width ); + } } elseif ( $size == 'large' ) { - // We're inserting a large size image into the editor. If it's a really - // big image we'll scale it down to fit reasonably within the editor - // itself, and within the theme's content width if it's known. The user - // can resize it in the editor if they wish. + /* + * We're inserting a large size image into the editor. If it's a really + * big image we'll scale it down to fit reasonably within the editor + * itself, and within the theme's content width if it's known. The user + * can resize it in the editor if they wish. + */ $max_width = intval(get_option('large_size_w')); $max_height = intval(get_option('large_size_h')); - if ( intval($content_width) > 0 ) + if ( intval($content_width) > 0 ) { $max_width = min( intval($content_width), $max_width ); + } } elseif ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) && in_array( $size, array_keys( $_wp_additional_image_sizes ) ) ) { $max_width = intval( $_wp_additional_image_sizes[$size]['width'] ); $max_height = intval( $_wp_additional_image_sizes[$size]['height'] ); @@ -108,11 +124,11 @@ function image_constrain_size_for_editor($width, $height, $size = 'medium', $con * * @since 2.5.0 * - * @param int|string $width Optional. Width attribute value. - * @param int|string $height Optional. Height attribute value. + * @param int|string $width Image width in pixels. + * @param int|string $height Image height in pixels. * @return string HTML attributes for width and, or height. */ -function image_hwstring($width, $height) { +function image_hwstring( $width, $height ) { $out = ''; if ($width) $out .= 'width="'.intval($width).'" '; @@ -139,11 +155,14 @@ function image_hwstring($width, $height) { * * @since 2.5.0 * - * @param int $id Attachment ID for image. - * @param array|string $size Optional, default is 'medium'. Size of image, either array or string. - * @return bool|array False on failure, array on success. + * @param int $id Attachment ID for image. + * @param array|string $size Optional. Image size to scale to. Accepts any valid image size, + * or an array of width and height values in pixels (in that order). + * Default 'medium'. + * @return false|array Array containing the image URL, width, height, and boolean for whether + * the image is an intermediate size. False on failure. */ -function image_downsize($id, $size = 'medium') { +function image_downsize( $id, $size = 'medium' ) { if ( !wp_attachment_is_image($id) ) return false; @@ -158,7 +177,8 @@ function image_downsize($id, $size = 'medium') { * * @param bool $downsize Whether to short-circuit the image downsize. Default false. * @param int $id Attachment ID for image. - * @param array|string $size Size of image, either array or string. Default 'medium'. + * @param array|string $size Size of image. Image size or array of width and height values (in that order). + * Default 'medium'. */ if ( $out = apply_filters( 'image_downsize', false, $id, $size ) ) { return $out; @@ -215,12 +235,13 @@ function image_downsize($id, $size = 'medium') { * * @since 2.9.0 * + * @global array $_wp_additional_image_sizes Associative array of additional image sizes. + * * @param string $name Image size identifier. * @param int $width Image width in pixels. * @param int $height Image height in pixels. - * @param bool|array $crop Optional. Whether to crop images to specified height and width or resize. + * @param bool|array $crop Optional. Whether to crop images to specified width and height or resize. * An array can specify positioning of the crop area. Default false. - * @return bool|array False, if no image was created. Metadata array on success. */ function add_image_size( $name, $width = 0, $height = 0, $crop = false ) { global $_wp_additional_image_sizes; @@ -237,6 +258,8 @@ function add_image_size( $name, $width = 0, $height = 0, $crop = false ) { * * @since 3.9.0 * + * @global array $_wp_additional_image_sizes + * * @param string $name The image size to check. * @return bool True if the image size exists, false if not. */ @@ -251,6 +274,8 @@ function has_image_size( $name ) { * * @since 3.9.0 * + * @global array $_wp_additional_image_sizes + * * @param string $name The image size to remove. * @return bool True if the image size was successfully removed, false on failure. */ @@ -269,20 +294,20 @@ function remove_image_size( $name ) { * Registers an image size for the post thumbnail. * * @since 2.9.0 + * * @see add_image_size() for details on cropping behavior. * * @param int $width Image width in pixels. * @param int $height Image height in pixels. - * @param bool|array $crop Optional. Whether to crop images to specified height and width or resize. + * @param bool|array $crop Optional. Whether to crop images to specified width and height or resize. * An array can specify positioning of the crop area. Default false. - * @return bool|array False, if no image was created. Metadata array on success. */ function set_post_thumbnail_size( $width = 0, $height = 0, $crop = false ) { add_image_size( 'post-thumbnail', $width, $height, $crop ); } /** - * An <img src /> tag for an image attachment, scaling it down if requested. + * Gets an img tag for an image attachment, scaling it down if requested. * * The filter 'get_image_tag_class' allows for changing the class name for the * image without having to use regular expressions on the HTML content. The @@ -295,14 +320,16 @@ function set_post_thumbnail_size( $width = 0, $height = 0, $crop = false ) { * * @since 2.5.0 * - * @param int $id Attachment ID. - * @param string $alt Image Description for the alt attribute. - * @param string $title Image Description for the title attribute. - * @param string $align Part of the class name for aligning the image. - * @param string $size Optional. Default is 'medium'. + * @param int $id Attachment ID. + * @param string $alt Image Description for the alt attribute. + * @param string $title Image Description for the title attribute. + * @param string $align Part of the class name for aligning the image. + * @param string|array $size Optional. Registered image size to retrieve a tag for. Accepts any + * valid image size, or an array of width and height values in pixels + * (in that order). Default 'medium'. * @return string HTML IMG element for given image attachment */ -function get_image_tag($id, $alt, $title, $align, $size='medium') { +function get_image_tag( $id, $alt, $title, $align, $size = 'medium' ) { list( $img_src, $width, $height ) = image_downsize($id, $size); $hwstring = image_hwstring($width, $height); @@ -316,10 +343,11 @@ function get_image_tag($id, $alt, $title, $align, $size='medium') { * * @since 2.6.0 * - * @param string $class CSS class name or space-separated list of classes. - * @param int $id Attachment ID. - * @param string $align Part of the class name for aligning the image. - * @param string $size Optional. Default is 'medium'. + * @param string $class CSS class name or space-separated list of classes. + * @param int $id Attachment ID. + * @param string $align Part of the class name for aligning the image. + * @param string|array $size Size of image. Image size or array of width and height values (in that order). + * Default 'medium'. */ $class = apply_filters( 'get_image_tag_class', $class, $id, $align, $size ); @@ -330,34 +358,33 @@ function get_image_tag($id, $alt, $title, $align, $size='medium') { * * @since 2.6.0 * - * @param string $html HTML content for the image. - * @param int $id Attachment ID. - * @param string $alt Alternate text. - * @param string $title Attachment title. - * @param string $align Part of the class name for aligning the image. - * @param string $size Optional. Default is 'medium'. + * @param string $html HTML content for the image. + * @param int $id Attachment ID. + * @param string $alt Alternate text. + * @param string $title Attachment title. + * @param string $align Part of the class name for aligning the image. + * @param string|array $size Size of image. Image size or array of width and height values (in that order). + * Default 'medium'. */ - $html = apply_filters( 'get_image_tag', $html, $id, $alt, $title, $align, $size ); - - return $html; + return apply_filters( 'get_image_tag', $html, $id, $alt, $title, $align, $size ); } /** - * Calculates the new dimensions for a downsampled image. + * Calculates the new dimensions for a down-sampled image. * * If either width or height are empty, no constraint is applied on * that dimension. * * @since 2.5.0 * - * @param int $current_width Current width of the image. + * @param int $current_width Current width of the image. * @param int $current_height Current height of the image. - * @param int $max_width Optional. Maximum wanted width. - * @param int $max_height Optional. Maximum wanted height. + * @param int $max_width Optional. Max width in pixels to constrain to. Default 0. + * @param int $max_height Optional. Max height in pixels to constrain to. Default 0. * @return array First item is the width, the second item is the height. */ -function wp_constrain_dimensions( $current_width, $current_height, $max_width=0, $max_height=0 ) { - if ( !$max_width and !$max_height ) +function wp_constrain_dimensions( $current_width, $current_height, $max_width = 0, $max_height = 0 ) { + if ( !$max_width && !$max_height ) return array( $current_width, $current_height ); $width_ratio = $height_ratio = 1.0; @@ -377,30 +404,48 @@ function wp_constrain_dimensions( $current_width, $current_height, $max_width=0, $smaller_ratio = min( $width_ratio, $height_ratio ); $larger_ratio = max( $width_ratio, $height_ratio ); - if ( intval( $current_width * $larger_ratio ) > $max_width || intval( $current_height * $larger_ratio ) > $max_height ) + if ( (int) round( $current_width * $larger_ratio ) > $max_width || (int) round( $current_height * $larger_ratio ) > $max_height ) { // The larger ratio is too big. It would result in an overflow. $ratio = $smaller_ratio; - else + } else { // The larger ratio fits, and is likely to be a more "snug" fit. $ratio = $larger_ratio; + } // Very small dimensions may result in 0, 1 should be the minimum. - $w = max ( 1, intval( $current_width * $ratio ) ); - $h = max ( 1, intval( $current_height * $ratio ) ); + $w = max ( 1, (int) round( $current_width * $ratio ) ); + $h = max ( 1, (int) round( $current_height * $ratio ) ); // Sometimes, due to rounding, we'll end up with a result like this: 465x700 in a 177x177 box is 117x176... a pixel short // We also have issues with recursive calls resulting in an ever-changing result. Constraining to the result of a constraint should yield the original result. // Thus we look for dimensions that are one pixel shy of the max value and bump them up - if ( $did_width && $w == $max_width - 1 ) + + // Note: $did_width means it is possible $smaller_ratio == $width_ratio. + if ( $did_width && $w == $max_width - 1 ) { $w = $max_width; // Round it up - if ( $did_height && $h == $max_height - 1 ) + } + + // Note: $did_height means it is possible $smaller_ratio == $height_ratio. + if ( $did_height && $h == $max_height - 1 ) { $h = $max_height; // Round it up + } - return array( $w, $h ); + /** + * Filter dimensions to constrain down-sampled images to. + * + * @since 4.1.0 + * + * @param array $dimensions The image width and height. + * @param int $current_width The current width of the image. + * @param int $current_height The current height of the image. + * @param int $max_width The maximum width permitted. + * @param int $max_height The maximum height permitted. + */ + return apply_filters( 'wp_constrain_dimensions', array( $w, $h ), $current_width, $current_height, $max_width, $max_height ); } /** - * Retrieve calculated resize dimensions for use in WP_Image_Editor. + * Retrieves calculated resize dimensions for use in WP_Image_Editor. * * Calculates dimensions and coordinates for a resized image that fits * within a specified width and height. @@ -419,11 +464,11 @@ function wp_constrain_dimensions( $current_width, $current_height, $max_width=0, * @param int $orig_h Original height in pixels. * @param int $dest_w New width in pixels. * @param int $dest_h New height in pixels. - * @param bool|array $crop Optional. Whether to crop image to specified height and width or resize. + * @param bool|array $crop Optional. Whether to crop image to specified width and height or resize. * An array can specify positioning of the crop area. Default false. - * @return bool|array False on failure. Returned array matches parameters for `imagecopyresampled()`. + * @return false|array False on failure. Returned array matches parameters for `imagecopyresampled()`. */ -function image_resize_dimensions($orig_w, $orig_h, $dest_w, $dest_h, $crop = false) { +function image_resize_dimensions( $orig_w, $orig_h, $dest_w, $dest_h, $crop = false ) { if ($orig_w <= 0 || $orig_h <= 0) return false; @@ -444,7 +489,7 @@ function image_resize_dimensions($orig_w, $orig_h, $dest_w, $dest_h, $crop = fal * @param int $orig_h Original height in pixels. * @param int $dest_w New width in pixels. * @param int $dest_h New height in pixels. - * @param bool|array $crop Whether to crop image to specified height and width or resize. + * @param bool|array $crop Whether to crop image to specified width and height or resize. * An array can specify positioning of the crop area. Default false. */ $output = apply_filters( 'image_resize_dimensions', null, $orig_w, $orig_h, $dest_w, $dest_h, $crop ); @@ -457,12 +502,12 @@ function image_resize_dimensions($orig_w, $orig_h, $dest_w, $dest_h, $crop = fal $new_w = min($dest_w, $orig_w); $new_h = min($dest_h, $orig_h); - if ( !$new_w ) { - $new_w = intval($new_h * $aspect_ratio); + if ( ! $new_w ) { + $new_w = (int) round( $new_h * $aspect_ratio ); } - if ( !$new_h ) { - $new_h = intval($new_w / $aspect_ratio); + if ( ! $new_h ) { + $new_h = (int) round( $new_w / $aspect_ratio ); } $size_ratio = max($new_w / $orig_w, $new_h / $orig_h); @@ -503,8 +548,9 @@ function image_resize_dimensions($orig_w, $orig_h, $dest_w, $dest_h, $crop = fal } // if the resulting image would be the same size or larger we don't want to resize it - if ( $new_w >= $orig_w && $new_h >= $orig_h ) + if ( $new_w >= $orig_w && $new_h >= $orig_h && $dest_w != $orig_w && $dest_h != $orig_h ) { return false; + } // the return array matches the parameters to imagecopyresampled() // int dst_x, int dst_y, int src_x, int src_y, int dst_w, int dst_h, int src_w, int src_h @@ -513,7 +559,7 @@ function image_resize_dimensions($orig_w, $orig_h, $dest_w, $dest_h, $crop = fal } /** - * Resize an image to make a thumbnail or intermediate size. + * Resizes an image to make a thumbnail or intermediate size. * * The returned array has the file size, the image width, and image height. The * filter 'image_make_intermediate_size' can be used to hook in and change the @@ -521,11 +567,12 @@ function image_resize_dimensions($orig_w, $orig_h, $dest_w, $dest_h, $crop = fal * * @since 2.5.0 * - * @param string $file File path. - * @param int $width Image width. - * @param int $height Image height. - * @param bool $crop Optional, default is false. Whether to crop image to specified height and width or resize. - * @return bool|array False, if no image was created. Metadata array on success. + * @param string $file File path. + * @param int $width Image width. + * @param int $height Image height. + * @param bool $crop Optional. Whether to crop image to specified width and height or resize. + * Default false. + * @return false|array False, if no image was created. Metadata array on success. */ function image_make_intermediate_size( $file, $width, $height, $crop = false ) { if ( $width || $height ) { @@ -545,7 +592,7 @@ function image_make_intermediate_size( $file, $width, $height, $crop = false ) { } /** - * Retrieve the image's intermediate size (resized) path, width, and height. + * Retrieves the image's intermediate size (resized) path, width, and height. * * The $size parameter can be an array with the width and height respectively. * If the size matches the 'sizes' metadata array for width and height, then it @@ -564,45 +611,68 @@ function image_make_intermediate_size( $file, $width, $height, $crop = false ) { * browser scale down the image. * * @since 2.5.0 - * @see add_image_size() * - * @param int $post_id Attachment ID for image. - * @param array|string $size Optional, default is 'thumbnail'. Size of image, either array or string. - * @return bool|array False on failure or array of file path, width, and height on success. + * @param int $post_id Attachment ID. + * @param array|string $size Optional. Image size. Accepts any valid image size, or an array + * of width and height values in pixels (in that order). + * Default 'thumbnail'. + * @return false|array $data { + * Array of file relative path, width, and height on success. Additionally includes absolute + * path and URL if registered size is passed to $size parameter. False on failure. + * + * @type string $file Image's path relative to uploads directory + * @type int $width Width of image + * @type int $height Height of image + * @type string $path Optional. Image's absolute filesystem path. Only returned if registered + * size is passed to `$size` parameter. + * @type string $url Optional. Image's URL. Only returned if registered size is passed to `$size` + * parameter. + * } */ -function image_get_intermediate_size($post_id, $size='thumbnail') { +function image_get_intermediate_size( $post_id, $size = 'thumbnail' ) { if ( !is_array( $imagedata = wp_get_attachment_metadata( $post_id ) ) ) return false; // get the best one for a specified set of dimensions if ( is_array($size) && !empty($imagedata['sizes']) ) { + $candidates = array(); + foreach ( $imagedata['sizes'] as $_size => $data ) { - // already cropped to width or height; so use this size - if ( ( $data['width'] == $size[0] && $data['height'] <= $size[1] ) || ( $data['height'] == $size[1] && $data['width'] <= $size[0] ) ) { - $file = $data['file']; - list($width, $height) = image_constrain_size_for_editor( $data['width'], $data['height'], $size ); - return compact( 'file', 'width', 'height' ); + // If there's an exact match to an existing image size, short circuit. + if ( $data['width'] == $size[0] && $data['height'] == $size[1] ) { + list( $data['width'], $data['height'] ) = image_constrain_size_for_editor( $data['width'], $data['height'], $size ); + + /** This filter is documented in wp-includes/media.php */ + return apply_filters( 'image_get_intermediate_size', $data, $post_id, $size ); + } + // If it's not an exact match but it's at least the dimensions requested. + if ( $data['width'] >= $size[0] && $data['height'] >= $size[1] ) { + $candidates[ $data['width'] * $data['height'] ] = $_size; } - // add to lookup table: area => size - $areas[$data['width'] * $data['height']] = $_size; } - if ( !$size || !empty($areas) ) { + + if ( ! empty( $candidates ) ) { // find for the smallest image not smaller than the desired size - ksort($areas); - foreach ( $areas as $_size ) { + ksort( $candidates ); + foreach ( $candidates as $_size ) { $data = $imagedata['sizes'][$_size]; - if ( $data['width'] >= $size[0] || $data['height'] >= $size[1] ) { - // Skip images with unexpectedly divergent aspect ratios (crops) - // First, we calculate what size the original image would be if constrained to a box the size of the current image in the loop - $maybe_cropped = image_resize_dimensions($imagedata['width'], $imagedata['height'], $data['width'], $data['height'], false ); - // If the size doesn't match within one pixel, then it is of a different aspect ratio, so we skip it, unless it's the thumbnail size - if ( 'thumbnail' != $_size && ( !$maybe_cropped || ( $maybe_cropped[4] != $data['width'] && $maybe_cropped[4] + 1 != $data['width'] ) || ( $maybe_cropped[5] != $data['height'] && $maybe_cropped[5] + 1 != $data['height'] ) ) ) - continue; - // If we're still here, then we're going to use this size - $file = $data['file']; - list($width, $height) = image_constrain_size_for_editor( $data['width'], $data['height'], $size ); - return compact( 'file', 'width', 'height' ); + + // Skip images with unexpectedly divergent aspect ratios (crops) + // First, we calculate what size the original image would be if constrained to a box the size of the current image in the loop + $maybe_cropped = image_resize_dimensions($imagedata['width'], $imagedata['height'], $data['width'], $data['height'], false ); + // If the size doesn't match within one pixel, then it is of a different aspect ratio, so we skip it, unless it's the thumbnail size + if ( 'thumbnail' != $_size && + ( ! $maybe_cropped + || ( $maybe_cropped[4] != $data['width'] && $maybe_cropped[4] + 1 != $data['width'] ) + || ( $maybe_cropped[5] != $data['height'] && $maybe_cropped[5] + 1 != $data['height'] ) + ) ) { + continue; } + // If we're still here, then we're going to use this size. + list( $data['width'], $data['height'] ) = image_constrain_size_for_editor( $data['width'], $data['height'], $size ); + + /** This filter is documented in wp-includes/media.php */ + return apply_filters( 'image_get_intermediate_size', $data, $post_id, $size ); } } } @@ -617,17 +687,35 @@ function image_get_intermediate_size($post_id, $size='thumbnail') { $data['path'] = path_join( dirname($imagedata['file']), $data['file'] ); $data['url'] = path_join( dirname($file_url), $data['file'] ); } - return $data; + + /** + * Filter the output of image_get_intermediate_size() + * + * @since 4.4.0 + * + * @see image_get_intermediate_size() + * + * @param array $data Array of file relative path, width, and height on success. May also include + * file absolute path and URL. + * @param int $post_id The post_id of the image attachment + * @param string|array $size Registered image size or flat array of initially-requested height and width + * dimensions (in that order). + */ + return apply_filters( 'image_get_intermediate_size', $data, $post_id, $size ); } /** - * Get the available image sizes + * Gets the available intermediate image sizes. + * * @since 3.0.0 - * @return array Returns a filtered array of image size strings + * + * @global array $_wp_additional_image_sizes + * + * @return array Returns a filtered array of image size strings. */ function get_intermediate_image_sizes() { global $_wp_additional_image_sizes; - $image_sizes = array('thumbnail', 'medium', 'large'); // Standard sizes + $image_sizes = array('thumbnail', 'medium', 'medium_large', 'large'); // Standard sizes if ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) ) $image_sizes = array_merge( $image_sizes, array_keys( $_wp_additional_image_sizes ) ); @@ -637,7 +725,7 @@ function get_intermediate_image_sizes() { * @since 2.5.0 * * @param array $image_sizes An array of intermediate image sizes. Defaults - * are 'thumbnail', 'medium', 'large'. + * are 'thumbnail', 'medium', 'medium_large', 'large'. */ return apply_filters( 'intermediate_image_sizes', $image_sizes ); } @@ -647,64 +735,82 @@ function get_intermediate_image_sizes() { * * A mime icon for files, thumbnail or intermediate size for images. * + * The returned array contains four values: the URL of the attachment image src, + * the width of the image file, the height of the image file, and a boolean + * representing whether the returned array describes an intermediate (generated) + * image size or the original, full-sized upload. + * * @since 2.5.0 * - * @param int $attachment_id Image attachment ID. - * @param string $size Optional, default is 'thumbnail'. - * @param bool $icon Optional, default is false. Whether it is an icon. - * @return bool|array Returns an array (url, width, height), or false, if no image is available. + * @param int $attachment_id Image attachment ID. + * @param string|array $size Optional. Image size. Accepts any valid image size, or an array of width + * and height values in pixels (in that order). Default 'thumbnail'. + * @param bool $icon Optional. Whether the image should be treated as an icon. Default false. + * @return false|array Returns an array (url, width, height, is_intermediate), or false, if no image is available. */ -function wp_get_attachment_image_src($attachment_id, $size='thumbnail', $icon = false) { - +function wp_get_attachment_image_src( $attachment_id, $size = 'thumbnail', $icon = false ) { // get a thumbnail or intermediate image if there is one - if ( $image = image_downsize($attachment_id, $size) ) - return $image; + $image = image_downsize( $attachment_id, $size ); + if ( ! $image ) { + $src = false; + + if ( $icon && $src = wp_mime_type_icon( $attachment_id ) ) { + /** This filter is documented in wp-includes/post.php */ + $icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/media' ); - $src = false; + $src_file = $icon_dir . '/' . wp_basename( $src ); + @list( $width, $height ) = getimagesize( $src_file ); + } - if ( $icon && $src = wp_mime_type_icon($attachment_id) ) { - /** This filter is documented in wp-includes/post.php */ - $icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/media' ); - $src_file = $icon_dir . '/' . wp_basename($src); - @list($width, $height) = getimagesize($src_file); + if ( $src && $width && $height ) { + $image = array( $src, $width, $height ); + } } - if ( $src && $width && $height ) - return array( $src, $width, $height ); - return false; + /** + * Filter the image src result. + * + * @since 4.3.0 + * + * @param array|false $image Either array with src, width & height, icon src, or false. + * @param int $attachment_id Image attachment ID. + * @param string|array $size Size of image. Image size or array of width and height values + * (in that order). Default 'thumbnail'. + * @param bool $icon Whether the image should be treated as an icon. Default false. + */ + return apply_filters( 'wp_get_attachment_image_src', $image, $attachment_id, $size, $icon ); } /** * Get an HTML img element representing an image attachment * - * While $size will accept an array, it is better to register a size with + * While `$size` will accept an array, it is better to register a size with * add_image_size() so that a cropped version is generated. It's much more * efficient than having to find the closest-sized image and then having the * browser scale down the image. * * @since 2.5.0 * - * @see add_image_size() - * @uses wp_get_attachment_image_src() Gets attachment file URL and dimensions - * - * @param int $attachment_id Image attachment ID. - * @param string $size Optional, default is 'thumbnail'. - * @param bool $icon Optional, default is false. Whether it is an icon. - * @param mixed $attr Optional, attributes for the image markup. + * @param int $attachment_id Image attachment ID. + * @param string|array $size Optional. Image size. Accepts any valid image size, or an array of width + * and height values in pixels (in that order). Default 'thumbnail'. + * @param bool $icon Optional. Whether the image should be treated as an icon. Default false. + * @param string|array $attr Optional. Attributes for the image markup. Default empty. * @return string HTML img element or empty string on failure. */ function wp_get_attachment_image($attachment_id, $size = 'thumbnail', $icon = false, $attr = '') { - $html = ''; $image = wp_get_attachment_image_src($attachment_id, $size, $icon); if ( $image ) { list($src, $width, $height) = $image; $hwstring = image_hwstring($width, $height); - if ( is_array($size) ) - $size = join('x', $size); + $size_class = $size; + if ( is_array( $size_class ) ) { + $size_class = join( 'x', $size_class ); + } $attachment = get_post($attachment_id); $default_attr = array( 'src' => $src, - 'class' => "attachment-$size", + 'class' => "attachment-$size_class size-$size_class", 'alt' => trim(strip_tags( get_post_meta($attachment_id, '_wp_attachment_image_alt', true) )), // Use Alt field first ); if ( empty($default_attr['alt']) ) @@ -712,17 +818,38 @@ function wp_get_attachment_image($attachment_id, $size = 'thumbnail', $icon = fa if ( empty($default_attr['alt']) ) $default_attr['alt'] = trim(strip_tags( $attachment->post_title )); // Finally, use the title - $attr = wp_parse_args($attr, $default_attr); + $attr = wp_parse_args( $attr, $default_attr ); + + // Generate 'srcset' and 'sizes' if not already present. + if ( empty( $attr['srcset'] ) ) { + $image_meta = get_post_meta( $attachment_id, '_wp_attachment_metadata', true ); + + if ( is_array( $image_meta ) ) { + $size_array = array( absint( $width ), absint( $height ) ); + $srcset = wp_calculate_image_srcset( $size_array, $src, $image_meta, $attachment_id ); + $sizes = wp_calculate_image_sizes( $size_array, $src, $image_meta, $attachment_id ); + + if ( $srcset && ( $sizes || ! empty( $attr['sizes'] ) ) ) { + $attr['srcset'] = $srcset; + + if ( empty( $attr['sizes'] ) ) { + $attr['sizes'] = $sizes; + } + } + } + } /** * Filter the list of attachment image attributes. * * @since 2.8.0 * - * @param mixed $attr Attributes for the image markup. - * @param int $attachment_id Image attachment ID. + * @param array $attr Attributes for the image markup. + * @param WP_Post $attachment Image attachment post. + * @param string|array $size Requested size. Image size or array of width and height values + * (in that order). Default 'thumbnail'. */ - $attr = apply_filters( 'wp_get_attachment_image_attributes', $attr, $attachment ); + $attr = apply_filters( 'wp_get_attachment_image_attributes', $attr, $attachment, $size ); $attr = array_map( 'esc_attr', $attr ); $html = rtrim("<img $hwstring"); foreach ( $attr as $name => $value ) { @@ -735,13 +862,539 @@ function wp_get_attachment_image($attachment_id, $size = 'thumbnail', $icon = fa } /** - * Adds a 'wp-post-image' class to post thumbnails - * Uses the begin_fetch_post_thumbnail_html and end_fetch_post_thumbnail_html action hooks to - * dynamically add/remove itself so as to only filter post thumbnails + * Get the URL of an image attachment. + * + * @since 4.4.0 + * + * @param int $attachment_id Image attachment ID. + * @param string|array $size Optional. Image size to retrieve. Accepts any valid image size, or an array + * of width and height values in pixels (in that order). Default 'thumbnail'. + * @param bool $icon Optional. Whether the image should be treated as an icon. Default false. + * @return string|false Attachment URL or false if no image is available. + */ +function wp_get_attachment_image_url( $attachment_id, $size = 'thumbnail', $icon = false ) { + $image = wp_get_attachment_image_src( $attachment_id, $size, $icon ); + return isset( $image['0'] ) ? $image['0'] : false; +} + +/** + * Get the attachment path relative to the upload directory. * + * @since 4.4.1 + * @access private + * + * @param string $file Attachment file name. + * @return string Attachment path relative to the upload directory. + */ +function _wp_get_attachment_relative_path( $file ) { + $dirname = dirname( $file ); + + if ( '.' === $dirname ) { + return ''; + } + + if ( false !== strpos( $dirname, 'wp-content/uploads' ) ) { + // Get the directory name relative to the upload directory (back compat for pre-2.7 uploads) + $dirname = substr( $dirname, strpos( $dirname, 'wp-content/uploads' ) + 18 ); + $dirname = ltrim( $dirname, '/' ); + } + + return $dirname; +} + +/** + * Get the image size as array from its meta data. + * + * Used for responsive images. + * + * @since 4.4.0 + * @access private + * + * @param string $size_name Image size. Accepts any valid image size name ('thumbnail', 'medium', etc.). + * @param array $image_meta The image meta data. + * @return array|bool Array of width and height values in pixels (in that order) + * or false if the size doesn't exist. + */ +function _wp_get_image_size_from_meta( $size_name, $image_meta ) { + if ( $size_name === 'full' ) { + return array( + absint( $image_meta['width'] ), + absint( $image_meta['height'] ), + ); + } elseif ( ! empty( $image_meta['sizes'][$size_name] ) ) { + return array( + absint( $image_meta['sizes'][$size_name]['width'] ), + absint( $image_meta['sizes'][$size_name]['height'] ), + ); + } + + return false; +} + +/** + * Retrieves the value for an image attachment's 'srcset' attribute. + * + * @since 4.4.0 + * + * @see wp_calculate_image_srcset() + * + * @param int $attachment_id Image attachment ID. + * @param array|string $size Optional. Image size. Accepts any valid image size, or an array of + * width and height values in pixels (in that order). Default 'medium'. + * @param array $image_meta Optional. The image meta data as returned by 'wp_get_attachment_metadata()'. + * Default null. + * @return string|bool A 'srcset' value string or false. + */ +function wp_get_attachment_image_srcset( $attachment_id, $size = 'medium', $image_meta = null ) { + if ( ! $image = wp_get_attachment_image_src( $attachment_id, $size ) ) { + return false; + } + + if ( ! is_array( $image_meta ) ) { + $image_meta = get_post_meta( $attachment_id, '_wp_attachment_metadata', true ); + } + + $image_src = $image[0]; + $size_array = array( + absint( $image[1] ), + absint( $image[2] ) + ); + + return wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attachment_id ); +} + +/** + * A helper function to calculate the image sources to include in a 'srcset' attribute. + * + * @since 4.4.0 + * + * @param array $size_array Array of width and height values in pixels (in that order). + * @param string $image_src The 'src' of the image. + * @param array $image_meta The image meta data as returned by 'wp_get_attachment_metadata()'. + * @param int $attachment_id Optional. The image attachment ID to pass to the filter. Default 0. + * @return string|bool The 'srcset' attribute value. False on error or when only one source exists. + */ +function wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attachment_id = 0 ) { + /** + * Let plugins pre-filter the image meta to be able to fix inconsistencies in the stored data. + * + * @param array $image_meta The image meta data as returned by 'wp_get_attachment_metadata()'. + * @param array $size_array Array of width and height values in pixels (in that order). + * @param string $image_src The 'src' of the image. + * @param int $attachment_id The image attachment ID or 0 if not supplied. + */ + $image_meta = apply_filters( 'wp_calculate_image_srcset_meta', $image_meta, $size_array, $image_src, $attachment_id ); + + if ( empty( $image_meta['sizes'] ) || ! isset( $image_meta['file'] ) || strlen( $image_meta['file'] ) < 4 ) { + return false; + } + + $image_sizes = $image_meta['sizes']; + + // Get the width and height of the image. + $image_width = (int) $size_array[0]; + $image_height = (int) $size_array[1]; + + // Bail early if error/no width. + if ( $image_width < 1 ) { + return false; + } + + $image_basename = wp_basename( $image_meta['file'] ); + + /* + * WordPress flattens animated GIFs into one frame when generating intermediate sizes. + * To avoid hiding animation in user content, if src is a full size GIF, a srcset attribute is not generated. + * If src is an intermediate size GIF, the full size is excluded from srcset to keep a flattened GIF from becoming animated. + */ + if ( ! isset( $image_sizes['thumbnail']['mime-type'] ) || 'image/gif' !== $image_sizes['thumbnail']['mime-type'] ) { + $image_sizes['full'] = array( + 'width' => $image_meta['width'], + 'height' => $image_meta['height'], + 'file' => $image_basename, + ); + } elseif ( strpos( $image_src, $image_meta['file'] ) ) { + return false; + } + + // Retrieve the uploads sub-directory from the full size image. + $dirname = _wp_get_attachment_relative_path( $image_meta['file'] ); + + if ( $dirname ) { + $dirname = trailingslashit( $dirname ); + } + + $upload_dir = wp_get_upload_dir(); + $image_baseurl = trailingslashit( $upload_dir['baseurl'] ) . $dirname; + + /* + * If currently on HTTPS, prefer HTTPS URLs when we know they're supported by the domain + * (which is to say, when they share the domain name of the current request). + */ + if ( is_ssl() && 'https' !== substr( $image_baseurl, 0, 5 ) && parse_url( $image_baseurl, PHP_URL_HOST ) === $_SERVER['HTTP_HOST'] ) { + $image_baseurl = set_url_scheme( $image_baseurl, 'https' ); + } + + /* + * Images that have been edited in WordPress after being uploaded will + * contain a unique hash. Look for that hash and use it later to filter + * out images that are leftovers from previous versions. + */ + $image_edited = preg_match( '/-e[0-9]{13}/', wp_basename( $image_src ), $image_edit_hash ); + + /** + * Filter the maximum image width to be included in a 'srcset' attribute. + * + * @since 4.4.0 + * + * @param int $max_width The maximum image width to be included in the 'srcset'. Default '1600'. + * @param array $size_array Array of width and height values in pixels (in that order). + */ + $max_srcset_image_width = apply_filters( 'max_srcset_image_width', 1600, $size_array ); + + // Array to hold URL candidates. + $sources = array(); + + /** + * To make sure the ID matches our image src, we will check to see if any sizes in our attachment + * meta match our $image_src. If no matches are found we don't return a srcset to avoid serving + * an incorrect image. See #35045. + */ + $src_matched = false; + + /* + * Loop through available images. Only use images that are resized + * versions of the same edit. + */ + foreach ( $image_sizes as $image ) { + $is_src = false; + + // Check if image meta isn't corrupted. + if ( ! is_array( $image ) ) { + continue; + } + + // If the file name is part of the `src`, we've confirmed a match. + if ( ! $src_matched && false !== strpos( $image_src, $dirname . $image['file'] ) ) { + $src_matched = $is_src = true; + } + + // Filter out images that are from previous edits. + if ( $image_edited && ! strpos( $image['file'], $image_edit_hash[0] ) ) { + continue; + } + + /* + * Filter out images that are wider than '$max_srcset_image_width' unless + * that file is in the 'src' attribute. + */ + if ( $max_srcset_image_width && $image['width'] > $max_srcset_image_width && ! $is_src ) { + continue; + } + + /** + * To check for varying crops, we calculate the expected size of the smaller + * image if the larger were constrained by the width of the smaller and then + * see if it matches what we're expecting. + */ + if ( $image_width > $image['width'] ) { + $constrained_size = wp_constrain_dimensions( $image_width, $image_height, $image['width'] ); + $expected_size = array( $image['width'], $image['height'] ); + } else { + $constrained_size = wp_constrain_dimensions( $image['width'], $image['height'], $image_width ); + $expected_size = array( $image_width, $image_height ); + } + + // If the image dimensions are within 1px of the expected size, use it. + if ( abs( $constrained_size[0] - $expected_size[0] ) <= 1 && abs( $constrained_size[1] - $expected_size[1] ) <= 1 ) { + // Add the URL, descriptor, and value to the sources array to be returned. + $source = array( + 'url' => $image_baseurl . $image['file'], + 'descriptor' => 'w', + 'value' => $image['width'], + ); + + // The 'src' image has to be the first in the 'srcset', because of a bug in iOS8. See #35030. + if ( $is_src ) { + $sources = array( $image['width'] => $source ) + $sources; + } else { + $sources[ $image['width'] ] = $source; + } + } + } + + /** + * Filter an image's 'srcset' sources. + * + * @since 4.4.0 + * + * @param array $sources { + * One or more arrays of source data to include in the 'srcset'. + * + * @type array $width { + * @type string $url The URL of an image source. + * @type string $descriptor The descriptor type used in the image candidate string, + * either 'w' or 'x'. + * @type int $value The source width if paired with a 'w' descriptor, or a + * pixel density value if paired with an 'x' descriptor. + * } + * } + * @param array $size_array Array of width and height values in pixels (in that order). + * @param string $image_src The 'src' of the image. + * @param array $image_meta The image meta data as returned by 'wp_get_attachment_metadata()'. + * @param int $attachment_id Image attachment ID or 0. + */ + $sources = apply_filters( 'wp_calculate_image_srcset', $sources, $size_array, $image_src, $image_meta, $attachment_id ); + + // Only return a 'srcset' value if there is more than one source. + if ( ! $src_matched || count( $sources ) < 2 ) { + return false; + } + + $srcset = ''; + + foreach ( $sources as $source ) { + $srcset .= $source['url'] . ' ' . $source['value'] . $source['descriptor'] . ', '; + } + + return rtrim( $srcset, ', ' ); +} + +/** + * Retrieves the value for an image attachment's 'sizes' attribute. + * + * @since 4.4.0 + * + * @see wp_calculate_image_sizes() + * + * @param int $attachment_id Image attachment ID. + * @param array|string $size Optional. Image size. Accepts any valid image size, or an array of width + * and height values in pixels (in that order). Default 'medium'. + * @param array $image_meta Optional. The image meta data as returned by 'wp_get_attachment_metadata()'. + * Default null. + * @return string|bool A valid source size value for use in a 'sizes' attribute or false. + */ +function wp_get_attachment_image_sizes( $attachment_id, $size = 'medium', $image_meta = null ) { + if ( ! $image = wp_get_attachment_image_src( $attachment_id, $size ) ) { + return false; + } + + if ( ! is_array( $image_meta ) ) { + $image_meta = get_post_meta( $attachment_id, '_wp_attachment_metadata', true ); + } + + $image_src = $image[0]; + $size_array = array( + absint( $image[1] ), + absint( $image[2] ) + ); + + return wp_calculate_image_sizes( $size_array, $image_src, $image_meta, $attachment_id ); +} + +/** + * Creates a 'sizes' attribute value for an image. + * + * @since 4.4.0 + * + * @param array|string $size Image size to retrieve. Accepts any valid image size, or an array + * of width and height values in pixels (in that order). Default 'medium'. + * @param string $image_src Optional. The URL to the image file. Default null. + * @param array $image_meta Optional. The image meta data as returned by 'wp_get_attachment_metadata()'. + * Default null. + * @param int $attachment_id Optional. Image attachment ID. Either `$image_meta` or `$attachment_id` + * is needed when using the image size name as argument for `$size`. Default 0. + * @return string|bool A valid source size value for use in a 'sizes' attribute or false. + */ +function wp_calculate_image_sizes( $size, $image_src = null, $image_meta = null, $attachment_id = 0 ) { + $width = 0; + + if ( is_array( $size ) ) { + $width = absint( $size[0] ); + } elseif ( is_string( $size ) ) { + if ( ! $image_meta && $attachment_id ) { + $image_meta = get_post_meta( $attachment_id, '_wp_attachment_metadata', true ); + } + + if ( is_array( $image_meta ) ) { + $size_array = _wp_get_image_size_from_meta( $size, $image_meta ); + if ( $size_array ) { + $width = absint( $size_array[0] ); + } + } + } + + if ( ! $width ) { + return false; + } + + // Setup the default 'sizes' attribute. + $sizes = sprintf( '(max-width: %1$dpx) 100vw, %1$dpx', $width ); + + /** + * Filter the output of 'wp_calculate_image_sizes()'. + * + * @since 4.4.0 + * + * @param string $sizes A source size value for use in a 'sizes' attribute. + * @param array|string $size Requested size. Image size or array of width and height values + * in pixels (in that order). + * @param string|null $image_src The URL to the image file or null. + * @param array|null $image_meta The image meta data as returned by wp_get_attachment_metadata() or null. + * @param int $attachment_id Image attachment ID of the original image or 0. + */ + return apply_filters( 'wp_calculate_image_sizes', $sizes, $size, $image_src, $image_meta, $attachment_id ); +} + +/** + * Filters 'img' elements in post content to add 'srcset' and 'sizes' attributes. + * + * @since 4.4.0 + * + * @see wp_image_add_srcset_and_sizes() + * + * @param string $content The raw post content to be filtered. + * @return string Converted content with 'srcset' and 'sizes' attributes added to images. + */ +function wp_make_content_images_responsive( $content ) { + if ( ! preg_match_all( '/<img [^>]+>/', $content, $matches ) ) { + return $content; + } + + $selected_images = $attachment_ids = array(); + + foreach( $matches[0] as $image ) { + if ( false === strpos( $image, ' srcset=' ) && preg_match( '/wp-image-([0-9]+)/i', $image, $class_id ) && + ( $attachment_id = absint( $class_id[1] ) ) ) { + + /* + * If exactly the same image tag is used more than once, overwrite it. + * All identical tags will be replaced later with 'str_replace()'. + */ + $selected_images[ $image ] = $attachment_id; + // Overwrite the ID when the same image is included more than once. + $attachment_ids[ $attachment_id ] = true; + } + } + + if ( count( $attachment_ids ) > 1 ) { + /* + * Warm object cache for use with 'get_post_meta()'. + * + * To avoid making a database call for each image, a single query + * warms the object cache with the meta information for all images. + */ + update_meta_cache( 'post', array_keys( $attachment_ids ) ); + } + + foreach ( $selected_images as $image => $attachment_id ) { + $image_meta = get_post_meta( $attachment_id, '_wp_attachment_metadata', true ); + $content = str_replace( $image, wp_image_add_srcset_and_sizes( $image, $image_meta, $attachment_id ), $content ); + } + + return $content; +} + +/** + * Adds 'srcset' and 'sizes' attributes to an existing 'img' element. + * + * @since 4.4.0 + * + * @see wp_calculate_image_srcset() + * @see wp_calculate_image_sizes() + * + * @param string $image An HTML 'img' element to be filtered. + * @param array $image_meta The image meta data as returned by 'wp_get_attachment_metadata()'. + * @param int $attachment_id Image attachment ID. + * @return string Converted 'img' element with 'srcset' and 'sizes' attributes added. + */ +function wp_image_add_srcset_and_sizes( $image, $image_meta, $attachment_id ) { + // Ensure the image meta exists. + if ( empty( $image_meta['sizes'] ) ) { + return $image; + } + + $image_src = preg_match( '/src="([^"]+)"/', $image, $match_src ) ? $match_src[1] : ''; + list( $image_src ) = explode( '?', $image_src ); + + // Return early if we couldn't get the image source. + if ( ! $image_src ) { + return $image; + } + + // Bail early if an image has been inserted and later edited. + if ( preg_match( '/-e[0-9]{13}/', $image_meta['file'], $img_edit_hash ) && + strpos( wp_basename( $image_src ), $img_edit_hash[0] ) === false ) { + + return $image; + } + + $width = preg_match( '/ width="([0-9]+)"/', $image, $match_width ) ? (int) $match_width[1] : 0; + $height = preg_match( '/ height="([0-9]+)"/', $image, $match_height ) ? (int) $match_height[1] : 0; + + if ( ! $width || ! $height ) { + /* + * If attempts to parse the size value failed, attempt to use the image meta data to match + * the image file name from 'src' against the available sizes for an attachment. + */ + $image_filename = wp_basename( $image_src ); + + if ( $image_filename === wp_basename( $image_meta['file'] ) ) { + $width = (int) $image_meta['width']; + $height = (int) $image_meta['height']; + } else { + foreach( $image_meta['sizes'] as $image_size_data ) { + if ( $image_filename === $image_size_data['file'] ) { + $width = (int) $image_size_data['width']; + $height = (int) $image_size_data['height']; + break; + } + } + } + } + + if ( ! $width || ! $height ) { + return $image; + } + + $size_array = array( $width, $height ); + $srcset = wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attachment_id ); + + if ( $srcset ) { + // Check if there is already a 'sizes' attribute. + $sizes = strpos( $image, ' sizes=' ); + + if ( ! $sizes ) { + $sizes = wp_calculate_image_sizes( $size_array, $image_src, $image_meta, $attachment_id ); + } + } + + if ( $srcset && $sizes ) { + // Format the 'srcset' and 'sizes' string and escape attributes. + $attr = sprintf( ' srcset="%s"', esc_attr( $srcset ) ); + + if ( is_string( $sizes ) ) { + $attr .= sprintf( ' sizes="%s"', esc_attr( $sizes ) ); + } + + // Add 'srcset' and 'sizes' attributes to the image markup. + $image = preg_replace( '/<img ([^>]+?)[\/ ]*>/', '<img $1' . $attr . ' />', $image ); + } + + return $image; +} + +/** + * Adds a 'wp-post-image' class to post thumbnails. Internal use only. + * + * Uses the 'begin_fetch_post_thumbnail_html' and 'end_fetch_post_thumbnail_html' action hooks to + * dynamically add/remove itself so as to only filter post thumbnails. + * + * @ignore * @since 2.9.0 - * @param array $attr Attributes including src, class, alt, title - * @return array + * + * @param array $attr Thumbnail attributes including src, class, alt, title. + * @return array Modified array of attributes including the new 'wp-post-image' class. */ function _wp_post_thumbnail_class_filter( $attr ) { $attr['class'] .= ' wp-post-image'; @@ -749,18 +1402,26 @@ function _wp_post_thumbnail_class_filter( $attr ) { } /** - * Adds _wp_post_thumbnail_class_filter to the wp_get_attachment_image_attributes filter + * Adds '_wp_post_thumbnail_class_filter' callback to the 'wp_get_attachment_image_attributes' + * filter hook. Internal use only. * + * @ignore * @since 2.9.0 + * + * @param array $attr Thumbnail attributes including src, class, alt, title. */ function _wp_post_thumbnail_class_filter_add( $attr ) { add_filter( 'wp_get_attachment_image_attributes', '_wp_post_thumbnail_class_filter' ); } /** - * Removes _wp_post_thumbnail_class_filter from the wp_get_attachment_image_attributes filter + * Removes the '_wp_post_thumbnail_class_filter' callback from the 'wp_get_attachment_image_attributes' + * filter hook. Internal use only. * + * @ignore * @since 2.9.0 + * + * @param array $attr Thumbnail attributes including src, class, alt, title. */ function _wp_post_thumbnail_class_filter_remove( $attr ) { remove_filter( 'wp_get_attachment_image_attributes', '_wp_post_thumbnail_class_filter' ); @@ -770,7 +1431,7 @@ add_shortcode('wp_caption', 'img_caption_shortcode'); add_shortcode('caption', 'img_caption_shortcode'); /** - * The Caption shortcode. + * Builds the Caption shortcode output. * * Allows a plugin to replace the content that would otherwise be returned. The * filter is 'img_caption_shortcode' and passes an empty string, the attr @@ -781,7 +1442,7 @@ add_shortcode('caption', 'img_caption_shortcode'); * * @since 2.6.0 * - * @param array $attr { + * @param array $attr { * Attributes of the caption shortcode. * * @type string $id ID of the div element for the caption. @@ -791,7 +1452,7 @@ add_shortcode('caption', 'img_caption_shortcode'); * @type string $caption The caption text. * @type string $class Additional class name(s) added to the caption container. * } - * @param string $content Optional. Shortcode content. + * @param string $content Shortcode content. * @return string HTML content to display the caption. */ function img_caption_shortcode( $attr, $content = null ) { @@ -801,6 +1462,8 @@ function img_caption_shortcode( $attr, $content = null ) { $content = $matches[1]; $attr['caption'] = trim( $matches[2] ); } + } elseif ( strpos( $attr['caption'], '<' ) !== false ) { + $attr['caption'] = wp_kses( $attr['caption'], 'post' ); } /** @@ -834,16 +1497,13 @@ function img_caption_shortcode( $attr, $content = null ) { return $content; if ( ! empty( $atts['id'] ) ) - $atts['id'] = 'id="' . esc_attr( $atts['id'] ) . '" '; + $atts['id'] = 'id="' . esc_attr( sanitize_html_class( $atts['id'] ) ) . '" '; $class = trim( 'wp-caption ' . $atts['align'] . ' ' . $atts['class'] ); - if ( current_theme_supports( 'html5', 'caption' ) ) { - return '<figure ' . $atts['id'] . 'style="width: ' . (int) $atts['width'] . 'px;" class="' . esc_attr( $class ) . '">' - . do_shortcode( $content ) . '<figcaption class="wp-caption-text">' . $atts['caption'] . '</figcaption></figure>'; - } - - $caption_width = 10 + $atts['width']; + $html5 = current_theme_supports( 'html5', 'caption' ); + // HTML5 captions never added the extra 10px to the image width + $width = $html5 ? $atts['width'] : ( 10 + $atts['width'] ); /** * Filter the width of an image's caption. @@ -855,51 +1515,62 @@ function img_caption_shortcode( $attr, $content = null ) { * * @see img_caption_shortcode() * - * @param int $caption_width Width of the caption in pixels. To remove this inline style, - * return zero. - * @param array $atts Attributes of the caption shortcode. - * @param string $content The image element, possibly wrapped in a hyperlink. + * @param int $width Width of the caption in pixels. To remove this inline style, + * return zero. + * @param array $atts Attributes of the caption shortcode. + * @param string $content The image element, possibly wrapped in a hyperlink. */ - $caption_width = apply_filters( 'img_caption_shortcode_width', $caption_width, $atts, $content ); + $caption_width = apply_filters( 'img_caption_shortcode_width', $width, $atts, $content ); $style = ''; if ( $caption_width ) $style = 'style="width: ' . (int) $caption_width . 'px" '; - return '<div ' . $atts['id'] . $style . 'class="' . esc_attr( $class ) . '">' - . do_shortcode( $content ) . '<p class="wp-caption-text">' . $atts['caption'] . '</p></div>'; + $html = ''; + if ( $html5 ) { + $html = '<figure ' . $atts['id'] . $style . 'class="' . esc_attr( $class ) . '">' + . do_shortcode( $content ) . '<figcaption class="wp-caption-text">' . $atts['caption'] . '</figcaption></figure>'; + } else { + $html = '<div ' . $atts['id'] . $style . 'class="' . esc_attr( $class ) . '">' + . do_shortcode( $content ) . '<p class="wp-caption-text">' . $atts['caption'] . '</p></div>'; + } + + return $html; } add_shortcode('gallery', 'gallery_shortcode'); /** - * The Gallery shortcode. + * Builds the Gallery shortcode output. * * This implements the functionality of the Gallery Shortcode for displaying * WordPress images on a post. * * @since 2.5.0 * + * @staticvar int $instance + * * @param array $attr { * Attributes of the gallery shortcode. * - * @type string $order Order of the images in the gallery. Default 'ASC'. Accepts 'ASC', 'DESC'. - * @type string $orderby The field to use when ordering the images. Default 'menu_order ID'. - * Accepts any valid SQL ORDERBY statement. - * @type int $id Post ID. - * @type string $itemtag HTML tag to use for each image in the gallery. - * Default 'dl', or 'figure' when the theme registers HTML5 gallery support. - * @type string $icontag HTML tag to use for each image's icon. - * Default 'dt', or 'div' when the theme registers HTML5 gallery support. - * @type string $captiontag HTML tag to use for each image's caption. - * Default 'dd', or 'figcaption' when the theme registers HTML5 gallery support. - * @type int $columns Number of columns of images to display. Default 3. - * @type string $size Size of the images to display. Default 'thumbnail'. - * @type string $ids A comma-separated list of IDs of attachments to display. Default empty. - * @type string $include A comma-separated list of IDs of attachments to include. Default empty. - * @type string $exclude A comma-separated list of IDs of attachments to exclude. Default empty. - * @type string $link What to link each image to. Default empty (links to the attachment page). - * Accepts 'file', 'none'. + * @type string $order Order of the images in the gallery. Default 'ASC'. Accepts 'ASC', 'DESC'. + * @type string $orderby The field to use when ordering the images. Default 'menu_order ID'. + * Accepts any valid SQL ORDERBY statement. + * @type int $id Post ID. + * @type string $itemtag HTML tag to use for each image in the gallery. + * Default 'dl', or 'figure' when the theme registers HTML5 gallery support. + * @type string $icontag HTML tag to use for each image's icon. + * Default 'dt', or 'div' when the theme registers HTML5 gallery support. + * @type string $captiontag HTML tag to use for each image's caption. + * Default 'dd', or 'figcaption' when the theme registers HTML5 gallery support. + * @type int $columns Number of columns of images to display. Default 3. + * @type string|array $size Size of the images to display. Accepts any valid image size, or an array of width + * and height values in pixels (in that order). Default 'thumbnail'. + * @type string $ids A comma-separated list of IDs of attachments to display. Default empty. + * @type string $include A comma-separated list of IDs of attachments to include. Default empty. + * @type string $exclude A comma-separated list of IDs of attachments to exclude. Default empty. + * @type string $link What to link each image to. Default empty (links to the attachment page). + * Accepts 'file', 'none'. * } * @return string HTML content to display gallery. */ @@ -911,8 +1582,9 @@ function gallery_shortcode( $attr ) { if ( ! empty( $attr['ids'] ) ) { // 'ids' is explicitly ordered, unless you specify otherwise. - if ( empty( $attr['orderby'] ) ) + if ( empty( $attr['orderby'] ) ) { $attr['orderby'] = 'post__in'; + } $attr['include'] = $attr['ids']; } @@ -923,25 +1595,21 @@ function gallery_shortcode( $attr ) { * the default gallery template. * * @since 2.5.0 + * @since 4.2.0 The `$instance` parameter was added. * * @see gallery_shortcode() * - * @param string $output The gallery output. Default empty. - * @param array $attr Attributes of the gallery shortcode. + * @param string $output The gallery output. Default empty. + * @param array $attr Attributes of the gallery shortcode. + * @param int $instance Unique numeric ID of this gallery shortcode instance. */ - $output = apply_filters( 'post_gallery', '', $attr ); - if ( $output != '' ) + $output = apply_filters( 'post_gallery', '', $attr, $instance ); + if ( $output != '' ) { return $output; - - // We're trusting author input, so let's at least make sure it looks like a valid orderby statement - if ( isset( $attr['orderby'] ) ) { - $attr['orderby'] = sanitize_sql_orderby( $attr['orderby'] ); - if ( !$attr['orderby'] ) - unset( $attr['orderby'] ); } $html5 = current_theme_supports( 'html5', 'gallery' ); - extract(shortcode_atts(array( + $atts = shortcode_atts( array( 'order' => 'ASC', 'orderby' => 'menu_order ID', 'id' => $post ? $post->ID : 0, @@ -953,53 +1621,56 @@ function gallery_shortcode( $attr ) { 'include' => '', 'exclude' => '', 'link' => '' - ), $attr, 'gallery')); + ), $attr, 'gallery' ); - $id = intval($id); - if ( 'RAND' == $order ) - $orderby = 'none'; + $id = intval( $atts['id'] ); - if ( !empty($include) ) { - $_attachments = get_posts( array('include' => $include, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $order, 'orderby' => $orderby) ); + if ( ! empty( $atts['include'] ) ) { + $_attachments = get_posts( array( 'include' => $atts['include'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) ); $attachments = array(); foreach ( $_attachments as $key => $val ) { $attachments[$val->ID] = $_attachments[$key]; } - } elseif ( !empty($exclude) ) { - $attachments = get_children( array('post_parent' => $id, 'exclude' => $exclude, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $order, 'orderby' => $orderby) ); + } elseif ( ! empty( $atts['exclude'] ) ) { + $attachments = get_children( array( 'post_parent' => $id, 'exclude' => $atts['exclude'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) ); } else { - $attachments = get_children( array('post_parent' => $id, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $order, 'orderby' => $orderby) ); + $attachments = get_children( array( 'post_parent' => $id, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) ); } - if ( empty($attachments) ) + if ( empty( $attachments ) ) { return ''; + } if ( is_feed() ) { $output = "\n"; - foreach ( $attachments as $att_id => $attachment ) - $output .= wp_get_attachment_link($att_id, $size, true) . "\n"; + foreach ( $attachments as $att_id => $attachment ) { + $output .= wp_get_attachment_link( $att_id, $atts['size'], true ) . "\n"; + } return $output; } - $itemtag = tag_escape($itemtag); - $captiontag = tag_escape($captiontag); - $icontag = tag_escape($icontag); + $itemtag = tag_escape( $atts['itemtag'] ); + $captiontag = tag_escape( $atts['captiontag'] ); + $icontag = tag_escape( $atts['icontag'] ); $valid_tags = wp_kses_allowed_html( 'post' ); - if ( ! isset( $valid_tags[ $itemtag ] ) ) + if ( ! isset( $valid_tags[ $itemtag ] ) ) { $itemtag = 'dl'; - if ( ! isset( $valid_tags[ $captiontag ] ) ) + } + if ( ! isset( $valid_tags[ $captiontag ] ) ) { $captiontag = 'dd'; - if ( ! isset( $valid_tags[ $icontag ] ) ) + } + if ( ! isset( $valid_tags[ $icontag ] ) ) { $icontag = 'dt'; + } - $columns = intval($columns); + $columns = intval( $atts['columns'] ); $itemwidth = $columns > 0 ? floor(100/$columns) : 100; $float = is_rtl() ? 'right' : 'left'; $selector = "gallery-{$instance}"; - $gallery_style = $gallery_div = ''; + $gallery_style = ''; /** * Filter whether to print default gallery styles. @@ -1032,7 +1703,7 @@ function gallery_shortcode( $attr ) { </style>\n\t\t"; } - $size_class = sanitize_html_class( $size ); + $size_class = sanitize_html_class( $atts['size'] ); $gallery_div = "<div id='$selector' class='gallery galleryid-{$id} gallery-columns-{$columns} gallery-size-{$size_class}'>"; /** @@ -1040,26 +1711,28 @@ function gallery_shortcode( $attr ) { * * @since 2.5.0 * - * @param string $gallery_style Default gallery shortcode CSS styles. - * @param string $gallery_div Opening HTML div container for the gallery shortcode output. + * @param string $gallery_style Default CSS styles and opening HTML div container + * for the gallery shortcode output. */ $output = apply_filters( 'gallery_style', $gallery_style . $gallery_div ); $i = 0; foreach ( $attachments as $id => $attachment ) { - if ( ! empty( $link ) && 'file' === $link ) - $image_output = wp_get_attachment_link( $id, $size, false, false ); - elseif ( ! empty( $link ) && 'none' === $link ) - $image_output = wp_get_attachment_image( $id, $size, false ); - else - $image_output = wp_get_attachment_link( $id, $size, true, false ); + $attr = ( trim( $attachment->post_excerpt ) ) ? array( 'aria-describedby' => "$selector-$id" ) : ''; + if ( ! empty( $atts['link'] ) && 'file' === $atts['link'] ) { + $image_output = wp_get_attachment_link( $id, $atts['size'], false, false, false, $attr ); + } elseif ( ! empty( $atts['link'] ) && 'none' === $atts['link'] ) { + $image_output = wp_get_attachment_image( $id, $atts['size'], false, $attr ); + } else { + $image_output = wp_get_attachment_link( $id, $atts['size'], true, false, false, $attr ); + } $image_meta = wp_get_attachment_metadata( $id ); $orientation = ''; - if ( isset( $image_meta['height'], $image_meta['width'] ) ) + if ( isset( $image_meta['height'], $image_meta['width'] ) ) { $orientation = ( $image_meta['height'] > $image_meta['width'] ) ? 'portrait' : 'landscape'; - + } $output .= "<{$itemtag} class='gallery-item'>"; $output .= " <{$icontag} class='gallery-icon {$orientation}'> @@ -1067,7 +1740,7 @@ function gallery_shortcode( $attr ) { </{$icontag}>"; if ( $captiontag && trim($attachment->post_excerpt) ) { $output .= " - <{$captiontag} class='wp-caption-text gallery-caption'> + <{$captiontag} class='wp-caption-text gallery-caption' id='$selector-$id'> " . wptexturize($attachment->post_excerpt) . " </{$captiontag}>"; } @@ -1089,7 +1762,7 @@ function gallery_shortcode( $attr ) { } /** - * Output the templates used by playlists. + * Outputs the templates used by playlists. * * @since 3.9.0 */ @@ -1097,10 +1770,13 @@ function wp_underscore_playlist_templates() { ?> <script type="text/html" id="tmpl-wp-playlist-current-item"> <# if ( data.image ) { #> - <img src="{{ data.thumb.src }}"/> + <img src="{{ data.thumb.src }}" alt="" /> <# } #> <div class="wp-playlist-caption"> - <span class="wp-playlist-item-meta wp-playlist-item-title">“{{ data.title }}”</span> + <span class="wp-playlist-item-meta wp-playlist-item-title"><?php + /* translators: playlist item title */ + printf( _x( '“%s”', 'playlist item title' ), '{{ data.title }}' ); + ?></span> <# if ( data.meta.album ) { #><span class="wp-playlist-item-meta wp-playlist-item-album">{{ data.meta.album }}</span><# } #> <# if ( data.meta.artist ) { #><span class="wp-playlist-item-meta wp-playlist-item-artist">{{ data.meta.artist }}</span><# } #> </div> @@ -1112,7 +1788,10 @@ function wp_underscore_playlist_templates() { <# if ( data.caption ) { #> {{ data.caption }} <# } else { #> - <span class="wp-playlist-item-title">“{{{ data.title }}}”</span> + <span class="wp-playlist-item-title"><?php + /* translators: playlist item title */ + printf( _x( '“%s”', 'playlist item title' ), '{{{ data.title }}}' ); + ?></span> <# if ( data.artists && data.meta.artist ) { #> <span class="wp-playlist-item-artist"> — {{ data.meta.artist }}</span> <# } #> @@ -1127,7 +1806,7 @@ function wp_underscore_playlist_templates() { } /** - * Output and enqueue default scripts and styles for playlists. + * Outputs and enqueue default scripts and styles for playlists. * * @since 3.9.0 * @@ -1142,17 +1821,42 @@ function wp_playlist_scripts( $type ) { add_action( 'wp_footer', 'wp_underscore_playlist_templates', 0 ); add_action( 'admin_footer', 'wp_underscore_playlist_templates', 0 ); } -add_action( 'wp_playlist_scripts', 'wp_playlist_scripts' ); /** - * The playlist shortcode. + * Builds the Playlist shortcode output. * * This implements the functionality of the playlist shortcode for displaying * a collection of WordPress audio or video files in a post. * * @since 3.9.0 * - * @param array $attr Playlist shortcode attributes. + * @global int $content_width + * @staticvar int $instance + * + * @param array $attr { + * Array of default playlist attributes. + * + * @type string $type Type of playlist to display. Accepts 'audio' or 'video'. Default 'audio'. + * @type string $order Designates ascending or descending order of items in the playlist. + * Accepts 'ASC', 'DESC'. Default 'ASC'. + * @type string $orderby Any column, or columns, to sort the playlist. If $ids are + * passed, this defaults to the order of the $ids array ('post__in'). + * Otherwise default is 'menu_order ID'. + * @type int $id If an explicit $ids array is not present, this parameter + * will determine which attachments are used for the playlist. + * Default is the current post ID. + * @type array $ids Create a playlist out of these explicit attachment IDs. If empty, + * a playlist will be created from all $type attachments of $id. + * Default empty. + * @type array $exclude List of specific attachment IDs to exclude from the playlist. Default empty. + * @type string $style Playlist style to use. Accepts 'light' or 'dark'. Default 'light'. + * @type bool $tracklist Whether to show or hide the playlist. Default true. + * @type bool $tracknumbers Whether to show or hide the numbers next to entries in the playlist. Default true. + * @type bool $images Show or hide the video or audio thumbnail (Featured Image/post + * thumbnail). Default true. + * @type bool $artists Whether to show or hide artist name in the playlist. Default true. + * } + * * @return string Playlist output. Empty string if the passed type is unsupported. */ function wp_playlist_shortcode( $attr ) { @@ -1177,26 +1881,18 @@ function wp_playlist_shortcode( $attr ) { * of the default playlist output, returning the passed value instead. * * @since 3.9.0 + * @since 4.2.0 The `$instance` parameter was added. * - * @param string $output Playlist output. Default empty. - * @param array $attr An array of shortcode attributes. + * @param string $output Playlist output. Default empty. + * @param array $attr An array of shortcode attributes. + * @param int $instance Unique numeric ID of this playlist shortcode instance. */ - $output = apply_filters( 'post_playlist', '', $attr ); + $output = apply_filters( 'post_playlist', '', $attr, $instance ); if ( $output != '' ) { return $output; } - /* - * We're trusting author input, so let's at least make sure it looks - * like a valid orderby statement. - */ - if ( isset( $attr['orderby'] ) ) { - $attr['orderby'] = sanitize_sql_orderby( $attr['orderby'] ); - if ( ! $attr['orderby'] ) - unset( $attr['orderby'] ); - } - - extract( shortcode_atts( array( + $atts = shortcode_atts( array( 'type' => 'audio', 'order' => 'ASC', 'orderby' => 'menu_order ID', @@ -1208,32 +1904,33 @@ function wp_playlist_shortcode( $attr ) { 'tracknumbers' => true, 'images' => true, 'artists' => true - ), $attr, 'playlist' ) ); + ), $attr, 'playlist' ); + + $id = intval( $atts['id'] ); - $id = intval( $id ); - if ( 'RAND' == $order ) { - $orderby = 'none'; + if ( $atts['type'] !== 'audio' ) { + $atts['type'] = 'video'; } $args = array( 'post_status' => 'inherit', 'post_type' => 'attachment', - 'post_mime_type' => $type, - 'order' => $order, - 'orderby' => $orderby + 'post_mime_type' => $atts['type'], + 'order' => $atts['order'], + 'orderby' => $atts['orderby'] ); - if ( ! empty( $include ) ) { - $args['include'] = $include; + if ( ! empty( $atts['include'] ) ) { + $args['include'] = $atts['include']; $_attachments = get_posts( $args ); $attachments = array(); foreach ( $_attachments as $key => $val ) { $attachments[$val->ID] = $_attachments[$key]; } - } elseif ( ! empty( $exclude ) ) { + } elseif ( ! empty( $atts['exclude'] ) ) { $args['post_parent'] = $id; - $args['exclude'] = $exclude; + $args['exclude'] = $atts['exclude']; $attachments = get_children( $args ); } else { $args['post_parent'] = $id; @@ -1260,12 +1957,14 @@ function wp_playlist_shortcode( $attr ) { $theme_width = empty( $content_width ) ? $default_width : ( $content_width - $outer ); $theme_height = empty( $content_width ) ? $default_height : round( ( $default_height * $theme_width ) / $default_width ); - $data = compact( 'type' ); - - // don't pass strings to JSON, will be truthy in JS - foreach ( array( 'tracklist', 'tracknumbers', 'images', 'artists' ) as $key ) { - $data[$key] = filter_var( $$key, FILTER_VALIDATE_BOOLEAN ); - } + $data = array( + 'type' => $atts['type'], + // don't pass strings to JSON, will be truthy in JS + 'tracklist' => wp_validate_boolean( $atts['tracklist'] ), + 'tracknumbers' => wp_validate_boolean( $atts['tracknumbers'] ), + 'images' => wp_validate_boolean( $atts['images'] ), + 'artists' => wp_validate_boolean( $atts['artists'] ), + ); $tracks = array(); foreach ( $attachments as $attachment ) { @@ -1289,7 +1988,7 @@ function wp_playlist_shortcode( $attr ) { } } - if ( 'video' === $type ) { + if ( 'video' === $atts['type'] ) { if ( ! empty( $meta['width'] ) && ! empty( $meta['height'] ) ) { $width = $meta['width']; $height = $meta['height']; @@ -1309,12 +2008,12 @@ function wp_playlist_shortcode( $attr ) { } } - if ( $images ) { - $id = get_post_thumbnail_id( $attachment->ID ); - if ( ! empty( $id ) ) { - list( $src, $width, $height ) = wp_get_attachment_image_src( $id, 'full' ); + if ( $atts['images'] ) { + $thumb_id = get_post_thumbnail_id( $attachment->ID ); + if ( ! empty( $thumb_id ) ) { + list( $src, $width, $height ) = wp_get_attachment_image_src( $thumb_id, 'full' ); $track['image'] = compact( 'src', 'width', 'height' ); - list( $src, $width, $height ) = wp_get_attachment_image_src( $id, 'thumbnail' ); + list( $src, $width, $height ) = wp_get_attachment_image_src( $thumb_id, 'thumbnail' ); $track['thumb'] = compact( 'src', 'width', 'height' ); } else { $src = wp_mime_type_icon( $attachment->ID ); @@ -1329,8 +2028,8 @@ function wp_playlist_shortcode( $attr ) { } $data['tracks'] = $tracks; - $safe_type = esc_attr( $type ); - $safe_style = esc_attr( $style ); + $safe_type = esc_attr( $atts['type'] ); + $safe_style = esc_attr( $atts['style'] ); ob_start(); @@ -1343,10 +2042,10 @@ function wp_playlist_shortcode( $attr ) { * @param string $type Type of playlist. Possible values are 'audio' or 'video'. * @param string $style The 'theme' for the playlist. Core provides 'light' and 'dark'. */ - do_action( 'wp_playlist_scripts', $type, $style ); + do_action( 'wp_playlist_scripts', $atts['type'], $atts['style'] ); } ?> <div class="wp-playlist wp-<?php echo $safe_type ?>-playlist wp-playlist-<?php echo $safe_style ?>"> - <?php if ( 'audio' === $type ): ?> + <?php if ( 'audio' === $atts['type'] ): ?> <div class="wp-playlist-current-item"></div> <?php endif ?> <<?php echo $safe_type ?> controls="controls" preload="none" width="<?php @@ -1365,7 +2064,7 @@ function wp_playlist_shortcode( $attr ) { } ?></ol> </noscript> - <script type="application/json"><?php echo json_encode( $data ) ?></script> + <script type="application/json" class="wp-playlist-script"><?php echo wp_json_encode( $data ) ?></script> </div> <?php return ob_get_clean(); @@ -1373,12 +2072,12 @@ function wp_playlist_shortcode( $attr ) { add_shortcode( 'playlist', 'wp_playlist_shortcode' ); /** - * Provide a No-JS Flash fallback as a last resort for audio / video + * Provides a No-JS Flash fallback as a last resort for audio / video. * * @since 3.6.0 * - * @param string $url - * @return string Fallback HTML + * @param string $url The media element URL. + * @return string Fallback HTML. */ function wp_mediaelement_fallback( $url ) { /** @@ -1393,10 +2092,11 @@ function wp_mediaelement_fallback( $url ) { } /** - * Return a filtered list of WP-supported audio formats. + * Returns a filtered list of WP-supported audio formats. * * @since 3.6.0 - * @return array + * + * @return array Supported audio formats. */ function wp_get_audio_extensions() { /** @@ -1411,12 +2111,12 @@ function wp_get_audio_extensions() { } /** - * Return useful keys to use to lookup data from an attachment's stored metadata. + * Returns useful keys to use to lookup data from an attachment's stored metadata. * * @since 3.9.0 * * @param WP_Post $attachment The current attachment, provided for context. - * @param string $context The context. Accepts 'edit', 'display'. Default 'display'. + * @param string $context Optional. The context. Accepts 'edit', 'display'. Default 'display'. * @return array Key/value pairs of field keys to labels. */ function wp_get_attachment_id3_keys( $attachment, $context = 'display' ) { @@ -1429,6 +2129,9 @@ function wp_get_attachment_id3_keys( $attachment, $context = 'display' ) { $fields['genre'] = __( 'Genre' ); $fields['year'] = __( 'Year' ); $fields['length_formatted'] = _x( 'Length', 'video or audio' ); + } elseif ( 'js' === $context ) { + $fields['bitrate'] = __( 'Bitrate' ); + $fields['bitrate_mode'] = __( 'Bitrate Mode' ); } /** @@ -1443,32 +2146,33 @@ function wp_get_attachment_id3_keys( $attachment, $context = 'display' ) { return apply_filters( 'wp_get_attachment_id3_keys', $fields, $attachment, $context ); } /** - * The Audio shortcode. + * Builds the Audio shortcode output. * * This implements the functionality of the Audio Shortcode for displaying * WordPress mp3s in a post. * * @since 3.6.0 * - * @param array $attr { + * @staticvar int $instance + * + * @param array $attr { * Attributes of the audio shortcode. * * @type string $src URL to the source of the audio file. Default empty. * @type string $loop The 'loop' attribute for the `<audio>` element. Default empty. * @type string $autoplay The 'autoplay' attribute for the `<audio>` element. Default empty. - * @type string $preload The 'preload' attribute for the `<audio>` element. Default empty. + * @type string $preload The 'preload' attribute for the `<audio>` element. Default 'none'. * @type string $class The 'class' attribute for the `<audio>` element. Default 'wp-audio-shortcode'. - * @type string $id The 'id' attribute for the `<audio>` element. Default 'audio-{$post_id}-{$instances}'. - * @type string $style The 'style' attribute for the `<audio>` element. Default 'width: 100%'. + * @type string $style The 'style' attribute for the `<audio>` element. Default 'width: 100%; visibility: hidden;'. * } - * @param string $content Optional. Shortcode content. - * @return string HTML content to display audio. + * @param string $content Shortcode content. + * @return string|void HTML content to display audio. */ function wp_audio_shortcode( $attr, $content = '' ) { $post_id = get_post() ? get_the_ID() : 0; - static $instances = 0; - $instances++; + static $instance = 0; + $instance++; /** * Filter the default audio shortcode output. @@ -1477,14 +2181,15 @@ function wp_audio_shortcode( $attr, $content = '' ) { * * @since 3.6.0 * - * @param string $html Empty variable to be replaced with shortcode markup. - * @param array $attr Attributes of the shortcode. @see wp_audio_shortcode() - * @param string $content Shortcode content. - * @param int $instances Unique numeric ID of this audio shortcode instance. + * @param string $html Empty variable to be replaced with shortcode markup. + * @param array $attr Attributes of the shortcode. @see wp_audio_shortcode() + * @param string $content Shortcode content. + * @param int $instance Unique numeric ID of this audio shortcode instance. */ - $html = apply_filters( 'wp_audio_shortcode_override', '', $attr, $content, $instances ); - if ( '' !== $html ) - return $html; + $override = apply_filters( 'wp_audio_shortcode_override', '', $attr, $content, $instance ); + if ( '' !== $override ) { + return $override; + } $audio = null; @@ -1493,40 +2198,46 @@ function wp_audio_shortcode( $attr, $content = '' ) { 'src' => '', 'loop' => '', 'autoplay' => '', - 'preload' => 'none' + 'preload' => 'none', + 'class' => 'wp-audio-shortcode', + 'style' => 'width: 100%; visibility: hidden;' ); - foreach ( $default_types as $type ) + foreach ( $default_types as $type ) { $defaults_atts[$type] = ''; + } $atts = shortcode_atts( $defaults_atts, $attr, 'audio' ); - extract( $atts ); $primary = false; - if ( ! empty( $src ) ) { - $type = wp_check_filetype( $src, wp_get_mime_types() ); - if ( ! in_array( strtolower( $type['ext'] ), $default_types ) ) - return sprintf( '<a class="wp-embedded-audio" href="%s">%s</a>', esc_url( $src ), esc_html( $src ) ); + if ( ! empty( $atts['src'] ) ) { + $type = wp_check_filetype( $atts['src'], wp_get_mime_types() ); + if ( ! in_array( strtolower( $type['ext'] ), $default_types ) ) { + return sprintf( '<a class="wp-embedded-audio" href="%s">%s</a>', esc_url( $atts['src'] ), esc_html( $atts['src'] ) ); + } $primary = true; array_unshift( $default_types, 'src' ); } else { foreach ( $default_types as $ext ) { - if ( ! empty( $$ext ) ) { - $type = wp_check_filetype( $$ext, wp_get_mime_types() ); - if ( strtolower( $type['ext'] ) === $ext ) + if ( ! empty( $atts[ $ext ] ) ) { + $type = wp_check_filetype( $atts[ $ext ], wp_get_mime_types() ); + if ( strtolower( $type['ext'] ) === $ext ) { $primary = true; + } } } } if ( ! $primary ) { $audios = get_attached_media( 'audio', $post_id ); - if ( empty( $audios ) ) + if ( empty( $audios ) ) { return; + } $audio = reset( $audios ); - $src = wp_get_attachment_url( $audio->ID ); - if ( empty( $src ) ) + $atts['src'] = wp_get_attachment_url( $audio->ID ); + if ( empty( $atts['src'] ) ) { return; + } array_unshift( $default_types, 'src' ); } @@ -1551,45 +2262,51 @@ function wp_audio_shortcode( $attr, $content = '' ) { * * @param string $class CSS class or list of space-separated classes. */ - $atts = array( - 'class' => apply_filters( 'wp_audio_shortcode_class', 'wp-audio-shortcode' ), - 'id' => sprintf( 'audio-%d-%d', $post_id, $instances ), - 'loop' => $loop, - 'autoplay' => $autoplay, - 'preload' => $preload, - 'style' => 'width: 100%; visibility: hidden;', + $atts['class'] = apply_filters( 'wp_audio_shortcode_class', $atts['class'] ); + + $html_atts = array( + 'class' => $atts['class'], + 'id' => sprintf( 'audio-%d-%d', $post_id, $instance ), + 'loop' => wp_validate_boolean( $atts['loop'] ), + 'autoplay' => wp_validate_boolean( $atts['autoplay'] ), + 'preload' => $atts['preload'], + 'style' => $atts['style'], ); // These ones should just be omitted altogether if they are blank foreach ( array( 'loop', 'autoplay', 'preload' ) as $a ) { - if ( empty( $atts[$a] ) ) - unset( $atts[$a] ); + if ( empty( $html_atts[$a] ) ) { + unset( $html_atts[$a] ); + } } $attr_strings = array(); - foreach ( $atts as $k => $v ) { + foreach ( $html_atts as $k => $v ) { $attr_strings[] = $k . '="' . esc_attr( $v ) . '"'; } $html = ''; - if ( 'mediaelement' === $library && 1 === $instances ) + if ( 'mediaelement' === $library && 1 === $instance ) { $html .= "\n"; + } $html .= sprintf( '<audio %s controls="controls">', join( ' ', $attr_strings ) ); $fileurl = ''; $source = '<source type="%s" src="%s" />'; foreach ( $default_types as $fallback ) { - if ( ! empty( $$fallback ) ) { - if ( empty( $fileurl ) ) - $fileurl = $$fallback; - $type = wp_check_filetype( $$fallback, wp_get_mime_types() ); - $url = add_query_arg( '_', $instances, $$fallback ); + if ( ! empty( $atts[ $fallback ] ) ) { + if ( empty( $fileurl ) ) { + $fileurl = $atts[ $fallback ]; + } + $type = wp_check_filetype( $atts[ $fallback ], wp_get_mime_types() ); + $url = add_query_arg( '_', $instance, $atts[ $fallback ] ); $html .= sprintf( $source, $type['type'], esc_url( $url ) ); } } - if ( 'mediaelement' === $library ) + if ( 'mediaelement' === $library ) { $html .= wp_mediaelement_fallback( $fileurl ); + } $html .= '</audio>'; /** @@ -1608,10 +2325,11 @@ function wp_audio_shortcode( $attr, $content = '' ) { add_shortcode( 'audio', 'wp_audio_shortcode' ); /** - * Return a filtered list of WP-supported video formats + * Returns a filtered list of WP-supported video formats. * * @since 3.6.0 - * @return array + * + * @return array List of supported video formats. */ function wp_get_video_extensions() { /** @@ -1626,14 +2344,17 @@ function wp_get_video_extensions() { } /** - * The Video shortcode. + * Builds the Video shortcode output. * * This implements the functionality of the Video Shortcode for displaying * WordPress mp4s in a post. * * @since 3.6.0 * - * @param array $attr { + * @global int $content_width + * @staticvar int $instance + * + * @param array $attr { * Attributes of the shortcode. * * @type string $src URL to the source of the video file. Default empty. @@ -1646,18 +2367,16 @@ function wp_get_video_extensions() { * Default 'metadata'. * @type string $class The 'class' attribute for the `<video>` element. * Default 'wp-video-shortcode'. - * @type string $id The 'id' attribute for the `<video>` element. - * Default 'video-{$post_id}-{$instances}'. * } - * @param string $content Optional. Shortcode content. - * @return string HTML content to display video. + * @param string $content Shortcode content. + * @return string|void HTML content to display video. */ function wp_video_shortcode( $attr, $content = '' ) { global $content_width; $post_id = get_post() ? get_the_ID() : 0; - static $instances = 0; - $instances++; + static $instance = 0; + $instance++; /** * Filter the default video shortcode output. @@ -1669,14 +2388,15 @@ function wp_video_shortcode( $attr, $content = '' ) { * * @see wp_video_shortcode() * - * @param string $html Empty variable to be replaced with shortcode markup. - * @param array $attr Attributes of the video shortcode. - * @param string $content Video shortcode content. - * @param int $instances Unique numeric ID of this video shortcode instance. + * @param string $html Empty variable to be replaced with shortcode markup. + * @param array $attr Attributes of the video shortcode. + * @param string $content Video shortcode content. + * @param int $instance Unique numeric ID of this video shortcode instance. */ - $html = apply_filters( 'wp_video_shortcode_override', '', $attr, $content, $instances ); - if ( '' !== $html ) - return $html; + $override = apply_filters( 'wp_video_shortcode_override', '', $attr, $content, $instance ); + if ( '' !== $override ) { + return $override; + } $video = null; @@ -1689,59 +2409,72 @@ function wp_video_shortcode( $attr, $content = '' ) { 'preload' => 'metadata', 'width' => 640, 'height' => 360, + 'class' => 'wp-video-shortcode', ); - foreach ( $default_types as $type ) + foreach ( $default_types as $type ) { $defaults_atts[$type] = ''; + } $atts = shortcode_atts( $defaults_atts, $attr, 'video' ); - extract( $atts ); if ( is_admin() ) { // shrink the video so it isn't huge in the admin - if ( $width > $defaults_atts['width'] ) { - $height = round( ( $height * $defaults_atts['width'] ) / $width ); - $width = $defaults_atts['width']; + if ( $atts['width'] > $defaults_atts['width'] ) { + $atts['height'] = round( ( $atts['height'] * $defaults_atts['width'] ) / $atts['width'] ); + $atts['width'] = $defaults_atts['width']; } } else { // if the video is bigger than the theme - if ( ! empty( $content_width ) && $width > $content_width ) { - $height = round( ( $height * $content_width ) / $width ); - $width = $content_width; + if ( ! empty( $content_width ) && $atts['width'] > $content_width ) { + $atts['height'] = round( ( $atts['height'] * $content_width ) / $atts['width'] ); + $atts['width'] = $content_width; } } - $yt_pattern = '#^https?://(:?www\.)?(:?youtube\.com/watch|youtu\.be/)#'; + $is_vimeo = $is_youtube = false; + $yt_pattern = '#^https?://(?:www\.)?(?:youtube\.com/watch|youtu\.be/)#'; + $vimeo_pattern = '#^https?://(.+\.)?vimeo\.com/.*#'; $primary = false; - if ( ! empty( $src ) ) { - if ( ! preg_match( $yt_pattern, $src ) ) { - $type = wp_check_filetype( $src, wp_get_mime_types() ); + if ( ! empty( $atts['src'] ) ) { + $is_vimeo = ( preg_match( $vimeo_pattern, $atts['src'] ) ); + $is_youtube = ( preg_match( $yt_pattern, $atts['src'] ) ); + if ( ! $is_youtube && ! $is_vimeo ) { + $type = wp_check_filetype( $atts['src'], wp_get_mime_types() ); if ( ! in_array( strtolower( $type['ext'] ), $default_types ) ) { - return sprintf( '<a class="wp-embedded-video" href="%s">%s</a>', esc_url( $src ), esc_html( $src ) ); + return sprintf( '<a class="wp-embedded-video" href="%s">%s</a>', esc_url( $atts['src'] ), esc_html( $atts['src'] ) ); } } + + if ( $is_vimeo ) { + wp_enqueue_script( 'froogaloop' ); + } + $primary = true; array_unshift( $default_types, 'src' ); } else { foreach ( $default_types as $ext ) { - if ( ! empty( $$ext ) ) { - $type = wp_check_filetype( $$ext, wp_get_mime_types() ); - if ( strtolower( $type['ext'] ) === $ext ) + if ( ! empty( $atts[ $ext ] ) ) { + $type = wp_check_filetype( $atts[ $ext ], wp_get_mime_types() ); + if ( strtolower( $type['ext'] ) === $ext ) { $primary = true; + } } } } if ( ! $primary ) { $videos = get_attached_media( 'video', $post_id ); - if ( empty( $videos ) ) + if ( empty( $videos ) ) { return; + } $video = reset( $videos ); - $src = wp_get_attachment_url( $video->ID ); - if ( empty( $src ) ) + $atts['src'] = wp_get_attachment_url( $video->ID ); + if ( empty( $atts['src'] ) ) { return; + } array_unshift( $default_types, 'src' ); } @@ -1766,125 +2499,153 @@ function wp_video_shortcode( $attr, $content = '' ) { * * @param string $class CSS class or list of space-separated classes. */ - $atts = array( - 'class' => apply_filters( 'wp_video_shortcode_class', 'wp-video-shortcode' ), - 'id' => sprintf( 'video-%d-%d', $post_id, $instances ), - 'width' => absint( $width ), - 'height' => absint( $height ), - 'poster' => esc_url( $poster ), - 'loop' => $loop, - 'autoplay' => $autoplay, - 'preload' => $preload, + $atts['class'] = apply_filters( 'wp_video_shortcode_class', $atts['class'] ); + + $html_atts = array( + 'class' => $atts['class'], + 'id' => sprintf( 'video-%d-%d', $post_id, $instance ), + 'width' => absint( $atts['width'] ), + 'height' => absint( $atts['height'] ), + 'poster' => esc_url( $atts['poster'] ), + 'loop' => wp_validate_boolean( $atts['loop'] ), + 'autoplay' => wp_validate_boolean( $atts['autoplay'] ), + 'preload' => $atts['preload'], ); // These ones should just be omitted altogether if they are blank foreach ( array( 'poster', 'loop', 'autoplay', 'preload' ) as $a ) { - if ( empty( $atts[$a] ) ) - unset( $atts[$a] ); + if ( empty( $html_atts[$a] ) ) { + unset( $html_atts[$a] ); + } } $attr_strings = array(); - foreach ( $atts as $k => $v ) { + foreach ( $html_atts as $k => $v ) { $attr_strings[] = $k . '="' . esc_attr( $v ) . '"'; } $html = ''; - if ( 'mediaelement' === $library && 1 === $instances ) + if ( 'mediaelement' === $library && 1 === $instance ) { $html .= "\n"; + } $html .= sprintf( '<video %s controls="controls">', join( ' ', $attr_strings ) ); $fileurl = ''; $source = '<source type="%s" src="%s" />'; foreach ( $default_types as $fallback ) { - if ( ! empty( $$fallback ) ) { - if ( empty( $fileurl ) ) - $fileurl = $$fallback; - - if ( 'src' === $fallback && preg_match( $yt_pattern, $src ) ) { + if ( ! empty( $atts[ $fallback ] ) ) { + if ( empty( $fileurl ) ) { + $fileurl = $atts[ $fallback ]; + } + if ( 'src' === $fallback && $is_youtube ) { $type = array( 'type' => 'video/youtube' ); + } elseif ( 'src' === $fallback && $is_vimeo ) { + $type = array( 'type' => 'video/vimeo' ); } else { - $type = wp_check_filetype( $$fallback, wp_get_mime_types() ); + $type = wp_check_filetype( $atts[ $fallback ], wp_get_mime_types() ); } - $url = add_query_arg( '_', $instances, $$fallback ); + $url = add_query_arg( '_', $instance, $atts[ $fallback ] ); $html .= sprintf( $source, $type['type'], esc_url( $url ) ); } } if ( ! empty( $content ) ) { - if ( false !== strpos( $content, "\n" ) ) + if ( false !== strpos( $content, "\n" ) ) { $content = str_replace( array( "\r\n", "\n", "\t" ), '', $content ); - + } $html .= trim( $content ); } - if ( 'mediaelement' === $library ) + if ( 'mediaelement' === $library ) { $html .= wp_mediaelement_fallback( $fileurl ); + } $html .= '</video>'; - $html = sprintf( '<div style="width: %dpx; max-width: 100%%;" class="wp-video">%s</div>', $width, $html ); + $width_rule = ''; + if ( ! empty( $atts['width'] ) ) { + $width_rule = sprintf( 'width: %dpx; ', $atts['width'] ); + } + $output = sprintf( '<div style="%s" class="wp-video">%s</div>', $width_rule, $html ); /** * Filter the output of the video shortcode. * * @since 3.6.0 * - * @param string $html Video shortcode HTML output. + * @param string $output Video shortcode HTML output. * @param array $atts Array of video shortcode attributes. * @param string $video Video file. * @param int $post_id Post ID. * @param string $library Media library used for the video shortcode. */ - return apply_filters( 'wp_video_shortcode', $html, $atts, $video, $post_id, $library ); + return apply_filters( 'wp_video_shortcode', $output, $atts, $video, $post_id, $library ); } add_shortcode( 'video', 'wp_video_shortcode' ); /** - * Display previous image link that has the same post parent. + * Displays previous image link that has the same post parent. * * @since 2.5.0 - * @param string $size Optional, default is 'thumbnail'. Size of image, either array or string. 0 or 'none' will default to post_title or $text; - * @param string $text Optional, default is false. If included, link will reflect $text variable. - * @return string HTML content. + * + * @see adjacent_image_link() + * + * @param string|array $size Optional. Image size. Accepts any valid image size, an array of width and + * height values in pixels (in that order), 0, or 'none'. 0 or 'none' will + * default to 'post_title' or `$text`. Default 'thumbnail'. + * @param string $text Optional. Link text. Default false. */ -function previous_image_link($size = 'thumbnail', $text = false) { +function previous_image_link( $size = 'thumbnail', $text = false ) { adjacent_image_link(true, $size, $text); } /** - * Display next image link that has the same post parent. + * Displays next image link that has the same post parent. * * @since 2.5.0 - * @param string $size Optional, default is 'thumbnail'. Size of image, either array or string. 0 or 'none' will default to post_title or $text; - * @param string $text Optional, default is false. If included, link will reflect $text variable. - * @return string HTML content. + * + * @see adjacent_image_link() + * + * @param string|array $size Optional. Image size. Accepts any valid image size, an array of width and + * height values in pixels (in that order), 0, or 'none'. 0 or 'none' will + * default to 'post_title' or `$text`. Default 'thumbnail'. + * @param string $text Optional. Link text. Default false. */ -function next_image_link($size = 'thumbnail', $text = false) { +function next_image_link( $size = 'thumbnail', $text = false ) { adjacent_image_link(false, $size, $text); } /** - * Display next or previous image link that has the same post parent. + * Displays next or previous image link that has the same post parent. * * Retrieves the current attachment object from the $post global. * * @since 2.5.0 * - * @param bool $prev Optional. Default is true to display previous link, false for next. + * @param bool $prev Optional. Whether to display the next (false) or previous (true) link. Default true. + * @param string|array $size Optional. Image size. Accepts any valid image size, or an array of width and height + * values in pixels (in that order). Default 'thumbnail'. + * @param bool $text Optional. Link text. Default false. */ -function adjacent_image_link($prev = true, $size = 'thumbnail', $text = false) { +function adjacent_image_link( $prev = true, $size = 'thumbnail', $text = false ) { $post = get_post(); $attachments = array_values( get_children( array( 'post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) ); - foreach ( $attachments as $k => $attachment ) - if ( $attachment->ID == $post->ID ) + foreach ( $attachments as $k => $attachment ) { + if ( $attachment->ID == $post->ID ) { break; + } + } - $k = $prev ? $k - 1 : $k + 1; + $output = ''; + $attachment_id = 0; - $output = $attachment_id = null; - if ( isset( $attachments[ $k ] ) ) { - $attachment_id = $attachments[ $k ]->ID; - $output = wp_get_attachment_link( $attachment_id, $size, true, false, $text ); + if ( $attachments ) { + $k = $prev ? $k - 1 : $k + 1; + + if ( isset( $attachments[ $k ] ) ) { + $attachment_id = $attachments[ $k ]->ID; + $output = wp_get_attachment_link( $attachment_id, $size, true, false, $text ); + } } $adjacent = $prev ? 'previous' : 'next'; @@ -1892,7 +2653,7 @@ function adjacent_image_link($prev = true, $size = 'thumbnail', $text = false) { /** * Filter the adjacent image link. * - * The dynamic portion of the hook name, $adjacent, refers to the type of adjacency, + * The dynamic portion of the hook name, `$adjacent`, refers to the type of adjacency, * either 'next', or 'previous'. * * @since 3.5.0 @@ -1906,23 +2667,24 @@ function adjacent_image_link($prev = true, $size = 'thumbnail', $text = false) { } /** - * Retrieve taxonomies attached to the attachment. + * Retrieves taxonomies attached to given the attachment. * * @since 2.5.0 * - * @param int|array|object $attachment Attachment ID, Attachment data array, or Attachment data object. + * @param int|array|object $attachment Attachment ID, data array, or data object. * @return array Empty array on failure. List of taxonomies on success. */ -function get_attachment_taxonomies($attachment) { - if ( is_int( $attachment ) ) - $attachment = get_post($attachment); - else if ( is_array($attachment) ) +function get_attachment_taxonomies( $attachment ) { + if ( is_int( $attachment ) ) { + $attachment = get_post( $attachment ); + } elseif ( is_array( $attachment ) ) { $attachment = (object) $attachment; - + } if ( ! is_object($attachment) ) return array(); - $filename = basename($attachment->guid); + $file = get_attached_file( $attachment->ID ); + $filename = basename( $file ); $objects = array('attachment'); @@ -1945,15 +2707,16 @@ function get_attachment_taxonomies($attachment) { } /** - * Return all of the taxonomy names that are registered for attachments. + * Retrieves all of the taxonomy names that are registered for attachments. * * Handles mime-type-specific taxonomies such as attachment:image and attachment:video. * * @since 3.5.0 - * @see get_attachment_taxonomies() - * @uses get_taxonomies() * - * @param string $output The type of output to return, either taxonomy 'names' or 'objects'. 'names' is the default. + * @see get_taxonomies() + * + * @param string $output Optional. The type of taxonomy output to return. Accepts 'names' or 'objects'. + * Default 'names'. * @return array The names of all taxonomy of $object_type. */ function get_taxonomies_for_attachments( $output = 'names' ) { @@ -1975,13 +2738,14 @@ function get_taxonomies_for_attachments( $output = 'names' ) { /** * Create new GD image resource with transparency support - * @TODO: Deprecate if possible. + * + * @todo: Deprecate if possible. * * @since 2.9.0 * - * @param int $width Image width - * @param int $height Image height - * @return image resource + * @param int $width Image width in pixels. + * @param int $height Image height in pixels.. + * @return resource The GD image resource. */ function wp_imagecreatetruecolor($width, $height) { $img = imagecreatetruecolor($width, $height); @@ -1992,72 +2756,17 @@ function wp_imagecreatetruecolor($width, $height) { return $img; } -/** - * Register an embed handler. This function should probably only be used for sites that do not support oEmbed. - * - * @since 2.9.0 - * @see WP_Embed::register_handler() - */ -function wp_embed_register_handler( $id, $regex, $callback, $priority = 10 ) { - global $wp_embed; - $wp_embed->register_handler( $id, $regex, $callback, $priority ); -} - -/** - * Unregister a previously registered embed handler. - * - * @since 2.9.0 - * @see WP_Embed::unregister_handler() - */ -function wp_embed_unregister_handler( $id, $priority = 10 ) { - global $wp_embed; - $wp_embed->unregister_handler( $id, $priority ); -} - -/** - * Create default array of embed parameters. - * - * The width defaults to the content width as specified by the theme. If the - * theme does not specify a content width, then 500px is used. - * - * The default height is 1.5 times the width, or 1000px, whichever is smaller. - * - * The 'embed_defaults' filter can be used to adjust either of these values. - * - * @since 2.9.0 - * - * @return array Default embed parameters. - */ -function wp_embed_defaults() { - if ( ! empty( $GLOBALS['content_width'] ) ) - $width = (int) $GLOBALS['content_width']; - - if ( empty( $width ) ) - $width = 500; - - $height = min( ceil( $width * 1.5 ), 1000 ); - - /** - * Filter the default array of embed dimensions. - * - * @since 2.9.0 - * - * @param int $width Width of the embed in pixels. - * @param int $height Height of the embed in pixels. - */ - return apply_filters( 'embed_defaults', compact( 'width', 'height' ) ); -} - /** * Based on a supplied width/height example, return the biggest possible dimensions based on the max width/height. * * @since 2.9.0 - * @uses wp_constrain_dimensions() This function passes the widths and the heights. * - * @param int $example_width The width of an example embed. + * @see wp_constrain_dimensions() + * + * @param int $example_width The width of an example embed. * @param int $example_height The height of an example embed. - * @param int $max_width The maximum allowed width. - * @param int $max_height The maximum allowed height. + * @param int $max_width The maximum allowed width. + * @param int $max_height The maximum allowed height. * @return array The maximum possible width and height based on the example ratio. */ function wp_expand_dimensions( $example_width, $example_height, $max_width, $max_height ) { @@ -2069,203 +2778,6 @@ function wp_expand_dimensions( $example_width, $example_height, $max_width, $max return wp_constrain_dimensions( $example_width * 1000000, $example_height * 1000000, $max_width, $max_height ); } -/** - * Attempts to fetch the embed HTML for a provided URL using oEmbed. - * - * @since 2.9.0 - * @see WP_oEmbed - * - * @uses _wp_oembed_get_object() - * @uses WP_oEmbed::get_html() - * - * @param string $url The URL that should be embedded. - * @param array $args Additional arguments and parameters. - * @return bool|string False on failure or the embed HTML on success. - */ -function wp_oembed_get( $url, $args = '' ) { - require_once( ABSPATH . WPINC . '/class-oembed.php' ); - $oembed = _wp_oembed_get_object(); - return $oembed->get_html( $url, $args ); -} - -/** - * Adds a URL format and oEmbed provider URL pair. - * - * @since 2.9.0 - * @see WP_oEmbed - * - * @uses _wp_oembed_get_object() - * - * @param string $format The format of URL that this provider can handle. You can use asterisks as wildcards. - * @param string $provider The URL to the oEmbed provider. - * @param boolean $regex Whether the $format parameter is in a regex format. - */ -function wp_oembed_add_provider( $format, $provider, $regex = false ) { - require_once( ABSPATH . WPINC . '/class-oembed.php' ); - $oembed = _wp_oembed_get_object(); - $oembed->providers[$format] = array( $provider, $regex ); -} - -/** - * Removes an oEmbed provider. - * - * @since 3.5.0 - * @see WP_oEmbed - * - * @uses _wp_oembed_get_object() - * - * @param string $format The URL format for the oEmbed provider to remove. - */ -function wp_oembed_remove_provider( $format ) { - require_once( ABSPATH . WPINC . '/class-oembed.php' ); - - $oembed = _wp_oembed_get_object(); - - if ( isset( $oembed->providers[ $format ] ) ) { - unset( $oembed->providers[ $format ] ); - return true; - } - - return false; -} - -/** - * Determines if default embed handlers should be loaded. - * - * Checks to make sure that the embeds library hasn't already been loaded. If - * it hasn't, then it will load the embeds library. - * - * @since 2.9.0 - */ -function wp_maybe_load_embeds() { - /** - * Filter whether to load the default embed handlers. - * - * Returning a falsey value will prevent loading the default embed handlers. - * - * @since 2.9.0 - * - * @param bool $maybe_load_embeds Whether to load the embeds library. Default true. - */ - if ( ! apply_filters( 'load_default_embeds', true ) ) { - return; - } - - wp_embed_register_handler( 'googlevideo', '#http://video\.google\.([A-Za-z.]{2,5})/videoplay\?docid=([\d-]+)(.*?)#i', 'wp_embed_handler_googlevideo' ); - - /** - * Filter the audio embed handler callback. - * - * @since 3.6.0 - * - * @param callback $handler Audio embed handler callback function. - */ - wp_embed_register_handler( 'audio', '#^https?://.+?\.(' . join( '|', wp_get_audio_extensions() ) . ')$#i', apply_filters( 'wp_audio_embed_handler', 'wp_embed_handler_audio' ), 9999 ); - - /** - * Filter the video embed handler callback. - * - * @since 3.6.0 - * - * @param callback $handler Video embed handler callback function. - */ - wp_embed_register_handler( 'video', '#^https?://.+?\.(' . join( '|', wp_get_video_extensions() ) . ')$#i', apply_filters( 'wp_video_embed_handler', 'wp_embed_handler_video' ), 9999 ); -} - -/** - * The Google Video embed handler callback. Google Video does not support oEmbed. - * - * @see WP_Embed::register_handler() - * @see WP_Embed::shortcode() - * - * @param array $matches The regex matches from the provided regex when calling {@link wp_embed_register_handler()}. - * @param array $attr Embed attributes. - * @param string $url The original URL that was matched by the regex. - * @param array $rawattr The original unmodified attributes. - * @return string The embed HTML. - */ -function wp_embed_handler_googlevideo( $matches, $attr, $url, $rawattr ) { - // If the user supplied a fixed width AND height, use it - if ( !empty($rawattr['width']) && !empty($rawattr['height']) ) { - $width = (int) $rawattr['width']; - $height = (int) $rawattr['height']; - } else { - list( $width, $height ) = wp_expand_dimensions( 425, 344, $attr['width'], $attr['height'] ); - } - - /** - * Filter the Google Video embed output. - * - * @since 2.9.0 - * - * @param string $html Google Video HTML embed markup. - * @param array $matches The regex matches from the provided regex. - * @param array $attr An array of embed attributes. - * @param string $url The original URL that was matched by the regex. - * @param array $rawattr The original unmodified attributes. - */ - return apply_filters( 'embed_googlevideo', '<embed type="application/x-shockwave-flash" src="http://video.google.com/googleplayer.swf?docid=' . esc_attr($matches[2]) . '&hl=en&fs=true" style="width:' . esc_attr($width) . 'px;height:' . esc_attr($height) . 'px" allowFullScreen="true" allowScriptAccess="always" />', $matches, $attr, $url, $rawattr ); -} - -/** - * Audio embed handler callback. - * - * @since 3.6.0 - * - * @param array $matches The regex matches from the provided regex when calling {@link wp_embed_register_handler()}. - * @param array $attr Embed attributes. - * @param string $url The original URL that was matched by the regex. - * @param array $rawattr The original unmodified attributes. - * @return string The embed HTML. - */ -function wp_embed_handler_audio( $matches, $attr, $url, $rawattr ) { - $audio = sprintf( '[audio src="%s" /]', esc_url( $url ) ); - - /** - * Filter the audio embed output. - * - * @since 3.6.0 - * - * @param string $audio Audio embed output. - * @param array $attr An array of embed attributes. - * @param string $url The original URL that was matched by the regex. - * @param array $rawattr The original unmodified attributes. - */ - return apply_filters( 'wp_embed_handler_audio', $audio, $attr, $url, $rawattr ); -} - -/** - * Video embed handler callback. - * - * @since 3.6.0 - * - * @param array $matches The regex matches from the provided regex when calling {@link wp_embed_register_handler()}. - * @param array $attr Embed attributes. - * @param string $url The original URL that was matched by the regex. - * @param array $rawattr The original unmodified attributes. - * @return string The embed HTML. - */ -function wp_embed_handler_video( $matches, $attr, $url, $rawattr ) { - $dimensions = ''; - if ( ! empty( $rawattr['width'] ) && ! empty( $rawattr['height'] ) ) { - $dimensions .= sprintf( 'width="%d" ', (int) $rawattr['width'] ); - $dimensions .= sprintf( 'height="%d" ', (int) $rawattr['height'] ); - } - $video = sprintf( '[video %s src="%s" /]', $dimensions, esc_url( $url ) ); - - /** - * Filter the video embed output. - * - * @since 3.6.0 - * - * @param string $video Video embed output. - * @param array $attr An array of embed attributes. - * @param string $url The original URL that was matched by the regex. - * @param array $rawattr The original unmodified attributes. - */ - return apply_filters( 'wp_embed_handler_video', $video, $attr, $url, $rawattr ); -} - /** * Converts a shorthand byte value to an integer byte value. * @@ -2278,16 +2790,16 @@ function wp_convert_hr_to_bytes( $size ) { $size = strtolower( $size ); $bytes = (int) $size; if ( strpos( $size, 'k' ) !== false ) - $bytes = intval( $size ) * 1024; + $bytes = intval( $size ) * KB_IN_BYTES; elseif ( strpos( $size, 'm' ) !== false ) - $bytes = intval($size) * 1024 * 1024; + $bytes = intval($size) * MB_IN_BYTES; elseif ( strpos( $size, 'g' ) !== false ) - $bytes = intval( $size ) * 1024 * 1024 * 1024; + $bytes = intval( $size ) * GB_IN_BYTES; return $bytes; } /** - * Determine the maximum upload size allowed in php.ini. + * Determines the maximum upload size allowed in php.ini. * * @since 2.5.0 * @@ -2313,11 +2825,12 @@ function wp_max_upload_size() { * Returns a WP_Image_Editor instance and loads file into it. * * @since 3.5.0 - * @access public * - * @param string $path Path to file to load - * @param array $args Additional data. Accepts { 'mime_type'=>string, 'methods'=>{string, string, ...} } - * @return WP_Image_Editor|WP_Error + * @param string $path Path to the file to load. + * @param array $args Optional. Additional arguments for retrieving the image editor. + * Default empty array. + * @return WP_Image_Editor|WP_Error The WP_Image_Editor object if successful, an WP_Error + * object otherwise. */ function wp_get_image_editor( $path, $args = array() ) { $args['path'] = $path; @@ -2350,10 +2863,10 @@ function wp_get_image_editor( $path, $args = array() ) { * Tests whether there is an editor that supports a given mime type or methods. * * @since 3.5.0 - * @access public * - * @param string|array $args Array of requirements. Accepts { 'mime_type'=>string, 'methods'=>{string, string, ...} } - * @return boolean true if an eligible editor is found; false otherwise + * @param string|array $args Optional. Array of arguments to retrieve the image editor supports. + * Default empty array. + * @return bool True if an eligible editor is found; false otherwise. */ function wp_image_editor_supports( $args = array() ) { return (bool) _wp_image_editor_choose( $args ); @@ -2362,11 +2875,12 @@ function wp_image_editor_supports( $args = array() ) { /** * Tests which editors are capable of supporting the request. * + * @ignore * @since 3.5.0 - * @access private * - * @param array $args Additional data. Accepts { 'mime_type'=>string, 'methods'=>{string, string, ...} } - * @return string|bool Class name for the first editor that claims to support the request. False if no editor claims to support the request. + * @param array $args Optional. Array of arguments for choosing a capable editor. Default empty array. + * @return string|false Class name for the first editor that claims to support the request. False if no + * editor claims to support the request. */ function _wp_image_editor_choose( $args = array() ) { require_once ABSPATH . WPINC . '/class-wp-image-editor.php'; @@ -2411,7 +2925,7 @@ function _wp_image_editor_choose( $args = array() ) { * @since 3.4.0 */ function wp_plupload_default_settings() { - global $wp_scripts; + $wp_scripts = wp_scripts(); $data = $wp_scripts->get_data( 'wp-plupload', 'data' ); if ( $data && false !== strpos( $data, '_wpPluploadSettings' ) ) @@ -2430,10 +2944,13 @@ function wp_plupload_default_settings() { ), ); - // Multi-file uploading doesn't currently work in iOS Safari, - // single-file allows the built-in camera to be used as source for images - if ( wp_is_mobile() ) + // Currently only iOS Safari supports multiple files uploading but iOS 7.x has a bug that prevents uploading of videos + // when enabled. See #29602. + if ( wp_is_mobile() && strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false && + strpos( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' ) !== false ) { + $defaults['multi_selection'] = false; + } /** * Filter the Plupload default settings. @@ -2468,14 +2985,13 @@ function wp_plupload_default_settings() { 'limitExceeded' => is_multisite() && ! is_upload_space_available() ); - $script = 'var _wpPluploadSettings = ' . json_encode( $settings ) . ';'; + $script = 'var _wpPluploadSettings = ' . wp_json_encode( $settings ) . ';'; if ( $data ) $script = "$data\n$script"; $wp_scripts->add_data( 'wp-plupload', 'data', $script ); } -add_action( 'customize_controls_enqueue_scripts', 'wp_plupload_default_settings' ); /** * Prepares an attachment post object for JS, where it is expected @@ -2484,7 +3000,7 @@ add_action( 'customize_controls_enqueue_scripts', 'wp_plupload_default_settings' * @since 3.5.0 * * @param mixed $attachment Attachment ID or object. - * @return array Array of attachment details. + * @return array|void Array of attachment details. */ function wp_prepare_attachment_for_js( $attachment ) { if ( ! $attachment = get_post( $attachment ) ) @@ -2504,7 +3020,7 @@ function wp_prepare_attachment_for_js( $attachment ) { $response = array( 'id' => $attachment->ID, 'title' => $attachment->post_title, - 'filename' => wp_basename( $attachment->guid ), + 'filename' => wp_basename( get_attached_file( $attachment->ID ) ), 'url' => $attachment_url, 'link' => get_attachment_link( $attachment->ID ), 'alt' => get_post_meta( $attachment->ID, '_wp_attachment_image_alt', true ), @@ -2521,15 +3037,48 @@ function wp_prepare_attachment_for_js( $attachment ) { 'type' => $type, 'subtype' => $subtype, 'icon' => wp_mime_type_icon( $attachment->ID ), - 'dateFormatted' => mysql2date( get_option('date_format'), $attachment->post_date ), + 'dateFormatted' => mysql2date( __( 'F j, Y' ), $attachment->post_date ), 'nonces' => array( 'update' => false, 'delete' => false, 'edit' => false ), 'editLink' => false, + 'meta' => false, ); + $author = new WP_User( $attachment->post_author ); + $response['authorName'] = $author->display_name; + + if ( $attachment->post_parent ) { + $post_parent = get_post( $attachment->post_parent ); + } else { + $post_parent = false; + } + + if ( $post_parent ) { + $parent_type = get_post_type_object( $post_parent->post_type ); + if ( $parent_type && $parent_type->show_ui && current_user_can( 'edit_post', $attachment->post_parent ) ) { + $response['uploadedToLink'] = get_edit_post_link( $attachment->post_parent, 'raw' ); + } + $response['uploadedToTitle'] = $post_parent->post_title ? $post_parent->post_title : __( '(no title)' ); + } + + $attached_file = get_attached_file( $attachment->ID ); + + if ( isset( $meta['filesize'] ) ) { + $bytes = $meta['filesize']; + } elseif ( file_exists( $attached_file ) ) { + $bytes = filesize( $attached_file ); + } else { + $bytes = ''; + } + + if ( $bytes ) { + $response['filesizeInBytes'] = $bytes; + $response['filesizeHumanReadable'] = size_format( $bytes ); + } + if ( current_user_can( 'edit_post', $attachment->ID ) ) { $response['nonces']['update'] = wp_create_nonce( 'update-post_' . $attachment->ID ); $response['nonces']['edit'] = wp_create_nonce( 'image_editor-' . $attachment->ID ); @@ -2608,7 +3157,9 @@ function wp_prepare_attachment_for_js( $attachment ) { $response['fileLength'] = $meta['length_formatted']; $response['meta'] = array(); - foreach ( wp_get_attachment_id3_keys( $attachment ) as $key => $label ) { + foreach ( wp_get_attachment_id3_keys( $attachment, 'js' ) as $key => $label ) { + $response['meta'][ $key ] = false; + if ( ! empty( $meta[ $key ] ) ) { $response['meta'][ $key ] = $meta[ $key ]; } @@ -2649,14 +3200,23 @@ function wp_prepare_attachment_for_js( $attachment ) { * all media JS APIs. * * @since 3.5.0 + * + * @global int $content_width + * @global wpdb $wpdb + * @global WP_Locale $wp_locale + * + * @param array $args { + * Arguments for enqueuing media scripts. + * + * @type int|WP_Post A post object or ID. + * } */ function wp_enqueue_media( $args = array() ) { - // Enqueue me just once per page, please. if ( did_action( 'wp_enqueue_media' ) ) return; - global $content_width, $wpdb; + global $content_width, $wpdb, $wp_locale; $defaults = array( 'post' => null, @@ -2709,6 +3269,15 @@ function wp_enqueue_media( $args = array() ) { AND post_mime_type LIKE 'video%' LIMIT 1 " ); + $months = $wpdb->get_results( $wpdb->prepare( " + SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month + FROM $wpdb->posts + WHERE post_type = %s + ORDER BY post_date DESC + ", 'attachment' ) ); + foreach ( $months as $month_year ) { + $month_year->text = sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $month_year->month ), $month_year->year ); + } $settings = array( 'tabs' => $tabs, @@ -2724,12 +3293,14 @@ function wp_enqueue_media( $args = array() ) { ), 'defaultProps' => $props, 'attachmentCounts' => array( - 'audio' => (int) $has_audio, - 'video' => (int) $has_video, + 'audio' => ( $has_audio ) ? 1 : 0, + 'video' => ( $has_video ) ? 1 : 0 ), 'embedExts' => $exts, 'embedMimes' => $ext_mimes, 'contentWidth' => $content_width, + 'months' => $months, + 'mediaTrash' => MEDIA_TRASH ? 1 : 0 ); $post = null; @@ -2742,9 +3313,9 @@ function wp_enqueue_media( $args = array() ) { $thumbnail_support = current_theme_supports( 'post-thumbnails', $post->post_type ) && post_type_supports( $post->post_type, 'thumbnail' ); if ( ! $thumbnail_support && 'attachment' === $post->post_type && $post->post_mime_type ) { - if ( 0 === strpos( $post->post_mime_type, 'audio/' ) ) { + if ( wp_attachment_is( 'audio', $post ) ) { $thumbnail_support = post_type_supports( 'attachment:audio', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:audio' ); - } elseif ( 0 === strpos( $post->post_mime_type, 'video/' ) ) { + } elseif ( wp_attachment_is( 'video', $post ) ) { $thumbnail_support = post_type_supports( 'attachment:video', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:video' ); } } @@ -2755,7 +3326,11 @@ function wp_enqueue_media( $args = array() ) { } } - $hier = $post && is_post_type_hierarchical( $post->post_type ); + if ( $post ) { + $post_type_object = get_post_type_object( $post->post_type ); + } else { + $post_type_object = get_post_type_object( 'post' ); + } $strings = array( // Generic @@ -2773,31 +3348,50 @@ function wp_enqueue_media( $args = array() ) { lack of plural support here, turn it into "selected: %d" then translate it. */ 'selected' => __( '%d selected' ), - 'dragInfo' => __( 'Drag and drop to reorder images.' ), + 'dragInfo' => __( 'Drag and drop to reorder media files.' ), // Upload 'uploadFilesTitle' => __( 'Upload Files' ), 'uploadImagesTitle' => __( 'Upload Images' ), // Library - 'mediaLibraryTitle' => __( 'Media Library' ), - 'insertMediaTitle' => __( 'Insert Media' ), - 'createNewGallery' => __( 'Create a new gallery' ), - 'createNewPlaylist' => __( 'Create a new playlist' ), - 'createNewVideoPlaylist' => __( 'Create a new video playlist' ), - 'returnToLibrary' => __( '← Return to library' ), - 'allMediaItems' => __( 'All media items' ), - 'noItemsFound' => __( 'No items found.' ), - 'insertIntoPost' => $hier ? __( 'Insert into page' ) : __( 'Insert into post' ), - 'uploadedToThisPost' => $hier ? __( 'Uploaded to this page' ) : __( 'Uploaded to this post' ), - 'warnDelete' => __( "You are about to permanently delete this item.\n 'Cancel' to stop, 'OK' to delete." ), + 'mediaLibraryTitle' => __( 'Media Library' ), + 'insertMediaTitle' => __( 'Insert Media' ), + 'createNewGallery' => __( 'Create a new gallery' ), + 'createNewPlaylist' => __( 'Create a new playlist' ), + 'createNewVideoPlaylist' => __( 'Create a new video playlist' ), + 'returnToLibrary' => __( '← Return to library' ), + 'allMediaItems' => __( 'All media items' ), + 'allDates' => __( 'All dates' ), + 'noItemsFound' => __( 'No items found.' ), + 'insertIntoPost' => $post_type_object->labels->insert_into_item, + 'unattached' => __( 'Unattached' ), + 'trash' => _x( 'Trash', 'noun' ), + 'uploadedToThisPost' => $post_type_object->labels->uploaded_to_this_item, + 'warnDelete' => __( "You are about to permanently delete this item.\n 'Cancel' to stop, 'OK' to delete." ), + 'warnBulkDelete' => __( "You are about to permanently delete these items.\n 'Cancel' to stop, 'OK' to delete." ), + 'warnBulkTrash' => __( "You are about to trash these items.\n 'Cancel' to stop, 'OK' to delete." ), + 'bulkSelect' => __( 'Bulk Select' ), + 'cancelSelection' => __( 'Cancel Selection' ), + 'trashSelected' => __( 'Trash Selected' ), + 'untrashSelected' => __( 'Untrash Selected' ), + 'deleteSelected' => __( 'Delete Selected' ), + 'deletePermanently' => __( 'Delete Permanently' ), + 'apply' => __( 'Apply' ), + 'filterByDate' => __( 'Filter by date' ), + 'filterByType' => __( 'Filter by type' ), + 'searchMediaLabel' => __( 'Search Media' ), + 'noMedia' => __( 'No media files found.' ), + + // Library Details + 'attachmentDetails' => __( 'Attachment Details' ), // From URL 'insertFromUrlTitle' => __( 'Insert from URL' ), // Featured Images - 'setFeaturedImageTitle' => __( 'Set Featured Image' ), - 'setFeaturedImage' => __( 'Set featured image' ), + 'setFeaturedImageTitle' => $post_type_object->labels->featured_image, + 'setFeaturedImage' => $post_type_object->labels->set_featured_image, // Gallery 'createGalleryTitle' => __( 'Create Gallery' ), @@ -2882,9 +3476,11 @@ function wp_enqueue_media( $args = array() ) { $strings['settings'] = $settings; + // Ensure we enqueue media-editor first, that way media-views is + // registered internally before we try to localize it. see #24724. + wp_enqueue_script( 'media-editor' ); wp_localize_script( 'media-views', '_wpMediaViewsL10n', $strings ); - wp_enqueue_script( 'media-editor' ); wp_enqueue_script( 'media-audiovideo' ); wp_enqueue_style( 'media-views' ); if ( is_admin() ) { @@ -2908,13 +3504,13 @@ function wp_enqueue_media( $args = array() ) { } /** - * Retrieve media attached to the passed post. + * Retrieves media attached to the passed post. * * @since 3.6.0 * - * @param string $type (Mime) type of media desired - * @param mixed $post Post ID or object - * @return array Found attachments + * @param string $type Mime type. + * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post. + * @return array Found attachments. */ function get_attached_media( $type, $post = 0 ) { if ( ! $post = get_post( $post ) ) @@ -2943,7 +3539,7 @@ function get_attached_media( $type, $post = 0 ) { $children = get_children( $args ); /** - * Filter the + * Filter the list of media attached to the given post. * * @since 3.6.0 * @@ -2955,26 +3551,40 @@ function get_attached_media( $type, $post = 0 ) { } /** - * Check the content blob for an <audio>, <video> <object>, <embed>, or <iframe> + * Check the content blob for an audio, video, object, embed, or iframe tags. * * @since 3.6.0 * * @param string $content A string which might contain media data. - * @param array $types array of media types: 'audio', 'video', 'object', 'embed', or 'iframe' - * @return array A list of found HTML media embeds + * @param array $types An array of media types: 'audio', 'video', 'object', 'embed', or 'iframe'. + * @return array A list of found HTML media embeds. */ function get_media_embedded_in_content( $content, $types = null ) { $html = array(); - $allowed_media_types = array( 'audio', 'video', 'object', 'embed', 'iframe' ); + + /** + * Filter the embedded media types that are allowed to be returned from the content blob. + * + * @since 4.2.0 + * + * @param array $allowed_media_types An array of allowed media types. Default media types are + * 'audio', 'video', 'object', 'embed', and 'iframe'. + */ + $allowed_media_types = apply_filters( 'media_embedded_in_content_allowed_types', array( 'audio', 'video', 'object', 'embed', 'iframe' ) ); + if ( ! empty( $types ) ) { - if ( ! is_array( $types ) ) + if ( ! is_array( $types ) ) { $types = array( $types ); + } + $allowed_media_types = array_intersect( $allowed_media_types, $types ); } - foreach ( $allowed_media_types as $tag ) { - if ( preg_match( '#' . get_tag_regex( $tag ) . '#', $content, $matches ) ) { - $html[] = $matches[0]; + $tags = implode( '|', $allowed_media_types ); + + if ( preg_match_all( '#<(?P<tag>' . $tags . ')[^<]*?(?:>[\s\S]*?<\/(?P=tag)>|\s*\/>)#', $content, $matches ) ) { + foreach ( $matches[0] as $match ) { + $html[] = $match; } } @@ -2982,14 +3592,14 @@ function get_media_embedded_in_content( $content, $types = null ) { } /** - * Retrieve galleries from the passed post's content. + * Retrieves galleries from the passed post's content. * * @since 3.6.0 * - * @param int|WP_Post $post Optional. Post ID or object. - * @param bool $html Whether to return HTML or data in the array. + * @param int|WP_Post $post Post ID or object. + * @param bool $html Optional. Whether to return HTML or data in the array. Default true. * @return array A list of arrays, each containing gallery data and srcs parsed - * from the expanded shortcode. + * from the expanded shortcode. */ function get_post_galleries( $post, $html = true ) { if ( ! $post = get_post( $post ) ) @@ -3003,7 +3613,6 @@ function get_post_galleries( $post, $html = true ) { foreach ( $matches as $shortcode ) { if ( 'gallery' === $shortcode[2] ) { $srcs = array(); - $count = 1; $gallery = do_shortcode_tag( $shortcode ); if ( $html ) { @@ -3039,8 +3648,8 @@ function get_post_galleries( $post, $html = true ) { * * @since 3.6.0 * - * @param int|WP_Post $post Optional. Post ID or object. - * @param bool $html Whether to return HTML or data. + * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post. + * @param bool $html Optional. Whether to return HTML or data. Default is true. * @return string|array Gallery data and srcs parsed from the expanded shortcode. */ function get_post_gallery( $post = 0, $html = true ) { @@ -3064,9 +3673,11 @@ function get_post_gallery( $post = 0, $html = true ) { * * @since 3.6.0 * - * @param mixed $post Optional. Post ID or object. - * @return array A list of lists, each containing image srcs parsed - * from an expanded shortcode + * @see get_post_galleries() + * + * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`. + * @return array A list of lists, each containing image srcs parsed. + * from an expanded shortcode */ function get_post_galleries_images( $post = 0 ) { $galleries = get_post_galleries( $post, false ); @@ -3074,12 +3685,14 @@ function get_post_galleries_images( $post = 0 ) { } /** - * Check a post's content for galleries and return the image srcs for the first found gallery + * Checks a post's content for galleries and return the image srcs for the first found gallery * * @since 3.6.0 * - * @param mixed $post Optional. Post ID or object. - * @return array A list of a gallery's image srcs in order + * @see get_post_gallery() + * + * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`. + * @return array A list of a gallery's image srcs in order. */ function get_post_gallery_images( $post = 0 ) { $gallery = get_post_gallery( $post, false ); @@ -3087,7 +3700,7 @@ function get_post_gallery_images( $post = 0 ) { } /** - * Maybe attempt to generate attachment metadata, if missing. + * Maybe attempts to generate attachment metadata, if missing. * * @since 3.9.0 * @@ -3110,3 +3723,65 @@ function wp_maybe_generate_attachment_metadata( $attachment ) { } } } + +/** + * Tries to convert an attachment URL into a post ID. + * + * @since 4.0.0 + * + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string $url The URL to resolve. + * @return int The found post ID, or 0 on failure. + */ +function attachment_url_to_postid( $url ) { + global $wpdb; + + $dir = wp_get_upload_dir(); + $path = $url; + + $site_url = parse_url( $dir['url'] ); + $image_path = parse_url( $path ); + + //force the protocols to match if needed + if ( isset( $image_path['scheme'] ) && ( $image_path['scheme'] !== $site_url['scheme'] ) ) { + $path = str_replace( $image_path['scheme'], $site_url['scheme'], $path ); + } + + if ( 0 === strpos( $path, $dir['baseurl'] . '/' ) ) { + $path = substr( $path, strlen( $dir['baseurl'] . '/' ) ); + } + + $sql = $wpdb->prepare( + "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attached_file' AND meta_value = %s", + $path + ); + $post_id = $wpdb->get_var( $sql ); + + /** + * Filter an attachment id found by URL. + * + * @since 4.2.0 + * + * @param int|null $post_id The post_id (if any) found by the function. + * @param string $url The URL being looked up. + */ + return (int) apply_filters( 'attachment_url_to_postid', $post_id, $url ); +} + +/** + * Returns the URLs for CSS files used in an iframe-sandbox'd TinyMCE media view. + * + * @since 4.0.0 + * + * @global string $wp_version + * + * @return array The relevant CSS file URLs. + */ +function wpview_media_sandbox_styles() { + $version = 'ver=' . $GLOBALS['wp_version']; + $mediaelement = includes_url( "js/mediaelement/mediaelementplayer.min.css?$version" ); + $wpmediaelement = includes_url( "js/mediaelement/wp-mediaelement.css?$version" ); + + return array( $mediaelement, $wpmediaelement ); +} diff --git a/wp-includes/meta.php b/wp-includes/meta.php index 0f3aaa9..bfdd595 100644 --- a/wp-includes/meta.php +++ b/wp-includes/meta.php @@ -1,6 +1,6 @@ <?php /** - * Metadata API + * Core Metadata API * * Functions for retrieving and manipulating metadata of various WordPress object types. Metadata * for an object is a represented by a simple key-value pair. Objects may contain multiple @@ -8,35 +8,41 @@ * * @package WordPress * @subpackage Meta - * @since 2.9.0 */ /** * Add metadata for the specified object. * * @since 2.9.0 - * @uses $wpdb WordPress database object for queries. * - * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user) - * @param int $object_id ID of the object metadata is for - * @param string $meta_key Metadata key - * @param mixed $meta_value Metadata value. Must be serializable if non-scalar. - * @param bool $unique Optional, default is false. Whether the specified metadata key should be - * unique for the object. If true, and the object already has a value for the specified - * metadata key, no change will be made - * @return int|bool The meta ID on success, false on failure. + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user) + * @param int $object_id ID of the object metadata is for + * @param string $meta_key Metadata key + * @param mixed $meta_value Metadata value. Must be serializable if non-scalar. + * @param bool $unique Optional, default is false. + * Whether the specified metadata key should be unique for the object. + * If true, and the object already has a value for the specified metadata key, + * no change will be made. + * @return int|false The meta ID on success, false on failure. */ function add_metadata($meta_type, $object_id, $meta_key, $meta_value, $unique = false) { - if ( !$meta_type || !$meta_key ) - return false; + global $wpdb; - if ( !$object_id = absint($object_id) ) + if ( ! $meta_type || ! $meta_key || ! is_numeric( $object_id ) ) { return false; + } - if ( ! $table = _get_meta_table($meta_type) ) + $object_id = absint( $object_id ); + if ( ! $object_id ) { return false; + } - global $wpdb; + $table = _get_meta_table( $meta_type ); + if ( ! $table ) { + return false; + } $column = sanitize_key($meta_type . '_id'); @@ -48,7 +54,7 @@ function add_metadata($meta_type, $object_id, $meta_key, $meta_value, $unique = /** * Filter whether to add metadata of a specific type. * - * The dynamic portion of the hook, $meta_type, refers to the meta + * The dynamic portion of the hook, `$meta_type`, refers to the meta * object type (comment, post, or user). Returning a non-null value * will effectively short-circuit the function. * @@ -76,7 +82,7 @@ function add_metadata($meta_type, $object_id, $meta_key, $meta_value, $unique = /** * Fires immediately before meta of a specific type is added. * - * The dynamic portion of the hook, $meta_type, refers to the meta + * The dynamic portion of the hook, `$meta_type`, refers to the meta * object type (comment, post, or user). * * @since 3.1.0 @@ -103,7 +109,7 @@ function add_metadata($meta_type, $object_id, $meta_key, $meta_value, $unique = /** * Fires immediately after meta of a specific type is added. * - * The dynamic portion of the hook, $meta_type, refers to the meta + * The dynamic portion of the hook, `$meta_type`, refers to the meta * object type (comment, post, or user). * * @since 2.9.0 @@ -123,32 +129,39 @@ function add_metadata($meta_type, $object_id, $meta_key, $meta_value, $unique = * ID and metadata key, the metadata will be added. * * @since 2.9.0 - * @uses $wpdb WordPress database object for queries. * - * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user) - * @param int $object_id ID of the object metadata is for - * @param string $meta_key Metadata key - * @param mixed $meta_value Metadata value. Must be serializable if non-scalar. - * @param mixed $prev_value Optional. If specified, only update existing metadata entries with - * the specified value. Otherwise, update all entries. + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user) + * @param int $object_id ID of the object metadata is for + * @param string $meta_key Metadata key + * @param mixed $meta_value Metadata value. Must be serializable if non-scalar. + * @param mixed $prev_value Optional. If specified, only update existing metadata entries with + * the specified value. Otherwise, update all entries. * @return int|bool Meta ID if the key didn't exist, true on successful update, false on failure. */ function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_value = '') { - if ( !$meta_type || !$meta_key ) - return false; + global $wpdb; - if ( !$object_id = absint($object_id) ) + if ( ! $meta_type || ! $meta_key || ! is_numeric( $object_id ) ) { return false; + } - if ( ! $table = _get_meta_table($meta_type) ) + $object_id = absint( $object_id ); + if ( ! $object_id ) { return false; + } - global $wpdb; + $table = _get_meta_table( $meta_type ); + if ( ! $table ) { + return false; + } $column = sanitize_key($meta_type . '_id'); $id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id'; // expected_slashed ($meta_key) + $raw_meta_key = $meta_key; $meta_key = wp_unslash($meta_key); $passed_value = $meta_value; $meta_value = wp_unslash($meta_value); @@ -157,7 +170,7 @@ function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_v /** * Filter whether to update metadata of a specific type. * - * The dynamic portion of the hook, $meta_type, refers to the meta + * The dynamic portion of the hook, `$meta_type`, refers to the meta * object type (comment, post, or user). Returning a non-null value * will effectively short-circuit the function. * @@ -184,8 +197,10 @@ function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_v } } - if ( ! $meta_id = $wpdb->get_var( $wpdb->prepare( "SELECT $id_column FROM $table WHERE meta_key = %s AND $column = %d", $meta_key, $object_id ) ) ) - return add_metadata($meta_type, $object_id, $meta_key, $passed_value); + $meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT $id_column FROM $table WHERE meta_key = %s AND $column = %d", $meta_key, $object_id ) ); + if ( empty( $meta_ids ) ) { + return add_metadata( $meta_type, $object_id, $raw_meta_key, $passed_value ); + } $_meta_value = $meta_value; $meta_value = maybe_serialize( $meta_value ); @@ -198,33 +213,36 @@ function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_v $where['meta_value'] = $prev_value; } - /** - * Fires immediately before updating metadata of a specific type. - * - * The dynamic portion of the hook, $meta_type, refers to the meta - * object type (comment, post, or user). - * - * @since 2.9.0 - * - * @param int $meta_id ID of the metadata entry to update. - * @param int $object_id Object ID. - * @param string $meta_key Meta key. - * @param mixed $meta_value Meta value. - */ - do_action( "update_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value ); - - if ( 'post' == $meta_type ) + foreach ( $meta_ids as $meta_id ) { /** - * Fires immediately before updating a post's metadata. + * Fires immediately before updating metadata of a specific type. + * + * The dynamic portion of the hook, `$meta_type`, refers to the meta + * object type (comment, post, or user). * * @since 2.9.0 * - * @param int $meta_id ID of metadata entry to update. + * @param int $meta_id ID of the metadata entry to update. * @param int $object_id Object ID. * @param string $meta_key Meta key. * @param mixed $meta_value Meta value. */ - do_action( 'update_postmeta', $meta_id, $object_id, $meta_key, $meta_value ); + do_action( "update_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value ); + + if ( 'post' == $meta_type ) { + /** + * Fires immediately before updating a post's metadata. + * + * @since 2.9.0 + * + * @param int $meta_id ID of metadata entry to update. + * @param int $object_id Object ID. + * @param string $meta_key Meta key. + * @param mixed $meta_value Meta value. + */ + do_action( 'update_postmeta', $meta_id, $object_id, $meta_key, $meta_value ); + } + } $result = $wpdb->update( $table, $data, $where ); if ( ! $result ) @@ -232,24 +250,12 @@ function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_v wp_cache_delete($object_id, $meta_type . '_meta'); - /** - * Fires immediately after updating metadata of a specific type. - * - * The dynamic portion of the hook, $meta_type, refers to the meta - * object type (comment, post, or user). - * - * @since 2.9.0 - * - * @param int $meta_id ID of updated metadata entry. - * @param int $object_id Object ID. - * @param string $meta_key Meta key. - * @param mixed $meta_value Meta value. - */ - do_action( "updated_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value ); - - if ( 'post' == $meta_type ) { + foreach ( $meta_ids as $meta_id ) { /** - * Fires immediately after updating a post's metadata. + * Fires immediately after updating metadata of a specific type. + * + * The dynamic portion of the hook, `$meta_type`, refers to the meta + * object type (comment, post, or user). * * @since 2.9.0 * @@ -258,7 +264,21 @@ function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_v * @param string $meta_key Meta key. * @param mixed $meta_value Meta value. */ - do_action( 'updated_postmeta', $meta_id, $object_id, $meta_key, $meta_value ); + do_action( "updated_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value ); + + if ( 'post' == $meta_type ) { + /** + * Fires immediately after updating a post's metadata. + * + * @since 2.9.0 + * + * @param int $meta_id ID of updated metadata entry. + * @param int $object_id Object ID. + * @param string $meta_key Meta key. + * @param mixed $meta_value Meta value. + */ + do_action( 'updated_postmeta', $meta_id, $object_id, $meta_key, $meta_value ); + } } return true; @@ -268,29 +288,38 @@ function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_v * Delete metadata for the specified object. * * @since 2.9.0 - * @uses $wpdb WordPress database object for queries. * - * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user) - * @param int $object_id ID of the object metadata is for - * @param string $meta_key Metadata key - * @param mixed $meta_value Optional. Metadata value. Must be serializable if non-scalar. If specified, only delete metadata entries - * with this value. Otherwise, delete all entries with the specified meta_key. - * @param bool $delete_all Optional, default is false. If true, delete matching metadata entries - * for all objects, ignoring the specified object_id. Otherwise, only delete matching - * metadata entries for the specified object_id. + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user) + * @param int $object_id ID of the object metadata is for + * @param string $meta_key Metadata key + * @param mixed $meta_value Optional. Metadata value. Must be serializable if non-scalar. If specified, only delete + * metadata entries with this value. Otherwise, delete all entries with the specified meta_key. + * Pass `null, `false`, or an empty string to skip this check. (For backward compatibility, + * it is not possible to pass an empty string to delete those entries with an empty string + * for a value.) + * @param bool $delete_all Optional, default is false. If true, delete matching metadata entries for all objects, + * ignoring the specified object_id. Otherwise, only delete matching metadata entries for + * the specified object_id. * @return bool True on successful delete, false on failure. */ function delete_metadata($meta_type, $object_id, $meta_key, $meta_value = '', $delete_all = false) { - if ( !$meta_type || !$meta_key ) - return false; + global $wpdb; - if ( (!$object_id = absint($object_id)) && !$delete_all ) + if ( ! $meta_type || ! $meta_key || ! is_numeric( $object_id ) && ! $delete_all ) { return false; + } - if ( ! $table = _get_meta_table($meta_type) ) + $object_id = absint( $object_id ); + if ( ! $object_id && ! $delete_all ) { return false; + } - global $wpdb; + $table = _get_meta_table( $meta_type ); + if ( ! $table ) { + return false; + } $type_column = sanitize_key($meta_type . '_id'); $id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id'; @@ -301,7 +330,7 @@ function delete_metadata($meta_type, $object_id, $meta_key, $meta_value = '', $d /** * Filter whether to delete metadata of a specific type. * - * The dynamic portion of the hook, $meta_type, refers to the meta + * The dynamic portion of the hook, `$meta_type`, refers to the meta * object type (comment, post, or user). Returning a non-null value * will effectively short-circuit the function. * @@ -327,20 +356,26 @@ function delete_metadata($meta_type, $object_id, $meta_key, $meta_value = '', $d if ( !$delete_all ) $query .= $wpdb->prepare(" AND $type_column = %d", $object_id ); - if ( $meta_value ) + if ( '' !== $meta_value && null !== $meta_value && false !== $meta_value ) $query .= $wpdb->prepare(" AND meta_value = %s", $meta_value ); $meta_ids = $wpdb->get_col( $query ); if ( !count( $meta_ids ) ) return false; - if ( $delete_all ) - $object_ids = $wpdb->get_col( $wpdb->prepare( "SELECT $type_column FROM $table WHERE meta_key = %s", $meta_key ) ); + if ( $delete_all ) { + $value_clause = ''; + if ( '' !== $meta_value && null !== $meta_value && false !== $meta_value ) { + $value_clause = $wpdb->prepare( " AND meta_value = %s", $meta_value ); + } + + $object_ids = $wpdb->get_col( $wpdb->prepare( "SELECT $type_column FROM $table WHERE meta_key = %s $value_clause", $meta_key ) ); + } /** * Fires immediately before deleting metadata of a specific type. * - * The dynamic portion of the hook, $meta_type, refers to the meta + * The dynamic portion of the hook, `$meta_type`, refers to the meta * object type (comment, post, or user). * * @since 3.1.0 @@ -382,7 +417,7 @@ function delete_metadata($meta_type, $object_id, $meta_key, $meta_value = '', $d /** * Fires immediately after deleting metadata of a specific type. * - * The dynamic portion of the hook name, $meta_type, refers to the meta + * The dynamic portion of the hook name, `$meta_type`, refers to the meta * object type (comment, post, or user). * * @since 2.9.0 @@ -415,35 +450,38 @@ function delete_metadata($meta_type, $object_id, $meta_key, $meta_value = '', $d * @since 2.9.0 * * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user) - * @param int $object_id ID of the object metadata is for - * @param string $meta_key Optional. Metadata key. If not specified, retrieve all metadata for - * the specified object. - * @param bool $single Optional, default is false. If true, return only the first value of the - * specified meta_key. This parameter has no effect if meta_key is not specified. - * @return string|array Single metadata value, or array of values + * @param int $object_id ID of the object metadata is for + * @param string $meta_key Optional. Metadata key. If not specified, retrieve all metadata for + * the specified object. + * @param bool $single Optional, default is false. + * If true, return only the first value of the specified meta_key. + * This parameter has no effect if meta_key is not specified. + * @return mixed Single metadata value, or array of values */ function get_metadata($meta_type, $object_id, $meta_key = '', $single = false) { - if ( !$meta_type ) + if ( ! $meta_type || ! is_numeric( $object_id ) ) { return false; + } - if ( !$object_id = absint($object_id) ) + $object_id = absint( $object_id ); + if ( ! $object_id ) { return false; + } /** * Filter whether to retrieve metadata of a specific type. * - * The dynamic portion of the hook, $meta_type, refers to the meta + * The dynamic portion of the hook, `$meta_type`, refers to the meta * object type (comment, post, or user). Returning a non-null value * will effectively short-circuit the function. * * @since 3.1.0 * - * @param null|array|string $value The value get_metadata() should - * return - a single metadata value, + * @param null|array|string $value The value get_metadata() should return - a single metadata value, * or an array of values. * @param int $object_id Object ID. * @param string $meta_key Meta key. - * @param string|array $single Meta value, or an array of values. + * @param bool $single Whether to return only the first value of the specified $meta_key. */ $check = apply_filters( "get_{$meta_type}_metadata", null, $object_id, $meta_key, $single ); if ( null !== $check ) { @@ -460,8 +498,9 @@ function get_metadata($meta_type, $object_id, $meta_key = '', $single = false) { $meta_cache = $meta_cache[$object_id]; } - if ( !$meta_key ) + if ( ! $meta_key ) { return $meta_cache; + } if ( isset($meta_cache[$meta_key]) ) { if ( $single ) @@ -482,16 +521,19 @@ function get_metadata($meta_type, $object_id, $meta_key = '', $single = false) { * @since 3.3.0 * * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user) - * @param int $object_id ID of the object metadata is for - * @param string $meta_key Metadata key. - * @return boolean true of the key is set, false if not. + * @param int $object_id ID of the object metadata is for + * @param string $meta_key Metadata key. + * @return bool True of the key is set, false if not. */ function metadata_exists( $meta_type, $object_id, $meta_key ) { - if ( ! $meta_type ) + if ( ! $meta_type || ! is_numeric( $object_id ) ) { return false; + } - if ( ! $object_id = absint( $object_id ) ) + $object_id = absint( $object_id ); + if ( ! $object_id ) { return false; + } /** This filter is documented in wp-includes/meta.php */ $check = apply_filters( "get_{$meta_type}_metadata", null, $object_id, $meta_key, true ); @@ -516,21 +558,28 @@ function metadata_exists( $meta_type, $object_id, $meta_key ) { * * @since 3.3.0 * - * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user) - * @param int $meta_id ID for a specific meta row - * @return object Meta object or false. + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string $meta_type Type of object metadata is for (e.g., comment, post, term, or user). + * @param int $meta_id ID for a specific meta row + * @return object|false Meta object or false. */ function get_metadata_by_mid( $meta_type, $meta_id ) { global $wpdb; - if ( ! $meta_type ) + if ( ! $meta_type || ! is_numeric( $meta_id ) ) { return false; + } - if ( !$meta_id = absint( $meta_id ) ) + $meta_id = absint( $meta_id ); + if ( ! $meta_id ) { return false; + } - if ( ! $table = _get_meta_table($meta_type) ) + $table = _get_meta_table( $meta_type ); + if ( ! $table ) { return false; + } $id_column = ( 'user' == $meta_type ) ? 'umeta_id' : 'meta_id'; @@ -550,27 +599,31 @@ function get_metadata_by_mid( $meta_type, $meta_id ) { * * @since 3.3.0 * - * @uses get_metadata_by_mid() Calls get_metadata_by_mid() to fetch the meta key, value - * and object_id of the given meta_id. + * @global wpdb $wpdb WordPress database abstraction object. * - * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user) - * @param int $meta_id ID for a specific meta row + * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user) + * @param int $meta_id ID for a specific meta row * @param string $meta_value Metadata value - * @param string $meta_key Optional, you can provide a meta key to update it + * @param string $meta_key Optional, you can provide a meta key to update it * @return bool True on successful update, false on failure. */ function update_metadata_by_mid( $meta_type, $meta_id, $meta_value, $meta_key = false ) { global $wpdb; // Make sure everything is valid. - if ( ! $meta_type ) + if ( ! $meta_type || ! is_numeric( $meta_id ) ) { return false; + } - if ( ! $meta_id = absint( $meta_id ) ) + $meta_id = absint( $meta_id ); + if ( ! $meta_id ) { return false; + } - if ( ! $table = _get_meta_table( $meta_type ) ) + $table = _get_meta_table( $meta_type ); + if ( ! $table ) { return false; + } $column = sanitize_key($meta_type . '_id'); $id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id'; @@ -578,7 +631,6 @@ function update_metadata_by_mid( $meta_type, $meta_id, $meta_value, $meta_key = // Fetch the meta and go on if it's found. if ( $meta = get_metadata_by_mid( $meta_type, $meta_id ) ) { $original_key = $meta->meta_key; - $original_value = $meta->meta_value; $object_id = $meta->{$column}; // If a new meta_key (last parameter) was specified, change the meta key, @@ -640,25 +692,29 @@ function update_metadata_by_mid( $meta_type, $meta_id, $meta_value, $meta_key = * * @since 3.3.0 * - * @uses get_metadata_by_mid() Calls get_metadata_by_mid() to fetch the meta key, value - * and object_id of the given meta_id. + * @global wpdb $wpdb WordPress database abstraction object. * - * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user) - * @param int $meta_id ID for a specific meta row + * @param string $meta_type Type of object metadata is for (e.g., comment, post, term, or user). + * @param int $meta_id ID for a specific meta row * @return bool True on successful delete, false on failure. */ function delete_metadata_by_mid( $meta_type, $meta_id ) { global $wpdb; // Make sure everything is valid. - if ( ! $meta_type ) + if ( ! $meta_type || ! is_numeric( $meta_id ) ) { return false; + } - if ( ! $meta_id = absint( $meta_id ) ) + $meta_id = absint( $meta_id ); + if ( ! $meta_id ) { return false; + } - if ( ! $table = _get_meta_table( $meta_type ) ) + $table = _get_meta_table( $meta_type ); + if ( ! $table ) { return false; + } // object and id columns $column = sanitize_key($meta_type . '_id'); @@ -676,7 +732,7 @@ function delete_metadata_by_mid( $meta_type, $meta_id ) { /** * Fires immediately before deleting post or comment metadata of a specific type. * - * The dynamic portion of the hook, $meta_type, refers to the meta + * The dynamic portion of the hook, `$meta_type`, refers to the meta * object type (post or comment). * * @since 3.4.0 @@ -700,7 +756,7 @@ function delete_metadata_by_mid( $meta_type, $meta_id ) { /** * Fires immediately after deleting post or comment metadata of a specific type. * - * The dynamic portion of the hook, $meta_type, refers to the meta + * The dynamic portion of the hook, `$meta_type`, refers to the meta * object type (post or comment). * * @since 3.4.0 @@ -722,23 +778,27 @@ function delete_metadata_by_mid( $meta_type, $meta_id ) { * Update the metadata cache for the specified objects. * * @since 2.9.0 - * @uses $wpdb WordPress database object for queries. * - * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user) - * @param int|array $object_ids array or comma delimited list of object IDs to update cache for - * @return mixed Metadata cache for the specified objects, or false on failure. + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user) + * @param int|array $object_ids Array or comma delimited list of object IDs to update cache for + * @return array|false Metadata cache for the specified objects, or false on failure. */ function update_meta_cache($meta_type, $object_ids) { - if ( empty( $meta_type ) || empty( $object_ids ) ) + global $wpdb; + + if ( ! $meta_type || ! $object_ids ) { return false; + } - if ( ! $table = _get_meta_table($meta_type) ) + $table = _get_meta_table( $meta_type ); + if ( ! $table ) { return false; + } $column = sanitize_key($meta_type . '_id'); - global $wpdb; - if ( !is_array($object_ids) ) { $object_ids = preg_replace('|[^0-9,]|', '', $object_ids); $object_ids = explode(',', $object_ids); @@ -792,307 +852,50 @@ function update_meta_cache($meta_type, $object_ids) { } /** - * Given a meta query, generates SQL clauses to be appended to a main query - * - * @since 3.2.0 + * Retrieves the queue for lazy-loading metadata. * - * @see WP_Meta_Query + * @since 4.5.0 * - * @param array $meta_query A meta query - * @param string $type Type of meta - * @param string $primary_table - * @param string $primary_id_column - * @param object $context (optional) The main query object - * @return array( 'join' => $join_sql, 'where' => $where_sql ) + * @return WP_Metadata_Lazyloader $lazyloader Metadata lazyloader queue. */ -function get_meta_sql( $meta_query, $type, $primary_table, $primary_id_column, $context = null ) { - $meta_query_obj = new WP_Meta_Query( $meta_query ); - return $meta_query_obj->get_sql( $type, $primary_table, $primary_id_column, $context ); +function wp_metadata_lazyloader() { + static $wp_metadata_lazyloader; + + if ( null === $wp_metadata_lazyloader ) { + $wp_metadata_lazyloader = new WP_Metadata_Lazyloader(); + } + + return $wp_metadata_lazyloader; } /** - * Container class for a multiple metadata query + * Given a meta query, generates SQL clauses to be appended to a main query. * * @since 3.2.0 + * + * @see WP_Meta_Query + * + * @param array $meta_query A meta query. + * @param string $type Type of meta. + * @param string $primary_table Primary database table name. + * @param string $primary_id_column Primary ID column name. + * @param object $context Optional. The main query object + * @return array Associative array of `JOIN` and `WHERE` SQL. */ -class WP_Meta_Query { - /** - * List of metadata queries. A single query is an associative array: - * - 'key' string The meta key - * - 'value' string|array The meta value - * - 'compare' (optional) string How to compare the key to the value. - * Possible values: '=', '!=', '>', '>=', '<', '<=', 'LIKE', 'NOT LIKE', 'IN', 'NOT IN', - * 'BETWEEN', 'NOT BETWEEN', 'REGEXP', 'NOT REGEXP', 'RLIKE'. - * Default: '=' - * - 'type' string (optional) The type of the value. - * Possible values: 'NUMERIC', 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED'. - * Default: 'CHAR' - * - * @since 3.2.0 - * @access public - * @var array - */ - public $queries = array(); - - /** - * The relation between the queries. Can be one of 'AND' or 'OR'. - * - * @since 3.2.0 - * @access public - * @var string - */ - public $relation; - - /** - * Constructor - * - * @param array $meta_query (optional) A meta query - */ - function __construct( $meta_query = false ) { - if ( !$meta_query ) - return; - - if ( isset( $meta_query['relation'] ) && strtoupper( $meta_query['relation'] ) == 'OR' ) { - $this->relation = 'OR'; - } else { - $this->relation = 'AND'; - } - - $this->queries = array(); - - foreach ( $meta_query as $key => $query ) { - if ( ! is_array( $query ) ) - continue; - - $this->queries[] = $query; - } - } - - /** - * Constructs a meta query based on 'meta_*' query vars - * - * @since 3.2.0 - * @access public - * - * @param array $qv The query variables - */ - function parse_query_vars( $qv ) { - $meta_query = array(); - - // Simple query needs to be first for orderby=meta_value to work correctly - foreach ( array( 'key', 'compare', 'type' ) as $key ) { - if ( !empty( $qv[ "meta_$key" ] ) ) - $meta_query[0][ $key ] = $qv[ "meta_$key" ]; - } - - // WP_Query sets 'meta_value' = '' by default - if ( isset( $qv[ 'meta_value' ] ) && '' !== $qv[ 'meta_value' ] && ( ! is_array( $qv[ 'meta_value' ] ) || $qv[ 'meta_value' ] ) ) - $meta_query[0]['value'] = $qv[ 'meta_value' ]; - - if ( !empty( $qv['meta_query'] ) && is_array( $qv['meta_query'] ) ) { - $meta_query = array_merge( $meta_query, $qv['meta_query'] ); - } - - $this->__construct( $meta_query ); - } - - /** - * Given a meta type, return the appropriate alias if applicable - * - * @since 3.7.0 - * - * @param string $type MySQL type to cast meta_value - * @return string MySQL type - */ - function get_cast_for_type( $type = '' ) { - if ( empty( $type ) ) - return 'CHAR'; - - $meta_type = strtoupper( $type ); - - if ( ! preg_match( '/^(?:BINARY|CHAR|DATE|DATETIME|SIGNED|UNSIGNED|TIME|NUMERIC(?:$\d+(?:,\s?\d+)?$)?|DECIMAL(?:$\d+(?:,\s?\d+)?$)?)$/', $meta_type ) ) - return 'CHAR'; - - if ( 'NUMERIC' == $meta_type ) - $meta_type = 'SIGNED'; - - return $meta_type; - } - - /** - * Generates SQL clauses to be appended to a main query. - * - * @since 3.2.0 - * @access public - * - * @param string $type Type of meta - * @param string $primary_table - * @param string $primary_id_column - * @param object $context (optional) The main query object - * @return array( 'join' => $join_sql, 'where' => $where_sql ) - */ - function get_sql( $type, $primary_table, $primary_id_column, $context = null ) { - global $wpdb; - - if ( ! $meta_table = _get_meta_table( $type ) ) - return false; - - $meta_id_column = sanitize_key( $type . '_id' ); - - $join = array(); - $where = array(); - - $key_only_queries = array(); - $queries = array(); - - // Split out the queries with empty arrays as value - foreach ( $this->queries as $k => $q ) { - if ( isset( $q['value'] ) && is_array( $q['value'] ) && empty( $q['value'] ) ) { - $key_only_queries[$k] = $q; - unset( $this->queries[$k] ); - } - } - - // Split out the meta_key only queries (we can only do this for OR) - if ( 'OR' == $this->relation ) { - foreach ( $this->queries as $k => $q ) { - if ( ( empty( $q['compare'] ) || 'NOT EXISTS' != $q['compare'] ) && ! array_key_exists( 'value', $q ) && ! empty( $q['key'] ) ) - $key_only_queries[$k] = $q; - else - $queries[$k] = $q; - } - } else { - $queries = $this->queries; - } - - // Specify all the meta_key only queries in one go - if ( $key_only_queries ) { - $join[] = "INNER JOIN $meta_table ON $primary_table.$primary_id_column = $meta_table.$meta_id_column"; - - foreach ( $key_only_queries as $key => $q ) - $where["key-only-$key"] = $wpdb->prepare( "$meta_table.meta_key = %s", trim( $q['key'] ) ); - } - - foreach ( $queries as $k => $q ) { - $meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : ''; - $meta_type = $this->get_cast_for_type( isset( $q['type'] ) ? $q['type'] : '' ); - - if ( array_key_exists( 'value', $q ) && is_null( $q['value'] ) ) - $q['value'] = ''; - - $meta_value = isset( $q['value'] ) ? $q['value'] : null; - - if ( isset( $q['compare'] ) ) - $meta_compare = strtoupper( $q['compare'] ); - else - $meta_compare = is_array( $meta_value ) ? 'IN' : '='; - - if ( ! in_array( $meta_compare, array( - '=', '!=', '>', '>=', '<', '<=', - 'LIKE', 'NOT LIKE', - 'IN', 'NOT IN', - 'BETWEEN', 'NOT BETWEEN', - 'NOT EXISTS', - 'REGEXP', 'NOT REGEXP', 'RLIKE' - ) ) ) - $meta_compare = '='; - - $i = count( $join ); - $alias = $i ? 'mt' . $i : $meta_table; - - if ( 'NOT EXISTS' == $meta_compare ) { - $join[$i] = "LEFT JOIN $meta_table"; - $join[$i] .= $i ? " AS $alias" : ''; - $join[$i] .= " ON ($primary_table.$primary_id_column = $alias.$meta_id_column AND $alias.meta_key = '$meta_key')"; - - $where[$k] = ' ' . $alias . '.' . $meta_id_column . ' IS NULL'; - - continue; - } - - $join[$i] = "INNER JOIN $meta_table"; - $join[$i] .= $i ? " AS $alias" : ''; - $join[$i] .= " ON ($primary_table.$primary_id_column = $alias.$meta_id_column)"; - - $where[$k] = ''; - if ( !empty( $meta_key ) ) - $where[$k] = $wpdb->prepare( "$alias.meta_key = %s", $meta_key ); - - if ( is_null( $meta_value ) ) { - if ( empty( $where[$k] ) ) - unset( $join[$i] ); - continue; - } - - if ( in_array( $meta_compare, array( 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) { - if ( ! is_array( $meta_value ) ) - $meta_value = preg_split( '/[,\s]+/', $meta_value ); - - if ( empty( $meta_value ) ) { - unset( $join[$i] ); - continue; - } - } else { - $meta_value = trim( $meta_value ); - } - - if ( 'IN' == substr( $meta_compare, -2) ) { - $meta_compare_string = '(' . substr( str_repeat( ',%s', count( $meta_value ) ), 1 ) . ')'; - } elseif ( 'BETWEEN' == substr( $meta_compare, -7) ) { - $meta_value = array_slice( $meta_value, 0, 2 ); - $meta_compare_string = '%s AND %s'; - } elseif ( 'LIKE' == substr( $meta_compare, -4 ) ) { - $meta_value = '%' . like_escape( $meta_value ) . '%'; - $meta_compare_string = '%s'; - } else { - $meta_compare_string = '%s'; - } - - if ( ! empty( $where[$k] ) ) - $where[$k] .= ' AND '; - - $where[$k] = ' (' . $where[$k] . $wpdb->prepare( "CAST($alias.meta_value AS {$meta_type}) {$meta_compare} {$meta_compare_string})", $meta_value ); - } - - $where = array_filter( $where ); - - if ( empty( $where ) ) - $where = ''; - else - $where = ' AND (' . implode( "\n{$this->relation} ", $where ) . ' )'; - - $join = implode( "\n", $join ); - if ( ! empty( $join ) ) - $join = ' ' . $join; - - /** - * Filter the meta query's generated SQL. - * - * @since 3.1.0 - * - * @param array $args { - * An array of arguments. - * - * @type array $clauses Array containing the query's JOIN and WHERE clauses. - * @type array $queries Array of meta queries. - * @type string $type Type of meta. - * @type string $primary_table Primary table. - * @type string $primary_id_column Primary column ID. - * @type object $context The main query object. - * } - */ - return apply_filters_ref_array( 'get_meta_sql', array( compact( 'join', 'where' ), $this->queries, $type, $primary_table, $primary_id_column, $context ) ); - } +function get_meta_sql( $meta_query, $type, $primary_table, $primary_id_column, $context = null ) { + $meta_query_obj = new WP_Meta_Query( $meta_query ); + return $meta_query_obj->get_sql( $type, $primary_table, $primary_id_column, $context ); } /** * Retrieve the name of the metadata table for the specified object type. * * @since 2.9.0 - * @uses $wpdb WordPress database object for queries. + * + * @global wpdb $wpdb WordPress database abstraction object. * * @param string $type Type of object to get metadata table for (e.g., comment, post, or user) - * @return mixed Metadata table name, or false if no metadata table exists + * @return string|false Metadata table name, or false if no metadata table exists */ function _get_meta_table($type) { global $wpdb; @@ -1110,7 +913,8 @@ function _get_meta_table($type) { * * @since 3.1.3 * - * @param string $meta_key Meta key + * @param string $meta_key Meta key + * @param string|null $meta_type * @return bool True if the key is protected, false otherwise. */ function is_protected_meta( $meta_key, $meta_type = null ) { @@ -1133,9 +937,9 @@ function is_protected_meta( $meta_key, $meta_type = null ) { * * @since 3.1.3 * - * @param string $meta_key Meta key - * @param mixed $meta_value Meta value to sanitize - * @param string $meta_type Type of meta + * @param string $meta_key Meta key + * @param mixed $meta_value Meta value to sanitize + * @param string $meta_type Type of meta * @return mixed Sanitized $meta_value */ function sanitize_meta( $meta_key, $meta_value, $meta_type ) { @@ -1143,8 +947,9 @@ function sanitize_meta( $meta_key, $meta_value, $meta_type ) { /** * Filter the sanitization of a specific meta key of a specific meta type. * - * The dynamic portions of the hook name, $meta_type and $meta_key, refer to the - * metadata object type (comment, post, or user) and the meta key value, + * The dynamic portions of the hook name, `$meta_type`, and `$meta_key`, + * refer to the metadata object type (comment, post, or user) and the meta + * key value, * respectively. * * @since 3.3.0 @@ -1161,11 +966,10 @@ function sanitize_meta( $meta_key, $meta_value, $meta_type ) { * * @since 3.3.0 * - * @param string $meta_type Type of meta - * @param string $meta_key Meta key + * @param string $meta_type Type of meta + * @param string $meta_key Meta key * @param string|array $sanitize_callback A function or method to call when sanitizing the value of $meta_key. - * @param string|array $auth_callback Optional. A function or method to call when performing edit_post_meta, add_post_meta, and delete_post_meta capability checks. - * @param array $args Arguments + * @param string|array $auth_callback Optional. A function or method to call when performing edit_post_meta, add_post_meta, and delete_post_meta capability checks. */ function register_meta( $meta_type, $meta_key, $sanitize_callback, $auth_callback = null ) { if ( is_callable( $sanitize_callback ) ) diff --git a/wp-includes/ms-blogs.php b/wp-includes/ms-blogs.php index 16a4918..9108d59 100644 --- a/wp-includes/ms-blogs.php +++ b/wp-includes/ms-blogs.php @@ -9,9 +9,11 @@ */ /** - * Update the last_updated field for the current blog. + * Update the last_updated field for the current site. * * @since MU + * + * @global wpdb $wpdb WordPress database abstraction object. */ function wpmu_update_blogs_date() { global $wpdb; @@ -22,7 +24,7 @@ function wpmu_update_blogs_date() { * * @since MU * - * @param int $blog_id Blog ID. + * @param int $blog_id Site ID. */ do_action( 'wpmu_blog_updated', $wpdb->blogid ); } @@ -33,11 +35,19 @@ function wpmu_update_blogs_date() { * @since MU * * @param int $blog_id Blog ID - * @return string + * @return string Full URL of the blog if found. Empty string if not. */ function get_blogaddress_by_id( $blog_id ) { - $bloginfo = get_blog_details( (int) $blog_id, false ); // only get bare details! - return esc_url( 'http://' . $bloginfo->domain . $bloginfo->path ); + $bloginfo = get_blog_details( (int) $blog_id ); + + if ( empty( $bloginfo ) ) { + return ''; + } + + $scheme = parse_url( $bloginfo->home, PHP_URL_SCHEME ); + $scheme = empty( $scheme ) ? 'http' : $scheme; + + return esc_url( $scheme . '://' . $bloginfo->domain . $bloginfo->path ); } /** @@ -66,6 +76,8 @@ function get_blogaddress_by_name( $blogname ) { * * @since MU * + * @global wpdb $wpdb WordPress database abstraction object. + * * @param string $slug * @return int A blog id */ @@ -97,9 +109,13 @@ function get_id_from_blogname( $slug ) { * * @since MU * - * @param int|string|array $fields A blog ID, a blog slug, or an array of fields to query against. Optional. If not specified the current blog ID is used. - * @param bool $get_all Whether to retrieve all details or only the details in the blogs table. Default is true. - * @return object Blog details. + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param int|string|array $fields Optional. A blog ID, a blog slug, or an array of fields to query against. + * If not specified the current blog ID is used. + * @param bool $get_all Whether to retrieve all details or only the details in the blogs table. + * Default is true. + * @return WP_Site|false Blog details on success. False on failure. */ function get_blog_details( $fields = null, $get_all = true ) { global $wpdb; @@ -194,7 +210,7 @@ function get_blog_details( $fields = null, $get_all = true ) { } if ( empty($details) ) { - $details = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE blog_id = %d /* get_blog_details */", $blog_id ) ); + $details = WP_Site::get_instance( $blog_id ); if ( ! $details ) { // Set the full cache. wp_cache_set( $blog_id, -1, 'blog-details' ); @@ -202,15 +218,20 @@ function get_blog_details( $fields = null, $get_all = true ) { } } + if ( ! $details instanceof WP_Site ) { + $details = new WP_Site( $details ); + } + if ( ! $get_all ) { wp_cache_set( $blog_id . $all, $details, 'blog-details' ); return $details; } switch_to_blog( $blog_id ); - $details->blogname = get_option( 'blogname' ); - $details->siteurl = get_option( 'siteurl' ); - $details->post_count = get_option( 'post_count' ); + $details->blogname = get_option( 'blogname' ); + $details->siteurl = get_option( 'siteurl' ); + $details->post_count = get_option( 'post_count' ); + $details->home = get_option( 'home' ); restore_current_blog(); /** @@ -235,10 +256,14 @@ function get_blog_details( $fields = null, $get_all = true ) { * * @since MU * - * @param int $blog_id Blog ID + * @param int $blog_id Optional. Blog ID. Defaults to current blog. */ -function refresh_blog_details( $blog_id ) { +function refresh_blog_details( $blog_id = 0 ) { $blog_id = (int) $blog_id; + if ( ! $blog_id ) { + $blog_id = get_current_blog_id(); + } + $details = get_blog_details( $blog_id, false ); if ( ! $details ) { // Make sure clean_blog_cache() gets the blog ID @@ -268,7 +293,9 @@ function refresh_blog_details( $blog_id ) { * * @since MU * - * @param int $blog_id Blog ID + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param int $blog_id Blog ID * @param array $details Array of details keyed by blogs table field names. * @return bool True if update succeeds, false otherwise. */ @@ -292,8 +319,13 @@ function update_blog_details( $blog_id, $details = array() ) { $update_details = array(); $fields = array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id'); - foreach ( array_intersect( array_keys( $details ), $fields ) as $field ) - $update_details[$field] = $details[$field]; + foreach ( array_intersect( array_keys( $details ), $fields ) as $field ) { + if ( 'path' === $field ) { + $details[ $field ] = trailingslashit( '/' . trim( $details[ $field ], '/' ) ); + } + + $update_details[ $field ] = $details[ $field ]; + } $result = $wpdb->update( $wpdb->blogs, $update_details, array('blog_id' => $blog_id) ); @@ -408,12 +440,13 @@ function update_blog_details( $blog_id, $details = array() ) { * * @since 3.5.0 * - * @param stdClass $blog The blog details as returned from get_blog_details() + * @param WP_Site $blog The blog details as returned from get_blog_details() */ function clean_blog_cache( $blog ) { $blog_id = $blog->blog_id; $domain_path_key = md5( $blog->domain . $blog->path ); + wp_cache_delete( $blog_id, 'sites' ); wp_cache_delete( $blog_id , 'blog-details' ); wp_cache_delete( $blog_id . 'short' , 'blog-details' ); wp_cache_delete( $domain_path_key, 'blog-lookup' ); @@ -435,9 +468,9 @@ function clean_blog_cache( $blog ) { * * @since MU * - * @param int $id A blog ID. Can be null to refer to the current blog. - * @param string $option Name of option to retrieve. Expected to not be SQL-escaped. - * @param mixed $default Optional. Default value to return if the option does not exist. + * @param int $id A blog ID. Can be null to refer to the current blog. + * @param string $option Name of option to retrieve. Expected to not be SQL-escaped. + * @param mixed $default Optional. Default value to return if the option does not exist. * @return mixed Value set for the option. */ function get_blog_option( $id, $option, $default = false ) { @@ -456,7 +489,7 @@ function get_blog_option( $id, $option, $default = false ) { /** * Filter a blog option value. * - * The dynamic portion of the hook name, $option, refers to the blog option name. + * The dynamic portion of the hook name, `$option`, refers to the blog option name. * * @since 3.5.0 * @@ -480,9 +513,9 @@ function get_blog_option( $id, $option, $default = false ) { * * @since MU * - * @param int $id A blog ID. Can be null to refer to the current blog. + * @param int $id A blog ID. Can be null to refer to the current blog. * @param string $option Name of option to add. Expected to not be SQL-escaped. - * @param mixed $value Optional. Option value, can be anything. Expected to not be SQL-escaped. + * @param mixed $value Optional. Option value, can be anything. Expected to not be SQL-escaped. * @return bool False if option was not added and true if option was added. */ function add_blog_option( $id, $option, $value ) { @@ -506,7 +539,7 @@ function add_blog_option( $id, $option, $value ) { * * @since MU * - * @param int $id A blog ID. Can be null to refer to the current blog. + * @param int $id A blog ID. Can be null to refer to the current blog. * @param string $option Name of option to remove. Expected to not be SQL-escaped. * @return bool True, if option is successfully deleted. False on failure. */ @@ -531,9 +564,10 @@ function delete_blog_option( $id, $option ) { * * @since MU * - * @param int $id The blog id - * @param string $option The option key - * @param mixed $value The option value + * @param int $id The blog id. + * @param string $option The option key. + * @param mixed $value The option value. + * @param mixed $deprecated Not used. * @return bool True on success, false on failure. */ function update_blog_option( $id, $option, $value, $deprecated = null ) { @@ -567,12 +601,19 @@ function update_blog_option( $id, $option, $value, $deprecated = null ) { * @see restore_current_blog() * @since MU * - * @param int $new_blog The id of the blog you want to switch to. Default: current blog + * @global wpdb $wpdb + * @global int $blog_id + * @global array $_wp_switched_stack + * @global bool $switched + * @global string $table_prefix + * @global WP_Object_Cache $wp_object_cache + * + * @param int $new_blog The id of the blog you want to switch to. Default: current blog * @param bool $deprecated Deprecated argument - * @return bool Always returns True. + * @return true Always returns True. */ function switch_to_blog( $new_blog, $deprecated = null ) { - global $wpdb, $wp_roles; + global $wpdb; if ( empty( $new_blog ) ) $new_blog = $GLOBALS['blog_id']; @@ -616,16 +657,17 @@ function switch_to_blog( $new_blog, $deprecated = null ) { wp_cache_init(); if ( function_exists( 'wp_cache_add_global_groups' ) ) { - if ( is_array( $global_groups ) ) + if ( is_array( $global_groups ) ) { wp_cache_add_global_groups( $global_groups ); - else - wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', ' blog-id-cache' ) ); + } else { + wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites' ) ); + } wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) ); } } if ( did_action( 'init' ) ) { - $wp_roles->reinit(); + wp_roles()->reinit(); $current_user = wp_get_current_user(); $current_user->for_blog( $new_blog ); } @@ -643,10 +685,17 @@ function switch_to_blog( $new_blog, $deprecated = null ) { * @see switch_to_blog() * @since MU * + * @global wpdb $wpdb + * @global array $_wp_switched_stack + * @global int $blog_id + * @global bool $switched + * @global string $table_prefix + * @global WP_Object_Cache $wp_object_cache + * * @return bool True on success, false if we're already on the current blog */ function restore_current_blog() { - global $wpdb, $wp_roles; + global $wpdb; if ( empty( $GLOBALS['_wp_switched_stack'] ) ) return false; @@ -679,16 +728,17 @@ function restore_current_blog() { wp_cache_init(); if ( function_exists( 'wp_cache_add_global_groups' ) ) { - if ( is_array( $global_groups ) ) + if ( is_array( $global_groups ) ) { wp_cache_add_global_groups( $global_groups ); - else - wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', ' blog-id-cache' ) ); + } else { + wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites' ) ); + } wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) ); } } if ( did_action( 'init' ) ) { - $wp_roles->reinit(); + wp_roles()->reinit(); $current_user = wp_get_current_user(); $current_user->for_blog( $blog ); } @@ -707,6 +757,8 @@ function restore_current_blog() { * * @since 3.5.0 * + * @global array $_wp_switched_stack + * * @return bool True if switched, false otherwise. */ function ms_is_switched() { @@ -730,7 +782,7 @@ function is_archived( $id ) { * * @since MU * - * @param int $id The blog id + * @param int $id The blog id * @param string $archived The new status * @return string $archived */ @@ -744,10 +796,13 @@ function update_archived( $id, $archived ) { * * @since MU * - * @param int $blog_id BLog ID - * @param string $pref A field name - * @param string $value Value for $pref - * @return string $value + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param int $blog_id BLog ID + * @param string $pref A field name + * @param string $value Value for $pref + * @param null $deprecated + * @return string|false $value */ function update_blog_status( $blog_id, $pref, $value, $deprecated = null ) { global $wpdb; @@ -817,9 +872,11 @@ function update_blog_status( $blog_id, $pref, $value, $deprecated = null ) { * * @since MU * - * @param int $id The blog id + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param int $id The blog id * @param string $pref A field name - * @return bool $value + * @return bool|string|null $value */ function get_blog_status( $id, $pref ) { global $wpdb; @@ -836,9 +893,11 @@ function get_blog_status( $id, $pref ) { * * @since MU * + * @global wpdb $wpdb WordPress database abstraction object. + * * @param mixed $deprecated Not used - * @param int $start The offset - * @param int $quantity The maximum number of blogs to retrieve. Default is 40. + * @param int $start The offset + * @param int $quantity The maximum number of blogs to retrieve. Default is 40. * @return array The list of blogs */ function get_last_updated( $deprecated = '', $start = 0, $quantity = 40 ) { @@ -857,15 +916,17 @@ function get_last_updated( $deprecated = '', $start = 0, $quantity = 40 ) { * * @param string $new_status The new post status * @param string $old_status The old post status - * @param object $post Post object + * @param object $post Post object */ function _update_blog_date_on_post_publish( $new_status, $old_status, $post ) { $post_type_obj = get_post_type_object( $post->post_type ); - if ( ! $post_type_obj->public ) + if ( ! $post_type_obj || ! $post_type_obj->public ) { return; + } - if ( 'publish' != $new_status && 'publish' != $old_status ) + if ( 'publish' != $new_status && 'publish' != $old_status ) { return; + } // Post was freshly published, published post was saved, or published post was unpublished. @@ -883,12 +944,50 @@ function _update_blog_date_on_post_delete( $post_id ) { $post = get_post( $post_id ); $post_type_obj = get_post_type_object( $post->post_type ); - if ( ! $post_type_obj->public ) + if ( ! $post_type_obj || ! $post_type_obj->public ) { return; + } - if ( 'publish' != $post->post_status ) + if ( 'publish' != $post->post_status ) { return; + } wpmu_update_blogs_date(); } +/** + * Handler for updating the blog posts count date when a post is deleted. + * + * @since 4.0.0 + * + * @param int $post_id Post ID. + */ +function _update_posts_count_on_delete( $post_id ) { + $post = get_post( $post_id ); + + if ( ! $post || 'publish' !== $post->post_status ) { + return; + } + + update_posts_count(); +} + +/** + * Handler for updating the blog posts count date when a post status changes. + * + * @since 4.0.0 + * + * @param string $new_status The status the post is changing to. + * @param string $old_status The status the post is changing from. + */ +function _update_posts_count_on_transition_post_status( $new_status, $old_status ) { + if ( $new_status === $old_status ) { + return; + } + + if ( 'publish' !== $new_status && 'publish' !== $old_status ) { + return; + } + + update_posts_count(); +} diff --git a/wp-includes/ms-default-constants.php b/wp-includes/ms-default-constants.php index 8cbd2c3..dd17201 100644 --- a/wp-includes/ms-default-constants.php +++ b/wp-includes/ms-default-constants.php @@ -14,6 +14,8 @@ * wp-includes/ms-files.php (wp-content/blogs.php in MU). * * @since 3.0.0 + * + * @global wpdb $wpdb WordPress database abstraction object. */ function ms_upload_constants() { global $wpdb; @@ -114,17 +116,28 @@ function ms_file_constants() { * we will have translations loaded and can trigger warnings easily. * * @since 3.0.0 + * + * @staticvar bool $subdomain_error + * @staticvar bool $subdomain_error_warn */ function ms_subdomain_constants() { - static $error = null; - static $error_warn = false; + static $subdomain_error = null; + static $subdomain_error_warn = null; - if ( false === $error ) + if ( false === $subdomain_error ) { return; + } - if ( $error ) { - $vhost_deprecated = __( 'The constant <code>VHOST</code> <strong>is deprecated</strong>. Use the boolean constant <code>SUBDOMAIN_INSTALL</code> in wp-config.php to enable a subdomain configuration. Use is_subdomain_install() to check whether a subdomain configuration is enabled.' ); - if ( $error_warn ) { + if ( $subdomain_error ) { + $vhost_deprecated = sprintf( + /* translators: 1: VHOST, 2: SUBDOMAIN_INSTALL, 3: wp-config.php, 4: is_subdomain_install() */ + __( 'The constant %1$s <strong>is deprecated</strong>. Use the boolean constant %2$s in %3$s to enable a subdomain configuration. Use %4$s to check whether a subdomain configuration is enabled.' ), + '<code>VHOST</code>', + '<code>SUBDOMAIN_INSTALL</code>', + '<code>wp-config.php</code>', + '<code>is_subdomain_install()</code>' + ); + if ( $subdomain_error_warn ) { trigger_error( __( '<strong>Conflicting values for the constants VHOST and SUBDOMAIN_INSTALL.</strong> The value of SUBDOMAIN_INSTALL will be assumed to be your subdomain configuration setting.' ) . ' ' . $vhost_deprecated, E_USER_WARNING ); } else { _deprecated_argument( 'define()', '3.0', $vhost_deprecated ); @@ -133,19 +146,19 @@ function ms_subdomain_constants() { } if ( defined( 'SUBDOMAIN_INSTALL' ) && defined( 'VHOST' ) ) { - if ( SUBDOMAIN_INSTALL == ( 'yes' == VHOST ) ) { - $error = true; - } else { - $error = $error_warn = true; + $subdomain_error = true; + if ( SUBDOMAIN_INSTALL !== ( 'yes' == VHOST ) ) { + $subdomain_error_warn = true; } } elseif ( defined( 'SUBDOMAIN_INSTALL' ) ) { + $subdomain_error = false; define( 'VHOST', SUBDOMAIN_INSTALL ? 'yes' : 'no' ); } elseif ( defined( 'VHOST' ) ) { - $error = true; + $subdomain_error = true; define( 'SUBDOMAIN_INSTALL', 'yes' == VHOST ); } else { + $subdomain_error = false; define( 'SUBDOMAIN_INSTALL', false ); define( 'VHOST', 'no' ); } } -add_action( 'init', 'ms_subdomain_constants' ); diff --git a/wp-includes/ms-default-filters.php b/wp-includes/ms-default-filters.php index 759c81f..08d752a 100644 --- a/wp-includes/ms-default-filters.php +++ b/wp-includes/ms-default-filters.php @@ -13,17 +13,31 @@ * @since 3.0.0 */ +add_action( 'init', 'ms_subdomain_constants' ); + +// Functions +add_action( 'update_option_blog_public', 'update_blog_public', 10, 2 ); +add_filter( 'option_users_can_register', 'users_can_register_signup_filter' ); +add_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' ); + // Users add_filter( 'wpmu_validate_user_signup', 'signup_nonce_check' ); add_action( 'init', 'maybe_add_existing_user_to_blog' ); add_action( 'wpmu_new_user', 'newuser_notify_siteadmin' ); add_action( 'wpmu_activate_user', 'add_new_user_to_blog', 10, 3 ); +add_action( 'wpmu_activate_user', 'wpmu_welcome_user_notification', 10, 3 ); +add_action( 'after_signup_user', 'wpmu_signup_user_notification', 10, 4 ); +add_action( 'network_site_new_created_user', 'wp_send_new_user_notifications' ); +add_action( 'network_site_users_created_user', 'wp_send_new_user_notifications' ); +add_action( 'network_user_new_created_user', 'wp_send_new_user_notifications' ); add_filter( 'sanitize_user', 'strtolower' ); // Blogs add_filter( 'wpmu_validate_blog_signup', 'signup_nonce_check' ); add_action( 'wpmu_new_blog', 'wpmu_log_new_registrations', 10, 2 ); add_action( 'wpmu_new_blog', 'newblog_notify_siteadmin', 10, 2 ); +add_action( 'wpmu_activate_blog', 'wpmu_welcome_notification', 10, 5 ); +add_action( 'after_signup_site', 'wpmu_signup_blog_notification', 10, 7 ); // Register Nonce add_action( 'signup_hidden_fields', 'signup_nonce_fields' ); @@ -34,9 +48,10 @@ add_filter( 'allowed_redirect_hosts', 'redirect_this_site' ); // Administration add_filter( 'term_id_filter', 'global_terms', 10, 2 ); -add_action( 'publish_post', 'update_posts_count' ); +add_action( 'delete_post', '_update_posts_count_on_delete' ); add_action( 'delete_post', '_update_blog_date_on_post_delete' ); add_action( 'transition_post_status', '_update_blog_date_on_post_publish', 10, 3 ); +add_action( 'transition_post_status', '_update_posts_count_on_transition_post_status', 10, 2 ); // Counts add_action( 'admin_init', 'wp_schedule_update_network_counts'); @@ -69,6 +84,11 @@ add_filter( 'force_filtered_html_on_import', '__return_true' ); remove_filter( 'option_siteurl', '_config_wp_siteurl' ); remove_filter( 'option_home', '_config_wp_home' ); +// Some options changes should trigger blog details refresh. +add_action( 'update_option_blogname', 'refresh_blog_details', 10, 0 ); +add_action( 'update_option_siteurl', 'refresh_blog_details', 10, 0 ); +add_action( 'update_option_post_count', 'refresh_blog_details', 10, 0 ); + // If the network upgrade hasn't run yet, assume ms-files.php rewriting is used. add_filter( 'default_site_option_ms_files_rewriting', '__return_true' ); diff --git a/wp-includes/ms-deprecated.php b/wp-includes/ms-deprecated.php index 5c7bfe2..19224d7 100644 --- a/wp-includes/ms-deprecated.php +++ b/wp-includes/ms-deprecated.php @@ -18,9 +18,10 @@ * Dashboard blog functionality was removed in WordPress 3.1, replaced by the user admin. * * @since MU - * @deprecated 3.1.0 + * @deprecated 3.1.0 Use get_blog_details() * @see get_blog_details() - * @return int + * + * @return int Current site ID. */ function get_dashboard_blog() { _deprecated_function( __FUNCTION__, '3.1' ); @@ -31,10 +32,13 @@ function get_dashboard_blog() { } /** + * Generates a random password. + * * @since MU - * @deprecated 3.0.0 - * @deprecated Use wp_generate_password() + * @deprecated 3.0.0 Use wp_generate_password() * @see wp_generate_password() + * + * @param int $len Optional. The length of password to generate. Default 8. */ function generate_random_password( $len = 8 ) { _deprecated_function( __FUNCTION__, '3.0', 'wp_generate_password()' ); @@ -51,11 +55,10 @@ function generate_random_password( $len = 8 ) { * legacy function_exists() checks to determine if multisite is enabled. * * @since MU - * @deprecated 3.0.0 - * @deprecated Use is_super_admin() + * @deprecated 3.0.0 Use is_super_admin() * @see is_super_admin() - * @see is_multisite() * + * @param string $user_login Optional. Username for the user to check. Default empty. */ function is_site_admin( $user_login = '' ) { _deprecated_function( __FUNCTION__, '3.0', 'is_super_admin()' ); @@ -76,9 +79,10 @@ function is_site_admin( $user_login = '' ) { if ( !function_exists( 'graceful_fail' ) ) : /** + * Deprecated functionality to gracefully fail. + * * @since MU - * @deprecated 3.0.0 - * @deprecated Use wp_die() + * @deprecated 3.0.0 Use wp_die() * @see wp_die() */ function graceful_fail( $message ) { @@ -113,10 +117,13 @@ text-align: center; endif; /** + * Deprecated functionality to retrieve user information. + * * @since MU - * @deprecated 3.0.0 - * @deprecated Use get_user_by() + * @deprecated 3.0.0 Use get_user_by() * @see get_user_by() + * + * @param string $username Username. */ function get_user_details( $username ) { _deprecated_function( __FUNCTION__, '3.0', 'get_user_by()' ); @@ -124,19 +131,23 @@ function get_user_details( $username ) { } /** + * Deprecated functionality to clear the global post cache. + * * @since MU - * @deprecated 3.0.0 - * @deprecated Use clean_post_cache() + * @deprecated 3.0.0 Use clean_post_cache() * @see clean_post_cache() + * + * @param int $post_id Post ID. */ function clear_global_post_cache( $post_id ) { _deprecated_function( __FUNCTION__, '3.0', 'clean_post_cache()' ); } /** + * Deprecated functionality to determin if the current site is the main site. + * * @since MU - * @deprecated 3.0.0 - * @deprecated Use is_main_site() + * @deprecated 3.0.0 Use is_main_site() * @see is_main_site() */ function is_main_blog() { @@ -145,10 +156,15 @@ function is_main_blog() { } /** + * Deprecated functionality to validate an email address. + * * @since MU - * @deprecated 3.0.0 - * @deprecated Use is_email() + * @deprecated 3.0.0 Use is_email() * @see is_email() + * + * @param string $email Email address to verify. + * @param bool $check_domain Deprecated. + * @return string|bool Either false or the valid email address. */ function validate_email( $email, $check_domain = true) { _deprecated_function( __FUNCTION__, '3.0', 'is_email()' ); @@ -156,9 +172,15 @@ function validate_email( $email, $check_domain = true) { } /** + * Deprecated functionality to retrieve a list of all sites. + * * @since MU - * @deprecated 3.0.0 - * @deprecated No alternative available. For performance reasons this function is not recommended. + * @deprecated 3.0.0 Use wp_get_sites() + * @see wp_get_sites() + * + * @param int $start Optional. Offset for retrieving the blog list. Default 0. + * @param int $num Optional. Number of blogs to list. Default 10. + * @param string $deprecated Unused. */ function get_blog_list( $start = 0, $num = 10, $deprecated = '' ) { _deprecated_function( __FUNCTION__, '3.0', 'wp_get_sites()' ); @@ -166,26 +188,32 @@ function get_blog_list( $start = 0, $num = 10, $deprecated = '' ) { global $wpdb; $blogs = $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' ORDER BY registered DESC", $wpdb->siteid), ARRAY_A ); + $blog_list = array(); foreach ( (array) $blogs as $details ) { $blog_list[ $details['blog_id'] ] = $details; $blog_list[ $details['blog_id'] ]['postcount'] = $wpdb->get_var( "SELECT COUNT(ID) FROM " . $wpdb->get_blog_prefix( $details['blog_id'] ). "posts WHERE post_status='publish' AND post_type='post'" ); } - unset( $blogs ); - $blogs = $blog_list; - if ( false == is_array( $blogs ) ) + if ( ! $blog_list ) { return array(); + } - if ( $num == 'all' ) - return array_slice( $blogs, $start, count( $blogs ) ); - else - return array_slice( $blogs, $start, $num ); + if ( $num == 'all' ) { + return array_slice( $blog_list, $start, count( $blog_list ) ); + } else { + return array_slice( $blog_list, $start, $num ); + } } /** + * Deprecated functionality to retrieve a list of the most active sites. + * * @since MU * @deprecated 3.0.0 - * @deprecated No alternative available. For performance reasons this function is not recommended. + * + * @param int $num Optional. Number of activate blogs to retrieve. Default 10. + * @param bool $display Optional. Whether or not to display the most active blogs list. Default true. + * @return array List of "most active" sites. */ function get_most_active_blogs( $num = 10, $display = true ) { _deprecated_function( __FUNCTION__, '3.0' ); @@ -193,20 +221,23 @@ function get_most_active_blogs( $num = 10, $display = true ) { $blogs = get_blog_list( 0, 'all', false ); // $blog_id -> $details if ( is_array( $blogs ) ) { reset( $blogs ); + $most_active = array(); + $blog_list = array(); foreach ( (array) $blogs as $key => $details ) { $most_active[ $details['blog_id'] ] = $details['postcount']; $blog_list[ $details['blog_id'] ] = $details; // array_slice() removes keys!! } arsort( $most_active ); reset( $most_active ); - foreach ( (array) $most_active as $key => $details ) + $t = array(); + foreach ( (array) $most_active as $key => $details ) { $t[ $key ] = $blog_list[ $key ]; - + } unset( $most_active ); $most_active = $t; } - if ( $display == true ) { + if ( $display ) { if ( is_array( $most_active ) ) { reset( $most_active ); foreach ( (array) $most_active as $key => $details ) { @@ -230,11 +261,10 @@ function get_most_active_blogs( $num = 10, $display = true ) { * 6) $url * * @since MU - * @deprecated 3.3.0 - * @deprecated Use wp_redirect() - * @uses wpmu_admin_redirect_add_updated_param() + * @deprecated 3.3.0 Use wp_redirect() + * @see wp_redirect() * - * @param string $url + * @param string $url Optional. Redirect URL. Default empty. */ function wpmu_admin_do_redirect( $url = '' ) { _deprecated_function( __FUNCTION__, '3.3' ); @@ -250,7 +280,7 @@ function wpmu_admin_do_redirect( $url = '' ) { wp_redirect( $ref ); exit(); } - if ( empty( $_SERVER['HTTP_REFERER'] ) == false ) { + if ( ! empty( $_SERVER['HTTP_REFERER'] ) ) { wp_redirect( $_SERVER['HTTP_REFERER'] ); exit(); } @@ -270,10 +300,10 @@ function wpmu_admin_do_redirect( $url = '' ) { * Adds an 'updated=true' argument to a URL. * * @since MU - * @deprecated 3.3.0 - * @deprecated Use add_query_arg() + * @deprecated 3.3.0 Use add_query_arg() + * @see add_query_arg() * - * @param string $url + * @param string $url Optional. Redirect URL. Default empty. * @return string */ function wpmu_admin_redirect_add_updated_param( $url = '' ) { @@ -295,9 +325,8 @@ function wpmu_admin_redirect_add_updated_param( $url = '' ) { * and is simply returned as such. * * @since MU - * @deprecated 3.6.0 - * @deprecated Use get_user_by() - * @uses get_user_by() + * @deprecated 3.6.0 Use get_user_by() + * @see get_user_by() * * @param string $string Either an email address or a login. * @return int @@ -345,3 +374,67 @@ function get_blogaddress_by_domain( $domain, $path ) { } return esc_url_raw( $url ); } + +/** + * Create an empty blog. + * + * @since MU 1.0 + * @deprecated 4.4.0 + * + * @param string $domain The new blog's domain. + * @param string $path The new blog's path. + * @param string $weblog_title The new blog's title. + * @param int $site_id Optional. Defaults to 1. + * @return string|int The ID of the newly created blog + */ +function create_empty_blog( $domain, $path, $weblog_title, $site_id = 1 ) { + _deprecated_function( __FUNCTION__, '4.4' ); + + if ( empty($path) ) + $path = '/'; + + // Check if the domain has been used already. We should return an error message. + if ( domain_exists($domain, $path, $site_id) ) + return __( '<strong>ERROR</strong>: Site URL already taken.' ); + + // Need to back up wpdb table names, and create a new wp_blogs entry for new blog. + // Need to get blog_id from wp_blogs, and create new table names. + // Must restore table names at the end of function. + + if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) + return __( '<strong>ERROR</strong>: problem creating site entry.' ); + + switch_to_blog($blog_id); + install_blog($blog_id); + restore_current_blog(); + + return $blog_id; +} + +/** + * Get the admin for a domain/path combination. + * + * @since MU 1.0 + * @deprecated 4.4.0 + * + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string $sitedomain Optional. Site domain. + * @param string $path Optional. Site path. + * @return array|false The network admins + */ +function get_admin_users_for_domain( $sitedomain = '', $path = '' ) { + _deprecated_function( __FUNCTION__, '4.4' ); + + global $wpdb; + + if ( ! $sitedomain ) + $site_id = $wpdb->siteid; + else + $site_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE domain = %s AND path = %s", $sitedomain, $path ) ); + + if ( $site_id ) + return $wpdb->get_results( $wpdb->prepare( "SELECT u.ID, u.user_login, u.user_pass FROM $wpdb->users AS u, $wpdb->sitemeta AS sm WHERE sm.meta_key = 'admin_user_id' AND u.ID = sm.meta_value AND sm.site_id = %d", $site_id ), ARRAY_A ); + + return false; +} diff --git a/wp-includes/ms-files.php b/wp-includes/ms-files.php index de6d15d..87fa70f 100644 --- a/wp-includes/ms-files.php +++ b/wp-includes/ms-files.php @@ -11,7 +11,7 @@ define( 'SHORTINIT', true ); require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' ); -if( !is_multisite() ) +if ( !is_multisite() ) die( 'Multisite support not enabled' ); ms_file_constants(); @@ -30,10 +30,10 @@ if ( !is_file( $file ) ) { } $mime = wp_check_filetype( $file ); -if( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) ) +if ( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) ) $mime[ 'type' ] = mime_content_type( $file ); -if( $mime[ 'type' ] ) +if ( $mime[ 'type' ] ) $mimetype = $mime[ 'type' ]; else $mimetype = 'image/' . substr( $file, strrpos( $file, '.' ) + 1 ); @@ -60,7 +60,7 @@ header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', time() + 100000000 ) . ' GMT' ); // Support for Conditional GET - use stripslashes to avoid formatting.php dependency $client_etag = isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) ? stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) : false; -if( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) +if ( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) $_SERVER['HTTP_IF_MODIFIED_SINCE'] = false; $client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ); diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index 431ba07..dfb25da 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -11,8 +11,6 @@ * Gets the network's site and user counts. * * @since MU 1.0 - * @uses get_blog_count() - * @uses get_user_count() * * @return array Site and user count for the network. */ @@ -25,29 +23,6 @@ function get_sitestats() { return $stats; } -/** - * Get the admin for a domain/path combination. - * - * @since MU 1.0 - * - * @param string $sitedomain Optional. Site domain. - * @param string $path Optional. Site path. - * @return array The network admins - */ -function get_admin_users_for_domain( $sitedomain = '', $path = '' ) { - global $wpdb; - - if ( ! $sitedomain ) - $site_id = $wpdb->siteid; - else - $site_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE domain = %s AND path = %s", $sitedomain, $path ) ); - - if ( $site_id ) - return $wpdb->get_results( $wpdb->prepare( "SELECT u.ID, u.user_login, u.user_pass FROM $wpdb->users AS u, $wpdb->sitemeta AS sm WHERE sm.meta_key = 'admin_user_id' AND u.ID = sm.meta_value AND sm.site_id = %d", $site_id ), ARRAY_A ); - - return false; -} - /** * Get one of a user's active blogs * @@ -58,18 +33,17 @@ function get_admin_users_for_domain( $sitedomain = '', $path = '' ) { * is returned. * * @since MU 1.0 - * @uses get_blogs_of_user() - * @uses add_user_to_blog() - * @uses get_blog_details() + * + * @global wpdb $wpdb WordPress database abstraction object. * * @param int $user_id The unique ID of the user - * @return object The blog object + * @return WP_Site|void The blog object */ function get_active_blog_for_user( $user_id ) { global $wpdb; $blogs = get_blogs_of_user( $user_id ); if ( empty( $blogs ) ) - return null; + return; if ( !is_multisite() ) return $blogs[$wpdb->blogid]; @@ -108,7 +82,7 @@ function get_active_blog_for_user( $user_id ) { } } } else { - return null; + return; } return $ret; } else { @@ -171,10 +145,10 @@ function get_blog_post( $blog_id, $post_id ) { * * @since MU 1.0 * - * @param int $blog_id ID of the blog you're adding the user to. - * @param int $user_id ID of the user you're adding. - * @param string $role The role you want the user to have - * @return bool + * @param int $blog_id ID of the blog you're adding the user to. + * @param int $user_id ID of the user you're adding. + * @param string $role The role you want the user to have + * @return true|WP_Error */ function add_user_to_blog( $blog_id, $user_id, $role ) { switch_to_blog($blog_id); @@ -205,6 +179,7 @@ function add_user_to_blog( $blog_id, $user_id, $role ) { */ do_action( 'add_user_to_blog', $user_id, $role, $blog_id ); wp_cache_delete( $user_id, 'users' ); + wp_cache_delete( $blog_id . '_user_count', 'blog-details' ); restore_current_blog(); return true; } @@ -220,10 +195,12 @@ function add_user_to_blog( $blog_id, $user_id, $role ) { * * @since MU 1.0 * - * @param int $user_id ID of the user you're removing. - * @param int $blog_id ID of the blog you're removing the user from. + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param int $user_id ID of the user you're removing. + * @param int $blog_id ID of the blog you're removing the user from. * @param string $reassign Optional. A user to whom to reassign posts. - * @return bool + * @return true|WP_Error */ function remove_user_from_blog($user_id, $blog_id = '', $reassign = '') { global $wpdb; @@ -294,40 +271,6 @@ function remove_user_from_blog($user_id, $blog_id = '', $reassign = '') { return true; } -/** - * Create an empty blog. - * - * @since MU 1.0 - * @uses install_blog() - * - * @param string $domain The new blog's domain. - * @param string $path The new blog's path. - * @param string $weblog_title The new blog's title. - * @param int $site_id Optional. Defaults to 1. - * @return int The ID of the newly created blog - */ -function create_empty_blog( $domain, $path, $weblog_title, $site_id = 1 ) { - if ( empty($path) ) - $path = '/'; - - // Check if the domain has been used already. We should return an error message. - if ( domain_exists($domain, $path, $site_id) ) - return __( '<strong>ERROR</strong>: Site URL already taken.' ); - - // Need to back up wpdb table names, and create a new wp_blogs entry for new blog. - // Need to get blog_id from wp_blogs, and create new table names. - // Must restore table names at the end of function. - - if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) - return __( '<strong>ERROR</strong>: problem creating site entry.' ); - - switch_to_blog($blog_id); - install_blog($blog_id); - restore_current_blog(); - - return $blog_id; -} - /** * Get the permalink for a post on another blog. * @@ -355,8 +298,10 @@ function get_blog_permalink( $blog_id, $post_id ) { * * @since MU 2.6.5 * + * @global wpdb $wpdb WordPress database abstraction object. + * * @param string $domain - * @param string $path Optional. Not required for subdomain installations. + * @param string $path Optional. Not required for subdomain installations. * @return int 0 if no blog found, otherwise the ID of the matching blog */ function get_blog_id_from_url( $domain, $path = '/' ) { @@ -440,26 +385,22 @@ function is_email_address_unsafe( $user_email ) { } /** - * Processes new user registrations. + * Sanitize and validate data required for a user sign-up. * - * Checks the data provided by the user during signup. Verifies - * the validity and uniqueness of user names and user email addresses, - * and checks email addresses against admin-provided domain - * whitelists and blacklists. + * Verifies the validity and uniqueness of user names and user email addresses, + * and checks email addresses against admin-provided domain whitelists and blacklists. * - * The hook 'wpmu_validate_user_signup' provides an easy way - * to modify the signup process. The value $result, which is passed - * to the hook, contains both the user-provided info and the error - * messages created by the function. 'wpmu_validate_user_signup' allows - * you to process the data in any way you'd like, and unset the - * relevant errors if necessary. + * The {@see 'wpmu_validate_user_signup'} hook provides an easy way to modify the sign-up + * process. The value $result, which is passed to the hook, contains both the user-provided + * info and the error messages created by the function. {@see 'wpmu_validate_user_signup'} + * allows you to process the data in any way you'd like, and unset the relevant errors if + * necessary. * * @since MU - * @uses is_email_address_unsafe() - * @uses username_exists() - * @uses email_exists() * - * @param string $user_name The login name provided by the user. + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string $user_name The login name provided by the user. * @param string $user_email The email provided by the user. * @return array Contains username, email, and error messages. */ @@ -472,7 +413,7 @@ function wpmu_validate_user_signup($user_name, $user_email) { $user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) ); if ( $user_name != $orig_username || preg_match( '/[^a-z0-9]/', $user_name ) ) { - $errors->add( 'user_name', __( 'Only lowercase letters (a-z) and numbers are allowed.' ) ); + $errors->add( 'user_name', __( 'Usernames can only contain lowercase letters (a-z) and numbers.' ) ); $user_name = $orig_username; } @@ -482,12 +423,20 @@ function wpmu_validate_user_signup($user_name, $user_email) { $errors->add('user_name', __( 'Please enter a username.' ) ); $illegal_names = get_site_option( 'illegal_names' ); - if ( is_array( $illegal_names ) == false ) { + if ( ! is_array( $illegal_names ) ) { $illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' ); add_site_option( 'illegal_names', $illegal_names ); } - if ( in_array( $user_name, $illegal_names ) == true ) - $errors->add('user_name', __( 'That username is not allowed.' ) ); + if ( in_array( $user_name, $illegal_names ) ) { + $errors->add( 'user_name', __( 'Sorry, that username is not allowed.' ) ); + } + + /** This filter is documented in wp-includes/user.php */ + $illegal_logins = (array) apply_filters( 'illegal_user_logins', array() ); + + if ( in_array( strtolower( $user_name ), array_map( 'strtolower', $illegal_logins ) ) ) { + $errors->add( 'user_name', __( 'Sorry, that username is not allowed.' ) ); + } if ( is_email_address_unsafe( $user_email ) ) $errors->add('user_email', __('You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.')); @@ -495,8 +444,9 @@ function wpmu_validate_user_signup($user_name, $user_email) { if ( strlen( $user_name ) < 4 ) $errors->add('user_name', __( 'Username must be at least 4 characters.' ) ); - if ( strpos( ' ' . $user_name, '_' ) != false ) - $errors->add( 'user_name', __( 'Sorry, usernames may not contain the character “_”!' ) ); + if ( strlen( $user_name ) > 60 ) { + $errors->add( 'user_name', __( 'Username may not be longer than 60 characters.' ) ); + } // all numeric? if ( preg_match( '/^[0-9]*$/', $user_name ) ) @@ -506,10 +456,11 @@ function wpmu_validate_user_signup($user_name, $user_email) { $errors->add('user_email', __( 'Please enter a valid email address.' ) ); $limited_email_domains = get_site_option( 'limited_email_domains' ); - if ( is_array( $limited_email_domains ) && empty( $limited_email_domains ) == false ) { + if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) { $emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) ); - if ( in_array( $emaildomain, $limited_email_domains ) == false ) + if ( ! in_array( $emaildomain, $limited_email_domains ) ) { $errors->add('user_email', __('Sorry, that email address is not allowed!')); + } } // Check if the username has been used already. @@ -580,11 +531,13 @@ function wpmu_validate_user_signup($user_name, $user_email) { * the way that WordPress validates new site signups. * * @since MU - * @uses domain_exists() - * @uses username_exists() * - * @param string $blogname The blog name provided by the user. Must be unique. - * @param string $blog_title The blog title provided by the user. + * @global wpdb $wpdb + * @global string $domain + * + * @param string $blogname The blog name provided by the user. Must be unique. + * @param string $blog_title The blog title provided by the user. + * @param WP_User|string $user Optional. The user object to check against the new site name. * @return array Contains the new site data and error messages. */ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) { @@ -594,7 +547,6 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) { $base = $current_site->path; $blog_title = strip_tags( $blog_title ); - $blog_title = substr( $blog_title, 0, 50 ); $errors = new WP_Error(); $illegal_names = get_site_option( 'illegal_names' ); @@ -608,34 +560,22 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) { * spring them from jail. */ if ( ! is_subdomain_install() ) { - $illegal_names = array_merge( - $illegal_names, - /** - * Filter reserved site names on a sub-directory Multisite install. - * - * @since 3.0.0 - * - * @param array $subdirectory_reserved_names Array of reserved names. - */ - apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed' ) ) - ); + $illegal_names = array_merge( $illegal_names, get_subdirectory_reserved_names() ); } if ( empty( $blogname ) ) $errors->add('blogname', __( 'Please enter a site name.' ) ); - if ( preg_match( '/[^a-z0-9]+/', $blogname ) ) - $errors->add('blogname', __( 'Only lowercase letters (a-z) and numbers are allowed.' ) ); + if ( preg_match( '/[^a-z0-9]+/', $blogname ) ) { + $errors->add( 'blogname', __( 'Site names can only contain lowercase letters (a-z) and numbers.' ) ); + } - if ( in_array( $blogname, $illegal_names ) == true ) + if ( in_array( $blogname, $illegal_names ) ) $errors->add('blogname', __( 'That name is not allowed.' ) ); if ( strlen( $blogname ) < 4 && !is_super_admin() ) $errors->add('blogname', __( 'Site name must be at least 4 characters.' ) ); - if ( strpos( $blogname, '_' ) !== false ) - $errors->add( 'blogname', __( 'Sorry, site names may not contain the character “_”!' ) ); - // do not allow users to create a blog that conflicts with a page on the main blog. if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_site->blog_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) ) $errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) ); @@ -673,7 +613,7 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) { $errors->add( 'blogname', __( 'Sorry, that site already exists!' ) ); if ( username_exists( $blogname ) ) { - if ( is_object( $user ) == false || ( is_object($user) && ( $user->user_login != $blogname ) ) ) + if ( ! is_object( $user ) || ( is_object($user) && ( $user->user_login != $blogname ) ) ) $errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) ); } @@ -698,12 +638,12 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) { * @param array $result { * Array of domain, path, blog name, blog title, user and error messages. * - * @type string $domain Domain for the site. - * @type string $path Path for the site. Used in subdirectory installs. - * @type string $blogname The unique site name (slug). - * @type string $blog_title Blog title. - * @type string $user User email address. - * @type WP_Error $errors WP_Error containing any errors found. + * @type string $domain Domain for the site. + * @type string $path Path for the site. Used in subdirectory installs. + * @type string $blogname The unique site name (slug). + * @type string $blog_title Blog title. + * @type string|WP_User $user By default, an empty string. A user object if provided. + * @type WP_Error $errors WP_Error containing any errors found. * } */ return apply_filters( 'wpmu_validate_blog_signup', $result ); @@ -713,14 +653,15 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) { * Record site signup information for future activation. * * @since MU - * @uses wpmu_signup_blog_notification() * - * @param string $domain The requested domain. - * @param string $path The requested path. - * @param string $title The requested site title. - * @param string $user The user's requested login name. + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string $domain The requested domain. + * @param string $path The requested path. + * @param string $title The requested site title. + * @param string $user The user's requested login name. * @param string $user_email The user's email address. - * @param array $meta By default, contains the requested privacy setting and lang_id. + * @param array $meta By default, contains the requested privacy setting and lang_id. */ function wpmu_signup_blog( $domain, $path, $title, $user, $user_email, $meta = array() ) { global $wpdb; @@ -739,7 +680,20 @@ function wpmu_signup_blog( $domain, $path, $title, $user, $user_email, $meta = a 'meta' => $meta ) ); - wpmu_signup_blog_notification($domain, $path, $title, $user, $user_email, $key, $meta); + /** + * Fires after site signup information has been written to the database. + * + * @since 4.4.0 + * + * @param string $domain The requested domain. + * @param string $path The requested path. + * @param string $title The requested site title. + * @param string $user The user's requested login name. + * @param string $user_email The user's email address. + * @param string $key The user's activation key + * @param array $meta By default, contains the requested privacy setting and lang_id. + */ + do_action( 'after_signup_site', $domain, $path, $title, $user, $user_email, $key, $meta ); } /** @@ -749,11 +703,12 @@ function wpmu_signup_blog( $domain, $path, $title, $user, $user_email, $meta = a * new site registration is not. * * @since MU - * @uses wpmu_signup_user_notification() * - * @param string $user The user's requested login name. + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string $user The user's requested login name. * @param string $user_email The user's email address. - * @param array $meta By default, this is an empty array. + * @param array $meta By default, this is an empty array. */ function wpmu_signup_user( $user, $user_email, $meta = array() ) { global $wpdb; @@ -775,7 +730,17 @@ function wpmu_signup_user( $user, $user_email, $meta = array() ) { 'meta' => $meta ) ); - wpmu_signup_user_notification($user, $user_email, $key, $meta); + /** + * Fires after a user's signup information has been written to the database. + * + * @since 4.4.0 + * + * @param string $user The user's requested login name. + * @param string $user_email The user's email address. + * @param string $key The user's activation key + * @param array $meta Additional signup meta. By default, this is an empty array. + */ + do_action( 'after_signup_user', $user, $user_email, $key, $meta ); } /** @@ -793,13 +758,13 @@ function wpmu_signup_user( $user, $user_email, $meta = array() ) { * * @since MU * - * @param string $domain The new blog domain. - * @param string $path The new blog path. - * @param string $title The site title. - * @param string $user The user's login name. + * @param string $domain The new blog domain. + * @param string $path The new blog path. + * @param string $title The site title. + * @param string $user The user's login name. * @param string $user_email The user's email address. - * @param string $key The activation key created in wpmu_signup_blog() - * @param array $meta By default, contains the requested privacy setting and lang_id. + * @param string $key The activation key created in wpmu_signup_blog() + * @param array $meta By default, contains the requested privacy setting and lang_id. * @return bool */ function wpmu_signup_blog_notification( $domain, $path, $title, $user, $user_email, $key, $meta = array() ) { @@ -899,10 +864,10 @@ function wpmu_signup_blog_notification( $domain, $path, $title, $user, $user_ema * * @since MU * - * @param string $user The user's login name. + * @param string $user The user's login name. * @param string $user_email The user's email address. - * @param string $key The activation key created in wpmu_signup_user() - * @param array $meta By default, an empty array. + * @param string $key The activation key created in wpmu_signup_user() + * @param array $meta By default, an empty array. * @return bool */ function wpmu_signup_user_notification( $user, $user_email, $key, $meta = array() ) { @@ -978,15 +943,11 @@ function wpmu_signup_user_notification( $user, $user_email, $key, $meta = array( * by a Super Admin). * * @since MU - * @uses wp_generate_password() - * @uses wpmu_welcome_user_notification() - * @uses add_user_to_blog() - * @uses wpmu_create_user() - * @uses wpmu_create_blog() - * @uses wpmu_welcome_notification() + * + * @global wpdb $wpdb WordPress database abstraction object. * * @param string $key The activation key provided to the user. - * @return array An array containing information about the activated user and/or blog + * @return array|WP_Error An array containing information about the activated user and/or blog */ function wpmu_activate_signup($key) { global $wpdb; @@ -1024,7 +985,6 @@ function wpmu_activate_signup($key) { if ( isset( $user_already_exists ) ) return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup); - wpmu_welcome_user_notification( $user_id, $password, $meta ); /** * Fires immediately after a new user is activated. * @@ -1052,7 +1012,6 @@ function wpmu_activate_signup($key) { } $wpdb->update( $wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key) ); - wpmu_welcome_notification($blog_id, $user_id, $password, $signup->title, $meta); /** * Fires immediately after a site is activated. * @@ -1078,12 +1037,11 @@ function wpmu_activate_signup($key) { * use 'user_register'). * * @since MU - * @uses wp_create_user() * * @param string $user_name The new user's login name. - * @param string $password The new user's password. - * @param string $email The new user's email address. - * @return mixed Returns false on failure, or int $user_id on success + * @param string $password The new user's password. + * @param string $email The new user's email address. + * @return int|false Returns false on failure, or int $user_id on success */ function wpmu_create_user( $user_name, $password, $email ) { $user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) ); @@ -1121,18 +1079,14 @@ function wpmu_create_user( $user_name, $password, $email ) { * root domain (eg 'blog1.example.com'), and $path is '/'. * * @since MU - * @uses domain_exists() - * @uses insert_blog() - * @uses wp_install_defaults() - * @uses add_user_to_blog() - * - * @param string $domain The new site's domain. - * @param string $path The new site's path. - * @param string $title The new site's title. - * @param int $user_id The user ID of the new site's admin. - * @param array $meta Optional. Used to set initial site options. - * @param int $site_id Optional. Only relevant on multi-network installs. - * @return mixed Returns WP_Error object on failure, int $blog_id on success + * + * @param string $domain The new site's domain. + * @param string $path The new site's path. + * @param string $title The new site's title. + * @param int $user_id The user ID of the new site's admin. + * @param array $meta Optional. Used to set initial site options. + * @param int $site_id Optional. Only relevant on multi-network installs. + * @return int|WP_Error Returns WP_Error object on failure, int $blog_id on success */ function wpmu_create_blog( $domain, $path, $title, $user_id, $meta = array(), $site_id = 1 ) { $defaults = array( 'public' => 0 ); @@ -1153,8 +1107,9 @@ function wpmu_create_blog( $domain, $path, $title, $user_id, $meta = array(), $s if ( domain_exists($domain, $path, $site_id) ) return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) ); - if ( !defined('WP_INSTALLING') ) - define( 'WP_INSTALLING', true ); + if ( ! wp_installing() ) { + wp_installing( true ); + } if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) return new WP_Error('insert_blog', __('Could not create site.')); @@ -1204,7 +1159,8 @@ function wpmu_create_blog( $domain, $path, $title, $user_id, $meta = array(), $s * * @since MU * - * @param int $blog_id The new site's ID. + * @param int $blog_id The new site's ID. + * @param string $deprecated Not used. * @return bool */ function newblog_notify_siteadmin( $blog_id, $deprecated = '' ) { @@ -1248,7 +1204,6 @@ Disable these notifications: %4$s' ), $blogname, $siteurl, wp_unslash( $_SERVER[ * the notification email. * * @since MU - * @uses apply_filters() Filter newuser_notify_siteadmin to change the content of the email message * * @param int $user_id The new user's ID. * @return bool @@ -1292,9 +1247,11 @@ Disable these notifications: %3$s'), $user->user_login, wp_unslash( $_SERVER['RE * * @since MU * - * @param string $domain The domain to be checked. - * @param string $path The path to be checked. - * @param int $site_id Optional. Relevant only on multi-network installs. + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string $domain The domain to be checked. + * @param string $path The path to be checked. + * @param int $site_id Optional. Relevant only on multi-network installs. * @return int */ function domain_exists($domain, $path, $site_id = 1) { @@ -1323,10 +1280,12 @@ function domain_exists($domain, $path, $site_id = 1) { * * @since MU * - * @param string $domain The domain of the new site. - * @param string $path The path of the new site. - * @param int $site_id Unless you're running a multi-network install, be sure to set this value to 1. - * @return int The ID of the new row + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string $domain The domain of the new site. + * @param string $path The path of the new site. + * @param int $site_id Unless you're running a multi-network install, be sure to set this value to 1. + * @return int|false The ID of the new row */ function insert_blog($domain, $path, $site_id) { global $wpdb; @@ -1354,14 +1313,15 @@ function insert_blog($domain, $path, $site_id) { * points to the new blog. * * @since MU - * @uses make_db_current_silent() - * @uses populate_roles() * - * @param int $blog_id The value returned by insert_blog(). + * @global wpdb $wpdb + * @global WP_Roles $wp_roles + * + * @param int $blog_id The value returned by insert_blog(). * @param string $blog_title The title of the new site. */ function install_blog( $blog_id, $blog_title = '' ) { - global $wpdb, $wp_roles; + global $wpdb, $wp_roles, $current_site; // Cast for security $blog_id = (int) $blog_id; @@ -1379,12 +1339,25 @@ function install_blog( $blog_id, $blog_title = '' ) { make_db_current_silent( 'blog' ); populate_options(); populate_roles(); - $wp_roles->_init(); - $url = untrailingslashit( $url ); + // populate_roles() clears previous role definitions so we start over. + $wp_roles = new WP_Roles(); + + $siteurl = $home = untrailingslashit( $url ); + + if ( ! is_subdomain_install() ) { + + if ( 'https' === parse_url( get_site_option( 'siteurl' ), PHP_URL_SCHEME ) ) { + $siteurl = set_url_scheme( $siteurl, 'https' ); + } + if ( 'https' === parse_url( get_home_url( $current_site->blog_id ), PHP_URL_SCHEME ) ) { + $home = set_url_scheme( $home, 'https' ); + } - update_option( 'siteurl', $url ); - update_option( 'home', $url ); + } + + update_option( 'siteurl', $siteurl ); + update_option( 'home', $home ); if ( get_site_option( 'ms_files_rewriting' ) ) update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" ); @@ -1408,7 +1381,8 @@ function install_blog( $blog_id, $blog_title = '' ) { * @since MU * @deprecated MU * @deprecated Use wp_install_defaults() - * @uses wp_install_defaults() + * + * @global wpdb $wpdb WordPress database abstraction object. * * @param int $blog_id Ignored in this function. * @param int $user_id @@ -1435,11 +1409,11 @@ function install_blog_defaults($blog_id, $user_id) { * * @since MU * - * @param int $blog_id - * @param int $user_id + * @param int $blog_id + * @param int $user_id * @param string $password - * @param string $title The new blog's title - * @param array $meta Optional. Not used in the default function, but is passed along to hooks for customization. + * @param string $title The new blog's title + * @param array $meta Optional. Not used in the default function, but is passed along to hooks for customization. * @return bool */ function wpmu_welcome_notification( $blog_id, $user_id, $password, $title, $meta = array() ) { @@ -1462,13 +1436,15 @@ function wpmu_welcome_notification( $blog_id, $user_id, $password, $title, $meta return false; $welcome_email = get_site_option( 'welcome_email' ); - if ( $welcome_email == false ) - $welcome_email = __( 'Dear User, + if ( $welcome_email == false ) { + /* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */ + $welcome_email = __( 'Howdy USERNAME, Your new SITE_NAME site has been successfully set up at: BLOG_URL You can log in to the administrator account with the following information: + Username: USERNAME Password: PASSWORD Log in here: BLOG_URLwp-login.php @@ -1476,6 +1452,7 @@ Log in here: BLOG_URLwp-login.php We hope you enjoy your new site. Thanks! --The Team @ SITE_NAME' ); + } $url = get_blogaddress_by_id($blog_id); $user = get_userdata( $user_id ); @@ -1535,9 +1512,9 @@ We hope you enjoy your new site. Thanks! * * @since MU * - * @param int $user_id + * @param int $user_id * @param string $password - * @param array $meta Optional. Not used in the default function, but is passed along to hooks for customization. + * @param array $meta Optional. Not used in the default function, but is passed along to hooks for customization. * @return bool */ function wpmu_welcome_user_notification( $user_id, $password, $meta = array() ) { @@ -1562,13 +1539,13 @@ function wpmu_welcome_user_notification( $user_id, $password, $meta = array() ) $user = get_userdata( $user_id ); /** - * Filter the content of the welcome email after user activation. + * Filters the content of the welcome email after user activation. * * Content should be formatted for transmission via wp_mail(). * * @since MU * - * @param type $welcome_email The message body of the account activation success email. + * @param string $welcome_email The message body of the account activation success email. * @param int $user_id User ID. * @param string $password User password. * @param array $meta Signup meta data. @@ -1604,16 +1581,18 @@ function wpmu_welcome_user_notification( $user_id, $password, $meta = array() ) } /** - * Get the current site info. + * Get the current network. * * Returns an object containing the 'id', 'domain', 'path', and 'site_name' - * properties of the site being viewed. + * properties of the network being viewed. * * @see wpmu_current_site() * * @since MU * - * @return object + * @global WP_Network $current_site + * + * @return WP_Network */ function get_current_site() { global $current_site; @@ -1627,7 +1606,8 @@ function get_current_site() { * the most recent post_date_gmt. * * @since MU - * @uses get_blogs_of_user() + * + * @global wpdb $wpdb WordPress database abstraction object. * * @param int $user_id * @return array Contains the blog_id, post_id, post_date_gmt, and post_gmt_ts @@ -1674,20 +1654,25 @@ function get_most_recent_post_of_user( $user_id ) { * a blog has exceeded its allowed upload space. * * @since MU - * @uses recurse_dirsize() * - * @param string $directory - * @return int + * @param string $directory Full path of a directory. + * @return int Size of the directory in MB. */ function get_dirsize( $directory ) { $dirsize = get_transient( 'dirsize_cache' ); if ( is_array( $dirsize ) && isset( $dirsize[ $directory ][ 'size' ] ) ) return $dirsize[ $directory ][ 'size' ]; - if ( false == is_array( $dirsize ) ) + if ( ! is_array( $dirsize ) ) $dirsize = array(); - $dirsize[ $directory ][ 'size' ] = recurse_dirsize( $directory ); + // Exclude individual site directories from the total when checking the main site, + // as they are subdirectories and should not be counted. + if ( is_main_site() ) { + $dirsize[ $directory ][ 'size' ] = recurse_dirsize( $directory, $directory . '/sites' ); + } else { + $dirsize[ $directory ][ 'size' ] = recurse_dirsize( $directory ); + } set_transient( 'dirsize_cache', $dirsize, HOUR_IN_SECONDS ); return $dirsize[ $directory ][ 'size' ]; @@ -1700,17 +1685,20 @@ function get_dirsize( $directory ) { * other directories. * * @since MU + * @since 4.3.0 $exclude parameter added. * - * @param string $directory - * @return int + * @param string $directory Full path of a directory. + * @param string $exclude Optional. Full path of a subdirectory to exclude from the total. + * @return int|false Size in MB if a valid directory. False if not. */ -function recurse_dirsize( $directory ) { +function recurse_dirsize( $directory, $exclude = null ) { $size = 0; $directory = untrailingslashit( $directory ); - if ( !file_exists($directory) || !is_dir( $directory ) || !is_readable( $directory ) ) + if ( ! file_exists( $directory ) || ! is_dir( $directory ) || ! is_readable( $directory ) || $directory === $exclude ) { return false; + } if ($handle = opendir($directory)) { while(($file = readdir($handle)) !== false) { @@ -1719,7 +1707,7 @@ function recurse_dirsize( $directory ) { if (is_file($path)) { $size += filesize($path); } elseif (is_dir($path)) { - $handlesize = recurse_dirsize($path); + $handlesize = recurse_dirsize( $path, $exclude ); if ($handlesize > 0) $size += $handlesize; } @@ -1745,7 +1733,8 @@ function recurse_dirsize( $directory ) { * @return array */ function check_upload_mimes( $mimes ) { - $site_exts = explode( ' ', get_site_option( 'upload_filetypes' ) ); + $site_exts = explode( ' ', get_site_option( 'upload_filetypes', 'jpg jpeg png gif' ) ); + $site_mimes = array(); foreach ( $site_exts as $ext ) { foreach ( $mimes as $ext_pattern => $mime ) { if ( $ext != '' && strpos( $ext_pattern, $ext ) !== false ) @@ -1761,9 +1750,13 @@ function check_upload_mimes( $mimes ) { * WordPress MS stores a blog's post count as an option so as * to avoid extraneous COUNTs when a blog's details are fetched * with get_blog_details(). This function is called when posts - * are published to make sure the count stays current. + * are published or unpublished to make sure the count stays current. * * @since MU + * + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string $deprecated Not used. */ function update_posts_count( $deprecated = '' ) { global $wpdb; @@ -1775,6 +1768,8 @@ function update_posts_count( $deprecated = '' ) { * * @since MU * + * @global wpdb $wpdb WordPress database abstraction object. + * * @param int $blog_id * @param int $user_id */ @@ -1792,7 +1787,11 @@ function wpmu_log_new_registrations( $blog_id, $user_id ) { * * @see term_id_filter * - * @param int $term_id An ID for a term on the current blog. + * @global wpdb $wpdb WordPress database abstraction object. + * @staticvar int $global_terms_recurse + * + * @param int $term_id An ID for a term on the current blog. + * @param string $deprecated Not used. * @return int An ID from the global terms table mapped from $term_id. */ function global_terms( $term_id, $deprecated = '' ) { @@ -1830,11 +1829,13 @@ function global_terms( $term_id, $deprecated = '' ) { $global_id = $wpdb->insert_id; } } elseif ( $global_id != $term_id ) { - $local_id = $wpdb->get_row( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms WHERE term_id = %d", $global_id ) ); - if ( null != $local_id ) - $local_id = global_terms( $local_id ); - if ( 10 < $global_terms_recurse ) + $local_id = $wpdb->get_var( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms WHERE term_id = %d", $global_id ) ); + if ( null != $local_id ) { + global_terms( $local_id ); + if ( 10 < $global_terms_recurse ) { $global_id = $term_id; + } + } } if ( $global_id != $term_id ) { @@ -1847,7 +1848,7 @@ function global_terms( $term_id, $deprecated = '' ) { clean_term_cache($term_id); } - if( $recurse_start ) + if ( $recurse_start ) $global_terms_recurse = null; return $global_id; @@ -1859,6 +1860,7 @@ function global_terms( $term_id, $deprecated = '' ) { * @see wp_validate_redirect() * @since MU * + * @param array|string $deprecated Not used. * @return array The current site's domain */ function redirect_this_site( $deprecated = '' ) { @@ -1870,15 +1872,18 @@ function redirect_this_site( $deprecated = '' ) { * * @since MU * + * @blessed + * * @param array $upload - * @return mixed If the upload is under the size limit, $upload is returned. Otherwise returns an error message. + * @return string|array If the upload is under the size limit, $upload is returned. Otherwise returns an error message. */ function upload_is_file_too_big( $upload ) { - if ( is_array( $upload ) == false || defined( 'WP_IMPORTING' ) || get_site_option( 'upload_space_check_disabled' ) ) + if ( ! is_array( $upload ) || defined( 'WP_IMPORTING' ) || get_site_option( 'upload_space_check_disabled' ) ) return $upload; - if ( strlen( $upload['bits'] ) > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) ) - return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 )); + if ( strlen( $upload['bits'] ) > ( KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 ) ) ) { + return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 ) ); + } return $upload; } @@ -1887,7 +1892,6 @@ function upload_is_file_too_big( $upload ) { * Add a nonce field to the signup page. * * @since MU - * @uses wp_nonce_field() */ function signup_nonce_fields() { $id = mt_rand(); @@ -1899,7 +1903,6 @@ function signup_nonce_fields() { * Process the signup nonce created in signup_nonce_fields(). * * @since MU - * @uses wp_create_nonce() * * @param array $result * @return array @@ -1945,11 +1948,10 @@ function maybe_redirect_404() { * added, as when a user is invited through the regular WP Add User interface. * * @since MU - * @uses add_existing_user_to_blog() */ function maybe_add_existing_user_to_blog() { if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) ) - return false; + return; $parts = explode( '/', $_SERVER[ 'REQUEST_URI' ] ); $key = array_pop( $parts ); @@ -1964,16 +1966,18 @@ function maybe_add_existing_user_to_blog() { if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) ) wp_die( sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url() ) ); - wp_die( sprintf( __( 'You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">log in</a> using your username and password.' ), home_url(), admin_url() ), __( 'WordPress &rsaquo; Success' ) ); + wp_die( sprintf( __( 'You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">log in</a> using your username and password.' ), home_url(), admin_url() ), __( 'WordPress &rsaquo; Success' ), array( 'response' => 200 ) ); } /** * Add a user to a blog based on details from maybe_add_existing_user_to_blog(). * * @since MU - * @uses add_user_to_blog() + * + * @global int $blog_id * * @param array $details + * @return true|WP_Error|void */ function add_existing_user_to_blog( $details = false ) { global $blog_id; @@ -1989,8 +1993,8 @@ function add_existing_user_to_blog( $details = false ) { * @param mixed $result True on success or a WP_Error object if the user doesn't exist. */ do_action( 'added_existing_user', $details['user_id'], $result ); + return $result; } - return $result; } /** @@ -2002,7 +2006,7 @@ function add_existing_user_to_blog( $details = false ) { * @since MU * @see add_user_to_blog() * - * @param int $user_id + * @param int $user_id * @param mixed $password Ignored. * @param array $meta */ @@ -2020,6 +2024,8 @@ function add_new_user_to_blog( $user_id, $password, $meta ) { * Correct From host on outgoing mail to match the site domain * * @since MU + * + * @param PHPMailer $phpmailer The PHPMailer instance, passed by reference. */ function fix_phpmailer_messageid( $phpmailer ) { $phpmailer->Hostname = get_current_site()->domain; @@ -2029,18 +2035,18 @@ function fix_phpmailer_messageid( $phpmailer ) { * Check to see whether a user is marked as a spammer, based on user login. * * @since MU - * @uses get_user_by() * * @param string|WP_User $user Optional. Defaults to current user. WP_User object, - * or user login name as a string. + * or user login name as a string. * @return bool */ function is_user_spammy( $user = null ) { - if ( ! is_a( $user, 'WP_User' ) ) { - if ( $user ) + if ( ! ( $user instanceof WP_User ) ) { + if ( $user ) { $user = get_user_by( 'login', $user ); - else + } else { $user = wp_get_current_user(); + } } return $user && isset( $user->spam ) && 1 == $user->spam; @@ -2052,43 +2058,36 @@ function is_user_spammy( $user = null ) { * Public blogs have a setting of 1, private blogs are 0. * * @since MU - * @uses update_blog_status() * * @param int $old_value - * @param int $value The new public value - * @return bool + * @param int $value The new public value */ function update_blog_public( $old_value, $value ) { update_blog_status( get_current_blog_id(), 'public', (int) $value ); } -add_action('update_option_blog_public', 'update_blog_public', 10, 2); /** * Check whether a usermeta key has to do with the current blog. * * @since MU - * @uses wp_get_current_user() + * + * @global wpdb $wpdb WordPress database abstraction object. * * @param string $key - * @param int $user_id Optional. Defaults to current user. - * @param int $blog_id Optional. Defaults to current blog. + * @param int $user_id Optional. Defaults to current user. + * @param int $blog_id Optional. Defaults to current blog. * @return bool */ function is_user_option_local( $key, $user_id = 0, $blog_id = 0 ) { global $wpdb; $current_user = wp_get_current_user(); - if ( $user_id == 0 ) - $user_id = $current_user->ID; - if ( $blog_id == 0 ) + if ( $blog_id == 0 ) { $blog_id = $wpdb->blogid; - + } $local_key = $wpdb->get_blog_prefix( $blog_id ) . $key; - if ( isset( $current_user->$local_key ) ) - return true; - - return false; + return isset( $current_user->$local_key ); } /** @@ -2100,12 +2099,8 @@ function is_user_option_local( $key, $user_id = 0, $blog_id = 0 ) { */ function users_can_register_signup_filter() { $registration = get_site_option('registration'); - if ( $registration == 'all' || $registration == 'user' ) - return true; - - return false; + return ( $registration == 'all' || $registration == 'user' ); } -add_filter('option_users_can_register', 'users_can_register_signup_filter'); /** * Ensure that the welcome message is not empty. Currently unused. @@ -2118,7 +2113,9 @@ add_filter('option_users_can_register', 'users_can_register_signup_filter'); function welcome_user_msg_filter( $text ) { if ( !$text ) { remove_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' ); - $text = __( 'Dear User, + + /* translators: Do not translate USERNAME, PASSWORD, LOGINLINK, SITE_NAME: those are placeholders. */ + $text = __( 'Howdy USERNAME, Your new account is set up. @@ -2134,18 +2131,19 @@ Thanks! } return $text; } -add_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' ); /** * Whether to force SSL on content. * * @since 2.8.5 * - * @param string|bool $force + * @staticvar bool $forced_content + * + * @param bool $force * @return bool True if forced, false if not forced. */ function force_ssl_content( $force = '' ) { - static $forced_content; + static $forced_content = false; if ( '' != $force ) { $old_forced = $forced_content; @@ -2163,7 +2161,7 @@ function force_ssl_content( $force = '' ) { * * @since 2.8.5 * - * @param string URL + * @param string $url URL * @return string URL with https as the scheme */ function filter_SSL( $url ) { @@ -2185,7 +2183,7 @@ function wp_schedule_update_network_counts() { if ( !is_main_site() ) return; - if ( !wp_next_scheduled('update_network_counts') && !defined('WP_INSTALLING') ) + if ( ! wp_next_scheduled('update_network_counts') && ! wp_installing() ) wp_schedule_event(time(), 'twicedaily', 'update_network_counts'); } @@ -2206,8 +2204,6 @@ function wp_update_network_counts() { * on a network when a site is created or its status is updated. * * @since 3.7.0 - * - * @uses wp_update_network_site_counts() */ function wp_maybe_update_network_site_counts() { $is_small_network = ! wp_is_large_network( 'sites' ); @@ -2235,8 +2231,6 @@ function wp_maybe_update_network_site_counts() { * on a network when a user is created or its status is updated. * * @since 3.7.0 - * - * @uses wp_update_network_user_counts() */ function wp_maybe_update_network_user_counts() { $is_small_network = ! wp_is_large_network( 'users' ); @@ -2252,6 +2246,8 @@ function wp_maybe_update_network_user_counts() { * Update the network-wide site count. * * @since 3.7.0 + * + * @global wpdb $wpdb WordPress database abstraction object. */ function wp_update_network_site_counts() { global $wpdb; @@ -2264,6 +2260,8 @@ function wp_update_network_site_counts() { * Update the network-wide user count. * * @since 3.7.0 + * + * @global wpdb $wpdb WordPress database abstraction object. */ function wp_update_network_user_counts() { global $wpdb; @@ -2290,7 +2288,7 @@ function get_space_used() { $space_used = apply_filters( 'pre_get_space_used', false ); if ( false === $space_used ) { $upload_dir = wp_upload_dir(); - $space_used = get_dirsize( $upload_dir['basedir'] ) / 1024 / 1024; + $space_used = get_dirsize( $upload_dir['basedir'] ) / MB_IN_BYTES; } return $space_used; @@ -2309,7 +2307,7 @@ function get_space_allowed() { if ( ! is_numeric( $space_allowed ) ) $space_allowed = get_site_option( 'blog_upload_space' ); - if ( empty( $space_allowed ) || ! is_numeric( $space_allowed ) ) + if ( ! is_numeric( $space_allowed ) ) $space_allowed = 100; /** @@ -2330,11 +2328,15 @@ function get_space_allowed() { * @return int of upload space available in bytes */ function get_upload_space_available() { - $space_allowed = get_space_allowed() * 1024 * 1024; + $allowed = get_space_allowed(); + if ( $allowed < 0 ) { + $allowed = 0; + } + $space_allowed = $allowed * MB_IN_BYTES; if ( get_site_option( 'upload_space_check_disabled' ) ) return $space_allowed; - $space_used = get_space_used() * 1024 * 1024; + $space_used = get_space_used() * MB_IN_BYTES; if ( ( $space_allowed - $space_used ) <= 0 ) return 0; @@ -2356,12 +2358,15 @@ function is_upload_space_available() { } /** + * Filters the maximum upload file size allowed, in bytes. + * * @since 3.0.0 * - * @return int of upload size limit in bytes + * @param int $size Upload size limit in bytes. + * @return int Upload size limit in bytes. */ function upload_size_limit_filter( $size ) { - $fileupload_maxk = 1024 * get_site_option( 'fileupload_maxk', 1500 ); + $fileupload_maxk = KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 ); if ( get_site_option( 'upload_space_check_disabled' ) ) return min( $size, $fileupload_maxk ); @@ -2404,6 +2409,8 @@ function wp_is_large_network( $using = 'sites' ) { * * @since 3.7.0 * + * @global wpdb $wpdb WordPress database abstraction object. + * * @param array $args { * Array of default arguments. Optional. * @@ -2474,3 +2481,28 @@ function wp_get_sites( $args = array() ) { return $site_results; } + +/** + * Retrieves a list of reserved site on a sub-directory Multisite install. + * + * @since 4.4.0 + * + * @return array $names Array of reserved subdirectory names. + */ +function get_subdirectory_reserved_names() { + $names = array( + 'page', 'comments', 'blog', 'files', 'feed', 'wp-admin', + 'wp-content', 'wp-includes', 'wp-json', 'embed' + ); + + /** + * Filter reserved site names on a sub-directory Multisite install. + * + * @since 3.0.0 + * @since 4.4.0 'wp-admin', 'wp-content', 'wp-includes', 'wp-json', and 'embed' were added + * to the reserved names list. + * + * @param array $subdirectory_reserved_names Array of reserved names. + */ + return apply_filters( 'subdirectory_reserved_names', $names ); +} diff --git a/wp-includes/ms-load.php b/wp-includes/ms-load.php index 66047bc..a192315 100644 --- a/wp-includes/ms-load.php +++ b/wp-includes/ms-load.php @@ -19,22 +19,19 @@ function is_subdomain_install() { if ( defined('SUBDOMAIN_INSTALL') ) return SUBDOMAIN_INSTALL; - if ( defined('VHOST') && VHOST == 'yes' ) - return true; - - return false; + return ( defined( 'VHOST' ) && VHOST == 'yes' ); } /** * Returns array of network plugin files to be included in global scope. * * The default directory is wp-content/plugins. To change the default directory - * manually, define <code>WP_PLUGIN_DIR</code> and <code>WP_PLUGIN_URL</code> - * in wp-config.php. + * manually, define `WP_PLUGIN_DIR` and `WP_PLUGIN_URL` in `wp-config.php`. * * @access private * @since 3.1.0 - * @return array Files to include + * + * @return array Files to include. */ function wp_get_active_network_plugins() { $active_plugins = (array) get_site_option( 'active_sitewide_plugins', array() ); @@ -68,7 +65,7 @@ function wp_get_active_network_plugins() { * * @since 3.0.0 * - * @return bool|string Returns true on success, or drop-in file to include. + * @return true|string Returns true on success, or drop-in file to include. */ function ms_site_check() { $blog = get_blog_details(); @@ -92,14 +89,21 @@ function ms_site_check() { if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) ) return WP_CONTENT_DIR . '/blog-deleted.php'; else - wp_die( __( 'This user has elected to delete their account and the content is no longer available.' ), '', array( 'response' => 410 ) ); + wp_die( __( 'This site is no longer available.' ), '', array( 'response' => 410 ) ); } if ( '2' == $blog->deleted ) { - if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) ) + if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) ) { return WP_CONTENT_DIR . '/blog-inactive.php'; - else - wp_die( sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact <a href="mailto:%1$s">%1$s</a>.' ), str_replace( '@', ' AT ', get_site_option( 'admin_email', 'support@' . get_current_site()->domain ) ) ) ); + } else { + $admin_email = str_replace( '@', ' AT ', get_site_option( 'admin_email', 'support@' . get_current_site()->domain ) ); + wp_die( + /* translators: %s: admin email link */ + sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact %s.' ), + sprintf( '<a href="mailto:%s">%s</a>', $admin_email ) + ) + ); + } } if ( $blog->archived == '1' || $blog->spam == '1' ) { @@ -113,164 +117,34 @@ function ms_site_check() { } /** - * Retrieve a network object by its domain and path. + * Retrieve the closest matching network for a domain and path. * * @since 3.9.0 + * @since 4.4.0 Converted to a wrapper for WP_Network::get_by_path() * * @param string $domain Domain to check. * @param string $path Path to check. * @param int|null $segments Path segments to use. Defaults to null, or the full path. - * @return object|bool Network object if successful. False when no network is found. + * @return WP_Network|false Network object if successful. False when no network is found. */ function get_network_by_path( $domain, $path, $segments = null ) { - global $wpdb; - - $domains = $exact_domains = array( $domain ); - $pieces = explode( '.', $domain ); - - /* - * It's possible one domain to search is 'com', but it might as well - * be 'localhost' or some other locally mapped domain. - */ - while ( array_shift( $pieces ) ) { - if ( $pieces ) { - $domains[] = implode( '.', $pieces ); - } - } - - /* - * If we've gotten to this function during normal execution, there is - * more than one network installed. At this point, who knows how many - * we have. Attempt to optimize for the situation where networks are - * only domains, thus meaning paths never need to be considered. - * - * This is a very basic optimization; anything further could have drawbacks - * depending on the setup, so this is best done per-install. - */ - $using_paths = true; - if ( wp_using_ext_object_cache() ) { - $using_paths = wp_cache_get( 'networks_have_paths', 'site-options' ); - if ( false === $using_paths ) { - $using_paths = (bool) $wpdb->get_var( "SELECT id FROM $wpdb->site WHERE path <> '/' LIMIT 1" ); - wp_cache_add( 'networks_have_paths', (int) $using_paths, 'site-options' ); - } - } - - $paths = array(); - if ( $using_paths ) { - $path_segments = array_filter( explode( '/', trim( $path, "/" ) ) ); - - /** - * Filter the number of path segments to consider when searching for a site. - * - * @since 3.9.0 - * - * @param int|null $segments The number of path segments to consider. WordPress by default looks at - * one path segment. The function default of null only makes sense when you - * know the requested path should match a network. - * @param string $domain The requested domain. - * @param string $path The requested path, in full. - */ - $segments = apply_filters( 'network_by_path_segments_count', $segments, $domain, $path ); - - if ( null !== $segments && count($path_segments ) > $segments ) { - $path_segments = array_slice( $path_segments, 0, $segments ); - } - - while ( count( $path_segments ) ) { - $paths[] = '/' . implode( '/', $path_segments ) . '/'; - array_pop( $path_segments ); - } - - $paths[] = '/'; - } - - /** - * Determine a network by its domain and path. - * - * This allows one to short-circuit the default logic, perhaps by - * replacing it with a routine that is more optimal for your setup. - * - * Return null to avoid the short-circuit. Return false if no network - * can be found at the requested domain and path. Otherwise, return - * an object from wp_get_network(). - * - * @since 3.9.0 - * - * @param null|bool|object $network Network value to return by path. - * @param string $domain The requested domain. - * @param string $path The requested path, in full. - * @param int|null $segments The suggested number of paths to consult. - * Default null, meaning the entire path was to be consulted. - * @param array $paths The paths to search for, based on $path and $segments. - */ - $pre = apply_filters( 'pre_get_network_by_path', null, $domain, $path, $segments, $paths ); - if ( null !== $pre ) { - return $pre; - } - - // @todo Consider additional optimization routes, perhaps as an opt-in for plugins. - // We already have paths covered. What about how far domains should be drilled down (including www)? - - $search_domains = "'" . implode( "', '", $wpdb->_escape( $domains ) ) . "'"; - - if ( ! $using_paths ) { - $network = $wpdb->get_row( "SELECT id, domain, path FROM $wpdb->site - WHERE domain IN ($search_domains) ORDER BY CHAR_LENGTH(domain) DESC LIMIT 1" ); - if ( $network ) { - return wp_get_network( $network ); - } - return false; - - } else { - $search_paths = "'" . implode( "', '", $wpdb->_escape( $paths ) ) . "'"; - $networks = $wpdb->get_results( "SELECT id, domain, path FROM $wpdb->site - WHERE domain IN ($search_domains) AND path IN ($search_paths) - ORDER BY CHAR_LENGTH(domain) DESC, CHAR_LENGTH(path) DESC" ); - } - - /* - * Domains are sorted by length of domain, then by length of path. - * The domain must match for the path to be considered. Otherwise, - * a network with the path of / will suffice. - */ - $found = false; - foreach ( $networks as $network ) { - if ( $network->domain === $domain || "www.$network->domain" === $domain ) { - if ( in_array( $network->path, $paths, true ) ) { - $found = true; - break; - } - } - if ( $network->path === '/' ) { - $found = true; - break; - } - } - - if ( $found ) { - return wp_get_network( $network ); - } - - return false; + return WP_Network::get_by_path( $domain, $path, $segments ); } /** * Retrieve an object containing information about the requested network. * * @since 3.9.0 + * @since 4.4.0 Converted to leverage WP_Network * * @param object|int $network The network's database row or ID. - * @return object|bool Object containing network information if found, false if not. + * @return WP_Network|false Object containing network information if found, false if not. */ function wp_get_network( $network ) { - global $wpdb; - if ( ! is_object( $network ) ) { - $network = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->site WHERE id = %d", $network ) ); - if ( ! $network ) { - return false; - } + $network = WP_Network::get_instance( $network ); + } else { + $network = new WP_Network( $network ); } return $network; @@ -281,10 +155,12 @@ function wp_get_network( $network ) { * * @since 3.9.0 * + * @global wpdb $wpdb WordPress database abstraction object. + * * @param string $domain Domain to check. * @param string $path Path to check. * @param int|null $segments Path segments to use. Defaults to null, or the full path. - * @return object|bool Site object if successful. False when no site is found. + * @return object|false Site object if successful. False when no site is found. */ function get_site_by_path( $domain, $path, $segments = null ) { global $wpdb; @@ -308,6 +184,8 @@ function get_site_by_path( $domain, $path, $segments = null ) { $path_segments = array_slice( $path_segments, 0, $segments ); } + $paths = array(); + while ( count( $path_segments ) ) { $paths[] = '/' . implode( '/', $path_segments ) . '/'; array_pop( $path_segments ); @@ -389,24 +267,48 @@ function get_site_by_path( $domain, $path, $segments = null ) { * * @access private * @since 3.0.0 + * @since 4.4.0 The `$domain` and `$path` parameters were added. + * + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string $domain The requested domain for the error to reference. + * @param string $path The requested path for the error to reference. */ -function ms_not_installed() { - global $wpdb, $domain, $path; +function ms_not_installed( $domain, $path ) { + global $wpdb; + + if ( ! is_admin() ) { + dead_db(); + } wp_load_translations_early(); $title = __( 'Error establishing a database connection' ); + $msg = '<h1>' . $title . '</h1>'; - if ( ! is_admin() ) - die( $msg ); $msg .= '<p>' . __( 'If your site does not display, please contact the owner of this network.' ) . ''; $msg .= ' ' . __( 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' ) . '</p>'; - if ( ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ) - $msg .= '<p>' . sprintf( __( '<strong>Database tables are missing.</strong> This means that MySQL is not running, WordPress was not installed properly, or someone deleted <code>%s</code>. You really should look at your database now.' ), $wpdb->site ) . '</p>'; - else - $msg .= '<p>' . sprintf( __( '<strong>Could not find site <code>%1$s</code>.</strong> Searched for table <code>%2$s</code> in database <code>%3$s</code>. Is that right?' ), rtrim( $domain . $path, '/' ), $wpdb->blogs, DB_NAME ) . '</p>'; + $query = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->site ) ); + if ( ! $wpdb->get_var( $query ) ) { + $msg .= '<p>' . sprintf( + /* translators: %s: table name */ + __( '<strong>Database tables are missing.</strong> This means that MySQL is not running, WordPress was not installed properly, or someone deleted %s. You really should look at your database now.' ), + '<code>' . $wpdb->site . '</code>' + ) . '</p>'; + } else { + $msg .= '<p>' . sprintf( + /* translators: 1: site url, 2: table name, 3: database name */ + __( '<strong>Could not find site %1$s.</strong> Searched for table %2$s in database %3$s. Is that right?' ), + '<code>' . rtrim( $domain . $path, '/' ) . '</code>', + '<code>' . $wpdb->blogs . '</code>', + '<code>' . DB_NAME . '</code>' + ) . '</p>'; + } $msg .= '<p><strong>' . __( 'What do I do now?' ) . '</strong> '; - $msg .= __( 'Read the <a target="_blank" href="http://codex.wordpress.org/Debugging_a_WordPress_Network">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.' ); + /* translators: %s: Codex URL */ + $msg .= sprintf( __( 'Read the <a href="%s" target="_blank">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.' ), + __( 'https://codex.wordpress.org/Debugging_a_WordPress_Network' ) + ); $msg .= ' ' . __( 'If you’re still stuck with this message, then check that your database contains the following tables:' ) . '</p><ul>'; foreach ( $wpdb->tables('global') as $t => $table ) { if ( 'sitecategories' == $t ) @@ -415,7 +317,7 @@ function ms_not_installed() { } $msg .= '</ul>'; - wp_die( $msg, $title ); + wp_die( $msg, $title, array( 'response' => 500 ) ); } /** @@ -426,13 +328,13 @@ function ms_not_installed() { * * @access private * @since 3.0.0 - * @deprecated 3.9.0 + * @deprecated 3.9.0 Use get_current_site() instead. * * @param object $current_site * @return object */ function get_current_site_name( $current_site ) { - _deprecated_function( __FUNCTION__, '3.9' ); + _deprecated_function( __FUNCTION__, '3.9', 'get_current_site()' ); return $current_site; } @@ -446,6 +348,8 @@ function get_current_site_name( $current_site ) { * @since 3.0.0 * @deprecated 3.9.0 * + * @global object $current_site + * * @return object */ function wpmu_current_site() { diff --git a/wp-includes/ms-settings.php b/wp-includes/ms-settings.php index d4383d3..351a926 100644 --- a/wp-includes/ms-settings.php +++ b/wp-includes/ms-settings.php @@ -10,12 +10,21 @@ * @since 3.0.0 */ -/** Include Multisite initialization functions */ -require( ABSPATH . WPINC . '/ms-load.php' ); -require( ABSPATH . WPINC . '/ms-default-constants.php' ); +/** WP_Network class */ +require_once( ABSPATH . WPINC . '/class-wp-network.php' ); -if ( defined( 'SUNRISE' ) ) +/** WP_Site class */ +require_once( ABSPATH . WPINC . '/class-wp-site.php' ); + +/** Multisite loader */ +require_once( ABSPATH . WPINC . '/ms-load.php' ); + +/** Default Multisite constants */ +require_once( ABSPATH . WPINC . '/ms-default-constants.php' ); + +if ( defined( 'SUNRISE' ) ) { include_once( WP_CONTENT_DIR . '/sunrise.php' ); +} /** Check for and define SUBDOMAIN_INSTALL and the deprecated VHOST constant. */ ms_subdomain_constants(); @@ -74,18 +83,31 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) { // Are there even two networks installed? $one_network = $wpdb->get_row( "SELECT * FROM $wpdb->site LIMIT 2" ); // [sic] if ( 1 === $wpdb->num_rows ) { - $current_site = wp_get_network( $one_network ); + $current_site = new WP_Network( $one_network ); wp_cache_add( 'current_network', $current_site, 'site-options' ); } elseif ( 0 === $wpdb->num_rows ) { - ms_not_installed(); + ms_not_installed( $domain, $path ); } } if ( empty( $current_site ) ) { - $current_site = get_network_by_path( $domain, $path, 1 ); + $current_site = WP_Network::get_by_path( $domain, $path, 1 ); } if ( empty( $current_site ) ) { - ms_not_installed(); + /** + * Fires when a network cannot be found based on the requested domain and path. + * + * At the time of this action, the only recourse is to redirect somewhere + * and exit. If you want to declare a particular network, do so earlier. + * + * @since 4.4.0 + * + * @param string $domain The domain used to search for a network. + * @param string $path The path used to search for a path. + */ + do_action( 'ms_network_not_found', $domain, $path ); + + ms_not_installed( $domain, $path ); } elseif ( $path === $current_site->path ) { $current_blog = get_site_by_path( $domain, $path ); } else { @@ -96,27 +118,31 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) { // Find the site by the domain and at most the first path segment. $current_blog = get_site_by_path( $domain, $path, 1 ); if ( $current_blog ) { - $current_site = wp_get_network( $current_blog->site_id ? $current_blog->site_id : 1 ); + $current_site = WP_Network::get_instance( $current_blog->site_id ? $current_blog->site_id : 1 ); } else { // If you don't have a site with the same domain/path as a network, you're pretty screwed, but: - $current_site = get_network_by_path( $domain, $path, 1 ); + $current_site = WP_Network::get_by_path( $domain, $path, 1 ); } } // The network declared by the site trumps any constants. if ( $current_blog && $current_blog->site_id != $current_site->id ) { - $current_site = wp_get_network( $current_blog->site_id ); + $current_site = WP_Network::get_instance( $current_blog->site_id ); } // No network has been found, bail. if ( empty( $current_site ) ) { - ms_not_installed(); + /** This action is documented in wp-includes/ms-settings.php */ + do_action( 'ms_network_not_found', $domain, $path ); + + ms_not_installed( $domain, $path ); } - // @todo Investigate when exactly this can occur. - if ( empty( $current_blog ) && defined( 'WP_INSTALLING' ) ) { + // During activation of a new subdomain, the requested site does not yet exist. + if ( empty( $current_blog ) && wp_installing() ) { $current_blog = new stdClass; $current_blog->blog_id = $blog_id = 1; + $current_blog->public = 1; } // No site has been found, bail. @@ -155,21 +181,15 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) { * it's no use redirecting back to ourselves -- it'll cause a loop. * As we couldn't find a site, we're simply not installed. */ - ms_not_installed(); + ms_not_installed( $domain, $path ); } header( 'Location: ' . $destination ); exit; } - // @todo What if the domain of the network doesn't match the current site? - $current_site->cookie_domain = $current_site->domain; - if ( 'www.' === substr( $current_site->cookie_domain, 0, 4 ) ) { - $current_site->cookie_domain = substr( $current_site->cookie_domain, 4 ); - } - // Figure out the current network's main site. - if ( ! isset( $current_site->blog_id ) ) { + if ( empty( $current_site->blog_id ) ) { if ( $current_blog->domain === $current_site->domain && $current_blog->path === $current_site->path ) { $current_site->blog_id = $current_blog->blog_id; } elseif ( ! $current_site->blog_id = wp_cache_get( 'network:' . $current_site->id . ':main_site', 'site-options' ) ) { @@ -201,11 +221,12 @@ $switched = false; // need to init cache again after blog_id is set wp_start_object_cache(); -if ( ! isset( $current_site->site_name ) ) { - $current_site->site_name = get_site_option( 'site_name' ); - if ( ! $current_site->site_name ) { - $current_site->site_name = ucfirst( $current_site->domain ); - } +if ( ! $current_site instanceof WP_Network ) { + $current_site = new WP_Network( $current_site ); +} + +if ( ! $current_blog instanceof WP_Site ) { + $current_blog = new WP_Site( $current_blog ); } // Define upload directory constants diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php index b1b8db1..e947eb8 100644 --- a/wp-includes/nav-menu-template.php +++ b/wp-includes/nav-menu-template.php @@ -21,7 +21,7 @@ class Walker_Nav_Menu extends Walker { * @since 3.0.0 * @var string */ - var $tree_type = array( 'post_type', 'taxonomy', 'custom' ); + public $tree_type = array( 'post_type', 'taxonomy', 'custom' ); /** * Database fields to use. @@ -31,7 +31,7 @@ class Walker_Nav_Menu extends Walker { * @todo Decouple this. * @var array */ - var $db_fields = array( 'parent' => 'menu_item_parent', 'id' => 'db_id' ); + public $db_fields = array( 'parent' => 'menu_item_parent', 'id' => 'db_id' ); /** * Starts the list before the elements are added. @@ -44,7 +44,7 @@ class Walker_Nav_Menu extends Walker { * @param int $depth Depth of menu item. Used for padding. * @param array $args An array of arguments. @see wp_nav_menu() */ - function start_lvl( &$output, $depth = 0, $args = array() ) { + public function start_lvl( &$output, $depth = 0, $args = array() ) { $indent = str_repeat("\t", $depth); $output .= "\n$indent<ul class=\"sub-menu\">\n"; } @@ -60,7 +60,7 @@ class Walker_Nav_Menu extends Walker { * @param int $depth Depth of menu item. Used for padding. * @param array $args An array of arguments. @see wp_nav_menu() */ - function end_lvl( &$output, $depth = 0, $args = array() ) { + public function end_lvl( &$output, $depth = 0, $args = array() ) { $indent = str_repeat("\t", $depth); $output .= "$indent</ul>\n"; } @@ -71,6 +71,7 @@ class Walker_Nav_Menu extends Walker { * @see Walker::start_el() * * @since 3.0.0 + * @since 4.4.0 'nav_menu_item_args' filter was added. * * @param string $output Passed by reference. Used to append additional content. * @param object $item Menu item data object. @@ -78,40 +79,49 @@ class Walker_Nav_Menu extends Walker { * @param array $args An array of arguments. @see wp_nav_menu() * @param int $id Current item ID. */ - function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) { + public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) { $indent = ( $depth ) ? str_repeat( "\t", $depth ) : ''; - $class_names = ''; - $classes = empty( $item->classes ) ? array() : (array) $item->classes; $classes[] = 'menu-item-' . $item->ID; /** - * Filter the CSS class(es) applied to a menu item's <li>. + * Filter the arguments for a single nav menu item. * - * @since 3.0.0 + * @since 4.4.0 + * + * @param array $args An array of arguments. + * @param object $item Menu item data object. + * @param int $depth Depth of menu item. Used for padding. + */ + $args = apply_filters( 'nav_menu_item_args', $args, $item, $depth ); + + /** + * Filter the CSS class(es) applied to a menu item's list item element. * - * @see wp_nav_menu() + * @since 3.0.0 + * @since 4.1.0 The `$depth` parameter was added. * - * @param array $classes The CSS classes that are applied to the menu item's <li>. + * @param array $classes The CSS classes that are applied to the menu item's `<li>` element. * @param object $item The current menu item. - * @param array $args An array of wp_nav_menu() arguments. + * @param array $args An array of {@see wp_nav_menu()} arguments. + * @param int $depth Depth of menu item. Used for padding. */ - $class_names = join( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item, $args ) ); + $class_names = join( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item, $args, $depth ) ); $class_names = $class_names ? ' class="' . esc_attr( $class_names ) . '"' : ''; /** - * Filter the ID applied to a menu item's <li>. + * Filter the ID applied to a menu item's list item element. * * @since 3.0.1 + * @since 4.1.0 The `$depth` parameter was added. * - * @see wp_nav_menu() - * - * @param string $menu_id The ID that is applied to the menu item's <li>. + * @param string $menu_id The ID that is applied to the menu item's `<li>` element. * @param object $item The current menu item. - * @param array $args An array of wp_nav_menu() arguments. + * @param array $args An array of {@see wp_nav_menu()} arguments. + * @param int $depth Depth of menu item. Used for padding. */ - $id = apply_filters( 'nav_menu_item_id', 'menu-item-'. $item->ID, $item, $args ); + $id = apply_filters( 'nav_menu_item_id', 'menu-item-'. $item->ID, $item, $args, $depth ); $id = $id ? ' id="' . esc_attr( $id ) . '"' : ''; $output .= $indent . '<li' . $id . $class_names .'>'; @@ -123,24 +133,24 @@ class Walker_Nav_Menu extends Walker { $atts['href'] = ! empty( $item->url ) ? $item->url : ''; /** - * Filter the HTML attributes applied to a menu item's <a>. + * Filter the HTML attributes applied to a menu item's anchor element. * * @since 3.6.0 - * - * @see wp_nav_menu() + * @since 4.1.0 The `$depth` parameter was added. * * @param array $atts { - * The HTML attributes applied to the menu item's <a>, empty strings are ignored. + * The HTML attributes applied to the menu item's `<a>` element, empty strings are ignored. * * @type string $title Title attribute. * @type string $target Target attribute. * @type string $rel The rel attribute. * @type string $href The href attribute. * } - * @param object $item The current menu item. - * @param array $args An array of wp_nav_menu() arguments. + * @param object $item The current menu item. + * @param array $args An array of {@see wp_nav_menu()} arguments. + * @param int $depth Depth of menu item. Used for padding. */ - $atts = apply_filters( 'nav_menu_link_attributes', $atts, $item, $args ); + $atts = apply_filters( 'nav_menu_link_attributes', $atts, $item, $args, $depth ); $attributes = ''; foreach ( $atts as $attr => $value ) { @@ -150,28 +160,40 @@ class Walker_Nav_Menu extends Walker { } } + /** This filter is documented in wp-includes/post-template.php */ + $title = apply_filters( 'the_title', $item->title, $item->ID ); + + /** + * Filter a menu item's title. + * + * @since 4.4.0 + * + * @param string $title The menu item's title. + * @param object $item The current menu item. + * @param array $args An array of {@see wp_nav_menu()} arguments. + * @param int $depth Depth of menu item. Used for padding. + */ + $title = apply_filters( 'nav_menu_item_title', $title, $item, $args, $depth ); + $item_output = $args->before; $item_output .= '<a'. $attributes .'>'; - /** This filter is documented in wp-includes/post-template.php */ - $item_output .= $args->link_before . apply_filters( 'the_title', $item->title, $item->ID ) . $args->link_after; + $item_output .= $args->link_before . $title . $args->link_after; $item_output .= '</a>'; $item_output .= $args->after; /** * Filter a menu item's starting output. * - * The menu item's starting output only includes $args->before, the opening <a>, - * the menu item's title, the closing </a>, and $args->after. Currently, there is - * no filter for modifying the opening and closing <li> for a menu item. + * The menu item's starting output only includes `$args->before`, the opening `<a>`, + * the menu item's title, the closing `</a>`, and `$args->after`. Currently, there is + * no filter for modifying the opening and closing `<li>` for a menu item. * * @since 3.0.0 * - * @see wp_nav_menu() - * * @param string $item_output The menu item's starting HTML output. * @param object $item Menu item data object. * @param int $depth Depth of menu item. Used for padding. - * @param array $args An array of wp_nav_menu() arguments. + * @param array $args An array of {@see wp_nav_menu()} arguments. */ $output .= apply_filters( 'walker_nav_menu_start_el', $item_output, $item, $depth, $args ); } @@ -188,7 +210,7 @@ class Walker_Nav_Menu extends Walker { * @param int $depth Depth of page. Not Used. * @param array $args An array of arguments. @see wp_nav_menu() */ - function end_el( &$output, $item, $depth = 0, $args = array() ) { + public function end_el( &$output, $item, $depth = 0, $args = array() ) { $output .= "</li>\n"; } @@ -199,6 +221,8 @@ class Walker_Nav_Menu extends Walker { * * @since 3.0.0 * + * @staticvar array $menu_id_slugs + * * @param array $args { * Optional. Array of nav menu arguments. * @@ -209,7 +233,7 @@ class Walker_Nav_Menu extends Walker { * @type string $container Whether to wrap the ul, and what to wrap it with. Default 'div'. * @type string $container_class Class that is applied to the container. Default 'menu-{menu slug}-container'. * @type string $container_id The ID that is applied to the container. Default empty. - * @type callback|bool $fallback_cb If the menu doesn't exists, a callback function will fire. + * @type callable|bool $fallback_cb If the menu doesn't exists, a callback function will fire. * Default is 'wp_page_menu'. Set to false for no fallback. * @type string $before Text before the link text. Default empty. * @type string $after Text after the link text. Default empty. @@ -217,13 +241,13 @@ class Walker_Nav_Menu extends Walker { * @type string $link_after Text after the link. Default empty. * @type bool $echo Whether to echo the menu or return it. Default true. * @type int $depth How many levels of the hierarchy are to be included. 0 means all. Default 0. - * @type string $walker Allows a custom walker class to be specified. Default empty. + * @type object $walker Instance of a custom walker class. Default empty. * @type string $theme_location Theme location to be used. Must be registered with register_nav_menu() * in order to be selectable by the user. * @type string $items_wrap How the list items should be wrapped. Default is a ul with an id and class. * Uses printf() format with numbered placeholders. * } - * @return mixed Menu output if $echo is false, false if there are no items or no menu was found. + * @return object|false|void Menu output if $echo is false, false if there are no items or no menu was found. */ function wp_nav_menu( $args = array() ) { static $menu_id_slugs = array(); @@ -288,6 +312,10 @@ function wp_nav_menu( $args = array() ) { } } + if ( empty( $args->menu ) ) { + $args->menu = $menu; + } + // If the menu exists, get its items. if ( $menu && ! is_wp_error($menu) && !isset($menu_items) ) $menu_items = wp_get_nav_menu_items( $menu->term_id, array( 'update_post_term_cache' => false ) ); @@ -301,7 +329,7 @@ function wp_nav_menu( $args = array() ) { * - Otherwise, bail. */ if ( ( !$menu || is_wp_error($menu) || ( isset($menu_items) && empty($menu_items) && !$args->theme_location ) ) - && $args->fallback_cb && is_callable( $args->fallback_cb ) ) + && isset( $args->fallback_cb ) && $args->fallback_cb && is_callable( $args->fallback_cb ) ) return call_user_func( $args->fallback_cb, (array) $args ); if ( ! $menu || is_wp_error( $menu ) ) @@ -320,7 +348,7 @@ function wp_nav_menu( $args = array() ) { * Default is array containing 'div' and 'nav'. */ $allowed_tags = apply_filters( 'wp_nav_menu_container_allowedtags', array( 'div', 'nav' ) ); - if ( in_array( $args->container, $allowed_tags ) ) { + if ( is_string( $args->container ) && in_array( $args->container, $allowed_tags ) ) { $show_container = true; $class = $args->container_class ? ' class="' . esc_attr( $args->container_class ) . '"' : ' class="menu-'. $menu->slug .'-container"'; $id = $args->container_id ? ' id="' . esc_attr( $args->container_id ) . '"' : ''; @@ -353,7 +381,8 @@ function wp_nav_menu( $args = array() ) { * * @since 3.1.0 * - * @param array $sorted_menu_items The menu items, sorted by each menu item's menu order. + * @param array $sorted_menu_items The menu items, sorted by each menu item's menu order. + * @param object $args An object containing wp_nav_menu() arguments. */ $sorted_menu_items = apply_filters( 'wp_nav_menu_objects', $sorted_menu_items, $args ); @@ -384,7 +413,7 @@ function wp_nav_menu( $args = array() ) { * @see wp_nav_menu() * * @param string $items The HTML list content for the menu items. - * @param array $args Array of wp_nav_menu() arguments. + * @param object $args An object containing wp_nav_menu() arguments. */ $items = apply_filters( 'wp_nav_menu_items', $items, $args ); /** @@ -395,7 +424,7 @@ function wp_nav_menu( $args = array() ) { * @see wp_nav_menu() * * @param string $items The HTML list content for the menu items. - * @param array $args Array of wp_nav_menu() arguments. + * @param object $args An object containing wp_nav_menu() arguments. */ $items = apply_filters( "wp_nav_menu_{$menu->slug}_items", $items, $args ); @@ -417,7 +446,7 @@ function wp_nav_menu( $args = array() ) { * @see wp_nav_menu() * * @param string $nav_menu The HTML content for the navigation menu. - * @param array $args Array of wp_nav_menu() arguments. + * @param object $args An object containing wp_nav_menu() arguments. */ $nav_menu = apply_filters( 'wp_nav_menu', $nav_menu, $args ); @@ -433,6 +462,9 @@ function wp_nav_menu( $args = array() ) { * @access private * @since 3.0.0 * + * @global WP_Query $wp_query + * @global WP_Rewrite $wp_rewrite + * * @param array $menu_items The current menu item objects to which to add the class property information. */ function _wp_menu_item_classes_by_context( &$menu_items ) { @@ -546,12 +578,19 @@ function _wp_menu_item_classes_by_context( &$menu_items ) { $active_parent_object_ids[] = (int) $menu_item->post_parent; $active_object = $menu_item->object; + // if the menu item corresponds to the currently-queried post type archive + } elseif ( + 'post_type_archive' == $menu_item->type && + is_post_type_archive( array( $menu_item->object ) ) + ) { + $classes[] = 'current-menu-item'; + $menu_items[$key]->current = true; // if the menu item corresponds to the currently-requested URL - } elseif ( 'custom' == $menu_item->object ) { + } elseif ( 'custom' == $menu_item->object && isset( $_SERVER['HTTP_HOST'] ) ) { $_root_relative_current = untrailingslashit( $_SERVER['REQUEST_URI'] ); $current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_root_relative_current ); $raw_item_url = strpos( $menu_item->url, '#' ) ? substr( $menu_item->url, 0, strpos( $menu_item->url, '#' ) ) : $menu_item->url; - $item_url = untrailingslashit( $raw_item_url ); + $item_url = set_url_scheme( untrailingslashit( $raw_item_url ) ); $_indexless_current = untrailingslashit( preg_replace( '/' . preg_quote( $wp_rewrite->index, '/' ) . '$/', '', $current_url ) ); if ( $raw_item_url && in_array( $item_url, array( $current_url, $_indexless_current, $_root_relative_current ) ) ) { @@ -654,13 +693,17 @@ function _wp_menu_item_classes_by_context( &$menu_items ) { * * @uses Walker_Nav_Menu to create HTML list content. * @since 3.0.0 - * @see Walker::walk() for parameters and return description. + * + * @param array $items + * @param int $depth + * @param object $r + * @return string */ function walk_nav_menu_tree( $items, $depth, $r ) { $walker = ( empty($r->walker) ) ? new Walker_Nav_Menu : $r->walker; $args = array( $items, $depth, $r ); - return call_user_func_array( array($walker, 'walk'), $args ); + return call_user_func_array( array( $walker, 'walk' ), $args ); } /** @@ -668,12 +711,17 @@ function walk_nav_menu_tree( $items, $depth, $r ) { * * @since 3.0.1 * @access private + * + * @staticvar array $used_ids + * @param string $id + * @param object $item + * @return string */ function _nav_menu_item_id_use_once( $id, $item ) { static $_used_ids = array(); - if ( in_array( $item->ID, $_used_ids ) ) + if ( in_array( $item->ID, $_used_ids ) ) { return ''; + } $_used_ids[] = $item->ID; return $id; } -add_filter( 'nav_menu_item_id', '_nav_menu_item_id_use_once', 10, 2 ); diff --git a/wp-includes/nav-menu.php b/wp-includes/nav-menu.php index 46a6b2b..70a450e 100644 --- a/wp-includes/nav-menu.php +++ b/wp-includes/nav-menu.php @@ -12,28 +12,41 @@ * * @since 3.0.0 * - * @uses get_term - * @uses get_term_by - * - * @param string $menu Menu id, slug or name - * @return mixed false if $menu param isn't supplied or term does not exist, menu object if successful. + * @param string $menu Menu ID, slug, or name - or the menu object. + * @return object|false False if $menu param isn't supplied or term does not exist, menu object if successful. */ function wp_get_nav_menu_object( $menu ) { - if ( ! $menu ) - return false; + $menu_obj = false; - $menu_obj = get_term( $menu, 'nav_menu' ); + if ( is_object( $menu ) ) { + $menu_obj = $menu; + } - if ( ! $menu_obj ) - $menu_obj = get_term_by( 'slug', $menu, 'nav_menu' ); + if ( $menu && ! $menu_obj ) { + $menu_obj = get_term( $menu, 'nav_menu' ); - if ( ! $menu_obj ) - $menu_obj = get_term_by( 'name', $menu, 'nav_menu' ); + if ( ! $menu_obj ) { + $menu_obj = get_term_by( 'slug', $menu, 'nav_menu' ); + } - if ( ! $menu_obj ) + if ( ! $menu_obj ) { + $menu_obj = get_term_by( 'name', $menu, 'nav_menu' ); + } + } + + if ( ! $menu_obj || is_wp_error( $menu_obj ) ) { $menu_obj = false; + } - return $menu_obj; + /** + * Filter the nav_menu term retrieved for wp_get_nav_menu_object(). + * + * @since 4.3.0 + * + * @param object|false $menu_obj Term from nav_menu taxonomy, or false if nothing had been found. + * @param string $menu The menu ID, slug, or name passed to wp_get_nav_menu_object(). + */ + return apply_filters( 'wp_get_nav_menu_object', $menu_obj, $menu ); } /** @@ -43,7 +56,7 @@ function wp_get_nav_menu_object( $menu ) { * * @since 3.0.0 * - * @param int|string $menu The menu to check (id, slug, or name) + * @param int|string $menu The menu to check (ID, slug, or name). * @return bool Whether the menu exists. */ function is_nav_menu( $menu ) { @@ -64,10 +77,12 @@ function is_nav_menu( $menu ) { } /** - * Register navigation menus for a theme. + * Registers navigation menu locations for a theme. * * @since 3.0.0 * + * @global array $_wp_registered_nav_menus + * * @param array $locations Associative array of menu location identifiers (like a slug) and descriptive text. */ function register_nav_menus( $locations = array() ) { @@ -79,10 +94,11 @@ function register_nav_menus( $locations = array() ) { } /** - * Unregisters a navigation menu for a theme. + * Unregisters a navigation menu location for a theme. * - * @param array $location the menu location identifier + * @global array $_wp_registered_nav_menus * + * @param string $location The menu location identifier. * @return bool True on success, false on failure. */ function unregister_nav_menu( $location ) { @@ -99,20 +115,23 @@ function unregister_nav_menu( $location ) { } /** - * Register a navigation menu for a theme. + * Registers a navigation menu location for a theme. * * @since 3.0.0 * - * @param string $location Menu location identifier, like a slug. + * @param string $location Menu location identifier, like a slug. * @param string $description Menu location descriptive text. */ function register_nav_menu( $location, $description ) { register_nav_menus( array( $location => $description ) ); } /** - * Returns an array of all registered navigation menus in a theme + * Returns all registered navigation menu locations in a theme. * * @since 3.0.0 + * + * @global array $_wp_registered_nav_menus + * * @return array */ function get_registered_nav_menus() { @@ -135,19 +154,35 @@ function get_nav_menu_locations() { } /** - * Whether a registered nav menu location has a menu assigned to it. + * Determines whether a registered nav menu location has a menu assigned to it. * * @since 3.0.0 + * * @param string $location Menu location identifier. * @return bool Whether location has a menu. */ function has_nav_menu( $location ) { - $locations = get_nav_menu_locations(); - return ( ! empty( $locations[ $location ] ) ); + $has_nav_menu = false; + + $registered_nav_menus = get_registered_nav_menus(); + if ( isset( $registered_nav_menus[ $location ] ) ) { + $locations = get_nav_menu_locations(); + $has_nav_menu = ! empty( $locations[ $location ] ); + } + + /** + * Filter whether a nav menu is assigned to the specified location. + * + * @since 4.3.0 + * + * @param bool $has_nav_menu Whether there is a menu assigned to a location. + * @param string $location Menu location. + */ + return apply_filters( 'has_nav_menu', $has_nav_menu, $location ); } /** - * Determine whether the given ID is a nav menu item. + * Determines whether the given ID is a nav menu item. * * @since 3.0.0 * @@ -159,14 +194,17 @@ function is_nav_menu_item( $menu_item_id = 0 ) { } /** - * Create a Navigation Menu. + * Creates a navigation menu. + * + * Note that `$menu_name` is expected to be pre-slashed. * * @since 3.0.0 * - * @param string $menu_name Menu Name - * @return mixed Menu object on success|WP_Error on failure + * @param string $menu_name Menu name. + * @return int|WP_Error Menu ID on success, WP_Error object on failure. */ function wp_create_nav_menu( $menu_name ) { + // expected_slashed ($menu_name) return wp_update_nav_menu_object( 0, array( 'menu-name' => $menu_name ) ); } @@ -175,8 +213,8 @@ function wp_create_nav_menu( $menu_name ) { * * @since 3.0.0 * - * @param string $menu name|id|slug - * @return mixed Menu object on success|WP_Error on failure + * @param string $menu Menu ID, slug, or name. + * @return bool|WP_Error True on success, false or WP_Error object on failure. */ function wp_delete_nav_menu( $menu ) { $menu = wp_get_nav_menu_object( $menu ); @@ -217,13 +255,16 @@ function wp_delete_nav_menu( $menu ) { /** * Save the properties of a menu or create a new menu with those properties. * + * Note that `$menu_data` is expected to be pre-slashed. + * * @since 3.0.0 * - * @param int $menu_id The ID of the menu or "0" to create a new menu. + * @param int $menu_id The ID of the menu or "0" to create a new menu. * @param array $menu_data The array of menu data. - * @return int|WP_Error object The menu's ID or WP_Error object. + * @return int|WP_Error Menu ID on success, WP_Error object on failure. */ function wp_update_nav_menu_object( $menu_id = 0, $menu_data = array() ) { + // expected_slashed ($menu_data) $menu_id = (int) $menu_id; $_menu = wp_get_nav_menu_object( $menu_id ); @@ -242,15 +283,27 @@ function wp_update_nav_menu_object( $menu_id = 0, $menu_data = array() ) { ! is_wp_error( $_possible_existing ) && isset( $_possible_existing->term_id ) && $_possible_existing->term_id != $menu_id - ) - return new WP_Error( 'menu_exists', sprintf( __('The menu name <strong>%s</strong> conflicts with another menu name. Please try another.'), esc_html( $menu_data['menu-name'] ) ) ); + ) { + return new WP_Error( 'menu_exists', + /* translators: %s: menu name */ + sprintf( __( 'The menu name %s conflicts with another menu name. Please try another.' ), + '<strong>' . esc_html( $menu_data['menu-name'] ) . '</strong>' + ) + ); + } // menu doesn't already exist, so create a new menu if ( ! $_menu || is_wp_error( $_menu ) ) { $menu_exists = get_term_by( 'name', $menu_data['menu-name'], 'nav_menu' ); - if ( $menu_exists ) - return new WP_Error( 'menu_exists', sprintf( __('The menu name <strong>%s</strong> conflicts with another menu name. Please try another.'), esc_html( $menu_data['menu-name'] ) ) ); + if ( $menu_exists ) { + return new WP_Error( 'menu_exists', + /* translators: %s: menu name */ + sprintf( __( 'The menu name %s conflicts with another menu name. Please try another.' ), + '<strong>' . esc_html( $menu_data['menu-name'] ) . '</strong>' + ) + ); + } $_menu = wp_insert_term( $menu_data['menu-name'], 'nav_menu', $args ); @@ -280,6 +333,8 @@ function wp_update_nav_menu_object( $menu_id = 0, $menu_data = array() ) { if ( is_wp_error( $update_response ) ) return $update_response; + $menu_id = (int) $update_response['term_id']; + /** * Fires after a navigation menu has been successfully updated. * @@ -295,11 +350,14 @@ function wp_update_nav_menu_object( $menu_id = 0, $menu_data = array() ) { /** * Save the properties of a menu item or create a new one. * + * The menu-item-title, menu-item-description, and menu-item-attr-title are expected + * to be pre-slashed since they are passed directly into `wp_insert_post()`. + * * @since 3.0.0 * - * @param int $menu_id The ID of the menu. Required. If "0", makes the menu item a draft orphan. - * @param int $menu_item_db_id The ID of the menu item. If "0", creates a new menu item. - * @param array $menu_item_data The menu item's data. + * @param int $menu_id The ID of the menu. Required. If "0", makes the menu item a draft orphan. + * @param int $menu_item_db_id The ID of the menu item. If "0", creates a new menu item. + * @param array $menu_item_data The menu item's data. * @return int|WP_Error The menu item's database ID or WP_Error object on failure. */ function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item_data = array() ) { @@ -366,6 +424,11 @@ function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item $original_object = get_post( $args['menu-item-object-id'] ); $original_parent = (int) $original_object->post_parent; $original_title = $original_object->post_title; + } elseif ( 'post_type_archive' == $args['menu-item-type'] ) { + $original_object = get_post_type_object( $args['menu-item-object'] ); + if ( $original_object ) { + $original_title = $original_object->labels->archives; + } } if ( $args['menu-item-title'] == $original_title ) @@ -396,6 +459,19 @@ function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item $menu_item_db_id = wp_insert_post( $post ); if ( ! $menu_item_db_id || is_wp_error( $menu_item_db_id ) ) return $menu_item_db_id; + + /** + * Fires immediately after a new navigation menu item has been added. + * + * @since 4.4.0 + * + * @see wp_update_nav_menu_item() + * + * @param int $menu_id ID of the updated menu. + * @param int $menu_item_db_id ID of the new menu item. + * @param array $args An array of arguments used to update/add the menu item. + */ + do_action( 'wp_add_nav_menu_item', $menu_id, $menu_item_db_id, $args ); } // Associate the menu item with the menu term @@ -440,7 +516,7 @@ function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item * * @since 3.0.0 * - * @see wp_update_nav_menu_items() + * @see wp_update_nav_menu_item() * * @param int $menu_id ID of the updated menu. * @param int $menu_item_db_id ID of the updated menu item. @@ -455,12 +531,15 @@ function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item * Returns all navigation menu objects. * * @since 3.0.0 + * @since 4.1.0 Default value of the 'orderby' argument was changed from 'none' + * to 'name'. * - * @param array $args Array of arguments passed on to get_terms(). - * @return array menu objects + * @param array $args Optional. Array of arguments passed on to {@see get_terms()}. + * Default empty array. + * @return array Menu objects. */ function wp_get_nav_menus( $args = array() ) { - $defaults = array( 'hide_empty' => false, 'orderby' => 'none' ); + $defaults = array( 'hide_empty' => false, 'orderby' => 'name' ); $args = wp_parse_args( $args, $defaults ); /** @@ -482,6 +561,8 @@ function wp_get_nav_menus( $args = array() ) { * @since 3.0.0 * @access private * + * @global string $_menu_item_sort_prop + * * @param object $a The first object to compare * @param object $b The second object to compare * @return int -1, 0, or 1 if $a is considered to be respectively less than, equal to, or greater than $b. @@ -507,55 +588,56 @@ function _sort_nav_menu_items( $a, $b ) { } /** - * Returns if a menu item is valid. Bug #13958 + * Return if a menu item is valid. + * + * @link https://core.trac.wordpress.org/ticket/13958 * * @since 3.2.0 * @access private * - * @param object $menu_item The menu item to check - * @return bool false if invalid, else true. + * @param object $item The menu item to check. + * @return bool False if invalid, otherwise true. */ function _is_valid_nav_menu_item( $item ) { - if ( ! empty( $item->_invalid ) ) - return false; - - return true; + return empty( $item->_invalid ); } /** - * Returns all menu items of a navigation menu. + * Return all menu items of a navigation menu. * * @since 3.0.0 * - * @param string $menu menu name, id, or slug - * @param string $args - * @return mixed $items array of menu items, else false. + * @global string $_menu_item_sort_prop + * @staticvar array $fetched + * + * @param string $menu Menu name, ID, or slug. + * @param array $args Optional. Arguments to pass to {@see get_posts()}. + * @return false|array $items Array of menu items, otherwise false. */ function wp_get_nav_menu_items( $menu, $args = array() ) { $menu = wp_get_nav_menu_object( $menu ); - if ( ! $menu ) + if ( ! $menu ) { return false; + } static $fetched = array(); $items = get_objects_in_term( $menu->term_id, 'nav_menu' ); - - if ( empty( $items ) ) - return $items; + if ( is_wp_error( $items ) ) { + return false; + } $defaults = array( 'order' => 'ASC', 'orderby' => 'menu_order', 'post_type' => 'nav_menu_item', 'post_status' => 'publish', 'output' => ARRAY_A, 'output_key' => 'menu_order', 'nopaging' => true ); $args = wp_parse_args( $args, $defaults ); - if ( count( $items ) > 1 ) - $args['include'] = implode( ',', $items ); - else - $args['include'] = $items[0]; + $args['include'] = $items; - $items = get_posts( $args ); - - if ( is_wp_error( $items ) || ! is_array( $items ) ) - return false; + if ( ! empty( $items ) ) { + $items = get_posts( $args ); + } else { + $items = array(); + } // Get all posts and terms at once to prime the caches if ( empty( $fetched[$menu->term_id] ) || wp_using_ext_object_cache() ) { @@ -582,7 +664,10 @@ function wp_get_nav_menu_items( $menu, $args = array() ) { if ( ! empty( $terms ) ) { foreach ( array_keys($terms) as $taxonomy ) { - get_terms($taxonomy, array('include' => $terms[$taxonomy]) ); + get_terms( $taxonomy, array( + 'include' => $terms[ $taxonomy ], + 'hierarchical' => false, + ) ); } } unset($terms); @@ -590,15 +675,16 @@ function wp_get_nav_menu_items( $menu, $args = array() ) { $items = array_map( 'wp_setup_nav_menu_item', $items ); - if ( ! is_admin() ) // Remove invalid items only in frontend + if ( ! is_admin() ) { // Remove invalid items only in front end $items = array_filter( $items, '_is_valid_nav_menu_item' ); + } if ( ARRAY_A == $args['output'] ) { $GLOBALS['_menu_item_sort_prop'] = $args['output_key']; usort($items, '_sort_nav_menu_items'); $i = 1; - foreach( $items as $k => $item ) { - $items[$k]->$args['output_key'] = $i++; + foreach ( $items as $k => $item ) { + $items[$k]->{$args['output_key']} = $i++; } } @@ -611,27 +697,30 @@ function wp_get_nav_menu_items( $menu, $args = array() ) { * @param object $menu The menu object. * @param array $args An array of arguments used to retrieve menu item objects. */ - return apply_filters( 'wp_get_nav_menu_items', $items, $menu, $args ); + return apply_filters( 'wp_get_nav_menu_items', $items, $menu, $args ); } /** * Decorates a menu item object with the shared navigation menu item properties. * * Properties: - * - db_id: The DB ID of this item as a nav_menu_item object, if it exists (0 if it doesn't exist). - * - object_id: The DB ID of the original object this menu item represents, e.g. ID for posts and term_id for categories. - * - type: The family of objects originally represented, such as "post_type" or "taxonomy." - * - object: The type of object originally represented, such as "category," "post", or "attachment." - * - type_label: The singular label used to describe this type of menu item. - * - post_parent: The DB ID of the original object's parent object, if any (0 otherwise). - * - menu_item_parent: The DB ID of the nav_menu_item that is this item's menu parent, if any. 0 otherwise. - * - url: The URL to which this menu item points. - * - title: The title of this menu item. - * - target: The target attribute of the link element for this menu item. - * - attr_title: The title attribute of the link element for this menu item. - * - classes: The array of class attribute values for the link element of this menu item. - * - xfn: The XFN relationship expressed in the link of this menu item. - * - description: The description of this menu item. + * - ID: The term_id if the menu item represents a taxonomy term. + * - attr_title: The title attribute of the link element for this menu item. + * - classes: The array of class attribute values for the link element of this menu item. + * - db_id: The DB ID of this item as a nav_menu_item object, if it exists (0 if it doesn't exist). + * - description: The description of this menu item. + * - menu_item_parent: The DB ID of the nav_menu_item that is this item's menu parent, if any. 0 otherwise. + * - object: The type of object originally represented, such as "category," "post", or "attachment." + * - object_id: The DB ID of the original object this menu item represents, e.g. ID for posts and term_id for categories. + * - post_parent: The DB ID of the original object's parent object, if any (0 otherwise). + * - post_title: A "no title" label if menu item represents a post that lacks a title. + * - target: The target attribute of the link element for this menu item. + * - title: The title of this menu item. + * - type: The family of objects originally represented, such as "post_type" or "taxonomy." + * - type_label: The singular label used to describe this type of menu item. + * - url: The URL to which this menu item points. + * - xfn: The XFN relationship expressed in the link of this menu item. + * - _invalid: Whether the menu item represents an object that no longer exists. * * @since 3.0.0 * @@ -642,10 +731,10 @@ function wp_setup_nav_menu_item( $menu_item ) { if ( isset( $menu_item->post_type ) ) { if ( 'nav_menu_item' == $menu_item->post_type ) { $menu_item->db_id = (int) $menu_item->ID; - $menu_item->menu_item_parent = empty( $menu_item->menu_item_parent ) ? get_post_meta( $menu_item->ID, '_menu_item_menu_item_parent', true ) : $menu_item->menu_item_parent; - $menu_item->object_id = empty( $menu_item->object_id ) ? get_post_meta( $menu_item->ID, '_menu_item_object_id', true ) : $menu_item->object_id; - $menu_item->object = empty( $menu_item->object ) ? get_post_meta( $menu_item->ID, '_menu_item_object', true ) : $menu_item->object; - $menu_item->type = empty( $menu_item->type ) ? get_post_meta( $menu_item->ID, '_menu_item_type', true ) : $menu_item->type; + $menu_item->menu_item_parent = ! isset( $menu_item->menu_item_parent ) ? get_post_meta( $menu_item->ID, '_menu_item_menu_item_parent', true ) : $menu_item->menu_item_parent; + $menu_item->object_id = ! isset( $menu_item->object_id ) ? get_post_meta( $menu_item->ID, '_menu_item_object_id', true ) : $menu_item->object_id; + $menu_item->object = ! isset( $menu_item->object ) ? get_post_meta( $menu_item->ID, '_menu_item_object', true ) : $menu_item->object; + $menu_item->type = ! isset( $menu_item->type ) ? get_post_meta( $menu_item->ID, '_menu_item_type', true ) : $menu_item->type; if ( 'post_type' == $menu_item->type ) { $object = get_post_type_object( $menu_item->object ); @@ -659,9 +748,30 @@ function wp_setup_nav_menu_item( $menu_item ) { $menu_item->url = get_permalink( $menu_item->object_id ); $original_object = get_post( $menu_item->object_id ); - $original_title = $original_object->post_title; + /** This filter is documented in wp-includes/post-template.php */ + $original_title = apply_filters( 'the_title', $original_object->post_title, $original_object->ID ); + + if ( '' === $original_title ) { + /* translators: %d: ID of a post */ + $original_title = sprintf( __( '#%d (no title)' ), $original_object->ID ); + } + $menu_item->title = '' == $menu_item->post_title ? $original_title : $menu_item->post_title; + } elseif ( 'post_type_archive' == $menu_item->type ) { + $object = get_post_type_object( $menu_item->object ); + if ( $object ) { + $menu_item->title = '' == $menu_item->post_title ? $object->labels->archives : $menu_item->post_title; + $post_type_description = $object->description; + } else { + $menu_item->_invalid = true; + $post_type_description = ''; + } + + $menu_item->type_label = __( 'Post Type Archive' ); + $post_content = wp_trim_words( $menu_item->post_content, 200 ); + $post_type_description = '' == $post_content ? $post_type_description : $post_content; + $menu_item->url = get_post_type_archive_link( $menu_item->object ); } elseif ( 'taxonomy' == $menu_item->type ) { $object = get_taxonomy( $menu_item->object ); if ( $object ) { @@ -680,12 +790,12 @@ function wp_setup_nav_menu_item( $menu_item ) { $menu_item->title = '' == $menu_item->post_title ? $original_title : $menu_item->post_title; } else { - $menu_item->type_label = __('Custom'); + $menu_item->type_label = __('Custom Link'); $menu_item->title = $menu_item->post_title; - $menu_item->url = empty( $menu_item->url ) ? get_post_meta( $menu_item->ID, '_menu_item_url', true ) : $menu_item->url; + $menu_item->url = ! isset( $menu_item->url ) ? get_post_meta( $menu_item->ID, '_menu_item_url', true ) : $menu_item->url; } - $menu_item->target = empty( $menu_item->target ) ? get_post_meta( $menu_item->ID, '_menu_item_target', true ) : $menu_item->target; + $menu_item->target = ! isset( $menu_item->target ) ? get_post_meta( $menu_item->ID, '_menu_item_target', true ) : $menu_item->target; /** * Filter a navigation menu item's title attribute. @@ -694,9 +804,9 @@ function wp_setup_nav_menu_item( $menu_item ) { * * @param string $item_title The menu item title attribute. */ - $menu_item->attr_title = empty( $menu_item->attr_title ) ? apply_filters( 'nav_menu_attr_title', $menu_item->post_excerpt ) : $menu_item->attr_title; + $menu_item->attr_title = ! isset( $menu_item->attr_title ) ? apply_filters( 'nav_menu_attr_title', $menu_item->post_excerpt ) : $menu_item->attr_title; - if ( empty( $menu_item->description ) ) { + if ( ! isset( $menu_item->description ) ) { /** * Filter a navigation menu item's description. * @@ -707,8 +817,8 @@ function wp_setup_nav_menu_item( $menu_item ) { $menu_item->description = apply_filters( 'nav_menu_description', wp_trim_words( $menu_item->post_content, 200 ) ); } - $menu_item->classes = empty( $menu_item->classes ) ? (array) get_post_meta( $menu_item->ID, '_menu_item_classes', true ) : $menu_item->classes; - $menu_item->xfn = empty( $menu_item->xfn ) ? get_post_meta( $menu_item->ID, '_menu_item_xfn', true ) : $menu_item->xfn; + $menu_item->classes = ! isset( $menu_item->classes ) ? (array) get_post_meta( $menu_item->ID, '_menu_item_classes', true ) : $menu_item->classes; + $menu_item->xfn = ! isset( $menu_item->xfn ) ? get_post_meta( $menu_item->ID, '_menu_item_xfn', true ) : $menu_item->xfn; } else { $menu_item->db_id = 0; $menu_item->menu_item_parent = 0; @@ -719,8 +829,10 @@ function wp_setup_nav_menu_item( $menu_item ) { $menu_item->object = $object->name; $menu_item->type_label = $object->labels->singular_name; - if ( '' === $menu_item->post_title ) + if ( '' === $menu_item->post_title ) { + /* translators: %d: ID of a post */ $menu_item->post_title = sprintf( __( '#%d (no title)' ), $menu_item->ID ); + } $menu_item->title = $menu_item->post_title; $menu_item->url = get_permalink( $menu_item->ID ); @@ -771,9 +883,9 @@ function wp_setup_nav_menu_item( $menu_item ) { * * @since 3.0.0 * - * @param int $object_id The ID of the original object. + * @param int $object_id The ID of the original object. * @param string $object_type The type of object, such as "taxonomy" or "post_type." - * @param string $taxonomy If $object_type is "taxonomy", $taxonomy is the name of the tax that $object_id belongs to + * @param string $taxonomy If $object_type is "taxonomy", $taxonomy is the name of the tax that $object_id belongs to * @return array The array of menu item IDs; empty array if none; */ function wp_get_associated_nav_menu_items( $object_id = 0, $object_type = 'post_type', $taxonomy = '' ) { @@ -790,7 +902,7 @@ function wp_get_associated_nav_menu_items( $object_id = 0, $object_type = 'post_ 'posts_per_page' => -1, ) ); - foreach( (array) $menu_items as $menu_item ) { + foreach ( (array) $menu_items as $menu_item ) { if ( isset( $menu_item->ID ) && is_nav_menu_item( $menu_item->ID ) ) { $menu_item_type = get_post_meta( $menu_item->ID, '_menu_item_type', true ); if ( @@ -798,7 +910,7 @@ function wp_get_associated_nav_menu_items( $object_id = 0, $object_type = 'post_ 'post_type' == $menu_item_type ) { $menu_item_ids[] = (int) $menu_item->ID; - } else if ( + } elseif ( 'taxonomy' == $object_type && 'taxonomy' == $menu_item_type && get_post_meta( $menu_item->ID, '_menu_item_object', true ) == $taxonomy @@ -825,26 +937,27 @@ function _wp_delete_post_menu_item( $object_id = 0 ) { $menu_item_ids = wp_get_associated_nav_menu_items( $object_id, 'post_type' ); - foreach( (array) $menu_item_ids as $menu_item_id ) { + foreach ( (array) $menu_item_ids as $menu_item_id ) { wp_delete_post( $menu_item_id, true ); } } /** - * Callback for handling a menu item when its original object is deleted. + * Serves as a callback for handling a menu item when its original object is deleted. * * @since 3.0.0 * @access private * - * @param int $object_id The ID of the original object being trashed. - * + * @param int $object_id Optional. The ID of the original object being trashed. Default 0. + * @param int $tt_id Term taxonomy ID. Unused. + * @param string $taxonomy Taxonomy slug. */ function _wp_delete_tax_menu_item( $object_id = 0, $tt_id, $taxonomy ) { $object_id = (int) $object_id; $menu_item_ids = wp_get_associated_nav_menu_items( $object_id, 'taxonomy', $taxonomy ); - foreach( (array) $menu_item_ids as $menu_item_id ) { + foreach ( (array) $menu_item_ids as $menu_item_id ) { wp_delete_post( $menu_item_id, true ); } } @@ -857,8 +970,7 @@ function _wp_delete_tax_menu_item( $object_id = 0, $tt_id, $taxonomy ) { * * @param string $new_status The new status of the post object. * @param string $old_status The old status of the post object. - * @param object $post The post object being transitioned from one status to another. - * @return void + * @param object $post The post object being transitioned from one status to another. */ function _wp_auto_add_pages_to_menu( $new_status, $old_status, $post ) { if ( 'publish' != $new_status || 'publish' == $old_status || 'page' != $post->post_type ) diff --git a/wp-includes/option.php b/wp-includes/option.php index 4cc8c28..842981d 100644 --- a/wp-includes/option.php +++ b/wp-includes/option.php @@ -16,10 +16,15 @@ * * If the option was serialized then it will be unserialized when it is returned. * + * Any scalar values will be returned as strings. You may coerce the return type of a given option by registering a + * 'option_{$option}' filter callback. + * * @since 1.5.0 * - * @param string $option Name of option to retrieve. Expected to not be SQL-escaped. - * @param mixed $default Optional. Default value to return if the option does not exist. + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string $option Name of option to retrieve. Expected to not be SQL-escaped. + * @param mixed $default Optional. Default value to return if the option does not exist. * @return mixed Value set for the option. */ function get_option( $option, $default = false ) { @@ -32,40 +37,43 @@ function get_option( $option, $default = false ) { /** * Filter the value of an existing option before it is retrieved. * - * The dynamic portion of the hook name, $option, refers to the option name. + * The dynamic portion of the hook name, `$option`, refers to the option name. * * Passing a truthy value to the filter will short-circuit retrieving * the option value, returning the passed value instead. * * @since 1.5.0 + * @since 4.4.0 The `$option` parameter was added. * * @param bool|mixed $pre_option Value to return instead of the option value. * Default false to skip it. + * @param string $option Option name. */ - $pre = apply_filters( 'pre_option_' . $option, false ); + $pre = apply_filters( 'pre_option_' . $option, false, $option ); if ( false !== $pre ) return $pre; if ( defined( 'WP_SETUP_CONFIG' ) ) return false; - if ( ! defined( 'WP_INSTALLING' ) ) { + if ( ! wp_installing() ) { // prevent non-existent options from triggering multiple queries $notoptions = wp_cache_get( 'notoptions', 'options' ); - if ( isset( $notoptions[$option] ) ) - + if ( isset( $notoptions[ $option ] ) ) { /** * Filter the default value for an option. * - * The dynamic portion of the hook name, $option, refers - * to the option name. + * The dynamic portion of the hook name, `$option`, refers to the option name. * * @since 3.4.0 + * @since 4.4.0 The `$option` parameter was added. * - * @param mixed $default The default value to return if the option - * does not exist in the database. + * @param mixed $default The default value to return if the option does not exist + * in the database. + * @param string $option Option name. */ - return apply_filters( 'default_option_' . $option, $default ); + return apply_filters( 'default_option_' . $option, $default, $option ); + } $alloptions = wp_load_alloptions(); @@ -82,11 +90,14 @@ function get_option( $option, $default = false ) { $value = $row->option_value; wp_cache_add( $option, $value, 'options' ); } else { // option does not exist, so we must cache its non-existence + if ( ! is_array( $notoptions ) ) { + $notoptions = array(); + } $notoptions[$option] = true; wp_cache_set( 'notoptions', $notoptions, 'options' ); /** This filter is documented in wp-includes/option.php */ - return apply_filters( 'default_option_' . $option, $default ); + return apply_filters( 'default_option_' . $option, $default, $option ); } } } @@ -98,7 +109,7 @@ function get_option( $option, $default = false ) { $value = $row->option_value; } else { /** This filter is documented in wp-includes/option.php */ - return apply_filters( 'default_option_' . $option, $default ); + return apply_filters( 'default_option_' . $option, $default, $option ); } } @@ -112,15 +123,17 @@ function get_option( $option, $default = false ) { /** * Filter the value of an existing option. * - * The dynamic portion of the hook name, $option, refers to the option name. + * The dynamic portion of the hook name, `$option`, refers to the option name. * * @since 1.5.0 As 'option_' . $setting * @since 3.0.0 + * @since 4.4.0 The `$option` parameter was added. * - * @param mixed $value Value of the option. If stored serialized, it will be - * unserialized prior to being returned. + * @param mixed $value Value of the option. If stored serialized, it will be + * unserialized prior to being returned. + * @param string $option Option name. */ - return apply_filters( 'option_' . $option, maybe_unserialize( $value ) ); + return apply_filters( 'option_' . $option, maybe_unserialize( $value ), $option ); } /** @@ -141,7 +154,6 @@ function wp_protect_special_option( $option ) { /** * Print option value after sanitizing for forms. * - * @uses attr Sanitizes value. * @since 1.5.0 * * @param string $option Option name. @@ -155,12 +167,14 @@ function form_option( $option ) { * * @since 2.2.0 * + * @global wpdb $wpdb WordPress database abstraction object. + * * @return array List of all options. */ function wp_load_alloptions() { global $wpdb; - if ( !defined( 'WP_INSTALLING' ) || !is_multisite() ) + if ( ! wp_installing() || ! is_multisite() ) $alloptions = wp_cache_get( 'alloptions', 'options' ); else $alloptions = false; @@ -174,7 +188,7 @@ function wp_load_alloptions() { foreach ( (array) $alloptions_db as $o ) { $alloptions[$o->option_name] = $o->option_value; } - if ( !defined( 'WP_INSTALLING' ) || !is_multisite() ) + if ( ! wp_installing() || ! is_multisite() ) wp_cache_add( 'alloptions', $alloptions, 'options' ); } @@ -186,12 +200,14 @@ function wp_load_alloptions() { * * @since 3.0.0 * + * @global wpdb $wpdb WordPress database abstraction object. + * * @param int $site_id Optional site ID for which to query the options. Defaults to the current site. */ function wp_load_core_site_options( $site_id = null ) { global $wpdb; - if ( !is_multisite() || wp_using_ext_object_cache() || defined( 'WP_INSTALLING' ) ) + if ( ! is_multisite() || wp_using_ext_object_cache() || wp_installing() ) return; if ( empty($site_id) ) @@ -218,17 +234,23 @@ function wp_load_core_site_options( $site_id = null ) { * it will be serialized before it is inserted into the database. Remember, * resources can not be serialized or added as an option. * - * If the option does not exist, then the option will be added with the option - * value, but you will not be able to set whether it is autoloaded. If you want - * to set whether an option is autoloaded, then you need to use the add_option(). + * If the option does not exist, then the option will be added with the option value, + * with an `$autoload` value of 'yes'. * * @since 1.0.0 + * @since 4.2.0 The `$autoload` parameter was added. * - * @param string $option Option name. Expected to not be SQL-escaped. - * @param mixed $value Option value. Must be serializable if non-scalar. Expected to not be SQL-escaped. + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string $option Option name. Expected to not be SQL-escaped. + * @param mixed $value Option value. Must be serializable if non-scalar. Expected to not be SQL-escaped. + * @param string|bool $autoload Optional. Whether to load the option when WordPress starts up. For existing options, + * `$autoload` can only be updated using `update_option()` if `$value` is also changed. + * Accepts 'yes'|true to enable or 'no'|false to disable. For non-existent options, + * the default value is 'yes'. Default null. * @return bool False if value was not updated and true if value was updated. */ -function update_option( $option, $value ) { +function update_option( $option, $value, $autoload = null ) { global $wpdb; $option = trim($option); @@ -246,14 +268,16 @@ function update_option( $option, $value ) { /** * Filter a specific option before its value is (maybe) serialized and updated. * - * The dynamic portion of the hook name, $option, refers to the option name. + * The dynamic portion of the hook name, `$option`, refers to the option name. * * @since 2.6.0 + * @since 4.4.0 The `$option` parameter was added. * - * @param mixed $value The new, unserialized option value. - * @param mixed $old_value The old option value. + * @param mixed $value The new, unserialized option value. + * @param mixed $old_value The old option value. + * @param string $option Option name. */ - $value = apply_filters( 'pre_update_option_' . $option, $value, $old_value ); + $value = apply_filters( 'pre_update_option_' . $option, $value, $old_value, $option ); /** * Filter an option before its value is (maybe) serialized and updated. @@ -270,8 +294,15 @@ function update_option( $option, $value ) { if ( $value === $old_value ) return false; - if ( false === $old_value ) - return add_option( $option, $value ); + /** This filter is documented in wp-includes/option.php */ + if ( apply_filters( 'default_option_' . $option, false ) === $old_value ) { + // Default setting for new options is 'yes'. + if ( null === $autoload ) { + $autoload = 'yes'; + } + + return add_option( $option, $value, '', $autoload ); + } $serialized_value = maybe_serialize( $value ); @@ -286,7 +317,15 @@ function update_option( $option, $value ) { */ do_action( 'update_option', $option, $old_value, $value ); - $result = $wpdb->update( $wpdb->options, array( 'option_value' => $serialized_value ), array( 'option_name' => $option ) ); + $update_args = array( + 'option_value' => $serialized_value, + ); + + if ( null !== $autoload ) { + $update_args['autoload'] = ( 'no' === $autoload || false === $autoload ) ? 'no' : 'yes'; + } + + $result = $wpdb->update( $wpdb->options, $update_args, array( 'option_name' => $option ) ); if ( ! $result ) return false; @@ -296,7 +335,7 @@ function update_option( $option, $value ) { wp_cache_set( 'notoptions', $notoptions, 'options' ); } - if ( ! defined( 'WP_INSTALLING' ) ) { + if ( ! wp_installing() ) { $alloptions = wp_load_alloptions(); if ( isset( $alloptions[$option] ) ) { $alloptions[ $option ] = $serialized_value; @@ -309,14 +348,16 @@ function update_option( $option, $value ) { /** * Fires after the value of a specific option has been successfully updated. * - * The dynamic portion of the hook name, $option, refers to the option name. + * The dynamic portion of the hook name, `$option`, refers to the option name. * * @since 2.0.1 + * @since 4.4.0 The `$option` parameter was added. * - * @param mixed $old_value The old option value. - * @param mixed $value The new option value. + * @param mixed $old_value The old option value. + * @param mixed $value The new option value. + * @param string $option Option name. */ - do_action( "update_option_{$option}", $old_value, $value ); + do_action( "update_option_{$option}", $old_value, $value, $option ); /** * Fires after the value of an option has been successfully updated. @@ -345,10 +386,13 @@ function update_option( $option, $value ) { * * @since 1.0.0 * - * @param string $option Name of option to add. Expected to not be SQL-escaped. - * @param mixed $value Optional. Option value. Must be serializable if non-scalar. Expected to not be SQL-escaped. - * @param mixed $deprecated Optional. Description. Not used anymore. - * @param bool $autoload Optional. Default is enabled. Whether to load the option when WordPress starts up. + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string $option Name of option to add. Expected to not be SQL-escaped. + * @param mixed $value Optional. Option value. Must be serializable if non-scalar. Expected to not be SQL-escaped. + * @param string $deprecated Optional. Description. Not used anymore. + * @param string|bool $autoload Optional. Whether to load the option when WordPress starts up. + * Default is enabled. Accepts 'no' to disable for legacy reasons. * @return bool False if option was not added and true if option was added. */ function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' ) { @@ -371,11 +415,12 @@ function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' ) // Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query $notoptions = wp_cache_get( 'notoptions', 'options' ); if ( !is_array( $notoptions ) || !isset( $notoptions[$option] ) ) - if ( false !== get_option( $option ) ) + /** This filter is documented in wp-includes/option.php */ + if ( apply_filters( 'default_option_' . $option, false ) !== get_option( $option ) ) return false; $serialized_value = maybe_serialize( $value ); - $autoload = ( 'no' === $autoload ) ? 'no' : 'yes'; + $autoload = ( 'no' === $autoload || false === $autoload ) ? 'no' : 'yes'; /** * Fires before an option is added. @@ -391,7 +436,7 @@ function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' ) if ( ! $result ) return false; - if ( ! defined( 'WP_INSTALLING' ) ) { + if ( ! wp_installing() ) { if ( 'yes' == $autoload ) { $alloptions = wp_load_alloptions(); $alloptions[ $option ] = $serialized_value; @@ -411,7 +456,7 @@ function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' ) /** * Fires after a specific option has been added. * - * The dynamic portion of the hook name, $option, refers to the option name. + * The dynamic portion of the hook name, `$option`, refers to the option name. * * @since 2.5.0 As "add_option_{$name}" * @since 3.0.0 @@ -438,6 +483,8 @@ function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' ) * * @since 1.2.0 * + * @global wpdb $wpdb WordPress database abstraction object. + * * @param string $option Name of option to remove. Expected to not be SQL-escaped. * @return bool True, if option is successfully deleted. False on failure. */ @@ -465,7 +512,7 @@ function delete_option( $option ) { do_action( 'delete_option', $option ); $result = $wpdb->delete( $wpdb->options, array( 'option_name' => $option ) ); - if ( ! defined( 'WP_INSTALLING' ) ) { + if ( ! wp_installing() ) { if ( 'yes' == $row->autoload ) { $alloptions = wp_load_alloptions(); if ( is_array( $alloptions ) && isset( $alloptions[$option] ) ) { @@ -481,7 +528,7 @@ function delete_option( $option ) { /** * Fires after a specific option has been deleted. * - * The dynamic portion of the hook name, $option, refers to the option name. + * The dynamic portion of the hook name, `$option`, refers to the option name. * * @since 3.0.0 * @@ -515,7 +562,7 @@ function delete_transient( $transient ) { /** * Fires immediately before a specific transient is deleted. * - * The dynamic portion of the hook name, $transient, refers to the transient name. + * The dynamic portion of the hook name, `$transient`, refers to the transient name. * * @since 3.0.0 * @@ -551,31 +598,33 @@ function delete_transient( $transient ) { /** * Get the value of a transient. * - * If the transient does not exist or does not have a value, then the return value - * will be false. + * If the transient does not exist, does not have a value, or has expired, + * then the return value will be false. * * @since 2.8.0 * - * @param string $transient Transient name. Expected to not be SQL-escaped - * @return mixed Value of transient + * @param string $transient Transient name. Expected to not be SQL-escaped. + * @return mixed Value of transient. */ function get_transient( $transient ) { - /** + /** * Filter the value of an existing transient. * - * The dynamic portion of the hook name, $transient, refers to the transient name. + * The dynamic portion of the hook name, `$transient`, refers to the transient name. * * Passing a truthy value to the filter will effectively short-circuit retrieval * of the transient, returning the passed value instead. * * @since 2.8.0 + * @since 4.4.0 The `$transient` parameter was added * - * @param mixed $pre_transient The default value to return if the transient does not exist. - * Any value other than false will short-circuit the retrieval - * of the transient, and return the returned value. + * @param mixed $pre_transient The default value to return if the transient does not exist. + * Any value other than false will short-circuit the retrieval + * of the transient, and return the returned value. + * @param string $transient Transient name. */ - $pre = apply_filters( 'pre_transient_' . $transient, false ); + $pre = apply_filters( 'pre_transient_' . $transient, false, $transient ); if ( false !== $pre ) return $pre; @@ -583,12 +632,13 @@ function get_transient( $transient ) { $value = wp_cache_get( $transient, 'transient' ); } else { $transient_option = '_transient_' . $transient; - if ( ! defined( 'WP_INSTALLING' ) ) { + if ( ! wp_installing() ) { // If option is not in alloptions, it is not autoloaded and thus has a timeout $alloptions = wp_load_alloptions(); if ( !isset( $alloptions[$transient_option] ) ) { $transient_timeout = '_transient_timeout_' . $transient; - if ( get_option( $transient_timeout ) < time() ) { + $timeout = get_option( $transient_timeout ); + if ( false !== $timeout && $timeout < time() ) { delete_option( $transient_option ); delete_option( $transient_timeout ); $value = false; @@ -603,13 +653,15 @@ function get_transient( $transient ) { /** * Filter an existing transient's value. * - * The dynamic portion of the hook name, $transient, refers to the transient name. + * The dynamic portion of the hook name, `$transient`, refers to the transient name. * * @since 2.8.0 + * @since 4.4.0 The `$transient` parameter was added * - * @param mixed $value Value of transient. + * @param mixed $value Value of transient. + * @param string $transient Transient name. */ - return apply_filters( 'transient_' . $transient, $value ); + return apply_filters( 'transient_' . $transient, $value, $transient ); } /** @@ -620,54 +672,73 @@ function get_transient( $transient ) { * * @since 2.8.0 * - * @param string $transient Transient name. Expected to not be SQL-escaped. - * @param mixed $value Transient value. Must be serializable if non-scalar. Expected to not be SQL-escaped. - * @param int $expiration Time until expiration in seconds, default 0 + * @param string $transient Transient name. Expected to not be SQL-escaped. Must be + * 172 characters or fewer in length. + * @param mixed $value Transient value. Must be serializable if non-scalar. + * Expected to not be SQL-escaped. + * @param int $expiration Optional. Time until expiration in seconds. Default 0 (no expiration). * @return bool False if value was not set and true if value was set. */ function set_transient( $transient, $value, $expiration = 0 ) { + $expiration = (int) $expiration; + /** * Filter a specific transient before its value is set. * - * The dynamic portion of the hook name, $transient, refers to the transient name. + * The dynamic portion of the hook name, `$transient`, refers to the transient name. * * @since 3.0.0 + * @since 4.2.0 The `$expiration` parameter was added. + * @since 4.4.0 The `$transient` parameter was added. * - * @param mixed $value New value of transient. + * @param mixed $value New value of transient. + * @param int $expiration Time until expiration in seconds. + * @param string $transient Transient name. */ - $value = apply_filters( 'pre_set_transient_' . $transient, $value ); + $value = apply_filters( 'pre_set_transient_' . $transient, $value, $expiration, $transient ); - $expiration = (int) $expiration; + /** + * Filter the expiration for a transient before its value is set. + * + * The dynamic portion of the hook name, `$transient`, refers to the transient name. + * + * @since 4.4.0 + * + * @param int $expiration Time until expiration in seconds. Use 0 for no expiration. + * @param mixed $value New value of transient. + * @param string $transient Transient name. + */ + $expiration = apply_filters( 'expiration_of_transient_' . $transient, $expiration, $value, $transient ); if ( wp_using_ext_object_cache() ) { $result = wp_cache_set( $transient, $value, 'transient', $expiration ); } else { $transient_timeout = '_transient_timeout_' . $transient; - $transient = '_transient_' . $transient; - if ( false === get_option( $transient ) ) { + $transient_option = '_transient_' . $transient; + if ( false === get_option( $transient_option ) ) { $autoload = 'yes'; if ( $expiration ) { $autoload = 'no'; add_option( $transient_timeout, time() + $expiration, '', 'no' ); } - $result = add_option( $transient, $value, '', $autoload ); + $result = add_option( $transient_option, $value, '', $autoload ); } else { // If expiration is requested, but the transient has no timeout option, // delete, then re-create transient rather than update. $update = true; if ( $expiration ) { if ( false === get_option( $transient_timeout ) ) { - delete_option( $transient ); + delete_option( $transient_option ); add_option( $transient_timeout, time() + $expiration, '', 'no' ); - $result = add_option( $transient, $value, '', 'no' ); + $result = add_option( $transient_option, $value, '', 'no' ); $update = false; } else { update_option( $transient_timeout, time() + $expiration ); } } if ( $update ) { - $result = update_option( $transient, $value ); + $result = update_option( $transient_option, $value ); } } } @@ -677,23 +748,27 @@ function set_transient( $transient, $value, $expiration = 0 ) { /** * Fires after the value for a specific transient has been set. * - * The dynamic portion of the hook name, $transient, refers to the transient name. + * The dynamic portion of the hook name, `$transient`, refers to the transient name. * * @since 3.0.0 + * @since 3.6.0 The `$value` and `$expiration` parameters were added. + * @since 4.4.0 The `$transient` parameter was added. * - * @param mixed $value Transient value. - * @param int $expiration Time until expiration in seconds. Default 0. + * @param mixed $value Transient value. + * @param int $expiration Time until expiration in seconds. + * @param string $transient The name of the transient. */ - do_action( 'set_transient_' . $transient, $value, $expiration ); + do_action( 'set_transient_' . $transient, $value, $expiration, $transient ); /** * Fires after the value for a transient has been set. * * @since 3.0.0 + * @since 3.6.0 The `$value` and `$expiration` parameters were added. * * @param string $transient The name of the transient. * @param mixed $value Transient value. - * @param int $expiration Time until expiration in seconds. Default 0. + * @param int $expiration Time until expiration in seconds. */ do_action( 'setted_transient', $transient, $value, $expiration ); } @@ -711,17 +786,17 @@ function set_transient( $transient, $value, $expiration = 0 ) { */ function wp_user_settings() { - if ( ! is_admin() ) - return; - - if ( defined('DOING_AJAX') ) + if ( ! is_admin() || defined( 'DOING_AJAX' ) ) { return; + } - if ( ! $user_id = get_current_user_id() ) + if ( ! $user_id = get_current_user_id() ) { return; + } - if ( is_super_admin() && ! is_user_member_of_blog() ) + if ( is_super_admin() && ! is_user_member_of_blog() ) { return; + } $settings = (string) get_user_option( 'user-settings', $user_id ); @@ -744,8 +819,9 @@ function wp_user_settings() { } // The cookie is not set in the current browser or the saved value is newer. - setcookie( 'wp-settings-' . $user_id, $settings, time() + YEAR_IN_SECONDS, SITECOOKIEPATH ); - setcookie( 'wp-settings-time-' . $user_id, time(), time() + YEAR_IN_SECONDS, SITECOOKIEPATH ); + $secure = ( 'https' === parse_url( admin_url(), PHP_URL_SCHEME ) ); + setcookie( 'wp-settings-' . $user_id, $settings, time() + YEAR_IN_SECONDS, SITECOOKIEPATH, null, $secure ); + setcookie( 'wp-settings-time-' . $user_id, time(), time() + YEAR_IN_SECONDS, SITECOOKIEPATH, null, $secure ); $_COOKIE['wp-settings-' . $user_id] = $settings; } @@ -754,7 +830,7 @@ function wp_user_settings() { * * @since 2.7.0 * - * @param string $name The name of the setting. + * @param string $name The name of the setting. * @param string $default Optional default value to return when $name is not set. * @return mixed the last saved user setting or the default value/false if it doesn't exist. */ @@ -772,14 +848,14 @@ function get_user_setting( $name, $default = false ) { * * @since 2.8.0 * - * @param string $name The name of the setting. + * @param string $name The name of the setting. * @param string $value The value for the setting. - * @return bool true if set successfully/false if not. + * @return bool|void true if set successfully/false if not. */ function set_user_setting( $name, $value ) { - - if ( headers_sent() ) + if ( headers_sent() ) { return false; + } $all_user_settings = get_all_user_settings(); $all_user_settings[$name] = $value; @@ -795,13 +871,13 @@ function set_user_setting( $name, $value ) { * * @since 2.7.0 * - * @param mixed $names The name or array of names of the setting to be deleted. - * @return bool true if deleted successfully/false if not. + * @param string $names The name or array of names of the setting to be deleted. + * @return bool|void true if deleted successfully/false if not. */ function delete_user_setting( $names ) { - - if ( headers_sent() ) + if ( headers_sent() ) { return false; + } $all_user_settings = get_all_user_settings(); $names = (array) $names; @@ -814,8 +890,9 @@ function delete_user_setting( $names ) { } } - if ( $deleted ) + if ( $deleted ) { return wp_set_all_user_settings( $all_user_settings ); + } return false; } @@ -825,28 +902,35 @@ function delete_user_setting( $names ) { * * @since 2.7.0 * + * @global array $_updated_user_settings + * * @return array the last saved user settings or empty array. */ function get_all_user_settings() { global $_updated_user_settings; - if ( ! $user_id = get_current_user_id() ) + if ( ! $user_id = get_current_user_id() ) { return array(); + } - if ( isset( $_updated_user_settings ) && is_array( $_updated_user_settings ) ) + if ( isset( $_updated_user_settings ) && is_array( $_updated_user_settings ) ) { return $_updated_user_settings; + } $user_settings = array(); + if ( isset( $_COOKIE['wp-settings-' . $user_id] ) ) { - $cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-' . $user_id] ); + $cookie = preg_replace( '/[^A-Za-z0-9=&_-]/', '', $_COOKIE['wp-settings-' . $user_id] ); - if ( $cookie && strpos( $cookie, '=' ) ) // '=' cannot be 1st char + if ( strpos( $cookie, '=' ) ) { // '=' cannot be 1st char parse_str( $cookie, $user_settings ); - + } } else { $option = get_user_option( 'user-settings', $user_id ); - if ( $option && is_string($option) ) + + if ( $option && is_string( $option ) ) { parse_str( $option, $user_settings ); + } } $_updated_user_settings = $user_settings; @@ -858,28 +942,33 @@ function get_all_user_settings() { * * @since 2.8.0 * + * @global array $_updated_user_settings + * * @param array $user_settings - * @return bool + * @return bool|void */ function wp_set_all_user_settings( $user_settings ) { global $_updated_user_settings; - if ( ! $user_id = get_current_user_id() ) + if ( ! $user_id = get_current_user_id() ) { return false; + } - if ( is_super_admin() && ! is_user_member_of_blog() ) + if ( is_super_admin() && ! is_user_member_of_blog() ) { return; + } $settings = ''; foreach ( $user_settings as $name => $value ) { - $_name = preg_replace( '/[^A-Za-z0-9_]+/', '', $name ); - $_value = preg_replace( '/[^A-Za-z0-9_]+/', '', $value ); + $_name = preg_replace( '/[^A-Za-z0-9_-]+/', '', $name ); + $_value = preg_replace( '/[^A-Za-z0-9_-]+/', '', $value ); - if ( ! empty( $_name ) ) + if ( ! empty( $_name ) ) { $settings .= $_name . '=' . $_value . '&'; + } } - $settings = rtrim($settings, '&'); + $settings = rtrim( $settings, '&' ); parse_str( $settings, $_updated_user_settings ); update_user_option( $user_id, 'user-settings', $settings, false ); @@ -894,77 +983,162 @@ function wp_set_all_user_settings( $user_settings ) { * @since 2.7.0 */ function delete_all_user_settings() { - if ( ! $user_id = get_current_user_id() ) + if ( ! $user_id = get_current_user_id() ) { return; + } update_user_option( $user_id, 'user-settings', '', false ); - setcookie('wp-settings-' . $user_id, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH); + setcookie( 'wp-settings-' . $user_id, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH ); } /** - * Retrieve site option value based on name of option. + * Retrieve an option value for the current network based on name of option. * * @since 2.8.0 + * @since 4.4.0 The `$use_cache` parameter was deprecated. + * @since 4.4.0 Modified into wrapper for get_network_option() + * + * @see get_network_option() + * + * @param string $option Name of option to retrieve. Expected to not be SQL-escaped. + * @param mixed $default Optional value to return if option doesn't exist. Default false. + * @param bool $deprecated Whether to use cache. Multisite only. Always set to true. + * @return mixed Value set for the option. + */ +function get_site_option( $option, $default = false, $deprecated = true ) { + return get_network_option( null, $option, $default ); +} + +/** + * Add a new option for the current network. + * + * Existing options will not be updated. Note that prior to 3.3 this wasn't the case. + * + * @since 2.8.0 + * @since 4.4.0 Modified into wrapper for add_network_option() + * + * @see add_network_option() + * + * @param string $option Name of option to add. Expected to not be SQL-escaped. + * @param mixed $value Option value, can be anything. Expected to not be SQL-escaped. + * @return bool False if the option was not added. True if the option was added. + */ +function add_site_option( $option, $value ) { + return add_network_option( null, $option, $value ); +} + +/** + * Removes a option by name for the current network. + * + * @since 2.8.0 + * @since 4.4.0 Modified into wrapper for delete_network_option() + * + * @see delete_network_option() + * + * @param string $option Name of option to remove. Expected to not be SQL-escaped. + * @return bool True, if succeed. False, if failure. + */ +function delete_site_option( $option ) { + return delete_network_option( null, $option ); +} + +/** + * Update the value of an option that was already added for the current network. + * + * @since 2.8.0 + * @since 4.4.0 Modified into wrapper for update_network_option() + * + * @see update_network_option() + * + * @param string $option Name of option. Expected to not be SQL-escaped. + * @param mixed $value Option value. Expected to not be SQL-escaped. + * @return bool False if value was not updated. True if value was updated. + */ +function update_site_option( $option, $value ) { + return update_network_option( null, $option, $value ); +} + +/** + * Retrieve a network's option value based on the option name. + * + * @since 4.4.0 * * @see get_option() * - * @param string $option Name of option to retrieve. Expected to not be SQL-escaped. - * @param mixed $default Optional value to return if option doesn't exist. Default false. - * @param bool $use_cache Whether to use cache. Multisite only. Default true. + * @global wpdb $wpdb + * @global object $current_site + * + * @param int $network_id ID of the network. Can be null to default to the current network ID. + * @param string $option Name of option to retrieve. Expected to not be SQL-escaped. + * @param mixed $default Optional. Value to return if the option doesn't exist. Default false. * @return mixed Value set for the option. */ -function get_site_option( $option, $default = false, $use_cache = true ) { - global $wpdb; +function get_network_option( $network_id, $option, $default = false ) { + global $wpdb, $current_site; + + if ( $network_id && ! is_numeric( $network_id ) ) { + return false; + } + + $network_id = (int) $network_id; + + // Fallback to the current network if a network ID is not specified. + if ( ! $network_id && is_multisite() ) { + $network_id = $current_site->id; + } /** - * Filter an existing site option before it is retrieved. + * Filter an existing network option before it is retrieved. * - * The dynamic portion of the hook name, $option, refers to the option name. + * The dynamic portion of the hook name, `$option`, refers to the option name. * * Passing a truthy value to the filter will effectively short-circuit retrieval, * returning the passed value instead. * * @since 2.9.0 As 'pre_site_option_' . $key * @since 3.0.0 + * @since 4.4.0 The `$option` parameter was added * - * @param mixed $pre_option The default value to return if the option does not exist. + * @param mixed $pre_option The default value to return if the option does not exist. + * @param string $option Option name. */ - $pre = apply_filters( 'pre_site_option_' . $option, false ); + $pre = apply_filters( 'pre_site_option_' . $option, false, $option ); - if ( false !== $pre ) - return $pre; + if ( false !== $pre ) { + return $pre; + } // prevent non-existent options from triggering multiple queries - $notoptions_key = "{$wpdb->siteid}:notoptions"; + $notoptions_key = "$network_id:notoptions"; $notoptions = wp_cache_get( $notoptions_key, 'site-options' ); - if ( isset( $notoptions[$option] ) ) { + if ( isset( $notoptions[ $option ] ) ) { /** - * Filter a specific default site option. + * Filter a specific default network option. * - * The dynamic portion of the hook name, $option, refers to the option name. + * The dynamic portion of the hook name, `$option`, refers to the option name. * * @since 3.4.0 + * @since 4.4.0 The `$option` parameter was added. * - * @param mixed $default The value to return if the site option does not exist - * in the database. + * @param mixed $default The value to return if the site option does not exist + * in the database. + * @param string $option Option name. */ - return apply_filters( 'default_site_option_' . $option, $default ); + return apply_filters( 'default_site_option_' . $option, $default, $option ); } if ( ! is_multisite() ) { - /** This filter is documented in wp-includes/option.php */ - $default = apply_filters( 'default_site_option_' . $option, $default ); - $value = get_option($option, $default); + $default = apply_filters( 'default_site_option_' . $option, $default, $option ); + $value = get_option( $option, $default ); } else { - $cache_key = "{$wpdb->siteid}:$option"; - if ( $use_cache ) - $value = wp_cache_get($cache_key, 'site-options'); + $cache_key = "$network_id:$option"; + $value = wp_cache_get( $cache_key, 'site-options' ); - if ( !isset($value) || (false === $value) ) { - $row = $wpdb->get_row( $wpdb->prepare("SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $option, $wpdb->siteid ) ); + if ( ! isset( $value ) || false === $value ) { + $row = $wpdb->get_row( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $option, $network_id ) ); // Has to be get_row instead of get_var because of funkiness with 0, false, null values if ( is_object( $row ) ) { @@ -972,85 +1146,110 @@ function get_site_option( $option, $default = false, $use_cache = true ) { $value = maybe_unserialize( $value ); wp_cache_set( $cache_key, $value, 'site-options' ); } else { - $notoptions[$option] = true; + if ( ! is_array( $notoptions ) ) { + $notoptions = array(); + } + $notoptions[ $option ] = true; wp_cache_set( $notoptions_key, $notoptions, 'site-options' ); /** This filter is documented in wp-includes/option.php */ - $value = apply_filters( 'default_site_option_' . $option, $default ); + $value = apply_filters( 'default_site_option_' . $option, $default, $option ); } } } /** - * Filter the value of an existing site option. + * Filter the value of an existing network option. * - * The dynamic portion of the hook name, $option, refers to the option name. + * The dynamic portion of the hook name, `$option`, refers to the option name. * * @since 2.9.0 As 'site_option_' . $key * @since 3.0.0 + * @since 4.4.0 The `$option` parameter was added * - * @param mixed $value Value of site option. + * @param mixed $value Value of network option. + * @param string $option Option name. */ - return apply_filters( 'site_option_' . $option, $value ); + return apply_filters( 'site_option_' . $option, $value, $option ); } /** - * Add a new site option. + * Add a new network option. * - * Existing options will not be updated. Note that prior to 3.3 this wasn't the case. + * Existing options will not be updated. * - * @since 2.8.0 + * @since 4.4.0 * * @see add_option() * - * @param string $option Name of option to add. Expected to not be SQL-escaped. - * @param mixed $value Optional. Option value, can be anything. Expected to not be SQL-escaped. + * @global wpdb $wpdb + * @global object $current_site + * + * @param int $network_id ID of the network. Can be null to default to the current network ID. + * @param string $option Name of option to add. Expected to not be SQL-escaped. + * @param mixed $value Option value, can be anything. Expected to not be SQL-escaped. * @return bool False if option was not added and true if option was added. */ -function add_site_option( $option, $value ) { - global $wpdb; +function add_network_option( $network_id, $option, $value ) { + global $wpdb, $current_site; + + if ( $network_id && ! is_numeric( $network_id ) ) { + return false; + } + + $network_id = (int) $network_id; + + // Fallback to the current network if a network ID is not specified. + if ( ! $network_id && is_multisite() ) { + $network_id = $current_site->id; + } wp_protect_special_option( $option ); /** - * Filter the value of a specific site option before it is added. + * Filter the value of a specific network option before it is added. * - * The dynamic portion of the hook name, $option, refers to the option name. + * The dynamic portion of the hook name, `$option`, refers to the option name. * * @since 2.9.0 As 'pre_add_site_option_' . $key * @since 3.0.0 + * @since 4.4.0 The `$option` parameter was added * - * @param mixed $value Value of site option. + * @param mixed $value Value of network option. + * @param string $option Option name. */ - $value = apply_filters( 'pre_add_site_option_' . $option, $value ); + $value = apply_filters( 'pre_add_site_option_' . $option, $value, $option ); - $notoptions_key = "{$wpdb->siteid}:notoptions"; + $notoptions_key = "$network_id:notoptions"; - if ( !is_multisite() ) { + if ( ! is_multisite() ) { $result = add_option( $option, $value ); } else { - $cache_key = "{$wpdb->siteid}:$option"; + $cache_key = "$network_id:$option"; // Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query $notoptions = wp_cache_get( $notoptions_key, 'site-options' ); - if ( ! is_array( $notoptions ) || ! isset( $notoptions[$option] ) ) - if ( false !== get_site_option( $option ) ) + if ( ! is_array( $notoptions ) || ! isset( $notoptions[ $option ] ) ) { + if ( false !== get_network_option( $network_id, $option, false ) ) { return false; + } + } $value = sanitize_option( $option, $value ); $serialized_value = maybe_serialize( $value ); - $result = $wpdb->insert( $wpdb->sitemeta, array('site_id' => $wpdb->siteid, 'meta_key' => $option, 'meta_value' => $serialized_value ) ); + $result = $wpdb->insert( $wpdb->sitemeta, array( 'site_id' => $network_id, 'meta_key' => $option, 'meta_value' => $serialized_value ) ); - if ( ! $result ) + if ( ! $result ) { return false; + } wp_cache_set( $cache_key, $value, 'site-options' ); // This option exists now $notoptions = wp_cache_get( $notoptions_key, 'site-options' ); // yes, again... we need it to be fresh - if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) { - unset( $notoptions[$option] ); + if ( is_array( $notoptions ) && isset( $notoptions[ $option ] ) ) { + unset( $notoptions[ $option ] ); wp_cache_set( $notoptions_key, $notoptions, 'site-options' ); } } @@ -1058,151 +1257,189 @@ function add_site_option( $option, $value ) { if ( $result ) { /** - * Fires after a specific site option has been successfully added. + * Fires after a specific network option has been successfully added. * - * The dynamic portion of the hook name, $option, refers to the option name. + * The dynamic portion of the hook name, `$option`, refers to the option name. * * @since 2.9.0 As "add_site_option_{$key}" * @since 3.0.0 * - * @param string $option Name of site option. - * @param mixed $value Value of site option. + * @param string $option Name of the network option. + * @param mixed $value Value of the network option. */ - do_action( "add_site_option_{$option}", $option, $value ); + do_action( 'add_site_option_' . $option, $option, $value ); /** - * Fires after a site option has been successfully added. + * Fires after a network option has been successfully added. * * @since 3.0.0 * - * @param string $option Name of site option. - * @param mixed $value Value of site option. + * @param string $option Name of the network option. + * @param mixed $value Value of the network option. */ - do_action( "add_site_option", $option, $value ); + do_action( 'add_site_option', $option, $value ); return true; } + return false; } /** - * Removes site option by name. + * Removes a network option by name. * - * @since 2.8.0 + * @since 4.4.0 * * @see delete_option() * - * @param string $option Name of option to remove. Expected to not be SQL-escaped. + * @global wpdb $wpdb + * @global object $current_site + * + * @param int $network_id ID of the network. Can be null to default to the current network ID. + * @param string $option Name of option to remove. Expected to not be SQL-escaped. * @return bool True, if succeed. False, if failure. */ -function delete_site_option( $option ) { - global $wpdb; +function delete_network_option( $network_id, $option ) { + global $wpdb, $current_site; - // ms_protect_special_option( $option ); @todo + if ( $network_id && ! is_numeric( $network_id ) ) { + return false; + } + + $network_id = (int) $network_id; + + // Fallback to the current network if a network ID is not specified. + if ( ! $network_id && is_multisite() ) { + $network_id = $current_site->id; + } /** - * Fires immediately before a specific site option is deleted. + * Fires immediately before a specific network option is deleted. * - * The dynamic portion of the hook name, $option, refers to the option name. + * The dynamic portion of the hook name, `$option`, refers to the option name. * * @since 3.0.0 + * @since 4.4.0 The `$option` parameter was added + * + * @param string $option Option name. */ - do_action( 'pre_delete_site_option_' . $option ); + do_action( 'pre_delete_site_option_' . $option, $option ); - if ( !is_multisite() ) { + if ( ! is_multisite() ) { $result = delete_option( $option ); } else { - $row = $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM {$wpdb->sitemeta} WHERE meta_key = %s AND site_id = %d", $option, $wpdb->siteid ) ); - if ( is_null( $row ) || !$row->meta_id ) + $row = $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM {$wpdb->sitemeta} WHERE meta_key = %s AND site_id = %d", $option, $network_id ) ); + if ( is_null( $row ) || ! $row->meta_id ) { return false; - $cache_key = "{$wpdb->siteid}:$option"; + } + $cache_key = "$network_id:$option"; wp_cache_delete( $cache_key, 'site-options' ); - $result = $wpdb->delete( $wpdb->sitemeta, array( 'meta_key' => $option, 'site_id' => $wpdb->siteid ) ); + $result = $wpdb->delete( $wpdb->sitemeta, array( 'meta_key' => $option, 'site_id' => $network_id ) ); } if ( $result ) { /** - * Fires after a specific site option has been deleted. + * Fires after a specific network option has been deleted. * - * The dynamic portion of the hook name, $option, refers to the option name. + * The dynamic portion of the hook name, `$option`, refers to the option name. * * @since 2.9.0 As "delete_site_option_{$key}" * @since 3.0.0 * - * @param string $option Name of the site option. + * @param string $option Name of the network option. */ - do_action( "delete_site_option_{$option}", $option ); + do_action( 'delete_site_option_' . $option, $option ); /** - * Fires after a site option has been deleted. + * Fires after a network option has been deleted. * * @since 3.0.0 * - * @param string $option Name of the site option. + * @param string $option Name of the network option. */ - do_action( "delete_site_option", $option ); + do_action( 'delete_site_option', $option ); return true; } + return false; } /** - * Update the value of a site option that was already added. + * Update the value of a network option that was already added. * - * @since 2.8.0 + * @since 4.4.0 * * @see update_option() * - * @param string $option Name of option. Expected to not be SQL-escaped. - * @param mixed $value Option value. Expected to not be SQL-escaped. + * @global wpdb $wpdb + * @global object $current_site + * + * @param int $network_id ID of the network. Can be null to default to the current network ID. + * @param string $option Name of option. Expected to not be SQL-escaped. + * @param mixed $value Option value. Expected to not be SQL-escaped. * @return bool False if value was not updated and true if value was updated. */ -function update_site_option( $option, $value ) { - global $wpdb; +function update_network_option( $network_id, $option, $value ) { + global $wpdb, $current_site; + + if ( $network_id && ! is_numeric( $network_id ) ) { + return false; + } + + $network_id = (int) $network_id; + + // Fallback to the current network if a network ID is not specified. + if ( ! $network_id && is_multisite() ) { + $network_id = $current_site->id; + } wp_protect_special_option( $option ); - $old_value = get_site_option( $option ); + $old_value = get_network_option( $network_id, $option, false ); /** - * Filter a specific site option before its value is updated. + * Filter a specific network option before its value is updated. * - * The dynamic portion of the hook name, $option, refers to the option name. + * The dynamic portion of the hook name, `$option`, refers to the option name. * * @since 2.9.0 As 'pre_update_site_option_' . $key * @since 3.0.0 + * @since 4.4.0 The `$option` parameter was added * - * @param mixed $value New value of site option. - * @param mixed $old_value Old value of site option. + * @param mixed $value New value of the network option. + * @param mixed $old_value Old value of the network option. + * @param string $option Option name. */ - $value = apply_filters( 'pre_update_site_option_' . $option, $value, $old_value ); + $value = apply_filters( 'pre_update_site_option_' . $option, $value, $old_value, $option ); - if ( $value === $old_value ) + if ( $value === $old_value ) { return false; + } - if ( false === $old_value ) - return add_site_option( $option, $value ); + if ( false === $old_value ) { + return add_network_option( $network_id, $option, $value ); + } - $notoptions_key = "{$wpdb->siteid}:notoptions"; + $notoptions_key = "$network_id:notoptions"; $notoptions = wp_cache_get( $notoptions_key, 'site-options' ); - if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) { - unset( $notoptions[$option] ); + if ( is_array( $notoptions ) && isset( $notoptions[ $option ] ) ) { + unset( $notoptions[ $option ] ); wp_cache_set( $notoptions_key, $notoptions, 'site-options' ); } - if ( !is_multisite() ) { + if ( ! is_multisite() ) { $result = update_option( $option, $value ); } else { $value = sanitize_option( $option, $value ); $serialized_value = maybe_serialize( $value ); - $result = $wpdb->update( $wpdb->sitemeta, array( 'meta_value' => $serialized_value ), array( 'site_id' => $wpdb->siteid, 'meta_key' => $option ) ); + $result = $wpdb->update( $wpdb->sitemeta, array( 'meta_value' => $serialized_value ), array( 'site_id' => $network_id, 'meta_key' => $option ) ); if ( $result ) { - $cache_key = "{$wpdb->siteid}:$option"; + $cache_key = "$network_id:$option"; wp_cache_set( $cache_key, $value, 'site-options' ); } } @@ -1210,32 +1447,33 @@ function update_site_option( $option, $value ) { if ( $result ) { /** - * Fires after the value of a specific site option has been successfully updated. + * Fires after the value of a specific network option has been successfully updated. * - * The dynamic portion of the hook name, $option, refers to the option name. + * The dynamic portion of the hook name, `$option`, refers to the option name. * * @since 2.9.0 As "update_site_option_{$key}" * @since 3.0.0 * - * @param string $option Name of site option. - * @param mixed $value Current value of site option. - * @param mixed $old_value Old value of site option. + * @param string $option Name of the network option. + * @param mixed $value Current value of the network option. + * @param mixed $old_value Old value of the network option. */ - do_action( "update_site_option_{$option}", $option, $value, $old_value ); + do_action( 'update_site_option_' . $option, $option, $value, $old_value ); /** - * Fires after the value of a site option has been successfully updated. + * Fires after the value of a network option has been successfully updated. * * @since 3.0.0 * - * @param string $option Name of site option. - * @param mixed $value Current value of site option. - * @param mixed $old_value Old value of site option. + * @param string $option Name of the network option. + * @param mixed $value Current value of the network option. + * @param mixed $old_value Old value of the network option. */ - do_action( "update_site_option", $option, $value, $old_value ); + do_action( 'update_site_option', $option, $value, $old_value ); return true; } + return false; } @@ -1252,7 +1490,7 @@ function delete_site_transient( $transient ) { /** * Fires immediately before a specific site transient is deleted. * - * The dynamic portion of the hook name, $transient, refers to the transient name. + * The dynamic portion of the hook name, `$transient`, refers to the transient name. * * @since 3.0.0 * @@ -1287,33 +1525,35 @@ function delete_site_transient( $transient ) { /** * Get the value of a site transient. * - * If the transient does not exist or does not have a value, then the return value - * will be false. + * If the transient does not exist, does not have a value, or has expired, + * then the return value will be false. * * @since 2.9.0 * * @see get_transient() * * @param string $transient Transient name. Expected to not be SQL-escaped. - * @return mixed Value of transient + * @return mixed Value of transient. */ function get_site_transient( $transient ) { /** * Filter the value of an existing site transient. * - * The dynamic portion of the hook name, $transient, refers to the transient name. + * The dynamic portion of the hook name, `$transient`, refers to the transient name. * * Passing a truthy value to the filter will effectively short-circuit retrieval, * returning the passed value instead. * * @since 2.9.0 + * @since 4.4.0 The `$transient` parameter was added. * - * @param mixed $pre_site_transient The default value to return if the site transient does not exist. - * Any value other than false will short-circuit the retrieval - * of the transient, and return the returned value. + * @param mixed $pre_site_transient The default value to return if the site transient does not exist. + * Any value other than false will short-circuit the retrieval + * of the transient, and return the returned value. + * @param string $transient Transient name. */ - $pre = apply_filters( 'pre_site_transient_' . $transient, false ); + $pre = apply_filters( 'pre_site_transient_' . $transient, false, $transient ); if ( false !== $pre ) return $pre; @@ -1341,13 +1581,15 @@ function get_site_transient( $transient ) { /** * Filter the value of an existing site transient. * - * The dynamic portion of the hook name, $transient, refers to the transient name. + * The dynamic portion of the hook name, `$transient`, refers to the transient name. * * @since 2.9.0 + * @since 4.4.0 The `$transient` parameter was added. * - * @param mixed $value Value of site transient. + * @param mixed $value Value of site transient. + * @param string $transient Transient name. */ - return apply_filters( 'site_transient_' . $transient, $value ); + return apply_filters( 'site_transient_' . $transient, $value, $transient ); } /** @@ -1360,9 +1602,10 @@ function get_site_transient( $transient ) { * * @see set_transient() * - * @param string $transient Transient name. Expected to not be SQL-escaped. - * @param mixed $value Transient value. Expected to not be SQL-escaped. - * @param int $expiration Time until expiration in seconds, default 0 + * @param string $transient Transient name. Expected to not be SQL-escaped. Must be + * 40 characters or fewer in length. + * @param mixed $value Transient value. Expected to not be SQL-escaped. + * @param int $expiration Optional. Time until expiration in seconds. Default 0 (no expiration). * @return bool False if value was not set and true if value was set. */ function set_site_transient( $transient, $value, $expiration = 0 ) { @@ -1370,16 +1613,31 @@ function set_site_transient( $transient, $value, $expiration = 0 ) { /** * Filter the value of a specific site transient before it is set. * - * The dynamic portion of the hook name, $transient, refers to the transient name. + * The dynamic portion of the hook name, `$transient`, refers to the transient name. * * @since 3.0.0 + * @since 4.4.0 The `$transient` parameter was added. * - * @param mixed $value Value of site transient. + * @param mixed $value New value of site transient. + * @param string $transient Transient name. */ - $value = apply_filters( 'pre_set_site_transient_' . $transient, $value ); + $value = apply_filters( 'pre_set_site_transient_' . $transient, $value, $transient ); $expiration = (int) $expiration; + /** + * Filter the expiration for a site transient before its value is set. + * + * The dynamic portion of the hook name, `$transient`, refers to the transient name. + * + * @since 4.4.0 + * + * @param int $expiration Time until expiration in seconds. Use 0 for no expiration. + * @param mixed $value New value of site transient. + * @param string $transient Transient name. + */ + $expiration = apply_filters( 'expiration_of_site_transient_' . $transient, $expiration, $value, $transient ); + if ( wp_using_ext_object_cache() ) { $result = wp_cache_set( $transient, $value, 'site-transient', $expiration ); } else { @@ -1400,14 +1658,16 @@ function set_site_transient( $transient, $value, $expiration = 0 ) { /** * Fires after the value for a specific site transient has been set. * - * The dynamic portion of the hook name, $transient, refers to the transient name. + * The dynamic portion of the hook name, `$transient`, refers to the transient name. * * @since 3.0.0 + * @since 4.4.0 The `$transient` parameter was added * - * @param mixed $value Site transient value. - * @param int $expiration Time until expiration in seconds. Default 0. + * @param mixed $value Site transient value. + * @param int $expiration Time until expiration in seconds. + * @param string $transient Transient name. */ - do_action( 'set_site_transient_' . $transient, $value, $expiration ); + do_action( 'set_site_transient_' . $transient, $value, $expiration, $transient ); /** * Fires after the value for a site transient has been set. @@ -1416,7 +1676,7 @@ function set_site_transient( $transient, $value, $expiration = 0 ) { * * @param string $transient The name of the site transient. * @param mixed $value Site transient value. - * @param int $expiration Time until expiration in seconds. Default 0. + * @param int $expiration Time until expiration in seconds. */ do_action( 'setted_site_transient', $transient, $value, $expiration ); } diff --git a/wp-includes/pluggable-deprecated.php b/wp-includes/pluggable-deprecated.php index 3afb48c..466359e 100644 --- a/wp-includes/pluggable-deprecated.php +++ b/wp-includes/pluggable-deprecated.php @@ -22,13 +22,12 @@ if ( !function_exists('set_current_user') ) : * Set $id to null and specify a name if you do not know a user's ID. * * @since 2.0.1 - * @see wp_set_current_user() An alias of wp_set_current_user() - * @deprecated 3.0.0 - * @deprecated Use wp_set_current_user() + * @deprecated 3.0.0 Use wp_set_current_user() + * @see wp_set_current_user() * * @param int|null $id User ID. * @param string $name Optional. The user's username - * @return object returns wp_set_current_user() + * @return WP_User returns wp_set_current_user() */ function set_current_user($id, $name = '') { _deprecated_function( __FUNCTION__, '3.0', 'wp_set_current_user()' ); @@ -36,13 +35,30 @@ function set_current_user($id, $name = '') { } endif; +if ( !function_exists('get_currentuserinfo') ) : +/** + * Populate global variables with information about the currently logged in user. + * + * @since 0.71 + * @deprecated 4.5.0 Use wp_get_current_user() + * @see wp_get_current_user() + * + * @return bool|WP_User False on XMLRPC Request and invalid auth cookie, WP_User instance otherwise. + */ +function get_currentuserinfo() { + _deprecated_function( __FUNCTION__, '4.5', 'wp_get_current_user()' ); + + return _wp_get_current_user(); +} +endif; + if ( !function_exists('get_userdatabylogin') ) : /** * Retrieve user info by login name. * * @since 0.71 - * @deprecated 3.3.0 - * @deprecated Use get_user_by('login') + * @deprecated 3.3.0 Use get_user_by() + * @see get_user_by() * * @param string $user_login User's username * @return bool|object False on failure, User DB row object @@ -58,8 +74,8 @@ if ( !function_exists('get_user_by_email') ) : * Retrieve user info by email. * * @since 2.5.0 - * @deprecated 3.3.0 - * @deprecated Use get_user_by('email') + * @deprecated 3.3.0 Use get_user_by() + * @see get_user_by() * * @param string $email User's email address * @return bool|object False on failure, User DB row object @@ -75,8 +91,7 @@ if ( !function_exists('wp_setcookie') ) : * Sets a cookie for a user who just logged in. This function is deprecated. * * @since 1.5.0 - * @deprecated 2.5.0 - * @deprecated Use wp_set_auth_cookie() + * @deprecated 2.5.0 Use wp_set_auth_cookie() * @see wp_set_auth_cookie() * * @param string $username The user's username @@ -100,8 +115,7 @@ if ( !function_exists('wp_clearcookie') ) : * Clears the authentication cookie, logging the user out. This function is deprecated. * * @since 1.5.0 - * @deprecated 2.5.0 - * @deprecated Use wp_clear_auth_cookie() + * @deprecated 2.5.0 Use wp_clear_auth_cookie() * @see wp_clear_auth_cookie() */ function wp_clearcookie() { @@ -121,7 +135,6 @@ if ( !function_exists('wp_get_cookie_login') ): * * @since 2.0.3 * @deprecated 2.5.0 - * @deprecated No alternative * * @return bool Always returns false */ @@ -145,12 +158,14 @@ if ( !function_exists('wp_login') ) : * failure can utilize it later. * * @since 1.2.2 - * @deprecated Use wp_signon() + * @deprecated 2.5.0 Use wp_signon() + * @see wp_signon() + * * @global string $error Error when false is returned * - * @param string $username User's username - * @param string $password User's password - * @param bool $deprecated Not used + * @param string $username User's username + * @param string $password User's password + * @param string $deprecated Not used * @return bool False on login failure, true on successful check */ function wp_login($username, $password, $deprecated = '') { @@ -177,9 +192,10 @@ endif; * * @since 2.2.0 * @deprecated 3.5.0 + * * @link https://wordpress.org/plugins/atom-publishing-protocol/ */ -if ( ! class_exists( 'wp_atom_server' ) ) { +if ( ! class_exists( 'wp_atom_server', false ) ) { class wp_atom_server { public function __call( $name, $arguments ) { _deprecated_function( __CLASS__ . '::' . $name, '3.5', 'the Atom Publishing Protocol plugin' ); @@ -189,4 +205,4 @@ if ( ! class_exists( 'wp_atom_server' ) ) { _deprecated_function( __CLASS__ . '::' . $name, '3.5', 'the Atom Publishing Protocol plugin' ); } } -} \ No newline at end of file +} diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index ef2821f..31533d5 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -17,17 +17,23 @@ if ( !function_exists('wp_set_current_user') ) : * actions on users who aren't signed in. * * @since 2.0.3 - * @global object $current_user The current user object which holds the user data. + * @global WP_User $current_user The current user object which holds the user data. * - * @param int $id User ID + * @param int $id User ID * @param string $name User's username * @return WP_User Current user User object */ function wp_set_current_user($id, $name = '') { global $current_user; - if ( isset( $current_user ) && ( $current_user instanceof WP_User ) && ( $id == $current_user->ID ) ) + // If `$id` matches the user who's already current, there's nothing to do. + if ( isset( $current_user ) + && ( $current_user instanceof WP_User ) + && ( $id == $current_user->ID ) + && ( null !== $id ) + ) { return $current_user; + } $current_user = new WP_User( $id, $name ); @@ -48,80 +54,19 @@ if ( !function_exists('wp_get_current_user') ) : /** * Retrieve the current user object. * - * @since 2.0.3 - * - * @return WP_User Current user WP_User object - */ -function wp_get_current_user() { - global $current_user; - - get_currentuserinfo(); - - return $current_user; -} -endif; - -if ( !function_exists('get_currentuserinfo') ) : -/** - * Populate global variables with information about the currently logged in user. - * * Will set the current user, if the current user is not set. The current user * will be set to the logged-in person. If no user is logged-in, then it will * set the current user to 0, which is invalid and won't have any permissions. * - * @since 0.71 + * @since 2.0.3 * - * @uses $current_user Checks if the current user is set - * @uses wp_validate_auth_cookie() Retrieves current logged in user. + * @see _wp_get_current_user() + * @global WP_User $current_user Checks if the current user is set. * - * @return bool|null False on XML-RPC Request and invalid auth cookie. Null when current user set. + * @return WP_User Current WP_User instance. */ -function get_currentuserinfo() { - global $current_user; - - if ( ! empty( $current_user ) ) { - if ( $current_user instanceof WP_User ) - return; - - // Upgrade stdClass to WP_User - if ( is_object( $current_user ) && isset( $current_user->ID ) ) { - $cur_id = $current_user->ID; - $current_user = null; - wp_set_current_user( $cur_id ); - return; - } - - // $current_user has a junk value. Force to WP_User with ID 0. - $current_user = null; - wp_set_current_user( 0 ); - return false; - } - - if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST ) { - wp_set_current_user( 0 ); - return false; - } - - /** - * Filter the current user. - * - * The default filters use this to determine the current user from the - * request's cookies, if available. - * - * Returning a value of false will effectively short-circuit setting - * the current user. - * - * @since 3.9.0 - * - * @param int|bool $user_id User ID if one has been determined, false otherwise. - */ - $user_id = apply_filters( 'determine_current_user', false ); - if ( ! $user_id ) { - wp_set_current_user( 0 ); - return false; - } - - wp_set_current_user( $user_id ); +function wp_get_current_user() { + return _wp_get_current_user(); } endif; @@ -132,7 +77,7 @@ if ( !function_exists('get_userdata') ) : * @since 0.71 * * @param int $user_id User ID - * @return WP_User|bool WP_User object on success, false on failure. + * @return WP_User|false WP_User object on success, false on failure. */ function get_userdata( $user_id ) { return get_user_by( 'id', $user_id ); @@ -144,10 +89,11 @@ if ( !function_exists('get_user_by') ) : * Retrieve user info by a given field * * @since 2.8.0 + * @since 4.4.0 Added 'ID' as an alias of 'id' for the `$field` parameter. * - * @param string $field The field to retrieve the user with. id | slug | email | login + * @param string $field The field to retrieve the user with. id | ID | slug | email | login. * @param int|string $value A value for $field. A user ID, slug, email address, or login name. - * @return WP_User|bool WP_User object on success, false on failure. + * @return WP_User|false WP_User object on success, false on failure. */ function get_user_by( $field, $value ) { $userdata = WP_User::get_data_by( $field, $value ); @@ -168,6 +114,8 @@ if ( !function_exists('cache_users') ) : * * @since 3.0.0 * + * @global wpdb $wpdb WordPress database abstraction object. + * * @param array $user_ids User ID numbers list */ function cache_users( $user_ids ) { @@ -213,12 +161,12 @@ if ( !function_exists( 'wp_mail' ) ) : * * @since 1.2.1 * - * @uses PHPMailer + * @global PHPMailer $phpmailer * - * @param string|array $to Array or comma-separated list of email addresses to send message. - * @param string $subject Email subject - * @param string $message Message contents - * @param string|array $headers Optional. Additional headers. + * @param string|array $to Array or comma-separated list of email addresses to send message. + * @param string $subject Email subject + * @param string $message Message contents + * @param string|array $headers Optional. Additional headers. * @param string|array $attachments Optional. Files to attach. * @return bool Whether the email contents were sent successfully. */ @@ -233,15 +181,35 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array() * @param array $args A compacted array of wp_mail() arguments, including the "to" email, * subject, message, headers, and attachments values. */ - extract( apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', 'headers', 'attachments' ) ) ); + $atts = apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', 'headers', 'attachments' ) ); - if ( !is_array($attachments) ) - $attachments = explode( "\n", str_replace( "\r\n", "\n", $attachments ) ); + if ( isset( $atts['to'] ) ) { + $to = $atts['to']; + } + + if ( isset( $atts['subject'] ) ) { + $subject = $atts['subject']; + } + + if ( isset( $atts['message'] ) ) { + $message = $atts['message']; + } + + if ( isset( $atts['headers'] ) ) { + $headers = $atts['headers']; + } + if ( isset( $atts['attachments'] ) ) { + $attachments = $atts['attachments']; + } + + if ( ! is_array( $attachments ) ) { + $attachments = explode( "\n", str_replace( "\r\n", "\n", $attachments ) ); + } global $phpmailer; // (Re)create it, if it's gone missing - if ( !is_object( $phpmailer ) || !is_a( $phpmailer, 'PHPMailer' ) ) { + if ( ! ( $phpmailer instanceof PHPMailer ) ) { require_once ABSPATH . WPINC . '/class-phpmailer.php'; require_once ABSPATH . WPINC . '/class-smtp.php'; $phpmailer = new PHPMailer( true ); @@ -283,30 +251,37 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array() switch ( strtolower( $name ) ) { // Mainly for legacy -- process a From: header if it's there case 'from': - if ( strpos($content, '<' ) !== false ) { - // So... making my life hard again? - $from_name = substr( $content, 0, strpos( $content, '<' ) - 1 ); - $from_name = str_replace( '"', '', $from_name ); - $from_name = trim( $from_name ); + $bracket_pos = strpos( $content, '<' ); + if ( $bracket_pos !== false ) { + // Text before the bracketed email is the "From" name. + if ( $bracket_pos > 0 ) { + $from_name = substr( $content, 0, $bracket_pos - 1 ); + $from_name = str_replace( '"', '', $from_name ); + $from_name = trim( $from_name ); + } - $from_email = substr( $content, strpos( $content, '<' ) + 1 ); + $from_email = substr( $content, $bracket_pos + 1 ); $from_email = str_replace( '>', '', $from_email ); $from_email = trim( $from_email ); - } else { + + // Avoid setting an empty $from_email. + } elseif ( '' !== trim( $content ) ) { $from_email = trim( $content ); } break; case 'content-type': if ( strpos( $content, ';' ) !== false ) { - list( $type, $charset ) = explode( ';', $content ); + list( $type, $charset_content ) = explode( ';', $content ); $content_type = trim( $type ); - if ( false !== stripos( $charset, 'charset=' ) ) { - $charset = trim( str_replace( array( 'charset=', '"' ), '', $charset ) ); - } elseif ( false !== stripos( $charset, 'boundary=' ) ) { - $boundary = trim( str_replace( array( 'BOUNDARY=', 'boundary=', '"' ), '', $charset ) ); + if ( false !== stripos( $charset_content, 'charset=' ) ) { + $charset = trim( str_replace( array( 'charset=', '"' ), '', $charset_content ) ); + } elseif ( false !== stripos( $charset_content, 'boundary=' ) ) { + $boundary = trim( str_replace( array( 'BOUNDARY=', 'boundary=', '"' ), '', $charset_content ) ); $charset = ''; } - } else { + + // Avoid setting an empty $content_type. + } elseif ( '' !== trim( $content ) ) { $content_type = trim( $content ); } break; @@ -340,7 +315,7 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array() * Some hosts will block outgoing mail from this address if it doesn't exist but * there's no easy alternative. Defaulting to admin_email might appear to be another * option but some hosts may refuse to relay mail from an unknown domain. See - * http://trac.wordpress.org/ticket/5007. + * https://core.trac.wordpress.org/ticket/5007. */ if ( !isset( $from_email ) ) { @@ -379,7 +354,7 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array() try { // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>" $recipient_name = ''; - if( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) { + if ( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) { if ( count( $matches ) == 3 ) { $recipient_name = $matches[1]; $recipient = $matches[2]; @@ -401,7 +376,7 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array() try { // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>" $recipient_name = ''; - if( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) { + if ( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) { if ( count( $matches ) == 3 ) { $recipient_name = $matches[1]; $recipient = $matches[2]; @@ -419,7 +394,7 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array() try { // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>" $recipient_name = ''; - if( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) { + if ( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) { if ( count( $matches ) == 3 ) { $recipient_name = $matches[1]; $recipient = $matches[2]; @@ -472,7 +447,7 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array() // Set custom headers if ( !empty( $headers ) ) { - foreach( (array) $headers as $name => $content ) { + foreach ( (array) $headers as $name => $content ) { $phpmailer->AddCustomHeader( sprintf( '%1$s: %2$s', $name, $content ) ); } @@ -503,6 +478,19 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array() try { return $phpmailer->Send(); } catch ( phpmailerException $e ) { + + $mail_error_data = compact( 'to', 'subject', 'message', 'headers', 'attachments' ); + + /** + * Fires after a phpmailerException is caught. + * + * @since 4.4.0 + * + * @param WP_Error $error A WP_Error object with the phpmailerException code, message, and an array + * containing the mail recipient, subject, message, headers, and attachments. + */ + do_action( 'wp_mail_failed', new WP_Error( $e->getCode(), $e->getMessage(), $mail_error_data ) ); + return false; } } @@ -510,36 +498,40 @@ endif; if ( !function_exists('wp_authenticate') ) : /** - * Checks a user's login information and logs them in if it checks out. + * Authenticate a user, confirming the login credentials are valid. * * @since 2.5.0 + * @since 4.5.0 `$username` now accepts an email address. * - * @param string $username User's username - * @param string $password User's password - * @return WP_User|WP_Error WP_User object if login successful, otherwise WP_Error object. + * @param string $username User's username or email address. + * @param string $password User's password. + * @return WP_User|WP_Error WP_User object if the credentials are valid, + * otherwise WP_Error. */ function wp_authenticate($username, $password) { $username = sanitize_user($username); $password = trim($password); /** - * Filter the user to authenticate. + * Filter whether a set of user login credentials are valid. * - * If a non-null value is passed, the filter will effectively short-circuit - * authentication, returning an error instead. + * A WP_User object is returned if the credentials authenticate a user. + * WP_Error or null otherwise. * * @since 2.8.0 + * @since 4.5.0 `$username` now accepts an email address. * - * @param null|WP_User $user User to authenticate. - * @param string $username User login. - * @param string $password User password + * @param null|WP_User|WP_Error $user WP_User if the user is authenticated. + * WP_Error or null otherwise. + * @param string $username Username or email address. + * @param string $password User password */ $user = apply_filters( 'authenticate', null, $username, $password ); if ( $user == null ) { // TODO what should the error message be? (Or would these even happen?) // Only needed if all authentication handlers fail to return anything. - $user = new WP_Error('authentication_failed', __('<strong>ERROR</strong>: Invalid username or incorrect password.')); + $user = new WP_Error( 'authentication_failed', __( '<strong>ERROR</strong>: Invalid username, email address or incorrect password.' ) ); } $ignore_codes = array('empty_username', 'empty_password'); @@ -549,8 +541,9 @@ function wp_authenticate($username, $password) { * Fires after a user login has failed. * * @since 2.5.0 + * @since 4.5.0 The value of `$username` can now be an email address. * - * @param string $username User login. + * @param string $username Username or email address. */ do_action( 'wp_login_failed', $username ); } @@ -566,6 +559,7 @@ if ( !function_exists('wp_logout') ) : * @since 2.5.0 */ function wp_logout() { + wp_destroy_current_session(); wp_clear_auth_cookie(); /** @@ -589,9 +583,11 @@ if ( !function_exists('wp_validate_auth_cookie') ) : * * @since 2.5.0 * + * @global int $login_grace_period + * * @param string $cookie Optional. If used, will validate contents instead of cookie's * @param string $scheme Optional. The cookie scheme to use: auth, secure_auth, or logged_in - * @return bool|int False if invalid cookie, User ID if valid. + * @return false|int False if invalid cookie, User ID if valid. */ function wp_validate_auth_cookie($cookie = '', $scheme = '') { if ( ! $cookie_elements = wp_parse_auth_cookie($cookie, $scheme) ) { @@ -608,13 +604,16 @@ function wp_validate_auth_cookie($cookie = '', $scheme = '') { return false; } - extract($cookie_elements, EXTR_OVERWRITE); - - $expired = $expiration; + $scheme = $cookie_elements['scheme']; + $username = $cookie_elements['username']; + $hmac = $cookie_elements['hmac']; + $token = $cookie_elements['token']; + $expired = $expiration = $cookie_elements['expiration']; // Allow a grace period for POST and AJAX requests - if ( defined('DOING_AJAX') || 'POST' == $_SERVER['REQUEST_METHOD'] ) + if ( defined('DOING_AJAX') || 'POST' == $_SERVER['REQUEST_METHOD'] ) { $expired += HOUR_IN_SECONDS; + } // Quick check to see if an honest cookie has expired if ( $expired < time() ) { @@ -644,10 +643,13 @@ function wp_validate_auth_cookie($cookie = '', $scheme = '') { $pass_frag = substr($user->user_pass, 8, 4); - $key = wp_hash($username . $pass_frag . '|' . $expiration, $scheme); - $hash = hash_hmac('md5', $username . '|' . $expiration, $key); + $key = wp_hash( $username . '|' . $pass_frag . '|' . $expiration . '|' . $token, $scheme ); + + // If ext/hash is not present, compat.php's hash_hmac() does not support sha256. + $algo = function_exists( 'hash' ) ? 'sha256' : 'sha1'; + $hash = hash_hmac( $algo, $username . '|' . $expiration . '|' . $token, $key ); - if ( hash_hmac( 'md5', $hmac, $key ) !== hash_hmac( 'md5', $hash, $key ) ) { + if ( ! hash_equals( $hash, $hmac ) ) { /** * Fires if a bad authentication cookie hash is encountered. * @@ -659,8 +661,16 @@ function wp_validate_auth_cookie($cookie = '', $scheme = '') { return false; } - if ( $expiration < time() ) // AJAX/POST grace period set above + $manager = WP_Session_Tokens::get_instance( $user->ID ); + if ( ! $manager->verify( $token ) ) { + do_action( 'auth_cookie_bad_session_token', $cookie_elements ); + return false; + } + + // AJAX/POST grace period set above + if ( $expiration < time() ) { $GLOBALS['login_grace_period'] = 1; + } /** * Fires once an authentication cookie has been validated. @@ -682,20 +692,32 @@ if ( !function_exists('wp_generate_auth_cookie') ) : * * @since 2.5.0 * - * @param int $user_id User ID - * @param int $expiration Cookie expiration in seconds - * @param string $scheme Optional. The cookie scheme to use: auth, secure_auth, or logged_in - * @return string Authentication cookie contents + * @param int $user_id User ID + * @param int $expiration Cookie expiration in seconds + * @param string $scheme Optional. The cookie scheme to use: auth, secure_auth, or logged_in + * @param string $token User's session token to use for this cookie + * @return string Authentication cookie contents. Empty string if user does not exist. */ -function wp_generate_auth_cookie($user_id, $expiration, $scheme = 'auth') { +function wp_generate_auth_cookie( $user_id, $expiration, $scheme = 'auth', $token = '' ) { $user = get_userdata($user_id); + if ( ! $user ) { + return ''; + } + + if ( ! $token ) { + $manager = WP_Session_Tokens::get_instance( $user_id ); + $token = $manager->create( $expiration ); + } $pass_frag = substr($user->user_pass, 8, 4); - $key = wp_hash($user->user_login . $pass_frag . '|' . $expiration, $scheme); - $hash = hash_hmac('md5', $user->user_login . '|' . $expiration, $key); + $key = wp_hash( $user->user_login . '|' . $pass_frag . '|' . $expiration . '|' . $token, $scheme ); - $cookie = $user->user_login . '|' . $expiration . '|' . $hash; + // If ext/hash is not present, compat.php's hash_hmac() does not support sha256. + $algo = function_exists( 'hash' ) ? 'sha256' : 'sha1'; + $hash = hash_hmac( $algo, $user->user_login . '|' . $expiration . '|' . $token, $key ); + + $cookie = $user->user_login . '|' . $expiration . '|' . $token . '|' . $hash; /** * Filter the authentication cookie. @@ -706,8 +728,9 @@ function wp_generate_auth_cookie($user_id, $expiration, $scheme = 'auth') { * @param int $user_id User ID. * @param int $expiration Authentication cookie expiration in seconds. * @param string $scheme Cookie scheme used. Accepts 'auth', 'secure_auth', or 'logged_in'. + * @param string $token User's session token used. */ - return apply_filters( 'auth_cookie', $cookie, $user_id, $expiration, $scheme ); + return apply_filters( 'auth_cookie', $cookie, $user_id, $expiration, $scheme, $token ); } endif; @@ -719,7 +742,7 @@ if ( !function_exists('wp_parse_auth_cookie') ) : * * @param string $cookie * @param string $scheme Optional. The cookie scheme to use: auth, secure_auth, or logged_in - * @return array Authentication cookie components + * @return array|false Authentication cookie components */ function wp_parse_auth_cookie($cookie = '', $scheme = '') { if ( empty($cookie) ) { @@ -749,29 +772,34 @@ function wp_parse_auth_cookie($cookie = '', $scheme = '') { } $cookie_elements = explode('|', $cookie); - if ( count($cookie_elements) != 3 ) + if ( count( $cookie_elements ) !== 4 ) { return false; + } - list($username, $expiration, $hmac) = $cookie_elements; + list( $username, $expiration, $token, $hmac ) = $cookie_elements; - return compact('username', 'expiration', 'hmac', 'scheme'); + return compact( 'username', 'expiration', 'token', 'hmac', 'scheme' ); } endif; if ( !function_exists('wp_set_auth_cookie') ) : /** - * Sets the authentication cookies based on user ID. + * Log in a user by setting authentication cookies. * * The $remember parameter increases the time that the cookie will be kept. The * default the cookie is kept without remembering is two days. When $remember is * set, the cookies will be kept for 14 days or two weeks. * * @since 2.5.0 + * @since 4.3.0 Added the `$token` parameter. * - * @param int $user_id User ID - * @param bool $remember Whether to remember the user + * @param int $user_id User ID + * @param bool $remember Whether to remember the user + * @param mixed $secure Whether the admin cookies should only be sent over HTTPS. + * Default is_ssl(). + * @param string $token Optional. User's session token to use for this cookie. */ -function wp_set_auth_cookie($user_id, $remember = false, $secure = '') { +function wp_set_auth_cookie( $user_id, $remember = false, $secure = '', $token = '' ) { if ( $remember ) { /** * Filter the duration of the authentication cookie expiration period. @@ -795,8 +823,12 @@ function wp_set_auth_cookie($user_id, $remember = false, $secure = '') { $expire = 0; } - if ( '' === $secure ) + if ( '' === $secure ) { $secure = is_ssl(); + } + + // Front-end cookie is secure when the auth cookie is secure and the site's home URL is forced HTTPS. + $secure_logged_in_cookie = $secure && 'https' === parse_url( get_option( 'home' ), PHP_URL_SCHEME ); /** * Filter whether the connection is secure. @@ -813,11 +845,11 @@ function wp_set_auth_cookie($user_id, $remember = false, $secure = '') { * * @since 3.1.0 * - * @param bool $cookie Whether to use a secure cookie when logged-in. - * @param int $user_id User ID. - * @param bool $secure Whether the connection is secure. + * @param bool $secure_logged_in_cookie Whether to use a secure cookie when logged-in. + * @param int $user_id User ID. + * @param bool $secure Whether the connection is secure. */ - $secure_logged_in_cookie = apply_filters( 'secure_logged_in_cookie', false, $user_id, $secure ); + $secure_logged_in_cookie = apply_filters( 'secure_logged_in_cookie', $secure_logged_in_cookie, $user_id, $secure ); if ( $secure ) { $auth_cookie_name = SECURE_AUTH_COOKIE; @@ -827,8 +859,13 @@ function wp_set_auth_cookie($user_id, $remember = false, $secure = '') { $scheme = 'auth'; } - $auth_cookie = wp_generate_auth_cookie($user_id, $expiration, $scheme); - $logged_in_cookie = wp_generate_auth_cookie($user_id, $expiration, 'logged_in'); + if ( '' === $token ) { + $manager = WP_Session_Tokens::get_instance( $user_id ); + $token = $manager->create( $expiration ); + } + + $auth_cookie = wp_generate_auth_cookie( $user_id, $expiration, $scheme, $token ); + $logged_in_cookie = wp_generate_auth_cookie( $user_id, $expiration, 'logged_in', $token ); /** * Fires immediately before the authentication cookie is set. @@ -912,10 +949,7 @@ if ( !function_exists('is_user_logged_in') ) : function is_user_logged_in() { $user = wp_get_current_user(); - if ( ! $user->exists() ) - return false; - - return true; + return $user->exists(); } endif; @@ -1007,30 +1041,36 @@ if ( !function_exists('check_admin_referer') ) : * * @since 1.2.0 * - * @param string $action Action nonce - * @param string $query_arg where to look for nonce in $_REQUEST (since 2.5) + * @param int|string $action Action nonce. + * @param string $query_arg Optional. Key to check for nonce in `$_REQUEST` (since 2.5). + * Default '_wpnonce'. + * @return false|int False if the nonce is invalid, 1 if the nonce is valid and generated between + * 0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago. */ -function check_admin_referer($action = -1, $query_arg = '_wpnonce') { +function check_admin_referer( $action = -1, $query_arg = '_wpnonce' ) { if ( -1 == $action ) _doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2' ); $adminurl = strtolower(admin_url()); $referer = strtolower(wp_get_referer()); $result = isset($_REQUEST[$query_arg]) ? wp_verify_nonce($_REQUEST[$query_arg], $action) : false; - if ( !$result && !(-1 == $action && strpos($referer, $adminurl) === 0) ) { - wp_nonce_ays($action); - die(); - } /** * Fires once the admin request has been validated or not. * * @since 1.5.1 * - * @param string $action The nonce action. - * @param bool $result Whether the admin request nonce was validated. + * @param string $action The nonce action. + * @param false|int $result False if the nonce is invalid, 1 if the nonce is valid and generated between + * 0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago. */ do_action( 'check_admin_referer', $action, $result ); + + if ( ! $result && ! ( -1 == $action && strpos( $referer, $adminurl ) === 0 ) ) { + wp_nonce_ays( $action ); + die(); + } + return $result; } endif; @@ -1041,8 +1081,14 @@ if ( !function_exists('check_ajax_referer') ) : * * @since 2.0.3 * - * @param string $action Action nonce - * @param string $query_arg where to look for nonce in $_REQUEST (since 2.5) + * @param int|string $action Action nonce. + * @param false|string $query_arg Optional. Key to check for the nonce in `$_REQUEST` (since 2.5). If false, + * `$_REQUEST` values will be evaluated for '_ajax_nonce', and '_wpnonce' + * (in that order). Default false. + * @param bool $die Optional. Whether to die early when the nonce cannot be verified. + * Default true. + * @return false|int False if the nonce is invalid, 1 if the nonce is valid and generated between + * 0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago. */ function check_ajax_referer( $action = -1, $query_arg = false, $die = true ) { $nonce = ''; @@ -1056,23 +1102,25 @@ function check_ajax_referer( $action = -1, $query_arg = false, $die = true ) { $result = wp_verify_nonce( $nonce, $action ); - if ( $die && false == $result ) { - if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) - wp_die( -1 ); - else - die( '-1' ); - } - /** * Fires once the AJAX request has been validated or not. * * @since 2.1.0 * - * @param string $action The AJAX nonce action. - * @param bool $result Whether the AJAX request nonce was validated. + * @param string $action The AJAX nonce action. + * @param false|int $result False if the nonce is invalid, 1 if the nonce is valid and generated between + * 0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago. */ do_action( 'check_ajax_referer', $action, $result ); + if ( $die && false === $result ) { + if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) { + wp_die( -1 ); + } else { + die( '-1' ); + } + } + return $result; } endif; @@ -1083,8 +1131,10 @@ if ( !function_exists('wp_redirect') ) : * * @since 1.5.1 * + * @global bool $is_IIS + * * @param string $location The path to redirect to. - * @param int $status Status code to use. + * @param int $status Status code to use. * @return bool False if $location is not provided, true otherwise. */ function wp_redirect($location, $status = 302) { @@ -1115,7 +1165,7 @@ function wp_redirect($location, $status = 302) { $location = wp_sanitize_redirect($location); - if ( !$is_IIS && php_sapi_name() != 'cgi-fcgi' ) + if ( !$is_IIS && PHP_SAPI != 'cgi-fcgi' ) status_header($status); // This causes problems on IIS and some FastCGI setups header("Location: $location", true, $status); @@ -1130,16 +1180,45 @@ if ( !function_exists('wp_sanitize_redirect') ) : * * @since 2.3.0 * - * @return string redirect-sanitized URL + * @param string $location The path to redirect to. + * @return string Redirect-sanitized URL. **/ function wp_sanitize_redirect($location) { - $location = preg_replace('|[^a-z0-9-~+_.?#=&;,/:%!]|i', '', $location); + $regex = '/ + ( + (?: [\xC2-\xDF][\x80-\xBF] # double-byte sequences 110xxxxx 10xxxxxx + | \xE0[\xA0-\xBF][\x80-\xBF] # triple-byte sequences 1110xxxx 10xxxxxx * 2 + | [\xE1-\xEC][\x80-\xBF]{2} + | \xED[\x80-\x9F][\x80-\xBF] + | [\xEE-\xEF][\x80-\xBF]{2} + | \xF0[\x90-\xBF][\x80-\xBF]{2} # four-byte sequences 11110xxx 10xxxxxx * 3 + | [\xF1-\xF3][\x80-\xBF]{3} + | \xF4[\x80-\x8F][\x80-\xBF]{2} + ){1,40} # ...one or more times + )/x'; + $location = preg_replace_callback( $regex, '_wp_sanitize_utf8_in_redirect', $location ); + $location = preg_replace('|[^a-z0-9-~+_.?#=&;,/:%!*\[\]()@]|i', '', $location); $location = wp_kses_no_null($location); // remove %0d and %0a from location $strip = array('%0d', '%0a', '%0D', '%0A'); - $location = _deep_replace($strip, $location); - return $location; + return _deep_replace( $strip, $location ); +} + +/** + * URL encode UTF-8 characters in a URL. + * + * @ignore + * @since 4.2.0 + * @access private + * + * @see wp_sanitize_redirect() + * + * @param array $matches RegEx matches against the redirect location. + * @return string URL-encoded version of the first RegEx match. + */ +function _wp_sanitize_utf8_in_redirect( $matches ) { + return urlencode( $matches[0] ); } endif; @@ -1151,22 +1230,29 @@ if ( !function_exists('wp_safe_redirect') ) : * path. A plugin can therefore set or remove allowed host(s) to or from the * list. * - * If the host is not allowed, then the redirect is to wp-admin on the siteurl + * If the host is not allowed, then the redirect defaults to wp-admin on the siteurl * instead. This prevents malicious redirects which redirect to another host, * but only used in a few places. * * @since 2.3.0 * - * @uses wp_validate_redirect() To validate the redirect is to an allowed host. - * - * @return void Does not return anything - **/ + * @param string $location The path to redirect to. + * @param int $status Status code to use. + */ function wp_safe_redirect($location, $status = 302) { // Need to look at the URL the way it will end up in wp_redirect() $location = wp_sanitize_redirect($location); - $location = wp_validate_redirect($location, admin_url()); + /** + * Filter the redirect fallback URL for when the provided redirect is not safe (local). + * + * @since 4.3.0 + * + * @param string $fallback_url The fallback URL to use by default. + * @param int $status The redirect status. + */ + $location = wp_validate_redirect( $location, apply_filters( 'wp_safe_redirect_fallback', admin_url(), $status ) ); wp_redirect($location, $status); } @@ -1185,7 +1271,7 @@ if ( !function_exists('wp_validate_redirect') ) : * @since 2.8.1 * * @param string $location The redirect to validate - * @param string $default The value to return if $location is not allowed + * @param string $default The value to return if $location is not allowed * @return string redirect-sanitized URL **/ function wp_validate_redirect($location, $default = '') { @@ -1197,7 +1283,8 @@ function wp_validate_redirect($location, $default = '') { // In php 5 parse_url may fail if the URL query part contains http://, bug #38143 $test = ( $cut = strpos($location, '?') ) ? substr( $location, 0, $cut ) : $location; - $lp = parse_url($test); + // @-operator is used to prevent possible warnings in PHP < 5.3.3. + $lp = @parse_url($test); // Give up if malformed URL if ( false === $lp ) @@ -1207,9 +1294,17 @@ function wp_validate_redirect($location, $default = '') { if ( isset($lp['scheme']) && !('http' == $lp['scheme'] || 'https' == $lp['scheme']) ) return $default; - // Reject if scheme is set but host is not. This catches urls like https:host.com for which parse_url does not set the host field. - if ( isset($lp['scheme']) && !isset($lp['host']) ) + // Reject if certain components are set but host is not. This catches urls like https:host.com for which parse_url does not set the host field. + if ( ! isset( $lp['host'] ) && ( isset( $lp['scheme'] ) || isset( $lp['user'] ) || isset( $lp['pass'] ) || isset( $lp['port'] ) ) ) { return $default; + } + + // Reject malformed components parse_url() can return on odd inputs. + foreach ( array( 'user', 'pass', 'host' ) as $component ) { + if ( isset( $lp[ $component ] ) && strpbrk( $lp[ $component ], ':/?#@' ) ) { + return $default; + } + } $wpp = parse_url(home_url()); @@ -1236,8 +1331,8 @@ if ( ! function_exists('wp_notify_postauthor') ) : * * @since 1.0.0 * - * @param int $comment_id Comment ID - * @param string $deprecated Not used + * @param int|WP_Comment $comment_id Comment ID or WP_Comment object. + * @param string $deprecated Not used * @return bool True on completion. False if no email addresses were specified. */ function wp_notify_postauthor( $comment_id, $deprecated = null ) { @@ -1246,7 +1341,7 @@ function wp_notify_postauthor( $comment_id, $deprecated = null ) { } $comment = get_comment( $comment_id ); - if ( empty( $comment ) ) + if ( empty( $comment ) || empty( $comment->comment_post_ID ) ) return false; $post = get_post( $comment->comment_post_ID ); @@ -1269,7 +1364,7 @@ function wp_notify_postauthor( $comment_id, $deprecated = null ) { * @param array $emails An array of email addresses to receive a comment notification. * @param int $comment_id The comment ID. */ - $emails = apply_filters( 'comment_notification_recipients', $emails, $comment_id ); + $emails = apply_filters( 'comment_notification_recipients', $emails, $comment->comment_ID ); $emails = array_filter( $emails ); // If there are no addresses to send the comment to, bail. @@ -1292,7 +1387,7 @@ function wp_notify_postauthor( $comment_id, $deprecated = null ) { * Default false. * @param int $comment_id The comment ID. */ - $notify_author = apply_filters( 'comment_notification_notify_author', false, $comment_id ); + $notify_author = apply_filters( 'comment_notification_notify_author', false, $comment->comment_ID ); // The comment was left by the author if ( $author && ! $notify_author && $comment->user_id == $post->post_author ) { @@ -1321,50 +1416,51 @@ function wp_notify_postauthor( $comment_id, $deprecated = null ) { // The blogname option is escaped with esc_html on the way into the database in sanitize_option // we want to reverse this for the plain text arena of emails. $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); + $comment_content = wp_specialchars_decode( $comment->comment_content ); switch ( $comment->comment_type ) { case 'trackback': $notify_message = sprintf( __( 'New trackback on your post "%s"' ), $post->post_title ) . "\r\n"; - /* translators: 1: website name, 2: author IP, 3: author domain */ - $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; - $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n"; - $notify_message .= __('Excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n"; - $notify_message .= __('You can see all trackbacks on this post here: ') . "\r\n"; + /* translators: 1: website name, 2: website IP, 3: website hostname */ + $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; + $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n"; + $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n"; + $notify_message .= __( 'You can see all trackbacks on this post here:' ) . "\r\n"; /* translators: 1: blog name, 2: post title */ $subject = sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title ); break; case 'pingback': $notify_message = sprintf( __( 'New pingback on your post "%s"' ), $post->post_title ) . "\r\n"; - /* translators: 1: comment author, 2: author IP, 3: author domain */ - $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; - $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n"; - $notify_message .= __('Excerpt: ') . "\r\n" . sprintf('[...] %s [...]', $comment->comment_content ) . "\r\n\r\n"; - $notify_message .= __('You can see all pingbacks on this post here: ') . "\r\n"; + /* translators: 1: website name, 2: website IP, 3: website hostname */ + $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; + $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n"; + $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n"; + $notify_message .= __( 'You can see all pingbacks on this post here:' ) . "\r\n"; /* translators: 1: blog name, 2: post title */ $subject = sprintf( __('[%1$s] Pingback: "%2$s"'), $blogname, $post->post_title ); break; default: // Comments $notify_message = sprintf( __( 'New comment on your post "%s"' ), $post->post_title ) . "\r\n"; /* translators: 1: comment author, 2: author IP, 3: author domain */ - $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; - $notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n"; - $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n"; - $notify_message .= sprintf( __('Whois : http://whois.arin.net/rest/ip/%s'), $comment->comment_author_IP ) . "\r\n"; - $notify_message .= __('Comment: ') . "\r\n" . $comment->comment_content . "\r\n\r\n"; - $notify_message .= __('You can see all comments on this post here: ') . "\r\n"; + $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; + $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n"; + $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n"; + $notify_message .= sprintf( __('Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n"; + $notify_message .= __( 'You can see all comments on this post here:' ) . "\r\n"; /* translators: 1: blog name, 2: post title */ $subject = sprintf( __('[%1$s] Comment: "%2$s"'), $blogname, $post->post_title ); break; } $notify_message .= get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n"; - $notify_message .= sprintf( __('Permalink: %s'), get_comment_link( $comment_id ) ) . "\r\n"; + $notify_message .= sprintf( __('Permalink: %s'), get_comment_link( $comment ) ) . "\r\n"; - if ( user_can( $post->post_author, 'edit_comment', $comment_id ) ) { - if ( EMPTY_TRASH_DAYS ) - $notify_message .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=trash&c=$comment_id") ) . "\r\n"; - else - $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=delete&c=$comment_id") ) . "\r\n"; - $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=spam&c=$comment_id") ) . "\r\n"; + if ( user_can( $post->post_author, 'edit_comment', $comment->comment_ID ) ) { + if ( EMPTY_TRASH_DAYS ) { + $notify_message .= sprintf( __( 'Trash it: %s' ), admin_url( "comment.php?action=trash&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n"; + } else { + $notify_message .= sprintf( __( 'Delete it: %s' ), admin_url( "comment.php?action=delete&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n"; + } + $notify_message .= sprintf( __( 'Spam it: %s' ), admin_url( "comment.php?action=spam&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n"; } $wp_email = 'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME'])); @@ -1393,7 +1489,7 @@ function wp_notify_postauthor( $comment_id, $deprecated = null ) { * @param string $notify_message The comment notification email text. * @param int $comment_id Comment ID. */ - $notify_message = apply_filters( 'comment_notification_text', $notify_message, $comment_id ); + $notify_message = apply_filters( 'comment_notification_text', $notify_message, $comment->comment_ID ); /** * Filter the comment notification email subject. @@ -1403,7 +1499,7 @@ function wp_notify_postauthor( $comment_id, $deprecated = null ) { * @param string $subject The comment notification email subject. * @param int $comment_id Comment ID. */ - $subject = apply_filters( 'comment_notification_subject', $subject, $comment_id ); + $subject = apply_filters( 'comment_notification_subject', $subject, $comment->comment_ID ); /** * Filter the comment notification email headers. @@ -1413,7 +1509,7 @@ function wp_notify_postauthor( $comment_id, $deprecated = null ) { * @param string $message_headers Headers for the comment notification email. * @param int $comment_id Comment ID. */ - $message_headers = apply_filters( 'comment_notification_headers', $message_headers, $comment_id ); + $message_headers = apply_filters( 'comment_notification_headers', $message_headers, $comment->comment_ID ); foreach ( $emails as $email ) { @wp_mail( $email, wp_specialchars_decode( $subject ), $notify_message, $message_headers ); @@ -1425,27 +1521,43 @@ endif; if ( !function_exists('wp_notify_moderator') ) : /** - * Notifies the moderator of the blog about a new comment that is awaiting approval. + * Notifies the moderator of the site about a new comment that is awaiting approval. * * @since 1.0.0 * - * @uses $wpdb + * @global wpdb $wpdb WordPress database abstraction object. * - * @param int $comment_id Comment ID - * @return bool Always returns true + * Uses the {@see 'notify_moderator'} filter to determine whether the site moderator + * should be notified, overriding the site setting. + * + * @param int $comment_id Comment ID. + * @return true Always returns true. */ function wp_notify_moderator($comment_id) { global $wpdb; - if ( 0 == get_option( 'moderation_notify' ) ) + $maybe_notify = get_option( 'moderation_notify' ); + + /** + * Filter whether to send the site moderator email notifications, overriding the site setting. + * + * @since 4.4.0 + * + * @param bool $maybe_notify Whether to notify blog moderator. + * @param int $comment_ID The id of the comment for the notification. + */ + $maybe_notify = apply_filters( 'notify_moderator', $maybe_notify, $comment_id ); + + if ( ! $maybe_notify ) { return true; + } $comment = get_comment($comment_id); $post = get_post($comment->comment_post_ID); $user = get_userdata( $post->post_author ); // Send to the administration and to the post author if the author can modify the comment. $emails = array( get_option( 'admin_email' ) ); - if ( user_can( $user->ID, 'edit_comment', $comment_id ) && ! empty( $user->user_email ) ) { + if ( $user && user_can( $user->ID, 'edit_comment', $comment_id ) && ! empty( $user->user_email ) ) { if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) ) $emails[] = $user->user_email; } @@ -1456,43 +1568,47 @@ function wp_notify_moderator($comment_id) { // The blogname option is escaped with esc_html on the way into the database in sanitize_option // we want to reverse this for the plain text arena of emails. $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); + $comment_content = wp_specialchars_decode( $comment->comment_content ); switch ( $comment->comment_type ) { case 'trackback': $notify_message = sprintf( __('A new trackback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n"; $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n"; - $notify_message .= sprintf( __('Website : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; - $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n"; - $notify_message .= __('Trackback excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n"; + /* translators: 1: website name, 2: website IP, 3: website hostname */ + $notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; + $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n"; + $notify_message .= __('Trackback excerpt: ') . "\r\n" . $comment_content . "\r\n\r\n"; break; case 'pingback': $notify_message = sprintf( __('A new pingback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n"; $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n"; - $notify_message .= sprintf( __('Website : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; - $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n"; - $notify_message .= __('Pingback excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n"; + /* translators: 1: website name, 2: website IP, 3: website hostname */ + $notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; + $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n"; + $notify_message .= __('Pingback excerpt: ') . "\r\n" . $comment_content . "\r\n\r\n"; break; default: // Comments $notify_message = sprintf( __('A new comment on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n"; $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n"; - $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; - $notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n"; - $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n"; - $notify_message .= sprintf( __('Whois : http://whois.arin.net/rest/ip/%s'), $comment->comment_author_IP ) . "\r\n"; - $notify_message .= __('Comment: ') . "\r\n" . $comment->comment_content . "\r\n\r\n"; + $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; + $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n"; + $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n"; + $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n"; break; } - $notify_message .= sprintf( __('Approve it: %s'), admin_url("comment.php?action=approve&c=$comment_id") ) . "\r\n"; + $notify_message .= sprintf( __( 'Approve it: %s' ), admin_url( "comment.php?action=approve&c={$comment_id}#wpbody-content" ) ) . "\r\n"; + if ( EMPTY_TRASH_DAYS ) - $notify_message .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=trash&c=$comment_id") ) . "\r\n"; + $notify_message .= sprintf( __( 'Trash it: %s' ), admin_url( "comment.php?action=trash&c={$comment_id}#wpbody-content" ) ) . "\r\n"; else - $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=delete&c=$comment_id") ) . "\r\n"; - $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=spam&c=$comment_id") ) . "\r\n"; + $notify_message .= sprintf( __( 'Delete it: %s' ), admin_url( "comment.php?action=delete&c={$comment_id}#wpbody-content" ) ) . "\r\n"; + + $notify_message .= sprintf( __( 'Spam it: %s' ), admin_url( "comment.php?action=spam&c={$comment_id}#wpbody-content" ) ) . "\r\n"; $notify_message .= sprintf( _n('Currently %s comment is waiting for approval. Please visit the moderation panel:', 'Currently %s comments are waiting for approval. Please visit the moderation panel:', $comments_waiting), number_format_i18n($comments_waiting) ) . "\r\n"; - $notify_message .= admin_url("edit-comments.php?comment_status=moderated") . "\r\n"; + $notify_message .= admin_url( "edit-comments.php?comment_status=moderated#wpbody-content" ) . "\r\n"; $subject = sprintf( __('[%1$s] Please moderate: "%2$s"'), $blogname, $post->post_title ); $message_headers = ''; @@ -1551,9 +1667,9 @@ if ( !function_exists('wp_password_change_notification') ) : * * @since 2.7.0 * - * @param object $user User Object + * @param WP_User $user User object. */ -function wp_password_change_notification(&$user) { +function wp_password_change_notification( $user ) { // send a copy of password change notification to the admin // but check to see if it's the admin whose password we're changing, and skip this if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) ) { @@ -1573,11 +1689,23 @@ if ( !function_exists('wp_new_user_notification') ) : * A new user registration notification is also sent to admin email. * * @since 2.0.0 + * @since 4.3.0 The `$plaintext_pass` parameter was changed to `$notify`. + * @since 4.3.1 The `$plaintext_pass` parameter was deprecated. `$notify` added as a third parameter. * - * @param int $user_id User ID. - * @param string $plaintext_pass Optional. The user's plaintext password. Default empty. + * @global wpdb $wpdb WordPress database object for queries. + * @global PasswordHash $wp_hasher Portable PHP password hashing framework instance. + * + * @param int $user_id User ID. + * @param null $deprecated Not used (argument deprecated). + * @param string $notify Optional. Type of notification that should happen. Accepts 'admin' or an empty + * string (admin only), or 'both' (admin and user). Default empty. */ -function wp_new_user_notification($user_id, $plaintext_pass = '') { +function wp_new_user_notification( $user_id, $deprecated = null, $notify = '' ) { + if ( $deprecated !== null ) { + _deprecated_argument( __FUNCTION__, '4.3.1' ); + } + + global $wpdb, $wp_hasher; $user = get_userdata( $user_id ); // The blogname option is escaped with esc_html on the way into the database in sanitize_option @@ -1586,19 +1714,36 @@ function wp_new_user_notification($user_id, $plaintext_pass = '') { $message = sprintf(__('New user registration on your site %s:'), $blogname) . "\r\n\r\n"; $message .= sprintf(__('Username: %s'), $user->user_login) . "\r\n\r\n"; - $message .= sprintf(__('E-mail: %s'), $user->user_email) . "\r\n"; + $message .= sprintf(__('Email: %s'), $user->user_email) . "\r\n"; @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message); - if ( empty($plaintext_pass) ) + // `$deprecated was pre-4.3 `$plaintext_pass`. An empty `$plaintext_pass` didn't sent a user notifcation. + if ( 'admin' === $notify || ( empty( $deprecated ) && empty( $notify ) ) ) { return; + } - $message = sprintf(__('Username: %s'), $user->user_login) . "\r\n"; - $message .= sprintf(__('Password: %s'), $plaintext_pass) . "\r\n"; - $message .= wp_login_url() . "\r\n"; + // Generate something random for a password reset key. + $key = wp_generate_password( 20, false ); + + /** This action is documented in wp-login.php */ + do_action( 'retrieve_password_key', $user->user_login, $key ); + + // Now insert the key, hashed, into the DB. + if ( empty( $wp_hasher ) ) { + require_once ABSPATH . WPINC . '/class-phpass.php'; + $wp_hasher = new PasswordHash( 8, true ); + } + $hashed = time() . ':' . $wp_hasher->HashPassword( $key ); + $wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user->user_login ) ); + + $message = sprintf(__('Username: %s'), $user->user_login) . "\r\n\r\n"; + $message .= __('To set your password, visit the following address:') . "\r\n\r\n"; + $message .= '<' . network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user->user_login), 'login') . ">\r\n\r\n"; - wp_mail($user->user_email, sprintf(__('[%s] Your username and password'), $blogname), $message); + $message .= wp_login_url() . "\r\n"; + wp_mail($user->user_email, sprintf(__('[%s] Your username and password info'), $blogname), $message); } endif; @@ -1611,7 +1756,7 @@ if ( !function_exists('wp_nonce_tick') ) : * * @since 2.5.0 * - * @return int + * @return float Float value rounded up to the next highest integer. */ function wp_nonce_tick() { /** @@ -1636,11 +1781,13 @@ if ( !function_exists('wp_verify_nonce') ) : * * @since 2.0.3 * - * @param string $nonce Nonce that was used in the form to verify + * @param string $nonce Nonce that was used in the form to verify * @param string|int $action Should give context to what is taking place and be the same when nonce was created. - * @return bool Whether the nonce check passed or failed. + * @return false|int False if the nonce is invalid, 1 if the nonce is valid and generated between + * 0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago. */ -function wp_verify_nonce($nonce, $action = -1) { +function wp_verify_nonce( $nonce, $action = -1 ) { + $nonce = (string) $nonce; $user = wp_get_current_user(); $uid = (int) $user->ID; if ( ! $uid ) { @@ -1655,14 +1802,37 @@ function wp_verify_nonce($nonce, $action = -1) { $uid = apply_filters( 'nonce_user_logged_out', $uid, $action ); } + if ( empty( $nonce ) ) { + return false; + } + + $token = wp_get_session_token(); $i = wp_nonce_tick(); // Nonce generated 0-12 hours ago - if ( substr(wp_hash($i . $action . $uid, 'nonce'), -12, 10) === $nonce ) + $expected = substr( wp_hash( $i . '|' . $action . '|' . $uid . '|' . $token, 'nonce'), -12, 10 ); + if ( hash_equals( $expected, $nonce ) ) { return 1; + } + // Nonce generated 12-24 hours ago - if ( substr(wp_hash(($i - 1) . $action . $uid, 'nonce'), -12, 10) === $nonce ) + $expected = substr( wp_hash( ( $i - 1 ) . '|' . $action . '|' . $uid . '|' . $token, 'nonce' ), -12, 10 ); + if ( hash_equals( $expected, $nonce ) ) { return 2; + } + + /** + * Fires when nonce verification fails. + * + * @since 4.4.0 + * + * @param string $nonce The invalid nonce. + * @param string|int $action The nonce action. + * @param WP_User $user The current user object. + * @param string $token The user's session token. + */ + do_action( 'wp_verify_nonce_failed', $nonce, $action, $user, $token ); + // Invalid nonce return false; } @@ -1670,12 +1840,14 @@ endif; if ( !function_exists('wp_create_nonce') ) : /** - * Creates a random, one time use token. + * Creates a cryptographic token tied to a specific action, user, user session, + * and window of time. * * @since 2.0.3 + * @since 4.0.0 Session tokens were integrated with nonce creation * * @param string|int $action Scalar value to add context to the nonce. - * @return string The one use form token + * @return string The token. */ function wp_create_nonce($action = -1) { $user = wp_get_current_user(); @@ -1685,9 +1857,10 @@ function wp_create_nonce($action = -1) { $uid = apply_filters( 'nonce_user_logged_out', $uid, $action ); } + $token = wp_get_session_token(); $i = wp_nonce_tick(); - return substr(wp_hash($i . $action . $uid, 'nonce'), -12, 10); + return substr( wp_hash( $i . '|' . $action . '|' . $uid . '|' . $token, 'nonce' ), -12, 10 ); } endif; @@ -1705,16 +1878,14 @@ if ( !function_exists('wp_salt') ) : * {@link https://api.wordpress.org/secret-key/1.1/salt/ secret key created} just * for you. * - * <code> - * define('AUTH_KEY', ' Xakm<o xQy rw4EMsLKM-?!T+,PFF})H4lzcW57AF0U@N@< >M%G4Yt>f`z]MON'); - * define('SECURE_AUTH_KEY', 'LzJ}op]mr|6+![P}Ak:uNdJCJZd>(Hx.-Mh#Tz)pCIU#uGEnfFz|f ;;eU%/U^O~'); - * define('LOGGED_IN_KEY', '|i|Ux`9<p-h$aFf(qnT:sDO:D1P^wZ$$/Ra@miTJi9G;ddp_<q}6H1)o|a +&JCM'); - * define('NONCE_KEY', '%:R{[P|,s.KuMltH5}cI;/k<Gx~j!f0I)m_sIyu+&NJZ)-iO>z7X>QYR0Z_XnZ@|'); - * define('AUTH_SALT', 'eZyT)-Naw]F8CwA*VaW#q*|.)g@o}||wf~@C-YSt}(dh_r6EbI#A,y|nU2{B#JBW'); - * define('SECURE_AUTH_SALT', '!=oLUTXh,QW=H `}`L|9/^4-3 STz},T(w}W<I`.JjPi)<Bmf1v,HpGe}T1:Xt7n'); - * define('LOGGED_IN_SALT', '+XSqHc;@Q*K_b|Z?NC[3H!!EONbh.n<+=uKR:>*c(u`g~EJBf#8u#R{mUEZrozmm'); - * define('NONCE_SALT', 'h`GXHhD>SLWVfg1(1(N{;.V!MoE(SfbA_ksP@&`+AycHcAV$+?@3q+rxV{%^VyKT'); - * </code> + * define('AUTH_KEY', ' Xakm<o xQy rw4EMsLKM-?!T+,PFF})H4lzcW57AF0U@N@< >M%G4Yt>f`z]MON'); + * define('SECURE_AUTH_KEY', 'LzJ}op]mr|6+![P}Ak:uNdJCJZd>(Hx.-Mh#Tz)pCIU#uGEnfFz|f ;;eU%/U^O~'); + * define('LOGGED_IN_KEY', '|i|Ux`9<p-h$aFf(qnT:sDO:D1P^wZ$$/Ra@miTJi9G;ddp_<q}6H1)o|a +&JCM'); + * define('NONCE_KEY', '%:R{[P|,s.KuMltH5}cI;/k<Gx~j!f0I)m_sIyu+&NJZ)-iO>z7X>QYR0Z_XnZ@|'); + * define('AUTH_SALT', 'eZyT)-Naw]F8CwA*VaW#q*|.)g@o}||wf~@C-YSt}(dh_r6EbI#A,y|nU2{B#JBW'); + * define('SECURE_AUTH_SALT', '!=oLUTXh,QW=H `}`L|9/^4-3 STz},T(w}W<I`.JjPi)<Bmf1v,HpGe}T1:Xt7n'); + * define('LOGGED_IN_SALT', '+XSqHc;@Q*K_b|Z?NC[3H!!EONbh.n<+=uKR:>*c(u`g~EJBf#8u#R{mUEZrozmm'); + * define('NONCE_SALT', 'h`GXHhD>SLWVfg1(1(N{;.V!MoE(SfbA_ksP@&`+AycHcAV$+?@3q+rxV{%^VyKT'); * * Salting passwords helps against tools which has stored hashed values of * common dictionary strings. The added values makes it harder to crack. @@ -1723,6 +1894,9 @@ if ( !function_exists('wp_salt') ) : * * @link https://api.wordpress.org/secret-key/1.1/salt/ Create secrets for wp-config.php * + * @staticvar array $cached_salts + * @staticvar array $duplicated_keys + * * @param string $scheme Authentication scheme (auth, secure_auth, logged_in, nonce) * @return string Salt value */ @@ -1746,45 +1920,51 @@ function wp_salt( $scheme = 'auth' ) { $duplicated_keys = array( 'put your unique phrase here' => true ); foreach ( array( 'AUTH', 'SECURE_AUTH', 'LOGGED_IN', 'NONCE', 'SECRET' ) as $first ) { foreach ( array( 'KEY', 'SALT' ) as $second ) { - if ( ! defined( "{$first}_{$second}" ) ) + if ( ! defined( "{$first}_{$second}" ) ) { continue; + } $value = constant( "{$first}_{$second}" ); $duplicated_keys[ $value ] = isset( $duplicated_keys[ $value ] ); } } } - $key = $salt = ''; - if ( defined( 'SECRET_KEY' ) && SECRET_KEY && empty( $duplicated_keys[ SECRET_KEY ] ) ) - $key = SECRET_KEY; - if ( 'auth' == $scheme && defined( 'SECRET_SALT' ) && SECRET_SALT && empty( $duplicated_keys[ SECRET_SALT ] ) ) - $salt = SECRET_SALT; + $values = array( + 'key' => '', + 'salt' => '' + ); + if ( defined( 'SECRET_KEY' ) && SECRET_KEY && empty( $duplicated_keys[ SECRET_KEY ] ) ) { + $values['key'] = SECRET_KEY; + } + if ( 'auth' == $scheme && defined( 'SECRET_SALT' ) && SECRET_SALT && empty( $duplicated_keys[ SECRET_SALT ] ) ) { + $values['salt'] = SECRET_SALT; + } if ( in_array( $scheme, array( 'auth', 'secure_auth', 'logged_in', 'nonce' ) ) ) { foreach ( array( 'key', 'salt' ) as $type ) { $const = strtoupper( "{$scheme}_{$type}" ); if ( defined( $const ) && constant( $const ) && empty( $duplicated_keys[ constant( $const ) ] ) ) { - $$type = constant( $const ); - } elseif ( ! $$type ) { - $$type = get_site_option( "{$scheme}_{$type}" ); - if ( ! $$type ) { - $$type = wp_generate_password( 64, true, true ); - update_site_option( "{$scheme}_{$type}", $$type ); + $values[ $type ] = constant( $const ); + } elseif ( ! $values[ $type ] ) { + $values[ $type ] = get_site_option( "{$scheme}_{$type}" ); + if ( ! $values[ $type ] ) { + $values[ $type ] = wp_generate_password( 64, true, true ); + update_site_option( "{$scheme}_{$type}", $values[ $type ] ); } } } } else { - if ( ! $key ) { - $key = get_site_option( 'secret_key' ); - if ( ! $key ) { - $key = wp_generate_password( 64, true, true ); - update_site_option( 'secret_key', $key ); + if ( ! $values['key'] ) { + $values['key'] = get_site_option( 'secret_key' ); + if ( ! $values['key'] ) { + $values['key'] = wp_generate_password( 64, true, true ); + update_site_option( 'secret_key', $values['key'] ); } } - $salt = hash_hmac( 'md5', $scheme, $key ); + $values['salt'] = hash_hmac( 'md5', $scheme, $values['key'] ); } - $cached_salts[ $scheme ] = $key . $salt; + $cached_salts[ $scheme ] = $values['key'] . $values['salt']; /** This filter is documented in wp-includes/pluggable.php */ return apply_filters( 'salt', $cached_salts[ $scheme ], $scheme ); @@ -1796,9 +1976,9 @@ if ( !function_exists('wp_hash') ) : * Get hash of given string. * * @since 2.0.3 - * @uses wp_salt() Get WordPress salt * - * @param string $data Plain text to hash + * @param string $data Plain text to hash + * @param string $scheme Authentication scheme (auth, secure_auth, logged_in, nonce) * @return string Hash of $data */ function wp_hash($data, $scheme = 'auth') { @@ -1817,8 +1997,7 @@ if ( !function_exists('wp_hash_password') ) : * * @since 2.5.0 * - * @global object $wp_hasher PHPass object - * @uses PasswordHash::HashPassword + * @global PasswordHash $wp_hasher PHPass object * * @param string $password Plain text user password to hash * @return string The hash string of the password @@ -1827,7 +2006,7 @@ function wp_hash_password($password) { global $wp_hasher; if ( empty($wp_hasher) ) { - require_once( ABSPATH . 'wp-includes/class-phpass.php'); + require_once( ABSPATH . WPINC . '/class-phpass.php'); // By default, use the portable hash from phpass $wp_hasher = new PasswordHash(8, true); } @@ -1850,12 +2029,13 @@ if ( !function_exists('wp_check_password') ) : * * @since 2.5.0 * - * @global object $wp_hasher PHPass object used for checking the password + * @global PasswordHash $wp_hasher PHPass object used for checking the password * against the $hash + $password * @uses PasswordHash::CheckPassword * - * @param string $password Plaintext user's password - * @param string $hash Hash of the user's password to check against. + * @param string $password Plaintext user's password + * @param string $hash Hash of the user's password to check against. + * @param string|int $user_id Optional. User ID. * @return bool False, if the $password does not match the hashed password */ function wp_check_password($password, $hash, $user_id = '') { @@ -1863,7 +2043,7 @@ function wp_check_password($password, $hash, $user_id = '') { // If the hash is still md5... if ( strlen($hash) <= 32 ) { - $check = ( $hash == md5($password) ); + $check = hash_equals( $hash, md5( $password ) ); if ( $check && $user_id ) { // Rehash using new hash. wp_set_password($password, $user_id); @@ -1875,9 +2055,10 @@ function wp_check_password($password, $hash, $user_id = '') { * * @since 2.5.0 * - * @param bool $check Whether the passwords match. - * @param string $hash The hashed password. - * @param int $user_id User ID. + * @param bool $check Whether the passwords match. + * @param string $password The plaintext password. + * @param string $hash The hashed password. + * @param string|int $user_id User ID. Can be empty. */ return apply_filters( 'check_password', $check, $password, $hash, $user_id ); } @@ -1885,7 +2066,7 @@ function wp_check_password($password, $hash, $user_id = '') { // If the stored hash is longer than an MD5, presume the // new style phpass portable hash. if ( empty($wp_hasher) ) { - require_once( ABSPATH . 'wp-includes/class-phpass.php'); + require_once( ABSPATH . WPINC . '/class-phpass.php'); // By default, use the portable hash from phpass $wp_hasher = new PasswordHash(8, true); } @@ -1903,12 +2084,13 @@ if ( !function_exists('wp_generate_password') ) : * * @since 2.5.0 * - * @param int $length The length of password to generate - * @param bool $special_chars Whether to include standard special characters. Default true. - * @param bool $extra_special_chars Whether to include other special characters. Used when - * generating secret keys and salts. Default false. - * @return string The random password - **/ + * @param int $length Optional. The length of password to generate. Default 12. + * @param bool $special_chars Optional. Whether to include standard special characters. + * Default true. + * @param bool $extra_special_chars Optional. Whether to include other special characters. + * Used when generating secret keys and salts. Default false. + * @return string The random password. + */ function wp_generate_password( $length = 12, $special_chars = true, $extra_special_chars = false ) { $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'; if ( $special_chars ) @@ -1937,6 +2119,11 @@ if ( !function_exists('wp_rand') ) : * Generates a random number * * @since 2.6.2 + * @since 4.4.0 Uses PHP7 random_int() or the random_compat library if available. + * + * @global string $rnd_value + * @staticvar string $seed + * @staticvar bool $external_rand_source_available * * @param int $min Lower limit for the generated number * @param int $max Upper limit for the generated number @@ -1945,6 +2132,34 @@ if ( !function_exists('wp_rand') ) : function wp_rand( $min = 0, $max = 0 ) { global $rnd_value; + // Some misconfigured 32bit environments (Entropy PHP, for example) truncate integers larger than PHP_INT_MAX to PHP_INT_MAX rather than overflowing them to floats. + $max_random_number = 3000000000 === 2147483647 ? (float) "4294967295" : 4294967295; // 4294967295 = 0xffffffff + + // We only handle Ints, floats are truncated to their integer value. + $min = (int) $min; + $max = (int) $max; + + // Use PHP's CSPRNG, or a compatible method + static $use_random_int_functionality = true; + if ( $use_random_int_functionality ) { + try { + $_max = ( 0 != $max ) ? $max : $max_random_number; + // wp_rand() can accept arguments in either order, PHP cannot. + $_max = max( $min, $_max ); + $_min = min( $min, $_max ); + $val = random_int( $_min, $_max ); + if ( false !== $val ) { + return absint( $val ); + } else { + $use_random_int_functionality = false; + } + } catch ( Error $e ) { + $use_random_int_functionality = false; + } catch ( Exception $e ) { + $use_random_int_functionality = false; + } + } + // Reset $rnd_value after 14 uses // 32(md5) + 40(sha1) + 40(sha1) / 8 = 14 random numbers from $rnd_value if ( strlen($rnd_value) < 8 ) { @@ -1956,8 +2171,9 @@ function wp_rand( $min = 0, $max = 0 ) { $rnd_value .= sha1($rnd_value); $rnd_value .= sha1($rnd_value . $seed); $seed = md5($seed . $rnd_value); - if ( ! defined( 'WP_SETUP_CONFIG' ) ) - set_transient('random_seed', $seed); + if ( ! defined( 'WP_SETUP_CONFIG' ) && ! defined( 'WP_INSTALLING' ) ) { + set_transient( 'random_seed', $seed ); + } } // Take the first 8 digits for our value @@ -1968,9 +2184,6 @@ function wp_rand( $min = 0, $max = 0 ) { $value = abs(hexdec($value)); - // Some misconfigured 32bit environments (Entropy PHP, for example) truncate integers larger than PHP_INT_MAX to PHP_INT_MAX rather than overflowing them to floats. - $max_random_number = 3000000000 === 2147483647 ? (float) "4294967295" : 4294967295; // 4294967295 = 0xffffffff - // Reduce the value to be within the min - max range if ( $max != 0 ) $value = $min + ( $max - $min + 1 ) * $value / ( $max_random_number + 1 ); @@ -1986,13 +2199,16 @@ if ( !function_exists('wp_set_password') ) : * For integration with other applications, this function can be overwritten to * instead use the other package password checking algorithm. * + * Please note: This function should be used sparingly and is really only meant for single-time + * application. Leveraging this improperly in a plugin or theme could result in an endless loop + * of password resets if precautions are not taken to ensure it does not execute on every page load. + * * @since 2.5.0 * - * @uses $wpdb WordPress database object for queries - * @uses wp_hash_password() Used to encrypt the user's password before passing to the database + * @global wpdb $wpdb WordPress database abstraction object. * * @param string $password The plaintext new user password - * @param int $user_id User ID + * @param int $user_id User ID */ function wp_set_password( $password, $user_id ) { global $wpdb; @@ -2006,122 +2222,150 @@ endif; if ( !function_exists( 'get_avatar' ) ) : /** - * Retrieve the avatar for a user who provided a user ID or email address. + * Retrieve the avatar `<img>` tag for a user, email address, MD5 hash, comment, or post. * * @since 2.5.0 - * - * @param int|string|object $id_or_email A user ID, email address, or comment object - * @param int $size Size of the avatar image - * @param string $default URL to a default image to use if no avatar is available - * @param string $alt Alternative text to use in image tag. Defaults to blank - * @return string <img> tag for the user's avatar -*/ -function get_avatar( $id_or_email, $size = '96', $default = '', $alt = false ) { - if ( ! get_option('show_avatars') ) - return false; + * @since 4.2.0 Optional `$args` parameter added. + * + * @param mixed $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash, + * user email, WP_User object, WP_Post object, or WP_Comment object. + * @param int $size Optional. Height and width of the avatar image file in pixels. Default 96. + * @param string $default Optional. URL for the default image or a default type. Accepts '404' + * (return a 404 instead of a default image), 'retro' (8bit), 'monsterid' + * (monster), 'wavatar' (cartoon face), 'indenticon' (the "quilt"), + * 'mystery', 'mm', or 'mysteryman' (The Oyster Man), 'blank' (transparent GIF), + * or 'gravatar_default' (the Gravatar logo). Default is the value of the + * 'avatar_default' option, with a fallback of 'mystery'. + * @param string $alt Optional. Alternative text to use in <img> tag. Default empty. + * @param array $args { + * Optional. Extra arguments to retrieve the avatar. + * + * @type int $height Display height of the avatar in pixels. Defaults to $size. + * @type int $width Display width of the avatar in pixels. Defaults to $size. + * @type bool $force_default Whether to always show the default image, never the Gravatar. Default false. + * @type string $rating What rating to display avatars up to. Accepts 'G', 'PG', 'R', 'X', and are + * judged in that order. Default is the value of the 'avatar_rating' option. + * @type string $scheme URL scheme to use. See set_url_scheme() for accepted values. + * Default null. + * @type array|string $class Array or string of additional classes to add to the <img> element. + * Default null. + * @type bool $force_display Whether to always show the avatar - ignores the show_avatars option. + * Default false. + * @type string $extra_attr HTML attributes to insert in the IMG element. Is not sanitized. Default empty. + * } + * @return false|string `<img>` tag for the user's avatar. False on failure. + */ +function get_avatar( $id_or_email, $size = 96, $default = '', $alt = '', $args = null ) { + $defaults = array( + // get_avatar_data() args. + 'size' => 96, + 'height' => null, + 'width' => null, + 'default' => get_option( 'avatar_default', 'mystery' ), + 'force_default' => false, + 'rating' => get_option( 'avatar_rating' ), + 'scheme' => null, + 'alt' => '', + 'class' => null, + 'force_display' => false, + 'extra_attr' => '', + ); + + if ( empty( $args ) ) { + $args = array(); + } - if ( false === $alt) - $safe_alt = ''; - else - $safe_alt = esc_attr( $alt ); + $args['size'] = (int) $size; + $args['default'] = $default; + $args['alt'] = $alt; - if ( !is_numeric($size) ) - $size = '96'; + $args = wp_parse_args( $args, $defaults ); - $email = ''; - if ( is_numeric($id_or_email) ) { - $id = (int) $id_or_email; - $user = get_userdata($id); - if ( $user ) - $email = $user->user_email; - } elseif ( is_object($id_or_email) ) { - // No avatar for pingbacks or trackbacks + if ( empty( $args['height'] ) ) { + $args['height'] = $args['size']; + } + if ( empty( $args['width'] ) ) { + $args['width'] = $args['size']; + } - /** - * Filter the list of allowed comment types for retrieving avatars. - * - * @since 3.0.0 - * - * @param array $types An array of content types. Default only contains 'comment'. - */ - $allowed_comment_types = apply_filters( 'get_avatar_comment_types', array( 'comment' ) ); - if ( ! empty( $id_or_email->comment_type ) && ! in_array( $id_or_email->comment_type, (array) $allowed_comment_types ) ) - return false; + if ( is_object( $id_or_email ) && isset( $id_or_email->comment_ID ) ) { + $id_or_email = get_comment( $id_or_email ); + } - if ( ! empty( $id_or_email->user_id ) ) { - $id = (int) $id_or_email->user_id; - $user = get_userdata($id); - if ( $user ) - $email = $user->user_email; - } + /** + * Filter whether to retrieve the avatar URL early. + * + * Passing a non-null value will effectively short-circuit get_avatar(), passing + * the value through the {@see 'get_avatar'} filter and returning early. + * + * @since 4.2.0 + * + * @param string $avatar HTML for the user's avatar. Default null. + * @param mixed $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash, + * user email, WP_User object, WP_Post object, or WP_Comment object. + * @param array $args Arguments passed to get_avatar_url(), after processing. + */ + $avatar = apply_filters( 'pre_get_avatar', null, $id_or_email, $args ); - if ( ! $email && ! empty( $id_or_email->comment_author_email ) ) - $email = $id_or_email->comment_author_email; - } else { - $email = $id_or_email; + if ( ! is_null( $avatar ) ) { + /** This filter is documented in wp-includes/pluggable.php */ + return apply_filters( 'get_avatar', $avatar, $id_or_email, $args['size'], $args['default'], $args['alt'], $args ); } - if ( empty($default) ) { - $avatar_default = get_option('avatar_default'); - if ( empty($avatar_default) ) - $default = 'mystery'; - else - $default = $avatar_default; + if ( ! $args['force_display'] && ! get_option( 'show_avatars' ) ) { + return false; } - if ( !empty($email) ) - $email_hash = md5( strtolower( trim( $email ) ) ); + $url2x = get_avatar_url( $id_or_email, array_merge( $args, array( 'size' => $args['size'] * 2 ) ) ); - if ( is_ssl() ) { - $host = 'https://secure.gravatar.com'; - } else { - if ( !empty($email) ) - $host = sprintf( "http://%d.gravatar.com", ( hexdec( $email_hash[0] ) % 2 ) ); - else - $host = 'http://0.gravatar.com'; - } - - if ( 'mystery' == $default ) - $default = "$host/avatar/ad516503a11cd5ca435acc9bb6523536?s={$size}"; // ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com') - elseif ( 'blank' == $default ) - $default = $email ? 'blank' : includes_url( 'images/blank.gif' ); - elseif ( !empty($email) && 'gravatar_default' == $default ) - $default = ''; - elseif ( 'gravatar_default' == $default ) - $default = "$host/avatar/?s={$size}"; - elseif ( empty($email) ) - $default = "$host/avatar/?d=$default&s={$size}"; - elseif ( strpos($default, 'http://') === 0 ) - $default = add_query_arg( 's', $size, $default ); - - if ( !empty($email) ) { - $out = "$host/avatar/"; - $out .= $email_hash; - $out .= '?s='.$size; - $out .= '&d=' . urlencode( $default ); - - $rating = get_option('avatar_rating'); - if ( !empty( $rating ) ) - $out .= "&r={$rating}"; - - $out = str_replace( '&', '&', esc_url( $out ) ); - $avatar = "<img alt='{$safe_alt}' src='{$out}' class='avatar avatar-{$size} photo' height='{$size}' width='{$size}' />"; - } else { - $avatar = "<img alt='{$safe_alt}' src='{$default}' class='avatar avatar-{$size} photo avatar-default' height='{$size}' width='{$size}' />"; + $args = get_avatar_data( $id_or_email, $args ); + + $url = $args['url']; + + if ( ! $url || is_wp_error( $url ) ) { + return false; + } + + $class = array( 'avatar', 'avatar-' . (int) $args['size'], 'photo' ); + + if ( ! $args['found_avatar'] || $args['force_default'] ) { + $class[] = 'avatar-default'; } + if ( $args['class'] ) { + if ( is_array( $args['class'] ) ) { + $class = array_merge( $class, $args['class'] ); + } else { + $class[] = $args['class']; + } + } + + $avatar = sprintf( + "<img alt='%s' src='%s' srcset='%s' class='%s' height='%d' width='%d' %s/>", + esc_attr( $args['alt'] ), + esc_url( $url ), + esc_attr( "$url2x 2x" ), + esc_attr( join( ' ', $class ) ), + (int) $args['height'], + (int) $args['width'], + $args['extra_attr'] + ); + /** * Filter the avatar to retrieve. * * @since 2.5.0 + * @since 4.2.0 The `$args` parameter was added. * - * @param string $avatar Image tag for the user's avatar. - * @param int|object|string $id_or_email A user ID, email address, or comment object. - * @param int $size Square avatar width and height in pixels to retrieve. - * @param string $alt Alternative text to use in the avatar image tag. + * @param string $avatar <img> tag for the user's avatar. + * @param mixed $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash, + * user email, WP_User object, WP_Post object, or WP_Comment object. + * @param int $size Square avatar width and height in pixels to retrieve. + * @param string $alt Alternative text to use in the avatar image tag. * Default empty. + * @param array $args Arguments passed to get_avatar_data(), after processing. */ - return apply_filters( 'get_avatar', $avatar, $id_or_email, $size, $default, $alt ); + return apply_filters( 'get_avatar', $avatar, $id_or_email, $args['size'], $args['default'], $args['alt'], $args ); } endif; @@ -2148,16 +2392,16 @@ if ( !function_exists( 'wp_text_diff' ) ) : * @uses Text_Diff * @uses WP_Text_Diff_Renderer_Table * - * @param string $left_string "old" (left) version of string - * @param string $right_string "new" (right) version of string - * @param string|array $args Optional. Change 'title', 'title_left', and 'title_right' defaults. + * @param string $left_string "old" (left) version of string + * @param string $right_string "new" (right) version of string + * @param string|array $args Optional. Change 'title', 'title_left', and 'title_right' defaults. * @return string Empty string if strings are equivalent or HTML with differences. */ function wp_text_diff( $left_string, $right_string, $args = null ) { $defaults = array( 'title' => '', 'title_left' => '', 'title_right' => '' ); $args = wp_parse_args( $args, $defaults ); - if ( !class_exists( 'WP_Text_Diff_Renderer_Table' ) ) + if ( ! class_exists( 'WP_Text_Diff_Renderer_Table', false ) ) require( ABSPATH . WPINC . '/wp-diff.php' ); $left_string = normalize_whitespace($left_string); diff --git a/wp-includes/plugin.php b/wp-includes/plugin.php index 7eba1bb..7f6217d 100644 --- a/wp-includes/plugin.php +++ b/wp-includes/plugin.php @@ -11,7 +11,7 @@ * {@link http://us2.php.net/manual/en/language.pseudo-types.php#language.types.callback 'callback'} * type are valid. * - * Also see the {@link http://codex.wordpress.org/Plugin_API Plugin API} for + * Also see the {@link https://codex.wordpress.org/Plugin_API Plugin API} for * more information and examples on how to use a lot of these functions. * * @package WordPress @@ -35,7 +35,7 @@ if ( ! isset( $wp_current_filter ) ) $wp_current_filter = array(); /** - * Hooks a function or method to a specific filter action. + * Hook a function or method to a specific filter action. * * WordPress offers filter hooks to allow plugins to modify * various types of internal data at runtime. @@ -45,36 +45,60 @@ if ( ! isset( $wp_current_filter ) ) * the opportunity to modify a value by returning a new value. * * The following example shows how a callback function is bound to a filter hook. - * Note that $example is passed to the callback, (maybe) modified, then returned: * - * <code> - * function example_callback( $example ) { - * // Maybe modify $example in some way - * return $example; - * } - * add_filter( 'example_filter', 'example_callback' ); - * </code> + * Note that `$example` is passed to the callback, (maybe) modified, then returned: * - * Since WordPress 1.5.1, bound callbacks can take as many arguments as are - * passed as parameters in the corresponding apply_filters() call. The $accepted_args - * parameter allows for calling functions only when the number of args match. + * function example_callback( $example ) { + * // Maybe modify $example in some way. + * return $example; + * } + * add_filter( 'example_filter', 'example_callback' ); * - * <strong>Note:</strong> the function will return true whether or not the callback - * is valid. It is up to you to take care. This is done for optimization purposes, - * so everything is as quick as possible. + * Bound callbacks can accept from none to the total number of arguments passed as parameters + * in the corresponding apply_filters() call. * - * @global array $wp_filter A multidimensional array of all hooks and the callbacks hooked to them. - * @global array $merged_filters Tracks the tags that need to be merged for later. If the hook is added, it doesn't need to run through that process. + * In other words, if an apply_filters() call passes four total arguments, callbacks bound to + * it can accept none (the same as 1) of the arguments or up to four. The important part is that + * the `$accepted_args` value must reflect the number of arguments the bound callback *actually* + * opted to accept. If no arguments were accepted by the callback that is considered to be the + * same as accepting 1 argument. For example: + * + * // Filter call. + * $value = apply_filters( 'hook', $value, $arg2, $arg3 ); + * + * // Accepting zero/one arguments. + * function example_callback() { + * ... + * return 'some value'; + * } + * add_filter( 'hook', 'example_callback' ); // Where $priority is default 10, $accepted_args is default 1. + * + * // Accepting two arguments (three possible). + * function example_callback( $value, $arg2 ) { + * ... + * return $maybe_modified_value; + * } + * add_filter( 'hook', 'example_callback', 10, 2 ); // Where $priority is 10, $accepted_args is 2. + * + * *Note:* The function will return true whether or not the callback is valid. + * It is up to you to take care. This is done for optimization purposes, so + * everything is as quick as possible. * * @since 0.71 * + * @global array $wp_filter A multidimensional array of all hooks and the callbacks hooked to them. + * @global array $merged_filters Tracks the tags that need to be merged for later. If the hook is added, + * it doesn't need to run through that process. + * * @param string $tag The name of the filter to hook the $function_to_add callback to. - * @param callback $function_to_add The callback to be run when the filter is applied. - * @param int $priority (optional) The order in which the functions associated with a particular action are executed. Lower numbers correspond with earlier execution, and functions with the same priority are executed in the order in which they were added to the action. - * Default 10. - * @param int $accepted_args (optional) The number of arguments the function accepts. - * Default 1. - * @return boolean true + * @param callable $function_to_add The callback to be run when the filter is applied. + * @param int $priority Optional. Used to specify the order in which the functions + * associated with a particular action are executed. Default 10. + * Lower numbers correspond with earlier execution, + * and functions with the same priority are executed + * in the order in which they were added to the action. + * @param int $accepted_args Optional. The number of arguments the function accepts. Default 1. + * @return true */ function add_filter( $tag, $function_to_add, $priority = 10, $accepted_args = 1 ) { global $wp_filter, $merged_filters; @@ -90,20 +114,39 @@ function add_filter( $tag, $function_to_add, $priority = 10, $accepted_args = 1 * * @since 2.5.0 * - * @global array $wp_filter Stores all of the filters + * @global array $wp_filter Stores all of the filters. * - * @param string $tag The name of the filter hook. - * @param callback $function_to_check optional. - * @return mixed If $function_to_check is omitted, returns boolean for whether the hook has anything registered. - * When checking a specific function, the priority of that hook is returned, or false if the function is not attached. - * When using the $function_to_check argument, this function may return a non-boolean value that evaluates to false - * (e.g.) 0, so use the === operator for testing the return value. + * @param string $tag The name of the filter hook. + * @param callable|bool $function_to_check Optional. The callback to check for. Default false. + * @return false|int If $function_to_check is omitted, returns boolean for whether the hook has + * anything registered. When checking a specific function, the priority of that + * hook is returned, or false if the function is not attached. When using the + * $function_to_check argument, this function may return a non-boolean value + * that evaluates to false (e.g.) 0, so use the === operator for testing the + * return value. */ function has_filter($tag, $function_to_check = false) { - global $wp_filter; + // Don't reset the internal array pointer + $wp_filter = $GLOBALS['wp_filter']; + + $has = ! empty( $wp_filter[ $tag ] ); + + // Make sure at least one priority has a filter callback + if ( $has ) { + $exists = false; + foreach ( $wp_filter[ $tag ] as $callbacks ) { + if ( ! empty( $callbacks ) ) { + $exists = true; + break; + } + } + + if ( ! $exists ) { + $has = false; + } + } - $has = !empty($wp_filter[$tag]); - if ( false === $function_to_check || false == $has ) + if ( false === $function_to_check || false === $has ) return $has; if ( !$idx = _wp_filter_build_unique_id($tag, $function_to_check, false) ) @@ -126,31 +169,31 @@ function has_filter($tag, $function_to_check = false) { * the $tag parameter. * * The function allows for additional arguments to be added and passed to hooks. - * <code> - * // Our filter callback function - * function example_callback( $string, $arg1, $arg2 ) { - * // (maybe) modify $string - * return $string; - * } - * add_filter( 'example_filter', 'example_callback', 10, 3 ); - * - * // Apply the filters by calling the 'example_callback' function we - * // "hooked" to 'example_filter' using the add_filter() function above. - * // - 'example_filter' is the filter hook $tag - * // - 'filter me' is the value being filtered - * // - $arg1 and $arg2 are the additional arguments passed to the callback. - * $value = apply_filters( 'example_filter', 'filter me', $arg1, $arg2 ); - * </code> * - * @global array $wp_filter Stores all of the filters - * @global array $merged_filters Merges the filter hooks using this function. - * @global array $wp_current_filter stores the list of current filters with the current one last + * // Our filter callback function + * function example_callback( $string, $arg1, $arg2 ) { + * // (maybe) modify $string + * return $string; + * } + * add_filter( 'example_filter', 'example_callback', 10, 3 ); + * + * /* + * * Apply the filters by calling the 'example_callback' function we + * * "hooked" to 'example_filter' using the add_filter() function above. + * * - 'example_filter' is the filter hook $tag + * * - 'filter me' is the value being filtered + * * - $arg1 and $arg2 are the additional arguments passed to the callback. + * $value = apply_filters( 'example_filter', 'filter me', $arg1, $arg2 ); * * @since 0.71 * - * @param string $tag The name of the filter hook. - * @param mixed $value The value on which the filters hooked to <tt>$tag</tt> are applied on. - * @param mixed $var Additional variables passed to the functions hooked to <tt>$tag</tt>. + * @global array $wp_filter Stores all of the filters. + * @global array $merged_filters Merges the filter hooks using this function. + * @global array $wp_current_filter Stores the list of current filters with the current one last. + * + * @param string $tag The name of the filter hook. + * @param mixed $value The value on which the filters hooked to `$tag` are applied on. + * @param mixed $var,... Additional variables passed to the functions hooked to `$tag`. * @return mixed The filtered value after all hooked functions are applied to it. */ function apply_filters( $tag, $value ) { @@ -158,7 +201,7 @@ function apply_filters( $tag, $value ) { $args = array(); - // Do 'all' actions first + // Do 'all' actions first. if ( isset($wp_filter['all']) ) { $wp_current_filter[] = $tag; $args = func_get_args(); @@ -174,7 +217,7 @@ function apply_filters( $tag, $value ) { if ( !isset($wp_filter['all']) ) $wp_current_filter[] = $tag; - // Sort + // Sort. if ( !isset( $merged_filters[ $tag ] ) ) { ksort($wp_filter[$tag]); $merged_filters[ $tag ] = true; @@ -186,7 +229,7 @@ function apply_filters( $tag, $value ) { $args = func_get_args(); do { - foreach( (array) current($wp_filter[$tag]) as $the_ ) + foreach ( (array) current($wp_filter[$tag]) as $the_ ) if ( !is_null($the_['function']) ){ $args[1] = $value; $value = call_user_func_array($the_['function'], array_slice($args, 1, (int) $the_['accepted_args'])); @@ -202,16 +245,17 @@ function apply_filters( $tag, $value ) { /** * Execute functions hooked on a specific filter hook, specifying arguments in an array. * + * @since 3.0.0 + * * @see apply_filters() This function is identical, but the arguments passed to the - * functions hooked to <tt>$tag</tt> are supplied using an array. + * functions hooked to `$tag` are supplied using an array. * - * @since 3.0.0 - * @global array $wp_filter Stores all of the filters - * @global array $merged_filters Merges the filter hooks using this function. - * @global array $wp_current_filter stores the list of current filters with the current one last + * @global array $wp_filter Stores all of the filters + * @global array $merged_filters Merges the filter hooks using this function. + * @global array $wp_current_filter Stores the list of current filters with the current one last * - * @param string $tag The name of the filter hook. - * @param array $args The arguments supplied to the functions hooked to <tt>$tag</tt> + * @param string $tag The name of the filter hook. + * @param array $args The arguments supplied to the functions hooked to $tag. * @return mixed The filtered value after all hooked functions are applied to it. */ function apply_filters_ref_array($tag, $args) { @@ -242,7 +286,7 @@ function apply_filters_ref_array($tag, $args) { reset( $wp_filter[ $tag ] ); do { - foreach( (array) current($wp_filter[$tag]) as $the_ ) + foreach ( (array) current($wp_filter[$tag]) as $the_ ) if ( !is_null($the_['function']) ) $args[0] = call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args'])); @@ -266,22 +310,28 @@ function apply_filters_ref_array($tag, $args) { * * @since 1.2.0 * - * @param string $tag The filter hook to which the function to be removed is hooked. - * @param callback $function_to_remove The name of the function which should be removed. - * @param int $priority optional. The priority of the function (default: 10). - * @param int $accepted_args optional. The number of arguments the function accepts (default: 1). - * @return boolean Whether the function existed before it was removed. + * @global array $wp_filter Stores all of the filters + * @global array $merged_filters Merges the filter hooks using this function. + * + * @param string $tag The filter hook to which the function to be removed is hooked. + * @param callable $function_to_remove The name of the function which should be removed. + * @param int $priority Optional. The priority of the function. Default 10. + * @return bool Whether the function existed before it was removed. */ function remove_filter( $tag, $function_to_remove, $priority = 10 ) { - $function_to_remove = _wp_filter_build_unique_id($tag, $function_to_remove, $priority); + $function_to_remove = _wp_filter_build_unique_id( $tag, $function_to_remove, $priority ); - $r = isset($GLOBALS['wp_filter'][$tag][$priority][$function_to_remove]); + $r = isset( $GLOBALS['wp_filter'][ $tag ][ $priority ][ $function_to_remove ] ); - if ( true === $r) { - unset($GLOBALS['wp_filter'][$tag][$priority][$function_to_remove]); - if ( empty($GLOBALS['wp_filter'][$tag][$priority]) ) - unset($GLOBALS['wp_filter'][$tag][$priority]); - unset($GLOBALS['merged_filters'][$tag]); + if ( true === $r ) { + unset( $GLOBALS['wp_filter'][ $tag ][ $priority ][ $function_to_remove ] ); + if ( empty( $GLOBALS['wp_filter'][ $tag ][ $priority ] ) ) { + unset( $GLOBALS['wp_filter'][ $tag ][ $priority ] ); + } + if ( empty( $GLOBALS['wp_filter'][ $tag ] ) ) { + $GLOBALS['wp_filter'][ $tag ] = array(); + } + unset( $GLOBALS['merged_filters'][ $tag ] ); } return $r; @@ -292,22 +342,25 @@ function remove_filter( $tag, $function_to_remove, $priority = 10 ) { * * @since 2.7.0 * - * @param string $tag The filter to remove hooks from. - * @param int $priority The priority number to remove. - * @return bool True when finished. + * @global array $wp_filter Stores all of the filters + * @global array $merged_filters Merges the filter hooks using this function. + * + * @param string $tag The filter to remove hooks from. + * @param int|bool $priority Optional. The priority number to remove. Default false. + * @return true True when finished. */ -function remove_all_filters($tag, $priority = false) { +function remove_all_filters( $tag, $priority = false ) { global $wp_filter, $merged_filters; - if( isset($wp_filter[$tag]) ) { - if( false !== $priority && isset($wp_filter[$tag][$priority]) ) - unset($wp_filter[$tag][$priority]); - else - unset($wp_filter[$tag]); + if ( isset( $wp_filter[ $tag ]) ) { + if ( false === $priority ) { + $wp_filter[ $tag ] = array(); + } elseif ( isset( $wp_filter[ $tag ][ $priority ] ) ) { + $wp_filter[ $tag ][ $priority ] = array(); + } } - if( isset($merged_filters[$tag]) ) - unset($merged_filters[$tag]); + unset( $merged_filters[ $tag ] ); return true; } @@ -317,6 +370,8 @@ function remove_all_filters($tag, $priority = false) { * * @since 2.5.0 * + * @global array $wp_current_filter Stores the list of current filters with the current one last + * * @return string Hook name of the current filter or action. */ function current_filter() { @@ -329,8 +384,6 @@ function current_filter() { * * @since 3.9.0 * - * @uses current_filter() - * * @return string Hook name of the current action. */ function current_action() { @@ -342,7 +395,9 @@ function current_action() { * * The function current_filter() only returns the most recent filter or action * being executed. did_action() returns true once the action is initially - * processed. This function allows detection for any filter currently being + * processed. + * + * This function allows detection for any filter currently being * executed (despite not being the most recent filter to fire, in the case of * hooks called from hook callbacks) to be verified. * @@ -354,7 +409,7 @@ function current_action() { * * @param null|string $filter Optional. Filter to check. Defaults to null, which * checks if any filter is currently being run. - * @return bool Whether the filter is currently in the stack + * @return bool Whether the filter is currently in the stack. */ function doing_filter( $filter = null ) { global $wp_current_filter; @@ -371,8 +426,6 @@ function doing_filter( $filter = null ) { * * @since 3.9.0 * - * @uses doing_filter() - * * @param string|null $action Optional. Action to check. Defaults to null, which checks * if any action is currently being run. * @return bool Whether the action is currently in the stack. @@ -389,14 +442,17 @@ function doing_action( $action = null ) { * one or more of its PHP functions are executed at these points, using the * Action API. * - * @uses add_filter() Adds an action. Parameter list and functionality are the same. - * * @since 1.2.0 * - * @param string $tag The name of the action to which the $function_to_add is hooked. - * @param callback $function_to_add The name of the function you wish to be called. - * @param int $priority optional. Used to specify the order in which the functions associated with a particular action are executed (default: 10). Lower numbers correspond with earlier execution, and functions with the same priority are executed in the order in which they were added to the action. - * @param int $accepted_args optional. The number of arguments the function accept (default 1). + * @param string $tag The name of the action to which the $function_to_add is hooked. + * @param callable $function_to_add The name of the function you wish to be called. + * @param int $priority Optional. Used to specify the order in which the functions + * associated with a particular action are executed. Default 10. + * Lower numbers correspond with earlier execution, + * and functions with the same priority are executed + * in the order in which they were added to the action. + * @param int $accepted_args Optional. The number of arguments the function accepts. Default 1. + * @return true Will always return true. */ function add_action($tag, $function_to_add, $priority = 10, $accepted_args = 1) { return add_filter($tag, $function_to_add, $priority, $accepted_args); @@ -405,24 +461,23 @@ function add_action($tag, $function_to_add, $priority = 10, $accepted_args = 1) /** * Execute functions hooked on a specific action hook. * - * This function invokes all functions attached to action hook $tag. It is + * This function invokes all functions attached to action hook `$tag`. It is * possible to create new action hooks by simply calling this function, - * specifying the name of the new hook using the <tt>$tag</tt> parameter. + * specifying the name of the new hook using the `$tag` parameter. * * You can pass extra arguments to the hooks, much like you can with - * apply_filters(). - * - * @see apply_filters() This function works similar with the exception that - * nothing is returned and only the functions or methods are called. + * {@see apply_filters()}. * * @since 1.2.0 * - * @global array $wp_filter Stores all of the filters - * @global array $wp_actions Increments the amount of times action was triggered. + * @global array $wp_filter Stores all of the filters + * @global array $wp_actions Increments the amount of times action was triggered. + * @global array $merged_filters Merges the filter hooks using this function. + * @global array $wp_current_filter Stores the list of current filters with the current one last * - * @param string $tag The name of the action to be executed. - * @param mixed $arg,... Optional additional arguments which are passed on to the functions hooked to the action. - * @return null Will return null if $tag does not exist in $wp_filter array + * @param string $tag The name of the action to be executed. + * @param mixed $arg,... Optional. Additional arguments which are passed on to the + * functions hooked to the action. Default empty. */ function do_action($tag, $arg = '') { global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter; @@ -453,7 +508,7 @@ function do_action($tag, $arg = '') { $args[] =& $arg[0]; else $args[] = $arg; - for ( $a = 2; $a < func_num_args(); $a++ ) + for ( $a = 2, $num = func_num_args(); $a < $num; $a++ ) $args[] = func_get_arg($a); // Sort @@ -482,7 +537,7 @@ function do_action($tag, $arg = '') { * @global array $wp_actions Increments the amount of times action was triggered. * * @param string $tag The name of the action hook. - * @return int The number of times action hook <tt>$tag</tt> is fired + * @return int The number of times action hook $tag is fired. */ function did_action($tag) { global $wp_actions; @@ -496,17 +551,17 @@ function did_action($tag) { /** * Execute functions hooked on a specific action hook, specifying arguments in an array. * - * @see do_action() This function is identical, but the arguments passed to the - * functions hooked to <tt>$tag</tt> are supplied using an array. - * * @since 2.1.0 * - * @global array $wp_filter Stores all of the filters - * @global array $wp_actions Increments the amount of times action was triggered. + * @see do_action() This function is identical, but the arguments passed to the + * functions hooked to $tag< are supplied using an array. + * @global array $wp_filter Stores all of the filters + * @global array $wp_actions Increments the amount of times action was triggered. + * @global array $merged_filters Merges the filter hooks using this function. + * @global array $wp_current_filter Stores the list of current filters with the current one last * - * @param string $tag The name of the action to be executed. - * @param array $args The arguments supplied to the functions hooked to <tt>$tag</tt> - * @return null Will return null if $tag does not exist in $wp_filter array + * @param string $tag The name of the action to be executed. + * @param array $args The arguments supplied to the functions hooked to `$tag`. */ function do_action_ref_array($tag, $args) { global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter; @@ -541,7 +596,7 @@ function do_action_ref_array($tag, $args) { reset( $wp_filter[ $tag ] ); do { - foreach( (array) current($wp_filter[$tag]) as $the_ ) + foreach ( (array) current($wp_filter[$tag]) as $the_ ) if ( !is_null($the_['function']) ) call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args'])); @@ -557,12 +612,14 @@ function do_action_ref_array($tag, $args) { * * @see has_filter() has_action() is an alias of has_filter(). * - * @param string $tag The name of the action hook. - * @param callback $function_to_check optional. - * @return mixed If $function_to_check is omitted, returns boolean for whether the hook has anything registered. - * When checking a specific function, the priority of that hook is returned, or false if the function is not attached. - * When using the $function_to_check argument, this function may return a non-boolean value that evaluates to false - * (e.g.) 0, so use the === operator for testing the return value. + * @param string $tag The name of the action hook. + * @param callable|bool $function_to_check Optional. The callback to check for. Default false. + * @return bool|int If $function_to_check is omitted, returns boolean for whether the hook has + * anything registered. When checking a specific function, the priority of that + * hook is returned, or false if the function is not attached. When using the + * $function_to_check argument, this function may return a non-boolean value + * that evaluates to false (e.g.) 0, so use the === operator for testing the + * return value. */ function has_action($tag, $function_to_check = false) { return has_filter($tag, $function_to_check); @@ -577,10 +634,10 @@ function has_action($tag, $function_to_check = false) { * * @since 1.2.0 * - * @param string $tag The action hook to which the function to be removed is hooked. - * @param callback $function_to_remove The name of the function which should be removed. - * @param int $priority optional The priority of the function (default: 10). - * @return boolean Whether the function is removed. + * @param string $tag The action hook to which the function to be removed is hooked. + * @param callable $function_to_remove The name of the function which should be removed. + * @param int $priority Optional. The priority of the function. Default 10. + * @return bool Whether the function is removed. */ function remove_action( $tag, $function_to_remove, $priority = 10 ) { return remove_filter( $tag, $function_to_remove, $priority ); @@ -591,9 +648,9 @@ function remove_action( $tag, $function_to_remove, $priority = 10 ) { * * @since 2.7.0 * - * @param string $tag The action to remove hooks from. - * @param int $priority The priority number to remove them from. - * @return bool True when finished. + * @param string $tag The action to remove hooks from. + * @param int|bool $priority The priority number to remove them from. Default false. + * @return true True when finished. */ function remove_all_actions($tag, $priority = false) { return remove_all_filters($tag, $priority); @@ -610,11 +667,10 @@ function remove_all_actions($tag, $priority = false) { * * @since 1.5.0 * - * @access private + * @global array $wp_plugin_paths * * @param string $file The filename of plugin. * @return string The name of a plugin. - * @uses WP_PLUGIN_DIR */ function plugin_basename( $file ) { global $wp_plugin_paths; @@ -643,6 +699,11 @@ function plugin_basename( $file ) { * * @see plugin_basename() * + * @global array $wp_plugin_paths + * + * @staticvar string $wp_plugin_path + * @staticvar string $wpmu_plugin_path + * * @param string $file Known path to the file. * @return bool Whether the path was able to be registered. */ @@ -650,7 +711,7 @@ function wp_register_plugin_realpath( $file ) { global $wp_plugin_paths; // Normalize, but store as static to avoid recalculation of a constant value - static $wp_plugin_path, $wpmu_plugin_path; + static $wp_plugin_path = null, $wpmu_plugin_path = null; if ( ! isset( $wp_plugin_path ) ) { $wp_plugin_path = wp_normalize_path( WP_PLUGIN_DIR ); $wpmu_plugin_path = wp_normalize_path( WPMU_PLUGIN_DIR ); @@ -671,24 +732,24 @@ function wp_register_plugin_realpath( $file ) { } /** - * Gets the filesystem directory path (with trailing slash) for the plugin __FILE__ passed in + * Get the filesystem directory path (with trailing slash) for the plugin __FILE__ passed in. * * @since 2.8.0 * - * @param string $file The filename of the plugin (__FILE__) - * @return string the filesystem path of the directory that contains the plugin + * @param string $file The filename of the plugin (__FILE__). + * @return string the filesystem path of the directory that contains the plugin. */ function plugin_dir_path( $file ) { return trailingslashit( dirname( $file ) ); } /** - * Gets the URL directory path (with trailing slash) for the plugin __FILE__ passed in + * Get the URL directory path (with trailing slash) for the plugin __FILE__ passed in. * * @since 2.8.0 * - * @param string $file The filename of the plugin (__FILE__) - * @return string the URL path of the directory that contains the plugin + * @param string $file The filename of the plugin (__FILE__). + * @return string the URL path of the directory that contains the plugin. */ function plugin_dir_url( $file ) { return trailingslashit( plugins_url( '', $file ) ); @@ -709,8 +770,8 @@ function plugin_dir_url( $file ) { * * @since 2.0.0 * - * @param string $file The filename of the plugin including the path. - * @param callback $function the function hooked to the 'activate_PLUGIN' action. + * @param string $file The filename of the plugin including the path. + * @param callable $function The function hooked to the 'activate_PLUGIN' action. */ function register_activation_hook($file, $function) { $file = plugin_basename($file); @@ -732,8 +793,8 @@ function register_activation_hook($file, $function) { * * @since 2.0.0 * - * @param string $file The filename of the plugin including the path. - * @param callback $function the function hooked to the 'deactivate_PLUGIN' action. + * @param string $file The filename of the plugin including the path. + * @param callable $function The function hooked to the 'deactivate_PLUGIN' action. */ function register_deactivation_hook($file, $function) { $file = plugin_basename($file); @@ -762,8 +823,9 @@ function register_deactivation_hook($file, $function) { * * @since 2.7.0 * - * @param string $file - * @param callback $callback The callback to run when the hook is called. Must be a static method or function. + * @param string $file Plugin file. + * @param callable $callback The callback to run when the hook is called. Must be + * a static method or function. */ function register_uninstall_hook( $file, $callback ) { if ( is_array( $callback ) && is_object( $callback[0] ) ) { @@ -771,16 +833,19 @@ function register_uninstall_hook( $file, $callback ) { return; } - // The option should not be autoloaded, because it is not needed in most - // cases. Emphasis should be put on using the 'uninstall.php' way of - // uninstalling the plugin. + /* + * The option should not be autoloaded, because it is not needed in most + * cases. Emphasis should be put on using the 'uninstall.php' way of + * uninstalling the plugin. + */ $uninstallable_plugins = (array) get_option('uninstall_plugins'); $uninstallable_plugins[plugin_basename($file)] = $callback; + update_option('uninstall_plugins', $uninstallable_plugins); } /** - * Calls the 'all' hook, which will process the functions hooked into it. + * Call the 'all' hook, which will process the functions hooked into it. * * The 'all' hook passes all of the arguments or parameters that were used for * the hook, which this function was called for. @@ -793,7 +858,7 @@ function register_uninstall_hook( $file, $callback ) { * @since 2.5.0 * @access private * - * @uses $wp_filter Used to process all of the functions in the 'all' hook + * @global array $wp_filter Stores all of the filters * * @param array $args The collected parameters from the hook that was called. */ @@ -802,7 +867,7 @@ function _wp_call_all_hook($args) { reset( $wp_filter['all'] ); do { - foreach( (array) current($wp_filter['all']) as $the_ ) + foreach ( (array) current($wp_filter['all']) as $the_ ) if ( !is_null($the_['function']) ) call_user_func_array($the_['function'], $args); @@ -813,7 +878,7 @@ function _wp_call_all_hook($args) { * Build Unique ID for storage and retrieval. * * The old way to serialize the callback caused issues and this function is the - * solution. It works by checking for objects and creating an a new property in + * solution. It works by checking for objects and creating a new property in * the class to keep track of the object and new objects of the same class that * need to be added. * @@ -826,15 +891,22 @@ function _wp_call_all_hook($args) { * Functions and static method callbacks are just returned as strings and * shouldn't have any speed penalty. * - * @access private + * @link https://core.trac.wordpress.org/ticket/3875 + * * @since 2.2.3 - * @link http://trac.wordpress.org/ticket/3875 + * @access private * - * @global array $wp_filter Storage for all of the filters and actions - * @param string $tag Used in counting how many hooks were applied - * @param callback $function Used for creating unique id - * @param int|bool $priority Used in counting how many hooks were applied. If === false and $function is an object reference, we return the unique id only if it already has one, false otherwise. - * @return string|bool Unique ID for usage as array key or false if $priority === false and $function is an object reference, and it does not already have a unique id. + * @global array $wp_filter Storage for all of the filters and actions. + * @staticvar int $filter_id_count + * + * @param string $tag Used in counting how many hooks were applied + * @param callable $function Used for creating unique id + * @param int|bool $priority Used in counting how many hooks were applied. If === false + * and $function is an object reference, we return the unique + * id only if it already has one, false otherwise. + * @return string|false Unique ID for usage as array key or false if $priority === false + * and $function is an object reference, and it does not already have + * a unique id. */ function _wp_filter_build_unique_id($tag, $function, $priority) { global $wp_filter; @@ -868,7 +940,7 @@ function _wp_filter_build_unique_id($tag, $function, $priority) { return $obj_idx; } - } else if ( is_string($function[0]) ) { + } elseif ( is_string( $function[0] ) ) { // Static Calling return $function[0] . '::' . $function[1]; } diff --git a/wp-includes/pomo/entry.php b/wp-includes/pomo/entry.php index 097e92c..788092b 100644 --- a/wp-includes/pomo/entry.php +++ b/wp-includes/pomo/entry.php @@ -2,12 +2,12 @@ /** * Contains Translation_Entry class * - * @version $Id: entry.php 718 2012-10-31 00:32:02Z nbachiyski $ + * @version $Id: entry.php 1157 2015-11-20 04:30:11Z dd32 $ * @package pomo * @subpackage entry */ -if ( !class_exists( 'Translation_Entry' ) ): +if ( ! class_exists( 'Translation_Entry', false ) ): /** * Translation_Entry class encapsulates a translatable string */ @@ -40,7 +40,7 @@ class Translation_Entry { * - references (array) -- places in the code this strings is used, in relative_to_root_path/file.php:linenum form * - flags (array) -- flags like php-format */ - function Translation_Entry($args=array()) { + function __construct( $args = array() ) { // if no singular -- empty object if (!isset($args['singular'])) { return; @@ -49,23 +49,38 @@ class Translation_Entry { foreach ($args as $varname => $value) { $this->$varname = $value; } - if (isset($args['plural'])) $this->is_plural = true; + if (isset($args['plural']) && $args['plural']) $this->is_plural = true; if (!is_array($this->translations)) $this->translations = array(); if (!is_array($this->references)) $this->references = array(); if (!is_array($this->flags)) $this->flags = array(); } + /** + * PHP4 constructor. + */ + public function Translation_Entry( $args = array() ) { + self::__construct( $args ); + } + /** * Generates a unique key for this entry * * @return string|bool the key or false if the entry is empty */ function key() { - if (is_null($this->singular)) return false; - // prepend context and EOT, like in MO files - return is_null($this->context)? $this->singular : $this->context.chr(4).$this->singular; + if ( null === $this->singular || '' === $this->singular ) return false; + + // Prepend context and EOT, like in MO files + $key = !$this->context? $this->singular : $this->context.chr(4).$this->singular; + // Standardize on \n line endings + $key = str_replace( array( "\r\n", "\r" ), "\n", $key ); + + return $key; } + /** + * @param object $other + */ function merge_with(&$other) { $this->flags = array_unique( array_merge( $this->flags, $other->flags ) ); $this->references = array_unique( array_merge( $this->references, $other->references ) ); diff --git a/wp-includes/pomo/mo.php b/wp-includes/pomo/mo.php index 68c0792..6bc44d6 100644 --- a/wp-includes/pomo/mo.php +++ b/wp-includes/pomo/mo.php @@ -2,7 +2,7 @@ /** * Class for working with MO files * - * @version $Id: mo.php 718 2012-10-31 00:32:02Z nbachiyski $ + * @version $Id: mo.php 1157 2015-11-20 04:30:11Z dd32 $ * @package pomo * @subpackage mo */ @@ -10,7 +10,7 @@ require_once dirname(__FILE__) . '/translations.php'; require_once dirname(__FILE__) . '/streams.php'; -if ( !class_exists( 'MO' ) ): +if ( ! class_exists( 'MO', false ) ): class MO extends Gettext_Translations { var $_nplurals = 2; @@ -27,6 +27,10 @@ class MO extends Gettext_Translations { return $this->import_from_reader($reader); } + /** + * @param string $filename + * @return bool + */ function export_to_file($filename) { $fh = fopen($filename, 'wb'); if ( !$fh ) return false; @@ -35,6 +39,9 @@ class MO extends Gettext_Translations { return $res; } + /** + * @return string|false + */ function export() { $tmp_fh = fopen("php://temp", 'r+'); if ( !$tmp_fh ) return false; @@ -43,6 +50,10 @@ class MO extends Gettext_Translations { return stream_get_contents( $tmp_fh ); } + /** + * @param Translation_Entry $entry + * @return bool + */ function is_entry_good_for_export( $entry ) { if ( empty( $entry->translations ) ) { return false; @@ -55,6 +66,10 @@ class MO extends Gettext_Translations { return true; } + /** + * @param resource $fh + * @return true + */ function export_to_file_handle($fh) { $entries = array_filter( $this->entries, array( $this, 'is_entry_good_for_export' ) ); ksort($entries); @@ -75,21 +90,23 @@ class MO extends Gettext_Translations { $current_addr++; $originals_table = chr(0); + $reader = new POMO_Reader(); + foreach($entries as $entry) { $originals_table .= $this->export_original($entry) . chr(0); - $length = strlen($this->export_original($entry)); + $length = $reader->strlen($this->export_original($entry)); fwrite($fh, pack('VV', $length, $current_addr)); $current_addr += $length + 1; // account for the NULL byte after } $exported_headers = $this->export_headers(); - fwrite($fh, pack('VV', strlen($exported_headers), $current_addr)); + fwrite($fh, pack('VV', $reader->strlen($exported_headers), $current_addr)); $current_addr += strlen($exported_headers) + 1; $translations_table = $exported_headers . chr(0); foreach($entries as $entry) { $translations_table .= $this->export_translations($entry) . chr(0); - $length = strlen($this->export_translations($entry)); + $length = $reader->strlen($this->export_translations($entry)); fwrite($fh, pack('VV', $length, $current_addr)); $current_addr += $length + 1; } @@ -99,19 +116,30 @@ class MO extends Gettext_Translations { return true; } + /** + * @param Translation_Entry $entry + * @return string + */ function export_original($entry) { //TODO: warnings for control characters $exported = $entry->singular; if ($entry->is_plural) $exported .= chr(0).$entry->plural; - if (!is_null($entry->context)) $exported = $entry->context . chr(4) . $exported; + if ($entry->context) $exported = $entry->context . chr(4) . $exported; return $exported; } + /** + * @param Translation_Entry $entry + * @return string + */ function export_translations($entry) { //TODO: warnings for control characters - return implode(chr(0), $entry->translations); + return $entry->is_plural ? implode(chr(0), $entry->translations) : $entry->translations[0]; } + /** + * @return string + */ function export_headers() { $exported = ''; foreach($this->headers as $header => $value) { @@ -120,6 +148,10 @@ class MO extends Gettext_Translations { return $exported; } + /** + * @param int $magic + * @return string|false + */ function get_byteorder($magic) { // The magic is 0x950412de @@ -137,6 +169,9 @@ class MO extends Gettext_Translations { } } + /** + * @param POMO_FileReader $reader + */ function import_from_reader($reader) { $endian_string = MO::get_byteorder($reader->readint32()); if (false === $endian_string) { @@ -155,46 +190,49 @@ class MO extends Gettext_Translations { if (!is_array($header)) return false; - extract( $header ); - // support revision 0 of MO format specs, only - if ($revision != 0) + if ( $header['revision'] != 0 ) { return false; + } // seek to data blocks - $reader->seekto($originals_lenghts_addr); + $reader->seekto( $header['originals_lenghts_addr'] ); // read originals' indices - $originals_lengths_length = $translations_lenghts_addr - $originals_lenghts_addr; - if ( $originals_lengths_length != $total * 8 ) + $originals_lengths_length = $header['translations_lenghts_addr'] - $header['originals_lenghts_addr']; + if ( $originals_lengths_length != $header['total'] * 8 ) { return false; + } $originals = $reader->read($originals_lengths_length); - if ( $reader->strlen( $originals ) != $originals_lengths_length ) + if ( $reader->strlen( $originals ) != $originals_lengths_length ) { return false; + } // read translations' indices - $translations_lenghts_length = $hash_addr - $translations_lenghts_addr; - if ( $translations_lenghts_length != $total * 8 ) + $translations_lenghts_length = $header['hash_addr'] - $header['translations_lenghts_addr']; + if ( $translations_lenghts_length != $header['total'] * 8 ) { return false; + } $translations = $reader->read($translations_lenghts_length); - if ( $reader->strlen( $translations ) != $translations_lenghts_length ) + if ( $reader->strlen( $translations ) != $translations_lenghts_length ) { return false; + } // transform raw data into set of indices $originals = $reader->str_split( $originals, 8 ); $translations = $reader->str_split( $translations, 8 ); // skip hash table - $strings_addr = $hash_addr + $hash_length * 4; + $strings_addr = $header['hash_addr'] + $header['hash_length'] * 4; $reader->seekto($strings_addr); $strings = $reader->read_all(); $reader->close(); - for ( $i = 0; $i < $total; $i++ ) { + for ( $i = 0; $i < $header['total']; $i++ ) { $o = unpack( "{$endian}length/{$endian}pos", $originals[$i] ); $t = unpack( "{$endian}length/{$endian}pos", $translations[$i] ); if ( !$o || !$t ) return false; @@ -246,10 +284,17 @@ class MO extends Gettext_Translations { return $entry; } + /** + * @param int $count + * @return string + */ function select_plural_form($count) { return $this->gettext_select_plural_form($count); } + /** + * @return int + */ function get_plural_forms_count() { return $this->_nplurals; } diff --git a/wp-includes/pomo/po.php b/wp-includes/pomo/po.php index 6e549a2..65d65ff 100644 --- a/wp-includes/pomo/po.php +++ b/wp-includes/pomo/po.php @@ -2,21 +2,23 @@ /** * Class for working with PO files * - * @version $Id: po.php 718 2012-10-31 00:32:02Z nbachiyski $ + * @version $Id: po.php 1158 2015-11-20 04:31:23Z dd32 $ * @package pomo * @subpackage po */ require_once dirname(__FILE__) . '/translations.php'; -define('PO_MAX_LINE_LEN', 79); +if ( ! defined( 'PO_MAX_LINE_LEN' ) ) { + define('PO_MAX_LINE_LEN', 79); +} ini_set('auto_detect_line_endings', 1); /** * Routines for working with PO files */ -if ( !class_exists( 'PO' ) ): +if ( ! class_exists( 'PO', false ) ): class PO extends Gettext_Translations { var $comments_before_headers = ''; @@ -97,7 +99,7 @@ class PO extends Gettext_Translations { * @param string $string the string to format * @return string the poified string */ - function poify($string) { + public static function poify($string) { $quote = '"'; $slash = '\\'; $newline = "\n"; @@ -128,8 +130,8 @@ class PO extends Gettext_Translations { * @param string $string PO-formatted string * @return string enascaped string */ - function unpoify($string) { - $escapes = array('t' => "\t", 'n' => "\n", '\\' => '\\'); + public static function unpoify($string) { + $escapes = array('t' => "\t", 'n' => "\n", 'r' => "\r", '\\' => '\\'); $lines = array_map('trim', explode("\n", $string)); $lines = array_map(array('PO', 'trim_quotes'), $lines); $unpoified = ''; @@ -149,6 +151,10 @@ class PO extends Gettext_Translations { } } } + + // Standardise the line endings on imported content, technically PO files shouldn't contain \r + $unpoified = str_replace( array( "\r\n", "\r" ), "\n", $unpoified ); + return $unpoified; } @@ -160,7 +166,7 @@ class PO extends Gettext_Translations { * @param string $string prepend lines in this string * @param string $with prepend lines with this string */ - function prepend_each_line($string, $with) { + public static function prepend_each_line($string, $with) { $php_with = var_export($with, true); $lines = explode("\n", $string); // do not prepend the string on the last empty line, artefact by explode @@ -180,7 +186,7 @@ class PO extends Gettext_Translations { * @param string $char character to denote a special PO comment, * like :, default is a space */ - function comment_block($text, $char=' ') { + public static function comment_block($text, $char=' ') { $text = wordwrap($text, PO_MAX_LINE_LEN - 3); return PO::prepend_each_line($text, "#$char "); } @@ -189,32 +195,67 @@ class PO extends Gettext_Translations { * Builds a string from the entry for inclusion in PO file * * @static - * @param object &$entry the entry to convert to po string - * @return string|bool PO-style formatted string for the entry or + * @param Translation_Entry &$entry the entry to convert to po string + * @return false|string PO-style formatted string for the entry or * false if the entry is empty */ - function export_entry(&$entry) { - if (is_null($entry->singular)) return false; + public static function export_entry(&$entry) { + if ( null === $entry->singular || '' === $entry->singular ) return false; $po = array(); if (!empty($entry->translator_comments)) $po[] = PO::comment_block($entry->translator_comments); if (!empty($entry->extracted_comments)) $po[] = PO::comment_block($entry->extracted_comments, '.'); if (!empty($entry->references)) $po[] = PO::comment_block(implode(' ', $entry->references), ':'); if (!empty($entry->flags)) $po[] = PO::comment_block(implode(", ", $entry->flags), ','); - if (!is_null($entry->context)) $po[] = 'msgctxt '.PO::poify($entry->context); + if ($entry->context) $po[] = 'msgctxt '.PO::poify($entry->context); $po[] = 'msgid '.PO::poify($entry->singular); if (!$entry->is_plural) { $translation = empty($entry->translations)? '' : $entry->translations[0]; + $translation = PO::match_begin_and_end_newlines( $translation, $entry->singular ); $po[] = 'msgstr '.PO::poify($translation); } else { $po[] = 'msgid_plural '.PO::poify($entry->plural); $translations = empty($entry->translations)? array('', '') : $entry->translations; foreach($translations as $i => $translation) { + $translation = PO::match_begin_and_end_newlines( $translation, $entry->plural ); $po[] = "msgstr[$i] ".PO::poify($translation); } } return implode("\n", $po); } + public static function match_begin_and_end_newlines( $translation, $original ) { + if ( '' === $translation ) { + return $translation; + } + + $original_begin = "\n" === substr( $original, 0, 1 ); + $original_end = "\n" === substr( $original, -1 ); + $translation_begin = "\n" === substr( $translation, 0, 1 ); + $translation_end = "\n" === substr( $translation, -1 ); + + if ( $original_begin ) { + if ( ! $translation_begin ) { + $translation = "\n" . $translation; + } + } elseif ( $translation_begin ) { + $translation = ltrim( $translation, "\n" ); + } + + if ( $original_end ) { + if ( ! $translation_end ) { + $translation .= "\n"; + } + } elseif ( $translation_end ) { + $translation = rtrim( $translation, "\n" ); + } + + return $translation; + } + + /** + * @param string $filename + * @return boolean + */ function import_from_file($filename) { $f = fopen($filename, 'r'); if (!$f) return false; @@ -238,6 +279,11 @@ class PO extends Gettext_Translations { return true; } + /** + * @param resource $f + * @param int $lineno + * @return null|false|array + */ function read_entry($f, $lineno = 0) { $entry = new Translation_Entry(); // where were we in the last step @@ -343,6 +389,14 @@ class PO extends Gettext_Translations { return array('entry' => $entry, 'lineno' => $lineno); } + /** + * @staticvar string $last_line + * @staticvar boolean $use_last_line + * + * @param resource $f + * @param string $action + * @return boolean + */ function read_line($f, $action = 'read') { static $last_line = ''; static $use_last_line = false; @@ -361,6 +415,10 @@ class PO extends Gettext_Translations { return $line; } + /** + * @param Translation_Entry $entry + * @param string $po_comment_line + */ function add_comment_to_entry(&$entry, $po_comment_line) { $first_two = substr($po_comment_line, 0, 2); $comment = trim(substr($po_comment_line, 2)); @@ -375,7 +433,11 @@ class PO extends Gettext_Translations { } } - function trim_quotes($s) { + /** + * @param string $s + * @return sring + */ + public static function trim_quotes($s) { if ( substr($s, 0, 1) == '"') $s = substr($s, 1); if ( substr($s, -1, 1) == '"') $s = substr($s, 0, -1); return $s; diff --git a/wp-includes/pomo/streams.php b/wp-includes/pomo/streams.php index dbb1de8..5e37c9c 100644 --- a/wp-includes/pomo/streams.php +++ b/wp-includes/pomo/streams.php @@ -3,22 +3,32 @@ * Classes, which help reading streams of data from files. * Based on the classes from Danilo Segan <danilo@kvota.net> * - * @version $Id: streams.php 718 2012-10-31 00:32:02Z nbachiyski $ + * @version $Id: streams.php 1157 2015-11-20 04:30:11Z dd32 $ * @package pomo * @subpackage streams */ -if ( !class_exists( 'POMO_Reader' ) ): +if ( ! class_exists( 'POMO_Reader', false ) ): class POMO_Reader { var $endian = 'little'; var $_post = ''; - function POMO_Reader() { + /** + * PHP5 constructor. + */ + function __construct() { $this->is_overloaded = ((ini_get("mbstring.func_overload") & 2) != 0) && function_exists('mb_substr'); $this->_pos = 0; } + /** + * PHP4 constructor. + */ + public function POMO_Reader() { + self::__construct(); + } + /** * Sets the endianness of the file. * @@ -40,7 +50,7 @@ class POMO_Reader { return false; $endian_letter = ('big' == $this->endian)? 'N' : 'V'; $int = unpack($endian_letter, $bytes); - return array_shift($int); + return reset( $int ); } /** @@ -58,7 +68,12 @@ class POMO_Reader { return unpack($endian_letter.$count, $bytes); } - + /** + * @param string $string + * @param int $start + * @param int $length + * @return string + */ function substr($string, $start, $length) { if ($this->is_overloaded) { return mb_substr($string, $start, $length, 'ascii'); @@ -67,6 +82,10 @@ class POMO_Reader { } } + /** + * @param string $string + * @return int + */ function strlen($string) { if ($this->is_overloaded) { return mb_strlen($string, 'ascii'); @@ -75,6 +94,11 @@ class POMO_Reader { } } + /** + * @param string $string + * @param int $chunk_size + * @return array + */ function str_split($string, $chunk_size) { if (!function_exists('str_split')) { $length = $this->strlen($string); @@ -87,32 +111,58 @@ class POMO_Reader { } } - + /** + * @return int + */ function pos() { return $this->_pos; } + /** + * @return true + */ function is_resource() { return true; } + /** + * @return true + */ function close() { return true; } } endif; -if ( !class_exists( 'POMO_FileReader' ) ): +if ( ! class_exists( 'POMO_FileReader', false ) ): class POMO_FileReader extends POMO_Reader { - function POMO_FileReader($filename) { + + /** + * @param string $filename + */ + function __construct( $filename ) { parent::POMO_Reader(); $this->_f = fopen($filename, 'rb'); } + /** + * PHP4 constructor. + */ + public function POMO_FileReader( $filename ) { + self::__construct( $filename ); + } + + /** + * @param int $bytes + */ function read($bytes) { return fread($this->_f, $bytes); } + /** + * @param int $pos + * @return boolean + */ function seekto($pos) { if ( -1 == fseek($this->_f, $pos, SEEK_SET)) { return false; @@ -121,18 +171,30 @@ class POMO_FileReader extends POMO_Reader { return true; } + /** + * @return bool + */ function is_resource() { return is_resource($this->_f); } + /** + * @return bool + */ function feof() { return feof($this->_f); } + /** + * @return bool + */ function close() { return fclose($this->_f); } + /** + * @return string + */ function read_all() { $all = ''; while ( !$this->feof() ) @@ -142,7 +204,7 @@ class POMO_FileReader extends POMO_Reader { } endif; -if ( !class_exists( 'POMO_StringReader' ) ): +if ( ! class_exists( 'POMO_StringReader', false ) ): /** * Provides file-like methods for manipulating a string instead * of a physical file. @@ -151,13 +213,26 @@ class POMO_StringReader extends POMO_Reader { var $_str = ''; - function POMO_StringReader($str = '') { + /** + * PHP5 constructor. + */ + function __construct( $str = '' ) { parent::POMO_Reader(); $this->_str = $str; $this->_pos = 0; } + /** + * PHP4 constructor. + */ + public function POMO_StringReader( $str = '' ) { + self::__construct( $str ); + } + /** + * @param string $bytes + * @return string + */ function read($bytes) { $data = $this->substr($this->_str, $this->_pos, $bytes); $this->_pos += $bytes; @@ -165,16 +240,26 @@ class POMO_StringReader extends POMO_Reader { return $data; } + /** + * @param int $pos + * @return int + */ function seekto($pos) { $this->_pos = $pos; if ($this->strlen($this->_str) < $this->_pos) $this->_pos = $this->strlen($this->_str); return $this->_pos; } + /** + * @return int + */ function length() { return $this->strlen($this->_str); } + /** + * @return string + */ function read_all() { return $this->substr($this->_str, $this->_pos, $this->strlen($this->_str)); } @@ -182,28 +267,49 @@ class POMO_StringReader extends POMO_Reader { } endif; -if ( !class_exists( 'POMO_CachedFileReader' ) ): +if ( ! class_exists( 'POMO_CachedFileReader', false ) ): /** * Reads the contents of the file in the beginning. */ class POMO_CachedFileReader extends POMO_StringReader { - function POMO_CachedFileReader($filename) { + /** + * PHP5 constructor. + */ + function __construct( $filename ) { parent::POMO_StringReader(); $this->_str = file_get_contents($filename); if (false === $this->_str) return false; $this->_pos = 0; } + + /** + * PHP4 constructor. + */ + public function POMO_CachedFileReader( $filename ) { + self::__construct( $filename ); + } } endif; -if ( !class_exists( 'POMO_CachedIntFileReader' ) ): +if ( ! class_exists( 'POMO_CachedIntFileReader', false ) ): /** * Reads the contents of the file in the beginning. */ class POMO_CachedIntFileReader extends POMO_CachedFileReader { - function POMO_CachedIntFileReader($filename) { + /** + * PHP5 constructor. + */ + public function __construct( $filename ) { parent::POMO_CachedFileReader($filename); } + + /** + * PHP4 constructor. + */ + function POMO_CachedIntFileReader( $filename ) { + self::__construct( $filename ); + } } -endif; \ No newline at end of file +endif; + diff --git a/wp-includes/pomo/translations.php b/wp-includes/pomo/translations.php index 106b6da..66971d9 100644 --- a/wp-includes/pomo/translations.php +++ b/wp-includes/pomo/translations.php @@ -2,14 +2,14 @@ /** * Class for a set of entries for translation and their associated headers * - * @version $Id: translations.php 718 2012-10-31 00:32:02Z nbachiyski $ + * @version $Id: translations.php 1157 2015-11-20 04:30:11Z dd32 $ * @package pomo * @subpackage translations */ require_once dirname(__FILE__) . '/entry.php'; -if ( !class_exists( 'Translations' ) ): +if ( ! class_exists( 'Translations', false ) ): class Translations { var $entries = array(); var $headers = array(); @@ -17,7 +17,7 @@ class Translations { /** * Add entry to the PO structure * - * @param object &$entry + * @param array|Translation_Entry &$entry * @return bool true on success, false if the entry doesn't have a key */ function add_entry($entry) { @@ -30,6 +30,10 @@ class Translations { return true; } + /** + * @param array|Translation_Entry $entry + * @return bool + */ function add_entry_or_merge($entry) { if (is_array($entry)) { $entry = new Translation_Entry($entry); @@ -57,21 +61,35 @@ class Translations { $this->headers[$header] = $value; } + /** + * @param array $headers + */ function set_headers($headers) { foreach($headers as $header => $value) { $this->set_header($header, $value); } } + /** + * @param string $header + */ function get_header($header) { return isset($this->headers[$header])? $this->headers[$header] : false; } + /** + * @param Translation_Entry $entry + */ function translate_entry(&$entry) { $key = $entry->key(); return isset($this->entries[$key])? $this->entries[$key] : false; } + /** + * @param string $singular + * @param string $context + * @return string + */ function translate($singular, $context=null) { $entry = new Translation_Entry(array('singular' => $singular, 'context' => $context)); $translated = $this->translate_entry($entry); @@ -93,10 +111,19 @@ class Translations { return 1 == $count? 0 : 1; } + /** + * @return int + */ function get_plural_forms_count() { return 2; } + /** + * @param string $singular + * @param string $plural + * @param int $count + * @param string $context + */ function translate_plural($singular, $plural, $count, $context = null) { $entry = new Translation_Entry(array('singular' => $singular, 'plural' => $plural, 'context' => $context)); $translated = $this->translate_entry($entry); @@ -122,6 +149,9 @@ class Translations { } } + /** + * @param object $other + */ function merge_originals_with(&$other) { foreach( $other->entries as $entry ) { if ( !isset( $this->entries[$entry->key()] ) ) @@ -139,6 +169,7 @@ class Gettext_Translations extends Translations { * It lives in this class, because there are more than one descendand, which will use it and * they can't share it effectively. * + * @param int $count */ function gettext_select_plural_form($count) { if (!isset($this->_gettext_select_plural_form) || is_null($this->_gettext_select_plural_form)) { @@ -149,6 +180,10 @@ class Gettext_Translations extends Translations { return call_user_func($this->_gettext_select_plural_form, $count); } + /** + * @param string $header + * @return array + */ function nplurals_and_expression_from_header($header) { if (preg_match('/^\s*nplurals\s*=\s*(\d+)\s*;\s+plural\s*=\s*(.+)$/', $header, $matches)) { $nplurals = (int)$matches[1]; @@ -162,6 +197,8 @@ class Gettext_Translations extends Translations { /** * Makes a function, which will return the right translation index, according to the * plural forms header + * @param int $nplurals + * @param string $expression */ function make_plural_form_function($nplurals, $expression) { $expression = str_replace('n', '$n', $expression); @@ -172,7 +209,7 @@ class Gettext_Translations extends Translations { } /** - * Adds parantheses to the inner parts of ternary operators in + * Adds parentheses to the inner parts of ternary operators in * plural expressions, because PHP evaluates ternary oerators from left to right * * @param string $expression the expression without parentheses @@ -203,6 +240,10 @@ class Gettext_Translations extends Translations { return rtrim($res, ';'); } + /** + * @param string $translation + * @return array + */ function make_headers($translation) { $headers = array(); // sometimes \ns are used instead of real new lines @@ -216,6 +257,10 @@ class Gettext_Translations extends Translations { return $headers; } + /** + * @param string $header + * @param string $value + */ function set_header($header, $value) { parent::set_header($header, $value); if ('Plural-Forms' == $header) { @@ -227,7 +272,7 @@ class Gettext_Translations extends Translations { } endif; -if ( !class_exists( 'NOOP_Translations' ) ): +if ( ! class_exists( 'NOOP_Translations', false ) ): /** * Provides the same interface as Translations, but doesn't do anything */ @@ -239,36 +284,74 @@ class NOOP_Translations { return true; } + /** + * + * @param string $header + * @param string $value + */ function set_header($header, $value) { } + /** + * + * @param array $headers + */ function set_headers($headers) { } + /** + * @param string $header + * @return false + */ function get_header($header) { return false; } + /** + * @param Translation_Entry $entry + * @return false + */ function translate_entry(&$entry) { return false; } + /** + * @param string $singular + * @param string $context + */ function translate($singular, $context=null) { return $singular; } + /** + * + * @param int $count + * @return bool + */ function select_plural_form($count) { return 1 == $count? 0 : 1; } + /** + * @return int + */ function get_plural_forms_count() { return 2; } + /** + * @param string $singular + * @param string $plural + * @param int $count + * @param string $context + */ function translate_plural($singular, $plural, $count, $context = null) { return 1 == $count? $singular : $plural; } + /** + * @param object $other + */ function merge_with(&$other) { } } diff --git a/wp-includes/post-formats.php b/wp-includes/post-formats.php index cdb9da5..7800ba0 100644 --- a/wp-includes/post-formats.php +++ b/wp-includes/post-formats.php @@ -11,8 +11,8 @@ * * @since 3.1.0 * - * @param int|object $post Post ID or post object. Optional, default is the current post from the loop. - * @return mixed The format if successful. False otherwise. + * @param int|object|null $post Post ID or post object. Optional, default is the current post from the loop. + * @return string|false The format if successful. False otherwise. */ function get_post_format( $post = null ) { if ( ! $post = get_post( $post ) ) @@ -26,7 +26,7 @@ function get_post_format( $post = null ) { if ( empty( $_format ) ) return false; - $format = array_shift( $_format ); + $format = reset( $_format ); return str_replace('post-format-', '', $format->slug ); } @@ -36,10 +36,8 @@ function get_post_format( $post = null ) { * * @since 3.1.0 * - * @uses has_term() - * - * @param string|array $format Optional. The format or formats to check. - * @param object|int $post Optional. The post to check. If not supplied, defaults to the current post if used in the loop. + * @param string|array $format Optional. The format or formats to check. + * @param object|int|null $post Optional. The post to check. If not supplied, defaults to the current post if used in the loop. * @return bool True if the post has any of the given formats (or any format, if no format specified), false otherwise. */ function has_post_format( $format = array(), $post = null ) { @@ -59,15 +57,15 @@ function has_post_format( $format = array(), $post = null ) { * * @since 3.1.0 * - * @param int|object $post The post for which to assign a format. - * @param string $format A format to assign. Use an empty string or array to remove all formats from the post. - * @return mixed WP_Error on error. Array of affected term IDs on success. + * @param int|object $post The post for which to assign a format. + * @param string $format A format to assign. Use an empty string or array to remove all formats from the post. + * @return array|WP_Error|false WP_Error on error. Array of affected term IDs on success. */ function set_post_format( $post, $format ) { $post = get_post( $post ); if ( empty( $post ) ) - return new WP_Error( 'invalid_post', __( 'Invalid post' ) ); + return new WP_Error( 'invalid_post', __( 'Invalid post.' ) ); if ( ! empty( $format ) ) { $format = sanitize_key( $format ); @@ -108,8 +106,6 @@ function get_post_format_strings() { * * @since 3.1.0 * - * @uses get_post_format_strings() - * * @return array The array of post format slugs. */ function get_post_format_slugs() { @@ -122,8 +118,6 @@ function get_post_format_slugs() { * * @since 3.1.0 * - * @uses get_post_format_strings() - * * @param string $slug A post format slug. * @return string The translated post format name. */ @@ -141,7 +135,7 @@ function get_post_format_string( $slug ) { * @since 3.1.0 * * @param string $format The post format slug. - * @return string The post format term link. + * @return string|WP_Error|false The post format term link. */ function get_post_format_link( $format ) { $term = get_term_by('slug', 'post-format-' . $format, 'post_format' ); @@ -155,6 +149,9 @@ function get_post_format_link( $format ) { * * @access private * @since 3.1.0 + * + * @param array $qvs + * @return array */ function _post_format_request( $qvs ) { if ( ! isset( $qvs['post_format'] ) ) @@ -167,18 +164,25 @@ function _post_format_request( $qvs ) { $qvs['post_type'] = $tax->object_type; return $qvs; } -add_filter( 'request', '_post_format_request' ); /** * Filters the post format term link to remove the format prefix. * * @access private * @since 3.1.0 + * + * @global WP_Rewrite $wp_rewrite + * + * @param string $link + * @param object $term + * @param string $taxonomy + * @return string */ function _post_format_link( $link, $term, $taxonomy ) { global $wp_rewrite; - if ( 'post_format' != $taxonomy ) + if ( 'post_format' != $taxonomy ) { return $link; + } if ( $wp_rewrite->get_extra_permastruct( $taxonomy ) ) { return str_replace( "/{$term->slug}", '/' . str_replace( 'post-format-', '', $term->slug ), $link ); } else { @@ -186,13 +190,15 @@ function _post_format_link( $link, $term, $taxonomy ) { return add_query_arg( 'post_format', str_replace( 'post-format-', '', $term->slug ), $link ); } } -add_filter( 'term_link', '_post_format_link', 10, 3 ); /** * Remove the post format prefix from the name property of the term object created by get_term(). * * @access private * @since 3.1.0 + * + * @param object $term + * @return object */ function _post_format_get_term( $term ) { if ( isset( $term->slug ) ) { @@ -200,18 +206,22 @@ function _post_format_get_term( $term ) { } return $term; } -add_filter( 'get_post_format', '_post_format_get_term' ); /** * Remove the post format prefix from the name property of the term objects created by get_terms(). * * @access private * @since 3.1.0 + * + * @param array $terms + * @param string|array $taxonomies + * @param array $args + * @return array */ function _post_format_get_terms( $terms, $taxonomies, $args ) { if ( in_array( 'post_format', (array) $taxonomies ) ) { if ( isset( $args['fields'] ) && 'names' == $args['fields'] ) { - foreach( $terms as $order => $name ) { + foreach ( $terms as $order => $name ) { $terms[$order] = get_post_format_string( str_replace( 'post-format-', '', $name ) ); } } else { @@ -224,13 +234,15 @@ function _post_format_get_terms( $terms, $taxonomies, $args ) { } return $terms; } -add_filter( 'get_terms', '_post_format_get_terms', 10, 3 ); /** * Remove the post format prefix from the name property of the term objects created by wp_get_object_terms(). * * @access private * @since 3.1.0 + * + * @param array $terms + * @return array */ function _post_format_wp_get_object_terms( $terms ) { foreach ( (array) $terms as $order => $term ) { @@ -240,4 +252,3 @@ function _post_format_wp_get_object_terms( $terms ) { } return $terms; } -add_filter( 'wp_get_object_terms', '_post_format_wp_get_object_terms' ); diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php index be46258..3da4245 100644 --- a/wp-includes/post-template.php +++ b/wp-includes/post-template.php @@ -21,12 +21,12 @@ function the_ID() { * Retrieve the ID of the current item in the WordPress Loop. * * @since 2.1.0 - * @uses $post * - * @return int + * @return int|false The ID of the current item in the WordPress Loop. False if $post is not set. */ function get_the_ID() { - return get_post()->ID; + $post = get_post(); + return ! empty( $post ) ? $post->ID : false; } /** @@ -35,11 +35,11 @@ function get_the_ID() { * @since 0.71 * * @param string $before Optional. Content to prepend to the title. - * @param string $after Optional. Content to append to the title. - * @param bool $echo Optional, default to true.Whether to display or return. - * @return null|string Null on no title. String if $echo parameter is false. + * @param string $after Optional. Content to append to the title. + * @param bool $echo Optional, default to true.Whether to display or return. + * @return string|void String if $echo parameter is false. */ -function the_title($before = '', $after = '', $echo = true) { +function the_title( $before = '', $after = '', $echo = true ) { $title = get_the_title(); if ( strlen($title) == 0 ) @@ -65,26 +65,34 @@ function the_title($before = '', $after = '', $echo = true) { * * @since 2.3.0 * - * @param string|array $args Optional. Override the defaults. - * @return string|null Null on failure or display. String when echo is false. + * @param string|array $args { + * Title attribute arguments. Optional. + * + * @type string $before Markup to prepend to the title. Default empty. + * @type string $after Markup to append to the title. Default empty. + * @type bool $echo Whether to echo or return the title. Default true for echo. + * @type WP_Post $post Current post object to retrieve the title for. + * } + * @return string|void String when echo is false. */ function the_title_attribute( $args = '' ) { - $defaults = array('before' => '', 'after' => '', 'echo' => true, 'post' => get_post() ); - $r = wp_parse_args($args, $defaults); - extract( $r, EXTR_SKIP ); + $defaults = array( 'before' => '', 'after' => '', 'echo' => true, 'post' => get_post() ); + $r = wp_parse_args( $args, $defaults ); - $title = get_the_title( $post ); + $title = get_the_title( $r['post'] ); - if ( strlen($title) == 0 ) + if ( strlen( $title ) == 0 ) { return; + } - $title = $before . $title . $after; - $title = esc_attr(strip_tags($title)); + $title = $r['before'] . $title . $r['after']; + $title = esc_attr( strip_tags( $title ) ); - if ( $echo ) + if ( $r['echo'] ) { echo $title; - else + } else { return $title; + } } /** @@ -96,7 +104,7 @@ function the_title_attribute( $args = '' ) { * * @since 0.71 * - * @param int|WP_Post $post Optional. Post ID or post object. + * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post. * @return string */ function get_the_title( $post = 0 ) { @@ -115,12 +123,13 @@ function get_the_title( $post = 0 ) { * * @since 2.8.0 * - * @param string $prepend Text displayed before the post title. - * Default 'Protected: %s'. + * @param string $prepend Text displayed before the post title. + * Default 'Protected: %s'. + * @param WP_Post $post Current post object. */ - $protected_title_format = apply_filters( 'protected_title_format', __( 'Protected: %s' ) ); + $protected_title_format = apply_filters( 'protected_title_format', __( 'Protected: %s' ), $post ); $title = sprintf( $protected_title_format, $title ); - } else if ( isset( $post->post_status ) && 'private' == $post->post_status ) { + } elseif ( isset( $post->post_status ) && 'private' == $post->post_status ) { /** * Filter the text prepended to the post title of private posts. @@ -129,10 +138,11 @@ function get_the_title( $post = 0 ) { * * @since 2.8.0 * - * @param string $prepend Text displayed before the post title. - * Default 'Private: %s'. + * @param string $prepend Text displayed before the post title. + * Default 'Private: %s'. + * @param WP_Post $post Current post object. */ - $private_title_format = apply_filters( 'private_title_format', __( 'Private: %s' ) ); + $private_title_format = apply_filters( 'private_title_format', __( 'Private: %s' ), $post ); $title = sprintf( $private_title_format, $title ); } } @@ -151,18 +161,33 @@ function get_the_title( $post = 0 ) { /** * Display the Post Global Unique Identifier (guid). * - * The guid will appear to be a link, but should not be used as an link to the + * The guid will appear to be a link, but should not be used as a link to the * post. The reason you should not use it as a link, is because of moving the * blog across domains. * - * Url is escaped to make it xml safe + * URL is escaped to make it XML-safe. * * @since 1.5.0 * - * @param int|WP_Post $id Optional. Post ID or post object. + * @param int|WP_Post $post Optional. Post ID or post object. Default is global $post. */ -function the_guid( $id = 0 ) { - echo esc_url( get_the_guid( $id ) ); +function the_guid( $post = 0 ) { + $post = get_post( $post ); + + $guid = isset( $post->guid ) ? get_the_guid( $post ) : ''; + $id = isset( $post->ID ) ? $post->ID : 0; + + /** + * Filter the escaped Global Unique Identifier (guid) of the post. + * + * @since 4.2.0 + * + * @see get_the_guid() + * + * @param string $guid Escaped Global Unique Identifier (guid) of the post. + * @param int $id The post ID. + */ + echo apply_filters( 'the_guid', $guid, $id ); } /** @@ -174,20 +199,24 @@ function the_guid( $id = 0 ) { * * @since 1.5.0 * - * @param int|WP_Post $id Optional. Post ID or post object. + * @param int|WP_Post $post Optional. Post ID or post object. Default is global $post. * @return string */ -function get_the_guid( $id = 0 ) { - $post = get_post($id); +function get_the_guid( $post = 0 ) { + $post = get_post( $post ); + + $guid = isset( $post->guid ) ? $post->guid : ''; + $id = isset( $post->ID ) ? $post->ID : 0; /** * Filter the Global Unique Identifier (guid) of the post. * * @since 1.5.0 * - * @param string $post_guid Global Unique Identifier (guid) of the post. + * @param string $guid Global Unique Identifier (guid) of the post. + * @param int $id The post ID. */ - return apply_filters( 'get_the_guid', $post->guid ); + return apply_filters( 'get_the_guid', $guid, $id ); } /** @@ -196,7 +225,7 @@ function get_the_guid( $id = 0 ) { * @since 0.71 * * @param string $more_link_text Optional. Content for when there is more text. - * @param bool $strip_teaser Optional. Strip teaser content before the more text. Default is false. + * @param bool $strip_teaser Optional. Strip teaser content before the more text. Default is false. */ function the_content( $more_link_text = null, $strip_teaser = false) { $content = get_the_content( $more_link_text, $strip_teaser ); @@ -218,8 +247,14 @@ function the_content( $more_link_text = null, $strip_teaser = false) { * * @since 0.71 * + * @global int $page + * @global int $more + * @global bool $preview + * @global array $pages + * @global int $multipage + * * @param string $more_link_text Optional. Content for when there is more text. - * @param bool $stripteaser Optional. Strip teaser content before the more text. Default is false. + * @param bool $strip_teaser Optional. Strip teaser content before the more text. Default is false. * @return string */ function get_the_content( $more_link_text = null, $strip_teaser = false ) { @@ -280,18 +315,19 @@ function get_the_content( $more_link_text = null, $strip_teaser = false ) { } } - if ( $preview ) // preview fix for javascript bug with foreign languages + if ( $preview ) // Preview fix for JavaScript bug with foreign languages. $output = preg_replace_callback( '/\%u([0-9A-F]{4})/', '_convert_urlencoded_to_entities', $output ); return $output; } /** - * Preview fix for javascript bug with foreign languages + * Preview fix for JavaScript bug with foreign languages. * * @since 3.1.0 * @access private - * @param array $match Match array from preg_replace_callback + * + * @param array $match Match array from preg_replace_callback. * @return string */ function _convert_urlencoded_to_entities( $match ) { @@ -318,20 +354,25 @@ function the_excerpt() { } /** - * Retrieve the post excerpt. + * Retrieves the post excerpt. * * @since 0.71 + * @since 4.5.0 Introduced the `$post` parameter. * - * @param mixed $deprecated Not used. - * @return string + * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post. + * @return string Post excerpt. */ -function get_the_excerpt( $deprecated = '' ) { - if ( !empty( $deprecated ) ) +function get_the_excerpt( $post = null ) { + if ( is_bool( $post ) ) { _deprecated_argument( __FUNCTION__, '2.3' ); + } - $post = get_post(); + $post = get_post( $post ); + if ( empty( $post ) ) { + return ''; + } - if ( post_password_required() ) { + if ( post_password_required( $post ) ) { return __( 'There is no excerpt because this is a protected post.' ); } @@ -339,10 +380,12 @@ function get_the_excerpt( $deprecated = '' ) { * Filter the retrieved post excerpt. * * @since 1.2.0 + * @since 4.5.0 Introduced the `$post` parameter. * * @param string $post_excerpt The post excerpt. + * @param WP_Post $post Post object. */ - return apply_filters( 'get_the_excerpt', $post->post_excerpt ); + return apply_filters( 'get_the_excerpt', $post->post_excerpt, $post ); } /** @@ -363,8 +406,8 @@ function has_excerpt( $id = 0 ) { * * @since 2.7.0 * - * @param string|array $class One or more classes to add to the class list. - * @param int|WP_Post $post_id Optional. Post ID or post object. + * @param string|array $class One or more classes to add to the class list. + * @param int|WP_Post $post_id Optional. Post ID or post object. Defaults to the global `$post`. */ function post_class( $class = '', $post_id = null ) { // Separates classes with a single space, collates classes for post DIV @@ -376,26 +419,38 @@ function post_class( $class = '', $post_id = null ) { * * The class names are many. If the post is a sticky, then the 'sticky' * class name. The class 'hentry' is always added to each post. If the post has a - * post thumbnail, 'has-post-thumbnail' is added as a class. For each - * category, the class will be added with 'category-' with category slug is - * added. The tags are the same way as the categories with 'tag-' before the tag - * slug. All classes are passed through the filter, 'post_class' with the list - * of classes, followed by $class parameter value, with the post ID as the last - * parameter. + * post thumbnail, 'has-post-thumbnail' is added as a class. For each taxonomy that + * the post belongs to, a class will be added of the format '{$taxonomy}-{$slug}' - + * eg 'category-foo' or 'my_custom_taxonomy-bar'. The 'post_tag' taxonomy is a special + * case; the class has the 'tag-' prefix instead of 'post_tag-'. All classes are + * passed through the filter, 'post_class' with the list of classes, followed by + * $class parameter value, with the post ID as the last parameter. * * @since 2.7.0 + * @since 4.2.0 Custom taxonomy classes were added. * - * @param string|array $class One or more classes to add to the class list. - * @param int|WP_Post $post_id Optional. Post ID or post object. + * @param string|array $class One or more classes to add to the class list. + * @param int|WP_Post $post_id Optional. Post ID or post object. * @return array Array of classes. */ function get_post_class( $class = '', $post_id = null ) { - $post = get_post($post_id); + $post = get_post( $post_id ); $classes = array(); - if ( empty($post) ) + if ( $class ) { + if ( ! is_array( $class ) ) { + $class = preg_split( '#\s+#', $class ); + } + $classes = array_map( 'esc_attr', $class ); + } else { + // Ensure that we always coerce class to being an array. + $class = array(); + } + + if ( ! $post ) { return $classes; + } $classes[] = 'post-' . $post->ID; if ( ! is_admin() ) @@ -413,57 +468,70 @@ function get_post_class( $class = '', $post_id = null ) { $classes[] = 'format-standard'; } - // Post requires password - if ( post_password_required( $post->ID ) ) { + $post_password_required = post_password_required( $post->ID ); + + // Post requires password. + if ( $post_password_required ) { $classes[] = 'post-password-required'; - // Post thumbnails - } elseif ( ! is_attachment( $post ) && current_theme_supports( 'post-thumbnails' ) && has_post_thumbnail( $post->ID ) ) { + } elseif ( ! empty( $post->post_password ) ) { + $classes[] = 'post-password-protected'; + } + + // Post thumbnails. + if ( current_theme_supports( 'post-thumbnails' ) && has_post_thumbnail( $post->ID ) && ! is_attachment( $post ) && ! $post_password_required ) { $classes[] = 'has-post-thumbnail'; } // sticky for Sticky Posts - if ( is_sticky($post->ID) && is_home() && !is_paged() ) - $classes[] = 'sticky'; + if ( is_sticky( $post->ID ) ) { + if ( is_home() && ! is_paged() ) { + $classes[] = 'sticky'; + } elseif ( is_admin() ) { + $classes[] = 'status-sticky'; + } + } // hentry for hAtom compliance $classes[] = 'hentry'; - // Categories - if ( is_object_in_taxonomy( $post->post_type, 'category' ) ) { - foreach ( (array) get_the_category($post->ID) as $cat ) { - if ( empty($cat->slug ) ) - continue; - $classes[] = 'category-' . sanitize_html_class($cat->slug, $cat->term_id); - } - } - - // Tags - if ( is_object_in_taxonomy( $post->post_type, 'post_tag' ) ) { - foreach ( (array) get_the_tags($post->ID) as $tag ) { - if ( empty($tag->slug ) ) - continue; - $classes[] = 'tag-' . sanitize_html_class($tag->slug, $tag->term_id); + // All public taxonomies + $taxonomies = get_taxonomies( array( 'public' => true ) ); + foreach ( (array) $taxonomies as $taxonomy ) { + if ( is_object_in_taxonomy( $post->post_type, $taxonomy ) ) { + foreach ( (array) get_the_terms( $post->ID, $taxonomy ) as $term ) { + if ( empty( $term->slug ) ) { + continue; + } + + $term_class = sanitize_html_class( $term->slug, $term->term_id ); + if ( is_numeric( $term_class ) || ! trim( $term_class, '-' ) ) { + $term_class = $term->term_id; + } + + // 'post_tag' uses the 'tag' prefix for backward compatibility. + if ( 'post_tag' == $taxonomy ) { + $classes[] = 'tag-' . $term_class; + } else { + $classes[] = sanitize_html_class( $taxonomy . '-' . $term_class, $taxonomy . '-' . $term->term_id ); + } + } } } - if ( !empty($class) ) { - if ( !is_array( $class ) ) - $class = preg_split('#\s+#', $class); - $classes = array_merge($classes, $class); - } - - $classes = array_map('esc_attr', $classes); + $classes = array_map( 'esc_attr', $classes ); /** * Filter the list of CSS classes for the current post. * * @since 2.7.0 * - * @param array $classes An array of post classes. - * @param string $class A comma-separated list of additional classes added to the post. - * @param int $post_id The post ID. + * @param array $classes An array of post classes. + * @param array $class An array of additional classes added to the post. + * @param int $post_id The post ID. */ - return apply_filters( 'post_class', $classes, $class, $post->ID ); + $classes = apply_filters( 'post_class', $classes, $class, $post->ID ); + + return array_unique( $classes ); } /** @@ -483,11 +551,13 @@ function body_class( $class = '' ) { * * @since 2.8.0 * + * @global WP_Query $wp_query + * * @param string|array $class One or more classes to add to the class list. * @return array Array of classes. */ function get_body_class( $class = '' ) { - global $wp_query, $wpdb; + global $wp_query; $classes = array(); @@ -546,7 +616,7 @@ function get_body_class( $class = '' ) { if ( is_array( $post_type ) ) $post_type = reset( $post_type ); $classes[] = 'post-type-archive-' . sanitize_html_class( $post_type ); - } else if ( is_author() ) { + } elseif ( is_author() ) { $author = $wp_query->get_queried_object(); $classes[] = 'author'; if ( isset( $author->user_nicename ) ) { @@ -557,21 +627,36 @@ function get_body_class( $class = '' ) { $cat = $wp_query->get_queried_object(); $classes[] = 'category'; if ( isset( $cat->term_id ) ) { - $classes[] = 'category-' . sanitize_html_class( $cat->slug, $cat->term_id ); + $cat_class = sanitize_html_class( $cat->slug, $cat->term_id ); + if ( is_numeric( $cat_class ) || ! trim( $cat_class, '-' ) ) { + $cat_class = $cat->term_id; + } + + $classes[] = 'category-' . $cat_class; $classes[] = 'category-' . $cat->term_id; } } elseif ( is_tag() ) { - $tags = $wp_query->get_queried_object(); + $tag = $wp_query->get_queried_object(); $classes[] = 'tag'; - if ( isset( $tags->term_id ) ) { - $classes[] = 'tag-' . sanitize_html_class( $tags->slug, $tags->term_id ); - $classes[] = 'tag-' . $tags->term_id; + if ( isset( $tag->term_id ) ) { + $tag_class = sanitize_html_class( $tag->slug, $tag->term_id ); + if ( is_numeric( $tag_class ) || ! trim( $tag_class, '-' ) ) { + $tag_class = $tag->term_id; + } + + $classes[] = 'tag-' . $tag_class; + $classes[] = 'tag-' . $tag->term_id; } } elseif ( is_tax() ) { $term = $wp_query->get_queried_object(); if ( isset( $term->term_id ) ) { + $term_class = sanitize_html_class( $term->slug, $term->term_id ); + if ( is_numeric( $term_class ) || ! trim( $term_class, '-' ) ) { + $term_class = $term->term_id; + } + $classes[] = 'tax-' . sanitize_html_class( $term->taxonomy ); - $classes[] = 'term-' . sanitize_html_class( $term->slug, $term->term_id ); + $classes[] = 'term-' . $term_class; $classes[] = 'term-' . $term->term_id; } } @@ -584,8 +669,9 @@ function get_body_class( $class = '' ) { $classes[] = 'page-id-' . $page_id; - if ( $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' AND post_status = 'publish' LIMIT 1", $page_id) ) ) + if ( get_pages( array( 'parent' => $page_id, 'number' => 1 ) ) ) { $classes[] = 'page-parent'; + } if ( $post->post_parent ) { $classes[] = 'page-child'; @@ -593,7 +679,14 @@ function get_body_class( $class = '' ) { } if ( is_page_template() ) { $classes[] = 'page-template'; - $classes[] = 'page-template-' . sanitize_html_class( str_replace( '.', '-', get_page_template_slug( $page_id ) ) ); + + $template_slug = get_page_template_slug( $page_id ); + $template_parts = explode( '/', $template_slug ); + + foreach ( $template_parts as $part ) { + $classes[] = 'page-template-' . sanitize_html_class( str_replace( array( '.', '/' ), '-', basename( $part, '.php' ) ) ); + } + $classes[] = 'page-template-' . sanitize_html_class( str_replace( '.', '-', $template_slug ) ); } else { $classes[] = 'page-template-default'; } @@ -607,15 +700,19 @@ function get_body_class( $class = '' ) { $classes[] = 'no-customize-support'; } - if ( get_theme_mod( 'background_color' ) || get_background_image() ) + if ( get_background_color() !== get_theme_support( 'custom-background', 'default-color' ) || get_background_image() ) $classes[] = 'custom-background'; + if ( has_custom_logo() ) { + $classes[] = 'wp-custom-logo'; + } + $page = $wp_query->get( 'page' ); - if ( !$page || $page < 2) + if ( ! $page || $page < 2 ) $page = $wp_query->get( 'paged' ); - if ( $page && $page > 1 ) { + if ( $page && $page > 1 && ! is_404() ) { $classes[] = 'paged-' . $page; if ( is_single() ) @@ -652,10 +749,12 @@ function get_body_class( $class = '' ) { * * @since 2.8.0 * - * @param array $classes An array of body classes. - * @param string $class A comma-separated list of additional classes added to the body. + * @param array $classes An array of body classes. + * @param array $class An array of additional classes added to the body. */ - return apply_filters( 'body_class', $classes, $class ); + $classes = apply_filters( 'body_class', $classes, $class ); + + return array_unique( $classes ); } /** @@ -663,7 +762,7 @@ function get_body_class( $class = '' ) { * * @since 2.7.0 * - * @param int|WP_Post $post An optional post. Global $post used if not provided. + * @param int|WP_Post|null $post An optional post. Global $post used if not provided. * @return bool false if a password is not required or the correct password cookie is present, true otherwise. */ function post_password_required( $post = null ) { @@ -675,7 +774,7 @@ function post_password_required( $post = null ) { if ( ! isset( $_COOKIE['wp-postpass_' . COOKIEHASH] ) ) return true; - require_once ABSPATH . 'wp-includes/class-phpass.php'; + require_once ABSPATH . WPINC . '/class-phpass.php'; $hasher = new PasswordHash( 8, true ); $hash = wp_unslash( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] ); @@ -695,36 +794,37 @@ function post_password_required( $post = null ) { * Displays page links for paginated posts (i.e. includes the . * Quicktag one or more times). This tag must be within The Loop. * - * The defaults for overwriting are: - * 'before' - Default is '<p> Pages:' (string). The html or text to prepend to - * each bookmarks. - * 'after' - Default is '</p>' (string). The html or text to append to each - * bookmarks. - * 'link_before' - Default is '' (string). The html or text to prepend to each - * Pages link inside the <a> tag. Also prepended to the current item, which - * is not linked. - * 'link_after' - Default is '' (string). The html or text to append to each - * Pages link inside the <a> tag. Also appended to the current item, which - * is not linked. - * 'next_or_number' - Default is 'number' (string). Indicates whether page - * numbers should be used. Valid values are number and next. - * 'separator' - Default is ' ' (string). Text used between pagination links. - * 'nextpagelink' - Default is 'Next Page' (string). Text for link to next page. - * of the bookmark. - * 'previouspagelink' - Default is 'Previous Page' (string). Text for link to - * previous page, if available. - * 'pagelink' - Default is '%' (String).Format string for page numbers. The % in - * the parameter string will be replaced with the page number, so Page % - * generates "Page 1", "Page 2", etc. Defaults to %, just the page number. - * 'echo' - Default is 1 (integer). When not 0, this triggers the HTML to be - * echoed and then returned. - * * @since 1.2.0 * - * @param string|array $args Optional. Overwrite the defaults. + * @global int $page + * @global int $numpages + * @global int $multipage + * @global int $more + * + * @param string|array $args { + * Optional. Array or string of default arguments. + * + * @type string $before HTML or text to prepend to each link. Default is `<p> Pages:`. + * @type string $after HTML or text to append to each link. Default is `</p>`. + * @type string $link_before HTML or text to prepend to each link, inside the `<a>` tag. + * Also prepended to the current item, which is not linked. Default empty. + * @type string $link_after HTML or text to append to each Pages link inside the `<a>` tag. + * Also appended to the current item, which is not linked. Default empty. + * @type string $next_or_number Indicates whether page numbers should be used. Valid values are number + * and next. Default is 'number'. + * @type string $separator Text between pagination links. Default is ' '. + * @type string $nextpagelink Link text for the next page link, if available. Default is 'Next Page'. + * @type string $previouspagelink Link text for the previous page link, if available. Default is 'Previous Page'. + * @type string $pagelink Format string for page numbers. The % in the parameter string will be + * replaced with the page number, so 'Page %' generates "Page 1", "Page 2", etc. + * Defaults to '%', just the page number. + * @type int|bool $echo Whether to echo or not. Accepts 1|true or 0|false. Default 1|true. + * } * @return string Formatted output in HTML. */ function wp_link_pages( $args = '' ) { + global $page, $numpages, $multipage, $more; + $defaults = array( 'before' => '<p>' . __( 'Pages:' ), 'after' => '</p>', @@ -738,29 +838,26 @@ function wp_link_pages( $args = '' ) { 'echo' => 1 ); - $r = wp_parse_args( $args, $defaults ); + $params = wp_parse_args( $args, $defaults ); /** * Filter the arguments used in retrieving page links for paginated posts. * * @since 3.0.0 * - * @param array $r An array of arguments for page links for paginated posts. + * @param array $params An array of arguments for page links for paginated posts. */ - $r = apply_filters( 'wp_link_pages_args', $r ); - extract( $r, EXTR_SKIP ); - - global $page, $numpages, $multipage, $more; + $r = apply_filters( 'wp_link_pages_args', $params ); $output = ''; if ( $multipage ) { - if ( 'number' == $next_or_number ) { - $output .= $before; + if ( 'number' == $r['next_or_number'] ) { + $output .= $r['before']; for ( $i = 1; $i <= $numpages; $i++ ) { - $link = $link_before . str_replace( '%', $i, $pagelink ) . $link_after; - if ( $i != $page || ! $more && 1 == $page ) + $link = $r['link_before'] . str_replace( '%', $i, $r['pagelink'] ) . $r['link_after']; + if ( $i != $page || ! $more && 1 == $page ) { $link = _wp_link_page( $i ) . $link . '</a>'; - + } /** * Filter the HTML output of individual page number links. * @@ -770,28 +867,32 @@ function wp_link_pages( $args = '' ) { * @param int $i Page number for paginated posts' page links. */ $link = apply_filters( 'wp_link_pages_link', $link, $i ); - $output .= $separator . $link; + + // Use the custom links separator beginning with the second link. + $output .= ( 1 === $i ) ? ' ' : $r['separator']; + $output .= $link; } - $output .= $after; + $output .= $r['after']; } elseif ( $more ) { - $output .= $before; - $i = $page - 1; - if ( $i ) { - $link = _wp_link_page( $i ) . $link_before . $previouspagelink . $link_after . '</a>'; + $output .= $r['before']; + $prev = $page - 1; + if ( $prev > 0 ) { + $link = _wp_link_page( $prev ) . $r['link_before'] . $r['previouspagelink'] . $r['link_after'] . '</a>'; /** This filter is documented in wp-includes/post-template.php */ - $link = apply_filters( 'wp_link_pages_link', $link, $i ); - $output .= $separator . $link; + $output .= apply_filters( 'wp_link_pages_link', $link, $prev ); } - $i = $page + 1; - if ( $i <= $numpages ) { - $link = _wp_link_page( $i ) . $link_before . $nextpagelink . $link_after . '</a>'; + $next = $page + 1; + if ( $next <= $numpages ) { + if ( $prev ) { + $output .= $r['separator']; + } + $link = _wp_link_page( $next ) . $r['link_before'] . $r['nextpagelink'] . $r['link_after'] . '</a>'; /** This filter is documented in wp-includes/post-template.php */ - $link = apply_filters( 'wp_link_pages_link', $link, $i ); - $output .= $separator . $link; + $output .= apply_filters( 'wp_link_pages_link', $link, $next ); } - $output .= $after; + $output .= $r['after']; } } @@ -803,12 +904,12 @@ function wp_link_pages( $args = '' ) { * @param string $output HTML output of paginated posts' page links. * @param array $args An array of arguments. */ - $output = apply_filters( 'wp_link_pages', $output, $args ); + $html = apply_filters( 'wp_link_pages', $output, $args ); - if ( $echo ) - echo $output; - - return $output; + if ( $r['echo'] ) { + echo $html; + } + return $html; } /** @@ -817,12 +918,15 @@ function wp_link_pages( $args = '' ) { * @since 3.1.0 * @access private * + * @global WP_Rewrite $wp_rewrite + * * @param int $i Page number. * @return string Link. */ function _wp_link_page( $i ) { global $wp_rewrite; $post = get_post(); + $query_args = array(); if ( 1 == $i ) { $url = get_permalink(); @@ -836,16 +940,13 @@ function _wp_link_page( $i ) { } if ( is_preview() ) { - $url = add_query_arg( array( - 'preview' => 'true' - ), $url ); if ( ( 'draft' !== $post->post_status ) && isset( $_GET['preview_id'], $_GET['preview_nonce'] ) ) { - $url = add_query_arg( array( - 'preview_id' => wp_unslash( $_GET['preview_id'] ), - 'preview_nonce' => wp_unslash( $_GET['preview_nonce'] ) - ), $url ); + $query_args['preview_id'] = wp_unslash( $_GET['preview_id'] ); + $query_args['preview_nonce'] = wp_unslash( $_GET['preview_nonce'] ); } + + $url = get_preview_post_link( $post, $query_args, $url ); } return '<a href="' . esc_url( $url ) . '">'; @@ -861,7 +962,7 @@ function _wp_link_page( $i ) { * @since 1.5.0 * * @param string $key Meta data key name. - * @return bool|string|array Array of values or single value, if only one element exists. False will be returned if key does not exist. + * @return false|string|array Array of values or single value, if only one element exists. False will be returned if key does not exist. */ function post_custom( $key = '' ) { $custom = get_post_custom(); @@ -877,9 +978,10 @@ function post_custom( $key = '' ) { /** * Display list of post custom fields. * - * @internal This will probably change at some point... * @since 1.2.0 - * @uses apply_filters() Calls 'the_meta_key' on list item HTML content, with key and value as separate parameters. + * + * @internal This will probably change at some point... + * */ function the_meta() { if ( $keys = get_post_custom_keys() ) { @@ -914,35 +1016,64 @@ function the_meta() { * Retrieve or display list of pages as a dropdown (select list). * * @since 2.1.0 - * - * @param array|string $args Optional. Override default arguments. + * @since 4.2.0 The `$value_field` argument was added. + * @since 4.3.0 The `$class` argument was added. + * + * @param array|string $args { + * Optional. Array or string of arguments to generate a pages drop-down element. + * + * @type int $depth Maximum depth. Default 0. + * @type int $child_of Page ID to retrieve child pages of. Default 0. + * @type int|string $selected Value of the option that should be selected. Default 0. + * @type bool|int $echo Whether to echo or return the generated markup. Accepts 0, 1, + * or their bool equivalents. Default 1. + * @type string $name Value for the 'name' attribute of the select element. + * Default 'page_id'. + * @type string $id Value for the 'id' attribute of the select element. + * @type string $class Value for the 'class' attribute of the select element. Default: none. + * Defaults to the value of `$name`. + * @type string $show_option_none Text to display for showing no pages. Default empty (does not display). + * @type string $show_option_no_change Text to display for "no change" option. Default empty (does not display). + * @type string $option_none_value Value to use when no page is selected. Default empty. + * @type string $value_field Post field used to populate the 'value' attribute of the option + * elements. Accepts any valid post field. Default 'ID'. + * } * @return string HTML content, if not displaying. */ -function wp_dropdown_pages($args = '') { +function wp_dropdown_pages( $args = '' ) { $defaults = array( 'depth' => 0, 'child_of' => 0, 'selected' => 0, 'echo' => 1, 'name' => 'page_id', 'id' => '', + 'class' => '', 'show_option_none' => '', 'show_option_no_change' => '', - 'option_none_value' => '' + 'option_none_value' => '', + 'value_field' => 'ID', ); $r = wp_parse_args( $args, $defaults ); - extract( $r, EXTR_SKIP ); - $pages = get_pages($r); + $pages = get_pages( $r ); $output = ''; // Back-compat with old system where both id and name were based on $name argument - if ( empty($id) ) - $id = $name; - - if ( ! empty($pages) ) { - $output = "<select name='" . esc_attr( $name ) . "' id='" . esc_attr( $id ) . "'>\n"; - if ( $show_option_no_change ) - $output .= "\t<option value=\"-1\">$show_option_no_change</option>"; - if ( $show_option_none ) - $output .= "\t<option value=\"" . esc_attr($option_none_value) . "\">$show_option_none</option>\n"; - $output .= walk_page_dropdown_tree($pages, $depth, $r); + if ( empty( $r['id'] ) ) { + $r['id'] = $r['name']; + } + + if ( ! empty( $pages ) ) { + $class = ''; + if ( ! empty( $r['class'] ) ) { + $class = " class='" . esc_attr( $r['class'] ) . "'"; + } + + $output = "<select name='" . esc_attr( $r['name'] ) . "'" . $class . " id='" . esc_attr( $r['id'] ) . "'>\n"; + if ( $r['show_option_no_change'] ) { + $output .= "\t<option value=\"-1\">" . $r['show_option_no_change'] . "</option>\n"; + } + if ( $r['show_option_none'] ) { + $output .= "\t<option value=\"" . esc_attr( $r['option_none_value'] ) . '">' . $r['show_option_none'] . "</option>\n"; + } + $output .= walk_page_dropdown_tree( $pages, $r['depth'], $r ); $output .= "</select>\n"; } @@ -950,15 +1081,18 @@ function wp_dropdown_pages($args = '') { * Filter the HTML output of a list of pages as a drop down. * * @since 2.1.0 + * @since 4.4.0 `$r` and `$pages` added as arguments. * * @param string $output HTML output for drop down list of pages. - */ - $output = apply_filters( 'wp_dropdown_pages', $output ); - - if ( $echo ) - echo $output; + * @param array $r The parsed arguments array. + * @param array $pages List of WP_Post objects returned by `get_pages()` + */ + $html = apply_filters( 'wp_dropdown_pages', $output, $r, $pages ); - return $output; + if ( $r['echo'] ) { + echo $html; + } + return $html; } /** @@ -966,30 +1100,58 @@ function wp_dropdown_pages($args = '') { * * @since 1.5.0 * - * @param array|string $args Optional. Override default arguments. - * @return string HTML content, if not displaying. + * @see get_pages() + * + * @global WP_Query $wp_query + * + * @param array|string $args { + * Array or string of arguments. Optional. + * + * @type int $child_of Display only the sub-pages of a single page by ID. Default 0 (all pages). + * @type string $authors Comma-separated list of author IDs. Default empty (all authors). + * @type string $date_format PHP date format to use for the listed pages. Relies on the 'show_date' parameter. + * Default is the value of 'date_format' option. + * @type int $depth Number of levels in the hierarchy of pages to include in the generated list. + * Accepts -1 (any depth), 0 (all pages), 1 (top-level pages only), and n (pages to + * the given n depth). Default 0. + * @type bool $echo Whether or not to echo the list of pages. Default true. + * @type string $exclude Comma-separated list of page IDs to exclude. Default empty. + * @type array $include Comma-separated list of page IDs to include. Default empty. + * @type string $link_after Text or HTML to follow the page link label. Default null. + * @type string $link_before Text or HTML to precede the page link label. Default null. + * @type string $post_type Post type to query for. Default 'page'. + * @type string $post_status Comma-separated list of post statuses to include. Default 'publish'. + * @type string $show_date Whether to display the page publish or modified date for each page. Accepts + * 'modified' or any other value. An empty value hides the date. Default empty. + * @type string $sort_column Comma-separated list of column names to sort the pages by. Accepts 'post_author', + * 'post_date', 'post_title', 'post_name', 'post_modified', 'post_modified_gmt', + * 'menu_order', 'post_parent', 'ID', 'rand', or 'comment_count'. Default 'post_title'. + * @type string $title_li List heading. Passing a null or empty value will result in no heading, and the list + * will not be wrapped with unordered list `<ul>` tags. Default 'Pages'. + * @type Walker $walker Walker instance to use for listing pages. Default empty (Walker_Page). + * } + * @return string|void HTML list of pages. */ -function wp_list_pages($args = '') { +function wp_list_pages( $args = '' ) { $defaults = array( 'depth' => 0, 'show_date' => '', - 'date_format' => get_option('date_format'), + 'date_format' => get_option( 'date_format' ), 'child_of' => 0, 'exclude' => '', - 'title_li' => __('Pages'), 'echo' => 1, + 'title_li' => __( 'Pages' ), 'echo' => 1, 'authors' => '', 'sort_column' => 'menu_order, post_title', 'link_before' => '', 'link_after' => '', 'walker' => '', ); $r = wp_parse_args( $args, $defaults ); - extract( $r, EXTR_SKIP ); $output = ''; $current_page = 0; // sanitize, mostly to keep spaces out - $r['exclude'] = preg_replace('/[^0-9,]/', '', $r['exclude']); + $r['exclude'] = preg_replace( '/[^0-9,]/', '', $r['exclude'] ); // Allow plugins to filter an array of excluded pages (but don't put a nullstring into the array) - $exclude_array = ( $r['exclude'] ) ? explode(',', $r['exclude']) : array(); + $exclude_array = ( $r['exclude'] ) ? explode( ',', $r['exclude'] ) : array(); /** * Filter the array of pages to exclude from the pages list. @@ -1002,12 +1164,12 @@ function wp_list_pages($args = '') { // Query pages. $r['hierarchical'] = 0; - $pages = get_pages($r); + $pages = get_pages( $r ); - if ( !empty($pages) ) { - if ( $r['title_li'] ) + if ( ! empty( $pages ) ) { + if ( $r['title_li'] ) { $output .= '<li class="pagenav">' . $r['title_li'] . '<ul>'; - + } global $wp_query; if ( is_page() || is_attachment() || $wp_query->is_posts_page ) { $current_page = get_queried_object_id(); @@ -1018,28 +1180,32 @@ function wp_list_pages($args = '') { } } - $output .= walk_page_tree($pages, $r['depth'], $current_page, $r); + $output .= walk_page_tree( $pages, $r['depth'], $current_page, $r ); - if ( $r['title_li'] ) + if ( $r['title_li'] ) { $output .= '</ul></li>'; + } } /** * Filter the HTML output of the pages to list. * * @since 1.5.1 + * @since 4.4.0 `$pages` added as arguments. * * @see wp_list_pages() * * @param string $output HTML output of the pages list. * @param array $r An array of page-listing arguments. + * @param array $pages List of WP_Post objects returned by `get_pages()` */ - $output = apply_filters( 'wp_list_pages', $output, $r ); + $html = apply_filters( 'wp_list_pages', $output, $r, $pages ); - if ( $r['echo'] ) - echo $output; - else - return $output; + if ( $r['echo'] ) { + echo $html; + } else { + return $html; + } } /** @@ -1049,27 +1215,42 @@ function wp_list_pages($args = '') { * wp_list_pages()} function. Check that function for more info on those * arguments. * - * <ul> - * <li><strong>sort_column</strong> - How to sort the list of pages. Defaults - * to 'menu_order, post_title'. Use column for posts table.</li> - * <li><strong>menu_class</strong> - Class to use for the div ID which contains - * the page list. Defaults to 'menu'.</li> - * <li><strong>echo</strong> - Whether to echo list or return it. Defaults to - * echo.</li> - * <li><strong>link_before</strong> - Text before show_home argument text.</li> - * <li><strong>link_after</strong> - Text after show_home argument text.</li> - * <li><strong>show_home</strong> - If you set this argument, then it will - * display the link to the home page. The show_home argument really just needs - * to be set to the value of the text of the link.</li> - * </ul> - * * @since 2.7.0 - * - * @param array|string $args - * @return string html menu + * @since 4.4.0 Added `menu_id`, `container`, `before`, `after`, and `walker` arguments. + * + * @param array|string $args { + * Optional. Arguments to generate a page menu. See wp_list_pages() for additional arguments. + * + * @type string $sort_column How to short the list of pages. Accepts post column names. + * Default 'menu_order, post_title'. + * @type string $menu_id ID for the div containing the page list. Default is empty string. + * @type string $menu_class Class to use for the element containing the page list. Default 'menu'. + * @type string $container Element to use for the element containing the page list. Default 'div'. + * @type bool $echo Whether to echo the list or return it. Accepts true (echo) or false (return). + * Default true. + * @type int|bool|string $show_home Whether to display the link to the home page. Can just enter the text + * you'd like shown for the home link. 1|true defaults to 'Home'. + * @type string $link_before The HTML or text to prepend to $show_home text. Default empty. + * @type string $link_after The HTML or text to append to $show_home text. Default empty. + * @type string $before The HTML or text to prepend to the menu. Default is '<ul>'. + * @type string $after The HTML or text to append to the menu. Default is '</ul>'. + * @type Walker $walker Walker instance to use for listing pages. Default empty (Walker_Page). + * } + * @return string|void HTML menu */ function wp_page_menu( $args = array() ) { - $defaults = array('sort_column' => 'menu_order, post_title', 'menu_class' => 'menu', 'echo' => true, 'link_before' => '', 'link_after' => ''); + $defaults = array( + 'sort_column' => 'menu_order, post_title', + 'menu_id' => '', + 'menu_class' => 'menu', + 'container' => 'div', + 'echo' => true, + 'link_before' => '', + 'link_after' => '', + 'before' => '<ul>', + 'after' => '</ul>', + 'walker' => '', + ); $args = wp_parse_args( $args, $defaults ); /** @@ -1112,10 +1293,36 @@ function wp_page_menu( $args = array() ) { $list_args['title_li'] = ''; $menu .= str_replace( array( "\r", "\n", "\t" ), '', wp_list_pages($list_args) ); - if ( $menu ) - $menu = '<ul>' . $menu . '</ul>'; + $container = sanitize_text_field( $args['container'] ); - $menu = '<div class="' . esc_attr($args['menu_class']) . '">' . $menu . "</div>\n"; + // Fallback in case `wp_nav_menu()` was called without a container. + if ( empty( $container ) ) { + $container = 'div'; + } + + if ( $menu ) { + + // wp_nav_menu doesn't set before and after + if ( isset( $args['fallback_cb'] ) && + 'wp_page_menu' === $args['fallback_cb'] && + 'ul' !== $container ) { + $args['before'] = '<ul>'; + $args['after'] = '</ul>'; + } + + $menu = $args['before'] . $menu . $args['after']; + } + + $attrs = ''; + if ( ! empty( $args['menu_id'] ) ) { + $attrs .= ' id="' . esc_attr( $args['menu_id'] ) . '"'; + } + + if ( ! empty( $args['menu_class'] ) ) { + $attrs .= ' class="' . esc_attr( $args['menu_class'] ) . '"'; + } + + $menu = "<{$container}{$attrs}>" . $menu . "</{$container}>\n"; /** * Filter the HTML output of a page-based menu. @@ -1143,9 +1350,14 @@ function wp_page_menu( $args = array() ) { * * @uses Walker_Page to create HTML list content. * @since 2.1.0 - * @see Walker_Page::walk() for parameters and return description. + * + * @param array $pages + * @param int $depth + * @param int $current_page + * @param array $r + * @return string */ -function walk_page_tree($pages, $depth, $current_page, $r) { +function walk_page_tree( $pages, $depth, $current_page, $r ) { if ( empty($r['walker']) ) $walker = new Walker_Page; else @@ -1166,6 +1378,8 @@ function walk_page_tree($pages, $depth, $current_page, $r) { * @uses Walker_PageDropdown to create HTML dropdown content. * @since 2.1.0 * @see Walker_PageDropdown::walk() for parameters and return description. + * + * @return string */ function walk_page_dropdown_tree() { $args = func_get_args(); @@ -1177,194 +1391,6 @@ function walk_page_dropdown_tree() { return call_user_func_array(array($walker, 'walk'), $args); } -/** - * Create HTML list of pages. - * - * @since 2.1.0 - * @uses Walker - */ -class Walker_Page extends Walker { - /** - * @see Walker::$tree_type - * @since 2.1.0 - * @var string - */ - var $tree_type = 'page'; - - /** - * @see Walker::$db_fields - * @since 2.1.0 - * @todo Decouple this. - * @var array - */ - var $db_fields = array ('parent' => 'post_parent', 'id' => 'ID'); - - /** - * @see Walker::start_lvl() - * @since 2.1.0 - * - * @param string $output Passed by reference. Used to append additional content. - * @param int $depth Depth of page. Used for padding. - * @param array $args - */ - function start_lvl( &$output, $depth = 0, $args = array() ) { - $indent = str_repeat("\t", $depth); - $output .= "\n$indent<ul class='children'>\n"; - } - - /** - * @see Walker::end_lvl() - * @since 2.1.0 - * - * @param string $output Passed by reference. Used to append additional content. - * @param int $depth Depth of page. Used for padding. - * @param array $args - */ - function end_lvl( &$output, $depth = 0, $args = array() ) { - $indent = str_repeat("\t", $depth); - $output .= "$indent</ul>\n"; - } - - /** - * @see Walker::start_el() - * @since 2.1.0 - * - * @param string $output Passed by reference. Used to append additional content. - * @param object $page Page data object. - * @param int $depth Depth of page. Used for padding. - * @param int $current_page Page ID. - * @param array $args - */ - function start_el( &$output, $page, $depth = 0, $args = array(), $current_page = 0 ) { - if ( $depth ) - $indent = str_repeat("\t", $depth); - else - $indent = ''; - - extract($args, EXTR_SKIP); - $css_class = array('page_item', 'page-item-'.$page->ID); - - if( isset( $args['pages_with_children'][ $page->ID ] ) ) - $css_class[] = 'page_item_has_children'; - - if ( !empty($current_page) ) { - $_current_page = get_post( $current_page ); - if ( in_array( $page->ID, $_current_page->ancestors ) ) - $css_class[] = 'current_page_ancestor'; - if ( $page->ID == $current_page ) - $css_class[] = 'current_page_item'; - elseif ( $_current_page && $page->ID == $_current_page->post_parent ) - $css_class[] = 'current_page_parent'; - } elseif ( $page->ID == get_option('page_for_posts') ) { - $css_class[] = 'current_page_parent'; - } - - /** - * Filter the list of CSS classes to include with each page item in the list. - * - * @since 2.8.0 - * - * @see wp_list_pages() - * - * @param array $css_class An array of CSS classes to be applied - * to each list item. - * @param WP_Post $page Page data object. - * @param int $depth Depth of page, used for padding. - * @param array $args An array of arguments. - * @param int $current_page ID of the current page. - */ - $css_class = implode( ' ', apply_filters( 'page_css_class', $css_class, $page, $depth, $args, $current_page ) ); - - if ( '' === $page->post_title ) - $page->post_title = sprintf( __( '#%d (no title)' ), $page->ID ); - - /** This filter is documented in wp-includes/post-template.php */ - $output .= $indent . '<li class="' . $css_class . '"><a href="' . get_permalink($page->ID) . '">' . $link_before . apply_filters( 'the_title', $page->post_title, $page->ID ) . $link_after . '</a>'; - - if ( !empty($show_date) ) { - if ( 'modified' == $show_date ) - $time = $page->post_modified; - else - $time = $page->post_date; - - $output .= " " . mysql2date($date_format, $time); - } - } - - /** - * @see Walker::end_el() - * @since 2.1.0 - * - * @param string $output Passed by reference. Used to append additional content. - * @param object $page Page data object. Not used. - * @param int $depth Depth of page. Not Used. - * @param array $args - */ - function end_el( &$output, $page, $depth = 0, $args = array() ) { - $output .= "</li>\n"; - } - -} - -/** - * Create HTML dropdown list of pages. - * - * @since 2.1.0 - * @uses Walker - */ -class Walker_PageDropdown extends Walker { - /** - * @see Walker::$tree_type - * @since 2.1.0 - * @var string - */ - var $tree_type = 'page'; - - /** - * @see Walker::$db_fields - * @since 2.1.0 - * @todo Decouple this - * @var array - */ - var $db_fields = array ('parent' => 'post_parent', 'id' => 'ID'); - - /** - * @see Walker::start_el() - * @since 2.1.0 - * - * @param string $output Passed by reference. Used to append additional content. - * @param object $page Page data object. - * @param int $depth Depth of page in reference to parent pages. Used for padding. - * @param array $args Uses 'selected' argument for selected page to set selected HTML attribute for option element. - * @param int $id - */ - function start_el( &$output, $page, $depth = 0, $args = array(), $id = 0 ) { - $pad = str_repeat(' ', $depth * 3); - - $output .= "\t<option class=\"level-$depth\" value=\"$page->ID\""; - if ( $page->ID == $args['selected'] ) - $output .= ' selected="selected"'; - $output .= '>'; - - $title = $page->post_title; - if ( '' === $title ) { - $title = sprintf( __( '#%d (no title)' ), $page->ID ); - } - - /** - * Filter the page title when creating an HTML drop-down list of pages. - * - * @since 3.1.0 - * - * @param string $title Page title. - * @param object $page Page data object. - */ - $title = apply_filters( 'list_pages', $title, $page ); - $output .= $pad . esc_html( $title ); - $output .= "</option>\n"; - } -} - // // Attachments // @@ -1375,9 +1401,9 @@ class Walker_PageDropdown extends Walker { * @since 2.0.0 * * @param int|WP_Post $id Optional. Post ID or post object. - * @param bool $fullsize Optional, default is false. Whether to use full size. - * @param bool $deprecated Deprecated. Not used. - * @param bool $permalink Optional, default is false. Whether to include permalink. + * @param bool $fullsize Optional, default is false. Whether to use full size. + * @param bool $deprecated Deprecated. Not used. + * @param bool $permalink Optional, default is false. Whether to include permalink. */ function the_attachment_link( $id = 0, $fullsize = false, $deprecated = false, $permalink = false ) { if ( !empty( $deprecated ) ) @@ -1393,17 +1419,20 @@ function the_attachment_link( $id = 0, $fullsize = false, $deprecated = false, $ * Retrieve an attachment page link using an image or icon, if possible. * * @since 2.5.0 - * @uses apply_filters() Calls 'wp_get_attachment_link' filter on HTML content with same parameters as function. - * - * @param int|WP_Post $id Optional. Post ID or post object. - * @param string $size Optional, default is 'thumbnail'. Size of image, either array or string. - * @param bool $permalink Optional, default is false. Whether to add permalink to image. - * @param bool $icon Optional, default is false. Whether to include icon. - * @param string|bool $text Optional, default is false. If string, then will be link text. + * @since 4.4.0 The `$id` parameter can now accept either a post ID or `WP_Post` object. + * + * @param int|WP_Post $id Optional. Post ID or post object. + * @param string|array $size Optional. Image size. Accepts any valid image size, or an array + * of width and height values in pixels (in that order). + * Default 'thumbnail'. + * @param bool $permalink Optional, Whether to add permalink to image. Default false. + * @param bool $icon Optional. Whether the attachment is an icon. Default false. + * @param string|false $text Optional. Link text to use. Activated by passing a string, false otherwise. + * Default false. + * @param array|string $attr Optional. Array or string of attributes. Default empty. * @return string HTML content. */ -function wp_get_attachment_link( $id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false ) { - $id = intval( $id ); +function wp_get_attachment_link( $id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false, $attr = '' ) { $_post = get_post( $id ); if ( empty( $_post ) || ( 'attachment' != $_post->post_type ) || ! $url = wp_get_attachment_url( $_post->ID ) ) @@ -1412,14 +1441,13 @@ function wp_get_attachment_link( $id = 0, $size = 'thumbnail', $permalink = fals if ( $permalink ) $url = get_attachment_link( $_post->ID ); - $post_title = esc_attr( $_post->post_title ); - - if ( $text ) + if ( $text ) { $link_text = $text; - elseif ( $size && 'none' != $size ) - $link_text = wp_get_attachment_image( $id, $size, $icon ); - else + } elseif ( $size && 'none' != $size ) { + $link_text = wp_get_attachment_image( $_post->ID, $size, $icon, $attr ); + } else { $link_text = ''; + } if ( trim( $link_text ) == '' ) $link_text = $_post->post_title; @@ -1429,18 +1457,19 @@ function wp_get_attachment_link( $id = 0, $size = 'thumbnail', $permalink = fals * * @since 2.7.0 * - * @param string $link_html The page link HTML output. - * @param int $id Post ID. - * @param string $size Image size. Default 'thumbnail'. - * @param bool $permalink Whether to add permalink to image. Default false. - * @param bool $icon Whether to include an icon. Default false. - * @param string|bool $text If string, will be link text. Default false. + * @param string $link_html The page link HTML output. + * @param int $id Post ID. + * @param string|array $size Size of the image. Image size or array of width and height values (in that order). + * Default 'thumbnail'. + * @param bool $permalink Whether to add permalink to image. Default false. + * @param bool $icon Whether to include an icon. Default false. + * @param string|bool $text If string, will be link text. Default false. */ return apply_filters( 'wp_get_attachment_link', "<a href='$url'>$link_text</a>", $id, $size, $permalink, $icon, $text ); } /** - * Wrap attachment in <<p>> element before content. + * Wrap attachment in paragraph tag before content. * * @since 2.0.0 * @@ -1453,15 +1482,18 @@ function prepend_attachment($content) { if ( empty($post->post_type) || $post->post_type != 'attachment' ) return $content; - if ( 0 === strpos( $post->post_mime_type, 'video' ) ) { + if ( wp_attachment_is( 'video', $post ) ) { $meta = wp_get_attachment_metadata( get_the_ID() ); $atts = array( 'src' => wp_get_attachment_url() ); if ( ! empty( $meta['width'] ) && ! empty( $meta['height'] ) ) { $atts['width'] = (int) $meta['width']; $atts['height'] = (int) $meta['height']; } + if ( has_post_thumbnail() ) { + $atts['poster'] = wp_get_attachment_url( get_post_thumbnail_id() ); + } $p = wp_video_shortcode( $atts ); - } elseif ( 0 === strpos( $post->post_mime_type, 'audio' ) ) { + } elseif ( wp_attachment_is( 'audio', $post ) ) { $p = wp_audio_shortcode( array( 'src' => wp_get_attachment_url() ) ); } else { $p = '<p class="attachment">'; @@ -1492,8 +1524,8 @@ function prepend_attachment($content) { * Retrieve protected post password form content. * * @since 1.0.0 - * @uses apply_filters() Calls 'the_password_form' filter on output. - * @param int|WP_Post $post Optional. A post ID or post object. + * + * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post. * @return string HTML content for password form for password protected post. */ function get_the_password_form( $post = 0 ) { @@ -1501,7 +1533,7 @@ function get_the_password_form( $post = 0 ) { $label = 'pwbox-' . ( empty($post->ID) ? rand() : $post->ID ); $output = '<form action="' . esc_url( site_url( 'wp-login.php?action=postpass', 'login_post' ) ) . '" class="post-password-form" method="post"> <p>' . __( 'This content is password protected. To view it please enter your password below:' ) . '</p> - <p><label for="' . $label . '">' . __( 'Password:' ) . ' <input name="post_password" id="' . $label . '" type="password" size="20" /></label> <input type="submit" name="Submit" value="' . esc_attr__( 'Submit' ) . '" /></p></form> + <p><label for="' . $label . '">' . __( 'Password:' ) . ' <input name="post_password" id="' . $label . '" type="password" size="20" /></label> <input type="submit" name="Submit" value="' . esc_attr_x( 'Enter', 'post password form' ) . '" /></p></form> '; /** @@ -1522,13 +1554,13 @@ function get_the_password_form( $post = 0 ) { * Whether currently in a page template. * * This template tag allows you to determine if you are in a page template. - * You can optionally provide a template name and then the check will be - * specific to that template. + * You can optionally provide a template name or array of template names + * and then the check will be specific to that template. * * @since 2.5.0 - * @uses $wp_query + * @since 4.2.0 The `$template` parameter was changed to also accept an array of page templates. * - * @param string $template The specific template name if specific matching is required. + * @param string|array $template The specific template name or array of templates to match. * @return bool True on success, false on failure. */ function is_page_template( $template = '' ) { @@ -1543,10 +1575,15 @@ function is_page_template( $template = '' ) { if ( $template == $page_template ) return true; - if ( 'default' == $template && ! $page_template ) - return true; + if ( is_array( $template ) ) { + if ( ( in_array( 'default', $template, true ) && ! $page_template ) + || in_array( $page_template, $template, true ) + ) { + return true; + } + } - return false; + return ( 'default' === $template && ! $page_template ); } /** @@ -1555,7 +1592,7 @@ function is_page_template( $template = '' ) { * @since 3.4.0 * * @param int $post_id Optional. The page ID to check. Defaults to the current post, when used in the loop. - * @return string|bool Page template filename. Returns an empty string when the default page template + * @return string|false Page template filename. Returns an empty string when the default page template * is in use. Returns false if the post is not a page. */ function get_page_template_slug( $post_id = null ) { @@ -1573,11 +1610,9 @@ function get_page_template_slug( $post_id = null ) { * * @since 2.6.0 * - * @uses date_i18n() - * * @param int|object $revision Revision ID or revision object. - * @param bool $link Optional, default is true. Link to revisions's page? - * @return string i18n formatted datetimestamp or localized 'Current Revision'. + * @param bool $link Optional, default is true. Link to revisions's page? + * @return string|false i18n formatted datetimestamp or localized 'Current Revision'. */ function wp_post_revision_title( $revision, $link = true ) { if ( !$revision = get_post( $revision ) ) @@ -1587,7 +1622,7 @@ function wp_post_revision_title( $revision, $link = true ) { return false; /* translators: revision date format, see http://php.net/date */ - $datef = _x( 'j F, Y @ G:i', 'revision date format'); + $datef = _x( 'F j, Y @ H:i:s', 'revision date format' ); /* translators: 1: date */ $autosavef = _x( '%1$s [Autosave]', 'post revision title extra' ); /* translators: 1: date */ @@ -1610,11 +1645,9 @@ function wp_post_revision_title( $revision, $link = true ) { * * @since 3.6.0 * - * @uses date_i18n() - * * @param int|object $revision Revision ID or revision object. - * @param bool $link Optional, default is true. Link to revisions's page? - * @return string gravatar, user, i18n formatted datetimestamp or localized 'Current Revision'. + * @param bool $link Optional, default is true. Link to revisions's page? + * @return string|false gravatar, user, i18n formatted datetimestamp or localized 'Current Revision'. */ function wp_post_revision_title_expanded( $revision, $link = true ) { if ( !$revision = get_post( $revision ) ) @@ -1625,7 +1658,7 @@ function wp_post_revision_title_expanded( $revision, $link = true ) { $author = get_the_author_meta( 'display_name', $revision->post_author ); /* translators: revision date format, see http://php.net/date */ - $datef = _x( 'j F, Y @ G:i:s', 'revision date format'); + $datef = _x( 'F j, Y @ H:i:s', 'revision date format' ); $gravatar = get_avatar( $revision->post_author, 24 ); @@ -1650,7 +1683,17 @@ function wp_post_revision_title_expanded( $revision, $link = true ) { elseif ( wp_is_post_autosave( $revision ) ) $revision_date_author = sprintf( $autosavef, $revision_date_author ); - return $revision_date_author; + /** + * Filter the formatted author and date for a revision. + * + * @since 4.4.0 + * + * @param string $revision_date_author The formatted string. + * @param WP_Post $revision The revision object. + * @param bool $link Whether to link to the revisions page, as passed into + * wp_post_revision_title_expanded(). + */ + return apply_filters( 'wp_post_revision_title_expanded', $revision_date_author, $revision, $link ); } /** @@ -1661,14 +1704,8 @@ function wp_post_revision_title_expanded( $revision, $link = true ) { * * @since 2.6.0 * - * @uses wp_get_post_revisions() - * @uses wp_post_revision_title_expanded() - * @uses get_edit_post_link() - * @uses get_the_author_meta() - * - * @param int|WP_Post $post_id Optional. Post ID or post object. - * @param string $type 'all' (default), 'revision' or 'autosave' - * @return null + * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post. + * @param string $type 'all' (default), 'revision' or 'autosave' */ function wp_list_post_revisions( $post_id = 0, $type = 'all' ) { if ( ! $post = get_post( $post_id ) ) diff --git a/wp-includes/post-thumbnail-template.php b/wp-includes/post-thumbnail-template.php index 91201e7..2862bdc 100644 --- a/wp-includes/post-thumbnail-template.php +++ b/wp-includes/post-thumbnail-template.php @@ -2,8 +2,8 @@ /** * WordPress Post Thumbnail Template Functions. * - * Support for post thumbnails - * Themes function.php must call add_theme_support( 'post-thumbnails' ) to use these. + * Support for post thumbnails. + * Theme's functions.php must call add_theme_support( 'post-thumbnails' ) to use these. * * @package WordPress * @subpackage Template @@ -13,45 +13,63 @@ * Check if post has an image attached. * * @since 2.9.0 + * @since 4.4.0 `$post` can be a post ID or WP_Post object. * - * @param int $post_id Optional. Post ID. - * @return bool Whether post has an image attached. + * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`. + * @return bool Whether the post has an image attached. */ -function has_post_thumbnail( $post_id = null ) { - return (bool) get_post_thumbnail_id( $post_id ); +function has_post_thumbnail( $post = null ) { + return (bool) get_post_thumbnail_id( $post ); } /** - * Retrieve Post Thumbnail ID. + * Retrieve post thumbnail ID. * * @since 2.9.0 + * @since 4.4.0 `$post` can be a post ID or WP_Post object. * - * @param int $post_id Optional. Post ID. - * @return int + * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`. + * @return string|int Post thumbnail ID or empty string. */ -function get_post_thumbnail_id( $post_id = null ) { - $post_id = ( null === $post_id ) ? get_the_ID() : $post_id; - return get_post_meta( $post_id, '_thumbnail_id', true ); +function get_post_thumbnail_id( $post = null ) { + $post = get_post( $post ); + if ( ! $post ) { + return ''; + } + return get_post_meta( $post->ID, '_thumbnail_id', true ); } /** - * Display Post Thumbnail. + * Display the post thumbnail. + * + * When a theme adds 'post-thumbnail' support, a special 'post-thumbnail' image size + * is registered, which differs from the 'thumbnail' image size managed via the + * Settings > Media screen. + * + * When using the_post_thumbnail() or related functions, the 'post-thumbnail' image + * size is used by default, though a different size can be specified instead as needed. * * @since 2.9.0 * - * @param string|array $size Optional. Image size. Defaults to 'post-thumbnail', which theme sets using set_post_thumbnail_size( $width, $height, $crop_flag );. - * @param string|array $attr Optional. Query string or array of attributes. + * @see get_the_post_thumbnail() + * + * @param string|array $size Optional. Image size to use. Accepts any valid image size, or + * an array of width and height values in pixels (in that order). + * Default 'post-thumbnail'. + * @param string|array $attr Optional. Query string or array of attributes. Default empty. */ function the_post_thumbnail( $size = 'post-thumbnail', $attr = '' ) { echo get_the_post_thumbnail( null, $size, $attr ); } /** - * Update cache for thumbnails in the current loop + * Update cache for thumbnails in the current loop. * * @since 3.2.0 * - * @param object $wp_query Optional. A WP_Query instance. Defaults to the $wp_query global. + * @global WP_Query $wp_query + * + * @param WP_Query $wp_query Optional. A WP_Query instance. Defaults to the $wp_query global. */ function update_post_thumbnail_cache( $wp_query = null ) { if ( ! $wp_query ) @@ -74,24 +92,39 @@ function update_post_thumbnail_cache( $wp_query = null ) { } /** - * Retrieve Post Thumbnail. + * Retrieve the post thumbnail. + * + * When a theme adds 'post-thumbnail' support, a special 'post-thumbnail' image size + * is registered, which differs from the 'thumbnail' image size managed via the + * Settings > Media screen. + * + * When using the_post_thumbnail() or related functions, the 'post-thumbnail' image + * size is used by default, though a different size can be specified instead as needed. * * @since 2.9.0 + * @since 4.4.0 `$post` can be a post ID or WP_Post object. * - * @param int $post_id Optional. Post ID. - * @param string $size Optional. Image size. Defaults to 'post-thumbnail'. - * @param string|array $attr Optional. Query string or array of attributes. + * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`. + * @param string|array $size Optional. Image size to use. Accepts any valid image size, or + * an array of width and height values in pixels (in that order). + * Default 'post-thumbnail'. + * @param string|array $attr Optional. Query string or array of attributes. Default empty. + * @return string The post thumbnail image tag. */ -function get_the_post_thumbnail( $post_id = null, $size = 'post-thumbnail', $attr = '' ) { - $post_id = ( null === $post_id ) ? get_the_ID() : $post_id; - $post_thumbnail_id = get_post_thumbnail_id( $post_id ); +function get_the_post_thumbnail( $post = null, $size = 'post-thumbnail', $attr = '' ) { + $post = get_post( $post ); + if ( ! $post ) { + return ''; + } + $post_thumbnail_id = get_post_thumbnail_id( $post ); /** * Filter the post thumbnail size. * * @since 2.9.0 * - * @param string $size The post thumbnail size. + * @param string|array $size The post thumbnail size. Image size or array of width and height + * values (in that order). Default 'post-thumbnail'. */ $size = apply_filters( 'post_thumbnail_size', $size ); @@ -104,11 +137,12 @@ function get_the_post_thumbnail( $post_id = null, $size = 'post-thumbnail', $att * * @since 2.9.0 * - * @param string $post_id The post ID. - * @param string $post_thumbnail_id The post thumbnail ID. - * @param string $size The post thumbnail size. + * @param int $post_id The post ID. + * @param string $post_thumbnail_id The post thumbnail ID. + * @param string|array $size The post thumbnail size. Image size or array of width + * and height values (in that order). Default 'post-thumbnail'. */ - do_action( 'begin_fetch_post_thumbnail_html', $post_id, $post_thumbnail_id, $size ); + do_action( 'begin_fetch_post_thumbnail_html', $post->ID, $post_thumbnail_id, $size ); if ( in_the_loop() ) update_post_thumbnail_cache(); $html = wp_get_attachment_image( $post_thumbnail_id, $size, false, $attr ); @@ -118,11 +152,12 @@ function get_the_post_thumbnail( $post_id = null, $size = 'post-thumbnail', $att * * @since 2.9.0 * - * @param string $post_id The post ID. - * @param string $post_thumbnail_id The post thumbnail ID. - * @param string $size The post thumbnail size. + * @param int $post_id The post ID. + * @param string $post_thumbnail_id The post thumbnail ID. + * @param string|array $size The post thumbnail size. Image size or array of width + * and height values (in that order). Default 'post-thumbnail'. */ - do_action( 'end_fetch_post_thumbnail_html', $post_id, $post_thumbnail_id, $size ); + do_action( 'end_fetch_post_thumbnail_html', $post->ID, $post_thumbnail_id, $size ); } else { $html = ''; @@ -132,11 +167,46 @@ function get_the_post_thumbnail( $post_id = null, $size = 'post-thumbnail', $att * * @since 2.9.0 * - * @param string $html The post thumbnail HTML. - * @param string $post_id The post ID. - * @param string $post_thumbnail_id The post thumbnail ID. - * @param string $size The post thumbnail size. - * @param string $attr Query string of attributes. + * @param string $html The post thumbnail HTML. + * @param int $post_id The post ID. + * @param string $post_thumbnail_id The post thumbnail ID. + * @param string|array $size The post thumbnail size. Image size or array of width and height + * values (in that order). Default 'post-thumbnail'. + * @param string $attr Query string of attributes. */ - return apply_filters( 'post_thumbnail_html', $html, $post_id, $post_thumbnail_id, $size, $attr ); + return apply_filters( 'post_thumbnail_html', $html, $post->ID, $post_thumbnail_id, $size, $attr ); +} + +/** + * Return the post thumbnail URL. + * + * @since 4.4.0 + * + * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`. + * @param string|array $size Optional. Registered image size to retrieve the source for or a flat + * array of height and width dimensions. Default 'post-thumbnail'. + * @return string|false Post thumbnail URL or false if no URL is available. + */ +function get_the_post_thumbnail_url( $post = null, $size = 'post-thumbnail' ) { + $post_thumbnail_id = get_post_thumbnail_id( $post ); + if ( ! $post_thumbnail_id ) { + return false; + } + return wp_get_attachment_image_url( $post_thumbnail_id, $size ); +} + +/** + * Display the post thumbnail URL. + * + * @since 4.4.0 + * + * @param string|array $size Optional. Image size to use. Accepts any valid image size, + * or an array of width and height values in pixels (in that order). + * Default 'post-thumbnail'. + */ +function the_post_thumbnail_url( $size = 'post-thumbnail' ) { + $url = get_the_post_thumbnail_url( null, $size ); + if ( $url ) { + echo esc_url( $url ); + } } diff --git a/wp-includes/post.php b/wp-includes/post.php index d537148..ccb11de 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -1,10 +1,9 @@ <?php /** - * Post functions and post utility function. + * Core Post API * * @package WordPress * @subpackage Post - * @since 1.5.0 */ // @@ -26,6 +25,7 @@ function create_initial_post_types() { '_edit_link' => 'post.php?post=%d', /* internal use only. don't use this when registering your own post type. */ 'capability_type' => 'post', 'map_meta_cap' => true, + 'menu_position' => 5, 'hierarchical' => false, 'rewrite' => false, 'query_var' => false, @@ -43,6 +43,7 @@ function create_initial_post_types() { '_edit_link' => 'post.php?post=%d', /* internal use only. don't use this when registering your own post type. */ 'capability_type' => 'page', 'map_meta_cap' => true, + 'menu_position' => 20, 'hierarchical' => true, 'rewrite' => false, 'query_var' => false, @@ -109,42 +110,42 @@ function create_initial_post_types() { ) ); register_post_status( 'publish', array( - 'label' => _x( 'Published', 'post' ), + 'label' => _x( 'Published', 'post status' ), 'public' => true, '_builtin' => true, /* internal use only. */ 'label_count' => _n_noop( 'Published <span class="count">(%s)</span>', 'Published <span class="count">(%s)</span>' ), ) ); register_post_status( 'future', array( - 'label' => _x( 'Scheduled', 'post' ), + 'label' => _x( 'Scheduled', 'post status' ), 'protected' => true, '_builtin' => true, /* internal use only. */ 'label_count' => _n_noop('Scheduled <span class="count">(%s)</span>', 'Scheduled <span class="count">(%s)</span>' ), ) ); register_post_status( 'draft', array( - 'label' => _x( 'Draft', 'post' ), + 'label' => _x( 'Draft', 'post status' ), 'protected' => true, '_builtin' => true, /* internal use only. */ 'label_count' => _n_noop( 'Draft <span class="count">(%s)</span>', 'Drafts <span class="count">(%s)</span>' ), ) ); register_post_status( 'pending', array( - 'label' => _x( 'Pending', 'post' ), + 'label' => _x( 'Pending', 'post status' ), 'protected' => true, '_builtin' => true, /* internal use only. */ 'label_count' => _n_noop( 'Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>' ), ) ); register_post_status( 'private', array( - 'label' => _x( 'Private', 'post' ), + 'label' => _x( 'Private', 'post status' ), 'private' => true, '_builtin' => true, /* internal use only. */ 'label_count' => _n_noop( 'Private <span class="count">(%s)</span>', 'Private <span class="count">(%s)</span>' ), ) ); register_post_status( 'trash', array( - 'label' => _x( 'Trash', 'post' ), + 'label' => _x( 'Trash', 'post status' ), 'internal' => true, '_builtin' => true, /* internal use only. */ 'label_count' => _n_noop( 'Trash <span class="count">(%s)</span>', 'Trash <span class="count">(%s)</span>' ), @@ -164,7 +165,6 @@ function create_initial_post_types() { 'exclude_from_search' => false, ) ); } -add_action( 'init', 'create_initial_post_types', 0 ); // highest priority /** * Retrieve attached file path based on attachment ID. @@ -180,17 +180,21 @@ add_action( 'init', 'create_initial_post_types', 0 ); // highest priority * * @since 2.0.0 * - * @param int $attachment_id Attachment ID. - * @param bool $unfiltered Whether to apply filters. - * @return string|bool The file path to where the attached file should be, false otherwise. + * @param int $attachment_id Attachment ID. + * @param bool $unfiltered Optional. Whether to apply filters. Default false. + * @return string|false The file path to where the attached file should be, false otherwise. */ function get_attached_file( $attachment_id, $unfiltered = false ) { $file = get_post_meta( $attachment_id, '_wp_attached_file', true ); - // If the file is relative, prepend upload dir - if ( $file && 0 !== strpos($file, '/') && !preg_match('|^.:\\\|', $file) && ( ($uploads = wp_upload_dir()) && false === $uploads['error'] ) ) + + // If the file is relative, prepend upload dir. + if ( $file && 0 !== strpos( $file, '/' ) && ! preg_match( '|^.:\\\|', $file ) && ( ( $uploads = wp_get_upload_dir() ) && false === $uploads['error'] ) ) { $file = $uploads['basedir'] . "/$file"; - if ( $unfiltered ) + } + + if ( $unfiltered ) { return $file; + } /** * Filter the attached file based on the given ID. @@ -211,8 +215,8 @@ function get_attached_file( $attachment_id, $unfiltered = false ) { * * @since 2.1.0 * - * @param int $attachment_id Attachment ID - * @param string $file File path for the attachment + * @param int $attachment_id Attachment ID. + * @param string $file File path for the attachment. * @return bool True on success, false on failure. */ function update_attached_file( $attachment_id, $file ) { @@ -242,13 +246,13 @@ function update_attached_file( $attachment_id, $file ) { * * @since 2.9.0 * - * @param string $path Full path to the file - * @return string relative path on success, unchanged path on failure. + * @param string $path Full path to the file. + * @return string Relative path on success, unchanged path on failure. */ function _wp_relative_upload_path( $path ) { $new_path = $path; - $uploads = wp_upload_dir(); + $uploads = wp_get_upload_dir(); if ( 0 === strpos( $new_path, $uploads['basedir'] ) ) { $new_path = str_replace( $uploads['basedir'], '', $new_path ); $new_path = ltrim( $new_path, '/' ); @@ -278,7 +282,7 @@ function _wp_relative_upload_path( $path ) { * Attachments may also be made the child of a post, so if that is an accurate * statement (which needs to be verified), it would then be possible to get * all of the attachments for a post. Attachments have since changed since - * version 2.5, so this is most likely unaccurate, but serves generally as an + * version 2.5, so this is most likely inaccurate, but serves generally as an * example of what is possible. * * The arguments listed as defaults are for this function and also of the @@ -304,16 +308,20 @@ function _wp_relative_upload_path( $path ) { * post types are 'post', 'pages', and 'attachments'. The 'post_status' * argument will accept any post status within the write administration panels. * - * @see get_posts() Has additional arguments that can be replaced. - * @internal Claims made in the long description might be inaccurate. - * * @since 2.0.0 * - * @param mixed $args Optional. User defined arguments for replacing the defaults. - * @param string $output Optional. Constant for return type, either OBJECT (default), ARRAY_A, ARRAY_N. - * @return array|bool False on failure and the type will be determined by $output parameter. + * @see get_posts() + * @todo Check validity of description. + * + * @global WP_Post $post + * + * @param mixed $args Optional. User defined arguments for replacing the defaults. Default empty. + * @param string $output Optional. Constant for return type. Accepts OBJECT, ARRAY_A, ARRAY_N. + * Default OBJECT. + * @return array Array of children, where the type of each element is determined by $output parameter. + * Empty array on failure. */ -function get_children($args = '', $output = OBJECT) { +function get_children( $args = '', $output = OBJECT ) { $kids = array(); if ( empty( $args ) ) { if ( isset( $GLOBALS['post'] ) ) { @@ -350,12 +358,16 @@ function get_children($args = '', $output = OBJECT) { if ( $output == OBJECT ) { return $kids; } elseif ( $output == ARRAY_A ) { - foreach ( (array) $kids as $kid ) + $weeuns = array(); + foreach ( (array) $kids as $kid ) { $weeuns[$kid->ID] = get_object_vars($kids[$kid->ID]); + } return $weeuns; } elseif ( $output == ARRAY_N ) { - foreach ( (array) $kids as $kid ) + $babes = array(); + foreach ( (array) $kids as $kid ) { $babes[$kid->ID] = array_values(get_object_vars($kids[$kid->ID])); + } return $babes; } else { return $kids; @@ -370,16 +382,16 @@ function get_children($args = '', $output = OBJECT) { * referenced. * * The returned array has 'main', 'extended', and 'more_text' keys. Main has the text before - * the <code></code>. The 'extended' key has the content after the - * <code></code> comment. The 'more_text' key has the custom "Read More" text. + * the ``. The 'extended' key has the content after the + * `` comment. The 'more_text' key has the custom "Read More" text. * * @since 1.0.0 * * @param string $post Post content. - * @return array Post before ('main'), after ('extended'), and custom readmore ('more_text'). + * @return array Post before ('main'), after ('extended'), and custom read more ('more_text'). */ -function get_extended($post) { - //Match the new style more links +function get_extended( $post ) { + //Match the new style more links. if ( preg_match('//', $post, $matches) ) { list($main, $extended) = explode($matches[0], $post, 2); $more_text = $matches[1]; @@ -389,7 +401,7 @@ function get_extended($post) { $more_text = ''; } - // ` leading and trailing whitespace + // leading and trailing whitespace. $main = preg_replace('/^[\s]*(.*)[\s]*$/', '\\1', $main); $extended = preg_replace('/^[\s]*(.*)[\s]*$/', '\\1', $extended); $more_text = preg_replace('/^[\s]*(.*)[\s]*$/', '\\1', $more_text); @@ -404,18 +416,22 @@ function get_extended($post) { * $post, must be given as a variable, since it is passed by reference. * * @since 1.5.1 - * @link http://codex.wordpress.org/Function_Reference/get_post * - * @param int|WP_Post $post Optional. Post ID or post object. - * @param string $output Optional, default is Object. Either OBJECT, ARRAY_A, or ARRAY_N. - * @param string $filter Optional, default is raw. - * @return WP_Post|null WP_Post on success or null on failure + * @global WP_Post $post + * + * @param int|WP_Post|null $post Optional. Post ID or post object. Defaults to global $post. + * @param string $output Optional, default is Object. Accepts OBJECT, ARRAY_A, or ARRAY_N. + * Default OBJECT. + * @param string $filter Optional. Type of filter to apply. Accepts 'raw', 'edit', 'db', + * or 'display'. Default 'raw'. + * @return WP_Post|array|null Type corresponding to $output on success or null on failure. + * When $output is OBJECT, a `WP_Post` instance is returned. */ function get_post( $post = null, $output = OBJECT, $filter = 'raw' ) { if ( empty( $post ) && isset( $GLOBALS['post'] ) ) $post = $GLOBALS['post']; - if ( is_a( $post, 'WP_Post' ) ) { + if ( $post instanceof WP_Post ) { $_post = $post; } elseif ( is_object( $post ) ) { if ( empty( $post->filter ) ) { @@ -443,294 +459,6 @@ function get_post( $post = null, $output = OBJECT, $filter = 'raw' ) { return $_post; } -/** - * WordPress Post class. - * - * @since 3.5.0 - * - */ -final class WP_Post { - - /** - * Post ID. - * - * @var int - */ - public $ID; - - /** - * ID of post author. - * - * A numeric string, for compatibility reasons. - * - * @var string - */ - public $post_author = 0; - - /** - * The post's local publication time. - * - * @var string - */ - public $post_date = '0000-00-00 00:00:00'; - - /** - * The post's GMT publication time. - * - * @var string - */ - public $post_date_gmt = '0000-00-00 00:00:00'; - - /** - * The post's content. - * - * @var string - */ - public $post_content = ''; - - /** - * The post's title. - * - * @var string - */ - public $post_title = ''; - - /** - * The post's excerpt. - * - * @var string - */ - public $post_excerpt = ''; - - /** - * The post's status. - * - * @var string - */ - public $post_status = 'publish'; - - /** - * Whether comments are allowed. - * - * @var string - */ - public $comment_status = 'open'; - - /** - * Whether pings are allowed. - * - * @var string - */ - public $ping_status = 'open'; - - /** - * The post's password in plain text. - * - * @var string - */ - public $post_password = ''; - - /** - * The post's slug. - * - * @var string - */ - public $post_name = ''; - - /** - * URLs queued to be pinged. - * - * @var string - */ - public $to_ping = ''; - - /** - * URLs that have been pinged. - * - * @var string - */ - public $pinged = ''; - - /** - * The post's local modified time. - * - * @var string - */ - public $post_modified = '0000-00-00 00:00:00'; - - /** - * The post's GMT modified time. - * - * @var string - */ - public $post_modified_gmt = '0000-00-00 00:00:00'; - - /** - * A utility DB field for post content. - * - * - * @var string - */ - public $post_content_filtered = ''; - - /** - * ID of a post's parent post. - * - * @var int - */ - public $post_parent = 0; - - /** - * The unique identifier for a post, not necessarily a URL, used as the feed GUID. - * - * @var string - */ - public $guid = ''; - - /** - * A field used for ordering posts. - * - * @var int - */ - public $menu_order = 0; - - /** - * The post's type, like post or page. - * - * @var string - */ - public $post_type = 'post'; - - /** - * An attachment's mime type. - * - * @var string - */ - public $post_mime_type = ''; - - /** - * Cached comment count. - * - * A numeric string, for compatibility reasons. - * - * @var string - */ - public $comment_count = 0; - - /** - * Stores the post object's sanitization level. - * - * Does not correspond to a DB field. - * - * @var string - */ - public $filter; - - public static function get_instance( $post_id ) { - global $wpdb; - - $post_id = (int) $post_id; - if ( ! $post_id ) - return false; - - $_post = wp_cache_get( $post_id, 'posts' ); - - if ( ! $_post ) { - $_post = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE ID = %d LIMIT 1", $post_id ) ); - - if ( ! $_post ) - return false; - - $_post = sanitize_post( $_post, 'raw' ); - wp_cache_add( $_post->ID, $_post, 'posts' ); - } elseif ( empty( $_post->filter ) ) { - $_post = sanitize_post( $_post, 'raw' ); - } - - return new WP_Post( $_post ); - } - - public function __construct( $post ) { - foreach ( get_object_vars( $post ) as $key => $value ) - $this->$key = $value; - } - - public function __isset( $key ) { - if ( 'ancestors' == $key ) - return true; - - if ( 'page_template' == $key ) - return ( 'page' == $this->post_type ); - - if ( 'post_category' == $key ) - return true; - - if ( 'tags_input' == $key ) - return true; - - return metadata_exists( 'post', $this->ID, $key ); - } - - public function __get( $key ) { - if ( 'page_template' == $key && $this->__isset( $key ) ) { - return get_post_meta( $this->ID, '_wp_page_template', true ); - } - - if ( 'post_category' == $key ) { - if ( is_object_in_taxonomy( $this->post_type, 'category' ) ) - $terms = get_the_terms( $this, 'category' ); - - if ( empty( $terms ) ) - return array(); - - return wp_list_pluck( $terms, 'term_id' ); - } - - if ( 'tags_input' == $key ) { - if ( is_object_in_taxonomy( $this->post_type, 'post_tag' ) ) - $terms = get_the_terms( $this, 'post_tag' ); - - if ( empty( $terms ) ) - return array(); - - return wp_list_pluck( $terms, 'name' ); - } - - // Rest of the values need filtering - - if ( 'ancestors' == $key ) - $value = get_post_ancestors( $this ); - else - $value = get_post_meta( $this->ID, $key, true ); - - if ( $this->filter ) - $value = sanitize_post_field( $key, $value, $this->ID, $this->filter ); - - return $value; - } - - public function filter( $filter ) { - if ( $this->filter == $filter ) - return $this; - - if ( $filter == 'raw' ) - return self::get_instance( $this->ID ); - - return sanitize_post( $this, $filter ); - } - - public function to_array() { - $post = get_object_vars( $this ); - - foreach ( array( 'ancestors', 'page_template', 'post_category', 'tags_input' ) as $key ) { - if ( $this->__isset( $key ) ) - $post[ $key ] = $this->__get( $key ); - } - - return $post; - } -} - /** * Retrieve ancestors of a post. * @@ -770,14 +498,17 @@ function get_post_ancestors( $post ) { * supported values are found within those functions. * * @since 2.3.0 - * @uses sanitize_post_field() See for possible $context values. + * @since 4.5.0 The `$post` parameter was made optional. * - * @param string $field Post field name. - * @param int|WP_Post $post Post ID or post object. - * @param string $context Optional. How to filter the field. Default is 'display'. + * @see sanitize_post_field() + * + * @param string $field Post field name. + * @param int|WP_Post $post Optional. Post ID or post object. Defaults to current post. + * @param string $context Optional. How to filter the field. Accepts 'raw', 'edit', 'db', + * or 'display'. Default 'display'. * @return string The value of the post field on success, empty string on failure. */ -function get_post_field( $field, $post, $context = 'display' ) { +function get_post_field( $field, $post = null, $context = 'display' ) { $post = get_post( $post ); if ( !$post ) @@ -797,10 +528,10 @@ function get_post_field( $field, $post, $context = 'display' ) { * * @since 2.0.0 * - * @param int|WP_Post $ID Optional. Post ID or post object. - * @return string|bool The mime type on success, false on failure. + * @param int|WP_Post $ID Optional. Post ID or post object. Default empty. + * @return string|false The mime type on success, false on failure. */ -function get_post_mime_type($ID = '') { +function get_post_mime_type( $ID = '' ) { $post = get_post($ID); if ( is_object($post) ) @@ -817,10 +548,10 @@ function get_post_mime_type($ID = '') { * * @since 2.0.0 * - * @param int|WP_Post $ID Optional. Post ID or post object. - * @return string|bool Post status on success, false on failure. + * @param int|WP_Post $ID Optional. Post ID or post object. Default empty. + * @return string|false Post status on success, false on failure. */ -function get_post_status($ID = '') { +function get_post_status( $ID = '' ) { $post = get_post($ID); if ( !is_object($post) ) @@ -830,16 +561,31 @@ function get_post_status($ID = '') { if ( 'private' == $post->post_status ) return 'private'; - // Unattached attachments are assumed to be published + // Unattached attachments are assumed to be published. if ( ( 'inherit' == $post->post_status ) && ( 0 == $post->post_parent) ) return 'publish'; - // Inherit status from the parent - if ( $post->post_parent && ( $post->ID != $post->post_parent ) ) - return get_post_status($post->post_parent); + // Inherit status from the parent. + if ( $post->post_parent && ( $post->ID != $post->post_parent ) ) { + $parent_post_status = get_post_status( $post->post_parent ); + if ( 'trash' == $parent_post_status ) { + return get_post_meta( $post->post_parent, '_wp_trash_meta_status', true ); + } else { + return $parent_post_status; + } + } + } - return $post->post_status; + /** + * Filter the post status. + * + * @since 4.4.0 + * + * @param string $post_status The post status. + * @param WP_Post $post The post object. + */ + return apply_filters( 'get_post_status', $post->post_status, $post ); } /** @@ -854,10 +600,10 @@ function get_post_status($ID = '') { */ function get_post_statuses() { $status = array( - 'draft' => __('Draft'), - 'pending' => __('Pending Review'), - 'private' => __('Private'), - 'publish' => __('Published') + 'draft' => __( 'Draft' ), + 'pending' => __( 'Pending Review' ), + 'private' => __( 'Private' ), + 'publish' => __( 'Published' ) ); return $status; @@ -875,9 +621,9 @@ function get_post_statuses() { */ function get_page_statuses() { $status = array( - 'draft' => __('Draft'), - 'private' => __('Private'), - 'publish' => __('Published') + 'draft' => __( 'Draft' ), + 'private' => __( 'Private' ), + 'publish' => __( 'Published' ) ); return $status; @@ -890,25 +636,43 @@ function get_page_statuses() { * parameters given. The function will accept an array (second optional * parameter), along with a string for the post status name. * - * - * Optional $args contents: - * - * label - A descriptive name for the post status marked for translation. Defaults to $post_status. - * public - Whether posts of this status should be shown in the front end of the site. Defaults to true. - * exclude_from_search - Whether to exclude posts with this post status from search results. Defaults to false. - * show_in_admin_all_list - Whether to include posts in the edit listing for their post type - * show_in_admin_status_list - Show in the list of statuses with post counts at the top of the edit - * listings, e.g. All (12) | Published (9) | My Custom Status (2) ... - * * Arguments prefixed with an _underscore shouldn't be used by plugins and themes. * * @since 3.0.0 - * @uses $wp_post_statuses Inserts new post status object into the list + * @global array $wp_post_statuses Inserts new post status object into the list * * @param string $post_status Name of the post status. - * @param array|string $args See above description. + * @param array|string $args { + * Optional. Array or string of post status arguments. + * + * @type bool|string $label A descriptive name for the post status marked + * for translation. Defaults to value of $post_status. + * @type bool|array $label_count Descriptive text to use for nooped plurals. + * Default array of $label, twice + * @type bool $exclude_from_search Whether to exclude posts with this post status + * from search results. Default is value of $internal. + * @type bool $_builtin Whether the status is built-in. Core-use only. + * Default false. + * @type bool $public Whether posts of this status should be shown + * in the front end of the site. Default false. + * @type bool $internal Whether the status is for internal use only. + * Default false. + * @type bool $protected Whether posts with this status should be protected. + * Default false. + * @type bool $private Whether posts with this status should be private. + * Default false. + * @type bool $publicly_queryable Whether posts with this status should be publicly- + * queryable. Default is value of $public. + * @type bool $show_in_admin_all_list Whether to include posts in the edit listing for + * their post type. Default is value of $internal. + * @type bool $show_in_admin_status_list Show in the list of statuses with post counts at + * the top of the edit listings, + * e.g. All (12) | Published (9) | My Custom Status (2) + * Default is value of $internal. + * } + * @return object */ -function register_post_status($post_status, $args = array()) { +function register_post_status( $post_status, $args = array() ) { global $wp_post_statuses; if (!is_array($wp_post_statuses)) @@ -934,6 +698,7 @@ function register_post_status($post_status, $args = array()) { $post_status = sanitize_key($post_status); $args->name = $post_status; + // Set various defaults. if ( null === $args->public && null === $args->internal && null === $args->protected && null === $args->private ) $args->internal = true; @@ -973,15 +738,16 @@ function register_post_status($post_status, $args = array()) { } /** - * Retrieve a post status object by name + * Retrieve a post status object by name. * * @since 3.0.0 - * @uses $wp_post_statuses - * @see register_post_status - * @see get_post_statuses * - * @param string $post_status The name of a registered post status - * @return object A post status object + * @global array $wp_post_statuses List of post statuses. + * + * @see register_post_status() + * + * @param string $post_status The name of a registered post status. + * @return object|null A post status object. */ function get_post_status_object( $post_status ) { global $wp_post_statuses; @@ -993,18 +759,21 @@ function get_post_status_object( $post_status ) { } /** - * Get a list of all registered post status objects. + * Get a list of post statuses. * * @since 3.0.0 - * @uses $wp_post_statuses - * @see register_post_status - * @see get_post_status_object - * - * @param array|string $args An array of key => value arguments to match against the post status objects. - * @param string $output The type of output to return, either post status 'names' or 'objects'. 'names' is the default. - * @param string $operator The logical operation to perform. 'or' means only one element - * from the array needs to match; 'and' means all elements must match. The default is 'and'. - * @return array A list of post status names or objects + * + * @global array $wp_post_statuses List of post statuses. + * + * @see register_post_status() + * + * @param array|string $args Optional. Array or string of post status arguments to compare against + * properties of the global `$wp_post_statuses objects`. Default empty array. + * @param string $output Optional. The type of output to return, either 'names' or 'objects'. Default 'names'. + * @param string $operator Optional. The logical operation to perform. 'or' means only one element + * from the array needs to match; 'and' means all elements must match. + * Default 'and'. + * @return array A list of post status names or objects. */ function get_post_stati( $args = array(), $output = 'names', $operator = 'and' ) { global $wp_post_statuses; @@ -1020,7 +789,8 @@ function get_post_stati( $args = array(), $output = 'names', $operator = 'and' ) * A false return value might also mean that the post type does not exist. * * @since 3.0.0 - * @see get_post_type_object + * + * @see get_post_type_object() * * @param string $post_type Post type name * @return bool Whether post type is hierarchical. @@ -1034,12 +804,13 @@ function is_post_type_hierarchical( $post_type ) { } /** - * Checks if a post type is registered. + * Check if a post type is registered. * * @since 3.0.0 - * @uses get_post_type_object() * - * @param string $post_type Post type name + * @see get_post_type_object() + * + * @param string $post_type Post type name. * @return bool Whether post type is registered. */ function post_type_exists( $post_type ) { @@ -1051,8 +822,8 @@ function post_type_exists( $post_type ) { * * @since 2.1.0 * - * @param int|WP_Post $post Optional. Post ID or post object. - * @return string|bool Post type on success, false on failure. + * @param int|WP_Post|null $post Optional. Post ID or post object. Default is global $post. + * @return string|false Post type on success, false on failure. */ function get_post_type( $post = null ) { if ( $post = get_post( $post ) ) @@ -1062,37 +833,44 @@ function get_post_type( $post = null ) { } /** - * Retrieve a post type object by name + * Retrieve a post type object by name. * * @since 3.0.0 - * @uses $wp_post_types - * @see register_post_type - * @see get_post_types * - * @param string $post_type The name of a registered post type - * @return object A post type object + * @global array $wp_post_types List of post types. + * + * @see register_post_type() + * + * @param string $post_type The name of a registered post type. + * @return object|null A post type object. */ function get_post_type_object( $post_type ) { global $wp_post_types; - if ( empty($wp_post_types[$post_type]) ) + if ( ! is_scalar( $post_type ) || empty( $wp_post_types[ $post_type ] ) ) { return null; + } - return $wp_post_types[$post_type]; + return $wp_post_types[ $post_type ]; } /** * Get a list of all registered post type objects. * * @since 2.9.0 - * @uses $wp_post_types - * @see register_post_type - * - * @param array|string $args An array of key => value arguments to match against the post type objects. - * @param string $output The type of output to return, either post type 'names' or 'objects'. 'names' is the default. - * @param string $operator The logical operation to perform. 'or' means only one element - * from the array needs to match; 'and' means all elements must match. The default is 'and'. - * @return array A list of post type names or objects + * + * @global array $wp_post_types List of post types. + * + * @see register_post_type() for accepted arguments. + * + * @param array|string $args Optional. An array of key => value arguments to match against + * the post type objects. Default empty array. + * @param string $output Optional. The type of output to return. Accepts post type 'names' + * or 'objects'. Default 'names'. + * @param string $operator Optional. The logical operation to perform. 'or' means only one + * element from the array needs to match; 'and' means all elements + * must match; 'not' means no elements may match. Default 'and'. + * @return array A list of post type names or objects. */ function get_post_types( $args = array(), $output = 'names', $operator = 'and' ) { global $wp_post_types; @@ -1109,97 +887,136 @@ function get_post_types( $args = array(), $output = 'names', $operator = 'and' ) * parameters given. The function will accept an array (second optional * parameter), along with a string for the post type name. * - * Optional $args contents: - * - * - label - Name of the post type shown in the menu. Usually plural. If not set, labels['name'] will be used. - * - labels - An array of labels for this post type. - * * If not set, post labels are inherited for non-hierarchical types and page labels for hierarchical ones. - * * You can see accepted values in {@link get_post_type_labels()}. - * - description - A short descriptive summary of what the post type is. Defaults to blank. - * - public - Whether a post type is intended for use publicly either via the admin interface or by front-end users. - * * Defaults to false. - * * While the default settings of exclude_from_search, publicly_queryable, show_ui, and show_in_nav_menus are - * inherited from public, each does not rely on this relationship and controls a very specific intention. - * - hierarchical - Whether the post type is hierarchical (e.g. page). Defaults to false. - * - exclude_from_search - Whether to exclude posts with this post type from front end search results. - * * If not set, the opposite of public's current value is used. - * - publicly_queryable - Whether queries can be performed on the front end for the post type as part of parse_request(). - * * ?post_type={post_type_key} - * * ?{post_type_key}={single_post_slug} - * * ?{post_type_query_var}={single_post_slug} - * * If not set, the default is inherited from public. - * - show_ui - Whether to generate a default UI for managing this post type in the admin. - * * If not set, the default is inherited from public. - * - show_in_menu - Where to show the post type in the admin menu. - * * If true, the post type is shown in its own top level menu. - * * If false, no menu is shown - * * If a string of an existing top level menu (eg. 'tools.php' or 'edit.php?post_type=page'), the post type will - * be placed as a sub menu of that. - * * show_ui must be true. - * * If not set, the default is inherited from show_ui - * - show_in_nav_menus - Makes this post type available for selection in navigation menus. - * * If not set, the default is inherited from public. - * - show_in_admin_bar - Makes this post type available via the admin bar. - * * If not set, the default is inherited from show_in_menu - * - menu_position - The position in the menu order the post type should appear. - * * show_in_menu must be true - * * Defaults to null, which places it at the bottom of its area. - * - menu_icon - The url to the icon to be used for this menu. Defaults to use the posts icon. - * * Pass a base64-encoded SVG using a data URI, which will be colored to match the color scheme. - * This should begin with 'data:image/svg+xml;base64,'. - * * Pass the name of a Dashicons helper class to use a font icon, e.g. 'dashicons-chart-pie'. - * * Pass 'none' to leave div.wp-menu-image empty so an icon can be added via CSS. - * - capability_type - The string to use to build the read, edit, and delete capabilities. Defaults to 'post'. - * * May be passed as an array to allow for alternative plurals when using this argument as a base to construct the - * capabilities, e.g. array('story', 'stories'). - * - capabilities - Array of capabilities for this post type. - * * By default the capability_type is used as a base to construct capabilities. - * * You can see accepted values in {@link get_post_type_capabilities()}. - * - map_meta_cap - Whether to use the internal default meta capability handling. Defaults to false. - * - supports - An alias for calling add_post_type_support() directly. Defaults to title and editor. - * * See {@link add_post_type_support()} for documentation. - * - register_meta_box_cb - Provide a callback function that sets up the meta boxes - * for the edit form. Do remove_meta_box() and add_meta_box() calls in the callback. - * - taxonomies - An array of taxonomy identifiers that will be registered for the post type. - * * Default is no taxonomies. - * * Taxonomies can be registered later with register_taxonomy() or register_taxonomy_for_object_type(). - * - has_archive - True to enable post type archives. Default is false. - * * Will generate the proper rewrite rules if rewrite is enabled. - * - rewrite - Triggers the handling of rewrites for this post type. Defaults to true, using $post_type as slug. - * * To prevent rewrite, set to false. - * * To specify rewrite rules, an array can be passed with any of these keys - * * 'slug' => string Customize the permastruct slug. Defaults to $post_type key - * * 'with_front' => bool Should the permastruct be prepended with WP_Rewrite::$front. Defaults to true. - * * 'feeds' => bool Should a feed permastruct be built for this post type. Inherits default from has_archive. - * * 'pages' => bool Should the permastruct provide for pagination. Defaults to true. - * * 'ep_mask' => const Assign an endpoint mask. - * * If not specified and permalink_epmask is set, inherits from permalink_epmask. - * * If not specified and permalink_epmask is not set, defaults to EP_PERMALINK - * - query_var - Sets the query_var key for this post type. Defaults to $post_type key - * * If false, a post type cannot be loaded at ?{query_var}={post_slug} - * * If specified as a string, the query ?{query_var_string}={post_slug} will be valid. - * - can_export - Allows this post type to be exported. Defaults to true. - * - delete_with_user - Whether to delete posts of this type when deleting a user. - * * If true, posts of this type belonging to the user will be moved to trash when then user is deleted. - * * If false, posts of this type belonging to the user will *not* be trashed or deleted. - * * If not set (the default), posts are trashed if post_type_supports('author'). Otherwise posts are not trashed or deleted. - * - _builtin - true if this post type is a native or "built-in" post_type. THIS IS FOR INTERNAL USE ONLY! - * - _edit_link - URL segement to use for edit link of this post type. THIS IS FOR INTERNAL USE ONLY! - * * @since 2.9.0 - * @uses $wp_post_types Inserts new post type object into the list - * @uses $wp_rewrite Gets default feeds - * @uses $wp Adds query vars + * @since 3.0.0 The `show_ui` argument is now enforced on the new post screen. + * @since 4.4.0 The `show_ui` argument is now enforced on the post type listing screen and post editing screen. + * + * @global array $wp_post_types List of post types. + * @global WP_Rewrite $wp_rewrite Used for default feeds. + * @global WP $wp Used to add query vars. * * @param string $post_type Post type key, must not exceed 20 characters. - * @param array|string $args See optional args description above. - * @return object|WP_Error the registered post type object, or an error object. + * @param array|string $args { + * Array or string of arguments for registering a post type. + * + * @type string $label Name of the post type shown in the menu. Usually plural. + * Default is value of $labels['name']. + * @type array $labels An array of labels for this post type. If not set, post + * labels are inherited for non-hierarchical types and page + * labels for hierarchical ones. {@see get_post_type_labels()}. + * @type string $description A short descriptive summary of what the post type is. + * Default empty. + * @type bool $public Whether a post type is intended for use publicly either via + * the admin interface or by front-end users. While the default + * settings of $exclude_from_search, $publicly_queryable, $show_ui, + * and $show_in_nav_menus are inherited from public, each does not + * rely on this relationship and controls a very specific intention. + * Default false. + * @type bool $hierarchical Whether the post type is hierarchical (e.g. page). Default false. + * @type bool $exclude_from_search Whether to exclude posts with this post type from front end search + * results. Default is the opposite value of $public. + * @type bool $publicly_queryable Whether queries can be performed on the front end for the post type + * as part of {@see parse_request()}. Endpoints would include: + * * ?post_type={post_type_key} + * * ?{post_type_key}={single_post_slug} + * * ?{post_type_query_var}={single_post_slug} + * If not set, the default is inherited from $public. + * @type bool $show_ui Whether to generate and allow a UI for managing this post type in the + * admin. Default is value of $public. + * @type bool $show_in_menu Where to show the post type in the admin menu. To work, $show_ui + * must be true. If true, the post type is shown in its own top level + * menu. If false, no menu is shown. If a string of an existing top + * level menu (eg. 'tools.php' or 'edit.php?post_type=page'), the post + * type will be placed as a sub-menu of that. + * Default is value of $show_ui. + * @type bool $show_in_nav_menus Makes this post type available for selection in navigation menus. + * Default is value $public. + * @type bool $show_in_admin_bar Makes this post type available via the admin bar. Default is value + * of $show_in_menu. + * @type int $menu_position The position in the menu order the post type should appear. To work, + * $show_in_menu must be true. Default null (at the bottom). + * @type string $menu_icon The url to the icon to be used for this menu. Pass a base64-encoded + * SVG using a data URI, which will be colored to match the color scheme + * -- this should begin with 'data:image/svg+xml;base64,'. Pass the name + * of a Dashicons helper class to use a font icon, e.g. + * 'dashicons-chart-pie'. Pass 'none' to leave div.wp-menu-image empty + * so an icon can be added via CSS. Defaults to use the posts icon. + * @type string $capability_type The string to use to build the read, edit, and delete capabilities. + * May be passed as an array to allow for alternative plurals when using + * this argument as a base to construct the capabilities, e.g. + * array('story', 'stories'). Default 'post'. + * @type array $capabilities Array of capabilities for this post type. $capability_type is used + * as a base to construct capabilities by default. + * {@see get_post_type_capabilities()}. + * @type bool $map_meta_cap Whether to use the internal default meta capability handling. + * Default false. + * @type array $supports An alias for calling {@see add_post_type_support()} directly. + * Defaults to array containing 'title' & 'editor'. + * @type callable $register_meta_box_cb Provide a callback function that sets up the meta boxes for the + * edit form. Do remove_meta_box() and add_meta_box() calls in the + * callback. Default null. + * @type array $taxonomies An array of taxonomy identifiers that will be registered for the + * post type. Taxonomies can be registered later with + * {@see register_taxonomy()} or {@see register_taxonomy_for_object_type()}. + * Default empty array. + * @type bool|string $has_archive Whether there should be post type archives, or if a string, the + * archive slug to use. Will generate the proper rewrite rules if + * $rewrite is enabled. Default false. + * @type bool|array $rewrite { + * Triggers the handling of rewrites for this post type. To prevent rewrite, set to false. + * Defaults to true, using $post_type as slug. To specify rewrite rules, an array can be + * passed with any of these keys: + * + * @type string $slug Customize the permastruct slug. Defaults to $post_type key. + * @type bool $with_front Whether the permastruct should be prepended with WP_Rewrite::$front. + * Default true. + * @type bool $feeds Whether the feed permastruct should be built for this post type. + * Default is value of $has_archive. + * @type bool $pages Whether the permastruct should provide for pagination. Default true. + * @type const $ep_mask Endpoint mask to assign. If not specified and permalink_epmask is set, + * inherits from $permalink_epmask. If not specified and permalink_epmask + * is not set, defaults to EP_PERMALINK. + * } + * @type string|bool $query_var Sets the query_var key for this post type. Defaults to $post_type + * key. If false, a post type cannot be loaded at + * ?{query_var}={post_slug}. If specified as a string, the query + * ?{query_var_string}={post_slug} will be valid. + * @type bool $can_export Whether to allow this post type to be exported. Default true. + * @type bool $delete_with_user Whether to delete posts of this type when deleting a user. If true, + * posts of this type belonging to the user will be moved to trash + * when then user is deleted. If false, posts of this type belonging + * to the user will *not* be trashed or deleted. If not set (the default), + * posts are trashed if post_type_supports('author'). Otherwise posts + * are not trashed or deleted. Default null. + * @type bool $_builtin FOR INTERNAL USE ONLY! True if this post type is a native or + * "built-in" post_type. Default false. + * @type string $_edit_link FOR INTERNAL USE ONLY! URL segment to use for edit link of + * this post type. Default 'post.php?post=%d'. + * } + * @return object|WP_Error The registered post type object, or an error object. */ function register_post_type( $post_type, $args = array() ) { global $wp_post_types, $wp_rewrite, $wp; - if ( ! is_array( $wp_post_types ) ) + if ( ! is_array( $wp_post_types ) ) { $wp_post_types = array(); + } + + // Sanitize post type name + $post_type = sanitize_key( $post_type ); + $args = wp_parse_args( $args ); + + /** + * Filter the arguments for registering a post type. + * + * @since 4.4.0 + * + * @param array $args Array of arguments for registering a post type. + * @param string $post_type Post type key. + */ + $args = apply_filters( 'register_post_type_args', $args, $post_type ); + + $has_edit_link = ! empty( $args['_edit_link'] ); // Args prefixed with an underscore are reserved for internal use. $defaults = array( @@ -1229,14 +1046,15 @@ function register_post_type( $post_type, $args = array() ) { '_builtin' => false, '_edit_link' => 'post.php?post=%d', ); - $args = wp_parse_args( $args, $defaults ); + $args = array_merge( $defaults, $args ); $args = (object) $args; - $post_type = sanitize_key( $post_type ); $args->name = $post_type; - if ( strlen( $post_type ) > 20 ) - return new WP_Error( 'post_type_too_long', __( 'Post types cannot exceed 20 characters in length' ) ); + if ( empty( $post_type ) || strlen( $post_type ) > 20 ) { + _doing_it_wrong( __FUNCTION__, __( 'Post type names must be between 1 and 20 characters in length.' ), '4.2' ); + return new WP_Error( 'post_type_length_invalid', __( 'Post type names must be between 1 and 20 characters in length.' ) ); + } // If not set, default to the setting for public. if ( null === $args->publicly_queryable ) @@ -1252,7 +1070,7 @@ function register_post_type( $post_type, $args = array() ) { // If not set, default to the whether the full UI is shown. if ( null === $args->show_in_admin_bar ) - $args->show_in_admin_bar = true === $args->show_in_menu; + $args->show_in_admin_bar = (bool) $args->show_in_menu; // If not set, default to the setting for public. if ( null === $args->show_in_nav_menus ) @@ -1262,7 +1080,7 @@ function register_post_type( $post_type, $args = array() ) { if ( null === $args->exclude_from_search ) $args->exclude_from_search = !$args->public; - // Back compat with quirky handling in version 3.0. #14122 + // Back compat with quirky handling in version 3.0. #14122. if ( empty( $args->capabilities ) && null === $args->map_meta_cap && in_array( $args->capability_type, array( 'post', 'page' ) ) ) $args->map_meta_cap = true; @@ -1270,6 +1088,11 @@ function register_post_type( $post_type, $args = array() ) { if ( null === $args->map_meta_cap ) $args->map_meta_cap = false; + // If there's no specified edit link and no UI, remove the edit link. + if ( ! $args->show_ui && ! $has_edit_link ) { + $args->_edit_link = ''; + } + $args->cap = get_post_type_capabilities( $args ); unset( $args->capabilities ); @@ -1284,12 +1107,15 @@ function register_post_type( $post_type, $args = array() ) { add_post_type_support( $post_type, array( 'title', 'editor' ) ); } - if ( false !== $args->query_var && ! empty( $wp ) ) { + if ( false !== $args->query_var ) { if ( true === $args->query_var ) $args->query_var = $post_type; else $args->query_var = sanitize_title_with_dashes( $args->query_var ); - $wp->add_query_var( $args->query_var ); + + if ( $wp && is_post_type_viewable( $args ) ) { + $wp->add_query_var( $args->query_var ); + } } if ( false !== $args->rewrite && ( is_admin() || '' != get_option( 'permalink_structure' ) ) ) { @@ -1337,6 +1163,7 @@ function register_post_type( $post_type, $args = array() ) { add_permastruct( $post_type, "{$args->rewrite['slug']}/%$post_type%", $permastruct_args ); } + // Register the post type meta box if a custom callback was specified. if ( $args->register_meta_box_cb ) add_action( 'add_meta_boxes_' . $post_type, $args->register_meta_box_cb, 10, 1 ); @@ -1357,7 +1184,7 @@ function register_post_type( $post_type, $args = array() ) { * @since 3.3.0 * * @param string $post_type Post type. - * @param array $args Arguments used to register the post type. + * @param object $args Arguments used to register the post type. */ do_action( 'registered_post_type', $post_type, $args ); @@ -1365,7 +1192,89 @@ function register_post_type( $post_type, $args = array() ) { } /** - * Builds an object with all post type capabilities out of a post type object + * Unregisters a post type. + * + * Can not be used to unregister built-in post types. + * + * @since 4.5.0 + * + * @global WP_Rewrite $wp_rewrite WordPress rewrite component. + * @global WP $wp Current WordPress environment instance. + * @global array $_wp_post_type_features Used to remove post type features. + * @global array $post_type_meta_caps Used to remove meta capabilities. + * @global array $wp_post_types List of post types. + * + * @param string $post_type Post type to unregister. + * @return bool|WP_Error True on success, WP_Error on failure or if the post type doesn't exist. + */ +function unregister_post_type( $post_type ) { + if ( ! post_type_exists( $post_type ) ) { + return new WP_Error( 'invalid_post_type', __( 'Invalid post type' ) ); + } + + $post_type_args = get_post_type_object( $post_type ); + + // Do not allow unregistering internal post types. + if ( $post_type_args->_builtin ) { + return new WP_Error( 'invalid_post_type', __( 'Unregistering a built-in post type is not allowed' ) ); + } + + global $wp, $wp_rewrite, $_wp_post_type_features, $post_type_meta_caps, $wp_post_types; + + // Remove query var. + if ( false !== $post_type_args->query_var ) { + $wp->remove_query_var( $post_type_args->query_var ); + } + + // Remove any rewrite rules, permastructs, and rules. + if ( false !== $post_type_args->rewrite ) { + remove_rewrite_tag( "%$post_type%" ); + remove_permastruct( $post_type ); + foreach ( $wp_rewrite->extra_rules_top as $regex => $query ) { + if ( false !== strpos( $query, "index.php?post_type=$post_type" ) ) { + unset( $wp_rewrite->extra_rules_top[ $regex ] ); + } + } + } + + // Remove registered custom meta capabilities. + foreach ( $post_type_args->cap as $cap ) { + unset( $post_type_meta_caps[ $cap ] ); + } + + // Remove all post type support. + unset( $_wp_post_type_features[ $post_type ] ); + + // Unregister the post type meta box if a custom callback was specified. + if ( $post_type_args->register_meta_box_cb ) { + remove_action( 'add_meta_boxes_' . $post_type, $post_type_args->register_meta_box_cb ); + } + + // Remove the post type from all taxonomies. + foreach ( get_object_taxonomies( $post_type ) as $taxonomy ) { + unregister_taxonomy_for_object_type( $taxonomy, $post_type ); + } + + // Remove the future post hook action. + remove_action( 'future_' . $post_type, '_future_post_hook', 5 ); + + // Remove the post type. + unset( $wp_post_types[ $post_type ] ); + + /** + * Fires after a post type was unregistered. + * + * @since 4.5.0 + * + * @param string $post_type Post type key. + */ + do_action( 'unregistered_post_type', $post_type ); + + return true; +} + +/** + * Build an object with all post type capabilities out of a post type object * * Post type capabilities use the 'capability_type' argument as a base, if the * capability is not set in the 'capabilities' argument array or if the @@ -1411,11 +1320,13 @@ function register_post_type( $post_type, $args = array() ) { * only assigned by default if the post type is registered with the 'map_meta_cap' * argument set to true (default is false). * - * @see map_meta_cap() * @since 3.0.0 * - * @param object $args Post type registration arguments - * @return object object with all the capabilities as member variables + * @see register_post_type() + * @see map_meta_cap() + * + * @param object $args Post type registration arguments. + * @return object object with all the capabilities as member variables. */ function get_post_type_capabilities( $args ) { if ( ! is_array( $args->capability_type ) ) @@ -1464,46 +1375,72 @@ function get_post_type_capabilities( $args ) { } /** - * Stores or returns a list of post type meta caps for map_meta_cap(). + * Store or return a list of post type meta caps for map_meta_cap(). * * @since 3.1.0 * @access private + * + * @global array $post_type_meta_caps Used to store meta capabilities. + * + * @param array $capabilities Post type meta capabilities. */ function _post_type_meta_capabilities( $capabilities = null ) { - static $meta_caps = array(); - if ( null === $capabilities ) - return $meta_caps; + global $post_type_meta_caps; + foreach ( $capabilities as $core => $custom ) { - if ( in_array( $core, array( 'read_post', 'delete_post', 'edit_post' ) ) ) - $meta_caps[ $custom ] = $core; + if ( in_array( $core, array( 'read_post', 'delete_post', 'edit_post' ) ) ) { + $post_type_meta_caps[ $custom ] = $core; + } } } /** - * Builds an object with all post type labels out of a post type object + * Build an object with all post type labels out of a post type object * * Accepted keys of the label array in the post type object: - * - name - general name for the post type, usually plural. The same and overridden by $post_type_object->label. Default is Posts/Pages + * + * - name - general name for the post type, usually plural. The same and overridden + * by $post_type_object->label. Default is Posts/Pages * - singular_name - name for one object of this post type. Default is Post/Page - * - add_new - Default is Add New for both hierarchical and non-hierarchical types. When internationalizing this string, please use a {@link http://codex.wordpress.org/I18n_for_WordPress_Developers#Disambiguation_by_context gettext context} matching your post type. Example: <code>_x('Add New', 'product');</code> - * - add_new_item - Default is Add New Post/Add New Page - * - edit_item - Default is Edit Post/Edit Page - * - new_item - Default is New Post/New Page - * - view_item - Default is View Post/View Page - * - search_items - Default is Search Posts/Search Pages - * - not_found - Default is No posts found/No pages found - * - not_found_in_trash - Default is No posts found in Trash/No pages found in Trash - * - parent_item_colon - This string isn't used on non-hierarchical types. In hierarchical ones the default is Parent Page: - * - all_items - String for the submenu. Default is All Posts/All Pages - * - menu_name - Default is the same as <code>name</code> - * - * Above, the first default value is for non-hierarchical post types (like posts) and the second one is for hierarchical post types (like pages). + * - add_new - Default is Add New for both hierarchical and non-hierarchical types. + * When internationalizing this string, please use a gettext context + * {@link https://codex.wordpress.org/I18n_for_WordPress_Developers#Disambiguation_by_context} + * matching your post type. Example: `_x( 'Add New', 'product' );`. + * - add_new_item - Default is Add New Post/Add New Page. + * - edit_item - Default is Edit Post/Edit Page. + * - new_item - Default is New Post/New Page. + * - view_item - Default is View Post/View Page. + * - search_items - Default is Search Posts/Search Pages. + * - not_found - Default is No posts found/No pages found. + * - not_found_in_trash - Default is No posts found in Trash/No pages found in Trash. + * - parent_item_colon - This string isn't used on non-hierarchical types. In hierarchical + * ones the default is 'Parent Page:'. + * - all_items - String for the submenu. Default is All Posts/All Pages. + * - archives - String for use with archives in nav menus. Default is Post Archives/Page Archives. + * - insert_into_item - String for the media frame button. Default is Insert into post/Insert into page. + * - uploaded_to_this_item - String for the media frame filter. Default is Uploaded to this post/Uploaded to this page. + * - featured_image - Default is Featured Image. + * - set_featured_image - Default is Set featured image. + * - remove_featured_image - Default is Remove featured image. + * - use_featured_image - Default is Use as featured image. + * - menu_name - Default is the same as `name`. + * - filter_items_list - String for the table views hidden heading. + * - items_list_navigation - String for the table pagination hidden heading. + * - items_list - String for the table hidden heading. + * + * Above, the first default value is for non-hierarchical post types (like posts) + * and the second one is for hierarchical post types (like pages). * * @since 3.0.0 + * @since 4.3.0 Added the `featured_image`, `set_featured_image`, `remove_featured_image`, + * and `use_featured_image` labels. + * @since 4.4.0 Added the `insert_into_item`, `uploaded_to_this_item`, `filter_items_list`, + * `items_list_navigation`, and `items_list` labels. + * * @access private * - * @param object $post_type_object - * @return object object with all the labels as member variables + * @param object $post_type_object Post type object. + * @return object object with all the labels as member variables. */ function get_post_type_labels( $post_type_object ) { $nohier_vs_hier_defaults = array( @@ -1518,7 +1455,17 @@ function get_post_type_labels( $post_type_object ) { 'not_found' => array( __('No posts found.'), __('No pages found.') ), 'not_found_in_trash' => array( __('No posts found in Trash.'), __('No pages found in Trash.') ), 'parent_item_colon' => array( null, __('Parent Page:') ), - 'all_items' => array( __( 'All Posts' ), __( 'All Pages' ) ) + 'all_items' => array( __( 'All Posts' ), __( 'All Pages' ) ), + 'archives' => array( __( 'Post Archives' ), __( 'Page Archives' ) ), + 'insert_into_item' => array( __( 'Insert into post' ), __( 'Insert into page' ) ), + 'uploaded_to_this_item' => array( __( 'Uploaded to this post' ), __( 'Uploaded to this page' ) ), + 'featured_image' => array( __( 'Featured Image' ), __( 'Featured Image' ) ), + 'set_featured_image' => array( __( 'Set featured image' ), __( 'Set featured image' ) ), + 'remove_featured_image' => array( __( 'Remove featured image' ), __( 'Remove featured image' ) ), + 'use_featured_image' => array( __( 'Use as featured image' ), __( 'Use as featured image' ) ), + 'filter_items_list' => array( __( 'Filter posts list' ), __( 'Filter pages list' ) ), + 'items_list_navigation' => array( __( 'Posts list navigation' ), __( 'Pages list navigation' ) ), + 'items_list' => array( __( 'Posts list' ), __( 'Pages list' ) ), ); $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name']; @@ -1526,26 +1473,38 @@ function get_post_type_labels( $post_type_object ) { $post_type = $post_type_object->name; + $default_labels = clone $labels; + /** * Filter the labels of a specific post type. * - * The dynamic portion of the hook name, $post_type, refers to + * The dynamic portion of the hook name, `$post_type`, refers to * the post type slug. * * @since 3.5.0 * * @see get_post_type_labels() for the full list of labels. * - * @param array $labels Array of labels for the given post type. + * @param object $labels Object with labels for the post type as member variables. */ - return apply_filters( "post_type_labels_{$post_type}", $labels ); -} + $labels = apply_filters( "post_type_labels_{$post_type}", $labels ); + + // Ensure that the filtered labels contain all required default values. + $labels = (object) array_merge( (array) $default_labels, (array) $labels ); + + return $labels; +} /** - * Builds an object with custom-something object (post type, taxonomy) labels out of a custom-something object + * Build an object with custom-something object (post type, taxonomy) labels + * out of a custom-something object * - * @access private * @since 3.0.0 + * @access private + * + * @param object $object A custom-something object. + * @param array $nohier_vs_hier_defaults Hierarchical vs non-hierarchical default labels. + * @return object Object containing labels for the given custom-something object. */ function _get_custom_object_labels( $object, $nohier_vs_hier_defaults ) { $object->labels = (array) $object->labels; @@ -1565,15 +1524,22 @@ function _get_custom_object_labels( $object, $nohier_vs_hier_defaults ) { if ( !isset( $object->labels['all_items'] ) && isset( $object->labels['menu_name'] ) ) $object->labels['all_items'] = $object->labels['menu_name']; - foreach ( $nohier_vs_hier_defaults as $key => $value ) - $defaults[$key] = $object->hierarchical ? $value[1] : $value[0]; + if ( !isset( $object->labels['archives'] ) && isset( $object->labels['all_items'] ) ) { + $object->labels['archives'] = $object->labels['all_items']; + } + $defaults = array(); + foreach ( $nohier_vs_hier_defaults as $key => $value ) { + $defaults[$key] = $object->hierarchical ? $value[1] : $value[0]; + } $labels = array_merge( $defaults, $object->labels ); - return (object)$labels; + $object->labels = (object) $object->labels; + + return (object) $labels; } /** - * Adds submenus for post types. + * Add submenus for post types. * * @access private * @since 3.1.0 @@ -1581,13 +1547,12 @@ function _get_custom_object_labels( $object, $nohier_vs_hier_defaults ) { function _add_post_type_submenus() { foreach ( get_post_types( array( 'show_ui' => true ) ) as $ptype ) { $ptype_obj = get_post_type_object( $ptype ); - // Submenus only. + // Sub-menus only. if ( ! $ptype_obj->show_in_menu || $ptype_obj->show_in_menu === true ) continue; add_submenu_page( $ptype_obj->show_in_menu, $ptype_obj->labels->name, $ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype" ); } } -add_action( 'admin_menu', '_add_post_type_submenus' ); /** * Register support of certain features for a post type. @@ -1603,8 +1568,10 @@ add_action( 'admin_menu', '_add_post_type_submenus' ); * * @since 3.0.0 * + * @global array $_wp_post_type_features + * * @param string $post_type The post type for which to add the feature. - * @param string|array $feature The feature being added, accpets an array of + * @param string|array $feature The feature being added, accepts an array of * feature strings or a single string. */ function add_post_type_support( $post_type, $feature ) { @@ -1623,24 +1590,28 @@ function add_post_type_support( $post_type, $feature ) { * Remove support for a feature from a post type. * * @since 3.0.0 - * @param string $post_type The post type for which to remove the feature - * @param string $feature The feature being removed + * + * @global array $_wp_post_type_features + * + * @param string $post_type The post type for which to remove the feature. + * @param string $feature The feature being removed. */ function remove_post_type_support( $post_type, $feature ) { global $_wp_post_type_features; - if ( isset( $_wp_post_type_features[$post_type][$feature] ) ) - unset( $_wp_post_type_features[$post_type][$feature] ); + unset( $_wp_post_type_features[ $post_type ][ $feature ] ); } /** * Get all the post type features * * @since 3.4.0 - * @param string $post_type The post type - * @return array + * + * @global array $_wp_post_type_features + * + * @param string $post_type The post type. + * @return array Post type supports list. */ - function get_all_post_type_supports( $post_type ) { global $_wp_post_type_features; @@ -1651,14 +1622,16 @@ function get_all_post_type_supports( $post_type ) { } /** - * Checks a post type's support for a given feature + * Check a post type's support for a given feature. * * @since 3.0.0 - * @param string $post_type The post type being checked - * @param string $feature the feature being checked - * @return boolean + * + * @global array $_wp_post_type_features + * + * @param string $post_type The post type being checked. + * @param string $feature The feature being checked. + * @return bool Whether the post type supports the given feature. */ - function post_type_supports( $post_type, $feature ) { global $_wp_post_type_features; @@ -1666,18 +1639,40 @@ function post_type_supports( $post_type, $feature ) { } /** - * Updates the post type for the post ID. + * Retrieves a list of post type names that support a specific feature. + * + * @since 4.5.0 + * + * @global array $_wp_post_type_features Post type features + * + * @param array|string $feature Single feature or an array of features the post types should support. + * @param string $operator Optional. The logical operation to perform. 'or' means + * only one element from the array needs to match; 'and' + * means all elements must match; 'not' means no elements may + * match. Default 'and'. + * @return array A list of post type names. + */ +function get_post_types_by_support( $feature, $operator = 'and' ) { + global $_wp_post_type_features; + + $features = array_fill_keys( (array) $feature, true ); + + return array_keys( wp_filter_object_list( $_wp_post_type_features, $features, $operator ) ); +} + +/** + * Update the post type for the post ID. * * The page or post cache will be cleaned for the post ID. * * @since 2.5.0 * - * @uses $wpdb + * @global wpdb $wpdb WordPress database abstraction object. * - * @param int $post_id Post ID to change post type. Not actually optional. - * @param string $post_type Optional, default is post. Supported values are 'post' or 'page' to - * name a few. - * @return int Amount of rows changed. Should be 1 for success and 0 for failure. + * @param int $post_id Optional. Post ID to change post type. Default 0. + * @param string $post_type Optional. Post type. Accepts 'post' or 'page' to + * name a few. Default 'post'. + * @return int|false Amount of rows changed. Should be 1 for success and 0 for failure. */ function set_post_type( $post_id = 0, $post_type = 'post' ) { global $wpdb; @@ -1690,33 +1685,56 @@ function set_post_type( $post_id = 0, $post_type = 'post' ) { return $return; } +/** + * Determines whether a post type is considered "viewable". + * + * For built-in post types such as posts and pages, the 'public' value will be evaluated. + * For all others, the 'publicly_queryable' value will be used. + * + * @since 4.4.0 + * @since 4.5.0 Added the ability to pass a post type name in addition to object. + * + * @param object $post_type Post type name or object. + * @return bool Whether the post type should be considered viewable. + */ +function is_post_type_viewable( $post_type ) { + if ( is_scalar( $post_type ) ) { + $post_type = get_post_type_object( $post_type ); + if ( ! $post_type ) { + return false; + } + } + + return $post_type->publicly_queryable || ( $post_type->_builtin && $post_type->public ); +} + /** * Retrieve list of latest posts or posts matching criteria. * * The defaults are as follows: - * 'numberposts' - Default is 5. Total number of posts to retrieve. - * 'offset' - Default is 0. See {@link WP_Query::query()} for more. - * 'category' - What category to pull the posts from. - * 'orderby' - Default is 'date', which orders based on post_date. How to order the posts. - * 'order' - Default is 'DESC'. The order to retrieve the posts. - * 'include' - See {@link WP_Query::query()} for more. - * 'exclude' - See {@link WP_Query::query()} for more. - * 'meta_key' - See {@link WP_Query::query()} for more. - * 'meta_value' - See {@link WP_Query::query()} for more. - * 'post_type' - Default is 'post'. Can be 'page', or 'attachment' to name a few. - * 'post_parent' - The parent of the post or post type. - * 'post_status' - Default is 'publish'. Post status to retrieve. * * @since 1.2.0 - * @uses WP_Query::query() See for more default arguments and information. - * @link http://codex.wordpress.org/Template_Tags/get_posts * - * @param array $args Optional. Overrides defaults. + * @see WP_Query::parse_query() + * + * @param array $args { + * Optional. Arguments to retrieve posts. See WP_Query::parse_query() for all + * available arguments. + * + * @type int $numberposts Total number of posts to retrieve. Is an alias of $posts_per_page + * in WP_Query. Accepts -1 for all. Default 5. + * @type int|string $category Category ID or comma-separated list of IDs (this or any children). + * Is an alias of $cat in WP_Query. Default 0. + * @type array $include An array of post IDs to retrieve, sticky posts will be included. + * Is an alias of $post__in in WP_Query. Default empty array. + * @type array $exclude An array of post IDs not to retrieve. Default empty array. + * @type bool $suppress_filters Whether to suppress filters. Default true. + * } * @return array List of posts. */ -function get_posts($args = null) { +function get_posts( $args = null ) { $defaults = array( - 'numberposts' => 5, 'offset' => 0, + 'numberposts' => 5, 'category' => 0, 'orderby' => 'date', 'order' => 'DESC', 'include' => array(), 'exclude' => array(), 'meta_key' => '', @@ -1756,16 +1774,16 @@ function get_posts($args = null) { * Post meta data is called "Custom Fields" on the Administration Screen. * * @since 1.5.0 - * @link http://codex.wordpress.org/Function_Reference/add_post_meta * - * @param int $post_id Post ID. - * @param string $meta_key Metadata name. - * @param mixed $meta_value Metadata value. Must be serializable if non-scalar. - * @param bool $unique Optional, default is false. Whether the same key should not be added. - * @return int|bool Meta ID on success, false on failure. + * @param int $post_id Post ID. + * @param string $meta_key Metadata name. + * @param mixed $meta_value Metadata value. Must be serializable if non-scalar. + * @param bool $unique Optional. Whether the same key should not be added. + * Default false. + * @return int|false Meta ID on success, false on failure. */ -function add_post_meta($post_id, $meta_key, $meta_value, $unique = false) { - // make sure meta is added to the post, not a revision +function add_post_meta( $post_id, $meta_key, $meta_value, $unique = false ) { + // Make sure meta is added to the post, not a revision. if ( $the_post = wp_is_post_revision($post_id) ) $post_id = $the_post; @@ -1780,15 +1798,15 @@ function add_post_meta($post_id, $meta_key, $meta_value, $unique = false) { * allows removing all metadata matching key, if needed. * * @since 1.5.0 - * @link http://codex.wordpress.org/Function_Reference/delete_post_meta * - * @param int $post_id post ID - * @param string $meta_key Metadata name. - * @param mixed $meta_value Optional. Metadata value. Must be serializable if non-scalar. + * @param int $post_id Post ID. + * @param string $meta_key Metadata name. + * @param mixed $meta_value Optional. Metadata value. Must be serializable if + * non-scalar. Default empty. * @return bool True on success, false on failure. */ -function delete_post_meta($post_id, $meta_key, $meta_value = '') { - // make sure meta is added to the post, not a revision +function delete_post_meta( $post_id, $meta_key, $meta_value = '' ) { + // Make sure meta is added to the post, not a revision. if ( $the_post = wp_is_post_revision($post_id) ) $post_id = $the_post; @@ -1799,15 +1817,15 @@ function delete_post_meta($post_id, $meta_key, $meta_value = '') { * Retrieve post meta field for a post. * * @since 1.5.0 - * @link http://codex.wordpress.org/Function_Reference/get_post_meta * - * @param int $post_id Post ID. - * @param string $key Optional. The meta key to retrieve. By default, returns data for all keys. - * @param bool $single Whether to return a single value. - * @return mixed Will be an array if $single is false. Will be value of meta data field if $single - * is true. + * @param int $post_id Post ID. + * @param string $key Optional. The meta key to retrieve. By default, returns + * data for all keys. Default empty. + * @param bool $single Optional. Whether to return a single value. Default false. + * @return mixed Will be an array if $single is false. Will be value of meta data + * field if $single is true. */ -function get_post_meta($post_id, $key = '', $single = false) { +function get_post_meta( $post_id, $key = '', $single = false ) { return get_metadata('post', $post_id, $key, $single); } @@ -1820,16 +1838,17 @@ function get_post_meta($post_id, $key = '', $single = false) { * If the meta field for the post does not exist, it will be added. * * @since 1.5.0 - * @link http://codex.wordpress.org/Function_Reference/update_post_meta * - * @param int $post_id Post ID. - * @param string $meta_key Metadata key. - * @param mixed $meta_value Metadata value. Must be serializable if non-scalar. - * @param mixed $prev_value Optional. Previous value to check before removing. - * @return int|bool Meta ID if the key didn't exist, true on successful update, false on failure. + * @param int $post_id Post ID. + * @param string $meta_key Metadata key. + * @param mixed $meta_value Metadata value. Must be serializable if non-scalar. + * @param mixed $prev_value Optional. Previous value to check before removing. + * Default empty. + * @return int|bool Meta ID if the key didn't exist, true on successful update, + * false on failure. */ -function update_post_meta($post_id, $meta_key, $meta_value, $prev_value = '') { - // make sure meta is added to the post, not a revision +function update_post_meta( $post_id, $meta_key, $meta_value, $prev_value = '' ) { + // Make sure meta is added to the post, not a revision. if ( $the_post = wp_is_post_revision($post_id) ) $post_id = $the_post; @@ -1842,9 +1861,9 @@ function update_post_meta($post_id, $meta_key, $meta_value, $prev_value = '') { * @since 2.3.0 * * @param string $post_meta_key Key to search for when deleting. - * @return bool Whether the post meta key was deleted from the database + * @return bool Whether the post meta key was deleted from the database. */ -function delete_post_meta_by_key($post_meta_key) { +function delete_post_meta_by_key( $post_meta_key ) { return delete_metadata( 'post', null, $post_meta_key, '', true ); } @@ -1855,10 +1874,9 @@ function delete_post_meta_by_key($post_meta_key) { * so the function is optimized to be called more than once. * * @since 1.2.0 - * @link http://codex.wordpress.org/Function_Reference/get_post_custom * - * @param int $post_id Post ID. - * @return array + * @param int $post_id Optional. Post ID. Default is ID of the global $post. + * @return array Post meta for the given post. */ function get_post_custom( $post_id = 0 ) { $post_id = absint( $post_id ); @@ -1874,10 +1892,9 @@ function get_post_custom( $post_id = 0 ) { * If there are no meta fields, then nothing (null) will be returned. * * @since 1.2.0 - * @link http://codex.wordpress.org/Function_Reference/get_post_custom_keys * - * @param int $post_id post ID - * @return array|null Either array of the keys, or null if keys could not be retrieved. + * @param int $post_id Optional. Post ID. Default is ID of the global $post. + * @return array|void Array of the keys, if retrieved. */ function get_post_custom_keys( $post_id = 0 ) { $custom = get_post_custom( $post_id ); @@ -1896,11 +1913,10 @@ function get_post_custom_keys( $post_id = 0 ) { * will be retrieved and only the meta field key values returned. * * @since 1.2.0 - * @link http://codex.wordpress.org/Function_Reference/get_post_custom_values * - * @param string $key Meta field key. - * @param int $post_id Post ID - * @return array Meta field values. + * @param string $key Optional. Meta field key. Default empty. + * @param int $post_id Optional. Post ID. Default is ID of the global $post. + * @return array|null Meta field values. */ function get_post_custom_values( $key = '', $post_id = 0 ) { if ( !$key ) @@ -1919,7 +1935,7 @@ function get_post_custom_values( $key = '', $post_id = 0 ) { * * @since 2.7.0 * - * @param int $post_id Optional. Post ID. + * @param int $post_id Optional. Post ID. Default is ID of the global $post. * @return bool Whether post is sticky. */ function is_sticky( $post_id = 0 ) { @@ -1942,18 +1958,23 @@ function is_sticky( $post_id = 0 ) { /** * Sanitize every post field. * - * If the context is 'raw', then the post object or array will get minimal santization of the int fields. + * If the context is 'raw', then the post object or array will get minimal + * sanitization of the integer fields. * * @since 2.3.0 - * @uses sanitize_post_field() Used to sanitize the fields. * - * @param object|WP_Post|array $post The Post Object or Array - * @param string $context Optional, default is 'display'. How to sanitize post fields. - * @return object|WP_Post|array The now sanitized Post Object or Array (will be the same type as $post) + * @see sanitize_post_field() + * + * @param object|WP_Post|array $post The Post Object or Array + * @param string $context Optional. How to sanitize post fields. + * Accepts 'raw', 'edit', 'db', or 'display'. + * Default 'display'. + * @return object|WP_Post|array The now sanitized Post Object or Array (will be the + * same type as $post). */ -function sanitize_post($post, $context = 'display') { +function sanitize_post( $post, $context = 'display' ) { if ( is_object($post) ) { - // Check if post already filtered for this context + // Check if post already filtered for this context. if ( isset($post->filter) && $context == $post->filter ) return $post; if ( !isset($post->ID) ) @@ -1961,8 +1982,8 @@ function sanitize_post($post, $context = 'display') { foreach ( array_keys(get_object_vars($post)) as $field ) $post->$field = sanitize_post_field($field, $post->$field, $post->ID, $context); $post->filter = $context; - } else { - // Check if post already filtered for this context + } elseif ( is_array( $post ) ) { + // Check if post already filtered for this context. if ( isset($post['filter']) && $context == $post['filter'] ) return $post; if ( !isset($post['ID']) ) @@ -1977,25 +1998,26 @@ function sanitize_post($post, $context = 'display') { /** * Sanitize post field based on context. * - * Possible context values are: 'raw', 'edit', 'db', 'display', 'attribute' and 'js'. The - * 'display' context is used by default. 'attribute' and 'js' contexts are treated like 'display' - * when calling filters. + * Possible context values are: 'raw', 'edit', 'db', 'display', 'attribute' and + * 'js'. The 'display' context is used by default. 'attribute' and 'js' contexts + * are treated like 'display' when calling filters. * * @since 2.3.0 + * @since 4.4.0 Like `sanitize_post()`, `$context` defaults to 'display'. * - * @param string $field The Post Object field name. - * @param mixed $value The Post Object value. - * @param int $post_id Post ID. - * @param string $context How to sanitize post fields. Looks for 'raw', 'edit', 'db', 'display', - * 'attribute' and 'js'. + * @param string $field The Post Object field name. + * @param mixed $value The Post Object value. + * @param int $post_id Post ID. + * @param string $context Optional. How to sanitize post fields. Looks for 'raw', 'edit', + * 'db', 'display', 'attribute' and 'js'. Default 'display'. * @return mixed Sanitized value. */ -function sanitize_post_field($field, $value, $post_id, $context) { +function sanitize_post_field( $field, $value, $post_id, $context = 'display' ) { $int_fields = array('ID', 'post_parent', 'menu_order'); if ( in_array($field, $int_fields) ) $value = (int) $value; - // Fields which contain arrays of ints. + // Fields which contain arrays of integers. $array_int_fields = array( 'ancestors' ); if ( in_array($field, $array_int_fields) ) { $value = array_map( 'absint', $value); @@ -2019,7 +2041,8 @@ function sanitize_post_field($field, $value, $post_id, $context) { /** * Filter the value of a specific post field to edit. * - * The dynamic portion of the hook name, $field, refers to the post field name. + * The dynamic portion of the hook name, `$field`, refers to the post + * field name. * * @since 2.3.0 * @@ -2031,7 +2054,7 @@ function sanitize_post_field($field, $value, $post_id, $context) { /** * Filter the value of a specific post field to edit. * - * The dynamic portion of the hook name, $field_no_prefix, refers to + * The dynamic portion of the hook name, `$field_no_prefix`, refers to * the post field name. * * @since 2.3.0 @@ -2052,13 +2075,14 @@ function sanitize_post_field($field, $value, $post_id, $context) { } else { $value = esc_attr($value); } - } else if ( 'db' == $context ) { + } elseif ( 'db' == $context ) { if ( $prefixed ) { /** * Filter the value of a specific post field before saving. * - * The dynamic portion of the hook name, $field, refers to the post field name. + * The dynamic portion of the hook name, `$field`, refers to the post + * field name. * * @since 2.3.0 * @@ -2069,7 +2093,7 @@ function sanitize_post_field($field, $value, $post_id, $context) { /** * Filter the value of a specific field before saving. * - * The dynamic portion of the hook name, $field_no_prefix, refers + * The dynamic portion of the hook name, `$field_no_prefix`, refers * to the post field name. * * @since 2.3.0 @@ -2083,7 +2107,8 @@ function sanitize_post_field($field, $value, $post_id, $context) { /** * Filter the value of a specific post field before saving. * - * The dynamic portion of the hook name, $field, refers to the post field name. + * The dynamic portion of the hook name, `$field`, refers to the post + * field name. * * @since 2.3.0 * @@ -2099,7 +2124,8 @@ function sanitize_post_field($field, $value, $post_id, $context) { /** * Filter the value of a specific post field for display. * - * The dynamic portion of the hook name, $field, refers to the post field name. + * The dynamic portion of the hook name, `$field`, refers to the post + * field name. * * @since 2.3.0 * @@ -2117,7 +2143,7 @@ function sanitize_post_field($field, $value, $post_id, $context) { if ( 'attribute' == $context ) $value = esc_attr($value); - else if ( 'js' == $context ) + elseif ( 'js' == $context ) $value = esc_js($value); return $value; @@ -2132,7 +2158,7 @@ function sanitize_post_field($field, $value, $post_id, $context) { * * @param int $post_id Post ID. */ -function stick_post($post_id) { +function stick_post( $post_id ) { $stickies = get_option('sticky_posts'); if ( !is_array($stickies) ) @@ -2145,7 +2171,7 @@ function stick_post($post_id) { } /** - * Unstick a post. + * Un-stick a post. * * Sticky posts should be displayed at the top of the front page. * @@ -2153,7 +2179,7 @@ function stick_post($post_id) { * * @param int $post_id Post ID. */ -function unstick_post($post_id) { +function unstick_post( $post_id ) { $stickies = get_option('sticky_posts'); if ( !is_array($stickies) ) @@ -2172,19 +2198,19 @@ function unstick_post($post_id) { } /** - * Return the cache key for wp_count_posts() based on the passed arguments + * Return the cache key for wp_count_posts() based on the passed arguments. * * @since 3.9.0 * - * @param string $type Optional. Post type to retrieve count - * @param string $perm Optional. 'readable' or empty. + * @param string $type Optional. Post type to retrieve count Default 'post'. + * @param string $perm Optional. 'readable' or empty. Default empty. * @return string The cache key. */ function _count_posts_cache_key( $type = 'post', $perm = '' ) { $cache_key = 'posts-' . $type; if ( 'readable' == $perm && is_user_logged_in() ) { $post_type_object = get_post_type_object( $type ); - if ( ! current_user_can( $post_type_object->cap->read_private_posts ) ) { + if ( $post_type_object && ! current_user_can( $post_type_object->cap->read_private_posts ) ) { $cache_key .= '_' . $perm . '_' . get_current_user_id(); } } @@ -2202,13 +2228,13 @@ function _count_posts_cache_key( $type = 'post', $perm = '' ) { * The $perm parameter checks for 'readable' value and if the user can read * private posts, it will display that for the user that is signed in. * - * @link http://codex.wordpress.org/Template_Tags/wp_count_posts - * * @since 2.5.0 * - * @param string $type Optional. Post type to retrieve count - * @param string $perm Optional. 'readable' or empty. - * @return object Number of posts for each status + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string $type Optional. Post type to retrieve count. Default 'post'. + * @param string $perm Optional. 'readable' or empty. Default empty. + * @return object Number of posts for each status. */ function wp_count_posts( $type = 'post', $perm = '' ) { global $wpdb; @@ -2218,6 +2244,12 @@ function wp_count_posts( $type = 'post', $perm = '' ) { $cache_key = _count_posts_cache_key( $type, $perm ); + $counts = wp_cache_get( $cache_key, 'counts' ); + if ( false !== $counts ) { + /** This filter is documented in wp-includes/post.php */ + return apply_filters( 'wp_count_posts', $counts, $type, $perm ); + } + $query = "SELECT post_status, COUNT( * ) AS num_posts FROM {$wpdb->posts} WHERE post_type = %s"; if ( 'readable' == $perm && is_user_logged_in() ) { $post_type_object = get_post_type_object($type); @@ -2229,18 +2261,16 @@ function wp_count_posts( $type = 'post', $perm = '' ) { } $query .= ' GROUP BY post_status'; - $counts = wp_cache_get( $cache_key, 'counts' ); - if ( false === $counts ) { - $results = (array) $wpdb->get_results( $wpdb->prepare( $query, $type ), ARRAY_A ); - $counts = array_fill_keys( get_post_stati(), 0 ); - - foreach ( $results as $row ) - $counts[ $row['post_status'] ] = $row['num_posts']; + $results = (array) $wpdb->get_results( $wpdb->prepare( $query, $type ), ARRAY_A ); + $counts = array_fill_keys( get_post_stati(), 0 ); - $counts = (object) $counts; - wp_cache_set( $cache_key, $counts, 'counts' ); + foreach ( $results as $row ) { + $counts[ $row['post_status'] ] = $row['num_posts']; } + $counts = (object) $counts; + wp_cache_set( $cache_key, $counts, 'counts' ); + /** * Modify returned post counts by status for the current post type. * @@ -2265,7 +2295,10 @@ function wp_count_posts( $type = 'post', $perm = '' ) { * * @since 2.5.0 * - * @param string|array $mime_type Optional. Array or comma-separated list of MIME patterns. + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string|array $mime_type Optional. Array or comma-separated list of + * MIME patterns. Default empty. * @return object An object containing the attachment counts by mime type. */ function wp_count_attachments( $mime_type = '' ) { @@ -2275,7 +2308,7 @@ function wp_count_attachments( $mime_type = '' ) { $count = $wpdb->get_results( "SELECT post_mime_type, COUNT( * ) AS num_posts FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' $and GROUP BY post_mime_type", ARRAY_A ); $counts = array(); - foreach( (array) $count as $row ) { + foreach ( (array) $count as $row ) { $counts[ $row['post_mime_type'] ] = $row['num_posts']; } $counts['trash'] = $wpdb->get_var( "SELECT COUNT( * ) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status = 'trash' $and"); @@ -2285,18 +2318,20 @@ function wp_count_attachments( $mime_type = '' ) { * * @since 3.7.0 * - * @param object $counts An object containing the attachment counts by mime type. - * @param string $mime_type The mime type pattern used to filter the attachments counted. + * @param object $counts An object containing the attachment counts by + * mime type. + * @param string $mime_type The mime type pattern used to filter the attachments + * counted. */ return apply_filters( 'wp_count_attachments', (object) $counts, $mime_type ); } /** - * Get default post mime types + * Get default post mime types. * * @since 2.9.0 * - * @return array + * @return array List of post mime types. */ function get_post_mime_types() { $post_mime_types = array( // array( adj, noun ) @@ -2324,32 +2359,45 @@ function get_post_mime_types() { * * @since 2.5.0 * - * @param string|array $wildcard_mime_types e.g. audio/mpeg or image (same as image/*) or - * flash (same as *flash*). - * @param string|array $real_mime_types post_mime_type values - * @return array array(wildcard=>array(real types)) + * @param string|array $wildcard_mime_types Mime types, e.g. audio/mpeg or image (same as image/*) + * or flash (same as *flash*). + * @param string|array $real_mime_types Real post mime type values. + * @return array array(wildcard=>array(real types)). */ -function wp_match_mime_types($wildcard_mime_types, $real_mime_types) { +function wp_match_mime_types( $wildcard_mime_types, $real_mime_types ) { $matches = array(); - if ( is_string($wildcard_mime_types) ) - $wildcard_mime_types = array_map('trim', explode(',', $wildcard_mime_types)); - if ( is_string($real_mime_types) ) - $real_mime_types = array_map('trim', explode(',', $real_mime_types)); + if ( is_string( $wildcard_mime_types ) ) { + $wildcard_mime_types = array_map( 'trim', explode( ',', $wildcard_mime_types ) ); + } + if ( is_string( $real_mime_types ) ) { + $real_mime_types = array_map( 'trim', explode( ',', $real_mime_types ) ); + } + + $patternses = array(); $wild = '[-._a-z0-9]*'; + foreach ( (array) $wildcard_mime_types as $type ) { - $type = str_replace('*', $wild, $type); - $patternses[1][$type] = "^$type$"; - if ( false === strpos($type, '/') ) { - $patternses[2][$type] = "^$type/"; - $patternses[3][$type] = $type; + $mimes = array_map( 'trim', explode( ',', $type ) ); + foreach ( $mimes as $mime ) { + $regex = str_replace( '__wildcard__', $wild, preg_quote( str_replace( '*', '__wildcard__', $mime ) ) ); + $patternses[][$type] = "^$regex$"; + if ( false === strpos( $mime, '/' ) ) { + $patternses[][$type] = "^$regex/"; + $patternses[][$type] = $regex; + } } } - asort($patternses); - foreach ( $patternses as $patterns ) - foreach ( $patterns as $type => $pattern ) - foreach ( (array) $real_mime_types as $real ) - if ( preg_match("#$pattern#", $real) && ( empty($matches[$type]) || false === array_search($real, $matches[$type]) ) ) + asort( $patternses ); + + foreach ( $patternses as $patterns ) { + foreach ( $patterns as $type => $pattern ) { + foreach ( (array) $real_mime_types as $real ) { + if ( preg_match( "#$pattern#", $real ) && ( empty( $matches[$type] ) || false === array_search( $real, $matches[$type] ) ) ) { $matches[$type][] = $real; + } + } + } + } return $matches; } @@ -2358,15 +2406,20 @@ function wp_match_mime_types($wildcard_mime_types, $real_mime_types) { * * @since 2.5.0 * - * @param string|array $post_mime_types List of mime types or comma separated string of mime types. - * @param string $table_alias Optional. Specify a table alias, if needed. + * @param string|array $post_mime_types List of mime types or comma separated string + * of mime types. + * @param string $table_alias Optional. Specify a table alias, if needed. + * Default empty. * @return string The SQL AND clause for mime searching. */ -function wp_post_mime_type_where($post_mime_types, $table_alias = '') { +function wp_post_mime_type_where( $post_mime_types, $table_alias = '' ) { $where = ''; $wildcards = array('', '%', '%/%'); if ( is_string($post_mime_types) ) $post_mime_types = array_map('trim', explode(',', $post_mime_types)); + + $wheres = array(); + foreach ( (array) $post_mime_types as $mime_type ) { $mime_type = preg_replace('/\s/', '', $mime_type); $slashpos = strpos($mime_type, '/'); @@ -2400,22 +2453,25 @@ function wp_post_mime_type_where($post_mime_types, $table_alias = '') { } /** - * Trashes or deletes a post or page. + * Trash or delete a post or page. * - * When the post and page is permanently deleted, everything that is tied to it is deleted also. - * This includes comments, post meta fields, and terms associated with the post. + * When the post and page is permanently deleted, everything that is tied to + * it is deleted also. This includes comments, post meta fields, and terms + * associated with the post. * - * The post or page is moved to trash instead of permanently deleted unless trash is - * disabled, item is already in the trash, or $force_delete is true. + * The post or page is moved to trash instead of permanently deleted unless + * trash is disabled, item is already in the trash, or $force_delete is true. * * @since 1.0.0 * - * @uses wp_delete_attachment() if post type is 'attachment'. - * @uses wp_trash_post() if item should be trashed. + * @global wpdb $wpdb WordPress database abstraction object. + * @see wp_delete_attachment() + * @see wp_trash_post() * - * @param int $postid Post ID. - * @param bool $force_delete Whether to bypass trash and force deletion. Defaults to false. - * @return mixed False on failure + * @param int $postid Optional. Post ID. Default 0. + * @param bool $force_delete Optional. Whether to bypass trash and force deletion. + * Default false. + * @return array|false|WP_Post False on failure. */ function wp_delete_post( $postid = 0, $force_delete = false ) { global $wpdb; @@ -2424,11 +2480,25 @@ function wp_delete_post( $postid = 0, $force_delete = false ) { return $post; if ( !$force_delete && ( $post->post_type == 'post' || $post->post_type == 'page') && get_post_status( $postid ) != 'trash' && EMPTY_TRASH_DAYS ) - return wp_trash_post($postid); + return wp_trash_post( $postid ); if ( $post->post_type == 'attachment' ) return wp_delete_attachment( $postid, $force_delete ); + /** + * Filter whether a post deletion should take place. + * + * @since 4.4.0 + * + * @param bool $delete Whether to go forward with deletion. + * @param WP_Post $post Post object. + * @param bool $force_delete Whether to bypass the trash. + */ + $check = apply_filters( 'pre_delete_post', null, $post, $force_delete ); + if ( null !== $check ) { + return $check; + } + /** * Fires before a post is deleted, at the start of wp_delete_post(). * @@ -2449,25 +2519,31 @@ function wp_delete_post( $postid = 0, $force_delete = false ) { $parent_where = array( 'post_parent' => $postid ); if ( is_post_type_hierarchical( $post->post_type ) ) { - // Point children of this page to its parent, also clean the cache of affected children + // Point children of this page to its parent, also clean the cache of affected children. $children_query = $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE post_parent = %d AND post_type = %s", $postid, $post->post_type ); $children = $wpdb->get_results( $children_query ); - - $wpdb->update( $wpdb->posts, $parent_data, $parent_where + array( 'post_type' => $post->post_type ) ); + if ( $children ) { + $wpdb->update( $wpdb->posts, $parent_data, $parent_where + array( 'post_type' => $post->post_type ) ); + } } - // Do raw query. wp_get_post_revisions() is filtered + // Do raw query. wp_get_post_revisions() is filtered. $revision_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'revision'", $postid ) ); // Use wp_delete_post (via wp_delete_post_revision) again. Ensures any meta/misplaced data gets cleaned up. foreach ( $revision_ids as $revision_id ) wp_delete_post_revision( $revision_id ); - // Point all attachments to this post up one level + // Point all attachments to this post up one level. $wpdb->update( $wpdb->posts, $parent_data, $parent_where + array( 'post_type' => 'attachment' ) ); + wp_defer_comment_counting( true ); + $comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d", $postid )); - foreach ( $comment_ids as $comment_id ) + foreach ( $comment_ids as $comment_id ) { wp_delete_comment( $comment_id, true ); + } + + wp_defer_comment_counting( false ); $post_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $postid )); foreach ( $post_meta_ids as $mid ) @@ -2519,20 +2595,23 @@ function wp_delete_post( $postid = 0, $force_delete = false ) { } /** - * Resets the page_on_front, show_on_front, and page_for_post settings when a - * linked page is deleted or trashed. + * Reset the page_on_front, show_on_front, and page_for_post settings when + * a linked page is deleted or trashed. * * Also ensures the post is no longer sticky. * - * @access private * @since 3.7.0 - * @param $post_id + * @access private + * + * @param int $post_id Post ID. */ function _reset_front_page_settings_for_post( $post_id ) { $post = get_post( $post_id ); if ( 'page' == $post->post_type ) { - // If the page is defined in option page_on_front or post_for_posts, - // adjust the corresponding options + /* + * If the page is defined in option page_on_front or post_for_posts, + * adjust the corresponding options. + */ if ( get_option( 'page_on_front' ) == $post->ID ) { update_option( 'show_on_front', 'posts' ); update_option( 'page_on_front', 0 ); @@ -2543,22 +2622,21 @@ function _reset_front_page_settings_for_post( $post_id ) { } unstick_post( $post->ID ); } -add_action( 'before_delete_post', '_reset_front_page_settings_for_post' ); -add_action( 'wp_trash_post', '_reset_front_page_settings_for_post' ); /** - * Moves a post or page to the Trash + * Move a post or page to the Trash * * If trash is disabled, the post or page is permanently deleted. * * @since 2.9.0 * - * @uses wp_delete_post() if trash is disabled + * @see wp_delete_post() * - * @param int $post_id Post ID. - * @return mixed False on failure + * @param int $post_id Optional. Post ID. Default is ID of the global $post + * if EMPTY_TRASH_DAYS equals true. + * @return false|array|WP_Post|null Post data array, otherwise false. */ -function wp_trash_post($post_id = 0) { +function wp_trash_post( $post_id = 0 ) { if ( !EMPTY_TRASH_DAYS ) return wp_delete_post($post_id, true); @@ -2581,7 +2659,7 @@ function wp_trash_post($post_id = 0) { add_post_meta($post_id,'_wp_trash_meta_time', time()); $post['post_status'] = 'trash'; - wp_insert_post($post); + wp_insert_post( wp_slash( $post ) ); wp_trash_post_comments($post_id); @@ -2598,14 +2676,14 @@ function wp_trash_post($post_id = 0) { } /** - * Restores a post or page from the Trash + * Restore a post or page from the Trash. * * @since 2.9.0 * - * @param int $post_id Post ID. - * @return mixed False on failure + * @param int $post_id Optional. Post ID. Default is ID of the global $post. + * @return WP_Post|false WP_Post object. False on failure. */ -function wp_untrash_post($post_id = 0) { +function wp_untrash_post( $post_id = 0 ) { if ( !$post = get_post($post_id, ARRAY_A) ) return $post; @@ -2628,7 +2706,7 @@ function wp_untrash_post($post_id = 0) { delete_post_meta($post_id, '_wp_trash_meta_status'); delete_post_meta($post_id, '_wp_trash_meta_time'); - wp_insert_post($post); + wp_insert_post( wp_slash( $post ) ); wp_untrash_post_comments($post_id); @@ -2645,14 +2723,16 @@ function wp_untrash_post($post_id = 0) { } /** - * Moves comments for a post to the trash + * Moves comments for a post to the trash. * * @since 2.9.0 * - * @param int|WP_Post $post Optional. Post ID or post object. - * @return mixed False on failure + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param int|WP_Post|null $post Optional. Post ID or post object. Defaults to global $post. + * @return mixed|void False on failure. */ -function wp_trash_post_comments($post = null) { +function wp_trash_post_comments( $post = null ) { global $wpdb; $post = get_post($post); @@ -2674,13 +2754,13 @@ function wp_trash_post_comments($post = null) { if ( empty($comments) ) return; - // Cache current status for each comment + // Cache current status for each comment. $statuses = array(); foreach ( $comments as $comment ) $statuses[$comment->comment_ID] = $comment->comment_approved; add_post_meta($post_id, '_wp_trash_meta_comments_status', $statuses); - // Set status for all comments to post-trashed + // Set status for all comments to post-trashed. $result = $wpdb->update($wpdb->comments, array('comment_approved' => 'post-trashed'), array('comment_post_ID' => $post_id)); clean_comment_cache( array_keys($statuses) ); @@ -2699,14 +2779,16 @@ function wp_trash_post_comments($post = null) { } /** - * Restore comments for a post from the trash + * Restore comments for a post from the trash. * * @since 2.9.0 * - * @param int|WP_Post $post Optional. Post ID or post object. - * @return mixed False on failure + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param int|WP_Post|null $post Optional. Post ID or post object. Defaults to global $post. + * @return true|void */ -function wp_untrash_post_comments($post = null) { +function wp_untrash_post_comments( $post = null ) { global $wpdb; $post = get_post($post); @@ -2729,17 +2811,18 @@ function wp_untrash_post_comments($post = null) { */ do_action( 'untrash_post_comments', $post_id ); - // Restore each comment to its original status + // Restore each comment to its original status. $group_by_status = array(); foreach ( $statuses as $comment_id => $comment_status ) $group_by_status[$comment_status][] = $comment_id; foreach ( $group_by_status as $status => $comments ) { // Sanity check. This shouldn't happen. - if ( 'post-trashed' == $status ) + if ( 'post-trashed' == $status ) { $status = '0'; - $comments_in = implode( "', '", $comments ); - $wpdb->query( "UPDATE $wpdb->comments SET comment_approved = '$status' WHERE comment_ID IN ('" . $comments_in . "')" ); + } + $comments_in = implode( ', ', array_map( 'intval', $comments ) ); + $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->comments SET comment_approved = %s WHERE comment_ID IN ($comments_in)", $status ) ); } clean_comment_cache( array_keys($statuses) ); @@ -2764,11 +2847,12 @@ function wp_untrash_post_comments($post = null) { * * @since 2.1.0 * - * @uses wp_get_object_terms() Retrieves the categories. Args details can be found here. + * @see wp_get_object_terms() * - * @param int $post_id Optional. The Post ID. - * @param array $args Optional. Overwrite the defaults. - * @return array + * @param int $post_id Optional. The Post ID. Does not default to the ID of the + * global $post. Default 0. + * @param array $args Optional. Category arguments. Default empty. + * @return array List of categories. */ function wp_get_post_categories( $post_id = 0, $args = array() ) { $post_id = (int) $post_id; @@ -2789,9 +2873,8 @@ function wp_get_post_categories( $post_id = 0, $args = array() ) { * * @since 2.3.0 * - * @uses wp_get_object_terms() Gets the tags for returning. Args can be found here - * - * @param int $post_id Optional. The Post ID + * @param int $post_id Optional. The Post ID. Does not default to the ID of the + * global $post. Default 0. * @param array $args Optional. Overwrite the defaults * @return array List of post tags. */ @@ -2808,12 +2891,12 @@ function wp_get_post_tags( $post_id = 0, $args = array() ) { * * @since 2.8.0 * - * @uses wp_get_object_terms() Gets the tags for returning. Args can be found here - * - * @param int $post_id Optional. The Post ID - * @param string $taxonomy The taxonomy for which to retrieve terms. Defaults to post_tag. - * @param array $args Optional. Overwrite the defaults - * @return array List of post tags. + * @param int $post_id Optional. The Post ID. Does not default to the ID of the + * global $post. Default 0. + * @param string $taxonomy Optional. The taxonomy for which to retrieve terms. Default 'post_tag'. + * @param array $args Optional. {@link wp_get_object_terms()} arguments. Default empty array. + * @return array|WP_Error List of post terms or empty array if no terms were found. WP_Error object + * if `$taxonomy` doesn't exist. */ function wp_get_post_terms( $post_id = 0, $taxonomy = 'post_tag', $args = array() ) { $post_id = (int) $post_id; @@ -2827,16 +2910,15 @@ function wp_get_post_terms( $post_id = 0, $taxonomy = 'post_tag', $args = array( } /** - * Retrieve number of recent posts. + * Retrieve a number of recent posts. * * @since 1.0.0 - * @uses wp_parse_args() - * @uses get_posts() * - * @param string $deprecated Deprecated. - * @param array $args Optional. Overrides defaults. - * @param string $output Optional. - * @return unknown. + * @see get_posts() + * + * @param array $args Optional. Arguments to retrieve posts. Default empty array. + * @param string $output Optional. Type of output. Accepts ARRAY_A or ''. Default ARRAY_A. + * @return array|false Associative array if $output equals ARRAY_A, array or false if no results. */ function wp_get_recent_posts( $args = array(), $output = ARRAY_A ) { @@ -2845,7 +2927,7 @@ function wp_get_recent_posts( $args = array(), $output = ARRAY_A ) { $args = array( 'numberposts' => absint( $args ) ); } - // Set default arguments + // Set default arguments. $defaults = array( 'numberposts' => 10, 'offset' => 0, 'category' => 0, 'orderby' => 'post_date', @@ -2859,9 +2941,9 @@ function wp_get_recent_posts( $args = array(), $output = ARRAY_A ) { $results = get_posts( $r ); - // Backward compatibility. Prior to 3.1 expected posts to be returned in array + // Backward compatibility. Prior to 3.1 expected posts to be returned in array. if ( ARRAY_A == $output ){ - foreach( $results as $key => $result ) { + foreach ( $results as $key => $result ) { $results[$key] = get_object_vars( $result ); } return $results ? $results : array(); @@ -2880,30 +2962,52 @@ function wp_get_recent_posts( $args = array(), $output = ARRAY_A ) { * and 'post_date_gmt' keys. You can close the comments or open the comments by * setting the value for 'comment_status' key. * - * @global wpdb $wpdb WordPress database abstraction object. - * * @since 1.0.0 + * @since 4.2.0 Support was added for encoding emoji in the post title, content, and excerpt. + * @since 4.4.0 A 'meta_input' array can now be passed to `$postarr` to add post meta data. + * + * @see sanitize_post() + * @global wpdb $wpdb WordPress database abstraction object. * * @param array $postarr { * An array of elements that make up a post to update or insert. * - * @type int $ID The post ID. If equal to something other than 0, the post with that ID will - * be updated. Default 0. + * @type int $ID The post ID. If equal to something other than 0, + * the post with that ID will be updated. Default 0. + * @type int $post_author The ID of the user who added the post. Default is + * the current user ID. + * @type string $post_date The date of the post. Default is the current time. + * @type string $post_date_gmt The date of the post in the GMT timezone. Default is + * the value of `$post_date`. + * @type mixed $post_content The post content. Default empty. + * @type string $post_content_filtered The filtered post content. Default empty. + * @type string $post_title The post title. Default empty. + * @type string $post_excerpt The post excerpt. Default empty. * @type string $post_status The post status. Default 'draft'. * @type string $post_type The post type. Default 'post'. - * @type int $post_author The ID of the user who added the post. Default the current user ID. - * @type bool $ping_status Whether the post can accept pings. Default value of 'default_ping_status' option. + * @type string $comment_status Whether the post can accept comments. Accepts 'open' or 'closed'. + * Default is the value of 'default_comment_status' option. + * @type string $ping_status Whether the post can accept pings. Accepts 'open' or 'closed'. + * Default is the value of 'default_ping_status' option. + * @type string $post_password The password to access the post. Default empty. + * @type string $post_name The post name. Default is the sanitized post title + * when creating a new post. + * @type string $to_ping Space or carriage return-separated list of URLs to ping. + * Default empty. + * @type string $pinged Space or carriage return-separated list of URLs that have + * been pinged. Default empty. + * @type string $post_modified The date when the post was last modified. Default is + * the current time. + * @type string $post_modified_gmt The date when the post was last modified in the GMT + * timezone. Default is the current time. * @type int $post_parent Set this for the post it belongs to, if any. Default 0. - * @type int $menu_order The order it is displayed. Default 0. - * @type string $to_ping Space or carriage return-separated list of URLs to ping. Default empty string. - * @type string $pinged Space or carriage return-separated list of URLs that have been pinged. - * Default empty string. - * @type string $post_password The password to access the post. Default empty string. - * @type string $guid' Global Unique ID for referencing the post. - * @type string $post_content_filtered The filtered post content. Default empty string. - * @type string $post_excerpt The post excerpt. Default empty string. + * @type int $menu_order The order the post should be displayed in. Default 0. + * @type string $post_mime_type The mime type of the post. Default empty. + * @type string $guid Global Unique ID for referencing the post. Default empty. + * @type array $tax_input Array of taxonomy terms keyed by their taxonomy name. Default empty. + * @type array $meta_input Array of post meta values keyed by their post meta key. Default empty. * } - * @param bool $wp_error Optional. Allow return of WP_Error on failure. + * @param bool $wp_error Optional. Whether to allow return of WP_Error on failure. Default false. * @return int|WP_Error The post ID on success. The value 0 or WP_Error on failure. */ function wp_insert_post( $postarr, $wp_error = false ) { @@ -2911,11 +3015,25 @@ function wp_insert_post( $postarr, $wp_error = false ) { $user_id = get_current_user_id(); - $defaults = array('post_status' => 'draft', 'post_type' => 'post', 'post_author' => $user_id, - 'ping_status' => get_option('default_ping_status'), 'post_parent' => 0, - 'menu_order' => 0, 'to_ping' => '', 'pinged' => '', 'post_password' => '', - 'guid' => '', 'post_content_filtered' => '', 'post_excerpt' => '', 'import_id' => 0, - 'post_content' => '', 'post_title' => ''); + $defaults = array( + 'post_author' => $user_id, + 'post_content' => '', + 'post_content_filtered' => '', + 'post_title' => '', + 'post_excerpt' => '', + 'post_status' => 'draft', + 'post_type' => 'post', + 'comment_status' => '', + 'ping_status' => '', + 'post_password' => '', + 'to_ping' => '', + 'pinged' => '', + 'post_parent' => 0, + 'menu_order' => 0, + 'guid' => '', + 'import_id' => 0, + 'context' => '', + ); $postarr = wp_parse_args($postarr, $defaults); @@ -2923,32 +3041,47 @@ function wp_insert_post( $postarr, $wp_error = false ) { $postarr = sanitize_post($postarr, 'db'); - // export array as variables - extract($postarr, EXTR_SKIP); - // Are we updating or creating? $post_ID = 0; $update = false; - if ( ! empty( $ID ) ) { + $guid = $postarr['guid']; + + if ( ! empty( $postarr['ID'] ) ) { $update = true; - // Get the post ID and GUID - $post_ID = $ID; + // Get the post ID and GUID. + $post_ID = $postarr['ID']; $post_before = get_post( $post_ID ); if ( is_null( $post_before ) ) { - if ( $wp_error ) + if ( $wp_error ) { return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) ); + } return 0; } $guid = get_post_field( 'guid', $post_ID ); - $previous_status = get_post_field('post_status', $ID); + $previous_status = get_post_field('post_status', $post_ID ); } else { $previous_status = 'new'; } - $maybe_empty = ! $post_content && ! $post_title && ! $post_excerpt && post_type_supports( $post_type, 'editor' ) - && post_type_supports( $post_type, 'title' ) && post_type_supports( $post_type, 'excerpt' ); + $post_type = empty( $postarr['post_type'] ) ? 'post' : $postarr['post_type']; + + $post_title = $postarr['post_title']; + $post_content = $postarr['post_content']; + $post_excerpt = $postarr['post_excerpt']; + if ( isset( $postarr['post_name'] ) ) { + $post_name = $postarr['post_name']; + } elseif ( $update ) { + // For an update, don't modify the post_name if it wasn't supplied as an argument. + $post_name = $post_before->post_name; + } + + $maybe_empty = 'attachment' !== $post_type + && ! $post_content && ! $post_title && ! $post_excerpt + && post_type_supports( $post_type, 'editor' ) + && post_type_supports( $post_type, 'title' ) + && post_type_supports( $post_type, 'excerpt' ); /** * Filter whether the post should be considered "empty". @@ -2967,74 +3100,93 @@ function wp_insert_post( $postarr, $wp_error = false ) { * @param array $postarr Array of post data. */ if ( apply_filters( 'wp_insert_post_empty_content', $maybe_empty, $postarr ) ) { - if ( $wp_error ) + if ( $wp_error ) { return new WP_Error( 'empty_content', __( 'Content, title, and excerpt are empty.' ) ); - else + } else { return 0; + } } - if ( empty($post_type) ) - $post_type = 'post'; - - if ( empty($post_status) ) - $post_status = 'draft'; + $post_status = empty( $postarr['post_status'] ) ? 'draft' : $postarr['post_status']; + if ( 'attachment' === $post_type && ! in_array( $post_status, array( 'inherit', 'private', 'trash' ) ) ) { + $post_status = 'inherit'; + } - if ( !empty($post_category) ) - $post_category = array_filter($post_category); // Filter out empty terms + if ( ! empty( $postarr['post_category'] ) ) { + // Filter out empty terms. + $post_category = array_filter( $postarr['post_category'] ); + } // Make sure we set a valid category. - if ( empty($post_category) || 0 == count($post_category) || !is_array($post_category) ) { + if ( empty( $post_category ) || 0 == count( $post_category ) || ! is_array( $post_category ) ) { // 'post' requires at least one category. - if ( 'post' == $post_type && 'auto-draft' != $post_status ) + if ( 'post' == $post_type && 'auto-draft' != $post_status ) { $post_category = array( get_option('default_category') ); - else + } else { $post_category = array(); + } } - if ( empty($post_author) ) - $post_author = $user_id; - - // Don't allow contributors to set the post slug for pending review posts - if ( 'pending' == $post_status && !current_user_can( 'publish_posts' ) ) + // Don't allow contributors to set the post slug for pending review posts. + if ( 'pending' == $post_status && !current_user_can( 'publish_posts' ) ) { $post_name = ''; + } - // Create a valid post name. Drafts and pending posts are allowed to have an empty - // post name. + /* + * Create a valid post name. Drafts and pending posts are allowed to have + * an empty post name. + */ if ( empty($post_name) ) { - if ( !in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) ) + if ( !in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) ) { $post_name = sanitize_title($post_title); - else + } else { $post_name = ''; + } } else { // On updates, we need to check to see if it's using the old, fixed sanitization context. $check_name = sanitize_title( $post_name, '', 'old-save' ); - if ( $update && strtolower( urlencode( $post_name ) ) == $check_name && get_post_field( 'post_name', $ID ) == $check_name ) + if ( $update && strtolower( urlencode( $post_name ) ) == $check_name && get_post_field( 'post_name', $post_ID ) == $check_name ) { $post_name = $check_name; - else // new post, or slug has changed. + } else { // new post, or slug has changed. $post_name = sanitize_title($post_name); + } } - // If the post date is empty (due to having been new or a draft) and status is not 'draft' or 'pending', set date to now - if ( empty($post_date) || '0000-00-00 00:00:00' == $post_date ) - $post_date = current_time('mysql'); + /* + * If the post date is empty (due to having been new or a draft) and status + * is not 'draft' or 'pending', set date to now. + */ + if ( empty( $postarr['post_date'] ) || '0000-00-00 00:00:00' == $postarr['post_date'] ) { + if ( empty( $postarr['post_date_gmt'] ) || '0000-00-00 00:00:00' == $postarr['post_date_gmt'] ) { + $post_date = current_time( 'mysql' ); + } else { + $post_date = get_date_from_gmt( $postarr['post_date_gmt'] ); + } + } else { + $post_date = $postarr['post_date']; + } - // validate the date - $mm = substr( $post_date, 5, 2 ); - $jj = substr( $post_date, 8, 2 ); - $aa = substr( $post_date, 0, 4 ); - $valid_date = wp_checkdate( $mm, $jj, $aa, $post_date ); - if ( !$valid_date ) { - if ( $wp_error ) - return new WP_Error( 'invalid_date', __( 'Whoops, the provided date is invalid.' ) ); - else - return 0; + // Validate the date. + $mm = substr( $post_date, 5, 2 ); + $jj = substr( $post_date, 8, 2 ); + $aa = substr( $post_date, 0, 4 ); + $valid_date = wp_checkdate( $mm, $jj, $aa, $post_date ); + if ( ! $valid_date ) { + if ( $wp_error ) { + return new WP_Error( 'invalid_date', __( 'Whoops, the provided date is invalid.' ) ); + } else { + return 0; } + } - if ( empty($post_date_gmt) || '0000-00-00 00:00:00' == $post_date_gmt ) { - if ( !in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) ) - $post_date_gmt = get_gmt_from_date($post_date); - else + if ( empty( $postarr['post_date_gmt'] ) || '0000-00-00 00:00:00' == $postarr['post_date_gmt'] ) { + if ( ! in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) ) { + $post_date_gmt = get_gmt_from_date( $post_date ); + } else { $post_date_gmt = '0000-00-00 00:00:00'; + } + } else { + $post_date_gmt = $postarr['post_date_gmt']; } if ( $update || '0000-00-00 00:00:00' == $post_date ) { @@ -3045,37 +3197,59 @@ function wp_insert_post( $postarr, $wp_error = false ) { $post_modified_gmt = $post_date_gmt; } - if ( 'publish' == $post_status ) { - $now = gmdate('Y-m-d H:i:59'); - if ( mysql2date('U', $post_date_gmt, false) > mysql2date('U', $now, false) ) - $post_status = 'future'; - } elseif( 'future' == $post_status ) { - $now = gmdate('Y-m-d H:i:59'); - if ( mysql2date('U', $post_date_gmt, false) <= mysql2date('U', $now, false) ) - $post_status = 'publish'; + if ( 'attachment' !== $post_type ) { + if ( 'publish' == $post_status ) { + $now = gmdate('Y-m-d H:i:59'); + if ( mysql2date('U', $post_date_gmt, false) > mysql2date('U', $now, false) ) { + $post_status = 'future'; + } + } elseif ( 'future' == $post_status ) { + $now = gmdate('Y-m-d H:i:59'); + if ( mysql2date('U', $post_date_gmt, false) <= mysql2date('U', $now, false) ) { + $post_status = 'publish'; + } + } } - if ( empty($comment_status) ) { - if ( $update ) + // Comment status. + if ( empty( $postarr['comment_status'] ) ) { + if ( $update ) { $comment_status = 'closed'; - else - $comment_status = get_option('default_comment_status'); + } else { + $comment_status = get_default_comment_status( $post_type ); + } + } else { + $comment_status = $postarr['comment_status']; } - if ( empty($ping_status) ) - $ping_status = get_option('default_ping_status'); - if ( isset($to_ping) ) - $to_ping = sanitize_trackback_urls( $to_ping ); - else - $to_ping = ''; + // These variables are needed by compact() later. + $post_content_filtered = $postarr['post_content_filtered']; + $post_author = isset( $postarr['post_author'] ) ? $postarr['post_author'] : $user_id; + $ping_status = empty( $postarr['ping_status'] ) ? get_default_comment_status( $post_type, 'pingback' ) : $postarr['ping_status']; + $to_ping = isset( $postarr['to_ping'] ) ? sanitize_trackback_urls( $postarr['to_ping'] ) : ''; + $pinged = isset( $postarr['pinged'] ) ? $postarr['pinged'] : ''; + $import_id = isset( $postarr['import_id'] ) ? $postarr['import_id'] : 0; + + /* + * The 'wp_insert_post_parent' filter expects all variables to be present. + * Previously, these variables would have already been extracted + */ + if ( isset( $postarr['menu_order'] ) ) { + $menu_order = (int) $postarr['menu_order']; + } else { + $menu_order = 0; + } - if ( ! isset($pinged) ) - $pinged = ''; + $post_password = isset( $postarr['post_password'] ) ? $postarr['post_password'] : ''; + if ( 'private' == $post_status ) { + $post_password = ''; + } - if ( isset($post_parent) ) - $post_parent = (int) $post_parent; - else + if ( isset( $postarr['post_parent'] ) ) { + $post_parent = (int) $postarr['post_parent']; + } else { $post_parent = 0; + } /** * Filter the post parent -- used to check for and prevent hierarchy loops. @@ -3089,28 +3263,68 @@ function wp_insert_post( $postarr, $wp_error = false ) { */ $post_parent = apply_filters( 'wp_insert_post_parent', $post_parent, $post_ID, compact( array_keys( $postarr ) ), $postarr ); - if ( isset($menu_order) ) - $menu_order = (int) $menu_order; - else - $menu_order = 0; + /* + * If the post is being untrashed and it has a desired slug stored in post meta, + * reassign it. + */ + if ( 'trash' === $previous_status && 'trash' !== $post_status ) { + $desired_post_slug = get_post_meta( $post_ID, '_wp_desired_post_slug', true ); + if ( $desired_post_slug ) { + delete_post_meta( $post_ID, '_wp_desired_post_slug' ); + $post_name = $desired_post_slug; + } + } - if ( !isset($post_password) || 'private' == $post_status ) - $post_password = ''; + // If a trashed post has the desired slug, change it and let this post have it. + if ( 'trash' !== $post_status && $post_name ) { + wp_add_trashed_suffix_to_post_name_for_trashed_posts( $post_name, $post_ID ); + } - $post_name = wp_unique_post_slug($post_name, $post_ID, $post_status, $post_type, $post_parent); + // When trashing an existing post, change its slug to allow non-trashed posts to use it. + if ( 'trash' === $post_status && 'trash' !== $previous_status && 'new' !== $previous_status ) { + $post_name = wp_add_trashed_suffix_to_post_name_for_post( $post_ID ); + } - // expected_slashed (everything!) - $data = compact( array( 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_content_filtered', 'post_title', 'post_excerpt', 'post_status', 'post_type', 'comment_status', 'ping_status', 'post_password', 'post_name', 'to_ping', 'pinged', 'post_modified', 'post_modified_gmt', 'post_parent', 'menu_order', 'guid' ) ); + $post_name = wp_unique_post_slug( $post_name, $post_ID, $post_status, $post_type, $post_parent ); - /** - * Filter slashed post data just before it is inserted into the database. - * - * @since 2.7.0 - * - * @param array $data Array of slashed post data. - * @param array $postarr Array of sanitized, but otherwise unmodified post data. - */ - $data = apply_filters( 'wp_insert_post_data', $data, $postarr ); + // Don't unslash. + $post_mime_type = isset( $postarr['post_mime_type'] ) ? $postarr['post_mime_type'] : ''; + + // Expected_slashed (everything!). + $data = compact( 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_content_filtered', 'post_title', 'post_excerpt', 'post_status', 'post_type', 'comment_status', 'ping_status', 'post_password', 'post_name', 'to_ping', 'pinged', 'post_modified', 'post_modified_gmt', 'post_parent', 'menu_order', 'post_mime_type', 'guid' ); + + $emoji_fields = array( 'post_title', 'post_content', 'post_excerpt' ); + + foreach ( $emoji_fields as $emoji_field ) { + if ( isset( $data[ $emoji_field ] ) ) { + $charset = $wpdb->get_col_charset( $wpdb->posts, $emoji_field ); + if ( 'utf8' === $charset ) { + $data[ $emoji_field ] = wp_encode_emoji( $data[ $emoji_field ] ); + } + } + } + + if ( 'attachment' === $post_type ) { + /** + * Filter attachment post data before it is updated in or added to the database. + * + * @since 3.9.0 + * + * @param array $data An array of sanitized attachment post data. + * @param array $postarr An array of unsanitized attachment post data. + */ + $data = apply_filters( 'wp_insert_attachment_data', $data, $postarr ); + } else { + /** + * Filter slashed post data just before it is inserted into the database. + * + * @since 2.7.0 + * + * @param array $data An array of slashed post data. + * @param array $postarr An array of sanitized, but otherwise unmodified post data. + */ + $data = apply_filters( 'wp_insert_post_data', $data, $postarr ); + } $data = wp_unslash( $data ); $where = array( 'ID' => $post_ID ); @@ -3125,78 +3339,145 @@ function wp_insert_post( $postarr, $wp_error = false ) { */ do_action( 'pre_post_update', $post_ID, $data ); if ( false === $wpdb->update( $wpdb->posts, $data, $where ) ) { - if ( $wp_error ) + if ( $wp_error ) { return new WP_Error('db_update_error', __('Could not update post in the database'), $wpdb->last_error); - else + } else { return 0; + } } } else { - if ( isset($post_mime_type) ) - $data['post_mime_type'] = wp_unslash( $post_mime_type ); // This isn't in the update - // If there is a suggested ID, use it if not already present - if ( !empty($import_id) ) { + // If there is a suggested ID, use it if not already present. + if ( ! empty( $import_id ) ) { $import_id = (int) $import_id; if ( ! $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE ID = %d", $import_id) ) ) { $data['ID'] = $import_id; } } if ( false === $wpdb->insert( $wpdb->posts, $data ) ) { - if ( $wp_error ) + if ( $wp_error ) { return new WP_Error('db_insert_error', __('Could not insert post into the database'), $wpdb->last_error); - else + } else { return 0; + } } $post_ID = (int) $wpdb->insert_id; - // use the newly generated $post_ID + // Use the newly generated $post_ID. $where = array( 'ID' => $post_ID ); } - if ( empty($data['post_name']) && !in_array( $data['post_status'], array( 'draft', 'pending', 'auto-draft' ) ) ) { - $data['post_name'] = sanitize_title($data['post_title'], $post_ID); + if ( empty( $data['post_name'] ) && ! in_array( $data['post_status'], array( 'draft', 'pending', 'auto-draft' ) ) ) { + $data['post_name'] = wp_unique_post_slug( sanitize_title( $data['post_title'], $post_ID ), $post_ID, $data['post_status'], $post_type, $post_parent ); $wpdb->update( $wpdb->posts, array( 'post_name' => $data['post_name'] ), $where ); + clean_post_cache( $post_ID ); } - if ( is_object_in_taxonomy($post_type, 'category') ) + if ( is_object_in_taxonomy( $post_type, 'category' ) ) { wp_set_post_categories( $post_ID, $post_category ); + } - if ( isset( $tags_input ) && is_object_in_taxonomy($post_type, 'post_tag') ) - wp_set_post_tags( $post_ID, $tags_input ); + if ( isset( $postarr['tags_input'] ) && is_object_in_taxonomy( $post_type, 'post_tag' ) ) { + wp_set_post_tags( $post_ID, $postarr['tags_input'] ); + } - // new-style support for all custom taxonomies - if ( !empty($tax_input) ) { - foreach ( $tax_input as $taxonomy => $tags ) { + // New-style support for all custom taxonomies. + if ( ! empty( $postarr['tax_input'] ) ) { + foreach ( $postarr['tax_input'] as $taxonomy => $tags ) { $taxonomy_obj = get_taxonomy($taxonomy); - if ( is_array($tags) ) // array = hierarchical, string = non-hierarchical. + if ( ! $taxonomy_obj ) { + /* translators: %s: taxonomy name */ + _doing_it_wrong( __FUNCTION__, sprintf( __( 'Invalid taxonomy: %s.' ), $taxonomy ), '4.4.0' ); + continue; + } + + // array = hierarchical, string = non-hierarchical. + if ( is_array( $tags ) ) { $tags = array_filter($tags); - if ( current_user_can($taxonomy_obj->cap->assign_terms) ) + } + if ( current_user_can( $taxonomy_obj->cap->assign_terms ) ) { wp_set_post_terms( $post_ID, $tags, $taxonomy ); + } + } + } + + if ( ! empty( $postarr['meta_input'] ) ) { + foreach ( $postarr['meta_input'] as $field => $value ) { + update_post_meta( $post_ID, $field, $value ); } } $current_guid = get_post_field( 'guid', $post_ID ); - // Set GUID - if ( !$update && '' == $current_guid ) + // Set GUID. + if ( ! $update && '' == $current_guid ) { $wpdb->update( $wpdb->posts, array( 'guid' => get_permalink( $post_ID ) ), $where ); + } + + if ( 'attachment' === $postarr['post_type'] ) { + if ( ! empty( $postarr['file'] ) ) { + update_attached_file( $post_ID, $postarr['file'] ); + } + + if ( ! empty( $postarr['context'] ) ) { + add_post_meta( $post_ID, '_wp_attachment_context', $postarr['context'], true ); + } + } clean_post_cache( $post_ID ); - $post = get_post($post_ID); + $post = get_post( $post_ID ); - if ( !empty($page_template) && 'page' == $data['post_type'] ) { - $post->page_template = $page_template; + if ( ! empty( $postarr['page_template'] ) && 'page' == $data['post_type'] ) { + $post->page_template = $postarr['page_template']; $page_templates = wp_get_theme()->get_page_templates( $post ); - if ( 'default' != $page_template && ! isset( $page_templates[ $page_template ] ) ) { - if ( $wp_error ) + if ( 'default' != $postarr['page_template'] && ! isset( $page_templates[ $postarr['page_template'] ] ) ) { + if ( $wp_error ) { return new WP_Error('invalid_page_template', __('The page template is invalid.')); - else - return 0; + } + update_post_meta( $post_ID, '_wp_page_template', 'default' ); + } else { + update_post_meta( $post_ID, '_wp_page_template', $postarr['page_template'] ); } - update_post_meta($post_ID, '_wp_page_template', $page_template); } - wp_transition_post_status($data['post_status'], $previous_status, $post); + if ( 'attachment' !== $postarr['post_type'] ) { + wp_transition_post_status( $data['post_status'], $previous_status, $post ); + } else { + if ( $update ) { + /** + * Fires once an existing attachment has been updated. + * + * @since 2.0.0 + * + * @param int $post_ID Attachment ID. + */ + do_action( 'edit_attachment', $post_ID ); + $post_after = get_post( $post_ID ); + + /** + * Fires once an existing attachment has been updated. + * + * @since 4.4.0 + * + * @param int $post_ID Post ID. + * @param WP_Post $post_after Post object following the update. + * @param WP_Post $post_before Post object before the update. + */ + do_action( 'attachment_updated', $post_ID, $post_after, $post_before ); + } else { + + /** + * Fires once an attachment has been added. + * + * @since 2.0.0 + * + * @param int $post_ID Attachment ID. + */ + do_action( 'add_attachment', $post_ID ); + } + + return $post_ID; + } if ( $update ) { /** @@ -3225,7 +3506,7 @@ function wp_insert_post( $postarr, $wp_error = false ) { /** * Fires once a post has been saved. * - * The dynamic portion of the hook name, $post->post_type, refers to + * The dynamic portion of the hook name, `$post->post_type`, refers to * the post type slug. * * @since 3.7.0 @@ -3269,18 +3550,19 @@ function wp_insert_post( $postarr, $wp_error = false ) { * * @since 1.0.0 * - * @param array|object $postarr Post data. Arrays are expected to be escaped, objects are not. - * @param bool $wp_error Optional. Allow return of WP_Error on failure. + * @param array|object $postarr Optional. Post data. Arrays are expected to be escaped, + * objects are not. Default array. + * @param bool $wp_error Optional. Allow return of WP_Error on failure. Default false. * @return int|WP_Error The value 0 or WP_Error on failure. The post ID on success. */ function wp_update_post( $postarr = array(), $wp_error = false ) { if ( is_object($postarr) ) { - // non-escaped post was passed + // Non-escaped post was passed. $postarr = get_object_vars($postarr); $postarr = wp_slash($postarr); } - // First, get all of the original fields + // First, get all of the original fields. $post = get_post($postarr['ID'], ARRAY_A); if ( is_null( $post ) ) { @@ -3299,7 +3581,7 @@ function wp_update_post( $postarr = array(), $wp_error = false ) { else $post_cats = $post['post_category']; - // Drafts shouldn't be assigned a date unless explicitly done so by the user + // Drafts shouldn't be assigned a date unless explicitly done so by the user. if ( isset( $post['post_status'] ) && in_array($post['post_status'], array('draft', 'pending', 'auto-draft')) && empty($postarr['edit_date']) && ('0000-00-00 00:00:00' == $post['post_date_gmt']) ) $clear_date = true; @@ -3324,7 +3606,8 @@ function wp_update_post( $postarr = array(), $wp_error = false ) { * Publish a post by transitioning the post status. * * @since 2.1.0 - * @uses $wpdb + * + * @global wpdb $wpdb WordPress database abstraction object. * * @param int|WP_Post $post Post ID or post object. */ @@ -3347,10 +3630,13 @@ function wp_publish_post( $post ) { /** This action is documented in wp-includes/post.php */ do_action( 'edit_post', $post->ID, $post ); + /** This action is documented in wp-includes/post.php */ do_action( "save_post_{$post->post_type}", $post->ID, $post, true ); + /** This action is documented in wp-includes/post.php */ do_action( 'save_post', $post->ID, $post, true ); + /** This action is documented in wp-includes/post.php */ do_action( 'wp_insert_post', $post->ID, $post, true ); } @@ -3364,10 +3650,8 @@ function wp_publish_post( $post ) { * @since 2.5.0 * * @param int|WP_Post $post_id Post ID or post object. - * @return null Nothing is returned. Which can mean that no action is required or post was published. */ -function check_and_publish_future_post($post_id) { - +function check_and_publish_future_post( $post_id ) { $post = get_post($post_id); if ( empty($post) ) @@ -3378,13 +3662,15 @@ function check_and_publish_future_post($post_id) { $time = strtotime( $post->post_date_gmt . ' GMT' ); - if ( $time > time() ) { // Uh oh, someone jumped the gun! + // Uh oh, someone jumped the gun! + if ( $time > time() ) { wp_clear_scheduled_hook( 'publish_future_post', array( $post_id ) ); // clear anything else in the system wp_schedule_single_event( $time, 'publish_future_post', array( $post_id ) ); return; } - return wp_publish_post($post_id); + // wp_publish_post(_ returns no meaningful value. + wp_publish_post( $post_id ); } /** @@ -3392,14 +3678,15 @@ function check_and_publish_future_post($post_id) { * * @since 2.8.0 * - * @global wpdb $wpdb + * @global wpdb $wpdb WordPress database abstraction object. * @global WP_Rewrite $wp_rewrite - * @param string $slug the desired slug (post_name) - * @param integer $post_ID - * @param string $post_status no uniqueness checks are made if the post is still draft or pending - * @param string $post_type - * @param integer $post_parent - * @return string unique slug for the post, based on $post_name (with a -1, -2, etc. suffix) + * + * @param string $slug The desired slug (post_name). + * @param int $post_ID Post ID. + * @param string $post_status No uniqueness checks are made if the post is still draft or pending. + * @param string $post_type Post type. + * @param int $post_parent Post parent ID. + * @return string Unique slug for the post, based on $post_name (with a -1, -2, etc. suffix) */ function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_parent ) { if ( in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) || ( 'inherit' == $post_status && 'revision' == $post_type ) ) @@ -3413,7 +3700,6 @@ function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_p if ( ! is_array( $feeds ) ) $feeds = array(); - $hierarchical_post_types = get_post_types( array('hierarchical' => true) ); if ( 'attachment' == $post_type ) { // Attachment slugs must be unique across all types. $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND ID != %d LIMIT 1"; @@ -3427,7 +3713,7 @@ function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_p * @param bool $bad_slug Whether the slug would be bad as an attachment slug. * @param string $slug The post slug. */ - if ( $post_name_check || in_array( $slug, $feeds ) || apply_filters( 'wp_unique_post_slug_is_bad_attachment_slug', false, $slug ) ) { + if ( $post_name_check || in_array( $slug, $feeds ) || 'embed' === $slug || apply_filters( 'wp_unique_post_slug_is_bad_attachment_slug', false, $slug ) ) { $suffix = 2; do { $alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix"; @@ -3436,7 +3722,7 @@ function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_p } while ( $post_name_check ); $slug = $alt_post_name; } - } elseif ( in_array( $post_type, $hierarchical_post_types ) ) { + } elseif ( is_post_type_hierarchical( $post_type ) ) { if ( 'nav_menu_item' == $post_type ) return $slug; @@ -3444,8 +3730,8 @@ function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_p * Page slugs must be unique within their own trees. Pages are in a separate * namespace than posts so page slugs are allowed to overlap post slugs. */ - $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ( '" . implode( "', '", esc_sql( $hierarchical_post_types ) ) . "' ) AND ID != %d AND post_parent = %d LIMIT 1"; - $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_ID, $post_parent ) ); + $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ( %s, 'attachment' ) AND ID != %d AND post_parent = %d LIMIT 1"; + $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_ID, $post_parent ) ); /** * Filter whether the post slug would make a bad hierarchical post slug. @@ -3457,11 +3743,11 @@ function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_p * @param string $post_type Post type. * @param int $post_parent Post parent ID. */ - if ( $post_name_check || in_array( $slug, $feeds ) || preg_match( "@^($wp_rewrite->pagination_base)?\d+$@", $slug ) || apply_filters( 'wp_unique_post_slug_is_bad_hierarchical_slug', false, $slug, $post_type, $post_parent ) ) { + if ( $post_name_check || in_array( $slug, $feeds ) || 'embed' === $slug || preg_match( "@^($wp_rewrite->pagination_base)?\d+$@", $slug ) || apply_filters( 'wp_unique_post_slug_is_bad_hierarchical_slug', false, $slug, $post_type, $post_parent ) ) { $suffix = 2; do { $alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix"; - $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_ID, $post_parent ) ); + $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_type, $post_ID, $post_parent ) ); $suffix++; } while ( $post_name_check ); $slug = $alt_post_name; @@ -3471,6 +3757,28 @@ function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_p $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s AND ID != %d LIMIT 1"; $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_ID ) ); + // Prevent new post slugs that could result in URLs that conflict with date archives. + $post = get_post( $post_ID ); + $conflicts_with_date_archive = false; + if ( 'post' === $post_type && ( ! $post || $post->post_name !== $slug ) && preg_match( '/^[0-9]+$/', $slug ) && $slug_num = intval( $slug ) ) { + $permastructs = array_values( array_filter( explode( '/', get_option( 'permalink_structure' ) ) ) ); + $postname_index = array_search( '%postname%', $permastructs ); + + /* + * Potential date clashes are as follows: + * + * - Any integer in the first permastruct position could be a year. + * - An integer between 1 and 12 that follows 'year' conflicts with 'monthnum'. + * - An integer between 1 and 31 that follows 'monthnum' conflicts with 'day'. + */ + if ( 0 === $postname_index || + ( $postname_index && '%year%' === $permastructs[ $postname_index - 1 ] && 13 > $slug_num ) || + ( $postname_index && '%monthnum%' === $permastructs[ $postname_index - 1 ] && 32 > $slug_num ) + ) { + $conflicts_with_date_archive = true; + } + } + /** * Filter whether the post slug would be bad as a flat slug. * @@ -3480,7 +3788,7 @@ function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_p * @param string $slug The post slug. * @param string $post_type Post type. */ - if ( $post_name_check || in_array( $slug, $feeds ) || apply_filters( 'wp_unique_post_slug_is_bad_flat_slug', false, $slug, $post_type ) ) { + if ( $post_name_check || in_array( $slug, $feeds ) || 'embed' === $slug || $conflicts_with_date_archive || apply_filters( 'wp_unique_post_slug_is_bad_flat_slug', false, $slug, $post_type ) ) { $suffix = 2; do { $alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix"; @@ -3507,14 +3815,15 @@ function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_p } /** - * Truncates a post slug. + * Truncate a post slug. * * @since 3.6.0 * @access private - * @uses utf8_uri_encode() Makes sure UTF-8 characters are properly cut and encoded. * - * @param string $slug The slug to truncate. - * @param int $length Max length of the slug. + * @see utf8_uri_encode() + * + * @param string $slug The slug to truncate. + * @param int $length Optional. Max length of the slug. Default 200 (characters). * @return string The truncated slug. */ function _truncate_post_slug( $slug, $length = 200 ) { @@ -3530,17 +3839,18 @@ function _truncate_post_slug( $slug, $length = 200 ) { } /** - * Adds tags to a post. + * Add tags to a post. * - * @uses wp_set_post_tags() Same first two parameters, but the last parameter is always set to true. + * @see wp_set_post_tags() * * @since 2.3.0 * - * @param int $post_id Post ID - * @param string $tags The tags to set for the post, separated by commas. - * @return bool|null Will return false if $post_id is not an integer or is 0. Will return null otherwise + * @param int $post_id Optional. The Post ID. Does not default to the ID of the global $post. + * @param string|array $tags Optional. An array of tags to set for the post, or a string of tags + * separated by commas. Default empty. + * @return array|false|WP_Error Array of affected term IDs. WP_Error or false on failure. */ -function wp_add_post_tags($post_id = 0, $tags = '') { +function wp_add_post_tags( $post_id = 0, $tags = '' ) { return wp_set_post_tags($post_id, $tags, true); } @@ -3548,12 +3858,15 @@ function wp_add_post_tags($post_id = 0, $tags = '') { * Set the tags for a post. * * @since 2.3.0 - * @uses wp_set_object_terms() Sets the tags for the post. * - * @param int $post_id Post ID. - * @param string $tags The tags to set for the post, separated by commas. - * @param bool $append If true, don't delete existing tags, just add on. If false, replace the tags with the new tags. - * @return mixed Array of affected term IDs. WP_Error or false on failure. + * @see wp_set_object_terms() + * + * @param int $post_id Optional. The Post ID. Does not default to the ID of the global $post. + * @param string|array $tags Optional. An array of tags to set for the post, or a string of tags + * separated by commas. Default empty. + * @param bool $append Optional. If true, don't delete existing tags, just add on. If false, + * replace the tags with the new tags. Default false. + * @return array|false|WP_Error Array of term taxonomy IDs of affected terms. WP_Error or false on failure. */ function wp_set_post_tags( $post_id = 0, $tags = '', $append = false ) { return wp_set_post_terms( $post_id, $tags, 'post_tag', $append); @@ -3563,13 +3876,16 @@ function wp_set_post_tags( $post_id = 0, $tags = '', $append = false ) { * Set the terms for a post. * * @since 2.8.0 - * @uses wp_set_object_terms() Sets the tags for the post. * - * @param int $post_id Post ID. - * @param string $tags The tags to set for the post, separated by commas. - * @param string $taxonomy Taxonomy name. Defaults to 'post_tag'. - * @param bool $append If true, don't delete existing tags, just add on. If false, replace the tags with the new tags. - * @return mixed Array of affected term IDs. WP_Error or false on failure. + * @see wp_set_object_terms() + * + * @param int $post_id Optional. The Post ID. Does not default to the ID of the global $post. + * @param string|array $tags Optional. An array of terms to set for the post, or a string of terms + * separated by commas. Default empty. + * @param string $taxonomy Optional. Taxonomy name. Default 'post_tag'. + * @param bool $append Optional. If true, don't delete existing terms, just add on. If false, + * replace the terms with the new terms. Default false. + * @return array|false|WP_Error Array of term taxonomy IDs of affected terms. WP_Error or false on failure. */ function wp_set_post_terms( $post_id = 0, $tags = '', $taxonomy = 'post_tag', $append = false ) { $post_id = (int) $post_id; @@ -3587,8 +3903,10 @@ function wp_set_post_terms( $post_id = 0, $tags = '', $taxonomy = 'post_tag', $a $tags = explode( ',', trim( $tags, " \n\t\r\0\x0B," ) ); } - // Hierarchical taxonomies must always pass IDs rather than names so that children with the same - // names but different parents aren't confused. + /* + * Hierarchical taxonomies must always pass IDs rather than names so that + * children with the same names but different parents aren't confused. + */ if ( is_taxonomy_hierarchical( $taxonomy ) ) { $tags = array_unique( array_map( 'intval', $tags ) ); } @@ -3604,10 +3922,13 @@ function wp_set_post_terms( $post_id = 0, $tags = '', $taxonomy = 'post_tag', $a * * @since 2.1.0 * - * @param int $post_ID Post ID. + * @param int $post_ID Optional. The Post ID. Does not default to the ID + * of the global $post. Default 0. * @param array|int $post_categories Optional. List of categories or ID of category. - * @param bool $append If true, don't delete existing categories, just add on. If false, replace the categories with the new categories. - * @return bool|mixed + * Default empty array. + * @param bool $append If true, don't delete existing categories, just add on. + * If false, replace the categories with the new categories. + * @return array|false|WP_Error Array of term taxonomy IDs of affected categories. WP_Error or false on failure. */ function wp_set_post_categories( $post_ID = 0, $post_categories = array(), $append = false ) { $post_ID = (int) $post_ID; @@ -3622,7 +3943,7 @@ function wp_set_post_categories( $post_ID = 0, $post_categories = array(), $appe } else { $post_categories = array(); } - } else if ( 1 == count($post_categories) && '' == reset($post_categories) ) { + } elseif ( 1 == count( $post_categories ) && '' == reset( $post_categories ) ) { return true; } @@ -3630,28 +3951,27 @@ function wp_set_post_categories( $post_ID = 0, $post_categories = array(), $appe } /** - * Transition the post status of a post. - * - * Calls hooks to transition post status. - * - * The first is 'transition_post_status' with new status, old status, and post data. + * Fires actions related to the transitioning of a post's status. * - * The next action called is 'OLDSTATUS_to_NEWSTATUS' the 'NEWSTATUS' is the - * $new_status parameter and the 'OLDSTATUS' is $old_status parameter; it has the - * post data. + * When a post is saved, the post status is "transitioned" from one status to another, + * though this does not always mean the status has actually changed before and after + * the save. This function fires a number of action hooks related to that transition: + * the generic 'transition_post_status' action, as well as the dynamic hooks + * `"{$old_status}_to_{$new_status}"` and `"{$new_status}_{$post->post_type}"`. Note + * that the function does not transition the post object in the database. * - * The final action is named 'NEWSTATUS_POSTTYPE', 'NEWSTATUS' is from the $new_status - * parameter and POSTTYPE is post_type post data. + * For instance: When publishing a post for the first time, the post status may transition + * from 'draft' â or some other status â to 'publish'. However, if a post is already + * published and is simply being updated, the "old" and "new" statuses may both be 'publish' + * before and after the transition. * * @since 2.3.0 * - * @link http://codex.wordpress.org/Post_Status_Transitions - * - * @param string $new_status Transition to this post status. - * @param string $old_status Previous post status. - * @param object $post Post data. + * @param string $new_status Transition to this post status. + * @param string $old_status Previous post status. + * @param WP_Post $post Post data. */ -function wp_transition_post_status($new_status, $old_status, $post) { +function wp_transition_post_status( $new_status, $old_status, $post ) { /** * Fires when a post is transitioned from one status to another. * @@ -3666,7 +3986,7 @@ function wp_transition_post_status($new_status, $old_status, $post) { /** * Fires when a post is transitioned from one status to another. * - * The dynamic portions of the hook name, $new_status and $old status, + * The dynamic portions of the hook name, `$new_status` and `$old status`, * refer to the old and new post statuses, respectively. * * @since 2.3.0 @@ -3678,9 +3998,17 @@ function wp_transition_post_status($new_status, $old_status, $post) { /** * Fires when a post is transitioned from one status to another. * - * The dynamic portions of the hook name, $new_status and $post->post_type, + * The dynamic portions of the hook name, `$new_status` and `$post->post_type`, * refer to the new post status and post type, respectively. * + * Please note: When this action is hooked using a particular post status (like + * 'publish', as `publish_{$post->post_type}`), it will fire both when a post is + * first transitioned to that status from something else, as well as upon + * subsequent post updates (old and new status are both the same). + * + * Therefore, if you are looking to only fire a callback when a post is first + * transitioned to a status, use the {@see 'transition_post_status'} hook instead. + * * @since 2.3.0 * * @param int $post_id Post ID. @@ -3690,20 +4018,21 @@ function wp_transition_post_status($new_status, $old_status, $post) { } // -// Trackback and ping functions +// Comment, trackback, and pingback functions. // /** - * Add a URL to those already pung. + * Add a URL to those already pinged. * * @since 1.5.0 - * @uses $wpdb * - * @param int $post_id Post ID. - * @param string $uri Ping URI. - * @return int How many rows were updated. + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param int $post_id Post ID. + * @param string $uri Ping URI. + * @return int|false How many rows were updated. */ -function add_ping($post_id, $uri) { +function add_ping( $post_id, $uri ) { global $wpdb; $pung = $wpdb->get_var( $wpdb->prepare( "SELECT pinged FROM $wpdb->posts WHERE ID = %d", $post_id )); $pung = trim($pung); @@ -3720,7 +4049,7 @@ function add_ping($post_id, $uri) { */ $new = apply_filters( 'add_ping', $new ); - // expected_slashed ($new) + // expected_slashed ($new). $new = wp_unslash($new); return $wpdb->update( $wpdb->posts, array( 'pinged' => $new ), array( 'ID' => $post_id ) ); } @@ -3731,9 +4060,9 @@ function add_ping($post_id, $uri) { * @since 1.5.0 * * @param int $post_id Post ID. - * @return array List of enclosures + * @return array List of enclosures. */ -function get_enclosed($post_id) { +function get_enclosed( $post_id ) { $custom_fields = get_post_custom( $post_id ); $pung = array(); if ( !is_array( $custom_fields ) ) @@ -3742,7 +4071,7 @@ function get_enclosed($post_id) { foreach ( $custom_fields as $key => $val ) { if ( 'enclosure' != $key || !is_array( $val ) ) continue; - foreach( $val as $enc ) { + foreach ( $val as $enc ) { $enclosure = explode( "\n", $enc ); $pung[] = trim( $enclosure[ 0 ] ); } @@ -3756,20 +4085,20 @@ function get_enclosed($post_id) { * @param array $pung Array of enclosures for the given post. * @param int $post_id Post ID. */ - $pung = apply_filters( 'get_enclosed', $pung, $post_id ); - return $pung; + return apply_filters( 'get_enclosed', $pung, $post_id ); } /** * Retrieve URLs already pinged for a post. * * @since 1.5.0 - * @uses $wpdb + * + * @global wpdb $wpdb WordPress database abstraction object. * * @param int $post_id Post ID. * @return array */ -function get_pung($post_id) { +function get_pung( $post_id ) { global $wpdb; $pung = $wpdb->get_var( $wpdb->prepare( "SELECT pinged FROM $wpdb->posts WHERE ID = %d", $post_id )); $pung = trim($pung); @@ -3782,20 +4111,20 @@ function get_pung($post_id) { * * @param array $pung Array of URLs already pinged for the given post. */ - $pung = apply_filters( 'get_pung', $pung ); - return $pung; + return apply_filters( 'get_pung', $pung ); } /** * Retrieve URLs that need to be pinged. * * @since 1.5.0 - * @uses $wpdb + * + * @global wpdb $wpdb WordPress database abstraction object. * * @param int $post_id Post ID * @return array */ -function get_to_ping($post_id) { +function get_to_ping( $post_id ) { global $wpdb; $to_ping = $wpdb->get_var( $wpdb->prepare( "SELECT to_ping FROM $wpdb->posts WHERE ID = %d", $post_id )); $to_ping = sanitize_trackback_urls( $to_ping ); @@ -3808,8 +4137,7 @@ function get_to_ping($post_id) { * * @param array $to_ping List of URLs yet to ping. */ - $to_ping = apply_filters( 'get_to_ping', $to_ping ); - return $to_ping; + return apply_filters( 'get_to_ping', $to_ping ); } /** @@ -3817,28 +4145,25 @@ function get_to_ping($post_id) { * * @since 1.0.0 * - * @param string $tb_list Comma separated list of URLs - * @param int $post_id Post ID + * @param string $tb_list Comma separated list of URLs. + * @param int $post_id Post ID. */ -function trackback_url_list($tb_list, $post_id) { +function trackback_url_list( $tb_list, $post_id ) { if ( ! empty( $tb_list ) ) { - // get post data - $postdata = get_post($post_id, ARRAY_A); + // Get post data. + $postdata = get_post( $post_id, ARRAY_A ); - // import postdata as variables - extract($postdata, EXTR_SKIP); + // Form an excerpt. + $excerpt = strip_tags( $postdata['post_excerpt'] ? $postdata['post_excerpt'] : $postdata['post_content'] ); - // form an excerpt - $excerpt = strip_tags($post_excerpt ? $post_excerpt : $post_content); - - if (strlen($excerpt) > 255) { - $excerpt = substr($excerpt,0,252) . '…'; + if ( strlen( $excerpt ) > 255 ) { + $excerpt = substr( $excerpt, 0, 252 ) . '…'; } - $trackback_urls = explode(',', $tb_list); - foreach( (array) $trackback_urls as $tb_url) { - $tb_url = trim($tb_url); - trackback($tb_url, wp_unslash($post_title), $excerpt, $post_id); + $trackback_urls = explode( ',', $tb_list ); + foreach ( (array) $trackback_urls as $tb_url ) { + $tb_url = trim( $tb_url ); + trackback( $tb_url, wp_unslash( $postdata['post_title'] ), $excerpt, $post_id ); } } } @@ -3851,7 +4176,8 @@ function trackback_url_list($tb_list, $post_id) { * Get a list of page IDs. * * @since 2.0.0 - * @uses $wpdb + * + * @global wpdb $wpdb WordPress database abstraction object. * * @return array List of page IDs. */ @@ -3873,12 +4199,14 @@ function get_all_page_ids() { * Use get_post() instead of get_page(). * * @since 1.5.1 - * @deprecated 3.5.0 - * - * @param mixed $page Page object or page ID. Passed by reference. - * @param string $output What to output. OBJECT, ARRAY_A, or ARRAY_N. - * @param string $filter How the return value should be filtered. - * @return WP_Post|null WP_Post on success or null on failure + * @deprecated 3.5.0 Use get_post() + * + * @param mixed $page Page object or page ID. Passed by reference. + * @param string $output Optional. What to output. Accepts OBJECT, ARRAY_A, or ARRAY_N. + * Default OBJECT. + * @param string $filter Optional. How the return value should be filtered. Accepts 'raw', + * 'edit', 'db', 'display'. Default 'raw'. + * @return WP_Post|array|null WP_Post on success or null on failure. */ function get_page( $page, $output = OBJECT, $filter = 'raw') { return get_post( $page, $output, $filter ); @@ -3888,12 +4216,14 @@ function get_page( $page, $output = OBJECT, $filter = 'raw') { * Retrieves a page given its path. * * @since 2.1.0 - * @uses $wpdb * - * @param string $page_path Page path - * @param string $output Optional. Output type. OBJECT, ARRAY_N, or ARRAY_A. Default OBJECT. - * @param string|array $post_type Optional. Post type or array of post types. Default page. - * @return WP_Post|null WP_Post on success or null on failure + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string $page_path Page path. + * @param string $output Optional. Output type. Accepts OBJECT, ARRAY_N, or ARRAY_A. + * Default OBJECT. + * @param string|array $post_type Optional. Post type or array of post types. Default 'page'. + * @return WP_Post|array|void WP_Post on success. */ function get_page_by_path( $page_path, $output = OBJECT, $post_type = 'page' ) { global $wpdb; @@ -3931,6 +4261,11 @@ function get_page_by_path( $page_path, $output = OBJECT, $post_type = 'page' ) { if ( $page->post_name == $revparts[0] ) { $count = 0; $p = $page; + + /* + * Loop through the given path parts from right to left, + * ensuring each matches the post ancestry. + */ while ( $p->post_parent != 0 && isset( $pages[ $p->post_parent ] ) ) { $count++; $parent = $pages[ $p->post_parent ]; @@ -3947,22 +4282,23 @@ function get_page_by_path( $page_path, $output = OBJECT, $post_type = 'page' ) { } } - if ( $foundid ) + if ( $foundid ) { return get_post( $foundid, $output ); - - return null; + } } /** * Retrieve a page given its title. * * @since 2.1.0 - * @uses $wpdb * - * @param string $page_title Page title - * @param string $output Optional. Output type. OBJECT, ARRAY_N, or ARRAY_A. Default OBJECT. - * @param string|array $post_type Optional. Post type or array of post types. Default page. - * @return WP_Post|null WP_Post on success or null on failure + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string $page_title Page title + * @param string $output Optional. Output type. OBJECT, ARRAY_N, or ARRAY_A. + * Default OBJECT. + * @param string|array $post_type Optional. Post type or array of post types. Default 'page'. + * @return WP_Post|array|void WP_Post on success or null on failure */ function get_page_by_title( $page_title, $output = OBJECT, $post_type = 'page' ) { global $wpdb; @@ -3987,34 +4323,48 @@ function get_page_by_title( $page_title, $output = OBJECT, $post_type = 'page' ) $page = $wpdb->get_var( $sql ); - if ( $page ) + if ( $page ) { return get_post( $page, $output ); - - return null; + } } /** - * Retrieve child pages from list of pages matching page ID. + * Identify descendants of a given page ID in a list of page objects. * - * Matches against the pages parameter against the page ID. Also matches all - * children for the same to retrieve all children of a page. Does not make any - * SQL queries to get the children. + * Descendants are identified from the `$pages` array passed to the function. No database queries are performed. * * @since 1.5.1 * - * @param int $page_id Page ID. - * @param array $pages List of pages' objects. - * @return array + * @param int $page_id Page ID. + * @param array $pages List of page objects from which descendants should be identified. + * @return array List of page children. */ -function get_page_children($page_id, $pages) { - $page_list = array(); +function get_page_children( $page_id, $pages ) { + // Build a hash of ID -> children. + $children = array(); foreach ( (array) $pages as $page ) { - if ( $page->post_parent == $page_id ) { - $page_list[] = $page; - if ( $children = get_page_children($page->ID, $pages) ) - $page_list = array_merge($page_list, $children); + $children[ intval( $page->post_parent ) ][] = $page; + } + + $page_list = array(); + + // Start the search by looking at immediate children. + if ( isset( $children[ $page_id ] ) ) { + // Always start at the end of the stack in order to preserve original `$pages` order. + $to_look = array_reverse( $children[ $page_id ] ); + + while ( $to_look ) { + $p = array_pop( $to_look ); + $page_list[] = $p; + if ( isset( $children[ $p->ID ] ) ) { + foreach ( array_reverse( $children[ $p->ID ] ) as $child ) { + // Append to the `$to_look` stack to descend the tree. + $to_look[] = $child; + } + } } } + return $page_list; } @@ -4026,14 +4376,13 @@ function get_page_children($page_id, $pages) { * * @since 2.0.0 * - * @param array $pages Posts array. - * @param int $page_id Parent page ID. + * @param array $pages Posts array, passed by reference. + * @param int $page_id Optional. Parent page ID. Default 0. * @return array A list arranged by hierarchy. Children immediately follow their parents. */ function get_page_hierarchy( &$pages, $page_id = 0 ) { if ( empty( $pages ) ) { - $result = array(); - return $result; + return array(); } $children = array(); @@ -4049,14 +4398,21 @@ function get_page_hierarchy( &$pages, $page_id = 0 ) { } /** - * function to traverse and return all the nested children post names of a root page. + * Traverse and return all the nested children post names of a root page. + * * $children contains parent-children relations * * @since 2.9.0 + * + * @see _page_traverse_name() + * + * @param int $page_id Page ID. + * @param array $children Parent-children relations, passed by reference. + * @param array $result Result, passed by reference. */ function _page_traverse_name( $page_id, &$children, &$result ){ if ( isset( $children[ $page_id ] ) ){ - foreach( (array)$children[ $page_id ] as $child ) { + foreach ( (array)$children[ $page_id ] as $child ) { $result[ $child->ID ] = $child->post_name; _page_traverse_name( $child->ID, $children, $result ); } @@ -4064,17 +4420,19 @@ function _page_traverse_name( $page_id, &$children, &$result ){ } /** - * Builds URI for a page. + * Build the URI path for a page. * * Sub pages will be in the "directory" under the parent page post name. * * @since 1.5.0 * - * @param mixed $page Page object or page ID. + * @param WP_Post|object|int $page Page object or page ID. * @return string|false Page URI, false on error. */ function get_page_uri( $page ) { - $page = get_post( $page ); + if ( ! $page instanceof WP_Post ) { + $page = get_post( $page ); + } if ( ! $page ) return false; @@ -4082,54 +4440,68 @@ function get_page_uri( $page ) { $uri = $page->post_name; foreach ( $page->ancestors as $parent ) { - $uri = get_post( $parent )->post_name . '/' . $uri; + $parent = get_post( $parent ); + if ( $parent ) { + $uri = $parent->post_name . '/' . $uri; + } } - return $uri; + /** + * Filter the URI for a page. + * + * @since 4.4.0 + * + * @param string $uri Page URI. + * @param WP_Post $page Page object. + */ + return apply_filters( 'get_page_uri', $uri, $page ); } /** * Retrieve a list of pages. * - * @global wpdb $wpdb WordPress database abstraction object + * @global wpdb $wpdb WordPress database abstraction object. * * @since 1.5.0 * - * @param mixed $args { - * Array or string of arguments. Optional. - * - * @type int 'child_of' Page ID to return child and grandchild pages of. Default 0, or no restriction. - * @type string 'sort_order' How to sort retrieved pages. - * Default 'ASC'. Accepts 'ASC', 'DESC'. - * @type string 'sort_column' What columns to sort pages by, comma-separated. - * Default 'post_title'. Accepts 'post_author', 'post_date', 'post_title', 'post_name', - * 'post_modified', 'post_modified_gmt', 'menu_order', 'post_parent', 'ID', 'rand', - * 'comment_count'. 'post_' can be omitted for any values that start with it. - * @type bool 'hierarchical' Whether to return pages hierarchically. Default true. - * @type array 'exclude' Array of page IDs to exclude. - * @type array 'include' Array of page IDs to include. Cannot be used with 'child_of', 'parent', 'exclude', - * 'meta_key', 'meta_value', or 'hierarchical'. - * @type string 'meta_key' Only include pages with this meta key. - * @type string 'meta_value' Only include pages with this meta value. - * @type string 'authors' A comma-separated list of author IDs. - * @type int 'parent' Page ID to return direct children of. 'hierarchical' must be false. - * Default -1, or no restriction. - * @type int 'exclude_tree' Remove all children of the given ID from returned pages. - * @type int 'number' The number of pages to return. Default 0, or all pages. - * @type int 'offset' The number of pages to skip before returning. Requires 'number'. - * Default 0. - * @type string 'post_type' The post type to query. - * Default 'page'. - * @type string 'post_status' A comma-separated list of post status types to include. - * Default 'publish'. + * @param array|string $args { + * Optional. Array or string of arguments to retrieve pages. + * + * @type int $child_of Page ID to return child and grandchild pages of. Note: The value + * of `$hierarchical` has no bearing on whether `$child_of` returns + * hierarchical results. Default 0, or no restriction. + * @type string $sort_order How to sort retrieved pages. Accepts 'ASC', 'DESC'. Default 'ASC'. + * @type string $sort_column What columns to sort pages by, comma-separated. Accepts 'post_author', + * 'post_date', 'post_title', 'post_name', 'post_modified', 'menu_order', + * 'post_modified_gmt', 'post_parent', 'ID', 'rand', 'comment_count'. + * 'post_' can be omitted for any values that start with it. + * Default 'post_title'. + * @type bool $hierarchical Whether to return pages hierarchically. If false in conjunction with + * `$child_of` also being false, both arguments will be disregarded. + * Default true. + * @type array $exclude Array of page IDs to exclude. Default empty array. + * @type array $include Array of page IDs to include. Cannot be used with `$child_of`, + * `$parent`, `$exclude`, `$meta_key`, `$meta_value`, or `$hierarchical`. + * Default empty array. + * @type string $meta_key Only include pages with this meta key. Default empty. + * @type string $meta_value Only include pages with this meta value. Requires `$meta_key`. + * Default empty. + * @type string $authors A comma-separated list of author IDs. Default empty. + * @type int $parent Page ID to return direct children of. Default -1, or no restriction. + * @type string|array $exclude_tree Comma-separated string or array of page IDs to exclude. + * Default empty array. + * @type int $number The number of pages to return. Default 0, or all pages. + * @type int $offset The number of pages to skip before returning. Requires `$number`. + * Default 0. + * @type string $post_type The post type to query. Default 'page'. + * @type string $post_status A comma-separated list of post status types to include. + * Default 'publish'. * } - * @return array List of pages matching defaults or $args. + * @return array|false List of pages matching defaults or `$args`. */ function get_pages( $args = array() ) { global $wpdb; - $pages = false; - $defaults = array( 'child_of' => 0, 'sort_order' => 'ASC', 'sort_column' => 'post_title', 'hierarchical' => 1, @@ -4141,26 +4513,37 @@ function get_pages( $args = array() ) { ); $r = wp_parse_args( $args, $defaults ); - extract( $r, EXTR_SKIP ); - $number = (int) $number; - $offset = (int) $offset; - // Make sure the post type is hierarchical + $number = (int) $r['number']; + $offset = (int) $r['offset']; + $child_of = (int) $r['child_of']; + $hierarchical = $r['hierarchical']; + $exclude = $r['exclude']; + $meta_key = $r['meta_key']; + $meta_value = $r['meta_value']; + $parent = $r['parent']; + $post_status = $r['post_status']; + + // Make sure the post type is hierarchical. $hierarchical_post_types = get_post_types( array( 'hierarchical' => true ) ); - if ( !in_array( $post_type, $hierarchical_post_types ) ) - return $pages; + if ( ! in_array( $r['post_type'], $hierarchical_post_types ) ) { + return false; + } - if ( $parent > 0 && ! $child_of ) + if ( $parent > 0 && ! $child_of ) { $hierarchical = false; + } - // Make sure we have a valid post status - if ( !is_array( $post_status ) ) + // Make sure we have a valid post status. + if ( ! is_array( $post_status ) ) { $post_status = explode( ',', $post_status ); - if ( array_diff( $post_status, get_post_stati() ) ) - return $pages; + } + if ( array_diff( $post_status, get_post_stati() ) ) { + return false; + } - // $args can be whatever, only use the args defined in defaults to compute the key - $key = md5( serialize( compact(array_keys($defaults)) ) ); + // $args can be whatever, only use the args defined in defaults to compute the key. + $key = md5( serialize( wp_array_slice_assoc( $r, array_keys( $defaults ) ) ) ); $last_changed = wp_cache_get( 'last_changed', 'posts' ); if ( ! $last_changed ) { $last_changed = microtime(); @@ -4169,59 +4552,62 @@ function get_pages( $args = array() ) { $cache_key = "get_pages:$key:$last_changed"; if ( $cache = wp_cache_get( $cache_key, 'posts' ) ) { - // Convert to WP_Post instances + // Convert to WP_Post instances. $pages = array_map( 'get_post', $cache ); /** This filter is documented in wp-includes/post.php */ $pages = apply_filters( 'get_pages', $pages, $r ); return $pages; } - if ( !is_array($cache) ) - $cache = array(); - $inclusions = ''; - if ( ! empty( $include ) ) { + if ( ! empty( $r['include'] ) ) { $child_of = 0; //ignore child_of, parent, exclude, meta_key, and meta_value params if using include $parent = -1; $exclude = ''; $meta_key = ''; $meta_value = ''; $hierarchical = false; - $incpages = wp_parse_id_list( $include ); - if ( ! empty( $incpages ) ) + $incpages = wp_parse_id_list( $r['include'] ); + if ( ! empty( $incpages ) ) { $inclusions = ' AND ID IN (' . implode( ',', $incpages ) . ')'; + } } $exclusions = ''; if ( ! empty( $exclude ) ) { $expages = wp_parse_id_list( $exclude ); - if ( ! empty( $expages ) ) + if ( ! empty( $expages ) ) { $exclusions = ' AND ID NOT IN (' . implode( ',', $expages ) . ')'; + } } $author_query = ''; - if (!empty($authors)) { - $post_authors = preg_split('/[\s,]+/',$authors); + if ( ! empty( $r['authors'] ) ) { + $post_authors = preg_split( '/[\s,]+/', $r['authors'] ); if ( ! empty( $post_authors ) ) { foreach ( $post_authors as $post_author ) { //Do we have an author id or an author login? if ( 0 == intval($post_author) ) { $post_author = get_user_by('login', $post_author); - if ( empty($post_author) ) + if ( empty( $post_author ) ) { continue; - if ( empty($post_author->ID) ) + } + if ( empty( $post_author->ID ) ) { continue; + } $post_author = $post_author->ID; } - if ( '' == $author_query ) + if ( '' == $author_query ) { $author_query = $wpdb->prepare(' post_author = %d ', $post_author); - else + } else { $author_query .= $wpdb->prepare(' OR post_author = %d ', $post_author); + } } - if ( '' != $author_query ) + if ( '' != $author_query ) { $author_query = " AND ($author_query)"; + } } } @@ -4233,36 +4619,41 @@ function get_pages( $args = array() ) { // meta_key and meta_value might be slashed $meta_key = wp_unslash($meta_key); $meta_value = wp_unslash($meta_value); - if ( '' !== $meta_key ) + if ( '' !== $meta_key ) { $where .= $wpdb->prepare(" AND $wpdb->postmeta.meta_key = %s", $meta_key); - if ( '' !== $meta_value ) + } + if ( '' !== $meta_value ) { $where .= $wpdb->prepare(" AND $wpdb->postmeta.meta_value = %s", $meta_value); + } } if ( is_array( $parent ) ) { $post_parent__in = implode( ',', array_map( 'absint', (array) $parent ) ); - if ( ! empty( $post_parent__in ) ) + if ( ! empty( $post_parent__in ) ) { $where .= " AND post_parent IN ($post_parent__in)"; + } } elseif ( $parent >= 0 ) { $where .= $wpdb->prepare(' AND post_parent = %d ', $parent); } if ( 1 == count( $post_status ) ) { - $where_post_type = $wpdb->prepare( "post_type = %s AND post_status = %s", $post_type, array_shift( $post_status ) ); + $where_post_type = $wpdb->prepare( "post_type = %s AND post_status = %s", $r['post_type'], reset( $post_status ) ); } else { $post_status = implode( "', '", $post_status ); - $where_post_type = $wpdb->prepare( "post_type = %s AND post_status IN ('$post_status')", $post_type ); + $where_post_type = $wpdb->prepare( "post_type = %s AND post_status IN ('$post_status')", $r['post_type'] ); } $orderby_array = array(); - $allowed_keys = array('author', 'post_author', 'date', 'post_date', 'title', 'post_title', 'name', 'post_name', 'modified', - 'post_modified', 'modified_gmt', 'post_modified_gmt', 'menu_order', 'parent', 'post_parent', - 'ID', 'rand', 'comment_count'); - foreach ( explode( ',', $sort_column ) as $orderby ) { + $allowed_keys = array( 'author', 'post_author', 'date', 'post_date', 'title', 'post_title', 'name', 'post_name', 'modified', + 'post_modified', 'modified_gmt', 'post_modified_gmt', 'menu_order', 'parent', 'post_parent', + 'ID', 'rand', 'comment_count' ); + + foreach ( explode( ',', $r['sort_column'] ) as $orderby ) { $orderby = trim( $orderby ); - if ( !in_array( $orderby, $allowed_keys ) ) + if ( ! in_array( $orderby, $allowed_keys ) ) { continue; + } switch ( $orderby ) { case 'menu_order': @@ -4277,10 +4668,11 @@ function get_pages( $args = array() ) { $orderby = "$wpdb->posts.comment_count"; break; default: - if ( 0 === strpos( $orderby, 'post_' ) ) + if ( 0 === strpos( $orderby, 'post_' ) ) { $orderby = "$wpdb->posts." . $orderby; - else + } else { $orderby = "$wpdb->posts.post_" . $orderby; + } } $orderby_array[] = $orderby; @@ -4288,16 +4680,18 @@ function get_pages( $args = array() ) { } $sort_column = ! empty( $orderby_array ) ? implode( ',', $orderby_array ) : "$wpdb->posts.post_title"; - $sort_order = strtoupper( $sort_order ); - if ( '' !== $sort_order && !in_array( $sort_order, array( 'ASC', 'DESC' ) ) ) + $sort_order = strtoupper( $r['sort_order'] ); + if ( '' !== $sort_order && ! in_array( $sort_order, array( 'ASC', 'DESC' ) ) ) { $sort_order = 'ASC'; + } $query = "SELECT * FROM $wpdb->posts $join WHERE ($where_post_type) $where "; $query .= $author_query; $query .= " ORDER BY " . $sort_column . " " . $sort_order ; - if ( !empty($number) ) + if ( ! empty( $number ) ) { $query .= ' LIMIT ' . $offset . ',' . $number; + } $pages = $wpdb->get_results($query); @@ -4307,7 +4701,7 @@ function get_pages( $args = array() ) { return $pages; } - // Sanitize before caching so it'll only get done once + // Sanitize before caching so it'll only get done once. $num_pages = count($pages); for ($i = 0; $i < $num_pages; $i++) { $pages[$i] = sanitize_post($pages[$i], 'raw'); @@ -4316,12 +4710,13 @@ function get_pages( $args = array() ) { // Update cache. update_post_cache( $pages ); - if ( $child_of || $hierarchical ) + if ( $child_of || $hierarchical ) { $pages = get_page_children($child_of, $pages); + } - if ( ! empty( $exclude_tree ) ) { - $exclude = wp_parse_id_list( $exclude_tree ); - foreach( $exclude as $id ) { + if ( ! empty( $r['exclude_tree'] ) ) { + $exclude = wp_parse_id_list( $r['exclude_tree'] ); + foreach ( $exclude as $id ) { $children = get_page_children( $id, $pages ); foreach ( $children as $child ) { $exclude[] = $child->ID; @@ -4337,8 +4732,9 @@ function get_pages( $args = array() ) { } $page_structure = array(); - foreach ( $pages as $page ) + foreach ( $pages as $page ) { $page_structure[] = $page->ID; + } wp_cache_set( $cache_key, $page_structure, 'posts' ); @@ -4353,9 +4749,7 @@ function get_pages( $args = array() ) { * @param array $pages List of pages to retrieve. * @param array $r Array of get_pages() arguments. */ - $pages = apply_filters( 'get_pages', $pages, $r ); - - return $pages; + return apply_filters( 'get_pages', $pages, $r ); } // @@ -4386,7 +4780,7 @@ function is_local_attachment($url) { /** * Insert an attachment. * - * If you set the 'ID' in the $object parameter, it will mean that you are + * If you set the 'ID' in the $args parameter, it will mean that you are * updating and attempt to update the attachment. You can also set the * attachment name or title by setting the key 'post_name' or 'post_title'. * @@ -4397,211 +4791,34 @@ function is_local_attachment($url) { * comments are allowed. You can close them manually or keep them open by * setting the value for the 'comment_status' key. * - * The $object parameter can have the following: - * 'post_status' - Default is 'draft'. Can not be overridden, set the same as parent post. - * 'post_type' - Default is 'post', will be set to attachment. Can not override. - * 'post_author' - Default is current user ID. The ID of the user, who added the attachment. - * 'ping_status' - Default is the value in default ping status option. Whether the attachment - * can accept pings. - * 'post_parent' - Default is 0. Can use $parent parameter or set this for the post it belongs - * to, if any. - * 'menu_order' - Default is 0. The order it is displayed. - * 'to_ping' - Whether to ping. - * 'pinged' - Default is empty string. - * 'post_password' - Default is empty string. The password to access the attachment. - * 'guid' - Global Unique ID for referencing the attachment. - * 'post_content_filtered' - Attachment post content filtered. - * 'post_excerpt' - Attachment excerpt. - * * @since 2.0.0 - * @uses $wpdb * - * @param string|array $object Arguments to override defaults. - * @param string $file Optional filename. - * @param int $parent Parent post ID. + * @see wp_insert_post() + * + * @param string|array $args Arguments for inserting an attachment. + * @param string $file Optional. Filename. + * @param int $parent Optional. Parent post ID. * @return int Attachment ID. */ -function wp_insert_attachment($object, $file = false, $parent = 0) { - global $wpdb; - - $user_id = get_current_user_id(); - - $defaults = array('post_status' => 'inherit', 'post_type' => 'post', 'post_author' => $user_id, - 'ping_status' => get_option('default_ping_status'), 'post_parent' => 0, 'post_title' => '', - 'menu_order' => 0, 'to_ping' => '', 'pinged' => '', 'post_password' => '', 'post_content' => '', - 'guid' => '', 'post_content_filtered' => '', 'post_excerpt' => '', 'import_id' => 0, 'context' => ''); - - $object = wp_parse_args($object, $defaults); - if ( !empty($parent) ) - $object['post_parent'] = $parent; - - unset( $object[ 'filter' ] ); - - $object = sanitize_post($object, 'db'); - - // export array as variables - extract($object, EXTR_SKIP); - - if ( empty($post_author) ) - $post_author = $user_id; - - $post_type = 'attachment'; - - if ( ! in_array( $post_status, array( 'inherit', 'private' ) ) ) - $post_status = 'inherit'; - - if ( !empty($post_category) ) - $post_category = array_filter($post_category); // Filter out empty terms - - // Make sure we set a valid category. - if ( empty($post_category) || 0 == count($post_category) || !is_array($post_category) ) { - $post_category = array(); - } - - // Are we updating or creating? - if ( !empty($ID) ) { - $update = true; - $post_ID = (int) $ID; - } else { - $update = false; - $post_ID = 0; - } - - // Create a valid post name. - if ( empty($post_name) ) - $post_name = sanitize_title($post_title); - else - $post_name = sanitize_title($post_name); - - // expected_slashed ($post_name) - $post_name = wp_unique_post_slug($post_name, $post_ID, $post_status, $post_type, $post_parent); - - if ( empty($post_date) ) - $post_date = current_time('mysql'); - if ( empty($post_date_gmt) ) - $post_date_gmt = current_time('mysql', 1); - - if ( empty($post_modified) ) - $post_modified = $post_date; - if ( empty($post_modified_gmt) ) - $post_modified_gmt = $post_date_gmt; - - if ( empty($comment_status) ) { - if ( $update ) - $comment_status = 'closed'; - else - $comment_status = get_option('default_comment_status'); - } - if ( empty($ping_status) ) - $ping_status = get_option('default_ping_status'); - - if ( isset($to_ping) ) - $to_ping = preg_replace('|\s+|', "\n", $to_ping); - else - $to_ping = ''; - - if ( isset($post_parent) ) - $post_parent = (int) $post_parent; - else - $post_parent = 0; - - if ( isset($menu_order) ) - $menu_order = (int) $menu_order; - else - $menu_order = 0; - - if ( !isset($post_password) ) - $post_password = ''; - - if ( ! isset($pinged) ) - $pinged = ''; - - // expected_slashed (everything!) - $data = compact( array( 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_content_filtered', 'post_title', 'post_excerpt', 'post_status', 'post_type', 'comment_status', 'ping_status', 'post_password', 'post_name', 'to_ping', 'pinged', 'post_modified', 'post_modified_gmt', 'post_parent', 'menu_order', 'post_mime_type', 'guid' ) ); - - /** - * Filter attachment post data before it is updated in or added - * to the database. - * - * @since 3.9.0 - * - * @param array $data Array of sanitized attachment post data. - * @param array $object Array of un-sanitized attachment post data. - */ - $data = apply_filters( 'wp_insert_attachment_data', $data, $object ); - $data = wp_unslash( $data ); - - if ( $update ) { - $wpdb->update( $wpdb->posts, $data, array( 'ID' => $post_ID ) ); - } else { - // If there is a suggested ID, use it if not already present - if ( !empty($import_id) ) { - $import_id = (int) $import_id; - if ( ! $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE ID = %d", $import_id) ) ) { - $data['ID'] = $import_id; - } - } - - $wpdb->insert( $wpdb->posts, $data ); - $post_ID = (int) $wpdb->insert_id; - } - - if ( empty($post_name) ) { - $post_name = sanitize_title($post_title, $post_ID); - $wpdb->update( $wpdb->posts, compact("post_name"), array( 'ID' => $post_ID ) ); - } - - if ( is_object_in_taxonomy($post_type, 'category') ) - wp_set_post_categories( $post_ID, $post_category ); +function wp_insert_attachment( $args, $file = false, $parent = 0 ) { + $defaults = array( + 'file' => $file, + 'post_parent' => 0 + ); - if ( isset( $tags_input ) && is_object_in_taxonomy($post_type, 'post_tag') ) - wp_set_post_tags( $post_ID, $tags_input ); + $data = wp_parse_args( $args, $defaults ); - // support for all custom taxonomies - if ( !empty($tax_input) ) { - foreach ( $tax_input as $taxonomy => $tags ) { - $taxonomy_obj = get_taxonomy($taxonomy); - if ( is_array($tags) ) // array = hierarchical, string = non-hierarchical. - $tags = array_filter($tags); - if ( current_user_can($taxonomy_obj->cap->assign_terms) ) - wp_set_post_terms( $post_ID, $tags, $taxonomy ); - } + if ( ! empty( $parent ) ) { + $data['post_parent'] = $parent; } - if ( $file ) - update_attached_file( $post_ID, $file ); - - clean_post_cache( $post_ID ); + $data['post_type'] = 'attachment'; - if ( ! empty( $context ) ) - add_post_meta( $post_ID, '_wp_attachment_context', $context, true ); - - if ( $update) { - /** - * Fires once an existing attachment has been updated. - * - * @since 2.0.0 - * - * @param int $post_ID Attachment ID. - */ - do_action( 'edit_attachment', $post_ID ); - } else { - - /** - * Fires once an attachment has been added. - * - * @since 2.0.0 - * - * @param int $post_ID Attachment ID. - */ - do_action( 'add_attachment', $post_ID ); - } - - return $post_ID; + return wp_insert_post( $data ); } /** - * Trashes or deletes an attachment. + * Trash or delete an attachment. * * When an attachment is permanently deleted, the file will also be removed. * Deletion removes all post meta fields, taxonomy, comments, etc. associated @@ -4611,10 +4828,12 @@ function wp_insert_attachment($object, $file = false, $parent = 0) { * for media is disabled, item is already in the trash, or $force_delete is true. * * @since 2.0.0 - * @uses $wpdb * - * @param int $post_id Attachment ID. - * @param bool $force_delete Whether to bypass trash and force deletion. Defaults to false. + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param int $post_id Attachment ID. + * @param bool $force_delete Optional. Whether to bypass trash and force deletion. + * Default false. * @return mixed False on failure. Post data on success. */ function wp_delete_attachment( $post_id, $force_delete = false ) { @@ -4636,12 +4855,6 @@ function wp_delete_attachment( $post_id, $force_delete = false ) { $backup_sizes = get_post_meta( $post->ID, '_wp_attachment_backup_sizes', true ); $file = get_attached_file( $post_id ); - $intermediate_sizes = array(); - foreach ( get_intermediate_image_sizes() as $size ) { - if ( $intermediate = image_get_intermediate_size( $post_id, $size ) ) - $intermediate_sizes[] = $intermediate; - } - if ( is_multisite() ) delete_transient( 'dirsize_cache' ); @@ -4657,11 +4870,17 @@ function wp_delete_attachment( $post_id, $force_delete = false ) { wp_delete_object_term_relationships($post_id, array('category', 'post_tag')); wp_delete_object_term_relationships($post_id, get_object_taxonomies($post->post_type)); - delete_metadata( 'post', null, '_thumbnail_id', $post_id, true ); // delete all for any posts. + // Delete all for any posts. + delete_metadata( 'post', null, '_thumbnail_id', $post_id, true ); + + wp_defer_comment_counting( true ); $comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id )); - foreach ( $comment_ids as $comment_id ) + foreach ( $comment_ids as $comment_id ) { wp_delete_comment( $comment_id, true ); + } + + wp_defer_comment_counting( false ); $post_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $post_id )); foreach ( $post_meta_ids as $mid ) @@ -4676,39 +4895,38 @@ function wp_delete_attachment( $post_id, $force_delete = false ) { /** This action is documented in wp-includes/post.php */ do_action( 'deleted_post', $post_id ); - $uploadpath = wp_upload_dir(); + $uploadpath = wp_get_upload_dir(); if ( ! empty($meta['thumb']) ) { - // Don't delete the thumb if another attachment uses it - if (! $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attachment_metadata' AND meta_value LIKE %s AND post_id <> %d", '%' . $meta['thumb'] . '%', $post_id)) ) { + // Don't delete the thumb if another attachment uses it. + if (! $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attachment_metadata' AND meta_value LIKE %s AND post_id <> %d", '%' . $wpdb->esc_like( $meta['thumb'] ) . '%', $post_id)) ) { $thumbfile = str_replace(basename($file), $meta['thumb'], $file); - /** This filter is documented in wp-admin/custom-header.php */ + /** This filter is documented in wp-includes/functions.php */ $thumbfile = apply_filters( 'wp_delete_file', $thumbfile ); @ unlink( path_join($uploadpath['basedir'], $thumbfile) ); } } - // remove intermediate and backup images if there are any - foreach ( $intermediate_sizes as $intermediate ) { - /** This filter is documented in wp-admin/custom-header.php */ - $intermediate_file = apply_filters( 'wp_delete_file', $intermediate['path'] ); - @ unlink( path_join($uploadpath['basedir'], $intermediate_file) ); + // Remove intermediate and backup images if there are any. + if ( isset( $meta['sizes'] ) && is_array( $meta['sizes'] ) ) { + foreach ( $meta['sizes'] as $size => $sizeinfo ) { + $intermediate_file = str_replace( basename( $file ), $sizeinfo['file'], $file ); + /** This filter is documented in wp-includes/functions.php */ + $intermediate_file = apply_filters( 'wp_delete_file', $intermediate_file ); + @ unlink( path_join( $uploadpath['basedir'], $intermediate_file ) ); + } } if ( is_array($backup_sizes) ) { foreach ( $backup_sizes as $size ) { $del_file = path_join( dirname($meta['file']), $size['file'] ); - /** This filter is documented in wp-admin/custom-header.php */ + /** This filter is documented in wp-includes/functions.php */ $del_file = apply_filters( 'wp_delete_file', $del_file ); @ unlink( path_join($uploadpath['basedir'], $del_file) ); } } - /** This filter is documented in wp-admin/custom-header.php */ - $file = apply_filters( 'wp_delete_file', $file ); - - if ( ! empty($file) ) - @ unlink($file); + wp_delete_file( $file ); clean_post_cache( $post ); @@ -4720,9 +4938,9 @@ function wp_delete_attachment( $post_id, $force_delete = false ) { * * @since 2.1.0 * - * @param int $post_id Attachment ID - * @param bool $unfiltered Optional, default is false. If true, filters are not run. - * @return string|bool Attachment meta field. False on failure. + * @param int $post_id Attachment ID. Default 0. + * @param bool $unfiltered Optional. If true, filters are not run. Default false. + * @return mixed Attachment meta field. False on failure. */ function wp_get_attachment_metadata( $post_id = 0, $unfiltered = false ) { $post_id = (int) $post_id; @@ -4751,9 +4969,9 @@ function wp_get_attachment_metadata( $post_id = 0, $unfiltered = false ) { * * @since 2.1.0 * - * @param int $post_id Attachment ID. - * @param array $data Attachment data. - * @return int + * @param int $post_id Attachment ID. + * @param array $data Attachment data. + * @return int|bool False if $post is invalid. */ function wp_update_attachment_metadata( $post_id, $data ) { $post_id = (int) $post_id; @@ -4779,8 +4997,10 @@ function wp_update_attachment_metadata( $post_id, $data ) { * * @since 2.1.0 * - * @param int $post_id Attachment ID. - * @return string + * @global string $pagenow + * + * @param int $post_id Optional. Attachment ID. Default 0. + * @return string|false Attachment URL, otherwise false. */ function wp_get_attachment_url( $post_id = 0 ) { $post_id = (int) $post_id; @@ -4791,19 +5011,36 @@ function wp_get_attachment_url( $post_id = 0 ) { return false; $url = ''; - if ( $file = get_post_meta( $post->ID, '_wp_attached_file', true) ) { //Get attached file - if ( ($uploads = wp_upload_dir()) && false === $uploads['error'] ) { //Get upload directory - if ( 0 === strpos($file, $uploads['basedir']) ) //Check that the upload base exists in the file location - $url = str_replace($uploads['basedir'], $uploads['baseurl'], $file); //replace file location with url location - elseif ( false !== strpos($file, 'wp-content/uploads') ) - $url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 ); - else - $url = $uploads['baseurl'] . "/$file"; //Its a newly uploaded file, therefor $file is relative to the basedir. + // Get attached file. + if ( $file = get_post_meta( $post->ID, '_wp_attached_file', true ) ) { + // Get upload directory. + if ( ( $uploads = wp_get_upload_dir() ) && false === $uploads['error'] ) { + // Check that the upload base exists in the file location. + if ( 0 === strpos( $file, $uploads['basedir'] ) ) { + // Replace file location with url location. + $url = str_replace($uploads['basedir'], $uploads['baseurl'], $file); + } elseif ( false !== strpos($file, 'wp-content/uploads') ) { + // Get the directory name relative to the basedir (back compat for pre-2.7 uploads) + $url = trailingslashit( $uploads['baseurl'] . '/' . _wp_get_attachment_relative_path( $file ) ) . basename( $file ); + } else { + // It's a newly-uploaded file, therefore $file is relative to the basedir. + $url = $uploads['baseurl'] . "/$file"; + } } } - if ( empty($url) ) //If any of the above options failed, Fallback on the GUID as used pre-2.7, not recommended to rely upon this. + /* + * If any of the above options failed, Fallback on the GUID as used pre-2.7, + * not recommended to rely upon this. + */ + if ( empty($url) ) { $url = get_the_guid( $post->ID ); + } + + // On SSL front end, URLs should be HTTPS. + if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $GLOBALS['pagenow'] ) { + $url = set_url_scheme( $url ); + } /** * Filter the attachment URL. @@ -4826,8 +5063,8 @@ function wp_get_attachment_url( $post_id = 0 ) { * * @since 2.1.0 * - * @param int $post_id Attachment ID. - * @return mixed False on failure. Thumbnail file path on success. + * @param int $post_id Optional. Attachment ID. Default 0. + * @return string|false False on failure. Thumbnail file path on success. */ function wp_get_attachment_thumb_file( $post_id = 0 ) { $post_id = (int) $post_id; @@ -4857,8 +5094,8 @@ function wp_get_attachment_thumb_file( $post_id = 0 ) { * * @since 2.1.0 * - * @param int $post_id Attachment ID - * @return string|bool False on failure. Thumbnail URL on success. + * @param int $post_id Optional. Attachment ID. Default 0. + * @return string|false False on failure. Thumbnail URL on success. */ function wp_get_attachment_thumb_url( $post_id = 0 ) { $post_id = (int) $post_id; @@ -4888,28 +5125,66 @@ function wp_get_attachment_thumb_url( $post_id = 0 ) { } /** - * Check if the attachment is an image. + * Verifies an attachment is of a given type. * - * @since 2.1.0 + * @since 4.2.0 * - * @param int $post_id Attachment ID - * @return bool + * @param string $type Attachment type. Accepts 'image', 'audio', or 'video'. + * @param int|WP_Post $post_id Optional. Attachment ID. Default 0. + * @return bool True if one of the accepted types, false otherwise. */ -function wp_attachment_is_image( $post_id = 0 ) { - $post_id = (int) $post_id; - if ( !$post = get_post( $post_id ) ) +function wp_attachment_is( $type, $post_id = 0 ) { + if ( ! $post = get_post( $post_id ) ) { return false; + } - if ( !$file = get_attached_file( $post->ID ) ) + if ( ! $file = get_attached_file( $post->ID ) ) { return false; + } - $ext = preg_match('/\.([^.]+)$/', $file, $matches) ? strtolower($matches[1]) : false; + if ( 0 === strpos( $post->post_mime_type, $type . '/' ) ) { + return true; + } - $image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' ); + $check = wp_check_filetype( $file ); + if ( empty( $check['ext'] ) ) { + return false; + } - if ( 'image/' == substr($post->post_mime_type, 0, 6) || $ext && 'import' == $post->post_mime_type && in_array($ext, $image_exts) ) - return true; - return false; + $ext = $check['ext']; + + if ( 'import' !== $post->post_mime_type ) { + return $type === $ext; + } + + switch ( $type ) { + case 'image': + $image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' ); + return in_array( $ext, $image_exts ); + + case 'audio': + return in_array( $ext, wp_get_audio_extensions() ); + + case 'video': + return in_array( $ext, wp_get_video_extensions() ); + + default: + return $type === $ext; + } +} + +/** + * Checks if the attachment is an image. + * + * @since 2.1.0 + * @since 4.2.0 Modified into wrapper for wp_attachment_is() and + * allowed WP_Post object to be passed. + * + * @param int|WP_Post $post Optional. Attachment ID. Default 0. + * @return bool Whether the attachment is an image. + */ +function wp_attachment_is_image( $post = 0 ) { + return wp_attachment_is( 'image', $post ); } /** @@ -4918,7 +5193,7 @@ function wp_attachment_is_image( $post_id = 0 ) { * @since 2.1.0 * * @param string|int $mime MIME type or attachment ID. - * @return string|bool + * @return string|false Icon, false otherwise. */ function wp_mime_type_icon( $mime = 0 ) { if ( !is_numeric($mime) ) @@ -4931,7 +5206,8 @@ function wp_mime_type_icon( $mime = 0 ) { $mime = (int) $mime; if ( $post = get_post( $mime ) ) { $post_id = (int) $post->ID; - $ext = preg_replace('/^.+?\.([^.]+)$/', '$1', $post->guid); + $file = get_attached_file( $post_id ); + $ext = preg_replace('/^.+?\.([^.]+)$/', '$1', $file); if ( !empty($ext) ) { $post_mimes[] = $ext; if ( $ext_type = wp_ext2type( $ext ) ) @@ -4997,7 +5273,8 @@ function wp_mime_type_icon( $mime = 0 ) { wp_cache_add( 'icon_files', $icon_files, 'default', 600 ); } - // Icon basename - extension = MIME wildcard + $types = array(); + // Icon basename - extension = MIME wildcard. foreach ( $icon_files as $file => $uri ) $types[ preg_replace('/^([^.]*).*$/', '$1', basename($file)) ] =& $icon_files[$file]; @@ -5011,11 +5288,16 @@ function wp_mime_type_icon( $mime = 0 ) { $matches['default'] = array('default'); foreach ( $matches as $match => $wilds ) { - if ( isset($types[$wilds[0]])) { - $icon = $types[$wilds[0]]; - if ( !is_numeric($mime) ) - wp_cache_add("mime_type_icon_$mime", $icon); - break; + foreach ( $wilds as $wild ) { + if ( ! isset( $types[ $wild ] ) ) { + continue; + } + + $icon = $types[ $wild ]; + if ( ! is_numeric( $mime ) ) { + wp_cache_add( "mime_type_icon_$mime", $icon ); + } + break 2; } } } @@ -5034,7 +5316,7 @@ function wp_mime_type_icon( $mime = 0 ) { } /** - * Checked for changed slugs for published post objects and save the old slug. + * Check for changed slugs for published post objects and save the old slug. * * The function is used when a post object of any type is updated, * by comparing the current and previous post objects. @@ -5048,29 +5330,32 @@ function wp_mime_type_icon( $mime = 0 ) { * * @since 2.1.0 * - * @param int $post_id Post ID. - * @param object $post The Post Object - * @param object $post_before The Previous Post Object - * @return int Same as $post_id + * @param int $post_id Post ID. + * @param WP_Post $post The Post Object + * @param WP_Post $post_before The Previous Post Object */ -function wp_check_for_changed_slugs($post_id, $post, $post_before) { - // dont bother if it hasnt changed - if ( $post->post_name == $post_before->post_name ) +function wp_check_for_changed_slugs( $post_id, $post, $post_before ) { + // Don't bother if it hasn't changed. + if ( $post->post_name == $post_before->post_name ) { return; + } - // we're only concerned with published, non-hierarchical objects - if ( $post->post_status != 'publish' || is_post_type_hierarchical( $post->post_type ) ) + // We're only concerned with published, non-hierarchical objects. + if ( ! ( 'publish' === $post->post_status || ( 'attachment' === get_post_type( $post ) && 'inherit' === $post->post_status ) ) || is_post_type_hierarchical( $post->post_type ) ) { return; + } - $old_slugs = (array) get_post_meta($post_id, '_wp_old_slug'); + $old_slugs = (array) get_post_meta( $post_id, '_wp_old_slug' ); - // if we haven't added this old slug before, add it now - if ( !empty( $post_before->post_name ) && !in_array($post_before->post_name, $old_slugs) ) - add_post_meta($post_id, '_wp_old_slug', $post_before->post_name); + // If we haven't added this old slug before, add it now. + if ( ! empty( $post_before->post_name ) && ! in_array( $post_before->post_name, $old_slugs ) ) { + add_post_meta( $post_id, '_wp_old_slug', $post_before->post_name ); + } - // if the new slug was used previously, delete it from the list - if ( in_array($post->post_name, $old_slugs) ) - delete_post_meta($post_id, '_wp_old_slug', $post->post_name); + // If the new slug was used previously, delete it from the list. + if ( in_array( $post->post_name, $old_slugs ) ) { + delete_post_meta( $post_id, '_wp_old_slug', $post->post_name ); + } } /** @@ -5082,8 +5367,9 @@ function wp_check_for_changed_slugs($post_id, $post, $post_before) { * published posts, and all private posts to which the user has access. * * @since 2.2.0 + * @since 4.3.0 Added the ability to pass an array to `$post_type`. * - * @param string $post_type currently only supports 'post' or 'page'. + * @param string|array $post_type Single post type or an array of post types. Currently only supports 'post' or 'page'. * @return string SQL code that can be added to a where clause. */ function get_private_posts_cap_sql( $post_type ) { @@ -5093,65 +5379,82 @@ function get_private_posts_cap_sql( $post_type ) { /** * Retrieve the post SQL based on capability, author, and type. * - * @see get_private_posts_cap_sql() for full description. - * * @since 3.0.0 - * @param string $post_type Post type. - * @param bool $full Optional. Returns a full WHERE statement instead of just an 'andalso' term. - * @param int $post_author Optional. Query posts having a single author ID. - * @param bool $public_only Optional. Only return public posts. Skips cap checks for $current_user. Default is false. + * @since 4.3.0 Introduced the ability to pass an array of post types to `$post_type`. + * + * @see get_private_posts_cap_sql() + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param array|string $post_type Single post type or an array of post types. + * @param bool $full Optional. Returns a full WHERE statement instead of just + * an 'andalso' term. Default true. + * @param int $post_author Optional. Query posts having a single author ID. Default null. + * @param bool $public_only Optional. Only return public posts. Skips cap checks for + * $current_user. Default false. * @return string SQL WHERE code that can be added to a query. */ function get_posts_by_author_sql( $post_type, $full = true, $post_author = null, $public_only = false ) { global $wpdb; - // Private posts - $post_type_obj = get_post_type_object( $post_type ); - if ( ! $post_type_obj ) - return $full ? 'WHERE 1 = 0' : ' 1 = 0 '; - - /** - * Filter the capability to read private posts for a custom post type - * when generating SQL for getting posts by author. - * - * @since 2.2.0 - * @deprecated 3.2.0 The hook transitioned from "somewhat useless" to "totally useless". - * - * @param string $cap Capability. - */ - if ( ! $cap = apply_filters( 'pub_priv_sql_capability', '' ) ) { - $cap = $post_type_obj->cap->read_private_posts; + if ( is_array( $post_type ) ) { + $post_types = $post_type; + } else { + $post_types = array( $post_type ); } - if ( $full ) { - if ( null === $post_author ) { - $sql = $wpdb->prepare( 'WHERE post_type = %s AND ', $post_type ); - } else { - $sql = $wpdb->prepare( 'WHERE post_author = %d AND post_type = %s AND ', $post_author, $post_type ); + $post_type_clauses = array(); + foreach ( $post_types as $post_type ) { + $post_type_obj = get_post_type_object( $post_type ); + if ( ! $post_type_obj ) { + continue; } - } else { - $sql = ''; - } - - $sql .= "(post_status = 'publish'"; - - // Only need to check the cap if $public_only is false - if ( false === $public_only ) { - if ( current_user_can( $cap ) ) { - // Does the user have the capability to view private posts? Guess so. - $sql .= " OR post_status = 'private'"; - } elseif ( is_user_logged_in() ) { - // Users can view their own private posts. - $id = get_current_user_id(); - if ( null === $post_author || ! $full ) { - $sql .= " OR post_status = 'private' AND post_author = $id"; - } elseif ( $id == (int) $post_author ) { - $sql .= " OR post_status = 'private'"; + + /** + * Filter the capability to read private posts for a custom post type + * when generating SQL for getting posts by author. + * + * @since 2.2.0 + * @deprecated 3.2.0 The hook transitioned from "somewhat useless" to "totally useless". + * + * @param string $cap Capability. + */ + if ( ! $cap = apply_filters( 'pub_priv_sql_capability', '' ) ) { + $cap = current_user_can( $post_type_obj->cap->read_private_posts ); + } + + // Only need to check the cap if $public_only is false. + $post_status_sql = "post_status = 'publish'"; + if ( false === $public_only ) { + if ( $cap ) { + // Does the user have the capability to view private posts? Guess so. + $post_status_sql .= " OR post_status = 'private'"; + } elseif ( is_user_logged_in() ) { + // Users can view their own private posts. + $id = get_current_user_id(); + if ( null === $post_author || ! $full ) { + $post_status_sql .= " OR post_status = 'private' AND post_author = $id"; + } elseif ( $id == (int) $post_author ) { + $post_status_sql .= " OR post_status = 'private'"; + } // else none } // else none - } // else none + } + + $post_type_clauses[] = "( post_type = '" . $post_type . "' AND ( $post_status_sql ) )"; + } + + if ( empty( $post_type_clauses ) ) { + return $full ? 'WHERE 1 = 0' : '1 = 0'; + } + + $sql = '( '. implode( ' OR ', $post_type_clauses ) . ' )'; + + if ( null !== $post_author ) { + $sql .= $wpdb->prepare( ' AND post_author = %d', $post_author ); } - $sql .= ')'; + if ( $full ) { + $sql = 'WHERE ' . $sql; + } return $sql; } @@ -5164,41 +5467,68 @@ function get_posts_by_author_sql( $post_type, $full = true, $post_author = null, * 'gmt' is when the last post was posted in GMT formatted date. * * @since 0.71 - * - * @param string $timezone The location to get the time. Can be 'gmt', 'blog', or 'server'. + * @since 4.4.0 The `$post_type` argument was added. + * + * @param string $timezone Optional. The timezone for the timestamp. Accepts 'server', 'blog', or 'gmt'. + * 'server' uses the server's internal timezone. + * 'blog' uses the `post_modified` field, which proxies to the timezone set for the site. + * 'gmt' uses the `post_modified_gmt` field. + * Default 'server'. + * @param string $post_type Optional. The post type to check. Default 'any'. * @return string The date of the last post. */ -function get_lastpostdate($timezone = 'server') { +function get_lastpostdate( $timezone = 'server', $post_type = 'any' ) { /** * Filter the date the last post was published. * * @since 2.3.0 * - * @param string $date Date the last post was published. Likely values are 'gmt', - * 'blog', or 'server'. + * @param string $date Date the last post was published. * @param string $timezone Location to use for getting the post published date. + * See {@see get_lastpostdate()} for accepted `$timezone` values. */ - return apply_filters( 'get_lastpostdate', _get_last_post_time( $timezone, 'date' ), $timezone ); + return apply_filters( 'get_lastpostdate', _get_last_post_time( $timezone, 'date', $post_type ), $timezone ); } /** - * Retrieve last post modified date depending on timezone. + * Get the timestamp of the last time any post was modified. * * The server timezone is the default and is the difference between GMT and * server time. The 'blog' value is just when the last post was modified. The * 'gmt' is when the last post was modified in GMT time. * * @since 1.2.0 + * @since 4.4.0 The `$post_type` argument was added. * - * @param string $timezone The location to get the time. Can be 'gmt', 'blog', or 'server'. - * @return string The date the post was last modified. + * @param string $timezone Optional. The timezone for the timestamp. See {@see get_lastpostdate()} + * for information on accepted values. + * Default 'server'. + * @param string $post_type Optional. The post type to check. Default 'any'. + * @return string The timestamp. */ -function get_lastpostmodified($timezone = 'server') { - $lastpostmodified = _get_last_post_time( $timezone, 'modified' ); +function get_lastpostmodified( $timezone = 'server', $post_type = 'any' ) { + /** + * Pre-filter the return value of get_lastpostmodified() before the query is run. + * + * @since 4.4.0 + * + * @param string $lastpostmodified Date the last post was modified. + * Returning anything other than false will short-circuit the function. + * @param string $timezone Location to use for getting the post modified date. + * See {@see get_lastpostdate()} for accepted `$timezone` values. + * @param string $post_type The post type to check. + */ + $lastpostmodified = apply_filters( 'pre_get_lastpostmodified', false, $timezone, $post_type ); + if ( false !== $lastpostmodified ) { + return $lastpostmodified; + } + + $lastpostmodified = _get_last_post_time( $timezone, 'modified', $post_type ); $lastpostdate = get_lastpostdate($timezone); - if ( $lastpostdate > $lastpostmodified ) + if ( $lastpostdate > $lastpostmodified ) { $lastpostmodified = $lastpostdate; + } /** * Filter the date the last post was modified. @@ -5207,38 +5537,50 @@ function get_lastpostmodified($timezone = 'server') { * * @param string $lastpostmodified Date the last post was modified. * @param string $timezone Location to use for getting the post modified date. + * See {@see get_lastpostdate()} for accepted `$timezone` values. */ return apply_filters( 'get_lastpostmodified', $lastpostmodified, $timezone ); } /** - * Retrieve latest post date data based on timezone. + * Get the timestamp of the last time any post was modified or published. * - * @access private * @since 3.1.0 + * @since 4.4.0 The `$post_type` argument was added. + * @access private * - * @param string $timezone The location to get the time. Can be 'gmt', 'blog', or 'server'. - * @param string $field Field to check. Can be 'date' or 'modified'. - * @return string The date. + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string $timezone The timezone for the timestamp. See get_lastpostdate(). + * for information on accepted values. + * @param string $field Post field to check. Accepts 'date' or 'modified'. + * @param string $post_type Optional. The post type to check. Default 'any'. + * @return string|false The timestamp. */ -function _get_last_post_time( $timezone, $field ) { +function _get_last_post_time( $timezone, $field, $post_type = 'any' ) { global $wpdb; - if ( !in_array( $field, array( 'date', 'modified' ) ) ) + if ( ! in_array( $field, array( 'date', 'modified' ) ) ) { return false; + } $timezone = strtolower( $timezone ); $key = "lastpost{$field}:$timezone"; + if ( 'any' !== $post_type ) { + $key .= ':' . sanitize_key( $post_type ); + } $date = wp_cache_get( $key, 'timeinfo' ); - if ( !$date ) { - $add_seconds_server = date('Z'); - - $post_types = get_post_types( array( 'public' => true ) ); - array_walk( $post_types, array( &$wpdb, 'escape_by_ref' ) ); - $post_types = "'" . implode( "', '", $post_types ) . "'"; + if ( ! $date ) { + if ( 'any' === $post_type ) { + $post_types = get_post_types( array( 'public' => true ) ); + array_walk( $post_types, array( $wpdb, 'escape_by_ref' ) ); + $post_types = "'" . implode( "', '", $post_types ) . "'"; + } else { + $post_types = "'" . sanitize_key( $post_type ) . "'"; + } switch ( $timezone ) { case 'gmt': @@ -5248,12 +5590,14 @@ function _get_last_post_time( $timezone, $field ) { $date = $wpdb->get_var("SELECT post_{$field} FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1"); break; case 'server': + $add_seconds_server = date( 'Z' ); $date = $wpdb->get_var("SELECT DATE_ADD(post_{$field}_gmt, INTERVAL '$add_seconds_server' SECOND) FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1"); break; } - if ( $date ) + if ( $date ) { wp_cache_set( $key, $date, 'timeinfo' ); + } } return $date; @@ -5264,7 +5608,7 @@ function _get_last_post_time( $timezone, $field ) { * * @since 1.5.1 * - * @param array $posts Array of post objects + * @param array $posts Array of post objects, passed by reference. */ function update_post_cache( &$posts ) { if ( ! $posts ) @@ -5285,10 +5629,12 @@ function update_post_cache( &$posts ) { * * @since 2.0.0 * + * @global bool $_wp_suspend_cache_invalidation + * * @param int|WP_Post $post Post ID or post object to remove from the cache. */ function clean_post_cache( $post ) { - global $_wp_suspend_cache_invalidation, $wpdb; + global $_wp_suspend_cache_invalidation; if ( ! empty( $_wp_suspend_cache_invalidation ) ) return; @@ -5314,9 +5660,6 @@ function clean_post_cache( $post ) { */ do_action( 'clean_post_cache', $post->ID, $post ); - if ( is_post_type_hierarchical( $post->post_type ) ) - wp_cache_delete( 'get_pages', 'posts' ); - if ( 'page' == $post->post_type ) { wp_cache_delete( 'all_page_ids', 'posts' ); @@ -5338,16 +5681,12 @@ function clean_post_cache( $post ) { * * @since 1.5.0 * - * @uses update_post_cache() - * @uses update_object_term_cache() - * @uses update_postmeta_cache() - * - * @param array $posts Array of Post objects - * @param string $post_type The post type of the posts in $posts. Default is 'post'. - * @param bool $update_term_cache Whether to update the term cache. Default is true. - * @param bool $update_meta_cache Whether to update the meta cache. Default is true. + * @param array $posts Array of Post objects + * @param string $post_type Optional. Post type. Default 'post'. + * @param bool $update_term_cache Optional. Whether to update the term cache. Default true. + * @param bool $update_meta_cache Optional. Whether to update the meta cache. Default true. */ -function update_post_caches(&$posts, $post_type = 'post', $update_term_cache = true, $update_meta_cache = true) { +function update_post_caches( &$posts, $post_type = 'post', $update_term_cache = true, $update_meta_cache = true ) { // No point in doing all this work if we didn't match any posts. if ( !$posts ) return; @@ -5365,9 +5704,11 @@ function update_post_caches(&$posts, $post_type = 'post', $update_term_cache = t if ( is_array($post_type) ) { $ptypes = $post_type; } elseif ( 'any' == $post_type ) { + $ptypes = array(); // Just use the post_types in the supplied posts. - foreach ( $posts as $post ) + foreach ( $posts as $post ) { $ptypes[] = $post->post_type; + } $ptypes = array_unique($ptypes); } else { $ptypes = array($post_type); @@ -5391,9 +5732,10 @@ function update_post_caches(&$posts, $post_type = 'post', $update_term_cache = t * @since 2.1.0 * * @param array $post_ids List of post IDs. - * @return bool|array Returns false if there is nothing to update or an array of metadata. + * @return array|false Returns false if there is nothing to update or an array + * of metadata. */ -function update_postmeta_cache($post_ids) { +function update_postmeta_cache( $post_ids ) { return update_meta_cache('post', $post_ids); } @@ -5403,15 +5745,16 @@ function update_postmeta_cache($post_ids) { * Cleaning means delete from the cache. Optionally will clean the term * object cache associated with the attachment ID. * - * This function will not run if $_wp_suspend_cache_invalidation is not empty. See - * wp_suspend_cache_invalidation(). + * This function will not run if $_wp_suspend_cache_invalidation is not empty. * * @since 3.0.0 * - * @param int $id The attachment ID in the cache to clean - * @param bool $clean_terms optional. Whether to clean terms cache + * @global bool $_wp_suspend_cache_invalidation + * + * @param int $id The attachment ID in the cache to clean. + * @param bool $clean_terms Optional. Whether to clean terms cache. Default false. */ -function clean_attachment_cache($id, $clean_terms = false) { +function clean_attachment_cache( $id, $clean_terms = false ) { global $_wp_suspend_cache_invalidation; if ( !empty($_wp_suspend_cache_invalidation) ) @@ -5444,18 +5787,19 @@ function clean_attachment_cache($id, $clean_terms = false) { * * @since 2.3.0 * @access private - * @uses $wpdb - * @uses wp_clear_scheduled_hook() with 'publish_future_post' and post ID. * - * @param string $new_status New post status - * @param string $old_status Previous post status - * @param object $post Object type containing the post information + * @see wp_clear_scheduled_hook() + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string $new_status New post status. + * @param string $old_status Previous post status. + * @param WP_Post $post Post object. */ -function _transition_post_status($new_status, $old_status, $post) { +function _transition_post_status( $new_status, $old_status, $post ) { global $wpdb; if ( $old_status != 'publish' && $new_status == 'publish' ) { - // Reset GUID if transitioning to publish and it is empty + // Reset GUID if transitioning to publish and it is empty. if ( '' == get_the_guid($post->ID) ) $wpdb->update( $wpdb->posts, array( 'guid' => get_permalink( $post->ID ) ), array( 'ID' => $post->ID ) ); @@ -5470,11 +5814,12 @@ function _transition_post_status($new_status, $old_status, $post) { do_action('private_to_published', $post->ID); } - // If published posts changed clear the lastpostmodified cache + // If published posts changed clear the lastpostmodified cache. if ( 'publish' == $new_status || 'publish' == $old_status) { foreach ( array( 'server', 'gmt', 'blog' ) as $timezone ) { wp_cache_delete( "lastpostmodified:$timezone", 'timeinfo' ); wp_cache_delete( "lastpostdate:$timezone", 'timeinfo' ); + wp_cache_delete( "lastpostdate:$timezone:{$post->post_type}", 'timeinfo' ); } } @@ -5495,10 +5840,11 @@ function _transition_post_status($new_status, $old_status, $post) { * @since 2.3.0 * @access private * - * @param int $deprecated Not used. Can be set to null. Never implemented. - * Not marked as deprecated with _deprecated_argument() as it conflicts with - * wp_transition_post_status() and the default filter for _future_post_hook(). - * @param object $post Object type containing the post information + * @param int $deprecated Not used. Can be set to null. Never implemented. Not marked + * as deprecated with _deprecated_argument() as it conflicts with + * wp_transition_post_status() and the default filter for + * {@see _future_post_hook()}. + * @param WP_Post $post Post object. */ function _future_post_hook( $deprecated, $post ) { wp_clear_scheduled_hook( 'publish_future_post', array( $post->ID ) ); @@ -5508,13 +5854,14 @@ function _future_post_hook( $deprecated, $post ) { /** * Hook to schedule pings and enclosures when a post is published. * + * Uses XMLRPC_REQUEST and WP_IMPORTING constants. + * * @since 2.3.0 * @access private - * @uses XMLRPC_REQUEST and WP_IMPORTING constants. * - * @param int $post_id The ID in the database table of the post being published + * @param int $post_id The ID in the database table of the post being published. */ -function _publish_post_hook($post_id) { +function _publish_post_hook( $post_id ) { if ( defined( 'XMLRPC_REQUEST' ) ) { /** * Fires when _publish_post_hook() is called during an XML-RPC request. @@ -5537,13 +5884,13 @@ function _publish_post_hook($post_id) { } /** - * Returns the post's parent's post_ID + * Return the post's parent's post_ID * * @since 3.1.0 * - * @param int $post_id + * @param int $post_ID * - * @return int|bool false on error + * @return int|false Post parent ID, otherwise false. */ function wp_get_post_parent_id( $post_ID ) { $post = get_post( $post_ID ); @@ -5553,38 +5900,37 @@ function wp_get_post_parent_id( $post_ID ) { } /** - * Checks the given subset of the post hierarchy for hierarchy loops. - * Prevents loops from forming and breaks those that it finds. + * Check the given subset of the post hierarchy for hierarchy loops. * - * Attached to the wp_insert_post_parent filter. + * Prevents loops from forming and breaks those that it finds. Attached + * to the 'wp_insert_post_parent' filter. * * @since 3.1.0 - * @uses wp_find_hierarchy_loop() * - * @param int $post_parent ID of the parent for the post we're checking. - * @param int $post_ID ID of the post we're checking. + * @see wp_find_hierarchy_loop() * - * @return int The new post_parent for the post. + * @param int $post_parent ID of the parent for the post we're checking. + * @param int $post_ID ID of the post we're checking. + * @return int The new post_parent for the post, 0 otherwise. */ function wp_check_post_hierarchy_for_loops( $post_parent, $post_ID ) { - // Nothing fancy here - bail + // Nothing fancy here - bail. if ( !$post_parent ) return 0; - // New post can't cause a loop + // New post can't cause a loop. if ( empty( $post_ID ) ) return $post_parent; - // Can't be its own parent + // Can't be its own parent. if ( $post_parent == $post_ID ) return 0; - // Now look for larger loops - + // Now look for larger loops. if ( !$loop = wp_find_hierarchy_loop( 'wp_get_post_parent_id', $post_ID, $post_parent ) ) return $post_parent; // No loop - // Setting $post_parent to the given value causes a loop + // Setting $post_parent to the given value causes a loop. if ( isset( $loop[$post_ID] ) ) return 0; @@ -5596,19 +5942,19 @@ function wp_check_post_hierarchy_for_loops( $post_parent, $post_ID ) { } /** - * Sets a post thumbnail. + * Set a post thumbnail. * * @since 3.1.0 * - * @param int|WP_Post $post Post ID or post object where thumbnail should be attached. - * @param int $thumbnail_id Thumbnail to attach. - * @return bool True on success, false on failure. + * @param int|WP_Post $post Post ID or post object where thumbnail should be attached. + * @param int $thumbnail_id Thumbnail to attach. + * @return int|bool True on success, false on failure. */ function set_post_thumbnail( $post, $thumbnail_id ) { $post = get_post( $post ); $thumbnail_id = absint( $thumbnail_id ); if ( $post && $thumbnail_id && get_post( $thumbnail_id ) ) { - if ( $thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'thumbnail' ) ) + if ( wp_get_attachment_image( $thumbnail_id, 'thumbnail' ) ) return update_post_meta( $post->ID, '_thumbnail_id', $thumbnail_id ); else return delete_post_meta( $post->ID, '_thumbnail_id' ); @@ -5617,7 +5963,7 @@ function set_post_thumbnail( $post, $thumbnail_id ) { } /** - * Removes a post thumbnail. + * Remove a post thumbnail. * * @since 3.3.0 * @@ -5632,27 +5978,72 @@ function delete_post_thumbnail( $post ) { } /** - * Deletes auto-drafts for new posts that are > 7 days old + * Delete auto-drafts for new posts that are > 7 days old. * * @since 3.4.0 + * + * @global wpdb $wpdb WordPress database abstraction object. */ function wp_delete_auto_drafts() { global $wpdb; - // Cleanup old auto-drafts more than 7 days old + // Cleanup old auto-drafts more than 7 days old. $old_posts = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_status = 'auto-draft' AND DATE_SUB( NOW(), INTERVAL 7 DAY ) > post_date" ); - foreach ( (array) $old_posts as $delete ) - wp_delete_post( $delete, true ); // Force delete + foreach ( (array) $old_posts as $delete ) { + // Force delete. + wp_delete_post( $delete, true ); + } } /** - * Update the custom taxonomies' term counts when a post's status is changed. For example, default posts term counts (for custom taxonomies) don't include private / draft posts. + * Queues posts for lazy-loading of term meta. + * + * @since 4.5.0 + * + * @param array $posts Array of WP_Post objects. + */ +function wp_queue_posts_for_term_meta_lazyload( $posts ) { + $post_type_taxonomies = $term_ids = array(); + foreach ( $posts as $post ) { + if ( ! ( $post instanceof WP_Post ) ) { + continue; + } + + if ( ! isset( $post_type_taxonomies[ $post->post_type ] ) ) { + $post_type_taxonomies[ $post->post_type ] = get_object_taxonomies( $post->post_type ); + } + + foreach ( $post_type_taxonomies[ $post->post_type ] as $taxonomy ) { + // Term cache should already be primed by `update_post_term_cache()`. + $terms = get_object_term_cache( $post->ID, $taxonomy ); + if ( false !== $terms ) { + foreach ( $terms as $term ) { + if ( ! isset( $term_ids[ $term->term_id ] ) ) { + $term_ids[] = $term->term_id; + } + } + } + } + } + + if ( $term_ids ) { + $lazyloader = wp_metadata_lazyloader(); + $lazyloader->queue_objects( 'term', $term_ids ); + } +} + +/** + * Update the custom taxonomies' term counts when a post's status is changed. + * + * For example, default posts term counts (for custom taxonomies) don't include + * private / draft posts. * - * @access private - * @param string $new_status - * @param string $old_status - * @param object $post * @since 3.3.0 + * @access private + * + * @param string $new_status New post status. + * @param string $old_status Old post status. + * @param WP_Post $post Post object. */ function _update_term_count_on_transition_post_status( $new_status, $old_status, $post ) { // Update counts for the post's terms. @@ -5666,12 +6057,15 @@ function _update_term_count_on_transition_post_status( $new_status, $old_status, * Adds any posts from the given ids to the cache that do not already exist in cache * * @since 3.4.0 - * * @access private * - * @param array $post_ids ID list - * @param bool $update_term_cache Whether to update the term cache. Default is true. - * @param bool $update_meta_cache Whether to update the meta cache. Default is true. + * @see update_post_caches() + * + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param array $ids ID list. + * @param bool $update_term_cache Optional. Whether to update the term cache. Default true. + * @param bool $update_meta_cache Optional. Whether to update the meta cache. Default true. */ function _prime_post_caches( $ids, $update_term_cache = true, $update_meta_cache = true ) { global $wpdb; @@ -5683,3 +6077,61 @@ function _prime_post_caches( $ids, $update_term_cache = true, $update_meta_cache update_post_caches( $fresh_posts, 'any', $update_term_cache, $update_meta_cache ); } } + +/** + * Adds a suffix if any trashed posts have a given slug. + * + * Store its desired (i.e. current) slug so it can try to reclaim it + * if the post is untrashed. + * + * For internal use. + * + * @since 4.5.0 + * @access private + * + * @param string $post_name Slug. + * @param string $post_ID Optional. Post ID that should be ignored. Default 0. + */ +function wp_add_trashed_suffix_to_post_name_for_trashed_posts( $post_name, $post_ID = 0 ) { + $trashed_posts_with_desired_slug = get_posts( array( + 'name' => $post_name, + 'post_status' => 'trash', + 'post_type' => 'any', + 'nopaging' => true, + 'post__not_in' => array( $post_ID ) + ) ); + + if ( ! empty( $trashed_posts_with_desired_slug ) ) { + foreach ( $trashed_posts_with_desired_slug as $_post ) { + wp_add_trashed_suffix_to_post_name_for_post( $_post ); + } + } +} + +/** + * Adds a trashed suffix For a given post. + * + * Store its desired (i.e. current) slug so it can try to reclaim it + * if the post is untrashed. + * + * For internal use. + * + * @since 4.5.0 + * @access private + * + * @param WP_Post $post The post. + */ +function wp_add_trashed_suffix_to_post_name_for_post( $post ) { + global $wpdb; + + $post = get_post( $post ); + + if ( '__trashed' === substr( $post->post_name, -9 ) ) { + return $post->post_name; + } + add_post_meta( $post->ID, '_wp_desired_post_slug', $post->post_name ); + $post_name = _truncate_post_slug( $post->post_name, 191 ) . '__trashed'; + $wpdb->update( $wpdb->posts, array( 'post_name' => $post_name ), array( 'ID' => $post->ID ) ); + clean_post_cache( $post->ID ); + return $post_name; +} diff --git a/wp-includes/query.php b/wp-includes/query.php index fcaac10..988787a 100644 --- a/wp-includes/query.php +++ b/wp-includes/query.php @@ -5,7 +5,7 @@ * The query API attempts to get which part of WordPress the user is on. It * also provides functionality for getting URL query information. * - * @link http://codex.wordpress.org/The_Loop More information on The Loop. + * @link https://codex.wordpress.org/The_Loop More information on The Loop. * * @package WordPress * @subpackage Query @@ -14,29 +14,31 @@ /** * Retrieve variable in the WP_Query class. * - * @see WP_Query::get() * @since 1.5.0 - * @uses $wp_query + * @since 3.9.0 The `$default` argument was introduced. + * + * @global WP_Query $wp_query Global WP_Query instance. * * @param string $var The variable key to retrieve. - * @param mixed $default Value to return if the query variable is not set. Default ''. - * @return mixed + * @param mixed $default Optional. Value to return if the query variable is not set. Default empty. + * @return mixed Contents of the query variable. */ function get_query_var( $var, $default = '' ) { global $wp_query; - return $wp_query->get( $var, $default ); } /** - * Retrieve the currently-queried object. Wrapper for $wp_query->get_queried_object() + * Retrieve the currently-queried object. * - * @uses WP_Query::get_queried_object + * Wrapper for WP_Query::get_queried_object(). * * @since 3.1.0 * @access public * - * @return object + * @global WP_Query $wp_query Global WP_Query instance. + * + * @return object Queried object. */ function get_queried_object() { global $wp_query; @@ -44,14 +46,15 @@ function get_queried_object() { } /** - * Retrieve ID of the current queried object. Wrapper for $wp_query->get_queried_object_id() + * Retrieve ID of the current queried object. * - * @uses WP_Query::get_queried_object_id() + * Wrapper for WP_Query::get_queried_object_id(). * * @since 3.1.0 - * @access public * - * @return int + * @global WP_Query $wp_query Global WP_Query instance. + * + * @return int ID of the queried object. */ function get_queried_object_id() { global $wp_query; @@ -61,18 +64,16 @@ function get_queried_object_id() { /** * Set query variable. * - * @see WP_Query::set() * @since 2.2.0 - * @uses $wp_query * - * @param string $var Query variable key. - * @param mixed $value - * @return null + * @global WP_Query $wp_query Global WP_Query instance. + * + * @param string $var Query variable key. + * @param mixed $value Query variable value. */ -function set_query_var($var, $value) { +function set_query_var( $var, $value ) { global $wp_query; - - return $wp_query->set($var, $value); + $wp_query->set( $var, $value ); } /** @@ -82,7 +83,8 @@ function set_query_var($var, $value) { * once. This must not be used within the WordPress Loop. * * @since 1.5.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. * * @param string $query * @return array List of posts @@ -100,7 +102,9 @@ function query_posts($query) { * wp_query object is not destroyed properly before another is set up. * * @since 2.3.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. + * @global WP_Query $wp_the_query Copy of the global WP_Query instance created during wp_reset_query(). */ function wp_reset_query() { $GLOBALS['wp_query'] = $GLOBALS['wp_the_query']; @@ -112,7 +116,8 @@ function wp_reset_query() { * the $post global to the current post in the main query. * * @since 3.0.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. */ function wp_reset_postdata() { global $wp_query; @@ -131,9 +136,9 @@ function wp_reset_postdata() { * * Month, Year, Category, Author, Post Type archive... * - * @see WP_Query::is_archive() * @since 1.5.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. * * @return bool */ @@ -151,11 +156,11 @@ function is_archive() { /** * Is the query for an existing post type archive page? * - * @see WP_Query::is_post_type_archive() * @since 3.1.0 - * @uses $wp_query * - * @param mixed $post_types Optional. Post type or array of posts types to check against. + * @global WP_Query $wp_query Global WP_Query instance. + * + * @param string|array $post_types Optional. Post type or array of posts types to check against. * @return bool */ function is_post_type_archive( $post_types = '' ) { @@ -172,11 +177,11 @@ function is_post_type_archive( $post_types = '' ) { /** * Is the query for an existing attachment page? * - * @see WP_Query::is_attachment() * @since 2.0.0 - * @uses $wp_query * - * @param mixed $attachment Attachment ID, title, slug, or array of such. + * @global WP_Query $wp_query Global WP_Query instance. + * + * @param int|string|array|object $attachment Attachment ID, title, slug, or array of such. * @return bool */ function is_attachment( $attachment = '' ) { @@ -196,9 +201,9 @@ function is_attachment( $attachment = '' ) { * If the $author parameter is specified, this function will additionally * check if the query is for one of the authors specified. * - * @see WP_Query::is_author() * @since 1.5.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. * * @param mixed $author Optional. User ID, nickname, nicename, or array of User IDs, nicknames, and nicenames * @return bool @@ -220,9 +225,9 @@ function is_author( $author = '' ) { * If the $category parameter is specified, this function will additionally * check if the query is for one of the categories specified. * - * @see WP_Query::is_category() * @since 1.5.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. * * @param mixed $category Optional. Category ID, name, slug, or array of Category IDs, names, and slugs. * @return bool @@ -244,9 +249,9 @@ function is_category( $category = '' ) { * If the $tag parameter is specified, this function will additionally * check if the query is for one of the tags specified. * - * @see WP_Query::is_tag() * @since 2.3.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. * * @param mixed $tag Optional. Tag ID, name, slug, or array of Tag IDs, names, and slugs. * @return bool @@ -272,12 +277,12 @@ function is_tag( $tag = '' ) { * this function will additionally check if the query is for one of the terms * specified. * - * @see WP_Query::is_tax() * @since 2.5.0 - * @uses $wp_query * - * @param mixed $taxonomy Optional. Taxonomy slug or slugs. - * @param mixed $term Optional. Term ID, name, slug or array of Term IDs, names, and slugs. + * @global WP_Query $wp_query Global WP_Query instance. + * + * @param string|array $taxonomy Optional. Taxonomy slug or slugs. + * @param int|string|array $term Optional. Term ID, name, slug or array of Term IDs, names, and slugs. * @return bool */ function is_tax( $taxonomy = '', $term = '' ) { @@ -291,32 +296,12 @@ function is_tax( $taxonomy = '', $term = '' ) { return $wp_query->is_tax( $taxonomy, $term ); } -/** - * Whether the current URL is within the comments popup window. - * - * @see WP_Query::is_comments_popup() - * @since 1.5.0 - * @uses $wp_query - * - * @return bool - */ -function is_comments_popup() { - global $wp_query; - - if ( ! isset( $wp_query ) ) { - _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' ); - return false; - } - - return $wp_query->is_comments_popup(); -} - /** * Is the query for an existing date archive? * - * @see WP_Query::is_date() * @since 1.5.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. * * @return bool */ @@ -334,9 +319,9 @@ function is_date() { /** * Is the query for an existing day archive? * - * @see WP_Query::is_day() * @since 1.5.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. * * @return bool */ @@ -354,9 +339,9 @@ function is_day() { /** * Is the query for a feed? * - * @see WP_Query::is_feed() * @since 1.5.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. * * @param string|array $feeds Optional feed types to check. * @return bool @@ -375,9 +360,9 @@ function is_feed( $feeds = '' ) { /** * Is the query for a comments feed? * - * @see WP_Query::is_comments_feed() * @since 3.0.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. * * @return bool */ @@ -404,10 +389,9 @@ function is_comment_feed() { * * Otherwise the same as @see is_home() * - * @see WP_Query::is_front_page() * @since 2.5.0 - * @uses is_home() - * @uses get_option() + * + * @global WP_Query $wp_query Global WP_Query instance. * * @return bool True, if front of site. */ @@ -434,9 +418,9 @@ function is_front_page() { * * @see is_front_page() * - * @see WP_Query::is_home() * @since 1.5.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. * * @return bool True if blog view homepage. */ @@ -454,9 +438,9 @@ function is_home() { /** * Is the query for an existing month archive? * - * @see WP_Query::is_month() * @since 1.5.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. * * @return bool */ @@ -480,12 +464,12 @@ function is_month() { * @see is_single() * @see is_singular() * - * @see WP_Query::is_page() * @since 1.5.0 - * @uses $wp_query * - * @param mixed $page Page ID, title, slug, or array of such. - * @return bool + * @global WP_Query $wp_query Global WP_Query instance. + * + * @param int|string|array $page Optional. Page ID, title, slug, or array of such. Default empty. + * @return bool Whether the query is for an existing single page. */ function is_page( $page = '' ) { global $wp_query; @@ -501,9 +485,9 @@ function is_page( $page = '' ) { /** * Is the query for paged result and not for the first page? * - * @see WP_Query::is_paged() * @since 1.5.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. * * @return bool */ @@ -521,9 +505,9 @@ function is_paged() { /** * Is the query for a post or page preview? * - * @see WP_Query::is_preview() * @since 2.0.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. * * @return bool */ @@ -541,9 +525,9 @@ function is_preview() { /** * Is the query for the robots file? * - * @see WP_Query::is_robots() * @since 2.1.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. * * @return bool */ @@ -561,9 +545,9 @@ function is_robots() { /** * Is the query for a search? * - * @see WP_Query::is_search() * @since 1.5.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. * * @return bool */ @@ -589,12 +573,12 @@ function is_search() { * @see is_page() * @see is_singular() * - * @see WP_Query::is_single() * @since 1.5.0 - * @uses $wp_query * - * @param mixed $post Post ID, title, slug, or array of such. - * @return bool + * @global WP_Query $wp_query Global WP_Query instance. + * + * @param int|string|array $post Optional. Post ID, title, slug, or array of such. Default empty. + * @return bool Whether the query is for an existing single post. */ function is_single( $post = '' ) { global $wp_query; @@ -616,12 +600,12 @@ function is_single( $post = '' ) { * @see is_page() * @see is_single() * - * @see WP_Query::is_singular() * @since 1.5.0 - * @uses $wp_query * - * @param mixed $post_types Optional. Post Type or array of Post Types - * @return bool + * @global WP_Query $wp_query Global WP_Query instance. + * + * @param string|array $post_types Optional. Post type or array of post types. Default empty. + * @return bool Whether the query is for an existing single post of any of the given post types. */ function is_singular( $post_types = '' ) { global $wp_query; @@ -637,9 +621,9 @@ function is_singular( $post_types = '' ) { /** * Is the query for a specific time? * - * @see WP_Query::is_time() * @since 1.5.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. * * @return bool */ @@ -657,9 +641,9 @@ function is_time() { /** * Is the query for a trackback endpoint call? * - * @see WP_Query::is_trackback() * @since 1.5.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. * * @return bool */ @@ -677,9 +661,9 @@ function is_trackback() { /** * Is the query for an existing year archive? * - * @see WP_Query::is_year() * @since 1.5.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. * * @return bool */ @@ -697,9 +681,9 @@ function is_year() { /** * Is the query a 404 (returns no results)? * - * @see WP_Query::is_404() * @since 1.5.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. * * @return bool */ @@ -714,17 +698,45 @@ function is_404() { return $wp_query->is_404(); } +/** + * Is the query for an embedded post? + * + * @since 4.4.0 + * + * @global WP_Query $wp_query Global WP_Query instance. + * + * @return bool Whether we're in an embedded post or not. + */ +function is_embed() { + global $wp_query; + + if ( ! isset( $wp_query ) ) { + _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' ); + return false; + } + + return $wp_query->is_embed(); +} + /** * Is the query the main query? * * @since 3.3.0 * + * @global WP_Query $wp_query Global WP_Query instance. + * * @return bool */ function is_main_query() { if ( 'pre_get_posts' === current_filter() ) { - $message = sprintf( __( 'In <code>%1$s</code>, use the <code>%2$s</code> method, not the <code>%3$s</code> function. See %4$s.' ), - 'pre_get_posts', 'WP_Query::is_main_query()', 'is_main_query()', __( 'http://codex.wordpress.org/Function_Reference/is_main_query' ) ); + $message = sprintf( + /* translators: 1: pre_get_posts 2: WP_Query->is_main_query() 3: is_main_query() 4: link to codex is_main_query() page. */ + __( 'In %1$s, use the %2$s method, not the %3$s function. See %4$s.' ), + '<code>pre_get_posts</code>', + '<code>WP_Query->is_main_query()</code>', + '<code>is_main_query()</code>', + __( 'https://codex.wordpress.org/Function_Reference/is_main_query' ) + ); _doing_it_wrong( __FUNCTION__, $message, '3.7' ); } @@ -739,15 +751,14 @@ function is_main_query() { /** * Whether current WordPress query has results to loop over. * - * @see WP_Query::have_posts() * @since 1.5.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. * * @return bool */ function have_posts() { global $wp_query; - return $wp_query->have_posts(); } @@ -755,41 +766,37 @@ function have_posts() { * Whether the caller is in the Loop. * * @since 2.0.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. * * @return bool True if caller is within loop, false if loop hasn't started or ended. */ function in_the_loop() { global $wp_query; - return $wp_query->in_the_loop; } /** * Rewind the loop posts. * - * @see WP_Query::rewind_posts() * @since 1.5.0 - * @uses $wp_query * - * @return null + * @global WP_Query $wp_query Global WP_Query instance. */ function rewind_posts() { global $wp_query; - - return $wp_query->rewind_posts(); + $wp_query->rewind_posts(); } /** * Iterate the post index in the loop. * - * @see WP_Query::the_post() * @since 1.5.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. */ function the_post() { global $wp_query; - $wp_query->the_post(); } @@ -800,9 +807,9 @@ function the_post() { /** * Whether there are comments to loop over. * - * @see WP_Query::have_comments() * @since 2.2.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. * * @return bool */ @@ -814,9 +821,9 @@ function have_comments() { /** * Iterate comment index in the comment loop. * - * @see WP_Query::the_comment() * @since 2.2.0 - * @uses $wp_query + * + * @global WP_Query $wp_query Global WP_Query instance. * * @return object */ @@ -832,9 +839,10 @@ function the_comment() { /** * The WordPress Query class. * - * @link http://codex.wordpress.org/Function_Reference/WP_Query Codex page. + * @link https://codex.wordpress.org/Function_Reference/WP_Query Codex page. * * @since 1.5.0 + * @since 4.5.0 Removed the `$comments_popup` property. */ class WP_Query { @@ -845,7 +853,7 @@ class WP_Query { * @access public * @var array */ - var $query; + public $query; /** * Query vars, after parsing @@ -854,7 +862,7 @@ class WP_Query { * @access public * @var array */ - var $query_vars = array(); + public $query_vars = array(); /** * Taxonomy query, as passed to get_tax_sql() @@ -863,7 +871,7 @@ class WP_Query { * @access public * @var object WP_Tax_Query */ - var $tax_query; + public $tax_query; /** * Metadata query container @@ -872,7 +880,7 @@ class WP_Query { * @access public * @var object WP_Meta_Query */ - var $meta_query = false; + public $meta_query = false; /** * Date query container @@ -881,7 +889,7 @@ class WP_Query { * @access public * @var object WP_Date_Query */ - var $date_query = false; + public $date_query = false; /** * Holds the data for a single object that is queried. @@ -892,7 +900,7 @@ class WP_Query { * @access public * @var object|array */ - var $queried_object; + public $queried_object; /** * The ID of the queried object. @@ -901,7 +909,7 @@ class WP_Query { * @access public * @var int */ - var $queried_object_id; + public $queried_object_id; /** * Get post database query. @@ -910,7 +918,7 @@ class WP_Query { * @access public * @var string */ - var $request; + public $request; /** * List of posts. @@ -919,7 +927,7 @@ class WP_Query { * @access public * @var array */ - var $posts; + public $posts; /** * The amount of posts for the current query. @@ -928,7 +936,7 @@ class WP_Query { * @access public * @var int */ - var $post_count = 0; + public $post_count = 0; /** * Index of the current item in the loop. @@ -937,7 +945,7 @@ class WP_Query { * @access public * @var int */ - var $current_post = -1; + public $current_post = -1; /** * Whether the loop has started and the caller is in the loop. @@ -946,7 +954,7 @@ class WP_Query { * @access public * @var bool */ - var $in_the_loop = false; + public $in_the_loop = false; /** * The current post. @@ -955,7 +963,7 @@ class WP_Query { * @access public * @var WP_Post */ - var $post; + public $post; /** * The list of comments for current post. @@ -964,7 +972,7 @@ class WP_Query { * @access public * @var array */ - var $comments; + public $comments; /** * The amount of comments for the posts. @@ -973,7 +981,7 @@ class WP_Query { * @access public * @var int */ - var $comment_count = 0; + public $comment_count = 0; /** * The index of the comment in the comment loop. @@ -982,7 +990,7 @@ class WP_Query { * @access public * @var int */ - var $current_comment = -1; + public $current_comment = -1; /** * Current comment ID. @@ -991,7 +999,7 @@ class WP_Query { * @access public * @var int */ - var $comment; + public $comment; /** * The amount of found posts for the current query. @@ -1002,7 +1010,7 @@ class WP_Query { * @access public * @var int */ - var $found_posts = 0; + public $found_posts = 0; /** * The amount of pages. @@ -1011,7 +1019,7 @@ class WP_Query { * @access public * @var int */ - var $max_num_pages = 0; + public $max_num_pages = 0; /** * The amount of comment pages. @@ -1020,7 +1028,7 @@ class WP_Query { * @access public * @var int */ - var $max_num_comment_pages = 0; + public $max_num_comment_pages = 0; /** * Set if query is single post. @@ -1029,7 +1037,7 @@ class WP_Query { * @access public * @var bool */ - var $is_single = false; + public $is_single = false; /** * Set if query is preview of blog. @@ -1038,7 +1046,7 @@ class WP_Query { * @access public * @var bool */ - var $is_preview = false; + public $is_preview = false; /** * Set if query returns a page. @@ -1047,7 +1055,7 @@ class WP_Query { * @access public * @var bool */ - var $is_page = false; + public $is_page = false; /** * Set if query is an archive list. @@ -1056,7 +1064,7 @@ class WP_Query { * @access public * @var bool */ - var $is_archive = false; + public $is_archive = false; /** * Set if query is part of a date. @@ -1065,7 +1073,7 @@ class WP_Query { * @access public * @var bool */ - var $is_date = false; + public $is_date = false; /** * Set if query contains a year. @@ -1074,7 +1082,7 @@ class WP_Query { * @access public * @var bool */ - var $is_year = false; + public $is_year = false; /** * Set if query contains a month. @@ -1083,7 +1091,7 @@ class WP_Query { * @access public * @var bool */ - var $is_month = false; + public $is_month = false; /** * Set if query contains a day. @@ -1092,7 +1100,7 @@ class WP_Query { * @access public * @var bool */ - var $is_day = false; + public $is_day = false; /** * Set if query contains time. @@ -1101,7 +1109,7 @@ class WP_Query { * @access public * @var bool */ - var $is_time = false; + public $is_time = false; /** * Set if query contains an author. @@ -1110,7 +1118,7 @@ class WP_Query { * @access public * @var bool */ - var $is_author = false; + public $is_author = false; /** * Set if query contains category. @@ -1119,7 +1127,7 @@ class WP_Query { * @access public * @var bool */ - var $is_category = false; + public $is_category = false; /** * Set if query contains tag. @@ -1128,7 +1136,7 @@ class WP_Query { * @access public * @var bool */ - var $is_tag = false; + public $is_tag = false; /** * Set if query contains taxonomy. @@ -1137,7 +1145,7 @@ class WP_Query { * @access public * @var bool */ - var $is_tax = false; + public $is_tax = false; /** * Set if query was part of a search result. @@ -1146,7 +1154,7 @@ class WP_Query { * @access public * @var bool */ - var $is_search = false; + public $is_search = false; /** * Set if query is feed display. @@ -1155,7 +1163,7 @@ class WP_Query { * @access public * @var bool */ - var $is_feed = false; + public $is_feed = false; /** * Set if query is comment feed display. @@ -1164,7 +1172,7 @@ class WP_Query { * @access public * @var bool */ - var $is_comment_feed = false; + public $is_comment_feed = false; /** * Set if query is trackback. @@ -1173,7 +1181,7 @@ class WP_Query { * @access public * @var bool */ - var $is_trackback = false; + public $is_trackback = false; /** * Set if query is blog homepage. @@ -1182,7 +1190,7 @@ class WP_Query { * @access public * @var bool */ - var $is_home = false; + public $is_home = false; /** * Set if query couldn't found anything. @@ -1191,16 +1199,16 @@ class WP_Query { * @access public * @var bool */ - var $is_404 = false; + public $is_404 = false; /** - * Set if query is within comments popup window. + * Set if query is embed. * - * @since 1.5.0 + * @since 4.4.0 * @access public * @var bool */ - var $is_comments_popup = false; + public $is_embed = false; /** * Set if query is paged @@ -1209,7 +1217,7 @@ class WP_Query { * @access public * @var bool */ - var $is_paged = false; + public $is_paged = false; /** * Set if query is part of administration page. @@ -1218,7 +1226,7 @@ class WP_Query { * @access public * @var bool */ - var $is_admin = false; + public $is_admin = false; /** * Set if query is an attachment. @@ -1227,7 +1235,7 @@ class WP_Query { * @access public * @var bool */ - var $is_attachment = false; + public $is_attachment = false; /** * Set if is single, is a page, or is an attachment. @@ -1236,7 +1244,7 @@ class WP_Query { * @access public * @var bool */ - var $is_singular = false; + public $is_singular = false; /** * Set if query is for robots. @@ -1245,7 +1253,7 @@ class WP_Query { * @access public * @var bool */ - var $is_robots = false; + public $is_robots = false; /** * Set if query contains posts. @@ -1256,7 +1264,7 @@ class WP_Query { * @access public * @var bool */ - var $is_posts_page = false; + public $is_posts_page = false; /** * Set if query is for a post type archive. @@ -1265,7 +1273,7 @@ class WP_Query { * @access public * @var bool */ - var $is_post_type_archive = false; + public $is_post_type_archive = false; /** * Stores the ->query_vars state like md5(serialize( $this->query_vars ) ) so we know @@ -1273,8 +1281,9 @@ class WP_Query { * * @since 3.1.0 * @access private + * @var bool|string */ - var $query_vars_hash = false; + private $query_vars_hash = false; /** * Whether query vars have changed since the initial parse_query() call. Used to catch modifications to query vars made @@ -1283,7 +1292,7 @@ class WP_Query { * @since 3.1.1 * @access private */ - var $query_vars_changed = true; + private $query_vars_changed = true; /** * Set if post thumbnails are cached @@ -1292,7 +1301,7 @@ class WP_Query { * @access public * @var bool */ - var $thumbnails_cached = false; + public $thumbnails_cached = false; /** * Cached list of search stopwords. @@ -1302,6 +1311,10 @@ class WP_Query { */ private $stopwords; + private $compat_fields = array( 'query_vars_hash', 'query_vars_changed' ); + + private $compat_methods = array( 'init_query_flags', 'parse_tax_query' ); + /** * Resets query flags to false. * @@ -1310,7 +1323,7 @@ class WP_Query { * @since 2.0.0 * @access private */ - function init_query_flags() { + private function init_query_flags() { $this->is_single = false; $this->is_preview = false; $this->is_page = false; @@ -1330,7 +1343,6 @@ class WP_Query { $this->is_trackback = false; $this->is_home = false; $this->is_404 = false; - $this->is_comments_popup = false; $this->is_paged = false; $this->is_admin = false; $this->is_attachment = false; @@ -1346,7 +1358,7 @@ class WP_Query { * @since 1.5.0 * @access public */ - function init() { + public function init() { unset($this->posts); unset($this->query); $this->query_vars = array(); @@ -1374,7 +1386,7 @@ class WP_Query { * @since 1.5.0 * @access public */ - function parse_query_vars() { + public function parse_query_vars() { $this->parse_query(); } @@ -1382,12 +1394,13 @@ class WP_Query { * Fills in the query variables, which do not exist within the parameter. * * @since 2.1.0 + * @since 4.4.0 Removed the `comments_popup` public query variable. * @access public * * @param array $array Defined query variables. * @return array Complete query variables with undefined ones filled in empty. */ - function fill_query_vars($array) { + public function fill_query_vars($array) { $keys = array( 'error' , 'm' @@ -1417,14 +1430,15 @@ class WP_Query { , 'feed' , 'tb' , 'paged' - , 'comments_popup' , 'meta_key' , 'meta_value' , 'preview' , 's' , 'sentence' + , 'title' , 'fields' , 'menu_order' + , 'embed' ); foreach ( $keys as $key ) { @@ -1432,7 +1446,7 @@ class WP_Query { $array[$key] = ''; } - $array_keys = array( 'category__in', 'category__not_in', 'category__and', 'post__in', 'post__not_in', + $array_keys = array( 'category__in', 'category__not_in', 'category__and', 'post__in', 'post__not_in', 'post_name__in', 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'post_parent__in', 'post_parent__not_in', 'author__in', 'author__not_in' ); @@ -1447,11 +1461,116 @@ class WP_Query { * Parse a query string and set query type booleans. * * @since 1.5.0 + * @since 4.2.0 Introduced the ability to order by specific clauses of a `$meta_query`, by passing the clause's + * array key to `$orderby`. + * @since 4.4.0 Introduced `$post_name__in` and `$title` parameters. `$s` was updated to support excluded + * search terms, by prepending a hyphen. + * @since 4.5.0 Removed the `$comments_popup` parameter. + * Introduced the `$comment_status` and `$ping_status` parameters. + * Introduced `RAND(x)` syntax for `$orderby`, which allows an integer seed value to random sorts. * @access public * - * @param string|array $query Optional query. + * @param string|array $query { + * Optional. Array or string of Query parameters. + * + * @type int $attachment_id Attachment post ID. Used for 'attachment' post_type. + * @type int|string $author Author ID, or comma-separated list of IDs. + * @type string $author_name User 'user_nicename'. + * @type array $author__in An array of author IDs to query from. + * @type array $author__not_in An array of author IDs not to query from. + * @type bool $cache_results Whether to cache post information. Default true. + * @type int|string $cat Category ID or comma-separated list of IDs (this or any children). + * @type array $category__and An array of category IDs (AND in). + * @type array $category__in An array of category IDs (OR in, no children). + * @type array $category__not_in An array of category IDs (NOT in). + * @type string $category_name Use category slug (not name, this or any children). + * @type string $comment_status Comment status. + * @type int $comments_per_page The number of comments to return per page. + * Default 'comments_per_page' option. + * @type array $date_query An associative array of WP_Date_Query arguments. + * {@see WP_Date_Query::__construct()} + * @type int $day Day of the month. Default empty. Accepts numbers 1-31. + * @type bool $exact Whether to search by exact keyword. Default false. + * @type string|array $fields Which fields to return. Single field or all fields (string), + * or array of fields. 'id=>parent' uses 'id' and 'post_parent'. + * Default all fields. Accepts 'ids', 'id=>parent'. + * @type int $hour Hour of the day. Default empty. Accepts numbers 0-23. + * @type int|bool $ignore_sticky_posts Whether to ignore sticky posts or not. Setting this to false + * excludes stickies from 'post__in'. Accepts 1|true, 0|false. + * Default 0|false. + * @type int $m Combination YearMonth. Accepts any four-digit year and month + * numbers 1-12. Default empty. + * @type string $meta_compare Comparison operator to test the 'meta_value'. + * @type string $meta_key Custom field key. + * @type array $meta_query An associative array of WP_Meta_Query arguments. + * {@see WP_Meta_Query} + * @type string $meta_value Custom field value. + * @type int $meta_value_num Custom field value number. + * @type int $menu_order The menu order of the posts. + * @type int $monthnum The two-digit month. Default empty. Accepts numbers 1-12. + * @type string $name Post slug. + * @type bool $nopaging Show all posts (true) or paginate (false). Default false. + * @type bool $no_found_rows Whether to skip counting the total rows found. Enabling can improve + * performance. Default false. + * @type int $offset The number of posts to offset before retrieval. + * @type string $order Designates ascending or descending order of posts. Default 'DESC'. + * Accepts 'ASC', 'DESC'. + * @type string|array $orderby Sort retrieved posts by parameter. One or more options may be + * passed. To use 'meta_value', or 'meta_value_num', + * 'meta_key=keyname' must be also be defined. To sort by a + * specific `$meta_query` clause, use that clause's array key. + * Default 'date'. Accepts 'none', 'name', 'author', 'date', + * 'title', 'modified', 'menu_order', 'parent', 'ID', 'rand', + * 'RAND(x)' (where 'x' is an integer seed value), + * 'comment_count', 'meta_value', 'meta_value_num', 'post__in', + * and the array keys of `$meta_query`. + * @type int $p Post ID. + * @type int $page Show the number of posts that would show up on page X of a + * static front page. + * @type int $paged The number of the current page. + * @type int $page_id Page ID. + * @type string $pagename Page slug. + * @type string $perm Show posts if user has the appropriate capability. + * @type string $ping_status Ping status. + * @type array $post__in An array of post IDs to retrieve, sticky posts will be included + * @type string $post_mime_type The mime type of the post. Used for 'attachment' post_type. + * @type array $post__not_in An array of post IDs not to retrieve. Note: a string of comma- + * separated IDs will NOT work. + * @type int $post_parent Page ID to retrieve child pages for. Use 0 to only retrieve + * top-level pages. + * @type array $post_parent__in An array containing parent page IDs to query child pages from. + * @type array $post_parent__not_in An array containing parent page IDs not to query child pages from. + * @type string|array $post_type A post type slug (string) or array of post type slugs. + * Default 'any' if using 'tax_query'. + * @type string|array $post_status A post status (string) or array of post statuses. + * @type int $posts_per_page The number of posts to query for. Use -1 to request all posts. + * @type int $posts_per_archive_page The number of posts to query for by archive page. Overrides + * 'posts_per_page' when is_archive(), or is_search() are true. + * @type array $post_name__in An array of post slugs that results must match. + * @type string $s Search keyword(s). Prepending a term with a hyphen will + * exclude posts matching that term. Eg, 'pillow -sofa' will + * return posts containing 'pillow' but not 'sofa'. + * @type int $second Second of the minute. Default empty. Accepts numbers 0-60. + * @type bool $sentence Whether to search by phrase. Default false. + * @type bool $suppress_filters Whether to suppress filters. Default false. + * @type string $tag Tag slug. Comma-separated (either), Plus-separated (all). + * @type array $tag__and An array of tag ids (AND in). + * @type array $tag__in An array of tag ids (OR in). + * @type array $tag__not_in An array of tag ids (NOT in). + * @type int $tag_id Tag id or comma-separated list of IDs. + * @type array $tag_slug__and An array of tag slugs (AND in). + * @type array $tag_slug__in An array of tag slugs (OR in). unless 'ignore_sticky_posts' is + * true. Note: a string of comma-separated IDs will NOT work. + * @type array $tax_query An associative array of WP_Tax_Query arguments. + * {@see WP_Tax_Query->queries} + * @type string $title Post title. + * @type bool $update_post_meta_cache Whether to update the post meta cache. Default true. + * @type bool $update_post_term_cache Whether to update the post term cache. Default true. + * @type int $w The week number of the year. Default empty. Accepts numbers 0-53. + * @type int $year The four-digit year. Default empty. Accepts any four-digit year. + * } */ - function parse_query( $query = '' ) { + public function parse_query( $query = '' ) { if ( ! empty( $query ) ) { $this->init(); $this->query = $this->query_vars = wp_parse_args( $query ); @@ -1478,14 +1597,16 @@ class WP_Query { $qv['author'] = preg_replace( '|[^0-9,-]|', '', $qv['author'] ); // comma separated list of positive or negative integers $qv['pagename'] = trim( $qv['pagename'] ); $qv['name'] = trim( $qv['name'] ); + $qv['title'] = trim( $qv['title'] ); if ( '' !== $qv['hour'] ) $qv['hour'] = absint($qv['hour']); if ( '' !== $qv['minute'] ) $qv['minute'] = absint($qv['minute']); if ( '' !== $qv['second'] ) $qv['second'] = absint($qv['second']); if ( '' !== $qv['menu_order'] ) $qv['menu_order'] = absint($qv['menu_order']); // Fairly insane upper bound for search string lengths. - if ( ! empty( $qv['s'] ) && strlen( $qv['s'] ) > 1600 ) + if ( ! is_scalar( $qv['s'] ) || ( ! empty( $qv['s'] ) && strlen( $qv['s'] ) > 1600 ) ) { $qv['s'] = ''; + } // Compat. Map subpost to attachment. if ( '' != $qv['subpost'] ) @@ -1510,9 +1631,9 @@ class WP_Query { $this->is_page = true; $this->is_single = false; } else { - // Look for archive queries. Dates, categories, authors, search, post type archives. + // Look for archive queries. Dates, categories, authors, search, post type archives. - if ( !empty($qv['s']) ) { + if ( isset( $this->query['s'] ) ) { $this->is_search = true; } @@ -1565,9 +1686,9 @@ class WP_Query { $this->is_date = true; if ( strlen($qv['m']) > 9 ) { $this->is_time = true; - } else if ( strlen($qv['m']) > 7 ) { + } elseif ( strlen( $qv['m'] ) > 7 ) { $this->is_day = true; - } else if ( strlen($qv['m']) > 5 ) { + } elseif ( strlen( $qv['m'] ) > 5 ) { $this->is_month = true; } else { $this->is_year = true; @@ -1582,7 +1703,11 @@ class WP_Query { $this->parse_tax_query( $qv ); foreach ( $this->tax_query->queries as $tax_query ) { - if ( 'NOT IN' != $tax_query['operator'] ) { + if ( ! is_array( $tax_query ) ) { + continue; + } + + if ( isset( $tax_query['operator'] ) && 'NOT IN' != $tax_query['operator'] ) { switch ( $tax_query['taxonomy'] ) { case 'category': $this->is_category = true; @@ -1619,15 +1744,16 @@ class WP_Query { if ( '' != $qv['feed'] ) $this->is_feed = true; + if ( '' != $qv['embed'] ) { + $this->is_embed = true; + } + if ( '' != $qv['tb'] ) $this->is_trackback = true; if ( '' != $qv['paged'] && ( intval($qv['paged']) > 1 ) ) $this->is_paged = true; - if ( '' != $qv['comments_popup'] ) - $this->is_comments_popup = true; - // if we're previewing inside the write screen if ( '' != $qv['preview'] ) $this->is_preview = true; @@ -1645,7 +1771,7 @@ class WP_Query { if ( $this->is_feed && ( !empty($qv['withcomments']) || ( empty($qv['withoutcomments']) && $this->is_singular ) ) ) $this->is_comment_feed = true; - if ( !( $this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_comments_popup || $this->is_robots ) ) + if ( !( $this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_robots ) ) $this->is_home = true; // Correct is_* for page_on_front and page_for_posts @@ -1654,6 +1780,9 @@ class WP_Query { // pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename. if ( isset($_query['pagename']) && '' == $_query['pagename'] ) unset($_query['pagename']); + + unset( $_query['embed'] ); + if ( empty($_query) || !array_diff( array_keys($_query), array('preview', 'page', 'paged', 'cpage') ) ) { $this->is_page = true; $this->is_home = false; @@ -1667,11 +1796,25 @@ class WP_Query { } if ( '' != $qv['pagename'] ) { - $this->queried_object = get_page_by_path($qv['pagename']); - if ( !empty($this->queried_object) ) + $this->queried_object = get_page_by_path( $qv['pagename'] ); + + if ( $this->queried_object && 'attachment' == $this->queried_object->post_type ) { + if ( preg_match( "/^[^%]*%(?:postname)%/", get_option( 'permalink_structure' ) ) ) { + // See if we also have a post with the same slug + $post = get_page_by_path( $qv['pagename'], OBJECT, 'post' ); + if ( $post ) { + $this->queried_object = $post; + $this->is_page = false; + $this->is_single = true; + } + } + } + + if ( ! empty( $this->queried_object ) ) { $this->queried_object_id = (int) $this->queried_object->ID; - else - unset($this->queried_object); + } else { + unset( $this->queried_object ); + } if ( 'page' == get_option('show_on_front') && isset($this->queried_object_id) && $this->queried_object_id == get_option('page_for_posts') ) { $this->is_page = false; @@ -1711,6 +1854,8 @@ class WP_Query { if ( '404' == $qv['error'] ) $this->set_404(); + $this->is_embed = $this->is_embed && ( $this->is_singular || $this->is_404 ); + $this->query_vars_hash = md5( serialize( $this->query_vars ) ); $this->query_vars_changed = false; @@ -1727,12 +1872,14 @@ class WP_Query { /** * Parses various taxonomy related query vars. * + * For BC, this method is not marked as protected. See [28987]. + * * @access protected * @since 3.1.0 * - * @param array &$q The query variables + * @param array $q The query variables. Passed by reference. */ - function parse_tax_query( &$q ) { + public function parse_tax_query( &$q ) { if ( ! empty( $q['tax_query'] ) && is_array( $q['tax_query'] ) ) { $tax_query = $q['tax_query']; } else { @@ -1763,6 +1910,10 @@ class WP_Query { $term = $q[$t->query_var]; + if ( is_array( $term ) ) { + $term = implode( ',', $term ); + } + if ( strpos($term, '+') !== false ) { $terms = preg_split( '/[+]+/', $term ); foreach ( $terms as $term ) { @@ -1778,6 +1929,11 @@ class WP_Query { } } + // If querystring 'cat' is an array, implode it. + if ( is_array( $q['cat'] ) ) { + $q['cat'] = implode( ',', $q['cat'] ); + } + // Category stuff if ( ! empty( $q['cat'] ) && ! $this->is_singular ) { $cat_in = $cat_not_in = array(); @@ -1853,6 +2009,11 @@ class WP_Query { ); } + // If querystring 'tag' is array, implode it. + if ( is_array( $q['tag'] ) ) { + $q['tag'] = implode( ',', $q['tag'] ); + } + // Tag stuff if ( '' != $q['tag'] && !$this->is_singular && $this->query_vars_changed ) { if ( strpos($q['tag'], ',') !== false ) { @@ -1861,7 +2022,7 @@ class WP_Query { $tag = sanitize_term_field('slug', $tag, 0, 'post_tag', 'db'); $q['tag_slug__in'][] = $tag; } - } else if ( preg_match('/[+\r\n\t ]+/', $q['tag']) || !empty($q['cat']) ) { + } elseif ( preg_match('/[+\r\n\t ]+/', $q['tag'] ) || ! empty( $q['cat'] ) ) { $tags = preg_split('/[+\r\n\t ]+/', $q['tag']); foreach ( (array) $tags as $tag ) { $tag = sanitize_term_field('slug', $tag, 0, 'post_tag', 'db'); @@ -1943,7 +2104,8 @@ class WP_Query { * * @since 3.7.0 * - * @global wpdb $wpdb + * @global wpdb $wpdb WordPress database abstraction object. + * * @param array $q Query variables. * @return string WHERE clause. */ @@ -1977,11 +2139,24 @@ class WP_Query { $searchand = ''; $q['search_orderby_title'] = array(); foreach ( $q['search_terms'] as $term ) { - $term = like_escape( esc_sql( $term ) ); - if ( $n ) - $q['search_orderby_title'][] = "$wpdb->posts.post_title LIKE '%$term%'"; + // Terms prefixed with '-' should be excluded. + $include = '-' !== substr( $term, 0, 1 ); + if ( $include ) { + $like_op = 'LIKE'; + $andor_op = 'OR'; + } else { + $like_op = 'NOT LIKE'; + $andor_op = 'AND'; + $term = substr( $term, 1 ); + } + + if ( $n && $include ) { + $like = '%' . $wpdb->esc_like( $term ) . '%'; + $q['search_orderby_title'][] = $wpdb->prepare( "$wpdb->posts.post_title LIKE %s", $like ); + } - $search .= "{$searchand}(($wpdb->posts.post_title LIKE '{$n}{$term}{$n}') OR ($wpdb->posts.post_content LIKE '{$n}{$term}{$n}'))"; + $like = $n . $wpdb->esc_like( $term ) . $n; + $search .= $wpdb->prepare( "{$searchand}(($wpdb->posts.post_title $like_op %s) $andor_op ($wpdb->posts.post_excerpt $like_op %s) $andor_op ($wpdb->posts.post_content $like_op %s))", $like, $like, $like ); $searchand = ' AND '; } @@ -2003,7 +2178,7 @@ class WP_Query { * * @since 3.7.0 * - * @param array Terms to check. + * @param array $terms Terms to check. * @return array Terms that are not stopwords. */ protected function parse_search_terms( $terms ) { @@ -2019,8 +2194,8 @@ class WP_Query { else $term = trim( $term, "\"' " ); - // Avoid single A-Z. - if ( ! $term || ( 1 === strlen( $term ) && preg_match( '/^[a-z]$/i', $term ) ) ) + // Avoid single A-Z and single dashes. + if ( ! $term || ( 1 === strlen( $term ) && preg_match( '/^[a-z\-]$/i', $term ) ) ) continue; if ( in_array( call_user_func( $strtolower, $term ), $stopwords, true ) ) @@ -2051,7 +2226,7 @@ class WP_Query { 'Comma-separated list of search stopwords in your language' ) ); $stopwords = array(); - foreach( $words as $word ) { + foreach ( $words as $word ) { $word = trim( $word, "\r\n\t " ); if ( $word ) $stopwords[] = $word; @@ -2071,22 +2246,29 @@ class WP_Query { /** * Generate SQL for the ORDER BY condition based on passed search terms. * - * @global wpdb $wpdb + * @global wpdb $wpdb WordPress database abstraction object. + * * @param array $q Query variables. * @return string ORDER BY clause. */ protected function parse_search_order( &$q ) { global $wpdb; - $search_orderby = ''; - if ( $q['search_terms_count'] > 1 ) { $num_terms = count( $q['search_orderby_title'] ); - $search_orderby_s = like_escape( esc_sql( $q['s'] ) ); - $search_orderby = '(CASE '; + // If the search terms contain negative queries, don't bother ordering by sentence matches. + $like = ''; + if ( ! preg_match( '/(?:\s|^)\-/', $q['s'] ) ) { + $like = '%' . $wpdb->esc_like( $q['s'] ) . '%'; + } + + $search_orderby = ''; + // sentence match in 'post_title' - $search_orderby .= "WHEN $wpdb->posts.post_title LIKE '%{$search_orderby_s}%' THEN 1 "; + if ( $like ) { + $search_orderby .= $wpdb->prepare( "WHEN $wpdb->posts.post_title LIKE %s THEN 1 ", $like ); + } // sanity limit, sort as sentence when more than 6 terms // (few searches are longer than 6 terms and most titles are not) @@ -2098,9 +2280,15 @@ class WP_Query { $search_orderby .= 'WHEN ' . implode( ' OR ', $q['search_orderby_title'] ) . ' THEN 3 '; } - // sentence match in 'post_content' - $search_orderby .= "WHEN $wpdb->posts.post_content LIKE '%{$search_orderby_s}%' THEN 4 "; - $search_orderby .= 'ELSE 5 END)'; + // Sentence match in 'post_content' and 'post_excerpt'. + if ( $like ) { + $search_orderby .= $wpdb->prepare( "WHEN $wpdb->posts.post_excerpt LIKE %s THEN 4 ", $like ); + $search_orderby .= $wpdb->prepare( "WHEN $wpdb->posts.post_content LIKE %s THEN 5 ", $like ); + } + + if ( $search_orderby ) { + $search_orderby = '(CASE ' . $search_orderby . 'ELSE 6 END)'; + } } else { // single word or sentence search $search_orderby = reset( $q['search_orderby_title'] ) . ' DESC'; @@ -2109,13 +2297,129 @@ class WP_Query { return $search_orderby; } + /** + * If the passed orderby value is allowed, convert the alias to a + * properly-prefixed orderby value. + * + * @since 4.0.0 + * @access protected + * + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param string $orderby Alias for the field to order by. + * @return string|false Table-prefixed value to used in the ORDER clause. False otherwise. + */ + protected function parse_orderby( $orderby ) { + global $wpdb; + + // Used to filter values. + $allowed_keys = array( + 'post_name', 'post_author', 'post_date', 'post_title', 'post_modified', + 'post_parent', 'post_type', 'name', 'author', 'date', 'title', 'modified', + 'parent', 'type', 'ID', 'menu_order', 'comment_count', 'rand', + ); + + $primary_meta_key = ''; + $primary_meta_query = false; + $meta_clauses = $this->meta_query->get_clauses(); + if ( ! empty( $meta_clauses ) ) { + $primary_meta_query = reset( $meta_clauses ); + + if ( ! empty( $primary_meta_query['key'] ) ) { + $primary_meta_key = $primary_meta_query['key']; + $allowed_keys[] = $primary_meta_key; + } + + $allowed_keys[] = 'meta_value'; + $allowed_keys[] = 'meta_value_num'; + $allowed_keys = array_merge( $allowed_keys, array_keys( $meta_clauses ) ); + } + + // If RAND() contains a seed value, sanitize and add to allowed keys. + $rand_with_seed = false; + if ( preg_match( '/RAND$([0-9]+)$/i', $orderby, $matches ) ) { + $orderby = sprintf( 'RAND(%s)', intval( $matches[1] ) ); + $allowed_keys[] = $orderby; + $rand_with_seed = true; + } + + if ( ! in_array( $orderby, $allowed_keys, true ) ) { + return false; + } + + switch ( $orderby ) { + case 'post_name': + case 'post_author': + case 'post_date': + case 'post_title': + case 'post_modified': + case 'post_parent': + case 'post_type': + case 'ID': + case 'menu_order': + case 'comment_count': + $orderby_clause = "$wpdb->posts.{$orderby}"; + break; + case 'rand': + $orderby_clause = 'RAND()'; + break; + case $primary_meta_key: + case 'meta_value': + if ( ! empty( $primary_meta_query['type'] ) ) { + $orderby_clause = "CAST({$primary_meta_query['alias']}.meta_value AS {$primary_meta_query['cast']})"; + } else { + $orderby_clause = "{$primary_meta_query['alias']}.meta_value"; + } + break; + case 'meta_value_num': + $orderby_clause = "{$primary_meta_query['alias']}.meta_value+0"; + break; + default: + if ( array_key_exists( $orderby, $meta_clauses ) ) { + // $orderby corresponds to a meta_query clause. + $meta_clause = $meta_clauses[ $orderby ]; + $orderby_clause = "CAST({$meta_clause['alias']}.meta_value AS {$meta_clause['cast']})"; + } elseif ( $rand_with_seed ) { + $orderby_clause = $orderby; + } else { + // Default: order by post field. + $orderby_clause = "$wpdb->posts.post_" . sanitize_key( $orderby ); + } + + break; + } + + return $orderby_clause; + } + + /** + * Parse an 'order' query variable and cast it to ASC or DESC as necessary. + * + * @since 4.0.0 + * @access protected + * + * @param string $order The 'order' query variable. + * @return string The sanitized 'order' query variable. + */ + protected function parse_order( $order ) { + if ( ! is_string( $order ) || empty( $order ) ) { + return 'DESC'; + } + + if ( 'ASC' === strtoupper( $order ) ) { + return 'ASC'; + } else { + return 'DESC'; + } + } + /** * Sets the 404 property and saves whether query is feed. * * @since 2.0.0 * @access public */ - function set_404() { + public function set_404() { $is_feed = $this->is_feed; $this->init_query_flags(); @@ -2128,13 +2432,15 @@ class WP_Query { * Retrieve query variable. * * @since 1.5.0 + * @since 3.9.0 The `$default` argument was introduced. + * * @access public * * @param string $query_var Query variable key. - * @param mixed $default Value to return if the query variable is not set. Default ''. - * @return mixed + * @param mixed $default Optional. Value to return if the query variable is not set. Default empty. + * @return mixed Contents of the query variable. */ - function get( $query_var, $default = '' ) { + public function get( $query_var, $default = '' ) { if ( isset( $this->query_vars[ $query_var ] ) ) { return $this->query_vars[ $query_var ]; } @@ -2149,9 +2455,9 @@ class WP_Query { * @access public * * @param string $query_var Query variable key. - * @param mixed $value Query variable value. + * @param mixed $value Query variable value. */ - function set($query_var, $value) { + public function set($query_var, $value) { $this->query_vars[$query_var] = $value; } @@ -2163,11 +2469,12 @@ class WP_Query { * * @since 1.5.0 * @access public - * @uses do_action_ref_array() Calls 'pre_get_posts' hook before retrieving posts. + * + * @global wpdb $wpdb WordPress database abstraction object. * * @return array List of posts. */ - function get_posts() { + public function get_posts() { global $wpdb; $this->parse_query(); @@ -2212,7 +2519,6 @@ class WP_Query { $join = ''; $search = ''; $groupby = ''; - $fields = ''; $post_status_join = false; $page = 1; @@ -2264,6 +2570,7 @@ class WP_Query { $q['nopaging'] = false; } } + if ( $this->is_feed ) { // This overrides posts_per_page. if ( ! empty( $q['posts_per_rss'] ) ) { @@ -2276,7 +2583,7 @@ class WP_Query { $q['posts_per_page'] = (int) $q['posts_per_page']; if ( $q['posts_per_page'] < -1 ) $q['posts_per_page'] = abs($q['posts_per_page']); - else if ( $q['posts_per_page'] == 0 ) + elseif ( $q['posts_per_page'] == 0 ) $q['posts_per_page'] = 1; if ( !isset($q['comments_per_page']) || $q['comments_per_page'] == 0 ) @@ -2372,11 +2679,11 @@ class WP_Query { if ( !$ptype_obj || !$ptype_obj->query_var || empty($q[ $ptype_obj->query_var ]) ) continue; - if ( ! $ptype_obj->hierarchical || strpos($q[ $ptype_obj->query_var ], '/') === false ) { - // Non-hierarchical post_types & parent-level-hierarchical post_types can directly use 'name' + if ( ! $ptype_obj->hierarchical ) { + // Non-hierarchical post types can directly use 'name'. $q['name'] = $q[ $ptype_obj->query_var ]; } else { - // Hierarchical post_types will operate through the + // Hierarchical post types will operate through 'pagename'. $q['pagename'] = $q[ $ptype_obj->query_var ]; $q['name'] = ''; } @@ -2387,6 +2694,11 @@ class WP_Query { unset($ptype_obj); } + if ( '' !== $q['title'] ) { + $where .= $wpdb->prepare( " AND $wpdb->posts.post_title = %s", stripslashes( $q['title'] ) ); + } + + // Parameters related to 'post_name'. if ( '' != $q['name'] ) { $q['name'] = sanitize_title_for_query( $q['name'] ); $where .= " AND $wpdb->posts.post_name = '" . $q['name'] . "'"; @@ -2431,12 +2743,11 @@ class WP_Query { $q['attachment'] = sanitize_title_for_query( wp_basename( $q['attachment'] ) ); $q['name'] = $q['attachment']; $where .= " AND $wpdb->posts.post_name = '" . $q['attachment'] . "'"; + } elseif ( is_array( $q['post_name__in'] ) && ! empty( $q['post_name__in'] ) ) { + $q['post_name__in'] = array_map( 'sanitize_title_for_query', $q['post_name__in'] ); + $where .= " AND $wpdb->posts.post_name IN ('" . implode( "' ,'", $q['post_name__in'] ) . "')"; } - - if ( intval($q['comments_popup']) ) - $q['p'] = absint($q['comments_popup']); - // If an attachment is requested by number, let it supersede any post number. if ( $q['attachment_id'] ) $q['p'] = absint($q['attachment_id']); @@ -2470,18 +2781,21 @@ class WP_Query { } // If a search pattern is specified, load the posts that match. - if ( ! empty( $q['s'] ) ) + if ( strlen( $q['s'] ) ) { $search = $this->parse_search( $q ); + } - /** - * Filter the search SQL that is used in the WHERE clause of WP_Query. - * - * @since 3.0.0 - * - * @param string $search Search SQL for WHERE clause. - * @param WP_Query $this The current WP_Query object. - */ - $search = apply_filters_ref_array( 'posts_search', array( $search, &$this ) ); + if ( ! $q['suppress_filters'] ) { + /** + * Filter the search SQL that is used in the WHERE clause of WP_Query. + * + * @since 3.0.0 + * + * @param string $search Search SQL for WHERE clause. + * @param WP_Query $this The current WP_Query object. + */ + $search = apply_filters_ref_array( 'posts_search', array( $search, &$this ) ); + } // Taxonomies if ( !$this->is_singular ) { @@ -2497,7 +2811,7 @@ class WP_Query { if ( empty($post_type) ) { // Do a fully inclusive search for currently registered post types of queried taxonomies $post_type = array(); - $taxonomies = wp_list_pluck( $this->tax_query->queries, 'taxonomy' ); + $taxonomies = array_keys( $this->tax_query->queried_terms ); foreach ( get_post_types( array( 'exclude_from_search' => false ) ) as $pt ) { $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies( $pt ); if ( array_intersect( $taxonomies, $object_taxonomies ) ) @@ -2514,51 +2828,59 @@ class WP_Query { } } - // Back-compat - if ( !empty($this->tax_query->queries) ) { - $tax_query_in_and = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'NOT IN' ), 'NOT' ); - if ( !empty( $tax_query_in_and ) ) { - if ( !isset( $q['taxonomy'] ) ) { - foreach ( $tax_query_in_and as $a_tax_query ) { - if ( !in_array( $a_tax_query['taxonomy'], array( 'category', 'post_tag' ) ) ) { - $q['taxonomy'] = $a_tax_query['taxonomy']; - if ( 'slug' == $a_tax_query['field'] ) - $q['term'] = $a_tax_query['terms'][0]; - else - $q['term_id'] = $a_tax_query['terms'][0]; + /* + * Ensure that 'taxonomy', 'term', 'term_id', 'cat', and + * 'category_name' vars are set for backward compatibility. + */ + if ( ! empty( $this->tax_query->queried_terms ) ) { - break; - } + /* + * Set 'taxonomy', 'term', and 'term_id' to the + * first taxonomy other than 'post_tag' or 'category'. + */ + if ( ! isset( $q['taxonomy'] ) ) { + foreach ( $this->tax_query->queried_terms as $queried_taxonomy => $queried_items ) { + if ( empty( $queried_items['terms'][0] ) ) { + continue; } - } - $cat_query = wp_list_filter( $tax_query_in_and, array( 'taxonomy' => 'category' ) ); - if ( ! empty( $cat_query ) ) { - $cat_query = reset( $cat_query ); + if ( ! in_array( $queried_taxonomy, array( 'category', 'post_tag' ) ) ) { + $q['taxonomy'] = $queried_taxonomy; - if ( ! empty( $cat_query['terms'][0] ) ) { - $the_cat = get_term_by( $cat_query['field'], $cat_query['terms'][0], 'category' ); - if ( $the_cat ) { - $this->set( 'cat', $the_cat->term_id ); - $this->set( 'category_name', $the_cat->slug ); + if ( 'slug' === $queried_items['field'] ) { + $q['term'] = $queried_items['terms'][0]; + } else { + $q['term_id'] = $queried_items['terms'][0]; } - unset( $the_cat ); + + // Take the first one we find. + break; } } - unset( $cat_query ); + } + + // 'cat', 'category_name', 'tag_id' + foreach ( $this->tax_query->queried_terms as $queried_taxonomy => $queried_items ) { + if ( empty( $queried_items['terms'][0] ) ) { + continue; + } - $tag_query = wp_list_filter( $tax_query_in_and, array( 'taxonomy' => 'post_tag' ) ); - if ( ! empty( $tag_query ) ) { - $tag_query = reset( $tag_query ); + if ( 'category' === $queried_taxonomy ) { + $the_cat = get_term_by( $queried_items['field'], $queried_items['terms'][0], 'category' ); + if ( $the_cat ) { + $this->set( 'cat', $the_cat->term_id ); + $this->set( 'category_name', $the_cat->slug ); + } + unset( $the_cat ); + } - if ( ! empty( $tag_query['terms'][0] ) ) { - $the_tag = get_term_by( $tag_query['field'], $tag_query['terms'][0], 'post_tag' ); - if ( $the_tag ) - $this->set( 'tag_id', $the_tag->term_id ); - unset( $the_tag ); + if ( 'post_tag' === $queried_taxonomy ) { + $the_tag = get_term_by( $queried_items['field'], $queried_items['terms'][0], 'post_tag' ); + if ( $the_tag ) { + $this->set( 'tag_id', $the_tag->term_id ); } + unset( $the_tag ); } - unset( $tag_query ); } } @@ -2611,12 +2933,30 @@ class WP_Query { $where .= $search . $whichauthor . $whichmimetype; - if ( empty($q['order']) || ((strtoupper($q['order']) != 'ASC') && (strtoupper($q['order']) != 'DESC')) ) - $q['order'] = 'DESC'; + if ( ! empty( $this->meta_query->queries ) ) { + $clauses = $this->meta_query->get_sql( 'post', $wpdb->posts, 'ID', $this ); + $join .= $clauses['join']; + $where .= $clauses['where']; + } + + $rand = ( isset( $q['orderby'] ) && 'rand' === $q['orderby'] ); + if ( ! isset( $q['order'] ) ) { + $q['order'] = $rand ? '' : 'DESC'; + } else { + $q['order'] = $rand ? '' : $this->parse_order( $q['order'] ); + } - // Order by - if ( empty($q['orderby']) ) { - $orderby = "$wpdb->posts.post_date " . $q['order']; + // Order by. + if ( empty( $q['orderby'] ) ) { + /* + * Boolean false or empty array blanks out ORDER BY, + * while leaving the value unset or otherwise empty sets the default. + */ + if ( isset( $q['orderby'] ) && ( is_array( $q['orderby'] ) || false === $q['orderby'] ) ) { + $orderby = ''; + } else { + $orderby = "$wpdb->posts.post_date " . $q['order']; + } } elseif ( 'none' == $q['orderby'] ) { $orderby = ''; } elseif ( $q['orderby'] == 'post__in' && ! empty( $post__in ) ) { @@ -2624,59 +2964,41 @@ class WP_Query { } elseif ( $q['orderby'] == 'post_parent__in' && ! empty( $post_parent__in ) ) { $orderby = "FIELD( {$wpdb->posts}.post_parent, $post_parent__in )"; } else { - // Used to filter values - $allowed_keys = array('name', 'author', 'date', 'title', 'modified', 'menu_order', 'parent', 'ID', 'rand', 'comment_count'); - if ( !empty($q['meta_key']) ) { - $allowed_keys[] = $q['meta_key']; - $allowed_keys[] = 'meta_value'; - $allowed_keys[] = 'meta_value_num'; - } - $q['orderby'] = urldecode($q['orderby']); - $q['orderby'] = addslashes_gpc($q['orderby']); - $orderby_array = array(); - foreach ( explode( ' ', $q['orderby'] ) as $i => $orderby ) { - // Only allow certain values for safety - if ( ! in_array($orderby, $allowed_keys) ) - continue; + if ( is_array( $q['orderby'] ) ) { + foreach ( $q['orderby'] as $_orderby => $order ) { + $orderby = addslashes_gpc( urldecode( $_orderby ) ); + $parsed = $this->parse_orderby( $orderby ); - switch ( $orderby ) { - case 'menu_order': - $orderby = "$wpdb->posts.menu_order"; - break; - case 'ID': - $orderby = "$wpdb->posts.ID"; - break; - case 'rand': - $orderby = 'RAND()'; - break; - case $q['meta_key']: - case 'meta_value': - if ( isset( $q['meta_type'] ) ) { - $meta_type = $this->meta_query->get_cast_for_type( $q['meta_type'] ); - $orderby = "CAST($wpdb->postmeta.meta_value AS {$meta_type})"; - } else { - $orderby = "$wpdb->postmeta.meta_value"; - } - break; - case 'meta_value_num': - $orderby = "$wpdb->postmeta.meta_value+0"; - break; - case 'comment_count': - $orderby = "$wpdb->posts.comment_count"; - break; - default: - $orderby = "$wpdb->posts.post_" . $orderby; + if ( ! $parsed ) { + continue; + } + + $orderby_array[] = $parsed . ' ' . $this->parse_order( $order ); } + $orderby = implode( ', ', $orderby_array ); - $orderby_array[] = $orderby; - } - $orderby = implode( ',', $orderby_array ); + } else { + $q['orderby'] = urldecode( $q['orderby'] ); + $q['orderby'] = addslashes_gpc( $q['orderby'] ); + + foreach ( explode( ' ', $q['orderby'] ) as $i => $orderby ) { + $parsed = $this->parse_orderby( $orderby ); + // Only allow certain values for safety. + if ( ! $parsed ) { + continue; + } - if ( empty( $orderby ) ) - $orderby = "$wpdb->posts.post_date ".$q['order']; - else - $orderby .= " {$q['order']}"; + $orderby_array[] = $parsed; + } + $orderby = implode( ' ' . $q['order'] . ', ', $orderby_array ); + + if ( empty( $orderby ) ) { + $orderby = "$wpdb->posts.post_date " . $q['order']; + } elseif ( ! empty( $q['order'] ) ) { + $orderby .= " {$q['order']}"; + } + } } // Order search results by relevance only when another "orderby" is not specified in the query. @@ -2685,15 +3007,18 @@ class WP_Query { if ( ! empty( $q['search_orderby_title'] ) && ( empty( $q['orderby'] ) && ! $this->is_feed ) || ( isset( $q['orderby'] ) && 'relevance' === $q['orderby'] ) ) $search_orderby = $this->parse_search_order( $q ); - /** - * Filter the ORDER BY used when ordering search results. - * - * @since 3.7.0 - * - * @param string $search_orderby The ORDER BY clause. - * @param WP_Query $this The current WP_Query instance. - */ - $search_orderby = apply_filters( 'posts_search_orderby', $search_orderby, $this ); + if ( ! $q['suppress_filters'] ) { + /** + * Filter the ORDER BY used when ordering search results. + * + * @since 3.7.0 + * + * @param string $search_orderby The ORDER BY clause. + * @param WP_Query $this The current WP_Query instance. + */ + $search_orderby = apply_filters( 'posts_search_orderby', $search_orderby, $this ); + } + if ( $search_orderby ) $orderby = $orderby ? $search_orderby . ', ' . $orderby : $search_orderby; } @@ -2717,6 +3042,14 @@ class WP_Query { $where .= sprintf( " AND $wpdb->posts.post_password %s ''", $q['has_password'] ? '!=' : '=' ); } + if ( ! empty( $q['comment_status'] ) ) { + $where .= $wpdb->prepare( " AND $wpdb->posts.comment_status = %s ", $q['comment_status'] ); + } + + if ( ! empty( $q['ping_status'] ) ) { + $where .= $wpdb->prepare( " AND $wpdb->posts.ping_status = %s ", $q['ping_status'] ); + } + if ( 'any' == $post_type ) { $in_search_post_types = get_post_types( array('exclude_from_search' => false) ); if ( empty( $in_search_post_types ) ) @@ -2752,6 +3085,7 @@ class WP_Query { $user_id = get_current_user_id(); + $q_status = array(); if ( ! empty( $q['post_status'] ) ) { $statuswheres = array(); $q_status = $q['post_status']; @@ -2760,9 +3094,12 @@ class WP_Query { $r_status = array(); $p_status = array(); $e_status = array(); - if ( in_array('any', $q_status) ) { - foreach ( get_post_stati( array('exclude_from_search' => true) ) as $status ) - $e_status[] = "$wpdb->posts.post_status <> '$status'"; + if ( in_array( 'any', $q_status ) ) { + foreach ( get_post_stati( array( 'exclude_from_search' => true ) ) as $status ) { + if ( ! in_array( $status, $q_status ) ) { + $e_status[] = "$wpdb->posts.post_status <> '$status'"; + } + } } else { foreach ( get_post_stati() as $status ) { if ( in_array( $status, $q_status ) ) { @@ -2831,12 +3168,6 @@ class WP_Query { $where .= ')'; } - if ( !empty( $this->meta_query->queries ) ) { - $clauses = $this->meta_query->get_sql( 'post', $wpdb->posts, 'ID', $this ); - $join .= $clauses['join']; - $where .= $clauses['where']; - } - /* * Apply filters on where and join prior to paging so that any * manipulations to them are reflected in the paging by day queries. @@ -2869,24 +3200,25 @@ class WP_Query { if ( !$page ) $page = 1; - if ( empty($q['offset']) ) { - $pgstrt = ($page - 1) * $q['posts_per_page'] . ', '; - } else { // we're ignoring $page and using 'offset' - $q['offset'] = absint($q['offset']); + // If 'offset' is provided, it takes precedence over 'paged'. + if ( isset( $q['offset'] ) && is_numeric( $q['offset'] ) ) { + $q['offset'] = absint( $q['offset'] ); $pgstrt = $q['offset'] . ', '; + } else { + $pgstrt = absint( ( $page - 1 ) * $q['posts_per_page'] ) . ', '; } $limits = 'LIMIT ' . $pgstrt . $q['posts_per_page']; } // Comments feeds - if ( $this->is_comment_feed && ( $this->is_archive || $this->is_search || !$this->is_singular ) ) { + if ( $this->is_comment_feed && ! $this->is_singular ) { if ( $this->is_archive || $this->is_search ) { $cjoin = "JOIN $wpdb->posts ON ($wpdb->comments.comment_post_ID = $wpdb->posts.ID) $join "; $cwhere = "WHERE comment_approved = '1' $where"; $cgroupby = "$wpdb->comments.comment_id"; } else { // Other non singular e.g. front $cjoin = "JOIN $wpdb->posts ON ( $wpdb->comments.comment_post_ID = $wpdb->posts.ID )"; - $cwhere = "WHERE post_status = 'publish' AND comment_approved = '1'"; + $cwhere = "WHERE ( post_status = 'publish' OR ( post_status = 'inherit' && post_type = 'attachment' ) ) AND comment_approved = '1'"; $cgroupby = ''; } @@ -2944,7 +3276,9 @@ class WP_Query { $cgroupby = ( ! empty( $cgroupby ) ) ? 'GROUP BY ' . $cgroupby : ''; $corderby = ( ! empty( $corderby ) ) ? 'ORDER BY ' . $corderby : ''; - $this->comments = (array) $wpdb->get_results("SELECT $distinct $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby $corderby $climits"); + $comments = (array) $wpdb->get_results("SELECT $distinct $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby $corderby $climits"); + // Convert to WP_Comment + $this->comments = array_map( 'get_comment', $comments ); $this->comment_count = count($this->comments); $post_ids = array(); @@ -3054,9 +3388,13 @@ class WP_Query { */ $clauses = (array) apply_filters_ref_array( 'posts_clauses', array( compact( $pieces ), &$this ) ); - foreach ( $pieces as $piece ) { - $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : ''; - } + $where = isset( $clauses[ 'where' ] ) ? $clauses[ 'where' ] : ''; + $groupby = isset( $clauses[ 'groupby' ] ) ? $clauses[ 'groupby' ] : ''; + $join = isset( $clauses[ 'join' ] ) ? $clauses[ 'join' ] : ''; + $orderby = isset( $clauses[ 'orderby' ] ) ? $clauses[ 'orderby' ] : ''; + $distinct = isset( $clauses[ 'distinct' ] ) ? $clauses[ 'distinct' ] : ''; + $fields = isset( $clauses[ 'fields' ] ) ? $clauses[ 'fields' ] : ''; + $limits = isset( $clauses[ 'limits' ] ) ? $clauses[ 'limits' ] : ''; } /** @@ -3173,8 +3511,14 @@ class WP_Query { * @param WP_Query &$this The WP_Query instance (passed by reference). */ $clauses = (array) apply_filters_ref_array( 'posts_clauses_request', array( compact( $pieces ), &$this ) ); - foreach ( $pieces as $piece ) - $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : ''; + + $where = isset( $clauses[ 'where' ] ) ? $clauses[ 'where' ] : ''; + $groupby = isset( $clauses[ 'groupby' ] ) ? $clauses[ 'groupby' ] : ''; + $join = isset( $clauses[ 'join' ] ) ? $clauses[ 'join' ] : ''; + $orderby = isset( $clauses[ 'orderby' ] ) ? $clauses[ 'orderby' ] : ''; + $distinct = isset( $clauses[ 'distinct' ] ) ? $clauses[ 'distinct' ] : ''; + $fields = isset( $clauses[ 'fields' ] ) ? $clauses[ 'fields' ] : ''; + $limits = isset( $clauses[ 'limits' ] ) ? $clauses[ 'limits' ] : ''; } if ( ! empty($groupby) ) @@ -3202,10 +3546,11 @@ class WP_Query { if ( 'ids' == $q['fields'] ) { $this->posts = $wpdb->get_col( $this->request ); + $this->posts = array_map( 'intval', $this->posts ); $this->post_count = count( $this->posts ); $this->set_found_posts( $q, $limits ); - return array_map( 'intval', $this->posts ); + return $this->posts; } if ( 'id=>parent' == $q['fields'] ) { @@ -3214,9 +3559,13 @@ class WP_Query { $this->set_found_posts( $q, $limits ); $r = array(); - foreach ( $this->posts as $post ) { + foreach ( $this->posts as $key => $post ) { + $this->posts[ $key ]->ID = (int) $post->ID; + $this->posts[ $key ]->post_parent = (int) $post->post_parent; + $r[ (int) $post->ID ] = (int) $post->post_parent; } + return $r; } @@ -3300,16 +3649,25 @@ class WP_Query { $climits = apply_filters_ref_array( 'comment_feed_limits', array( 'LIMIT ' . get_option('posts_per_rss'), &$this ) ); $comments_request = "SELECT $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby $corderby $climits"; - $this->comments = $wpdb->get_results($comments_request); + $comments = $wpdb->get_results($comments_request); + // Convert to WP_Comment + $this->comments = array_map( 'get_comment', $comments ); $this->comment_count = count($this->comments); } // Check post status to determine if post should be displayed. if ( !empty($this->posts) && ($this->is_single || $this->is_page) ) { $status = get_post_status($this->posts[0]); + if ( 'attachment' === $this->posts[0]->post_type && 0 === (int) $this->posts[0]->post_parent ) { + $this->is_page = false; + $this->is_single = true; + $this->is_attachment = true; + } $post_status_obj = get_post_status_object($status); - //$type = get_post_type($this->posts[0]); - if ( !$post_status_obj->public ) { + + // If the post_status was specifically requested, let it pass through. + if ( !$post_status_obj->public && ! in_array( $status, $q_status ) ) { + if ( ! is_user_logged_in() ) { // User must be logged in to view unpublished posts. $this->posts = array(); @@ -3386,6 +3744,11 @@ class WP_Query { } } + // If comments have been fetched as part of the query, make sure comment meta lazy-loading is set up. + if ( ! empty( $this->comments ) ) { + wp_queue_comments_for_comment_meta_lazyload( $this->comments ); + } + if ( ! $q['suppress_filters'] ) { /** * Filter the array of retrieved posts after they've been fetched and @@ -3415,6 +3778,10 @@ class WP_Query { $this->posts = array(); } + if ( $q['update_post_term_cache'] ) { + wp_queue_posts_for_term_meta_lazyload( $this->posts ); + } + return $this->posts; } @@ -3424,8 +3791,13 @@ class WP_Query { * * @since 3.5.0 * @access private + * + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param array $q Query variables. + * @param string $limits LIMIT clauses of the query. */ - function set_found_posts( $q, $limits ) { + private function set_found_posts( $q, $limits ) { global $wpdb; // Bail if posts is an empty array. Continue if posts is an empty string, @@ -3469,7 +3841,7 @@ class WP_Query { * * @return WP_Post Next post. */ - function next_post() { + public function next_post() { $this->current_post++; @@ -3485,10 +3857,10 @@ class WP_Query { * * @since 1.5.0 * @access public - * @uses $post - * @uses do_action_ref_array() Calls 'loop_start' if loop has just started + * + * @global WP_Post $post */ - function the_post() { + public function the_post() { global $post; $this->in_the_loop = true; @@ -3503,7 +3875,7 @@ class WP_Query { do_action_ref_array( 'loop_start', array( &$this ) ); $post = $this->next_post(); - setup_postdata($post); + $this->setup_postdata( $post ); } /** @@ -3513,11 +3885,10 @@ class WP_Query { * * @since 1.5.0 * @access public - * @uses do_action_ref_array() Calls 'loop_end' if loop is ended * * @return bool True if posts are available, false if end of loop. */ - function have_posts() { + public function have_posts() { if ( $this->current_post + 1 < $this->post_count ) { return true; } elseif ( $this->current_post + 1 == $this->post_count && $this->post_count > 0 ) { @@ -3543,7 +3914,7 @@ class WP_Query { * @since 1.5.0 * @access public */ - function rewind_posts() { + public function rewind_posts() { $this->current_post = -1; if ( $this->post_count > 0 ) { $this->post = $this->posts[0]; @@ -3551,14 +3922,14 @@ class WP_Query { } /** - * Iterate current comment index and return comment object. + * Iterate current comment index and return WP_Comment object. * * @since 2.2.0 * @access public * - * @return object Comment object. + * @return WP_Comment Comment object. */ - function next_comment() { + public function next_comment() { $this->current_comment++; $this->comment = $this->comments[$this->current_comment]; @@ -3570,10 +3941,9 @@ class WP_Query { * * @since 2.2.0 * @access public - * @global object $comment Current comment. - * @uses do_action() Calls 'comment_loop_start' hook when first comment is processed. + * @global WP_Comment $comment Current comment. */ - function the_comment() { + public function the_comment() { global $comment; $comment = $this->next_comment(); @@ -3598,7 +3968,7 @@ class WP_Query { * * @return bool True, if more comments. False, if no more posts. */ - function have_comments() { + public function have_comments() { if ( $this->current_comment + 1 < $this->comment_count ) { return true; } elseif ( $this->current_comment + 1 == $this->comment_count ) { @@ -3614,7 +3984,7 @@ class WP_Query { * @since 2.2.0 * @access public */ - function rewind_comments() { + public function rewind_comments() { $this->current_comment = -1; if ( $this->comment_count > 0 ) { $this->comment = $this->comments[0]; @@ -3630,7 +4000,7 @@ class WP_Query { * @param string $query URL query string. * @return array List of posts. */ - function query( $query ) { + public function query( $query ) { $this->init(); $this->query = $this->query_vars = wp_parse_args( $query ); return $this->get_posts(); @@ -3648,12 +4018,12 @@ class WP_Query { * * @return object */ - function get_queried_object() { + public function get_queried_object() { if ( isset($this->queried_object) ) return $this->queried_object; $this->queried_object = null; - $this->queried_object_id = 0; + $this->queried_object_id = null; if ( $this->is_category || $this->is_tag || $this->is_tax ) { if ( $this->is_category ) { @@ -3669,14 +4039,20 @@ class WP_Query { $term = get_term_by( 'slug', $this->get( 'tag' ), 'post_tag' ); } } else { - $tax_query_in_and = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'NOT IN' ), 'NOT' ); - $query = reset( $tax_query_in_and ); + // For other tax queries, grab the first term from the first clause. + $tax_query_in_and = wp_list_filter( $this->tax_query->queried_terms, array( 'operator' => 'NOT IN' ), 'NOT' ); - if ( $query['terms'] ) { - if ( 'term_id' == $query['field'] ) { - $term = get_term( reset( $query['terms'] ), $query['taxonomy'] ); - } else { - $term = get_term_by( $query['field'], reset( $query['terms'] ), $query['taxonomy'] ); + if ( ! empty( $tax_query_in_and ) ) { + $queried_taxonomies = array_keys( $tax_query_in_and ); + $matched_taxonomy = reset( $queried_taxonomies ); + $query = $tax_query_in_and[ $matched_taxonomy ]; + + if ( $query['terms'] ) { + if ( 'term_id' == $query['field'] ) { + $term = get_term( reset( $query['terms'] ), $matched_taxonomy ); + } else { + $term = get_term_by( $query['field'], reset( $query['terms'] ), $matched_taxonomy ); + } } } } @@ -3697,7 +4073,7 @@ class WP_Query { $page_for_posts = get_option('page_for_posts'); $this->queried_object = get_post( $page_for_posts ); $this->queried_object_id = (int) $this->queried_object->ID; - } elseif ( $this->is_singular && !is_null($this->post) ) { + } elseif ( $this->is_singular && ! empty( $this->post ) ) { $this->queried_object = $this->post; $this->queried_object_id = (int) $this->post->ID; } elseif ( $this->is_author ) { @@ -3716,7 +4092,7 @@ class WP_Query { * * @return int */ - function get_queried_object_id() { + public function get_queried_object_id() { $this->get_queried_object(); if ( isset($this->queried_object_id) ) { @@ -3734,15 +4110,61 @@ class WP_Query { * @since 1.5.0 * @access public * - * @param string $query URL query string. - * @return WP_Query + * @param string|array $query URL query string or array of vars. */ - function __construct($query = '') { + public function __construct($query = '') { if ( ! empty($query) ) { $this->query($query); } } + /** + * Make private properties readable for backwards compatibility. + * + * @since 4.0.0 + * @access public + * + * @param string $name Property to get. + * @return mixed Property. + */ + public function __get( $name ) { + if ( in_array( $name, $this->compat_fields ) ) { + return $this->$name; + } + } + + /** + * Make private properties checkable for backwards compatibility. + * + * @since 4.0.0 + * @access public + * + * @param string $name Property to check if set. + * @return bool Whether the property is set. + */ + public function __isset( $name ) { + if ( in_array( $name, $this->compat_fields ) ) { + return isset( $this->$name ); + } + } + + /** + * Make private/protected methods readable for backwards compatibility. + * + * @since 4.0.0 + * @access public + * + * @param callable $name Method to call. + * @param array $arguments Arguments to pass when calling. + * @return mixed|false Return value of the callback, false otherwise. + */ + public function __call( $name, $arguments ) { + if ( in_array( $name, $this->compat_methods ) ) { + return call_user_func_array( array( $this, $name ), $arguments ); + } + return false; + } + /** * Is the query for an existing archive page? * @@ -3752,7 +4174,7 @@ class WP_Query { * * @return bool */ - function is_archive() { + public function is_archive() { return (bool) $this->is_archive; } @@ -3764,7 +4186,7 @@ class WP_Query { * @param mixed $post_types Optional. Post type or array of posts types to check against. * @return bool */ - function is_post_type_archive( $post_types = '' ) { + public function is_post_type_archive( $post_types = '' ) { if ( empty( $post_types ) || ! $this->is_post_type_archive ) return (bool) $this->is_post_type_archive; @@ -3784,7 +4206,7 @@ class WP_Query { * @param mixed $attachment Attachment ID, title, slug, or array of such. * @return bool */ - function is_attachment( $attachment = '' ) { + public function is_attachment( $attachment = '' ) { if ( ! $this->is_attachment ) { return false; } @@ -3793,11 +4215,11 @@ class WP_Query { return true; } - $attachment = (array) $attachment; + $attachment = array_map( 'strval', (array) $attachment ); $post_obj = $this->get_queried_object(); - if ( in_array( $post_obj->ID, $attachment ) ) { + if ( in_array( (string) $post_obj->ID, $attachment ) ) { return true; } elseif ( in_array( $post_obj->post_title, $attachment ) ) { return true; @@ -3818,7 +4240,7 @@ class WP_Query { * @param mixed $author Optional. User ID, nickname, nicename, or array of User IDs, nicknames, and nicenames * @return bool */ - function is_author( $author = '' ) { + public function is_author( $author = '' ) { if ( !$this->is_author ) return false; @@ -3827,9 +4249,9 @@ class WP_Query { $author_obj = $this->get_queried_object(); - $author = (array) $author; + $author = array_map( 'strval', (array) $author ); - if ( in_array( $author_obj->ID, $author ) ) + if ( in_array( (string) $author_obj->ID, $author ) ) return true; elseif ( in_array( $author_obj->nickname, $author ) ) return true; @@ -3850,7 +4272,7 @@ class WP_Query { * @param mixed $category Optional. Category ID, name, slug, or array of Category IDs, names, and slugs. * @return bool */ - function is_category( $category = '' ) { + public function is_category( $category = '' ) { if ( !$this->is_category ) return false; @@ -3859,9 +4281,9 @@ class WP_Query { $cat_obj = $this->get_queried_object(); - $category = (array) $category; + $category = array_map( 'strval', (array) $category ); - if ( in_array( $cat_obj->term_id, $category ) ) + if ( in_array( (string) $cat_obj->term_id, $category ) ) return true; elseif ( in_array( $cat_obj->name, $category ) ) return true; @@ -3882,7 +4304,7 @@ class WP_Query { * @param mixed $tag Optional. Tag ID, name, slug, or array of Tag IDs, names, and slugs. * @return bool */ - function is_tag( $tag = '' ) { + public function is_tag( $tag = '' ) { if ( ! $this->is_tag ) return false; @@ -3891,9 +4313,9 @@ class WP_Query { $tag_obj = $this->get_queried_object(); - $tag = (array) $tag; + $tag = array_map( 'strval', (array) $tag ); - if ( in_array( $tag_obj->term_id, $tag ) ) + if ( in_array( (string) $tag_obj->term_id, $tag ) ) return true; elseif ( in_array( $tag_obj->name, $tag ) ) return true; @@ -3915,11 +4337,13 @@ class WP_Query { * * @since 3.1.0 * + * @global array $wp_taxonomies + * * @param mixed $taxonomy Optional. Taxonomy slug or slugs. - * @param mixed $term. Optional. Term ID, name, slug or array of Term IDs, names, and slugs. + * @param mixed $term Optional. Term ID, name, slug or array of Term IDs, names, and slugs. * @return bool */ - function is_tax( $taxonomy = '', $term = '' ) { + public function is_tax( $taxonomy = '', $term = '' ) { global $wp_taxonomies; if ( !$this->is_tax ) @@ -3951,11 +4375,14 @@ class WP_Query { * Whether the current URL is within the comments popup window. * * @since 3.1.0 + * @deprecated 4.5.0 * * @return bool */ - function is_comments_popup() { - return (bool) $this->is_comments_popup; + public function is_comments_popup() { + _deprecated_function( __FUNCTION__, '4.5' ); + + return false; } /** @@ -3965,7 +4392,7 @@ class WP_Query { * * @return bool */ - function is_date() { + public function is_date() { return (bool) $this->is_date; } @@ -3976,7 +4403,7 @@ class WP_Query { * * @return bool */ - function is_day() { + public function is_day() { return (bool) $this->is_day; } @@ -3988,7 +4415,7 @@ class WP_Query { * @param string|array $feeds Optional feed types to check. * @return bool */ - function is_feed( $feeds = '' ) { + public function is_feed( $feeds = '' ) { if ( empty( $feeds ) || ! $this->is_feed ) return (bool) $this->is_feed; $qv = $this->get( 'feed' ); @@ -4004,7 +4431,7 @@ class WP_Query { * * @return bool */ - function is_comment_feed() { + public function is_comment_feed() { return (bool) $this->is_comment_feed; } @@ -4021,12 +4448,10 @@ class WP_Query { * Otherwise the same as @see WP_Query::is_home() * * @since 3.1.0 - * @uses is_home() - * @uses get_option() * * @return bool True, if front of site. */ - function is_front_page() { + public function is_front_page() { // most likely case if ( 'posts' == get_option( 'show_on_front') && $this->is_home() ) return true; @@ -4052,7 +4477,7 @@ class WP_Query { * * @return bool True if blog view homepage. */ - function is_home() { + public function is_home() { return (bool) $this->is_home; } @@ -4063,7 +4488,7 @@ class WP_Query { * * @return bool */ - function is_month() { + public function is_month() { return (bool) $this->is_month; } @@ -4078,10 +4503,10 @@ class WP_Query { * * @since 3.1.0 * - * @param mixed $page Page ID, title, slug, or array of such. - * @return bool + * @param int|string|array $page Optional. Page ID, title, slug, path, or array of such. Default empty. + * @return bool Whether the query is for an existing single page. */ - function is_page( $page = '' ) { + public function is_page( $page = '' ) { if ( !$this->is_page ) return false; @@ -4090,14 +4515,26 @@ class WP_Query { $page_obj = $this->get_queried_object(); - $page = (array) $page; + $page = array_map( 'strval', (array) $page ); - if ( in_array( $page_obj->ID, $page ) ) + if ( in_array( (string) $page_obj->ID, $page ) ) { return true; - elseif ( in_array( $page_obj->post_title, $page ) ) + } elseif ( in_array( $page_obj->post_title, $page ) ) { return true; - else if ( in_array( $page_obj->post_name, $page ) ) + } elseif ( in_array( $page_obj->post_name, $page ) ) { return true; + } else { + foreach ( $page as $pagepath ) { + if ( ! strpos( $pagepath, '/' ) ) { + continue; + } + $pagepath_obj = get_page_by_path( $pagepath ); + + if ( $pagepath_obj && ( $pagepath_obj->ID == $page_obj->ID ) ) { + return true; + } + } + } return false; } @@ -4109,7 +4546,7 @@ class WP_Query { * * @return bool */ - function is_paged() { + public function is_paged() { return (bool) $this->is_paged; } @@ -4120,7 +4557,7 @@ class WP_Query { * * @return bool */ - function is_preview() { + public function is_preview() { return (bool) $this->is_preview; } @@ -4131,7 +4568,7 @@ class WP_Query { * * @return bool */ - function is_robots() { + public function is_robots() { return (bool) $this->is_robots; } @@ -4142,7 +4579,7 @@ class WP_Query { * * @return bool */ - function is_search() { + public function is_search() { return (bool) $this->is_search; } @@ -4159,10 +4596,10 @@ class WP_Query { * * @since 3.1.0 * - * @param mixed $post Post ID, title, slug, or array of such. - * @return bool + * @param int|string|array $post Optional. Post ID, title, slug, path, or array of such. Default empty. + * @return bool Whether the query is for an existing single post. */ - function is_single( $post = '' ) { + public function is_single( $post = '' ) { if ( !$this->is_single ) return false; @@ -4171,15 +4608,26 @@ class WP_Query { $post_obj = $this->get_queried_object(); - $post = (array) $post; + $post = array_map( 'strval', (array) $post ); - if ( in_array( $post_obj->ID, $post ) ) + if ( in_array( (string) $post_obj->ID, $post ) ) { return true; - elseif ( in_array( $post_obj->post_title, $post ) ) + } elseif ( in_array( $post_obj->post_title, $post ) ) { return true; - elseif ( in_array( $post_obj->post_name, $post ) ) + } elseif ( in_array( $post_obj->post_name, $post ) ) { return true; + } else { + foreach ( $post as $postpath ) { + if ( ! strpos( $postpath, '/' ) ) { + continue; + } + $postpath_obj = get_page_by_path( $postpath, OBJECT, $post_obj->post_type ); + if ( $postpath_obj && ( $postpath_obj->ID == $post_obj->ID ) ) { + return true; + } + } + } return false; } @@ -4194,10 +4642,10 @@ class WP_Query { * * @since 3.1.0 * - * @param mixed $post_types Optional. Post Type or array of Post Types - * @return bool + * @param string|array $post_types Optional. Post type or array of post types. Default empty. + * @return bool Whether the query is for an existing single post of any of the given post types. */ - function is_singular( $post_types = '' ) { + public function is_singular( $post_types = '' ) { if ( empty( $post_types ) || !$this->is_singular ) return (bool) $this->is_singular; @@ -4213,7 +4661,7 @@ class WP_Query { * * @return bool */ - function is_time() { + public function is_time() { return (bool) $this->is_time; } @@ -4224,7 +4672,7 @@ class WP_Query { * * @return bool */ - function is_trackback() { + public function is_trackback() { return (bool) $this->is_trackback; } @@ -4235,7 +4683,7 @@ class WP_Query { * * @return bool */ - function is_year() { + public function is_year() { return (bool) $this->is_year; } @@ -4246,36 +4694,186 @@ class WP_Query { * * @return bool */ - function is_404() { + public function is_404() { return (bool) $this->is_404; } + /** + * Is the query for an embedded post? + * + * @since 4.4.0 + * + * @return bool + */ + public function is_embed() { + return (bool) $this->is_embed; + } + /** * Is the query the main query? * * @since 3.3.0 * + * @global WP_Query $wp_query Global WP_Query instance. + * * @return bool */ - function is_main_query() { + public function is_main_query() { global $wp_the_query; return $wp_the_query === $this; } + /** + * Set up global post data. + * + * @since 4.1.0 + * @since 4.4.0 Added the ability to pass a post ID to `$post`. + * + * @global int $id + * @global WP_User $authordata + * @global string|int|bool $currentday + * @global string|int|bool $currentmonth + * @global int $page + * @global array $pages + * @global int $multipage + * @global int $more + * @global int $numpages + * + * @param WP_Post|object|int $post WP_Post instance or Post ID/object. + * @return true True when finished. + */ + public function setup_postdata( $post ) { + global $id, $authordata, $currentday, $currentmonth, $page, $pages, $multipage, $more, $numpages; + + if ( ! ( $post instanceof WP_Post ) ) { + $post = get_post( $post ); + } + + if ( ! $post ) { + return; + } + + $id = (int) $post->ID; + + $authordata = get_userdata($post->post_author); + + $currentday = mysql2date('d.m.y', $post->post_date, false); + $currentmonth = mysql2date('m', $post->post_date, false); + $numpages = 1; + $multipage = 0; + $page = $this->get( 'page' ); + if ( ! $page ) + $page = 1; + + /* + * Force full post content when viewing the permalink for the $post, + * or when on an RSS feed. Otherwise respect the 'more' tag. + */ + if ( $post->ID === get_queried_object_id() && ( $this->is_page() || $this->is_single() ) ) { + $more = 1; + } elseif ( $this->is_feed() ) { + $more = 1; + } else { + $more = 0; + } + + $content = $post->post_content; + if ( false !== strpos( $content, '' ) ) { + $content = str_replace( "\n\n", '', $content ); + $content = str_replace( "\n", '', $content ); + $content = str_replace( "\n", '', $content ); + + // Ignore nextpage at the beginning of the content. + if ( 0 === strpos( $content, '' ) ) + $content = substr( $content, 15 ); + + $pages = explode('', $content); + } else { + $pages = array( $post->post_content ); + } + + /** + * Filter the "pages" derived from splitting the post content. + * + * "Pages" are determined by splitting the post content based on the presence + * of `` tags. + * + * @since 4.4.0 + * + * @param array $pages Array of "pages" derived from the post content. + * of `` tags.. + * @param WP_Post $post Current post object. + */ + $pages = apply_filters( 'content_pagination', $pages, $post ); + + $numpages = count( $pages ); + + if ( $numpages > 1 ) { + if ( $page > 1 ) { + $more = 1; + } + $multipage = 1; + } else { + $multipage = 0; + } + + /** + * Fires once the post data has been setup. + * + * @since 2.8.0 + * @since 4.1.0 Introduced `$this` parameter. + * + * @param WP_Post &$post The Post object (passed by reference). + * @param WP_Query &$this The current Query object (passed by reference). + */ + do_action_ref_array( 'the_post', array( &$post, &$this ) ); + + return true; + } /** * After looping through a nested query, this function * restores the $post global to the current post in this query. * * @since 3.7.0 * - * @return bool + * @global WP_Post $post */ - function reset_postdata() { + public function reset_postdata() { if ( ! empty( $this->post ) ) { $GLOBALS['post'] = $this->post; - setup_postdata( $this->post ); + $this->setup_postdata( $this->post ); } } + + /** + * Lazyload term meta for posts in the loop. + * + * @since 4.4.0 + * @deprecated 4.5.0 See wp_queue_posts_for_term_meta_lazyload(). + * + * @param mixed $check + * @param int $term_id + * @return mixed + */ + public function lazyload_term_meta( $check, $term_id ) { + _deprecated_function( __METHOD__, '4.5.0' ); + return $check; + } + + /** + * Lazyload comment meta for comments in the loop. + * + * @since 4.4.0 + * @deprecated 4.5.0 See wp_queue_comments_for_comment_meta_lazyload(). + * + * @param mixed $check + * @param int $comment_id + * @return mixed + */ + public function lazyload_comment_meta( $check, $comment_id ) { + _deprecated_function( __METHOD__, '4.5.0' ); + return $check; + } } /** @@ -4284,28 +4882,31 @@ class WP_Query { * Attempts to find the current slug from the past slugs. * * @since 2.1.0 - * @uses $wp_query - * @uses $wpdb * - * @return null If no link is found, null is returned. + * @global WP_Query $wp_query Global WP_Query instance. + * @global wpdb $wpdb WordPress database abstraction object. */ function wp_old_slug_redirect() { global $wp_query; - if ( is_404() && '' != $wp_query->query_vars['name'] ) : + + if ( is_404() && '' !== $wp_query->query_vars['name'] ) : global $wpdb; // Guess the current post_type based on the query vars. - if ( get_query_var('post_type') ) - $post_type = get_query_var('post_type'); - elseif ( !empty($wp_query->query_vars['pagename']) ) + if ( get_query_var( 'post_type' ) ) { + $post_type = get_query_var( 'post_type' ); + } elseif ( get_query_var( 'attachment' ) ) { + $post_type = 'attachment'; + } elseif ( ! empty( $wp_query->query_vars['pagename'] ) ) { $post_type = 'page'; - else + } else { $post_type = 'post'; + } if ( is_array( $post_type ) ) { if ( count( $post_type ) > 1 ) return; - $post_type = array_shift( $post_type ); + $post_type = reset( $post_type ); } // Do not attempt redirect for hierarchical post types @@ -4328,10 +4929,26 @@ function wp_old_slug_redirect() { if ( ! $id ) return; - $link = get_permalink($id); + $link = get_permalink( $id ); + + if ( isset( $GLOBALS['wp_query']->query_vars['paged'] ) && $GLOBALS['wp_query']->query_vars['paged'] > 1 ) { + $link = user_trailingslashit( trailingslashit( $link ) . 'page/' . $GLOBALS['wp_query']->query_vars['paged'] ); + } elseif( is_embed() ) { + $link = user_trailingslashit( trailingslashit( $link ) . 'embed' ); + } - if ( !$link ) + /** + * Filter the old slug redirect URL. + * + * @since 4.4.0 + * + * @param string $link The redirect URL. + */ + $link = apply_filters( 'old_slug_redirect_url', $link ); + + if ( ! $link ) { return; + } wp_redirect( $link, 301 ); // Permanent redirect exit; @@ -4342,53 +4959,19 @@ function wp_old_slug_redirect() { * Set up global post data. * * @since 1.5.0 + * @since 4.4.0 Added the ability to pass a post ID to `$post`. * - * @param object $post Post data. - * @uses do_action_ref_array() Calls 'the_post' + * @global WP_Query $wp_query Global WP_Query instance. + * + * @param WP_Post|object|int $post WP_Post instance or Post ID/object. * @return bool True when finished. */ function setup_postdata( $post ) { - global $id, $authordata, $currentday, $currentmonth, $page, $pages, $multipage, $more, $numpages; - - $id = (int) $post->ID; - - $authordata = get_userdata($post->post_author); + global $wp_query; - $currentday = mysql2date('d.m.y', $post->post_date, false); - $currentmonth = mysql2date('m', $post->post_date, false); - $numpages = 1; - $multipage = 0; - $page = get_query_var('page'); - if ( ! $page ) - $page = 1; - if ( is_single() || is_page() || is_feed() ) - $more = 1; - $content = $post->post_content; - if ( false !== strpos( $content, '' ) ) { - if ( $page > 1 ) - $more = 1; - $content = str_replace( "\n\n", '', $content ); - $content = str_replace( "\n", '', $content ); - $content = str_replace( "\n", '', $content ); - // Ignore nextpage at the beginning of the content. - if ( 0 === strpos( $content, '' ) ) - $content = substr( $content, 15 ); - $pages = explode('', $content); - $numpages = count($pages); - if ( $numpages > 1 ) - $multipage = 1; - } else { - $pages = array( $post->post_content ); + if ( ! empty( $wp_query ) && $wp_query instanceof WP_Query ) { + return $wp_query->setup_postdata( $post ); } - /** - * Fires once the post data has been setup. - * - * @since 2.8.0 - * - * @param WP_Post &$post The Post object (passed by reference). - */ - do_action_ref_array( 'the_post', array( &$post ) ); - - return true; + return false; } diff --git a/wp-includes/random_compat/byte_safe_strings.php b/wp-includes/random_compat/byte_safe_strings.php new file mode 100644 index 0000000..ae3b7b9 --- /dev/null +++ b/wp-includes/random_compat/byte_safe_strings.php @@ -0,0 +1,173 @@ +<?php +/** + * Random_* Compatibility Library + * for using the new PHP 7 random_* API in PHP 5 projects + * + * The MIT License (MIT) + * + * Copyright (c) 2015 Paragon Initiative Enterprises + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +if (!function_exists('RandomCompat_strlen')) { + if ( + defined('MB_OVERLOAD_STRING') && + ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING + ) { + /** + * strlen() implementation that isn't brittle to mbstring.func_overload + * + * This version uses mb_strlen() in '8bit' mode to treat strings as raw + * binary rather than UTF-8, ISO-8859-1, etc + * + * @param string $binary_string + * + * @throws TypeError + * + * @return int + */ + function RandomCompat_strlen($binary_string) + { + if (!is_string($binary_string)) { + throw new TypeError( + 'RandomCompat_strlen() expects a string' + ); + } + + return mb_strlen($binary_string, '8bit'); + } + + } else { + /** + * strlen() implementation that isn't brittle to mbstring.func_overload + * + * This version just used the default strlen() + * + * @param string $binary_string + * + * @throws TypeError + * + * @return int + */ + function RandomCompat_strlen($binary_string) + { + if (!is_string($binary_string)) { + throw new TypeError( + 'RandomCompat_strlen() expects a string' + ); + } + return strlen($binary_string); + } + } +} + +if (!function_exists('RandomCompat_substr')) { + + if ( + defined('MB_OVERLOAD_STRING') + && + ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING + ) { + /** + * substr() implementation that isn't brittle to mbstring.func_overload + * + * This version uses mb_substr() in '8bit' mode to treat strings as raw + * binary rather than UTF-8, ISO-8859-1, etc + * + * @param string $binary_string + * @param int $start + * @param int $length (optional) + * + * @throws TypeError + * + * @return string + */ + function RandomCompat_substr($binary_string, $start, $length = null) + { + if (!is_string($binary_string)) { + throw new TypeError( + 'RandomCompat_substr(): First argument should be a string' + ); + } + + if (!is_int($start)) { + throw new TypeError( + 'RandomCompat_substr(): Second argument should be an integer' + ); + } + + if ($length === null) { + /** + * mb_substr($str, 0, NULL, '8bit') returns an empty string on + * PHP 5.3, so we have to find the length ourselves. + */ + $length = RandomCompat_strlen($length) - $start; + } elseif (!is_int($length)) { + throw new TypeError( + 'RandomCompat_substr(): Third argument should be an integer, or omitted' + ); + } + + return mb_substr($binary_string, $start, $length, '8bit'); + } + + } else { + + /** + * substr() implementation that isn't brittle to mbstring.func_overload + * + * This version just uses the default substr() + * + * @param string $binary_string + * @param int $start + * @param int $length (optional) + * + * @throws TypeError + * + * @return string + */ + function RandomCompat_substr($binary_string, $start, $length = null) + { + if (!is_string($binary_string)) { + throw new TypeError( + 'RandomCompat_substr(): First argument should be a string' + ); + } + + if (!is_int($start)) { + throw new TypeError( + 'RandomCompat_substr(): Second argument should be an integer' + ); + } + + if ($length !== null) { + if (!is_int($length)) { + throw new TypeError( + 'RandomCompat_substr(): Third argument should be an integer, or omitted' + ); + } + + return substr($binary_string, $start, $length); + } + + return substr($binary_string, $start); + } + } +} diff --git a/wp-includes/random_compat/cast_to_int.php b/wp-includes/random_compat/cast_to_int.php new file mode 100644 index 0000000..f441c5d --- /dev/null +++ b/wp-includes/random_compat/cast_to_int.php @@ -0,0 +1,71 @@ +<?php +/** + * Random_* Compatibility Library + * for using the new PHP 7 random_* API in PHP 5 projects + * + * The MIT License (MIT) + * + * Copyright (c) 2015 Paragon Initiative Enterprises + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +if (!function_exists('RandomCompat_intval')) { + + /** + * Cast to an integer if we can, safely. + * + * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX) + * (non-inclusive), it will sanely cast it to an int. If you it's equal to + * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats + * lose precision, so the <= and => operators might accidentally let a float + * through. + * + * @param int|float $number The number we want to convert to an int + * @param boolean $fail_open Set to true to not throw an exception + * + * @return int (or float if $fail_open) + * + * @throws TypeError + */ + function RandomCompat_intval($number, $fail_open = false) + { + if (is_numeric($number)) { + $number += 0; + } + + if ( + is_float($number) + && + $number > ~PHP_INT_MAX + && + $number < PHP_INT_MAX + ) { + $number = (int) $number; + } + + if (is_int($number) || $fail_open) { + return $number; + } + + throw new TypeError( + 'Expected an integer.' + ); + } +} diff --git a/wp-includes/random_compat/error_polyfill.php b/wp-includes/random_compat/error_polyfill.php new file mode 100644 index 0000000..57cfefd --- /dev/null +++ b/wp-includes/random_compat/error_polyfill.php @@ -0,0 +1,42 @@ +<?php +/** + * Random_* Compatibility Library + * for using the new PHP 7 random_* API in PHP 5 projects + * + * The MIT License (MIT) + * + * Copyright (c) 2015 Paragon Initiative Enterprises + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +if (!class_exists('Error', false)) { + // We can't really avoid making this extend Exception in PHP 5. + class Error extends Exception + { + + } +} + +if (!class_exists('TypeError', false)) { + class TypeError extends Error + { + + } +} diff --git a/wp-includes/random_compat/random.php b/wp-includes/random_compat/random.php new file mode 100644 index 0000000..595115e --- /dev/null +++ b/wp-includes/random_compat/random.php @@ -0,0 +1,217 @@ +<?php +/** + * Random_* Compatibility Library + * for using the new PHP 7 random_* API in PHP 5 projects + * + * @version 1.2.1 + * @released 2016-02-29 + * + * The MIT License (MIT) + * + * Copyright (c) 2015 Paragon Initiative Enterprises + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +if (!defined('PHP_VERSION_ID')) { + // This constant was introduced in PHP 5.2.7 + $RandomCompatversion = explode('.', PHP_VERSION); + define( + 'PHP_VERSION_ID', + $RandomCompatversion[0] * 10000 + + $RandomCompatversion[1] * 100 + + $RandomCompatversion[2] + ); + $RandomCompatversion = null; +} + +if (PHP_VERSION_ID < 70000) { + + if (!defined('RANDOM_COMPAT_READ_BUFFER')) { + define('RANDOM_COMPAT_READ_BUFFER', 8); + } + + $RandomCompatDIR = dirname(__FILE__); + + require_once $RandomCompatDIR.'/byte_safe_strings.php'; + require_once $RandomCompatDIR.'/cast_to_int.php'; + require_once $RandomCompatDIR.'/error_polyfill.php'; + + if (!function_exists('random_bytes')) { + /** + * PHP 5.2.0 - 5.6.x way to implement random_bytes() + * + * We use conditional statements here to define the function in accordance + * to the operating environment. It's a micro-optimization. + * + * In order of preference: + * 1. Use libsodium if available. + * 2. fread() /dev/urandom if available (never on Windows) + * 3. mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM) + * 4. COM('CAPICOM.Utilities.1')->GetRandom() + * 5. openssl_random_pseudo_bytes() (absolute last resort) + * + * See ERRATA.md for our reasoning behind this particular order + */ + if (extension_loaded('libsodium')) { + // See random_bytes_libsodium.php + if (PHP_VERSION_ID >= 50300 && function_exists('\\Sodium\\randombytes_buf')) { + require_once $RandomCompatDIR.'/random_bytes_libsodium.php'; + } elseif (method_exists('Sodium', 'randombytes_buf')) { + require_once $RandomCompatDIR.'/random_bytes_libsodium_legacy.php'; + } + } + + /** + * Reading directly from /dev/urandom: + */ + if (DIRECTORY_SEPARATOR === '/') { + // DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast + // way to exclude Windows. + $RandomCompatUrandom = true; + $RandomCompat_basedir = ini_get('open_basedir'); + + if (!empty($RandomCompat_basedir)) { + $RandomCompat_open_basedir = explode( + PATH_SEPARATOR, + strtolower($RandomCompat_basedir) + ); + $RandomCompatUrandom = in_array( + '/dev', + $RandomCompat_open_basedir + ); + $RandomCompat_open_basedir = null; + } + + if ( + !function_exists('random_bytes') + && + $RandomCompatUrandom + && + @is_readable('/dev/urandom') + ) { + // Error suppression on is_readable() in case of an open_basedir + // or safe_mode failure. All we care about is whether or not we + // can read it at this point. If the PHP environment is going to + // panic over trying to see if the file can be read in the first + // place, that is not helpful to us here. + + // See random_bytes_dev_urandom.php + require_once $RandomCompatDIR.'/random_bytes_dev_urandom.php'; + } + // Unset variables after use + $RandomCompat_basedir = null; + $RandomCompatUrandom = null; + } + + /** + * mcrypt_create_iv() + */ + if ( + !function_exists('random_bytes') + && + PHP_VERSION_ID >= 50307 + && + extension_loaded('mcrypt') + ) { + // Prevent this code from hanging indefinitely on non-Windows; + // see https://bugs.php.net/bug.php?id=69833 + if ( + DIRECTORY_SEPARATOR !== '/' || + (PHP_VERSION_ID <= 50609 || PHP_VERSION_ID >= 50613) + ) { + // See random_bytes_mcrypt.php + require_once $RandomCompatDIR.'/random_bytes_mcrypt.php'; + } + } + + if ( + !function_exists('random_bytes') + && + extension_loaded('com_dotnet') + && + class_exists('COM') + ) { + $RandomCompat_disabled_classes = preg_split( + '#\s*,\s*#', + strtolower(ini_get('disable_classes')) + ); + + if (!in_array('com', $RandomCompat_disabled_classes)) { + try { + $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1'); + if (method_exists($RandomCompatCOMtest, 'GetRandom')) { + // See random_bytes_com_dotnet.php + require_once $RandomCompatDIR.'/random_bytes_com_dotnet.php'; + } + } catch (com_exception $e) { + // Don't try to use it. + } + } + $RandomCompat_disabled_classes = null; + $RandomCompatCOMtest = null; + } + + /** + * openssl_random_pseudo_bytes() + */ + if ( + ( + // Unix-like with PHP >= 5.3.0 or + ( + DIRECTORY_SEPARATOR === '/' + && + PHP_VERSION_ID >= 50300 + ) + || + // Windows with PHP >= 5.4.1 + PHP_VERSION_ID >= 50401 + ) + && + !function_exists('random_bytes') + && + extension_loaded('openssl') + ) { + // See random_bytes_openssl.php + require_once $RandomCompatDIR.'/random_bytes_openssl.php'; + } + + /** + * throw new Exception + */ + if (!function_exists('random_bytes')) { + /** + * We don't have any more options, so let's throw an exception right now + * and hope the developer won't let it fail silently. + */ + function random_bytes($length) + { + throw new Exception( + 'There is no suitable CSPRNG installed on your system' + ); + } + } + } + + if (!function_exists('random_int')) { + require_once $RandomCompatDIR.'/random_int.php'; + } + + $RandomCompatDIR = null; +} diff --git a/wp-includes/random_compat/random_bytes_com_dotnet.php b/wp-includes/random_compat/random_bytes_com_dotnet.php new file mode 100644 index 0000000..3422825 --- /dev/null +++ b/wp-includes/random_compat/random_bytes_com_dotnet.php @@ -0,0 +1,81 @@ +<?php +/** + * Random_* Compatibility Library + * for using the new PHP 7 random_* API in PHP 5 projects + * + * The MIT License (MIT) + * + * Copyright (c) 2015 Paragon Initiative Enterprises + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +/** + * Windows with PHP < 5.3.0 will not have the function + * openssl_random_pseudo_bytes() available, so let's use + * CAPICOM to work around this deficiency. + * + * @param int $bytes + * + * @throws Exception + * + * @return string + */ +function random_bytes($bytes) +{ + try { + $bytes = RandomCompat_intval($bytes); + } catch (TypeError $ex) { + throw new TypeError( + 'random_bytes(): $bytes must be an integer' + ); + } + + if ($bytes < 1) { + throw new Error( + 'Length must be greater than 0' + ); + } + + $buf = ''; + $util = new COM('CAPICOM.Utilities.1'); + $execCount = 0; + + /** + * Let's not let it loop forever. If we run N times and fail to + * get N bytes of random data, then CAPICOM has failed us. + */ + do { + $buf .= base64_decode($util->GetRandom($bytes, 0)); + if (RandomCompat_strlen($buf) >= $bytes) { + /** + * Return our random entropy buffer here: + */ + return RandomCompat_substr($buf, 0, $bytes); + } + ++$execCount; + } while ($execCount < $bytes); + + /** + * If we reach here, PHP has failed us. + */ + throw new Exception( + 'Could not gather sufficient random data' + ); +} diff --git a/wp-includes/random_compat/random_bytes_dev_urandom.php b/wp-includes/random_compat/random_bytes_dev_urandom.php new file mode 100644 index 0000000..db93b07 --- /dev/null +++ b/wp-includes/random_compat/random_bytes_dev_urandom.php @@ -0,0 +1,148 @@ +<?php +/** + * Random_* Compatibility Library + * for using the new PHP 7 random_* API in PHP 5 projects + * + * The MIT License (MIT) + * + * Copyright (c) 2015 Paragon Initiative Enterprises + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +if (!defined('RANDOM_COMPAT_READ_BUFFER')) { + define('RANDOM_COMPAT_READ_BUFFER', 8); +} + +/** + * Unless open_basedir is enabled, use /dev/urandom for + * random numbers in accordance with best practices + * + * Why we use /dev/urandom and not /dev/random + * @ref http://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers + * + * @param int $bytes + * + * @throws Exception + * + * @return string + */ +function random_bytes($bytes) +{ + static $fp = null; + /** + * This block should only be run once + */ + if (empty($fp)) { + /** + * We use /dev/urandom if it is a char device. + * We never fall back to /dev/random + */ + $fp = fopen('/dev/urandom', 'rb'); + if (!empty($fp)) { + $st = fstat($fp); + if (($st['mode'] & 0170000) !== 020000) { + fclose($fp); + $fp = false; + } + } + + if (!empty($fp)) { + /** + * stream_set_read_buffer() does not exist in HHVM + * + * If we don't set the stream's read buffer to 0, PHP will + * internally buffer 8192 bytes, which can waste entropy + * + * stream_set_read_buffer returns 0 on success + */ + if (function_exists('stream_set_read_buffer')) { + stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER); + } + if (function_exists('stream_set_chunk_size')) { + stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER); + } + } + } + + try { + $bytes = RandomCompat_intval($bytes); + } catch (TypeError $ex) { + throw new TypeError( + 'random_bytes(): $bytes must be an integer' + ); + } + + if ($bytes < 1) { + throw new Error( + 'Length must be greater than 0' + ); + } + + /** + * This if() block only runs if we managed to open a file handle + * + * It does not belong in an else {} block, because the above + * if (empty($fp)) line is logic that should only be run once per + * page load. + */ + if (!empty($fp)) { + $remaining = $bytes; + $buf = ''; + + /** + * We use fread() in a loop to protect against partial reads + */ + do { + $read = fread($fp, $remaining); + if ($read === false) { + /** + * We cannot safely read from the file. Exit the + * do-while loop and trigger the exception condition + */ + $buf = false; + break; + } + /** + * Decrease the number of bytes returned from remaining + */ + $remaining -= RandomCompat_strlen($read); + $buf .= $read; + } while ($remaining > 0); + + /** + * Is our result valid? + */ + if ($buf !== false) { + if (RandomCompat_strlen($buf) === $bytes) { + /** + * Return our random entropy buffer here: + */ + return $buf; + } + } + } + + /** + * If we reach here, PHP has failed us. + */ + throw new Exception( + 'Error reading from source device' + ); +} diff --git a/wp-includes/random_compat/random_bytes_libsodium.php b/wp-includes/random_compat/random_bytes_libsodium.php new file mode 100644 index 0000000..f802d4e --- /dev/null +++ b/wp-includes/random_compat/random_bytes_libsodium.php @@ -0,0 +1,86 @@ +<?php +/** + * Random_* Compatibility Library + * for using the new PHP 7 random_* API in PHP 5 projects + * + * The MIT License (MIT) + * + * Copyright (c) 2015 Paragon Initiative Enterprises + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +/** + * If the libsodium PHP extension is loaded, we'll use it above any other + * solution. + * + * libsodium-php project: + * @ref https://github.com/jedisct1/libsodium-php + * + * @param int $bytes + * + * @throws Exception + * + * @return string + */ +function random_bytes($bytes) +{ + try { + $bytes = RandomCompat_intval($bytes); + } catch (TypeError $ex) { + throw new TypeError( + 'random_bytes(): $bytes must be an integer' + ); + } + + if ($bytes < 1) { + throw new Error( + 'Length must be greater than 0' + ); + } + + /** + * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be + * generated in one invocation. + */ + if ($bytes > 2147483647) { + $buf = ''; + for ($i = 0; $i < $bytes; $i += 1073741824) { + $n = ($bytes - $i) > 1073741824 + ? 1073741824 + : $bytes - $i; + $buf .= \Sodium\randombytes_buf($n); + } + } else { + $buf = \Sodium\randombytes_buf($bytes); + } + + if ($buf !== false) { + if (RandomCompat_strlen($buf) === $bytes) { + return $buf; + } + } + + /** + * If we reach here, PHP has failed us. + */ + throw new Exception( + 'Could not gather sufficient random data' + ); +} diff --git a/wp-includes/random_compat/random_bytes_libsodium_legacy.php b/wp-includes/random_compat/random_bytes_libsodium_legacy.php new file mode 100644 index 0000000..44fddbf --- /dev/null +++ b/wp-includes/random_compat/random_bytes_libsodium_legacy.php @@ -0,0 +1,86 @@ +<?php +/** + * Random_* Compatibility Library + * for using the new PHP 7 random_* API in PHP 5 projects + * + * The MIT License (MIT) + * + * Copyright (c) 2015 Paragon Initiative Enterprises + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +/** + * If the libsodium PHP extension is loaded, we'll use it above any other + * solution. + * + * libsodium-php project: + * @ref https://github.com/jedisct1/libsodium-php + * + * @param int $bytes + * + * @throws Exception + * + * @return string + */ +function random_bytes($bytes) +{ + try { + $bytes = RandomCompat_intval($bytes); + } catch (TypeError $ex) { + throw new TypeError( + 'random_bytes(): $bytes must be an integer' + ); + } + + if ($bytes < 1) { + throw new Error( + 'Length must be greater than 0' + ); + } + + /** + * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be + * generated in one invocation. + */ + if ($bytes > 2147483647) { + $buf = ''; + for ($i = 0; $i < $bytes; $i += 1073741824) { + $n = ($bytes - $i) > 1073741824 + ? 1073741824 + : $bytes - $i; + $buf .= Sodium::randombytes_buf($n); + } + } else { + $buf = Sodium::randombytes_buf($bytes); + } + + if ($buf !== false) { + if (RandomCompat_strlen($buf) === $bytes) { + return $buf; + } + } + + /** + * If we reach here, PHP has failed us. + */ + throw new Exception( + 'Could not gather sufficient random data' + ); +} diff --git a/wp-includes/random_compat/random_bytes_mcrypt.php b/wp-includes/random_compat/random_bytes_mcrypt.php new file mode 100644 index 0000000..7ac9d91 --- /dev/null +++ b/wp-includes/random_compat/random_bytes_mcrypt.php @@ -0,0 +1,76 @@ +<?php +/** + * Random_* Compatibility Library + * for using the new PHP 7 random_* API in PHP 5 projects + * + * The MIT License (MIT) + * + * Copyright (c) 2015 Paragon Initiative Enterprises + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + + +/** + * Powered by ext/mcrypt (and thankfully NOT libmcrypt) + * + * @ref https://bugs.php.net/bug.php?id=55169 + * @ref https://github.com/php/php-src/blob/c568ffe5171d942161fc8dda066bce844bdef676/ext/mcrypt/mcrypt.c#L1321-L1386 + * + * @param int $bytes + * + * @throws Exception + * + * @return string + */ +function random_bytes($bytes) +{ + try { + $bytes = RandomCompat_intval($bytes); + } catch (TypeError $ex) { + throw new TypeError( + 'random_bytes(): $bytes must be an integer' + ); + } + + if ($bytes < 1) { + throw new Error( + 'Length must be greater than 0' + ); + } + + $buf = @mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM); + if ( + $buf !== false + && + RandomCompat_strlen($buf) === $bytes + ) { + /** + * Return our random entropy buffer here: + */ + return $buf; + } + + /** + * If we reach here, PHP has failed us. + */ + throw new Exception( + 'Could not gather sufficient random data' + ); +} diff --git a/wp-includes/random_compat/random_bytes_openssl.php b/wp-includes/random_compat/random_bytes_openssl.php new file mode 100644 index 0000000..62bf770 --- /dev/null +++ b/wp-includes/random_compat/random_bytes_openssl.php @@ -0,0 +1,83 @@ +<?php +/** + * Random_* Compatibility Library + * for using the new PHP 7 random_* API in PHP 5 projects + * + * The MIT License (MIT) + * + * Copyright (c) 2015 Paragon Initiative Enterprises + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +/** + * Since openssl_random_pseudo_bytes() uses openssl's + * RAND_pseudo_bytes() API, which has been marked as deprecated by the + * OpenSSL team, this is our last resort before failure. + * + * @ref https://www.openssl.org/docs/crypto/RAND_bytes.html + * + * @param int $bytes + * + * @throws Exception + * + * @return string + */ +function random_bytes($bytes) +{ + try { + $bytes = RandomCompat_intval($bytes); + } catch (TypeError $ex) { + throw new TypeError( + 'random_bytes(): $bytes must be an integer' + ); + } + + if ($bytes < 1) { + throw new Error( + 'Length must be greater than 0' + ); + } + + /** + * $secure is passed by reference. If it's set to false, fail. Note + * that this will only return false if this function fails to return + * any data. + * + * @ref https://github.com/paragonie/random_compat/issues/6#issuecomment-119564973 + */ + $secure = true; + $buf = openssl_random_pseudo_bytes($bytes, $secure); + if ( + $buf !== false + && + $secure + && + RandomCompat_strlen($buf) === $bytes + ) { + return $buf; + } + + /** + * If we reach here, PHP has failed us. + */ + throw new Exception( + 'Could not gather sufficient random data' + ); +} diff --git a/wp-includes/random_compat/random_int.php b/wp-includes/random_compat/random_int.php new file mode 100644 index 0000000..fd3ef87 --- /dev/null +++ b/wp-includes/random_compat/random_int.php @@ -0,0 +1,191 @@ +<?php +/** + * Random_* Compatibility Library + * for using the new PHP 7 random_* API in PHP 5 projects + * + * The MIT License (MIT) + * + * Copyright (c) 2015 Paragon Initiative Enterprises + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +/** + * Fetch a random integer between $min and $max inclusive + * + * @param int $min + * @param int $max + * + * @throws Exception + * + * @return int + */ +function random_int($min, $max) +{ + /** + * Type and input logic checks + * + * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX) + * (non-inclusive), it will sanely cast it to an int. If you it's equal to + * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats + * lose precision, so the <= and => operators might accidentally let a float + * through. + */ + + try { + $min = RandomCompat_intval($min); + } catch (TypeError $ex) { + throw new TypeError( + 'random_int(): $min must be an integer' + ); + } + + try { + $max = RandomCompat_intval($max); + } catch (TypeError $ex) { + throw new TypeError( + 'random_int(): $max must be an integer' + ); + } + + /** + * Now that we've verified our weak typing system has given us an integer, + * let's validate the logic then we can move forward with generating random + * integers along a given range. + */ + if ($min > $max) { + throw new Error( + 'Minimum value must be less than or equal to the maximum value' + ); + } + + if ($max === $min) { + return $min; + } + + /** + * Initialize variables to 0 + * + * We want to store: + * $bytes => the number of random bytes we need + * $mask => an integer bitmask (for use with the &) operator + * so we can minimize the number of discards + */ + $attempts = $bits = $bytes = $mask = $valueShift = 0; + + /** + * At this point, $range is a positive number greater than 0. It might + * overflow, however, if $max - $min > PHP_INT_MAX. PHP will cast it to + * a float and we will lose some precision. + */ + $range = $max - $min; + + /** + * Test for integer overflow: + */ + if (!is_int($range)) { + + /** + * Still safely calculate wider ranges. + * Provided by @CodesInChaos, @oittaa + * + * @ref https://gist.github.com/CodesInChaos/03f9ea0b58e8b2b8d435 + * + * We use ~0 as a mask in this case because it generates all 1s + * + * @ref https://eval.in/400356 (32-bit) + * @ref http://3v4l.org/XX9r5 (64-bit) + */ + $bytes = PHP_INT_SIZE; + $mask = ~0; + + } else { + + /** + * $bits is effectively ceil(log($range, 2)) without dealing with + * type juggling + */ + while ($range > 0) { + if ($bits % 8 === 0) { + ++$bytes; + } + ++$bits; + $range >>= 1; + $mask = $mask << 1 | 1; + } + $valueShift = $min; + } + + /** + * Now that we have our parameters set up, let's begin generating + * random integers until one falls between $min and $max + */ + do { + /** + * The rejection probability is at most 0.5, so this corresponds + * to a failure probability of 2^-128 for a working RNG + */ + if ($attempts > 128) { + throw new Exception( + 'random_int: RNG is broken - too many rejections' + ); + } + + /** + * Let's grab the necessary number of random bytes + */ + $randomByteString = random_bytes($bytes); + if ($randomByteString === false) { + throw new Exception( + 'Random number generator failure' + ); + } + + /** + * Let's turn $randomByteString into an integer + * + * This uses bitwise operators (<< and |) to build an integer + * out of the values extracted from ord() + * + * Example: [9F] | [6D] | [32] | [0C] => + * 159 + 27904 + 3276800 + 201326592 => + * 204631455 + */ + $val = 0; + for ($i = 0; $i < $bytes; ++$i) { + $val |= ord($randomByteString[$i]) << ($i * 8); + } + + /** + * Apply mask + */ + $val &= $mask; + $val += $valueShift; + + ++$attempts; + /** + * If $val overflows to a floating point number, + * ... or is larger than $max, + * ... or smaller than $min, + * then try again. + */ + } while (!is_int($val) || $val > $max || $val < $min); + + return (int) $val; +} diff --git a/wp-includes/rest-api.php b/wp-includes/rest-api.php new file mode 100644 index 0000000..2375676 --- /dev/null +++ b/wp-includes/rest-api.php @@ -0,0 +1,668 @@ +<?php +/** + * REST API functions. + * + * @package WordPress + * @subpackage REST_API + * @since 4.4.0 + */ + +/** + * Version number for our API. + * + * @var string + */ +define( 'REST_API_VERSION', '2.0' ); + +/** + * Registers a REST API route. + * + * @since 4.4.0 + * + * @global WP_REST_Server $wp_rest_server ResponseHandler instance (usually WP_REST_Server). + * + * @param string $namespace The first URL segment after core prefix. Should be unique to your package/plugin. + * @param string $route The base URL for route you are adding. + * @param array $args Optional. Either an array of options for the endpoint, or an array of arrays for + * multiple methods. Default empty array. + * @param bool $override Optional. If the route already exists, should we override it? True overrides, + * false merges (with newer overriding if duplicate keys exist). Default false. + * @return bool True on success, false on error. + */ +function register_rest_route( $namespace, $route, $args = array(), $override = false ) { + /** @var WP_REST_Server $wp_rest_server */ + global $wp_rest_server; + + if ( empty( $namespace ) ) { + /* + * Non-namespaced routes are not allowed, with the exception of the main + * and namespace indexes. If you really need to register a + * non-namespaced route, call `WP_REST_Server::register_route` directly. + */ + _doing_it_wrong( 'register_rest_route', __( 'Routes must be namespaced with plugin or theme name and version.' ), '4.4.0' ); + return false; + } else if ( empty( $route ) ) { + _doing_it_wrong( 'register_rest_route', __( 'Route must be specified.' ), '4.4.0' ); + return false; + } + + if ( isset( $args['callback'] ) ) { + // Upgrade a single set to multiple. + $args = array( $args ); + } + + $defaults = array( + 'methods' => 'GET', + 'callback' => null, + 'args' => array(), + ); + foreach ( $args as $key => &$arg_group ) { + if ( ! is_numeric( $arg_group ) ) { + // Route option, skip here. + continue; + } + + $arg_group = array_merge( $defaults, $arg_group ); + } + + $full_route = '/' . trim( $namespace, '/' ) . '/' . trim( $route, '/' ); + $wp_rest_server->register_route( $namespace, $full_route, $args, $override ); + return true; +} + +/** + * Registers rewrite rules for the API. + * + * @since 4.4.0 + * + * @see rest_api_register_rewrites() + * @global WP $wp Current WordPress environment instance. + */ +function rest_api_init() { + rest_api_register_rewrites(); + + global $wp; + $wp->add_query_var( 'rest_route' ); +} + +/** + * Adds REST rewrite rules. + * + * @since 4.4.0 + * + * @see add_rewrite_rule() + */ +function rest_api_register_rewrites() { + add_rewrite_rule( '^' . rest_get_url_prefix() . '/?$','index.php?rest_route=/','top' ); + add_rewrite_rule( '^' . rest_get_url_prefix() . '/(.*)?','index.php?rest_route=/$matches[1]','top' ); +} + +/** + * Registers the default REST API filters. + * + * Attached to the {@see 'rest_api_init'} action + * to make testing and disabling these filters easier. + * + * @since 4.4.0 + */ +function rest_api_default_filters() { + // Deprecated reporting. + add_action( 'deprecated_function_run', 'rest_handle_deprecated_function', 10, 3 ); + add_filter( 'deprecated_function_trigger_error', '__return_false' ); + add_action( 'deprecated_argument_run', 'rest_handle_deprecated_argument', 10, 3 ); + add_filter( 'deprecated_argument_trigger_error', '__return_false' ); + + // Default serving. + add_filter( 'rest_pre_serve_request', 'rest_send_cors_headers' ); + add_filter( 'rest_post_dispatch', 'rest_send_allow_header', 10, 3 ); + + add_filter( 'rest_pre_dispatch', 'rest_handle_options_request', 10, 3 ); +} + +/** + * Loads the REST API. + * + * @since 4.4.0 + * + * @global WP $wp Current WordPress environment instance. + * @global WP_REST_Server $wp_rest_server ResponseHandler instance (usually WP_REST_Server). + */ +function rest_api_loaded() { + if ( empty( $GLOBALS['wp']->query_vars['rest_route'] ) ) { + return; + } + + /** + * Whether this is a REST Request. + * + * @since 4.4.0 + * @var bool + */ + define( 'REST_REQUEST', true ); + + // Initialize the server. + $server = rest_get_server(); + + // Fire off the request. + $server->serve_request( $GLOBALS['wp']->query_vars['rest_route'] ); + + // We're done. + die(); +} + +/** + * Retrieves the URL prefix for any API resource. + * + * @since 4.4.0 + * + * @return string Prefix. + */ +function rest_get_url_prefix() { + /** + * Filter the REST URL prefix. + * + * @since 4.4.0 + * + * @param string $prefix URL prefix. Default 'wp-json'. + */ + return apply_filters( 'rest_url_prefix', 'wp-json' ); +} + +/** + * Retrieves the URL to a REST endpoint on a site. + * + * Note: The returned URL is NOT escaped. + * + * @since 4.4.0 + * + * @todo Check if this is even necessary + * + * @param int $blog_id Optional. Blog ID. Default of null returns URL for current blog. + * @param string $path Optional. REST route. Default '/'. + * @param string $scheme Optional. Sanitization scheme. Default 'rest'. + * @return string Full URL to the endpoint. + */ +function get_rest_url( $blog_id = null, $path = '/', $scheme = 'rest' ) { + if ( empty( $path ) ) { + $path = '/'; + } + + if ( is_multisite() && get_blog_option( $blog_id, 'permalink_structure' ) || get_option( 'permalink_structure' ) ) { + $url = get_home_url( $blog_id, rest_get_url_prefix(), $scheme ); + $url .= '/' . ltrim( $path, '/' ); + } else { + $url = trailingslashit( get_home_url( $blog_id, '', $scheme ) ); + + $path = '/' . ltrim( $path, '/' ); + + $url = add_query_arg( 'rest_route', $path, $url ); + } + + if ( is_ssl() ) { + // If the current host is the same as the REST URL host, force the REST URL scheme to HTTPS. + if ( $_SERVER['SERVER_NAME'] === parse_url( get_home_url( $blog_id ), PHP_URL_HOST ) ) { + $url = set_url_scheme( $url, 'https' ); + } + } + + /** + * Filter the REST URL. + * + * Use this filter to adjust the url returned by the `get_rest_url` function. + * + * @since 4.4.0 + * + * @param string $url REST URL. + * @param string $path REST route. + * @param int $blog_id Blog ID. + * @param string $scheme Sanitization scheme. + */ + return apply_filters( 'rest_url', $url, $path, $blog_id, $scheme ); +} + +/** + * Retrieves the URL to a REST endpoint. + * + * Note: The returned URL is NOT escaped. + * + * @since 4.4.0 + * + * @param string $path Optional. REST route. Default empty. + * @param string $scheme Optional. Sanitization scheme. Default 'json'. + * @return string Full URL to the endpoint. + */ +function rest_url( $path = '', $scheme = 'json' ) { + return get_rest_url( null, $path, $scheme ); +} + +/** + * Do a REST request. + * + * Used primarily to route internal requests through WP_REST_Server. + * + * @since 4.4.0 + * + * @global WP_REST_Server $wp_rest_server ResponseHandler instance (usually WP_REST_Server). + * + * @param WP_REST_Request|string $request Request. + * @return WP_REST_Response REST response. + */ +function rest_do_request( $request ) { + $request = rest_ensure_request( $request ); + return rest_get_server()->dispatch( $request ); +} + +/** + * Retrieves the current REST server instance. + * + * Instantiates a new instance if none exists already. + * + * @since 4.5.0 + * + * @global WP_REST_Server $wp_rest_server REST server instance. + * + * @return WP_REST_Server REST server instance. + */ +function rest_get_server() { + /* @var WP_REST_Server $wp_rest_server */ + global $wp_rest_server; + + if ( empty( $wp_rest_server ) ) { + /** + * Filter the REST Server Class. + * + * This filter allows you to adjust the server class used by the API, using a + * different class to handle requests. + * + * @since 4.4.0 + * + * @param string $class_name The name of the server class. Default 'WP_REST_Server'. + */ + $wp_rest_server_class = apply_filters( 'wp_rest_server_class', 'WP_REST_Server' ); + $wp_rest_server = new $wp_rest_server_class; + + /** + * Fires when preparing to serve an API request. + * + * Endpoint objects should be created and register their hooks on this action rather + * than another action to ensure they're only loaded when needed. + * + * @since 4.4.0 + * + * @param WP_REST_Server $wp_rest_server Server object. + */ + do_action( 'rest_api_init', $wp_rest_server ); + } + + return $wp_rest_server; +} + +/** + * Ensures request arguments are a request object (for consistency). + * + * @since 4.4.0 + * + * @param array|WP_REST_Request $request Request to check. + * @return WP_REST_Request REST request instance. + */ +function rest_ensure_request( $request ) { + if ( $request instanceof WP_REST_Request ) { + return $request; + } + + return new WP_REST_Request( 'GET', '', $request ); +} + +/** + * Ensures a REST response is a response object (for consistency). + * + * This implements WP_HTTP_Response, allowing usage of `set_status`/`header`/etc + * without needing to double-check the object. Will also allow WP_Error to indicate error + * responses, so users should immediately check for this value. + * + * @since 4.4.0 + * + * @param WP_Error|WP_HTTP_Response|mixed $response Response to check. + * @return mixed WP_Error if response generated an error, WP_HTTP_Response if response + * is a already an instance, otherwise returns a new WP_REST_Response instance. + */ +function rest_ensure_response( $response ) { + if ( is_wp_error( $response ) ) { + return $response; + } + + if ( $response instanceof WP_HTTP_Response ) { + return $response; + } + + return new WP_REST_Response( $response ); +} + +/** + * Handles _deprecated_function() errors. + * + * @since 4.4.0 + * + * @param string $function The function that was called. + * @param string $replacement The function that should have been called. + * @param string $version Version. + */ +function rest_handle_deprecated_function( $function, $replacement, $version ) { + if ( ! empty( $replacement ) ) { + /* translators: 1: function name, 2: WordPress version number, 3: new function name */ + $string = sprintf( __( '%1$s (since %2$s; use %3$s instead)' ), $function, $version, $replacement ); + } else { + /* translators: 1: function name, 2: WordPress version number */ + $string = sprintf( __( '%1$s (since %2$s; no alternative available)' ), $function, $version ); + } + + header( sprintf( 'X-WP-DeprecatedFunction: %s', $string ) ); +} + +/** + * Handles _deprecated_argument() errors. + * + * @since 4.4.0 + * + * @param string $function The function that was called. + * @param string $message A message regarding the change. + * @param string $version Version. + */ +function rest_handle_deprecated_argument( $function, $message, $version ) { + if ( ! empty( $message ) ) { + /* translators: 1: function name, 2: WordPress version number, 3: error message */ + $string = sprintf( __( '%1$s (since %2$s; %3$s)' ), $function, $version, $message ); + } else { + /* translators: 1: function name, 2: WordPress version number */ + $string = sprintf( __( '%1$s (since %2$s; no alternative available)' ), $function, $version ); + } + + header( sprintf( 'X-WP-DeprecatedParam: %s', $string ) ); +} + +/** + * Sends Cross-Origin Resource Sharing headers with API requests. + * + * @since 4.4.0 + * + * @param mixed $value Response data. + * @return mixed Response data. + */ +function rest_send_cors_headers( $value ) { + $origin = get_http_origin(); + + if ( $origin ) { + header( 'Access-Control-Allow-Origin: ' . esc_url_raw( $origin ) ); + header( 'Access-Control-Allow-Methods: POST, GET, OPTIONS, PUT, DELETE' ); + header( 'Access-Control-Allow-Credentials: true' ); + } + + return $value; +} + +/** + * Handles OPTIONS requests for the server. + * + * This is handled outside of the server code, as it doesn't obey normal route + * mapping. + * + * @since 4.4.0 + * + * @param mixed $response Current response, either response or `null` to indicate pass-through. + * @param WP_REST_Server $handler ResponseHandler instance (usually WP_REST_Server). + * @param WP_REST_Request $request The request that was used to make current response. + * @return WP_REST_Response Modified response, either response or `null` to indicate pass-through. + */ +function rest_handle_options_request( $response, $handler, $request ) { + if ( ! empty( $response ) || $request->get_method() !== 'OPTIONS' ) { + return $response; + } + + $response = new WP_REST_Response(); + $data = array(); + + $accept = array(); + + foreach ( $handler->get_routes() as $route => $endpoints ) { + $match = preg_match( '@^' . $route . '$@i', $request->get_route(), $args ); + + if ( ! $match ) { + continue; + } + + $data = $handler->get_data_for_route( $route, $endpoints, 'help' ); + $response->set_matched_route( $route ); + break; + } + + $response->set_data( $data ); + return $response; +} + +/** + * Sends the "Allow" header to state all methods that can be sent to the current route. + * + * @since 4.4.0 + * + * @param WP_REST_Response $response Current response being served. + * @param WP_REST_Server $server ResponseHandler instance (usually WP_REST_Server). + * @param WP_REST_Request $request The request that was used to make current response. + * @return WP_REST_Response Response to be served, with "Allow" header if route has allowed methods. + */ +function rest_send_allow_header( $response, $server, $request ) { + $matched_route = $response->get_matched_route(); + + if ( ! $matched_route ) { + return $response; + } + + $routes = $server->get_routes(); + + $allowed_methods = array(); + + // Get the allowed methods across the routes. + foreach ( $routes[ $matched_route ] as $_handler ) { + foreach ( $_handler['methods'] as $handler_method => $value ) { + + if ( ! empty( $_handler['permission_callback'] ) ) { + + $permission = call_user_func( $_handler['permission_callback'], $request ); + + $allowed_methods[ $handler_method ] = true === $permission; + } else { + $allowed_methods[ $handler_method ] = true; + } + } + } + + // Strip out all the methods that are not allowed (false values). + $allowed_methods = array_filter( $allowed_methods ); + + if ( $allowed_methods ) { + $response->header( 'Allow', implode( ', ', array_map( 'strtoupper', array_keys( $allowed_methods ) ) ) ); + } + + return $response; +} + +/** + * Adds the REST API URL to the WP RSD endpoint. + * + * @since 4.4.0 + * + * @see get_rest_url() + */ +function rest_output_rsd() { + $api_root = get_rest_url(); + + if ( empty( $api_root ) ) { + return; + } + ?> + <api name="WP-API" blogID="1" preferred="false" apiLink="<?php echo esc_url( $api_root ); ?>" /> + <?php +} + +/** + * Outputs the REST API link tag into page header. + * + * @since 4.4.0 + * + * @see get_rest_url() + */ +function rest_output_link_wp_head() { + $api_root = get_rest_url(); + + if ( empty( $api_root ) ) { + return; + } + + echo "<link rel='https://api.w.org/' href='" . esc_url( $api_root ) . "' />\n"; +} + +/** + * Sends a Link header for the REST API. + * + * @since 4.4.0 + */ +function rest_output_link_header() { + if ( headers_sent() ) { + return; + } + + $api_root = get_rest_url(); + + if ( empty( $api_root ) ) { + return; + } + + header( 'Link: <' . esc_url_raw( $api_root ) . '>; rel="https://api.w.org/"', false ); +} + +/** + * Checks for errors when using cookie-based authentication. + * + * WordPress' built-in cookie authentication is always active + * for logged in users. However, the API has to check nonces + * for each request to ensure users are not vulnerable to CSRF. + * + * @since 4.4.0 + * + * @global mixed $wp_rest_auth_cookie + * + * @param WP_Error|mixed $result Error from another authentication handler, null if we should handle it, + * or another value if not. + * @return WP_Error|mixed|bool WP_Error if the cookie is invalid, the $result, otherwise true. + */ +function rest_cookie_check_errors( $result ) { + if ( ! empty( $result ) ) { + return $result; + } + + global $wp_rest_auth_cookie; + + /* + * Is cookie authentication being used? (If we get an auth + * error, but we're still logged in, another authentication + * must have been used). + */ + if ( true !== $wp_rest_auth_cookie && is_user_logged_in() ) { + return $result; + } + + // Determine if there is a nonce. + $nonce = null; + + if ( isset( $_REQUEST['_wpnonce'] ) ) { + $nonce = $_REQUEST['_wpnonce']; + } elseif ( isset( $_SERVER['HTTP_X_WP_NONCE'] ) ) { + $nonce = $_SERVER['HTTP_X_WP_NONCE']; + } + + if ( null === $nonce ) { + // No nonce at all, so act as if it's an unauthenticated request. + wp_set_current_user( 0 ); + return true; + } + + // Check the nonce. + $result = wp_verify_nonce( $nonce, 'wp_rest' ); + + if ( ! $result ) { + return new WP_Error( 'rest_cookie_invalid_nonce', __( 'Cookie nonce is invalid' ), array( 'status' => 403 ) ); + } + + return true; +} + +/** + * Collects cookie authentication status. + * + * Collects errors from wp_validate_auth_cookie for use by rest_cookie_check_errors. + * + * @since 4.4.0 + * + * @see current_action() + * @global mixed $wp_rest_auth_cookie + */ +function rest_cookie_collect_status() { + global $wp_rest_auth_cookie; + + $status_type = current_action(); + + if ( 'auth_cookie_valid' !== $status_type ) { + $wp_rest_auth_cookie = substr( $status_type, 12 ); + return; + } + + $wp_rest_auth_cookie = true; +} + +/** + * Parses an RFC3339 time into a Unix timestamp. + * + * @since 4.4.0 + * + * @param string $date RFC3339 timestamp. + * @param bool $force_utc Optional. Whether to force UTC timezone instead of using + * the timestamp's timezone. Default false. + * @return int Unix timestamp. + */ +function rest_parse_date( $date, $force_utc = false ) { + if ( $force_utc ) { + $date = preg_replace( '/[+-]\d+:?\d+$/', '+00:00', $date ); + } + + $regex = '#^\d{4}-\d{2}-\d{2}[Tt ]\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}(?::\d{2})?)?$#'; + + if ( ! preg_match( $regex, $date, $matches ) ) { + return false; + } + + return strtotime( $date ); +} + +/** + * Retrieves a local date with its GMT equivalent, in MySQL datetime format. + * + * @since 4.4.0 + * + * @see rest_parse_date() + * + * @param string $date RFC3339 timestamp. + * @param bool $force_utc Whether a UTC timestamp should be forced. Default false. + * @return array|null Local and UTC datetime strings, in MySQL datetime format (Y-m-d H:i:s), + * null on failure. + */ +function rest_get_date_with_gmt( $date, $force_utc = false ) { + $date = rest_parse_date( $date, $force_utc ); + + if ( empty( $date ) ) { + return null; + } + + $utc = date( 'Y-m-d H:i:s', $date ); + $local = get_date_from_gmt( $utc ); + + return array( $local, $utc ); +} diff --git a/wp-includes/rest-api/class-wp-rest-request.php b/wp-includes/rest-api/class-wp-rest-request.php new file mode 100644 index 0000000..6e0720e --- /dev/null +++ b/wp-includes/rest-api/class-wp-rest-request.php @@ -0,0 +1,984 @@ +<?php +/** + * REST API: WP_REST_Request class + * + * @package WordPress + * @subpackage REST_API + * @since 4.4.0 + */ + +/** + * Core class used to implement a REST request object. + * + * Contains data from the request, to be passed to the callback. + * + * Note: This implements ArrayAccess, and acts as an array of parameters when + * used in that manner. It does not use ArrayObject (as we cannot rely on SPL), + * so be aware it may have non-array behaviour in some cases. + * + * Note: When using features provided by ArrayAccess, be aware that WordPress deliberately + * does not distinguish between arguments of the same name for different request methods. + * For instance, in a request with `GET id=1` and `POST id=2`, `$request['id']` will equal + * 2 (`POST`) not 1 (`GET`). For more precision between request methods, use + * {@see WP_REST_Request::get_body_params()}, {@see WP_REST_Request::get_url_params()}, + * etc. + * + * @since 4.4.0 + * + * @see ArrayAccess + */ +class WP_REST_Request implements ArrayAccess { + + /** + * HTTP method. + * + * @since 4.4.0 + * @access protected + * @var string + */ + protected $method = ''; + + /** + * Parameters passed to the request. + * + * These typically come from the `$_GET`, `$_POST` and `$_FILES` + * superglobals when being created from the global scope. + * + * @since 4.4.0 + * @access protected + * @var array Contains GET, POST and FILES keys mapping to arrays of data. + */ + protected $params; + + /** + * HTTP headers for the request. + * + * @since 4.4.0 + * @access protected + * @var array Map of key to value. Key is always lowercase, as per HTTP specification. + */ + protected $headers = array(); + + /** + * Body data. + * + * @since 4.4.0 + * @access protected + * @var string Binary data from the request. + */ + protected $body = null; + + /** + * Route matched for the request. + * + * @since 4.4.0 + * @access protected + * @var string + */ + protected $route; + + /** + * Attributes (options) for the route that was matched. + * + * This is the options array used when the route was registered, typically + * containing the callback as well as the valid methods for the route. + * + * @since 4.4.0 + * @access protected + * @var array Attributes for the request. + */ + protected $attributes = array(); + + /** + * Used to determine if the JSON data has been parsed yet. + * + * Allows lazy-parsing of JSON data where possible. + * + * @since 4.4.0 + * @access protected + * @var bool + */ + protected $parsed_json = false; + + /** + * Used to determine if the body data has been parsed yet. + * + * @since 4.4.0 + * @access protected + * @var bool + */ + protected $parsed_body = false; + + /** + * Constructor. + * + * @since 4.4.0 + * @access public + * + * @param string $method Optional. Request method. Default empty. + * @param string $route Optional. Request route. Default empty. + * @param array $attributes Optional. Request attributes. Default empty array. + */ + public function __construct( $method = '', $route = '', $attributes = array() ) { + $this->params = array( + 'URL' => array(), + 'GET' => array(), + 'POST' => array(), + 'FILES' => array(), + + // See parse_json_params. + 'JSON' => null, + + 'defaults' => array(), + ); + + $this->set_method( $method ); + $this->set_route( $route ); + $this->set_attributes( $attributes ); + } + + /** + * Retrieves the HTTP method for the request. + * + * @since 4.4.0 + * @access public + * + * @return string HTTP method. + */ + public function get_method() { + return $this->method; + } + + /** + * Sets HTTP method for the request. + * + * @since 4.4.0 + * @access public + * + * @param string $method HTTP method. + */ + public function set_method( $method ) { + $this->method = strtoupper( $method ); + } + + /** + * Retrieves all headers from the request. + * + * @since 4.4.0 + * @access public + * + * @return array Map of key to value. Key is always lowercase, as per HTTP specification. + */ + public function get_headers() { + return $this->headers; + } + + /** + * Canonicalizes the header name. + * + * Ensures that header names are always treated the same regardless of + * source. Header names are always case insensitive. + * + * Note that we treat `-` (dashes) and `_` (underscores) as the same + * character, as per header parsing rules in both Apache and nginx. + * + * @link http://stackoverflow.com/q/18185366 + * @link http://wiki.nginx.org/Pitfalls#Missing_.28disappearing.29_HTTP_headers + * @link http://nginx.org/en/docs/http/ngx_http_core_module.html#underscores_in_headers + * + * @since 4.4.0 + * @access public + * @static + * + * @param string $key Header name. + * @return string Canonicalized name. + */ + public static function canonicalize_header_name( $key ) { + $key = strtolower( $key ); + $key = str_replace( '-', '_', $key ); + + return $key; + } + + /** + * Retrieves the given header from the request. + * + * If the header has multiple values, they will be concatenated with a comma + * as per the HTTP specification. Be aware that some non-compliant headers + * (notably cookie headers) cannot be joined this way. + * + * @since 4.4.0 + * @access public + * + * @param string $key Header name, will be canonicalized to lowercase. + * @return string|null String value if set, null otherwise. + */ + public function get_header( $key ) { + $key = $this->canonicalize_header_name( $key ); + + if ( ! isset( $this->headers[ $key ] ) ) { + return null; + } + + return implode( ',', $this->headers[ $key ] ); + } + + /** + * Retrieves header values from the request. + * + * @since 4.4.0 + * @access public + * + * @param string $key Header name, will be canonicalized to lowercase. + * @return array|null List of string values if set, null otherwise. + */ + public function get_header_as_array( $key ) { + $key = $this->canonicalize_header_name( $key ); + + if ( ! isset( $this->headers[ $key ] ) ) { + return null; + } + + return $this->headers[ $key ]; + } + + /** + * Sets the header on request. + * + * @since 4.4.0 + * @access public + * + * @param string $key Header name. + * @param string $value Header value, or list of values. + */ + public function set_header( $key, $value ) { + $key = $this->canonicalize_header_name( $key ); + $value = (array) $value; + + $this->headers[ $key ] = $value; + } + + /** + * Appends a header value for the given header. + * + * @since 4.4.0 + * @access public + * + * @param string $key Header name. + * @param string $value Header value, or list of values. + */ + public function add_header( $key, $value ) { + $key = $this->canonicalize_header_name( $key ); + $value = (array) $value; + + if ( ! isset( $this->headers[ $key ] ) ) { + $this->headers[ $key ] = array(); + } + + $this->headers[ $key ] = array_merge( $this->headers[ $key ], $value ); + } + + /** + * Removes all values for a header. + * + * @since 4.4.0 + * @access public + * + * @param string $key Header name. + */ + public function remove_header( $key ) { + unset( $this->headers[ $key ] ); + } + + /** + * Sets headers on the request. + * + * @since 4.4.0 + * @access public + * + * @param array $headers Map of header name to value. + * @param bool $override If true, replace the request's headers. Otherwise, merge with existing. + */ + public function set_headers( $headers, $override = true ) { + if ( true === $override ) { + $this->headers = array(); + } + + foreach ( $headers as $key => $value ) { + $this->set_header( $key, $value ); + } + } + + /** + * Retrieves the content-type of the request. + * + * @since 4.4.0 + * @access public + * + * @return array Map containing 'value' and 'parameters' keys. + */ + public function get_content_type() { + $value = $this->get_header( 'content-type' ); + if ( empty( $value ) ) { + return null; + } + + $parameters = ''; + if ( strpos( $value, ';' ) ) { + list( $value, $parameters ) = explode( ';', $value, 2 ); + } + + $value = strtolower( $value ); + if ( strpos( $value, '/' ) === false ) { + return null; + } + + // Parse type and subtype out. + list( $type, $subtype ) = explode( '/', $value, 2 ); + + $data = compact( 'value', 'type', 'subtype', 'parameters' ); + $data = array_map( 'trim', $data ); + + return $data; + } + + /** + * Retrieves the parameter priority order. + * + * Used when checking parameters in get_param(). + * + * @since 4.4.0 + * @access protected + * + * @return array List of types to check, in order of priority. + */ + protected function get_parameter_order() { + $order = array(); + $order[] = 'JSON'; + + $this->parse_json_params(); + + // Ensure we parse the body data. + $body = $this->get_body(); + if ( $this->method !== 'POST' && ! empty( $body ) ) { + $this->parse_body_params(); + } + + $accepts_body_data = array( 'POST', 'PUT', 'PATCH' ); + if ( in_array( $this->method, $accepts_body_data ) ) { + $order[] = 'POST'; + } + + $order[] = 'GET'; + $order[] = 'URL'; + $order[] = 'defaults'; + + /** + * Filter the parameter order. + * + * The order affects which parameters are checked when using get_param() and family. + * This acts similarly to PHP's `request_order` setting. + * + * @since 4.4.0 + * + * @param array $order { + * An array of types to check, in order of priority. + * + * @param string $type The type to check. + * } + * @param WP_REST_Request $this The request object. + */ + return apply_filters( 'rest_request_parameter_order', $order, $this ); + } + + /** + * Retrieves a parameter from the request. + * + * @since 4.4.0 + * @access public + * + * @param string $key Parameter name. + * @return mixed|null Value if set, null otherwise. + */ + public function get_param( $key ) { + $order = $this->get_parameter_order(); + + foreach ( $order as $type ) { + // Determine if we have the parameter for this type. + if ( isset( $this->params[ $type ][ $key ] ) ) { + return $this->params[ $type ][ $key ]; + } + } + + return null; + } + + /** + * Sets a parameter on the request. + * + * @since 4.4.0 + * @access public + * + * @param string $key Parameter name. + * @param mixed $value Parameter value. + */ + public function set_param( $key, $value ) { + switch ( $this->method ) { + case 'POST': + $this->params['POST'][ $key ] = $value; + break; + + default: + $this->params['GET'][ $key ] = $value; + break; + } + } + + /** + * Retrieves merged parameters from the request. + * + * The equivalent of get_param(), but returns all parameters for the request. + * Handles merging all the available values into a single array. + * + * @since 4.4.0 + * @access public + * + * @return array Map of key to value. + */ + public function get_params() { + $order = $this->get_parameter_order(); + $order = array_reverse( $order, true ); + + $params = array(); + foreach ( $order as $type ) { + $params = array_merge( $params, (array) $this->params[ $type ] ); + } + + return $params; + } + + /** + * Retrieves parameters from the route itself. + * + * These are parsed from the URL using the regex. + * + * @since 4.4.0 + * @access public + * + * @return array Parameter map of key to value. + */ + public function get_url_params() { + return $this->params['URL']; + } + + /** + * Sets parameters from the route. + * + * Typically, this is set after parsing the URL. + * + * @since 4.4.0 + * @access public + * + * @param array $params Parameter map of key to value. + */ + public function set_url_params( $params ) { + $this->params['URL'] = $params; + } + + /** + * Retrieves parameters from the query string. + * + * These are the parameters you'd typically find in `$_GET`. + * + * @since 4.4.0 + * @access public + * + * @return array Parameter map of key to value + */ + public function get_query_params() { + return $this->params['GET']; + } + + /** + * Sets parameters from the query string. + * + * Typically, this is set from `$_GET`. + * + * @since 4.4.0 + * @access public + * + * @param array $params Parameter map of key to value. + */ + public function set_query_params( $params ) { + $this->params['GET'] = $params; + } + + /** + * Retrieves parameters from the body. + * + * These are the parameters you'd typically find in `$_POST`. + * + * @since 4.4.0 + * @access public + * + * @return array Parameter map of key to value. + */ + public function get_body_params() { + return $this->params['POST']; + } + + /** + * Sets parameters from the body. + * + * Typically, this is set from `$_POST`. + * + * @since 4.4.0 + * @access public + * + * @param array $params Parameter map of key to value. + */ + public function set_body_params( $params ) { + $this->params['POST'] = $params; + } + + /** + * Retrieves multipart file parameters from the body. + * + * These are the parameters you'd typically find in `$_FILES`. + * + * @since 4.4.0 + * @access public + * + * @return array Parameter map of key to value + */ + public function get_file_params() { + return $this->params['FILES']; + } + + /** + * Sets multipart file parameters from the body. + * + * Typically, this is set from `$_FILES`. + * + * @since 4.4.0 + * @access public + * + * @param array $params Parameter map of key to value. + */ + public function set_file_params( $params ) { + $this->params['FILES'] = $params; + } + + /** + * Retrieves the default parameters. + * + * These are the parameters set in the route registration. + * + * @since 4.4.0 + * @access public + * + * @return array Parameter map of key to value + */ + public function get_default_params() { + return $this->params['defaults']; + } + + /** + * Sets default parameters. + * + * These are the parameters set in the route registration. + * + * @since 4.4.0 + * @access public + * + * @param array $params Parameter map of key to value. + */ + public function set_default_params( $params ) { + $this->params['defaults'] = $params; + } + + /** + * Retrieves the request body content. + * + * @since 4.4.0 + * @access public + * + * @return string Binary data from the request body. + */ + public function get_body() { + return $this->body; + } + + /** + * Sets body content. + * + * @since 4.4.0 + * @access public + * + * @param string $data Binary data from the request body. + */ + public function set_body( $data ) { + $this->body = $data; + + // Enable lazy parsing. + $this->parsed_json = false; + $this->parsed_body = false; + $this->params['JSON'] = null; + } + + /** + * Retrieves the parameters from a JSON-formatted body. + * + * @since 4.4.0 + * @access public + * + * @return array Parameter map of key to value. + */ + public function get_json_params() { + // Ensure the parameters have been parsed out. + $this->parse_json_params(); + + return $this->params['JSON']; + } + + /** + * Parses the JSON parameters. + * + * Avoids parsing the JSON data until we need to access it. + * + * @since 4.4.0 + * @access protected + */ + protected function parse_json_params() { + if ( $this->parsed_json ) { + return; + } + + $this->parsed_json = true; + + // Check that we actually got JSON. + $content_type = $this->get_content_type(); + + if ( empty( $content_type ) || 'application/json' !== $content_type['value'] ) { + return; + } + + $params = json_decode( $this->get_body(), true ); + + /* + * Check for a parsing error. + * + * Note that due to WP's JSON compatibility functions, json_last_error + * might not be defined: https://core.trac.wordpress.org/ticket/27799 + */ + if ( null === $params && ( ! function_exists( 'json_last_error' ) || JSON_ERROR_NONE !== json_last_error() ) ) { + return; + } + + $this->params['JSON'] = $params; + } + + /** + * Parses the request body parameters. + * + * Parses out URL-encoded bodies for request methods that aren't supported + * natively by PHP. In PHP 5.x, only POST has these parsed automatically. + * + * @since 4.4.0 + * @access protected + */ + protected function parse_body_params() { + if ( $this->parsed_body ) { + return; + } + + $this->parsed_body = true; + + /* + * Check that we got URL-encoded. Treat a missing content-type as + * URL-encoded for maximum compatibility. + */ + $content_type = $this->get_content_type(); + + if ( ! empty( $content_type ) && 'application/x-www-form-urlencoded' !== $content_type['value'] ) { + return; + } + + parse_str( $this->get_body(), $params ); + + /* + * Amazingly, parse_str follows magic quote rules. Sigh. + * + * NOTE: Do not refactor to use `wp_unslash`. + */ + if ( get_magic_quotes_gpc() ) { + $params = stripslashes_deep( $params ); + } + + /* + * Add to the POST parameters stored internally. If a user has already + * set these manually (via `set_body_params`), don't override them. + */ + $this->params['POST'] = array_merge( $params, $this->params['POST'] ); + } + + /** + * Retrieves the route that matched the request. + * + * @since 4.4.0 + * @access public + * + * @return string Route matching regex. + */ + public function get_route() { + return $this->route; + } + + /** + * Sets the route that matched the request. + * + * @since 4.4.0 + * @access public + * + * @param string $route Route matching regex. + */ + public function set_route( $route ) { + $this->route = $route; + } + + /** + * Retrieves the attributes for the request. + * + * These are the options for the route that was matched. + * + * @since 4.4.0 + * @access public + * + * @return array Attributes for the request. + */ + public function get_attributes() { + return $this->attributes; + } + + /** + * Sets the attributes for the request. + * + * @since 4.4.0 + * @access public + * + * @param array $attributes Attributes for the request. + */ + public function set_attributes( $attributes ) { + $this->attributes = $attributes; + } + + /** + * Sanitizes (where possible) the params on the request. + * + * This is primarily based off the sanitize_callback param on each registered + * argument. + * + * @since 4.4.0 + * @access public + * + * @return true|null True if there are no parameters to sanitize, null otherwise. + */ + public function sanitize_params() { + + $attributes = $this->get_attributes(); + + // No arguments set, skip sanitizing. + if ( empty( $attributes['args'] ) ) { + return true; + } + + $order = $this->get_parameter_order(); + + foreach ( $order as $type ) { + if ( empty( $this->params[ $type ] ) ) { + continue; + } + foreach ( $this->params[ $type ] as $key => $value ) { + // Check if this param has a sanitize_callback added. + if ( isset( $attributes['args'][ $key ] ) && ! empty( $attributes['args'][ $key ]['sanitize_callback'] ) ) { + $this->params[ $type ][ $key ] = call_user_func( $attributes['args'][ $key ]['sanitize_callback'], $value, $this, $key ); + } + } + } + return null; + } + + /** + * Checks whether this request is valid according to its attributes. + * + * @since 4.4.0 + * @access public + * + * @return bool|WP_Error True if there are no parameters to validate or if all pass validation, + * WP_Error if required parameters are missing. + */ + public function has_valid_params() { + + $attributes = $this->get_attributes(); + $required = array(); + + // No arguments set, skip validation. + if ( empty( $attributes['args'] ) ) { + return true; + } + + foreach ( $attributes['args'] as $key => $arg ) { + + $param = $this->get_param( $key ); + if ( isset( $arg['required'] ) && true === $arg['required'] && null === $param ) { + $required[] = $key; + } + } + + if ( ! empty( $required ) ) { + return new WP_Error( 'rest_missing_callback_param', sprintf( __( 'Missing parameter(s): %s' ), implode( ', ', $required ) ), array( 'status' => 400, 'params' => $required ) ); + } + + /* + * Check the validation callbacks for each registered arg. + * + * This is done after required checking as required checking is cheaper. + */ + $invalid_params = array(); + + foreach ( $attributes['args'] as $key => $arg ) { + + $param = $this->get_param( $key ); + + if ( null !== $param && ! empty( $arg['validate_callback'] ) ) { + $valid_check = call_user_func( $arg['validate_callback'], $param, $this, $key ); + + if ( false === $valid_check ) { + $invalid_params[ $key ] = __( 'Invalid parameter.' ); + } + + if ( is_wp_error( $valid_check ) ) { + $invalid_params[ $key ] = $valid_check->get_error_message(); + } + } + } + + if ( $invalid_params ) { + return new WP_Error( 'rest_invalid_param', sprintf( __( 'Invalid parameter(s): %s' ), implode( ', ', array_keys( $invalid_params ) ) ), array( 'status' => 400, 'params' => $invalid_params ) ); + } + + return true; + + } + + /** + * Checks if a parameter is set. + * + * @since 4.4.0 + * @access public + * + * @param string $offset Parameter name. + * @return bool Whether the parameter is set. + */ + public function offsetExists( $offset ) { + $order = $this->get_parameter_order(); + + foreach ( $order as $type ) { + if ( isset( $this->params[ $type ][ $offset ] ) ) { + return true; + } + } + + return false; + } + + /** + * Retrieves a parameter from the request. + * + * @since 4.4.0 + * @access public + * + * @param string $offset Parameter name. + * @return mixed|null Value if set, null otherwise. + */ + public function offsetGet( $offset ) { + return $this->get_param( $offset ); + } + + /** + * Sets a parameter on the request. + * + * @since 4.4.0 + * @access public + * + * @param string $offset Parameter name. + * @param mixed $value Parameter value. + */ + public function offsetSet( $offset, $value ) { + $this->set_param( $offset, $value ); + } + + /** + * Removes a parameter from the request. + * + * @since 4.4.0 + * @access public + * + * @param string $offset Parameter name. + */ + public function offsetUnset( $offset ) { + $order = $this->get_parameter_order(); + + // Remove the offset from every group. + foreach ( $order as $type ) { + unset( $this->params[ $type ][ $offset ] ); + } + } + + /** + * Retrieves a WP_REST_Request object from a full URL. + * + * @static + * @since 4.5.0 + * @access public + * + * @param string $url URL with protocol, domain, path and query args. + * @return WP_REST_Request|false WP_REST_Request object on success, false on failure. + */ + public static function from_url( $url ) { + $bits = parse_url( $url ); + $query_params = array(); + + if ( ! empty( $bits['query'] ) ) { + wp_parse_str( $bits['query'], $query_params ); + } + + $api_root = rest_url(); + if ( get_option( 'permalink_structure' ) && 0 === strpos( $url, $api_root ) ) { + // Pretty permalinks on, and URL is under the API root + $api_url_part = substr( $url, strlen( untrailingslashit( $api_root ) ) ); + $route = parse_url( $api_url_part, PHP_URL_PATH ); + } elseif ( ! empty( $query_params['rest_route'] ) ) { + // ?rest_route=... set directly + $route = $query_params['rest_route']; + unset( $query_params['rest_route'] ); + } + + $request = false; + if ( ! empty( $route ) ) { + $request = new WP_REST_Request( 'GET', $route ); + $request->set_query_params( $query_params ); + } + + /** + * Filter the request generated from a URL. + * + * @since 4.5.0 + * + * @param WP_REST_Request|false $request Generated request object, or false if URL + * could not be parsed. + * @param string $url URL the request was generated from. + */ + return apply_filters( 'rest_request_from_url', $request, $url ); + } +} diff --git a/wp-includes/rest-api/class-wp-rest-response.php b/wp-includes/rest-api/class-wp-rest-response.php new file mode 100644 index 0000000..4acc8b6 --- /dev/null +++ b/wp-includes/rest-api/class-wp-rest-response.php @@ -0,0 +1,305 @@ +<?php +/** + * REST API: WP_REST_Response class + * + * @package WordPress + * @subpackage REST_API + * @since 4.4.0 + */ + +/** + * Core class used to implement a REST response object. + * + * @since 4.4.0 + * + * @see WP_HTTP_Response + */ +class WP_REST_Response extends WP_HTTP_Response { + + /** + * Links related to the response. + * + * @since 4.4.0 + * @access protected + * @var array + */ + protected $links = array(); + + /** + * The route that was to create the response. + * + * @since 4.4.0 + * @access protected + * @var string + */ + protected $matched_route = ''; + + /** + * The handler that was used to create the response. + * + * @since 4.4.0 + * @access protected + * @var null|array + */ + protected $matched_handler = null; + + /** + * Adds a link to the response. + * + * @internal The $rel parameter is first, as this looks nicer when sending multiple. + * + * @since 4.4.0 + * @access public + * + * @link http://tools.ietf.org/html/rfc5988 + * @link http://www.iana.org/assignments/link-relations/link-relations.xml + * + * @param string $rel Link relation. Either an IANA registered type, + * or an absolute URL. + * @param string $href Target URI for the link. + * @param array $attributes Optional. Link parameters to send along with the URL. Default empty array. + */ + public function add_link( $rel, $href, $attributes = array() ) { + if ( empty( $this->links[ $rel ] ) ) { + $this->links[ $rel ] = array(); + } + + if ( isset( $attributes['href'] ) ) { + // Remove the href attribute, as it's used for the main URL. + unset( $attributes['href'] ); + } + + $this->links[ $rel ][] = array( + 'href' => $href, + 'attributes' => $attributes, + ); + } + + /** + * Removes a link from the response. + * + * @since 4.4.0 + * @access public + * + * @param string $rel Link relation. Either an IANA registered type, or an absolute URL. + * @param string $href Optional. Only remove links for the relation matching the given href. + * Default null. + */ + public function remove_link( $rel, $href = null ) { + if ( ! isset( $this->links[ $rel ] ) ) { + return; + } + + if ( $href ) { + $this->links[ $rel ] = wp_list_filter( $this->links[ $rel ], array( 'href' => $href ), 'NOT' ); + } else { + $this->links[ $rel ] = array(); + } + + if ( ! $this->links[ $rel ] ) { + unset( $this->links[ $rel ] ); + } + } + + /** + * Adds multiple links to the response. + * + * Link data should be an associative array with link relation as the key. + * The value can either be an associative array of link attributes + * (including `href` with the URL for the response), or a list of these + * associative arrays. + * + * @since 4.4.0 + * @access public + * + * @param array $links Map of link relation to list of links. + */ + public function add_links( $links ) { + foreach ( $links as $rel => $set ) { + // If it's a single link, wrap with an array for consistent handling. + if ( isset( $set['href'] ) ) { + $set = array( $set ); + } + + foreach ( $set as $attributes ) { + $this->add_link( $rel, $attributes['href'], $attributes ); + } + } + } + + /** + * Retrieves links for the response. + * + * @since 4.4.0 + * @access public + * + * @return array List of links. + */ + public function get_links() { + return $this->links; + } + + /** + * Sets a single link header. + * + * @internal The $rel parameter is first, as this looks nicer when sending multiple. + * + * @since 4.4.0 + * @access public + * + * @link http://tools.ietf.org/html/rfc5988 + * @link http://www.iana.org/assignments/link-relations/link-relations.xml + * + * @param string $rel Link relation. Either an IANA registered type, or an absolute URL. + * @param string $link Target IRI for the link. + * @param array $other Optional. Other parameters to send, as an assocative array. + * Default empty array. + */ + public function link_header( $rel, $link, $other = array() ) { + $header = '<' . $link . '>; rel="' . $rel . '"'; + + foreach ( $other as $key => $value ) { + if ( 'title' === $key ) { + $value = '"' . $value . '"'; + } + $header .= '; ' . $key . '=' . $value; + } + $this->header( 'Link', $header, false ); + } + + /** + * Retrieves the route that was used. + * + * @since 4.4.0 + * @access public + * + * @return string The matched route. + */ + public function get_matched_route() { + return $this->matched_route; + } + + /** + * Sets the route (regex for path) that caused the response. + * + * @since 4.4.0 + * @access public + * + * @param string $route Route name. + */ + public function set_matched_route( $route ) { + $this->matched_route = $route; + } + + /** + * Retrieves the handler that was used to generate the response. + * + * @since 4.4.0 + * @access public + * + * @return null|array The handler that was used to create the response. + */ + public function get_matched_handler() { + return $this->matched_handler; + } + + /** + * Retrieves the handler that was responsible for generating the response. + * + * @since 4.4.0 + * @access public + * + * @param array $handler The matched handler. + */ + public function set_matched_handler( $handler ) { + $this->matched_handler = $handler; + } + + /** + * Checks if the response is an error, i.e. >= 400 response code. + * + * @since 4.4.0 + * @access public + * + * @return bool Whether the response is an error. + */ + public function is_error() { + return $this->get_status() >= 400; + } + + /** + * Retrieves a WP_Error object from the response. + * + * @since 4.4.0 + * @access public + * + * @return WP_Error|null WP_Error or null on not an errored response. + */ + public function as_error() { + if ( ! $this->is_error() ) { + return null; + } + + $error = new WP_Error; + + if ( is_array( $this->get_data() ) ) { + $data = $this->get_data(); + $error->add( $data['code'], $data['message'], $data['data'] ); + if ( ! empty( $data['additional_errors'] ) ) { + foreach( $data['additional_errors'] as $err ) { + $error->add( $err['code'], $err['message'], $err['data'] ); + } + } + } else { + $error->add( $this->get_status(), '', array( 'status' => $this->get_status() ) ); + } + + return $error; + } + + /** + * Retrieves the CURIEs (compact URIs) used for relations. + * + * @since 4.5.0 + * @access public + * + * @return array Compact URIs. + */ + public function get_curies() { + $curies = array( + array( + 'name' => 'wp', + 'href' => 'https://api.w.org/{rel}', + 'templated' => true, + ), + ); + + /** + * Filter extra CURIEs available on API responses. + * + * CURIEs allow a shortened version of URI relations. This allows a more + * usable form for custom relations than using the full URI. These work + * similarly to how XML namespaces work. + * + * Registered CURIES need to specify a name and URI template. This will + * automatically transform URI relations into their shortened version. + * The shortened relation follows the format `{name}:{rel}`. `{rel}` in + * the URI template will be replaced with the `{rel}` part of the + * shortened relation. + * + * For example, a CURIE with name `example` and URI template + * `http://w.org/{rel}` would transform a `http://w.org/term` relation + * into `example:term`. + * + * Well-behaved clients should expand and normalise these back to their + * full URI relation, however some naive clients may not resolve these + * correctly, so adding new CURIEs may break backwards compatibility. + * + * @since 4.5.0 + * + * @param array $additional Additional CURIEs to register with the API. + */ + $additional = apply_filters( 'rest_response_link_curies', array() ); + return array_merge( $curies, $additional ); + } +} diff --git a/wp-includes/rest-api/class-wp-rest-server.php b/wp-includes/rest-api/class-wp-rest-server.php new file mode 100644 index 0000000..ebf58de --- /dev/null +++ b/wp-includes/rest-api/class-wp-rest-server.php @@ -0,0 +1,1262 @@ +<?php +/** + * REST API: WP_REST_Server class + * + * @package WordPress + * @subpackage REST_API + * @since 4.4.0 + */ + +/** + * Core class used to implement the WordPress REST API server. + * + * @since 4.4.0 + */ +class WP_REST_Server { + + /** + * Alias for GET transport method. + * + * @since 4.4.0 + * @var string + */ + const READABLE = 'GET'; + + /** + * Alias for POST transport method. + * + * @since 4.4.0 + * @var string + */ + const CREATABLE = 'POST'; + + /** + * Alias for POST, PUT, PATCH transport methods together. + * + * @since 4.4.0 + * @var string + */ + const EDITABLE = 'POST, PUT, PATCH'; + + /** + * Alias for DELETE transport method. + * + * @since 4.4.0 + * @var string + */ + const DELETABLE = 'DELETE'; + + /** + * Alias for GET, POST, PUT, PATCH & DELETE transport methods together. + * + * @since 4.4.0 + * @var string + */ + const ALLMETHODS = 'GET, POST, PUT, PATCH, DELETE'; + + /** + * Namespaces registered to the server. + * + * @since 4.4.0 + * @access protected + * @var array + */ + protected $namespaces = array(); + + /** + * Endpoints registered to the server. + * + * @since 4.4.0 + * @access protected + * @var array + */ + protected $endpoints = array(); + + /** + * Options defined for the routes. + * + * @since 4.4.0 + * @access protected + * @var array + */ + protected $route_options = array(); + + /** + * Instantiates the REST server. + * + * @since 4.4.0 + * @access public + */ + public function __construct() { + $this->endpoints = array( + // Meta endpoints. + '/' => array( + 'callback' => array( $this, 'get_index' ), + 'methods' => 'GET', + 'args' => array( + 'context' => array( + 'default' => 'view', + ), + ), + ), + ); + } + + + /** + * Checks the authentication headers if supplied. + * + * @since 4.4.0 + * @access public + * + * @return WP_Error|null WP_Error indicates unsuccessful login, null indicates successful + * or no authentication provided + */ + public function check_authentication() { + /** + * Pass an authentication error to the API + * + * This is used to pass a WP_Error from an authentication method back to + * the API. + * + * Authentication methods should check first if they're being used, as + * multiple authentication methods can be enabled on a site (cookies, + * HTTP basic auth, OAuth). If the authentication method hooked in is + * not actually being attempted, null should be returned to indicate + * another authentication method should check instead. Similarly, + * callbacks should ensure the value is `null` before checking for + * errors. + * + * A WP_Error instance can be returned if an error occurs, and this should + * match the format used by API methods internally (that is, the `status` + * data should be used). A callback can return `true` to indicate that + * the authentication method was used, and it succeeded. + * + * @since 4.4.0 + * + * @param WP_Error|null|bool WP_Error if authentication error, null if authentication + * method wasn't used, true if authentication succeeded. + */ + return apply_filters( 'rest_authentication_errors', null ); + } + + /** + * Converts an error to a response object. + * + * This iterates over all error codes and messages to change it into a flat + * array. This enables simpler client behaviour, as it is represented as a + * list in JSON rather than an object/map. + * + * @since 4.4.0 + * @access protected + * + * @param WP_Error $error WP_Error instance. + * @return WP_REST_Response List of associative arrays with code and message keys. + */ + protected function error_to_response( $error ) { + $error_data = $error->get_error_data(); + + if ( is_array( $error_data ) && isset( $error_data['status'] ) ) { + $status = $error_data['status']; + } else { + $status = 500; + } + + $errors = array(); + + foreach ( (array) $error->errors as $code => $messages ) { + foreach ( (array) $messages as $message ) { + $errors[] = array( 'code' => $code, 'message' => $message, 'data' => $error->get_error_data( $code ) ); + } + } + + $data = $errors[0]; + if ( count( $errors ) > 1 ) { + // Remove the primary error. + array_shift( $errors ); + $data['additional_errors'] = $errors; + } + + $response = new WP_REST_Response( $data, $status ); + + return $response; + } + + /** + * Retrieves an appropriate error representation in JSON. + * + * Note: This should only be used in WP_REST_Server::serve_request(), as it + * cannot handle WP_Error internally. All callbacks and other internal methods + * should instead return a WP_Error with the data set to an array that includes + * a 'status' key, with the value being the HTTP status to send. + * + * @since 4.4.0 + * @access protected + * + * @param string $code WP_Error-style code. + * @param string $message Human-readable message. + * @param int $status Optional. HTTP status code to send. Default null. + * @return string JSON representation of the error + */ + protected function json_error( $code, $message, $status = null ) { + if ( $status ) { + $this->set_status( $status ); + } + + $error = compact( 'code', 'message' ); + + return wp_json_encode( $error ); + } + + /** + * Handles serving an API request. + * + * Matches the current server URI to a route and runs the first matching + * callback then outputs a JSON representation of the returned value. + * + * @since 4.4.0 + * @access public + * + * @see WP_REST_Server::dispatch() + * + * @param string $path Optional. The request route. If not set, `$_SERVER['PATH_INFO']` will be used. + * Default null. + * @return false|null Null if not served and a HEAD request, false otherwise. + */ + public function serve_request( $path = null ) { + $content_type = isset( $_GET['_jsonp'] ) ? 'application/javascript' : 'application/json'; + $this->send_header( 'Content-Type', $content_type . '; charset=' . get_option( 'blog_charset' ) ); + + /* + * Mitigate possible JSONP Flash attacks. + * + * http://miki.it/blog/2014/7/8/abusing-jsonp-with-rosetta-flash/ + */ + $this->send_header( 'X-Content-Type-Options', 'nosniff' ); + $this->send_header( 'Access-Control-Expose-Headers', 'X-WP-Total, X-WP-TotalPages' ); + $this->send_header( 'Access-Control-Allow-Headers', 'Authorization' ); + + /** + * Send nocache headers on authenticated requests. + * + * @since 4.4.0 + * + * @param bool $rest_send_nocache_headers Whether to send no-cache headers. + */ + $send_no_cache_headers = apply_filters( 'rest_send_nocache_headers', is_user_logged_in() ); + if ( $send_no_cache_headers ) { + foreach ( wp_get_nocache_headers() as $header => $header_value ) { + $this->send_header( $header, $header_value ); + } + } + + /** + * Filter whether the REST API is enabled. + * + * @since 4.4.0 + * + * @param bool $rest_enabled Whether the REST API is enabled. Default true. + */ + $enabled = apply_filters( 'rest_enabled', true ); + + /** + * Filter whether jsonp is enabled. + * + * @since 4.4.0 + * + * @param bool $jsonp_enabled Whether jsonp is enabled. Default true. + */ + $jsonp_enabled = apply_filters( 'rest_jsonp_enabled', true ); + + $jsonp_callback = null; + + if ( ! $enabled ) { + echo $this->json_error( 'rest_disabled', __( 'The REST API is disabled on this site.' ), 404 ); + return false; + } + if ( isset( $_GET['_jsonp'] ) ) { + if ( ! $jsonp_enabled ) { + echo $this->json_error( 'rest_callback_disabled', __( 'JSONP support is disabled on this site.' ), 400 ); + return false; + } + + // Check for invalid characters (only alphanumeric allowed). + if ( is_string( $_GET['_jsonp'] ) ) { + $jsonp_callback = preg_replace( '/[^\w\.]/', '', wp_unslash( $_GET['_jsonp'] ), -1, $illegal_char_count ); + if ( 0 !== $illegal_char_count ) { + $jsonp_callback = null; + } + } + if ( null === $jsonp_callback ) { + echo $this->json_error( 'rest_callback_invalid', __( 'The JSONP callback function is invalid.' ), 400 ); + return false; + } + } + + if ( empty( $path ) ) { + if ( isset( $_SERVER['PATH_INFO'] ) ) { + $path = $_SERVER['PATH_INFO']; + } else { + $path = '/'; + } + } + + $request = new WP_REST_Request( $_SERVER['REQUEST_METHOD'], $path ); + + $request->set_query_params( wp_unslash( $_GET ) ); + $request->set_body_params( wp_unslash( $_POST ) ); + $request->set_file_params( $_FILES ); + $request->set_headers( $this->get_headers( wp_unslash( $_SERVER ) ) ); + $request->set_body( $this->get_raw_data() ); + + /* + * HTTP method override for clients that can't use PUT/PATCH/DELETE. First, we check + * $_GET['_method']. If that is not set, we check for the HTTP_X_HTTP_METHOD_OVERRIDE + * header. + */ + if ( isset( $_GET['_method'] ) ) { + $request->set_method( $_GET['_method'] ); + } elseif ( isset( $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] ) ) { + $request->set_method( $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] ); + } + + $result = $this->check_authentication(); + + if ( ! is_wp_error( $result ) ) { + $result = $this->dispatch( $request ); + } + + // Normalize to either WP_Error or WP_REST_Response... + $result = rest_ensure_response( $result ); + + // ...then convert WP_Error across. + if ( is_wp_error( $result ) ) { + $result = $this->error_to_response( $result ); + } + + /** + * Filter the API response. + * + * Allows modification of the response before returning. + * + * @since 4.4.0 + * @since 4.5.0 Applied to embedded responses. + * + * @param WP_HTTP_Response $result Result to send to the client. Usually a WP_REST_Response. + * @param WP_REST_Server $this Server instance. + * @param WP_REST_Request $request Request used to generate the response. + */ + $result = apply_filters( 'rest_post_dispatch', rest_ensure_response( $result ), $this, $request ); + + // Wrap the response in an envelope if asked for. + if ( isset( $_GET['_envelope'] ) ) { + $result = $this->envelope_response( $result, isset( $_GET['_embed'] ) ); + } + + // Send extra data from response objects. + $headers = $result->get_headers(); + $this->send_headers( $headers ); + + $code = $result->get_status(); + $this->set_status( $code ); + + /** + * Filter whether the request has already been served. + * + * Allow sending the request manually - by returning true, the API result + * will not be sent to the client. + * + * @since 4.4.0 + * + * @param bool $served Whether the request has already been served. + * Default false. + * @param WP_HTTP_Response $result Result to send to the client. Usually a WP_REST_Response. + * @param WP_REST_Request $request Request used to generate the response. + * @param WP_REST_Server $this Server instance. + */ + $served = apply_filters( 'rest_pre_serve_request', false, $result, $request, $this ); + + if ( ! $served ) { + if ( 'HEAD' === $request->get_method() ) { + return null; + } + + // Embed links inside the request. + $result = $this->response_to_data( $result, isset( $_GET['_embed'] ) ); + + $result = wp_json_encode( $result ); + + $json_error_message = $this->get_json_last_error(); + if ( $json_error_message ) { + $json_error_obj = new WP_Error( 'rest_encode_error', $json_error_message, array( 'status' => 500 ) ); + $result = $this->error_to_response( $json_error_obj ); + $result = wp_json_encode( $result->data[0] ); + } + + if ( $jsonp_callback ) { + // Prepend '/**/' to mitigate possible JSONP Flash attacks + // http://miki.it/blog/2014/7/8/abusing-jsonp-with-rosetta-flash/ + echo '/**/' . $jsonp_callback . '(' . $result . ')'; + } else { + echo $result; + } + } + return null; + } + + /** + * Converts a response to data to send. + * + * @since 4.4.0 + * @access public + * + * @param WP_REST_Response $response Response object. + * @param bool $embed Whether links should be embedded. + * @return array { + * Data with sub-requests embedded. + * + * @type array [$_links] Links. + * @type array [$_embedded] Embeddeds. + * } + */ + public function response_to_data( $response, $embed ) { + $data = $response->get_data(); + $links = $this->get_compact_response_links( $response ); + + if ( ! empty( $links ) ) { + // Convert links to part of the data. + $data['_links'] = $links; + } + if ( $embed ) { + // Determine if this is a numeric array. + if ( wp_is_numeric_array( $data ) ) { + $data = array_map( array( $this, 'embed_links' ), $data ); + } else { + $data = $this->embed_links( $data ); + } + } + + return $data; + } + + /** + * Retrieves links from a response. + * + * Extracts the links from a response into a structured hash, suitable for + * direct output. + * + * @since 4.4.0 + * @access public + * @static + * + * @param WP_REST_Response $response Response to extract links from. + * @return array Map of link relation to list of link hashes. + */ + public static function get_response_links( $response ) { + $links = $response->get_links(); + if ( empty( $links ) ) { + return array(); + } + + // Convert links to part of the data. + $data = array(); + foreach ( $links as $rel => $items ) { + $data[ $rel ] = array(); + + foreach ( $items as $item ) { + $attributes = $item['attributes']; + $attributes['href'] = $item['href']; + $data[ $rel ][] = $attributes; + } + } + + return $data; + } + + /** + * Retrieves the CURIEs (compact URIs) used for relations. + * + * Extracts the links from a response into a structured hash, suitable for + * direct output. + * + * @since 4.5.0 + * @access public + * @static + * + * @param WP_REST_Response $response Response to extract links from. + * @return array Map of link relation to list of link hashes. + */ + public static function get_compact_response_links( $response ) { + $links = self::get_response_links( $response ); + + if ( empty( $links ) ) { + return array(); + } + + $curies = $response->get_curies(); + $used_curies = array(); + + foreach ( $links as $rel => $items ) { + + // Convert $rel URIs to their compact versions if they exist. + foreach ( $curies as $curie ) { + $href_prefix = substr( $curie['href'], 0, strpos( $curie['href'], '{rel}' ) ); + if ( strpos( $rel, $href_prefix ) !== 0 ) { + continue; + } + + // Relation now changes from '$uri' to '$curie:$relation' + $rel_regex = str_replace( '\{rel\}', '(.+)', preg_quote( $curie['href'], '!' ) ); + preg_match( '!' . $rel_regex . '!', $rel, $matches ); + if ( $matches ) { + $new_rel = $curie['name'] . ':' . $matches[1]; + $used_curies[ $curie['name'] ] = $curie; + $links[ $new_rel ] = $items; + unset( $links[ $rel ] ); + break; + } + } + } + + // Push the curies onto the start of the links array. + if ( $used_curies ) { + $links['curies'] = array_values( $used_curies ); + } + + return $links; + } + + /** + * Embeds the links from the data into the request. + * + * @since 4.4.0 + * @access protected + * + * @param array $data Data from the request. + * @return array { + * Data with sub-requests embedded. + * + * @type array [$_links] Links. + * @type array [$_embedded] Embeddeds. + * } + */ + protected function embed_links( $data ) { + if ( empty( $data['_links'] ) ) { + return $data; + } + + $embedded = array(); + + foreach ( $data['_links'] as $rel => $links ) { + // Ignore links to self, for obvious reasons. + if ( 'self' === $rel ) { + continue; + } + + $embeds = array(); + + foreach ( $links as $item ) { + // Determine if the link is embeddable. + if ( empty( $item['embeddable'] ) ) { + // Ensure we keep the same order. + $embeds[] = array(); + continue; + } + + // Run through our internal routing and serve. + $request = WP_REST_Request::from_url( $item['href'] ); + if ( ! $request ) { + $embeds[] = array(); + continue; + } + + // Embedded resources get passed context=embed. + if ( empty( $request['context'] ) ) { + $request['context'] = 'embed'; + } + + $response = $this->dispatch( $request ); + + /** This filter is documented in wp-includes/rest-api/class-wp-rest-server.php */ + $response = apply_filters( 'rest_post_dispatch', rest_ensure_response( $response ), $this, $request ); + + $embeds[] = $this->response_to_data( $response, false ); + } + + // Determine if any real links were found. + $has_links = count( array_filter( $embeds ) ); + if ( $has_links ) { + $embedded[ $rel ] = $embeds; + } + } + + if ( ! empty( $embedded ) ) { + $data['_embedded'] = $embedded; + } + + return $data; + } + + /** + * Wraps the response in an envelope. + * + * The enveloping technique is used to work around browser/client + * compatibility issues. Essentially, it converts the full HTTP response to + * data instead. + * + * @since 4.4.0 + * @access public + * + * @param WP_REST_Response $response Response object. + * @param bool $embed Whether links should be embedded. + * @return WP_REST_Response New response with wrapped data + */ + public function envelope_response( $response, $embed ) { + $envelope = array( + 'body' => $this->response_to_data( $response, $embed ), + 'status' => $response->get_status(), + 'headers' => $response->get_headers(), + ); + + /** + * Filter the enveloped form of a response. + * + * @since 4.4.0 + * + * @param array $envelope Envelope data. + * @param WP_REST_Response $response Original response data. + */ + $envelope = apply_filters( 'rest_envelope_response', $envelope, $response ); + + // Ensure it's still a response and return. + return rest_ensure_response( $envelope ); + } + + /** + * Registers a route to the server. + * + * @since 4.4.0 + * @access public + * + * @param string $namespace Namespace. + * @param string $route The REST route. + * @param array $route_args Route arguments. + * @param bool $override Optional. Whether the route should be overriden if it already exists. + * Default false. + */ + public function register_route( $namespace, $route, $route_args, $override = false ) { + if ( ! isset( $this->namespaces[ $namespace ] ) ) { + $this->namespaces[ $namespace ] = array(); + + $this->register_route( $namespace, '/' . $namespace, array( + array( + 'methods' => self::READABLE, + 'callback' => array( $this, 'get_namespace_index' ), + 'args' => array( + 'namespace' => array( + 'default' => $namespace, + ), + 'context' => array( + 'default' => 'view', + ), + ), + ), + ) ); + } + + // Associative to avoid double-registration. + $this->namespaces[ $namespace ][ $route ] = true; + $route_args['namespace'] = $namespace; + + if ( $override || empty( $this->endpoints[ $route ] ) ) { + $this->endpoints[ $route ] = $route_args; + } else { + $this->endpoints[ $route ] = array_merge( $this->endpoints[ $route ], $route_args ); + } + } + + /** + * Retrieves the route map. + * + * The route map is an associative array with path regexes as the keys. The + * value is an indexed array with the callback function/method as the first + * item, and a bitmask of HTTP methods as the second item (see the class + * constants). + * + * Each route can be mapped to more than one callback by using an array of + * the indexed arrays. This allows mapping e.g. GET requests to one callback + * and POST requests to another. + * + * Note that the path regexes (array keys) must have @ escaped, as this is + * used as the delimiter with preg_match() + * + * @since 4.4.0 + * @access public + * + * @return array `'/path/regex' => array( $callback, $bitmask )` or + * `'/path/regex' => array( array( $callback, $bitmask ), ...)`. + */ + public function get_routes() { + + /** + * Filter the array of available endpoints. + * + * @since 4.4.0 + * + * @param array $endpoints The available endpoints. An array of matching regex patterns, each mapped + * to an array of callbacks for the endpoint. These take the format + * `'/path/regex' => array( $callback, $bitmask )` or + * `'/path/regex' => array( array( $callback, $bitmask ). + */ + $endpoints = apply_filters( 'rest_endpoints', $this->endpoints ); + + // Normalise the endpoints. + $defaults = array( + 'methods' => '', + 'accept_json' => false, + 'accept_raw' => false, + 'show_in_index' => true, + 'args' => array(), + ); + + foreach ( $endpoints as $route => &$handlers ) { + + if ( isset( $handlers['callback'] ) ) { + // Single endpoint, add one deeper. + $handlers = array( $handlers ); + } + + if ( ! isset( $this->route_options[ $route ] ) ) { + $this->route_options[ $route ] = array(); + } + + foreach ( $handlers as $key => &$handler ) { + + if ( ! is_numeric( $key ) ) { + // Route option, move it to the options. + $this->route_options[ $route ][ $key ] = $handler; + unset( $handlers[ $key ] ); + continue; + } + + $handler = wp_parse_args( $handler, $defaults ); + + // Allow comma-separated HTTP methods. + if ( is_string( $handler['methods'] ) ) { + $methods = explode( ',', $handler['methods'] ); + } else if ( is_array( $handler['methods'] ) ) { + $methods = $handler['methods']; + } else { + $methods = array(); + } + + $handler['methods'] = array(); + + foreach ( $methods as $method ) { + $method = strtoupper( trim( $method ) ); + $handler['methods'][ $method ] = true; + } + } + } + return $endpoints; + } + + /** + * Retrieves namespaces registered on the server. + * + * @since 4.4.0 + * @access public + * + * @return array List of registered namespaces. + */ + public function get_namespaces() { + return array_keys( $this->namespaces ); + } + + /** + * Retrieves specified options for a route. + * + * @since 4.4.0 + * @access public + * + * @param string $route Route pattern to fetch options for. + * @return array|null Data as an associative array if found, or null if not found. + */ + public function get_route_options( $route ) { + if ( ! isset( $this->route_options[ $route ] ) ) { + return null; + } + + return $this->route_options[ $route ]; + } + + /** + * Matches the request to a callback and call it. + * + * @since 4.4.0 + * @access public + * + * @param WP_REST_Request $request Request to attempt dispatching. + * @return WP_REST_Response Response returned by the callback. + */ + public function dispatch( $request ) { + /** + * Filter the pre-calculated result of a REST dispatch request. + * + * Allow hijacking the request before dispatching by returning a non-empty. The returned value + * will be used to serve the request instead. + * + * @since 4.4.0 + * + * @param mixed $result Response to replace the requested version with. Can be anything + * a normal endpoint can return, or null to not hijack the request. + * @param WP_REST_Server $this Server instance. + * @param WP_REST_Request $request Request used to generate the response. + */ + $result = apply_filters( 'rest_pre_dispatch', null, $this, $request ); + + if ( ! empty( $result ) ) { + return $result; + } + + $method = $request->get_method(); + $path = $request->get_route(); + + foreach ( $this->get_routes() as $route => $handlers ) { + $match = preg_match( '@^' . $route . '$@i', $path, $args ); + + if ( ! $match ) { + continue; + } + + foreach ( $handlers as $handler ) { + $callback = $handler['callback']; + $response = null; + + // Fallback to GET method if no HEAD method is registered. + $checked_method = $method; + if ( 'HEAD' === $method && empty( $handler['methods']['HEAD'] ) ) { + $checked_method = 'GET'; + } + if ( empty( $handler['methods'][ $checked_method ] ) ) { + continue; + } + + if ( ! is_callable( $callback ) ) { + $response = new WP_Error( 'rest_invalid_handler', __( 'The handler for the route is invalid' ), array( 'status' => 500 ) ); + } + + if ( ! is_wp_error( $response ) ) { + // Remove the redundant preg_match argument. + unset( $args[0] ); + + $request->set_url_params( $args ); + $request->set_attributes( $handler ); + + $request->sanitize_params(); + + $defaults = array(); + + foreach ( $handler['args'] as $arg => $options ) { + if ( isset( $options['default'] ) ) { + $defaults[ $arg ] = $options['default']; + } + } + + $request->set_default_params( $defaults ); + + $check_required = $request->has_valid_params(); + if ( is_wp_error( $check_required ) ) { + $response = $check_required; + } + } + + if ( ! is_wp_error( $response ) ) { + // Check permission specified on the route. + if ( ! empty( $handler['permission_callback'] ) ) { + $permission = call_user_func( $handler['permission_callback'], $request ); + + if ( is_wp_error( $permission ) ) { + $response = $permission; + } else if ( false === $permission || null === $permission ) { + $response = new WP_Error( 'rest_forbidden', __( "You don't have permission to do this." ), array( 'status' => 403 ) ); + } + } + } + + if ( ! is_wp_error( $response ) ) { + /** + * Filter the REST dispatch request result. + * + * Allow plugins to override dispatching the request. + * + * @since 4.4.0 + * @since 4.5.0 Added `$route` and `$handler` parameters. + * + * @param bool $dispatch_result Dispatch result, will be used if not empty. + * @param WP_REST_Request $request Request used to generate the response. + * @param string $route Route matched for the request. + * @param array $handler Route handler used for the request. + */ + $dispatch_result = apply_filters( 'rest_dispatch_request', null, $request, $route, $handler ); + + // Allow plugins to halt the request via this filter. + if ( null !== $dispatch_result ) { + $response = $dispatch_result; + } else { + $response = call_user_func( $callback, $request ); + } + } + + if ( is_wp_error( $response ) ) { + $response = $this->error_to_response( $response ); + } else { + $response = rest_ensure_response( $response ); + } + + $response->set_matched_route( $route ); + $response->set_matched_handler( $handler ); + + return $response; + } + } + + return $this->error_to_response( new WP_Error( 'rest_no_route', __( 'No route was found matching the URL and request method' ), array( 'status' => 404 ) ) ); + } + + /** + * Returns if an error occurred during most recent JSON encode/decode. + * + * Strings to be translated will be in format like + * "Encoding error: Maximum stack depth exceeded". + * + * @since 4.4.0 + * @access protected + * + * @return bool|string Boolean false or string error message. + */ + protected function get_json_last_error() { + // See https://core.trac.wordpress.org/ticket/27799. + if ( ! function_exists( 'json_last_error' ) ) { + return false; + } + + $last_error_code = json_last_error(); + + if ( ( defined( 'JSON_ERROR_NONE' ) && JSON_ERROR_NONE === $last_error_code ) || empty( $last_error_code ) ) { + return false; + } + + return json_last_error_msg(); + } + + /** + * Retrieves the site index. + * + * This endpoint describes the capabilities of the site. + * + * @since 4.4.0 + * @access public + * + * @param array $request { + * Request. + * + * @type string $context Context. + * } + * @return array Index entity + */ + public function get_index( $request ) { + // General site data. + $available = array( + 'name' => get_option( 'blogname' ), + 'description' => get_option( 'blogdescription' ), + 'url' => get_option( 'siteurl' ), + 'home' => home_url(), + 'namespaces' => array_keys( $this->namespaces ), + 'authentication' => array(), + 'routes' => $this->get_data_for_routes( $this->get_routes(), $request['context'] ), + ); + + $response = new WP_REST_Response( $available ); + + $response->add_link( 'help', 'http://v2.wp-api.org/' ); + + /** + * Filter the API root index data. + * + * This contains the data describing the API. This includes information + * about supported authentication schemes, supported namespaces, routes + * available on the API, and a small amount of data about the site. + * + * @since 4.4.0 + * + * @param WP_REST_Response $response Response data. + */ + return apply_filters( 'rest_index', $response ); + } + + /** + * Retrieves the index for a namespace. + * + * @since 4.4.0 + * @access public + * + * @param WP_REST_Request $request REST request instance. + * @return WP_REST_Response|WP_Error WP_REST_Response instance if the index was found, + * WP_Error if the namespace isn't set. + */ + public function get_namespace_index( $request ) { + $namespace = $request['namespace']; + + if ( ! isset( $this->namespaces[ $namespace ] ) ) { + return new WP_Error( 'rest_invalid_namespace', __( 'The specified namespace could not be found.' ), array( 'status' => 404 ) ); + } + + $routes = $this->namespaces[ $namespace ]; + $endpoints = array_intersect_key( $this->get_routes(), $routes ); + + $data = array( + 'namespace' => $namespace, + 'routes' => $this->get_data_for_routes( $endpoints, $request['context'] ), + ); + $response = rest_ensure_response( $data ); + + // Link to the root index. + $response->add_link( 'up', rest_url( '/' ) ); + + /** + * Filter the namespace index data. + * + * This typically is just the route data for the namespace, but you can + * add any data you'd like here. + * + * @since 4.4.0 + * + * @param WP_REST_Response $response Response data. + * @param WP_REST_Request $request Request data. The namespace is passed as the 'namespace' parameter. + */ + return apply_filters( 'rest_namespace_index', $response, $request ); + } + + /** + * Retrieves the publicly-visible data for routes. + * + * @since 4.4.0 + * @access public + * + * @param array $routes Routes to get data for. + * @param string $context Optional. Context for data. Accepts 'view' or 'help'. Default 'view'. + * @return array Route data to expose in indexes. + */ + public function get_data_for_routes( $routes, $context = 'view' ) { + $available = array(); + + // Find the available routes. + foreach ( $routes as $route => $callbacks ) { + $data = $this->get_data_for_route( $route, $callbacks, $context ); + if ( empty( $data ) ) { + continue; + } + + /** + * Filter the REST endpoint data. + * + * @since 4.4.0 + * + * @param WP_REST_Request $request Request data. The namespace is passed as the 'namespace' parameter. + */ + $available[ $route ] = apply_filters( 'rest_endpoints_description', $data ); + } + + /** + * Filter the publicly-visible data for routes. + * + * This data is exposed on indexes and can be used by clients or + * developers to investigate the site and find out how to use it. It + * acts as a form of self-documentation. + * + * @since 4.4.0 + * + * @param array $available Map of route to route data. + * @param array $routes Internal route data as an associative array. + */ + return apply_filters( 'rest_route_data', $available, $routes ); + } + + /** + * Retrieves publicly-visible data for the route. + * + * @since 4.4.0 + * @access public + * + * @param string $route Route to get data for. + * @param array $callbacks Callbacks to convert to data. + * @param string $context Optional. Context for the data. Accepts 'view' or 'help'. Default 'view'. + * @return array|null Data for the route, or null if no publicly-visible data. + */ + public function get_data_for_route( $route, $callbacks, $context = 'view' ) { + $data = array( + 'namespace' => '', + 'methods' => array(), + 'endpoints' => array(), + ); + + if ( isset( $this->route_options[ $route ] ) ) { + $options = $this->route_options[ $route ]; + + if ( isset( $options['namespace'] ) ) { + $data['namespace'] = $options['namespace']; + } + + if ( isset( $options['schema'] ) && 'help' === $context ) { + $data['schema'] = call_user_func( $options['schema'] ); + } + } + + $route = preg_replace( '#$\?P<(\w+?)>.*?$#', '{$1}', $route ); + + foreach ( $callbacks as $callback ) { + // Skip to the next route if any callback is hidden. + if ( empty( $callback['show_in_index'] ) ) { + continue; + } + + $data['methods'] = array_merge( $data['methods'], array_keys( $callback['methods'] ) ); + $endpoint_data = array( + 'methods' => array_keys( $callback['methods'] ), + ); + + if ( isset( $callback['args'] ) ) { + $endpoint_data['args'] = array(); + foreach ( $callback['args'] as $key => $opts ) { + $arg_data = array( + 'required' => ! empty( $opts['required'] ), + ); + if ( isset( $opts['default'] ) ) { + $arg_data['default'] = $opts['default']; + } + if ( isset( $opts['enum'] ) ) { + $arg_data['enum'] = $opts['enum']; + } + if ( isset( $opts['description'] ) ) { + $arg_data['description'] = $opts['description']; + } + $endpoint_data['args'][ $key ] = $arg_data; + } + } + + $data['endpoints'][] = $endpoint_data; + + // For non-variable routes, generate links. + if ( strpos( $route, '{' ) === false ) { + $data['_links'] = array( + 'self' => rest_url( $route ), + ); + } + } + + if ( empty( $data['methods'] ) ) { + // No methods supported, hide the route. + return null; + } + + return $data; + } + + /** + * Sends an HTTP status code. + * + * @since 4.4.0 + * @access protected + * + * @param int $code HTTP status. + */ + protected function set_status( $code ) { + status_header( $code ); + } + + /** + * Sends an HTTP header. + * + * @since 4.4.0 + * @access public + * + * @param string $key Header key. + * @param string $value Header value. + */ + public function send_header( $key, $value ) { + /* + * Sanitize as per RFC2616 (Section 4.2): + * + * Any LWS that occurs between field-content MAY be replaced with a + * single SP before interpreting the field value or forwarding the + * message downstream. + */ + $value = preg_replace( '/\s+/', ' ', $value ); + header( sprintf( '%s: %s', $key, $value ) ); + } + + /** + * Sends multiple HTTP headers. + * + * @since 4.4.0 + * @access public + * + * @param array $headers Map of header name to header value. + */ + public function send_headers( $headers ) { + foreach ( $headers as $key => $value ) { + $this->send_header( $key, $value ); + } + } + + /** + * Retrieves the raw request entity (body). + * + * @since 4.4.0 + * @access public + * + * @global string $HTTP_RAW_POST_DATA Raw post data. + * + * @return string Raw request data. + */ + public static function get_raw_data() { + global $HTTP_RAW_POST_DATA; + + /* + * A bug in PHP < 5.2.2 makes $HTTP_RAW_POST_DATA not set by default, + * but we can do it ourself. + */ + if ( ! isset( $HTTP_RAW_POST_DATA ) ) { + $HTTP_RAW_POST_DATA = file_get_contents( 'php://input' ); + } + + return $HTTP_RAW_POST_DATA; + } + + /** + * Extracts headers from a PHP-style $_SERVER array. + * + * @since 4.4.0 + * @access public + * + * @param array $server Associative array similar to `$_SERVER`. + * @return array Headers extracted from the input. + */ + public function get_headers( $server ) { + $headers = array(); + + // CONTENT_* headers are not prefixed with HTTP_. + $additional = array( 'CONTENT_LENGTH' => true, 'CONTENT_MD5' => true, 'CONTENT_TYPE' => true ); + + foreach ( $server as $key => $value ) { + if ( strpos( $key, 'HTTP_' ) === 0 ) { + $headers[ substr( $key, 5 ) ] = $value; + } elseif ( isset( $additional[ $key ] ) ) { + $headers[ $key ] = $value; + } + } + + return $headers; + } +} diff --git a/wp-includes/revision.php b/wp-includes/revision.php index 4852303..653399e 100644 --- a/wp-includes/revision.php +++ b/wp-includes/revision.php @@ -9,78 +9,105 @@ /** * Determines which fields of posts are to be saved in revisions. * - * Does two things. If passed a post *array*, it will return a post array ready - * to be inserted into the posts table as a post revision. Otherwise, returns - * an array whose keys are the post fields to be saved for post revisions. - * * @since 2.6.0 + * @since 4.5.0 A `WP_Post` object can now be passed to the `$post` parameter. + * @since 4.5.0 The optional `$autosave` parameter was deprecated and renamed to `$deprecated`. * @access private * - * @param array $post Optional a post array to be processed for insertion as a post revision. - * @param bool $autosave optional Is the revision an autosave? - * @return array Post array ready to be inserted as a post revision or array of fields that can be versioned. + * @staticvar array $fields + * + * @param array|WP_Post $post Optional. A post array or a WP_Post object being processed + * for insertion as a post revision. Default empty array. + * @param bool $deprecated Not used. + * @return array Array of fields that can be versioned. */ -function _wp_post_revision_fields( $post = null, $autosave = false ) { - static $fields = false; +function _wp_post_revision_fields( $post = array(), $deprecated = false ) { + static $fields = null; + + if ( ! is_array( $post ) ) { + $post = get_post( $post, ARRAY_A ); + } - if ( !$fields ) { + if ( is_null( $fields ) ) { // Allow these to be versioned $fields = array( 'post_title' => __( 'Title' ), 'post_content' => __( 'Content' ), 'post_excerpt' => __( 'Excerpt' ), ); + } - /** - * Filter the list of fields saved in post revisions. - * - * Included by default: 'post_title', 'post_content' and 'post_excerpt'. - * - * Disallowed fields: 'ID', 'post_name', 'post_parent', 'post_date', - * 'post_date_gmt', 'post_status', 'post_type', 'comment_count', - * and 'post_author'. - * - * @since 2.6.0 - * - * @param array $fields List of fields to revision. Contains 'post_title', - * 'post_content', and 'post_excerpt' by default. - */ - $fields = apply_filters( '_wp_post_revision_fields', $fields ); + /** + * Filter the list of fields saved in post revisions. + * + * Included by default: 'post_title', 'post_content' and 'post_excerpt'. + * + * Disallowed fields: 'ID', 'post_name', 'post_parent', 'post_date', + * 'post_date_gmt', 'post_status', 'post_type', 'comment_count', + * and 'post_author'. + * + * @since 2.6.0 + * @since 4.5.0 The `$post` parameter was added. + * + * @param array $fields List of fields to revision. Contains 'post_title', + * 'post_content', and 'post_excerpt' by default. + * @param array $post A post array being processed for insertion as a post revision. + */ + $fields = apply_filters( '_wp_post_revision_fields', $fields, $post ); - // WP uses these internally either in versioning or elsewhere - they cannot be versioned - foreach ( array( 'ID', 'post_name', 'post_parent', 'post_date', 'post_date_gmt', 'post_status', 'post_type', 'comment_count', 'post_author' ) as $protect ) - unset( $fields[$protect] ); + // WP uses these internally either in versioning or elsewhere - they cannot be versioned + foreach ( array( 'ID', 'post_name', 'post_parent', 'post_date', 'post_date_gmt', 'post_status', 'post_type', 'comment_count', 'post_author' ) as $protect ) { + unset( $fields[ $protect ] ); } - if ( !is_array($post) ) - return $fields; - $return = array(); - foreach ( array_intersect( array_keys( $post ), array_keys( $fields ) ) as $field ) - $return[$field] = $post[$field]; + return $fields; +} + +/** + * Returns a post array ready to be inserted into the posts table as a post revision. + * + * @since 4.5.0 + * @access private + * + * @param array|WP_Post $post Optional. A post array or a WP_Post object to be processed + * for insertion as a post revision. Default empty array. + * @param bool $autosave Optional. Is the revision an autosave? Default false. + * @return array Post array ready to be inserted as a post revision. + */ +function _wp_post_revision_data( $post = array(), $autosave = false ) { + if ( ! is_array( $post ) ) { + $post = get_post( $post, ARRAY_A ); + } - $return['post_parent'] = $post['ID']; - $return['post_status'] = 'inherit'; - $return['post_type'] = 'revision'; - $return['post_name'] = $autosave ? "$post[ID]-autosave-v1" : "$post[ID]-revision-v1"; // "1" is the revisioning system version - $return['post_date'] = isset($post['post_modified']) ? $post['post_modified'] : ''; - $return['post_date_gmt'] = isset($post['post_modified_gmt']) ? $post['post_modified_gmt'] : ''; + $fields = _wp_post_revision_fields( $post ); - return $return; + $revision_data = array(); + + foreach ( array_intersect( array_keys( $post ), array_keys( $fields ) ) as $field ) { + $revision_data[ $field ] = $post[ $field ]; + } + + $revision_data['post_parent'] = $post['ID']; + $revision_data['post_status'] = 'inherit'; + $revision_data['post_type'] = 'revision'; + $revision_data['post_name'] = $autosave ? "$post[ID]-autosave-v1" : "$post[ID]-revision-v1"; // "1" is the revisioning system version + $revision_data['post_date'] = isset( $post['post_modified'] ) ? $post['post_modified'] : ''; + $revision_data['post_date_gmt'] = isset( $post['post_modified_gmt'] ) ? $post['post_modified_gmt'] : ''; + + return $revision_data; } /** - * Saves an already existing post as a post revision. + * Creates a revision for the current version of a post. * - * Typically used immediately after post updates. - * Adds a copy of the current post as a revision, so latest revision always matches current post + * Typically used immediately after a post update, as every update is a revision, + * and the most recent revision always matches the current post. * * @since 2.6.0 * - * @uses _wp_put_post_revision() - * * @param int $post_id The ID of the post to save as a revision. - * @return mixed Null or 0 if error, new revision ID, if success. + * @return int|WP_Error|void Void or 0 if error, new revision ID, if success. */ function wp_save_post_revision( $post_id ) { if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) @@ -118,35 +145,53 @@ function wp_save_post_revision( $post_id ) { * * @since 3.6.0 * - * @param bool $check_for_changes Whether to check for changes before saving a new revision. - * Default true. - * @param int $last_revision ID of the last revision. - * @param int $post Post ID. + * @param bool $check_for_changes Whether to check for changes before saving a new revision. + * Default true. + * @param WP_Post $last_revision The last revision post object. + * @param WP_Post $post The post object. * */ if ( isset( $last_revision ) && apply_filters( 'wp_save_post_revision_check_for_changes', $check_for_changes = true, $last_revision, $post ) ) { $post_has_changed = false; - foreach ( array_keys( _wp_post_revision_fields() ) as $field ) { + foreach ( array_keys( _wp_post_revision_fields( $post ) ) as $field ) { if ( normalize_whitespace( $post->$field ) != normalize_whitespace( $last_revision->$field ) ) { $post_has_changed = true; break; } } + + /** + * Filter whether a post has changed. + * + * By default a revision is saved only if one of the revisioned fields has changed. + * This filter allows for additional checks to determine if there were changes. + * + * @since 4.1.0 + * + * @param bool $post_has_changed Whether the post has changed. + * @param WP_Post $last_revision The last revision post object. + * @param WP_Post $post The post object. + * + */ + $post_has_changed = (bool) apply_filters( 'wp_save_post_revision_post_has_changed', $post_has_changed, $last_revision, $post ); + //don't save revision if post unchanged - if( ! $post_has_changed ) + if ( ! $post_has_changed ) { return; + } } } $return = _wp_put_post_revision( $post ); + // If a limit for the number of revisions to keep has been set, + // delete the oldest ones. $revisions_to_keep = wp_revisions_to_keep( $post ); if ( $revisions_to_keep < 0 ) return $return; - // all revisions and autosaves $revisions = wp_get_post_revisions( $post_id, array( 'order' => 'ASC' ) ); $delete = count($revisions) - $revisions_to_keep; @@ -175,11 +220,9 @@ function wp_save_post_revision( $post_id ) { * * @since 2.6.0 * - * @uses wp_get_post_revisions() - * * @param int $post_id The post ID. - * @param int $user_id optional The post author ID. - * @return object|bool The autosaved data or false on failure or when no autosave exists. + * @param int $user_id Optional The post author ID. + * @return WP_Post|false The autosaved data or false on failure or when no autosave exists. */ function wp_get_post_autosave( $post_id, $user_id = 0 ) { $revisions = wp_get_post_revisions( $post_id, array( 'check_enabled' => false ) ); @@ -190,7 +233,6 @@ function wp_get_post_autosave( $post_id, $user_id = 0 ) { continue; return $revision; - break; } } @@ -202,8 +244,8 @@ function wp_get_post_autosave( $post_id, $user_id = 0 ) { * * @since 2.6.0 * - * @param int|object $post Post ID or post object. - * @return bool|int False if not a revision, ID of revision's parent otherwise. + * @param int|WP_Post $post Post ID or post object. + * @return false|int False if not a revision, ID of revision's parent otherwise. */ function wp_is_post_revision( $post ) { if ( !$post = wp_get_post_revision( $post ) ) @@ -217,8 +259,8 @@ function wp_is_post_revision( $post ) { * * @since 2.6.0 * - * @param int|object $post Post ID or post object. - * @return bool|int False if not a revision, ID of autosave's parent otherwise + * @param int|WP_Post $post Post ID or post object. + * @return false|int False if not a revision, ID of autosave's parent otherwise */ function wp_is_post_autosave( $post ) { if ( !$post = wp_get_post_revision( $post ) ) @@ -236,11 +278,9 @@ function wp_is_post_autosave( $post ) { * @since 2.6.0 * @access private * - * @uses wp_insert_post() - * - * @param int|object|array $post Post ID, post object OR post array. - * @param bool $autosave Optional. Is the revision an autosave? - * @return mixed WP_Error or 0 if error, new revision ID if success. + * @param int|WP_Post|array|null $post Post ID, post object OR post array. + * @param bool $autosave Optional. Is the revision an autosave? + * @return int|WP_Error WP_Error or 0 if error, new revision ID if success. */ function _wp_put_post_revision( $post = null, $autosave = false ) { if ( is_object($post) ) @@ -249,13 +289,12 @@ function _wp_put_post_revision( $post = null, $autosave = false ) { $post = get_post($post, ARRAY_A); if ( ! $post || empty($post['ID']) ) - return new WP_Error( 'invalid_post', __( 'Invalid post ID' ) ); + return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) ); if ( isset($post['post_type']) && 'revision' == $post['post_type'] ) return new WP_Error( 'post_type', __( 'Cannot create a revision of a revision' ) ); - $post_id = $post['ID']; - $post = _wp_post_revision_fields( $post, $autosave ); + $post = _wp_post_revision_data( $post, $autosave ); $post = wp_slash($post); //since data is from db $revision_id = wp_insert_post( $post ); @@ -281,12 +320,10 @@ function _wp_put_post_revision( $post = null, $autosave = false ) { * * @since 2.6.0 * - * @uses get_post() - * - * @param int|object $post The post ID or object. - * @param string $output Optional. OBJECT, ARRAY_A, or ARRAY_N. - * @param string $filter Optional sanitation filter. @see sanitize_post(). - * @return mixed Null if error or post object if success. + * @param int|WP_Post $post The post ID or object. + * @param string $output Optional. OBJECT, ARRAY_A, or ARRAY_N. + * @param string $filter Optional sanitation filter. @see sanitize_post(). + * @return WP_Post|array|null Null if error or post object if success. */ function wp_get_post_revision(&$post, $output = OBJECT, $filter = 'raw') { if ( !$revision = get_post( $post, OBJECT, $filter ) ) @@ -314,22 +351,19 @@ function wp_get_post_revision(&$post, $output = OBJECT, $filter = 'raw') { * * @since 2.6.0 * - * @uses wp_get_post_revision() - * @uses wp_update_post() - * - * @param int|object $revision_id Revision ID or revision object. - * @param array $fields Optional. What fields to restore from. Defaults to all. - * @return mixed Null if error, false if no fields to restore, (int) post ID if success. + * @param int|WP_Post $revision_id Revision ID or revision object. + * @param array $fields Optional. What fields to restore from. Defaults to all. + * @return int|false|null Null if error, false if no fields to restore, (int) post ID if success. */ function wp_restore_post_revision( $revision_id, $fields = null ) { if ( !$revision = wp_get_post_revision( $revision_id, ARRAY_A ) ) return $revision; if ( !is_array( $fields ) ) - $fields = array_keys( _wp_post_revision_fields() ); + $fields = array_keys( _wp_post_revision_fields( $revision ) ); $update = array(); - foreach( array_intersect( array_keys( $revision ), $fields ) as $field ) { + foreach ( array_intersect( array_keys( $revision ), $fields ) as $field ) { $update[$field] = $revision[$field]; } @@ -375,20 +409,15 @@ function wp_restore_post_revision( $revision_id, $fields = null ) { * * @since 2.6.0 * - * @uses wp_get_post_revision() - * @uses wp_delete_post() - * - * @param int|object $revision_id Revision ID or revision object. - * @return mixed Null or WP_Error if error, deleted post if success. + * @param int|WP_Post $revision_id Revision ID or revision object. + * @return array|false|WP_Post|WP_Error|null Null or WP_Error if error, deleted post if success. */ function wp_delete_post_revision( $revision_id ) { - if ( !$revision = wp_get_post_revision( $revision_id ) ) + if ( ! $revision = wp_get_post_revision( $revision_id ) ) { return $revision; + } $delete = wp_delete_post( $revision->ID ); - if ( is_wp_error( $delete ) ) - return $delete; - if ( $delete ) { /** * Fires once a post revision has been deleted. @@ -409,9 +438,10 @@ function wp_delete_post_revision( $revision_id ) { * * @since 2.6.0 * - * @uses get_children() + * @see get_children() * - * @param int|object $post_id Post ID or post object + * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global `$post`. + * @param array|null $args Optional. Arguments for retrieving post revisions. Default null. * @return array An array of revisions, or an empty array if none. */ function wp_get_post_revisions( $post_id = 0, $args = null ) { @@ -419,7 +449,7 @@ function wp_get_post_revisions( $post_id = 0, $args = null ) { if ( ! $post || empty( $post->ID ) ) return array(); - $defaults = array( 'order' => 'DESC', 'orderby' => 'date', 'check_enabled' => true ); + $defaults = array( 'order' => 'DESC', 'orderby' => 'date ID', 'check_enabled' => true ); $args = wp_parse_args( $args, $defaults ); if ( $args['check_enabled'] && ! wp_revisions_enabled( $post ) ) @@ -438,24 +468,24 @@ function wp_get_post_revisions( $post_id = 0, $args = null ) { * * @since 3.6.0 * - * @uses wp_revisions_to_keep() - * - * @param object $post The post object. + * @param WP_Post $post The post object. * @return bool True if number of revisions to keep isn't zero, false otherwise. */ function wp_revisions_enabled( $post ) { - return wp_revisions_to_keep( $post ) != 0; + return wp_revisions_to_keep( $post ) !== 0; } /** * Determine how many revisions to retain for a given post. - * By default, an infinite number of revisions are stored if a post type supports revisions. * - * @since 3.6.0 + * By default, an infinite number of revisions are kept. * - * @uses post_type_supports() + * The constant WP_POST_REVISIONS can be set in wp-config to specify the limit + * of revisions to keep. * - * @param object $post The post object. + * @since 3.6.0 + * + * @param WP_Post $post The post object. * @return int The number of revisions to keep. */ function wp_revisions_to_keep( $post ) { @@ -487,18 +517,21 @@ function wp_revisions_to_keep( $post ) { * * @since 2.7.0 * @access private + * + * @param WP_Post $post + * @return WP_Post|false */ -function _set_preview($post) { - - if ( ! is_object($post) ) +function _set_preview( $post ) { + if ( ! is_object( $post ) ) { return $post; + } - $preview = wp_get_post_autosave($post->ID); - - if ( ! is_object($preview) ) + $preview = wp_get_post_autosave( $post->ID ); + if ( ! is_object( $preview ) ) { return $post; + } - $preview = sanitize_post($preview); + $preview = sanitize_post( $preview ); $post->post_content = $preview->post_content; $post->post_title = $preview->post_title; @@ -516,11 +549,10 @@ function _set_preview($post) { * @access private */ function _show_post_preview() { - if ( isset($_GET['preview_id']) && isset($_GET['preview_nonce']) ) { $id = (int) $_GET['preview_id']; - if ( false == wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $id ) ) + if ( false === wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $id ) ) wp_die( __('You do not have permission to preview drafts.') ); add_filter('the_preview', '_set_preview'); @@ -532,6 +564,11 @@ function _show_post_preview() { * * @since 3.6.0 * @access private + * + * @param array $terms + * @param int $post_id + * @param string $taxonomy + * @return array */ function _wp_preview_terms_filter( $terms, $post_id, $taxonomy ) { if ( ! $post = get_post() ) @@ -553,7 +590,10 @@ function _wp_preview_terms_filter( $terms, $post_id, $taxonomy ) { * * @since 3.6.0 * @access private -*/ + * + * @param WP_Post $revision + * @return int|false + */ function _wp_get_post_revision_version( $revision ) { if ( is_object( $revision ) ) $revision = get_object_vars( $revision ); @@ -572,10 +612,10 @@ function _wp_get_post_revision_version( $revision ) { * @since 3.6.0 * @access private * - * @uses wp_get_post_revisions() + * @global wpdb $wpdb WordPress database abstraction object. * - * @param object $post Post object - * @param array $revisions Current revisions of the post + * @param WP_Post $post Post object + * @param array $revisions Current revisions of the post * @return bool true if the revisions were upgraded, false if problems */ function _wp_upgrade_revisions_of_post( $post, $revisions ) { diff --git a/wp-includes/rewrite.php b/wp-includes/rewrite.php index 0de3b3e..0763dc5 100644 --- a/wp-includes/rewrite.php +++ b/wp-includes/rewrite.php @@ -6,108 +6,6 @@ * @subpackage Rewrite */ -/** - * Add a straight rewrite rule. - * - * @see WP_Rewrite::add_rule() for long description. - * @since 2.1.0 - * - * @param string $regex Regular Expression to match request against. - * @param string $redirect Page to redirect to. - * @param string $after Optional, default is 'bottom'. Where to add rule, can also be 'top'. - */ -function add_rewrite_rule($regex, $redirect, $after = 'bottom') { - global $wp_rewrite; - $wp_rewrite->add_rule($regex, $redirect, $after); -} - -/** - * Add a new rewrite tag (like %postname%). - * - * The $query parameter is optional. If it is omitted you must ensure that - * you call this on, or before, the 'init' hook. This is because $query defaults - * to "$tag=", and for this to work a new query var has to be added. - * - * @see WP_Rewrite::add_rewrite_tag() - * @since 2.1.0 - * - * @param string $tag Name of the new rewrite tag. - * @param string $regex Regular expression to substitute the tag for in rewrite rules. - * @param string $query String to append to the rewritten query. Must end in '='. Optional. - */ -function add_rewrite_tag( $tag, $regex, $query = '' ) { - // validate the tag's name - if ( strlen( $tag ) < 3 || $tag[0] != '%' || $tag[ strlen($tag) - 1 ] != '%' ) - return; - - global $wp_rewrite, $wp; - - if ( empty( $query ) ) { - $qv = trim( $tag, '%' ); - $wp->add_query_var( $qv ); - $query = $qv . '='; - } - - $wp_rewrite->add_rewrite_tag( $tag, $regex, $query ); -} - -/** - * Add permalink structure. - * - * @see WP_Rewrite::add_permastruct() - * @since 3.0.0 - * - * @param string $name Name for permalink structure. - * @param string $struct Permalink structure. - * @param array $args Optional configuration for building the rules from the permalink structure, - * see {@link WP_Rewrite::add_permastruct()} for full details. - */ -function add_permastruct( $name, $struct, $args = array() ) { - global $wp_rewrite; - - // backwards compatibility for the old parameters: $with_front and $ep_mask - if ( ! is_array( $args ) ) - $args = array( 'with_front' => $args ); - if ( func_num_args() == 4 ) - $args['ep_mask'] = func_get_arg( 3 ); - - return $wp_rewrite->add_permastruct( $name, $struct, $args ); -} - -/** - * Add a new feed type like /atom1/. - * - * @since 2.1.0 - * - * @param string $feedname - * @param callback $function Callback to run on feed display. - * @return string Feed action name. - */ -function add_feed($feedname, $function) { - global $wp_rewrite; - if ( ! in_array($feedname, $wp_rewrite->feeds) ) //override the file if it is - $wp_rewrite->feeds[] = $feedname; - $hook = 'do_feed_' . $feedname; - // Remove default function hook - remove_action($hook, $hook); - add_action($hook, $function, 10, 1); - return $hook; -} - -/** - * Remove rewrite rules and then recreate rewrite rules. - * - * @see WP_Rewrite::flush_rules() - * @since 3.0.0 - * - * @param bool $hard Whether to update .htaccess (hard flush) or just update - * rewrite_rules transient (soft flush). Default is true (hard). - */ -function flush_rewrite_rules( $hard = true ) { - global $wp_rewrite; - $wp_rewrite->flush_rules( $hard ); -} - /** * Endpoint Mask for default, which is nothing. * @@ -220,39 +118,194 @@ define( 'EP_ALL_ARCHIVES', EP_DATE | EP_YEAR | EP_MONTH | EP_DAY | EP_CATEGORIES */ define( 'EP_ALL', EP_PERMALINK | EP_ATTACHMENT | EP_ROOT | EP_COMMENTS | EP_SEARCH | EP_PAGES | EP_ALL_ARCHIVES ); +/** + * Adds a rewrite rule that transforms a URL structure to a set of query vars. + * + * Any value in the $after parameter that isn't 'bottom' will result in the rule + * being placed at the top of the rewrite rules. + * + * @since 2.1.0 + * @since 4.4.0 Array support was added to the `$query` parameter. + * + * @global WP_Rewrite $wp_rewrite WordPress Rewrite Component. + * + * @param string $regex Regular expression to match request against. + * @param string|array $query The corresponding query vars for this rewrite rule. + * @param string $after Optional. Priority of the new rule. Accepts 'top' + * or 'bottom'. Default 'bottom'. + */ +function add_rewrite_rule( $regex, $query, $after = 'bottom' ) { + global $wp_rewrite; + + $wp_rewrite->add_rule( $regex, $query, $after ); +} + +/** + * Add a new rewrite tag (like %postname%). + * + * The $query parameter is optional. If it is omitted you must ensure that + * you call this on, or before, the 'init' hook. This is because $query defaults + * to "$tag=", and for this to work a new query var has to be added. + * + * @since 2.1.0 + * + * @global WP_Rewrite $wp_rewrite + * @global WP $wp + * + * @param string $tag Name of the new rewrite tag. + * @param string $regex Regular expression to substitute the tag for in rewrite rules. + * @param string $query Optional. String to append to the rewritten query. Must end in '='. Default empty. + */ +function add_rewrite_tag( $tag, $regex, $query = '' ) { + // validate the tag's name + if ( strlen( $tag ) < 3 || $tag[0] != '%' || $tag[ strlen($tag) - 1 ] != '%' ) + return; + + global $wp_rewrite, $wp; + + if ( empty( $query ) ) { + $qv = trim( $tag, '%' ); + $wp->add_query_var( $qv ); + $query = $qv . '='; + } + + $wp_rewrite->add_rewrite_tag( $tag, $regex, $query ); +} + +/** + * Removes an existing rewrite tag (like %postname%). + * + * @since 4.5.0 + * + * @global WP_Rewrite $wp_rewrite WordPress rewrite component. + * + * @param string $tag Name of the rewrite tag. + */ +function remove_rewrite_tag( $tag ) { + global $wp_rewrite; + $wp_rewrite->remove_rewrite_tag( $tag ); +} + +/** + * Add permalink structure. + * + * @since 3.0.0 + * + * @see WP_Rewrite::add_permastruct() + * @global WP_Rewrite $wp_rewrite WordPress rewrite component. + * + * @param string $name Name for permalink structure. + * @param string $struct Permalink structure. + * @param array $args Optional. Arguments for building the rules from the permalink structure, + * see WP_Rewrite::add_permastruct() for full details. Default empty array. + */ +function add_permastruct( $name, $struct, $args = array() ) { + global $wp_rewrite; + + // backwards compatibility for the old parameters: $with_front and $ep_mask + if ( ! is_array( $args ) ) + $args = array( 'with_front' => $args ); + if ( func_num_args() == 4 ) + $args['ep_mask'] = func_get_arg( 3 ); + + $wp_rewrite->add_permastruct( $name, $struct, $args ); +} + +/** + * Removes a permalink structure. + * + * Can only be used to remove permastructs that were added using add_permastruct(). + * Built-in permastructs cannot be removed. + * + * @since 4.5.0 + * + * @see WP_Rewrite::remove_permastruct() + * @global WP_Rewrite $wp_rewrite WordPress rewrite component. + * + * @param string $name Name for permalink structure. + */ +function remove_permastruct( $name ) { + global $wp_rewrite; + + $wp_rewrite->remove_permastruct( $name ); +} + +/** + * Add a new feed type like /atom1/. + * + * @since 2.1.0 + * + * @global WP_Rewrite $wp_rewrite + * + * @param string $feedname Feed name. + * @param callable $function Callback to run on feed display. + * @return string Feed action name. + */ +function add_feed( $feedname, $function ) { + global $wp_rewrite; + + if ( ! in_array( $feedname, $wp_rewrite->feeds ) ) { + $wp_rewrite->feeds[] = $feedname; + } + + $hook = 'do_feed_' . $feedname; + + // Remove default function hook + remove_action( $hook, $hook ); + + add_action( $hook, $function, 10, 2 ); + + return $hook; +} + +/** + * Remove rewrite rules and then recreate rewrite rules. + * + * @since 3.0.0 + * + * @global WP_Rewrite $wp_rewrite + * + * @param bool $hard Whether to update .htaccess (hard flush) or just update + * rewrite_rules transient (soft flush). Default is true (hard). + */ +function flush_rewrite_rules( $hard = true ) { + global $wp_rewrite; + $wp_rewrite->flush_rules( $hard ); +} + /** * Add an endpoint, like /trackback/. * * Adding an endpoint creates extra rewrite rules for each of the matching * places specified by the provided bitmask. For example: * - * <code> - * add_rewrite_endpoint( 'json', EP_PERMALINK | EP_PAGES ); - * </code> + * add_rewrite_endpoint( 'json', EP_PERMALINK | EP_PAGES ); * * will add a new rewrite rule ending with "json(/(.*))?/?$" for every permastruct * that describes a permalink (post) or page. This is rewritten to "json=$match" * where $match is the part of the URL matched by the endpoint regex (e.g. "foo" in - * "<permalink>/json/foo/"). + * "[permalink]/json/foo/"). * * A new query var with the same name as the endpoint will also be created. * * When specifying $places ensure that you are using the EP_* constants (or a * combination of them using the bitwise OR operator) as their values are not - * guaranteed to remain static (especially EP_ALL). + * guaranteed to remain static (especially `EP_ALL`). * - * Be sure to flush the rewrite rules - flush_rewrite_rules() - when your plugin gets + * Be sure to flush the rewrite rules - see flush_rewrite_rules() - when your plugin gets * activated and deactivated. * * @since 2.1.0 - * @see WP_Rewrite::add_endpoint() - * @global object $wp_rewrite + * @since 4.3.0 Added support for skipping query var registration by passing `false` to `$query_var`. + * + * @global WP_Rewrite $wp_rewrite * - * @param string $name Name of the endpoint. - * @param int $places Endpoint mask describing the places the endpoint should be added. - * @param string $query_var Name of the corresponding query variable. Defaults to $name. + * @param string $name Name of the endpoint. + * @param int $places Endpoint mask describing the places the endpoint should be added. + * @param string|bool $query_var Name of the corresponding query variable. Pass `false` to skip registering a query_var + * for this endpoint. Defaults to the value of `$name`. */ -function add_rewrite_endpoint( $name, $places, $query_var = null ) { +function add_rewrite_endpoint( $name, $places, $query_var = true ) { global $wp_rewrite; $wp_rewrite->add_endpoint( $name, $places, $query_var ); } @@ -276,17 +329,137 @@ function _wp_filter_taxonomy_base( $base ) { return $base; } + +/** + * Resolve numeric slugs that collide with date permalinks. + * + * Permalinks of posts with numeric slugs can sometimes look to WP_Query::parse_query() + * like a date archive, as when your permalink structure is `/%year%/%postname%/` and + * a post with post_name '05' has the URL `/2015/05/`. + * + * This function detects conflicts of this type and resolves them in favor of the + * post permalink. + * + * Note that, since 4.3.0, wp_unique_post_slug() prevents the creation of post slugs + * that would result in a date archive conflict. The resolution performed in this + * function is primarily for legacy content, as well as cases when the admin has changed + * the site's permalink structure in a way that introduces URL conflicts. + * + * @since 4.3.0 + * + * @param array $query_vars Optional. Query variables for setting up the loop, as determined in + * WP::parse_request(). Default empty array. + * @return array Returns the original array of query vars, with date/post conflicts resolved. + */ +function wp_resolve_numeric_slug_conflicts( $query_vars = array() ) { + if ( ! isset( $query_vars['year'] ) && ! isset( $query_vars['monthnum'] ) && ! isset( $query_vars['day'] ) ) { + return $query_vars; + } + + // Identify the 'postname' position in the permastruct array. + $permastructs = array_values( array_filter( explode( '/', get_option( 'permalink_structure' ) ) ) ); + $postname_index = array_search( '%postname%', $permastructs ); + + if ( false === $postname_index ) { + return $query_vars; + } + + /* + * A numeric slug could be confused with a year, month, or day, depending on position. To account for + * the possibility of post pagination (eg 2015/2 for the second page of a post called '2015'), our + * `is_*` checks are generous: check for year-slug clashes when `is_year` *or* `is_month`, and check + * for month-slug clashes when `is_month` *or* `is_day`. + */ + $compare = ''; + if ( 0 === $postname_index && ( isset( $query_vars['year'] ) || isset( $query_vars['monthnum'] ) ) ) { + $compare = 'year'; + } elseif ( '%year%' === $permastructs[ $postname_index - 1 ] && ( isset( $query_vars['monthnum'] ) || isset( $query_vars['day'] ) ) ) { + $compare = 'monthnum'; + } elseif ( '%monthnum%' === $permastructs[ $postname_index - 1 ] && isset( $query_vars['day'] ) ) { + $compare = 'day'; + } + + if ( ! $compare ) { + return $query_vars; + } + + // This is the potentially clashing slug. + $value = $query_vars[ $compare ]; + + $post = get_page_by_path( $value, OBJECT, 'post' ); + if ( ! ( $post instanceof WP_Post ) ) { + return $query_vars; + } + + // If the date of the post doesn't match the date specified in the URL, resolve to the date archive. + if ( preg_match( '/^([0-9]{4})\-([0-9]{2})/', $post->post_date, $matches ) && isset( $query_vars['year'] ) && ( 'monthnum' === $compare || 'day' === $compare ) ) { + // $matches[1] is the year the post was published. + if ( intval( $query_vars['year'] ) !== intval( $matches[1] ) ) { + return $query_vars; + } + + // $matches[2] is the month the post was published. + if ( 'day' === $compare && isset( $query_vars['monthnum'] ) && intval( $query_vars['monthnum'] ) !== intval( $matches[2] ) ) { + return $query_vars; + } + } + + /* + * If the located post contains nextpage pagination, then the URL chunk following postname may be + * intended as the page number. Verify that it's a valid page before resolving to it. + */ + $maybe_page = ''; + if ( 'year' === $compare && isset( $query_vars['monthnum'] ) ) { + $maybe_page = $query_vars['monthnum']; + } elseif ( 'monthnum' === $compare && isset( $query_vars['day'] ) ) { + $maybe_page = $query_vars['day']; + } + // Bug found in #11694 - 'page' was returning '/4' + $maybe_page = (int) trim( $maybe_page, '/' ); + + $post_page_count = substr_count( $post->post_content, '' ) + 1; + + // If the post doesn't have multiple pages, but a 'page' candidate is found, resolve to the date archive. + if ( 1 === $post_page_count && $maybe_page ) { + return $query_vars; + } + + // If the post has multiple pages and the 'page' number isn't valid, resolve to the date archive. + if ( $post_page_count > 1 && $maybe_page > $post_page_count ) { + return $query_vars; + } + + // If we've gotten to this point, we have a slug/date clash. First, adjust for nextpage. + if ( '' !== $maybe_page ) { + $query_vars['page'] = intval( $maybe_page ); + } + + // Next, unset autodetected date-related query vars. + unset( $query_vars['year'] ); + unset( $query_vars['monthnum'] ); + unset( $query_vars['day'] ); + + // Then, set the identified post. + $query_vars['name'] = $post->post_name; + + // Finally, return the modified query vars. + return $query_vars; +} + /** - * Examine a url and try to determine the post ID it represents. + * Examine a URL and try to determine the post ID it represents. * * Checks are supposedly from the hosted site blog. * * @since 1.0.0 * + * @global WP_Rewrite $wp_rewrite + * @global WP $wp + * * @param string $url Permalink to check. * @return int Post ID, or 0 on failure. */ -function url_to_postid($url) { +function url_to_postid( $url ) { global $wp_rewrite; /** @@ -305,13 +478,6 @@ function url_to_postid($url) { return $id; } - // Check to see if we are using rewrite rules - $rewrite = $wp_rewrite->wp_rewrite_rules(); - - // Not using rewrite rules, and 'p=N' and 'page_id=N' methods failed, so we're out of options - if ( empty($rewrite) ) - return 0; - // Get rid of the #anchor $url_split = explode('#', $url); $url = $url_split[0]; @@ -320,6 +486,10 @@ function url_to_postid($url) { $url_split = explode('?', $url); $url = $url_split[0]; + // Set the correct URL scheme. + $scheme = parse_url( home_url(), PHP_URL_SCHEME ); + $url = set_url_scheme( $url, $scheme ); + // Add 'www.' if it is absent and should be there if ( false !== strpos(home_url(), '://www.') && false === strpos($url, '://www.') ) $url = str_replace('://', '://www.', $url); @@ -328,6 +498,21 @@ function url_to_postid($url) { if ( false === strpos(home_url(), '://www.') ) $url = str_replace('://www.', '://', $url); + if ( trim( $url, '/' ) === home_url() && 'page' == get_option( 'show_on_front' ) ) { + $page_on_front = get_option( 'page_on_front' ); + + if ( $page_on_front && get_post( $page_on_front ) instanceof WP_Post ) { + return (int) $page_on_front; + } + } + + // Check to see if we are using rewrite rules + $rewrite = $wp_rewrite->wp_rewrite_rules(); + + // Not using rewrite rules, and 'p=N' and 'page_id=N' methods failed, so we're out of options + if ( empty($rewrite) ) + return 0; + // Strip 'index.php/' if we're not using path info permalinks if ( !$wp_rewrite->using_index_permalinks() ) $url = str_replace( $wp_rewrite->index . '/', '', $url ); @@ -365,10 +550,18 @@ function url_to_postid($url) { if ( preg_match("#^$match#", $request_match, $matches) ) { if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) { - // this is a verbose page match, lets check to be sure about it - if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) ) + // This is a verbose page match, let's check to be sure about it. + $page = get_page_by_path( $matches[ $varmatch[1] ] ); + if ( ! $page ) { continue; - } + } + + $post_status_obj = get_post_status_object( $page->post_status ); + if ( ! $post_status_obj->public && ! $post_status_obj->protected + && ! $post_status_obj->private && $post_status_obj->exclude_from_search ) { + continue; + } + } // Got a match. // Trim the query of everything up to the '?'. @@ -391,6 +584,9 @@ function url_to_postid($url) { } } + // Resolve conflicts between posts with numeric slugs and date archive queries. + $query = wp_resolve_numeric_slug_conflicts( $query ); + // Do the query $query = new WP_Query( $query ); if ( ! empty( $query->posts ) && $query->is_singular ) @@ -401,1780 +597,3 @@ function url_to_postid($url) { } return 0; } - -/** - * WordPress Rewrite Component. - * - * The WordPress Rewrite class writes the rewrite module rules to the .htaccess - * file. It also handles parsing the request to get the correct setup for the - * WordPress Query class. - * - * The Rewrite along with WP class function as a front controller for WordPress. - * You can add rules to trigger your page view and processing using this - * component. The full functionality of a front controller does not exist, - * meaning you can't define how the template files load based on the rewrite - * rules. - * - * @since 1.5.0 - */ -class WP_Rewrite { - /** - * Permalink structure for posts. - * - * @since 1.5.0 - * @access private - * @var string - */ - var $permalink_structure; - - /** - * Whether to add trailing slashes. - * - * @since 2.2.0 - * @access private - * @var bool - */ - var $use_trailing_slashes; - - /** - * Base for the author permalink structure (example.com/$author_base/authorname). - * - * @since 1.5.0 - * @access private - * @var string - */ - var $author_base = 'author'; - - /** - * Permalink structure for author archives. - * - * @since 1.5.0 - * @access private - * @var string - */ - var $author_structure; - - /** - * Permalink structure for date archives. - * - * @since 1.5.0 - * @access private - * @var string - */ - var $date_structure; - - /** - * Permalink structure for pages. - * - * @since 1.5.0 - * @access private - * @var string - */ - var $page_structure; - - /** - * Base of the search permalink structure (example.com/$search_base/query). - * - * @since 1.5.0 - * @access private - * @var string - */ - var $search_base = 'search'; - - /** - * Permalink structure for searches. - * - * @since 1.5.0 - * @access private - * @var string - */ - var $search_structure; - - /** - * Comments permalink base. - * - * @since 1.5.0 - * @access private - * @var string - */ - var $comments_base = 'comments'; - - /** - * Pagination permalink base. - * - * @since 3.1.0 - * @access private - * @var string - */ - var $pagination_base = 'page'; - - /** - * Feed permalink base. - * - * @since 1.5.0 - * @access private - * @var string - */ - var $feed_base = 'feed'; - - /** - * Comments feed permalink structure. - * - * @since 1.5.0 - * @access private - * @var string - */ - var $comments_feed_structure; - - /** - * Feed request permalink structure. - * - * @since 1.5.0 - * @access private - * @var string - */ - var $feed_structure; - - /** - * The static portion of the post permalink structure. - * - * If the permalink structure is "/archive/%post_id%" then the front - * is "/archive/". If the permalink structure is "/%year%/%postname%/" - * then the front is "/". - * - * @see WP_Rewrite::init() - * @since 1.5.0 - * @access private - * @var string - */ - var $front; - - /** - * The prefix for all permalink structures. - * - * If PATHINFO/index permalinks are in use then the root is the value of - * {@link WP_Rewrite::$index} with a trailing slash appended. Otherwise - * the root will be empty. - * - * @see WP_Rewrite::init() - * @see WP_Rewrite::using_index_permalinks() - * @since 1.5.0 - * @access private - * @var string - */ - var $root = ''; - - /** - * The name of the index file which is the entry point to all requests. - * - * @since 1.5.0 - * @access public - * @var string - */ - var $index = 'index.php'; - - /** - * Variable name to use for regex matches in the rewritten query. - * - * @since 1.5.0 - * @access private - * @var string - */ - var $matches = ''; - - /** - * Rewrite rules to match against the request to find the redirect or query. - * - * @since 1.5.0 - * @access private - * @var array - */ - var $rules; - - /** - * Additional rules added external to the rewrite class. - * - * Those not generated by the class, see add_rewrite_rule(). - * - * @since 2.1.0 - * @access private - * @var array - */ - var $extra_rules = array(); - - /** - * Additional rules that belong at the beginning to match first. - * - * Those not generated by the class, see add_rewrite_rule(). - * - * @since 2.3.0 - * @access private - * @var array - */ - var $extra_rules_top = array(); - - /** - * Rules that don't redirect to WordPress' index.php. - * - * These rules are written to the mod_rewrite portion of the .htaccess, - * and are added by {@link add_external_rule()}. - * - * @since 2.1.0 - * @access private - * @var array - */ - var $non_wp_rules = array(); - - /** - * Extra permalink structures, e.g. categories, added by {@link add_permastruct()}. - * - * @since 2.1.0 - * @access private - * @var array - */ - var $extra_permastructs = array(); - - /** - * Endpoints (like /trackback/) added by {@link add_rewrite_endpoint()}. - * - * @since 2.1.0 - * @access private - * @var array - */ - var $endpoints; - - /** - * Whether to write every mod_rewrite rule for WordPress into the .htaccess file. - * - * This is off by default, turning it on might print a lot of rewrite rules - * to the .htaccess file. - * - * @see WP_Rewrite::mod_rewrite_rules() - * @since 2.0.0 - * @access public - * @var bool - */ - var $use_verbose_rules = false; - - /** - * Could post permalinks be confused with those of pages? - * - * If the first rewrite tag in the post permalink structure is one that could - * also match a page name (e.g. %postname% or %author%) then this flag is - * set to true. Prior to WordPress 3.3 this flag indicated that every page - * would have a set of rules added to the top of the rewrite rules array. - * Now it tells {@link WP::parse_request()} to check if a URL matching the - * page permastruct is actually a page before accepting it. - * - * @link http://core.trac.wordpress.org/ticket/16687 - * @see WP_Rewrite::init() - * @since 2.5.0 - * @access public - * @var bool - */ - var $use_verbose_page_rules = true; - - /** - * Rewrite tags that can be used in permalink structures. - * - * These are translated into the regular expressions stored in - * {@link WP_Rewrite::$rewritereplace} and are rewritten to the - * query variables listed in {@link WP_Rewrite::$queryreplace}. - * - * Additional tags can be added with {@link add_rewrite_tag()}. - * - * @since 1.5.0 - * @access private - * @var array - */ - var $rewritecode = array( - '%year%', - '%monthnum%', - '%day%', - '%hour%', - '%minute%', - '%second%', - '%postname%', - '%post_id%', - '%author%', - '%pagename%', - '%search%' - ); - - /** - * Regular expressions to be substituted into rewrite rules in place - * of rewrite tags, see {@link WP_Rewrite::$rewritecode}. - * - * @since 1.5.0 - * @access private - * @var array - */ - var $rewritereplace = array( - '([0-9]{4})', - '([0-9]{1,2})', - '([0-9]{1,2})', - '([0-9]{1,2})', - '([0-9]{1,2})', - '([0-9]{1,2})', - '([^/]+)', - '([0-9]+)', - '([^/]+)', - '([^/]+?)', - '(.+)' - ); - - /** - * Query variables that rewrite tags map to, see {@link WP_Rewrite::$rewritecode}. - * - * @since 1.5.0 - * @access private - * @var array - */ - var $queryreplace = array( - 'year=', - 'monthnum=', - 'day=', - 'hour=', - 'minute=', - 'second=', - 'name=', - 'p=', - 'author_name=', - 'pagename=', - 's=' - ); - - /** - * Supported default feeds. - * - * @since 1.5.0 - * @access private - * @var array - */ - var $feeds = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' ); - - /** - * Whether permalinks are being used. - * - * This can be either rewrite module or permalink in the HTTP query string. - * - * @since 1.5.0 - * @access public - * - * @return bool True, if permalinks are enabled. - */ - function using_permalinks() { - return ! empty($this->permalink_structure); - } - - /** - * Whether permalinks are being used and rewrite module is not enabled. - * - * Means that permalink links are enabled and index.php is in the URL. - * - * @since 1.5.0 - * @access public - * - * @return bool - */ - function using_index_permalinks() { - if ( empty($this->permalink_structure) ) - return false; - - // If the index is not in the permalink, we're using mod_rewrite. - if ( preg_match('#^/*' . $this->index . '#', $this->permalink_structure) ) - return true; - - return false; - } - - /** - * Whether permalinks are being used and rewrite module is enabled. - * - * Using permalinks and index.php is not in the URL. - * - * @since 1.5.0 - * @access public - * - * @return bool - */ - function using_mod_rewrite_permalinks() { - if ( $this->using_permalinks() && ! $this->using_index_permalinks() ) - return true; - else - return false; - } - - /** - * Index for matches for usage in preg_*() functions. - * - * The format of the string is, with empty matches property value, '$NUM'. - * The 'NUM' will be replaced with the value in the $number parameter. With - * the matches property not empty, the value of the returned string will - * contain that value of the matches property. The format then will be - * '$MATCHES[NUM]', with MATCHES as the value in the property and NUM the - * value of the $number parameter. - * - * @since 1.5.0 - * @access public - * - * @param int $number Index number. - * @return string - */ - function preg_index($number) { - $match_prefix = '$'; - $match_suffix = ''; - - if ( ! empty($this->matches) ) { - $match_prefix = '$' . $this->matches . '['; - $match_suffix = ']'; - } - - return "$match_prefix$number$match_suffix"; - } - - /** - * Retrieve all page and attachments for pages URIs. - * - * The attachments are for those that have pages as parents and will be - * retrieved. - * - * @since 2.5.0 - * @access public - * - * @return array Array of page URIs as first element and attachment URIs as second element. - */ - function page_uri_index() { - global $wpdb; - - //get pages in order of hierarchy, i.e. children after parents - $pages = $wpdb->get_results("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'page' AND post_status != 'auto-draft'"); - $posts = get_page_hierarchy( $pages ); - - // If we have no pages get out quick - if ( !$posts ) - return array( array(), array() ); - - //now reverse it, because we need parents after children for rewrite rules to work properly - $posts = array_reverse($posts, true); - - $page_uris = array(); - $page_attachment_uris = array(); - - foreach ( $posts as $id => $post ) { - // URL => page name - $uri = get_page_uri($id); - $attachments = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'attachment' AND post_parent = %d", $id )); - if ( !empty($attachments) ) { - foreach ( $attachments as $attachment ) { - $attach_uri = get_page_uri($attachment->ID); - $page_attachment_uris[$attach_uri] = $attachment->ID; - } - } - - $page_uris[$uri] = $id; - } - - return array( $page_uris, $page_attachment_uris ); - } - - /** - * Retrieve all of the rewrite rules for pages. - * - * @since 1.5.0 - * @access public - * - * @return array - */ - function page_rewrite_rules() { - // the extra .? at the beginning prevents clashes with other regular expressions in the rules array - $this->add_rewrite_tag( '%pagename%', '(.?.+?)', 'pagename=' ); - - return $this->generate_rewrite_rules( $this->get_page_permastruct(), EP_PAGES, true, true, false, false ); - } - - /** - * Retrieve date permalink structure, with year, month, and day. - * - * The permalink structure for the date, if not set already depends on the - * permalink structure. It can be one of three formats. The first is year, - * month, day; the second is day, month, year; and the last format is month, - * day, year. These are matched against the permalink structure for which - * one is used. If none matches, then the default will be used, which is - * year, month, day. - * - * Prevents post ID and date permalinks from overlapping. In the case of - * post_id, the date permalink will be prepended with front permalink with - * 'date/' before the actual permalink to form the complete date permalink - * structure. - * - * @since 1.5.0 - * @access public - * - * @return bool|string False on no permalink structure. Date permalink structure. - */ - function get_date_permastruct() { - if ( isset($this->date_structure) ) - return $this->date_structure; - - if ( empty($this->permalink_structure) ) { - $this->date_structure = ''; - return false; - } - - // The date permalink must have year, month, and day separated by slashes. - $endians = array('%year%/%monthnum%/%day%', '%day%/%monthnum%/%year%', '%monthnum%/%day%/%year%'); - - $this->date_structure = ''; - $date_endian = ''; - - foreach ( $endians as $endian ) { - if ( false !== strpos($this->permalink_structure, $endian) ) { - $date_endian= $endian; - break; - } - } - - if ( empty($date_endian) ) - $date_endian = '%year%/%monthnum%/%day%'; - - // Do not allow the date tags and %post_id% to overlap in the permalink - // structure. If they do, move the date tags to $front/date/. - $front = $this->front; - preg_match_all('/%.+?%/', $this->permalink_structure, $tokens); - $tok_index = 1; - foreach ( (array) $tokens[0] as $token) { - if ( '%post_id%' == $token && ($tok_index <= 3) ) { - $front = $front . 'date/'; - break; - } - $tok_index++; - } - - $this->date_structure = $front . $date_endian; - - return $this->date_structure; - } - - /** - * Retrieve the year permalink structure without month and day. - * - * Gets the date permalink structure and strips out the month and day - * permalink structures. - * - * @since 1.5.0 - * @access public - * - * @return bool|string False on failure. Year structure on success. - */ - function get_year_permastruct() { - $structure = $this->get_date_permastruct(); - - if ( empty($structure) ) - return false; - - $structure = str_replace('%monthnum%', '', $structure); - $structure = str_replace('%day%', '', $structure); - - $structure = preg_replace('#/+#', '/', $structure); - - return $structure; - } - - /** - * Retrieve the month permalink structure without day and with year. - * - * Gets the date permalink structure and strips out the day permalink - * structures. Keeps the year permalink structure. - * - * @since 1.5.0 - * @access public - * - * @return bool|string False on failure. Year/Month structure on success. - */ - function get_month_permastruct() { - $structure = $this->get_date_permastruct(); - - if ( empty($structure) ) - return false; - - $structure = str_replace('%day%', '', $structure); - - $structure = preg_replace('#/+#', '/', $structure); - - return $structure; - } - - /** - * Retrieve the day permalink structure with month and year. - * - * Keeps date permalink structure with all year, month, and day. - * - * @since 1.5.0 - * @access public - * - * @return bool|string False on failure. Year/Month/Day structure on success. - */ - function get_day_permastruct() { - return $this->get_date_permastruct(); - } - - /** - * Retrieve the permalink structure for categories. - * - * If the category_base property has no value, then the category structure - * will have the front property value, followed by 'category', and finally - * '%category%'. If it does, then the root property will be used, along with - * the category_base property value. - * - * @since 1.5.0 - * @access public - * - * @return bool|string False on failure. Category permalink structure. - */ - function get_category_permastruct() { - return $this->get_extra_permastruct('category'); - } - - /** - * Retrieve the permalink structure for tags. - * - * If the tag_base property has no value, then the tag structure will have - * the front property value, followed by 'tag', and finally '%tag%'. If it - * does, then the root property will be used, along with the tag_base - * property value. - * - * @since 2.3.0 - * @access public - * - * @return bool|string False on failure. Tag permalink structure. - */ - function get_tag_permastruct() { - return $this->get_extra_permastruct('post_tag'); - } - - /** - * Retrieve extra permalink structure by name. - * - * @since 2.5.0 - * @access public - * - * @param string $name Permalink structure name. - * @return string|bool False if not found. Permalink structure string. - */ - function get_extra_permastruct($name) { - if ( empty($this->permalink_structure) ) - return false; - - if ( isset($this->extra_permastructs[$name]) ) - return $this->extra_permastructs[$name]['struct']; - - return false; - } - - /** - * Retrieve the author permalink structure. - * - * The permalink structure is front property, author base, and finally - * '/%author%'. Will set the author_structure property and then return it - * without attempting to set the value again. - * - * @since 1.5.0 - * @access public - * - * @return string|bool False if not found. Permalink structure string. - */ - function get_author_permastruct() { - if ( isset($this->author_structure) ) - return $this->author_structure; - - if ( empty($this->permalink_structure) ) { - $this->author_structure = ''; - return false; - } - - $this->author_structure = $this->front . $this->author_base . '/%author%'; - - return $this->author_structure; - } - - /** - * Retrieve the search permalink structure. - * - * The permalink structure is root property, search base, and finally - * '/%search%'. Will set the search_structure property and then return it - * without attempting to set the value again. - * - * @since 1.5.0 - * @access public - * - * @return string|bool False if not found. Permalink structure string. - */ - function get_search_permastruct() { - if ( isset($this->search_structure) ) - return $this->search_structure; - - if ( empty($this->permalink_structure) ) { - $this->search_structure = ''; - return false; - } - - $this->search_structure = $this->root . $this->search_base . '/%search%'; - - return $this->search_structure; - } - - /** - * Retrieve the page permalink structure. - * - * The permalink structure is root property, and '%pagename%'. Will set the - * page_structure property and then return it without attempting to set the - * value again. - * - * @since 1.5.0 - * @access public - * - * @return string|bool False if not found. Permalink structure string. - */ - function get_page_permastruct() { - if ( isset($this->page_structure) ) - return $this->page_structure; - - if (empty($this->permalink_structure)) { - $this->page_structure = ''; - return false; - } - - $this->page_structure = $this->root . '%pagename%'; - - return $this->page_structure; - } - - /** - * Retrieve the feed permalink structure. - * - * The permalink structure is root property, feed base, and finally - * '/%feed%'. Will set the feed_structure property and then return it - * without attempting to set the value again. - * - * @since 1.5.0 - * @access public - * - * @return string|bool False if not found. Permalink structure string. - */ - function get_feed_permastruct() { - if ( isset($this->feed_structure) ) - return $this->feed_structure; - - if ( empty($this->permalink_structure) ) { - $this->feed_structure = ''; - return false; - } - - $this->feed_structure = $this->root . $this->feed_base . '/%feed%'; - - return $this->feed_structure; - } - - /** - * Retrieve the comment feed permalink structure. - * - * The permalink structure is root property, comment base property, feed - * base and finally '/%feed%'. Will set the comment_feed_structure property - * and then return it without attempting to set the value again. - * - * @since 1.5.0 - * @access public - * - * @return string|bool False if not found. Permalink structure string. - */ - function get_comment_feed_permastruct() { - if ( isset($this->comment_feed_structure) ) - return $this->comment_feed_structure; - - if (empty($this->permalink_structure)) { - $this->comment_feed_structure = ''; - return false; - } - - $this->comment_feed_structure = $this->root . $this->comments_base . '/' . $this->feed_base . '/%feed%'; - - return $this->comment_feed_structure; - } - - /** - * Add or update existing rewrite tags (e.g. %postname%). - * - * If the tag already exists, replace the existing pattern and query for - * that tag, otherwise add the new tag. - * - * @see WP_Rewrite::$rewritecode - * @see WP_Rewrite::$rewritereplace - * @see WP_Rewrite::$queryreplace - * @since 1.5.0 - * @access public - * - * @param string $tag Name of the rewrite tag to add or update. - * @param string $regex Regular expression to substitute the tag for in rewrite rules. - * @param string $query String to append to the rewritten query. Must end in '='. - */ - function add_rewrite_tag( $tag, $regex, $query ) { - $position = array_search( $tag, $this->rewritecode ); - if ( false !== $position && null !== $position ) { - $this->rewritereplace[ $position ] = $regex; - $this->queryreplace[ $position ] = $query; - } else { - $this->rewritecode[] = $tag; - $this->rewritereplace[] = $regex; - $this->queryreplace[] = $query; - } - } - - /** - * Generate rewrite rules from a permalink structure. - * - * The main WP_Rewrite function for building the rewrite rule list. The - * contents of the function is a mix of black magic and regular expressions, - * so best just ignore the contents and move to the parameters. - * - * @since 1.5.0 - * @access public - * - * @param string $permalink_structure The permalink structure. - * @param int $ep_mask Endpoint mask defining what endpoints are added to the structure. Default is EP_NONE. - * @param bool $paged Should archive pagination rules be added for the structure? Default is true. - * @param bool $feed Should feed rewrite rules be added for the structure? Default is true. - * @param bool $forcomments Should the feed rules be a query for a comments feed? Default is false. - * @param bool $walk_dirs Should the 'directories' making up the structure be walked over and rewrite rules - * built for each in turn? Default is true. - * @param bool $endpoints Should endpoints be applied to the generated rewrite rules? Default is true. - * @return array Rewrite rule list. - */ - function generate_rewrite_rules($permalink_structure, $ep_mask = EP_NONE, $paged = true, $feed = true, $forcomments = false, $walk_dirs = true, $endpoints = true) { - //build a regex to match the feed section of URLs, something like (feed|atom|rss|rss2)/? - $feedregex2 = ''; - foreach ( (array) $this->feeds as $feed_name) - $feedregex2 .= $feed_name . '|'; - $feedregex2 = '(' . trim($feedregex2, '|') . ')/?$'; - - //$feedregex is identical but with /feed/ added on as well, so URLs like <permalink>/feed/atom - //and <permalink>/atom are both possible - $feedregex = $this->feed_base . '/' . $feedregex2; - - //build a regex to match the trackback and page/xx parts of URLs - $trackbackregex = 'trackback/?$'; - $pageregex = $this->pagination_base . '/?([0-9]{1,})/?$'; - $commentregex = 'comment-page-([0-9]{1,})/?$'; - - //build up an array of endpoint regexes to append => queries to append - if ( $endpoints ) { - $ep_query_append = array (); - foreach ( (array) $this->endpoints as $endpoint) { - //match everything after the endpoint name, but allow for nothing to appear there - $epmatch = $endpoint[1] . '(/(.*))?/?$'; - //this will be appended on to the rest of the query for each dir - $epquery = '&' . $endpoint[2] . '='; - $ep_query_append[$epmatch] = array ( $endpoint[0], $epquery ); - } - } - - //get everything up to the first rewrite tag - $front = substr($permalink_structure, 0, strpos($permalink_structure, '%')); - //build an array of the tags (note that said array ends up being in $tokens[0]) - preg_match_all('/%.+?%/', $permalink_structure, $tokens); - - $num_tokens = count($tokens[0]); - - $index = $this->index; //probably 'index.php' - $feedindex = $index; - $trackbackindex = $index; - //build a list from the rewritecode and queryreplace arrays, that will look something like - //tagname=$matches[i] where i is the current $i - for ( $i = 0; $i < $num_tokens; ++$i ) { - if ( 0 < $i ) - $queries[$i] = $queries[$i - 1] . '&'; - else - $queries[$i] = ''; - - $query_token = str_replace($this->rewritecode, $this->queryreplace, $tokens[0][$i]) . $this->preg_index($i+1); - $queries[$i] .= $query_token; - } - - //get the structure, minus any cruft (stuff that isn't tags) at the front - $structure = $permalink_structure; - if ( $front != '/' ) - $structure = str_replace($front, '', $structure); - - //create a list of dirs to walk over, making rewrite rules for each level - //so for example, a $structure of /%year%/%monthnum%/%postname% would create - //rewrite rules for /%year%/, /%year%/%monthnum%/ and /%year%/%monthnum%/%postname% - $structure = trim($structure, '/'); - $dirs = $walk_dirs ? explode('/', $structure) : array( $structure ); - $num_dirs = count($dirs); - - //strip slashes from the front of $front - $front = preg_replace('|^/+|', '', $front); - - //the main workhorse loop - $post_rewrite = array(); - $struct = $front; - for ( $j = 0; $j < $num_dirs; ++$j ) { - //get the struct for this dir, and trim slashes off the front - $struct .= $dirs[$j] . '/'; //accumulate. see comment near explode('/', $structure) above - $struct = ltrim($struct, '/'); - - //replace tags with regexes - $match = str_replace($this->rewritecode, $this->rewritereplace, $struct); - - //make a list of tags, and store how many there are in $num_toks - $num_toks = preg_match_all('/%.+?%/', $struct, $toks); - - //get the 'tagname=$matches[i]' - $query = ( isset($queries) && is_array($queries) && !empty($num_toks) ) ? $queries[$num_toks - 1] : ''; - - //set up $ep_mask_specific which is used to match more specific URL types - switch ( $dirs[$j] ) { - case '%year%': - $ep_mask_specific = EP_YEAR; - break; - case '%monthnum%': - $ep_mask_specific = EP_MONTH; - break; - case '%day%': - $ep_mask_specific = EP_DAY; - break; - default: - $ep_mask_specific = EP_NONE; - } - - //create query for /page/xx - $pagematch = $match . $pageregex; - $pagequery = $index . '?' . $query . '&paged=' . $this->preg_index($num_toks + 1); - - //create query for /comment-page-xx - $commentmatch = $match . $commentregex; - $commentquery = $index . '?' . $query . '&cpage=' . $this->preg_index($num_toks + 1); - - if ( get_option('page_on_front') ) { - //create query for Root /comment-page-xx - $rootcommentmatch = $match . $commentregex; - $rootcommentquery = $index . '?' . $query . '&page_id=' . get_option('page_on_front') . '&cpage=' . $this->preg_index($num_toks + 1); - } - - //create query for /feed/(feed|atom|rss|rss2|rdf) - $feedmatch = $match . $feedregex; - $feedquery = $feedindex . '?' . $query . '&feed=' . $this->preg_index($num_toks + 1); - - //create query for /(feed|atom|rss|rss2|rdf) (see comment near creation of $feedregex) - $feedmatch2 = $match . $feedregex2; - $feedquery2 = $feedindex . '?' . $query . '&feed=' . $this->preg_index($num_toks + 1); - - //if asked to, turn the feed queries into comment feed ones - if ( $forcomments ) { - $feedquery .= '&withcomments=1'; - $feedquery2 .= '&withcomments=1'; - } - - //start creating the array of rewrites for this dir - $rewrite = array(); - if ( $feed ) //...adding on /feed/ regexes => queries - $rewrite = array($feedmatch => $feedquery, $feedmatch2 => $feedquery2); - if ( $paged ) //...and /page/xx ones - $rewrite = array_merge($rewrite, array($pagematch => $pagequery)); - - //only on pages with comments add ../comment-page-xx/ - if ( EP_PAGES & $ep_mask || EP_PERMALINK & $ep_mask ) - $rewrite = array_merge($rewrite, array($commentmatch => $commentquery)); - else if ( EP_ROOT & $ep_mask && get_option('page_on_front') ) - $rewrite = array_merge($rewrite, array($rootcommentmatch => $rootcommentquery)); - - //do endpoints - if ( $endpoints ) { - foreach ( (array) $ep_query_append as $regex => $ep) { - //add the endpoints on if the mask fits - if ( $ep[0] & $ep_mask || $ep[0] & $ep_mask_specific ) - $rewrite[$match . $regex] = $index . '?' . $query . $ep[1] . $this->preg_index($num_toks + 2); - } - } - - //if we've got some tags in this dir - if ( $num_toks ) { - $post = false; - $page = false; - - //check to see if this dir is permalink-level: i.e. the structure specifies an - //individual post. Do this by checking it contains at least one of 1) post name, - //2) post ID, 3) page name, 4) timestamp (year, month, day, hour, second and - //minute all present). Set these flags now as we need them for the endpoints. - if ( strpos($struct, '%postname%') !== false - || strpos($struct, '%post_id%') !== false - || strpos($struct, '%pagename%') !== false - || (strpos($struct, '%year%') !== false && strpos($struct, '%monthnum%') !== false && strpos($struct, '%day%') !== false && strpos($struct, '%hour%') !== false && strpos($struct, '%minute%') !== false && strpos($struct, '%second%') !== false) - ) { - $post = true; - if ( strpos($struct, '%pagename%') !== false ) - $page = true; - } - - if ( ! $post ) { - // For custom post types, we need to add on endpoints as well. - foreach ( get_post_types( array('_builtin' => false ) ) as $ptype ) { - if ( strpos($struct, "%$ptype%") !== false ) { - $post = true; - $page = is_post_type_hierarchical( $ptype ); // This is for page style attachment url's - break; - } - } - } - - //if we're creating rules for a permalink, do all the endpoints like attachments etc - if ( $post ) { - //create query and regex for trackback - $trackbackmatch = $match . $trackbackregex; - $trackbackquery = $trackbackindex . '?' . $query . '&tb=1'; - //trim slashes from the end of the regex for this dir - $match = rtrim($match, '/'); - //get rid of brackets - $submatchbase = str_replace( array('(', ')'), '', $match); - - //add a rule for at attachments, which take the form of <permalink>/some-text - $sub1 = $submatchbase . '/([^/]+)/'; - $sub1tb = $sub1 . $trackbackregex; //add trackback regex <permalink>/trackback/... - $sub1feed = $sub1 . $feedregex; //and <permalink>/feed/(atom|...) - $sub1feed2 = $sub1 . $feedregex2; //and <permalink>/(feed|atom...) - $sub1comment = $sub1 . $commentregex; //and <permalink>/comment-page-xx - - //add another rule to match attachments in the explicit form: - //<permalink>/attachment/some-text - $sub2 = $submatchbase . '/attachment/([^/]+)/'; - $sub2tb = $sub2 . $trackbackregex; //and add trackbacks <permalink>/attachment/trackback - $sub2feed = $sub2 . $feedregex; //feeds, <permalink>/attachment/feed/(atom|...) - $sub2feed2 = $sub2 . $feedregex2; //and feeds again on to this <permalink>/attachment/(feed|atom...) - $sub2comment = $sub2 . $commentregex; //and <permalink>/comment-page-xx - - //create queries for these extra tag-ons we've just dealt with - $subquery = $index . '?attachment=' . $this->preg_index(1); - $subtbquery = $subquery . '&tb=1'; - $subfeedquery = $subquery . '&feed=' . $this->preg_index(2); - $subcommentquery = $subquery . '&cpage=' . $this->preg_index(2); - - //do endpoints for attachments - if ( !empty($endpoints) ) { - foreach ( (array) $ep_query_append as $regex => $ep ) { - if ( $ep[0] & EP_ATTACHMENT ) { - $rewrite[$sub1 . $regex] = $subquery . $ep[1] . $this->preg_index(3); - $rewrite[$sub2 . $regex] = $subquery . $ep[1] . $this->preg_index(3); - } - } - } - - //now we've finished with endpoints, finish off the $sub1 and $sub2 matches - //add a ? as we don't have to match that last slash, and finally a $ so we - //match to the end of the URL - $sub1 .= '?$'; - $sub2 .= '?$'; - - //post pagination, e.g. <permalink>/2/ - $match = $match . '(/[0-9]+)?/?$'; - $query = $index . '?' . $query . '&page=' . $this->preg_index($num_toks + 1); - } else { //not matching a permalink so this is a lot simpler - //close the match and finalise the query - $match .= '?$'; - $query = $index . '?' . $query; - } - - //create the final array for this dir by joining the $rewrite array (which currently - //only contains rules/queries for trackback, pages etc) to the main regex/query for - //this dir - $rewrite = array_merge($rewrite, array($match => $query)); - - //if we're matching a permalink, add those extras (attachments etc) on - if ( $post ) { - //add trackback - $rewrite = array_merge(array($trackbackmatch => $trackbackquery), $rewrite); - - //add regexes/queries for attachments, attachment trackbacks and so on - if ( ! $page ) //require <permalink>/attachment/stuff form for pages because of confusion with subpages - $rewrite = array_merge($rewrite, array($sub1 => $subquery, $sub1tb => $subtbquery, $sub1feed => $subfeedquery, $sub1feed2 => $subfeedquery, $sub1comment => $subcommentquery)); - $rewrite = array_merge(array($sub2 => $subquery, $sub2tb => $subtbquery, $sub2feed => $subfeedquery, $sub2feed2 => $subfeedquery, $sub2comment => $subcommentquery), $rewrite); - } - } //if($num_toks) - //add the rules for this dir to the accumulating $post_rewrite - $post_rewrite = array_merge($rewrite, $post_rewrite); - } //foreach ($dir) - return $post_rewrite; //the finished rules. phew! - } - - /** - * Generate Rewrite rules with permalink structure and walking directory only. - * - * Shorten version of {@link WP_Rewrite::generate_rewrite_rules()} that - * allows for shorter list of parameters. See the method for longer - * description of what generating rewrite rules does. - * - * @uses WP_Rewrite::generate_rewrite_rules() See for long description and rest of parameters. - * @since 1.5.0 - * @access public - * - * @param string $permalink_structure The permalink structure to generate rules. - * @param bool $walk_dirs Optional, default is false. Whether to create list of directories to walk over. - * @return array - */ - function generate_rewrite_rule($permalink_structure, $walk_dirs = false) { - return $this->generate_rewrite_rules($permalink_structure, EP_NONE, false, false, false, $walk_dirs); - } - - /** - * Construct rewrite matches and queries from permalink structure. - * - * Runs the action 'generate_rewrite_rules' with the parameter that is an - * reference to the current WP_Rewrite instance to further manipulate the - * permalink structures and rewrite rules. Runs the 'rewrite_rules_array' - * filter on the full rewrite rule array. - * - * There are two ways to manipulate the rewrite rules, one by hooking into - * the 'generate_rewrite_rules' action and gaining full control of the - * object or just manipulating the rewrite rule array before it is passed - * from the function. - * - * @since 1.5.0 - * @access public - * - * @return array An associate array of matches and queries. - */ - function rewrite_rules() { - $rewrite = array(); - - if ( empty($this->permalink_structure) ) - return $rewrite; - - // robots.txt -only if installed at the root - $home_path = parse_url( home_url() ); - $robots_rewrite = ( empty( $home_path['path'] ) || '/' == $home_path['path'] ) ? array( 'robots\.txt$' => $this->index . '?robots=1' ) : array(); - - // Old feed and service files - $deprecated_files = array( - '.*wp-(atom|rdf|rss|rss2|feed|commentsrss2)\.php$' => $this->index . '?feed=old', - '.*wp-app\.php(/.*)?$' => $this->index . '?error=403', - ); - - // Registration rules - $registration_pages = array(); - if ( is_multisite() && is_main_site() ) { - $registration_pages['.*wp-signup.php$'] = $this->index . '?signup=true'; - $registration_pages['.*wp-activate.php$'] = $this->index . '?activate=true'; - } - $registration_pages['.*wp-register.php$'] = $this->index . '?register=true'; // Deprecated - - // Post rewrite rules. - $post_rewrite = $this->generate_rewrite_rules( $this->permalink_structure, EP_PERMALINK ); - - /** - * Filter rewrite rules used for "post" archives. - * - * @since 1.5.0 - * - * @param array $post_rewrite The rewrite rules for posts. - */ - $post_rewrite = apply_filters( 'post_rewrite_rules', $post_rewrite ); - - // Date rewrite rules. - $date_rewrite = $this->generate_rewrite_rules($this->get_date_permastruct(), EP_DATE); - - /** - * Filter rewrite rules used for date archives. - * - * Likely date archives would include /yyyy/, /yyyy/mm/, and /yyyy/mm/dd/. - * - * @since 1.5.0 - * - * @param array $date_rewrite The rewrite rules for date archives. - */ - $date_rewrite = apply_filters( 'date_rewrite_rules', $date_rewrite ); - - // Root-level rewrite rules. - $root_rewrite = $this->generate_rewrite_rules($this->root . '/', EP_ROOT); - - /** - * Filter rewrite rules used for root-level archives. - * - * Likely root-level archives would include pagination rules for the homepage - * as well as site-wide post feeds (e.g. /feed/, and /feed/atom/). - * - * @since 1.5.0 - * - * @param array $root_rewrite The root-level rewrite rules. - */ - $root_rewrite = apply_filters( 'root_rewrite_rules', $root_rewrite ); - - // Comments rewrite rules. - $comments_rewrite = $this->generate_rewrite_rules($this->root . $this->comments_base, EP_COMMENTS, false, true, true, false); - - /** - * Filter rewrite rules used for comment feed archives. - * - * Likely comments feed archives include /comments/feed/, and /comments/feed/atom/. - * - * @since 1.5.0 - * - * @param array $comments_rewrite The rewrite rules for the site-wide comments feeds. - */ - $comments_rewrite = apply_filters( 'comments_rewrite_rules', $comments_rewrite ); - - // Search rewrite rules. - $search_structure = $this->get_search_permastruct(); - $search_rewrite = $this->generate_rewrite_rules($search_structure, EP_SEARCH); - - /** - * Filter rewrite rules used for search archives. - * - * Likely search-related archives include /search/search+query/ as well as - * pagination and feed paths for a search. - * - * @since 1.5.0 - * - * @param array $search_rewrite The rewrite rules for search queries. - */ - $search_rewrite = apply_filters( 'search_rewrite_rules', $search_rewrite ); - - // Author rewrite rules. - $author_rewrite = $this->generate_rewrite_rules($this->get_author_permastruct(), EP_AUTHORS); - - /** - * Filter rewrite rules used for author archives. - * - * Likely author archives would include /author/author-name/, as well as - * pagination and feed paths for author archives. - * - * @since 1.5.0 - * - * @param array $author_rewrite The rewrite rules for author archives. - */ - $author_rewrite = apply_filters( 'author_rewrite_rules', $author_rewrite ); - - // Pages rewrite rules. - $page_rewrite = $this->page_rewrite_rules(); - - /** - * Filter rewrite rules used for "page" post type archives. - * - * @since 1.5.0 - * - * @param array $page_rewrite The rewrite rules for the "page" post type. - */ - $page_rewrite = apply_filters( 'page_rewrite_rules', $page_rewrite ); - - // Extra permastructs. - foreach ( $this->extra_permastructs as $permastructname => $struct ) { - if ( is_array( $struct ) ) { - if ( count( $struct ) == 2 ) - $rules = $this->generate_rewrite_rules( $struct[0], $struct[1] ); - else - $rules = $this->generate_rewrite_rules( $struct['struct'], $struct['ep_mask'], $struct['paged'], $struct['feed'], $struct['forcomments'], $struct['walk_dirs'], $struct['endpoints'] ); - } else { - $rules = $this->generate_rewrite_rules( $struct ); - } - - /** - * Filter rewrite rules used for individual permastructs. - * - * The dynamic portion of the hook name, $permastructname, refers - * to the name of the registered permastruct, e.g. 'post_tag' (tags), - * 'category' (categories), etc. - * - * @since 3.1.0 - * - * @param array $rules The rewrite rules generated for the current permastruct. - */ - $rules = apply_filters( $permastructname . '_rewrite_rules', $rules ); - if ( 'post_tag' == $permastructname ) { - - /** - * Filter rewrite rules used specifically for Tags. - * - * @since 2.3.0 - * @deprecated 3.1.0 Use 'post_tag_rewrite_rules' instead - * - * @param array $rules The rewrite rules generated for tags. - */ - $rules = apply_filters( 'tag_rewrite_rules', $rules ); - } - - $this->extra_rules_top = array_merge($this->extra_rules_top, $rules); - } - - // Put them together. - if ( $this->use_verbose_page_rules ) - $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite, $author_rewrite, $date_rewrite, $page_rewrite, $post_rewrite, $this->extra_rules); - else - $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules); - - /** - * Fires after the rewrite rules are generated. - * - * @since 1.5.0 - * - * @param WP_Rewrite $this Current WP_Rewrite instance, passed by reference. - */ - do_action_ref_array( 'generate_rewrite_rules', array( &$this ) ); - - /** - * Filter the full set of generated rewrite rules. - * - * @since 1.5.0 - * - * @param array $this->rules The compiled array of rewrite rules. - */ - $this->rules = apply_filters( 'rewrite_rules_array', $this->rules ); - - return $this->rules; - } - - /** - * Retrieve the rewrite rules. - * - * The difference between this method and {@link - * WP_Rewrite::rewrite_rules()} is that this method stores the rewrite rules - * in the 'rewrite_rules' option and retrieves it. This prevents having to - * process all of the permalinks to get the rewrite rules in the form of - * caching. - * - * @since 1.5.0 - * @access public - * - * @return array Rewrite rules. - */ - function wp_rewrite_rules() { - $this->rules = get_option('rewrite_rules'); - if ( empty($this->rules) ) { - $this->matches = 'matches'; - $this->rewrite_rules(); - update_option('rewrite_rules', $this->rules); - } - - return $this->rules; - } - - /** - * Retrieve mod_rewrite formatted rewrite rules to write to .htaccess. - * - * Does not actually write to the .htaccess file, but creates the rules for - * the process that will. - * - * Will add the non_wp_rules property rules to the .htaccess file before - * the WordPress rewrite rules one. - * - * @since 1.5.0 - * @access public - * - * @return string - */ - function mod_rewrite_rules() { - if ( ! $this->using_permalinks() ) - return ''; - - $site_root = parse_url( site_url() ); - if ( isset( $site_root['path'] ) ) - $site_root = trailingslashit($site_root['path']); - - $home_root = parse_url(home_url()); - if ( isset( $home_root['path'] ) ) - $home_root = trailingslashit($home_root['path']); - else - $home_root = '/'; - - $rules = "<IfModule mod_rewrite.c>\n"; - $rules .= "RewriteEngine On\n"; - $rules .= "RewriteBase $home_root\n"; - $rules .= "RewriteRule ^index\.php$ - [L]\n"; // Prevent -f checks on index.php. - - //add in the rules that don't redirect to WP's index.php (and thus shouldn't be handled by WP at all) - foreach ( (array) $this->non_wp_rules as $match => $query) { - // Apache 1.3 does not support the reluctant (non-greedy) modifier. - $match = str_replace('.+?', '.+', $match); - - // If the match is unanchored and greedy, prepend rewrite conditions - // to avoid infinite redirects and eclipsing of real files. - //if ($match == '(.+)/?$' || $match == '([^/]+)/?$' ) { - //nada. - //} - - $rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n"; - } - - if ( $this->use_verbose_rules ) { - $this->matches = ''; - $rewrite = $this->rewrite_rules(); - $num_rules = count($rewrite); - $rules .= "RewriteCond %{REQUEST_FILENAME} -f [OR]\n" . - "RewriteCond %{REQUEST_FILENAME} -d\n" . - "RewriteRule ^.*$ - [S=$num_rules]\n"; - - foreach ( (array) $rewrite as $match => $query) { - // Apache 1.3 does not support the reluctant (non-greedy) modifier. - $match = str_replace('.+?', '.+', $match); - - // If the match is unanchored and greedy, prepend rewrite conditions - // to avoid infinite redirects and eclipsing of real files. - //if ($match == '(.+)/?$' || $match == '([^/]+)/?$' ) { - //nada. - //} - - if ( strpos($query, $this->index) !== false ) - $rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n"; - else - $rules .= 'RewriteRule ^' . $match . ' ' . $site_root . $query . " [QSA,L]\n"; - } - } else { - $rules .= "RewriteCond %{REQUEST_FILENAME} !-f\n" . - "RewriteCond %{REQUEST_FILENAME} !-d\n" . - "RewriteRule . {$home_root}{$this->index} [L]\n"; - } - - $rules .= "</IfModule>\n"; - - /** - * - * Filter the list of rewrite rules formatted for output to an .htaccess file. - * - * @since 1.5.0 - * - * @param string $rules mod_rewrite Rewrite rules formatted for .htaccess. - */ - $rules = apply_filters( 'mod_rewrite_rules', $rules ); - - /** - * Filter the list of rewrite rules formatted for output to an .htaccess file. - * - * @since 1.5.0 - * @deprecated 1.5.0 Use the mod_rewrite_rules filter instead. - * - * @param string $rules mod_rewrite Rewrite rules formatted for .htaccess. - */ - $rules = apply_filters( 'rewrite_rules', $rules ); // Deprecated - - return $rules; - } - - /** - * Retrieve IIS7 URL Rewrite formatted rewrite rules to write to web.config file. - * - * Does not actually write to the web.config file, but creates the rules for - * the process that will. - * - * @since 2.8.0 - * @access public - * - * @return string - */ - function iis7_url_rewrite_rules( $add_parent_tags = false ) { - - if ( ! $this->using_permalinks() ) - return ''; - $rules = ''; - if ( $add_parent_tags ) { - $rules .= '<configuration> - <system.webServer> - <rewrite> - <rules>'; - } - - $rules .= ' - <rule name="wordpress" patternSyntax="Wildcard"> - <match url="*" /> - <conditions> - <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" /> - <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" /> - </conditions> - <action type="Rewrite" url="index.php" /> - </rule>'; - - if ( $add_parent_tags ) { - $rules .= ' - </rules> - </rewrite> - </system.webServer> -</configuration>'; - } - - /** - * Filter the list of rewrite rules formatted for output to a web.config. - * - * @since 2.8.0 - * - * @param string $rules Rewrite rules formatted for IIS web.config. - */ - $rules = apply_filters( 'iis7_url_rewrite_rules', $rules ); - - return $rules; - } - - /** - * Add a straight rewrite rule. - * - * Any value in the $after parameter that isn't 'bottom' will be placed at - * the top of the rules. - * - * @since 2.1.0 - * @access public - * - * @param string $regex Regular expression to match against request. - * @param string $redirect URL regex redirects to when regex matches request. - * @param string $after Optional, default is bottom. Location to place rule. - */ - function add_rule($regex, $redirect, $after = 'bottom') { - //get everything up to the first ? - $index = (strpos($redirect, '?') == false ? strlen($redirect) : strpos($redirect, '?')); - $front = substr($redirect, 0, $index); - if ( $front != $this->index ) { //it doesn't redirect to WP's index.php - $this->add_external_rule($regex, $redirect); - } else { - if ( 'bottom' == $after) - $this->extra_rules = array_merge($this->extra_rules, array($regex => $redirect)); - else - $this->extra_rules_top = array_merge($this->extra_rules_top, array($regex => $redirect)); - //$this->extra_rules[$regex] = $redirect; - } - } - - /** - * Add a rule that doesn't redirect to index.php. - * - * Can redirect to any place. - * - * @since 2.1.0 - * @access public - * - * @param string $regex Regular expression to match against request. - * @param string $redirect URL regex redirects to when regex matches request. - */ - function add_external_rule($regex, $redirect) { - $this->non_wp_rules[$regex] = $redirect; - } - - /** - * Add an endpoint, like /trackback/. - * - * @since 2.1.0 - * @since 3.9.0 $query_var parameter added. - * @access public - * - * @see add_rewrite_endpoint() for full documentation. - * @uses WP::add_query_var() - * - * @param string $name Name of the endpoint. - * @param int $places Endpoint mask describing the places the endpoint should be added. - * @param string $query_var Name of the corresponding query variable. Default is value of $name. - */ - function add_endpoint( $name, $places, $query_var = null ) { - global $wp; - if ( null === $query_var ) { - $query_var = $name; - } - $this->endpoints[] = array( $places, $name, $query_var ); - $wp->add_query_var( $query_var ); - } - - /** - * Add a new permalink structure. - * - * A permalink structure (permastruct) is an abstract definition of a set of rewrite rules; it - * is an easy way of expressing a set of regular expressions that rewrite to a set of query strings. - * The new permastruct is added to the {@link WP_Rewrite::$extra_permastructs} array. When the - * rewrite rules are built by {@link WP_Rewrite::rewrite_rules()} all of these extra permastructs - * are passed to {@link WP_Rewrite::generate_rewrite_rules()} which transforms them into the - * regular expressions that many love to hate. - * - * The $args parameter gives you control over how {@link WP_Rewrite::generate_rewrite_rules()} - * works on the new permastruct. - * - * @since 2.5.0 - * @access public - * - * @param string $name Name for permalink structure. - * @param string $struct Permalink structure (e.g. category/%category%) - * @param array $args Optional configuration for building the rules from the permalink structure: - * - with_front (bool) - Should the structure be prepended with WP_Rewrite::$front? Default is true. - * - ep_mask (int) - Endpoint mask defining what endpoints are added to the structure. Default is EP_NONE. - * - paged (bool) - Should archive pagination rules be added for the structure? Default is true. - * - feed (bool) - Should feed rewrite rules be added for the structure? Default is true. - * - forcomments (bool) - Should the feed rules be a query for a comments feed? Default is false. - * - walk_dirs (bool) - Should the 'directories' making up the structure be walked over and rewrite - * rules built for each in turn? Default is true. - * - endpoints (bool) - Should endpoints be applied to the generated rewrite rules? Default is true. - */ - function add_permastruct( $name, $struct, $args = array() ) { - // backwards compatibility for the old parameters: $with_front and $ep_mask - if ( ! is_array( $args ) ) - $args = array( 'with_front' => $args ); - if ( func_num_args() == 4 ) - $args['ep_mask'] = func_get_arg( 3 ); - - $defaults = array( - 'with_front' => true, - 'ep_mask' => EP_NONE, - 'paged' => true, - 'feed' => true, - 'forcomments' => false, - 'walk_dirs' => true, - 'endpoints' => true, - ); - $args = array_intersect_key( $args, $defaults ); - $args = wp_parse_args( $args, $defaults ); - - if ( $args['with_front'] ) - $struct = $this->front . $struct; - else - $struct = $this->root . $struct; - $args['struct'] = $struct; - - $this->extra_permastructs[ $name ] = $args; - } - - /** - * Remove rewrite rules and then recreate rewrite rules. - * - * Calls {@link WP_Rewrite::wp_rewrite_rules()} after removing the - * 'rewrite_rules' option. If the function named 'save_mod_rewrite_rules' - * exists, it will be called. - * - * @since 2.0.1 - * @access public - * @param bool $hard Whether to update .htaccess (hard flush) or just update rewrite_rules option (soft flush). Default is true (hard). - */ - function flush_rules($hard = true) { - delete_option('rewrite_rules'); - $this->wp_rewrite_rules(); - /** - * Filter whether a "hard" rewrite rule flush should be performed when requested. - * - * A "hard" flush updates .htaccess (Apache) or web.config (IIS). - * - * @since 3.7.0 - * - * @param bool $hard Whether to flush rewrite rules "hard". Default true. - */ - if ( ! $hard || ! apply_filters( 'flush_rewrite_rules_hard', true ) ) { - return; - } - if ( function_exists( 'save_mod_rewrite_rules' ) ) - save_mod_rewrite_rules(); - if ( function_exists( 'iis7_save_url_rewrite_rules' ) ) - iis7_save_url_rewrite_rules(); - } - - /** - * Sets up the object's properties. - * - * The 'use_verbose_page_rules' object property will be set to true if the - * permalink structure begins with one of the following: '%postname%', '%category%', - * '%tag%', or '%author%'. - * - * @since 1.5.0 - * @access public - */ - function init() { - $this->extra_rules = $this->non_wp_rules = $this->endpoints = array(); - $this->permalink_structure = get_option('permalink_structure'); - $this->front = substr($this->permalink_structure, 0, strpos($this->permalink_structure, '%')); - $this->root = ''; - if ( $this->using_index_permalinks() ) - $this->root = $this->index . '/'; - unset($this->author_structure); - unset($this->date_structure); - unset($this->page_structure); - unset($this->search_structure); - unset($this->feed_structure); - unset($this->comment_feed_structure); - $this->use_trailing_slashes = ( '/' == substr($this->permalink_structure, -1, 1) ); - - // Enable generic rules for pages if permalink structure doesn't begin with a wildcard. - if ( preg_match("/^[^%]*%(?:postname|category|tag|author)%/", $this->permalink_structure) ) - $this->use_verbose_page_rules = true; - else - $this->use_verbose_page_rules = false; - } - - /** - * Set the main permalink structure for the blog. - * - * Will update the 'permalink_structure' option, if there is a difference - * between the current permalink structure and the parameter value. Calls - * {@link WP_Rewrite::init()} after the option is updated. - * - * Fires the 'permalink_structure_changed' action once the init call has - * processed passing the old and new values - * - * @since 1.5.0 - * @access public - * - * @param string $permalink_structure Permalink structure. - */ - function set_permalink_structure($permalink_structure) { - if ( $permalink_structure != $this->permalink_structure ) { - $old_permalink_structure = $this->permalink_structure; - update_option('permalink_structure', $permalink_structure); - $this->init(); - - /** - * Fires after the permalink structure is updated. - * - * @since 2.8.0 - * - * @param string $old_permalink_structure The previous permalink structure. - * @param string $permalink_structure The new permalink structure. - */ - do_action( 'permalink_structure_changed', $old_permalink_structure, $permalink_structure ); - } - } - - /** - * Set the category base for the category permalink. - * - * Will update the 'category_base' option, if there is a difference between - * the current category base and the parameter value. Calls - * {@link WP_Rewrite::init()} after the option is updated. - * - * @since 1.5.0 - * @access public - * - * @param string $category_base Category permalink structure base. - */ - function set_category_base($category_base) { - if ( $category_base != get_option('category_base') ) { - update_option('category_base', $category_base); - $this->init(); - } - } - - /** - * Set the tag base for the tag permalink. - * - * Will update the 'tag_base' option, if there is a difference between the - * current tag base and the parameter value. Calls - * {@link WP_Rewrite::init()} after the option is updated. - * - * @since 2.3.0 - * @access public - * - * @param string $tag_base Tag permalink structure base. - */ - function set_tag_base( $tag_base ) { - if ( $tag_base != get_option( 'tag_base') ) { - update_option( 'tag_base', $tag_base ); - $this->init(); - } - } - - /** - * Constructor - Calls init(), which runs setup. - * - * @since 1.5.0 - * @access public - * - * @return WP_Rewrite - */ - function __construct() { - $this->init(); - } -} diff --git a/wp-includes/rss.php b/wp-includes/rss.php index ab6ead0..548ccf2 100644 --- a/wp-includes/rss.php +++ b/wp-includes/rss.php @@ -55,7 +55,10 @@ class MagpieRSS { var $_CONTENT_CONSTRUCTS = array('content', 'summary', 'info', 'title', 'tagline', 'copyright'); - function MagpieRSS ($source) { + /** + * PHP5 constructor. + */ + function __construct( $source ) { # if PHP xml isn't compiled in, die # @@ -97,6 +100,13 @@ class MagpieRSS { $this->normalize(); } + /** + * PHP4 constructor. + */ + public function MagpieRSS( $source ) { + self::__construct( $source ); + } + function feed_start_element($p, $element, &$attrs) { $el = $element = strtolower($element); $attrs = array_change_key_case($attrs, CASE_LOWER); @@ -247,7 +257,7 @@ class MagpieRSS { } elseif ($this->feed_type == ATOM and $this->incontent ) { // balance tags properly - // note: i don't think this is actually neccessary + // note: This may not actually be necessary if ( $this->stack[0] == $el ) { $this->append_content("</$el>"); @@ -579,8 +589,8 @@ function _fetch_remote_file($url, $headers = "" ) { * @package External * @subpackage MagpieRSS * - * @param unknown_type $resp - * @return unknown + * @param array $resp + * @return MagpieRSS|bool */ function _response_to_rss ($resp) { $rss = new MagpieRSS( $resp->results ); @@ -589,7 +599,7 @@ function _response_to_rss ($resp) { if ( $rss && (!isset($rss->ERROR) || !$rss->ERROR) ) { // find Etag, and Last-Modified - foreach( (array) $resp->headers as $h) { + foreach ( (array) $resp->headers as $h) { // 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1" if (strpos($h, ": ")) { list($field, $val) = explode(": ", $h, 2); @@ -709,7 +719,10 @@ class RSSCache { var $MAX_AGE = 43200; // when are files stale, default twelve hours var $ERROR = ''; // accumulate error messages - function RSSCache ($base='', $age='') { + /** + * PHP5 constructor. + */ + function __construct( $base = '', $age = '' ) { $this->BASE_CACHE = WP_CONTENT_DIR . '/cache'; if ( $base ) { $this->BASE_CACHE = $base; @@ -720,11 +733,18 @@ class RSSCache { } + /** + * PHP4 constructor. + */ + public function RSSCache( $base = '', $age = '' ) { + self::__construct( $base, $age ); + } + /*=======================================================================*\ Function: set Purpose: add an item to the cache, keyed on url Input: url from wich the rss file was fetched - Output: true on sucess + Output: true on success \*=======================================================================*/ function set ($url, $rss) { $cache_option = 'rss_' . $this->file_name( $url ); diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 1779ae7..40a586b 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -2,11 +2,6 @@ /** * WordPress scripts and styles default loader. * - * Most of the functionality that existed here was moved to - * {@link http://backpress.automattic.com/ BackPress}. WordPress themes and - * plugins will only be concerned about the filters and actions set in this - * file. - * * Several constants are used to manage the loading, concatenating and compression of scripts and CSS: * define('SCRIPT_DEBUG', true); loads the development (non-minified) versions of all scripts and CSS, and disables compression and concatenation, * define('CONCATENATE_SCRIPTS', false); disables compression and concatenation of scripts and CSS, @@ -21,19 +16,19 @@ * @package WordPress */ -/** BackPress: WordPress Dependencies Class */ +/** WordPress Dependencies Class */ require( ABSPATH . WPINC . '/class.wp-dependencies.php' ); -/** BackPress: WordPress Scripts Class */ +/** WordPress Scripts Class */ require( ABSPATH . WPINC . '/class.wp-scripts.php' ); -/** BackPress: WordPress Scripts Functions */ +/** WordPress Scripts Functions */ require( ABSPATH . WPINC . '/functions.wp-scripts.php' ); -/** BackPress: WordPress Styles Class */ +/** WordPress Styles Class */ require( ABSPATH . WPINC . '/class.wp-styles.php' ); -/** BackPress: WordPress Styles Functions */ +/** WordPress Styles Functions */ require( ABSPATH . WPINC . '/functions.wp-styles.php' ); /** @@ -45,10 +40,10 @@ require( ABSPATH . WPINC . '/functions.wp-styles.php' ); * * @since 2.6.0 * - * @param object $scripts WP_Scripts object. + * @param WP_Scripts $scripts WP_Scripts object. */ function wp_default_scripts( &$scripts ) { - include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version + include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version $develop_src = false !== strpos( $wp_version, '-src' ); @@ -74,33 +69,58 @@ function wp_default_scripts( &$scripts ) { 'url' => (string) SITECOOKIEPATH, 'uid' => (string) get_current_user_id(), 'time' => (string) time(), + 'secure' => (string) ( 'https' === parse_url( site_url(), PHP_URL_SCHEME ) ), ) ); $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), false, 1 ); did_action( 'init' ) && $scripts->localize( 'common', 'commonL10n', array( - 'warnDelete' => __("You are about to permanently delete the selected items.\n 'Cancel' to stop, 'OK' to delete.") + 'warnDelete' => __( "You are about to permanently delete these items.\n 'Cancel' to stop, 'OK' to delete." ), + 'dismiss' => __( 'Dismiss this notice.' ), ) ); + $scripts->add( 'wp-a11y', "/wp-includes/js/wp-a11y$suffix.js", array( 'jquery' ), false, 1 ); + $scripts->add( 'sack', "/wp-includes/js/tw-sack$suffix.js", array(), '1.6.1', 1 ); $scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", array(), false, 1 ); did_action( 'init' ) && $scripts->localize( 'quicktags', 'quicktagsL10n', array( - 'closeAllOpenTags' => esc_attr(__('Close all open tags')), - 'closeTags' => esc_attr(__('close tags')), - 'enterURL' => __('Enter the URL'), - 'enterImageURL' => __('Enter the URL of the image'), - 'enterImageDescription' => __('Enter a description of the image'), - 'fullscreen' => __('fullscreen'), - 'toggleFullscreen' => esc_attr( __('Toggle fullscreen mode') ), - 'textdirection' => esc_attr( __('text direction') ), - 'toggleTextdirection' => esc_attr( __('Toggle Editor Text Direction') ) + 'closeAllOpenTags' => __( 'Close all open tags' ), + 'closeTags' => __( 'close tags' ), + 'enterURL' => __( 'Enter the URL' ), + 'enterImageURL' => __( 'Enter the URL of the image' ), + 'enterImageDescription' => __( 'Enter a description of the image' ), + 'textdirection' => __( 'text direction' ), + 'toggleTextdirection' => __( 'Toggle Editor Text Direction' ), + 'dfw' => __( 'Distraction-free writing mode' ), + 'strong' => __( 'Bold' ), + 'strongClose' => __( 'Close bold tag' ), + 'em' => __( 'Italic' ), + 'emClose' => __( 'Close italic tag' ), + 'link' => __( 'Insert link' ), + 'blockquote' => __( 'Blockquote' ), + 'blockquoteClose' => __( 'Close blockquote tag' ), + 'del' => __( 'Deleted text (strikethrough)' ), + 'delClose' => __( 'Close deleted text tag' ), + 'ins' => __( 'Inserted text' ), + 'insClose' => __( 'Close inserted text tag' ), + 'image' => __( 'Insert image' ), + 'ul' => __( 'Bulleted list' ), + 'ulClose' => __( 'Close bulleted list tag' ), + 'ol' => __( 'Numbered list' ), + 'olClose' => __( 'Close numbered list tag' ), + 'li' => __( 'List item' ), + 'liClose' => __( 'Close list item tag' ), + 'code' => __( 'Code' ), + 'codeClose' => __( 'Close code tag' ), + 'more' => __( 'Insert Read More tag' ), ) ); $scripts->add( 'colorpicker', "/wp-includes/js/colorpicker$suffix.js", array('prototype'), '3517m' ); $scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", array('utils','jquery'), false, 1 ); - $scripts->add( 'wp-fullscreen', "/wp-admin/js/wp-fullscreen$suffix.js", array('jquery'), false, 1 ); + // Back-compat for old DFW. To-do: remove at the end of 2016. + $scripts->add( 'wp-fullscreen-stub', "/wp-admin/js/wp-fullscreen-stub$suffix.js", array(), false, 1 ); $scripts->add( 'wp-ajax-response', "/wp-includes/js/wp-ajax-response$suffix.js", array('jquery'), false, 1 ); did_action( 'init' ) && $scripts->localize( 'wp-ajax-response', 'wpAjax', array( @@ -113,7 +133,7 @@ function wp_default_scripts( &$scripts ) { 'dismiss' => __('Dismiss'), ) ); - $scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('schedule', 'wp-ajax-response'), false, 1 ); + $scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('heartbeat'), false, 1 ); $scripts->add( 'heartbeat', "/wp-includes/js/heartbeat$suffix.js", array('jquery'), false, 1 ); did_action( 'init' ) && $scripts->localize( 'heartbeat', 'heartbeatSettings', @@ -145,61 +165,72 @@ function wp_default_scripts( &$scripts ) { $scripts->add( 'wp-lists', "/wp-includes/js/wp-lists$suffix.js", array( 'wp-ajax-response', 'jquery-color' ), false, 1 ); // WordPress no longer uses or bundles Prototype or script.aculo.us. These are now pulled from an external source. - $scripts->add( 'prototype', '//ajax.googleapis.com/ajax/libs/prototype/1.7.1.0/prototype.js', array(), '1.7.1'); - $scripts->add( 'scriptaculous-root', '//ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/scriptaculous.js', array('prototype'), '1.9.0'); - $scripts->add( 'scriptaculous-builder', '//ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/builder.js', array('scriptaculous-root'), '1.9.0'); - $scripts->add( 'scriptaculous-dragdrop', '//ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/dragdrop.js', array('scriptaculous-builder', 'scriptaculous-effects'), '1.9.0'); - $scripts->add( 'scriptaculous-effects', '//ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/effects.js', array('scriptaculous-root'), '1.9.0'); - $scripts->add( 'scriptaculous-slider', '//ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/slider.js', array('scriptaculous-effects'), '1.9.0'); - $scripts->add( 'scriptaculous-sound', '//ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/sound.js', array( 'scriptaculous-root' ), '1.9.0' ); - $scripts->add( 'scriptaculous-controls', '//ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/controls.js', array('scriptaculous-root'), '1.9.0'); + $scripts->add( 'prototype', 'https://ajax.googleapis.com/ajax/libs/prototype/1.7.1.0/prototype.js', array(), '1.7.1'); + $scripts->add( 'scriptaculous-root', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/scriptaculous.js', array('prototype'), '1.9.0'); + $scripts->add( 'scriptaculous-builder', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/builder.js', array('scriptaculous-root'), '1.9.0'); + $scripts->add( 'scriptaculous-dragdrop', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/dragdrop.js', array('scriptaculous-builder', 'scriptaculous-effects'), '1.9.0'); + $scripts->add( 'scriptaculous-effects', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/effects.js', array('scriptaculous-root'), '1.9.0'); + $scripts->add( 'scriptaculous-slider', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/slider.js', array('scriptaculous-effects'), '1.9.0'); + $scripts->add( 'scriptaculous-sound', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/sound.js', array( 'scriptaculous-root' ), '1.9.0' ); + $scripts->add( 'scriptaculous-controls', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/controls.js', array('scriptaculous-root'), '1.9.0'); $scripts->add( 'scriptaculous', false, array('scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls') ); // not used in core, replaced by Jcrop.js $scripts->add( 'cropper', '/wp-includes/js/crop/cropper.js', array('scriptaculous-dragdrop') ); // jQuery - $scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ), '1.11.0' ); - $scripts->add( 'jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '1.11.0' ); - $scripts->add( 'jquery-migrate', "/wp-includes/js/jquery/jquery-migrate$suffix.js", array(), '1.2.1' ); + $scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ), '1.12.3' ); + $scripts->add( 'jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '1.12.3' ); + $scripts->add( 'jquery-migrate', "/wp-includes/js/jquery/jquery-migrate$suffix.js", array(), '1.4.0' ); // full jQuery UI - $scripts->add( 'jquery-ui-core', '/wp-includes/js/jquery/ui/jquery.ui.core.min.js', array('jquery'), '1.10.4', 1 ); - $scripts->add( 'jquery-effects-core', '/wp-includes/js/jquery/ui/jquery.ui.effect.min.js', array('jquery'), '1.10.4', 1 ); - - $scripts->add( 'jquery-effects-blind', '/wp-includes/js/jquery/ui/jquery.ui.effect-blind.min.js', array('jquery-effects-core'), '1.10.4', 1 ); - $scripts->add( 'jquery-effects-bounce', '/wp-includes/js/jquery/ui/jquery.ui.effect-bounce.min.js', array('jquery-effects-core'), '1.10.4', 1 ); - $scripts->add( 'jquery-effects-clip', '/wp-includes/js/jquery/ui/jquery.ui.effect-clip.min.js', array('jquery-effects-core'), '1.10.4', 1 ); - $scripts->add( 'jquery-effects-drop', '/wp-includes/js/jquery/ui/jquery.ui.effect-drop.min.js', array('jquery-effects-core'), '1.10.4', 1 ); - $scripts->add( 'jquery-effects-explode', '/wp-includes/js/jquery/ui/jquery.ui.effect-explode.min.js', array('jquery-effects-core'), '1.10.4', 1 ); - $scripts->add( 'jquery-effects-fade', '/wp-includes/js/jquery/ui/jquery.ui.effect-fade.min.js', array('jquery-effects-core'), '1.10.4', 1 ); - $scripts->add( 'jquery-effects-fold', '/wp-includes/js/jquery/ui/jquery.ui.effect-fold.min.js', array('jquery-effects-core'), '1.10.4', 1 ); - $scripts->add( 'jquery-effects-highlight', '/wp-includes/js/jquery/ui/jquery.ui.effect-highlight.min.js', array('jquery-effects-core'), '1.10.4', 1 ); - $scripts->add( 'jquery-effects-pulsate', '/wp-includes/js/jquery/ui/jquery.ui.effect-pulsate.min.js', array('jquery-effects-core'), '1.10.4', 1 ); - $scripts->add( 'jquery-effects-scale', '/wp-includes/js/jquery/ui/jquery.ui.effect-scale.min.js', array('jquery-effects-core'), '1.10.4', 1 ); - $scripts->add( 'jquery-effects-shake', '/wp-includes/js/jquery/ui/jquery.ui.effect-shake.min.js', array('jquery-effects-core'), '1.10.4', 1 ); - $scripts->add( 'jquery-effects-slide', '/wp-includes/js/jquery/ui/jquery.ui.effect-slide.min.js', array('jquery-effects-core'), '1.10.4', 1 ); - $scripts->add( 'jquery-effects-transfer', '/wp-includes/js/jquery/ui/jquery.ui.effect-transfer.min.js', array('jquery-effects-core'), '1.10.4', 1 ); - - $scripts->add( 'jquery-ui-accordion', '/wp-includes/js/jquery/ui/jquery.ui.accordion.min.js', array('jquery-ui-core', 'jquery-ui-widget'), '1.10.4', 1 ); - $scripts->add( 'jquery-ui-autocomplete', '/wp-includes/js/jquery/ui/jquery.ui.autocomplete.min.js', array('jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position', 'jquery-ui-menu'), '1.10.4', 1 ); - $scripts->add( 'jquery-ui-button', '/wp-includes/js/jquery/ui/jquery.ui.button.min.js', array('jquery-ui-core', 'jquery-ui-widget'), '1.10.4', 1 ); - $scripts->add( 'jquery-ui-datepicker', '/wp-includes/js/jquery/ui/jquery.ui.datepicker.min.js', array('jquery-ui-core'), '1.10.4', 1 ); - $scripts->add( 'jquery-ui-dialog', '/wp-includes/js/jquery/ui/jquery.ui.dialog.min.js', array('jquery-ui-resizable', 'jquery-ui-draggable', 'jquery-ui-button', 'jquery-ui-position'), '1.10.4', 1 ); - $scripts->add( 'jquery-ui-draggable', '/wp-includes/js/jquery/ui/jquery.ui.draggable.min.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.10.4', 1 ); - $scripts->add( 'jquery-ui-droppable', '/wp-includes/js/jquery/ui/jquery.ui.droppable.min.js', array('jquery-ui-draggable'), '1.10.4', 1 ); - $scripts->add( 'jquery-ui-menu', '/wp-includes/js/jquery/ui/jquery.ui.menu.min.js', array( 'jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position' ), '1.10.4', 1 ); - $scripts->add( 'jquery-ui-mouse', '/wp-includes/js/jquery/ui/jquery.ui.mouse.min.js', array('jquery-ui-widget'), '1.10.4', 1 ); - $scripts->add( 'jquery-ui-position', '/wp-includes/js/jquery/ui/jquery.ui.position.min.js', array('jquery'), '1.10.4', 1 ); - $scripts->add( 'jquery-ui-progressbar', '/wp-includes/js/jquery/ui/jquery.ui.progressbar.min.js', array('jquery-ui-widget'), '1.10.4', 1 ); - $scripts->add( 'jquery-ui-resizable', '/wp-includes/js/jquery/ui/jquery.ui.resizable.min.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.10.4', 1 ); - $scripts->add( 'jquery-ui-selectable', '/wp-includes/js/jquery/ui/jquery.ui.selectable.min.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.10.4', 1 ); - $scripts->add( 'jquery-ui-slider', '/wp-includes/js/jquery/ui/jquery.ui.slider.min.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.10.4', 1 ); - $scripts->add( 'jquery-ui-sortable', '/wp-includes/js/jquery/ui/jquery.ui.sortable.min.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.10.4', 1 ); - $scripts->add( 'jquery-ui-spinner', '/wp-includes/js/jquery/ui/jquery.ui.spinner.min.js', array( 'jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-button' ), '1.10.4', 1 ); - $scripts->add( 'jquery-ui-tabs', '/wp-includes/js/jquery/ui/jquery.ui.tabs.min.js', array('jquery-ui-core', 'jquery-ui-widget'), '1.10.4', 1 ); - $scripts->add( 'jquery-ui-tooltip', '/wp-includes/js/jquery/ui/jquery.ui.tooltip.min.js', array( 'jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position' ), '1.10.4', 1 ); - $scripts->add( 'jquery-ui-widget', '/wp-includes/js/jquery/ui/jquery.ui.widget.min.js', array('jquery'), '1.10.4', 1 ); + $scripts->add( 'jquery-ui-core', "/wp-includes/js/jquery/ui/core$dev_suffix.js", array('jquery'), '1.11.4', 1 ); + $scripts->add( 'jquery-effects-core', "/wp-includes/js/jquery/ui/effect$dev_suffix.js", array('jquery'), '1.11.4', 1 ); + + $scripts->add( 'jquery-effects-blind', "/wp-includes/js/jquery/ui/effect-blind$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 ); + $scripts->add( 'jquery-effects-bounce', "/wp-includes/js/jquery/ui/effect-bounce$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 ); + $scripts->add( 'jquery-effects-clip', "/wp-includes/js/jquery/ui/effect-clip$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 ); + $scripts->add( 'jquery-effects-drop', "/wp-includes/js/jquery/ui/effect-drop$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 ); + $scripts->add( 'jquery-effects-explode', "/wp-includes/js/jquery/ui/effect-explode$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 ); + $scripts->add( 'jquery-effects-fade', "/wp-includes/js/jquery/ui/effect-fade$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 ); + $scripts->add( 'jquery-effects-fold', "/wp-includes/js/jquery/ui/effect-fold$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 ); + $scripts->add( 'jquery-effects-highlight', "/wp-includes/js/jquery/ui/effect-highlight$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 ); + $scripts->add( 'jquery-effects-puff', "/wp-includes/js/jquery/ui/effect-puff$dev_suffix.js", array('jquery-effects-core', 'jquery-effects-scale'), '1.11.4', 1 ); + $scripts->add( 'jquery-effects-pulsate', "/wp-includes/js/jquery/ui/effect-pulsate$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 ); + $scripts->add( 'jquery-effects-scale', "/wp-includes/js/jquery/ui/effect-scale$dev_suffix.js", array('jquery-effects-core', 'jquery-effects-size'), '1.11.4', 1 ); + $scripts->add( 'jquery-effects-shake', "/wp-includes/js/jquery/ui/effect-shake$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 ); + $scripts->add( 'jquery-effects-size', "/wp-includes/js/jquery/ui/effect-size$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 ); + $scripts->add( 'jquery-effects-slide', "/wp-includes/js/jquery/ui/effect-slide$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 ); + $scripts->add( 'jquery-effects-transfer', "/wp-includes/js/jquery/ui/effect-transfer$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 ); + + $scripts->add( 'jquery-ui-accordion', "/wp-includes/js/jquery/ui/accordion$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1 ); + $scripts->add( 'jquery-ui-autocomplete', "/wp-includes/js/jquery/ui/autocomplete$dev_suffix.js", array( 'jquery-ui-menu', 'wp-a11y' ), '1.11.4', 1 ); + $scripts->add( 'jquery-ui-button', "/wp-includes/js/jquery/ui/button$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1 ); + $scripts->add( 'jquery-ui-datepicker', "/wp-includes/js/jquery/ui/datepicker$dev_suffix.js", array('jquery-ui-core'), '1.11.4', 1 ); + $scripts->add( 'jquery-ui-dialog', "/wp-includes/js/jquery/ui/dialog$dev_suffix.js", array('jquery-ui-resizable', 'jquery-ui-draggable', 'jquery-ui-button', 'jquery-ui-position'), '1.11.4', 1 ); + $scripts->add( 'jquery-ui-draggable', "/wp-includes/js/jquery/ui/draggable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 ); + $scripts->add( 'jquery-ui-droppable', "/wp-includes/js/jquery/ui/droppable$dev_suffix.js", array('jquery-ui-draggable'), '1.11.4', 1 ); + $scripts->add( 'jquery-ui-menu', "/wp-includes/js/jquery/ui/menu$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position' ), '1.11.4', 1 ); + $scripts->add( 'jquery-ui-mouse', "/wp-includes/js/jquery/ui/mouse$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget' ), '1.11.4', 1 ); + $scripts->add( 'jquery-ui-position', "/wp-includes/js/jquery/ui/position$dev_suffix.js", array('jquery'), '1.11.4', 1 ); + $scripts->add( 'jquery-ui-progressbar', "/wp-includes/js/jquery/ui/progressbar$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1 ); + $scripts->add( 'jquery-ui-resizable', "/wp-includes/js/jquery/ui/resizable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 ); + $scripts->add( 'jquery-ui-selectable', "/wp-includes/js/jquery/ui/selectable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 ); + $scripts->add( 'jquery-ui-selectmenu', "/wp-includes/js/jquery/ui/selectmenu$dev_suffix.js", array('jquery-ui-menu'), '1.11.4', 1 ); + $scripts->add( 'jquery-ui-slider', "/wp-includes/js/jquery/ui/slider$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 ); + $scripts->add( 'jquery-ui-sortable', "/wp-includes/js/jquery/ui/sortable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 ); + $scripts->add( 'jquery-ui-spinner', "/wp-includes/js/jquery/ui/spinner$dev_suffix.js", array( 'jquery-ui-button' ), '1.11.4', 1 ); + $scripts->add( 'jquery-ui-tabs', "/wp-includes/js/jquery/ui/tabs$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1 ); + $scripts->add( 'jquery-ui-tooltip', "/wp-includes/js/jquery/ui/tooltip$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position' ), '1.11.4', 1 ); + $scripts->add( 'jquery-ui-widget', "/wp-includes/js/jquery/ui/widget$dev_suffix.js", array('jquery'), '1.11.4', 1 ); + + // Strings for 'jquery-ui-autocomplete' live region messages + did_action( 'init' ) && $scripts->localize( 'jquery-ui-autocomplete', 'uiAutocompleteL10n', array( + 'noResults' => __( 'No search results.' ), + /* translators: Number of results found when using jQuery UI Autocomplete */ + 'oneResult' => __( '1 result found. Use up and down arrow keys to navigate.' ), + 'manyResults' => __( '%d results found. Use up and down arrow keys to navigate.' ), + ) ); // deprecated, not used in core, most functionality is included in jQuery 1.3 $scripts->add( 'jquery-form', "/wp-includes/js/jquery/jquery.form$suffix.js", array('jquery'), '3.37.0', 1 ); @@ -221,25 +252,19 @@ function wp_default_scripts( &$scripts ) { $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20121105', 1 ); did_action( 'init' ) && $scripts->localize( 'thickbox', 'thickboxL10n', array( - 'next' => __('Next >'), - 'prev' => __('< Prev'), - 'image' => __('Image'), - 'of' => __('of'), - 'close' => __('Close'), - 'noiframes' => __('This feature requires inline frames. You have iframes disabled or your browser does not support them.'), - 'loadingAnimation' => includes_url('js/thickbox/loadingAnimation.gif'), + 'next' => __('Next >'), + 'prev' => __('< Prev'), + 'image' => __('Image'), + 'of' => __('of'), + 'close' => __('Close'), + 'noiframes' => __('This feature requires inline frames. You have iframes disabled or your browser does not support them.'), + 'loadingAnimation' => includes_url('js/thickbox/loadingAnimation.gif'), ) ); $scripts->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop.min.js", array('jquery'), '0.9.12'); $scripts->add( 'swfobject', "/wp-includes/js/swfobject.js", array(), '2.2-20120417'); - // common bits for both uploaders - $max_upload_size = ( (int) ( $max_up = @ini_get('upload_max_filesize') ) < (int) ( $max_post = @ini_get('post_max_size') ) ) ? $max_up : $max_post; - - if ( empty($max_upload_size) ) - $max_upload_size = __('not configured'); - // error message for both plupload and swfupload $uploader_l10n = array( 'queue_limit_exceeded' => __('You have attempted to queue too many files.'), @@ -266,7 +291,7 @@ function wp_default_scripts( &$scripts ) { 'error_uploading' => __('“%s” has failed to upload.') ); - $scripts->add( 'plupload', '/wp-includes/js/plupload/plupload.full.min.js', array(), '2.1.1' ); + $scripts->add( 'plupload', '/wp-includes/js/plupload/plupload.full.min.js', array(), '2.1.8' ); // Back compat handles: foreach ( array( 'all', 'html5', 'flash', 'silverlight', 'html4' ) as $handle ) { $scripts->add( "plupload-$handle", false, array( 'plupload' ), '2.1.1' ); @@ -289,10 +314,11 @@ function wp_default_scripts( &$scripts ) { $scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js", array(), false, 1 ); - $scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", array(), '2011-02-23'); + $scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", array(), '2015-05-03' ); + did_action( 'init' ) && $scripts->add_data( 'json2', 'conditional', 'lt IE 8' ); - $scripts->add( 'underscore', "/wp-includes/js/underscore$dev_suffix.js", array(), '1.6.0', 1 ); - $scripts->add( 'backbone', "/wp-includes/js/backbone$dev_suffix.js", array( 'underscore','jquery' ), '1.1.2', 1 ); + $scripts->add( 'underscore', "/wp-includes/js/underscore$dev_suffix.js", array(), '1.8.3', 1 ); + $scripts->add( 'backbone', "/wp-includes/js/backbone$dev_suffix.js", array( 'underscore','jquery' ), '1.2.3', 1 ); $scripts->add( 'wp-util', "/wp-includes/js/wp-util$suffix.js", array('underscore', 'jquery'), false, 1 ); did_action( 'init' ) && $scripts->localize( 'wp-util', '_wpUtilSettings', array( @@ -305,9 +331,9 @@ function wp_default_scripts( &$scripts ) { $scripts->add( 'revisions', "/wp-admin/js/revisions$suffix.js", array( 'wp-backbone', 'jquery-ui-slider', 'hoverIntent' ), false, 1 ); - $scripts->add( 'imgareaselect', "/wp-includes/js/imgareaselect/jquery.imgareaselect$suffix.js", array('jquery'), '0.9.10', 1 ); + $scripts->add( 'imgareaselect', "/wp-includes/js/imgareaselect/jquery.imgareaselect$suffix.js", array('jquery'), false, 1 ); - $scripts->add( 'mediaelement', "/wp-includes/js/mediaelement/mediaelement-and-player.min.js", array('jquery'), '2.14.2', 1 ); + $scripts->add( 'mediaelement', "/wp-includes/js/mediaelement/mediaelement-and-player.min.js", array('jquery'), '2.18.1-a', 1 ); did_action( 'init' ) && $scripts->localize( 'mediaelement', 'mejsL10n', array( 'language' => get_bloginfo( 'language' ), 'strings' => array( @@ -327,12 +353,23 @@ function wp_default_scripts( &$scripts ) { ) ); - $scripts->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement.js", array('mediaelement'), false, 1 ); - did_action( 'init' ) && $scripts->localize( 'mediaelement', '_wpmejsSettings', array( + $scripts->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement$suffix.js", array('mediaelement'), false, 1 ); + $mejs_settings = array( 'pluginPath' => includes_url( 'js/mediaelement/', 'relative' ), - ) ); + ); + did_action( 'init' ) && $scripts->localize( 'mediaelement', '_wpmejsSettings', + /** + * Filter the MediaElement configuration settings. + * + * @since 4.4.0 + * + * @param array $mejs_settings MediaElement settings array. + */ + apply_filters( 'mejs_settings', $mejs_settings ) + ); - $scripts->add( 'wp-playlist', "/wp-includes/js/mediaelement/wp-playlist.js", array( 'wp-util', 'backbone', 'mediaelement' ), false, 1 ); + $scripts->add( 'froogaloop', "/wp-includes/js/mediaelement/froogaloop.min.js", array(), '2.0' ); + $scripts->add( 'wp-playlist', "/wp-includes/js/mediaelement/wp-playlist$suffix.js", array( 'wp-util', 'backbone', 'mediaelement' ), false, 1 ); $scripts->add( 'zxcvbn-async', "/wp-includes/js/zxcvbn-async$suffix.js", array(), '1.0' ); did_action( 'init' ) && $scripts->localize( 'zxcvbn-async', '_zxcvbnSettings', array( @@ -341,63 +378,87 @@ function wp_default_scripts( &$scripts ) { $scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array( 'jquery', 'zxcvbn-async' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'password-strength-meter', 'pwsL10n', array( - 'empty' => __('Strength indicator'), - 'short' => __('Very weak'), - 'bad' => __('Weak'), - /* translators: password strength */ - 'good' => _x('Medium', 'password strength'), - 'strong' => __('Strong'), - 'mismatch' => __('Mismatch') + 'short' => _x( 'Very weak', 'password strength' ), + 'bad' => _x( 'Weak', 'password strength' ), + 'good' => _x( 'Medium', 'password strength' ), + 'strong' => _x( 'Strong', 'password strength' ), + 'mismatch' => _x( 'Mismatch', 'password mismatch' ), ) ); - $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), false, 1 ); + $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter', 'wp-util' ), false, 1 ); + did_action( 'init' ) && $scripts->localize( 'user-profile', 'userProfileL10n', array( + 'warn' => __( 'Your new password has not been saved.' ), + 'show' => __( 'Show' ), + 'hide' => __( 'Hide' ), + 'cancel' => __( 'Cancel' ), + 'ariaShow' => esc_attr__( 'Show password' ), + 'ariaHide' => esc_attr__( 'Hide password' ), + ) ); + + $scripts->add( 'language-chooser', "/wp-admin/js/language-chooser$suffix.js", array( 'jquery' ), false, 1 ); $scripts->add( 'user-suggest', "/wp-admin/js/user-suggest$suffix.js", array( 'jquery-ui-autocomplete' ), false, 1 ); $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", array(), false, 1 ); - $scripts->add( 'wplink', "/wp-includes/js/wplink$suffix.js", array( 'jquery' ), false, 1 ); + $scripts->add( 'wplink', "/wp-includes/js/wplink$suffix.js", array( 'jquery', 'wp-a11y' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'wplink', 'wpLinkL10n', array( 'title' => __('Insert/edit link'), 'update' => __('Update'), 'save' => __('Add Link'), 'noTitle' => __('(no title)'), - 'noMatchesFound' => __('No matches found.') + 'noMatchesFound' => __('No results found.'), + 'linkSelected' => __( 'Link selected.' ), + 'linkInserted' => __( 'Link inserted.' ), ) ); $scripts->add( 'wpdialogs', "/wp-includes/js/wpdialog$suffix.js", array( 'jquery-ui-dialog' ), false, 1 ); - $scripts->add( 'word-count', "/wp-admin/js/word-count$suffix.js", array( 'jquery' ), false, 1 ); + $scripts->add( 'word-count', "/wp-admin/js/word-count$suffix.js", array(), false, 1 ); did_action( 'init' ) && $scripts->localize( 'word-count', 'wordCountL10n', array( - /* translators: If your word count is based on single characters (East Asian characters), - enter 'characters'. Otherwise, enter 'words'. Do not translate into your own language. */ - 'type' => 'characters' == _x( 'words', 'word count: words or characters?' ) ? 'c' : 'w', + /* + * translators: If your word count is based on single characters (e.g. East Asian characters), + * enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'. + * Do not translate into your own language. + */ + 'type' => _x( 'words', 'Word count type. Do not translate!' ), + 'shortcodes' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array() ) ); $scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox', 'shortcode' ), false, 1 ); - $scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), 'r7', 1 ); + $scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), '1.8.1', 1 ); - $scripts->add( 'customize-base', "/wp-includes/js/customize-base$suffix.js", array( 'jquery', 'json2' ), false, 1 ); + $scripts->add( 'customize-base', "/wp-includes/js/customize-base$suffix.js", array( 'jquery', 'json2', 'underscore' ), false, 1 ); $scripts->add( 'customize-loader', "/wp-includes/js/customize-loader$suffix.js", array( 'customize-base' ), false, 1 ); $scripts->add( 'customize-preview', "/wp-includes/js/customize-preview$suffix.js", array( 'customize-base' ), false, 1 ); $scripts->add( 'customize-models', "/wp-includes/js/customize-models.js", array( 'underscore', 'backbone' ), false, 1 ); - $scripts->add( 'customize-views', "/wp-includes/js/customize-views.js", array( 'jquery', 'underscore', 'imgareaselect', 'customize-models' ), false, 1 ); - $scripts->add( 'customize-controls', "/wp-admin/js/customize-controls$suffix.js", array( 'customize-base' ), false, 1 ); + $scripts->add( 'customize-views', "/wp-includes/js/customize-views.js", array( 'jquery', 'underscore', 'imgareaselect', 'customize-models', 'media-editor', 'media-views' ), false, 1 ); + $scripts->add( 'customize-controls', "/wp-admin/js/customize-controls$suffix.js", array( 'customize-base', 'wp-a11y' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'customize-controls', '_wpCustomizeControlsL10n', array( - 'activate' => __( 'Save & Activate' ), - 'save' => __( 'Save & Publish' ), - 'saved' => __( 'Saved' ), - 'cancel' => __( 'Cancel' ), - 'close' => __( 'Close' ), - 'cheatin' => __( 'Cheatin’ uh?' ), - + 'activate' => __( 'Save & Activate' ), + 'save' => __( 'Save & Publish' ), + 'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ), + 'saved' => __( 'Saved' ), + 'cancel' => __( 'Cancel' ), + 'close' => __( 'Close' ), + 'cheatin' => __( 'Cheatin’ uh?' ), + 'notAllowed' => __( 'You are not allowed to customize the appearance of this site.' ), + 'previewIframeTitle' => __( 'Site Preview' ), + 'loginIframeTitle' => __( 'Session expired' ), + 'collapseSidebar' => __( 'Collapse Sidebar' ), + 'expandSidebar' => __( 'Expand Sidebar' ), + 'untitledBlogName' => __( '(Untitled)' ), // Used for overriding the file types allowed in plupload. - 'allowedFiles' => __( 'Allowed Files' ), + 'allowedFiles' => __( 'Allowed Files' ), ) ); + $scripts->add( 'customize-selective-refresh', "/wp-includes/js/customize-selective-refresh$suffix.js", array( 'jquery', 'wp-util', 'customize-preview' ), false, 1 ); $scripts->add( 'customize-widgets', "/wp-admin/js/customize-widgets$suffix.js", array( 'jquery', 'jquery-ui-sortable', 'jquery-ui-droppable', 'wp-backbone', 'customize-controls' ), false, 1 ); - $scripts->add( 'customize-preview-widgets', "/wp-includes/js/customize-preview-widgets$suffix.js", array( 'jquery', 'wp-util', 'customize-preview' ), false, 1 ); + $scripts->add( 'customize-preview-widgets', "/wp-includes/js/customize-preview-widgets$suffix.js", array( 'jquery', 'wp-util', 'customize-preview', 'customize-selective-refresh' ), false, 1 ); + + $scripts->add( 'customize-nav-menus', "/wp-admin/js/customize-nav-menus$suffix.js", array( 'jquery', 'wp-backbone', 'customize-controls', 'accordion', 'nav-menu' ), false, 1 ); + $scripts->add( 'customize-preview-nav-menus', "/wp-includes/js/customize-preview-nav-menus$suffix.js", array( 'jquery', 'wp-util', 'customize-preview', 'customize-selective-refresh' ), false, 1 ); $scripts->add( 'accordion', "/wp-admin/js/accordion$suffix.js", array( 'jquery' ), false, 1 ); @@ -410,15 +471,17 @@ function wp_default_scripts( &$scripts ) { ), ) ); + $scripts->add( 'wp-embed', "/wp-includes/js/wp-embed$suffix.js" ); + // To enqueue media-views or media-editor, call wp_enqueue_media(). // Both rely on numerous settings, styles, and templates to operate correctly. $scripts->add( 'media-views', "/wp-includes/js/media-views$suffix.js", array( 'utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable', 'wp-mediaelement' ), false, 1 ); $scripts->add( 'media-editor', "/wp-includes/js/media-editor$suffix.js", array( 'shortcode', 'media-views' ), false, 1 ); $scripts->add( 'media-audiovideo', "/wp-includes/js/media-audiovideo$suffix.js", array( 'media-editor' ), false, 1 ); - $scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'media-models', 'media-audiovideo', 'wp-playlist' ), false, 1 ); + $scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'jquery', 'media-views', 'media-audiovideo' ), false, 1 ); if ( is_admin() ) { - $scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array('jquery', 'wp-ajax-response'), false, 1 ); + $scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array( 'jquery', 'wp-ajax-response' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'admin-tags', 'tagsl10n', array( 'noPerm' => __('You do not have permission to do that.'), 'broken' => __('An unidentified error has occurred.') @@ -429,14 +492,26 @@ function wp_default_scripts( &$scripts ) { 'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']), 'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last']), 'replyApprove' => __( 'Approve and Reply' ), - 'reply' => __( 'Reply' ) + 'reply' => __( 'Reply' ), + 'warnQuickEdit' => __( "Are you sure you want to edit this comment?\nThe changes you made will be lost." ), + 'docTitleComments' => __( 'Comments' ), + /* translators: %s: comments count */ + 'docTitleCommentsCount' => __( 'Comments (%s)' ), ) ); $scripts->add( 'xfn', "/wp-admin/js/xfn$suffix.js", array('jquery'), false, 1 ); $scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array('jquery-ui-sortable'), false, 1 ); + did_action( 'init' ) && $scripts->localize( 'postbox', 'postBoxL10n', array( + 'postBoxEmptyString' => __( 'Drag boxes here' ), + ) ); + + $scripts->add( 'tags-box', "/wp-admin/js/tags-box$suffix.js", array( 'jquery', 'suggest' ), false, 1 ); + did_action( 'init' ) && $scripts->localize( 'tags-box', 'tagsBoxL10n', array( + 'tagDelimiter' => _x( ',', 'tag delimiter' ), + ) ); - $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array('suggest', 'wp-lists', 'postbox', 'heartbeat'), false, 1 ); + $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array( 'suggest', 'wp-lists', 'postbox', 'tags-box', 'underscore', 'word-count', 'wp-a11y' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'post', 'postL10n', array( 'ok' => __('OK'), 'cancel' => __('Cancel'), @@ -444,7 +519,7 @@ function wp_default_scripts( &$scripts ) { 'publishOnFuture' => __('Schedule for:'), 'publishOnPast' => __('Published on:'), /* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute */ - 'dateFormat' => __('%1$s %2$s, %3$s @ %4$s : %5$s'), + 'dateFormat' => __('%1$s %2$s, %3$s @ %4$s:%5$s'), 'showcomm' => __('Show more comments'), 'endcomm' => __('No more comments found.'), 'publish' => __('Publish'), @@ -458,49 +533,90 @@ function wp_default_scripts( &$scripts ) { 'password' => __('Password Protected'), 'privatelyPublished' => __('Privately Published'), 'published' => __('Published'), - 'comma' => _x( ',', 'tag delimiter' ), 'saveAlert' => __('The changes you made will be lost if you navigate away from this page.'), 'savingText' => __('Saving Draft…'), + 'permalinkSaved' => __( 'Permalink saved' ), + ) ); + + $scripts->add( 'press-this', "/wp-admin/js/press-this$suffix.js", array( 'jquery', 'tags-box' ), false, 1 ); + did_action( 'init' ) && $scripts->localize( 'press-this', 'pressThisL10n', array( + 'newPost' => __( 'Title' ), + 'serverError' => __( 'Connection lost or the server is busy. Please try again later.' ), + 'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ), + /* translators: %d: nth embed found in a post */ + 'suggestedEmbedAlt' => __( 'Suggested embed #%d' ), + /* translators: %d: nth image found in a post */ + 'suggestedImgAlt' => __( 'Suggested image #%d' ), ) ); + $scripts->add( 'editor-expand', "/wp-admin/js/editor-expand$suffix.js", array( 'jquery' ), false, 1 ); + $scripts->add( 'link', "/wp-admin/js/link$suffix.js", array( 'wp-lists', 'postbox' ), false, 1 ); $scripts->add( 'comment', "/wp-admin/js/comment$suffix.js", array( 'jquery', 'postbox' ) ); $scripts->add_data( 'comment', 'group', 1 ); did_action( 'init' ) && $scripts->localize( 'comment', 'commentL10n', array( - 'submittedOn' => __('Submitted on:') + 'submittedOn' => __( 'Submitted on:' ), + /* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute */ + 'dateFormat' => __( '%1$s %2$s, %3$s @ %4$s:%5$s' ) ) ); $scripts->add( 'admin-gallery', "/wp-admin/js/gallery$suffix.js", array( 'jquery-ui-sortable' ) ); $scripts->add( 'admin-widgets', "/wp-admin/js/widgets$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable' ), false, 1 ); - $scripts->add( 'theme', "/wp-admin/js/theme$suffix.js", array( 'wp-backbone' ), false, 1 ); + $scripts->add( 'theme', "/wp-admin/js/theme$suffix.js", array( 'wp-backbone', 'wp-a11y' ), false, 1 ); - $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest', 'heartbeat' ), false, 1 ); + $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest', 'wp-a11y' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'inline-edit-post', 'inlineEditL10n', array( - 'error' => __('Error while saving the changes.'), - 'ntdeltitle' => __('Remove From Bulk Edit'), - 'notitle' => __('(no title)'), - 'comma' => _x( ',', 'tag delimiter' ), + 'error' => __( 'Error while saving the changes.' ), + 'ntdeltitle' => __( 'Remove From Bulk Edit' ), + 'notitle' => __( '(no title)' ), + 'comma' => trim( _x( ',', 'tag delimiter' ) ), + 'saved' => __( 'Changes saved.' ), ) ); - $scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery' ), false, 1 ); + $scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery', 'wp-a11y' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'inline-edit-tax', 'inlineEditL10n', array( - 'error' => __('Error while saving the changes.') + 'error' => __( 'Error while saving the changes.' ), + 'saved' => __( 'Changes saved.' ), ) ); - $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery', 'thickbox' ), false, 1 ); + $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery', 'jquery-ui-core', 'thickbox' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'plugin-install', 'plugininstallL10n', array( - 'plugin_information' => __('Plugin Information:'), + 'plugin_information' => __( 'Plugin:' ), + 'plugin_modal_label' => __( 'Plugin details' ), 'ays' => __('Are you sure you want to install this plugin?') ) ); - $scripts->add( 'updates', "/wp-admin/js/updates$suffix.js", array( 'jquery' ) ); + $scripts->add( 'updates', "/wp-admin/js/updates$suffix.js", array( 'jquery', 'wp-util', 'wp-a11y' ) ); + did_action( 'init' ) && $scripts->localize( 'updates', '_wpUpdatesSettings', array( + 'ajax_nonce' => wp_create_nonce( 'updates' ), + 'l10n' => array( + 'updating' => __( 'Updating...' ), // no ellipsis + 'updated' => __( 'Updated!' ), + 'updateFailedShort' => __( 'Update Failed!' ), + /* translators: Error string for a failed update */ + 'updateFailed' => __( 'Update Failed: %s' ), + /* translators: Plugin name and version */ + 'updatingLabel' => __( 'Updating %s...' ), // no ellipsis + /* translators: Plugin name and version */ + 'updatedLabel' => __( '%s updated!' ), + /* translators: Plugin name and version */ + 'updateFailedLabel' => __( '%s update failed' ), + /* translators: JavaScript accessible string */ + 'updatingMsg' => __( 'Updating... please wait.' ), // no ellipsis + /* translators: JavaScript accessible string */ + 'updatedMsg' => __( 'Update completed successfully.' ), + /* translators: JavaScript accessible string */ + 'updateCancel' => __( 'Update canceled.' ), + 'beforeunload' => __( 'Plugin updates may not complete if you navigate away from this page.' ), + ) + ) ); $scripts->add( 'farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2' ); - $scripts->add( 'iris', '/wp-admin/js/iris.min.js', array( 'jquery-ui-draggable', 'jquery-ui-slider', 'jquery-touch-punch' ), false, 1 ); + $scripts->add( 'iris', '/wp-admin/js/iris.min.js', array( 'jquery-ui-draggable', 'jquery-ui-slider', 'jquery-touch-punch' ), '1.0.7', 1 ); $scripts->add( 'wp-color-picker', "/wp-admin/js/color-picker$suffix.js", array( 'iris' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'wp-color-picker', 'wpColorPickerL10n', array( 'clear' => __( 'Clear' ), @@ -513,6 +629,7 @@ function wp_default_scripts( &$scripts ) { $scripts->add( 'list-revisions', "/wp-includes/js/wp-list-revisions$suffix.js" ); + $scripts->add( 'media-grid', "/wp-includes/js/media-grid$suffix.js", array( 'media-editor' ), false, 1 ); $scripts->add( 'media', "/wp-admin/js/media$suffix.js", array( 'jquery' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'media', 'attachMediaBoxL10n', array( 'error' => __( 'An error has occurred. Please reload the page and try again.' ), @@ -526,17 +643,18 @@ function wp_default_scripts( &$scripts ) { $scripts->add( 'set-post-thumbnail', "/wp-admin/js/set-post-thumbnail$suffix.js", array( 'jquery' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'set-post-thumbnail', 'setPostThumbnailL10n', array( 'setThumbnail' => __( 'Use as featured image' ), - 'saving' => __( 'Saving...' ), + 'saving' => __( 'Saving...' ), // no ellipsis 'error' => __( 'Could not set that as the thumbnail image. Try a different attachment.' ), 'done' => __( 'Done' ) ) ); // Navigation Menus - $scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable', 'wp-lists', 'postbox' ) ); + $scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable', 'wp-lists', 'postbox', 'json2' ) ); did_action( 'init' ) && $scripts->localize( 'nav-menu', 'navMenuL10n', array( - 'noResultsFound' => _x('No results found.', 'search results'), + 'noResultsFound' => __( 'No results found.' ), 'warnDeleteMenu' => __( "You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete." ), - 'saveAlert' => __('The changes you made will be lost if you navigate away from this page.') + 'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ), + 'untitled' => _x( '(no label)', 'missing menu item navigation label' ) ) ); $scripts->add( 'custom-header', "/wp-admin/js/custom-header.js", array( 'jquery-masonry' ), false, 1 ); @@ -560,10 +678,10 @@ function wp_default_scripts( &$scripts ) { * * @since 2.6.0 * - * @param object $styles + * @param WP_Styles $styles */ function wp_default_styles( &$styles ) { - include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version + include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version if ( ! defined( 'SCRIPT_DEBUG' ) ) define( 'SCRIPT_DEBUG', false !== strpos( $wp_version, '-src' ) ); @@ -599,23 +717,41 @@ function wp_default_styles( &$styles ) { } // Hotlink Open Sans, for now - $open_sans_font_url = "//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,300,400,600&subset=$subsets"; + $open_sans_font_url = "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,300,400,600&subset=$subsets"; } // Register a stylesheet for the selected admin color scheme. - $styles->add( 'colors', true, array( 'wp-admin', 'buttons', 'open-sans', 'dashicons' ) ); + $styles->add( 'colors', true, array( 'wp-admin', 'buttons' ) ); $suffix = SCRIPT_DEBUG ? '' : '.min'; // Admin CSS - $styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array( 'open-sans', 'dashicons' ) ); - $styles->add( 'login', "/wp-admin/css/login$suffix.css", array( 'buttons', 'open-sans', 'dashicons' ) ); - $styles->add( 'install', "/wp-admin/css/install$suffix.css", array( 'buttons', 'open-sans' ) ); - $styles->add( 'wp-color-picker', "/wp-admin/css/color-picker$suffix.css" ); - $styles->add( 'customize-controls', "/wp-admin/css/customize-controls$suffix.css", array( 'wp-admin', 'colors', 'ie', 'imgareaselect' ) ); - $styles->add( 'customize-widgets', "/wp-admin/css/customize-widgets$suffix.css", array( 'wp-admin', 'colors' ) ); - $styles->add( 'ie', "/wp-admin/css/ie$suffix.css" ); - + $styles->add( 'common', "/wp-admin/css/common$suffix.css" ); + $styles->add( 'forms', "/wp-admin/css/forms$suffix.css" ); + $styles->add( 'admin-menu', "/wp-admin/css/admin-menu$suffix.css" ); + $styles->add( 'dashboard', "/wp-admin/css/dashboard$suffix.css" ); + $styles->add( 'list-tables', "/wp-admin/css/list-tables$suffix.css" ); + $styles->add( 'edit', "/wp-admin/css/edit$suffix.css" ); + $styles->add( 'revisions', "/wp-admin/css/revisions$suffix.css" ); + $styles->add( 'media', "/wp-admin/css/media$suffix.css" ); + $styles->add( 'themes', "/wp-admin/css/themes$suffix.css" ); + $styles->add( 'about', "/wp-admin/css/about$suffix.css" ); + $styles->add( 'nav-menus', "/wp-admin/css/nav-menus$suffix.css" ); + $styles->add( 'widgets', "/wp-admin/css/widgets$suffix.css" ); + $styles->add( 'site-icon', "/wp-admin/css/site-icon$suffix.css" ); + $styles->add( 'l10n', "/wp-admin/css/l10n$suffix.css" ); + + $styles->add( 'wp-admin', false, array( 'open-sans', 'dashicons', 'common', 'forms', 'admin-menu', 'dashboard', 'list-tables', 'edit', 'revisions', 'media', 'themes', 'about', 'nav-menus', 'widgets', 'site-icon', 'l10n' ) ); + + $styles->add( 'login', "/wp-admin/css/login$suffix.css", array( 'open-sans', 'dashicons', 'buttons', 'forms', 'l10n' ) ); + $styles->add( 'install', "/wp-admin/css/install$suffix.css", array( 'open-sans', 'buttons' ) ); + $styles->add( 'wp-color-picker', "/wp-admin/css/color-picker$suffix.css" ); + $styles->add( 'customize-controls', "/wp-admin/css/customize-controls$suffix.css", array( 'wp-admin', 'colors', 'ie', 'imgareaselect' ) ); + $styles->add( 'customize-widgets', "/wp-admin/css/customize-widgets$suffix.css", array( 'wp-admin', 'colors' ) ); + $styles->add( 'customize-nav-menus', "/wp-admin/css/customize-nav-menus$suffix.css", array( 'wp-admin', 'colors' ) ); + $styles->add( 'press-this', "/wp-admin/css/press-this$suffix.css", array( 'open-sans', 'buttons' ) ); + + $styles->add( 'ie', "/wp-admin/css/ie$suffix.css" ); $styles->add_data( 'ie', 'conditional', 'lte IE 7' ); // Common dependencies @@ -624,34 +760,39 @@ function wp_default_styles( &$styles ) { $styles->add( 'open-sans', $open_sans_font_url ); // Includes CSS - $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array( 'open-sans', 'dashicons' ) ); - $styles->add( 'wp-auth-check', "/wp-includes/css/wp-auth-check$suffix.css", array( 'dashicons' ) ); - $styles->add( 'editor-buttons', "/wp-includes/css/editor$suffix.css", array( 'dashicons' ) ); - $styles->add( 'media-views', "/wp-includes/css/media-views$suffix.css", array( 'buttons', 'dashicons', 'wp-mediaelement' ) ); - $styles->add( 'wp-pointer', "/wp-includes/css/wp-pointer$suffix.css", array( 'dashicons' ) ); + $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array( 'open-sans', 'dashicons' ) ); + $styles->add( 'wp-auth-check', "/wp-includes/css/wp-auth-check$suffix.css", array( 'dashicons' ) ); + $styles->add( 'editor-buttons', "/wp-includes/css/editor$suffix.css", array( 'dashicons' ) ); + $styles->add( 'media-views', "/wp-includes/css/media-views$suffix.css", array( 'buttons', 'dashicons', 'wp-mediaelement' ) ); + $styles->add( 'wp-pointer', "/wp-includes/css/wp-pointer$suffix.css", array( 'dashicons' ) ); + $styles->add( 'customize-preview', "/wp-includes/css/customize-preview$suffix.css" ); + $styles->add( 'wp-embed-template-ie', "/wp-includes/css/wp-embed-template-ie$suffix.css" ); + $styles->add_data( 'wp-embed-template-ie', 'conditional', 'lte IE 8' ); // External libraries and friends $styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.8' ); $styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array( 'dashicons' ) ); - $styles->add( 'mediaelement', "/wp-includes/js/mediaelement/mediaelementplayer.min.css", array(), '2.13.0' ); - $styles->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement.css", array( 'mediaelement' ) ); + $styles->add( 'mediaelement', "/wp-includes/js/mediaelement/mediaelementplayer.min.css", array(), '2.18.1' ); + $styles->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement$suffix.css", array( 'mediaelement' ) ); $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array( 'dashicons' ) ); // Deprecated CSS - $styles->add( 'media', "/wp-admin/css/deprecated-media$suffix.css" ); - $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.3u1' ); - $styles->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop.min.css", array(), '0.9.12' ); + $styles->add( 'deprecated-media', "/wp-admin/css/deprecated-media$suffix.css" ); + $styles->add( 'farbtastic', "/wp-admin/css/farbtastic$suffix.css", array(), '1.3u1' ); + $styles->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop.min.css", array(), '0.9.12' ); $styles->add( 'colors-fresh', false, array( 'wp-admin', 'buttons' ) ); // Old handle. // RTL CSS $rtl_styles = array( // wp-admin - 'wp-admin', 'install', 'wp-color-picker', 'customize-controls', 'customize-widgets', 'ie', 'login', + 'common', 'forms', 'admin-menu', 'dashboard', 'list-tables', 'edit', 'revisions', 'media', 'themes', 'about', 'nav-menus', + 'widgets', 'site-icon', 'l10n', 'install', 'wp-color-picker', 'customize-controls', 'customize-widgets', 'customize-nav-menus', + 'ie', 'login', 'press-this', // wp-includes 'buttons', 'admin-bar', 'wp-auth-check', 'editor-buttons', 'media-views', 'wp-pointer', 'wp-jquery-ui-dialog', // deprecated - 'media', 'farbtastic', + 'deprecated-media', 'farbtastic', ); foreach ( $rtl_styles as $rtl_style ) { @@ -717,16 +858,16 @@ function wp_just_in_time_script_localization() { * the $_wp_admin_css_colors array value URL. * * @since 2.6.0 - * @uses $_wp_admin_css_colors + * @global array $_wp_admin_css_colors * - * @param string $src Source URL. + * @param string $src Source URL. * @param string $handle Either 'colors' or 'colors-rtl'. - * @return string URL path to CSS stylesheet for Administration Screens. + * @return string|false URL path to CSS stylesheet for Administration Screens. */ function wp_style_loader_src( $src, $handle ) { global $_wp_admin_css_colors; - if ( defined('WP_INSTALLING') ) + if ( wp_installing() ) return preg_replace( '#^wp-admin/#', './', $src ); if ( 'colors' == $handle ) { @@ -736,13 +877,13 @@ function wp_style_loader_src( $src, $handle ) { $color = 'fresh'; $color = $_wp_admin_css_colors[$color]; - $parsed = parse_url( $src ); $url = $color->url; if ( ! $url ) { return false; } + $parsed = parse_url( $src ); if ( isset($parsed['query']) && $parsed['query'] ) { wp_parse_str( $parsed['query'], $qv ); $url = add_query_arg( $qv, $url ); @@ -763,17 +904,20 @@ function wp_style_loader_src( $src, $handle ) { * @since 2.8.0 * * @see wp_print_scripts() + * + * @global bool $concatenate_scripts + * + * @return array */ function print_head_scripts() { - global $wp_scripts, $concatenate_scripts; + global $concatenate_scripts; if ( ! did_action('wp_print_scripts') ) { /** This action is documented in wp-includes/functions.wp-scripts.php */ do_action( 'wp_print_scripts' ); } - if ( !is_a($wp_scripts, 'WP_Scripts') ) - $wp_scripts = new WP_Scripts(); + $wp_scripts = wp_scripts(); script_concat_settings(); $wp_scripts->do_concat = $concatenate_scripts; @@ -798,13 +942,18 @@ function print_head_scripts() { * Prints the scripts that were queued for the footer or too late for the HTML head. * * @since 2.8.0 + * + * @global WP_Scripts $wp_scripts + * @global bool $concatenate_scripts + * + * @return array */ function print_footer_scripts() { global $wp_scripts, $concatenate_scripts; - if ( !is_a($wp_scripts, 'WP_Scripts') ) + if ( ! ( $wp_scripts instanceof WP_Scripts ) ) { return array(); // No need to run if not instantiated. - + } script_concat_settings(); $wp_scripts->do_concat = $concatenate_scripts; $wp_scripts->do_footer_items(); @@ -825,7 +974,12 @@ function print_footer_scripts() { } /** - * @internal use + * Print scripts (internal use only) + * + * @ignore + * + * @global WP_Scripts $wp_scripts + * @global bool $compress_scripts */ function _print_scripts() { global $wp_scripts, $compress_scripts; @@ -862,6 +1016,10 @@ function _print_scripts() { * wp_print_footer_scripts() is called in the footer to print these scripts. * * @since 2.8.0 + * + * @global WP_Scripts $wp_scripts + * + * @return array */ function wp_print_head_scripts() { if ( ! did_action('wp_print_scripts') ) { @@ -871,9 +1029,9 @@ function wp_print_head_scripts() { global $wp_scripts; - if ( !is_a($wp_scripts, 'WP_Scripts') ) + if ( ! ( $wp_scripts instanceof WP_Scripts ) ) { return array(); // no need to run if nothing is queued - + } return print_head_scripts(); } @@ -922,19 +1080,18 @@ function wp_enqueue_scripts() { * Prints the styles queue in the HTML head on admin pages. * * @since 2.8.0 + * + * @global bool $concatenate_scripts + * + * @return array */ function print_admin_styles() { - global $wp_styles, $concatenate_scripts, $compress_css; + global $concatenate_scripts; - if ( !is_a($wp_styles, 'WP_Styles') ) - $wp_styles = new WP_Styles(); + $wp_styles = wp_styles(); script_concat_settings(); $wp_styles->do_concat = $concatenate_scripts; - $zip = $compress_css ? 1 : 0; - if ( $zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP ) - $zip = 'gzip'; - $wp_styles->do_items(false); /** @@ -956,13 +1113,20 @@ function print_admin_styles() { * Prints the styles that were queued too late for the HTML head. * * @since 3.3.0 + * + * @global WP_Styles $wp_styles + * @global bool $concatenate_scripts + * + * @return array|void */ function print_late_styles() { global $wp_styles, $concatenate_scripts; - if ( !is_a($wp_styles, 'WP_Styles') ) + if ( ! ( $wp_styles instanceof WP_Styles ) ) { return; + } + script_concat_settings(); $wp_styles->do_concat = $concatenate_scripts; $wp_styles->do_footer_items(); @@ -982,19 +1146,30 @@ function print_late_styles() { } /** - * @internal use + * Print styles (internal use only) + * + * @ignore + * @since 3.3.0 + * + * @global bool $compress_css */ function _print_styles() { - global $wp_styles, $compress_css; + global $compress_css; + + $wp_styles = wp_styles(); $zip = $compress_css ? 1 : 0; if ( $zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP ) $zip = 'gzip'; - if ( !empty($wp_styles->concat) ) { + if ( $concat = trim( $wp_styles->concat, ', ' ) ) { $dir = $wp_styles->text_direction; $ver = $wp_styles->default_version; - $href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&dir={$dir}&load=" . trim($wp_styles->concat, ', ') . '&ver=' . $ver; + + $concat = str_split( $concat, 128 ); + $concat = 'load%5B%5D=' . implode( '&load%5B%5D=', $concat ); + + $href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&dir={$dir}&" . $concat . '&ver=' . $ver; echo "<link rel='stylesheet' href='" . esc_attr($href) . "' type='text/css' media='all' />\n"; if ( !empty($wp_styles->print_code) ) { @@ -1012,6 +1187,10 @@ function _print_styles() { * Determine the concatenation and compression settings for scripts and styles. * * @since 2.8.0 + * + * @global bool $concatenate_scripts + * @global bool $compress_scripts + * @global bool $compress_css */ function script_concat_settings() { global $concatenate_scripts, $compress_scripts, $compress_css; @@ -1020,7 +1199,7 @@ function script_concat_settings() { if ( ! isset($concatenate_scripts) ) { $concatenate_scripts = defined('CONCATENATE_SCRIPTS') ? CONCATENATE_SCRIPTS : true; - if ( ! is_admin() || ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) ) + if ( ( ! is_admin() && ! did_action( 'login_init' ) ) || ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) ) $concatenate_scripts = false; } @@ -1036,10 +1215,3 @@ function script_concat_settings() { $compress_css = false; } } - -add_action( 'wp_default_scripts', 'wp_default_scripts' ); -add_filter( 'wp_print_scripts', 'wp_just_in_time_script_localization' ); -add_filter( 'print_scripts_array', 'wp_prototype_before_jquery' ); - -add_action( 'wp_default_styles', 'wp_default_styles' ); -add_filter( 'style_loader_src', 'wp_style_loader_src', 10, 2 ); diff --git a/wp-includes/session.php b/wp-includes/session.php new file mode 100644 index 0000000..409fe30 --- /dev/null +++ b/wp-includes/session.php @@ -0,0 +1,440 @@ +<?php +/** + * Abstract class for managing user session tokens. + * + * @since 4.0.0 + */ +abstract class WP_Session_Tokens { + + /** + * User ID. + * + * @since 4.0.0 + * @access protected + * @var int User ID. + */ + protected $user_id; + + /** + * Protected constructor. + * + * @since 4.0.0 + * + * @param int $user_id User whose session to manage. + */ + protected function __construct( $user_id ) { + $this->user_id = $user_id; + } + + /** + * Get a session token manager instance for a user. + * + * This method contains a filter that allows a plugin to swap out + * the session manager for a subclass of WP_Session_Tokens. + * + * @since 4.0.0 + * @access public + * @static + * + * @param int $user_id User whose session to manage. + */ + final public static function get_instance( $user_id ) { + /** + * Filter the session token manager used. + * + * @since 4.0.0 + * + * @param string $session Name of class to use as the manager. + * Default 'WP_User_Meta_Session_Tokens'. + */ + $manager = apply_filters( 'session_token_manager', 'WP_User_Meta_Session_Tokens' ); + return new $manager( $user_id ); + } + + /** + * Hashes a session token for storage. + * + * @since 4.0.0 + * @access private + * + * @param string $token Session token to hash. + * @return string A hash of the session token (a verifier). + */ + final private function hash_token( $token ) { + // If ext/hash is not present, use sha1() instead. + if ( function_exists( 'hash' ) ) { + return hash( 'sha256', $token ); + } else { + return sha1( $token ); + } + } + + /** + * Get a user's session. + * + * @since 4.0.0 + * @access public + * + * @param string $token Session token + * @return array User session + */ + final public function get( $token ) { + $verifier = $this->hash_token( $token ); + return $this->get_session( $verifier ); + } + + /** + * Validate a user's session token as authentic. + * + * Checks that the given token is present and hasn't expired. + * + * @since 4.0.0 + * @access public + * + * @param string $token Token to verify. + * @return bool Whether the token is valid for the user. + */ + final public function verify( $token ) { + $verifier = $this->hash_token( $token ); + return (bool) $this->get_session( $verifier ); + } + + /** + * Generate a session token and attach session information to it. + * + * A session token is a long, random string. It is used in a cookie + * link that cookie to an expiration time and to ensure the cookie + * becomes invalidated upon logout. + * + * This function generates a token and stores it with the associated + * expiration time (and potentially other session information via the + * `attach_session_information` filter). + * + * @since 4.0.0 + * @access public + * + * @param int $expiration Session expiration timestamp. + * @return string Session token. + */ + final public function create( $expiration ) { + /** + * Filter the information attached to the newly created session. + * + * Could be used in the future to attach information such as + * IP address or user agent to a session. + * + * @since 4.0.0 + * + * @param array $session Array of extra data. + * @param int $user_id User ID. + */ + $session = apply_filters( 'attach_session_information', array(), $this->user_id ); + $session['expiration'] = $expiration; + + // IP address. + if ( !empty( $_SERVER['REMOTE_ADDR'] ) ) { + $session['ip'] = $_SERVER['REMOTE_ADDR']; + } + + // User-agent. + if ( ! empty( $_SERVER['HTTP_USER_AGENT'] ) ) { + $session['ua'] = wp_unslash( $_SERVER['HTTP_USER_AGENT'] ); + } + + // Timestamp + $session['login'] = time(); + + $token = wp_generate_password( 43, false, false ); + + $this->update( $token, $session ); + + return $token; + } + + /** + * Update a session token. + * + * @since 4.0.0 + * @access public + * + * @param string $token Session token to update. + * @param array $session Session information. + */ + final public function update( $token, $session ) { + $verifier = $this->hash_token( $token ); + $this->update_session( $verifier, $session ); + } + + /** + * Destroy a session token. + * + * @since 4.0.0 + * @access public + * + * @param string $token Session token to destroy. + */ + final public function destroy( $token ) { + $verifier = $this->hash_token( $token ); + $this->update_session( $verifier, null ); + } + + /** + * Destroy all session tokens for this user, + * except a single token, presumably the one in use. + * + * @since 4.0.0 + * @access public + * + * @param string $token_to_keep Session token to keep. + */ + final public function destroy_others( $token_to_keep ) { + $verifier = $this->hash_token( $token_to_keep ); + $session = $this->get_session( $verifier ); + if ( $session ) { + $this->destroy_other_sessions( $verifier ); + } else { + $this->destroy_all_sessions(); + } + } + + /** + * Determine whether a session token is still valid, + * based on expiration. + * + * @since 4.0.0 + * @access protected + * + * @param array $session Session to check. + * @return bool Whether session is valid. + */ + final protected function is_still_valid( $session ) { + return $session['expiration'] >= time(); + } + + /** + * Destroy all session tokens for a user. + * + * @since 4.0.0 + * @access public + */ + final public function destroy_all() { + $this->destroy_all_sessions(); + } + + /** + * Destroy all session tokens for all users. + * + * @since 4.0.0 + * @access public + * @static + */ + final public static function destroy_all_for_all_users() { + $manager = apply_filters( 'session_token_manager', 'WP_User_Meta_Session_Tokens' ); + call_user_func( array( $manager, 'drop_sessions' ) ); + } + + /** + * Retrieve all sessions of a user. + * + * @since 4.0.0 + * @access public + * + * @return array Sessions of a user. + */ + final public function get_all() { + return array_values( $this->get_sessions() ); + } + + /** + * This method should retrieve all sessions of a user, keyed by verifier. + * + * @since 4.0.0 + * @access protected + * + * @return array Sessions of a user, keyed by verifier. + */ + abstract protected function get_sessions(); + + /** + * This method should look up a session by its verifier (token hash). + * + * @since 4.0.0 + * @access protected + * + * @param string $verifier Verifier of the session to retrieve. + * @return array|null The session, or null if it does not exist. + */ + abstract protected function get_session( $verifier ); + + /** + * This method should update a session by its verifier. + * + * Omitting the second argument should destroy the session. + * + * @since 4.0.0 + * @access protected + * + * @param string $verifier Verifier of the session to update. + * @param array $session Optional. Session. Omitting this argument destroys the session. + */ + abstract protected function update_session( $verifier, $session = null ); + + /** + * This method should destroy all session tokens for this user, + * except a single session passed. + * + * @since 4.0.0 + * @access protected + * + * @param string $verifier Verifier of the session to keep. + */ + abstract protected function destroy_other_sessions( $verifier ); + + /** + * This method should destroy all sessions for a user. + * + * @since 4.0.0 + * @access protected + */ + abstract protected function destroy_all_sessions(); + + /** + * This static method should destroy all session tokens for all users. + * + * @since 4.0.0 + * @access public + * @static + */ + public static function drop_sessions() {} +} + +/** + * Meta-based user sessions token manager. + * + * @since 4.0.0 + */ +class WP_User_Meta_Session_Tokens extends WP_Session_Tokens { + + /** + * Get all sessions of a user. + * + * @since 4.0.0 + * @access protected + * + * @return array Sessions of a user. + */ + protected function get_sessions() { + $sessions = get_user_meta( $this->user_id, 'session_tokens', true ); + + if ( ! is_array( $sessions ) ) { + return array(); + } + + $sessions = array_map( array( $this, 'prepare_session' ), $sessions ); + return array_filter( $sessions, array( $this, 'is_still_valid' ) ); + } + + /** + * Converts an expiration to an array of session information. + * + * @param mixed $session Session or expiration. + * @return array Session. + */ + protected function prepare_session( $session ) { + if ( is_int( $session ) ) { + return array( 'expiration' => $session ); + } + + return $session; + } + + /** + * Retrieve a session by its verifier (token hash). + * + * @since 4.0.0 + * @access protected + * + * @param string $verifier Verifier of the session to retrieve. + * @return array|null The session, or null if it does not exist + */ + protected function get_session( $verifier ) { + $sessions = $this->get_sessions(); + + if ( isset( $sessions[ $verifier ] ) ) { + return $sessions[ $verifier ]; + } + + return null; + } + + /** + * Update a session by its verifier. + * + * @since 4.0.0 + * @access protected + * + * @param string $verifier Verifier of the session to update. + * @param array $session Optional. Session. Omitting this argument destroys the session. + */ + protected function update_session( $verifier, $session = null ) { + $sessions = $this->get_sessions(); + + if ( $session ) { + $sessions[ $verifier ] = $session; + } else { + unset( $sessions[ $verifier ] ); + } + + $this->update_sessions( $sessions ); + } + + /** + * Update a user's sessions in the usermeta table. + * + * @since 4.0.0 + * @access protected + * + * @param array $sessions Sessions. + */ + protected function update_sessions( $sessions ) { + if ( $sessions ) { + update_user_meta( $this->user_id, 'session_tokens', $sessions ); + } else { + delete_user_meta( $this->user_id, 'session_tokens' ); + } + } + + /** + * Destroy all session tokens for a user, except a single session passed. + * + * @since 4.0.0 + * @access protected + * + * @param string $verifier Verifier of the session to keep. + */ + protected function destroy_other_sessions( $verifier ) { + $session = $this->get_session( $verifier ); + $this->update_sessions( array( $verifier => $session ) ); + } + + /** + * Destroy all session tokens for a user. + * + * @since 4.0.0 + * @access protected + */ + protected function destroy_all_sessions() { + $this->update_sessions( array() ); + } + + /** + * Destroy all session tokens for all users. + * + * @since 4.0.0 + * @access public + * @static + */ + public static function drop_sessions() { + delete_metadata( 'user', 0, 'session_tokens', false, true ); + } +} diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php index 15f8561..132d63a 100644 --- a/wp-includes/shortcodes.php +++ b/wp-includes/shortcodes.php @@ -21,11 +21,9 @@ * * To apply shortcode tags to content: * - * <code> - * $out = do_shortcode($content); - * </code> + * $out = do_shortcode( $content ); * - * @link http://codex.wordpress.org/Shortcode_API + * @link https://codex.wordpress.org/Shortcode_API * * @package WordPress * @subpackage Shortcodes @@ -52,51 +50,59 @@ $shortcode_tags = array(); * * Simplest example of a shortcode tag using the API: * - * <code> - * // [footag foo="bar"] - * function footag_func($atts) { - * return "foo = {$atts[foo]}"; - * } - * add_shortcode('footag', 'footag_func'); - * </code> + * // [footag foo="bar"] + * function footag_func( $atts ) { + * return "foo = { + * $atts[foo] + * }"; + * } + * add_shortcode( 'footag', 'footag_func' ); * * Example with nice attribute defaults: * - * <code> - * // [bartag foo="bar"] - * function bartag_func($atts) { - * extract(shortcode_atts(array( - * 'foo' => 'no foo', - * 'baz' => 'default baz', - * ), $atts)); + * // [bartag foo="bar"] + * function bartag_func( $atts ) { + * $args = shortcode_atts( array( + * 'foo' => 'no foo', + * 'baz' => 'default baz', + * ), $atts ); * - * return "foo = {$foo}"; - * } - * add_shortcode('bartag', 'bartag_func'); - * </code> + * return "foo = {$args['foo']}"; + * } + * add_shortcode( 'bartag', 'bartag_func' ); * * Example with enclosed content: * - * <code> - * // [baztag]content[/baztag] - * function baztag_func($atts, $content='') { - * return "content = $content"; - * } - * add_shortcode('baztag', 'baztag_func'); - * </code> + * // [baztag]content[/baztag] + * function baztag_func( $atts, $content = '' ) { + * return "content = $content"; + * } + * add_shortcode( 'baztag', 'baztag_func' ); * * @since 2.5.0 * - * @uses $shortcode_tags + * @global array $shortcode_tags * - * @param string $tag Shortcode tag to be searched in post content. + * @param string $tag Shortcode tag to be searched in post content. * @param callable $func Hook to run when shortcode is found. */ function add_shortcode($tag, $func) { global $shortcode_tags; - if ( is_callable($func) ) - $shortcode_tags[$tag] = $func; + if ( '' == trim( $tag ) ) { + $message = __( 'Invalid shortcode name: Empty name given.' ); + _doing_it_wrong( __FUNCTION__, $message, '4.4.0' ); + return; + } + + if ( 0 !== preg_match( '@[<>&/\[\]\x00-\x20=]@', $tag ) ) { + /* translators: 1: shortcode name, 2: space separated list of reserved characters */ + $message = sprintf( __( 'Invalid shortcode name: %1$s. Do not use spaces or reserved characters: %2$s' ), $tag, '& / < > [ ] =' ); + _doing_it_wrong( __FUNCTION__, $message, '4.4.0' ); + return; + } + + $shortcode_tags[ $tag ] = $func; } /** @@ -104,9 +110,9 @@ function add_shortcode($tag, $func) { * * @since 2.5.0 * - * @uses $shortcode_tags + * @global array $shortcode_tags * - * @param string $tag shortcode tag to remove hook for. + * @param string $tag Shortcode tag to remove hook for. */ function remove_shortcode($tag) { global $shortcode_tags; @@ -123,7 +129,7 @@ function remove_shortcode($tag) { * * @since 2.5.0 * - * @uses $shortcode_tags + * @global array $shortcode_tags */ function remove_all_shortcodes() { global $shortcode_tags; @@ -136,9 +142,10 @@ function remove_all_shortcodes() { * * @since 3.6.0 * - * @global array $shortcode_tags - * @param string $tag - * @return boolean + * @global array $shortcode_tags List of shortcode tags and their callback hooks. + * + * @param string $tag Shortcode tag to check. + * @return bool Whether the given shortcode exists. */ function shortcode_exists( $tag ) { global $shortcode_tags; @@ -151,8 +158,10 @@ function shortcode_exists( $tag ) { * @since 3.6.0 * * @global array $shortcode_tags - * @param string $tag - * @return boolean + * + * @param string $content Content to search for shortcodes. + * @param string $tag Shortcode tag to check. + * @return bool Whether the passed content contains the given shortcode. */ function has_shortcode( $content, $tag ) { if ( false === strpos( $content, '[' ) ) { @@ -160,13 +169,16 @@ function has_shortcode( $content, $tag ) { } if ( shortcode_exists( $tag ) ) { - preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER ); + preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER ); if ( empty( $matches ) ) return false; foreach ( $matches as $shortcode ) { - if ( $tag === $shortcode[2] ) + if ( $tag === $shortcode[2] ) { return true; + } elseif ( ! empty( $shortcode[5] ) && has_shortcode( $shortcode[5], $tag ) ) { + return true; + } } } return false; @@ -181,13 +193,13 @@ function has_shortcode( $content, $tag ) { * * @since 2.5.0 * - * @uses $shortcode_tags - * @uses get_shortcode_regex() Gets the search pattern for searching shortcodes. + * @global array $shortcode_tags List of shortcode tags and their callback hooks. * - * @param string $content Content to search for shortcodes + * @param string $content Content to search for shortcodes. + * @param bool $ignore_html When true, shortcodes inside HTML elements will be skipped. * @return string Content with shortcodes filtered out. */ -function do_shortcode($content) { +function do_shortcode( $content, $ignore_html = false ) { global $shortcode_tags; if ( false === strpos( $content, '[' ) ) { @@ -197,8 +209,23 @@ function do_shortcode($content) { if (empty($shortcode_tags) || !is_array($shortcode_tags)) return $content; - $pattern = get_shortcode_regex(); - return preg_replace_callback( "/$pattern/s", 'do_shortcode_tag', $content ); + // Find all registered tag names in $content. + preg_match_all( '@\[([^<>&/\[\]\x00-\x20=]++)@', $content, $matches ); + $tagnames = array_intersect( array_keys( $shortcode_tags ), $matches[1] ); + + if ( empty( $tagnames ) ) { + return $content; + } + + $content = do_shortcodes_in_html_tags( $content, $ignore_html, $tagnames ); + + $pattern = get_shortcode_regex( $tagnames ); + $content = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $content ); + + // Always restore square braces so we don't break things like  -<?php //} ?> -<p class="credit"><?php timer_stop(1); ?> <cite><?php printf(__('Powered by <a href="%s" title="Powered by WordPress, state-of-the-art semantic personal publishing platform"><strong>WordPress</strong></a>'), 'https://wordpress.org/'); ?></cite></p> -<?php // Seen at http://www.mijnkopthee.nl/log2/archive/2003/05/28/esc(18) ?> -<script type="text/javascript"> - -</script> -</body> -</html> diff --git a/wp-includes/theme-compat/comments.php b/wp-includes/theme-compat/comments.php index a1ae2c6..2e8ebc3 100644 --- a/wp-includes/theme-compat/comments.php +++ b/wp-includes/theme-compat/comments.php @@ -7,7 +7,14 @@ * This file is here for Backwards compatibility with old themes and will be removed in a future version * */ -_deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) ); +_deprecated_file( + /* translators: %s: template name */ + sprintf( __( 'Theme without %s' ), basename( __FILE__ ) ), + '3.0', + null, + /* translators: %s: template name */ + sprintf( __( 'Please include a %s template in your theme.' ), basename( __FILE__ ) ) +); // Do not delete these lines if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME'])) @@ -23,8 +30,18 @@ _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.  <?php if ( have_comments() ) : ?> - <h3 id="comments"><?php printf( _n( 'One Response to %2$s', '%1$s Responses to %2$s', get_comments_number() ), - number_format_i18n( get_comments_number() ), '“' . get_the_title() . '”' ); ?></h3> + <h3 id="comments"> + <?php + if ( 1 == get_comments_number() ) { + /* translators: %s: post title */ + printf( __( 'One response to %s' ), '“' . get_the_title() . '”' ); + } else { + /* translators: 1: number of comments, 2: post title */ + printf( _n( '%1$s response to %2$s', '%1$s responses to %2$s', get_comments_number() ), + number_format_i18n( get_comments_number() ), '“' . get_the_title() . '”' ); + } + ?> + </h3> <div class="navigation"> <div class="alignleft"><?php previous_comments_link() ?></div> @@ -51,51 +68,4 @@ _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3. <?php endif; ?> <?php endif; ?> -<?php if ( comments_open() ) : ?> - -<div id="respond"> - -<h3><?php comment_form_title( __('Leave a Reply'), __('Leave a Reply to %s' ) ); ?></h3> - -<div id="cancel-comment-reply"> - <small><?php cancel_comment_reply_link() ?></small> -</div> - -<?php if ( get_option('comment_registration') && !is_user_logged_in() ) : ?> -<p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.'), wp_login_url( get_permalink() )); ?></p> -<?php else : ?> - -<form action="<?php echo site_url(); ?>/wp-comments-post.php" method="post" id="commentform"> - -<?php if ( is_user_logged_in() ) : ?> - -<p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.'), get_edit_user_link(), $user_identity); ?> <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php esc_attr_e('Log out of this account'); ?>"><?php _e('Log out »'); ?></a></p> - -<?php else : ?> - -<p><input type="text" name="author" id="author" value="<?php echo esc_attr($comment_author); ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> /> -<label for="author"><small><?php _e('Name'); ?> <?php if ($req) _e('(required)'); ?></small></label></p> - -<p><input type="text" name="email" id="email" value="<?php echo esc_attr($comment_author_email); ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> /> -<label for="email"><small><?php _e('Mail (will not be published)'); ?> <?php if ($req) _e('(required)'); ?></small></label></p> - -<p><input type="text" name="url" id="url" value="<?php echo esc_attr($comment_author_url); ?>" size="22" tabindex="3" /> -<label for="url"><small><?php _e('Website'); ?></small></label></p> - -<?php endif; ?> - - - -<p><textarea name="comment" id="comment" cols="58" rows="10" tabindex="4"></textarea></p> - -<p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php esc_attr_e('Submit Comment'); ?>" /> -<?php comment_id_fields(); ?> -</p> -<?php do_action('comment_form', $post->ID); ?> - -</form> - -<?php endif; // If registration required and not logged in ?> -</div> - -<?php endif; // if you delete this the sky will fall on your head ?> +<?php comment_form(); ?> diff --git a/wp-includes/theme-compat/embed-404.php b/wp-includes/theme-compat/embed-404.php new file mode 100644 index 0000000..ee76675 --- /dev/null +++ b/wp-includes/theme-compat/embed-404.php @@ -0,0 +1,36 @@ +<?php +/** + * Contains the post embed content template part + * + * When a post is embedded in an iframe, this file is used to create the content template part + * output if the active theme does not include an embed-404.php template. + * + * @package WordPress + * @subpackage Theme_Compat + * @since 4.5.0 + */ +?> +<div class="wp-embed"> + <p class="wp-embed-heading"><?php _e( 'Oops! That embed can’t be found.' ); ?></p> + + <div class="wp-embed-excerpt"> + <p> + <?php + printf( + /* translators: %s: a link to the embedded site */ + __( 'It looks like nothing was found at this location. Maybe try visiting %s directly?' ), + '<strong><a href="' . esc_url( home_url() ) . '">' . esc_html( get_bloginfo( 'name' ) ) . '</a></strong>' + ); + ?> + </p> + </div> + + <?php + /** This filter is documented in wp-includes/theme-compat/embed-content.php */ + do_action( 'embed_content' ); + ?> + + <div class="wp-embed-footer"> + <?php the_embed_site_title() ?> + </div> +</div> diff --git a/wp-includes/theme-compat/embed-content.php b/wp-includes/theme-compat/embed-content.php new file mode 100644 index 0000000..05498eb --- /dev/null +++ b/wp-includes/theme-compat/embed-content.php @@ -0,0 +1,115 @@ +<?php +/** + * Contains the post embed content template part + * + * When a post is embedded in an iframe, this file is used to create the content template part + * output if the active theme does not include an embed-content.php template. + * + * @package WordPress + * @subpackage Theme_Compat + * @since 4.5.0 + */ +?> + <div <?php post_class( 'wp-embed' ); ?>> + <?php + $thumbnail_id = 0; + + if ( has_post_thumbnail() ) { + $thumbnail_id = get_post_thumbnail_id(); + } + + if ( 'attachment' === get_post_type() && wp_attachment_is_image() ) { + $thumbnail_id = get_the_ID(); + } + + $aspect_ratio = 1; + $measurements = array( 1, 1 ); + $image_size = 'full'; // Fallback. + + $meta = wp_get_attachment_metadata( $thumbnail_id ); + if ( is_array( $meta ) ) { + foreach ( $meta['sizes'] as $size => $data ) { + if ( $data['width'] / $data['height'] > $aspect_ratio ) { + $aspect_ratio = $data['width'] / $data['height']; + $measurements = array( $data['width'], $data['height'] ); + $image_size = $size; + } + } + } + + /** + * Filter the thumbnail image size for use in the embed template. + * + * @since 4.4.0 + * @since 4.5.0 Added `$thumbnail_id` parameter. + * + * @param string $image_size Thumbnail image size. + * @param int $thumbnail_id Attachment ID. + */ + $image_size = apply_filters( 'embed_thumbnail_image_size', $image_size, $thumbnail_id ); + + $shape = $measurements[0] / $measurements[1] >= 1.75 ? 'rectangular' : 'square'; + + /** + * Filter the thumbnail shape for use in the embed template. + * + * Rectangular images are shown above the title while square images + * are shown next to the content. + * + * @since 4.4.0 + * @since 4.5.0 Added `$thumbnail_id` parameter. + * + * @param string $shape Thumbnail image shape. Either 'rectangular' or 'square'. + * @param int $thumbnail_id Attachment ID. + */ + $shape = apply_filters( 'embed_thumbnail_image_shape', $shape, $thumbnail_id ); + + if ( 'rectangular' === $shape ) : ?> + <div class="wp-embed-featured-image rectangular"> + <a href="<?php the_permalink(); ?>" target="_top"> + <?php echo wp_get_attachment_image( $thumbnail_id, $image_size ); ?> + </a> + </div> + <?php endif; ?> + + <p class="wp-embed-heading"> + <a href="<?php the_permalink(); ?>" target="_top"> + <?php the_title(); ?> + </a> + </p> + + <?php if ( 'square' === $shape ) : ?> + <div class="wp-embed-featured-image square"> + <a href="<?php the_permalink(); ?>" target="_top"> + <?php echo wp_get_attachment_image( $thumbnail_id, $image_size ); ?> + </a> + </div> + <?php endif; ?> + + <div class="wp-embed-excerpt"><?php the_excerpt_embed(); ?></div> + + <?php + /** + * Print additional content after the embed excerpt. + * + * @since 4.4.0 + */ + do_action( 'embed_content' ); + ?> + + <div class="wp-embed-footer"> + <?php the_embed_site_title() ?> + + <div class="wp-embed-meta"> + <?php + /** + * Print additional meta content in the embed template. + * + * @since 4.4.0 + */ + do_action( 'embed_content_meta'); + ?> + </div> + </div> + </div> +<?php diff --git a/wp-includes/theme-compat/embed.php b/wp-includes/theme-compat/embed.php new file mode 100644 index 0000000..e1194cc --- /dev/null +++ b/wp-includes/theme-compat/embed.php @@ -0,0 +1,23 @@ +<?php +/** + * Contains the post embed base template + * + * When a post is embedded in an iframe, this file is used to create the output + * if the active theme does not include an embed.php template. + * + * @package WordPress + * @subpackage oEmbed + * @since 4.4.0 + */ + +get_header( 'embed' ); + +if ( have_posts() ) : + while ( have_posts() ) : the_post(); + get_template_part( 'embed', 'content' ); + endwhile; +else : + get_template_part( 'embed', '404' ); +endif; + +get_footer( 'embed' ); diff --git a/wp-includes/theme-compat/footer-embed.php b/wp-includes/theme-compat/footer-embed.php new file mode 100644 index 0000000..6ca651d --- /dev/null +++ b/wp-includes/theme-compat/footer-embed.php @@ -0,0 +1,21 @@ +<?php +/** + * Contains the post embed footer template + * + * When a post is embedded in an iframe, this file is used to create the footer output + * if the active theme does not include a footer-embed.php template. + * + * @package WordPress + * @subpackage Theme_Compat + * @since 4.5.0 + */ + +/** + * Print scripts or data before the closing body tag in the embed template. + * + * @since 4.4.0 + */ +do_action( 'embed_footer' ); +?> +</body> +</html> diff --git a/wp-includes/theme-compat/footer.php b/wp-includes/theme-compat/footer.php index 52b1d72..61f91b1 100644 --- a/wp-includes/theme-compat/footer.php +++ b/wp-includes/theme-compat/footer.php @@ -7,17 +7,28 @@ * This file is here for Backwards compatibility with old themes and will be removed in a future version * */ -_deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) ); +_deprecated_file( + /* translators: %s: template name */ + sprintf( __( 'Theme without %s' ), basename( __FILE__ ) ), + '3.0', + null, + /* translators: %s: template name */ + sprintf( __( 'Please include a %s template in your theme.' ), basename( __FILE__ ) ) +); ?> <hr /> <div id="footer" role="contentinfo">  <p> - <?php printf(__('%1$s is proudly powered by %2$s'), get_bloginfo('name'), - '<a href="https://wordpress.org/">WordPress</a>'); ?> - <br /><?php printf(__('%1$s and %2$s.'), '<a href="' . get_bloginfo('rss2_url') . '">' . __('Entries (RSS)') . '</a>', '<a href="' . get_bloginfo('comments_rss2_url') . '">' . __('Comments (RSS)') . '</a>'); ?> -  + <?php + printf( + /* translators: 1: blog name, 2: WordPress */ + __( '%1$s is proudly powered by %2$s' ), + get_bloginfo('name'), + '<a href="https://wordpress.org/">WordPress</a>' + ); + ?> </p> </div> </div> diff --git a/wp-includes/theme-compat/header-embed.php b/wp-includes/theme-compat/header-embed.php new file mode 100644 index 0000000..f831134 --- /dev/null +++ b/wp-includes/theme-compat/header-embed.php @@ -0,0 +1,32 @@ +<?php +/** + * Contains the post embed header template + * + * When a post is embedded in an iframe, this file is used to create the header output + * if the active theme does not include a header-embed.php template. + * + * @package WordPress + * @subpackage Theme_Compat + * @since 4.5.0 + */ + +if ( ! headers_sent() ) { + header( 'X-WP-embed: true' ); +} + +?> +<!DOCTYPE html> +<html <?php language_attributes(); ?> class="no-js"> +<head> + <title><?php echo wp_get_document_title(); ?></title> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <?php + /** + * Print scripts or data in the embed template <head> tag. + * + * @since 4.4.0 + */ + do_action( 'embed_head' ); + ?> +</head> +<body <?php body_class(); ?>> diff --git a/wp-includes/theme-compat/header.php b/wp-includes/theme-compat/header.php index b54d64c..432ae5b 100644 --- a/wp-includes/theme-compat/header.php +++ b/wp-includes/theme-compat/header.php @@ -7,7 +7,14 @@ * This file is here for Backwards compatibility with old themes and will be removed in a future version * */ -_deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) ); +_deprecated_file( + /* translators: %s: template name */ + sprintf( __( 'Theme without %s' ), basename( __FILE__ ) ), + '3.0', + null, + /* translators: %s: template name */ + sprintf( __( 'Please include a %s template in your theme.' ), basename( __FILE__ ) ) +); ?> <!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>> @@ -15,11 +22,12 @@ _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3. <link rel="profile" href="http://gmpg.org/xfn/11" /> <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" /> -<title><?php wp_title('«', true, 'right'); ?> <?php bloginfo('name'); ?></title> +<title><?php echo wp_get_document_title(); ?></title> <link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" media="screen" /> <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" /> +<?php if ( file_exists( get_stylesheet_directory() . '/images/kubrickbgwide.jpg' ) ) { ?> <style type="text/css" media="screen"> <?php @@ -32,6 +40,7 @@ if ( empty($withcomments) && !is_single() ) { <?php } ?> </style> +<?php } ?> <?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?> diff --git a/wp-includes/theme-compat/sidebar.php b/wp-includes/theme-compat/sidebar.php index fc529c9..23fa630 100644 --- a/wp-includes/theme-compat/sidebar.php +++ b/wp-includes/theme-compat/sidebar.php @@ -7,7 +7,14 @@ * This file is here for Backwards compatibility with old themes and will be removed in a future version * */ -_deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) ); +_deprecated_file( + /* translators: %s: template name */ + sprintf( __( 'Theme without %s' ), basename( __FILE__ ) ), + '3.0', + null, + /* translators: %s: template name */ + sprintf( __( 'Please include a %s template in your theme.' ), basename( __FILE__ ) ) +); ?> <div id="sidebar" role="complementary"> <ul> @@ -24,32 +31,60 @@ _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3. --> <?php if ( is_404() || is_category() || is_day() || is_month() || - is_year() || is_search() || is_paged() ) { + is_year() || is_search() || is_paged() ) : ?> <li> - <?php /* If this is a 404 page */ if (is_404()) { ?> - <?php /* If this is a category archive */ } elseif (is_category()) { ?> - <p><?php printf(__('You are currently browsing the archives for the %s category.'), single_cat_title('', false)); ?></p> + <?php if ( is_404() ) : /* If this is a 404 page */ ?> + <?php elseif ( is_category() ) : /* If this is a category archive */ ?> + <p><?php /* translators: %s: category name */ + printf( __( 'You are currently browsing the archives for the %s category.' ), + single_cat_title( '', false ) + ); + ?></p> - <?php /* If this is a daily archive */ } elseif (is_day()) { ?> - <p><?php printf(__('You are currently browsing the <a href="%1$s/">%2$s</a> blog archives for the day %3$s.'), get_bloginfo('url'), get_bloginfo('name'), get_the_time(__('l, F jS, Y'))); ?></p> + <?php elseif ( is_day() ) : /* If this is a daily archive */ ?> + <p><?php /* translators: 1: site link, 2: archive date */ + printf( __( 'You are currently browsing the %1$s blog archives for the day %2$s.' ), + sprintf( '<a href="%1$s/">%2$s</a>', get_bloginfo( 'url' ), get_bloginfo( 'name' ) ), + get_the_time( __( 'l, F jS, Y' ) ) + ); + ?></p> - <?php /* If this is a monthly archive */ } elseif (is_month()) { ?> - <p><?php printf(__('You are currently browsing the <a href="%1$s/">%2$s</a> blog archives for %3$s.'), get_bloginfo('url'), get_bloginfo('name'), get_the_time(__('F, Y'))); ?></p> + <?php elseif ( is_month() ) : /* If this is a monthly archive */ ?> + <p><?php /* translators: 1: site link, 2: archive month */ + printf( __( 'You are currently browsing the %1$s blog archives for %2$s.' ), + sprintf( '<a href="%1$s/">%2$s</a>', get_bloginfo( 'url' ), get_bloginfo( 'name' ) ), + get_the_time( __( 'F, Y' ) ) + ); + ?></p> - <?php /* If this is a yearly archive */ } elseif (is_year()) { ?> - <p><?php printf(__('You are currently browsing the <a href="%1$s/">%2$s</a> blog archives for the year %3$s.'), get_bloginfo('url'), get_bloginfo('name'), get_the_time('Y')); ?></p> + <?php elseif ( is_year() ) : /* If this is a yearly archive */ ?> + <p><?php /* translators: 1: site link, 2: archive year */ + printf( __( 'You are currently browsing the %1$s blog archives for the year %2$s.' ), + sprintf( '<a href="%1$s/">%2$s</a>', get_bloginfo( 'url' ), get_bloginfo( 'name' ) ), + get_the_time( 'Y' ) + ); + ?></p> - <?php /* If this is a search result */ } elseif (is_search()) { ?> - <p><?php printf(__('You have searched the <a href="%1$s/">%2$s</a> blog archives for <strong>‘%3$s’</strong>. If you are unable to find anything in these search results, you can try one of these links.'), get_bloginfo('url'), get_bloginfo('name'), esc_html( get_search_query() ) ); ?></p> + <?php elseif ( is_search() ) : /* If this is a search result */ ?> + <p><?php /* translators: 1: site link, 2: search query */ + printf( __( 'You have searched the %1$s blog archives for <strong>‘%2$s’</strong>. If you are unable to find anything in these search results, you can try one of these links.' ), + sprintf( '<a href="%1$s/">%2$s</a>', get_bloginfo( 'url' ), get_bloginfo( 'name' ) ), + esc_html( get_search_query() ) + ); + ?></p> - <?php /* If this set is paginated */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?> - <p><?php printf(__('You are currently browsing the <a href="%1$s/">%2$s</a> blog archives.'), get_bloginfo('url'), get_bloginfo('name')); ?></p> + <?php elseif ( isset( $_GET['paged'] ) && ! empty( $_GET['paged'] ) ) : /* If this set is paginated */ ?> + <p><?php /* translators: %s: site link */ + printf( __( 'You are currently browsing the %s blog archives.' ), + sprintf( '<a href="%1$s/">%2$s</a>', get_bloginfo( 'url' ), get_bloginfo( 'name' ) ) + ); + ?></p> - <?php } ?> + <?php endif; ?> </li> - <?php }?> + <?php endif; ?> </ul> <ul role="navigation"> <?php wp_list_pages('title_li=<h2>' . __('Pages') . '</h2>' ); ?> @@ -63,21 +98,18 @@ _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3. <?php wp_list_categories(array('show_count' => 1, 'title_li' => '<h2>' . __('Categories') . '</h2>')); ?> </ul> <ul> - <?php /* If this is the frontpage */ if ( is_home() || is_page() ) { ?> + <?php if ( is_home() || is_page() ) { /* If this is the frontpage */ ?> <?php wp_list_bookmarks(); ?> <li><h2><?php _e('Meta'); ?></h2> <ul> <?php wp_register(); ?> <li><?php wp_loginout(); ?></li> - <li><a href="http://validator.w3.org/check/referer" title="<?php esc_attr_e('This page validates as XHTML 1.0 Transitional'); ?>"><?php _e('Valid <abbr title="eXtensible HyperText Markup Language">XHTML</abbr>'); ?></a></li> - <li><a href="http://gmpg.org/xfn/"><abbr title="<?php esc_attr_e('XHTML Friends Network'); ?>"><?php _e('XFN'); ?></abbr></a></li> - <li><a href="https://wordpress.org/" title="<?php esc_attr_e('Powered by WordPress, state-of-the-art semantic personal publishing platform.'); ?>">WordPress</a></li> <?php wp_meta(); ?> </ul> </li> <?php } ?> - <?php endif; ?> + <?php endif; /* ! dynamic_sidebar() */ ?> </ul> </div> diff --git a/wp-includes/theme.php b/wp-includes/theme.php index 00b3c39..f4dfaee 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -14,6 +14,9 @@ * * @since 3.4.0 * + * @global array $wp_theme_directories + * @staticvar array $_themes + * * @param array $args The search arguments. Optional. * - errors mixed True to return themes with errors, false to return themes without errors, null * to return all themes. Defaults to false. @@ -22,7 +25,7 @@ * to return only network-allowed themes. Null to return all themes. Defaults to null. * - blog_id int (Multisite) The blog ID used to calculate which themes are allowed. Defaults to 0, * synonymous for the current blog. - * @return Array of WP_Theme objects. + * @return array Array of WP_Theme objects. */ function wp_get_themes( $args = array() ) { global $wp_theme_directories; @@ -84,9 +87,11 @@ function wp_get_themes( $args = array() ) { * * @since 3.4.0 * + * @global array $wp_theme_directories + * * @param string $stylesheet Directory name for the theme. Optional. Defaults to current theme. * @param string $theme_root Absolute path of the theme root to look in. Optional. If not specified, get_raw_theme_root() - * is used to calculate the theme root for the $stylesheet provided (or current theme). + * is used to calculate the theme root for the $stylesheet provided (or current theme). * @return WP_Theme Theme object. Be sure to check the object's exists() method if you need to confirm the theme's existence. */ function wp_get_theme( $stylesheet = null, $theme_root = null ) { @@ -137,7 +142,7 @@ function is_child_theme() { * The theme name that the administrator has currently set the front end theme * as. * - * For all extensive purposes, the template name and the stylesheet name are + * For all intents and purposes, the template name and the stylesheet name are * going to be the same for most cases. * * @since 1.5.0 @@ -172,7 +177,7 @@ function get_stylesheet_directory() { * * @since 1.5.0 * - * @param string $stylesheet_dir Absolute path to the current them. + * @param string $stylesheet_dir Absolute path to the current theme. * @param string $stylesheet Directory name of the current theme. * @param string $theme_root Absolute path to themes directory. */ @@ -243,6 +248,8 @@ function get_stylesheet_uri() { * * @since 2.1.0 * + * @global WP_Locale $wp_locale + * * @return string */ function get_locale_stylesheet_uri() { @@ -271,7 +278,6 @@ function get_locale_stylesheet_uri() { * Retrieve name of the current theme. * * @since 1.5.0 - * @uses apply_filters() Calls 'template' filter on template option. * * @return string Template name. */ @@ -339,6 +345,8 @@ function get_template_directory_uri() { * * @since 2.9.0 * + * @global array $wp_theme_directories + * * @return array|string An array of theme roots keyed by template/stylesheet or a single theme root if all themes have the same root. */ function get_theme_roots() { @@ -360,6 +368,8 @@ function get_theme_roots() { * * @since 2.9.0 * + * @global array $wp_theme_directories + * * @param string $directory Either the full filesystem path to a theme folder or a folder within WP_CONTENT_DIR * @return bool */ @@ -370,11 +380,19 @@ function register_theme_directory( $directory ) { // Try prepending as the theme directory could be relative to the content directory $directory = WP_CONTENT_DIR . '/' . $directory; // If this directory does not exist, return and do not register - if ( ! file_exists( $directory ) ) + if ( ! file_exists( $directory ) ) { return false; + } } - $wp_theme_directories[] = $directory; + if ( ! is_array( $wp_theme_directories ) ) { + $wp_theme_directories = array(); + } + + $untrailed = untrailingslashit( $directory ); + if ( ! empty( $untrailed ) && ! in_array( $untrailed, $wp_theme_directories ) ) { + $wp_theme_directories[] = $untrailed; + } return true; } @@ -384,21 +402,26 @@ function register_theme_directory( $directory ) { * * @since 2.9.0 * + * @global array $wp_theme_directories + * @staticvar array $found_themes + * * @param bool $force Optional. Whether to force a new directory scan. Defaults to false. - * @return array Valid themes found + * @return array|false Valid themes found */ function search_theme_directories( $force = false ) { global $wp_theme_directories; + static $found_themes = null; + if ( empty( $wp_theme_directories ) ) return false; - static $found_themes; if ( ! $force && isset( $found_themes ) ) return $found_themes; $found_themes = array(); $wp_theme_directories = (array) $wp_theme_directories; + $relative_theme_roots = array(); // Set up maybe-relative, maybe-absolute array of theme directories. // We always want to return absolute, but we need to cache relative @@ -510,6 +533,8 @@ function search_theme_directories( $force = false ) { * * @since 1.5.0 * + * @global array $wp_theme_directories + * * @param string $stylesheet_or_template The stylesheet or template name of the theme * @return string Theme path. */ @@ -542,10 +567,12 @@ function get_theme_root( $stylesheet_or_template = false ) { * * @since 1.5.0 * + * @global array $wp_theme_directories + * * @param string $stylesheet_or_template Optional. The stylesheet or template name of the theme. - * Default is to leverage the main theme root. - * @param string $theme_root Optional. The theme root for which calculations will be based, preventing - * the need for a get_raw_theme_root() call. + * Default is to leverage the main theme root. + * @param string $theme_root Optional. The theme root for which calculations will be based, preventing + * the need for a get_raw_theme_root() call. * @return string Themes URI. */ function get_theme_root_uri( $stylesheet_or_template = false, $theme_root = false ) { @@ -589,8 +616,11 @@ function get_theme_root_uri( $stylesheet_or_template = false, $theme_root = fals * * @since 3.1.0 * + * @global array $wp_theme_directories + * * @param string $stylesheet_or_template The stylesheet or template name of the theme - * @param bool $skip_cache Optional. Whether to skip the cache. Defaults to false, meaning the cache is used. + * @param bool $skip_cache Optional. Whether to skip the cache. + * Defaults to false, meaning the cache is used. * @return string Theme root */ function get_raw_theme_root( $stylesheet_or_template, $skip_cache = false ) { @@ -630,117 +660,6 @@ function locale_stylesheet() { echo '<link rel="stylesheet" href="' . $stylesheet . '" type="text/css" media="screen" />'; } -/** - * Start preview theme output buffer. - * - * Will only perform task if the user has permissions and template and preview - * query variables exist. - * - * @since 2.6.0 - */ -function preview_theme() { - if ( ! (isset($_GET['template']) && isset($_GET['preview'])) ) - return; - - if ( !current_user_can( 'switch_themes' ) ) - return; - - // Admin Thickbox requests - if ( isset( $_GET['preview_iframe'] ) ) - show_admin_bar( false ); - - $_GET['template'] = preg_replace('|[^a-z0-9_./-]|i', '', $_GET['template']); - - if ( validate_file($_GET['template']) ) - return; - - add_filter( 'template', '_preview_theme_template_filter' ); - - if ( isset($_GET['stylesheet']) ) { - $_GET['stylesheet'] = preg_replace('|[^a-z0-9_./-]|i', '', $_GET['stylesheet']); - if ( validate_file($_GET['stylesheet']) ) - return; - add_filter( 'stylesheet', '_preview_theme_stylesheet_filter' ); - } - - // Prevent theme mods to current theme being used on theme being previewed - add_filter( 'pre_option_theme_mods_' . get_option( 'stylesheet' ), '__return_empty_array' ); - - ob_start( 'preview_theme_ob_filter' ); -} -add_action('setup_theme', 'preview_theme'); - -/** - * Private function to modify the current template when previewing a theme - * - * @since 2.9.0 - * @access private - * - * @return string - */ -function _preview_theme_template_filter() { - return isset($_GET['template']) ? $_GET['template'] : ''; -} - -/** - * Private function to modify the current stylesheet when previewing a theme - * - * @since 2.9.0 - * @access private - * - * @return string - */ -function _preview_theme_stylesheet_filter() { - return isset($_GET['stylesheet']) ? $_GET['stylesheet'] : ''; -} - -/** - * Callback function for ob_start() to capture all links in the theme. - * - * @since 2.6.0 - * @access private - * - * @param string $content - * @return string - */ -function preview_theme_ob_filter( $content ) { - return preg_replace_callback( "|(<a.*?href=([\"']))(.*?)([\"'].*?>)|", 'preview_theme_ob_filter_callback', $content ); -} - -/** - * Manipulates preview theme links in order to control and maintain location. - * - * Callback function for preg_replace_callback() to accept and filter matches. - * - * @since 2.6.0 - * @access private - * - * @param array $matches - * @return string - */ -function preview_theme_ob_filter_callback( $matches ) { - if ( strpos($matches[4], 'onclick') !== false ) - $matches[4] = preg_replace('#onclick=([\'"]).*?(?<!\\\)\\1#i', '', $matches[4]); //Strip out any onclicks from rest of <a>. (?<!\\\) means to ignore the '" if it's escaped by \ to prevent breaking mid-attribute. - if ( - ( false !== strpos($matches[3], '/wp-admin/') ) - || - ( false !== strpos( $matches[3], '://' ) && 0 !== strpos( $matches[3], home_url() ) ) - || - ( false !== strpos($matches[3], '/feed/') ) - || - ( false !== strpos($matches[3], '/trackback/') ) - ) - return $matches[1] . "#$matches[2] onclick=$matches[2]return false;" . $matches[4]; - - $stylesheet = isset( $_GET['stylesheet'] ) ? $_GET['stylesheet'] : ''; - $template = isset( $_GET['template'] ) ? $_GET['template'] : ''; - - $link = add_query_arg( array( 'preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'preview_iframe' => 1 ), $matches[3] ); - if ( 0 === strpos($link, 'preview=1') ) - $link = "?$link"; - return $matches[1] . esc_attr( $link ) . $matches[4]; -} - /** * Switches the theme. * @@ -749,6 +668,10 @@ function preview_theme_ob_filter_callback( $matches ) { * * @since 2.5.0 * + * @global array $wp_theme_directories + * @global WP_Customize_Manager $wp_customize + * @global array $sidebars_widgets + * * @param string $stylesheet Stylesheet name */ function switch_theme( $stylesheet ) { @@ -765,16 +688,16 @@ function switch_theme( $stylesheet ) { set_theme_mod( 'sidebars_widgets', array( 'time' => time(), 'data' => $_sidebars_widgets ) ); } - $old_theme = wp_get_theme(); - $new_theme = wp_get_theme( $stylesheet ); + $nav_menu_locations = get_theme_mod( 'nav_menu_locations' ); if ( func_num_args() > 1 ) { - $template = $stylesheet; $stylesheet = func_get_arg( 1 ); - } else { - $template = $new_theme->get_template(); } + $old_theme = wp_get_theme(); + $new_theme = wp_get_theme( $stylesheet ); + $template = $new_theme->get_template(); + update_option( 'template', $template ); update_option( 'stylesheet', $stylesheet ); @@ -793,35 +716,50 @@ function switch_theme( $stylesheet ) { // Migrate from the old mods_{name} option to theme_mods_{slug}. if ( is_admin() && false === get_option( 'theme_mods_' . $stylesheet ) ) { $default_theme_mods = (array) get_option( 'mods_' . $new_name ); + if ( ! empty( $nav_menu_locations ) && empty( $default_theme_mods['nav_menu_locations'] ) ) { + $default_theme_mods['nav_menu_locations'] = $nav_menu_locations; + } add_option( "theme_mods_$stylesheet", $default_theme_mods ); } else { /* - * Since retrieve_widgets() is called when initializing the customizer theme, - * we need to to remove the theme mods to avoid overwriting changes made via - * the widget customizer when accessing wp-admin/widgets.php. + * Since retrieve_widgets() is called when initializing a theme in the Customizer, + * we need to remove the theme mods to avoid overwriting changes made via + * the Customizer when accessing wp-admin/widgets.php. */ if ( 'wp_ajax_customize_save' === current_action() ) { remove_theme_mod( 'sidebars_widgets' ); } + + if ( ! empty( $nav_menu_locations ) ) { + $nav_mods = get_theme_mod( 'nav_menu_locations' ); + if ( empty( $nav_mods ) ) { + set_theme_mod( 'nav_menu_locations', $nav_menu_locations ); + } + } } update_option( 'theme_switched', $old_theme->get_stylesheet() ); + /** * Fires after the theme is switched. * * @since 1.5.0 + * @since 4.5.0 Introduced the `$old_theme` parameter. * * @param string $new_name Name of the new theme. * @param WP_Theme $new_theme WP_Theme instance of the new theme. + * @param WP_Theme $old_theme WP_Theme instance of the old theme. */ - do_action( 'switch_theme', $new_name, $new_theme ); + do_action( 'switch_theme', $new_name, $new_theme, $old_theme ); } /** * Checks that current theme files 'index.php' and 'style.css' exists. * - * Does not check the default theme, which is the fallback and should always exist. + * Does not initially check the default theme, which is the fallback and should always exist. + * But if it doesn't exist, it'll fall back to the latest core default theme that does exist. * Will switch theme to the fallback theme if current theme does not validate. + * * You can use the 'validate_current_theme' filter to return false to * disable this functionality. * @@ -836,27 +774,44 @@ function validate_current_theme() { * * @since 2.7.0 * - * @param bool true Validation flag to check the current theme. + * @param bool $validate Whether to validate the current theme. Default true. */ - if ( defined('WP_INSTALLING') || ! apply_filters( 'validate_current_theme', true ) ) + if ( wp_installing() || ! apply_filters( 'validate_current_theme', true ) ) return true; - if ( get_template() != WP_DEFAULT_THEME && !file_exists(get_template_directory() . '/index.php') ) { - switch_theme( WP_DEFAULT_THEME ); - return false; + if ( ! file_exists( get_template_directory() . '/index.php' ) ) { + // Invalid. + } elseif ( ! file_exists( get_template_directory() . '/style.css' ) ) { + // Invalid. + } elseif ( is_child_theme() && ! file_exists( get_stylesheet_directory() . '/style.css' ) ) { + // Invalid. + } else { + // Valid. + return true; } - if ( get_stylesheet() != WP_DEFAULT_THEME && !file_exists(get_template_directory() . '/style.css') ) { + $default = wp_get_theme( WP_DEFAULT_THEME ); + if ( $default->exists() ) { switch_theme( WP_DEFAULT_THEME ); return false; } - if ( is_child_theme() && ! file_exists( get_stylesheet_directory() . '/style.css' ) ) { - switch_theme( WP_DEFAULT_THEME ); - return false; + /** + * If we're in an invalid state but WP_DEFAULT_THEME doesn't exist, + * switch to the latest core default theme that's installed. + * If it turns out that this latest core default theme is our current + * theme, then there's nothing we can do about that, so we have to bail, + * rather than going into an infinite loop. (This is why there are + * checks against WP_DEFAULT_THEME above, also.) We also can't do anything + * if it turns out there is no default theme installed. (That's `false`.) + */ + $default = WP_Theme::get_core_default_theme(); + if ( false === $default || get_stylesheet() == $default->get_stylesheet() ) { + return true; } - return true; + switch_theme( $default->get_stylesheet() ); + return false; } /** @@ -864,11 +819,12 @@ function validate_current_theme() { * * @since 3.1.0 * - * @return array Theme modifications. + * @return array|void Theme modifications. */ function get_theme_mods() { $theme_slug = get_option( 'stylesheet' ); - if ( false === ( $mods = get_option( "theme_mods_$theme_slug" ) ) ) { + $mods = get_option( "theme_mods_$theme_slug" ); + if ( false === $mods ) { $theme_name = get_option( 'current_theme' ); if ( false === $theme_name ) $theme_name = wp_get_theme()->get('Name'); @@ -891,7 +847,7 @@ function get_theme_mods() { * * @since 2.1.0 * - * @param string $name Theme modification name. + * @param string $name Theme modification name. * @param bool|string $default * @return string */ @@ -902,7 +858,7 @@ function get_theme_mod( $name, $default = false ) { /** * Filter the theme modification, or 'theme_mod', value. * - * The dynamic portion of the hook name, $name, refers to + * The dynamic portion of the hook name, `$name`, refers to * the key name of the modification array. For example, * 'header_textcolor', 'header_image', and so on depending * on the theme options. @@ -926,8 +882,8 @@ function get_theme_mod( $name, $default = false ) { * * @since 2.1.0 * - * @param string $name Theme modification name. - * @param string $value theme modification value. + * @param string $name Theme modification name. + * @param mixed $value Theme modification value. */ function set_theme_mod( $name, $value ) { $mods = get_theme_mods(); @@ -936,7 +892,7 @@ function set_theme_mod( $name, $value ) { /** * Filter the theme mod value on save. * - * The dynamic portion of the hook name, $name, refers to the key name of + * The dynamic portion of the hook name, `$name`, refers to the key name of * the modification array. For example, 'header_textcolor', 'header_image', * and so on depending on the theme options. * @@ -960,7 +916,6 @@ function set_theme_mod( $name, $value ) { * @since 2.1.0 * * @param string $name Theme modification name. - * @return null */ function remove_theme_mod( $name ) { $mods = get_theme_mods(); @@ -970,9 +925,10 @@ function remove_theme_mod( $name ) { unset( $mods[ $name ] ); - if ( empty( $mods ) ) - return remove_theme_mods(); - + if ( empty( $mods ) ) { + remove_theme_mods(); + return; + } $theme = get_option( 'stylesheet' ); update_option( "theme_mods_$theme", $mods ); } @@ -993,18 +949,18 @@ function remove_theme_mods() { } /** - * Retrieve text color for custom header. + * Retrieves the custom header text color in HEX format. * * @since 2.1.0 * - * @return string + * @return string Header text color in HEX format (minus the hash symbol). */ function get_header_textcolor() { return get_theme_mod('header_textcolor', get_theme_support( 'custom-header', 'default-text-color' ) ); } /** - * Display text color for custom header. + * Displays the custom header text color in HEX format (minus the hash symbol). * * @since 2.1.0 */ @@ -1024,7 +980,20 @@ function display_header_text() { return false; $text_color = get_theme_mod( 'header_textcolor', get_theme_support( 'custom-header', 'default-text-color' ) ); - return 'blank' != $text_color; + return 'blank' !== $text_color; +} + +/** + * Check whether a header image is set or not. + * + * @since 4.2.0 + * + * @see get_header_image() + * + * @return bool Whether a header image is set or not. + */ +function has_header_image() { + return (bool) get_header_image(); } /** @@ -1032,7 +1001,7 @@ function display_header_text() { * * @since 2.1.0 * - * @return string + * @return string|false */ function get_header_image() { $url = get_theme_mod( 'header_image', get_theme_support( 'custom-header', 'default-image' ) ); @@ -1046,6 +1015,83 @@ function get_header_image() { return esc_url_raw( set_url_scheme( $url ) ); } +/** + * Create image tag markup for a custom header image. + * + * @since 4.4.0 + * + * @param array $attr Optional. Additional attributes for the image tag. Can be used + * to override the default attributes. Default empty. + * @return string HTML image element markup or empty string on failure. + */ +function get_header_image_tag( $attr = array() ) { + $header = get_custom_header(); + + if ( empty( $header->url ) ) { + return ''; + } + + $width = absint( $header->width ); + $height = absint( $header->height ); + + $attr = wp_parse_args( + $attr, + array( + 'src' => $header->url, + 'width' => $width, + 'height' => $height, + 'alt' => get_bloginfo( 'name' ), + ) + ); + + // Generate 'srcset' and 'sizes' if not already present. + if ( empty( $attr['srcset'] ) && ! empty( $header->attachment_id ) ) { + $image_meta = get_post_meta( $header->attachment_id, '_wp_attachment_metadata', true ); + $size_array = array( $width, $height ); + + if ( is_array( $image_meta ) ) { + $srcset = wp_calculate_image_srcset( $size_array, $header->url, $image_meta, $header->attachment_id ); + $sizes = ! empty( $attr['sizes'] ) ? $attr['sizes'] : wp_calculate_image_sizes( $size_array, $header->url, $image_meta, $header->attachment_id ); + + if ( $srcset && $sizes ) { + $attr['srcset'] = $srcset; + $attr['sizes'] = $sizes; + } + } + } + + $attr = array_map( 'esc_attr', $attr ); + $html = '<img'; + + foreach ( $attr as $name => $value ) { + $html .= ' ' . $name . '="' . $value . '"'; + } + + $html .= ' />'; + + /** + * Filter the markup of header images. + * + * @since 4.4.0 + * + * @param string $html The HTML image tag markup being filtered. + * @param object $header The custom header object returned by 'get_custom_header()'. + * @param array $attr Array of the attributes for the image tag. + */ + return apply_filters( 'get_header_image_tag', $html, $header, $attr ); +} + +/** + * Display the image markup for a custom header image. + * + * @since 4.4.0 + * + * @param array $attr Optional. Attributes for the image markup. Default empty. + */ +function the_header_image_tag( $attr = array() ) { + echo get_header_image_tag( $attr ); +} + /** * Get random header image data from registered images in theme. * @@ -1053,11 +1099,13 @@ function get_header_image() { * * @access private * - * @return string Path to header image + * @global array $_wp_default_headers + * @staticvar object $_wp_random_header + * + * @return object */ - function _get_random_header_data() { - static $_wp_random_header; + static $_wp_random_header = null; if ( empty( $_wp_random_header ) ) { global $_wp_default_headers; @@ -1093,7 +1141,6 @@ function _get_random_header_data() { * * @return string Path to header image */ - function get_random_header_image() { $random_image = _get_random_header_data(); if ( empty( $random_image->url ) ) @@ -1111,7 +1158,7 @@ function get_random_header_image() { * @since 3.2.0 * * @param string $type The random pool to use. any|default|uploaded - * @return boolean + * @return bool */ function is_random_header_image( $type = 'any' ) { $header_image_mod = get_theme_mod( 'header_image', get_theme_support( 'custom-header', 'default-image' ) ); @@ -1135,7 +1182,10 @@ function is_random_header_image( $type = 'any' ) { * @since 2.1.0 */ function header_image() { - echo esc_url( get_header_image() ); + $image = get_header_image(); + if ( $image ) { + echo esc_url( $image ); + } } /** @@ -1157,11 +1207,14 @@ function get_uploaded_header_images() { foreach ( (array) $headers as $header ) { $url = esc_url_raw( wp_get_attachment_url( $header->ID ) ); $header_data = wp_get_attachment_metadata( $header->ID ); - $header_index = basename($url); + $header_index = $header->ID; + $header_images[$header_index] = array(); - $header_images[$header_index]['attachment_id'] = $header->ID; + $header_images[$header_index]['attachment_id'] = $header->ID; $header_images[$header_index]['url'] = $url; - $header_images[$header_index]['thumbnail_url'] = $url; + $header_images[$header_index]['thumbnail_url'] = $url; + $header_images[$header_index]['alt_text'] = get_post_meta( $header->ID, '_wp_attachment_image_alt', true ); + if ( isset( $header_data['width'] ) ) $header_images[$header_index]['width'] = $header_data['width']; if ( isset( $header_data['height'] ) ) @@ -1176,6 +1229,8 @@ function get_uploaded_header_images() { * * @since 3.4.0 * + * @global array $_wp_default_headers + * * @return object */ function get_custom_header() { @@ -1217,6 +1272,8 @@ function get_custom_header() { * * @since 3.0.0 * + * @global array $_wp_default_headers + * * @param array $headers Array of headers keyed by a string id. The ids point to arrays containing 'url', 'thumbnail_url', and 'description' keys. */ function register_default_headers( $headers ) { @@ -1234,6 +1291,8 @@ function register_default_headers( $headers ) { * @see register_default_headers() * @since 3.0.0 * + * @global array $_wp_default_headers + * * @param string|array $header The header string id (key of array) to remove, or an array thereof. * @return bool|void A single header returns true on success, false on failure. * There is currently no return value for multiple headers. @@ -1357,11 +1416,12 @@ body.custom-background { <?php echo trim( $style ); ?> } * * @since 3.0.0 * - * @param mixed $stylesheet Optional. Stylesheet name or array thereof, relative to theme root. - * Defaults to 'editor-style.css' + * @global array $editor_styles + * + * @param array|string $stylesheet Optional. Stylesheet name or array thereof, relative to theme root. + * Defaults to 'editor-style.css' */ function add_editor_style( $stylesheet = 'editor-style.css' ) { - add_theme_support( 'editor-style' ); if ( ! is_admin() ) @@ -1383,6 +1443,8 @@ function add_editor_style( $stylesheet = 'editor-style.css' ) { * * @since 3.1.0 * + * @global array $editor_styles + * * @return bool True on success, false if there were no stylesheets to remove. */ function remove_editor_styles() { @@ -1394,6 +1456,62 @@ function remove_editor_styles() { return true; } +/** + * Retrieve any registered editor stylesheets + * + * @since 4.0.0 + * + * @global array $editor_styles Registered editor stylesheets + * + * @return array If registered, a list of editor stylesheet URLs. + */ +function get_editor_stylesheets() { + $stylesheets = array(); + // load editor_style.css if the current theme supports it + if ( ! empty( $GLOBALS['editor_styles'] ) && is_array( $GLOBALS['editor_styles'] ) ) { + $editor_styles = $GLOBALS['editor_styles']; + + $editor_styles = array_unique( array_filter( $editor_styles ) ); + $style_uri = get_stylesheet_directory_uri(); + $style_dir = get_stylesheet_directory(); + + // Support externally referenced styles (like, say, fonts). + foreach ( $editor_styles as $key => $file ) { + if ( preg_match( '~^(https?:)?//~', $file ) ) { + $stylesheets[] = esc_url_raw( $file ); + unset( $editor_styles[ $key ] ); + } + } + + // Look in a parent theme first, that way child theme CSS overrides. + if ( is_child_theme() ) { + $template_uri = get_template_directory_uri(); + $template_dir = get_template_directory(); + + foreach ( $editor_styles as $key => $file ) { + if ( $file && file_exists( "$template_dir/$file" ) ) { + $stylesheets[] = "$template_uri/$file"; + } + } + } + + foreach ( $editor_styles as $file ) { + if ( $file && file_exists( "$style_dir/$file" ) ) { + $stylesheets[] = "$style_uri/$file"; + } + } + } + + /** + * Filter the array of stylesheets applied to the editor. + * + * @since 4.3.0 + * + * @param array $stylesheets Array of stylesheets to be applied to the editor. + */ + return apply_filters( 'editor_stylesheets', $stylesheets ); +} + /** * Allows a theme to register its support of a certain feature * @@ -1403,6 +1521,8 @@ function remove_editor_styles() { * * @since 2.9.0 * + * @global array $_wp_theme_features + * * @param string $feature The feature being added. * @return void|bool False on failure, void otherwise. */ @@ -1416,8 +1536,12 @@ function add_theme_support( $feature ) { switch ( $feature ) { case 'post-formats' : - if ( is_array( $args[0] ) ) - $args[0] = array_intersect( $args[0], array_keys( get_post_format_slugs() ) ); + if ( is_array( $args[0] ) ) { + $post_formats = get_post_format_slugs(); + unset( $post_formats['standard'] ); + + $args[0] = array_intersect( $args[0], array_keys( $post_formats ) ); + } break; case 'html5' : @@ -1426,7 +1550,7 @@ function add_theme_support( $feature ) { // Build an array of types for back-compat. $args = array( 0 => array( 'comment-list', 'comment-form', 'search-form' ) ); } elseif ( ! is_array( $args[0] ) ) { - _doing_it_wrong( "add_theme_support( 'html5' )", 'You need to pass an array of types.', '3.6.1' ); + _doing_it_wrong( "add_theme_support( 'html5' )", __( 'You need to pass an array of types.' ), '3.6.1' ); return false; } @@ -1435,9 +1559,28 @@ function add_theme_support( $feature ) { $args[0] = array_merge( $_wp_theme_features['html5'][0], $args[0] ); break; + case 'custom-logo': + if ( ! is_array( $args ) ) { + $args = array( 0 => array() ); + } + $defaults = array( + 'width' => null, + 'height' => null, + 'flex-width' => false, + 'flex-height' => false, + 'header-text' => '', + ); + $args[0] = wp_parse_args( array_intersect_key( $args[0], $defaults ), $defaults ); + + // Allow full flexibility if no size is specified. + if ( is_null( $args[0]['width'] ) && is_null( $args[0]['height'] ) ) { + $args[0]['flex-width'] = true; + $args[0]['flex-height'] = true; + } + break; + case 'custom-header-uploads' : return add_theme_support( 'custom-header', array( 'uploads' => true ) ); - break; case 'custom-header' : if ( ! is_array( $args ) ) @@ -1552,6 +1695,17 @@ function add_theme_support( $feature ) { define( 'BACKGROUND_IMAGE', $args[0]['default-image'] ); break; + + // Ensure that 'title-tag' is accessible in the admin. + case 'title-tag' : + // Can be called in functions.php but must happen before wp_loaded, i.e. not in header.php. + if ( did_action( 'wp_loaded' ) ) { + /* translators: 1: Theme support 2: hook name */ + _doing_it_wrong( "add_theme_support( 'title-tag' )", sprintf( __( 'Theme support for %1$s should be registered before the %2$s hook.' ), + '<code>title-tag</code>', '<code>wp_loaded</code>' ), '4.1' ); + + return false; + } } $_wp_theme_features[ $feature ] = $args; @@ -1562,6 +1716,9 @@ function add_theme_support( $feature ) { * * @since 3.4.0 * @access private + * + * @global Custom_Image_Header $custom_image_header + * @global Custom_Background $custom_background */ function _custom_header_background_just_in_time() { global $custom_image_header, $custom_background; @@ -1593,15 +1750,40 @@ function _custom_header_background_just_in_time() { } } } -add_action( 'wp_loaded', '_custom_header_background_just_in_time' ); + +/** + * Adds CSS to hide header text for custom logo, based on Customizer setting. + * + * @since 4.5.0 + * @access private + */ +function _custom_logo_header_styles() { + if ( ! current_theme_supports( 'custom-header', 'header-text' ) && get_theme_support( 'custom-logo', 'header-text' ) && ! get_theme_mod( 'header_text', true ) ) { + $classes = (array) get_theme_support( 'custom-logo', 'header-text' ); + $classes = array_map( 'sanitize_html_class', $classes ); + $classes = '.' . implode( ', .', $classes ); + + ?> +  + <style id="custom-logo-css" type="text/css"> + <?php echo $classes; ?> { + position: absolute; + clip: rect(1px, 1px, 1px, 1px); + } + </style> + <?php + } +} /** * Gets the theme support arguments passed when registering that support * * @since 3.1.0 * + * @global array $_wp_theme_features + * * @param string $feature the feature to check - * @return array The array of extra arguments + * @return mixed The array of extra arguments or the value for the registered feature. */ function get_theme_support( $feature ) { global $_wp_theme_features; @@ -1613,15 +1795,15 @@ function get_theme_support( $feature ) { $args = array_slice( func_get_args(), 1 ); switch ( $feature ) { + case 'custom-logo' : case 'custom-header' : case 'custom-background' : if ( isset( $_wp_theme_features[ $feature ][0][ $args[0] ] ) ) return $_wp_theme_features[ $feature ][0][ $args[0] ]; return false; - break; + default : return $_wp_theme_features[ $feature ]; - break; } } @@ -1634,7 +1816,7 @@ function get_theme_support( $feature ) { * @since 3.0.0 * @see add_theme_support() * @param string $feature the feature being added - * @return bool Whether feature was removed. + * @return bool|void Whether feature was removed. */ function remove_theme_support( $feature ) { // Blacklist: for internal registrations not used directly by themes. @@ -1649,6 +1831,12 @@ function remove_theme_support( $feature ) { * * @access private * @since 3.1.0 + * + * @global array $_wp_theme_features + * @global Custom_Image_Header $custom_image_header + * @global Custom_Background $custom_background + * + * @param string $feature */ function _remove_theme_support( $feature ) { global $_wp_theme_features; @@ -1693,8 +1881,11 @@ function _remove_theme_support( $feature ) { * Checks a theme's support for a given feature * * @since 2.9.0 + * + * @global array $_wp_theme_features + * * @param string $feature the feature being checked - * @return boolean + * @return bool */ function current_theme_supports( $feature ) { global $_wp_theme_features; @@ -1720,7 +1911,6 @@ function current_theme_supports( $feature ) { return true; $content_type = $args[0]; return in_array( $content_type, $_wp_theme_features[$feature][0] ); - break; case 'html5': case 'post-formats': @@ -1731,24 +1921,20 @@ function current_theme_supports( $feature ) { $type = $args[0]; return in_array( $type, $_wp_theme_features[$feature][0] ); - break; + case 'custom-logo': case 'custom-header': - case 'custom-background' : - // specific custom header and background capabilities can be registered by passing - // an array to add_theme_support() - $header_support = $args[0]; - return ( isset( $_wp_theme_features[$feature][0][$header_support] ) && $_wp_theme_features[$feature][0][$header_support] ); - break; + case 'custom-background': + // Specific capabilities can be registered by passing an array to add_theme_support(). + return ( isset( $_wp_theme_features[ $feature ][0][ $args[0] ] ) && $_wp_theme_features[ $feature ][0][ $args[0] ] ); } /** * Filter whether the current theme supports a specific feature. * - * The dynamic portion of the hook name, $feature, refers to - * the specific theme feature. Possible values include 'post-formats', - * 'post-thumbnails', 'custom-background', 'custom-header', 'menus', - * 'automatic-feed-links', and 'html5'. + * The dynamic portion of the hook name, `$feature`, refers to the specific theme + * feature. Possible values include 'post-formats', 'post-thumbnails', 'custom-background', + * 'custom-header', 'menus', 'automatic-feed-links', 'html5', and `customize-selective-refresh-widgets`. * * @since 3.4.0 * @@ -1780,26 +1966,36 @@ function require_if_theme_supports( $feature, $include ) { * Checks an attachment being deleted to see if it's a header or background image. * * If true it removes the theme modification which would be pointing at the deleted - * attachment + * attachment. * * @access private * @since 3.0.0 - * @param int $id the attachment id + * @since 4.3.0 Also removes `header_image_data`. + * @since 4.5.0 Also removes custom logo theme mods. + * + * @param int $id The attachment id. */ function _delete_attachment_theme_mod( $id ) { $attachment_image = wp_get_attachment_url( $id ); - $header_image = get_header_image(); + $header_image = get_header_image(); $background_image = get_background_image(); + $custom_logo_id = get_theme_mod( 'custom_logo' ); - if ( $header_image && $header_image == $attachment_image ) + if ( $custom_logo_id && $custom_logo_id == $id ) { + remove_theme_mod( 'custom_logo' ); + remove_theme_mod( 'header_text' ); + } + + if ( $header_image && $header_image == $attachment_image ) { remove_theme_mod( 'header_image' ); + remove_theme_mod( 'header_image_data' ); + } - if ( $background_image && $background_image == $attachment_image ) + if ( $background_image && $background_image == $attachment_image ) { remove_theme_mod( 'background_image' ); + } } -add_action( 'delete_attachment', '_delete_attachment_theme_mod' ); - /** * Checks if a theme has been changed and runs 'after_switch_theme' hook on the next WP load * @@ -1834,6 +2030,7 @@ function check_theme_switched() { /** This action is documented in wp-includes/theme.php */ do_action( 'after_switch_theme', $stylesheet ); } + flush_rewrite_rules(); update_option( 'theme_switched', false ); } @@ -1842,21 +2039,26 @@ function check_theme_switched() { /** * Includes and instantiates the WP_Customize_Manager class. * - * Fires when ?wp_customize=on or on wp-admin/customize.php. + * Loads the Customizer at plugins_loaded when accessing the customize.php admin + * page or when any request includes a wp_customize=on param, either as a GET + * query var or as POST data. This param is a signal for whether to bootstrap + * the Customizer when WordPress is loading, especially in the Customizer preview + * or when making Customizer Ajax requests for widgets or menus. * * @since 3.4.0 + * + * @global WP_Customize_Manager $wp_customize */ function _wp_customize_include() { if ( ! ( ( isset( $_REQUEST['wp_customize'] ) && 'on' == $_REQUEST['wp_customize'] ) || ( is_admin() && 'customize.php' == basename( $_SERVER['PHP_SELF'] ) ) - ) ) + ) ) { return; + } - require( ABSPATH . WPINC . '/class-wp-customize-manager.php' ); - // Init Customize class - $GLOBALS['wp_customize'] = new WP_Customize_Manager; + require_once ABSPATH . WPINC . '/class-wp-customize-manager.php'; + $GLOBALS['wp_customize'] = new WP_Customize_Manager(); } -add_action( 'plugins_loaded', '_wp_customize_include' ); /** * Adds settings for the customize-loader script. @@ -1864,8 +2066,6 @@ add_action( 'plugins_loaded', '_wp_customize_include' ); * @since 3.4.0 */ function _wp_customize_loader_settings() { - global $wp_scripts; - $admin_origin = parse_url( admin_url() ); $home_origin = parse_url( home_url() ); $cross_domain = ( strtolower( $admin_origin[ 'host' ] ) != strtolower( $home_origin[ 'host' ] ) ); @@ -1879,25 +2079,30 @@ function _wp_customize_loader_settings() { 'url' => esc_url( admin_url( 'customize.php' ) ), 'isCrossDomain' => $cross_domain, 'browser' => $browser, + 'l10n' => array( + 'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ), + 'mainIframeTitle' => __( 'Customizer' ), + ), ); - $script = 'var _wpCustomizeLoaderSettings = ' . json_encode( $settings ) . ';'; + $script = 'var _wpCustomizeLoaderSettings = ' . wp_json_encode( $settings ) . ';'; + $wp_scripts = wp_scripts(); $data = $wp_scripts->get_data( 'customize-loader', 'data' ); if ( $data ) $script = "$data\n$script"; $wp_scripts->add_data( 'customize-loader', 'data', $script ); } -add_action( 'admin_enqueue_scripts', '_wp_customize_loader_settings' ); /** - * Returns a URL to load the theme customizer. + * Returns a URL to load the Customizer. * * @since 3.4.0 * * @param string $stylesheet Optional. Theme to customize. Defaults to current theme. - * The theme's stylesheet will be urlencoded if necessary. + * The theme's stylesheet will be urlencoded if necessary. + * @return string */ function wp_customize_url( $stylesheet = null ) { $url = admin_url( 'customize.php' ); @@ -1907,7 +2112,7 @@ function wp_customize_url( $stylesheet = null ) { } /** - * Prints a script to check whether or not the customizer is supported, + * Prints a script to check whether or not the Customizer is supported, * and apply either the no-customize-support or customize-support class * to the body. * @@ -1943,3 +2148,18 @@ function wp_customize_support_script() { </script> <?php } + +/** + * Whether the site is being previewed in the Customizer. + * + * @since 4.0.0 + * + * @global WP_Customize_Manager $wp_customize Customizer instance. + * + * @return bool True if the site is being previewed in the Customizer, false otherwise. + */ +function is_customize_preview() { + global $wp_customize; + + return ( $wp_customize instanceof WP_Customize_Manager ) && $wp_customize->is_preview(); +} diff --git a/wp-includes/update.php b/wp-includes/update.php index 3639907..3fe0d93 100644 --- a/wp-includes/update.php +++ b/wp-includes/update.php @@ -14,18 +14,21 @@ * isn't installing. * * @since 2.3.0 - * @uses $wp_version Used to check against the newest WordPress version. + * @global string $wp_version Used to check against the newest WordPress version. + * @global wpdb $wpdb + * @global string $wp_local_package * * @param array $extra_stats Extra statistics to report to the WordPress.org API. - * @param bool $force_check Whether to bypass the transient cache and force a fresh update check. Defaults to false, true if $extra_stats is set. - * @return mixed Returns null if update is unsupported. Returns false if check is too soon. + * @param bool $force_check Whether to bypass the transient cache and force a fresh update check. Defaults to false, true if $extra_stats is set. */ function wp_version_check( $extra_stats = array(), $force_check = false ) { - if ( defined('WP_INSTALLING') ) + if ( wp_installing() ) { return; + } global $wpdb, $wp_local_package; - include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version + // include an unmodified $wp_version + include( ABSPATH . WPINC . '/version.php' ); $php_version = phpversion(); $current = get_site_transient( 'update_core' ); @@ -47,10 +50,10 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) { // Wait 60 seconds between multiple version check requests $timeout = 60; $time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked ); - if ( ! $force_check && $time_not_changed ) - return false; + if ( ! $force_check && $time_not_changed ) { + return; + } - $locale = get_locale(); /** * Filter the locale requested for WordPress core translations. * @@ -58,7 +61,7 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) { * * @param string $locale Current locale. */ - $locale = apply_filters( 'core_version_check_locale', $locale ); + $locale = apply_filters( 'core_version_check_locale', get_locale() ); // Update last_checked for current to prevent multiple blocking requests if request hangs $current->last_checked = time(); @@ -83,18 +86,19 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) { } $query = array( - 'version' => $wp_version, - 'php' => $php_version, - 'locale' => $locale, - 'mysql' => $mysql_version, - 'local_package' => isset( $wp_local_package ) ? $wp_local_package : '', - 'blogs' => $num_blogs, - 'users' => $user_count, - 'multisite_enabled' => $multisite_enabled, + 'version' => $wp_version, + 'php' => $php_version, + 'locale' => $locale, + 'mysql' => $mysql_version, + 'local_package' => isset( $wp_local_package ) ? $wp_local_package : '', + 'blogs' => $num_blogs, + 'users' => $user_count, + 'multisite_enabled' => $multisite_enabled, + 'initial_db_version' => get_site_option( 'initial_db_version' ), ); $post_body = array( - 'translations' => json_encode( $translations ), + 'translations' => wp_json_encode( $translations ), ); if ( is_array( $extra_stats ) ) @@ -120,14 +124,16 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) { $response = wp_remote_post( $http_url, $options ); } - if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) - return false; + if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) { + return; + } $body = trim( wp_remote_retrieve_body( $response ) ); $body = json_decode( $body, true ); - if ( ! is_array( $body ) || ! isset( $body['offers'] ) ) - return false; + if ( ! is_array( $body ) || ! isset( $body['offers'] ) ) { + return; + } $offers = $body['offers']; @@ -142,7 +148,7 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) { $offer[ $offer_key ] = esc_html( $value ); } $offer = (object) array_intersect_key( $offer, array_fill_keys( array( 'response', 'download', 'locale', - 'packages', 'current', 'version', 'php_version', 'mysql_version', 'new_bundled', 'partial_version', 'notify_email', 'support_email' ), '' ) ); + 'packages', 'current', 'version', 'php_version', 'mysql_version', 'new_bundled', 'partial_version', 'notify_email', 'support_email', 'new_files' ), '' ) ); } $updates = new stdClass(); @@ -163,7 +169,7 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) { } } - // Trigger a background updates check if running non-interactively, and we weren't called from the update handler. + // Trigger background updates if running non-interactively, and we weren't called from the update handler. if ( defined( 'DOING_CRON' ) && DOING_CRON && ! doing_action( 'wp_maybe_auto_update' ) ) { do_action( 'wp_maybe_auto_update' ); } @@ -177,16 +183,17 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) { * api.wordpress.org. Will only check if WordPress isn't installing. * * @since 2.3.0 - * @uses $wp_version Used to notify the WordPress version. + * @global string $wp_version Used to notify the WordPress version. * * @param array $extra_stats Extra statistics to report to the WordPress.org API. - * @return mixed Returns null if update is unsupported. Returns false if check is too soon. */ function wp_update_plugins( $extra_stats = array() ) { - include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version + if ( wp_installing() ) { + return; + } - if ( defined('WP_INSTALLING') ) - return false; + // include an unmodified $wp_version + include( ABSPATH . WPINC . '/version.php' ); // If running blog-side, bail unless we've not checked in the last 12 hours if ( !function_exists( 'get_plugins' ) ) @@ -244,8 +251,9 @@ function wp_update_plugins( $extra_stats = array() ) { } // Bail if we've checked recently and if nothing has changed - if ( ! $plugin_changed ) - return false; + if ( ! $plugin_changed ) { + return; + } } // Update last_checked for current to prevent multiple blocking requests if request hangs @@ -254,28 +262,39 @@ function wp_update_plugins( $extra_stats = array() ) { $to_send = compact( 'plugins', 'active' ); - $locales = array( get_locale() ); + $locales = array_values( get_available_languages() ); + /** * Filter the locales requested for plugin translations. * * @since 3.7.0 + * @since 4.5.0 The default value of the `$locales` parameter changed to include all locales. * - * @param array $locales Plugin locale. Default is current locale of the site. + * @param array $locales Plugin locales. Default is all available locales of the site. */ $locales = apply_filters( 'plugins_update_check_locales', $locales ); + $locales = array_unique( $locales ); + + if ( defined( 'DOING_CRON' ) && DOING_CRON ) { + $timeout = 30; + } else { + // Three seconds, plus one extra second for every 10 plugins + $timeout = 3 + (int) ( count( $plugins ) / 10 ); + } $options = array( - 'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3), + 'timeout' => $timeout, 'body' => array( - 'plugins' => json_encode( $to_send ), - 'translations' => json_encode( $translations ), - 'locale' => json_encode( $locales ), + 'plugins' => wp_json_encode( $to_send ), + 'translations' => wp_json_encode( $translations ), + 'locale' => wp_json_encode( $locales ), + 'all' => wp_json_encode( true ), ), 'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' ) ); if ( $extra_stats ) { - $options['body']['update_stats'] = json_encode( $extra_stats ); + $options['body']['update_stats'] = wp_json_encode( $extra_stats ); } $url = $http_url = 'http://api.wordpress.org/plugins/update-check/1.1/'; @@ -288,21 +307,35 @@ function wp_update_plugins( $extra_stats = array() ) { $raw_response = wp_remote_post( $http_url, $options ); } - if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) ) - return false; + if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) ) { + return; + } $response = json_decode( wp_remote_retrieve_body( $raw_response ), true ); foreach ( $response['plugins'] as &$plugin ) { $plugin = (object) $plugin; + if ( isset( $plugin->compatibility ) ) { + $plugin->compatibility = (object) $plugin->compatibility; + foreach ( $plugin->compatibility as &$data ) { + $data = (object) $data; + } + } + } + unset( $plugin, $data ); + foreach ( $response['no_update'] as &$plugin ) { + $plugin = (object) $plugin; } unset( $plugin ); if ( is_array( $response ) ) { $new_option->response = $response['plugins']; $new_option->translations = $response['translations']; + // TODO: Perhaps better to store no_update in a separate transient with an expiry? + $new_option->no_update = $response['no_update']; } else { $new_option->response = array(); $new_option->translations = array(); + $new_option->no_update = array(); } set_site_transient( 'update_plugins', $new_option ); @@ -316,16 +349,16 @@ function wp_update_plugins( $extra_stats = array() ) { * installing. * * @since 2.7.0 - * @uses $wp_version Used to notify the WordPress version. * * @param array $extra_stats Extra statistics to report to the WordPress.org API. - * @return mixed Returns null if update is unsupported. Returns false if check is too soon. */ function wp_update_themes( $extra_stats = array() ) { - include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version + if ( wp_installing() ) { + return; + } - if ( defined( 'WP_INSTALLING' ) ) - return false; + // include an unmodified $wp_version + include( ABSPATH . WPINC . '/version.php' ); $installed_themes = wp_get_themes(); $translations = wp_get_installed_translations( 'themes' ); @@ -392,8 +425,9 @@ function wp_update_themes( $extra_stats = array() ) { } // Bail if we've checked recently and if nothing has changed - if ( ! $theme_changed ) - return false; + if ( ! $theme_changed ) { + return; + } } // Update last_checked for current to prevent multiple blocking requests if request hangs @@ -402,28 +436,38 @@ function wp_update_themes( $extra_stats = array() ) { $request['themes'] = $themes; - $locales = array( get_locale() ); + $locales = array_values( get_available_languages() ); + /** * Filter the locales requested for theme translations. * * @since 3.7.0 + * @since 4.5.0 The default value of the `$locales` parameter changed to include all locales. * - * @param array $locales Theme locale. Default is current locale of the site. + * @param array $locales Theme locales. Default is all available locales of the site. */ $locales = apply_filters( 'themes_update_check_locales', $locales ); + $locales = array_unique( $locales ); + + if ( defined( 'DOING_CRON' ) && DOING_CRON ) { + $timeout = 30; + } else { + // Three seconds, plus one extra second for every 10 themes + $timeout = 3 + (int) ( count( $themes ) / 10 ); + } $options = array( - 'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3), + 'timeout' => $timeout, 'body' => array( - 'themes' => json_encode( $request ), - 'translations' => json_encode( $translations ), - 'locale' => json_encode( $locales ), + 'themes' => wp_json_encode( $request ), + 'translations' => wp_json_encode( $translations ), + 'locale' => wp_json_encode( $locales ), ), 'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' ) ); if ( $extra_stats ) { - $options['body']['update_stats'] = json_encode( $extra_stats ); + $options['body']['update_stats'] = wp_json_encode( $extra_stats ); } $url = $http_url = 'http://api.wordpress.org/themes/update-check/1.1/'; @@ -436,8 +480,9 @@ function wp_update_themes( $extra_stats = array() ) { $raw_response = wp_remote_post( $http_url, $options ); } - if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) ) - return false; + if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) ) { + return; + } $new_update = new stdClass; $new_update->last_checked = time(); @@ -459,8 +504,8 @@ function wp_update_themes( $extra_stats = array() ) { * @since 3.7.0 */ function wp_maybe_auto_update() { - include_once ABSPATH . '/wp-admin/includes/admin.php'; - include_once ABSPATH . '/wp-admin/includes/class-wp-upgrader.php'; + include_once( ABSPATH . '/wp-admin/includes/admin.php' ); + include_once( ABSPATH . '/wp-admin/includes/class-wp-upgrader.php' ); $upgrader = new WP_Automatic_Updater; $upgrader->run(); @@ -470,12 +515,13 @@ function wp_maybe_auto_update() { * Retrieves a list of all language updates available. * * @since 3.7.0 + * + * @return array */ function wp_get_translation_updates() { $updates = array(); $transients = array( 'update_core' => 'core', 'update_plugins' => 'plugin', 'update_themes' => 'theme' ); foreach ( $transients as $transient => $type ) { - $transient = get_site_transient( $transient ); if ( empty( $transient->translations ) ) continue; @@ -484,7 +530,6 @@ function wp_get_translation_updates() { $updates[] = (object) $translation; } } - return $updates; } @@ -549,17 +594,24 @@ function wp_get_update_data() { return apply_filters( 'wp_get_update_data', $update_data, $titles ); } +/** + * Determines whether core should be updated. + * + * @since 2.8.0 + * + * @global string $wp_version + */ function _maybe_update_core() { - include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version + // include an unmodified $wp_version + include( ABSPATH . WPINC . '/version.php' ); $current = get_site_transient( 'update_core' ); - if ( isset( $current->last_checked ) && + if ( isset( $current->last_checked, $current->version_checked ) && 12 * HOUR_IN_SECONDS > ( time() - $current->last_checked ) && - isset( $current->version_checked ) && - $current->version_checked == $wp_version ) + $current->version_checked == $wp_version ) { return; - + } wp_version_check(); } /** @@ -592,7 +644,6 @@ function _maybe_update_themes() { $current = get_site_transient( 'update_themes' ); if ( isset( $current->last_checked ) && 12 * HOUR_IN_SECONDS > ( time() - $current->last_checked ) ) return; - wp_update_themes(); } @@ -602,32 +653,34 @@ function _maybe_update_themes() { * @since 3.1.0 */ function wp_schedule_update_checks() { - if ( !wp_next_scheduled('wp_version_check') && !defined('WP_INSTALLING') ) + if ( ! wp_next_scheduled( 'wp_version_check' ) && ! wp_installing() ) wp_schedule_event(time(), 'twicedaily', 'wp_version_check'); - if ( !wp_next_scheduled('wp_update_plugins') && !defined('WP_INSTALLING') ) + if ( ! wp_next_scheduled( 'wp_update_plugins' ) && ! wp_installing() ) wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins'); - if ( !wp_next_scheduled('wp_update_themes') && !defined('WP_INSTALLING') ) + if ( ! wp_next_scheduled( 'wp_update_themes' ) && ! wp_installing() ) wp_schedule_event(time(), 'twicedaily', 'wp_update_themes'); +} - if ( ! wp_next_scheduled( 'wp_maybe_auto_update' ) && ! defined( 'WP_INSTALLING' ) ) { - // Schedule auto updates for 7 a.m. and 7 p.m. in the timezone of the site. - $next = strtotime( 'today 7am' ); - $now = time(); - // Find the next instance of 7 a.m. or 7 p.m., but skip it if it is within 3 hours from now. - while ( ( $now + 3 * HOUR_IN_SECONDS ) > $next ) { - $next += 12 * HOUR_IN_SECONDS; - } - $next = $next - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS; - // Add a random number of minutes, so we don't have all sites trying to update exactly on the hour - $next = $next + rand( 0, 59 ) * MINUTE_IN_SECONDS; - wp_schedule_event( $next, 'twicedaily', 'wp_maybe_auto_update' ); +/** + * Clear existing update caches for plugins, themes, and core. + * + * @since 4.1.0 + */ +function wp_clean_update_cache() { + if ( function_exists( 'wp_clean_plugins_cache' ) ) { + wp_clean_plugins_cache(); + } else { + delete_site_transient( 'update_plugins' ); } + wp_clean_themes_cache(); + delete_site_transient( 'update_core' ); } -if ( ( ! is_main_site() && ! is_network_admin() ) || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) +if ( ( ! is_main_site() && ! is_network_admin() ) || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) { return; +} add_action( 'admin_init', '_maybe_update_core' ); add_action( 'wp_version_check', 'wp_version_check' ); @@ -647,6 +700,8 @@ add_action( 'admin_init', '_maybe_update_themes' ); add_action( 'wp_update_themes', 'wp_update_themes' ); add_action( 'upgrader_process_complete', 'wp_update_themes', 10, 0 ); +add_action( 'update_option_WPLANG', 'wp_clean_update_cache' , 10, 0 ); + add_action( 'wp_maybe_auto_update', 'wp_maybe_auto_update' ); -add_action('init', 'wp_schedule_update_checks'); +add_action( 'init', 'wp_schedule_update_checks' ); diff --git a/wp-includes/user.php b/wp-includes/user.php index 5a9dc46..69cc86c 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -1,13 +1,13 @@ <?php /** - * WordPress User API + * Core User API * * @package WordPress * @subpackage Users */ /** - * Authenticate user with remember capability. + * Authenticates and logs a user in with 'remember' capability. * * The credentials is an array that has 'user_login', 'user_password', and * 'remember' indices. If the credentials is not given, then the log in form @@ -19,8 +19,10 @@ * * @since 2.5.0 * - * @param array $credentials Optional. User info in order to sign on. - * @param bool $secure_cookie Optional. Whether to use secure cookie. + * @global string $auth_secure_cookie + * + * @param array $credentials Optional. User info in order to sign on. + * @param string|bool $secure_cookie Optional. Whether to use secure cookie. * @return WP_User|WP_Error WP_User on success, WP_Error on failure. */ function wp_signon( $credentials = array(), $secure_cookie = '' ) { @@ -102,7 +104,7 @@ function wp_signon( $credentials = array(), $secure_cookie = '' ) { } /** - * Authenticate the user using the username and password. + * Authenticate a user, confirming the username and password are valid. * * @since 2.8.0 * @@ -112,7 +114,7 @@ function wp_signon( $credentials = array(), $secure_cookie = '' ) { * @return WP_User|WP_Error WP_User on success, WP_Error on failure. */ function wp_authenticate_username_password($user, $username, $password) { - if ( is_a( $user, 'WP_User' ) ) { + if ( $user instanceof WP_User ) { return $user; } @@ -133,8 +135,14 @@ function wp_authenticate_username_password($user, $username, $password) { $user = get_user_by('login', $username); - if ( !$user ) - return new WP_Error( 'invalid_username', sprintf( __( '<strong>ERROR</strong>: Invalid username. <a href="%s" title="Password Lost and Found">Lost your password</a>?' ), wp_lostpassword_url() ) ); + if ( !$user ) { + return new WP_Error( 'invalid_username', + __( '<strong>ERROR</strong>: Invalid username.' ) . + ' <a href="' . wp_lostpassword_url() . '">' . + __( 'Lost your password?' ) . + '</a>' + ); + } /** * Filter whether the given user can be authenticated with the provided $password. @@ -149,9 +157,90 @@ function wp_authenticate_username_password($user, $username, $password) { if ( is_wp_error($user) ) return $user; - if ( !wp_check_password($password, $user->user_pass, $user->ID) ) - return new WP_Error( 'incorrect_password', sprintf( __( '<strong>ERROR</strong>: The password you entered for the username <strong>%1$s</strong> is incorrect. <a href="%2$s" title="Password Lost and Found">Lost your password</a>?' ), - $username, wp_lostpassword_url() ) ); + if ( ! wp_check_password( $password, $user->user_pass, $user->ID ) ) { + return new WP_Error( 'incorrect_password', + sprintf( + /* translators: %s: user name */ + __( '<strong>ERROR</strong>: The password you entered for the username %s is incorrect.' ), + '<strong>' . $username . '</strong>' + ) . + ' <a href="' . wp_lostpassword_url() . '">' . + __( 'Lost your password?' ) . + '</a>' + ); + } + + return $user; +} + +/** + * Authenticates a user using the email and password. + * + * @since 4.5.0 + * + * @param WP_User|WP_Error|null $user WP_User or WP_Error object if a previous + * callback failed authentication. + * @param string $email Email address for authentication. + * @param string $password Password for authentication. + * @return WP_User|WP_Error WP_User on success, WP_Error on failure. + */ +function wp_authenticate_email_password( $user, $email, $password ) { + if ( $user instanceof WP_User ) { + return $user; + } + + if ( empty( $email ) || empty( $password ) ) { + if ( is_wp_error( $user ) ) { + return $user; + } + + $error = new WP_Error(); + + if ( empty( $email ) ) { + $error->add( 'empty_username', __( '<strong>ERROR</strong>: The email field is empty.' ) ); // Uses 'empty_username' for back-compat with wp_signon() + } + + if ( empty( $password ) ) { + $error->add( 'empty_password', __( '<strong>ERROR</strong>: The password field is empty.' ) ); + } + + return $error; + } + + if ( ! is_email( $email ) ) { + return $user; + } + + $user = get_user_by( 'email', $email ); + + if ( ! $user ) { + return new WP_Error( 'invalid_email', + __( '<strong>ERROR</strong>: Invalid email address.' ) . + ' <a href="' . wp_lostpassword_url() . '">' . + __( 'Lost your password?' ) . + '</a>' + ); + } + + /** This filter is documented in wp-includes/user.php */ + $user = apply_filters( 'wp_authenticate_user', $user, $password ); + + if ( is_wp_error( $user ) ) { + return $user; + } + + if ( ! wp_check_password( $password, $user->user_pass, $user->ID ) ) { + return new WP_Error( 'incorrect_password', + sprintf( + /* translators: %s: email address */ + __( '<strong>ERROR</strong>: The password you entered for the email address %s is incorrect.' ), + '<strong>' . $email . '</strong>' + ) . + ' <a href="' . wp_lostpassword_url() . '">' . + __( 'Lost your password?' ) . + '</a>' + ); + } return $user; } @@ -161,13 +250,15 @@ function wp_authenticate_username_password($user, $username, $password) { * * @since 2.8.0 * + * @global string $auth_secure_cookie + * * @param WP_User|WP_Error|null $user WP_User or WP_Error object from a previous callback. Default null. * @param string $username Username. If not empty, cancels the cookie authentication. * @param string $password Password. If not empty, cancels the cookie authentication. * @return WP_User|WP_Error WP_User on success, WP_Error on failure. */ function wp_authenticate_cookie($user, $username, $password) { - if ( is_a( $user, 'WP_User' ) ) { + if ( $user instanceof WP_User ) { return $user; } @@ -202,7 +293,7 @@ function wp_authenticate_cookie($user, $username, $password) { * @return WP_User|WP_Error WP_User on success, WP_Error if the user is considered a spammer. */ function wp_authenticate_spam_check( $user ) { - if ( $user && is_a( $user, 'WP_User' ) && is_multisite() ) { + if ( $user instanceof WP_User && is_multisite() ) { /** * Filter whether the user has been marked as a spammer. * @@ -229,10 +320,10 @@ function wp_authenticate_spam_check( $user ) { * * @since 3.9.0 * - * @param int|bool $user The user ID (or false) as received from the + * @param int|bool $user_id The user ID (or false) as received from the * determine_current_user filter. - * @return int|bool User ID if validated, false otherwise. If a user ID from - * an earlier filter callback is received, that value is returned. + * @return int|false User ID if validated, false otherwise. If a user ID from + * an earlier filter callback is received, that value is returned. */ function wp_validate_logged_in_cookie( $user_id ) { if ( $user_id ) { @@ -250,16 +341,21 @@ function wp_validate_logged_in_cookie( $user_id ) { * Number of posts user has written. * * @since 3.0.0 + * @since 4.1.0 Added `$post_type` argument. + * @since 4.3.0 Added `$public_only` argument. Added the ability to pass an array + * of post types to `$post_type`. * - * @global wpdb $wpdb WordPress database object for queries. + * @global wpdb $wpdb WordPress database abstraction object. * - * @param int $userid User ID. - * @return int Amount of posts user has written. + * @param int $userid User ID. + * @param array|string $post_type Optional. Single post type or array of post types to count the number of posts for. Default 'post'. + * @param bool $public_only Optional. Whether to only return counts for public posts. Default false. + * @return string Number of posts the user has written in this post type. */ -function count_user_posts($userid) { +function count_user_posts( $userid, $post_type = 'post', $public_only = false ) { global $wpdb; - $where = get_posts_by_author_sql('post', true, $userid); + $where = get_posts_by_author_sql( $post_type, true, $userid, $public_only ); $count = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->posts $where" ); @@ -267,11 +363,15 @@ function count_user_posts($userid) { * Filter the number of posts a user has written. * * @since 2.7.0 + * @since 4.1.0 Added `$post_type` argument. + * @since 4.3.1 Added `$public_only` argument. * - * @param int $count The user's post count. - * @param int $userid User ID. + * @param int $count The user's post count. + * @param int $userid User ID. + * @param string|array $post_type Single post type or array of post types to count the number of posts for. + * @param bool $public_only Whether to limit counted posts to public posts. */ - return apply_filters( 'get_usernumposts', $count, $userid ); + return apply_filters( 'get_usernumposts', $count, $userid, $post_type, $public_only ); } /** @@ -279,9 +379,11 @@ function count_user_posts($userid) { * * @since 3.0.0 * - * @param array $users Array of user IDs. - * @param string $post_type Optional. Post type to check. Defaults to post. - * @param bool $public_only Optional. Only return counts for public posts. Defaults to false. + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param array $users Array of user IDs. + * @param string|array $post_type Optional. Single post type or array of post types to check. Defaults to 'post'. + * @param bool $public_only Optional. Only return counts for public posts. Defaults to false. * @return array Amount of posts each user has written. */ function count_many_users_posts( $users, $post_type = 'post', $public_only = false ) { @@ -316,8 +418,6 @@ function count_many_users_posts( $users, $post_type = 'post', $public_only = fal * * @since MU * - * @uses wp_get_current_user - * * @return int The current user's ID */ function get_current_user_id() { @@ -339,11 +439,11 @@ function get_current_user_id() { * * @since 2.0.0 * - * @global wpdb $wpdb WordPress database object for queries. + * @global wpdb $wpdb WordPress database abstraction object. * * @param string $option User option name. * @param int $user Optional. User ID. - * @param bool $deprecated Use get_option() to check for an option in the options table. + * @param string $deprecated Use get_option() to check for an option in the options table. * @return mixed User option value on success, false on failure. */ function get_user_option( $option, $user = 0, $deprecated = '' ) { @@ -369,7 +469,7 @@ function get_user_option( $option, $user = 0, $deprecated = '' ) { /** * Filter a specific user option value. * - * The dynamic portion of the hook name, $option, refers to the user option name. + * The dynamic portion of the hook name, `$option`, refers to the user option name. * * @since 2.5.0 * @@ -391,7 +491,7 @@ function get_user_option( $option, $user = 0, $deprecated = '' ) { * * @since 2.0.0 * - * @global wpdb $wpdb WordPress database object for queries. + * @global wpdb $wpdb WordPress database abstraction object. * * @param int $user_id User ID. * @param string $option_name User option name. @@ -419,7 +519,7 @@ function update_user_option( $user_id, $option_name, $newvalue, $global = false * * @since 3.0.0 * - * @global wpdb $wpdb WordPress database object for queries. + * @global wpdb $wpdb WordPress database abstraction object. * * @param int $user_id User ID * @param string $option_name User option name. @@ -435,416 +535,15 @@ function delete_user_option( $user_id, $option_name, $global = false ) { return delete_user_meta( $user_id, $option_name ); } -/** - * WordPress User Query class. - * - * @since 3.1.0 - */ -class WP_User_Query { - - /** - * Query vars, after parsing - * - * @since 3.5.0 - * @access public - * @var array - */ - var $query_vars = array(); - - /** - * List of found user ids - * - * @since 3.1.0 - * @access private - * @var array - */ - var $results; - - /** - * Total number of found users for the current query - * - * @since 3.1.0 - * @access private - * @var int - */ - var $total_users = 0; - - // SQL clauses - var $query_fields; - var $query_from; - var $query_where; - var $query_orderby; - var $query_limit; - - /** - * PHP5 constructor. - * - * @since 3.1.0 - * - * @param string|array $args Optional. The query variables. - * @return WP_User_Query - */ - function __construct( $query = null ) { - if ( ! empty( $query ) ) { - $this->prepare_query( $query ); - $this->query(); - } - } - - /** - * Prepare the query variables. - * - * @since 3.1.0 - * - * @param string|array $args Optional. The query variables. - */ - function prepare_query( $query = array() ) { - global $wpdb; - - if ( empty( $this->query_vars ) || ! empty( $query ) ) { - $this->query_limit = null; - $this->query_vars = wp_parse_args( $query, array( - 'blog_id' => $GLOBALS['blog_id'], - 'role' => '', - 'meta_key' => '', - 'meta_value' => '', - 'meta_compare' => '', - 'include' => array(), - 'exclude' => array(), - 'search' => '', - 'search_columns' => array(), - 'orderby' => 'login', - 'order' => 'ASC', - 'offset' => '', - 'number' => '', - 'count_total' => true, - 'fields' => 'all', - 'who' => '' - ) ); - } - - $qv =& $this->query_vars; - - if ( is_array( $qv['fields'] ) ) { - $qv['fields'] = array_unique( $qv['fields'] ); - - $this->query_fields = array(); - foreach ( $qv['fields'] as $field ) { - $field = 'ID' === $field ? 'ID' : sanitize_key( $field ); - $this->query_fields[] = "$wpdb->users.$field"; - } - $this->query_fields = implode( ',', $this->query_fields ); - } elseif ( 'all' == $qv['fields'] ) { - $this->query_fields = "$wpdb->users.*"; - } else { - $this->query_fields = "$wpdb->users.ID"; - } - - if ( isset( $qv['count_total'] ) && $qv['count_total'] ) - $this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields; - - $this->query_from = "FROM $wpdb->users"; - $this->query_where = "WHERE 1=1"; - - // sorting - if ( isset( $qv['orderby'] ) ) { - if ( in_array( $qv['orderby'], array('nicename', 'email', 'url', 'registered') ) ) { - $orderby = 'user_' . $qv['orderby']; - } elseif ( in_array( $qv['orderby'], array('user_nicename', 'user_email', 'user_url', 'user_registered') ) ) { - $orderby = $qv['orderby']; - } elseif ( 'name' == $qv['orderby'] || 'display_name' == $qv['orderby'] ) { - $orderby = 'display_name'; - } elseif ( 'post_count' == $qv['orderby'] ) { - // todo: avoid the JOIN - $where = get_posts_by_author_sql('post'); - $this->query_from .= " LEFT OUTER JOIN ( - SELECT post_author, COUNT(*) as post_count - FROM $wpdb->posts - $where - GROUP BY post_author - ) p ON ({$wpdb->users}.ID = p.post_author) - "; - $orderby = 'post_count'; - } elseif ( 'ID' == $qv['orderby'] || 'id' == $qv['orderby'] ) { - $orderby = 'ID'; - } elseif ( 'meta_value' == $qv['orderby'] ) { - $orderby = "$wpdb->usermeta.meta_value"; - } else { - $orderby = 'user_login'; - } - } - - if ( empty( $orderby ) ) - $orderby = 'user_login'; - - $qv['order'] = isset( $qv['order'] ) ? strtoupper( $qv['order'] ) : ''; - if ( 'ASC' == $qv['order'] ) - $order = 'ASC'; - else - $order = 'DESC'; - $this->query_orderby = "ORDER BY $orderby $order"; - - // limit - if ( isset( $qv['number'] ) && $qv['number'] ) { - if ( $qv['offset'] ) - $this->query_limit = $wpdb->prepare("LIMIT %d, %d", $qv['offset'], $qv['number']); - else - $this->query_limit = $wpdb->prepare("LIMIT %d", $qv['number']); - } - - $search = ''; - if ( isset( $qv['search'] ) ) - $search = trim( $qv['search'] ); - - if ( $search ) { - $leading_wild = ( ltrim($search, '*') != $search ); - $trailing_wild = ( rtrim($search, '*') != $search ); - if ( $leading_wild && $trailing_wild ) - $wild = 'both'; - elseif ( $leading_wild ) - $wild = 'leading'; - elseif ( $trailing_wild ) - $wild = 'trailing'; - else - $wild = false; - if ( $wild ) - $search = trim($search, '*'); - - $search_columns = array(); - if ( $qv['search_columns'] ) - $search_columns = array_intersect( $qv['search_columns'], array( 'ID', 'user_login', 'user_email', 'user_url', 'user_nicename' ) ); - if ( ! $search_columns ) { - if ( false !== strpos( $search, '@') ) - $search_columns = array('user_email'); - elseif ( is_numeric($search) ) - $search_columns = array('user_login', 'ID'); - elseif ( preg_match('|^https?://|', $search) && ! ( is_multisite() && wp_is_large_network( 'users' ) ) ) - $search_columns = array('user_url'); - else - $search_columns = array('user_login', 'user_nicename'); - } - - /** - * Filter the columns to search in a WP_User_Query search. - * - * The default columns depend on the search term, and include 'user_email', - * 'user_login', 'ID', 'user_url', and 'user_nicename'. - * - * @since 3.6.0 - * - * @param array $search_columns Array of column names to be searched. - * @param string $search Text being searched. - * @param WP_User_Query $this The current WP_User_Query instance. - */ - $search_columns = apply_filters( 'user_search_columns', $search_columns, $search, $this ); - - $this->query_where .= $this->get_search_sql( $search, $search_columns, $wild ); - } - - $blog_id = 0; - if ( isset( $qv['blog_id'] ) ) - $blog_id = absint( $qv['blog_id'] ); - - if ( isset( $qv['who'] ) && 'authors' == $qv['who'] && $blog_id ) { - $qv['meta_key'] = $wpdb->get_blog_prefix( $blog_id ) . 'user_level'; - $qv['meta_value'] = 0; - $qv['meta_compare'] = '!='; - $qv['blog_id'] = $blog_id = 0; // Prevent extra meta query - } - - $role = ''; - if ( isset( $qv['role'] ) ) - $role = trim( $qv['role'] ); - - if ( $blog_id && ( $role || is_multisite() ) ) { - $cap_meta_query = array(); - $cap_meta_query['key'] = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities'; - - if ( $role ) { - $cap_meta_query['value'] = '"' . $role . '"'; - $cap_meta_query['compare'] = 'like'; - } - - if ( empty( $qv['meta_query'] ) || ! in_array( $cap_meta_query, $qv['meta_query'], true ) ) { - $qv['meta_query'][] = $cap_meta_query; - } - } - - $meta_query = new WP_Meta_Query(); - $meta_query->parse_query_vars( $qv ); - - if ( !empty( $meta_query->queries ) ) { - $clauses = $meta_query->get_sql( 'user', $wpdb->users, 'ID', $this ); - $this->query_from .= $clauses['join']; - $this->query_where .= $clauses['where']; - - if ( 'OR' == $meta_query->relation ) - $this->query_fields = 'DISTINCT ' . $this->query_fields; - } - - if ( ! empty( $qv['include'] ) ) { - $ids = implode( ',', wp_parse_id_list( $qv['include'] ) ); - $this->query_where .= " AND $wpdb->users.ID IN ($ids)"; - } elseif ( ! empty( $qv['exclude'] ) ) { - $ids = implode( ',', wp_parse_id_list( $qv['exclude'] ) ); - $this->query_where .= " AND $wpdb->users.ID NOT IN ($ids)"; - } - - /** - * Fires after the WP_User_Query has been parsed, and before - * the query is executed. - * - * The passed WP_User_Query object contains SQL parts formed - * from parsing the given query. - * - * @since 3.1.0 - * - * @param WP_User_Query $this The current WP_User_Query instance, - * passed by reference. - */ - do_action_ref_array( 'pre_user_query', array( &$this ) ); - } - - /** - * Execute the query, with the current variables. - * - * @since 3.1.0 - * - * @global wpdb $wpdb WordPress database object for queries. - */ - function query() { - global $wpdb; - - $qv =& $this->query_vars; - - $query = "SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit"; - - if ( is_array( $qv['fields'] ) || 'all' == $qv['fields'] ) { - $this->results = $wpdb->get_results( $query ); - } else { - $this->results = $wpdb->get_col( $query ); - } - - /** - * Filter SELECT FOUND_ROWS() query for the current WP_User_Query instance. - * - * @since 3.2.0 - * - * @global wpdb $wpdb WordPress database object. - * - * @param string $sql The SELECT FOUND_ROWS() query for the current WP_User_Query. - */ - if ( isset( $qv['count_total'] ) && $qv['count_total'] ) - $this->total_users = $wpdb->get_var( apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()' ) ); - - if ( !$this->results ) - return; - - if ( 'all_with_meta' == $qv['fields'] ) { - cache_users( $this->results ); - - $r = array(); - foreach ( $this->results as $userid ) - $r[ $userid ] = new WP_User( $userid, '', $qv['blog_id'] ); - - $this->results = $r; - } elseif ( 'all' == $qv['fields'] ) { - foreach ( $this->results as $key => $user ) { - $this->results[ $key ] = new WP_User( $user ); - } - } - } - - /** - * Retrieve query variable. - * - * @since 3.5.0 - * @access public - * - * @param string $query_var Query variable key. - * @return mixed - */ - function get( $query_var ) { - if ( isset( $this->query_vars[$query_var] ) ) - return $this->query_vars[$query_var]; - - return null; - } - - /** - * Set query variable. - * - * @since 3.5.0 - * @access public - * - * @param string $query_var Query variable key. - * @param mixed $value Query variable value. - */ - function set( $query_var, $value ) { - $this->query_vars[$query_var] = $value; - } - - /** - * Used internally to generate an SQL string for searching across multiple columns - * - * @access protected - * @since 3.1.0 - * - * @param string $string - * @param array $cols - * @param bool $wild Whether to allow wildcard searches. Default is false for Network Admin, true for - * single site. Single site allows leading and trailing wildcards, Network Admin only trailing. - * @return string - */ - function get_search_sql( $string, $cols, $wild = false ) { - $string = esc_sql( $string ); - - $searches = array(); - $leading_wild = ( 'leading' == $wild || 'both' == $wild ) ? '%' : ''; - $trailing_wild = ( 'trailing' == $wild || 'both' == $wild ) ? '%' : ''; - foreach ( $cols as $col ) { - if ( 'ID' == $col ) - $searches[] = "$col = '$string'"; - else - $searches[] = "$col LIKE '$leading_wild" . like_escape($string) . "$trailing_wild'"; - } - - return ' AND (' . implode(' OR ', $searches) . ')'; - } - - /** - * Return the list of users. - * - * @since 3.1.0 - * @access public - * - * @return array Array of results. - */ - function get_results() { - return $this->results; - } - - /** - * Return the total number of users for the current query. - * - * @since 3.1.0 - * @access public - * - * @return array Array of total users. - */ - function get_total() { - return $this->total_users; - } -} - /** * Retrieve list of users matching criteria. * * @since 3.1.0 * - * @uses WP_User_Query See for default arguments and information. + * @see WP_User_Query * - * @param array $args Optional. Array of arguments. + * @param array $args Optional. Arguments to retrieve users. See {@see WP_User_Query::prepare_query()} + * for more information on accepted arguments. * @return array List of users. */ function get_users( $args = array() ) { @@ -862,7 +561,7 @@ function get_users( $args = array() ) { * * @since 3.0.0 * - * @global wpdb $wpdb WordPress database object for queries. + * @global wpdb $wpdb WordPress database abstraction object. * * @param int $user_id User ID * @param bool $all Whether to retrieve all blogs, or only blogs that are not @@ -910,9 +609,10 @@ function get_blogs_of_user( $user_id, $all = false ) { 'path' => $blog->path, 'site_id' => $blog->site_id, 'siteurl' => $blog->siteurl, - 'archived' => 0, - 'spam' => 0, - 'deleted' => 0 + 'archived' => $blog->archived, + 'mature' => $blog->mature, + 'spam' => $blog->spam, + 'deleted' => $blog->deleted, ); } unset( $keys[ $wpdb->base_prefix . 'capabilities' ] ); @@ -939,9 +639,10 @@ function get_blogs_of_user( $user_id, $all = false ) { 'path' => $blog->path, 'site_id' => $blog->site_id, 'siteurl' => $blog->siteurl, - 'archived' => 0, - 'spam' => 0, - 'deleted' => 0 + 'archived' => $blog->archived, + 'mature' => $blog->mature, + 'spam' => $blog->spam, + 'deleted' => $blog->deleted, ); } } @@ -963,24 +664,64 @@ function get_blogs_of_user( $user_id, $all = false ) { * Find out whether a user is a member of a given blog. * * @since MU 1.1 - * @uses get_blogs_of_user() * * @param int $user_id Optional. The unique ID of the user. Defaults to the current user. * @param int $blog_id Optional. ID of the blog to check. Defaults to the current site. * @return bool */ function is_user_member_of_blog( $user_id = 0, $blog_id = 0 ) { + global $wpdb; + $user_id = (int) $user_id; $blog_id = (int) $blog_id; - if ( empty( $user_id ) ) + if ( empty( $user_id ) ) { $user_id = get_current_user_id(); + } + + // Technically not needed, but does save calls to get_blog_details and get_user_meta + // in the event that the function is called when a user isn't logged in + if ( empty( $user_id ) ) { + return false; + } else { + $user = get_userdata( $user_id ); + if ( ! $user instanceof WP_User ) { + return false; + } + } - if ( empty( $blog_id ) ) + if ( ! is_multisite() ) { + return true; + } + + if ( empty( $blog_id ) ) { $blog_id = get_current_blog_id(); + } + + $blog = get_blog_details( $blog_id ); + + if ( ! $blog || ! isset( $blog->domain ) || $blog->archived || $blog->spam || $blog->deleted ) { + return false; + } - $blogs = get_blogs_of_user( $user_id ); - return array_key_exists( $blog_id, $blogs ); + $keys = get_user_meta( $user_id ); + if ( empty( $keys ) ) { + return false; + } + + // no underscore before capabilities in $base_capabilities_key + $base_capabilities_key = $wpdb->base_prefix . 'capabilities'; + $site_capabilities_key = $wpdb->base_prefix . $blog_id . '_capabilities'; + + if ( isset( $keys[ $base_capabilities_key ] ) && $blog_id == 1 ) { + return true; + } + + if ( isset( $keys[ $site_capabilities_key ] ) ) { + return true; + } + + return false; } /** @@ -989,14 +730,13 @@ function is_user_member_of_blog( $user_id = 0, $blog_id = 0 ) { * Post meta data is called "Custom Fields" on the Administration Screens. * * @since 3.0.0 - * @uses add_metadata() - * @link http://codex.wordpress.org/Function_Reference/add_user_meta - * - * @param int $user_id User ID. - * @param string $meta_key Metadata name. - * @param mixed $meta_value Metadata value. - * @param bool $unique Optional, default is false. Whether the same key should not be added. - * @return int|bool Meta ID on success, false on failure. + * @link https://codex.wordpress.org/Function_Reference/add_user_meta + * + * @param int $user_id User ID. + * @param string $meta_key Metadata name. + * @param mixed $meta_value Metadata value. + * @param bool $unique Optional, default is false. Whether the same key should not be added. + * @return int|false Meta ID on success, false on failure. */ function add_user_meta($user_id, $meta_key, $meta_value, $unique = false) { return add_metadata('user', $user_id, $meta_key, $meta_value, $unique); @@ -1010,12 +750,11 @@ function add_user_meta($user_id, $meta_key, $meta_value, $unique = false) { * allows removing all metadata matching key, if needed. * * @since 3.0.0 - * @uses delete_metadata() - * @link http://codex.wordpress.org/Function_Reference/delete_user_meta + * @link https://codex.wordpress.org/Function_Reference/delete_user_meta * - * @param int $user_id user ID - * @param string $meta_key Metadata name. - * @param mixed $meta_value Optional. Metadata value. + * @param int $user_id User ID + * @param string $meta_key Metadata name. + * @param mixed $meta_value Optional. Metadata value. * @return bool True on success, false on failure. */ function delete_user_meta($user_id, $meta_key, $meta_value = '') { @@ -1026,14 +765,12 @@ function delete_user_meta($user_id, $meta_key, $meta_value = '') { * Retrieve user meta field for a user. * * @since 3.0.0 - * @uses get_metadata() - * @link http://codex.wordpress.org/Function_Reference/get_user_meta - * - * @param int $user_id User ID. - * @param string $key Optional. The meta key to retrieve. By default, returns data for all keys. - * @param bool $single Whether to return a single value. - * @return mixed Will be an array if $single is false. Will be value of meta data field if $single - * is true. + * @link https://codex.wordpress.org/Function_Reference/get_user_meta + * + * @param int $user_id User ID. + * @param string $key Optional. The meta key to retrieve. By default, returns data for all keys. + * @param bool $single Whether to return a single value. + * @return mixed Will be an array if $single is false. Will be value of meta data field if $single is true. */ function get_user_meta($user_id, $key = '', $single = false) { return get_metadata('user', $user_id, $key, $single); @@ -1048,13 +785,12 @@ function get_user_meta($user_id, $key = '', $single = false) { * If the meta field for the user does not exist, it will be added. * * @since 3.0.0 - * @uses update_metadata - * @link http://codex.wordpress.org/Function_Reference/update_user_meta + * @link https://codex.wordpress.org/Function_Reference/update_user_meta * - * @param int $user_id User ID. - * @param string $meta_key Metadata key. - * @param mixed $meta_value Metadata value. - * @param mixed $prev_value Optional. Previous value to check before removing. + * @param int $user_id User ID. + * @param string $meta_key Metadata key. + * @param mixed $meta_value Metadata value. + * @param mixed $prev_value Optional. Previous value to check before removing. * @return int|bool Meta ID if the key didn't exist, true on successful update, false on failure. */ function update_user_meta($user_id, $meta_key, $meta_value, $prev_value = '') { @@ -1070,11 +806,15 @@ function update_user_meta($user_id, $meta_key, $meta_value, $prev_value = '') { * Using $strategy = 'memory' this is memory-intensive and should handle around 10^5 users, but see WP Bug #12257. * * @since 3.0.0 + * @since 4.4.0 The number of users with no role is now included in the `none` element. + * + * @global wpdb $wpdb WordPress database abstraction object. + * * @param string $strategy 'time' or 'memory' * @return array Includes a grand total and an array of counts indexed by role strings. */ function count_users($strategy = 'time') { - global $wpdb, $wp_roles; + global $wpdb; // Initialize $id = get_current_blog_id(); @@ -1082,18 +822,14 @@ function count_users($strategy = 'time') { $result = array(); if ( 'time' == $strategy ) { - global $wp_roles; - - if ( ! isset( $wp_roles ) ) - $wp_roles = new WP_Roles(); - - $avail_roles = $wp_roles->get_names(); + $avail_roles = wp_roles()->get_names(); // Build a CPU-intensive query that will return concise information. $select_count = array(); foreach ( $avail_roles as $this_role => $name ) { - $select_count[] = "COUNT(NULLIF(`meta_value` LIKE '%\"" . like_escape( $this_role ) . "\"%', false))"; + $select_count[] = $wpdb->prepare( "COUNT(NULLIF(`meta_value` LIKE %s, false))", '%' . $wpdb->esc_like( '"' . $this_role . '"' ) . '%'); } + $select_count[] = "COUNT(NULLIF(`meta_value` = 'a:0:{}', false))"; $select_count = implode(', ', $select_count); // Add the meta_value index to the selection list, then run the query. @@ -1109,13 +845,17 @@ function count_users($strategy = 'time') { } } + $role_counts['none'] = (int) $row[$col++]; + // Get the meta_value index from the end of the result set. $total_users = (int) $row[$col]; $result['total_users'] = $total_users; $result['avail_roles'] =& $role_counts; } else { - $avail_roles = array(); + $avail_roles = array( + 'none' => 0, + ); $users_of_blog = $wpdb->get_col( "SELECT meta_value FROM $wpdb->usermeta WHERE meta_key = '{$blog_prefix}capabilities'" ); @@ -1123,6 +863,9 @@ function count_users($strategy = 'time') { $b_roles = maybe_unserialize($caps_meta); if ( ! is_array( $b_roles ) ) continue; + if ( empty( $b_roles ) ) { + $avail_roles['none']++; + } foreach ( $b_roles as $b_role => $val ) { if ( isset($avail_roles[$b_role]) ) { $avail_roles[$b_role]++; @@ -1136,6 +879,10 @@ function count_users($strategy = 'time') { $result['avail_roles'] =& $avail_roles; } + if ( is_multisite() ) { + $result['avail_roles']['none'] = 0; + } + return $result; } @@ -1149,12 +896,13 @@ function count_users($strategy = 'time') { * Used by wp_set_current_user() for back compat. Might be deprecated in the future. * * @since 2.0.4 - * @global string $userdata User description. - * @global string $user_login The user username for logging in - * @global int $user_level The level of the user - * @global int $user_ID The ID of the user - * @global string $user_email The email address of the user - * @global string $user_url The url in the user's profile + * + * @global string $user_login The user username for logging in + * @global object $userdata User data. + * @global int $user_level The level of the user + * @global int $user_ID The ID of the user + * @global string $user_email The email address of the user + * @global string $user_url The url in the user's profile * @global string $user_identity The display name of the user * * @param int $for_user_id Optional. User ID to set up global data. @@ -1192,34 +940,53 @@ function setup_userdata($for_user_id = '') { * used, either 'include' or 'exclude', but not both. * * The available arguments are as follows: - * <ol> - * <li>show_option_all - Text to show all and whether HTML option exists.</li> - * <li>show_option_none - Text for show none and whether HTML option exists.</li> - * <li>hide_if_only_one_author - Don't create the dropdown if there is only one user.</li> - * <li>orderby - SQL order by clause for what order the users appear. Default is 'display_name'.</li> - * <li>order - Default is 'ASC'. Can also be 'DESC'.</li> - * <li>include - User IDs to include.</li> - * <li>exclude - User IDs to exclude.</li> - * <li>multi - Default is 'false'. Whether to skip the ID attribute on the 'select' element. A 'true' value is overridden when id argument is set.</li> - * <li>show - Default is 'display_name'. User table column to display. If the selected item is empty then the user_login will be displayed in parentheses</li> - * <li>echo - Default is '1'. Whether to display or retrieve content.</li> - * <li>selected - Which User ID is selected.</li> - * <li>include_selected - Always include the selected user ID in the dropdown. Default is false.</li> - * <li>name - Default is 'user'. Name attribute of select element.</li> - * <li>id - Default is the value of the 'name' parameter. ID attribute of select element.</li> - * <li>class - Class attribute of select element.</li> - * <li>blog_id - ID of blog (Multisite only). Defaults to ID of current blog.</li> - * <li>who - Which users to query. Currently only 'authors' is supported. Default is all users.</li> - * </ol> * * @since 2.3.0 - * - * @global wpdb $wpdb WordPress database object for queries. - * - * @todo Hash-notate arguments array. - * - * @param string|array $args Optional. Array of user arguments. - * @return string|null Null on display. String of HTML content on retrieve. + * @since 4.5.0 Added the 'display_name_with_login' value for 'show'. + * + * @global int $blog_id + * + * @param array|string $args { + * Optional. Array or string of arguments to generate a drop-down of users. + * {@see WP_User_Query::prepare_query() for additional available arguments. + * + * @type string $show_option_all Text to show as the drop-down default (all). + * Default empty. + * @type string $show_option_none Text to show as the drop-down default when no + * users were found. Default empty. + * @type int|string $option_none_value Value to use for $show_option_non when no users + * were found. Default -1. + * @type string $hide_if_only_one_author Whether to skip generating the drop-down + * if only one user was found. Default empty. + * @type string $orderby Field to order found users by. Accepts user fields. + * Default 'display_name'. + * @type string $order Whether to order users in ascending or descending + * order. Accepts 'ASC' (ascending) or 'DESC' (descending). + * Default 'ASC'. + * @type array|string $include Array or comma-separated list of user IDs to include. + * Default empty. + * @type array|string $exclude Array or comma-separated list of user IDs to exclude. + * Default empty. + * @type bool|int $multi Whether to skip the ID attribute on the 'select' element. + * Accepts 1|true or 0|false. Default 0|false. + * @type string $show User data to display. If the selected item is empty + * then the 'user_login' will be displayed in parentheses. + * Accepts any user field, or 'display_name_with_login' to show + * the display name with user_login in parentheses. + * Default 'display_name'. + * @type int|bool $echo Whether to echo or return the drop-down. Accepts 1|true (echo) + * or 0|false (return). Default 1|true. + * @type int $selected Which user ID should be selected. Default 0. + * @type bool $include_selected Whether to always include the selected user ID in the drop- + * down. Default false. + * @type string $name Name attribute of select element. Default 'user'. + * @type string $id ID attribute of the select element. Default is the value of $name. + * @type string $class Class attribute of the select element. Default empty. + * @type int $blog_id ID of blog (Multisite only). Default is ID of the current blog. + * @type string $who Which type of users to query. Accepts only an empty string or + * 'authors'. Default empty. + * } + * @return string String of HTML content. */ function wp_dropdown_users( $args = '' ) { $defaults = array( @@ -1228,51 +995,89 @@ function wp_dropdown_users( $args = '' ) { 'include' => '', 'exclude' => '', 'multi' => 0, 'show' => 'display_name', 'echo' => 1, 'selected' => 0, 'name' => 'user', 'class' => '', 'id' => '', - 'blog_id' => $GLOBALS['blog_id'], 'who' => '', 'include_selected' => false + 'blog_id' => $GLOBALS['blog_id'], 'who' => '', 'include_selected' => false, + 'option_none_value' => -1 ); $defaults['selected'] = is_author() ? get_query_var( 'author' ) : 0; $r = wp_parse_args( $args, $defaults ); - extract( $r, EXTR_SKIP ); $query_args = wp_array_slice_assoc( $r, array( 'blog_id', 'include', 'exclude', 'orderby', 'order', 'who' ) ); - $query_args['fields'] = array( 'ID', 'user_login', $show ); + + $fields = array( 'ID', 'user_login' ); + + $show = ! empty( $r['show'] ) ? $r['show'] : 'display_name'; + if ( 'display_name_with_login' === $show ) { + $fields[] = 'display_name'; + } else { + $fields[] = $show; + } + + $query_args['fields'] = $fields; + + $show_option_all = $r['show_option_all']; + $show_option_none = $r['show_option_none']; + $option_none_value = $r['option_none_value']; + + /** + * Filter the query arguments for the user drop-down. + * + * @since 4.4.0 + * + * @param array $query_args The query arguments for wp_dropdown_users(). + * @param array $r The default arguments for wp_dropdown_users(). + */ + $query_args = apply_filters( 'wp_dropdown_users_args', $query_args, $r ); + $users = get_users( $query_args ); $output = ''; - if ( !empty($users) && ( empty($hide_if_only_one_author) || count($users) > 1 ) ) { - $name = esc_attr( $name ); - if ( $multi && ! $id ) + if ( ! empty( $users ) && ( empty( $r['hide_if_only_one_author'] ) || count( $users ) > 1 ) ) { + $name = esc_attr( $r['name'] ); + if ( $r['multi'] && ! $r['id'] ) { $id = ''; - else - $id = $id ? " id='" . esc_attr( $id ) . "'" : " id='$name'"; - - $output = "<select name='{$name}'{$id} class='$class'>\n"; + } else { + $id = $r['id'] ? " id='" . esc_attr( $r['id'] ) . "'" : " id='$name'"; + } + $output = "<select name='{$name}'{$id} class='" . $r['class'] . "'>\n"; - if ( $show_option_all ) + if ( $show_option_all ) { $output .= "\t<option value='0'>$show_option_all</option>\n"; + } if ( $show_option_none ) { - $_selected = selected( -1, $selected, false ); - $output .= "\t<option value='-1'$_selected>$show_option_none</option>\n"; + $_selected = selected( $option_none_value, $r['selected'], false ); + $output .= "\t<option value='" . esc_attr( $option_none_value ) . "'$_selected>$show_option_none</option>\n"; } - $found_selected = false; - foreach ( (array) $users as $user ) { - $user->ID = (int) $user->ID; - $_selected = selected( $user->ID, $selected, false ); - if ( $_selected ) - $found_selected = true; - $display = !empty($user->$show) ? $user->$show : '('. $user->user_login . ')'; - $output .= "\t<option value='$user->ID'$_selected>" . esc_html($display) . "</option>\n"; - } + if ( $r['include_selected'] && ( $r['selected'] > 0 ) ) { + $found_selected = false; + $r['selected'] = (int) $r['selected']; + foreach ( (array) $users as $user ) { + $user->ID = (int) $user->ID; + if ( $user->ID === $r['selected'] ) { + $found_selected = true; + } + } - if ( $include_selected && ! $found_selected && ( $selected > 0 ) ) { - $user = get_userdata( $selected ); - $_selected = selected( $user->ID, $selected, false ); - $display = !empty($user->$show) ? $user->$show : '('. $user->user_login . ')'; - $output .= "\t<option value='$user->ID'$_selected>" . esc_html($display) . "</option>\n"; + if ( ! $found_selected ) { + $users[] = get_userdata( $r['selected'] ); + } + } + + foreach ( (array) $users as $user ) { + if ( 'display_name_with_login' === $show ) { + /* translators: 1: display name, 2: user_login */ + $display = sprintf( _x( '%1$s (%2$s)', 'user dropdown' ), $user->display_name, $user->user_login ); + } elseif ( ! empty( $user->$show ) ) { + $display = $user->$show; + } else { + $display = '(' . $user->user_login . ')'; + } + + $_selected = selected( $user->ID, $r['selected'], false ); + $output .= "\t<option value='$user->ID'$_selected>" . esc_html( $display ) . "</option>\n"; } $output .= "</select>"; @@ -1285,12 +1090,12 @@ function wp_dropdown_users( $args = '' ) { * * @param string $output HTML output generated by wp_dropdown_users(). */ - $output = apply_filters( 'wp_dropdown_users', $output ); - - if ( $echo ) - echo $output; + $html = apply_filters( 'wp_dropdown_users', $output ); - return $output; + if ( $r['echo'] ) { + echo $html; + } + return $html; } /** @@ -1302,11 +1107,11 @@ function wp_dropdown_users( $args = '' ) { * * @since 2.3.0 * - * @param string $field The user Object field name. - * @param mixed $value The user Object value. - * @param int $user_id user ID. + * @param string $field The user Object field name. + * @param mixed $value The user Object value. + * @param int $user_id User ID. * @param string $context How to sanitize user fields. Looks for 'raw', 'edit', 'db', 'display', - * 'attribute' and 'js'. + * 'attribute' and 'js'. * @return mixed Sanitized value. */ function sanitize_user_field($field, $value, $user_id, $context) { @@ -1332,7 +1137,7 @@ function sanitize_user_field($field, $value, $user_id, $context) { /** * Filter a user field value in the 'edit' context. * - * The dynamic portion of the hook name, $field, refers to the prefixed user + * The dynamic portion of the hook name, `$field`, refers to the prefixed user * field being filtered, such as 'user_login', 'user_email', 'first_name', etc. * * @since 2.9.0 @@ -1347,7 +1152,7 @@ function sanitize_user_field($field, $value, $user_id, $context) { $value = esc_html( $value ); // textarea_escaped? else $value = esc_attr($value); - } else if ( 'db' == $context ) { + } elseif ( 'db' == $context ) { if ( $prefixed ) { /** This filter is documented in wp-includes/post.php */ $value = apply_filters( "pre_{$field}", $value ); @@ -1356,7 +1161,7 @@ function sanitize_user_field($field, $value, $user_id, $context) { /** * Filter the value of a user field in the 'db' context. * - * The dynamic portion of the hook name, $field, refers to the prefixed user + * The dynamic portion of the hook name, `$field`, refers to the prefixed user * field being filtered, such as 'user_login', 'user_email', 'first_name', etc. * * @since 2.9.0 @@ -1376,7 +1181,7 @@ function sanitize_user_field($field, $value, $user_id, $context) { /** * Filter the value of a user field in a standard context. * - * The dynamic portion of the hook name, $field, refers to the prefixed user + * The dynamic portion of the hook name, `$field`, refers to the prefixed user * field being filtered, such as 'user_login', 'user_email', 'first_name', etc. * * @since 2.9.0 @@ -1392,11 +1197,11 @@ function sanitize_user_field($field, $value, $user_id, $context) { if ( 'user_url' == $field ) $value = esc_url($value); - if ( 'attribute' == $context ) - $value = esc_attr($value); - else if ( 'js' == $context ) - $value = esc_js($value); - + if ( 'attribute' == $context ) { + $value = esc_attr( $value ); + } elseif ( 'js' == $context ) { + $value = esc_js( $value ); + } return $value; } @@ -1405,9 +1210,18 @@ function sanitize_user_field($field, $value, $user_id, $context) { * * @since 3.0.0 * - * @param object $user User object to be cached + * @param object|WP_User $user User object to be cached + * @return bool|null Returns false on failure. */ -function update_user_caches($user) { +function update_user_caches( $user ) { + if ( $user instanceof WP_User ) { + if ( ! $user->exists() ) { + return false; + } + + $user = $user->data; + } + wp_cache_add($user->ID, $user, 'users'); wp_cache_add($user->user_login, $user->ID, 'userlogins'); wp_cache_add($user->user_email, $user->ID, 'useremail'); @@ -1418,6 +1232,7 @@ function update_user_caches($user) { * Clean all user caches * * @since 3.0.0 + * @since 4.4.0 'clean_user_cache' action was added. * * @param WP_User|int $user User object or ID to be cleaned from the cache */ @@ -1432,6 +1247,16 @@ function clean_user_cache( $user ) { wp_cache_delete( $user->user_login, 'userlogins' ); wp_cache_delete( $user->user_email, 'useremail' ); wp_cache_delete( $user->user_nicename, 'userslugs' ); + + /** + * Fires immediately after the given user's cache is cleaned. + * + * @since 4.4.0 + * + * @param int $user_id User ID. + * @param WP_User $user User object. + */ + do_action( 'clean_user_cache', $user->ID, $user ); } /** @@ -1440,14 +1265,13 @@ function clean_user_cache( $user ) { * @since 2.0.0 * * @param string $username Username. - * @return null|int The user's ID on success, and null on failure. + * @return int|false The user's ID on success, and false on failure. */ function username_exists( $username ) { - if ( $user = get_user_by('login', $username ) ) { + if ( $user = get_user_by( 'login', $username ) ) { return $user->ID; - } else { - return null; } + return false; } /** @@ -1456,27 +1280,28 @@ function username_exists( $username ) { * @since 2.1.0 * * @param string $email Email. - * @return bool|int The user's ID on success, and false on failure. + * @return int|false The user's ID on success, and false on failure. */ function email_exists( $email ) { - if ( $user = get_user_by('email', $email) ) + if ( $user = get_user_by( 'email', $email) ) { return $user->ID; - + } return false; } /** - * Checks whether an username is valid. + * Checks whether a username is valid. * * @since 2.0.1 - * @uses apply_filters() Calls 'validate_username' hook on $valid check and $username as parameters + * @since 4.4.0 Empty sanitized usernames are now considered invalid * * @param string $username Username. * @return bool Whether username given is valid */ function validate_username( $username ) { $sanitized = sanitize_user( $username, true ); - $valid = ( $sanitized == $username ); + $valid = ( $sanitized == $username && ! empty( $sanitized ) ); + /** * Filter whether the provided username is valid or not. * @@ -1489,67 +1314,83 @@ function validate_username( $username ) { } /** - * Insert an user into the database. - * - * Most of the $userdata array fields have filters associated with the values. - * The exceptions are 'rich_editing', 'role', 'jabber', 'aim', 'yim', - * 'user_registered', and 'ID'. The filters have the prefix 'pre_user_' followed - * by the field name. An example using 'description' would have the filter - * called, 'pre_user_description' that can be hooked into. - * - * The $userdata array can contain the following fields: - * 'ID' - An integer that will be used for updating an existing user. - * 'user_pass' - A string that contains the plain text password for the user. - * 'user_login' - A string that contains the user's username for logging in. - * 'user_nicename' - A string that contains a URL-friendly name for the user. - * The default is the user's username. - * 'user_url' - A string containing the user's URL for the user's web site. - * 'user_email' - A string containing the user's email address. - * 'display_name' - A string that will be shown on the site. Defaults to user's - * username. It is likely that you will want to change this, for appearance. - * 'nickname' - The user's nickname, defaults to the user's username. - * 'first_name' - The user's first name. - * 'last_name' - The user's last name. - * 'description' - A string containing content about the user. - * 'rich_editing' - A string for whether to enable the rich editor. False - * if not empty. - * 'user_registered' - The date the user registered. Format is 'Y-m-d H:i:s'. - * 'role' - A string used to set the user's role. - * 'jabber' - User's Jabber account. - * 'aim' - User's AOL IM account. - * 'yim' - User's Yahoo IM account. + * Insert a user into the database. * - * @since 2.0.0 - * - * @global wpdb $wpdb WordPress database object for queries. + * Most of the `$userdata` array fields have filters associated with the values. Exceptions are + * 'ID', 'rich_editing', 'comment_shortcuts', 'admin_color', 'use_ssl', + * 'user_registered', and 'role'. The filters have the prefix 'pre_user_' followed by the field + * name. An example using 'description' would have the filter called, 'pre_user_description' that + * can be hooked into. * - * @todo Hash-notate arguments array. - * - * @param mixed $userdata An array of user data or a user object of type stdClass or WP_User. - * @return int|WP_Error The newly created user's ID or a WP_Error object if the user could not be created. + * @since 2.0.0 + * @since 3.6.0 The `aim`, `jabber`, and `yim` fields were removed as default user contact + * methods for new installs. See wp_get_user_contact_methods(). + * + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param array|object|WP_User $userdata { + * An array, object, or WP_User object of user data arguments. + * + * @type int $ID User ID. If supplied, the user will be updated. + * @type string $user_pass The plain-text user password. + * @type string $user_login The user's login username. + * @type string $user_nicename The URL-friendly user name. + * @type string $user_url The user URL. + * @type string $user_email The user email address. + * @type string $display_name The user's display name. + * Default is the user's username. + * @type string $nickname The user's nickname. + * Default is the user's username. + * @type string $first_name The user's first name. For new users, will be used + * to build the first part of the user's display name + * if `$display_name` is not specified. + * @type string $last_name The user's last name. For new users, will be used + * to build the second part of the user's display name + * if `$display_name` is not specified. + * @type string $description The user's biographical description. + * @type string|bool $rich_editing Whether to enable the rich-editor for the user. + * False if not empty. + * @type string|bool $comment_shortcuts Whether to enable comment moderation keyboard + * shortcuts for the user. Default false. + * @type string $admin_color Admin color scheme for the user. Default 'fresh'. + * @type bool $use_ssl Whether the user should always access the admin over + * https. Default false. + * @type string $user_registered Date the user registered. Format is 'Y-m-d H:i:s'. + * @type string|bool $show_admin_bar_front Whether to display the Admin Bar for the user on the + * site's front end. Default true. + * @type string $role User's role. + * } + * @return int|WP_Error The newly created user's ID or a WP_Error object if the user could not + * be created. */ function wp_insert_user( $userdata ) { global $wpdb; - if ( is_a( $userdata, 'stdClass' ) ) + if ( $userdata instanceof stdClass ) { $userdata = get_object_vars( $userdata ); - elseif ( is_a( $userdata, 'WP_User' ) ) + } elseif ( $userdata instanceof WP_User ) { $userdata = $userdata->to_array(); - - extract( $userdata, EXTR_SKIP ); + } // Are we updating or creating? - if ( !empty($ID) ) { - $ID = (int) $ID; + if ( ! empty( $userdata['ID'] ) ) { + $ID = (int) $userdata['ID']; $update = true; - $old_user_data = WP_User::get_data_by( 'id', $ID ); + $old_user_data = get_userdata( $ID ); + + if ( ! $old_user_data ) { + return new WP_Error( 'invalid_user_id', __( 'Invalid user ID.' ) ); + } + + // hashed in wp_update_user(), plaintext if called directly + $user_pass = ! empty( $userdata['user_pass'] ) ? $userdata['user_pass'] : $old_user_data->user_pass; } else { $update = false; // Hash the password - $user_pass = wp_hash_password($user_pass); + $user_pass = wp_hash_password( $userdata['user_pass'] ); } - $user_login = sanitize_user($user_login, true); + $sanitized_user_login = sanitize_user( $userdata['user_login'], true ); /** * Filter a username after it has been sanitized. @@ -1558,21 +1399,54 @@ function wp_insert_user( $userdata ) { * * @since 2.0.3 * - * @param string $user_login Username after it has been sanitized. + * @param string $sanitized_user_login Username after it has been sanitized. */ - $user_login = apply_filters( 'pre_user_login', $user_login ); + $pre_user_login = apply_filters( 'pre_user_login', $sanitized_user_login ); //Remove any non-printable chars from the login string to see if we have ended up with an empty username - $user_login = trim($user_login); + $user_login = trim( $pre_user_login ); - if ( empty($user_login) ) + // user_login must be between 0 and 60 characters. + if ( empty( $user_login ) ) { return new WP_Error('empty_user_login', __('Cannot create a user with an empty login name.') ); + } elseif ( mb_strlen( $user_login ) > 60 ) { + return new WP_Error( 'user_login_too_long', __( 'Username may not be longer than 60 characters.' ) ); + } - if ( !$update && username_exists( $user_login ) ) + if ( ! $update && username_exists( $user_login ) ) { return new WP_Error( 'existing_user_login', __( 'Sorry, that username already exists!' ) ); + } - if ( empty($user_nicename) ) - $user_nicename = sanitize_title( $user_login ); + /** + * Filter the list of blacklisted usernames. + * + * @since 4.4.0 + * + * @param array $usernames Array of blacklisted usernames. + */ + $illegal_logins = (array) apply_filters( 'illegal_user_logins', array() ); + + if ( in_array( strtolower( $user_login ), array_map( 'strtolower', $illegal_logins ) ) ) { + return new WP_Error( 'invalid_username', __( 'Sorry, that username is not allowed.' ) ); + } + + /* + * If a nicename is provided, remove unsafe user characters before using it. + * Otherwise build a nicename from the user_login. + */ + if ( ! empty( $userdata['user_nicename'] ) ) { + $user_nicename = sanitize_user( $userdata['user_nicename'], true ); + if ( mb_strlen( $user_nicename ) > 50 ) { + return new WP_Error( 'user_nicename_too_long', __( 'Nicename may not be longer than 50 characters.' ) ); + } + } else { + $user_nicename = mb_substr( $user_login, 0, 50 ); + } + + $user_nicename = sanitize_title( $user_nicename ); + + // Store values to save in user meta. + $meta = array(); /** * Filter a user's nicename before the user is created or updated. @@ -1583,35 +1457,40 @@ function wp_insert_user( $userdata ) { */ $user_nicename = apply_filters( 'pre_user_nicename', $user_nicename ); - if ( empty($user_url) ) - $user_url = ''; + $raw_user_url = empty( $userdata['user_url'] ) ? '' : $userdata['user_url']; /** * Filter a user's URL before the user is created or updated. * * @since 2.0.3 * - * @param string $user_url The user's URL. + * @param string $raw_user_url The user's URL. */ - $user_url = apply_filters( 'pre_user_url', $user_url ); + $user_url = apply_filters( 'pre_user_url', $raw_user_url ); - if ( empty($user_email) ) - $user_email = ''; + $raw_user_email = empty( $userdata['user_email'] ) ? '' : $userdata['user_email']; /** * Filter a user's email before the user is created or updated. * * @since 2.0.3 * - * @param string $user_email The user's email. + * @param string $raw_user_email The user's email. */ - $user_email = apply_filters( 'pre_user_email', $user_email ); + $user_email = apply_filters( 'pre_user_email', $raw_user_email ); - if ( !$update && ! defined( 'WP_IMPORTING' ) && email_exists($user_email) ) + /* + * If there is no update, just check for `email_exists`. If there is an update, + * check if current email and new email are the same, or not, and check `email_exists` + * accordingly. + */ + if ( ( ! $update || ( ! empty( $old_user_data ) && 0 !== strcasecmp( $user_email, $old_user_data->user_email ) ) ) + && ! defined( 'WP_IMPORTING' ) + && email_exists( $user_email ) + ) { return new WP_Error( 'existing_user_email', __( 'Sorry, that email address is already used!' ) ); - - if ( empty($nickname) ) - $nickname = $user_login; + } + $nickname = empty( $userdata['nickname'] ) ? $user_login : $userdata['nickname']; /** * Filter a user's nickname before the user is created or updated. @@ -1620,10 +1499,9 @@ function wp_insert_user( $userdata ) { * * @param string $nickname The user's nickname. */ - $nickname = apply_filters( 'pre_user_nickname', $nickname ); + $meta['nickname'] = apply_filters( 'pre_user_nickname', $nickname ); - if ( empty($first_name) ) - $first_name = ''; + $first_name = empty( $userdata['first_name'] ) ? '' : $userdata['first_name']; /** * Filter a user's first name before the user is created or updated. @@ -1632,10 +1510,9 @@ function wp_insert_user( $userdata ) { * * @param string $first_name The user's first name. */ - $first_name = apply_filters( 'pre_user_first_name', $first_name ); + $meta['first_name'] = apply_filters( 'pre_user_first_name', $first_name ); - if ( empty($last_name) ) - $last_name = ''; + $last_name = empty( $userdata['last_name'] ) ? '' : $userdata['last_name']; /** * Filter a user's last name before the user is created or updated. @@ -1644,20 +1521,23 @@ function wp_insert_user( $userdata ) { * * @param string $last_name The user's last name. */ - $last_name = apply_filters( 'pre_user_last_name', $last_name ); + $meta['last_name'] = apply_filters( 'pre_user_last_name', $last_name ); - if ( empty( $display_name ) ) { - if ( $update ) + if ( empty( $userdata['display_name'] ) ) { + if ( $update ) { $display_name = $user_login; - elseif ( $first_name && $last_name ) + } elseif ( $meta['first_name'] && $meta['last_name'] ) { /* translators: 1: first name, 2: last name */ - $display_name = sprintf( _x( '%1$s %2$s', 'Display name based on first name and last name' ), $first_name, $last_name ); - elseif ( $first_name ) - $display_name = $first_name; - elseif ( $last_name ) - $display_name = $last_name; - else + $display_name = sprintf( _x( '%1$s %2$s', 'Display name based on first name and last name' ), $meta['first_name'], $meta['last_name'] ); + } elseif ( $meta['first_name'] ) { + $display_name = $meta['first_name']; + } elseif ( $meta['last_name'] ) { + $display_name = $meta['last_name']; + } else { $display_name = $user_login; + } + } else { + $display_name = $userdata['display_name']; } /** @@ -1669,8 +1549,7 @@ function wp_insert_user( $userdata ) { */ $display_name = apply_filters( 'pre_user_display_name', $display_name ); - if ( empty($description) ) - $description = ''; + $description = empty( $userdata['description'] ) ? '' : $userdata['description']; /** * Filter a user's description before the user is created or updated. @@ -1679,43 +1558,42 @@ function wp_insert_user( $userdata ) { * * @param string $description The user's description. */ - $description = apply_filters( 'pre_user_description', $description ); + $meta['description'] = apply_filters( 'pre_user_description', $description ); - if ( empty($rich_editing) ) - $rich_editing = 'true'; + $meta['rich_editing'] = empty( $userdata['rich_editing'] ) ? 'true' : $userdata['rich_editing']; - if ( empty($comment_shortcuts) ) - $comment_shortcuts = 'false'; + $meta['comment_shortcuts'] = empty( $userdata['comment_shortcuts'] ) || 'false' === $userdata['comment_shortcuts'] ? 'false' : 'true'; - if ( empty($admin_color) ) - $admin_color = 'fresh'; - $admin_color = preg_replace('|[^a-z0-9 _.\-@]|i', '', $admin_color); + $admin_color = empty( $userdata['admin_color'] ) ? 'fresh' : $userdata['admin_color']; + $meta['admin_color'] = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $admin_color ); - if ( empty($use_ssl) ) - $use_ssl = 0; + $meta['use_ssl'] = empty( $userdata['use_ssl'] ) ? 0 : $userdata['use_ssl']; - if ( empty($user_registered) ) - $user_registered = gmdate('Y-m-d H:i:s'); + $user_registered = empty( $userdata['user_registered'] ) ? gmdate( 'Y-m-d H:i:s' ) : $userdata['user_registered']; - if ( empty($show_admin_bar_front) ) - $show_admin_bar_front = 'true'; + $meta['show_admin_bar_front'] = empty( $userdata['show_admin_bar_front'] ) ? 'true' : $userdata['show_admin_bar_front']; $user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $user_nicename, $user_login)); if ( $user_nicename_check ) { $suffix = 2; while ($user_nicename_check) { - $alt_user_nicename = $user_nicename . "-$suffix"; + // user_nicename allows 50 chars. Subtract one for a hyphen, plus the length of the suffix. + $base_length = 49 - mb_strlen( $suffix ); + $alt_user_nicename = mb_substr( $user_nicename, 0, $base_length ) . "-$suffix"; $user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $alt_user_nicename, $user_login)); $suffix++; } $user_nicename = $alt_user_nicename; } - $data = compact( 'user_pass', 'user_email', 'user_url', 'user_nicename', 'display_name', 'user_registered' ); - $data = wp_unslash( $data ); + $compacted = compact( 'user_pass', 'user_email', 'user_url', 'user_nicename', 'display_name', 'user_registered' ); + $data = wp_unslash( $compacted ); if ( $update ) { + if ( $user_email !== $old_user_data->user_email ) { + $data['user_activation_key'] = ''; + } $wpdb->update( $wpdb->users, $data, compact( 'ID' ) ); $user_id = (int) $ID; } else { @@ -1725,18 +1603,51 @@ function wp_insert_user( $userdata ) { $user = new WP_User( $user_id ); - foreach ( _get_additional_user_keys( $user ) as $key ) { - if ( isset( $$key ) ) - update_user_meta( $user_id, $key, $$key ); + /** + * Filter a user's meta values and keys before the user is created or updated. + * + * Does not include contact methods. These are added using `wp_get_user_contact_methods( $user )`. + * + * @since 4.4.0 + * + * @param array $meta { + * Default meta values and keys for the user. + * + * @type string $nickname The user's nickname. Default is the user's username. + * @type string $first_name The user's first name. + * @type string $last_name The user's last name. + * @type string $description The user's description. + * @type bool $rich_editing Whether to enable the rich-editor for the user. False if not empty. + * @type bool $comment_shortcuts Whether to enable keyboard shortcuts for the user. Default false. + * @type string $admin_color The color scheme for a user's admin screen. Default 'fresh'. + * @type int|bool $use_ssl Whether to force SSL on the user's admin area. 0|false if SSL is + * not forced. + * @type bool $show_admin_bar_front Whether to show the admin bar on the front end for the user. + * Default true. + * } + * @param WP_User $user User object. + * @param bool $update Whether the user is being updated rather than created. + */ + $meta = apply_filters( 'insert_user_meta', $meta, $user, $update ); + + // Update user meta. + foreach ( $meta as $key => $value ) { + update_user_meta( $user_id, $key, $value ); + } + + foreach ( wp_get_user_contact_methods( $user ) as $key => $value ) { + if ( isset( $userdata[ $key ] ) ) { + update_user_meta( $user_id, $key, $userdata[ $key ] ); + } } - if ( isset($role) ) - $user->set_role($role); - elseif ( !$update ) + if ( isset( $userdata['role'] ) ) { + $user->set_role( $userdata['role'] ); + } elseif ( ! $update ) { $user->set_role(get_option('default_role')); - - wp_cache_delete($user_id, 'users'); - wp_cache_delete($user_login, 'userlogins'); + } + wp_cache_delete( $user_id, 'users' ); + wp_cache_delete( $user_login, 'userlogins' ); if ( $update ) { /** @@ -1763,7 +1674,7 @@ function wp_insert_user( $userdata ) { } /** - * Update an user in the database. + * Update a user in the database. * * It is possible to update a user's password by specifying the 'user_pass' * value in the $userdata parameter array. @@ -1779,17 +1690,22 @@ function wp_insert_user( $userdata ) { * @return int|WP_Error The updated user's ID or a WP_Error object if the user could not be updated. */ function wp_update_user($userdata) { - if ( is_a( $userdata, 'stdClass' ) ) + if ( $userdata instanceof stdClass ) { $userdata = get_object_vars( $userdata ); - elseif ( is_a( $userdata, 'WP_User' ) ) + } elseif ( $userdata instanceof WP_User ) { $userdata = $userdata->to_array(); + } - $ID = (int) $userdata['ID']; + $ID = isset( $userdata['ID'] ) ? (int) $userdata['ID'] : 0; + if ( ! $ID ) { + return new WP_Error( 'invalid_user_id', __( 'Invalid user ID.' ) ); + } // First, get all of the original fields $user_obj = get_userdata( $ID ); - if ( ! $user_obj ) + if ( ! $user_obj ) { return new WP_Error( 'invalid_user_id', __( 'Invalid user ID.' ) ); + } $user = $user_obj->to_array(); @@ -1801,24 +1717,178 @@ function wp_update_user($userdata) { // Escape data pulled from DB. $user = add_magic_quotes( $user ); - // If password is changing, hash it now. - if ( ! empty($userdata['user_pass']) ) { + if ( ! empty( $userdata['user_pass'] ) && $userdata['user_pass'] !== $user_obj->user_pass ) { + // If password is changing, hash it now $plaintext_pass = $userdata['user_pass']; - $userdata['user_pass'] = wp_hash_password($userdata['user_pass']); + $userdata['user_pass'] = wp_hash_password( $userdata['user_pass'] ); + + /** + * Filter whether to send the password change email. + * + * @since 4.3.0 + * + * @see wp_insert_user() For `$user` and `$userdata` fields. + * + * @param bool $send Whether to send the email. + * @param array $user The original user array. + * @param array $userdata The updated user array. + * + */ + $send_password_change_email = apply_filters( 'send_password_change_email', true, $user, $userdata ); + } + + if ( isset( $userdata['user_email'] ) && $user['user_email'] !== $userdata['user_email'] ) { + /** + * Filter whether to send the email change email. + * + * @since 4.3.0 + * + * @see wp_insert_user() For `$user` and `$userdata` fields. + * + * @param bool $send Whether to send the email. + * @param array $user The original user array. + * @param array $userdata The updated user array. + * + */ + $send_email_change_email = apply_filters( 'send_email_change_email', true, $user, $userdata ); } - wp_cache_delete($user[ 'user_email' ], 'useremail'); + wp_cache_delete( $user['user_email'], 'useremail' ); + wp_cache_delete( $user['user_nicename'], 'userslugs' ); // Merge old and new fields with new fields overwriting old ones. - $userdata = array_merge($user, $userdata); - $user_id = wp_insert_user($userdata); + $userdata = array_merge( $user, $userdata ); + $user_id = wp_insert_user( $userdata ); + + if ( ! is_wp_error( $user_id ) ) { + + $blog_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ); + + if ( ! empty( $send_password_change_email ) ) { + + /* translators: Do not translate USERNAME, ADMIN_EMAIL, EMAIL, SITENAME, SITEURL: those are placeholders. */ + $pass_change_text = __( 'Hi ###USERNAME###, + +This notice confirms that your password was changed on ###SITENAME###. + +If you did not change your password, please contact the Site Administrator at +###ADMIN_EMAIL### + +This email has been sent to ###EMAIL### + +Regards, +All at ###SITENAME### +###SITEURL###' ); + + $pass_change_email = array( + 'to' => $user['user_email'], + 'subject' => __( '[%s] Notice of Password Change' ), + 'message' => $pass_change_text, + 'headers' => '', + ); + + /** + * Filter the contents of the email sent when the user's password is changed. + * + * @since 4.3.0 + * + * @param array $pass_change_email { + * Used to build wp_mail(). + * @type string $to The intended recipients. Add emails in a comma separated string. + * @type string $subject The subject of the email. + * @type string $message The content of the email. + * The following strings have a special meaning and will get replaced dynamically: + * - ###USERNAME### The current user's username. + * - ###ADMIN_EMAIL### The admin email in case this was unexpected. + * - ###EMAIL### The old email. + * - ###SITENAME### The name of the site. + * - ###SITEURL### The URL to the site. + * @type string $headers Headers. Add headers in a newline (\r\n) separated string. + * } + * @param array $user The original user array. + * @param array $userdata The updated user array. + * + */ + $pass_change_email = apply_filters( 'password_change_email', $pass_change_email, $user, $userdata ); + + $pass_change_email['message'] = str_replace( '###USERNAME###', $user['user_login'], $pass_change_email['message'] ); + $pass_change_email['message'] = str_replace( '###ADMIN_EMAIL###', get_option( 'admin_email' ), $pass_change_email['message'] ); + $pass_change_email['message'] = str_replace( '###EMAIL###', $user['user_email'], $pass_change_email['message'] ); + $pass_change_email['message'] = str_replace( '###SITENAME###', $blog_name, $pass_change_email['message'] ); + $pass_change_email['message'] = str_replace( '###SITEURL###', home_url(), $pass_change_email['message'] ); + + wp_mail( $pass_change_email['to'], sprintf( $pass_change_email['subject'], $blog_name ), $pass_change_email['message'], $pass_change_email['headers'] ); + } + + if ( ! empty( $send_email_change_email ) ) { + /* translators: Do not translate USERNAME, ADMIN_EMAIL, EMAIL, SITENAME, SITEURL: those are placeholders. */ + $email_change_text = __( 'Hi ###USERNAME###, + +This notice confirms that your email was changed on ###SITENAME###. + +If you did not change your email, please contact the Site Administrator at +###ADMIN_EMAIL### + +This email has been sent to ###EMAIL### + +Regards, +All at ###SITENAME### +###SITEURL###' ); + + $email_change_email = array( + 'to' => $user['user_email'], + 'subject' => __( '[%s] Notice of Email Change' ), + 'message' => $email_change_text, + 'headers' => '', + ); + + /** + * Filter the contents of the email sent when the user's email is changed. + * + * @since 4.3.0 + * + * @param array $email_change_email { + * Used to build wp_mail(). + * @type string $to The intended recipients. + * @type string $subject The subject of the email. + * @type string $message The content of the email. + * The following strings have a special meaning and will get replaced dynamically: + * - ###USERNAME### The current user's username. + * - ###ADMIN_EMAIL### The admin email in case this was unexpected. + * - ###EMAIL### The old email. + * - ###SITENAME### The name of the site. + * - ###SITEURL### The URL to the site. + * @type string $headers Headers. + * } + * @param array $user The original user array. + * @param array $userdata The updated user array. + */ + $email_change_email = apply_filters( 'email_change_email', $email_change_email, $user, $userdata ); + + $email_change_email['message'] = str_replace( '###USERNAME###', $user['user_login'], $email_change_email['message'] ); + $email_change_email['message'] = str_replace( '###ADMIN_EMAIL###', get_option( 'admin_email' ), $email_change_email['message'] ); + $email_change_email['message'] = str_replace( '###EMAIL###', $user['user_email'], $email_change_email['message'] ); + $email_change_email['message'] = str_replace( '###SITENAME###', $blog_name, $email_change_email['message'] ); + $email_change_email['message'] = str_replace( '###SITEURL###', home_url(), $email_change_email['message'] ); + + wp_mail( $email_change_email['to'], sprintf( $email_change_email['subject'], $blog_name ), $email_change_email['message'], $email_change_email['headers'] ); + } + } // Update the cookies if the password changed. $current_user = wp_get_current_user(); if ( $current_user->ID == $ID ) { if ( isset($plaintext_pass) ) { wp_clear_auth_cookie(); - wp_set_auth_cookie($ID); + + // Here we calculate the expiration length of the current auth cookie and compare it to the default expiration. + // If it's greater than this, then we know the user checked 'Remember Me' when they logged in. + $logged_in_cookie = wp_parse_auth_cookie( '', 'logged_in' ); + /** This filter is documented in wp-includes/pluggable.php */ + $default_cookie_life = apply_filters( 'auth_cookie_expiration', ( 2 * DAY_IN_SECONDS ), $ID, false ); + $remember = ( ( $logged_in_cookie['expiration'] - time() ) > $default_cookie_life ); + + wp_set_auth_cookie( $ID, $remember ); } } @@ -1826,18 +1896,19 @@ function wp_update_user($userdata) { } /** - * A simpler way of inserting an user into the database. + * A simpler way of inserting a user into the database. * * Creates a new user with just the username, password, and email. For more - * complex user creation use wp_insert_user() to specify more information. + * complex user creation use {@see wp_insert_user()} to specify more information. * * @since 2.0.0 * @see wp_insert_user() More complete way to create a new user * * @param string $username The user's username. * @param string $password The user's password. - * @param string $email The user's email (optional). - * @return int The new user's ID. + * @param string $email Optional. The user's email. Default empty. + * @return int|WP_Error The newly created user's ID or a WP_Error object if the user could not + * be created. */ function wp_create_user($username, $password, $email = '') { $user_login = wp_slash( $username ); @@ -1849,13 +1920,16 @@ function wp_create_user($username, $password, $email = '') { } /** - * Return a list of meta keys that wp_insert_user() is supposed to set. + * Returns a list of meta keys to be (maybe) populated in wp_update_user(). + * + * The list of keys returned via this function are dependent on the presence + * of those keys in the user meta data to be set. * * @since 3.3.0 * @access private * - * @param object $user WP_User instance. - * @return array + * @param WP_User $user WP_User instance. + * @return array List of user keys to be populated in wp_update_user(). */ function _get_additional_user_keys( $user ) { $keys = array( 'first_name', 'last_name', 'nickname', 'description', 'rich_editing', 'comment_shortcuts', 'admin_color', 'use_ssl', 'show_admin_bar_front' ); @@ -1896,13 +1970,115 @@ function wp_get_user_contact_methods( $user = null ) { /** * The old private function for setting up user contact methods. * + * Use wp_get_user_contact_methods() instead. + * * @since 2.9.0 * @access private + * + * @param WP_User $user Optional. WP_User object. Default null. + * @return array Array of contact methods and their labels. */ function _wp_get_user_contactmethods( $user = null ) { return wp_get_user_contact_methods( $user ); } +/** + * Gets the text suggesting how to create strong passwords. + * + * @since 4.1.0 + * + * @return string The password hint text. + */ +function wp_get_password_hint() { + $hint = __( 'Hint: The password should be at least twelve characters long. To make it stronger, use upper and lower case letters, numbers, and symbols like ! " ? $ % ^ & ).' ); + + /** + * Filter the text describing the site's password complexity policy. + * + * @since 4.1.0 + * + * @param string $hint The password hint text. + */ + return apply_filters( 'password_hint', $hint ); +} + +/** + * Creates, stores, then returns a password reset key for user. + * + * @since 4.4.0 + * + * @global wpdb $wpdb WordPress database abstraction object. + * @global PasswordHash $wp_hasher Portable PHP password hashing framework. + * + * @param WP_User $user User to retrieve password reset key for. + * + * @return string|WP_Error Password reset key on success. WP_Error on error. + */ +function get_password_reset_key( $user ) { + global $wpdb, $wp_hasher; + + /** + * Fires before a new password is retrieved. + * + * @since 1.5.0 + * @deprecated 1.5.1 Misspelled. Use 'retrieve_password' hook instead. + * + * @param string $user_login The user login name. + */ + do_action( 'retreive_password', $user->user_login ); + + /** + * Fires before a new password is retrieved. + * + * @since 1.5.1 + * + * @param string $user_login The user login name. + */ + do_action( 'retrieve_password', $user->user_login ); + + /** + * Filter whether to allow a password to be reset. + * + * @since 2.7.0 + * + * @param bool $allow Whether to allow the password to be reset. Default true. + * @param int $user_data->ID The ID of the user attempting to reset a password. + */ + $allow = apply_filters( 'allow_password_reset', true, $user->ID ); + + if ( ! $allow ) { + return new WP_Error( 'no_password_reset', __( 'Password reset is not allowed for this user' ) ); + } elseif ( is_wp_error( $allow ) ) { + return $allow; + } + + // Generate something random for a password reset key. + $key = wp_generate_password( 20, false ); + + /** + * Fires when a password reset key is generated. + * + * @since 2.5.0 + * + * @param string $user_login The username for the user. + * @param string $key The generated password reset key. + */ + do_action( 'retrieve_password_key', $user->user_login, $key ); + + // Now insert the key, hashed, into the DB. + if ( empty( $wp_hasher ) ) { + require_once ABSPATH . WPINC . '/class-phpass.php'; + $wp_hasher = new PasswordHash( 8, true ); + } + $hashed = time() . ':' . $wp_hasher->HashPassword( $key ); + $key_saved = $wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user->user_login ) ); + if ( false === $key_saved ) { + return new WP_Error( 'no_password_key_update', __( 'Could not save password reset key to database.' ) ); + } + + return $key; +} + /** * Retrieves a user row based on password reset key and login * @@ -1911,7 +2087,10 @@ function _wp_get_user_contactmethods( $user = null ) { * hashing process. This field is now hashed; old values are no longer accepted * but have a different WP_Error code so good user feedback can be provided. * - * @global wpdb $wpdb WordPress database object for queries. + * @since 3.1.0 + * + * @global wpdb $wpdb WordPress database object for queries. + * @global PasswordHash $wp_hasher Portable PHP password hashing framework instance. * * @param string $key Hash to validate sending user's password. * @param string $login The user login. @@ -1933,22 +2112,50 @@ function check_password_reset_key($key, $login) { return new WP_Error('invalid_key', __('Invalid key')); if ( empty( $wp_hasher ) ) { - require_once ABSPATH . 'wp-includes/class-phpass.php'; + require_once ABSPATH . WPINC . '/class-phpass.php'; $wp_hasher = new PasswordHash( 8, true ); } - if ( $wp_hasher->CheckPassword( $key, $row->user_activation_key ) ) + /** + * Filter the expiration time of password reset keys. + * + * @since 4.3.0 + * + * @param int $expiration The expiration time in seconds. + */ + $expiration_duration = apply_filters( 'password_reset_expiration', DAY_IN_SECONDS ); + + if ( false !== strpos( $row->user_activation_key, ':' ) ) { + list( $pass_request_time, $pass_key ) = explode( ':', $row->user_activation_key, 2 ); + $expiration_time = $pass_request_time + $expiration_duration; + } else { + $pass_key = $row->user_activation_key; + $expiration_time = false; + } + + if ( ! $pass_key ) { + return new WP_Error( 'invalid_key', __( 'Invalid key' ) ); + } + + $hash_is_correct = $wp_hasher->CheckPassword( $key, $pass_key ); + + if ( $hash_is_correct && $expiration_time && time() < $expiration_time ) { return get_userdata( $row->ID ); + } elseif ( $hash_is_correct && $expiration_time ) { + // Key has an expiration time that's passed + return new WP_Error( 'expired_key', __( 'Invalid key' ) ); + } - if ( $key === $row->user_activation_key ) { + if ( hash_equals( $row->user_activation_key, $key ) || ( $hash_is_correct && ! $expiration_time ) ) { $return = new WP_Error( 'expired_key', __( 'Invalid key' ) ); $user_id = $row->ID; /** * Filter the return value of check_password_reset_key() when an - * old-style key is used (plain-text key was stored in the database). + * old-style key is used. * - * @since 3.7.0 + * @since 3.7.0 Previously plain-text keys were stored in the database. + * @since 4.3.0 Previously key hashes were stored without an expiration time. * * @param WP_Error $return A WP_Error object denoting an expired key. * Return a WP_User object to validate the key. @@ -1963,7 +2170,9 @@ function check_password_reset_key($key, $login) { /** * Handles resetting the user's password. * - * @param object $user The user + * @since 2.5.0 + * + * @param object $user The user * @param string $new_pass New password for the user in plaintext */ function reset_password( $user, $new_pass ) { @@ -1980,12 +2189,22 @@ function reset_password( $user, $new_pass ) { wp_set_password( $new_pass, $user->ID ); update_user_option( $user->ID, 'default_password_nag', false, true ); - wp_password_change_notification( $user ); + /** + * Fires after the user's password is reset. + * + * @since 4.4.0 + * + * @param object $user The user. + * @param string $new_pass New user password. + */ + do_action( 'after_password_reset', $user, $new_pass ); } /** * Handles registering a new user. * + * @since 2.5.0 + * * @param string $user_login User's username for logging in * @param string $user_email User's email address to send password and add * @return int|WP_Error Either user's ID or error on failure. @@ -2011,11 +2230,18 @@ function register_new_user( $user_login, $user_email ) { $sanitized_user_login = ''; } elseif ( username_exists( $sanitized_user_login ) ) { $errors->add( 'username_exists', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ) ); + + } else { + /** This filter is documented in wp-includes/user.php */ + $illegal_user_logins = array_map( 'strtolower', (array) apply_filters( 'illegal_user_logins', array() ) ); + if ( in_array( strtolower( $sanitized_user_login ), $illegal_user_logins ) ) { + $errors->add( 'invalid_username', __( '<strong>ERROR</strong>: Sorry, that username is not allowed.' ) ); + } } - // Check the e-mail address + // Check the email address if ( $user_email == '' ) { - $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please type your e-mail address.' ) ); + $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please type your email address.' ) ); } elseif ( ! is_email( $user_email ) ) { $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn’t correct.' ) ); $user_email = ''; @@ -2066,7 +2292,187 @@ function register_new_user( $user_login, $user_email ) { update_user_option( $user_id, 'default_password_nag', true, true ); //Set up the Password change nag. - wp_new_user_notification( $user_id, $user_pass ); + /** + * Fires after a new user registration has been recorded. + * + * @since 4.4.0 + * + * @param int $user_id ID of the newly registered user. + */ + do_action( 'register_new_user', $user_id ); return $user_id; } + +/** + * Initiate email notifications related to the creation of new users. + * + * Notifications are sent both to the site admin and to the newly created user. + * + * @since 4.4.0 + * + * @param int $user_id ID of the newly created user. + * @param string $notify Optional. Type of notification that should happen. Accepts 'admin' or an empty string + * (admin only), or 'both' (admin and user). Default 'both'. + */ +function wp_send_new_user_notifications( $user_id, $notify = 'both' ) { + wp_new_user_notification( $user_id, null, $notify ); +} + +/** + * Retrieve the current session token from the logged_in cookie. + * + * @since 4.0.0 + * + * @return string Token. + */ +function wp_get_session_token() { + $cookie = wp_parse_auth_cookie( '', 'logged_in' ); + return ! empty( $cookie['token'] ) ? $cookie['token'] : ''; +} + +/** + * Retrieve a list of sessions for the current user. + * + * @since 4.0.0 + * @return array Array of sessions. + */ +function wp_get_all_sessions() { + $manager = WP_Session_Tokens::get_instance( get_current_user_id() ); + return $manager->get_all(); +} + +/** + * Remove the current session token from the database. + * + * @since 4.0.0 + */ +function wp_destroy_current_session() { + $token = wp_get_session_token(); + if ( $token ) { + $manager = WP_Session_Tokens::get_instance( get_current_user_id() ); + $manager->destroy( $token ); + } +} + +/** + * Remove all but the current session token for the current user for the database. + * + * @since 4.0.0 + */ +function wp_destroy_other_sessions() { + $token = wp_get_session_token(); + if ( $token ) { + $manager = WP_Session_Tokens::get_instance( get_current_user_id() ); + $manager->destroy_others( $token ); + } +} + +/** + * Remove all session tokens for the current user from the database. + * + * @since 4.0.0 + */ +function wp_destroy_all_sessions() { + $manager = WP_Session_Tokens::get_instance( get_current_user_id() ); + $manager->destroy_all(); +} + +/** + * Get the user IDs of all users with no role on this site. + * + * This function returns an empty array when used on Multisite. + * + * @since 4.4.0 + * + * @return array Array of user IDs. + */ +function wp_get_users_with_no_role() { + global $wpdb; + + if ( is_multisite() ) { + return array(); + } + + $prefix = $wpdb->get_blog_prefix(); + $regex = implode( '|', wp_roles()->get_names() ); + $regex = preg_replace( '/[^a-zA-Z_\|-]/', '', $regex ); + $users = $wpdb->get_col( $wpdb->prepare( " + SELECT user_id + FROM $wpdb->usermeta + WHERE meta_key = '{$prefix}capabilities' + AND meta_value NOT REGEXP %s + ", $regex ) ); + + return $users; +} + +/** + * Retrieves the current user object. + * + * Will set the current user, if the current user is not set. The current user + * will be set to the logged-in person. If no user is logged-in, then it will + * set the current user to 0, which is invalid and won't have any permissions. + * + * This function is used by the pluggable functions wp_get_current_user() and + * get_currentuserinfo(), the latter of which is deprecated but used for backward + * compatibility. + * + * @since 4.5.0 + * @access private + * + * @see wp_get_current_user() + * @global WP_User $current_user Checks if the current user is set. + * + * @return WP_User Current WP_User instance. + */ +function _wp_get_current_user() { + global $current_user; + + if ( ! empty( $current_user ) ) { + if ( $current_user instanceof WP_User ) { + return $current_user; + } + + // Upgrade stdClass to WP_User + if ( is_object( $current_user ) && isset( $current_user->ID ) ) { + $cur_id = $current_user->ID; + $current_user = null; + wp_set_current_user( $cur_id ); + return $current_user; + } + + // $current_user has a junk value. Force to WP_User with ID 0. + $current_user = null; + wp_set_current_user( 0 ); + return $current_user; + } + + if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST ) { + wp_set_current_user( 0 ); + return $current_user; + } + + /** + * Filter the current user. + * + * The default filters use this to determine the current user from the + * request's cookies, if available. + * + * Returning a value of false will effectively short-circuit setting + * the current user. + * + * @since 3.9.0 + * + * @param int|bool $user_id User ID if one has been determined, false otherwise. + */ + $user_id = apply_filters( 'determine_current_user', false ); + if ( ! $user_id ) { + wp_set_current_user( 0 ); + return $current_user; + } + + wp_set_current_user( $user_id ); + + return $current_user; +} diff --git a/wp-includes/vars.php b/wp-includes/vars.php index 996d173..c903101 100644 --- a/wp-includes/vars.php +++ b/wp-includes/vars.php @@ -10,13 +10,13 @@ * servers with known pretty permalink capability. * * Note: Though Nginx is detected, WordPress does not currently - * generate rewrite rules for it. See http://codex.wordpress.org/Nginx + * generate rewrite rules for it. See https://codex.wordpress.org/Nginx * * @package WordPress */ global $pagenow, - $is_lynx, $is_gecko, $is_winIE, $is_macIE, $is_opera, $is_NS4, $is_safari, $is_chrome, $is_iphone, $is_IE, + $is_lynx, $is_gecko, $is_winIE, $is_macIE, $is_opera, $is_NS4, $is_safari, $is_chrome, $is_iphone, $is_IE, $is_edge, $is_apache, $is_IIS, $is_iis7, $is_nginx; // On which page are we ? @@ -48,11 +48,13 @@ if ( is_admin() ) { unset($self_matches); // Simple browser detection -$is_lynx = $is_gecko = $is_winIE = $is_macIE = $is_opera = $is_NS4 = $is_safari = $is_chrome = $is_iphone = false; +$is_lynx = $is_gecko = $is_winIE = $is_macIE = $is_opera = $is_NS4 = $is_safari = $is_chrome = $is_iphone = $is_edge = false; if ( isset($_SERVER['HTTP_USER_AGENT']) ) { if ( strpos($_SERVER['HTTP_USER_AGENT'], 'Lynx') !== false ) { $is_lynx = true; + } elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Edge' ) !== false ) { + $is_edge = true; } elseif ( stripos($_SERVER['HTTP_USER_AGENT'], 'chrome') !== false ) { if ( stripos( $_SERVER['HTTP_USER_AGENT'], 'chromeframe' ) !== false ) { $is_admin = is_admin(); @@ -118,14 +120,9 @@ $is_iis7 = $is_IIS && intval( substr( $_SERVER['SERVER_SOFTWARE'], strpos( $_SER /** * Test if the current browser runs on a mobile device (smart phone, tablet, etc.) * - * @return bool true|false + * @return bool */ function wp_is_mobile() { - static $is_mobile; - - if ( isset($is_mobile) ) - return $is_mobile; - if ( empty($_SERVER['HTTP_USER_AGENT']) ) { $is_mobile = false; } elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Mobile') !== false // many mobile devices (all iPhone, iPad, etc.) diff --git a/wp-includes/version.php b/wp-includes/version.php index 1de7b45..bbc635c 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,21 +4,21 @@ * * @global string $wp_version */ -$wp_version = '3.9.1'; +$wp_version = '4.5.2'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * * @global int $wp_db_version */ -$wp_db_version = 27916; +$wp_db_version = 36686; /** * Holds the TinyMCE version * * @global string $tinymce_version */ -$tinymce_version = '4021-20140423'; +$tinymce_version = '4310-20160418'; /** * Holds the required PHP version diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php index 97c875e..6c559c3 100644 --- a/wp-includes/widgets.php +++ b/wp-includes/widgets.php @@ -1,442 +1,26 @@ <?php /** - * API for creating dynamic sidebar without hardcoding functionality into - * themes. Includes both internal WordPress routines and theme use routines. + * Core Widgets API * - * This functionality was found in a plugin before WordPress 2.2 release which - * included it in the core from that point on. + * This API is used for creating dynamic sidebar without hardcoding functionality into + * themes * - * @link http://codex.wordpress.org/Plugins/WordPress_Widgets WordPress Widgets - * @link http://codex.wordpress.org/Plugins/WordPress_Widgets_Api Widgets API + * Includes both internal WordPress routines and theme-use routines. * - * @package WordPress - * @subpackage Widgets - */ - -/** - * This class must be extended for each widget and WP_Widget::widget(), WP_Widget::update() - * and WP_Widget::form() need to be over-ridden. + * This functionality was found in a plugin before the WordPress 2.2 release, which + * included it in the core from that point on. * - * @package WordPress - * @subpackage Widgets - * @since 2.8.0 - */ -class WP_Widget { - - var $id_base; // Root id for all widgets of this type. - var $name; // Name for this widget type. - var $widget_options; // Option array passed to wp_register_sidebar_widget() - var $control_options; // Option array passed to wp_register_widget_control() - - var $number = false; // Unique ID number of the current instance. - var $id = false; // Unique ID string of the current instance (id_base-number) - var $updated = false; // Set true when we update the data after a POST submit - makes sure we don't do it twice. - - // Member functions that you must over-ride. - - /** Echo the widget content. - * - * Subclasses should over-ride this function to generate their widget code. - * - * @param array $args Display arguments including before_title, after_title, before_widget, and after_widget. - * @param array $instance The settings for the particular instance of the widget - */ - function widget($args, $instance) { - die('function WP_Widget::widget() must be over-ridden in a sub-class.'); - } - - /** Update a particular instance. - * - * This function should check that $new_instance is set correctly. - * The newly calculated value of $instance should be returned. - * If "false" is returned, the instance won't be saved/updated. - * - * @param array $new_instance New settings for this instance as input by the user via form() - * @param array $old_instance Old settings for this instance - * @return array Settings to save or bool false to cancel saving - */ - function update($new_instance, $old_instance) { - return $new_instance; - } - - /** Echo the settings update form - * - * @param array $instance Current settings - */ - function form($instance) { - echo '<p class="no-options-widget">' . __('There are no options for this widget.') . '</p>'; - return 'noform'; - } - - // Functions you'll need to call. - - /** - * PHP5 constructor - * - * @param string $id_base Optional Base ID for the widget, lower case, - * if left empty a portion of the widget's class name will be used. Has to be unique. - * @param string $name Name for the widget displayed on the configuration page. - * @param array $widget_options Optional Passed to wp_register_sidebar_widget() - * - description: shown on the configuration page - * - classname - * @param array $control_options Optional Passed to wp_register_widget_control() - * - width: required if more than 250px - * - height: currently not used but may be needed in the future - */ - function __construct( $id_base, $name, $widget_options = array(), $control_options = array() ) { - $this->id_base = empty($id_base) ? preg_replace( '/(wp_)?widget_/', '', strtolower(get_class($this)) ) : strtolower($id_base); - $this->name = $name; - $this->option_name = 'widget_' . $this->id_base; - $this->widget_options = wp_parse_args( $widget_options, array('classname' => $this->option_name) ); - $this->control_options = wp_parse_args( $control_options, array('id_base' => $this->id_base) ); - } - - /** - * PHP4 constructor - */ - function WP_Widget( $id_base, $name, $widget_options = array(), $control_options = array() ) { - WP_Widget::__construct( $id_base, $name, $widget_options, $control_options ); - } - - /** - * Constructs name attributes for use in form() fields - * - * This function should be used in form() methods to create name attributes for fields to be saved by update() - * - * @param string $field_name Field name - * @return string Name attribute for $field_name - */ - function get_field_name($field_name) { - return 'widget-' . $this->id_base . '[' . $this->number . '][' . $field_name . ']'; - } - - /** - * Constructs id attributes for use in form() fields - * - * This function should be used in form() methods to create id attributes for fields to be saved by update() - * - * @param string $field_name Field name - * @return string ID attribute for $field_name - */ - function get_field_id($field_name) { - return 'widget-' . $this->id_base . '-' . $this->number . '-' . $field_name; - } - - // Private Functions. Don't worry about these. - - function _register() { - $settings = $this->get_settings(); - $empty = true; - - if ( is_array($settings) ) { - foreach ( array_keys($settings) as $number ) { - if ( is_numeric($number) ) { - $this->_set($number); - $this->_register_one($number); - $empty = false; - } - } - } - - if ( $empty ) { - // If there are none, we register the widget's existence with a - // generic template - $this->_set(1); - $this->_register_one(); - } - } - - function _set($number) { - $this->number = $number; - $this->id = $this->id_base . '-' . $number; - } - - function _get_display_callback() { - return array($this, 'display_callback'); - } - - function _get_update_callback() { - return array($this, 'update_callback'); - } - - function _get_form_callback() { - return array($this, 'form_callback'); - } - - /** - * Determine if we're in the Customizer; if true, then the object cache gets - * suspended and widgets should check this to decide whether they should - * store anything persistently to the object cache, to transients, or - * anywhere else. - * - * @since 3.9.0 - * - * @return bool True if Customizer is on, false if not. - */ - function is_preview() { - global $wp_customize; - return ( isset( $wp_customize ) && $wp_customize->is_preview() ) ; - } - - /** Generate the actual widget content. - * Just finds the instance and calls widget(). - * Do NOT over-ride this function. */ - function display_callback( $args, $widget_args = 1 ) { - if ( is_numeric($widget_args) ) - $widget_args = array( 'number' => $widget_args ); - - $widget_args = wp_parse_args( $widget_args, array( 'number' => -1 ) ); - $this->_set( $widget_args['number'] ); - $instance = $this->get_settings(); - - if ( array_key_exists( $this->number, $instance ) ) { - $instance = $instance[$this->number]; - - /** - * Filter the settings for a particular widget instance. - * - * Returning false will effectively short-circuit display of the widget. - * - * @since 2.8.0 - * - * @param array $instance The current widget instance's settings. - * @param WP_Widget $this The current widget instance. - * @param array $args An array of default widget arguments. - */ - $instance = apply_filters( 'widget_display_callback', $instance, $this, $args ); - - if ( false === $instance ) { - return; - } - - $was_cache_addition_suspended = wp_suspend_cache_addition(); - if ( $this->is_preview() && ! $was_cache_addition_suspended ) { - wp_suspend_cache_addition( true ); - } - - $this->widget( $args, $instance ); - - if ( $this->is_preview() ) { - wp_suspend_cache_addition( $was_cache_addition_suspended ); - } - } - } - - /** - * Deal with changed settings. - * - * Do NOT over-ride this function. - * - * @param mixed $deprecated Not used. - */ - function update_callback( $deprecated = 1 ) { - global $wp_registered_widgets; - - $all_instances = $this->get_settings(); - - // We need to update the data - if ( $this->updated ) - return; - - $sidebars_widgets = wp_get_sidebars_widgets(); - - if ( isset($_POST['delete_widget']) && $_POST['delete_widget'] ) { - // Delete the settings for this instance of the widget - if ( isset($_POST['the-widget-id']) ) - $del_id = $_POST['the-widget-id']; - else - return; - - if ( isset($wp_registered_widgets[$del_id]['params'][0]['number']) ) { - $number = $wp_registered_widgets[$del_id]['params'][0]['number']; - - if ( $this->id_base . '-' . $number == $del_id ) - unset($all_instances[$number]); - } - } else { - if ( isset($_POST['widget-' . $this->id_base]) && is_array($_POST['widget-' . $this->id_base]) ) { - $settings = $_POST['widget-' . $this->id_base]; - } elseif ( isset($_POST['id_base']) && $_POST['id_base'] == $this->id_base ) { - $num = $_POST['multi_number'] ? (int) $_POST['multi_number'] : (int) $_POST['widget_number']; - $settings = array( $num => array() ); - } else { - return; - } - - foreach ( $settings as $number => $new_instance ) { - $new_instance = stripslashes_deep($new_instance); - $this->_set($number); - - $old_instance = isset($all_instances[$number]) ? $all_instances[$number] : array(); - - $was_cache_addition_suspended = wp_suspend_cache_addition(); - if ( $this->is_preview() && ! $was_cache_addition_suspended ) { - wp_suspend_cache_addition( true ); - } - - $instance = $this->update( $new_instance, $old_instance ); - - if ( $this->is_preview() ) { - wp_suspend_cache_addition( $was_cache_addition_suspended ); - } - - /** - * Filter a widget's settings before saving. - * - * Returning false will effectively short-circuit the widget's ability - * to update settings. - * - * @since 2.8.0 - * - * @param array $instance The current widget instance's settings. - * @param array $new_instance Array of new widget settings. - * @param array $old_instance Array of old widget settings. - * @param WP_Widget $this The current widget instance. - */ - $instance = apply_filters( 'widget_update_callback', $instance, $new_instance, $old_instance, $this ); - if ( false !== $instance ) { - $all_instances[$number] = $instance; - } - - break; // run only once - } - } - - $this->save_settings($all_instances); - $this->updated = true; - } - - /** - * Generate the control form. - * - * Do NOT over-ride this function. - */ - function form_callback( $widget_args = 1 ) { - if ( is_numeric($widget_args) ) - $widget_args = array( 'number' => $widget_args ); - - $widget_args = wp_parse_args( $widget_args, array( 'number' => -1 ) ); - $all_instances = $this->get_settings(); - - if ( -1 == $widget_args['number'] ) { - // We echo out a form where 'number' can be set later - $this->_set('__i__'); - $instance = array(); - } else { - $this->_set($widget_args['number']); - $instance = $all_instances[ $widget_args['number'] ]; - } - - /** - * Filter the widget instance's settings before displaying the control form. - * - * Returning false effectively short-circuits display of the control form. - * - * @since 2.8.0 - * - * @param array $instance The current widget instance's settings. - * @param WP_Widget $this The current widget instance. - */ - $instance = apply_filters( 'widget_form_callback', $instance, $this ); - - $return = null; - if ( false !== $instance ) { - $return = $this->form($instance); - - /** - * Fires at the end of the widget control form. - * - * Use this hook to add extra fields to the widget form. The hook - * is only fired if the value passed to the 'widget_form_callback' - * hook is not false. - * - * Note: If the widget has no form, the text echoed from the default - * form method can be hidden using CSS. - * - * @since 2.8.0 - * - * @param WP_Widget $this The widget instance, passed by reference. - * @param null $return Return null if new fields are added. - * @param array $instance An array of the widget's settings. - */ - do_action_ref_array( 'in_widget_form', array( &$this, &$return, $instance ) ); - } - return $return; - } - - /** Helper function: Registers a single instance. */ - function _register_one($number = -1) { - wp_register_sidebar_widget( $this->id, $this->name, $this->_get_display_callback(), $this->widget_options, array( 'number' => $number ) ); - _register_widget_update_callback( $this->id_base, $this->_get_update_callback(), $this->control_options, array( 'number' => -1 ) ); - _register_widget_form_callback( $this->id, $this->name, $this->_get_form_callback(), $this->control_options, array( 'number' => $number ) ); - } - - function save_settings($settings) { - $settings['_multiwidget'] = 1; - update_option( $this->option_name, $settings ); - } - - function get_settings() { - $settings = get_option($this->option_name); - - if ( false === $settings && isset($this->alt_option_name) ) - $settings = get_option($this->alt_option_name); - - if ( !is_array($settings) ) - $settings = array(); - - if ( !empty($settings) && !array_key_exists('_multiwidget', $settings) ) { - // old format, convert if single widget - $settings = wp_convert_widget_settings($this->id_base, $this->option_name, $settings); - } - - unset($settings['_multiwidget'], $settings['__i__']); - return $settings; - } -} - -/** - * Singleton that registers and instantiates WP_Widget classes. + * @link https://codex.wordpress.org/Plugins/WordPress_Widgets WordPress Widgets + * @link https://codex.wordpress.org/Plugins/WordPress_Widgets_Api Widgets API * * @package WordPress * @subpackage Widgets - * @since 2.8.0 + * @since 2.2.0 */ -class WP_Widget_Factory { - var $widgets = array(); - - function WP_Widget_Factory() { - add_action( 'widgets_init', array( $this, '_register_widgets' ), 100 ); - } - - function register($widget_class) { - $this->widgets[$widget_class] = new $widget_class(); - } - - function unregister($widget_class) { - if ( isset($this->widgets[$widget_class]) ) - unset($this->widgets[$widget_class]); - } - - function _register_widgets() { - global $wp_registered_widgets; - $keys = array_keys($this->widgets); - $registered = array_keys($wp_registered_widgets); - $registered = array_map('_get_widget_id_base', $registered); - - foreach ( $keys as $key ) { - // don't register new widget if old widget with the same id is already registered - if ( in_array($this->widgets[$key]->id_base, $registered, true) ) { - unset($this->widgets[$key]); - continue; - } - - $this->widgets[$key]->_register(); - } - } -} -/* Global Variables */ +// +// Global Variables +// /** @ignore */ global $wp_registered_sidebars, $wp_registered_widgets, $wp_registered_widget_controls, $wp_registered_widget_updates; @@ -464,15 +48,22 @@ $wp_registered_widgets = array(); * @since 2.2.0 */ $wp_registered_widget_controls = array(); +/** + * @global array $wp_registered_widget_updates + */ $wp_registered_widget_updates = array(); /** * Private + * + * @global array $_wp_sidebars_widgets */ $_wp_sidebars_widgets = array(); /** * Private + * + * @global array $_wp_deprecated_widgets_callbacks */ $GLOBALS['_wp_deprecated_widgets_callbacks'] = array( 'wp_widget_pages', @@ -499,7 +90,9 @@ $GLOBALS['_wp_deprecated_widgets_callbacks'] = array( 'wp_widget_recent_comments_control' ); -/* Template tags & API functions */ +// +// Template tags & API functions +// /** * Register a widget @@ -509,8 +102,8 @@ $GLOBALS['_wp_deprecated_widgets_callbacks'] = array( * @since 2.8.0 * * @see WP_Widget - * @see WP_Widget_Factory - * @uses WP_Widget_Factory + * + * @global WP_Widget_Factory $wp_widget_factory * * @param string $widget_class The name of a class that extends WP_Widget */ @@ -529,8 +122,8 @@ function register_widget($widget_class) { * @since 2.8.0 * * @see WP_Widget - * @see WP_Widget_Factory - * @uses WP_Widget_Factory + * + * @global WP_Widget_Factory $wp_widget_factory * * @param string $widget_class The name of a class that extends WP_Widget */ @@ -545,25 +138,28 @@ function unregister_widget($widget_class) { * * If you wanted to quickly create multiple sidebars for a theme or internally. * This function will allow you to do so. If you don't pass the 'name' and/or - * 'id' in $args, then they will be built for you. - * - * The default for the name is "Sidebar #", with '#' being replaced with the - * number the sidebar is currently when greater than one. If first sidebar, the - * name will be just "Sidebar". The default for id is "sidebar-" followed by the - * number the sidebar creation is currently at. If the id is provided, and multiple - * sidebars are being defined, the id will have "-2" appended, and so on. + * 'id' in `$args`, then they will be built for you. * * @since 2.2.0 * * @see register_sidebar() The second parameter is documented by register_sidebar() and is the same here. - * @uses parse_str() Converts a string to an array to be used in the rest of the function. - * @uses register_sidebar() Sends single sidebar information [name, id] to this - * function to handle building the sidebar. * - * @param int $number Number of sidebars to create. - * @param string|array $args Builds Sidebar based off of 'name' and 'id' values. + * @global array $wp_registered_sidebars + * + * @param int $number Optional. Number of sidebars to create. Default 1. + * @param array|string $args { + * Optional. Array or string of arguments for building a sidebar. + * + * @type string $id The base string of the unique identifier for each sidebar. If provided, and multiple + * sidebars are being defined, the id will have "-2" appended, and so on. + * Default 'sidebar-' followed by the number the sidebar creation is currently at. + * @type string $name The name or title for the sidebars displayed in the admin dashboard. If registering + * more than one sidebar, include '%d' in the string as a placeholder for the uniquely + * assigned number for each sidebar. + * Default 'Sidebar' for the first sidebar, otherwise 'Sidebar %d'. + * } */ -function register_sidebars($number = 1, $args = array()) { +function register_sidebars( $number = 1, $args = array() ) { global $wp_registered_sidebars; $number = (int) $number; @@ -583,13 +179,14 @@ function register_sidebars($number = 1, $args = array()) { if ( isset($args['id']) ) { $_args['id'] = $args['id']; $n = 2; // Start at -2 for conflicting custom ID's - while ( isset($wp_registered_sidebars[$_args['id']]) ) + while ( is_registered_sidebar( $_args['id'] ) ) { $_args['id'] = $args['id'] . '-' . $n++; + } } else { - $n = count($wp_registered_sidebars); + $n = count( $wp_registered_sidebars ); do { $_args['id'] = 'sidebar-' . ++$n; - } while ( isset($wp_registered_sidebars[$_args['id']]) ); + } while ( is_registered_sidebar( $_args['id'] ) ); } register_sidebar($_args); } @@ -610,32 +207,30 @@ function register_sidebars($number = 1, $args = array()) { * If theme support for 'widgets' has not yet been added when this function is * called, it will be automatically enabled through the use of add_theme_support() * - * Arguments passed as a string should be separated by '&': - * - * e.g. 'name=Sidebar&id=my_prefix_sidebar' - * - * The same arguments passed as an array: - * - * array( - * 'name' => 'Sidebar', - * 'id' => 'my_prefix_sidebar', - * ) - * - * Arguments: - * name - The name or title of the sidebar displayed in the admin dashboard. - * id - The unique identifier by which the sidebar will be called. - * before_widget - HTML content that will be prepended to each widget's HTML output - * when assigned to this sidebar. - * after_widget - HTML content that will be appended to each widget's HTML output - * when assigned to this sidebar. - * before_title - HTML content that will be prepended to the sidebar title when displayed. - * after_title - HTML content that will be appended to the sidebar title when displayed. - * * @since 2.2.0 - * @uses $wp_registered_sidebars Stores the new sidebar in this array by sidebar ID. - * @uses add_theme_support() to ensure widget support has been added. * - * @param string|array $args Arguments for the sidebar being registered. + * @global array $wp_registered_sidebars Stores the new sidebar in this array by sidebar ID. + * + * @param array|string $args { + * Optional. Array or string of arguments for the sidebar being registered. + * + * @type string $name The name or title of the sidebar displayed in the Widgets + * interface. Default 'Sidebar $instance'. + * @type string $id The unique identifier by which the sidebar will be called. + * Default 'sidebar-$instance'. + * @type string $description Description of the sidebar, displayed in the Widgets interface. + * Default empty string. + * @type string $class Extra CSS class to assign to the sidebar in the Widgets interface. + * Default empty. + * @type string $before_widget HTML content to prepend to each widget's HTML output when + * assigned to this sidebar. Default is an opening list item element. + * @type string $after_widget HTML content to append to each widget's HTML output when + * assigned to this sidebar. Default is a closing list item element. + * @type string $before_title HTML content to prepend to the sidebar title when displayed. + * Default is an opening h2 element. + * @type string $after_title HTML content to append to the sidebar title when displayed. + * Default is a closing h2 element. + * } * @return string Sidebar ID added to $wp_registered_sidebars global. */ function register_sidebar($args = array()) { @@ -643,6 +238,8 @@ function register_sidebar($args = array()) { $i = count($wp_registered_sidebars) + 1; + $id_is_empty = empty( $args['id'] ); + $defaults = array( 'name' => sprintf(__('Sidebar %d'), $i ), 'id' => "sidebar-$i", @@ -656,6 +253,11 @@ function register_sidebar($args = array()) { $sidebar = wp_parse_args( $args, $defaults ); + if ( $id_is_empty ) { + /* translators: 1: the id argument, 2: sidebar name, 3: recommended id value */ + _doing_it_wrong( __FUNCTION__, sprintf( __( 'No %1$s was set in the arguments array for the "%2$s" sidebar. Defaulting to "%3$s". Manually set the %1$s to "%3$s" to silence this notice and keep existing sidebar content.' ), '<code>id</code>', $sidebar['name'], $sidebar['id'] ), '4.2.0' ); + } + $wp_registered_sidebars[$sidebar['id']] = $sidebar; add_theme_support('widgets'); @@ -677,38 +279,60 @@ function register_sidebar($args = array()) { * * @since 2.2.0 * - * @uses $wp_registered_sidebars Stores the new sidebar in this array by sidebar ID. + * @global array $wp_registered_sidebars Stores the new sidebar in this array by sidebar ID. * * @param string $name The ID of the sidebar when it was added. */ function unregister_sidebar( $name ) { global $wp_registered_sidebars; - if ( isset( $wp_registered_sidebars[$name] ) ) - unset( $wp_registered_sidebars[$name] ); + unset( $wp_registered_sidebars[ $name ] ); +} + +/** + * Checks if a sidebar is registered. + * + * @since 4.4.0 + * + * @global array $wp_registered_sidebars Registered sidebars. + * + * @param string|int $sidebar_id The ID of the sidebar when it was registered. + * @return bool True if the sidebar is registered, false otherwise. + */ +function is_registered_sidebar( $sidebar_id ) { + global $wp_registered_sidebars; + + return isset( $wp_registered_sidebars[ $sidebar_id ] ); } /** - * Register widget for use in sidebars. + * Register an instance of a widget. * - * The default widget option is 'classname' that can be override. + * The default widget option is 'classname' that can be overridden. * - * The function can also be used to unregister widgets when $output_callback + * The function can also be used to un-register widgets when `$output_callback` * parameter is an empty string. * * @since 2.2.0 * - * @uses $wp_registered_widgets Uses stored registered widgets. - * @uses $wp_register_widget_defaults Retrieves widget defaults. - * - * @param int|string $id Widget ID. - * @param string $name Widget display title. - * @param callback $output_callback Run when widget is called. - * @param array|string $options Optional. Widget Options. - * @param mixed $params,... Widget parameters to add to widget. - * @return null Will return if $output_callback is empty after removing widget. + * @global array $wp_registered_widgets Uses stored registered widgets. + * @global array $wp_register_widget_defaults Retrieves widget defaults. + * @global array $wp_registered_widget_updates + * @global array $_wp_deprecated_widgets_callbacks + * + * @param int|string $id Widget ID. + * @param string $name Widget display title. + * @param callable $output_callback Run when widget is called. + * @param array $options { + * Optional. An array of supplementary widget options for the instance. + * + * @type string $classname Class name for the widget's HTML container. Default is a shortened + * version of the output callback name. + * @type string $description Widget description for display in the widget administration + * panel and/or theme. + * } */ -function wp_register_sidebar_widget($id, $name, $output_callback, $options = array()) { +function wp_register_sidebar_widget( $id, $name, $output_callback, $options = array() ) { global $wp_registered_widgets, $wp_registered_widget_controls, $wp_registered_widget_updates, $_wp_deprecated_widgets_callbacks; $id = strtolower($id); @@ -720,12 +344,8 @@ function wp_register_sidebar_widget($id, $name, $output_callback, $options = arr $id_base = _get_widget_id_base($id); if ( in_array($output_callback, $_wp_deprecated_widgets_callbacks, true) && !is_callable($output_callback) ) { - if ( isset($wp_registered_widget_controls[$id]) ) - unset($wp_registered_widget_controls[$id]); - - if ( isset($wp_registered_widget_updates[$id_base]) ) - unset($wp_registered_widget_updates[$id_base]); - + unset( $wp_registered_widget_controls[ $id ] ); + unset( $wp_registered_widget_updates[ $id_base ] ); return; } @@ -762,8 +382,10 @@ function wp_register_sidebar_widget($id, $name, $output_callback, $options = arr * * @since 2.5.0 * + * @global array $wp_registered_widgets + * * @param int|string $id Widget ID. - * @return string Widget description, if available. Null on failure to retrieve description. + * @return string|void Widget description, if available. */ function wp_widget_description( $id ) { if ( !is_scalar($id) ) @@ -783,8 +405,10 @@ function wp_widget_description( $id ) { * * @since 2.9.0 * - * @param int|string $id sidebar ID. - * @return string Sidebar description, if available. Null on failure to retrieve description. + * @global array $wp_registered_sidebars + * + * @param string $id sidebar ID. + * @return string|void Sidebar description, if available. */ function wp_sidebar_description( $id ) { if ( !is_scalar($id) ) @@ -821,22 +445,29 @@ function wp_unregister_sidebar_widget($id) { /** * Registers widget control callback for customizing options. * - * The options contains the 'height', 'width', and 'id_base' keys. The 'height' - * option is never used. The 'width' option is the width of the fully expanded - * control form, but try hard to use the default width. The 'id_base' is for - * multi-widgets (widgets which allow multiple instances such as the text - * widget), an id_base must be provided. The widget id will end up looking like - * {$id_base}-{$unique_number}. - * * @since 2.2.0 * - * @param int|string $id Sidebar ID. - * @param string $name Sidebar display name. - * @param callback $control_callback Run when sidebar is displayed. - * @param array|string $options Optional. Widget options. See above long description. - * @param mixed $params,... Optional. Additional parameters to add to widget. + * @todo `$params` parameter? + * + * @global array $wp_registered_widget_controls + * @global array $wp_registered_widget_updates + * @global array $wp_registered_widgets + * @global array $_wp_deprecated_widgets_callbacks + * + * @param int|string $id Sidebar ID. + * @param string $name Sidebar display name. + * @param callable $control_callback Run when sidebar is displayed. + * @param array $options { + * Optional. Array or string of control options. Default empty array. + * + * @type int $height Never used. Default 200. + * @type int $width Width of the fully expanded control form (but try hard to use the default width). + * Default 250. + * @type int|string $id_base Required for multi-widgets, i.e widgets that allow multiple instances such as the + * text widget. The widget id will end up looking like `{$id_base}-{$unique_number}`. + * } */ -function wp_register_widget_control($id, $name, $control_callback, $options = array()) { +function wp_register_widget_control( $id, $name, $control_callback, $options = array() ) { global $wp_registered_widget_controls, $wp_registered_widget_updates, $wp_registered_widgets, $_wp_deprecated_widgets_callbacks; $id = strtolower($id); @@ -849,9 +480,7 @@ function wp_register_widget_control($id, $name, $control_callback, $options = ar } if ( in_array($control_callback, $_wp_deprecated_widgets_callbacks, true) && !is_callable($control_callback) ) { - if ( isset($wp_registered_widgets[$id]) ) - unset($wp_registered_widgets[$id]); - + unset( $wp_registered_widgets[ $id ] ); return; } @@ -883,7 +512,19 @@ function wp_register_widget_control($id, $name, $control_callback, $options = ar $wp_registered_widget_updates[$id_base] = $widget; } -function _register_widget_update_callback($id_base, $update_callback, $options = array()) { +/** + * Registers the update callback for a widget. + * + * @since 2.8.0 + * + * @global array $wp_registered_widget_updates + * + * @param string $id_base The base ID of a widget created by extending WP_Widget. + * @param callable $update_callback Update callback method for the widget. + * @param array $options Optional. Widget control options. See {@see wp_register_widget_control()}. + * Default empty array. + */ +function _register_widget_update_callback( $id_base, $update_callback, $options = array() ) { global $wp_registered_widget_updates; if ( isset($wp_registered_widget_updates[$id_base]) ) { @@ -901,6 +542,19 @@ function _register_widget_update_callback($id_base, $update_callback, $options = $wp_registered_widget_updates[$id_base] = $widget; } +/** + * Registers the form callback for a widget. + * + * @since 2.8.0 + * + * @global array $wp_registered_widget_controls + * + * @param int|string $id Widget ID. + * @param string $name Name attribute for the widget. + * @param callable $form_callback Form callback. + * @param array $options Optional. Widget control options. See {@see wp_register_widget_control()}. + * Default empty array. + */ function _register_widget_form_callback($id, $name, $form_callback, $options = array()) { global $wp_registered_widget_controls; @@ -934,12 +588,11 @@ function _register_widget_form_callback($id, $name, $form_callback, $options = a * Remove control callback for widget. * * @since 2.2.0 - * @uses wp_register_widget_control() Unregisters by using empty callback. * * @param int|string $id Widget ID. */ function wp_unregister_widget_control($id) { - return wp_register_widget_control($id, '', ''); + wp_register_widget_control( $id, '', '' ); } /** @@ -951,18 +604,21 @@ function wp_unregister_widget_control($id) { * * @since 2.2.0 * + * @global array $wp_registered_sidebars + * @global array $wp_registered_widgets + * * @param int|string $index Optional, default is 1. Index, name or ID of dynamic sidebar. * @return bool True, if widget sidebar was found and called. False if not found or not called. */ -function dynamic_sidebar($index = 1) { +function dynamic_sidebar( $index = 1 ) { global $wp_registered_sidebars, $wp_registered_widgets; - if ( is_int($index) ) { + if ( is_int( $index ) ) { $index = "sidebar-$index"; } else { - $index = sanitize_title($index); + $index = sanitize_title( $index ); foreach ( (array) $wp_registered_sidebars as $key => $value ) { - if ( sanitize_title($value['name']) == $index ) { + if ( sanitize_title( $value['name'] ) == $index ) { $index = $key; break; } @@ -971,19 +627,19 @@ function dynamic_sidebar($index = 1) { $sidebars_widgets = wp_get_sidebars_widgets(); if ( empty( $wp_registered_sidebars[ $index ] ) || empty( $sidebars_widgets[ $index ] ) || ! is_array( $sidebars_widgets[ $index ] ) ) { - /** This action is documented in wp-includes/widgets.php */ + /** This action is documented in wp-includes/widget.php */ do_action( 'dynamic_sidebar_before', $index, false ); - /** This action is documented in wp-includes/widgets.php */ + /** This action is documented in wp-includes/widget.php */ do_action( 'dynamic_sidebar_after', $index, false ); - /** This filter is documented in wp-includes/widgets.php */ + /** This filter is documented in wp-includes/widget.php */ return apply_filters( 'dynamic_sidebar_has_widgets', false, $index ); } /** * Fires before widgets are rendered in a dynamic sidebar. * - * Note: The action also fires for empty sidebars, and on both the front-end - * and back-end, including the Inactive Widgets sidebar on the Widgets screen. + * Note: The action also fires for empty sidebars, and on both the front end + * and back end, including the Inactive Widgets sidebar on the Widgets screen. * * @since 3.9.0 * @@ -1018,7 +674,7 @@ function dynamic_sidebar($index = 1) { /** * Filter the parameters passed to a widget's display callback. * - * Note: The filter is evaluated on both the front-end and back-end, + * Note: The filter is evaluated on both the front end and back end, * including for the Inactive Widgets sidebar on the Widgets screen. * * @since 2.5.0 @@ -1054,7 +710,7 @@ function dynamic_sidebar($index = 1) { /** * Fires before a widget's display callback is called. * - * Note: The action fires on both the front-end and back-end, including + * Note: The action fires on both the front end and back end, including * for widgets in the Inactive Widgets sidebar on the Widgets screen. * * The action is not fired for empty sidebars. @@ -1066,13 +722,13 @@ function dynamic_sidebar($index = 1) { * * @type string $name Name of the widget. * @type string $id Widget ID. - * @type array|callback $callback When the hook is fired on the front-end, $callback is an array - * containing the widget object. Fired on the back-end, $callback + * @type array|callable $callback When the hook is fired on the front end, $callback is an array + * containing the widget object. Fired on the back end, $callback * is 'wp_widget_control', see $_callback. * @type array $params An associative array of multi-widget arguments. * @type string $classname CSS class applied to the widget container. * @type string $description The widget description. - * @type array $_callback When the hook is fired on the back-end, $_callback is populated + * @type array $_callback When the hook is fired on the back end, $_callback is populated * with an array containing the widget object, see $callback. * } */ @@ -1087,8 +743,8 @@ function dynamic_sidebar($index = 1) { /** * Fires after widgets are rendered in a dynamic sidebar. * - * Note: The action also fires for empty sidebars, and on both the front-end - * and back-end, including the Inactive Widgets sidebar on the Widgets screen. + * Note: The action also fires for empty sidebars, and on both the front end + * and back end, including the Inactive Widgets sidebar on the Widgets screen. * * @since 3.9.0 * @@ -1101,8 +757,8 @@ function dynamic_sidebar($index = 1) { /** * Filter whether a sidebar has widgets. * - * Note: The filter is also evaluated for empty sidebars, and on both the front-end - * and back-end, including the Inactive Widgets sidebar on the Widgets screen. + * Note: The filter is also evaluated for empty sidebars, and on both the front end + * and back end, including the Inactive Widgets sidebar on the Widgets screen. * * @since 3.9.0 * @@ -1110,14 +766,11 @@ function dynamic_sidebar($index = 1) { * Default false. * @param int|string $index Index, name, or ID of the dynamic sidebar. */ - - $did_one = apply_filters( 'dynamic_sidebar_has_widgets', $did_one, $index ); - - return $did_one; + return apply_filters( 'dynamic_sidebar_has_widgets', $did_one, $index ); } /** - * Whether widget is displayed on the front-end. + * Whether widget is displayed on the front end. * * Either $callback or $id_base can be used * $id_base is the first argument when extending WP_Widget class @@ -1131,21 +784,24 @@ function dynamic_sidebar($index = 1) { * * @since 2.2.0 * - * @param string $callback Optional, Widget callback to check. - * @param int $widget_id Optional, but needed for checking. Widget ID. - * @param string $id_base Optional, the base ID of a widget created by extending WP_Widget. - * @param bool $skip_inactive Optional, whether to check in 'wp_inactive_widgets'. - * @return mixed false if widget is not active or id of sidebar in which the widget is active. + * @global array $wp_registered_widgets + * + * @param string|false $callback Optional, Widget callback to check. Default false. + * @param int|false $widget_id Optional. Widget ID. Optional, but needed for checking. Default false. + * @param string|false $id_base Optional. The base ID of a widget created by extending WP_Widget. Default false. + * @param bool $skip_inactive Optional. Whether to check in 'wp_inactive_widgets'. Default true. + * @return string|false False if widget is not active or id of sidebar in which the widget is active. */ -function is_active_widget($callback = false, $widget_id = false, $id_base = false, $skip_inactive = true) { +function is_active_widget( $callback = false, $widget_id = false, $id_base = false, $skip_inactive = true ) { global $wp_registered_widgets; $sidebars_widgets = wp_get_sidebars_widgets(); if ( is_array($sidebars_widgets) ) { foreach ( $sidebars_widgets as $sidebar => $widgets ) { - if ( $skip_inactive && 'wp_inactive_widgets' == $sidebar ) + if ( $skip_inactive && ( 'wp_inactive_widgets' === $sidebar || 'orphaned_widgets' === substr( $sidebar, 0, 16 ) ) ) { continue; + } if ( is_array($widgets) ) { foreach ( $widgets as $widget ) { @@ -1165,13 +821,16 @@ function is_active_widget($callback = false, $widget_id = false, $id_base = fals * * @since 2.2.0 * + * @global array $wp_registered_widgets + * @global array $wp_registered_sidebars + * * @return bool True, if using widgets. False, if not using widgets. */ function is_dynamic_sidebar() { global $wp_registered_widgets, $wp_registered_sidebars; $sidebars_widgets = get_option('sidebars_widgets'); foreach ( (array) $wp_registered_sidebars as $index => $sidebar ) { - if ( count($sidebars_widgets[$index]) ) { + if ( ! empty( $sidebars_widgets[ $index ] ) ) { foreach ( (array) $sidebars_widgets[$index] as $widget ) if ( array_key_exists($widget, $wp_registered_widgets) ) return true; @@ -1185,7 +844,7 @@ function is_dynamic_sidebar() { * * @since 2.8.0 * - * @param mixed $index Sidebar name, id or number to check. + * @param string|int $index Sidebar name, id or number to check. * @return bool true if the sidebar is in use, false otherwise. */ function is_active_sidebar( $index ) { @@ -1205,10 +864,12 @@ function is_active_sidebar( $index ) { return apply_filters( 'is_active_sidebar', $is_active_sidebar, $index ); } -/* Internal Functions */ +// +// Internal Functions +// /** - * Retrieve full list of sidebars and their widgets. + * Retrieve full list of sidebars and their widget instance IDs. * * Will upgrade sidebar widget list, if needed. Will also save updated list, if * needed. @@ -1216,10 +877,13 @@ function is_active_sidebar( $index ) { * @since 2.2.0 * @access private * - * @param bool $deprecated Not used (deprecated). + * @global array $_wp_sidebars_widgets + * @global array $sidebars_widgets + * + * @param bool $deprecated Not used (argument deprecated). * @return array Upgraded list of widgets to version 3 array format when called from the admin. */ -function wp_get_sidebars_widgets($deprecated = true) { +function wp_get_sidebars_widgets( $deprecated = true ) { if ( $deprecated !== true ) _deprecated_argument( __FUNCTION__, '2.8.1' ); @@ -1246,8 +910,7 @@ function wp_get_sidebars_widgets($deprecated = true) { * * @param array $sidebars_widgets An associative array of sidebars and their widgets. */ - $sidebars_widgets = apply_filters( 'sidebars_widgets', $sidebars_widgets ); - return $sidebars_widgets; + return apply_filters( 'sidebars_widgets', $sidebars_widgets ); } /** @@ -1270,6 +933,8 @@ function wp_set_sidebars_widgets( $sidebars_widgets ) { * @since 2.2.0 * @access private * + * @global array $wp_registered_sidebars + * * @return array */ function wp_get_widget_defaults() { @@ -1288,6 +953,11 @@ function wp_get_widget_defaults() { * * @since 2.8.0 * + * @global array $_wp_sidebars_widgets + * + * @param string $base_name + * @param string $option_name + * @param array $settings * @return array */ function wp_convert_widget_settings($base_name, $option_name, $settings) { @@ -1346,22 +1016,40 @@ function wp_convert_widget_settings($base_name, $option_name, $settings) { * * @since 2.8.0 * - * @param string $widget the widget's PHP class name (see default-widgets.php) - * @param array $instance the widget's instance settings - * @param array $args the widget's sidebar args - * @return void - **/ -function the_widget($widget, $instance = array(), $args = array()) { + * @global WP_Widget_Factory $wp_widget_factory + * + * @param string $widget The widget's PHP class name (see class-wp-widget.php). + * @param array $instance Optional. The widget's instance settings. Default empty array. + * @param array $args { + * Optional. Array of arguments to configure the display of the widget. + * + * @type string $before_widget HTML content that will be prepended to the widget's HTML output. + * Default `<div class="widget %s">`, where `%s` is the widget's class name. + * @type string $after_widget HTML content that will be appended to the widget's HTML output. + * Default `</div>`. + * @type string $before_title HTML content that will be prepended to the widget's title when displayed. + * Default `<h2 class="widgettitle">`. + * @type string $after_title HTML content that will be appended to the widget's title when displayed. + * Default `</h2>`. + * } + */ +function the_widget( $widget, $instance = array(), $args = array() ) { global $wp_widget_factory; $widget_obj = $wp_widget_factory->widgets[$widget]; - if ( !is_a($widget_obj, 'WP_Widget') ) + if ( ! ( $widget_obj instanceof WP_Widget ) ) { return; + } - $before_widget = sprintf('<div class="widget %s">', $widget_obj->widget_options['classname'] ); - $default_args = array( 'before_widget' => $before_widget, 'after_widget' => "</div>", 'before_title' => '<h2 class="widgettitle">', 'after_title' => '</h2>' ); + $default_args = array( + 'before_widget' => '<div class="widget %s">', + 'after_widget' => "</div>", + 'before_title' => '<h2 class="widgettitle">', + 'after_title' => '</h2>', + ); + $args = wp_parse_args( $args, $default_args ); + $args['before_widget'] = sprintf( $args['before_widget'], $widget_obj->widget_options['classname'] ); - $args = wp_parse_args($args, $default_args); $instance = wp_parse_args($instance); /** @@ -1380,9 +1068,14 @@ function the_widget($widget, $instance = array(), $args = array()) { } /** - * Private + * Retrieves the widget ID base value. + * + * @since 2.8.0 + * + * @param string $id Widget ID. + * @return string Widget ID base. */ -function _get_widget_id_base($id) { +function _get_widget_id_base( $id ) { return preg_replace( '/-[0-9]+$/', '', $id ); } @@ -1391,6 +1084,8 @@ function _get_widget_id_base($id) { * * @access private * @since 3.3.0 + * + * @global array $sidebars_widgets */ function _wp_sidebars_changed() { global $sidebars_widgets; @@ -1406,9 +1101,13 @@ function _wp_sidebars_changed() { * * @since 2.8.0 * - * @param mixed $theme_changed Whether the theme was changed as a boolean. A value - * of 'customize' defers updates for the customizer. - * @return array + * @global array $wp_registered_sidebars + * @global array $sidebars_widgets + * @global array $wp_registered_widgets + * + * @param string|bool $theme_changed Whether the theme was changed as a boolean. A value + * of 'customize' defers updates for the Customizer. + * @return array|void */ function retrieve_widgets( $theme_changed = false ) { global $wp_registered_sidebars, $sidebars_widgets, $wp_registered_widgets; @@ -1426,8 +1125,9 @@ function retrieve_widgets( $theme_changed = false ) { } foreach ( $_sidebars_widgets as $sidebar => $widgets ) { - if ( 'wp_inactive_widgets' == $sidebar || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) ) + if ( 'wp_inactive_widgets' === $sidebar || 'orphaned_widgets' === substr( $sidebar, 0, 16 ) ) { continue; + } if ( !in_array( $sidebar, $registered_sidebar_keys ) ) { $_sidebars_widgets['orphaned_widgets_' . ++$orphaned] = $widgets; @@ -1512,3 +1212,265 @@ function retrieve_widgets( $theme_changed = false ) { return $sidebars_widgets; } + +/** + * Display the RSS entries in a list. + * + * @since 2.5.0 + * + * @param string|array|object $rss RSS url. + * @param array $args Widget arguments. + */ +function wp_widget_rss_output( $rss, $args = array() ) { + if ( is_string( $rss ) ) { + $rss = fetch_feed($rss); + } elseif ( is_array($rss) && isset($rss['url']) ) { + $args = $rss; + $rss = fetch_feed($rss['url']); + } elseif ( !is_object($rss) ) { + return; + } + + if ( is_wp_error($rss) ) { + if ( is_admin() || current_user_can('manage_options') ) + echo '<p>' . sprintf( __('<strong>RSS Error</strong>: %s'), $rss->get_error_message() ) . '</p>'; + return; + } + + $default_args = array( 'show_author' => 0, 'show_date' => 0, 'show_summary' => 0, 'items' => 0 ); + $args = wp_parse_args( $args, $default_args ); + + $items = (int) $args['items']; + if ( $items < 1 || 20 < $items ) + $items = 10; + $show_summary = (int) $args['show_summary']; + $show_author = (int) $args['show_author']; + $show_date = (int) $args['show_date']; + + if ( !$rss->get_item_quantity() ) { + echo '<ul><li>' . __( 'An error has occurred, which probably means the feed is down. Try again later.' ) . '</li></ul>'; + $rss->__destruct(); + unset($rss); + return; + } + + echo '<ul>'; + foreach ( $rss->get_items( 0, $items ) as $item ) { + $link = $item->get_link(); + while ( stristr( $link, 'http' ) != $link ) { + $link = substr( $link, 1 ); + } + $link = esc_url( strip_tags( $link ) ); + + $title = esc_html( trim( strip_tags( $item->get_title() ) ) ); + if ( empty( $title ) ) { + $title = __( 'Untitled' ); + } + + $desc = @html_entity_decode( $item->get_description(), ENT_QUOTES, get_option( 'blog_charset' ) ); + $desc = esc_attr( wp_trim_words( $desc, 55, ' […]' ) ); + + $summary = ''; + if ( $show_summary ) { + $summary = $desc; + + // Change existing [...] to […]. + if ( '[...]' == substr( $summary, -5 ) ) { + $summary = substr( $summary, 0, -5 ) . '[…]'; + } + + $summary = '<div class="rssSummary">' . esc_html( $summary ) . '</div>'; + } + + $date = ''; + if ( $show_date ) { + $date = $item->get_date( 'U' ); + + if ( $date ) { + $date = ' <span class="rss-date">' . date_i18n( get_option( 'date_format' ), $date ) . '</span>'; + } + } + + $author = ''; + if ( $show_author ) { + $author = $item->get_author(); + if ( is_object($author) ) { + $author = $author->get_name(); + $author = ' <cite>' . esc_html( strip_tags( $author ) ) . '</cite>'; + } + } + + if ( $link == '' ) { + echo "<li>$title{$date}{$summary}{$author}</li>"; + } elseif ( $show_summary ) { + echo "<li><a class='rsswidget' href='$link'>$title</a>{$date}{$summary}{$author}</li>"; + } else { + echo "<li><a class='rsswidget' href='$link'>$title</a>{$date}{$author}</li>"; + } + } + echo '</ul>'; + $rss->__destruct(); + unset($rss); +} + +/** + * Display RSS widget options form. + * + * The options for what fields are displayed for the RSS form are all booleans + * and are as follows: 'url', 'title', 'items', 'show_summary', 'show_author', + * 'show_date'. + * + * @since 2.5.0 + * + * @param array|string $args Values for input fields. + * @param array $inputs Override default display options. + */ +function wp_widget_rss_form( $args, $inputs = null ) { + $default_inputs = array( 'url' => true, 'title' => true, 'items' => true, 'show_summary' => true, 'show_author' => true, 'show_date' => true ); + $inputs = wp_parse_args( $inputs, $default_inputs ); + + $args['title'] = isset( $args['title'] ) ? $args['title'] : ''; + $args['url'] = isset( $args['url'] ) ? $args['url'] : ''; + $args['items'] = isset( $args['items'] ) ? (int) $args['items'] : 0; + + if ( $args['items'] < 1 || 20 < $args['items'] ) { + $args['items'] = 10; + } + + $args['show_summary'] = isset( $args['show_summary'] ) ? (int) $args['show_summary'] : (int) $inputs['show_summary']; + $args['show_author'] = isset( $args['show_author'] ) ? (int) $args['show_author'] : (int) $inputs['show_author']; + $args['show_date'] = isset( $args['show_date'] ) ? (int) $args['show_date'] : (int) $inputs['show_date']; + + if ( ! empty( $args['error'] ) ) { + echo '<p class="widget-error"><strong>' . sprintf( __( 'RSS Error: %s' ), $args['error'] ) . '</strong></p>'; + } + + $esc_number = esc_attr( $args['number'] ); + if ( $inputs['url'] ) : +?> + <p><label for="rss-url-<?php echo $esc_number; ?>"><?php _e( 'Enter the RSS feed URL here:' ); ?></label> + <input class="widefat" id="rss-url-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][url]" type="text" value="<?php echo esc_url( $args['url'] ); ?>" /></p> +<?php endif; if ( $inputs['title'] ) : ?> + <p><label for="rss-title-<?php echo $esc_number; ?>"><?php _e( 'Give the feed a title (optional):' ); ?></label> + <input class="widefat" id="rss-title-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][title]" type="text" value="<?php echo esc_attr( $args['title'] ); ?>" /></p> +<?php endif; if ( $inputs['items'] ) : ?> + <p><label for="rss-items-<?php echo $esc_number; ?>"><?php _e( 'How many items would you like to display?' ); ?></label> + <select id="rss-items-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][items]"> + <?php + for ( $i = 1; $i <= 20; ++$i ) { + echo "<option value='$i' " . selected( $args['items'], $i, false ) . ">$i</option>"; + } + ?> + </select></p> +<?php endif; if ( $inputs['show_summary'] ) : ?> + <p><input id="rss-show-summary-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][show_summary]" type="checkbox" value="1" <?php checked( $args['show_summary'] ); ?> /> + <label for="rss-show-summary-<?php echo $esc_number; ?>"><?php _e( 'Display item content?' ); ?></label></p> +<?php endif; if ( $inputs['show_author'] ) : ?> + <p><input id="rss-show-author-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][show_author]" type="checkbox" value="1" <?php checked( $args['show_author'] ); ?> /> + <label for="rss-show-author-<?php echo $esc_number; ?>"><?php _e( 'Display item author if available?' ); ?></label></p> +<?php endif; if ( $inputs['show_date'] ) : ?> + <p><input id="rss-show-date-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][show_date]" type="checkbox" value="1" <?php checked( $args['show_date'] ); ?>/> + <label for="rss-show-date-<?php echo $esc_number; ?>"><?php _e( 'Display item date?' ); ?></label></p> +<?php + endif; + foreach ( array_keys($default_inputs) as $input ) : + if ( 'hidden' === $inputs[$input] ) : + $id = str_replace( '_', '-', $input ); +?> + <input type="hidden" id="rss-<?php echo esc_attr( $id ); ?>-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][<?php echo esc_attr( $input ); ?>]" value="<?php echo esc_attr( $args[ $input ] ); ?>" /> +<?php + endif; + endforeach; +} + +/** + * Process RSS feed widget data and optionally retrieve feed items. + * + * The feed widget can not have more than 20 items or it will reset back to the + * default, which is 10. + * + * The resulting array has the feed title, feed url, feed link (from channel), + * feed items, error (if any), and whether to show summary, author, and date. + * All respectively in the order of the array elements. + * + * @since 2.5.0 + * + * @param array $widget_rss RSS widget feed data. Expects unescaped data. + * @param bool $check_feed Optional, default is true. Whether to check feed for errors. + * @return array + */ +function wp_widget_rss_process( $widget_rss, $check_feed = true ) { + $items = (int) $widget_rss['items']; + if ( $items < 1 || 20 < $items ) + $items = 10; + $url = esc_url_raw( strip_tags( $widget_rss['url'] ) ); + $title = isset( $widget_rss['title'] ) ? trim( strip_tags( $widget_rss['title'] ) ) : ''; + $show_summary = isset( $widget_rss['show_summary'] ) ? (int) $widget_rss['show_summary'] : 0; + $show_author = isset( $widget_rss['show_author'] ) ? (int) $widget_rss['show_author'] :0; + $show_date = isset( $widget_rss['show_date'] ) ? (int) $widget_rss['show_date'] : 0; + + if ( $check_feed ) { + $rss = fetch_feed($url); + $error = false; + $link = ''; + if ( is_wp_error($rss) ) { + $error = $rss->get_error_message(); + } else { + $link = esc_url(strip_tags($rss->get_permalink())); + while ( stristr($link, 'http') != $link ) + $link = substr($link, 1); + + $rss->__destruct(); + unset($rss); + } + } + + return compact( 'title', 'url', 'link', 'items', 'error', 'show_summary', 'show_author', 'show_date' ); +} + +/** + * Register all of the default WordPress widgets on startup. + * + * Calls 'widgets_init' action after all of the WordPress widgets have been + * registered. + * + * @since 2.2.0 + */ +function wp_widgets_init() { + if ( !is_blog_installed() ) + return; + + register_widget('WP_Widget_Pages'); + + register_widget('WP_Widget_Calendar'); + + register_widget('WP_Widget_Archives'); + + if ( get_option( 'link_manager_enabled' ) ) + register_widget('WP_Widget_Links'); + + register_widget('WP_Widget_Meta'); + + register_widget('WP_Widget_Search'); + + register_widget('WP_Widget_Text'); + + register_widget('WP_Widget_Categories'); + + register_widget('WP_Widget_Recent_Posts'); + + register_widget('WP_Widget_Recent_Comments'); + + register_widget('WP_Widget_RSS'); + + register_widget('WP_Widget_Tag_Cloud'); + + register_widget('WP_Nav_Menu_Widget'); + + /** + * Fires after all default WordPress widgets have been registered. + * + * @since 2.2.0 + */ + do_action( 'widgets_init' ); +} diff --git a/wp-includes/widgets/class-wp-nav-menu-widget.php b/wp-includes/widgets/class-wp-nav-menu-widget.php new file mode 100644 index 0000000..d465525 --- /dev/null +++ b/wp-includes/widgets/class-wp-nav-menu-widget.php @@ -0,0 +1,152 @@ +<?php +/** + * Widget API: WP_Nav_Menu_Widget class + * + * @package WordPress + * @subpackage Widgets + * @since 4.4.0 + */ + +/** + * Core class used to implement the Custom Menu widget. + * + * @since 3.0.0 + * + * @see WP_Widget + */ + class WP_Nav_Menu_Widget extends WP_Widget { + + /** + * Sets up a new Custom Menu widget instance. + * + * @since 3.0.0 + * @access public + */ + public function __construct() { + $widget_ops = array( + 'description' => __( 'Add a custom menu to your sidebar.' ), + 'customize_selective_refresh' => true, + ); + parent::__construct( 'nav_menu', __('Custom Menu'), $widget_ops ); + } + + /** + * Outputs the content for the current Custom Menu widget instance. + * + * @since 3.0.0 + * @access public + * + * @param array $args Display arguments including 'before_title', 'after_title', + * 'before_widget', and 'after_widget'. + * @param array $instance Settings for the current Custom Menu widget instance. + */ + public function widget( $args, $instance ) { + // Get menu + $nav_menu = ! empty( $instance['nav_menu'] ) ? wp_get_nav_menu_object( $instance['nav_menu'] ) : false; + + if ( !$nav_menu ) + return; + + /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */ + $instance['title'] = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base ); + + echo $args['before_widget']; + + if ( !empty($instance['title']) ) + echo $args['before_title'] . $instance['title'] . $args['after_title']; + + $nav_menu_args = array( + 'fallback_cb' => '', + 'menu' => $nav_menu + ); + + /** + * Filter the arguments for the Custom Menu widget. + * + * @since 4.2.0 + * @since 4.4.0 Added the `$instance` parameter. + * + * @param array $nav_menu_args { + * An array of arguments passed to wp_nav_menu() to retrieve a custom menu. + * + * @type callable|bool $fallback_cb Callback to fire if the menu doesn't exist. Default empty. + * @type mixed $menu Menu ID, slug, or name. + * } + * @param stdClass $nav_menu Nav menu object for the current menu. + * @param array $args Display arguments for the current widget. + * @param array $instance Array of settings for the current widget. + */ + wp_nav_menu( apply_filters( 'widget_nav_menu_args', $nav_menu_args, $nav_menu, $args, $instance ) ); + + echo $args['after_widget']; + } + + /** + * Handles updating settings for the current Custom Menu widget instance. + * + * @since 3.0.0 + * @access public + * + * @param array $new_instance New settings for this instance as input by the user via + * WP_Widget::form(). + * @param array $old_instance Old settings for this instance. + * @return array Updated settings to save. + */ + public function update( $new_instance, $old_instance ) { + $instance = array(); + if ( ! empty( $new_instance['title'] ) ) { + $instance['title'] = sanitize_text_field( $new_instance['title'] ); + } + if ( ! empty( $new_instance['nav_menu'] ) ) { + $instance['nav_menu'] = (int) $new_instance['nav_menu']; + } + return $instance; + } + + /** + * Outputs the settings form for the Custom Menu widget. + * + * @since 3.0.0 + * @access public + * + * @param array $instance Current settings. + */ + public function form( $instance ) { + $title = isset( $instance['title'] ) ? $instance['title'] : ''; + $nav_menu = isset( $instance['nav_menu'] ) ? $instance['nav_menu'] : ''; + + // Get menus + $menus = wp_get_nav_menus(); + + // If no menus exists, direct the user to go and create some. + ?> + <p class="nav-menu-widget-no-menus-message" <?php if ( ! empty( $menus ) ) { echo ' style="display:none" '; } ?>> + <?php + if ( isset( $GLOBALS['wp_customize'] ) && $GLOBALS['wp_customize'] instanceof WP_Customize_Manager ) { + $url = 'javascript: wp.customize.panel( "nav_menus" ).focus();'; + } else { + $url = admin_url( 'nav-menus.php' ); + } + ?> + <?php echo sprintf( __( 'No menus have been created yet. <a href="%s">Create some</a>.' ), esc_attr( $url ) ); ?> + </p> + <div class="nav-menu-widget-form-controls" <?php if ( empty( $menus ) ) { echo ' style="display:none" '; } ?>> + <p> + <label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ) ?></label> + <input type="text" class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" value="<?php echo esc_attr( $title ); ?>"/> + </p> + <p> + <label for="<?php echo $this->get_field_id( 'nav_menu' ); ?>"><?php _e( 'Select Menu:' ); ?></label> + <select id="<?php echo $this->get_field_id( 'nav_menu' ); ?>" name="<?php echo $this->get_field_name( 'nav_menu' ); ?>"> + <option value="0"><?php _e( '— Select —' ); ?></option> + <?php foreach ( $menus as $menu ) : ?> + <option value="<?php echo esc_attr( $menu->term_id ); ?>" <?php selected( $nav_menu, $menu->term_id ); ?>> + <?php echo esc_html( $menu->name ); ?> + </option> + <?php endforeach; ?> + </select> + </p> + </div> + <?php + } +} diff --git a/wp-includes/widgets/class-wp-widget-archives.php b/wp-includes/widgets/class-wp-widget-archives.php new file mode 100644 index 0000000..ba12572 --- /dev/null +++ b/wp-includes/widgets/class-wp-widget-archives.php @@ -0,0 +1,165 @@ +<?php +/** + * Widget API: WP_Widget_Archives class + * + * @package WordPress + * @subpackage Widgets + * @since 4.4.0 + */ + +/** + * Core class used to implement the Archives widget. + * + * @since 2.8.0 + * + * @see WP_Widget + */ +class WP_Widget_Archives extends WP_Widget { + + /** + * Sets up a new Archives widget instance. + * + * @since 2.8.0 + * @access public + */ + public function __construct() { + $widget_ops = array( + 'classname' => 'widget_archive', + 'description' => __( 'A monthly archive of your site’s Posts.' ), + 'customize_selective_refresh' => true, + ); + parent::__construct('archives', __('Archives'), $widget_ops); + } + + /** + * Outputs the content for the current Archives widget instance. + * + * @since 2.8.0 + * @access public + * + * @param array $args Display arguments including 'before_title', 'after_title', + * 'before_widget', and 'after_widget'. + * @param array $instance Settings for the current Archives widget instance. + */ + public function widget( $args, $instance ) { + $c = ! empty( $instance['count'] ) ? '1' : '0'; + $d = ! empty( $instance['dropdown'] ) ? '1' : '0'; + + /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */ + $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Archives' ) : $instance['title'], $instance, $this->id_base ); + + echo $args['before_widget']; + if ( $title ) { + echo $args['before_title'] . $title . $args['after_title']; + } + + if ( $d ) { + $dropdown_id = "{$this->id_base}-dropdown-{$this->number}"; + ?> + <label class="screen-reader-text" for="<?php echo esc_attr( $dropdown_id ); ?>"><?php echo $title; ?></label> + <select id="<?php echo esc_attr( $dropdown_id ); ?>" name="archive-dropdown" onchange='document.location.href=this.options[this.selectedIndex].value;'> + <?php + /** + * Filter the arguments for the Archives widget drop-down. + * + * @since 2.8.0 + * + * @see wp_get_archives() + * + * @param array $args An array of Archives widget drop-down arguments. + */ + $dropdown_args = apply_filters( 'widget_archives_dropdown_args', array( + 'type' => 'monthly', + 'format' => 'option', + 'show_post_count' => $c + ) ); + + switch ( $dropdown_args['type'] ) { + case 'yearly': + $label = __( 'Select Year' ); + break; + case 'monthly': + $label = __( 'Select Month' ); + break; + case 'daily': + $label = __( 'Select Day' ); + break; + case 'weekly': + $label = __( 'Select Week' ); + break; + default: + $label = __( 'Select Post' ); + break; + } + ?> + + <option value=""><?php echo esc_attr( $label ); ?></option> + <?php wp_get_archives( $dropdown_args ); ?> + + </select> + <?php } else { ?> + <ul> + <?php + /** + * Filter the arguments for the Archives widget. + * + * @since 2.8.0 + * + * @see wp_get_archives() + * + * @param array $args An array of Archives option arguments. + */ + wp_get_archives( apply_filters( 'widget_archives_args', array( + 'type' => 'monthly', + 'show_post_count' => $c + ) ) ); + ?> + </ul> + <?php + } + + echo $args['after_widget']; + } + + /** + * Handles updating settings for the current Archives widget instance. + * + * @since 2.8.0 + * @access public + * + * @param array $new_instance New settings for this instance as input by the user via + * WP_Widget_Archives::form(). + * @param array $old_instance Old settings for this instance. + * @return array Updated settings to save. + */ + public function update( $new_instance, $old_instance ) { + $instance = $old_instance; + $new_instance = wp_parse_args( (array) $new_instance, array( 'title' => '', 'count' => 0, 'dropdown' => '') ); + $instance['title'] = sanitize_text_field( $new_instance['title'] ); + $instance['count'] = $new_instance['count'] ? 1 : 0; + $instance['dropdown'] = $new_instance['dropdown'] ? 1 : 0; + + return $instance; + } + + /** + * Outputs the settings form for the Archives widget. + * + * @since 2.8.0 + * @access public + * + * @param array $instance Current settings. + */ + public function form( $instance ) { + $instance = wp_parse_args( (array) $instance, array( 'title' => '', 'count' => 0, 'dropdown' => '') ); + $title = sanitize_text_field( $instance['title'] ); + ?> + <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?></label> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></p> + <p> + <input class="checkbox" type="checkbox"<?php checked( $instance['dropdown'] ); ?> id="<?php echo $this->get_field_id('dropdown'); ?>" name="<?php echo $this->get_field_name('dropdown'); ?>" /> <label for="<?php echo $this->get_field_id('dropdown'); ?>"><?php _e('Display as dropdown'); ?></label> + <br/> + <input class="checkbox" type="checkbox"<?php checked( $instance['count'] ); ?> id="<?php echo $this->get_field_id('count'); ?>" name="<?php echo $this->get_field_name('count'); ?>" /> <label for="<?php echo $this->get_field_id('count'); ?>"><?php _e('Show post counts'); ?></label> + </p> + <?php + } +} diff --git a/wp-includes/widgets/class-wp-widget-calendar.php b/wp-includes/widgets/class-wp-widget-calendar.php new file mode 100644 index 0000000..9969678 --- /dev/null +++ b/wp-includes/widgets/class-wp-widget-calendar.php @@ -0,0 +1,108 @@ +<?php +/** + * Widget API: WP_Widget_Calendar class + * + * @package WordPress + * @subpackage Widgets + * @since 4.4.0 + */ + +/** + * Core class used to implement the Calendar widget. + * + * @since 2.8.0 + * + * @see WP_Widget + */ +class WP_Widget_Calendar extends WP_Widget { + /** + * Ensure that the ID attribute only appears in the markup once + * + * @since 4.4.0 + * + * @static + * @access private + * @var int + */ + private static $instance = 0; + + /** + * Sets up a new Calendar widget instance. + * + * @since 2.8.0 + * @access public + */ + public function __construct() { + $widget_ops = array( + 'classname' => 'widget_calendar', + 'description' => __( 'A calendar of your site’s Posts.' ), + 'customize_selective_refresh' => true, + ); + parent::__construct( 'calendar', __( 'Calendar' ), $widget_ops ); + } + + /** + * Outputs the content for the current Calendar widget instance. + * + * @since 2.8.0 + * @access public + * + * @param array $args Display arguments including 'before_title', 'after_title', + * 'before_widget', and 'after_widget'. + * @param array $instance The settings for the particular instance of the widget. + */ + public function widget( $args, $instance ) { + /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */ + $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base ); + + echo $args['before_widget']; + if ( $title ) { + echo $args['before_title'] . $title . $args['after_title']; + } + if ( 0 === self::$instance ) { + echo '<div id="calendar_wrap" class="calendar_wrap">'; + } else { + echo '<div class="calendar_wrap">'; + } + get_calendar(); + echo '</div>'; + echo $args['after_widget']; + + self::$instance++; + } + + /** + * Handles updating settings for the current Calendar widget instance. + * + * @since 2.8.0 + * @access public + * + * @param array $new_instance New settings for this instance as input by the user via + * WP_Widget::form(). + * @param array $old_instance Old settings for this instance. + * @return array Updated settings to save. + */ + public function update( $new_instance, $old_instance ) { + $instance = $old_instance; + $instance['title'] = sanitize_text_field( $new_instance['title'] ); + + return $instance; + } + + /** + * Outputs the settings form for the Calendar widget. + * + * @since 2.8.0 + * @access public + * + * @param array $instance Current settings. + */ + public function form( $instance ) { + $instance = wp_parse_args( (array) $instance, array( 'title' => '' ) ); + $title = sanitize_text_field( $instance['title'] ); + ?> + <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?></label> + <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></p> + <?php + } +} diff --git a/wp-includes/widgets/class-wp-widget-categories.php b/wp-includes/widgets/class-wp-widget-categories.php new file mode 100644 index 0000000..2fbc62a --- /dev/null +++ b/wp-includes/widgets/class-wp-widget-categories.php @@ -0,0 +1,174 @@ +<?php +/** + * Widget API: WP_Widget_Categories class + * + * @package WordPress + * @subpackage Widgets + * @since 4.4.0 + */ + +/** + * Core class used to implement a Categories widget. + * + * @since 2.8.0 + * + * @see WP_Widget + */ +class WP_Widget_Categories extends WP_Widget { + + /** + * Sets up a new Categories widget instance. + * + * @since 2.8.0 + * @access public + */ + public function __construct() { + $widget_ops = array( + 'classname' => 'widget_categories', + 'description' => __( 'A list or dropdown of categories.' ), + 'customize_selective_refresh' => true, + ); + parent::__construct( 'categories', __( 'Categories' ), $widget_ops ); + } + + /** + * Outputs the content for the current Categories widget instance. + * + * @since 2.8.0 + * @access public + * + * @param array $args Display arguments including 'before_title', 'after_title', + * 'before_widget', and 'after_widget'. + * @param array $instance Settings for the current Categories widget instance. + */ + public function widget( $args, $instance ) { + static $first_dropdown = true; + + /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */ + $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Categories' ) : $instance['title'], $instance, $this->id_base ); + + $c = ! empty( $instance['count'] ) ? '1' : '0'; + $h = ! empty( $instance['hierarchical'] ) ? '1' : '0'; + $d = ! empty( $instance['dropdown'] ) ? '1' : '0'; + + echo $args['before_widget']; + if ( $title ) { + echo $args['before_title'] . $title . $args['after_title']; + } + + $cat_args = array( + 'orderby' => 'name', + 'show_count' => $c, + 'hierarchical' => $h + ); + + if ( $d ) { + $dropdown_id = ( $first_dropdown ) ? 'cat' : "{$this->id_base}-dropdown-{$this->number}"; + $first_dropdown = false; + + echo '<label class="screen-reader-text" for="' . esc_attr( $dropdown_id ) . '">' . $title . '</label>'; + + $cat_args['show_option_none'] = __( 'Select Category' ); + $cat_args['id'] = $dropdown_id; + + /** + * Filter the arguments for the Categories widget drop-down. + * + * @since 2.8.0 + * + * @see wp_dropdown_categories() + * + * @param array $cat_args An array of Categories widget drop-down arguments. + */ + wp_dropdown_categories( apply_filters( 'widget_categories_dropdown_args', $cat_args ) ); + ?> + +<script type='text/javascript'> +/* <![CDATA[ */ +(function() { + var dropdown = document.getElementById( "<?php echo esc_js( $dropdown_id ); ?>" ); + function onCatChange() { + if ( dropdown.options[ dropdown.selectedIndex ].value > 0 ) { + location.href = "<?php echo home_url(); ?>/?cat=" + dropdown.options[ dropdown.selectedIndex ].value; + } + } + dropdown.onchange = onCatChange; +})(); +/* ]]> */ +</script> + +<?php + } else { +?> + <ul> +<?php + $cat_args['title_li'] = ''; + + /** + * Filter the arguments for the Categories widget. + * + * @since 2.8.0 + * + * @param array $cat_args An array of Categories widget options. + */ + wp_list_categories( apply_filters( 'widget_categories_args', $cat_args ) ); +?> + </ul> +<?php + } + + echo $args['after_widget']; + } + + /** + * Handles updating settings for the current Categories widget instance. + * + * @since 2.8.0 + * @access public + * + * @param array $new_instance New settings for this instance as input by the user via + * WP_Widget::form(). + * @param array $old_instance Old settings for this instance. + * @return array Updated settings to save. + */ + public function update( $new_instance, $old_instance ) { + $instance = $old_instance; + $instance['title'] = sanitize_text_field( $new_instance['title'] ); + $instance['count'] = !empty($new_instance['count']) ? 1 : 0; + $instance['hierarchical'] = !empty($new_instance['hierarchical']) ? 1 : 0; + $instance['dropdown'] = !empty($new_instance['dropdown']) ? 1 : 0; + + return $instance; + } + + /** + * Outputs the settings form for the Categories widget. + * + * @since 2.8.0 + * @access public + * + * @param array $instance Current settings. + */ + public function form( $instance ) { + //Defaults + $instance = wp_parse_args( (array) $instance, array( 'title' => '') ); + $title = sanitize_text_field( $instance['title'] ); + $count = isset($instance['count']) ? (bool) $instance['count'] :false; + $hierarchical = isset( $instance['hierarchical'] ) ? (bool) $instance['hierarchical'] : false; + $dropdown = isset( $instance['dropdown'] ) ? (bool) $instance['dropdown'] : false; + ?> + <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:' ); ?></label> + <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></p> + + <p><input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('dropdown'); ?>" name="<?php echo $this->get_field_name('dropdown'); ?>"<?php checked( $dropdown ); ?> /> + <label for="<?php echo $this->get_field_id('dropdown'); ?>"><?php _e( 'Display as dropdown' ); ?></label><br /> + + <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('count'); ?>" name="<?php echo $this->get_field_name('count'); ?>"<?php checked( $count ); ?> /> + <label for="<?php echo $this->get_field_id('count'); ?>"><?php _e( 'Show post counts' ); ?></label><br /> + + <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hierarchical'); ?>" name="<?php echo $this->get_field_name('hierarchical'); ?>"<?php checked( $hierarchical ); ?> /> + <label for="<?php echo $this->get_field_id('hierarchical'); ?>"><?php _e( 'Show hierarchy' ); ?></label></p> + <?php + } + +} diff --git a/wp-includes/widgets/class-wp-widget-links.php b/wp-includes/widgets/class-wp-widget-links.php new file mode 100644 index 0000000..68d86f1 --- /dev/null +++ b/wp-includes/widgets/class-wp-widget-links.php @@ -0,0 +1,166 @@ +<?php +/** + * Widget API: WP_Widget_Links class + * + * @package WordPress + * @subpackage Widgets + * @since 4.4.0 + */ + +/** + * Core class used to implement a Links widget. + * + * @since 2.8.0 + * + * @see WP_Widget + */ +class WP_Widget_Links extends WP_Widget { + + /** + * Sets up a new Links widget instance. + * + * @since 2.8.0 + * @access public + */ + public function __construct() { + $widget_ops = array( + 'description' => __( 'Your blogroll' ), + 'customize_selective_refresh' => true, + ); + parent::__construct( 'links', __( 'Links' ), $widget_ops ); + } + + /** + * Outputs the content for the current Links widget instance. + * + * @since 2.8.0 + * @access public + * + * @param array $args Display arguments including 'before_title', 'after_title', + * 'before_widget', and 'after_widget'. + * @param array $instance Settings for the current Links widget instance. + */ + public function widget( $args, $instance ) { + $show_description = isset($instance['description']) ? $instance['description'] : false; + $show_name = isset($instance['name']) ? $instance['name'] : false; + $show_rating = isset($instance['rating']) ? $instance['rating'] : false; + $show_images = isset($instance['images']) ? $instance['images'] : true; + $category = isset($instance['category']) ? $instance['category'] : false; + $orderby = isset( $instance['orderby'] ) ? $instance['orderby'] : 'name'; + $order = $orderby == 'rating' ? 'DESC' : 'ASC'; + $limit = isset( $instance['limit'] ) ? $instance['limit'] : -1; + + $before_widget = preg_replace( '/id="[^"]*"/', 'id="%id"', $args['before_widget'] ); + + $widget_links_args = array( + 'title_before' => $args['before_title'], + 'title_after' => $args['after_title'], + 'category_before' => $before_widget, + 'category_after' => $args['after_widget'], + 'show_images' => $show_images, + 'show_description' => $show_description, + 'show_name' => $show_name, + 'show_rating' => $show_rating, + 'category' => $category, + 'class' => 'linkcat widget', + 'orderby' => $orderby, + 'order' => $order, + 'limit' => $limit, + ); + + /** + * Filter the arguments for the Links widget. + * + * @since 2.6.0 + * @since 4.4.0 The `$instance` parameter was added. + * + * @see wp_list_bookmarks() + * + * @param array $widget_links_args An array of arguments to retrieve the links list. + * @param array $instance The settings for the particular instance of the widget. + */ + wp_list_bookmarks( apply_filters( 'widget_links_args', $widget_links_args, $instance ) ); + } + + /** + * Handles updating settings for the current Links widget instance. + * + * @since 2.8.0 + * @access public + * + * @param array $new_instance New settings for this instance as input by the user via + * WP_Widget::form(). + * @param array $old_instance Old settings for this instance. + * @return array Updated settings to save. + */ + public function update( $new_instance, $old_instance ) { + $new_instance = (array) $new_instance; + $instance = array( 'images' => 0, 'name' => 0, 'description' => 0, 'rating' => 0 ); + foreach ( $instance as $field => $val ) { + if ( isset($new_instance[$field]) ) + $instance[$field] = 1; + } + + $instance['orderby'] = 'name'; + if ( in_array( $new_instance['orderby'], array( 'name', 'rating', 'id', 'rand' ) ) ) + $instance['orderby'] = $new_instance['orderby']; + + $instance['category'] = intval( $new_instance['category'] ); + $instance['limit'] = ! empty( $new_instance['limit'] ) ? intval( $new_instance['limit'] ) : -1; + + return $instance; + } + + /** + * Outputs the settings form for the Links widget. + * + * @since 2.8.0 + * @access public + * + * @param array $instance Current settings. + */ + public function form( $instance ) { + + //Defaults + $instance = wp_parse_args( (array) $instance, array( 'images' => true, 'name' => true, 'description' => false, 'rating' => false, 'category' => false, 'orderby' => 'name', 'limit' => -1 ) ); + $link_cats = get_terms( 'link_category' ); + if ( ! $limit = intval( $instance['limit'] ) ) + $limit = -1; + ?> + <p> + <label for="<?php echo $this->get_field_id('category'); ?>"><?php _e( 'Select Link Category:' ); ?></label> + <select class="widefat" id="<?php echo $this->get_field_id('category'); ?>" name="<?php echo $this->get_field_name('category'); ?>"> + <option value=""><?php _ex('All Links', 'links widget'); ?></option> + <?php + foreach ( $link_cats as $link_cat ) { + echo '<option value="' . intval( $link_cat->term_id ) . '"' + . selected( $instance['category'], $link_cat->term_id, false ) + . '>' . $link_cat->name . "</option>\n"; + } + ?> + </select> + <label for="<?php echo $this->get_field_id('orderby'); ?>"><?php _e( 'Sort by:' ); ?></label> + <select name="<?php echo $this->get_field_name('orderby'); ?>" id="<?php echo $this->get_field_id('orderby'); ?>" class="widefat"> + <option value="name"<?php selected( $instance['orderby'], 'name' ); ?>><?php _e( 'Link title' ); ?></option> + <option value="rating"<?php selected( $instance['orderby'], 'rating' ); ?>><?php _e( 'Link rating' ); ?></option> + <option value="id"<?php selected( $instance['orderby'], 'id' ); ?>><?php _e( 'Link ID' ); ?></option> + <option value="rand"<?php selected( $instance['orderby'], 'rand' ); ?>><?php _ex( 'Random', 'Links widget' ); ?></option> + </select> + </p> + <p> + <input class="checkbox" type="checkbox"<?php checked($instance['images'], true) ?> id="<?php echo $this->get_field_id('images'); ?>" name="<?php echo $this->get_field_name('images'); ?>" /> + <label for="<?php echo $this->get_field_id('images'); ?>"><?php _e('Show Link Image'); ?></label><br /> + <input class="checkbox" type="checkbox"<?php checked($instance['name'], true) ?> id="<?php echo $this->get_field_id('name'); ?>" name="<?php echo $this->get_field_name('name'); ?>" /> + <label for="<?php echo $this->get_field_id('name'); ?>"><?php _e('Show Link Name'); ?></label><br /> + <input class="checkbox" type="checkbox"<?php checked($instance['description'], true) ?> id="<?php echo $this->get_field_id('description'); ?>" name="<?php echo $this->get_field_name('description'); ?>" /> + <label for="<?php echo $this->get_field_id('description'); ?>"><?php _e('Show Link Description'); ?></label><br /> + <input class="checkbox" type="checkbox"<?php checked($instance['rating'], true) ?> id="<?php echo $this->get_field_id('rating'); ?>" name="<?php echo $this->get_field_name('rating'); ?>" /> + <label for="<?php echo $this->get_field_id('rating'); ?>"><?php _e('Show Link Rating'); ?></label> + </p> + <p> + <label for="<?php echo $this->get_field_id('limit'); ?>"><?php _e( 'Number of links to show:' ); ?></label> + <input id="<?php echo $this->get_field_id('limit'); ?>" name="<?php echo $this->get_field_name('limit'); ?>" type="text" value="<?php echo $limit == -1 ? '' : intval( $limit ); ?>" size="3" /> + </p> + <?php + } +} diff --git a/wp-includes/widgets/class-wp-widget-meta.php b/wp-includes/widgets/class-wp-widget-meta.php new file mode 100644 index 0000000..2de9844 --- /dev/null +++ b/wp-includes/widgets/class-wp-widget-meta.php @@ -0,0 +1,114 @@ +<?php +/** + * Widget API: WP_Widget_Meta class + * + * @package WordPress + * @subpackage Widgets + * @since 4.4.0 + */ + +/** + * Core class used to implement a Meta widget. + * + * Displays log in/out, RSS feed links, etc. + * + * @since 2.8.0 + * + * @see WP_Widget + */ +class WP_Widget_Meta extends WP_Widget { + + /** + * Sets up a new Meta widget instance. + * + * @since 2.8.0 + * @access public + */ + public function __construct() { + $widget_ops = array( + 'classname' => 'widget_meta', + 'description' => __( 'Login, RSS, & WordPress.org links.' ), + 'customize_selective_refresh' => true, + ); + parent::__construct( 'meta', __( 'Meta' ), $widget_ops ); + } + + /** + * Outputs the content for the current Meta widget instance. + * + * @since 2.8.0 + * @access public + * + * @param array $args Display arguments including 'before_title', 'after_title', + * 'before_widget', and 'after_widget'. + * @param array $instance Settings for the current Meta widget instance. + */ + public function widget( $args, $instance ) { + /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */ + $title = apply_filters( 'widget_title', empty($instance['title']) ? __( 'Meta' ) : $instance['title'], $instance, $this->id_base ); + + echo $args['before_widget']; + if ( $title ) { + echo $args['before_title'] . $title . $args['after_title']; + } + ?> + <ul> + <?php wp_register(); ?> + <li><?php wp_loginout(); ?></li> + <li><a href="<?php echo esc_url( get_bloginfo( 'rss2_url' ) ); ?>"><?php _e('Entries <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li> + <li><a href="<?php echo esc_url( get_bloginfo( 'comments_rss2_url' ) ); ?>"><?php _e('Comments <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li> + <?php + /** + * Filter the "Powered by WordPress" text in the Meta widget. + * + * @since 3.6.0 + * + * @param string $title_text Default title text for the WordPress.org link. + */ + echo apply_filters( 'widget_meta_poweredby', sprintf( '<li><a href="%s" title="%s">%s</a></li>', + esc_url( __( 'https://wordpress.org/' ) ), + esc_attr__( 'Powered by WordPress, state-of-the-art semantic personal publishing platform.' ), + _x( 'WordPress.org', 'meta widget link text' ) + ) ); + + wp_meta(); + ?> + </ul> + <?php + echo $args['after_widget']; + } + + /** + * Handles updating settings for the current Meta widget instance. + * + * @since 2.8.0 + * @access public + * + * @param array $new_instance New settings for this instance as input by the user via + * WP_Widget::form(). + * @param array $old_instance Old settings for this instance. + * @return array Updated settings to save. + */ + public function update( $new_instance, $old_instance ) { + $instance = $old_instance; + $instance['title'] = sanitize_text_field( $new_instance['title'] ); + + return $instance; + } + + /** + * Outputs the settings form for the Meta widget. + * + * @since 2.8.0 + * @access public + * + * @param array $instance Current settings. + */ + public function form( $instance ) { + $instance = wp_parse_args( (array) $instance, array( 'title' => '' ) ); + $title = sanitize_text_field( $instance['title'] ); +?> + <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?></label> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></p> +<?php + } +} diff --git a/wp-includes/widgets/class-wp-widget-pages.php b/wp-includes/widgets/class-wp-widget-pages.php new file mode 100644 index 0000000..165f334 --- /dev/null +++ b/wp-includes/widgets/class-wp-widget-pages.php @@ -0,0 +1,151 @@ +<?php +/** + * Widget API: WP_Widget_Pages class + * + * @package WordPress + * @subpackage Widgets + * @since 4.4.0 + */ + +/** + * Core class used to implement a Pages widget. + * + * @since 2.8.0 + * + * @see WP_Widget + */ +class WP_Widget_Pages extends WP_Widget { + + /** + * Sets up a new Pages widget instance. + * + * @since 2.8.0 + * @access public + */ + public function __construct() { + $widget_ops = array( + 'classname' => 'widget_pages', + 'description' => __( 'A list of your site’s Pages.' ), + 'customize_selective_refresh' => true, + ); + parent::__construct( 'pages', __( 'Pages' ), $widget_ops ); + } + + /** + * Outputs the content for the current Pages widget instance. + * + * @since 2.8.0 + * @access public + * + * @param array $args Display arguments including 'before_title', 'after_title', + * 'before_widget', and 'after_widget'. + * @param array $instance Settings for the current Pages widget instance. + */ + public function widget( $args, $instance ) { + + /** + * Filter the widget title. + * + * @since 2.6.0 + * + * @param string $title The widget title. Default 'Pages'. + * @param array $instance An array of the widget's settings. + * @param mixed $id_base The widget ID. + */ + $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Pages' ) : $instance['title'], $instance, $this->id_base ); + + $sortby = empty( $instance['sortby'] ) ? 'menu_order' : $instance['sortby']; + $exclude = empty( $instance['exclude'] ) ? '' : $instance['exclude']; + + if ( $sortby == 'menu_order' ) + $sortby = 'menu_order, post_title'; + + /** + * Filter the arguments for the Pages widget. + * + * @since 2.8.0 + * + * @see wp_list_pages() + * + * @param array $args An array of arguments to retrieve the pages list. + */ + $out = wp_list_pages( apply_filters( 'widget_pages_args', array( + 'title_li' => '', + 'echo' => 0, + 'sort_column' => $sortby, + 'exclude' => $exclude + ) ) ); + + if ( ! empty( $out ) ) { + echo $args['before_widget']; + if ( $title ) { + echo $args['before_title'] . $title . $args['after_title']; + } + ?> + <ul> + <?php echo $out; ?> + </ul> + <?php + echo $args['after_widget']; + } + } + + /** + * Handles updating settings for the current Pages widget instance. + * + * @since 2.8.0 + * @access public + * + * @param array $new_instance New settings for this instance as input by the user via + * WP_Widget::form(). + * @param array $old_instance Old settings for this instance. + * @return array Updated settings to save. + */ + public function update( $new_instance, $old_instance ) { + $instance = $old_instance; + $instance['title'] = sanitize_text_field( $new_instance['title'] ); + if ( in_array( $new_instance['sortby'], array( 'post_title', 'menu_order', 'ID' ) ) ) { + $instance['sortby'] = $new_instance['sortby']; + } else { + $instance['sortby'] = 'menu_order'; + } + + $instance['exclude'] = sanitize_text_field( $new_instance['exclude'] ); + + return $instance; + } + + /** + * Outputs the settings form for the Pages widget. + * + * @since 2.8.0 + * @access public + * + * @param array $instance Current settings. + */ + public function form( $instance ) { + //Defaults + $instance = wp_parse_args( (array) $instance, array( 'sortby' => 'post_title', 'title' => '', 'exclude' => '') ); + ?> + <p> + <label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title:' ); ?></label> + <input class="widefat" id="<?php echo esc_attr( $this->get_field_id('title') ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $instance['title'] ); ?>" /> + </p> + <p> + <label for="<?php echo esc_attr( $this->get_field_id( 'sortby' ) ); ?>"><?php _e( 'Sort by:' ); ?></label> + <select name="<?php echo esc_attr( $this->get_field_name( 'sortby' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'sortby' ) ); ?>" class="widefat"> + <option value="post_title"<?php selected( $instance['sortby'], 'post_title' ); ?>><?php _e('Page title'); ?></option> + <option value="menu_order"<?php selected( $instance['sortby'], 'menu_order' ); ?>><?php _e('Page order'); ?></option> + <option value="ID"<?php selected( $instance['sortby'], 'ID' ); ?>><?php _e( 'Page ID' ); ?></option> + </select> + </p> + <p> + <label for="<?php echo esc_attr( $this->get_field_id( 'exclude' ) ); ?>"><?php _e( 'Exclude:' ); ?></label> + <input type="text" value="<?php echo esc_attr( $instance['exclude'] ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'exclude' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'exclude' ) ); ?>" class="widefat" /> + <br /> + <small><?php _e( 'Page IDs, separated by commas.' ); ?></small> + </p> + <?php + } + +} diff --git a/wp-includes/widgets/class-wp-widget-recent-comments.php b/wp-includes/widgets/class-wp-widget-recent-comments.php new file mode 100644 index 0000000..71fb4d2 --- /dev/null +++ b/wp-includes/widgets/class-wp-widget-recent-comments.php @@ -0,0 +1,178 @@ +<?php +/** + * Widget API: WP_Widget_Recent_Comments class + * + * @package WordPress + * @subpackage Widgets + * @since 4.4.0 + */ + +/** + * Core class used to implement a Recent Comments widget. + * + * @since 2.8.0 + * + * @see WP_Widget + */ +class WP_Widget_Recent_Comments extends WP_Widget { + + /** + * Sets up a new Recent Comments widget instance. + * + * @since 2.8.0 + * @access public + */ + public function __construct() { + $widget_ops = array( + 'classname' => 'widget_recent_comments', + 'description' => __( 'Your site’s most recent comments.' ), + 'customize_selective_refresh' => true, + ); + parent::__construct( 'recent-comments', __( 'Recent Comments' ), $widget_ops ); + $this->alt_option_name = 'widget_recent_comments'; + + if ( is_active_widget( false, false, $this->id_base ) || is_customize_preview() ) { + add_action( 'wp_head', array( $this, 'recent_comments_style' ) ); + } + } + + /** + * Outputs the default styles for the Recent Comments widget. + * + * @since 2.8.0 + * @access public + */ + public function recent_comments_style() { + /** + * Filter the Recent Comments default widget styles. + * + * @since 3.1.0 + * + * @param bool $active Whether the widget is active. Default true. + * @param string $id_base The widget ID. + */ + if ( ! current_theme_supports( 'widgets' ) // Temp hack #14876 + || ! apply_filters( 'show_recent_comments_widget_style', true, $this->id_base ) ) + return; + ?> + <style type="text/css">.recentcomments a{display:inline !important;padding:0 !important;margin:0 !important;}</style> + <?php + } + + /** + * Outputs the content for the current Recent Comments widget instance. + * + * @since 2.8.0 + * @access public + * + * @param array $args Display arguments including 'before_title', 'after_title', + * 'before_widget', and 'after_widget'. + * @param array $instance Settings for the current Recent Comments widget instance. + */ + public function widget( $args, $instance ) { + if ( ! isset( $args['widget_id'] ) ) + $args['widget_id'] = $this->id; + + $output = ''; + + $title = ( ! empty( $instance['title'] ) ) ? $instance['title'] : __( 'Recent Comments' ); + + /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */ + $title = apply_filters( 'widget_title', $title, $instance, $this->id_base ); + + $number = ( ! empty( $instance['number'] ) ) ? absint( $instance['number'] ) : 5; + if ( ! $number ) + $number = 5; + + /** + * Filter the arguments for the Recent Comments widget. + * + * @since 3.4.0 + * + * @see WP_Comment_Query::query() for information on accepted arguments. + * + * @param array $comment_args An array of arguments used to retrieve the recent comments. + */ + $comments = get_comments( apply_filters( 'widget_comments_args', array( + 'number' => $number, + 'status' => 'approve', + 'post_status' => 'publish' + ) ) ); + + $output .= $args['before_widget']; + if ( $title ) { + $output .= $args['before_title'] . $title . $args['after_title']; + } + + $output .= '<ul id="recentcomments">'; + if ( is_array( $comments ) && $comments ) { + // Prime cache for associated posts. (Prime post term cache if we need it for permalinks.) + $post_ids = array_unique( wp_list_pluck( $comments, 'comment_post_ID' ) ); + _prime_post_caches( $post_ids, strpos( get_option( 'permalink_structure' ), '%category%' ), false ); + + foreach ( (array) $comments as $comment ) { + $output .= '<li class="recentcomments">'; + /* translators: comments widget: 1: comment author, 2: post link */ + $output .= sprintf( _x( '%1$s on %2$s', 'widgets' ), + '<span class="comment-author-link">' . get_comment_author_link( $comment ) . '</span>', + '<a href="' . esc_url( get_comment_link( $comment ) ) . '">' . get_the_title( $comment->comment_post_ID ) . '</a>' + ); + $output .= '</li>'; + } + } + $output .= '</ul>'; + $output .= $args['after_widget']; + + echo $output; + } + + /** + * Handles updating settings for the current Recent Comments widget instance. + * + * @since 2.8.0 + * @access public + * + * @param array $new_instance New settings for this instance as input by the user via + * WP_Widget::form(). + * @param array $old_instance Old settings for this instance. + * @return array Updated settings to save. + */ + public function update( $new_instance, $old_instance ) { + $instance = $old_instance; + $instance['title'] = sanitize_text_field( $new_instance['title'] ); + $instance['number'] = absint( $new_instance['number'] ); + return $instance; + } + + /** + * Outputs the settings form for the Recent Comments widget. + * + * @since 2.8.0 + * @access public + * + * @param array $instance Current settings. + */ + public function form( $instance ) { + $title = isset( $instance['title'] ) ? $instance['title'] : ''; + $number = isset( $instance['number'] ) ? absint( $instance['number'] ) : 5; + ?> + <p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ); ?></label> + <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></p> + + <p><label for="<?php echo $this->get_field_id( 'number' ); ?>"><?php _e( 'Number of comments to show:' ); ?></label> + <input class="tiny-text" id="<?php echo $this->get_field_id( 'number' ); ?>" name="<?php echo $this->get_field_name( 'number' ); ?>" type="number" step="1" min="1" value="<?php echo $number; ?>" size="3" /></p> + <?php + } + + /** + * Flushes the Recent Comments widget cache. + * + * @since 2.8.0 + * @access public + * + * @deprecated 4.4.0 Fragment caching was removed in favor of split queries. + */ + public function flush_widget_cache() { + _deprecated_function( __METHOD__, '4.4' ); + } +} diff --git a/wp-includes/widgets/class-wp-widget-recent-posts.php b/wp-includes/widgets/class-wp-widget-recent-posts.php new file mode 100644 index 0000000..fdb54a0 --- /dev/null +++ b/wp-includes/widgets/class-wp-widget-recent-posts.php @@ -0,0 +1,142 @@ +<?php +/** + * Widget API: WP_Widget_Recent_Posts class + * + * @package WordPress + * @subpackage Widgets + * @since 4.4.0 + */ + +/** + * Core class used to implement a Recent Posts widget. + * + * @since 2.8.0 + * + * @see WP_Widget + */ +class WP_Widget_Recent_Posts extends WP_Widget { + + /** + * Sets up a new Recent Posts widget instance. + * + * @since 2.8.0 + * @access public + */ + public function __construct() { + $widget_ops = array( + 'classname' => 'widget_recent_entries', + 'description' => __( 'Your site’s most recent Posts.' ), + 'customize_selective_refresh' => true, + ); + parent::__construct( 'recent-posts', __( 'Recent Posts' ), $widget_ops ); + $this->alt_option_name = 'widget_recent_entries'; + } + + /** + * Outputs the content for the current Recent Posts widget instance. + * + * @since 2.8.0 + * @access public + * + * @param array $args Display arguments including 'before_title', 'after_title', + * 'before_widget', and 'after_widget'. + * @param array $instance Settings for the current Recent Posts widget instance. + */ + public function widget( $args, $instance ) { + if ( ! isset( $args['widget_id'] ) ) { + $args['widget_id'] = $this->id; + } + + $title = ( ! empty( $instance['title'] ) ) ? $instance['title'] : __( 'Recent Posts' ); + + /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */ + $title = apply_filters( 'widget_title', $title, $instance, $this->id_base ); + + $number = ( ! empty( $instance['number'] ) ) ? absint( $instance['number'] ) : 5; + if ( ! $number ) + $number = 5; + $show_date = isset( $instance['show_date'] ) ? $instance['show_date'] : false; + + /** + * Filter the arguments for the Recent Posts widget. + * + * @since 3.4.0 + * + * @see WP_Query::get_posts() + * + * @param array $args An array of arguments used to retrieve the recent posts. + */ + $r = new WP_Query( apply_filters( 'widget_posts_args', array( + 'posts_per_page' => $number, + 'no_found_rows' => true, + 'post_status' => 'publish', + 'ignore_sticky_posts' => true + ) ) ); + + if ($r->have_posts()) : + ?> + <?php echo $args['before_widget']; ?> + <?php if ( $title ) { + echo $args['before_title'] . $title . $args['after_title']; + } ?> + <ul> + <?php while ( $r->have_posts() ) : $r->the_post(); ?> + <li> + <a href="<?php the_permalink(); ?>"><?php get_the_title() ? the_title() : the_ID(); ?></a> + <?php if ( $show_date ) : ?> + <span class="post-date"><?php echo get_the_date(); ?></span> + <?php endif; ?> + </li> + <?php endwhile; ?> + </ul> + <?php echo $args['after_widget']; ?> + <?php + // Reset the global $the_post as this query will have stomped on it + wp_reset_postdata(); + + endif; + } + + /** + * Handles updating the settings for the current Recent Posts widget instance. + * + * @since 2.8.0 + * @access public + * + * @param array $new_instance New settings for this instance as input by the user via + * WP_Widget::form(). + * @param array $old_instance Old settings for this instance. + * @return array Updated settings to save. + */ + public function update( $new_instance, $old_instance ) { + $instance = $old_instance; + $instance['title'] = sanitize_text_field( $new_instance['title'] ); + $instance['number'] = (int) $new_instance['number']; + $instance['show_date'] = isset( $new_instance['show_date'] ) ? (bool) $new_instance['show_date'] : false; + return $instance; + } + + /** + * Outputs the settings form for the Recent Posts widget. + * + * @since 2.8.0 + * @access public + * + * @param array $instance Current settings. + */ + public function form( $instance ) { + $title = isset( $instance['title'] ) ? esc_attr( $instance['title'] ) : ''; + $number = isset( $instance['number'] ) ? absint( $instance['number'] ) : 5; + $show_date = isset( $instance['show_date'] ) ? (bool) $instance['show_date'] : false; +?> + <p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ); ?></label> + <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" /></p> + + <p><label for="<?php echo $this->get_field_id( 'number' ); ?>"><?php _e( 'Number of posts to show:' ); ?></label> + <input class="tiny-text" id="<?php echo $this->get_field_id( 'number' ); ?>" name="<?php echo $this->get_field_name( 'number' ); ?>" type="number" step="1" min="1" value="<?php echo $number; ?>" size="3" /></p> + + <p><input class="checkbox" type="checkbox"<?php checked( $show_date ); ?> id="<?php echo $this->get_field_id( 'show_date' ); ?>" name="<?php echo $this->get_field_name( 'show_date' ); ?>" /> + <label for="<?php echo $this->get_field_id( 'show_date' ); ?>"><?php _e( 'Display post date?' ); ?></label></p> +<?php + } +} diff --git a/wp-includes/widgets/class-wp-widget-rss.php b/wp-includes/widgets/class-wp-widget-rss.php new file mode 100644 index 0000000..a2548c4 --- /dev/null +++ b/wp-includes/widgets/class-wp-widget-rss.php @@ -0,0 +1,128 @@ +<?php +/** + * Widget API: WP_Widget_RSS class + * + * @package WordPress + * @subpackage Widgets + * @since 4.4.0 + */ + +/** + * Core class used to implement a RSS widget. + * + * @since 2.8.0 + * + * @see WP_Widget + */ +class WP_Widget_RSS extends WP_Widget { + + /** + * Sets up a new RSS widget instance. + * + * @since 2.8.0 + * @access public + */ + public function __construct() { + $widget_ops = array( + 'description' => __( 'Entries from any RSS or Atom feed.' ), + 'customize_selective_refresh' => true, + ); + $control_ops = array( 'width' => 400, 'height' => 200 ); + parent::__construct( 'rss', __( 'RSS' ), $widget_ops, $control_ops ); + } + + /** + * Outputs the content for the current RSS widget instance. + * + * @since 2.8.0 + * @access public + * + * @param array $args Display arguments including 'before_title', 'after_title', + * 'before_widget', and 'after_widget'. + * @param array $instance Settings for the current RSS widget instance. + */ + public function widget( $args, $instance ) { + if ( isset($instance['error']) && $instance['error'] ) + return; + + $url = ! empty( $instance['url'] ) ? $instance['url'] : ''; + while ( stristr($url, 'http') != $url ) + $url = substr($url, 1); + + if ( empty($url) ) + return; + + // self-url destruction sequence + if ( in_array( untrailingslashit( $url ), array( site_url(), home_url() ) ) ) + return; + + $rss = fetch_feed($url); + $title = $instance['title']; + $desc = ''; + $link = ''; + + if ( ! is_wp_error($rss) ) { + $desc = esc_attr(strip_tags(@html_entity_decode($rss->get_description(), ENT_QUOTES, get_option('blog_charset')))); + if ( empty($title) ) + $title = strip_tags( $rss->get_title() ); + $link = strip_tags( $rss->get_permalink() ); + while ( stristr($link, 'http') != $link ) + $link = substr($link, 1); + } + + if ( empty($title) ) + $title = empty($desc) ? __('Unknown Feed') : $desc; + + /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */ + $title = apply_filters( 'widget_title', $title, $instance, $this->id_base ); + + $url = strip_tags( $url ); + $icon = includes_url( 'images/rss.png' ); + if ( $title ) + $title = '<a class="rsswidget" href="' . esc_url( $url ) . '"><img class="rss-widget-icon" style="border:0" width="14" height="14" src="' . esc_url( $icon ) . '" alt="RSS" /></a> <a class="rsswidget" href="' . esc_url( $link ) . '">'. esc_html( $title ) . '</a>'; + + echo $args['before_widget']; + if ( $title ) { + echo $args['before_title'] . $title . $args['after_title']; + } + wp_widget_rss_output( $rss, $instance ); + echo $args['after_widget']; + + if ( ! is_wp_error($rss) ) + $rss->__destruct(); + unset($rss); + } + + /** + * Handles updating settings for the current RSS widget instance. + * + * @since 2.8.0 + * @access public + * + * @param array $new_instance New settings for this instance as input by the user via + * WP_Widget::form(). + * @param array $old_instance Old settings for this instance. + * @return array Updated settings to save. + */ + public function update( $new_instance, $old_instance ) { + $testurl = ( isset( $new_instance['url'] ) && ( !isset( $old_instance['url'] ) || ( $new_instance['url'] != $old_instance['url'] ) ) ); + return wp_widget_rss_process( $new_instance, $testurl ); + } + + /** + * Outputs the settings form for the RSS widget. + * + * @since 2.8.0 + * @access public + * + * @param array $instance Current settings. + */ + public function form( $instance ) { + if ( empty( $instance ) ) { + $instance = array( 'title' => '', 'url' => '', 'items' => 10, 'error' => false, 'show_summary' => 0, 'show_author' => 0, 'show_date' => 0 ); + } + $instance['number'] = $this->number; + + wp_widget_rss_form( $instance ); + } +} diff --git a/wp-includes/widgets/class-wp-widget-search.php b/wp-includes/widgets/class-wp-widget-search.php new file mode 100644 index 0000000..f7d67bb --- /dev/null +++ b/wp-includes/widgets/class-wp-widget-search.php @@ -0,0 +1,93 @@ +<?php +/** + * Widget API: WP_Widget_Search class + * + * @package WordPress + * @subpackage Widgets + * @since 4.4.0 + */ + +/** + * Core class used to implement a Search widget. + * + * @since 2.8.0 + * + * @see WP_Widget + */ +class WP_Widget_Search extends WP_Widget { + + /** + * Sets up a new Search widget instance. + * + * @since 2.8.0 + * @access public + */ + public function __construct() { + $widget_ops = array( + 'classname' => 'widget_search', + 'description' => __( 'A search form for your site.' ), + 'customize_selective_refresh' => true, + ); + parent::__construct( 'search', _x( 'Search', 'Search widget' ), $widget_ops ); + } + + /** + * Outputs the content for the current Search widget instance. + * + * @since 2.8.0 + * @access public + * + * @param array $args Display arguments including 'before_title', 'after_title', + * 'before_widget', and 'after_widget'. + * @param array $instance Settings for the current Search widget instance. + */ + public function widget( $args, $instance ) { + /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */ + $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base ); + + echo $args['before_widget']; + if ( $title ) { + echo $args['before_title'] . $title . $args['after_title']; + } + + // Use current theme search form if it exists + get_search_form(); + + echo $args['after_widget']; + } + + /** + * Outputs the settings form for the Search widget. + * + * @since 2.8.0 + * @access public + * + * @param array $instance Current settings. + */ + public function form( $instance ) { + $instance = wp_parse_args( (array) $instance, array( 'title' => '') ); + $title = $instance['title']; + ?> + <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></label></p> + <?php + } + + /** + * Handles updating settings for the current Search widget instance. + * + * @since 2.8.0 + * @access public + * + * @param array $new_instance New settings for this instance as input by the user via + * WP_Widget::form(). + * @param array $old_instance Old settings for this instance. + * @return array Updated settings. + */ + public function update( $new_instance, $old_instance ) { + $instance = $old_instance; + $new_instance = wp_parse_args((array) $new_instance, array( 'title' => '')); + $instance['title'] = sanitize_text_field( $new_instance['title'] ); + return $instance; + } + +} diff --git a/wp-includes/widgets/class-wp-widget-tag-cloud.php b/wp-includes/widgets/class-wp-widget-tag-cloud.php new file mode 100644 index 0000000..1251e1d --- /dev/null +++ b/wp-includes/widgets/class-wp-widget-tag-cloud.php @@ -0,0 +1,184 @@ +<?php +/** + * Widget API: WP_Widget_Tag_Cloud class + * + * @package WordPress + * @subpackage Widgets + * @since 4.4.0 + */ + +/** + * Core class used to implement a Tag cloud widget. + * + * @since 2.8.0 + * + * @see WP_Widget + */ +class WP_Widget_Tag_Cloud extends WP_Widget { + + /** + * Sets up a new Tag Cloud widget instance. + * + * @since 2.8.0 + * @access public + */ + public function __construct() { + $widget_ops = array( + 'description' => __( 'A cloud of your most used tags.' ), + 'customize_selective_refresh' => true, + ); + parent::__construct( 'tag_cloud', __( 'Tag Cloud' ), $widget_ops ); + } + + /** + * Outputs the content for the current Tag Cloud widget instance. + * + * @since 2.8.0 + * @access public + * + * @param array $args Display arguments including 'before_title', 'after_title', + * 'before_widget', and 'after_widget'. + * @param array $instance Settings for the current Tag Cloud widget instance. + */ + public function widget( $args, $instance ) { + $current_taxonomy = $this->_get_current_taxonomy($instance); + if ( !empty($instance['title']) ) { + $title = $instance['title']; + } else { + if ( 'post_tag' == $current_taxonomy ) { + $title = __('Tags'); + } else { + $tax = get_taxonomy($current_taxonomy); + $title = $tax->labels->name; + } + } + + /** + * Filter the taxonomy used in the Tag Cloud widget. + * + * @since 2.8.0 + * @since 3.0.0 Added taxonomy drop-down. + * + * @see wp_tag_cloud() + * + * @param array $current_taxonomy The taxonomy to use in the tag cloud. Default 'tags'. + */ + $tag_cloud = wp_tag_cloud( apply_filters( 'widget_tag_cloud_args', array( + 'taxonomy' => $current_taxonomy, + 'echo' => false + ) ) ); + + if ( empty( $tag_cloud ) ) { + return; + } + + /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */ + $title = apply_filters( 'widget_title', $title, $instance, $this->id_base ); + + echo $args['before_widget']; + if ( $title ) { + echo $args['before_title'] . $title . $args['after_title']; + } + + echo '<div class="tagcloud">'; + + echo $tag_cloud; + + echo "</div>\n"; + echo $args['after_widget']; + } + + /** + * Handles updating settings for the current Tag Cloud widget instance. + * + * @since 2.8.0 + * @access public + * + * @param array $new_instance New settings for this instance as input by the user via + * WP_Widget::form(). + * @param array $old_instance Old settings for this instance. + * @return array Settings to save or bool false to cancel saving. + */ + public function update( $new_instance, $old_instance ) { + $instance = array(); + $instance['title'] = sanitize_text_field( $new_instance['title'] ); + $instance['taxonomy'] = stripslashes($new_instance['taxonomy']); + return $instance; + } + + /** + * Outputs the Tag Cloud widget settings form. + * + * @since 2.8.0 + * @access public + * + * @param array $instance Current settings. + */ + public function form( $instance ) { + $current_taxonomy = $this->_get_current_taxonomy($instance); + $title_id = $this->get_field_id( 'title' ); + $instance['title'] = ! empty( $instance['title'] ) ? esc_attr( $instance['title'] ) : ''; + + echo '<p><label for="' . $title_id .'">' . __( 'Title:' ) . '</label> + <input type="text" class="widefat" id="' . $title_id .'" name="' . $this->get_field_name( 'title' ) .'" value="' . $instance['title'] .'" /> + </p>'; + + $taxonomies = get_taxonomies( array( 'show_tagcloud' => true ), 'object' ); + $id = $this->get_field_id( 'taxonomy' ); + $name = $this->get_field_name( 'taxonomy' ); + $input = '<input type="hidden" id="' . $id . '" name="' . $name . '" value="%s" />'; + + switch ( count( $taxonomies ) ) { + + // No tag cloud supporting taxonomies found, display error message + case 0: + echo '<p>' . __( 'The tag cloud will not be displayed since there are no taxonomies that support the tag cloud widget.' ) . '</p>'; + printf( $input, '' ); + break; + + // Just a single tag cloud supporting taxonomy found, no need to display options + case 1: + $keys = array_keys( $taxonomies ); + $taxonomy = reset( $keys ); + printf( $input, esc_attr( $taxonomy ) ); + break; + + // More than one tag cloud supporting taxonomy found, display options + default: + printf( + '<p><label for="%1$s">%2$s</label>' . + '<select class="widefat" id="%1$s" name="%3$s">', + $id, + __( 'Taxonomy:' ), + $name + ); + + foreach ( $taxonomies as $taxonomy => $tax ) { + printf( + '<option value="%s"%s>%s</option>', + esc_attr( $taxonomy ), + selected( $taxonomy, $current_taxonomy, false ), + $tax->labels->name + ); + } + + echo '</select></p>'; + } + } + + /** + * Retrieves the taxonomy for the current Tag cloud widget instance. + * + * @since 4.4.0 + * @access public + * + * @param array $instance Current settings. + * @return string Name of the current taxonomy if set, otherwise 'post_tag'. + */ + public function _get_current_taxonomy($instance) { + if ( !empty($instance['taxonomy']) && taxonomy_exists($instance['taxonomy']) ) + return $instance['taxonomy']; + + return 'post_tag'; + } +} diff --git a/wp-includes/widgets/class-wp-widget-text.php b/wp-includes/widgets/class-wp-widget-text.php new file mode 100644 index 0000000..a8ec3d4 --- /dev/null +++ b/wp-includes/widgets/class-wp-widget-text.php @@ -0,0 +1,118 @@ +<?php +/** + * Widget API: WP_Widget_Text class + * + * @package WordPress + * @subpackage Widgets + * @since 4.4.0 + */ + +/** + * Core class used to implement a Text widget. + * + * @since 2.8.0 + * + * @see WP_Widget + */ +class WP_Widget_Text extends WP_Widget { + + /** + * Sets up a new Text widget instance. + * + * @since 2.8.0 + * @access public + */ + public function __construct() { + $widget_ops = array( + 'classname' => 'widget_text', + 'description' => __( 'Arbitrary text or HTML.' ), + 'customize_selective_refresh' => true, + ); + $control_ops = array( 'width' => 400, 'height' => 350 ); + parent::__construct( 'text', __( 'Text' ), $widget_ops, $control_ops ); + } + + /** + * Outputs the content for the current Text widget instance. + * + * @since 2.8.0 + * @access public + * + * @param array $args Display arguments including 'before_title', 'after_title', + * 'before_widget', and 'after_widget'. + * @param array $instance Settings for the current Text widget instance. + */ + public function widget( $args, $instance ) { + + /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */ + $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base ); + + $widget_text = ! empty( $instance['text'] ) ? $instance['text'] : ''; + + /** + * Filter the content of the Text widget. + * + * @since 2.3.0 + * @since 4.4.0 Added the `$this` parameter. + * + * @param string $widget_text The widget content. + * @param array $instance Array of settings for the current widget. + * @param WP_Widget_Text $this Current Text widget instance. + */ + $text = apply_filters( 'widget_text', $widget_text, $instance, $this ); + + echo $args['before_widget']; + if ( ! empty( $title ) ) { + echo $args['before_title'] . $title . $args['after_title']; + } ?> + <div class="textwidget"><?php echo !empty( $instance['filter'] ) ? wpautop( $text ) : $text; ?></div> + <?php + echo $args['after_widget']; + } + + /** + * Handles updating settings for the current Text widget instance. + * + * @since 2.8.0 + * @access public + * + * @param array $new_instance New settings for this instance as input by the user via + * WP_Widget::form(). + * @param array $old_instance Old settings for this instance. + * @return array Settings to save or bool false to cancel saving. + */ + public function update( $new_instance, $old_instance ) { + $instance = $old_instance; + $instance['title'] = sanitize_text_field( $new_instance['title'] ); + if ( current_user_can( 'unfiltered_html' ) ) { + $instance['text'] = $new_instance['text']; + } else { + $instance['text'] = wp_kses_post( $new_instance['text'] ); + } + $instance['filter'] = ! empty( $new_instance['filter'] ); + return $instance; + } + + /** + * Outputs the Text widget settings form. + * + * @since 2.8.0 + * @access public + * + * @param array $instance Current settings. + */ + public function form( $instance ) { + $instance = wp_parse_args( (array) $instance, array( 'title' => '', 'text' => '' ) ); + $filter = isset( $instance['filter'] ) ? $instance['filter'] : 0; + $title = sanitize_text_field( $instance['title'] ); + ?> + <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?></label> + <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></p> + + <p><label for="<?php echo $this->get_field_id( 'text' ); ?>"><?php _e( 'Content:' ); ?></label> + <textarea class="widefat" rows="16" cols="20" id="<?php echo $this->get_field_id('text'); ?>" name="<?php echo $this->get_field_name('text'); ?>"><?php echo esc_textarea( $instance['text'] ); ?></textarea></p> + + <p><input id="<?php echo $this->get_field_id('filter'); ?>" name="<?php echo $this->get_field_name('filter'); ?>" type="checkbox"<?php checked( $filter ); ?> /> <label for="<?php echo $this->get_field_id('filter'); ?>"><?php _e('Automatically add paragraphs'); ?></label></p> + <?php + } +} diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php index c72a644..066e851 100644 --- a/wp-includes/wp-db.php +++ b/wp-includes/wp-db.php @@ -43,7 +43,7 @@ define( 'ARRAY_N', 'ARRAY_N' ); * file to your class. The wpdb class will still be included, * so you can extend it or simply use your own. * - * @link http://codex.wordpress.org/Function_Reference/wpdb_Class + * @link https://codex.wordpress.org/Function_Reference/wpdb_Class * * @package WordPress * @subpackage Database @@ -52,7 +52,10 @@ define( 'ARRAY_N', 'ARRAY_N' ); class wpdb { /** - * Whether to show SQL/DB errors + * Whether to show SQL/DB errors. + * + * Default behavior is to show errors if both WP_DEBUG and WP_DEBUG_DISPLAY + * evaluated to true. * * @since 0.71 * @access private @@ -75,25 +78,25 @@ class wpdb { * @since 2.5.0 * @var string */ - var $last_error = ''; + public $last_error = ''; /** * Amount of queries made * * @since 1.2.0 - * @access private + * @access public * @var int */ - var $num_queries = 0; + public $num_queries = 0; /** * Count of rows returned by previous query * * @since 0.71 - * @access private + * @access public * @var int */ - var $num_rows = 0; + public $num_rows = 0; /** * Count of affected rows by previous query @@ -111,7 +114,7 @@ class wpdb { * @access public * @var int */ - var $insert_id = 0; + public $insert_id = 0; /** * Last query made @@ -140,6 +143,43 @@ class wpdb { */ protected $result; + /** + * Cached column info, for sanity checking data before inserting + * + * @since 4.2.0 + * @access protected + * @var array + */ + protected $col_meta = array(); + + /** + * Calculated character sets on tables + * + * @since 4.2.0 + * @access protected + * @var array + */ + protected $table_charset = array(); + + /** + * Whether text fields in the current query need to be sanity checked. + * + * @since 4.2.0 + * @access protected + * @var bool + */ + protected $check_current_query = true; + + /** + * Flag to ensure we don't run into recursion problems when checking the collation. + * + * @since 4.2.0 + * @access private + * @see wpdb::check_safe_collation() + * @var bool + */ + private $checking_collation = false; + /** * Saved info on the table column * @@ -176,10 +216,10 @@ class wpdb { * security precautions. * * @since 2.5.0 - * @access private + * @access public * @var string */ - var $prefix = ''; + public $prefix = ''; /** * WordPress base table prefix. @@ -200,22 +240,22 @@ class wpdb { var $ready = false; /** - * {@internal Missing Description}} + * Blog ID. * * @since 3.0.0 * @access public * @var int */ - var $blogid = 0; + public $blogid = 0; /** - * {@internal Missing Description}} + * Site ID. * * @since 3.0.0 * @access public * @var int */ - var $siteid = 0; + public $siteid = 0; /** * List of WordPress per-blog tables @@ -226,7 +266,7 @@ class wpdb { * @var array */ var $tables = array( 'posts', 'comments', 'links', 'options', 'postmeta', - 'terms', 'term_taxonomy', 'term_relationships', 'commentmeta' ); + 'terms', 'term_taxonomy', 'term_relationships', 'termmeta', 'commentmeta' ); /** * List of deprecated WordPress tables @@ -268,7 +308,7 @@ class wpdb { * @access public * @var string */ - var $comments; + public $comments; /** * WordPress Comment Metadata table @@ -277,7 +317,7 @@ class wpdb { * @access public * @var string */ - var $commentmeta; + public $commentmeta; /** * WordPress Links table @@ -286,7 +326,7 @@ class wpdb { * @access public * @var string */ - var $links; + public $links; /** * WordPress Options table @@ -295,7 +335,7 @@ class wpdb { * @access public * @var string */ - var $options; + public $options; /** * WordPress Post Metadata table @@ -304,7 +344,7 @@ class wpdb { * @access public * @var string */ - var $postmeta; + public $postmeta; /** * WordPress Posts table @@ -313,7 +353,7 @@ class wpdb { * @access public * @var string */ - var $posts; + public $posts; /** * WordPress Terms table @@ -322,7 +362,7 @@ class wpdb { * @access public * @var string */ - var $terms; + public $terms; /** * WordPress Term Relationships table @@ -331,7 +371,7 @@ class wpdb { * @access public * @var string */ - var $term_relationships; + public $term_relationships; /** * WordPress Term Taxonomy table @@ -340,11 +380,20 @@ class wpdb { * @access public * @var string */ - var $term_taxonomy; + public $term_taxonomy; - /* - * Global and Multisite tables + /** + * WordPress Term Meta table. + * + * @since 4.4.0 + * @access public + * @var string */ + public $termmeta; + + // + // Global and Multisite tables + // /** * WordPress User Metadata table @@ -353,7 +402,7 @@ class wpdb { * @access public * @var string */ - var $usermeta; + public $usermeta; /** * WordPress Users table @@ -362,7 +411,7 @@ class wpdb { * @access public * @var string */ - var $users; + public $users; /** * Multisite Blogs table @@ -371,7 +420,7 @@ class wpdb { * @access public * @var string */ - var $blogs; + public $blogs; /** * Multisite Blog Versions table @@ -380,7 +429,7 @@ class wpdb { * @access public * @var string */ - var $blog_versions; + public $blog_versions; /** * Multisite Registration Log table @@ -389,7 +438,7 @@ class wpdb { * @access public * @var string */ - var $registration_log; + public $registration_log; /** * Multisite Signups table @@ -398,7 +447,7 @@ class wpdb { * @access public * @var string */ - var $signups; + public $signups; /** * Multisite Sites table @@ -407,7 +456,7 @@ class wpdb { * @access public * @var string */ - var $site; + public $site; /** * Multisite Sitewide Terms table @@ -416,7 +465,7 @@ class wpdb { * @access public * @var string */ - var $sitecategories; + public $sitecategories; /** * Multisite Site Metadata table @@ -425,7 +474,7 @@ class wpdb { * @access public * @var string */ - var $sitemeta; + public $sitemeta; /** * Format specifiers for DB columns. Columns not listed here default to %s. Initialized during WP load. @@ -441,7 +490,7 @@ class wpdb { * @access public * @var array */ - var $field_types = array(); + public $field_types = array(); /** * Database table columns charset @@ -450,7 +499,7 @@ class wpdb { * @access public * @var string */ - var $charset; + public $charset; /** * Database table columns collate @@ -459,7 +508,7 @@ class wpdb { * @access public * @var string */ - var $collate; + public $collate; /** * Database Username @@ -513,7 +562,7 @@ class wpdb { * @access public * @var string */ - var $func_call; + public $func_call; /** * Whether MySQL is used as the database engine. @@ -564,15 +613,17 @@ class wpdb { * the actual setting up of the class properties and connection * to the database. * - * @link http://core.trac.wordpress.org/ticket/3354 + * @link https://core.trac.wordpress.org/ticket/3354 * @since 2.0.8 * - * @param string $dbuser MySQL database user + * @global string $wp_version + * + * @param string $dbuser MySQL database user * @param string $dbpassword MySQL database password - * @param string $dbname MySQL database name - * @param string $dbhost MySQL database host + * @param string $dbname MySQL database name + * @param string $dbhost MySQL database host */ - function __construct( $dbuser, $dbpassword, $dbname, $dbhost ) { + public function __construct( $dbuser, $dbpassword, $dbname, $dbhost ) { register_shutdown_function( array( $this, '__destruct' ) ); if ( WP_DEBUG && WP_DEBUG_DISPLAY ) @@ -594,13 +645,16 @@ class wpdb { } } - $this->init_charset(); - $this->dbuser = $dbuser; $this->dbpassword = $dbpassword; $this->dbname = $dbname; $this->dbhost = $dbhost; + // wp-config.php creation will manually connect when ready. + if ( defined( 'WP_SETUP_CONFIG' ) ) { + return; + } + $this->db_connect(); } @@ -609,9 +663,9 @@ class wpdb { * * @see wpdb::__construct() * @since 2.0.8 - * @return bool true + * @return true */ - function __destruct() { + public function __destruct() { return true; } @@ -623,27 +677,35 @@ class wpdb { * @param string $name The private member to get, and optionally process * @return mixed The private member */ - function __get( $name ) { - if ( 'col_info' == $name ) + public function __get( $name ) { + if ( 'col_info' === $name ) $this->load_col_info(); return $this->$name; } /** - * Magic function, for backwards compatibility + * Magic function, for backwards compatibility. * * @since 3.5.0 * * @param string $name The private member to set * @param mixed $value The value to set */ - function __set( $name, $value ) { + public function __set( $name, $value ) { + $protected_members = array( + 'col_meta', + 'table_charset', + 'check_current_query', + ); + if ( in_array( $name, $protected_members, true ) ) { + return; + } $this->$name = $value; } /** - * Magic function, for backwards compatibility + * Magic function, for backwards compatibility. * * @since 3.5.0 * @@ -651,18 +713,18 @@ class wpdb { * * @return bool If the member is set or not */ - function __isset( $name ) { + public function __isset( $name ) { return isset( $this->$name ); } /** - * Magic function, for backwards compatibility + * Magic function, for backwards compatibility. * * @since 3.5.0 * * @param string $name The private member to unset */ - function __unset( $name ) { + public function __unset( $name ) { unset( $this->$name ); } @@ -671,19 +733,33 @@ class wpdb { * * @since 3.1.0 */ - function init_charset() { + public function init_charset() { if ( function_exists('is_multisite') && is_multisite() ) { $this->charset = 'utf8'; - if ( defined( 'DB_COLLATE' ) && DB_COLLATE ) + if ( defined( 'DB_COLLATE' ) && DB_COLLATE ) { $this->collate = DB_COLLATE; - else + } else { $this->collate = 'utf8_general_ci'; + } } elseif ( defined( 'DB_COLLATE' ) ) { $this->collate = DB_COLLATE; } - if ( defined( 'DB_CHARSET' ) ) + if ( defined( 'DB_CHARSET' ) ) { $this->charset = DB_CHARSET; + } + + if ( ( $this->use_mysqli && ! ( $this->dbh instanceof mysqli ) ) || empty( $this->dbh ) ) { + return; + } + + if ( 'utf8' === $this->charset && $this->has_cap( 'utf8mb4' ) ) { + $this->charset = 'utf8mb4'; + } + + if ( 'utf8mb4' === $this->charset && ( ! $this->collate || stripos( $this->collate, 'utf8_' ) === 0 ) ) { + $this->collate = 'utf8mb4_unicode_ci'; + } } /** @@ -692,10 +768,10 @@ class wpdb { * @since 3.1.0 * * @param resource $dbh The resource given by mysql_connect - * @param string $charset The character set (optional) - * @param string $collate The collation (optional) + * @param string $charset Optional. The character set. Default null. + * @param string $collate Optional. The collation. Default null. */ - function set_charset( $dbh, $charset = null, $collate = null ) { + public function set_charset( $dbh, $charset = null, $collate = null ) { if ( ! isset( $charset ) ) $charset = $this->charset; if ( ! isset( $collate ) ) @@ -708,7 +784,7 @@ class wpdb { $query = $this->prepare( 'SET NAMES %s', $charset ); if ( ! empty( $collate ) ) $query .= $this->prepare( ' COLLATE %s', $collate ); - mysqli_query( $query, $dbh ); + mysqli_query( $dbh, $query ); } } else { if ( function_exists( 'mysql_set_charset' ) && $this->has_cap( 'set_charset' ) ) { @@ -733,7 +809,7 @@ class wpdb { * * @param array $modes Optional. A list of SQL modes to set. */ - function set_sql_mode( $modes = array() ) { + public function set_sql_mode( $modes = array() ) { if ( empty( $modes ) ) { if ( $this->use_mysqli ) { $res = mysqli_query( $this->dbh, 'SELECT @@SESSION.sql_mode' ); @@ -769,13 +845,11 @@ class wpdb { * * @since 3.9.0 * - * @see wpdb::$incompatible_modes - * * @param array $incompatible_modes An array of incompatible modes. */ $incompatible_modes = (array) apply_filters( 'incompatible_sql_modes', $this->incompatible_modes ); - foreach( $modes as $i => $mode ) { + foreach ( $modes as $i => $mode ) { if ( in_array( $mode, $incompatible_modes ) ) { unset( $modes[ $i ] ); } @@ -795,11 +869,11 @@ class wpdb { * * @since 2.5.0 * - * @param string $prefix Alphanumeric name for the new prefix. - * @param bool $set_table_names Optional. Whether the table names, e.g. wpdb::$posts, should be updated or not. + * @param string $prefix Alphanumeric name for the new prefix. + * @param bool $set_table_names Optional. Whether the table names, e.g. wpdb::$posts, should be updated or not. * @return string|WP_Error Old prefix or WP_Error on error */ - function set_prefix( $prefix, $set_table_names = true ) { + public function set_prefix( $prefix, $set_table_names = true ) { if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) return new WP_Error('invalid_db_prefix', 'Invalid database prefix' ); @@ -834,11 +908,12 @@ class wpdb { * * @since 3.0.0 * @access public + * * @param int $blog_id * @param int $site_id Optional. - * @return string previous blog id + * @return int previous blog id */ - function set_blog_id( $blog_id, $site_id = 0 ) { + public function set_blog_id( $blog_id, $site_id = 0 ) { if ( ! empty( $site_id ) ) $this->siteid = $site_id; @@ -859,12 +934,11 @@ class wpdb { /** * Gets blog prefix. * - * @uses is_multisite() * @since 3.0.0 * @param int $blog_id Optional. * @return string Blog prefix. */ - function get_blog_prefix( $blog_id = null ) { + public function get_blog_prefix( $blog_id = null ) { if ( is_multisite() ) { if ( null === $blog_id ) $blog_id = $this->blogid; @@ -898,15 +972,14 @@ class wpdb { * @uses wpdb::$old_tables * @uses wpdb::$global_tables * @uses wpdb::$ms_global_tables - * @uses is_multisite() * - * @param string $scope Optional. Can be all, global, ms_global, blog, or old tables. Defaults to all. - * @param bool $prefix Optional. Whether to include table prefixes. Default true. If blog - * prefix is requested, then the custom users and usermeta tables will be mapped. - * @param int $blog_id Optional. The blog_id to prefix. Defaults to wpdb::$blogid. Used only when prefix is requested. + * @param string $scope Optional. Can be all, global, ms_global, blog, or old tables. Defaults to all. + * @param bool $prefix Optional. Whether to include table prefixes. Default true. If blog + * prefix is requested, then the custom users and usermeta tables will be mapped. + * @param int $blog_id Optional. The blog_id to prefix. Defaults to wpdb::$blogid. Used only when prefix is requested. * @return array Table names. When a prefix is requested, the key is the unprefixed table name. */ - function tables( $scope = 'all', $prefix = true, $blog_id = 0 ) { + public function tables( $scope = 'all', $prefix = true, $blog_id = 0 ) { switch ( $scope ) { case 'all' : $tables = array_merge( $this->global_tables, $this->tables ); @@ -929,7 +1002,6 @@ class wpdb { break; default : return array(); - break; } if ( $prefix ) { @@ -964,33 +1036,57 @@ class wpdb { * * @since 0.71 * - * @param string $db MySQL database name - * @param resource $dbh Optional link identifier. - * @return null Always null. + * @param string $db MySQL database name + * @param resource|null $dbh Optional link identifier. */ - function select( $db, $dbh = null ) { + public function select( $db, $dbh = null ) { if ( is_null($dbh) ) $dbh = $this->dbh; if ( $this->use_mysqli ) { - $success = @mysqli_select_db( $dbh, $db ); + $success = mysqli_select_db( $dbh, $db ); } else { - $success = @mysql_select_db( $db, $dbh ); + $success = mysql_select_db( $db, $dbh ); } if ( ! $success ) { $this->ready = false; if ( ! did_action( 'template_redirect' ) ) { wp_load_translations_early(); - $this->bail( sprintf( __( '<h1>Can’t select database</h1> -<p>We were able to connect to the database server (which means your username and password is okay) but not able to select the <code>%1$s</code> database.</p> -<ul> -<li>Are you sure it exists?</li> -<li>Does the user <code>%2$s</code> have permission to use the <code>%1$s</code> database?</li> -<li>On some systems the name of your database is prefixed with your username, so it would be like <code>username_%1$s</code>. Could that be the problem?</li> -</ul> -<p>If you don\'t know how to set up a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href="https://wordpress.org/support/">WordPress Support Forums</a>.</p>' ), htmlspecialchars( $db, ENT_QUOTES ), htmlspecialchars( $this->dbuser, ENT_QUOTES ) ), 'db_select_fail' ); + + $message = '<h1>' . __( 'Can’t select database' ) . "</h1>\n"; + + $message .= '<p>' . sprintf( + /* translators: %s: database name */ + __( 'We were able to connect to the database server (which means your username and password is okay) but not able to select the %s database.' ), + '<code>' . htmlspecialchars( $db, ENT_QUOTES ) . '</code>' + ) . "</p>\n"; + + $message .= "<ul>\n"; + $message .= '<li>' . __( 'Are you sure it exists?' ) . "</li>\n"; + + $message .= '<li>' . sprintf( + /* translators: 1: database user, 2: database name */ + __( 'Does the user %1$s have permission to use the %2$s database?' ), + '<code>' . htmlspecialchars( $this->dbuser, ENT_QUOTES ) . '</code>', + '<code>' . htmlspecialchars( $db, ENT_QUOTES ) . '</code>' + ) . "</li>\n"; + + $message .= '<li>' . sprintf( + /* translators: %s: database name */ + __( 'On some systems the name of your database is prefixed with your username, so it would be like <code>username_%1$s</code>. Could that be the problem?' ), + htmlspecialchars( $db, ENT_QUOTES ) + ). "</li>\n"; + + $message .= "</ul>\n"; + + $message .= '<p>' . sprintf( + /* translators: %s: support forums URL */ + __( 'If you don’t know how to set up a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href="%s">WordPress Support Forums</a>.' ), + __( 'https://wordpress.org/support/' ) + ) . "</p>\n"; + + $this->bail( $message, 'db_select_fail' ); } - return; } } @@ -1000,7 +1096,7 @@ class wpdb { * Use esc_sql() or wpdb::prepare() instead. * * @since 2.8.0 - * @deprecated 3.6.0 + * @deprecated 3.6.0 Use wpdb::prepare() * @see wpdb::prepare * @see esc_sql() * @access private @@ -1035,7 +1131,12 @@ class wpdb { } $class = get_class( $this ); - _doing_it_wrong( $class, "$class must set a database connection for use with escaping.", E_USER_NOTICE ); + if ( function_exists( '__' ) ) { + /* translators: %s: database access abstraction class, usually wpdb or a class extending wpdb */ + _doing_it_wrong( $class, sprintf( __( '%s must set a database connection for use with escaping.' ), $class ), E_USER_NOTICE ); + } else { + _doing_it_wrong( $class, sprintf( '%s must set a database connection for use with escaping.', $class ), E_USER_NOTICE ); + } return addslashes( $string ); } @@ -1070,14 +1171,14 @@ class wpdb { * Use esc_sql() or wpdb::prepare() instead. * * @since 0.71 - * @deprecated 3.6.0 + * @deprecated 3.6.0 Use wpdb::prepare() * @see wpdb::prepare() * @see esc_sql() * * @param mixed $data * @return mixed */ - function escape( $data ) { + public function escape( $data ) { if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) ) _deprecated_function( __METHOD__, '3.6', 'wpdb::prepare() or esc_sql()' ); if ( is_array( $data ) ) { @@ -1098,11 +1199,12 @@ class wpdb { * Escapes content by reference for insertion into the database, for security * * @uses wpdb::_real_escape() + * * @since 2.3.0 + * * @param string $string to escape - * @return void */ - function escape_by_ref( &$string ) { + public function escape_by_ref( &$string ) { if ( ! is_float( $string ) ) $string = $this->_real_escape( $string ); } @@ -1127,24 +1229,21 @@ class wpdb { * * Both %d and %s should be left unquoted in the query string. * - * <code> - * wpdb::prepare( "SELECT * FROM `table` WHERE `column` = %s AND `field` = %d", 'foo', 1337 ) - * wpdb::prepare( "SELECT DATE_FORMAT(`field`, '%%c') FROM `table` WHERE `column` = %s", 'foo' ); - * </code> + * wpdb::prepare( "SELECT * FROM `table` WHERE `column` = %s AND `field` = %d", 'foo', 1337 ) + * wpdb::prepare( "SELECT DATE_FORMAT(`field`, '%%c') FROM `table` WHERE `column` = %s", 'foo' ); * * @link http://php.net/sprintf Description of syntax. * @since 2.3.0 * - * @param string $query Query statement with sprintf()-like placeholders - * @param array|mixed $args The array of variables to substitute into the query's placeholders if being called like - * {@link http://php.net/vsprintf vsprintf()}, or the first variable to substitute into the query's placeholders if - * being called like {@link http://php.net/sprintf sprintf()}. - * @param mixed $args,... further variables to substitute into the query's placeholders if being called like - * {@link http://php.net/sprintf sprintf()}. - * @return null|false|string Sanitized query string, null if there is no query, false if there is an error and string - * if there was something to prepare + * @param string $query Query statement with sprintf()-like placeholders + * @param array|mixed $args The array of variables to substitute into the query's placeholders if being called like + * {@link http://php.net/vsprintf vsprintf()}, or the first variable to substitute into the query's placeholders if + * being called like {@link http://php.net/sprintf sprintf()}. + * @param mixed $args,... further variables to substitute into the query's placeholders if being called like + * {@link http://php.net/sprintf sprintf()}. + * @return string|void Sanitized query string, if there is a query to prepare. */ - function prepare( $query, $args ) { + public function prepare( $query, $args ) { if ( is_null( $query ) ) return; @@ -1166,6 +1265,34 @@ class wpdb { return @vsprintf( $query, $args ); } + /** + * First half of escaping for LIKE special characters % and _ before preparing for MySQL. + * + * Use this only before wpdb::prepare() or esc_sql(). Reversing the order is very bad for security. + * + * Example Prepared Statement: + * + * $wild = '%'; + * $find = 'only 43% of planets'; + * $like = $wild . $wpdb->esc_like( $find ) . $wild; + * $sql = $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE post_content LIKE '%s'", $like ); + * + * Example Escape Chain: + * + * $sql = esc_sql( $wpdb->esc_like( $input ) ); + * + * @since 4.0.0 + * @access public + * + * @param string $text The raw text to be escaped. The input typed by the user should have no + * extra or deleted slashes. + * @return string Text in the form of a LIKE phrase. The output is not SQL safe. Call $wpdb::prepare() + * or real_escape next. + */ + public function esc_like( $text ) { + return addcslashes( $text, '_%\\' ); + } + /** * Print SQL/DB error. * @@ -1173,9 +1300,9 @@ class wpdb { * @global array $EZSQL_ERROR Stores error information of query and error string * * @param string $str The error to display - * @return bool False if the showing of errors is disabled. + * @return false|void False if the showing of errors is disabled. */ - function print_error( $str = '' ) { + public function print_error( $str = '' ) { global $EZSQL_ERROR; if ( !$str ) { @@ -1205,19 +1332,29 @@ class wpdb { // If there is an error then take note of it if ( is_multisite() ) { - $msg = "WordPress database error: [$str]\n{$this->last_query}\n"; - if ( defined( 'ERRORLOGFILE' ) ) + $msg = sprintf( + "%s [%s]\n%s\n", + __( 'WordPress database error:' ), + $str, + $this->last_query + ); + + if ( defined( 'ERRORLOGFILE' ) ) { error_log( $msg, 3, ERRORLOGFILE ); - if ( defined( 'DIEONDBERROR' ) ) + } + if ( defined( 'DIEONDBERROR' ) ) { wp_die( $msg ); + } } else { $str = htmlspecialchars( $str, ENT_QUOTES ); $query = htmlspecialchars( $this->last_query, ENT_QUOTES ); - print "<div id='error'> - <p class='wpdberror'><strong>WordPress database error:</strong> [$str]<br /> - <code>$query</code></p> - </div>"; + printf( + '<div id="error"><p class="wpdberror"><strong>%s</strong> [%s]<br /><code>%s</code></p></div>', + __( 'WordPress database error:' ), + $str, + $query + ); } } @@ -1235,7 +1372,7 @@ class wpdb { * @param bool $show Whether to show or hide errors * @return bool Old value for showing errors. */ - function show_errors( $show = true ) { + public function show_errors( $show = true ) { $errors = $this->show_errors; $this->show_errors = $show; return $errors; @@ -1251,7 +1388,7 @@ class wpdb { * * @return bool Whether showing of errors was active */ - function hide_errors() { + public function hide_errors() { $show = $this->show_errors; $this->show_errors = false; return $show; @@ -1268,7 +1405,7 @@ class wpdb { * @param bool $suppress Optional. New value. Defaults to true. * @return bool Old value */ - function suppress_errors( $suppress = true ) { + public function suppress_errors( $suppress = true ) { $errors = $this->suppress_errors; $this->suppress_errors = (bool) $suppress; return $errors; @@ -1278,21 +1415,29 @@ class wpdb { * Kill cached query results. * * @since 0.71 - * @return void */ - function flush() { + public function flush() { $this->last_result = array(); $this->col_info = null; $this->last_query = null; $this->rows_affected = $this->num_rows = 0; $this->last_error = ''; - if ( is_resource( $this->result ) ) { - if ( $this->use_mysqli ) { - mysqli_free_result( $this->result ); - } else { - mysql_free_result( $this->result ); + if ( $this->use_mysqli && $this->result instanceof mysqli_result ) { + mysqli_free_result( $this->result ); + $this->result = null; + + // Sanity check before using the handle + if ( empty( $this->dbh ) || !( $this->dbh instanceof mysqli ) ) { + return; + } + + // Clear out any results from a multi-query + while ( mysqli_more_results( $this->dbh ) ) { + mysqli_next_result( $this->dbh ); } + } elseif ( is_resource( $this->result ) ) { + mysql_free_result( $this->result ); } } @@ -1308,10 +1453,13 @@ class wpdb { * @param bool $allow_bail Optional. Allows the function to bail. Default true. * @return bool True with a successful connection, false on failure. */ - function db_connect( $allow_bail = true ) { - + public function db_connect( $allow_bail = true ) { $this->is_mysql = true; + /* + * Deprecated in 3.9+ when using MySQLi. No equivalent + * $new_link parameter exists for mysqli_* functions. + */ $new_link = defined( 'MYSQL_NEW_LINK' ) ? MYSQL_NEW_LINK : true; $client_flags = defined( 'MYSQL_CLIENT_FLAGS' ) ? MYSQL_CLIENT_FLAGS : 0; @@ -1356,15 +1504,15 @@ class wpdb { if ( $this->has_connected ) { $attempt_fallback = false; - } else if ( defined( 'WP_USE_EXT_MYSQL' ) && ! WP_USE_EXT_MYSQL ) { + } elseif ( defined( 'WP_USE_EXT_MYSQL' ) && ! WP_USE_EXT_MYSQL ) { $attempt_fallback = false; - } else if ( ! function_exists( 'mysql_connect' ) ) { + } elseif ( ! function_exists( 'mysql_connect' ) ) { $attempt_fallback = false; } if ( $attempt_fallback ) { $this->use_mysqli = false; - $this->db_connect(); + return $this->db_connect( $allow_bail ); } } } else { @@ -1384,23 +1532,41 @@ class wpdb { die(); } - $this->bail( sprintf( __( " -<h1>Error establishing a database connection</h1> -<p>This either means that the username and password information in your <code>wp-config.php</code> file is incorrect or we can't contact the database server at <code>%s</code>. This could mean your host's database server is down.</p> -<ul> - <li>Are you sure you have the correct username and password?</li> - <li>Are you sure that you have typed the correct hostname?</li> - <li>Are you sure that the database server is running?</li> -</ul> -<p>If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href='https://wordpress.org/support/'>WordPress Support Forums</a>.</p> -" ), htmlspecialchars( $this->dbhost, ENT_QUOTES ) ), 'db_connect_fail' ); + $message = '<h1>' . __( 'Error establishing a database connection' ) . "</h1>\n"; + + $message .= '<p>' . sprintf( + /* translators: 1: wp-config.php. 2: database host */ + __( 'This either means that the username and password information in your %1$s file is incorrect or we can’t contact the database server at %2$s. This could mean your host’s database server is down.' ), + '<code>wp-config.php</code>', + '<code>' . htmlspecialchars( $this->dbhost, ENT_QUOTES ) . '</code>' + ) . "</p>\n"; + + $message .= "<ul>\n"; + $message .= '<li>' . __( 'Are you sure you have the correct username and password?' ) . "</li>\n"; + $message .= '<li>' . __( 'Are you sure that you have typed the correct hostname?' ) . "</li>\n"; + $message .= '<li>' . __( 'Are you sure that the database server is running?' ) . "</li>\n"; + $message .= "</ul>\n"; + + $message .= '<p>' . sprintf( + /* translators: %s: support forums URL */ + __( 'If you’re unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href="%s">WordPress Support Forums</a>.' ), + __( 'https://wordpress.org/support/' ) + ) . "</p>\n"; + + $this->bail( $message, 'db_connect_fail' ); return false; - } else if ( $this->dbh ) { + } elseif ( $this->dbh ) { + if ( ! $this->has_connected ) { + $this->init_charset(); + } + $this->has_connected = true; + $this->set_charset( $this->dbh ); - $this->set_sql_mode(); + $this->ready = true; + $this->set_sql_mode(); $this->select( $this->dbname, $this->dbh ); return true; @@ -1421,15 +1587,15 @@ class wpdb { * @since 3.9.0 * * @param bool $allow_bail Optional. Allows the function to bail. Default true. - * @return bool True if the connection is up. + * @return bool|void True if the connection is up. */ - function check_connection( $allow_bail = true ) { + public function check_connection( $allow_bail = true ) { if ( $this->use_mysqli ) { - if ( @mysqli_ping( $this->dbh ) ) { + if ( ! empty( $this->dbh ) && mysqli_ping( $this->dbh ) ) { return true; } } else { - if ( @mysql_ping( $this->dbh ) ) { + if ( ! empty( $this->dbh ) && mysql_ping( $this->dbh ) ) { return true; } } @@ -1470,16 +1636,29 @@ class wpdb { return false; } + wp_load_translations_early(); + + $message = '<h1>' . __( 'Error reconnecting to the database' ) . "</h1>\n"; + + $message .= '<p>' . sprintf( + /* translators: %s: database host */ + __( 'This means that we lost contact with the database server at %s. This could mean your host’s database server is down.' ), + '<code>' . htmlspecialchars( $this->dbhost, ENT_QUOTES ) . '</code>' + ) . "</p>\n"; + + $message .= "<ul>\n"; + $message .= '<li>' . __( 'Are you sure that the database server is running?' ) . "</li>\n"; + $message .= '<li>' . __( 'Are you sure that the database server is not under particularly heavy load?' ) . "</li>\n"; + $message .= "</ul>\n"; + + $message .= '<p>' . sprintf( + /* translators: %s: support forums URL */ + __( 'If you’re unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href="%s">WordPress Support Forums</a>.' ), + __( 'https://wordpress.org/support/' ) + ) . "</p>\n"; + // We weren't able to reconnect, so we better bail. - $this->bail( sprintf( ( " -<h1>Error reconnecting to the database</h1> -<p>This means that we lost contact with the database server at <code>%s</code>. This could mean your host's database server is down.</p> -<ul> - <li>Are you sure that the database server is running?</li> - <li>Are you sure that the database server is not under particularly heavy load?</li> -</ul> -<p>If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href='https://wordpress.org/support/'>WordPress Support Forums</a>.</p> -" ), htmlspecialchars( $this->dbhost, ENT_QUOTES ) ), 'db_connect_fail' ); + $this->bail( $message, 'db_connect_fail' ); // Call dead_db() if bail didn't die, because this database is no more. It has ceased to be (at least temporarily). dead_db(); @@ -1495,9 +1674,11 @@ class wpdb { * @param string $query Database query * @return int|false Number of rows affected/selected or false on error */ - function query( $query ) { - if ( ! $this->ready ) + public function query( $query ) { + if ( ! $this->ready ) { + $this->check_current_query = true; return false; + } /** * Filter the database query. @@ -1511,12 +1692,25 @@ class wpdb { */ $query = apply_filters( 'query', $query ); - $return_val = 0; $this->flush(); // Log how the function was called $this->func_call = "\$db->query(\"$query\")"; + // If we're writing to the database, make sure the query will write safely. + if ( $this->check_current_query && ! $this->check_ascii( $query ) ) { + $stripped_query = $this->strip_invalid_text_from_query( $query ); + // strip_invalid_text_from_query() can perform queries, so we need + // to flush again, just to make sure everything is clear. + $this->flush(); + if ( $stripped_query !== $query ) { + $this->insert_id = 0; + return false; + } + } + + $this->check_current_query = true; + // Keep track of the last query for debug.. $this->last_query = $query; @@ -1577,13 +1771,13 @@ class wpdb { $return_val = $this->rows_affected; } else { $num_rows = 0; - if ( $this->use_mysqli ) { - while ( $row = @mysqli_fetch_object( $this->result ) ) { + if ( $this->use_mysqli && $this->result instanceof mysqli_result ) { + while ( $row = mysqli_fetch_object( $this->result ) ) { $this->last_result[$num_rows] = $row; $num_rows++; } - } else { - while ( $row = @mysql_fetch_object( $this->result ) ) { + } elseif ( is_resource( $this->result ) ) { + while ( $row = mysql_fetch_object( $this->result ) ) { $this->last_result[$num_rows] = $row; $num_rows++; } @@ -1613,10 +1807,10 @@ class wpdb { $this->timer_start(); } - if ( $this->use_mysqli ) { - $this->result = @mysqli_query( $this->dbh, $query ); - } else { - $this->result = @mysql_query( $query, $this->dbh ); + if ( ! empty( $this->dbh ) && $this->use_mysqli ) { + $this->result = mysqli_query( $this->dbh, $query ); + } elseif ( ! empty( $this->dbh ) ) { + $this->result = mysql_query( $query, $this->dbh ); } $this->num_queries++; @@ -1628,46 +1822,50 @@ class wpdb { /** * Insert a row into a table. * - * <code> - * wpdb::insert( 'table', array( 'column' => 'foo', 'field' => 'bar' ) ) - * wpdb::insert( 'table', array( 'column' => 'foo', 'field' => 1337 ), array( '%s', '%d' ) ) - * </code> + * wpdb::insert( 'table', array( 'column' => 'foo', 'field' => 'bar' ) ) + * wpdb::insert( 'table', array( 'column' => 'foo', 'field' => 1337 ), array( '%s', '%d' ) ) * * @since 2.5.0 * @see wpdb::prepare() * @see wpdb::$field_types * @see wp_set_wpdb_vars() * - * @param string $table table name - * @param array $data Data to insert (in column => value pairs). Both $data columns and $data values should be "raw" (neither should be SQL escaped). - * @param array|string $format Optional. An array of formats to be mapped to each of the value in $data. If string, that format will be used for all of the values in $data. - * A format is one of '%d', '%f', '%s' (integer, float, string). If omitted, all values in $data will be treated as strings unless otherwise specified in wpdb::$field_types. + * @param string $table Table name + * @param array $data Data to insert (in column => value pairs). + * Both $data columns and $data values should be "raw" (neither should be SQL escaped). + * Sending a null value will cause the column to be set to NULL - the corresponding format is ignored in this case. + * @param array|string $format Optional. An array of formats to be mapped to each of the value in $data. + * If string, that format will be used for all of the values in $data. + * A format is one of '%d', '%f', '%s' (integer, float, string). + * If omitted, all values in $data will be treated as strings unless otherwise specified in wpdb::$field_types. * @return int|false The number of rows inserted, or false on error. */ - function insert( $table, $data, $format = null ) { + public function insert( $table, $data, $format = null ) { return $this->_insert_replace_helper( $table, $data, $format, 'INSERT' ); } /** * Replace a row into a table. * - * <code> - * wpdb::replace( 'table', array( 'column' => 'foo', 'field' => 'bar' ) ) - * wpdb::replace( 'table', array( 'column' => 'foo', 'field' => 1337 ), array( '%s', '%d' ) ) - * </code> + * wpdb::replace( 'table', array( 'column' => 'foo', 'field' => 'bar' ) ) + * wpdb::replace( 'table', array( 'column' => 'foo', 'field' => 1337 ), array( '%s', '%d' ) ) * * @since 3.0.0 * @see wpdb::prepare() * @see wpdb::$field_types * @see wp_set_wpdb_vars() * - * @param string $table table name - * @param array $data Data to insert (in column => value pairs). Both $data columns and $data values should be "raw" (neither should be SQL escaped). - * @param array|string $format Optional. An array of formats to be mapped to each of the value in $data. If string, that format will be used for all of the values in $data. - * A format is one of '%d', '%f', '%s' (integer, float, string). If omitted, all values in $data will be treated as strings unless otherwise specified in wpdb::$field_types. + * @param string $table Table name + * @param array $data Data to insert (in column => value pairs). + * Both $data columns and $data values should be "raw" (neither should be SQL escaped). + * Sending a null value will cause the column to be set to NULL - the corresponding format is ignored in this case. + * @param array|string $format Optional. An array of formats to be mapped to each of the value in $data. + * If string, that format will be used for all of the values in $data. + * A format is one of '%d', '%f', '%s' (integer, float, string). + * If omitted, all values in $data will be treated as strings unless otherwise specified in wpdb::$field_types. * @return int|false The number of rows affected, or false on error. */ - function replace( $table, $data, $format = null ) { + public function replace( $table, $data, $format = null ) { return $this->_insert_replace_helper( $table, $data, $format, 'REPLACE' ); } @@ -1682,127 +1880,314 @@ class wpdb { * @see wpdb::$field_types * @see wp_set_wpdb_vars() * - * @param string $table table name - * @param array $data Data to insert (in column => value pairs). Both $data columns and $data values should be "raw" (neither should be SQL escaped). - * @param array|string $format Optional. An array of formats to be mapped to each of the value in $data. If string, that format will be used for all of the values in $data. - * A format is one of '%d', '%f', '%s' (integer, float, string). If omitted, all values in $data will be treated as strings unless otherwise specified in wpdb::$field_types. - * @param string $type Optional. What type of operation is this? INSERT or REPLACE. Defaults to INSERT. + * @param string $table Table name + * @param array $data Data to insert (in column => value pairs). + * Both $data columns and $data values should be "raw" (neither should be SQL escaped). + * Sending a null value will cause the column to be set to NULL - the corresponding format is ignored in this case. + * @param array|string $format Optional. An array of formats to be mapped to each of the value in $data. + * If string, that format will be used for all of the values in $data. + * A format is one of '%d', '%f', '%s' (integer, float, string). + * If omitted, all values in $data will be treated as strings unless otherwise specified in wpdb::$field_types. + * @param string $type Optional. What type of operation is this? INSERT or REPLACE. Defaults to INSERT. * @return int|false The number of rows affected, or false on error. */ function _insert_replace_helper( $table, $data, $format = null, $type = 'INSERT' ) { - if ( ! in_array( strtoupper( $type ), array( 'REPLACE', 'INSERT' ) ) ) - return false; $this->insert_id = 0; - $formats = $format = (array) $format; - $fields = array_keys( $data ); - $formatted_fields = array(); - foreach ( $fields as $field ) { - if ( !empty( $format ) ) - $form = ( $form = array_shift( $formats ) ) ? $form : $format[0]; - elseif ( isset( $this->field_types[$field] ) ) - $form = $this->field_types[$field]; - else - $form = '%s'; - $formatted_fields[] = $form; + + if ( ! in_array( strtoupper( $type ), array( 'REPLACE', 'INSERT' ) ) ) { + return false; } - $sql = "{$type} INTO `$table` (`" . implode( '`,`', $fields ) . "`) VALUES (" . implode( ",", $formatted_fields ) . ")"; - return $this->query( $this->prepare( $sql, $data ) ); + + $data = $this->process_fields( $table, $data, $format ); + if ( false === $data ) { + return false; + } + + $formats = $values = array(); + foreach ( $data as $value ) { + if ( is_null( $value['value'] ) ) { + $formats[] = 'NULL'; + continue; + } + + $formats[] = $value['format']; + $values[] = $value['value']; + } + + $fields = '`' . implode( '`, `', array_keys( $data ) ) . '`'; + $formats = implode( ', ', $formats ); + + $sql = "$type INTO `$table` ($fields) VALUES ($formats)"; + + $this->check_current_query = false; + return $this->query( $this->prepare( $sql, $values ) ); } /** * Update a row in the table * - * <code> - * wpdb::update( 'table', array( 'column' => 'foo', 'field' => 'bar' ), array( 'ID' => 1 ) ) - * wpdb::update( 'table', array( 'column' => 'foo', 'field' => 1337 ), array( 'ID' => 1 ), array( '%s', '%d' ), array( '%d' ) ) - * </code> + * wpdb::update( 'table', array( 'column' => 'foo', 'field' => 'bar' ), array( 'ID' => 1 ) ) + * wpdb::update( 'table', array( 'column' => 'foo', 'field' => 1337 ), array( 'ID' => 1 ), array( '%s', '%d' ), array( '%d' ) ) * * @since 2.5.0 * @see wpdb::prepare() * @see wpdb::$field_types * @see wp_set_wpdb_vars() * - * @param string $table table name - * @param array $data Data to update (in column => value pairs). Both $data columns and $data values should be "raw" (neither should be SQL escaped). - * @param array $where A named array of WHERE clauses (in column => value pairs). Multiple clauses will be joined with ANDs. Both $where columns and $where values should be "raw". - * @param array|string $format Optional. An array of formats to be mapped to each of the values in $data. If string, that format will be used for all of the values in $data. - * A format is one of '%d', '%f', '%s' (integer, float, string). If omitted, all values in $data will be treated as strings unless otherwise specified in wpdb::$field_types. - * @param array|string $where_format Optional. An array of formats to be mapped to each of the values in $where. If string, that format will be used for all of the items in $where. A format is one of '%d', '%f', '%s' (integer, float, string). If omitted, all values in $where will be treated as strings. + * @param string $table Table name + * @param array $data Data to update (in column => value pairs). + * Both $data columns and $data values should be "raw" (neither should be SQL escaped). + * Sending a null value will cause the column to be set to NULL - the corresponding + * format is ignored in this case. + * @param array $where A named array of WHERE clauses (in column => value pairs). + * Multiple clauses will be joined with ANDs. + * Both $where columns and $where values should be "raw". + * Sending a null value will create an IS NULL comparison - the corresponding format will be ignored in this case. + * @param array|string $format Optional. An array of formats to be mapped to each of the values in $data. + * If string, that format will be used for all of the values in $data. + * A format is one of '%d', '%f', '%s' (integer, float, string). + * If omitted, all values in $data will be treated as strings unless otherwise specified in wpdb::$field_types. + * @param array|string $where_format Optional. An array of formats to be mapped to each of the values in $where. + * If string, that format will be used for all of the items in $where. + * A format is one of '%d', '%f', '%s' (integer, float, string). + * If omitted, all values in $where will be treated as strings. * @return int|false The number of rows updated, or false on error. */ - function update( $table, $data, $where, $format = null, $where_format = null ) { - if ( ! is_array( $data ) || ! is_array( $where ) ) + public function update( $table, $data, $where, $format = null, $where_format = null ) { + if ( ! is_array( $data ) || ! is_array( $where ) ) { return false; + } - $formats = $format = (array) $format; - $bits = $wheres = array(); - foreach ( (array) array_keys( $data ) as $field ) { - if ( !empty( $format ) ) - $form = ( $form = array_shift( $formats ) ) ? $form : $format[0]; - elseif ( isset($this->field_types[$field]) ) - $form = $this->field_types[$field]; - else - $form = '%s'; - $bits[] = "`$field` = {$form}"; + $data = $this->process_fields( $table, $data, $format ); + if ( false === $data ) { + return false; + } + $where = $this->process_fields( $table, $where, $where_format ); + if ( false === $where ) { + return false; } - $where_formats = $where_format = (array) $where_format; - foreach ( (array) array_keys( $where ) as $field ) { - if ( !empty( $where_format ) ) - $form = ( $form = array_shift( $where_formats ) ) ? $form : $where_format[0]; - elseif ( isset( $this->field_types[$field] ) ) - $form = $this->field_types[$field]; - else - $form = '%s'; - $wheres[] = "`$field` = {$form}"; + $fields = $conditions = $values = array(); + foreach ( $data as $field => $value ) { + if ( is_null( $value['value'] ) ) { + $fields[] = "`$field` = NULL"; + continue; + } + + $fields[] = "`$field` = " . $value['format']; + $values[] = $value['value']; } + foreach ( $where as $field => $value ) { + if ( is_null( $value['value'] ) ) { + $conditions[] = "`$field` IS NULL"; + continue; + } + + $conditions[] = "`$field` = " . $value['format']; + $values[] = $value['value']; + } + + $fields = implode( ', ', $fields ); + $conditions = implode( ' AND ', $conditions ); - $sql = "UPDATE `$table` SET " . implode( ', ', $bits ) . ' WHERE ' . implode( ' AND ', $wheres ); - return $this->query( $this->prepare( $sql, array_merge( array_values( $data ), array_values( $where ) ) ) ); + $sql = "UPDATE `$table` SET $fields WHERE $conditions"; + + $this->check_current_query = false; + return $this->query( $this->prepare( $sql, $values ) ); } /** * Delete a row in the table * - * <code> - * wpdb::delete( 'table', array( 'ID' => 1 ) ) - * wpdb::delete( 'table', array( 'ID' => 1 ), array( '%d' ) ) - * </code> + * wpdb::delete( 'table', array( 'ID' => 1 ) ) + * wpdb::delete( 'table', array( 'ID' => 1 ), array( '%d' ) ) * * @since 3.4.0 * @see wpdb::prepare() * @see wpdb::$field_types * @see wp_set_wpdb_vars() * - * @param string $table table name - * @param array $where A named array of WHERE clauses (in column => value pairs). Multiple clauses will be joined with ANDs. Both $where columns and $where values should be "raw". - * @param array|string $where_format Optional. An array of formats to be mapped to each of the values in $where. If string, that format will be used for all of the items in $where. A format is one of '%d', '%f', '%s' (integer, float, string). If omitted, all values in $where will be treated as strings unless otherwise specified in wpdb::$field_types. + * @param string $table Table name + * @param array $where A named array of WHERE clauses (in column => value pairs). + * Multiple clauses will be joined with ANDs. + * Both $where columns and $where values should be "raw". + * Sending a null value will create an IS NULL comparison - the corresponding format will be ignored in this case. + * @param array|string $where_format Optional. An array of formats to be mapped to each of the values in $where. + * If string, that format will be used for all of the items in $where. + * A format is one of '%d', '%f', '%s' (integer, float, string). + * If omitted, all values in $where will be treated as strings unless otherwise specified in wpdb::$field_types. * @return int|false The number of rows updated, or false on error. */ - function delete( $table, $where, $where_format = null ) { - if ( ! is_array( $where ) ) + public function delete( $table, $where, $where_format = null ) { + if ( ! is_array( $where ) ) { + return false; + } + + $where = $this->process_fields( $table, $where, $where_format ); + if ( false === $where ) { return false; + } + + $conditions = $values = array(); + foreach ( $where as $field => $value ) { + if ( is_null( $value['value'] ) ) { + $conditions[] = "`$field` IS NULL"; + continue; + } + + $conditions[] = "`$field` = " . $value['format']; + $values[] = $value['value']; + } + + $conditions = implode( ' AND ', $conditions ); - $bits = $wheres = array(); + $sql = "DELETE FROM `$table` WHERE $conditions"; - $where_formats = $where_format = (array) $where_format; + $this->check_current_query = false; + return $this->query( $this->prepare( $sql, $values ) ); + } - foreach ( array_keys( $where ) as $field ) { - if ( !empty( $where_format ) ) { - $form = ( $form = array_shift( $where_formats ) ) ? $form : $where_format[0]; + /** + * Processes arrays of field/value pairs and field formats. + * + * This is a helper method for wpdb's CRUD methods, which take field/value + * pairs for inserts, updates, and where clauses. This method first pairs + * each value with a format. Then it determines the charset of that field, + * using that to determine if any invalid text would be stripped. If text is + * stripped, then field processing is rejected and the query fails. + * + * @since 4.2.0 + * @access protected + * + * @param string $table Table name. + * @param array $data Field/value pair. + * @param mixed $format Format for each field. + * @return array|false Returns an array of fields that contain paired values + * and formats. Returns false for invalid values. + */ + protected function process_fields( $table, $data, $format ) { + $data = $this->process_field_formats( $data, $format ); + if ( false === $data ) { + return false; + } + + $data = $this->process_field_charsets( $data, $table ); + if ( false === $data ) { + return false; + } + + $data = $this->process_field_lengths( $data, $table ); + if ( false === $data ) { + return false; + } + + $converted_data = $this->strip_invalid_text( $data ); + + if ( $data !== $converted_data ) { + return false; + } + + return $data; + } + + /** + * Prepares arrays of value/format pairs as passed to wpdb CRUD methods. + * + * @since 4.2.0 + * @access protected + * + * @param array $data Array of fields to values. + * @param mixed $format Formats to be mapped to the values in $data. + * @return array Array, keyed by field names with values being an array + * of 'value' and 'format' keys. + */ + protected function process_field_formats( $data, $format ) { + $formats = $original_formats = (array) $format; + + foreach ( $data as $field => $value ) { + $value = array( + 'value' => $value, + 'format' => '%s', + ); + + if ( ! empty( $format ) ) { + $value['format'] = array_shift( $formats ); + if ( ! $value['format'] ) { + $value['format'] = reset( $original_formats ); + } } elseif ( isset( $this->field_types[ $field ] ) ) { - $form = $this->field_types[ $field ]; + $value['format'] = $this->field_types[ $field ]; + } + + $data[ $field ] = $value; + } + + return $data; + } + + /** + * Adds field charsets to field/value/format arrays generated by + * the wpdb::process_field_formats() method. + * + * @since 4.2.0 + * @access protected + * + * @param array $data As it comes from the wpdb::process_field_formats() method. + * @param string $table Table name. + * @return array|false The same array as $data with additional 'charset' keys. + */ + protected function process_field_charsets( $data, $table ) { + foreach ( $data as $field => $value ) { + if ( '%d' === $value['format'] || '%f' === $value['format'] ) { + /* + * We can skip this field if we know it isn't a string. + * This checks %d/%f versus ! %s because its sprintf() could take more. + */ + $value['charset'] = false; } else { - $form = '%s'; + $value['charset'] = $this->get_col_charset( $table, $field ); + if ( is_wp_error( $value['charset'] ) ) { + return false; + } } - $wheres[] = "$field = $form"; + $data[ $field ] = $value; } - $sql = "DELETE FROM $table WHERE " . implode( ' AND ', $wheres ); - return $this->query( $this->prepare( $sql, $where ) ); + return $data; } + /** + * For string fields, record the maximum string length that field can safely save. + * + * @since 4.2.1 + * @access protected + * + * @param array $data As it comes from the wpdb::process_field_charsets() method. + * @param string $table Table name. + * @return array|false The same array as $data with additional 'length' keys, or false if + * any of the values were too long for their corresponding field. + */ + protected function process_field_lengths( $data, $table ) { + foreach ( $data as $field => $value ) { + if ( '%d' === $value['format'] || '%f' === $value['format'] ) { + /* + * We can skip this field if we know it isn't a string. + * This checks %d/%f versus ! %s because its sprintf() could take more. + */ + $value['length'] = false; + } else { + $value['length'] = $this->get_col_length( $table, $field ); + if ( is_wp_error( $value['length'] ) ) { + return false; + } + } + + $data[ $field ] = $value; + } + + return $data; + } /** * Retrieve one variable from the database. @@ -1814,14 +2199,20 @@ class wpdb { * @since 0.71 * * @param string|null $query Optional. SQL query. Defaults to null, use the result from the previous query. - * @param int $x Optional. Column of value to return. Indexed from 0. - * @param int $y Optional. Row of value to return. Indexed from 0. + * @param int $x Optional. Column of value to return. Indexed from 0. + * @param int $y Optional. Row of value to return. Indexed from 0. * @return string|null Database query result (as string), or null on failure */ - function get_var( $query = null, $x = 0, $y = 0 ) { + public function get_var( $query = null, $x = 0, $y = 0 ) { $this->func_call = "\$db->get_var(\"$query\", $x, $y)"; - if ( $query ) + + if ( $this->check_current_query && $this->check_safe_collation( $query ) ) { + $this->check_current_query = false; + } + + if ( $query ) { $this->query( $query ); + } // Extract var out of cached results based x,y vals if ( !empty( $this->last_result[$y] ) ) { @@ -1839,18 +2230,26 @@ class wpdb { * * @since 0.71 * - * @param string|null $query SQL query. - * @param string $output Optional. one of ARRAY_A | ARRAY_N | OBJECT constants. Return an associative array (column => value, ...), - * a numerically indexed array (0 => value, ...) or an object ( ->column = value ), respectively. - * @param int $y Optional. Row to return. Indexed from 0. - * @return mixed Database query result in format specified by $output or null on failure + * @param string|null $query SQL query. + * @param string $output Optional. one of ARRAY_A | ARRAY_N | OBJECT constants. + * Return an associative array (column => value, ...), + * a numerically indexed array (0 => value, ...) or + * an object ( ->column = value ), respectively. + * @param int $y Optional. Row to return. Indexed from 0. + * @return array|object|null|void Database query result in format specified by $output or null on failure */ - function get_row( $query = null, $output = OBJECT, $y = 0 ) { + public function get_row( $query = null, $output = OBJECT, $y = 0 ) { $this->func_call = "\$db->get_row(\"$query\",$output,$y)"; - if ( $query ) + + if ( $this->check_current_query && $this->check_safe_collation( $query ) ) { + $this->check_current_query = false; + } + + if ( $query ) { $this->query( $query ); - else + } else { return null; + } if ( !isset( $this->last_result[$y] ) ) return null; @@ -1879,12 +2278,17 @@ class wpdb { * @since 0.71 * * @param string|null $query Optional. SQL query. Defaults to previous query. - * @param int $x Optional. Column to return. Indexed from 0. + * @param int $x Optional. Column to return. Indexed from 0. * @return array Database query result. Array indexed from 0 by SQL result row number. */ - function get_col( $query = null , $x = 0 ) { - if ( $query ) + public function get_col( $query = null , $x = 0 ) { + if ( $this->check_current_query && $this->check_safe_collation( $query ) ) { + $this->check_current_query = false; + } + + if ( $query ) { $this->query( $query ); + } $new_array = array(); // Extract the column values @@ -1901,19 +2305,26 @@ class wpdb { * * @since 0.71 * - * @param string $query SQL query. - * @param string $output Optional. Any of ARRAY_A | ARRAY_N | OBJECT | OBJECT_K constants. With one of the first three, return an array of rows indexed from 0 by SQL result row number. - * Each row is an associative array (column => value, ...), a numerically indexed array (0 => value, ...), or an object. ( ->column = value ), respectively. - * With OBJECT_K, return an associative array of row objects keyed by the value of each row's first column's value. Duplicate keys are discarded. - * @return mixed Database query results + * @param string $query SQL query. + * @param string $output Optional. Any of ARRAY_A | ARRAY_N | OBJECT | OBJECT_K constants. + * With one of the first three, return an array of rows indexed from 0 by SQL result row number. + * Each row is an associative array (column => value, ...), a numerically indexed array (0 => value, ...), or an object. ( ->column = value ), respectively. + * With OBJECT_K, return an associative array of row objects keyed by the value of each row's first column's value. + * Duplicate keys are discarded. + * @return array|object|null Database query results */ - function get_results( $query = null, $output = OBJECT ) { + public function get_results( $query = null, $output = OBJECT ) { $this->func_call = "\$db->get_results(\"$query\", $output)"; - if ( $query ) + if ( $this->check_current_query && $this->check_safe_collation( $query ) ) { + $this->check_current_query = false; + } + + if ( $query ) { $this->query( $query ); - else + } else { return null; + } $new_array = array(); if ( $output == OBJECT ) { @@ -1932,7 +2343,7 @@ class wpdb { } elseif ( $output == ARRAY_A || $output == ARRAY_N ) { // Return an integer-keyed array of... if ( $this->last_result ) { - foreach( (array) $this->last_result as $row ) { + foreach ( (array) $this->last_result as $row ) { if ( $output == ARRAY_N ) { // ...integer-keyed row arrays $new_array[] = array_values( get_object_vars( $row ) ); @@ -1950,6 +2361,651 @@ class wpdb { return null; } + /** + * Retrieves the character set for the given table. + * + * @since 4.2.0 + * @access protected + * + * @param string $table Table name. + * @return string|WP_Error Table character set, WP_Error object if it couldn't be found. + */ + protected function get_table_charset( $table ) { + $tablekey = strtolower( $table ); + + /** + * Filter the table charset value before the DB is checked. + * + * Passing a non-null value to the filter will effectively short-circuit + * checking the DB for the charset, returning that value instead. + * + * @since 4.2.0 + * + * @param string $charset The character set to use. Default null. + * @param string $table The name of the table being checked. + */ + $charset = apply_filters( 'pre_get_table_charset', null, $table ); + if ( null !== $charset ) { + return $charset; + } + + if ( isset( $this->table_charset[ $tablekey ] ) ) { + return $this->table_charset[ $tablekey ]; + } + + $charsets = $columns = array(); + + $table_parts = explode( '.', $table ); + $table = '`' . implode( '`.`', $table_parts ) . '`'; + $results = $this->get_results( "SHOW FULL COLUMNS FROM $table" ); + if ( ! $results ) { + return new WP_Error( 'wpdb_get_table_charset_failure' ); + } + + foreach ( $results as $column ) { + $columns[ strtolower( $column->Field ) ] = $column; + } + + $this->col_meta[ $tablekey ] = $columns; + + foreach ( $columns as $column ) { + if ( ! empty( $column->Collation ) ) { + list( $charset ) = explode( '_', $column->Collation ); + + // If the current connection can't support utf8mb4 characters, let's only send 3-byte utf8 characters. + if ( 'utf8mb4' === $charset && ! $this->has_cap( 'utf8mb4' ) ) { + $charset = 'utf8'; + } + + $charsets[ strtolower( $charset ) ] = true; + } + + list( $type ) = explode( '(', $column->Type ); + + // A binary/blob means the whole query gets treated like this. + if ( in_array( strtoupper( $type ), array( 'BINARY', 'VARBINARY', 'TINYBLOB', 'MEDIUMBLOB', 'BLOB', 'LONGBLOB' ) ) ) { + $this->table_charset[ $tablekey ] = 'binary'; + return 'binary'; + } + } + + // utf8mb3 is an alias for utf8. + if ( isset( $charsets['utf8mb3'] ) ) { + $charsets['utf8'] = true; + unset( $charsets['utf8mb3'] ); + } + + // Check if we have more than one charset in play. + $count = count( $charsets ); + if ( 1 === $count ) { + $charset = key( $charsets ); + } elseif ( 0 === $count ) { + // No charsets, assume this table can store whatever. + $charset = false; + } else { + // More than one charset. Remove latin1 if present and recalculate. + unset( $charsets['latin1'] ); + $count = count( $charsets ); + if ( 1 === $count ) { + // Only one charset (besides latin1). + $charset = key( $charsets ); + } elseif ( 2 === $count && isset( $charsets['utf8'], $charsets['utf8mb4'] ) ) { + // Two charsets, but they're utf8 and utf8mb4, use utf8. + $charset = 'utf8'; + } else { + // Two mixed character sets. ascii. + $charset = 'ascii'; + } + } + + $this->table_charset[ $tablekey ] = $charset; + return $charset; + } + + /** + * Retrieves the character set for the given column. + * + * @since 4.2.0 + * @access public + * + * @param string $table Table name. + * @param string $column Column name. + * @return string|false|WP_Error Column character set as a string. False if the column has no + * character set. WP_Error object if there was an error. + */ + public function get_col_charset( $table, $column ) { + $tablekey = strtolower( $table ); + $columnkey = strtolower( $column ); + + /** + * Filter the column charset value before the DB is checked. + * + * Passing a non-null value to the filter will short-circuit + * checking the DB for the charset, returning that value instead. + * + * @since 4.2.0 + * + * @param string $charset The character set to use. Default null. + * @param string $table The name of the table being checked. + * @param string $column The name of the column being checked. + */ + $charset = apply_filters( 'pre_get_col_charset', null, $table, $column ); + if ( null !== $charset ) { + return $charset; + } + + // Skip this entirely if this isn't a MySQL database. + if ( empty( $this->is_mysql ) ) { + return false; + } + + if ( empty( $this->table_charset[ $tablekey ] ) ) { + // This primes column information for us. + $table_charset = $this->get_table_charset( $table ); + if ( is_wp_error( $table_charset ) ) { + return $table_charset; + } + } + + // If still no column information, return the table charset. + if ( empty( $this->col_meta[ $tablekey ] ) ) { + return $this->table_charset[ $tablekey ]; + } + + // If this column doesn't exist, return the table charset. + if ( empty( $this->col_meta[ $tablekey ][ $columnkey ] ) ) { + return $this->table_charset[ $tablekey ]; + } + + // Return false when it's not a string column. + if ( empty( $this->col_meta[ $tablekey ][ $columnkey ]->Collation ) ) { + return false; + } + + list( $charset ) = explode( '_', $this->col_meta[ $tablekey ][ $columnkey ]->Collation ); + return $charset; + } + + /** + * Retrieve the maximum string length allowed in a given column. + * The length may either be specified as a byte length or a character length. + * + * @since 4.2.1 + * @access public + * + * @param string $table Table name. + * @param string $column Column name. + * @return array|false|WP_Error array( 'length' => (int), 'type' => 'byte' | 'char' ) + * false if the column has no length (for example, numeric column) + * WP_Error object if there was an error. + */ + public function get_col_length( $table, $column ) { + $tablekey = strtolower( $table ); + $columnkey = strtolower( $column ); + + // Skip this entirely if this isn't a MySQL database. + if ( empty( $this->is_mysql ) ) { + return false; + } + + if ( empty( $this->col_meta[ $tablekey ] ) ) { + // This primes column information for us. + $table_charset = $this->get_table_charset( $table ); + if ( is_wp_error( $table_charset ) ) { + return $table_charset; + } + } + + if ( empty( $this->col_meta[ $tablekey ][ $columnkey ] ) ) { + return false; + } + + $typeinfo = explode( '(', $this->col_meta[ $tablekey ][ $columnkey ]->Type ); + + $type = strtolower( $typeinfo[0] ); + if ( ! empty( $typeinfo[1] ) ) { + $length = trim( $typeinfo[1], ')' ); + } else { + $length = false; + } + + switch( $type ) { + case 'char': + case 'varchar': + return array( + 'type' => 'char', + 'length' => (int) $length, + ); + + case 'binary': + case 'varbinary': + return array( + 'type' => 'byte', + 'length' => (int) $length, + ); + + case 'tinyblob': + case 'tinytext': + return array( + 'type' => 'byte', + 'length' => 255, // 2^8 - 1 + ); + + case 'blob': + case 'text': + return array( + 'type' => 'byte', + 'length' => 65535, // 2^16 - 1 + ); + + case 'mediumblob': + case 'mediumtext': + return array( + 'type' => 'byte', + 'length' => 16777215, // 2^24 - 1 + ); + + case 'longblob': + case 'longtext': + return array( + 'type' => 'byte', + 'length' => 4294967295, // 2^32 - 1 + ); + + default: + return false; + } + } + + /** + * Check if a string is ASCII. + * + * The negative regex is faster for non-ASCII strings, as it allows + * the search to finish as soon as it encounters a non-ASCII character. + * + * @since 4.2.0 + * @access protected + * + * @param string $string String to check. + * @return bool True if ASCII, false if not. + */ + protected function check_ascii( $string ) { + if ( function_exists( 'mb_check_encoding' ) ) { + if ( mb_check_encoding( $string, 'ASCII' ) ) { + return true; + } + } elseif ( ! preg_match( '/[^\x00-\x7F]/', $string ) ) { + return true; + } + + return false; + } + + /** + * Check if the query is accessing a collation considered safe on the current version of MySQL. + * + * @since 4.2.0 + * @access protected + * + * @param string $query The query to check. + * @return bool True if the collation is safe, false if it isn't. + */ + protected function check_safe_collation( $query ) { + if ( $this->checking_collation ) { + return true; + } + + // We don't need to check the collation for queries that don't read data. + $query = ltrim( $query, "\r\n\t (" ); + if ( preg_match( '/^(?:SHOW|DESCRIBE|DESC|EXPLAIN|CREATE)\s/i', $query ) ) { + return true; + } + + // All-ASCII queries don't need extra checking. + if ( $this->check_ascii( $query ) ) { + return true; + } + + $table = $this->get_table_from_query( $query ); + if ( ! $table ) { + return false; + } + + $this->checking_collation = true; + $collation = $this->get_table_charset( $table ); + $this->checking_collation = false; + + // Tables with no collation, or latin1 only, don't need extra checking. + if ( false === $collation || 'latin1' === $collation ) { + return true; + } + + $table = strtolower( $table ); + if ( empty( $this->col_meta[ $table ] ) ) { + return false; + } + + // If any of the columns don't have one of these collations, it needs more sanity checking. + foreach ( $this->col_meta[ $table ] as $col ) { + if ( empty( $col->Collation ) ) { + continue; + } + + if ( ! in_array( $col->Collation, array( 'utf8_general_ci', 'utf8_bin', 'utf8mb4_general_ci', 'utf8mb4_bin' ), true ) ) { + return false; + } + } + + return true; + } + + /** + * Strips any invalid characters based on value/charset pairs. + * + * @since 4.2.0 + * @access protected + * + * @param array $data Array of value arrays. Each value array has the keys + * 'value' and 'charset'. An optional 'ascii' key can be + * set to false to avoid redundant ASCII checks. + * @return array|WP_Error The $data parameter, with invalid characters removed from + * each value. This works as a passthrough: any additional keys + * such as 'field' are retained in each value array. If we cannot + * remove invalid characters, a WP_Error object is returned. + */ + protected function strip_invalid_text( $data ) { + $db_check_string = false; + + foreach ( $data as &$value ) { + $charset = $value['charset']; + + if ( is_array( $value['length'] ) ) { + $length = $value['length']['length']; + $truncate_by_byte_length = 'byte' === $value['length']['type']; + } else { + $length = false; + // Since we have no length, we'll never truncate. + // Initialize the variable to false. true would take us + // through an unnecessary (for this case) codepath below. + $truncate_by_byte_length = false; + } + + // There's no charset to work with. + if ( false === $charset ) { + continue; + } + + // Column isn't a string. + if ( ! is_string( $value['value'] ) ) { + continue; + } + + $needs_validation = true; + if ( + // latin1 can store any byte sequence + 'latin1' === $charset + || + // ASCII is always OK. + ( ! isset( $value['ascii'] ) && $this->check_ascii( $value['value'] ) ) + ) { + $truncate_by_byte_length = true; + $needs_validation = false; + } + + if ( $truncate_by_byte_length ) { + mbstring_binary_safe_encoding(); + if ( false !== $length && strlen( $value['value'] ) > $length ) { + $value['value'] = substr( $value['value'], 0, $length ); + } + reset_mbstring_encoding(); + + if ( ! $needs_validation ) { + continue; + } + } + + // utf8 can be handled by regex, which is a bunch faster than a DB lookup. + if ( ( 'utf8' === $charset || 'utf8mb3' === $charset || 'utf8mb4' === $charset ) && function_exists( 'mb_strlen' ) ) { + $regex = '/ + ( + (?: [\x00-\x7F] # single-byte sequences 0xxxxxxx + | [\xC2-\xDF][\x80-\xBF] # double-byte sequences 110xxxxx 10xxxxxx + | \xE0[\xA0-\xBF][\x80-\xBF] # triple-byte sequences 1110xxxx 10xxxxxx * 2 + | [\xE1-\xEC][\x80-\xBF]{2} + | \xED[\x80-\x9F][\x80-\xBF] + | [\xEE-\xEF][\x80-\xBF]{2}'; + + if ( 'utf8mb4' === $charset ) { + $regex .= ' + | \xF0[\x90-\xBF][\x80-\xBF]{2} # four-byte sequences 11110xxx 10xxxxxx * 3 + | [\xF1-\xF3][\x80-\xBF]{3} + | \xF4[\x80-\x8F][\x80-\xBF]{2} + '; + } + + $regex .= '){1,40} # ...one or more times + ) + | . # anything else + /x'; + $value['value'] = preg_replace( $regex, '$1', $value['value'] ); + + + if ( false !== $length && mb_strlen( $value['value'], 'UTF-8' ) > $length ) { + $value['value'] = mb_substr( $value['value'], 0, $length, 'UTF-8' ); + } + continue; + } + + // We couldn't use any local conversions, send it to the DB. + $value['db'] = $db_check_string = true; + } + unset( $value ); // Remove by reference. + + if ( $db_check_string ) { + $queries = array(); + foreach ( $data as $col => $value ) { + if ( ! empty( $value['db'] ) ) { + // We're going to need to truncate by characters or bytes, depending on the length value we have. + if ( 'byte' === $value['length']['type'] ) { + // Using binary causes LEFT() to truncate by bytes. + $charset = 'binary'; + } else { + $charset = $value['charset']; + } + + if ( $this->charset ) { + $connection_charset = $this->charset; + } else { + if ( $this->use_mysqli ) { + $connection_charset = mysqli_character_set_name( $this->dbh ); + } else { + $connection_charset = mysql_client_encoding(); + } + } + + if ( is_array( $value['length'] ) ) { + $queries[ $col ] = $this->prepare( "CONVERT( LEFT( CONVERT( %s USING $charset ), %.0f ) USING $connection_charset )", $value['value'], $value['length']['length'] ); + } else if ( 'binary' !== $charset ) { + // If we don't have a length, there's no need to convert binary - it will always return the same result. + $queries[ $col ] = $this->prepare( "CONVERT( CONVERT( %s USING $charset ) USING $connection_charset )", $value['value'] ); + } + + unset( $data[ $col ]['db'] ); + } + } + + $sql = array(); + foreach ( $queries as $column => $query ) { + if ( ! $query ) { + continue; + } + + $sql[] = $query . " AS x_$column"; + } + + $this->check_current_query = false; + $row = $this->get_row( "SELECT " . implode( ', ', $sql ), ARRAY_A ); + if ( ! $row ) { + return new WP_Error( 'wpdb_strip_invalid_text_failure' ); + } + + foreach ( array_keys( $data ) as $column ) { + if ( isset( $row["x_$column"] ) ) { + $data[ $column ]['value'] = $row["x_$column"]; + } + } + } + + return $data; + } + + /** + * Strips any invalid characters from the query. + * + * @since 4.2.0 + * @access protected + * + * @param string $query Query to convert. + * @return string|WP_Error The converted query, or a WP_Error object if the conversion fails. + */ + protected function strip_invalid_text_from_query( $query ) { + // We don't need to check the collation for queries that don't read data. + $trimmed_query = ltrim( $query, "\r\n\t (" ); + if ( preg_match( '/^(?:SHOW|DESCRIBE|DESC|EXPLAIN|CREATE)\s/i', $trimmed_query ) ) { + return $query; + } + + $table = $this->get_table_from_query( $query ); + if ( $table ) { + $charset = $this->get_table_charset( $table ); + if ( is_wp_error( $charset ) ) { + return $charset; + } + + // We can't reliably strip text from tables containing binary/blob columns + if ( 'binary' === $charset ) { + return $query; + } + } else { + $charset = $this->charset; + } + + $data = array( + 'value' => $query, + 'charset' => $charset, + 'ascii' => false, + 'length' => false, + ); + + $data = $this->strip_invalid_text( array( $data ) ); + if ( is_wp_error( $data ) ) { + return $data; + } + + return $data[0]['value']; + } + + /** + * Strips any invalid characters from the string for a given table and column. + * + * @since 4.2.0 + * @access public + * + * @param string $table Table name. + * @param string $column Column name. + * @param string $value The text to check. + * @return string|WP_Error The converted string, or a WP_Error object if the conversion fails. + */ + public function strip_invalid_text_for_column( $table, $column, $value ) { + if ( ! is_string( $value ) ) { + return $value; + } + + $charset = $this->get_col_charset( $table, $column ); + if ( ! $charset ) { + // Not a string column. + return $value; + } elseif ( is_wp_error( $charset ) ) { + // Bail on real errors. + return $charset; + } + + $data = array( + $column => array( + 'value' => $value, + 'charset' => $charset, + 'length' => $this->get_col_length( $table, $column ), + ) + ); + + $data = $this->strip_invalid_text( $data ); + if ( is_wp_error( $data ) ) { + return $data; + } + + return $data[ $column ]['value']; + } + + /** + * Find the first table name referenced in a query. + * + * @since 4.2.0 + * @access protected + * + * @param string $query The query to search. + * @return string|false $table The table name found, or false if a table couldn't be found. + */ + protected function get_table_from_query( $query ) { + // Remove characters that can legally trail the table name. + $query = rtrim( $query, ';/-#' ); + + // Allow (select...) union [...] style queries. Use the first query's table name. + $query = ltrim( $query, "\r\n\t (" ); + + // Strip everything between parentheses except nested selects. + $query = preg_replace( '/$(?!\s*select)[^(]*?$/is', '()', $query ); + + // Quickly match most common queries. + if ( preg_match( '/^\s*(?:' + . 'SELECT.*?\s+FROM' + . '|INSERT(?:\s+LOW_PRIORITY|\s+DELAYED|\s+HIGH_PRIORITY)?(?:\s+IGNORE)?(?:\s+INTO)?' + . '|REPLACE(?:\s+LOW_PRIORITY|\s+DELAYED)?(?:\s+INTO)?' + . '|UPDATE(?:\s+LOW_PRIORITY)?(?:\s+IGNORE)?' + . '|DELETE(?:\s+LOW_PRIORITY|\s+QUICK|\s+IGNORE)*(?:\s+FROM)?' + . ')\s+((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)/is', $query, $maybe ) ) { + return str_replace( '`', '', $maybe[1] ); + } + + // SHOW TABLE STATUS and SHOW TABLES + if ( preg_match( '/^\s*(?:' + . 'SHOW\s+TABLE\s+STATUS.+(?:LIKE\s+|WHERE\s+Name\s*=\s*)' + . '|SHOW\s+(?:FULL\s+)?TABLES.+(?:LIKE\s+|WHERE\s+Name\s*=\s*)' + . ')\W((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)\W/is', $query, $maybe ) ) { + return str_replace( '`', '', $maybe[1] ); + } + + // Big pattern for the rest of the table-related queries. + if ( preg_match( '/^\s*(?:' + . '(?:EXPLAIN\s+(?:EXTENDED\s+)?)?SELECT.*?\s+FROM' + . '|DESCRIBE|DESC|EXPLAIN|HANDLER' + . '|(?:LOCK|UNLOCK)\s+TABLE(?:S)?' + . '|(?:RENAME|OPTIMIZE|BACKUP|RESTORE|CHECK|CHECKSUM|ANALYZE|REPAIR).*\s+TABLE' + . '|TRUNCATE(?:\s+TABLE)?' + . '|CREATE(?:\s+TEMPORARY)?\s+TABLE(?:\s+IF\s+NOT\s+EXISTS)?' + . '|ALTER(?:\s+IGNORE)?\s+TABLE' + . '|DROP\s+TABLE(?:\s+IF\s+EXISTS)?' + . '|CREATE(?:\s+\w+)?\s+INDEX.*\s+ON' + . '|DROP\s+INDEX.*\s+ON' + . '|LOAD\s+DATA.*INFILE.*INTO\s+TABLE' + . '|(?:GRANT|REVOKE).*ON\s+TABLE' + . '|SHOW\s+(?:.*FROM|.*TABLE)' + . ')\s+$*\s*((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)\s*$*/is', $query, $maybe ) ) { + return str_replace( '`', '', $maybe[1] ); + } + + return false; + } + /** * Load the column metadata from the last query. * @@ -1962,12 +3018,14 @@ class wpdb { return; if ( $this->use_mysqli ) { - for ( $i = 0; $i < @mysqli_num_fields( $this->result ); $i++ ) { - $this->col_info[ $i ] = @mysqli_fetch_field( $this->result ); + $num_fields = mysqli_num_fields( $this->result ); + for ( $i = 0; $i < $num_fields; $i++ ) { + $this->col_info[ $i ] = mysqli_fetch_field( $this->result ); } } else { - for ( $i = 0; $i < @mysql_num_fields( $this->result ); $i++ ) { - $this->col_info[ $i ] = @mysql_fetch_field( $this->result, $i ); + $num_fields = mysql_num_fields( $this->result ); + for ( $i = 0; $i < $num_fields; $i++ ) { + $this->col_info[ $i ] = mysql_fetch_field( $this->result, $i ); } } } @@ -1977,18 +3035,18 @@ class wpdb { * * @since 0.71 * - * @param string $info_type Optional. Type one of name, table, def, max_length, not_null, primary_key, multiple_key, unique_key, numeric, blob, type, unsigned, zerofill - * @param int $col_offset Optional. 0: col name. 1: which table the col's in. 2: col's max length. 3: if the col is numeric. 4: col's type + * @param string $info_type Optional. Type one of name, table, def, max_length, not_null, primary_key, multiple_key, unique_key, numeric, blob, type, unsigned, zerofill + * @param int $col_offset Optional. 0: col name. 1: which table the col's in. 2: col's max length. 3: if the col is numeric. 4: col's type * @return mixed Column Results */ - function get_col_info( $info_type = 'name', $col_offset = -1 ) { + public function get_col_info( $info_type = 'name', $col_offset = -1 ) { $this->load_col_info(); if ( $this->col_info ) { if ( $col_offset == -1 ) { $i = 0; $new_array = array(); - foreach( (array) $this->col_info as $col ) { + foreach ( (array) $this->col_info as $col ) { $new_array[$i] = $col->{$info_type}; $i++; } @@ -2006,7 +3064,7 @@ class wpdb { * * @return true */ - function timer_start() { + public function timer_start() { $this->time_start = microtime( true ); return true; } @@ -2018,7 +3076,7 @@ class wpdb { * * @return float Total time spent on the query, in seconds */ - function timer_stop() { + public function timer_stop() { return ( microtime( true ) - $this->time_start ); } @@ -2029,31 +3087,63 @@ class wpdb { * * @since 1.5.0 * - * @param string $message The Error message + * @param string $message The Error message * @param string $error_code Optional. A Computer readable string to identify the error. * @return false|void */ - function bail( $message, $error_code = '500' ) { + public function bail( $message, $error_code = '500' ) { if ( !$this->show_errors ) { - if ( class_exists( 'WP_Error' ) ) + if ( class_exists( 'WP_Error', false ) ) { $this->error = new WP_Error($error_code, $message); - else + } else { $this->error = $message; + } return false; } wp_die($message); } + + /** + * Closes the current database connection. + * + * @since 4.5.0 + * @access public + * + * @return bool True if the connection was successfully closed, false if it wasn't, + * or the connection doesn't exist. + */ + public function close() { + if ( ! $this->dbh ) { + return false; + } + + if ( $this->use_mysqli ) { + $closed = mysqli_close( $this->dbh ); + } else { + $closed = mysql_close( $this->dbh ); + } + + if ( $closed ) { + $this->dbh = null; + $this->ready = false; + $this->has_connected = false; + } + + return $closed; + } + /** * Whether MySQL database is at least the required minimum version. * * @since 2.5.0 - * @uses $wp_version - * @uses $required_mysql_version * - * @return WP_Error + * @global string $wp_version + * @global string $required_mysql_version + * + * @return WP_Error|void */ - function check_database_version() { + public function check_database_version() { global $wp_version, $required_mysql_version; // Make sure the server has the required MySQL version if ( version_compare($this->db_version(), $required_mysql_version, '<') ) @@ -2065,13 +3155,14 @@ class wpdb { * * Called when WordPress is generating the table scheme. * + * Use `wpdb::has_cap( 'collation' )`. + * * @since 2.5.0 - * @deprecated 3.5.0 - * @deprecated Use wpdb::has_cap( 'collation' ) + * @deprecated 3.5.0 Use wpdb::has_cap() * * @return bool True if collation is supported, false if version does not */ - function supports_collation() { + public function supports_collation() { _deprecated_function( __FUNCTION__, '3.5', 'wpdb::has_cap( \'collation\' )' ); return $this->has_cap( 'collation' ); } @@ -2098,12 +3189,16 @@ class wpdb { * Determine if a database supports a particular feature. * * @since 2.7.0 + * @since 4.1.0 Support was added for the 'utf8mb4' feature. + * * @see wpdb::db_version() * - * @param string $db_cap The feature to check for. - * @return bool + * @param string $db_cap The feature to check for. Accepts 'collation', + * 'group_concat', 'subqueries', 'set_charset', + * or 'utf8mb4'. + * @return int|false Whether the database feature is supported, false otherwise. */ - function has_cap( $db_cap ) { + public function has_cap( $db_cap ) { $version = $this->db_version(); switch ( strtolower( $db_cap ) ) { @@ -2113,7 +3208,27 @@ class wpdb { return version_compare( $version, '4.1', '>=' ); case 'set_charset' : return version_compare( $version, '5.0.7', '>=' ); - }; + case 'utf8mb4' : // @since 4.1.0 + if ( version_compare( $version, '5.5.3', '<' ) ) { + return false; + } + if ( $this->use_mysqli ) { + $client_version = mysqli_get_client_info(); + } else { + $client_version = mysql_get_client_info(); + } + + /* + * libmysql has supported utf8mb4 since 5.5.3, same as the MySQL server. + * mysqlnd has supported utf8mb4 since 5.0.9. + */ + if ( false !== strpos( $client_version, 'mysqlnd' ) ) { + $client_version = preg_replace( '/^\D+([\d.]+).*/', '$1', $client_version ); + return version_compare( $client_version, '5.0.9', '>=' ); + } else { + return version_compare( $client_version, '5.5.3', '>=' ); + } + } return false; } @@ -2126,20 +3241,20 @@ class wpdb { * * @since 2.5.0 * - * @return string The name of the calling function + * @return string|array The name of the calling function */ - function get_caller() { + public function get_caller() { return wp_debug_backtrace_summary( __CLASS__ ); } /** - * The database version number. + * Retrieves the MySQL server version. * * @since 2.7.0 * - * @return false|string false on failure, version number on success + * @return null|string Null on failure, version number on success. */ - function db_version() { + public function db_version() { if ( $this->use_mysqli ) { $server_info = mysqli_get_server_info( $this->dbh ); } else { diff --git a/wp-includes/wp-diff.php b/wp-includes/wp-diff.php index dc335e3..832a62f 100644 --- a/wp-includes/wp-diff.php +++ b/wp-includes/wp-diff.php @@ -8,7 +8,7 @@ * @subpackage Diff */ -if ( !class_exists( 'Text_Diff' ) ) { +if ( ! class_exists( 'Text_Diff', false ) ) { /** Text_Diff class */ require( dirname(__FILE__).'/Text/Diff.php' ); /** Text_Diff_Renderer class */ @@ -28,27 +28,27 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer { /** * @see Text_Diff_Renderer::_leading_context_lines * @var int - * @access protected + * @access public * @since 2.6.0 */ - var $_leading_context_lines = 10000; + public $_leading_context_lines = 10000; /** * @see Text_Diff_Renderer::_trailing_context_lines * @var int - * @access protected + * @access public * @since 2.6.0 */ - var $_trailing_context_lines = 10000; + public $_trailing_context_lines = 10000; /** - * {@internal Missing Description}} + * Threshold for when a diff should be saved or omitted. * * @var float * @access protected * @since 2.6.0 */ - var $_diff_threshold = 0.6; + protected $_diff_threshold = 0.6; /** * Inline display helper object name. @@ -57,7 +57,7 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer { * @access protected * @since 2.6.0 */ - var $inline_diff_renderer = 'WP_Text_Diff_Renderer_inline'; + protected $inline_diff_renderer = 'WP_Text_Diff_Renderer_inline'; /** * Should we show the split view or not @@ -66,7 +66,9 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer { * @access protected * @since 3.6.0 */ - var $_show_split_view = true; + protected $_show_split_view = true; + + protected $compat_fields = array( '_show_split_view', 'inline_diff_renderer', '_diff_threshold' ); /** * Constructor - Call parent constructor with params array. @@ -77,7 +79,7 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer { * * @param array $params */ - function __construct( $params = array() ) { + public function __construct( $params = array() ) { parent::__construct( $params ); if ( isset( $params[ 'show_split_view' ] ) ) $this->_show_split_view = $params[ 'show_split_view' ]; @@ -89,7 +91,7 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer { * @param string $header * @return string */ - function _startBlock( $header ) { + public function _startBlock( $header ) { return ''; } @@ -99,7 +101,7 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer { * @param array $lines * @param string $prefix */ - function _lines( $lines, $prefix=' ' ) { + public function _lines( $lines, $prefix=' ' ) { } /** @@ -108,7 +110,7 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer { * @param string $line HTML-escape the value. * @return string */ - function addedLine( $line ) { + public function addedLine( $line ) { return "<td class='diff-addedline'>{$line}</td>"; } @@ -119,7 +121,7 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer { * @param string $line HTML-escape the value. * @return string */ - function deletedLine( $line ) { + public function deletedLine( $line ) { return "<td class='diff-deletedline'>{$line}</td>"; } @@ -129,7 +131,7 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer { * @param string $line HTML-escape the value. * @return string */ - function contextLine( $line ) { + public function contextLine( $line ) { return "<td class='diff-context'>{$line}</td>"; } @@ -138,23 +140,40 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer { * * @return string */ - function emptyLine() { + public function emptyLine() { return '<td> </td>'; } /** * @ignore - * @access private + * @access public * * @param array $lines * @param bool $encode * @return string */ - function _added( $lines, $encode = true ) { + public function _added( $lines, $encode = true ) { $r = ''; foreach ($lines as $line) { - if ( $encode ) - $line = htmlspecialchars( $line ); + if ( $encode ) { + $processed_line = htmlspecialchars( $line ); + + /** + * Contextually filter a diffed line. + * + * Filters TextDiff processing of diffed line. By default, diffs are processed with + * htmlspecialchars. Use this filter to remove or change the processing. Passes a context + * indicating if the line is added, deleted or unchanged. + * + * @since 4.1.0 + * + * @param String $processed_line The processed diffed line. + * @param String $line The unprocessed diffed line. + * @param string null The line context. Values are 'added', 'deleted' or 'unchanged'. + */ + $line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'added' ); + } + if ( $this->_show_split_view ) { $r .= '<tr>' . $this->emptyLine() . $this->emptyLine() . $this->addedLine( $line ) . "</tr>\n"; } else { @@ -166,17 +185,21 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer { /** * @ignore - * @access private + * @access public * * @param array $lines * @param bool $encode * @return string */ - function _deleted( $lines, $encode = true ) { + public function _deleted( $lines, $encode = true ) { $r = ''; foreach ($lines as $line) { - if ( $encode ) - $line = htmlspecialchars( $line ); + if ( $encode ) { + $processed_line = htmlspecialchars( $line ); + + /** This filter is documented in wp-includes/wp-diff.php */ + $line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'deleted' ); + } if ( $this->_show_split_view ) { $r .= '<tr>' . $this->deletedLine( $line ) . $this->emptyLine() . $this->emptyLine() . "</tr>\n"; } else { @@ -189,17 +212,21 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer { /** * @ignore - * @access private + * @access public * * @param array $lines * @param bool $encode * @return string */ - function _context( $lines, $encode = true ) { + public function _context( $lines, $encode = true ) { $r = ''; foreach ($lines as $line) { - if ( $encode ) - $line = htmlspecialchars( $line ); + if ( $encode ) { + $processed_line = htmlspecialchars( $line ); + + /** This filter is documented in wp-includes/wp-diff.php */ + $line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'unchanged' ); + } if ( $this->_show_split_view ) { $r .= '<tr>' . $this->contextLine( $line ) . $this->emptyLine() . $this->contextLine( $line ) . "</tr>\n"; } else { @@ -215,14 +242,14 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer { * (TRAC style) sometimes these lines can actually be deleted or added rows. * We do additional processing to figure that out * - * @access private + * @access public * @since 2.6.0 * * @param array $orig * @param array $final * @return string */ - function _changed( $orig, $final ) { + public function _changed( $orig, $final ) { $r = ''; // Does the aforementioned additional processing @@ -246,7 +273,7 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer { $diff = $renderer->render( $text_diff ); // If they're too different, don't include any <ins> or <dels> - if ( $diff_count = preg_match_all( '!(<ins>.*?</ins>|<del>.*?</del>)!', $diff, $diff_matches ) ) { + if ( preg_match_all( '!(<ins>.*?</ins>|<del>.*?</del>)!', $diff, $diff_matches ) ) { // length of all text between <ins> or <del> $stripped_matches = strlen(strip_tags( join(' ', $diff_matches[0]) )); // since we count lengith of text between <ins> or <del> (instead of picking just one), @@ -309,11 +336,11 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer { * * @since 2.6.0 * - * @param unknown_type $orig - * @param unknown_type $final - * @return unknown + * @param array $orig + * @param array $final + * @return array */ - function interleave_changed_lines( $orig, $final ) { + public function interleave_changed_lines( $orig, $final ) { // Contains all pairwise string comparisons. Keys are such that this need only be a one dimensional array. $matches = array(); @@ -402,7 +429,7 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer { * @param string $string2 * @return int */ - function compute_string_distance( $string1, $string2 ) { + public function compute_string_distance( $string1, $string2 ) { // Vectors containing character frequency for all chars in each string $chars1 = count_chars($string1); $chars2 = count_chars($string2); @@ -414,7 +441,7 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer { if ( !$string1 ) return $difference; - // Return distance per charcter (of string1) + // Return distance per character (of string1). return $difference / strlen($string1); } @@ -426,10 +453,69 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer { * @param int $b * @return int */ - function difference( $a, $b ) { + public function difference( $a, $b ) { return abs( $a - $b ); } + /** + * Make private properties readable for backwards compatibility. + * + * @since 4.0.0 + * @access public + * + * @param string $name Property to get. + * @return mixed Property. + */ + public function __get( $name ) { + if ( in_array( $name, $this->compat_fields ) ) { + return $this->$name; + } + } + + /** + * Make private properties settable for backwards compatibility. + * + * @since 4.0.0 + * @access public + * + * @param string $name Property to check if set. + * @param mixed $value Property value. + * @return mixed Newly-set property. + */ + public function __set( $name, $value ) { + if ( in_array( $name, $this->compat_fields ) ) { + return $this->$name = $value; + } + } + + /** + * Make private properties checkable for backwards compatibility. + * + * @since 4.0.0 + * @access public + * + * @param string $name Property to check if set. + * @return bool Whether the property is set. + */ + public function __isset( $name ) { + if ( in_array( $name, $this->compat_fields ) ) { + return isset( $this->$name ); + } + } + + /** + * Make private properties un-settable for backwards compatibility. + * + * @since 4.0.0 + * @access public + * + * @param string $name Property to unset. + */ + public function __unset( $name ) { + if ( in_array( $name, $this->compat_fields ) ) { + unset( $this->$name ); + } + } } /** @@ -448,7 +534,7 @@ class WP_Text_Diff_Renderer_inline extends Text_Diff_Renderer_inline { * @param string $newlineEscape * @return string */ - function _splitOnWords($string, $newlineEscape = "\n") { + public function _splitOnWords($string, $newlineEscape = "\n") { $string = str_replace("\0", '', $string); $words = preg_split( '/([^\w])/u', $string, -1, PREG_SPLIT_DELIM_CAPTURE ); $words = str_replace( "\n", $newlineEscape, $words ); diff --git a/wp-load.php b/wp-load.php index fb85953..94a8b54 100644 --- a/wp-load.php +++ b/wp-load.php @@ -23,27 +23,30 @@ define( 'ABSPATH', dirname(__FILE__) . '/' ); error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR ); +/* + * If wp-config.php exists in the WordPress root, or if it exists in the root and wp-settings.php + * doesn't, load wp-config.php. The secondary check for wp-settings.php has the added benefit + * of avoiding cases where the current directory is a nested installation, e.g. / is WordPress(a) + * and /blog/ is WordPress(b). + * + * If neither set of conditions is true, initiate loading the setup process. + */ if ( file_exists( ABSPATH . 'wp-config.php') ) { /** The config file resides in ABSPATH */ require_once( ABSPATH . 'wp-config.php' ); -} elseif ( file_exists( dirname(ABSPATH) . '/wp-config.php' ) && ! file_exists( dirname(ABSPATH) . '/wp-settings.php' ) ) { +} elseif ( @file_exists( dirname( ABSPATH ) . '/wp-config.php' ) && ! @file_exists( dirname( ABSPATH ) . '/wp-settings.php' ) ) { /** The config file resides one level above ABSPATH but is not part of another install */ - require_once( dirname(ABSPATH) . '/wp-config.php' ); + require_once( dirname( ABSPATH ) . '/wp-config.php' ); } else { // A config file doesn't exist define( 'WPINC', 'wp-includes' ); - define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' ); require_once( ABSPATH . WPINC . '/load.php' ); - require_once( ABSPATH . WPINC . '/version.php' ); - - wp_check_php_mysql_versions(); - wp_load_translations_early(); // Standardize $_SERVER variables across setups. wp_fix_server_vars(); @@ -52,10 +55,38 @@ if ( file_exists( ABSPATH . 'wp-config.php') ) { $path = wp_guess_url() . '/wp-admin/setup-config.php'; + /* + * We're going to redirect to setup-config.php. While this shouldn't result + * in an infinite loop, that's a silly thing to assume, don't you think? If + * we're traveling in circles, our last-ditch effort is "Need more help?" + */ + if ( false === strpos( $_SERVER['REQUEST_URI'], 'setup-config' ) ) { + header( 'Location: ' . $path ); + exit; + } + + define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' ); + require_once( ABSPATH . WPINC . '/version.php' ); + + wp_check_php_mysql_versions(); + wp_load_translations_early(); + // Die with an error message - $die = __( "There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started." ) . '</p>'; - $die .= '<p>' . __( "Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ) . '</p>'; - $die .= '<p>' . __( "You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file." ) . '</p>'; + $die = sprintf( + /* translators: %s: wp-config.php */ + __( "There doesn't seem to be a %s file. I need this before we can get started." ), + '<code>wp-config.php</code>' + ) . '</p>'; + $die .= '<p>' . sprintf( + /* translators: %s: Codex URL */ + __( "Need more help? <a href='%s'>We got it</a>." ), + __( 'https://codex.wordpress.org/Editing_wp-config.php' ) + ) . '</p>'; + $die .= '<p>' . sprintf( + /* translators: %s: wp-config.php */ + __( "You can create a %s file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file." ), + '<code>wp-config.php</code>' + ) . '</p>'; $die .= '<p><a href="' . $path . '" class="button button-large">' . __( "Create a Configuration File" ) . '</a>'; wp_die( $die, __( 'WordPress &rsaquo; Error' ) ); diff --git a/wp-login.php b/wp-login.php index 7bb5334..ed3878c 100644 --- a/wp-login.php +++ b/wp-login.php @@ -25,10 +25,10 @@ if ( force_ssl_admin() && ! is_ssl() ) { /** * Output the login page header. * - * @param string $title Optional. WordPress Log In Page title to display in <title/> element. Default 'Log In'. - * @param string $message Optional. Message to display in header. Default empty. - * @param string $wp_error Optional. The error to pass. Default empty. - * @param WP_Error $wp_error Optional. WordPress Error Object + * @param string $title Optional. WordPress login Page title to display in the `<title>` element. + * Default 'Log In'. + * @param string $message Optional. Message to display in header. Default empty. + * @param WP_Error $wp_error Optional. The error to pass. Default empty. */ function login_header( $title = 'Log In', $message = '', $wp_error = '' ) { global $error, $interim_login, $action; @@ -56,6 +56,8 @@ function login_header( $title = 'Log In', $message = '', $wp_error = '' ) { if ( $shake_error_codes && $wp_error->get_error_code() && in_array( $wp_error->get_error_code(), $shake_error_codes ) ) add_action( 'login_head', 'wp_shake_js', 12 ); + $separator = is_rtl() ? ' &rsaquo; ' : ' &lsaquo; '; + ?><!DOCTYPE html>  <head> <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" /> - <title><?php bloginfo('name'); ?> &rsaquo; <?php echo $title; ?></title> + <title><?php echo get_bloginfo( 'name', 'display' ) . $separator . $title; ?></title> <?php - wp_admin_css( 'login', true ); + wp_enqueue_style( 'login' ); - // Remove all stored post data on logging out. - // This could be added by add_action('login_head'...) like wp_shake_js() - // but maybe better if it's not removable by plugins + /* + * Remove all stored post data on logging out. + * This could be added by add_action('login_head'...) like wp_shake_js(), + * but maybe better if it's not removable by plugins + */ if ( 'loggedout' == $wp_error->get_error_code() ) { ?> <script>if("sessionStorage" in window){try{for(var key in sessionStorage){if(key.indexOf("wp-autosave-")!=-1){sessionStorage.removeItem(key)}}}catch(e){}};</script> @@ -85,6 +89,7 @@ function login_header( $title = 'Log In', $message = '', $wp_error = '' ) { * @since 3.1.0 */ do_action( 'login_enqueue_scripts' ); + /** * Fires in the login page header after scripts are enqueued. * @@ -147,7 +152,7 @@ function login_header( $title = 'Log In', $message = '', $wp_error = '' ) { </head> <body class="login <?php echo esc_attr( implode( ' ', $classes ) ); ?>"> <div id="login"> - <h1><a href="<?php echo esc_url( $login_header_url ); ?>" title="<?php echo esc_attr( $login_header_title ); ?>"><?php bloginfo( 'name' ); ?></a></h1> + <h1><a href="<?php echo esc_url( $login_header_url ); ?>" title="<?php echo esc_attr( $login_header_title ); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1> <?php unset( $login_header_url, $login_header_title ); @@ -173,12 +178,12 @@ function login_header( $title = 'Log In', $message = '', $wp_error = '' ) { $errors = ''; $messages = ''; foreach ( $wp_error->get_error_codes() as $code ) { - $severity = $wp_error->get_error_data($code); - foreach ( $wp_error->get_error_messages($code) as $error ) { + $severity = $wp_error->get_error_data( $code ); + foreach ( $wp_error->get_error_messages( $code ) as $error_message ) { if ( 'message' == $severity ) - $messages .= ' ' . $error . "<br />\n"; + $messages .= ' ' . $error_message . "<br />\n"; else - $errors .= ' ' . $error . "<br />\n"; + $errors .= ' ' . $error_message . "<br />\n"; } } if ( ! empty( $errors ) ) { @@ -214,7 +219,7 @@ function login_footer($input_id = '') { // Don't allow interim logins to navigate away from the page. if ( ! $interim_login ): ?> - <p id="backtoblog"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php esc_attr_e( 'Are you lost?' ); ?>"><?php printf( __( '← Back to %s' ), get_bloginfo( 'title', 'display' ) ); ?></a></p> + <p id="backtoblog"><a href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php printf( __( '← Back to %s' ), get_bloginfo( 'title', 'display' ) ); ?></a></p> <?php endif; ?> </div> @@ -239,6 +244,9 @@ function login_footer($input_id = '') { <?php } +/** + * @since 3.0.0 + */ function wp_shake_js() { if ( wp_is_mobile() ) return; @@ -253,6 +261,9 @@ addLoadEvent(function(){ var p=new Array(15,30,15,0,-15,-30,-15,0);p=p.concat(p. <?php } +/** + * @since 3.7.0 + */ function wp_login_viewport_meta() { ?> <meta name="viewport" content="width=device-width" /> @@ -262,7 +273,8 @@ function wp_login_viewport_meta() { /** * Handles sending password retrieval email to user. * - * @uses $wpdb WordPress Database object + * @global wpdb $wpdb WordPress database abstraction object. + * @global PasswordHash $wp_hasher Portable PHP password hashing framework. * * @return bool|WP_Error True: when finish. WP_Error on error */ @@ -272,8 +284,8 @@ function retrieve_password() { $errors = new WP_Error(); if ( empty( $_POST['user_login'] ) ) { - $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.')); - } else if ( strpos( $_POST['user_login'], '@' ) ) { + $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or email address.')); + } elseif ( strpos( $_POST['user_login'], '@' ) ) { $user_data = get_user_by( 'email', trim( $_POST['user_login'] ) ); if ( empty( $user_data ) ) $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.')); @@ -286,76 +298,31 @@ function retrieve_password() { * Fires before errors are returned from a password reset request. * * @since 2.1.0 + * @since 4.4.0 Added the `$errors` parameter. + * + * @param WP_Error $errors A WP_Error object containing any errors generated + * by using invalid credentials. */ - do_action( 'lostpassword_post' ); + do_action( 'lostpassword_post', $errors ); if ( $errors->get_error_code() ) return $errors; if ( !$user_data ) { - $errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.')); + $errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or email.')); return $errors; } - // redefining user_login ensures we return the right case in the email + // Redefining user_login ensures we return the right case in the email. $user_login = $user_data->user_login; $user_email = $user_data->user_email; + $key = get_password_reset_key( $user_data ); - /** - * Fires before a new password is retrieved. - * - * @since 1.5.0 - * @deprecated 1.5.1 Misspelled. Use 'retrieve_password' hook instead. - * - * @param string $user_login The user login name. - */ - do_action( 'retreive_password', $user_login ); - /** - * Fires before a new password is retrieved. - * - * @since 1.5.1 - * - * @param string $user_login The user login name. - */ - do_action( 'retrieve_password', $user_login ); - - /** - * Filter whether to allow a password to be reset. - * - * @since 2.7.0 - * - * @param bool true Whether to allow the password to be reset. Default true. - * @param int $user_data->ID The ID of the user attempting to reset a password. - */ - $allow = apply_filters( 'allow_password_reset', true, $user_data->ID ); - - if ( ! $allow ) - return new WP_Error('no_password_reset', __('Password reset is not allowed for this user')); - else if ( is_wp_error($allow) ) - return $allow; - - // Generate something random for a password reset key. - $key = wp_generate_password( 20, false ); - - /** - * Fires when a password reset key is generated. - * - * @since 2.5.0 - * - * @param string $user_login The username for the user. - * @param string $key The generated password reset key. - */ - do_action( 'retrieve_password_key', $user_login, $key ); - - // Now insert the key, hashed, into the DB. - if ( empty( $wp_hasher ) ) { - require_once ABSPATH . 'wp-includes/class-phpass.php'; - $wp_hasher = new PasswordHash( 8, true ); + if ( is_wp_error( $key ) ) { + return $key; } - $hashed = $wp_hasher->HashPassword( $key ); - $wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user_login ) ); - $message = __('Someone requested that the password be reset for the following account:') . "\r\n\r\n"; + $message = __('Someone has requested a password reset for the following account:') . "\r\n\r\n"; $message .= network_home_url( '/' ) . "\r\n\r\n"; $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n"; $message .= __('If this was a mistake, just ignore this email and nothing will happen.') . "\r\n\r\n"; @@ -365,8 +332,10 @@ function retrieve_password() { if ( is_multisite() ) $blogname = $GLOBALS['current_site']->site_name; else - // The blogname option is escaped with esc_html on the way into the database in sanitize_option - // we want to reverse this for the plain text arena of emails. + /* + * The blogname option is escaped with esc_html on the way into the database + * in sanitize_option we want to reverse this for the plain text arena of emails. + */ $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); $title = sprintf( __('[%s] Password Reset'), $blogname ); @@ -375,22 +344,29 @@ function retrieve_password() { * Filter the subject of the password reset email. * * @since 2.8.0 + * @since 4.4.0 Added the `$user_login` and `$user_data` parameters. * - * @param string $title Default email title. + * @param string $title Default email title. + * @param string $user_login The username for the user. + * @param WP_User $user_data WP_User object. */ - $title = apply_filters( 'retrieve_password_title', $title ); + $title = apply_filters( 'retrieve_password_title', $title, $user_login, $user_data ); + /** * Filter the message body of the password reset mail. * * @since 2.8.0 + * @since 4.1.0 Added `$user_login` and `$user_data` parameters. * - * @param string $message Default mail message. - * @param string $key The activation key. + * @param string $message Default mail message. + * @param string $key The activation key. + * @param string $user_login The username for the user. + * @param WP_User $user_data WP_User object. */ - $message = apply_filters( 'retrieve_password_message', $message, $key ); + $message = apply_filters( 'retrieve_password_message', $message, $key, $user_login, $user_data ); if ( $message && !wp_mail( $user_email, wp_specialchars_decode( $title ), $message ) ) - wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function.') ); + wp_die( __('The email could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function.') ); return true; } @@ -423,9 +399,10 @@ if ( defined( 'RELOCATE' ) && RELOCATE ) { // Move flag is set } //Set a cookie now to see if they are supported by the browser. -setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN); +$secure = ( 'https' === parse_url( wp_login_url(), PHP_URL_SCHEME ) ); +setcookie( TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN, $secure ); if ( SITECOOKIEPATH != COOKIEPATH ) - setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN); + setcookie( TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN, $secure ); /** * Fires when the login form is initialized. @@ -436,7 +413,7 @@ do_action( 'login_init' ); /** * Fires before a specified login form action. * - * The dynamic portion of the hook name, $action, refers to the action + * The dynamic portion of the hook name, `$action`, refers to the action * that brought the visitor to the login form. Actions include 'postpass', * 'logout', 'lostpassword', etc. * @@ -450,7 +427,12 @@ $interim_login = isset($_REQUEST['interim-login']); switch ($action) { case 'postpass' : - require_once ABSPATH . 'wp-includes/class-phpass.php'; + if ( ! array_key_exists( 'post_password', $_POST ) ) { + wp_safe_redirect( wp_get_referer() ); + exit(); + } + + require_once ABSPATH . WPINC . '/class-phpass.php'; $hasher = new PasswordHash( 8, true ); /** @@ -464,23 +446,44 @@ case 'postpass' : * @param int $expires The expiry time, as passed to setcookie(). */ $expire = apply_filters( 'post_password_expires', time() + 10 * DAY_IN_SECONDS ); - setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), $expire, COOKIEPATH ); + $referer = wp_get_referer(); + if ( $referer ) { + $secure = ( 'https' === parse_url( $referer, PHP_URL_SCHEME ) ); + } else { + $secure = false; + } + setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), $expire, COOKIEPATH, COOKIE_DOMAIN, $secure ); wp_safe_redirect( wp_get_referer() ); exit(); -break; - case 'logout' : check_admin_referer('log-out'); + + $user = wp_get_current_user(); + wp_logout(); - $redirect_to = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : 'wp-login.php?loggedout=true'; + if ( ! empty( $_REQUEST['redirect_to'] ) ) { + $redirect_to = $requested_redirect_to = $_REQUEST['redirect_to']; + } else { + $redirect_to = 'wp-login.php?loggedout=true'; + $requested_redirect_to = ''; + } + + /** + * Filter the log out redirect URL. + * + * @since 4.2.0 + * + * @param string $redirect_to The redirect destination URL. + * @param string $requested_redirect_to The requested redirect destination URL passed as a parameter. + * @param WP_User $user The WP_User object for the user that's logging out. + */ + $redirect_to = apply_filters( 'logout_redirect', $redirect_to, $requested_redirect_to, $user ); wp_safe_redirect( $redirect_to ); exit(); -break; - case 'lostpassword' : case 'retrievepassword' : @@ -494,10 +497,11 @@ case 'retrievepassword' : } if ( isset( $_GET['error'] ) ) { - if ( 'invalidkey' == $_GET['error'] ) - $errors->add( 'invalidkey', __( 'Sorry, that key does not appear to be valid.' ) ); - elseif ( 'expiredkey' == $_GET['error'] ) - $errors->add( 'expiredkey', __( 'Sorry, that key has expired. Please try again.' ) ); + if ( 'invalidkey' == $_GET['error'] ) { + $errors->add( 'invalidkey', __( 'Your password reset link appears to be invalid. Please request a new link below.' ) ); + } elseif ( 'expiredkey' == $_GET['error'] ) { + $errors->add( 'expiredkey', __( 'Your password reset link has expired. Please request a new link below.' ) ); + } } $lostpassword_redirect = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : ''; @@ -523,14 +527,14 @@ case 'retrievepassword' : ?> -<form name="lostpasswordform" id="lostpasswordform" action="<?php echo esc_url( site_url( 'wp-login.php?action=lostpassword', 'login_post' ) ); ?>" method="post"> +<form name="lostpasswordform" id="lostpasswordform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=lostpassword', 'login_post' ) ); ?>" method="post"> <p> - <label for="user_login" ><?php _e('Username or E-mail:') ?><br /> + <label for="user_login" ><?php _e('Username or Email') ?><br /> <input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr($user_login); ?>" size="20" /></label> </p> <?php /** - * Fires inside the lostpassword <form> tags, before the hidden fields. + * Fires inside the lostpassword form tags, before the hidden fields. * * @since 2.1.0 */ @@ -544,13 +548,8 @@ case 'retrievepassword' : <?php if ( get_option( 'users_can_register' ) ) : $registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) ); - /** - * Filter the registration URL below the login form. - * - * @since 1.5.0 - * - * @param string $registration_url Registration URL. - */ + + /** This filter is documented in wp-includes/general-template.php */ echo ' | ' . apply_filters( 'register', $registration_url ); endif; ?> @@ -562,10 +561,28 @@ break; case 'resetpass' : case 'rp' : - $user = check_password_reset_key($_GET['key'], $_GET['login']); + list( $rp_path ) = explode( '?', wp_unslash( $_SERVER['REQUEST_URI'] ) ); + $rp_cookie = 'wp-resetpass-' . COOKIEHASH; + if ( isset( $_GET['key'] ) ) { + $value = sprintf( '%s:%s', wp_unslash( $_GET['login'] ), wp_unslash( $_GET['key'] ) ); + setcookie( $rp_cookie, $value, 0, $rp_path, COOKIE_DOMAIN, is_ssl(), true ); + wp_safe_redirect( remove_query_arg( array( 'key', 'login' ) ) ); + exit; + } + + if ( isset( $_COOKIE[ $rp_cookie ] ) && 0 < strpos( $_COOKIE[ $rp_cookie ], ':' ) ) { + list( $rp_login, $rp_key ) = explode( ':', wp_unslash( $_COOKIE[ $rp_cookie ] ), 2 ); + $user = check_password_reset_key( $rp_key, $rp_login ); + if ( isset( $_POST['pass1'] ) && ! hash_equals( $rp_key, $_POST['rp_key'] ) ) { + $user = false; + } + } else { + $user = false; + } - if ( is_wp_error($user) ) { - if ( $user->get_error_code() === 'expired_key' ) + if ( ! $user || is_wp_error( $user ) ) { + setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true ); + if ( $user && $user->get_error_code() === 'expired_key' ) wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=expiredkey' ) ); else wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=invalidkey' ) ); @@ -589,6 +606,7 @@ case 'rp' : if ( ( ! $errors->get_error_code() ) && isset( $_POST['pass1'] ) && !empty( $_POST['pass1'] ) ) { reset_password($user, $_POST['pass1']); + setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true ); login_header( __( 'Password Reset' ), '<p class="message reset-pass">' . __( 'Your password has been reset.' ) . ' <a href="' . esc_url( wp_login_url() ) . '">' . __( 'Log in' ) . '</a></p>' ); login_footer(); exit; @@ -600,21 +618,28 @@ case 'rp' : login_header(__('Reset Password'), '<p class="message reset-pass">' . __('Enter your new password below.') . '</p>', $errors ); ?> -<form name="resetpassform" id="resetpassform" action="<?php echo esc_url( site_url( 'wp-login.php?action=resetpass&key=' . urlencode( $_GET['key'] ) . '&login=' . urlencode( $_GET['login'] ), 'login_post' ) ); ?>" method="post" autocomplete="off"> - <input type="hidden" id="user_login" value="<?php echo esc_attr( $_GET['login'] ); ?>" autocomplete="off" /> +<form name="resetpassform" id="resetpassform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=resetpass', 'login_post' ) ); ?>" method="post" autocomplete="off"> + <input type="hidden" id="user_login" value="<?php echo esc_attr( $rp_login ); ?>" autocomplete="off" /> + + <div class="user-pass1-wrap"> + <p> + <label for="pass1"><?php _e( 'New password' ) ?></label> + </p> + + <div class="wp-pwd"> + <span class="password-input-wrapper"> + <input type="password" data-reveal="1" data-pw="<?php echo esc_attr( wp_generate_password( 16 ) ); ?>" name="pass1" id="pass1" class="input" size="20" value="" autocomplete="off" aria-describedby="pass-strength-result" /> + </span> + <div id="pass-strength-result" class="hide-if-no-js" aria-live="polite"><?php _e( 'Strength indicator' ); ?></div> + </div> + </div> - <p> - <label for="pass1"><?php _e('New password') ?><br /> - <input type="password" name="pass1" id="pass1" class="input" size="20" value="" autocomplete="off" /></label> - </p> - <p> - <label for="pass2"><?php _e('Confirm new password') ?><br /> - <input type="password" name="pass2" id="pass2" class="input" size="20" value="" autocomplete="off" /></label> + <p class="user-pass2-wrap"> + <label for="pass2"><?php _e( 'Confirm new password' ) ?></label><br /> + <input type="password" name="pass2" id="pass2" class="input" size="20" value="" autocomplete="off" /> </p> - <div id="pass-strength-result" class="hide-if-no-js"><?php _e('Strength indicator'); ?></div> - <p class="description indicator-hint"><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers, and symbols like ! " ? $ % ^ & ).'); ?></p> - + <p class="description indicator-hint"><?php echo wp_get_password_hint(); ?></p> <br class="clear" /> <?php @@ -627,6 +652,7 @@ case 'rp' : */ do_action( 'resetpass_form', $user ); ?> + <input type="hidden" name="rp_key" value="<?php echo esc_attr( $rp_key ); ?>" /> <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Reset Password'); ?>" /></p> </form> @@ -635,7 +661,8 @@ case 'rp' : <?php if ( get_option( 'users_can_register' ) ) : $registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) ); - /** This filter is documented in wp-login.php */ + + /** This filter is documented in wp-includes/general-template.php */ echo ' | ' . apply_filters( 'register', $registration_url ); endif; ?> @@ -647,7 +674,6 @@ break; case 'register' : if ( is_multisite() ) { - $sign_up_url = network_site_url( 'wp-signup.php' ); /** * Filter the Multisite sign up URL. * @@ -655,7 +681,7 @@ case 'register' : * * @param string $sign_up_url The sign up URL. */ - wp_redirect( apply_filters( 'wp_signup_location', $sign_up_url ) ); + wp_redirect( apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) ) ); exit; } @@ -667,8 +693,8 @@ case 'register' : $user_login = ''; $user_email = ''; if ( $http_post ) { - $user_login = $_POST['user_login']; - $user_email = $_POST['user_email']; + $user_login = isset( $_POST['user_login'] ) ? $_POST['user_login'] : ''; + $user_email = isset( $_POST['user_email'] ) ? $_POST['user_email'] : ''; $errors = register_new_user($user_login, $user_email); if ( !is_wp_error($errors) ) { $redirect_to = !empty( $_POST['redirect_to'] ) ? $_POST['redirect_to'] : 'wp-login.php?checkemail=registered'; @@ -688,25 +714,24 @@ case 'register' : $redirect_to = apply_filters( 'registration_redirect', $registration_redirect ); login_header(__('Registration Form'), '<p class="message register">' . __('Register For This Site') . '</p>', $errors); ?> - -<form name="registerform" id="registerform" action="<?php echo esc_url( site_url('wp-login.php?action=register', 'login_post') ); ?>" method="post"> +<form name="registerform" id="registerform" action="<?php echo esc_url( site_url( 'wp-login.php?action=register', 'login_post' ) ); ?>" method="post" novalidate="novalidate"> <p> <label for="user_login"><?php _e('Username') ?><br /> <input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr(wp_unslash($user_login)); ?>" size="20" /></label> </p> <p> - <label for="user_email"><?php _e('E-mail') ?><br /> - <input type="text" name="user_email" id="user_email" class="input" value="<?php echo esc_attr(wp_unslash($user_email)); ?>" size="25" /></label> + <label for="user_email"><?php _e('Email') ?><br /> + <input type="email" name="user_email" id="user_email" class="input" value="<?php echo esc_attr( wp_unslash( $user_email ) ); ?>" size="25" /></label> </p> <?php /** - * Fires following the 'E-mail' field in the user registration form. + * Fires following the 'Email' field in the user registration form. * * @since 2.1.0 */ do_action( 'register_form' ); ?> - <p id="reg_passmail"><?php _e('A password will be e-mailed to you.') ?></p> + <p id="reg_passmail"><?php _e( 'Registration confirmation will be emailed to you.' ); ?></p> <br class="clear" /> <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" /> <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Register'); ?>" /></p> @@ -714,7 +739,7 @@ case 'register' : <p id="nav"> <a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a> | -<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>" title="<?php esc_attr_e( 'Password Lost and Found' ) ?>"><?php _e( 'Lost your password?' ); ?></a> +<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a> </p> <?php @@ -731,7 +756,13 @@ default: // If the user wants ssl but the session is not ssl, force a secure cookie. if ( !empty($_POST['log']) && !force_ssl_admin() ) { $user_name = sanitize_user($_POST['log']); - if ( $user = get_user_by('login', $user_name) ) { + $user = get_user_by( 'login', $user_name ); + + if ( ! $user && strpos( $user_name, '@' ) ) { + $user = get_user_by( 'email', $user_name ); + } + + if ( $user ) { if ( get_user_option('use_ssl', $user->ID) ) { $secure_cookie = true; force_ssl_admin(true); @@ -750,22 +781,16 @@ default: $reauth = empty($_REQUEST['reauth']) ? false : true; - // If the user was redirected to a secure login form from a non-secure admin page, and secure login is required but secure admin is not, then don't use a secure - // cookie and redirect back to the referring non-secure admin page. This allows logins to always be POSTed over SSL while allowing the user to choose visiting - // the admin via http or https. - if ( !$secure_cookie && is_ssl() && force_ssl_login() && !force_ssl_admin() && ( 0 !== strpos($redirect_to, 'https') ) && ( 0 === strpos($redirect_to, 'http') ) ) - $secure_cookie = false; - $user = wp_signon( '', $secure_cookie ); if ( empty( $_COOKIE[ LOGGED_IN_COOKIE ] ) ) { if ( headers_sent() ) { $user = new WP_Error( 'test_cookie', sprintf( __( '<strong>ERROR</strong>: Cookies are blocked due to unexpected output. For help, please see <a href="%1$s">this documentation</a> or try the <a href="%2$s">support forums</a>.' ), - __( 'http://codex.wordpress.org/Cookies' ), __( 'https://wordpress.org/support/' ) ) ); + __( 'https://codex.wordpress.org/Cookies' ), __( 'https://wordpress.org/support/' ) ) ); } elseif ( isset( $_POST['testcookie'] ) && empty( $_COOKIE[ TEST_COOKIE ] ) ) { // If cookies are disabled we can't log in even with a valid user+pass $user = new WP_Error( 'test_cookie', sprintf( __( '<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ), - __( 'http://codex.wordpress.org/Cookies' ) ) ); + __( 'https://codex.wordpress.org/Cookies' ) ) ); } } @@ -804,7 +829,10 @@ default: elseif ( is_multisite() && !$user->has_cap('read') ) $redirect_to = get_dashboard_url( $user->ID ); elseif ( !$user->has_cap('edit_posts') ) - $redirect_to = admin_url('profile.php'); + $redirect_to = $user->has_cap( 'read' ) ? admin_url( 'profile.php' ) : home_url(); + + wp_redirect( $redirect_to ); + exit(); } wp_safe_redirect($redirect_to); exit(); @@ -817,7 +845,7 @@ default: if ( $interim_login ) { if ( ! $errors->get_error_code() ) - $errors->add('expired', __('Session expired. Please log in again. You will not move away from this page.'), 'message'); + $errors->add( 'expired', __( 'Your session has expired. Please log in to continue where you left off.' ), 'message' ); } else { // Some parts of this script use the main login form to display a message if ( isset($_GET['loggedout']) && true == $_GET['loggedout'] ) @@ -825,13 +853,13 @@ default: elseif ( isset($_GET['registration']) && 'disabled' == $_GET['registration'] ) $errors->add('registerdisabled', __('User registration is currently not allowed.')); elseif ( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] ) - $errors->add('confirm', __('Check your e-mail for the confirmation link.'), 'message'); + $errors->add('confirm', __('Check your email for the confirmation link.'), 'message'); elseif ( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] ) - $errors->add('newpass', __('Check your e-mail for your new password.'), 'message'); + $errors->add('newpass', __('Check your email for your new password.'), 'message'); elseif ( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] ) - $errors->add('registered', __('Registration complete. Please check your e-mail.'), 'message'); + $errors->add('registered', __('Registration complete. Please check your email.'), 'message'); elseif ( strpos( $redirect_to, 'about.php?updated' ) ) - $errors->add('updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to experience the awesomeness.' ), 'message' ); + $errors->add('updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to see what’s new.' ), 'message' ); } /** @@ -853,16 +881,22 @@ default: if ( isset($_POST['log']) ) $user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? esc_attr(wp_unslash($_POST['log'])) : ''; $rememberme = ! empty( $_POST['rememberme'] ); + + if ( ! empty( $errors->errors ) ) { + $aria_describedby_error = ' aria-describedby="login_error"'; + } else { + $aria_describedby_error = ''; + } ?> <form name="loginform" id="loginform" action="<?php echo esc_url( site_url( 'wp-login.php', 'login_post' ) ); ?>" method="post"> <p> - <label for="user_login"><?php _e('Username') ?><br /> - <input type="text" name="log" id="user_login" class="input" value="<?php echo esc_attr($user_login); ?>" size="20" /></label> + <label for="user_login"><?php _e('Username or Email') ?><br /> + <input type="text" name="log" id="user_login"<?php echo $aria_describedby_error; ?> class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" /></label> </p> <p> <label for="user_pass"><?php _e('Password') ?><br /> - <input type="password" name="pwd" id="user_pass" class="input" value="" size="20" /></label> + <input type="password" name="pwd" id="user_pass"<?php echo $aria_describedby_error; ?> class="input" value="" size="20" /></label> </p> <?php /** @@ -892,11 +926,12 @@ default: <?php if ( ! isset( $_GET['checkemail'] ) || ! in_array( $_GET['checkemail'], array( 'confirm', 'newpass' ) ) ) : if ( get_option( 'users_can_register' ) ) : $registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) ); - /** This filter is documented in wp-login.php */ + + /** This filter is documented in wp-includes/general-template.php */ echo apply_filters( 'register', $registration_url ) . ' | '; endif; ?> - <a href="<?php echo esc_url( wp_lostpassword_url() ); ?>" title="<?php esc_attr_e( 'Password Lost and Found' ); ?>"><?php _e( 'Lost your password?' ); ?></a> + <a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a> <?php endif; ?> </p> <?php } ?> @@ -904,7 +939,7 @@ default: <script type="text/javascript"> function wp_attempt_focus(){ setTimeout( function(){ try{ -<?php if ( $user_login || $interim_login ) { ?> +<?php if ( $user_login ) { ?> d = document.getElementById('user_pass'); d.value = ''; <?php } else { ?> diff --git a/wp-mail.php b/wp-mail.php index 550c28c..5efb57f 100644 --- a/wp-mail.php +++ b/wp-mail.php @@ -68,7 +68,7 @@ for ( $i = 1; $i <= $count; $i++ ) { $author_found = false; $dmonths = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'); foreach ($message as $line) { - // body signal + // Body signal. if ( strlen($line) < 3 ) $bodysignal = true; if ( $bodysignal ) { @@ -108,8 +108,10 @@ for ( $i = 1; $i <= $count; $i++ ) { $subject = $subject[0]; } - // Set the author using the email address (From or Reply-To, the last used) - // otherwise use the site admin + /* + * Set the author using the email address (From or Reply-To, the last used) + * otherwise use the site admin. + */ if ( ! $author_found && preg_match( '/^(From|Reply-To): /', $line ) ) { if ( preg_match('|[a-z0-9_.-]+@[a-z0-9_.-]+(?!.*<)|i', $line, $matches) ) $author = $matches[0]; @@ -126,33 +128,12 @@ for ( $i = 1; $i <= $count; $i++ ) { } } - if (preg_match('/Date: /i', $line)) { // of the form '20 Mar 2002 20:32:37' - $ddate = trim($line); - $ddate = str_replace('Date: ', '', $ddate); - if (strpos($ddate, ',')) { - $ddate = trim(substr($ddate, strpos($ddate, ',') + 1, strlen($ddate))); - } - $date_arr = explode(' ', $ddate); - $date_time = explode(':', $date_arr[3]); - - $ddate_H = $date_time[0]; - $ddate_i = $date_time[1]; - $ddate_s = $date_time[2]; - - $ddate_m = $date_arr[1]; - $ddate_d = $date_arr[0]; - $ddate_Y = $date_arr[2]; - for ( $j = 0; $j < 12; $j++ ) { - if ( $ddate_m == $dmonths[$j] ) { - $ddate_m = $j+1; - } - } - - $time_zn = intval($date_arr[4]) * 36; - $ddate_U = gmmktime($ddate_H, $ddate_i, $ddate_s, $ddate_m, $ddate_d, $ddate_Y); - $ddate_U = $ddate_U - $time_zn; - $post_date = gmdate('Y-m-d H:i:s', $ddate_U + $time_difference); - $post_date_gmt = gmdate('Y-m-d H:i:s', $ddate_U); + if ( preg_match( '/Date: /i', $line ) ) { // of the form '20 Mar 2002 20:32:37 +0100' + $ddate = str_replace( 'Date: ', '', trim( $line ) ); + $ddate = preg_replace( '!\s*$.+$\s*$!', '', $ddate ); // remove parenthesised timezone string if it exists, as this confuses strtotime + $ddate_U = strtotime( $ddate ); + $post_date = gmdate( 'Y-m-d H:i:s', $ddate_U + $time_difference ); + $post_date_gmt = gmdate( 'Y-m-d H:i:s', $ddate_U ); } } } @@ -171,7 +152,8 @@ for ( $i = 1; $i <= $count; $i++ ) { if ( $content_type == 'multipart/alternative' ) { $content = explode('--'.$boundary, $content); $content = $content[2]; - // match case-insensitive content-transfer-encoding + + // Match case-insensitive content-transfer-encoding. if ( preg_match( '/Content-Transfer-Encoding: quoted-printable/i', $content, $delim) ) { $content = explode($delim[0], $content); $content = $content[1]; @@ -241,15 +223,23 @@ for ( $i = 1; $i <= $count; $i++ ) { */ do_action( 'publish_phone', $post_ID ); - echo "\n<p>" . sprintf(__('<strong>Author:</strong> %s'), esc_html($post_author)) . '</p>'; - echo "\n<p>" . sprintf(__('<strong>Posted title:</strong> %s'), esc_html($post_title)) . '</p>'; + echo "\n<p><strong>" . __( 'Author:' ) . '</strong> ' . esc_html( $post_author ) . '</p>'; + echo "\n<p><strong>" . __( 'Posted title:' ) . '</strong> ' . esc_html( $post_title ) . '</p>'; if(!$pop3->delete($i)) { - echo '<p>' . sprintf(__('Oops: %s'), esc_html($pop3->ERROR)) . '</p>'; + echo '<p>' . sprintf( + /* translators: %s: POP3 error */ + __( 'Oops: %s' ), + esc_html( $pop3->ERROR ) + ) . '</p>'; $pop3->reset(); exit; } else { - echo '<p>' . sprintf(__('Mission complete. Message <strong>%s</strong> deleted.'), $i) . '</p>'; + echo '<p>' . sprintf( + /* translators: %s: the message ID */ + __( 'Mission complete. Message %s deleted.' ), + '<strong>' . $i . '</strong>' + ) . '</p>'; } } diff --git a/wp-settings.php b/wp-settings.php index 9f73195..a4bb370 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -26,10 +26,19 @@ require( ABSPATH . WPINC . '/default-constants.php' ); * we're including version.php from another install and don't want * these values to be overridden if already set. */ -global $wp_version, $wp_db_version, $tinymce_version, $required_php_version, $required_mysql_version; +global $wp_version, $wp_db_version, $tinymce_version, $required_php_version, $required_mysql_version, $wp_local_package; require( ABSPATH . WPINC . '/version.php' ); -// Set initial default constants including WP_MEMORY_LIMIT, WP_MAX_MEMORY_LIMIT, WP_DEBUG, WP_CONTENT_DIR and WP_CACHE. +/** + * If not already configured, `$blog_id` will default to 1 in a single site + * configuration. In multisite, it will be overridden by default in ms-settings.php. + * + * @global int $blog_id + * @since 2.0.0 + */ +global $blog_id; + +// Set initial default constants including WP_MEMORY_LIMIT, WP_MAX_MEMORY_LIMIT, WP_DEBUG, SCRIPT_DEBUG, WP_CONTENT_DIR and WP_CACHE. wp_initial_constants(); // Check for the required PHP version and for the MySQL extension or a database drop-in. @@ -113,26 +122,42 @@ require( ABSPATH . WPINC . '/class-wp-walker.php' ); require( ABSPATH . WPINC . '/class-wp-ajax-response.php' ); require( ABSPATH . WPINC . '/formatting.php' ); require( ABSPATH . WPINC . '/capabilities.php' ); +require( ABSPATH . WPINC . '/class-wp-roles.php' ); +require( ABSPATH . WPINC . '/class-wp-role.php' ); +require( ABSPATH . WPINC . '/class-wp-user.php' ); require( ABSPATH . WPINC . '/query.php' ); require( ABSPATH . WPINC . '/date.php' ); require( ABSPATH . WPINC . '/theme.php' ); require( ABSPATH . WPINC . '/class-wp-theme.php' ); require( ABSPATH . WPINC . '/template.php' ); require( ABSPATH . WPINC . '/user.php' ); +require( ABSPATH . WPINC . '/class-wp-user-query.php' ); +require( ABSPATH . WPINC . '/session.php' ); require( ABSPATH . WPINC . '/meta.php' ); +require( ABSPATH . WPINC . '/class-wp-meta-query.php' ); +require( ABSPATH . WPINC . '/class-wp-metadata-lazyloader.php' ); require( ABSPATH . WPINC . '/general-template.php' ); require( ABSPATH . WPINC . '/link-template.php' ); require( ABSPATH . WPINC . '/author-template.php' ); require( ABSPATH . WPINC . '/post.php' ); +require( ABSPATH . WPINC . '/class-walker-page.php' ); +require( ABSPATH . WPINC . '/class-walker-page-dropdown.php' ); +require( ABSPATH . WPINC . '/class-wp-post.php' ); require( ABSPATH . WPINC . '/post-template.php' ); require( ABSPATH . WPINC . '/revision.php' ); require( ABSPATH . WPINC . '/post-formats.php' ); require( ABSPATH . WPINC . '/post-thumbnail-template.php' ); require( ABSPATH . WPINC . '/category.php' ); +require( ABSPATH . WPINC . '/class-walker-category.php' ); +require( ABSPATH . WPINC . '/class-walker-category-dropdown.php' ); require( ABSPATH . WPINC . '/category-template.php' ); require( ABSPATH . WPINC . '/comment.php' ); +require( ABSPATH . WPINC . '/class-wp-comment.php' ); +require( ABSPATH . WPINC . '/class-wp-comment-query.php' ); +require( ABSPATH . WPINC . '/class-walker-comment.php' ); require( ABSPATH . WPINC . '/comment-template.php' ); require( ABSPATH . WPINC . '/rewrite.php' ); +require( ABSPATH . WPINC . '/class-wp-rewrite.php' ); require( ABSPATH . WPINC . '/feed.php' ); require( ABSPATH . WPINC . '/bookmark.php' ); require( ABSPATH . WPINC . '/bookmark-template.php' ); @@ -141,17 +166,33 @@ require( ABSPATH . WPINC . '/cron.php' ); require( ABSPATH . WPINC . '/deprecated.php' ); require( ABSPATH . WPINC . '/script-loader.php' ); require( ABSPATH . WPINC . '/taxonomy.php' ); +require( ABSPATH . WPINC . '/class-wp-term.php' ); +require( ABSPATH . WPINC . '/class-wp-tax-query.php' ); require( ABSPATH . WPINC . '/update.php' ); require( ABSPATH . WPINC . '/canonical.php' ); require( ABSPATH . WPINC . '/shortcodes.php' ); +require( ABSPATH . WPINC . '/embed.php' ); require( ABSPATH . WPINC . '/class-wp-embed.php' ); +require( ABSPATH . WPINC . '/class-wp-oembed-controller.php' ); require( ABSPATH . WPINC . '/media.php' ); require( ABSPATH . WPINC . '/http.php' ); require( ABSPATH . WPINC . '/class-http.php' ); +require( ABSPATH . WPINC . '/class-wp-http-streams.php' ); +require( ABSPATH . WPINC . '/class-wp-http-curl.php' ); +require( ABSPATH . WPINC . '/class-wp-http-proxy.php' ); +require( ABSPATH . WPINC . '/class-wp-http-cookie.php' ); +require( ABSPATH . WPINC . '/class-wp-http-encoding.php' ); +require( ABSPATH . WPINC . '/class-wp-http-response.php' ); require( ABSPATH . WPINC . '/widgets.php' ); +require( ABSPATH . WPINC . '/class-wp-widget.php' ); +require( ABSPATH . WPINC . '/class-wp-widget-factory.php' ); require( ABSPATH . WPINC . '/nav-menu.php' ); require( ABSPATH . WPINC . '/nav-menu-template.php' ); require( ABSPATH . WPINC . '/admin-bar.php' ); +require( ABSPATH . WPINC . '/rest-api.php' ); +require( ABSPATH . WPINC . '/rest-api/class-wp-rest-server.php' ); +require( ABSPATH . WPINC . '/rest-api/class-wp-rest-response.php' ); +require( ABSPATH . WPINC . '/rest-api/class-wp-rest-request.php' ); // Load multisite-specific files. if ( is_multisite() ) { @@ -174,7 +215,7 @@ unset( $mu_plugin ); // Load network activated plugins. if ( is_multisite() ) { - foreach( wp_get_active_network_plugins() as $network_plugin ) { + foreach ( wp_get_active_network_plugins() as $network_plugin ) { wp_register_plugin_realpath( $network_plugin ); include_once( $network_plugin ); } @@ -191,7 +232,7 @@ do_action( 'muplugins_loaded' ); if ( is_multisite() ) ms_cookie_constants( ); -// Define constants after multisite is loaded. Cookie-related constants may be overridden in ms_network_cookies(). +// Define constants after multisite is loaded. wp_cookie_constants(); // Define and enforce our SSL constants @@ -250,7 +291,7 @@ do_action( 'sanitize_comment_cookies' ); /** * WordPress Query object - * @global object $wp_the_query + * @global WP_Query $wp_the_query * @since 2.0.0 */ $GLOBALS['wp_the_query'] = new WP_Query(); @@ -258,35 +299,35 @@ $GLOBALS['wp_the_query'] = new WP_Query(); /** * Holds the reference to @see $wp_the_query * Use this global for WordPress queries - * @global object $wp_query + * @global WP_Query $wp_query * @since 1.5.0 */ $GLOBALS['wp_query'] = $GLOBALS['wp_the_query']; /** * Holds the WordPress Rewrite object for creating pretty URLs - * @global object $wp_rewrite + * @global WP_Rewrite $wp_rewrite * @since 1.5.0 */ $GLOBALS['wp_rewrite'] = new WP_Rewrite(); /** * WordPress Object - * @global object $wp + * @global WP $wp * @since 2.0.0 */ $GLOBALS['wp'] = new WP(); /** * WordPress Widget Factory Object - * @global object $wp_widget_factory + * @global WP_Widget_Factory $wp_widget_factory * @since 2.8.0 */ $GLOBALS['wp_widget_factory'] = new WP_Widget_Factory(); /** * WordPress User Roles - * @global object $wp_roles + * @global WP_Roles $wp_roles * @since 2.0.0 */ $GLOBALS['wp_roles'] = new WP_Roles(); @@ -315,13 +356,13 @@ require_once( ABSPATH . WPINC . '/locale.php' ); /** * WordPress Locale object for loading locale domain date and various strings. - * @global object $wp_locale + * @global WP_Locale $wp_locale * @since 2.1.0 */ $GLOBALS['wp_locale'] = new WP_Locale(); // Load the functions for the active theme, for both parent and child theme if applicable. -if ( ! defined( 'WP_INSTALLING' ) || 'wp-activate.php' === $pagenow ) { +if ( ! wp_installing() || 'wp-activate.php' === $pagenow ) { if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) ) include( STYLESHEETPATH . '/functions.php' ); if ( file_exists( TEMPLATEPATH . '/functions.php' ) ) @@ -366,7 +407,7 @@ if ( is_multisite() ) { * AJAX requests should use wp-admin/admin-ajax.php. admin-ajax.php can handle requests for * users not logged in. * - * @link http://codex.wordpress.org/AJAX_in_Plugins + * @link https://codex.wordpress.org/AJAX_in_Plugins * * @since 3.0.0 */ diff --git a/wp-signup.php b/wp-signup.php index d4e4a75..bd46d02 100644 --- a/wp-signup.php +++ b/wp-signup.php @@ -7,7 +7,7 @@ add_action( 'wp_head', 'wp_no_robots' ); require( dirname( __FILE__ ) . '/wp-blog-header.php' ); -if ( is_array( get_site_option( 'illegal_names' )) && isset( $_GET[ 'new' ] ) && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) == true ) { +if ( is_array( get_site_option( 'illegal_names' )) && isset( $_GET[ 'new' ] ) && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) ) { wp_redirect( network_home_url() ); die(); } @@ -19,7 +19,7 @@ if ( is_array( get_site_option( 'illegal_names' )) && isset( $_GET[ 'new' ] ) && */ function do_signup_header() { /** - * Fires within the <head> section of the site sign-up screen. + * Fires within the head section of the site sign-up screen. * * @since 3.0.0 */ @@ -28,7 +28,7 @@ function do_signup_header() { add_action( 'wp_head', 'do_signup_header' ); if ( !is_multisite() ) { - wp_redirect( site_url('wp-login.php?action=register') ); + wp_redirect( wp_registration_url() ); die(); } @@ -40,6 +40,13 @@ if ( !is_main_site() ) { // Fix for page title $wp_query->is_404 = false; +/** + * Fires before the Site Signup page is loaded. + * + * @since 4.4.0 + */ +do_action( 'before_signup_header' ); + /** * Prints styles for front-end Multisite signup pages * @@ -56,6 +63,7 @@ function wpmu_signup_stylesheet() { .mu_register #user_email, .mu_register #blogname, .mu_register #user_name { width:100%; font-size: 24px; margin:5px 0; } + .mu_register #site-language { display: block; } .mu_register .prefix_address, .mu_register .suffix_address {font-size: 18px;display:inline; } .mu_register label { font-weight:700; font-size:15px; display:block; margin:10px 0; } @@ -66,7 +74,7 @@ function wpmu_signup_stylesheet() { } add_action( 'wp_head', 'wpmu_signup_stylesheet' ); -get_header(); +get_header( 'wp-signup' ); /** * Fires before the site sign-up form. @@ -75,8 +83,8 @@ get_header(); */ do_action( 'before_signup_form' ); ?> -<div id="content" class="widecolumn"> -<div class="mu_register"> +<div id="signup-content" class="widecolumn"> +<div class="mu_register wp-signup-container"> <?php /** * Generates and displays the Signup and Create Site forms @@ -121,6 +129,38 @@ function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) { echo '<input name="blog_title" type="text" id="blog_title" value="'.esc_attr($blog_title).'" />'; ?> + <?php + // Site Language. + $languages = signup_get_available_languages(); + + if ( ! empty( $languages ) ) : + ?> + <p> + <label for="site-language"><?php _e( 'Site Language:' ); ?></label> + <?php + // Network default. + $lang = get_site_option( 'WPLANG' ); + + if ( isset( $_POST['WPLANG'] ) ) { + $lang = $_POST['WPLANG']; + } + + // Use US English if the default isn't available. + if ( ! in_array( $lang, $languages ) ) { + $lang = ''; + } + + wp_dropdown_languages( array( + 'name' => 'WPLANG', + 'id' => 'site-language', + 'selected' => $lang, + 'languages' => $languages, + 'show_available_translations' => false, + ) ); + ?> + </p> + <?php endif; // Languages. ?> + <div id="privacy"> <p class="privacy-intro"> <label for="blog_public_on"><?php _e('Privacy:') ?></label> @@ -153,8 +193,6 @@ function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) { * * @since MU * - * @uses wp_get_current_user() to retrieve the current user - * @uses wpmu_validate_blog_signup() to validate new site signup for the current user * @return array Contains the new site data and error messages. */ function validate_blog_form() { @@ -188,7 +226,7 @@ function show_user_form($user_name = '', $user_email = '', $errors = '') { <?php if ( $errmsg = $errors->get_error_message('user_email') ) { ?> <p class="error"><?php echo $errmsg ?></p> <?php } ?> - <input name="user_email" type="text" id="user_email" value="<?php echo esc_attr($user_email) ?>" maxlength="200" /><br /><?php _e('We send your registration email to this address. (Double-check your email address before continuing.)') ?> + <input name="user_email" type="email" id="user_email" value="<?php echo esc_attr($user_email) ?>" maxlength="200" /><br /><?php _e('We send your registration email to this address. (Double-check your email address before continuing.)') ?> <?php if ( $errmsg = $errors->get_error_message('generic') ) { echo '<p class="error">' . $errmsg . '</p>'; @@ -208,7 +246,6 @@ function show_user_form($user_name = '', $user_email = '', $errors = '') { * * @since MU * - * @uses wpmu_validate_user_signup() to retrieve an array of user data * @return array Contains username, email, and error messages. */ function validate_user_form() { @@ -220,9 +257,8 @@ function validate_user_form() { * * @since MU * - * @uses wp_get_current_user() to get the current user * @param string $blogname The new site name - * @param string $blog_title The new blog title + * @param string $blog_title The new site title. * @param array $errors */ function signup_another_blog( $blogname = '', $blog_title = '', $errors = '' ) { @@ -299,23 +335,28 @@ function signup_another_blog( $blogname = '', $blog_title = '', $errors = '' ) { } /** - * Validate a new blog signup + * Validate a new site signup. * * @since MU * - * @uses wp_get_current_user() to retrieve the current user - * @uses wpmu_create_blog() to add a new site - * @uses confirm_another_blog_signup() to confirm the user's new site signup - * @return bool True if blog signup was validated, false if error + * @return null|bool True if site signup was validated, false if error. + * The function halts all execution if the user is not logged in. */ function validate_another_blog_signup() { global $wpdb, $blogname, $blog_title, $errors, $domain, $path; $current_user = wp_get_current_user(); - if ( !is_user_logged_in() ) + if ( ! is_user_logged_in() ) { die(); + } $result = validate_blog_form(); - extract($result); + + // Extracted values set/overwrite globals. + $domain = $result['domain']; + $path = $result['path']; + $blogname = $result['blogname']; + $blog_title = $result['blog_title']; + $errors = $result['errors']; if ( $errors->get_error_code() ) { signup_another_blog($blogname, $blog_title, $errors); @@ -329,6 +370,21 @@ function validate_another_blog_signup() { 'public' => $public ); + // Handle the language setting for the new site. + if ( ! empty( $_POST['WPLANG'] ) ) { + + $languages = signup_get_available_languages(); + + if ( in_array( $_POST['WPLANG'], $languages ) ) { + $language = wp_unslash( sanitize_text_field( $_POST['WPLANG'] ) ); + + if ( $language ) { + $blog_meta_defaults['WPLANG'] = $language; + } + } + + } + /** * Filter the new site meta variables. * @@ -337,7 +393,8 @@ function validate_another_blog_signup() { * * @param array $blog_meta_defaults An array of default blog meta variables. */ - $meta = apply_filters( 'signup_create_blog_meta', $blog_meta_defaults ); + $meta_defaults = apply_filters( 'signup_create_blog_meta', $blog_meta_defaults ); + /** * Filter the new default site meta variables. * @@ -350,29 +407,59 @@ function validate_another_blog_signup() { * @type int $blog_public Whether search engines should be discouraged from indexing the site. 1 for true, 0 for false. * } */ - $meta = apply_filters( 'add_signup_meta', $meta ); + $meta = apply_filters( 'add_signup_meta', $meta_defaults ); - wpmu_create_blog( $domain, $path, $blog_title, $current_user->ID, $meta, $wpdb->siteid ); - confirm_another_blog_signup($domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta); + $blog_id = wpmu_create_blog( $domain, $path, $blog_title, $current_user->ID, $meta, $wpdb->siteid ); + + if ( is_wp_error( $blog_id ) ) { + return false; + } + + confirm_another_blog_signup( $domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta, $blog_id ); return true; } /** - * Confirm a new site signup + * Confirm a new site signup. * * @since MU - * - * @param string $domain The domain URL - * @param string $path The site root path - * @param string $user_name The username - * @param string $user_email The user's email address - * @param array $meta Any additional meta from the 'add_signup_meta' filter in validate_blog_signup() + * @since 4.4.0 Added the `$blog_id` parameter. + * + * @param string $domain The domain URL. + * @param string $path The site root path. + * @param string $blog_title The site title. + * @param string $user_name The username. + * @param string $user_email The user's email address. + * @param array $meta Any additional meta from the 'add_signup_meta' filter in validate_blog_signup(). + * @param int $blog_id The site ID. */ -function confirm_another_blog_signup( $domain, $path, $blog_title, $user_name, $user_email = '', $meta = array() ) { +function confirm_another_blog_signup( $domain, $path, $blog_title, $user_name, $user_email = '', $meta = array(), $blog_id = 0 ) { + + if ( $blog_id ) { + switch_to_blog( $blog_id ); + $home_url = home_url( '/' ); + $login_url = wp_login_url(); + restore_current_blog(); + } else { + $home_url = 'http://' . $domain . $path; + $login_url = 'http://' . $domain . $path . 'wp-login.php'; + } + + $site = sprintf( '<a href="%1$s">%2$s</a>', + esc_url( $home_url ), + $blog_title + ); + ?> - <h2><?php printf( __( 'The site %s is yours.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2> + <h2><?php printf( __( 'The site %s is yours.' ), $site ); ?></h2> <p> - <?php printf( __( '<a href="http://%1$s">http://%2$s</a> is your new site. <a href="%3$s">Log in</a> as “%4$s” using your existing password.' ), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name ) ?> + <?php printf( + __( '<a href="%1$s">%2$s</a> is your new site. <a href="%3$s">Log in</a> as “%4$s” using your existing password.' ), + esc_url( $home_url ), + untrailingslashit( $domain . $path ), + esc_url( $login_url ), + $user_name + ); ?> </p> <?php /** @@ -388,8 +475,6 @@ function confirm_another_blog_signup( $domain, $path, $blog_title, $user_name, $ * * @since MU * - * @uses apply_filters() filter $filtered_results - * @uses show_user_form() to display the user registration form * @param string $user_name The username * @param string $user_email The user's email * @param array $errors @@ -429,7 +514,7 @@ function signup_user( $user_name = '', $user_email = '', $errors = '' ) { ?> <h2><?php printf( __( 'Get your own %s account in seconds' ), get_current_site()->site_name ) ?></h2> - <form id="setupform" method="post" action="wp-signup.php"> + <form id="setupform" method="post" action="wp-signup.php" novalidate="novalidate"> <input type="hidden" name="stage" value="validate-user-signup" /> <?php /** This action is documented in wp-signup.php */ @@ -461,14 +546,13 @@ function signup_user( $user_name = '', $user_email = '', $errors = '' ) { * * @since MU * - * @uses validate_user_form() to retrieve an array of the user data - * @uses wpmu_signup_user() to signup the new user - * @uses confirm_user_signup() to confirm the new user signup * @return bool True if new user signup was validated, false if error */ function validate_user_signup() { $result = validate_user_form(); - extract($result); + $user_name = $result['user_name']; + $user_email = $result['user_email']; + $errors = $result['errors']; if ( $errors->get_error_code() ) { signup_user($user_name, $user_email, $errors); @@ -497,9 +581,11 @@ function validate_user_signup() { */ function confirm_user_signup($user_name, $user_email) { ?> - <h2><?php printf( __( '%s is your new username' ), $user_name) ?></h2> + <h2><?php /* translators: %s: username */ + printf( __( '%s is your new username' ), $user_name) ?></h2> <p><?php _e( 'But, before you can start using your new username, <strong>you must activate it</strong>.' ) ?></p> - <p><?php printf( __( 'Check your inbox at <strong>%s</strong> and click the link given.' ), $user_email ); ?></p> + <p><?php /* translators: %s: email address */ + printf( __( 'Check your inbox at %s and click the link given.' ), '<strong>' . $user_email . '</strong>' ); ?></p> <p><?php _e( 'If you do not activate your username within two days, you will have to sign up again.' ); ?></p> <?php /** This action is documented in wp-signup.php */ @@ -511,8 +597,6 @@ function confirm_user_signup($user_name, $user_email) { * * @since MU * - * @uses apply_filters() to filter $filtered_results - * @uses show_blog_form() to display the blog signup form * @param string $user_name The username * @param string $user_email The user's email address * @param string $blogname The site name @@ -576,25 +660,26 @@ function signup_blog($user_name = '', $user_email = '', $blogname = '', $blog_ti * * @since MU * - * @uses wpmu_validate_user_signup() to retrieve an array of the new user data and errors - * @uses wpmu_validate_blog_signup() to retrieve an array of the new site data and errors - * @uses apply_filters() to make signup $meta filterable - * @uses signup_user() to signup a new user - * @uses signup_blog() to signup a the new user to a new site * @return bool True if the site signup was validated, false if error */ function validate_blog_signup() { // Re-validate user info. - $result = wpmu_validate_user_signup($_POST['user_name'], $_POST['user_email']); - extract($result); + $user_result = wpmu_validate_user_signup( $_POST['user_name'], $_POST['user_email'] ); + $user_name = $user_result['user_name']; + $user_email = $user_result['user_email']; + $user_errors = $user_result['errors']; - if ( $errors->get_error_code() ) { - signup_user($user_name, $user_email, $errors); + if ( $user_errors->get_error_code() ) { + signup_user( $user_name, $user_email, $user_errors ); return false; } - $result = wpmu_validate_blog_signup($_POST['blogname'], $_POST['blog_title']); - extract($result); + $result = wpmu_validate_blog_signup( $_POST['blogname'], $_POST['blog_title'] ); + $domain = $result['domain']; + $path = $result['path']; + $blogname = $result['blogname']; + $blog_title = $result['blog_title']; + $errors = $result['errors']; if ( $errors->get_error_code() ) { signup_blog($user_name, $user_email, $blogname, $blog_title, $errors); @@ -602,10 +687,25 @@ function validate_blog_signup() { } $public = (int) $_POST['blog_public']; - $meta = array ('lang_id' => 1, 'public' => $public); + $signup_meta = array ('lang_id' => 1, 'public' => $public); + + // Handle the language setting for the new site. + if ( ! empty( $_POST['WPLANG'] ) ) { + + $languages = signup_get_available_languages(); + + if ( in_array( $_POST['WPLANG'], $languages ) ) { + $language = wp_unslash( sanitize_text_field( $_POST['WPLANG'] ) ); + + if ( $language ) { + $signup_meta['WPLANG'] = $language; + } + } + + } /** This filter is documented in wp-signup.php */ - $meta = apply_filters( 'add_signup_meta', $meta ); + $meta = apply_filters( 'add_signup_meta', $signup_meta ); wpmu_signup_blog($domain, $path, $blog_title, $user_name, $user_email, $meta); confirm_blog_signup($domain, $path, $blog_title, $user_name, $user_email, $meta); @@ -626,10 +726,12 @@ function validate_blog_signup() { */ function confirm_blog_signup( $domain, $path, $blog_title, $user_name = '', $user_email = '', $meta = array() ) { ?> - <h2><?php printf( __( 'Congratulations! Your new site, %s, is almost ready.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2> + <h2><?php /* translators: %s: site address */ + printf( __( 'Congratulations! Your new site, %s, is almost ready.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2> <p><?php _e( 'But, before you can start using your site, <strong>you must activate it</strong>.' ) ?></p> - <p><?php printf( __( 'Check your inbox at <strong>%s</strong> and click the link given.' ), $user_email) ?></p> + <p><?php /* translators: %s: email address */ + printf( __( 'Check your inbox at %s and click the link given.' ), '<strong>' . $user_email . '</strong>' ); ?></p> <p><?php _e( 'If you do not activate your site within two days, you will have to sign up again.' ); ?></p> <h2><?php _e( 'Still waiting for your email?' ); ?></h2> <p> @@ -645,6 +747,39 @@ function confirm_blog_signup( $domain, $path, $blog_title, $user_name = '', $use do_action( 'signup_finished' ); } +/** + * Retrieves languages available during the site/user signup process. + * + * @since 4.4.0 + * + * @see get_available_languages() + * + * @return array List of available languages. + */ +function signup_get_available_languages() { + /** + * Filter the list of available languages for front-end site signups. + * + * Passing an empty array to this hook will disable output of the setting on the + * signup form, and the default language will be used when creating the site. + * + * Languages not already installed will be stripped. + * + * @since 4.4.0 + * + * @param array $available_languages Available languages. + */ + $languages = (array) apply_filters( 'signup_get_available_languages', get_available_languages() ); + + /* + * Strip any non-installed languages and return. + * + * Re-call get_available_languages() here in case a language pack was installed + * in a callback hooked to the 'signup_get_available_languages' filter before this point. + */ + return array_intersect_assoc( $languages, get_available_languages() ); +} + // Main $active_signup = get_site_option( 'registration', 'none' ); /** @@ -672,7 +807,7 @@ $current_user = wp_get_current_user(); if ( $active_signup == 'none' ) { _e( 'Registration has been disabled.' ); } elseif ( $active_signup == 'blog' && !is_user_logged_in() ) { - $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode( network_site_url( 'wp-signup.php' ) ) ); + $login_url = wp_login_url( network_site_url( 'wp-signup.php' ) ); echo sprintf( __( 'You must first <a href="%s">log in</a>, and then you can create a new site.' ), $login_url ); } else { $stage = isset( $_POST['stage'] ) ? $_POST['stage'] : 'default'; @@ -703,9 +838,9 @@ if ( $active_signup == 'none' ) { do_action( 'preprocess_signup_form' ); if ( is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'blog' ) ) signup_another_blog($newblogname); - elseif ( is_user_logged_in() == false && ( $active_signup == 'all' || $active_signup == 'user' ) ) + elseif ( ! is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'user' ) ) signup_user( $newblogname, $user_email ); - elseif ( is_user_logged_in() == false && ( $active_signup == 'blog' ) ) + elseif ( ! is_user_logged_in() && ( $active_signup == 'blog' ) ) _e( 'Sorry, new registrations are not allowed at this time.' ); else _e( 'You are logged in already. No need to register again!' ); @@ -714,9 +849,15 @@ if ( $active_signup == 'none' ) { $newblog = get_blogaddress_by_name( $newblogname ); if ( $active_signup == 'blog' || $active_signup == 'all' ) - printf( '<p><em>' . __( 'The site you were looking for, <strong>%s</strong>, does not exist, but you can create it now!' ) . '</em></p>', $newblog ); + /* translators: %s: site address */ + printf( '<p><em>' . __( 'The site you were looking for, %s, does not exist, but you can create it now!' ) . '</em></p>', + '<strong>' . $newblog . '</strong>' + ); else - printf( '<p><em>' . __( 'The site you were looking for, <strong>%s</strong>, does not exist.' ) . '</em></p>', $newblog ); + /* translators: %s: site address */ + printf( '<p><em>' . __( 'The site you were looking for, %s, does not exist.' ) . '</em></p>', + '<strong>' . $newblog . '</strong>' + ); } break; } @@ -732,4 +873,4 @@ if ( $active_signup == 'none' ) { */ do_action( 'after_signup_form' ); ?> -<?php get_footer(); ?> +<?php get_footer( 'wp-signup' ); diff --git a/wp-trackback.php b/wp-trackback.php index a93bab7..3d21104 100644 --- a/wp-trackback.php +++ b/wp-trackback.php @@ -20,9 +20,9 @@ if (empty($wp)) { * * @since 0.71 * - * @param int|bool $error Whether there was an error. - * Default '0'. Accepts '0' or '1'. - * @param string $error_message Error message if an error occurred. + * @param mixed $error Whether there was an error. + * Default '0'. Accepts '0' or '1', true or false. + * @param string $error_message Error message if an error occurred. */ function trackback_response($error = 0, $error_message = '') { header('Content-Type: text/xml; charset=' . get_option('blog_charset') ); diff --git a/xmlrpc.php b/xmlrpc.php index 9c66382..b3cbc6d 100644 --- a/xmlrpc.php +++ b/xmlrpc.php @@ -26,7 +26,7 @@ if ( isset($HTTP_RAW_POST_DATA) ) $HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA); /** Include the bootstrap for setting up WordPress environment */ -include('./wp-load.php'); +include( dirname( __FILE__ ) . '/wp-load.php' ); if ( isset( $_GET['rsd'] ) ) { // http://cyber.law.harvard.edu/blogs/gems/tech/rsd.html header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true); @@ -35,7 +35,7 @@ header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true); <rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd"> <service> <engineName>WordPress</engineName> - <engineLink>http://wordpress.org/</engineLink> + <engineLink>https://wordpress.org/</engineLink> <homePageLink><?php bloginfo_rss('url') ?></homePageLink> <apis> <api name="WordPress" blogID="1" preferred="true" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" /> @@ -88,8 +88,8 @@ exit; /** * logIO() - Writes logging info to a file. * - * @deprecated 3.4.0 - * @deprecated Use error_log() + * @deprecated 3.4.0 Use error_log() + * @see error_log() * * @param string $io Whether input or output * @param string $msg Information describing logging reason.

- ' . __('URL') . ' - * + ' . __( 'URL' ) . ' * +
- ' . __('Title') . ' - * + ' . __( 'Title' ) . ' *
	' . __('Link text, e.g. “Ransom Demands (PDF)”') . '

- Version 3.9.1 + Version 4.5.2

First Things First

First Things First

Installation: Famous 5-minute install

Installation: Famous 5-minute install

Updating

Using the Automatic Updater

Updating

Using the Automatic Updater

Updating Manually

Updating Manually

Migrating from other systems

Migrating from other systems

System Requirements

System Requirements

System Recommendations

Recommendations

Online Resources

Online Resources

Final Notes

Final Notes

Share the Love

Share the Love

License

License

- - - - - - - -

+ + + +

cap->create_posts ) ) - echo ' ' . esc_html( $post_type_object->labels->add_new ) . ''; -?>

labels->edit_item; ?>

labels->edit_item; ?>

' . __( 'Cheatin’ uh?' ) . '

' . __( 'Cheatin’ uh?' ) . '

' . __( 'Cheatin’ uh?' ) . '

' . __( 'Cheatin’ uh?' ) . '

' . __( 'Cheatin’ uh?' ) . '

' . __( 'Cheatin’ uh?' ) . '

' . __('Search results for “%s”') . '', esc_html( wp_unslash($_REQUEST['s']) ) ); ?> -

' . __( 'Search results for “%s”' ) . '', esc_html( wp_unslash( $_REQUEST['s'] ) ) ); +} +?> +

labels->popular_items; ?>

labels->popular_items; ?>

labels->add_new_item; ?>

labels->add_new_item; ?>

' . __( 'Cheatin’ uh?' ) . '

labels->name ); if ( current_user_can( $post_type_object->cap->create_posts ) ) - echo ' ' . esc_html( $post_type_object->labels->add_new ) . ''; -if ( ! empty( $_REQUEST['s'] ) ) - printf( ' ' . __('Search results for “%s”') . '', get_search_query() ); -?>

- - - - - - - +

+ + +

' . __( 'Cheatin’ uh?' ) . '

' . __( 'Drafts' ) . "

' . __( 'Drafts' ) . "

- ' . get_comment_author_link() . '', $comment_post_link.' '.$comment_link, ' ' . __( '[Pending]' ) . '' ); ?> -

$type", $comment_post_link." ".$comment_link ); ?>

' . $args['title'] . '

' . $args['title'] . '

' . __( 'Comments' ) . '

' . __( 'Recent Comments' ) . '

' . __( 'View more comments' ) . '

- - labels->add_new_item ); - ?> - -

{$api->name}

-
Version 3.9.1 +
Version 4.5.2