- -

- - - - - - - -

- -

Version %1$s addressed some security issues and fixed %2$s bug.', - 'Version %1$s addressed some security issues and fixed %2$s bugs.', 2 ), '4.2.5', number_format_i18n( 2 ) ); ?> - the release notes.' ), 'http://codex.wordpress.org/Version_4.2.5' ); ?> -

Version %1$s addressed some security issues and fixed %2$s bug.', - 'Version %1$s addressed some security issues and fixed %2$s bugs.', 4 ), '4.2.4', number_format_i18n( 4 ) ); ?> - the release notes.' ), 'http://codex.wordpress.org/Version_4.2.4' ); ?> -

Version %1$s addressed some security issues and fixed %2$s bug.', - 'Version %1$s addressed some security issues and fixed %2$s bugs.', 20 ), '4.2.3', number_format_i18n( 20 ) ); ?> - the release notes.' ), 'http://codex.wordpress.org/Version_4.2.3' ); ?> -

Version %1$s addressed some security issues and fixed %2$s bug.', - 'Version %1$s addressed some security issues and fixed %2$s bugs.', 13 ), '4.2.2', number_format_i18n( 13 ) ); ?> - the release notes.' ), 'http://codex.wordpress.org/Version_4.2.2' ); ?> -

Version %1$s addressed a security issue.', - 'Version %1$s addressed some security issues.', 1 ), '4.2.1' ); ?> - the release notes.' ), 'http://codex.wordpress.org/Version_4.2.1' ); ?> -

- -

Tools menu, add Press This to your browser bookmark bar or your mobile device home screen. Once installed you can share your content with lightning speed. Sharing your favorite videos, images, and content has never been this fast or this easy.' ), admin_url( 'tools.php' ) ); ?>

- -

+$video_url = 'https://videopress.com/embed/T54Iy7Tw'; +$locale = str_replace( '_', '-', get_locale() ); +if ( 'en-AU' !== $locale ) { + list( $locale ) = explode( '-', $locale ); +} +if ( 'en' !== $locale ) { + $video_url = add_query_arg( 'defaultLangCode', $locale, $video_url ); +} + +$major_features = array( + array( + 'src' => array( + 'mp4' => '//s.w.org/images/core/4.3/formatting.mp4', + 'ogv' => '//s.w.org/images/core/4.3/formatting.ogv', + 'webm' => '//s.w.org/images/core/4.3/formatting.webm', + ), + 'heading' => __( 'Formatting Shortcuts' ), + /* Translators: 1: asterisks; 2: number sign; */ + 'description' => sprintf( __( 'Your writing flow just got faster with new formatting shortcuts in WordPress 4.3. Use asterisks to create lists and number signs to make a heading. No more breaking your flow; your text looks great with a %1$s and a %2$s.' ), '*', '#' ), + ), + array( + 'src' => '//s.w.org/images/core/4.3/menu-customizer.png', + 'heading' => __( 'Menus in the Customizer' ), + 'description' => __( 'Create your menu, update it, and assign it, all while live-previewing in the customizer. The streamlined customizer design provides a mobile-friendly and accessible interface. With every release, it becomes easier and faster to make your site just the way you want it.' ), + ), + array( + 'src' => '//s.w.org/images/core/4.3/better-passwords.png', + 'heading' => __( 'Better Passwords' ), + 'description' => __( 'Keep your site more secure with WordPress’ improved approach to passwords. Instead of receiving passwords via email, you’ll get a password reset link. When you add new users to your site or edit a user profile, WordPress will automatically generate a secure password.' ), + ), + array( + 'src' => '//s.w.org/images/core/4.3/site-icon-customizer.png', + 'heading' => __( 'Site Icons' ), + 'description' => __( 'Site icons represent your site in browser tabs, bookmark menus, and on the home screen of mobile devices. Add your unique site icon in the customizer; it will even stay in place when you switch themes. Make your whole site reflect your brand.' ), + ), +); +shuffle( $major_features ); + +$minor_features = array( + array( + 'src' => 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0MDAgNDAwIj48cGF0aCBmaWxsPSIjMDBhMGQyIiBkPSJNNTAgMjE1aDI0MHYzMEg1MHpNNTAgMjc1aDI0MHYzMEg1MHpNNTAgMTU1aDI0MHYzMEg1MHpNNTAgOTVoMjQwdjMwSDUwek0zMTAuMSA5NWwxOS45IDMwIDIwLjEtMzAiLz48L3N2Zz4=', + 'heading' => __( 'A smoother admin experience' ), + 'description' => __( 'Refinements to the list view across the admin make your WordPress more accessible and easier to work with on any device.' ), + ), + array( + 'src' => 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMCAyMCI+PHBhdGggZmlsbD0iIzAwYTBkMiIgZD0iTTUgMmgxMHEuODIgMCAxLjQxLjU5VDE3IDR2OHEwIC44Mi0uNTkgMS40MVQxNSAxNGgtMmwtNSA1di01SDVxLS44MiAwLTEuNDEtLjU5VDMgMTJWNHEwLS44Mi41OS0xLjQxVDUgMnptOC41IDguNUwxMSA4bDIuNS0yLjUtMS0xTDEwIDcgNy41IDQuNWwtMSAxTDkgOGwtMi41IDIuNSAxIDFMMTAgOWwyLjUgMi41eiIvPjwvc3ZnPg==', + 'heading' => __( 'Comments turned off on pages' ), + 'description' => __( 'All new pages that you create will have comments turned off. Keep discussions to your blog, right where they’re supposed to happen.' ), + ), + array( + 'src' => 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMiAzMiI+PHBhdGggZmlsbD0iIzAwYTBkMiIgZD0iTTI5LjMyOCA1LjcxMnEuMDQ4LS4xNDQuMDk2LS4zODR0LS4wNjQtLjgxNi0uNTI4LS45NzZxLS4zODQtLjM2OC0uODcyLS40NjR0LS43OTIgMGwtLjI4OC4wOHEtMS40NTYuNzItNS44OCAzLjczNnQtNi4zOTIgNS4xNzZxLS43MzYuODMyLTEuNDA4IDIuMzJ0LS44OCAzIC41NDQgMi4zOTJxLjgzMi43MzYgMi4zNDQuNTc2dDMuMDcyLS44MjQgMi4yNDgtMS4zNTJxMi4xNDQtMi4xNDQgNS4xNjgtNi42NTZ0My42MzItNS44MDh6TTIuMjQgMjguMjRxMS4wNTYtLjY4OCAxLjcxMi0xLjUyOHQuOTUyLTEuNjE2LjU0NC0xLjUyLjcyLTEuNDggMS4yNC0xLjI4cTEuMDg4LS44IDIuNTA0LS43MDR0Mi40MjQgMS4xNjhxLjgxNi44OC44MjQgMi42NHQtMS4wOCAyLjg5NnEtMS4yMTYgMS4xMi0yLjkwNCAxLjYyNHQtMy40MjQuNDI0LTMuNTEyLS42MjR6Ii8+PC9zdmc+', + 'heading' => __( 'Customize your site quickly' ), + 'description' => __( 'Wherever you are on the front-end, you can click the customize link in the toolbar to swiftly make changes to your site.' ), + ), +); + +$tech_features = array( + array( + 'heading' => __( 'Taxonomy Roadmap' ), + 'description' => __( 'Terms shared across multiple taxonomies are now split into separate terms.' ), + ), + array( + 'heading' => __( 'Template Hierarchy' ), + /* Translators: 1: singular.php; 2: single.php; 3:page.php */ + 'description' => sprintf( __( 'Added %1$s as a fallback for %2$s and %3$s' ), 'singular.php', 'single.php', 'page.php.' ), + ), + array( + 'heading' => 'WP_List_Table', + 'description' => __( 'List tables can and should designate a primary column.' ), + ), +); -

emoji.' ), '💙', '🐸', '🐒', '🍕', __( 'https://codex.wordpress.org/Emoji' ) ); - ?>

+?> +

your content, before it debuts on your site. ' ); ?>

Update Now and watch the magic happen.' ); ?>

+ + + +

+ + +

wp.a11y.speak()' ); - ?>

+ +

+ $feature['src']['mp4'], + 'ogv' => $feature['src']['ogv'], + 'webm' => $feature['src']['webm'], + 'loop' => true, + 'autoplay' => true, + 'width' => 500, + 'height' => 284 + ) ); + + // Image. + else: + ?> +

+ +

Plugin Developer Handbook.' ), 'https://developer.wordpress.org/plugins/taxonomy/working-with-split-terms-in-wp-4-2/' ); - ?>

- -

WP_Query', 'WP_Comment_Query', 'WP_User_Query' ); - ?>

+ +

+ + + + | + + +

- - | - - +

- -

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' ); diff --git a/wp-admin/admin.php b/wp-admin/admin.php index 22813cc7..d3e58d25 100644 --- a/wp-admin/admin.php +++ b/wp-admin/admin.php @@ -94,11 +94,21 @@ $time_format = get_option('time_format'); wp_enqueue_script( 'common' ); -// $pagenow is set in vars.php -// $wp_importers is sometimes set in wp-admin/includes/import.php -// -// The remaining variables are imported as globals elsewhere, -// declared as globals here + + + +/** + * $pagenow is set in vars.php + * $wp_importers is sometimes set in wp-admin/includes/import.php + * The remaining variables are imported as globals elsewhere, declared as globals here + * + * @global string $pagenow + * @global array $wp_importers + * @global string $hook_suffix + * @global string $plugin_page + * @global string $typenow + * @global string $taxnow + */ global $pagenow, $wp_importers, $hook_suffix, $plugin_page, $typenow, $taxnow; $page_hook = null; diff --git a/wp-admin/comment.php b/wp-admin/comment.php index c2487335..7131a0c7 100644 --- a/wp-admin/comment.php +++ b/wp-admin/comment.php @@ -12,6 +12,9 @@ require_once( dirname( __FILE__ ) . '/admin.php' ); $parent_file = 'edit-comments.php'; $submenu_file = 'edit-comments.php'; +/** + * @global string $action + */ global $action; wp_reset_vars( array('action') ); @@ -66,7 +69,7 @@ case 'editcomment' : $comment_id = absint( $_GET['c'] ); if ( !$comment = get_comment( $comment_id ) ) - comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' ' . __('Go back') . '.', 'javascript:history.go(-1)') ); + comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' ' . __('Go back') . '.', 'javascript:history.go(-1)') ); if ( !current_user_can( 'edit_comment', $comment_id ) ) comment_footer_die( __('You are not allowed to edit this comment.') ); @@ -114,13 +117,13 @@ case 'spam' : ?>

comment_approved != '0' ) { // if not unapproved - + comment_post_ID; @@ -249,7 +252,7 @@ case 'unapprovecomment' : $noredir = isset($_REQUEST['noredir']); if ( !$comment = get_comment($comment_id) ) - comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' ' . __('Go back') . '.', 'edit-comments.php') ); + comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' ' . __('Go back') . '.', '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.') ); diff --git a/wp-admin/credits.php b/wp-admin/credits.php index 4e160f4e..33ae7081 100644 --- a/wp-admin/credits.php +++ b/wp-admin/credits.php @@ -18,7 +18,7 @@ $title = __( 'Credits' ); * * @since 3.2.0 * - * @return array|bool A list of all of the contributors, or false on error. + * @return array|false A list of all of the contributors, or false on error. */ function wp_credits() { global $wp_version; @@ -55,7 +55,6 @@ function wp_credits() { * @param string &$display_name The contributor's display name, passed by reference. * @param string $username The contributor's username. * @param string $profiles URL to the contributor's WordPress.org profile page. - * @return string A contributor's display name, hyperlinked to a WordPress.org profile page. */ function _wp_credits_add_profile_link( &$display_name, $username, $profiles ) { $display_name = '' . esc_html( $display_name ) . ''; @@ -68,10 +67,9 @@ function _wp_credits_add_profile_link( &$display_name, $username, $profiles ) { * @since 3.2.0 * * @param string &$data External library data, passed by reference. - * @return string Link to the external library. */ function _wp_credits_build_object_link( &$data ) { - $data = '' . $data[0] . ''; + $data = '' . esc_html( $data[0] ) . ''; } list( $display_version ) = explode( '-', $wp_version ); @@ -82,7 +80,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

@@ -111,8 +109,6 @@ if ( ! $credits ) { echo '

' . __( 'WordPress is created by a worldwide team of passionate individuals.' ) . "

\n"; -$gravatar = is_ssl() ? 'https://secure.gravatar.com/avatar/' : 'http://0.gravatar.com/avatar/'; - foreach ( $credits['groups'] as $group_slug => $group_data ) { if ( $group_data['name'] ) { if ( 'Translators' == $group_data['name'] ) { @@ -124,7 +120,7 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) { $title = translate( $group_data['name'] ); } - echo '

' . $title . "

\n"; + echo '

' . esc_html( $title ) . "

\n"; } if ( ! empty( $group_data['shuffle'] ) ) @@ -144,11 +140,14 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) { $classes = 'wp-people-group ' . ( $compact ? 'compact' : '' ); echo '

' . "\n\t"; - echo ''; - $size = 'compact' == $group_data['type'] ? '30' : '60'; - echo '' . "\n\t"; - echo '' . $person_data[0] . "\n\t"; + echo '
' . "\n\t"; + echo ''; + $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 '' . "\n\t"; + echo '' . esc_html( $person_data[0] ) . "\n\t"; if ( ! $compact ) echo '' . translate( $person_data[3] ) . "\n"; echo "

@@ -260,6 +259,7 @@ class Custom_Background { + + @@ -357,7 +358,6 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) ) * @since 3.0.0 */ public function handle_upload() { - if ( empty($_FILES) ) return; @@ -434,6 +434,9 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) ) * * @since 3.4.0 * @deprecated 3.5.0 + * + * @param array $form_fields + * @return array $form_fields */ public function attachment_fields_to_edit( $form_fields ) { return $form_fields; @@ -443,6 +446,9 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) ) * * @since 3.4.0 * @deprecated 3.5.0 + * + * @param array $tabs + * @return array $tabs */ public function filter_upload_tabs( $tabs ) { return $tabs; diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php index a56c7602..e61feb78 100644 --- a/wp-admin/custom-header.php +++ b/wp-admin/custom-header.php @@ -228,6 +228,8 @@ class Custom_Image_Header { * Process the default headers * * @since 3.0.0 + * + * @global array $_wp_default_headers */ public function process_default_headers() { global $_wp_default_headers; @@ -267,7 +269,7 @@ class Custom_Image_Header { if ( 1 < count( $headers ) ) { echo '

'; echo ''; - echo __( 'Random: Show a different image on each page.' ); + _e( 'Random: Show a different image on each page.' ); echo ''; echo '

'; } @@ -277,12 +279,13 @@ class Custom_Image_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_desc : $header['alt_text']; echo '

'; echo ''; $width = ''; if ( !empty( $header['attachment_id'] ) ) $width = ' width="230"'; - echo ' ' . esc_attr( $header_desc ) .'

'; + echo ' ' . esc_attr( $header_alt_text ) .'

'; echo '

'; } echo '

'; @@ -315,7 +318,6 @@ class Custom_Image_Header { } } ?> - '; } + /** + * @access public + */ public function bulk_header() { $this->feedback('skin_upgrade_start'); } + /** + * @access public + */ public function bulk_footer() { $this->feedback('skin_upgrade_end'); } + /** + * + * @param string $title + */ public function before($title = '') { $this->in_loop = true; printf( '

' . $this->upgrader->strings['skin_before_update_header'] . '

', $title, $this->upgrader->update_current, $this->upgrader->update_count); @@ -289,6 +372,10 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin { $this->flush_output(); } + /** + * + * @param string $title + */ public function after($title = '') { echo '

' . __('Return to Plugins page') . '

' . __('Return to WordPress Updates') . '

' . __( 'Return to Plugins page' ) . '

' . __( 'Return to WordPress Updates page' ) . '

' . __('Return to Themes page') . '

' . __('Return to WordPress Updates') . '

' . __( 'Return to Themes page' ) . '

' . __( 'Return to WordPress Updates page' ) . '

%s %s

' . __('Activate Plugin & Run Importer') . '

' . __( 'Activate Plugin & Run Importer' ) . '

' . __('Activate Plugin') . '

' . __( 'Activate Plugin' ) . '

' . __('Network Activate') . '

' . __( 'Network Activate' ) . '

' . __('Return to Importers') . '

' . __( 'Return to Importers' ) . '

' . __('Return to Plugin Installer') . '

' . __( 'Return to Plugin Installer' ) . '

' . __('Return to Plugins page') . '

' . __( 'Return to Plugins page' ) . '

' . __('Preview') . '

' . __('Live Preview') . '

' . __('Activate') . '

' . __( 'Network Enable' ) . '

' . __('Return to Theme Installer') . '

' . __( 'Return to Theme Installer' ) . '

' . __('Return to Themes page') . '

' . __( 'Return to Themes page' ) . '

' . __('Customize') . '

' . __('Preview') . '

' . __('Live Preview') . '

' . __('Activate') . '

' . __('Return to Themes page') . '

' . __( 'Return to Themes page' ) . '

' . __( 'Updating translations for %1$s (%2$s)…' ) . '

'; parent::error( $error ); echo '

'; } + /** + * @access public + */ public function bulk_footer() { $this->decrement_update_count( 'translation' ); $update_actions = array(); - $update_actions['updates_page'] = '' . __( 'Return to WordPress Updates' ) . ''; + $update_actions['updates_page'] = '' . __( 'Return to WordPress Updates page' ) . ''; /** * Filter the list of action links available following a translations update. @@ -710,6 +856,13 @@ class Language_Pack_Upgrader_Skin extends WP_Upgrader_Skin { class Automatic_Upgrader_Skin extends WP_Upgrader_Skin { protected $messages = array(); + /** + * + * @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; @@ -722,6 +875,11 @@ class Automatic_Upgrader_Skin extends WP_Upgrader_Skin { return $result; } + /** + * @access public + * + * @return array + */ public function get_upgrade_messages() { return $this->messages; } @@ -765,19 +923,19 @@ class Automatic_Upgrader_Skin extends WP_Upgrader_Skin { $this->messages[] = $string; } + /** + * @access public + */ public function header() { ob_start(); } + /** + * @access public + */ public function footer() { - $output = ob_get_contents(); + $output = ob_get_clean(); if ( ! empty( $output ) ) $this->feedback( $output ); - ob_end_clean(); } - - public function bulk_header() {} - public function bulk_footer() {} - public function before() {} - public function after() {} } diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php index 5d2370d0..235df514 100644 --- a/wp-admin/includes/class-wp-upgrader.php +++ b/wp-admin/includes/class-wp-upgrader.php @@ -132,6 +132,7 @@ 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…'); @@ -142,6 +143,8 @@ class WP_Upgrader { * * @since 2.8.0 * + * @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. @@ -244,6 +247,8 @@ class WP_Upgrader { * * @since 2.8.0 * + * @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. @@ -288,6 +293,65 @@ class WP_Upgrader { return $working_dir; } + /** + * Clears the directory where this item is going to be installed into. + * + * @since 4.3.0 + * + * @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. * @@ -297,6 +361,9 @@ class WP_Upgrader { * * @since 2.8.0 * + * @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. * @@ -410,29 +477,25 @@ class WP_Upgrader { } 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, $args['hook_extra'] ); - if ( is_wp_error($removed) ) { + if ( is_wp_error( $removed ) ) { return $removed; - } elseif ( ! $removed ) { - return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']); } } 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. @@ -539,6 +602,25 @@ class WP_Upgrader { $options = wp_parse_args( $options, $defaults ); + /** + * 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(); } @@ -626,6 +708,8 @@ class WP_Upgrader { * * @since 2.8.0 * + * @global WP_Filesystem_Base $wp_filesystem Subclass + * * @param bool $enable True to enable maintenance mode, false to disable. */ public function maintenance_mode( $enable = false ) { @@ -957,6 +1041,8 @@ class Plugin_Upgrader extends WP_Upgrader { * * @since 3.3.0 * + * @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. */ @@ -1053,6 +1139,14 @@ class Plugin_Upgrader extends WP_Upgrader { * {@see Plugin_Upgrader::upgrade()} and {@see Plugin_Upgrader::bulk_upgrade()}. * * @since 2.8.0 + * + * @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; @@ -1156,6 +1250,11 @@ class Theme_Upgrader extends WP_Upgrader { * Hooked to the {@see 'upgrader_post_install'} filter by {@see Theme_Upgrader::install()}. * * @since 3.4.0 + * + * @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 @@ -1226,6 +1325,7 @@ class Theme_Upgrader extends WP_Upgrader { * @since 3.4.0 * * @param array $actions Preview actions. + * @return array */ public function hide_activate_preview_actions( $actions ) { unset($actions['activate'], $actions['preview']); @@ -1475,6 +1575,8 @@ class Theme_Upgrader extends WP_Upgrader { * * @since 3.3.0 * + * @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. */ @@ -1512,9 +1614,12 @@ class Theme_Upgrader extends WP_Upgrader { * {@see Theme_Upgrader::bulk_upgrade()}. * * @since 2.8.0 + * + * @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; @@ -1536,6 +1641,10 @@ class Theme_Upgrader extends WP_Upgrader { * and {@see Theme_Upgrader::bulk_upgrade()}. * * @since 2.8.0 + * + * @param bool|WP_Error $return + * @param array $theme + * @return bool|WP_Error */ public function current_after($return, $theme) { if ( is_wp_error($return) ) @@ -1566,6 +1675,14 @@ class Theme_Upgrader extends WP_Upgrader { * and {@see Theme_Upgrader::bulk_upgrade()}. * * @since 2.8.0 + * + * @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; @@ -1610,8 +1727,6 @@ 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. * @@ -1644,6 +1759,10 @@ class Language_Pack_Upgrader extends WP_Upgrader { * Hooked to the {@see 'upgrader_process_complete'} action by default. * * @since 3.7.0 + * + * @static + * + * @param false|WP_Upgrader $upgrader */ public static function async_upgrade( $upgrader = false ) { // Avoid recursion. @@ -1717,7 +1836,7 @@ class Language_Pack_Upgrader extends WP_Upgrader { * @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|WP_Error The result of the upgrade, or a {@see wP_Error} object instead. + * @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 ) { @@ -1738,6 +1857,8 @@ class Language_Pack_Upgrader extends WP_Upgrader { * * @since 3.7.0 * + * @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 @@ -1745,7 +1866,7 @@ class Language_Pack_Upgrader extends WP_Upgrader { * @type bool $clear_update_cache Whether to clear the update cache when done. * Default true. * } - * @return array|true|false|WP_Error Will return an array of results, or true if there are no updates, + * @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() ) { @@ -1779,7 +1900,7 @@ class Language_Pack_Upgrader extends WP_Upgrader { // 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_post_install' ); remove_all_filters( 'upgrader_source_selection' ); add_filter( 'upgrader_source_selection', array( $this, 'check_package' ), 10, 2 ); @@ -1862,6 +1983,11 @@ class Language_Pack_Upgrader extends WP_Upgrader { * {@see Language_Pack_Upgrader::bulk_upgrade()}. * * @since 3.7.0 + * + * @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; @@ -1893,7 +2019,7 @@ class Language_Pack_Upgrader extends WP_Upgrader { * * @since 3.7.0 * - * @param object The data for an update. + * @param object $update The data for an update. * @return string The name of the item being updated. */ public function get_name_for_update( $update ) { @@ -1948,6 +2074,9 @@ class Core_Upgrader extends WP_Upgrader { * * @since 2.8.0 * + * @global WP_Filesystem_Base $wp_filesystem Subclass + * @global callback $_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. @@ -2115,6 +2244,8 @@ class Core_Upgrader extends WP_Upgrader { * * @since 3.7.0 * + * @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. */ @@ -2221,6 +2352,9 @@ class Core_Upgrader extends WP_Upgrader { * * @since 3.7.0 * + * @global string $wp_version + * @global string $wp_local_package + * * @return bool True if the checksums match, otherwise false. */ public function check_files() { @@ -2466,6 +2600,8 @@ class WP_Automatic_Updater { * * @since 3.7.0 * + * @global wpdb $wpdb + * * @param string $type The type of update being checked: 'core', 'theme', * 'plugin', 'translation'. * @param object $item The update offer. @@ -2592,6 +2728,8 @@ class WP_Automatic_Updater { * * @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; @@ -2690,6 +2828,9 @@ class WP_Automatic_Updater { * Kicks off the background update process, looping through all pending updates. * * @since 3.7.0 + * + * @global wpdb $wpdb + * @global string $wp_version */ public function run() { global $wpdb, $wp_version; @@ -2825,7 +2966,9 @@ class WP_Automatic_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. * - * @param object $update_result The result of the core update. Includes the update offer and result. + * @global string $wp_version + * + * @param object|WP_Error $update_result The result of the core update. Includes the update offer and result. */ protected function after_core_update( $update_result ) { global $wp_version; @@ -2912,6 +3055,8 @@ class WP_Automatic_Updater { * * @since 3.7.0 * + * @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. * @param mixed $result Optional. The result for the core update. Can be WP_Error. diff --git a/wp-admin/includes/class-wp-users-list-table.php b/wp-admin/includes/class-wp-users-list-table.php index 07aab5b1..4035c58c 100644 --- a/wp-admin/includes/class-wp-users-list-table.php +++ b/wp-admin/includes/class-wp-users-list-table.php @@ -56,6 +56,8 @@ class WP_Users_List_Table extends WP_List_Table { * * @since 3.1.0 * @access public + * + * @return bool */ public function ajax_user_can() { if ( $this->is_site_users ) @@ -69,6 +71,9 @@ class WP_Users_List_Table extends WP_List_Table { * * @since 3.1.0 * @access public + * + * @global string $role + * @global string $usersearch */ public function prepare_items() { global $role, $usersearch; @@ -133,10 +138,14 @@ class WP_Users_List_Table extends WP_List_Table { * @since 3.1.0 * @access protected * + * @global string $role + * * @return array An array of HTML links, one for each view. */ protected function get_views() { - global $wp_roles, $role; + global $role; + + $wp_roles = wp_roles(); if ( $this->is_site_users ) { $url = 'site-users.php?id=' . $this->site_id; @@ -329,8 +338,6 @@ class WP_Users_List_Table extends WP_List_Table { * @since 4.2.0 The `$style` argument was deprecated. * @access public * - * @global WP_Roles $wp_roles User roles object. - * * @param object $user_object The current user object. * @param string $style Deprecated. Not used. * @param string $role Optional. Key for the $wp_roles array. Default empty. @@ -339,7 +346,7 @@ class WP_Users_List_Table extends WP_List_Table { * @return string Output for a single row. */ public function single_row( $user_object, $style = '', $role = '', $numposts = 0 ) { - global $wp_roles; + $wp_roles = wp_roles(); if ( ! ( $user_object instanceof WP_User ) ) { $user_object = get_userdata( (int) $user_object ); @@ -384,7 +391,6 @@ 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 ); // Set up the checkbox ( because the user is editable, otherwise it's empty ) $checkbox = '' @@ -398,63 +404,85 @@ class WP_Users_List_Table extends WP_List_Table { $r = ""; - 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 .= "$checkbox"; - break; - case 'username': - $r .= "$avatar $edit"; - break; - case 'name': - $r .= "$user_object->first_name $user_object->last_name"; - break; - case 'email': - $r .= "$email"; - break; - case 'role': - $r .= "$role_name"; - break; - case 'posts': - $attributes = 'class="posts column-posts num"' . $style; - $r .= ""; - if ( $numposts > 0 ) { - $r .= ""; - $r .= $numposts; - $r .= ''; - } else { - $r .= 0; - } - $r .= ""; - break; - default: - $r .= ""; - - /** - * 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 .= ""; + $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 .= "$checkbox"; + } else { + $r .= ""; + switch ( $column_name ) { + case 'username': + $r .= "$avatar $edit"; + break; + case 'name': + $r .= "$user_object->first_name $user_object->last_name"; + break; + case 'email': + $r .= "$email"; + break; + case 'role': + $r .= $role_name; + break; + case 'posts': + if ( $numposts > 0 ) { + $r .= ""; + $r .= ''; + $r .= ''; + $r .= ''; + } 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 .= ""; } } $r .= ''; 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'; + } } diff --git a/wp-admin/includes/comment.php b/wp-admin/includes/comment.php index 06447d41..36954b23 100644 --- a/wp-admin/includes/comment.php +++ b/wp-admin/includes/comment.php @@ -20,11 +20,11 @@ function comment_exists($comment_author, $comment_date) { global $wpdb; - $comment_author = stripslashes($comment_author); - $comment_date = stripslashes($comment_date); - 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 comment_date = %s", + stripslashes( $comment_author ), + stripslashes( $comment_date ) + ) ); } /** @@ -33,7 +33,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.' ) ); @@ -80,7 +79,7 @@ function edit_comment() { * @since 2.0.0 * * @param int $id ID of comment to retrieve. - * @return bool|object Comment if found. False on failure. + * @return object|false Comment if found. False on failure. */ function get_comment_to_edit( $id ) { if ( !$comment = get_comment($id) ) @@ -156,7 +155,8 @@ function get_pending_comments_num( $post_id ) { * Add avatars to relevant places in admin, or try to. * * @since 2.5.0 - * @uses $comment + * + * @global object $comment * * @param string $name User name. * @return string Avatar with Admin name. @@ -167,6 +167,9 @@ function floated_admin_avatar( $name ) { 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' ); diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php index b7dda132..49fcdd92 100644 --- a/wp-admin/includes/dashboard.php +++ b/wp-admin/includes/dashboard.php @@ -12,6 +12,10 @@ * 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; @@ -125,6 +129,16 @@ function wp_dashboard_setup() { do_action( 'do_meta_boxes', $screen->id, 'side', '' ); } +/** + * + * @global array $wp_dashboard_control_callbacks + * + * @param string $widget_id + * @param string $widget_name + * @param callback $callback + * @param callback $control_callback + * @param array $callback_args + */ 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; @@ -154,6 +168,11 @@ function wp_add_dashboard_widget( $widget_id, $widget_name, $callback, $control_ add_meta_box( $widget_id, $widget_name, $callback, $screen, $location, $priority, $callback_args ); } +/** + * + * @param type $dashboard + * @param type $meta_box + */ function _wp_dashboard_control_callback( $dashboard, $meta_box ) { echo '

"; } +/** + * @global object $comment + * + * @param object $comment + * @param bool $show_date + */ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { $GLOBALS['comment'] =& $comment; @@ -599,7 +631,7 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { comment_type || 'comment' == $comment->comment_type ) : ?> -

' . get_comment_author_link() . '', $comment_post_link.' '.$comment_link, ' ' . __( '[Pending]' ) . '' ); ?> @@ -619,7 +651,7 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { } $type = esc_html( $type ); ?> -
+

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

@@ -770,6 +802,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; @@ -845,7 +880,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; @@ -875,6 +911,8 @@ function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = ar * * @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 ) { @@ -1174,7 +1212,6 @@ function wp_dashboard_quota() {
search_term = wp_unslash( $search_term ); @@ -492,6 +492,20 @@ class WP_User_Search { $this->do_paging(); } + /** + * PHP4 Constructor - Sets up the object properties. + * + * @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 ); + } + /** * {@internal Missing Short Description}} * @@ -572,9 +586,9 @@ class WP_User_Search { 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( @@ -732,6 +746,8 @@ function wp_dashboard_quick_press_output() { * @deprecated 3.3.0 * @deprecated Use wp_editor() * @see wp_editor() + * + * @staticvar int $num / function wp_tiny_mce( $teeny = false, $settings = false ) { _deprecated_function( FUNCTION, '3.3', 'wp_editor()' ); diff --git a/wp-admin/includes/export.php b/wp-admin/includes/export.php index cd50e61b..98989324 100644 --- a/wp-admin/includes/export.php +++ b/wp-admin/includes/export.php @@ -20,6 +20,9 @@ define( 'WXR_VERSION', '1.2' ); * @since 2.1.0 * + * @global wpdb $wpdb + * @global WP_Post $post + * * @param array $args Filters defining what should be included in the export. / function export_wp( $args = array() ) { @@ -130,9 +133,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 ) . ']]>'; @@ -244,6 +247,8 @@ function export_wp( $args = array() ) { * @since 3.1.0 * + * @global wpdb $wpdb + * * @param array $post_ids Array of post IDs to filter the query by. Optional. */ function wxr_authors_list( array $post_ids = null ) { @@ -310,6 +315,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; @@ -375,6 +386,9 @@ function export_wp( $args = array() ) { ?> _screen ); $hidden = get_hidden_columns( $this->_screen ); @@ -107,6 +114,11 @@ class _WP_List_Table_Compat extends WP_List_Table { return array( $columns, $hidden, $sortable ); } + /** + * @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 75811962..fc8ce0fe 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 + * * @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}} * * @since 2.5.0 + * + * @global string $redir_tab / function the_media_upload_tabs() { global $redir_tab; @@ -216,7 +219,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() @@ -355,8 +357,7 @@ function media_handle_upload($file_id, $post_id, $post_data = array(), $override ), $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); @@ -419,8 +420,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); @@ -435,6 +435,8 @@ function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = * * @since 2.5.0 * + * @global int $body_id + * * @param string|callable $content_func / function wp_iframe($content_func / ... /) { @@ -529,6 +531,10 @@ document.body.className = document.body.className.replace('no-js', 'js'); * @since 2.5.0 * + * @global int $post_ID + * + * @staticvar int $instance + * * @param string $editor_id / function media_buttons($editor_id = 'content') { @@ -546,10 +552,9 @@ function media_buttons($editor_id = 'content') { $img = ' '; $id_attribute = $instance === 1 ? ' id="insert-media-button"' : ''; - printf( '%s', + printf( '', $id_attribute, esc_attr( $editor_id ), - esc_attr( 'Add Media' ), $img . ( 'Add Media' ) ); / @@ -569,7 +574,6 @@ function media_buttons($editor_id = 'content') { echo $legacy_filter; } } -add_action( 'media_buttons', 'media_buttons' ); / @@ -822,18 +826,20 @@ function wp_media_upload_handler() { } /** - * Download an image from the specified URL and attach it to a post. + * Downloads an image from the specified URL and attaches it to a post. * * @since 2.6.0 + * @since 4.2.0 Introduced the `$return` parameter. * - * @param string $file The URL of the image to download - * @param int $post_id The post ID the media is to be associated with - * @param string $desc Optional. Description of the image - * @param string $return Optional. What to return: an image tag (default) or only the src. - * @return string|WP_Error Populated HTML img tag on success + * @param string $file The URL of the image to download. + * @param int $post_id The post ID the media is to be associated with. + * @param string $desc Optional. Description of the image. + * @param string $return Optional. Accepts 'html' (image tag html) or 'src' (URL). Default 'html'. + * @return string|WP_Error Populated HTML img tag on success, WP_Error object otherwise. */ function media_sideload_image( $file, $post_id, $desc = null, $return = 'html' ) { if ( ! empty( $file ) ) { + // Set variables for storage, fix file filename for query strings. preg_match( '/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $file, $matches ); $file_array = array(); @@ -859,7 +865,7 @@ function media_sideload_image( $file, $post_id, $desc = null, $return = 'html' ) $src = wp_get_attachment_url( $id ); } - // Finally check to make sure the file has been saved, then return the HTML. + // Finally, check to make sure the file has been saved, then return the HTML. if ( ! empty( $src ) ) { if ( $return === 'src' ) { return $src; @@ -1050,6 +1056,14 @@ 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. $name = "attachments[{$edit_post->ID}][post_excerpt]"; @@ -1123,8 +1137,6 @@ 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}} * @@ -1150,8 +1162,6 @@ 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}} * @@ -1280,6 +1290,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 @@ -1314,6 +1326,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. @@ -1478,8 +1492,12 @@ function get_media_item( $attachment_id, $args = null ) { } if ( 'image' == $type && $calling_post_id && current_theme_supports( 'post-thumbnails', get_post_type( $calling_post_id ) ) && post_type_supports( get_post_type( $calling_post_id ), 'thumbnail' ) && get_post_thumbnail_id( $calling_post_id ) != $attachment_id ) { + + $calling_post = get_post( $calling_post_id ); + $calling_post_type_object = get_post_type_object( $calling_post->post_type ); + $ajax_nonce = wp_create_nonce( "set_post_thumbnail-$calling_post_id" ); - $thumbnail = "" . esc_html__( "Use as featured image" ) . ""; + $thumbnail = "" . esc_html( $calling_post_type_object->labels->use_featured_image ) . ""; } if ( ( $r['send'] || $thumbnail || $delete ) && !isset( $form_fields['buttons'] ) ) { @@ -1559,6 +1577,13 @@ function get_media_item( $attachment_id, $args = null ) { return $item; } +/** + * @since 3.5.0 + * + * @param int $attachment_id + * @param array $args + * @return array + / function get_compat_media_markup( $attachment_id, $args = null ) { $post = get_post( $attachment_id ); @@ -1715,7 +1740,8 @@ function get_compat_media_markup( $attachment_id, $args = null ) { / function media_upload_header() { $post_id = isset( $_REQUEST['post_id'] ) ? intval( $_REQUEST['post_id'] ) : 0; - echo '\n"; + + echo ''; if ( empty( $_GET['chromeless'] ) ) { echo '
'; the_media_upload_tabs(); @@ -1728,6 +1754,11 @@ function media_upload_header() { * * @since 2.5.0 * + * @global string $type + * @global string $tab + * @global bool $is_IE + * @global bool $is_opera + * * @param array $errors / function media_upload_form( $errors = null ) { @@ -2127,6 +2158,10 @@ echo apply_filters( 'type_url_form_media', wp_media_insert_url_form( $type ) ); * @since 2.5.0 * + * @global string $redir_tab + * @global string $type + * @global string $tab + * * @param array $errors / function media_upload_gallery_form($errors) { @@ -2272,6 +2307,13 @@ jQuery(function($){ * @since 2.5.0 * + * @global wpdb $wpdb + * @global WP_Query $wp_query + * @global WP_Locale $wp_locale + * @global string $type + * @global string $tab + * @global array $post_mime_types + * * @param array $errors / function media_upload_library_form($errors) { @@ -2556,6 +2598,8 @@ function wp_media_insert_url_form( $default_view = 'image' ) { Displays the multi-file uploader message. * * @since 2.6.0 + * + * @global int $post_ID */ function media_upload_flash_bypass() { $browser_uploader = admin_url( 'media-new.php?browser-uploader' ); @@ -2571,7 +2615,6 @@ function media_upload_flash_bypass() {
$data ) { if ( 0 == strcmp('wp-menu-separator', $data[4] ) ) { - if (false == $separator_found) { + if ( ! $separator_found ) { $separator_found = true; } else { unset($menu[$id]); @@ -194,13 +194,23 @@ foreach ( $menu as $id => $data ) { } unset($id, $data); +/** + * + * @param string $add + * @param string $class + * @return string + */ function add_cssclass($add, $class) { $class = empty($class) ? $add : $class .= ' ' . $add; return $class; } +/** + * + * @param array $menu + * @return array + */ function add_menu_classes($menu) { - $first = $lastorder = false; $i = 0; $mc = count($menu); @@ -279,6 +289,15 @@ if ( apply_filters( 'custom_menu_order', false ) ) { $menu_order = array_flip($menu_order); $default_menu_order = array_flip($default_menu_order); + /** + * + * @global array $menu_order + * @global array $default_menu_order + * + * @param array $a + * @param array $b + * @return int + / function sort_menu($a, $b) { global $menu_order, $default_menu_order; $a = $a[2]; diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php index 70057534..a7a895a1 100644 --- a/wp-admin/includes/meta-boxes.php +++ b/wp-admin/includes/meta-boxes.php @@ -7,6 +7,8 @@ * @since 2.7.0 * + * @global string $action + * * @param object $post / function post_submit_meta_box($post, $args = array() ) { @@ -204,7 +206,10 @@ if ( $can_publish ) : // Contributors don't get to choose the date of publish ?> -
+
+ + +

@@ -368,10 +373,13 @@ function post_format_meta_box( $post, $box ) { $post_formats[0][] = $post_format; ?>
- /> - -
/> -
+
+ + /> + +
/> + +

- link_id", 'delete-bookmark_' . $link->link_id); ?>" onclick="if ( confirm('link_name )); ?>') ) {return true;}return false;"> + link_id", 'delete-bookmark_' . $link->link_id); ?>" onclick="if ( confirm('link_name )); ?>') ) {return true;}return false;">
@@ -913,6 +923,8 @@ function link_target_meta_box($link) { ?> * @since 1.0.1 * + * @global object $link + * * @param string $class * @param string $value * @param mixed $deprecated Never used. diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php index 367611b0..3b6f0504 100644 --- a/wp-admin/includes/misc.php +++ b/wp-admin/includes/misc.php @@ -38,6 +38,8 @@ function got_mod_rewrite() { * * @since 3.7.0 * + * @global bool $is_nginx + * * @return bool Whether the server supports URL rewriting. / function got_url_rewrite() { @@ -153,6 +155,8 @@ function insert_with_markers( $filename, $marker, $insertion ) { blank out old rules. * * @since 1.5.0 + * + * @global WP_Rewrite $wp_rewrite / function save_mod_rewrite_rules() { if ( is_multisite() ) @@ -183,6 +187,8 @@ function save_mod_rewrite_rules() { * @since 2.8.0 * + * @global WP_Rewrite $wp_rewrite + * * @return bool True if web.config was updated successfully */ function iis7_save_url_rewrite_rules(){ @@ -244,10 +250,6 @@ function update_home_siteurl( $old_value, $value ) { flush_rewrite_rules(); } -add_action( 'update_option_home', 'update_home_siteurl', 10, 2 ); -add_action( 'update_option_siteurl', 'update_home_siteurl', 10, 2 ); -add_action( 'update_option_page_on_front', 'update_home_siteurl', 10, 2 ); - /** * Shorten an URL, to be used as link text * @@ -308,6 +310,12 @@ function show_message($message) { flush(); } +/** + * @since 2.8.0 + * + * @param string $content + * @return array + / function wp_doc_link_parse( $content ) { if ( !is_string( $content ) || empty( $content ) ) return array(); @@ -593,6 +601,8 @@ function saveDomDocument($doc, $filename) { Display the default admin color scheme picker (Used in user-edit.php) * * @since 3.0.0 + * + * @global array $_wp_admin_css_colors */ function admin_color_scheme_picker( $user_id ) { global $_wp_admin_css_colors; @@ -646,6 +656,10 @@ function admin_color_scheme_picker( $user_id ) { var _wpColorScheme = ' . wp_json_encode( array( 'icons' => $icon_colors ) ) . ";\n"; } -add_action( 'admin_head', 'wp_color_scheme_settings' ); +/** + * @since 3.3.0 + */ function _ipad_meta() { if ( wp_is_mobile() ) { ?> @@ -676,7 +692,6 @@ function _ipad_meta() { 1 ); - if ( ! $post_id = absint( $received['post_id'] ) ) + if ( ! $post_id = absint( $received['post_id'] ) ) { return $response; + } - if ( ! current_user_can( 'edit_post', $post_id ) || empty( $received['post_nonce'] ) ) + if ( ! current_user_can( 'edit_post', $post_id ) ) { return $response; - - if ( 2 === wp_verify_nonce( $received['post_nonce'], 'update-post_' . $post_id ) ) { - $response['wp-refresh-post-nonces'] = array( - 'replace' => array( - 'getpermalinknonce' => wp_create_nonce('getpermalink'), - 'samplepermalinknonce' => wp_create_nonce('samplepermalink'), - 'closedpostboxesnonce' => wp_create_nonce('closedpostboxes'), - '_ajax_linking_nonce' => wp_create_nonce( 'internal-linking' ), - '_wpnonce' => wp_create_nonce( 'update-post_' . $post_id ), - ), - 'heartbeatNonce' => wp_create_nonce( 'heartbeat-nonce' ), - ); } + + $response['wp-refresh-post-nonces'] = array( + 'replace' => array( + 'getpermalinknonce' => wp_create_nonce('getpermalink'), + 'samplepermalinknonce' => wp_create_nonce('samplepermalink'), + 'closedpostboxesnonce' => wp_create_nonce('closedpostboxes'), + '_ajax_linking_nonce' => wp_create_nonce( 'internal-linking' ), + '_wpnonce' => wp_create_nonce( 'update-post_' . $post_id ), + ), + 'heartbeatNonce' => wp_create_nonce( 'heartbeat-nonce' ), + ); } return $response; } -add_filter( 'heartbeat_received', 'wp_refresh_post_nonces', 10, 3 ); /** * Disable suspension of Heartbeat on the Add/Edit Post screens. * * @since 3.8.0 * + * @global string $pagenow + * * @param array $settings An array of Heartbeat settings. * @return array Filtered Heartbeat settings. */ @@ -799,7 +813,6 @@ function wp_heartbeat_set_suspension( $settings ) { return $settings; } -add_filter( 'heartbeat_settings', 'wp_heartbeat_set_suspension' ); /** * Autosave with heartbeat @@ -824,8 +837,6 @@ function heartbeat_autosave( $response, $data ) { return $response; } -// Run later as we have to set DOING_AUTOSAVE for back-compat -add_filter( 'heartbeat_received', 'heartbeat_autosave', 500, 2 ); /** * Disables autocomplete on the 'post' form (Add/Edit Post screens) for WebKit browsers, @@ -833,6 +844,9 @@ add_filter( 'heartbeat_received', 'heartbeat_autosave', 500, 2 ); * when the user navigates to it with the browser's Back button. See #28037 * * @since 4.0 + * + * @global bool $is_safari + * @global bool $is_chrome */ function post_form_autocomplete_off() { global $is_safari, $is_chrome; @@ -841,7 +855,6 @@ function post_form_autocomplete_off() { echo ' autocomplete="off"'; } } -add_action( 'post_edit_form_tag', 'post_form_autocomplete_off' ); /** * Remove single-use URL parameters and create canonical link based on new URL. @@ -886,4 +899,3 @@ function wp_admin_canonical_url() { exists() ) return false; + + // Global super-administrators are protected, and cannot be deleted. + $_super_admins = get_super_admins(); + if ( in_array( $user->user_login, $_super_admins, true ) ) { + return false; + } + /** * Fires before a user is deleted from the network. * @@ -253,6 +263,7 @@ function update_option_new_admin_email( $old_value, $value ) { ); update_option( 'adminhash', $new_admin_email ); + /* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. / $email_text = __( 'Howdy ###USERNAME###, You recently requested to have the administration email address on @@ -287,6 +298,7 @@ All at ###SITENAME### / $content = apply_filters( 'new_admin_email_content', $email_text, $new_admin_email ); + $current_user = wp_get_current_user(); $content = str_replace( '###USERNAME###', $current_user->user_login, $content ); $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'options.php?adminhash='.$hash ) ), $content ); $content = str_replace( '###EMAIL###', $value, $content ); @@ -295,8 +307,6 @@ All at ###SITENAME### wp_mail( $value, sprintf( __( '[%s] New Admin Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content ); } -add_action( 'update_option_new_admin_email', 'update_option_new_admin_email', 10, 2 ); -add_action( 'add_option_new_admin_email', 'update_option_new_admin_email', 10, 2 ); /** * Sends an email when an email address change is requested. @@ -334,6 +344,7 @@ function send_confirmation_on_profile_email() { ); update_option( $current_user->ID . '_new_email', $new_user_email ); + /* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */ $email_text = __( 'Howdy ###USERNAME###, You recently requested to have the email address on your account changed. @@ -377,7 +388,6 @@ All at ###SITENAME### $_POST['email'] = $current_user->user_email; } } -add_action( 'personal_options_update', 'send_confirmation_on_profile_email' ); /** * Adds an admin notice alerting the user to check for confirmation email @@ -389,7 +399,6 @@ function new_user_email_admin_notice() { if ( strpos( $_SERVER['PHP_SELF'], 'profile.php' ) && isset( $_GET['updated'] ) && $email = get_option( get_current_user_id() . '_new_email' ) ) echo "
" . sprintf( __( "Your email address has not been updated yet. Please check your inbox at %s for a confirmation email." ), $email['newemail'] ) . "
"; } -add_action( 'admin_notices', 'new_user_email_admin_notice' ); /** * Check whether a blog has used its allotted upload space. @@ -452,9 +461,9 @@ function display_space_usage() { * @return int Max size in bytes */ function fix_import_form_size( $size ) { - if ( upload_is_user_over_quota( false ) == true ) + if ( upload_is_user_over_quota( false ) ) { return 0; - + } $available = get_upload_space_available(); return min( $size, $available ); } @@ -484,7 +493,6 @@ function upload_space_setting( $id ) { " . sprintf( __( 'Thank you for Updating! Please visit the Upgrade Network page to update all your sites.' ), esc_url( network_admin_url( 'upgrade.php' ) ) ) . "

"; } -add_action( 'admin_notices', 'site_admin_notice' ); -add_action( 'network_admin_notices', 'site_admin_notice' ); /** * Avoids a collision between a site slug and a permalink slug. @@ -772,7 +779,6 @@ function avoid_blog_page_permalink_collision( $data, $postarr ) { } return $data; } -add_filter( 'wp_insert_post_data', 'avoid_blog_page_permalink_collision', 10, 2 ); /** * Handles the display of choosing a user's primary site. @@ -809,7 +815,7 @@ function choose_primary_blog() { } } elseif ( count( $all_blogs ) == 1 ) { $blog = reset( $all_blogs ); - echo $blog->domain; + echo esc_url( get_home_url( $blog->userblog_id ) ); if ( $primary_blog != $blog->userblog_id ) // Set the primary blog again if it's out of sync with blog list. update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id ); } else { @@ -838,6 +844,8 @@ function choose_primary_blog() { * * @since 3.0.0 * + * @global array $super_admins + * * @param int $user_id ID of the user to be granted Super Admin privileges. * @return bool True on success, false on failure. This can fail when the user is * already a super admin or when the `$super_admins` global is defined. @@ -883,6 +891,8 @@ function grant_super_admin( $user_id ) { * * @since 3.0.0 * + * @global array $super_admins + * * @param int $user_id ID of the user Super Admin privileges to be revoked from. * @return bool True on success, false on failure. This can fail when the user's email * is the network admin email or when the `$super_admins` global is defined. @@ -933,6 +943,8 @@ function revoke_super_admin( $user_id ) { * * @since 3.1.0 * + * @global wpdb $wpdb + * * @param int $site_id The network/site ID to check. * @return bool True if network can be edited, otherwise false. */ diff --git a/wp-admin/includes/nav-menu.php b/wp-admin/includes/nav-menu.php index 95752974..43a807c8 100644 --- a/wp-admin/includes/nav-menu.php +++ b/wp-admin/includes/nav-menu.php @@ -40,6 +40,8 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu { * @see Walker_Nav_Menu::start_el() * @since 3.0.0 * + * @global int $_wp_nav_menu_max_depth + * * @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. @@ -97,8 +99,8 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu { ?>

- type ) : ?> + type ) : ?>

@@ -145,13 +147,13 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {

@@ -195,7 +197,7 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {

- type && $original_title !== false ) : ?> + type && $original_title !== false ) : ?>

url ) . '">' . esc_html( $original_title ) . '' ); ?>

@@ -235,6 +237,10 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu { * @uses Walker_Nav_Menu */ class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu { + /** + * + * @param array $fields + */ public function __construct( $fields = false ) { if ( $fields ) { $this->db_fields = $fields; @@ -280,6 +286,8 @@ class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu { * * @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. @@ -451,18 +459,20 @@ function wp_nav_menu_setup() { add_filter( 'manage_nav-menus_columns', 'wp_nav_menu_manage_columns' ); // If first time editing, disable advanced items by default. - if( false === get_user_option( 'managenav-menuscolumnshidden' ) ) { + if ( false === get_user_option( 'managenav-menuscolumnshidden' ) ) { $user = wp_get_current_user(); update_user_option($user->ID, 'managenav-menuscolumnshidden', - array( 0 => 'link-target', 1 => 'css-classes', 2 => 'xfn', 3 => 'description', ), + array( 0 => 'link-target', 1 => 'css-classes', 2 => 'xfn', 3 => 'description', 4 => 'title-attribute', ), true); } } /** - * Limit the amount of meta boxes to just links, pages and cats for first time users. + * Limit the amount of meta boxes to pages, posts, links, and categories for first time users. * * @since 3.0.0 + * + * @global array $wp_meta_boxes **/ function wp_initial_nav_menu_meta_boxes() { global $wp_meta_boxes; @@ -470,7 +480,7 @@ function wp_initial_nav_menu_meta_boxes() { if ( get_user_option( 'metaboxhidden_nav-menus' ) !== false || ! is_array($wp_meta_boxes) ) return; - $initial_meta_boxes = array( 'nav-menu-theme-locations', 'add-page', 'add-custom-links', 'add-category' ); + $initial_meta_boxes = array( 'add-page', 'add-post', 'add-custom-links', 'add-category' ); $hidden_meta_boxes = array(); foreach ( array_keys($wp_meta_boxes['nav-menus']) as $context ) { @@ -549,7 +559,7 @@ function wp_nav_menu_taxonomy_meta_boxes() { * * @since 3.6.0 * - * @uses global $one_theme_location_no_menus to determine if no menus exist + * @global bool $one_theme_location_no_menus to determine if no menus exist * * @param int|string $nav_menu_selected_id (id, name or slug) of the currently-selected menu * @return string Disabled attribute if at least one menu exists, false if not @@ -567,6 +577,9 @@ function wp_nav_menu_disabled_check( $nav_menu_selected_id ) { * Displays a metabox for the custom links menu item. * * @since 3.0.0 + * + * @global int $_nav_menu_placeholder + * @global int|string $nav_menu_selected_id */ function wp_nav_menu_item_link_meta_box() { global $_nav_menu_placeholder, $nav_menu_selected_id; @@ -606,6 +619,9 @@ function wp_nav_menu_item_link_meta_box() { * * @since 3.0.0 * + * @global int $_nav_menu_placeholder + * @global int|string $nav_menu_selected_id + * * @param string $object Not used. * @param string $post_type The post type object. */ @@ -712,6 +728,21 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) { $recent_args = array_merge( $args, array( 'orderby' => 'post_date', 'order' => 'DESC', 'posts_per_page' => 15 ) ); $most_recent = $get_posts->query( $recent_args ); $args['walker'] = $walker; + + /** + * Filter the posts displayed in the 'Most Recent' tab of the current + * post type's menu items meta box. + * + * The dynamic portion of the hook name, `$post_type_name`, refers to the post type name. + * + * @since 4.3.0 + * + * @param array $most_recent An array of post objects being listed. + * @param array $args An array of WP_Query arguments. + * @param object $post_type The current post type object for this menu item meta box. + */ + $most_recent = apply_filters( "nav_menu_items_{$post_type_name}_recent", $most_recent, $args, $post_type ); + echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $most_recent), 0, (object) $args ); ?> @@ -849,6 +880,8 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) { * * @since 3.0.0 * + * @global int|string $nav_menu_selected_id + * * @param string $object Not used. * @param string $taxonomy The taxonomy object. */ @@ -1162,7 +1195,7 @@ function wp_get_nav_menu_to_edit( $menu_id = 0 ) { $result .= '

' . __( 'Add menu items from the column on the left.' ) . '

'; $result .= '

'; - if( empty($menu_items) ) + if ( empty($menu_items) ) return $result . ' '; /** @@ -1215,6 +1248,7 @@ function wp_nav_menu_manage_columns() { return array( '_title' => __('Show advanced menu properties'), 'cb' => '', + 'title-attribute' => __('Title Attribute'), 'link-target' => __('Link Target'), 'css-classes' => __('CSS Classes'), 'xfn' => __('Link Relationship (XFN)'), @@ -1228,6 +1262,7 @@ function wp_nav_menu_manage_columns() { * @access private * @since 3.0.0 * + * @global wpdb $wpdb */ function _wp_delete_orphaned_draft_menu_items() { global $wpdb; @@ -1239,7 +1274,6 @@ function _wp_delete_orphaned_draft_menu_items() { foreach( (array) $menu_items_to_delete as $menu_item_id ) wp_delete_post( $menu_item_id, true ); } -add_action('admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items'); /** * Saves nav menu items @@ -1280,10 +1314,11 @@ function wp_nav_menu_update_menu_items ( $nav_menu_selected_id, $nav_menu_select $menu_item_db_id = wp_update_nav_menu_item( $nav_menu_selected_id, ( $_POST['menu-item-db-id'][$_key] != $_key ? 0 : $_key ), $args ); - if ( is_wp_error( $menu_item_db_id ) ) + if ( is_wp_error( $menu_item_db_id ) ) { $messages[] = '

' . $menu_item_db_id->get_error_message() . '

'; - elseif ( isset( $menu_items[$menu_item_db_id] ) ) - unset( $menu_items[$menu_item_db_id] ); + } else { + unset( $menu_items[ $menu_item_db_id ] ); + } } } diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php index b8cf32f0..ab776e8d 100644 --- a/wp-admin/includes/plugin-install.php +++ b/wp-admin/includes/plugin-install.php @@ -130,6 +130,9 @@ 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' ) ); ?>

@@ -148,22 +151,28 @@ function install_dashboard() { } else { //Set up the tags in a way which can be interpreted by wp_generate_tag_cloud() $tags = array(); - foreach ( (array)$api_tags as $tag ) - $tags[ $tag['name'] ] = (object) array( - 'link' => 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_featured', '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'; @@ -209,7 +218,6 @@ function install_plugins_upload() {

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 @@ -401,6 +403,8 @@ function edit_post( $post_data = null ) { * * @since 2.7.0 * + * @global wpdb $wpdb + * * @param array $post_data Optional, the array of post data to process if not provided will use $_POST superglobal. * @return array */ @@ -606,8 +610,8 @@ function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) $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'; @@ -654,6 +658,8 @@ function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) * * @since 2.0.0 * + * @global wpdb $wpdb + * * @param string $title Post title * @param string $content Optional post content * @param string $date Optional post date @@ -695,6 +701,8 @@ function post_exists($title, $content = '', $date = '') { * * @since 2.1.0 * + * @global WP_User $current_user + * * @return int|WP_Error */ function wp_write_post() { @@ -834,6 +842,8 @@ function delete_meta( $mid ) { * * @since 1.2.0 * + * @global wpdb $wpdb + * * @return mixed */ function get_meta_keys() { @@ -865,6 +875,8 @@ function get_post_meta_by_id( $mid ) { * * @since 1.2.0 * + * @global wpdb $wpdb + * * @param int $postid * @return mixed */ @@ -1055,6 +1067,8 @@ function wp_edit_posts_query( $q = false ) { * * @since 2.5.0 * + * @global wpdb $wpdb + * * @param string $type * @return mixed */ @@ -1304,7 +1318,7 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) { } if ( isset( $view_post ) ) { - if( 'draft' == $post->post_status ) { + if ( 'draft' == $post->post_status ) { $preview_link = set_url_scheme( get_permalink( $post->ID ) ); /** This filter is documented in wp-admin/includes/meta-boxes.php */ $preview_link = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ), $post ); @@ -1338,6 +1352,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 @@ -1345,11 +1362,16 @@ 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_attr( $post_type_object->labels->set_featured_image ), + esc_url( $upload_iframe_src ), + esc_html( $post_type_object->labels->set_featured_image ) + ); if ( $thumbnail_id && get_post( $thumbnail_id ) ) { $old_content_width = $content_width; @@ -1360,8 +1382,12 @@ function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) { $thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'post-thumbnail' ); 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_attr( $post_type_object->labels->set_featured_image ), + esc_url( $upload_iframe_src ), + $thumbnail_html + ); + $content .= '

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

'; } $content_width = $old_content_width; } diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php index c522ab56..8c840548 100644 --- a/wp-admin/includes/schema.php +++ b/wp-admin/includes/schema.php @@ -8,14 +8,17 @@ * @subpackage Administration */ -// Declare these as global in case schema.php is included from a function. +/** + * Declare these as global in case schema.php is included from a function. + * + * @global wpdb $wpdb + * @global array $wp_queries + * @global string $charset_collate + */ global $wpdb, $wp_queries, $charset_collate; /** * The database character collate. - * @var string - * @global string - * @name $charset_collate */ $charset_collate = $wpdb->get_charset_collate(); @@ -24,6 +27,8 @@ $charset_collate = $wpdb->get_charset_collate(); * * @since 3.3.0 * + * @global wpdb $wpdb + * * @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. * @return string The SQL needed to create the requested tables. @@ -333,7 +338,8 @@ $wp_queries = wp_get_db_schema( 'all' ); * @since 1.5.0 * * @global wpdb $wpdb WordPress database abstraction object. - * @uses $wp_db_version + * @global int $wp_db_version + * @global int $wp_current_db_version */ function populate_options() { global $wpdb, $wp_db_version, $wp_current_db_version; @@ -490,6 +496,9 @@ function populate_options() { // 3.5 'link_manager_enabled' => 0, + + // 4.3.0 + 'finished_splitting_shared_terms' => 1, ); // 3.3 @@ -862,6 +871,11 @@ endif; * * @since 3.0.0 * + * @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. * @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. @@ -917,6 +931,7 @@ function populate_network( $network_id = 1, $domain = '', $email = '', $site_nam $site_admins = get_site_option( 'site_admins' ); } + /* 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: diff --git a/wp-admin/includes/screen.php b/wp-admin/includes/screen.php index 3572446d..fba5dc9d 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 */ @@ -60,6 +62,8 @@ function get_hidden_columns( $screen ) { * * @since 2.7.0 * + * @global array $wp_meta_boxes + * * @param WP_Screen $screen */ function meta_box_prefs( $screen ) { @@ -73,9 +77,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 +169,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() { @@ -179,7 +188,7 @@ function get_current_screen() { * @since 3.0.0 * * @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(); @@ -323,6 +332,11 @@ final class WP_Screen { /** * Stores old string-based help. + * + * @static + * @access private + * + * @var array */ private static $_old_compat_help = array(); @@ -339,8 +353,11 @@ final class WP_Screen { * The screen object registry. * * @since 3.3.0 - * @var array + * + * @static * @access private + * + * @var array */ private static $_registry = array(); @@ -368,12 +385,15 @@ final class WP_Screen { * @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. + * 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; } @@ -529,6 +549,10 @@ final class WP_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; @@ -560,9 +584,8 @@ final class WP_Screen { * @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. - * + * 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 ) ) @@ -578,6 +601,8 @@ final class WP_Screen { * * @since 3.3.0 * + * @static + * * @param WP_Screen $screen A screen object. * @param string $help Help text. */ @@ -787,6 +812,8 @@ final class WP_Screen { * This will trigger the deprecated filters for backwards compatibility. * * @since 3.3.0 + * + * @global string $screen_layout_columns */ public function render_screen_meta() { @@ -947,18 +974,24 @@ final class WP_Screen {

get_help_tabs() ) : ?>

- +

show_screen_options() ) : ?>

- +

postmeta - GROUP BY meta_key + WHERE meta_key NOT BETWEEN '_' AND '_z' HAVING meta_key NOT LIKE %s ORDER BY meta_key LIMIT %d"; @@ -737,6 +743,9 @@ function meta_form( $post = null ) { * * @since 0.71 * + * @global WP_Locale $wp_locale + * @global object $comment + * * @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 $tab_index The tabindex attribute to add. Default 0. @@ -772,23 +781,24 @@ 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 '

'; @@ -839,6 +849,8 @@ function page_template_dropdown( $default = '' ) { * * @since 1.5.0 * + * @global wpdb $wpdb + * * @param int $default Optional. The default page ID to be pre-selected. Default 0. * @param int $parent Optional. The parent page ID. Default 0. * @param int $level Optional. Page depth level. Default 0. @@ -934,6 +946,8 @@ function wp_import_upload_form( $action ) { * * @since 2.5.0 * + * @global array $wp_meta_boxes + * * @param string $id String for use in the 'id' attribute of tags. * @param string $title Title of the meta box. * @param callback $callback Function that fills the box with the desired content. @@ -1022,10 +1036,12 @@ function add_meta_box( $id, $title, $callback, $screen = null, $context = 'advan * * @since 2.5.0 * + * @global array $wp_meta_boxes + * * @staticvar bool $already_sorted - * @param string|WP_Screen $screen Screen identifier - * @param string $context box context - * @param mixed $object gets passed to the box callback function as first parameter + * @param string|WP_Screen $screen Screen identifier + * @param string $context box context + * @param mixed $object gets passed to the box callback function as first parameter * @return int number of meta_boxes */ function do_meta_boxes( $screen, $context, $object ) { @@ -1090,9 +1106,11 @@ function do_meta_boxes( $screen, $context, $object ) { * * @since 2.6.0 * - * @param string $id String for use in the 'id' attribute of tags. - * @param string|object $screen The screen on which to show the box (post, page, link). - * @param string $context The context within the page where the boxes should show ('normal', 'advanced'). + * @global array $wp_meta_boxes + * + * @param string $id String for use in the 'id' attribute of tags. + * @param string|object $screen The screen on which to show the box (post, page, link). + * @param string $context The context within the page where the boxes should show ('normal', 'advanced'). */ function remove_meta_box($id, $screen, $context) { global $wp_meta_boxes; @@ -1126,9 +1144,9 @@ function remove_meta_box($id, $screen, $context) { * * @uses global $wp_meta_boxes Used to retrieve registered meta boxes. * - * @param string|object $screen The screen identifier. - * @param string $context The meta box context. - * @param mixed $object gets passed to the section callback function as first parameter. + * @param string|object $screen The screen identifier. + * @param string $context The meta box context. + * @param mixed $object gets passed to the section callback function as first parameter. * @return int number of meta boxes as accordion sections. */ function do_accordion_sections( $screen, $context, $object ) { @@ -1204,10 +1222,10 @@ function do_accordion_sections( $screen, $context, $object ) { * * @global $wp_settings_sections Storage array of all settings sections added to admin pages * - * @param string $id Slug-name to identify the section. Used in the 'id' attribute of tags. - * @param string $title Formatted title of the section. Shown as the heading for the section. + * @param string $id Slug-name to identify the section. Used in the 'id' attribute of tags. + * @param string $title Formatted title of the section. Shown as the heading for the section. * @param string $callback Function that echos out any content at the top of the section (between heading and fields). - * @param string $page The slug-name of the settings page on which to show the section. Built-in pages include 'general', 'reading', 'writing', 'discussion', 'media', etc. Create your own using add_options_page(); + * @param string $page The slug-name of the settings page on which to show the section. Built-in pages include 'general', 'reading', 'writing', 'discussion', 'media', etc. Create your own using add_options_page(); */ function add_settings_section($id, $title, $callback, $page) { global $wp_settings_sections; @@ -1465,9 +1483,9 @@ function get_settings_errors( $setting = '', $sanitize = false ) { * * @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 ) { @@ -1576,6 +1594,10 @@ function _admin_search_query() { * * @since 2.7.0 * + * @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. */ @@ -1637,7 +1659,11 @@ if ( is_rtl() ) /** This filter is documented in wp-admin/admin-header.php */ $admin_body_classes = apply_filters( 'admin_body_class', '' ); ?> - class="wp-admin wp-core-ui no-js iframe "> + class="wp-admin wp-core-ui no-js iframe "> wp_content_dir() returned unslashed pre-2.8 + + /** + * Import $wp_version, $required_php_version, and $required_mysql_version from the new version + * $wp_filesystem->wp_content_dir() returned unslashed pre-2.8 + * + * @global string $wp_version + * @global string $required_php_version + * @global string $required_mysql_version + */ global $wp_version, $required_php_version, $required_mysql_version; $versions_file = trailingslashit( $wp_filesystem->wp_content_dir() ) . 'upgrade/version-current.php'; @@ -1101,8 +1121,10 @@ function update_core($from, $to) { * @since 3.7.0 Updated not to use a regular expression for the skip list * @see copy_dir() * - * @param string $from source directory - * @param string $to destination directory + * @global WP_Filesystem_Base $wp_filesystem + * + * @param string $from source directory + * @param string $to destination directory * @param array $skip_list a list of files/folders to skip copying * @return mixed WP_Error on failure, True on success. */ @@ -1156,6 +1178,11 @@ function _copy_dir($from, $to, $skip_list = array() ) { * * @since 3.3.0 * + * @global string $wp_version + * @global string $pagenow + * @global string $action + * + * @param string $new_version */ function _redirect_to_about_wordpress( $new_version ) { global $wp_version, $pagenow, $action; @@ -1190,12 +1217,14 @@ window.location = 'about.php?updated'; include(ABSPATH . 'wp-admin/admin-footer.php'); exit(); } -add_action( '_core_updated_successfully', '_redirect_to_about_wordpress' ); /** * Cleans up Genericons example files. * * @since 4.2.2 + * + * @global array $wp_theme_directories + * @global WP_Filesystem_Base $wp_filesystem */ function _upgrade_422_remove_genericons() { global $wp_theme_directories, $wp_filesystem; diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php index ba03453d..9bbb0c0f 100644 --- a/wp-admin/includes/update.php +++ b/wp-admin/includes/update.php @@ -9,7 +9,7 @@ /** * Selects the first update version from the update_core option. * - * @return bool|object The response from the API on success, false on failure. + * @return object|array|false The response from the API on success, false on failure. */ function get_preferred_from_update_core() { $updates = get_core_updates(); @@ -24,8 +24,8 @@ function get_preferred_from_update_core() { * Get available core updates. * * @param array $options Set $options['dismissed'] to true to show dismissed upgrades too, - * set $options['available'] to false to skip not-dismissed updates. - * @return bool|array Array of the update objects on success, false on failure. + * set $options['available'] to false to skip not-dismissed updates. + * @return array|false Array of the update objects on success, false on failure. */ function get_core_updates( $options = array() ) { $options = array_merge( array( 'available' => true, 'dismissed' => false ), $options ); @@ -67,7 +67,7 @@ function get_core_updates( $options = array() ) { * * @since 3.7.0 * - * @return bool|array False on failure, otherwise the core update offering. + * @return array|false False on failure, otherwise the core update offering. */ function find_core_auto_update() { $updates = get_site_transient( 'update_core' ); @@ -128,12 +128,23 @@ function get_core_checksums( $version, $locale ) { return $body['checksums']; } +/** + * + * @param object $update + * @return bool + */ function dismiss_core_update( $update ) { $dismissed = get_site_option( 'dismissed_update_core' ); $dismissed[ $update->current . '|' . $update->locale ] = true; return update_site_option( 'dismissed_update_core', $dismissed ); } +/** + * + * @param string $version + * @param string $locale + * @return bool + */ function undismiss_core_update( $version, $locale ) { $dismissed = get_site_option( 'dismissed_update_core' ); $key = $version . '|' . $locale; @@ -145,6 +156,12 @@ function undismiss_core_update( $version, $locale ) { return update_site_option( 'dismissed_update_core', $dismissed ); } +/** + * + * @param string $version + * @param string $locale + * @return object|false + */ function find_core_update( $version, $locale ) { $from_api = get_site_transient( 'update_core' ); @@ -159,6 +176,11 @@ function find_core_update( $version, $locale ) { return false; } +/** + * + * @param string $msg + * @return string + */ function core_update_footer( $msg = '' ) { if ( !current_user_can('update_core') ) return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) ); @@ -188,8 +210,12 @@ function core_update_footer( $msg = '' ) { return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) ); } } -add_filter( 'update_footer', 'core_update_footer' ); +/** + * + * @global string $pagenow + * @return false|void + */ function update_nag() { if ( is_multisite() && !current_user_can('update_core') ) return false; @@ -211,8 +237,6 @@ function update_nag() { } echo "

$msg

"; } -add_action( 'admin_notices', 'update_nag', 3 ); -add_action( 'network_admin_notices', 'update_nag', 3 ); // Called directly from dashboard function update_right_now_message() { @@ -235,6 +259,11 @@ function update_right_now_message() { echo "

$msg

"; } +/** + * @since 2.9.0 + * + * @return array + */ function get_plugin_updates() { $all_plugins = get_plugins(); $upgrade_plugins = array(); @@ -249,6 +278,9 @@ function get_plugin_updates() { return $upgrade_plugins; } +/** + * @since 2.9.0 + */ function wp_plugin_update_rows() { if ( !current_user_can('update_plugins' ) ) return; @@ -261,8 +293,13 @@ function wp_plugin_update_rows() { } } } -add_action( 'admin_init', 'wp_plugin_update_rows' ); +/** + * + * @param string $file + * @param array $plugin_data + * @return false|void + */ function wp_plugin_update_row( $file, $plugin_data ) { $current = get_site_transient( 'update_plugins' ); if ( !isset( $current->response[ $file ] ) ) @@ -278,7 +315,12 @@ function wp_plugin_update_row( $file, $plugin_data ) { $wp_list_table = _get_list_table('WP_Plugins_List_Table'); if ( is_network_admin() || !is_multisite() ) { - $active_class = ( is_plugin_active( $plugin_data['plugin'] ) ) ? ' active' : ''; + 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' ) ) { @@ -329,6 +371,10 @@ function wp_plugin_update_row( $file, $plugin_data ) { } } +/** + * + * @return array + */ function get_theme_updates() { $current = get_site_transient('update_themes'); @@ -344,6 +390,9 @@ function get_theme_updates() { return $update_themes; } +/** + * @since 3.1.0 + */ function wp_theme_update_rows() { if ( !current_user_can('update_themes' ) ) return; @@ -357,8 +406,13 @@ function wp_theme_update_rows() { } } } -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 ] ) ) @@ -400,6 +454,11 @@ function wp_theme_update_row( $theme_key, $theme ) { echo '

'; } +/** + * + * @global int $upgrading + * @return false|void + */ function maintenance_nag() { include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version global $upgrading; @@ -431,5 +490,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 cb2188b4..86d8cf91 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -118,6 +118,10 @@ if ( !function_exists('wp_install_defaults') ) : * * @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 ) { @@ -152,31 +156,31 @@ function wp_install_defaults( $user_id ) { $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!' ); + $first_post = __( 'Welcome to SITE_NAME. This is your first post. Edit or delete it, then start writing!' ); $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 @@ -190,19 +194,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: @@ -213,22 +217,22 @@ 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' => '', + '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. @@ -385,7 +389,9 @@ if ( !function_exists('wp_upgrade') ) : * * @since 2.1.0 * - * @return null If no update is necessary or site isn't completely installed, null. + * @global int $wp_current_db_version + * @global int $wp_db_version + * @global wpdb $wpdb */ function wp_upgrade() { global $wp_current_db_version, $wp_db_version, $wpdb; @@ -435,7 +441,8 @@ endif; * * @since 1.0.1 * - * @return null If no update is necessary, null. + * @global int $wp_current_db_version + * @global int $wp_db_version */ function upgrade_all() { global $wp_current_db_version, $wp_db_version; @@ -524,11 +531,8 @@ function upgrade_all() { if ( $wp_current_db_version < 29630 ) upgrade_400(); - if ( $wp_current_db_version < 31534 ) - upgrade_422(); - - if ( $wp_current_db_version < 31536 ) - upgrade_423(); + if ( $wp_current_db_version < 33055 ) + upgrade_430(); maybe_disable_link_manager(); @@ -542,6 +546,8 @@ function upgrade_all() { * Execute changes made in WordPress 1.0. * * @since 1.0.0 + * + * @global wpdb $wpdb */ function upgrade_100() { global $wpdb; @@ -598,6 +604,8 @@ function upgrade_100() { * Execute changes made in WordPress 1.0.1. * * @since 1.0.1 + * + * @global wpdb $wpdb */ function upgrade_101() { global $wpdb; @@ -616,6 +624,8 @@ function upgrade_101() { * Execute changes made in WordPress 1.2. * * @since 1.2.0 + * + * @global wpdb $wpdb */ function upgrade_110() { global $wpdb; @@ -676,6 +686,8 @@ function upgrade_110() { * Execute changes made in WordPress 1.5. * * @since 1.5.0 + * + * @global wpdb $wpdb */ function upgrade_130() { global $wpdb; @@ -760,6 +772,9 @@ function upgrade_130() { * Execute changes made in WordPress 2.0. * * @since 2.0.0 + * + * @global wpdb $wpdb + * @global int $wp_current_db_version */ function upgrade_160() { global $wpdb, $wp_current_db_version; @@ -843,6 +858,9 @@ function upgrade_160() { * Execute changes made in WordPress 2.1. * * @since 2.1.0 + * + * @global wpdb $wpdb + * @global int $wp_current_db_version */ function upgrade_210() { global $wpdb, $wp_current_db_version; @@ -887,6 +905,9 @@ function upgrade_210() { * Execute changes made in WordPress 2.3. * * @since 2.3.0 + * + * @global wpdb $wpdb + * @global int $wp_current_db_version */ function upgrade_230() { global $wp_current_db_version, $wpdb; @@ -1063,6 +1084,8 @@ function upgrade_230() { * Remove old options from the database. * * @since 2.3.0 + * + * @global wpdb $wpdb */ function upgrade_230_options_table() { global $wpdb; @@ -1077,6 +1100,8 @@ function upgrade_230_options_table() { * Remove old categories, link2cat, and post2cat database tables. * * @since 2.3.0 + * + * @global wpdb $wpdb */ function upgrade_230_old_tables() { global $wpdb; @@ -1089,6 +1114,8 @@ function upgrade_230_old_tables() { * Upgrade old slugs made in version 2.2. * * @since 2.2.0 + * + * @global wpdb $wpdb */ function upgrade_old_slugs() { // Upgrade people who were using the Redirect Old Slugs plugin. @@ -1100,6 +1127,8 @@ function upgrade_old_slugs() { * Execute changes made in WordPress 2.5.0. * * @since 2.5.0 + * + * @global int $wp_current_db_version */ function upgrade_250() { global $wp_current_db_version; @@ -1114,6 +1143,8 @@ function upgrade_250() { * Execute changes made in WordPress 2.5.2. * * @since 2.5.2 + * + * @global wpdb $wpdb */ function upgrade_252() { global $wpdb; @@ -1125,6 +1156,8 @@ function upgrade_252() { * Execute changes made in WordPress 2.6. * * @since 2.6.0 + * + * @global int $wp_current_db_version */ function upgrade_260() { global $wp_current_db_version; @@ -1137,6 +1170,9 @@ function upgrade_260() { * Execute changes made in WordPress 2.7. * * @since 2.7.0 + * + * @global wpdb $wpdb + * @global int $wp_current_db_version */ function upgrade_270() { global $wpdb, $wp_current_db_version; @@ -1153,6 +1189,9 @@ function upgrade_270() { * Execute changes made in WordPress 2.8. * * @since 2.8.0 + * + * @global int $wp_current_db_version + * @global wpdb $wpdb */ function upgrade_280() { global $wp_current_db_version, $wpdb; @@ -1180,6 +1219,8 @@ function upgrade_280() { * Execute changes made in WordPress 2.9. * * @since 2.9.0 + * + * @global int $wp_current_db_version */ function upgrade_290() { global $wp_current_db_version; @@ -1197,6 +1238,9 @@ function upgrade_290() { * Execute changes made in WordPress 3.0. * * @since 3.0.0 + * + * @global int $wp_current_db_version + * @global wpdb $wpdb */ function upgrade_300() { global $wp_current_db_version, $wpdb; @@ -1208,7 +1252,7 @@ function upgrade_300() { add_site_option( 'siteurl', '' ); // 3.0 screen options key name changes. - if ( is_main_site() && !defined('DO_NOT_UPGRADE_GLOBAL_TABLES') ) { + if ( wp_should_upgrade_global_tables() ) { $sql = "DELETE FROM $wpdb->usermeta WHERE meta_key LIKE %s OR meta_key LIKE %s @@ -1239,11 +1283,16 @@ function upgrade_300() { * Execute changes made in WordPress 3.3. * * @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')" ); } @@ -1308,6 +1357,9 @@ function upgrade_330() { * Execute changes made in WordPress 3.4. * * @since 3.4.0 + * + * @global int $wp_current_db_version + * @global wpdb $wpdb */ function upgrade_340() { global $wp_current_db_version, $wpdb; @@ -1324,7 +1376,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'" ); } @@ -1341,6 +1393,9 @@ function upgrade_340() { * Execute changes made in WordPress 3.5. * * @since 3.5.0 + * + * @global int $wp_current_db_version + * @global wpdb $wpdb */ function upgrade_350() { global $wp_current_db_version, $wpdb; @@ -1348,7 +1403,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, '-' ) ) @@ -1368,6 +1423,8 @@ function upgrade_350() { * Execute changes made in WordPress 3.7. * * @since 3.7.0 + * + * @global int $wp_current_db_version */ function upgrade_370() { global $wp_current_db_version; @@ -1380,6 +1437,8 @@ function upgrade_370() { * * @since 3.7.2 * @since 3.8.0 + * + * @global int $wp_current_db_version */ function upgrade_372() { global $wp_current_db_version; @@ -1391,6 +1450,8 @@ function upgrade_372() { * Execute changes made in WordPress 3.8.0. * * @since 3.8.0 + * + * @global int $wp_current_db_version */ function upgrade_380() { global $wp_current_db_version; @@ -1403,6 +1464,8 @@ function upgrade_380() { * Execute changes made in WordPress 4.0.0. * * @since 4.0.0 + * + * @global int $wp_current_db_version */ function upgrade_400() { global $wp_current_db_version; @@ -1421,80 +1484,39 @@ function upgrade_400() { * Execute changes made in WordPress 4.2.0. * * @since 4.2.0 - */ -function upgrade_420() { -} - -/** - * Execute changes made in WordPress 4.2.1. * - * @since 4.2.1 + * @global int $wp_current_db_version + * @global wpdb $wpdb */ -function upgrade_421() { -} +function upgrade_420() {} /** - * Execute changes made in WordPress 4.2.2. + * Executes changes made in WordPress 4.3.0. * - * @since 4.2.2 + * @since 4.3.0 + * + * @global int $wp_current_db_version Current version. + * @global wpdb $wpdb WordPress database abstraction object. */ -function upgrade_422() { +function upgrade_430() { global $wp_current_db_version, $wpdb; - if ( $wp_current_db_version < 31534 ) { - $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 ); - } + if ( $wp_current_db_version < 32364 ) { + upgrade_430_fix_comments(); } -} -/** - * Execute changes made in WordPress 4.2.0. - * - * @since 4.2.3 - */ -function upgrade_423() { - global $wp_current_db_version, $wpdb; + // 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 < 31536 && $wpdb->charset === 'utf8mb4' ) { + if ( $wp_current_db_version < 33055 && 'utf8mb4' === $wpdb->charset ) { if ( is_multisite() ) { $tables = $wpdb->tables( 'blog' ); } else { $tables = $wpdb->tables( 'all' ); - if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { + if ( ! wp_should_upgrade_global_tables() ) { $global_tables = $wpdb->tables( 'global' ); $tables = array_diff_assoc( $tables, $global_tables ); } @@ -1506,10 +1528,62 @@ function upgrade_423() { } } +/** + * Executes comments changes made in WordPress 4.3.0. + * + * @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 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; @@ -1605,7 +1679,7 @@ function upgrade_network() { // 4.2 if ( $wp_current_db_version < 31351 && $wpdb->charset === 'utf8mb4' ) { - if ( ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { + 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))" ); @@ -1613,15 +1687,20 @@ function upgrade_network() { $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.2.2 - if ( $wp_current_db_version < 31535 && 'utf8mb4' === $wpdb->charset ) { - if ( ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { + // 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 ) { @@ -1634,14 +1713,14 @@ function upgrade_network() { if ( $upgrade ) { $wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))" ); } - } - } - // 4.2.3 - if ( $wp_current_db_version < 31536 && $wpdb->charset === 'utf8mb4' ) { - if ( ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { $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 ); } @@ -1662,6 +1741,8 @@ function upgrade_network() { * * @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. @@ -1690,9 +1771,11 @@ function maybe_create_table($table_name, $create_ddl) { * * @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; @@ -1711,9 +1794,11 @@ function drop_index($table, $index) { * * @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; @@ -1727,10 +1812,12 @@ function add_clean_index($table, $index) { * * @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 True if already exists or on successful completion, false on error. + * @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; @@ -1757,6 +1844,8 @@ function maybe_add_column($table_name, $column_name, $create_ddl) { * * @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. */ @@ -1798,6 +1887,8 @@ function maybe_convert_table_to_utf8mb4( $table ) { * * @since 1.2.0 * + * @global wpdb $wpdb + * * @return stdClass List of options. */ function get_alloptions_110() { @@ -1820,6 +1911,8 @@ function get_alloptions_110() { * @since 1.5.1 * @access private * + * @global wpdb $wpdb + * * @param string $setting Option name. * @return mixed */ @@ -1879,6 +1972,8 @@ function deslash($content) { * * @since 1.5.0 * + * @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. @@ -1951,8 +2046,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; } @@ -2211,7 +2306,7 @@ function make_site_theme_from_oldschool($theme_name, $template) { // Don't copy anything. continue; - } + } } if (! @copy("$oldpath/$oldfile", "$site_dir/$newfile")) @@ -2264,7 +2359,7 @@ function make_site_theme_from_oldschool($theme_name, $template) { * * @param string $theme_name The name of the theme. * @param string $template The directory name of the theme. - * @return null|false + * @return false|void */ function make_site_theme_from_default($theme_name, $template) { $site_dir = WP_CONTENT_DIR . "/themes/$template"; @@ -2403,6 +2498,8 @@ function translate_level_to_role($level) { * Checks the version of the installed MySQL binary. * * @since 2.1.0 + * + * @global wpdb $wpdb */ function wp_check_mysql_version() { global $wpdb; @@ -2432,6 +2529,9 @@ function maybe_disable_automattic_widgets() { * 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 */ function maybe_disable_link_manager() { global $wp_current_db_version, $wpdb; @@ -2444,6 +2544,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 */ function pre_schema_upgrade() { global $wp_current_db_version, $wpdb; @@ -2461,7 +2564,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 ) { @@ -2479,7 +2582,7 @@ function pre_schema_upgrade() { // Upgrade versions prior to 4.2. if ( $wp_current_db_version < 31351 ) { - if ( ! is_multisite() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { + 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))" ); @@ -2495,6 +2598,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() { @@ -2514,3 +2619,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 49062fcb..132ea6d7 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; + $wp_roles = wp_roles(); $user = new stdClass; if ( $user_id ) { $update = true; @@ -176,7 +176,7 @@ 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 ) : '' ); + wp_new_user_notification( $user_id, 'both' ); } return $user_id; } @@ -198,9 +198,7 @@ function edit_user( $user_id = 0 ) { * @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 +234,8 @@ function get_user_to_edit( $user_id ) { * * @since 2.0.0 * + * @global wpdb $wpdb + * * @param int $user_id User ID. * @return array */ @@ -264,6 +264,8 @@ function get_users_drafts( $user_id ) { * * @since 2.0.0 * + * @global wpdb $wpdb + * * @param int $id User ID. * @param int $reassign Optional. Reassign posts and links to new User ID. * @return bool True when finished. @@ -384,9 +386,12 @@ 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; @@ -401,10 +406,11 @@ function default_password_nag_handler($errors = false) { } } -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) { // Short-circuit it. @@ -420,10 +426,10 @@ function default_password_nag_edit_user($user_ID, $old_data) { } } -add_action('admin_notices', 'default_password_nag'); - /** * @since 2.8.0 + * + * @global string $pagenow */ function default_password_nag() { global $pagenow; @@ -434,7 +440,7 @@ function default_password_nag() { 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' ); diff --git a/wp-admin/includes/widgets.php b/wp-admin/includes/widgets.php index e3b231bb..36cf6449 100644 --- a/wp-admin/includes/widgets.php +++ b/wp-admin/includes/widgets.php @@ -10,6 +10,9 @@ * Display list of the available widgets. * * @since 2.5.0 + * + * @global array $wp_registered_widgets + * @global array $wp_registered_widget_controls */ function wp_list_widgets() { global $wp_registered_widgets, $wp_registered_widget_controls; @@ -51,6 +54,8 @@ function wp_list_widgets() { * * @since 3.1.0 * @access private + * + * @return int */ function _sort_name_callback( $a, $b ) { return strnatcasecmp( $a['name'], $b['name'] ); @@ -99,6 +104,10 @@ function wp_list_widget_controls( $sidebar, $sidebar_name = '' ) { * * @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 */ diff --git a/wp-admin/index.php b/wp-admin/index.php index 40c7c7f2..91439289 100644 --- a/wp-admin/index.php +++ b/wp-admin/index.php @@ -93,7 +93,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' ); ?>

<?php _e( 'WordPress › Installation' ); ?> @@ -82,6 +85,8 @@ function display_header( $body_classes = '' ) { * Display installer setup form. * * @since 2.8.0 + * + * @param string|null $error */ function display_setup_form( $error = null ) { global $wpdb; @@ -124,16 +129,45 @@ function display_setup_form( $error = null ) { - + - -

+ + + - -

+ + + +

+ + +

+ + + + + + + + + + + + + + + + + + + @@ -144,10 +178,10 @@ function display_setup_form( $error = null ) { - /> + /> -

'submit' ) ); ?>

' . __( '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(); @@ -183,6 +223,16 @@ if ( ! is_string( $wpdb->base_prefix ) || '' === $wpdb->base_prefix ) { die( '

' . __( 'Configuration Error' ) . '

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

' ); } +// 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' ) . '

' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when installing WordPress.' ) . '

' ); +} + +/** + * @global string $wp_local_package + * @global WP_Locale $wp_locale + */ $language = ''; if ( ! empty( $_REQUEST['language'] ) ) { $language = preg_replace( '/[^a-zA-Z_]/', '', $_REQUEST['language'] ); @@ -303,5 +353,10 @@ if ( !wp_is_mobile() ) { + diff --git a/wp-admin/js/accordion.js b/wp-admin/js/accordion.js index 1769d27d..af628154 100644 --- a/wp-admin/js/accordion.js +++ b/wp-admin/js/accordion.js @@ -53,7 +53,10 @@ */ function accordionSwitch ( el ) { var section = el.closest( '.accordion-section' ), - siblings = section.closest( '.accordion-container' ).find( '.open' ), + 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' ); // This section has no content and cannot be expanded. @@ -61,15 +64,30 @@ 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( '.accordion-section-content' ).show().slideUp( 150 ); content.toggle( false ).slideToggle( 150 ); section.toggleClass( 'open' ); } + + // We have to wait for the animations to finish + setTimeout(function(){ + container.removeClass( 'opening' ); + }, 150); + + // 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 bcdf3aad..cb2ae153 100644 --- a/wp-admin/js/accordion.min.js +++ b/wp-admin/js/accordion.min.js @@ -1 +1 @@ -!function(a){function b(a){var b=a.closest(".accordion-section"),c=b.closest(".accordion-container").find(".open"),d=b.find(".accordion-section-content");b.hasClass("cannot-expand")||(b.hasClass("open")?(b.toggleClass("open"),d.toggle(!0).slideToggle(150)):(c.removeClass("open"),c.find(".accordion-section-content").show().slideUp(150),d.toggle(!1).slideToggle(150),b.toggleClass("open")))}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 +!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 index a1ac930f..fe8e74a0 100644 --- a/wp-admin/js/bookmarklet.js +++ b/wp-admin/js/bookmarklet.js @@ -66,16 +66,6 @@ form.appendChild( input ); } - if ( href.match( /\/\/(www|m)\.youtube\.com\/watch/ ) || - href.match( /\/\/vimeo\.com\/(.+\/)?([\d]+)$/ ) || - href.match( /\/\/(www\.)?dailymotion\.com\/video\/.+$/ ) || - href.match( /\/\/soundcloud\.com\/.+$/ ) || - href.match( /\/\/twitter\.com\/[^\/]+\/status\/[\d]+$/ ) || - href.match( /\/\/vine\.co\/v\/[^\/]+/ ) ) { - - add( '_embeds[]', href ); - } - metas = head.getElementsByTagName( 'meta' ) || []; for ( var m = 0; m < metas.length; m++ ) { diff --git a/wp-admin/js/bookmarklet.min.js b/wp-admin/js/bookmarklet.min.js index 4e9d0a7c..7f0a3d21 100644 --- a/wp-admin/js/bookmarklet.min.js +++ b/wp-admin/js/bookmarklet.min.js @@ -1 +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);(c.match(/\/\/(www|m)\.youtube\.com\/watch/)||c.match(/\/\/vimeo\.com\/(.+\/)?([\d]+)$/)||c.match(/\/\/(www\.)?dailymotion\.com\/video\/.+$/)||c.match(/\/\/soundcloud\.com\/.+$/)||c.match(/\/\/twitter\.com\/[^\/]+\/status\/[\d]+$/)||c.match(/\/\/vine\.co\/v\/[^\/]+/))&&e("_embeds[]",c),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 +(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/comment.js b/wp-admin/js/comment.js index b5506ea8..d194148f 100644 --- a/wp-admin/js/comment.js +++ b/wp-admin/js/comment.js @@ -1,50 +1,63 @@ -/* global postboxes:true, commentL10n:true */ +/* global postboxes, commentL10n */ jQuery(document).ready( function($) { postboxes.add_postbox_toggles('comment'); - var stamp = $('#timestamp').html(); - $('.edit-timestamp').click(function () { - if ($('#timestampdiv').is(':hidden')) { - $('#timestampdiv').slideDown('normal'); - $('.edit-timestamp').hide(); + var $timestampdiv = $('#timestampdiv'), + $timestamp = $( '#timestamp' ), + stamp = $timestamp.html(), + $timestampwrap = $timestampdiv.find( '.timestamp-wrap' ), + $edittimestamp = $timestampdiv.siblings( 'a.edit-timestamp' ); + + $edittimestamp.click( function( event ) { + if ( $timestampdiv.is( ':hidden' ) ) { + $timestampdiv.slideDown( 'fast', function() { + $( 'input, select', $timestampwrap ).first().focus(); + } ); + $(this).hide(); } - return false; + event.preventDefault(); }); - $('.cancel-timestamp').click(function() { - $('#timestampdiv').slideUp('normal'); + $timestampdiv.find('.cancel-timestamp').click( function( event ) { + // Move focus back to the Edit link. + $edittimestamp.show().focus(); + $timestampdiv.slideUp( 'fast' ); $('#mm').val($('#hidden_mm').val()); $('#jj').val($('#hidden_jj').val()); $('#aa').val($('#hidden_aa').val()); $('#hh').val($('#hidden_hh').val()); $('#mn').val($('#hidden_mn').val()); - $('#timestamp').html(stamp); - $('.edit-timestamp').show(); - return false; + $timestamp.html( stamp ); + event.preventDefault(); }); - $('.save-timestamp').click(function () { // crazyhorse - multiple ok cancels + $timestampdiv.find('.save-timestamp').click( function( event ) { // crazyhorse - multiple ok cancels var aa = $('#aa').val(), mm = $('#mm').val(), jj = $('#jj').val(), hh = $('#hh').val(), mn = $('#mn').val(), newD = new Date( aa, mm - 1, jj, hh, mn ); + event.preventDefault(); + if ( newD.getFullYear() != aa || (1 + newD.getMonth()) != mm || newD.getDate() != jj || newD.getMinutes() != mn ) { - $('.timestamp-wrap', '#timestampdiv').addClass('form-invalid'); - return false; + $timestampwrap.addClass( 'form-invalid' ); + return; } else { - $('.timestamp-wrap', '#timestampdiv').removeClass('form-invalid'); + $timestampwrap.removeClass( 'form-invalid' ); } - $('#timestampdiv').slideUp('normal'); - $('.edit-timestamp').show(); - $('#timestamp').html( + $timestamp.html( commentL10n.submittedOn + ' ' + - $( '#mm option[value="' + mm + '"]' ).text() + ' ' + - jj + ', ' + - aa + ' @ ' + - hh + ':' + - mn + ' ' + commentL10n.dateFormat + .replace( '%1$s', $( 'option[value="' + mm + '"]', '#mm' ).attr( 'data-text' ) ) + .replace( '%2$s', parseInt( jj, 10 ) ) + .replace( '%3$s', aa ) + .replace( '%4$s', ( '00' + hh ).slice( -2 ) ) + .replace( '%5$s', ( '00' + mn ).slice( -2 ) ) + + ' ' ); - return false; + + // Move focus back to the Edit link. + $edittimestamp.show().focus(); + $timestampdiv.slideUp( 'fast' ); }); }); diff --git a/wp-admin/js/comment.min.js b/wp-admin/js/comment.min.js index fbfa877a..08512640 100644 --- a/wp-admin/js/comment.min.js +++ b/wp-admin/js/comment.min.js @@ -1 +1 @@ -jQuery(document).ready(function(a){postboxes.add_postbox_toggles("comment");var b=a("#timestamp").html();a(".edit-timestamp").click(function(){return a("#timestampdiv").is(":hidden")&&(a("#timestampdiv").slideDown("normal"),a(".edit-timestamp").hide()),!1}),a(".cancel-timestamp").click(function(){return a("#timestampdiv").slideUp("normal"),a("#mm").val(a("#hidden_mm").val()),a("#jj").val(a("#hidden_jj").val()),a("#aa").val(a("#hidden_aa").val()),a("#hh").val(a("#hidden_hh").val()),a("#mn").val(a("#hidden_mn").val()),a("#timestamp").html(b),a(".edit-timestamp").show(),!1}),a(".save-timestamp").click(function(){var b=a("#aa").val(),c=a("#mm").val(),d=a("#jj").val(),e=a("#hh").val(),f=a("#mn").val(),g=new Date(b,c-1,d,e,f);return g.getFullYear()!=b||1+g.getMonth()!=c||g.getDate()!=d||g.getMinutes()!=f?(a(".timestamp-wrap","#timestampdiv").addClass("form-invalid"),!1):(a(".timestamp-wrap","#timestampdiv").removeClass("form-invalid"),a("#timestampdiv").slideUp("normal"),a(".edit-timestamp").show(),a("#timestamp").html(commentL10n.submittedOn+" "+a('#mm option[value="'+c+'"]').text()+" "+d+", "+b+" @ "+e+":"+f+" "),!1)})}); \ No newline at end of file +jQuery(document).ready(function(a){postboxes.add_postbox_toggles("comment");var b=a("#timestampdiv"),c=a("#timestamp"),d=c.html(),e=b.find(".timestamp-wrap"),f=b.siblings("a.edit-timestamp");f.click(function(c){b.is(":hidden")&&(b.slideDown("fast",function(){a("input, select",e).first().focus()}),a(this).hide()),c.preventDefault()}),b.find(".cancel-timestamp").click(function(e){f.show().focus(),b.slideUp("fast"),a("#mm").val(a("#hidden_mm").val()),a("#jj").val(a("#hidden_jj").val()),a("#aa").val(a("#hidden_aa").val()),a("#hh").val(a("#hidden_hh").val()),a("#mn").val(a("#hidden_mn").val()),c.html(d),e.preventDefault()}),b.find(".save-timestamp").click(function(d){var g=a("#aa").val(),h=a("#mm").val(),i=a("#jj").val(),j=a("#hh").val(),k=a("#mn").val(),l=new Date(g,h-1,i,j,k);return d.preventDefault(),l.getFullYear()!=g||1+l.getMonth()!=h||l.getDate()!=i||l.getMinutes()!=k?void e.addClass("form-invalid"):(e.removeClass("form-invalid"),c.html(commentL10n.submittedOn+" "+commentL10n.dateFormat.replace("%1$s",a('option[value="'+h+'"]',"#mm").attr("data-text")).replace("%2$s",parseInt(i,10)).replace("%3$s",g).replace("%4$s",("00"+j).slice(-2)).replace("%5$s",("00"+k).slice(-2))+" "),f.show().focus(),void b.slideUp("fast"))})}); \ No newline at end of file diff --git a/wp-admin/js/common.js b/wp-admin/js/common.js index 574ec094..5b5741c1 100644 --- a/wp-admin/js/common.js +++ b/wp-admin/js/common.js @@ -37,17 +37,19 @@ columns = { }, checked : function(column) { - $('.column-' + column).show(); + $('.column-' + column).removeClass( 'hidden' ); this.colSpanChange(+1); }, unchecked : function(column) { - $('.column-' + column).hide(); + $('.column-' + column).addClass( 'hidden' ); this.colSpanChange(-1); }, hidden : function() { - return $('.manage-column').filter(':hidden').map(function() { return this.id; }).get().join(','); + return $( '.manage-column[id]' ).filter( ':hidden' ).map(function() { + return this.id; + }).get().join( ',' ); }, useCheckboxesForHidden : function() { @@ -103,15 +105,14 @@ screenMeta = { init: function() { this.element = $('#screen-meta'); - this.toggles = $('.screen-meta-toggle a'); + this.toggles = $( '#screen-meta-links' ).find( '.show-settings' ); this.page = $('#wpcontent'); this.toggles.click( this.toggleEvent ); }, - toggleEvent: function( e ) { - var panel = $( this.href.replace(/.+#/, '#') ); - e.preventDefault(); + toggleEvent: function() { + var panel = $( '#' + $( this ).attr( 'aria-controls' ) ); if ( !panel.length ) return; @@ -122,22 +123,22 @@ screenMeta = { screenMeta.open( panel, $(this) ); }, - open: function( panel, link ) { + open: function( panel, button ) { - $('.screen-meta-toggle').not( link.parent() ).css('visibility', 'hidden'); + $( '#screen-meta-links' ).find( '.screen-meta-toggle' ).not( button.parent() ).css( 'visibility', 'hidden' ); panel.parent().show(); panel.slideDown( 'fast', function() { panel.focus(); - link.addClass('screen-meta-active').attr('aria-expanded', true); + button.addClass( 'screen-meta-active' ).attr( 'aria-expanded', true ); }); $( document ).trigger( 'screen:options:open' ); }, - close: function( panel, link ) { + close: function( panel, button ) { panel.slideUp( 'fast', function() { - link.removeClass('screen-meta-active').attr('aria-expanded', false); + button.removeClass( 'screen-meta-active' ).attr( 'aria-expanded', false ); $('.screen-meta-toggle').css('visibility', ''); panel.parent().hide(); }); @@ -369,7 +370,13 @@ $(document).ready( function() { } // Move .notice, .updated and .error alert boxes. Don't move boxes designed to be inline. - $firstHeading = $( 'div.wrap h2:first' ); + $firstHeading = $( '.wrap > h1:first' ); + + // Back compatibility: if there is no H1, apply to first H2. + if ( ! $firstHeading.length ) { + $firstHeading = $( '.wrap h2:first' ); + } + $firstHeading.nextAll( 'div.updated, div.error, div.notice' ).addClass( 'below-h2' ); $( 'div.updated, div.error, div.notice' ).not( '.below-h2, .inline' ).insertAfter( $firstHeading ); @@ -478,7 +485,12 @@ $(document).ready( function() { focusedRowActions.removeClass( 'visible' ); }, 30 ); } - }, 'td.post-title, td.title, td.comment, .tags td.column-name, .bookmarks td.column-name, td.blogname, .users-network td.column-blogs, td.username, .dashboard-comment-wrap' ); + }, '.has-row-actions' ); + + // Toggle list table rows on small screens + $( 'tbody' ).on( 'click', '.toggle-row', function() { + $( this ).closest( 'tr' ).toggleClass( 'is-expanded' ); + }); $('#default-password-nag-no').click( function() { setUserSetting('default_password_nag', 'hide'); @@ -740,6 +752,10 @@ $(document).ready( function() { // Toggle sidebar when toggle is clicked $( '#wp-admin-bar-menu-toggle' ).on( 'click.wp-responsive', function( event ) { event.preventDefault(); + + // close any open toolbar submenus + $adminbar.find( '.hover' ).removeClass( 'hover' ); + $wpwrap.toggleClass( 'wp-responsive-open' ); if ( $wpwrap.hasClass( 'wp-responsive-open' ) ) { $(this).find('a').attr( 'aria-expanded', 'true' ); diff --git a/wp-admin/js/common.min.js b/wp-admin/js/common.min.js index 25fb82bc..26025ea3 100644 --- a/wp-admin/js/common.min.js +++ b/wp-admin/js/common.min.js @@ -1 +1 @@ -var showNotice,adminMenu,columns,validateForm,screenMeta;!function(a,b){adminMenu={init:function(){},fold:function(){},restoreMenuState:function(){},toggle:function(){},favorites:function(){}},columns={init:function(){var b=this;a(".hide-column-tog","#adv-settings").click(function(){var c=a(this),d=c.val();c.prop("checked")?b.checked(d):b.unchecked(d),columns.saveManageColumnsState()})},saveManageColumnsState:function(){var b=this.hidden();a.post(ajaxurl,{action:"hidden-columns",hidden:b,screenoptionnonce:a("#screenoptionnonce").val(),page:pagenow})},checked:function(b){a(".column-"+b).show(),this.colSpanChange(1)},unchecked:function(b){a(".column-"+b).hide(),this.colSpanChange(-1)},hidden:function(){return a(".manage-column").filter(":hidden").map(function(){return this.id}).get().join(",")},useCheckboxesForHidden:function(){this.hidden=function(){return a(".hide-column-tog").not(":checked").map(function(){var a=this.id;return a.substring(a,a.length-5)}).get().join(",")}},colSpanChange:function(b){var c,d=a("table").find(".colspanchange");d.length&&(c=parseInt(d.attr("colspan"),10)+b,d.attr("colspan",c.toString()))}},a(document).ready(function(){columns.init()}),validateForm=function(b){return!a(b).find(".form-required").filter(function(){return""===a("input:visible",this).val()}).addClass("form-invalid").find("input:visible").change(function(){a(this).closest(".form-invalid").removeClass("form-invalid")}).size()},showNotice={warn:function(){var a=commonL10n.warnDelete||"";return confirm(a)?!0:!1},note:function(a){alert(a)}},screenMeta={element:null,toggles:null,page:null,init:function(){this.element=a("#screen-meta"),this.toggles=a(".screen-meta-toggle a"),this.page=a("#wpcontent"),this.toggles.click(this.toggleEvent)},toggleEvent:function(b){var c=a(this.href.replace(/.+#/,"#"));b.preventDefault(),c.length&&(c.is(":visible")?screenMeta.close(c,a(this)):screenMeta.open(c,a(this)))},open:function(b,c){a(".screen-meta-toggle").not(c.parent()).css("visibility","hidden"),b.parent().show(),b.slideDown("fast",function(){b.focus(),c.addClass("screen-meta-active").attr("aria-expanded",!0)}),a(document).trigger("screen:options:open")},close:function(b,c){b.slideUp("fast",function(){c.removeClass("screen-meta-active").attr("aria-expanded",!1),a(".screen-meta-toggle").css("visibility",""),b.parent().hide()}),a(document).trigger("screen:options:close")}},a(".contextual-help-tabs").delegate("a","click",function(b){var c,d=a(this);return b.preventDefault(),d.is(".active a")?!1:(a(".contextual-help-tabs .active").removeClass("active"),d.parent("li").addClass("active"),c=a(d.attr("href")),a(".help-tab-content").not(c).removeClass("active").hide(),void c.addClass("active").show())}),a(document).ready(function(){function c(a){var b,c,d,e,f,g,h,i=a.find(".wp-submenu");f=a.offset().top,g=x.scrollTop(),h=f-g-30,b=f+i.height()+1,c=A.height(),d=60+b-c,e=x.height()+g-50,b-d>e&&(d=b-e),d>h&&(d=h),d>1?i.css("margin-top","-"+d+"px"):i.css("margin-top","")}function d(a){var b=x.scrollTop(),c=!a||"scroll"!==a.type;if(!(t||v||B.data("wp-responsive"))){if(N.menu+N.adminbarN.wpwrap)return void f();if(M=!0,N.menu+N.adminbar>N.window){if(0>b)return void(J||(J=!0,K=!1,z.css({position:"fixed",top:"",bottom:""})));if(b+N.window>w.height()-1)return void(K||(K=!0,J=!1,z.css({position:"fixed",top:"",bottom:0})));b>I?J?(J=!1,L=z.offset().top-N.adminbar-(b-I),L+N.menu+N.adminbarb?K?(K=!1,L=z.offset().top-N.adminbar+(I-b),L+N.menu>b+N.window&&(L=b),z.css({position:"absolute",top:L,bottom:""})):!J&&z.offset().top>=b+N.adminbar&&(J=!0,z.css({position:"fixed",top:"",bottom:""})):c&&(J=K=!1,L=b+N.window-N.menu-N.adminbar-1,L>0?z.css({position:"absolute",top:L,bottom:""}):f())}I=b}}function e(){N={window:x.height(),wpwrap:A.height(),adminbar:H.height(),menu:z.height()}}function f(){!t&&M&&(J=K=M=!1,z.css({position:"",top:"",bottom:""}))}function g(){e(),B.data("wp-responsive")?(y.removeClass("sticky-menu"),f()):N.menu+N.adminbar>N.window?(d(),y.removeClass("sticky-menu")):(y.addClass("sticky-menu"),f())}var h,i,j,k,l,m,n,o,p,q=!1,r=a("input.current-page"),s=r.val(),t=/iPhone|iPad|iPod/.test(navigator.userAgent),u=-1!==navigator.userAgent.indexOf("Android"),v=a(document.documentElement).hasClass("ie8"),w=a(document),x=a(b),y=a(document.body),z=a("#adminmenuwrap"),A=a("#wpwrap"),B=a("#adminmenu"),C=a("#wp-responsive-overlay"),D=a("#wp-toolbar"),E=D.find('a[aria-haspopup="true"]'),F=a(".meta-box-sortables"),G=!1,H=a("#wpadminbar"),I=0,J=!1,K=!1,L=0,M=!1,N={window:x.height(),wpwrap:A.height(),adminbar:H.height(),menu:z.height()};B.on("click.wp-submenu-head",".wp-submenu-head",function(b){a(b.target).parent().siblings("a").get(0).click()}),a("#collapse-menu").on("click.collapse-menu",function(){var c,d,e=a(document.body);a("#adminmenu div.wp-submenu").css("margin-top",""),c=b.innerWidth?Math.max(b.innerWidth,document.documentElement.clientWidth):961,c&&960>c?e.hasClass("auto-fold")?(e.removeClass("auto-fold").removeClass("folded"),setUserSetting("unfold",1),setUserSetting("mfold","o"),d="open"):(e.addClass("auto-fold"),setUserSetting("unfold",0),d="folded"):e.hasClass("folded")?(e.removeClass("folded"),setUserSetting("mfold","o"),d="open"):(e.addClass("folded"),setUserSetting("mfold","f"),d="folded"),a(document).trigger("wp-collapse-menu",{state:d})}),("ontouchstart"in b||/IEMobile\/[1-9]/.test(navigator.userAgent))&&(m=t?"touchstart":"click",a(document.body).on(m+".wp-mobile-hover",function(b){B.data("wp-responsive")||a(b.target).closest("#adminmenu").length||B.find("li.opensub").removeClass("opensub")}),B.find("a.wp-has-submenu").on(m+".wp-mobile-hover",function(b){var d=a(this).parent();B.data("wp-responsive")||d.hasClass("opensub")||d.hasClass("wp-menu-open")&&!(d.width()<40)||(b.preventDefault(),c(d),B.find("li.opensub").removeClass("opensub"),d.addClass("opensub"))})),t||u||(B.find("li.wp-has-submenu").hoverIntent({over:function(){var b=a(this),d=b.find(".wp-submenu"),e=parseInt(d.css("top"),10);isNaN(e)||e>-5||B.data("wp-responsive")||(c(b),B.find("li.opensub").removeClass("opensub"),b.addClass("opensub"))},out:function(){B.data("wp-responsive")||a(this).removeClass("opensub").find(".wp-submenu").css("margin-top","")},timeout:200,sensitivity:7,interval:90}),B.on("focus.adminmenu",".wp-submenu a",function(b){B.data("wp-responsive")||a(b.target).closest("li.menu-top").addClass("opensub")}).on("blur.adminmenu",".wp-submenu a",function(b){B.data("wp-responsive")||a(b.target).closest("li.menu-top").removeClass("opensub")}).find("li.wp-has-submenu.wp-not-current-submenu").on("focusin.adminmenu",function(){c(a(this))})),p=a("div.wrap h2:first"),p.nextAll("div.updated, div.error, div.notice").addClass("below-h2"),a("div.updated, div.error, div.notice").not(".below-h2, .inline").insertAfter(p),a(".notice.is-dismissible").each(function(){var b=a(this),c=a(''),d=commonL10n.dismiss||"";c.find(".screen-reader-text").text(d),b.append(c),c.on("click.wp-dismiss-notice",function(c){c.preventDefault(),b.fadeTo(100,0,function(){a(this).slideUp(100,function(){a(this).remove()})})})}),screenMeta.init(),a("tbody").children().children(".check-column").find(":checkbox").click(function(b){if("undefined"==b.shiftKey)return!0;if(b.shiftKey){if(!q)return!0;h=a(q).closest("form").find(":checkbox"),i=h.index(q),j=h.index(this),k=a(this).prop("checked"),i>0&&j>0&&i!=j&&(l=j>i?h.slice(i,j):h.slice(j,i),l.prop("checked",function(){return a(this).closest("tr").is(":visible")?k:!1}))}q=this;var c=a(this).closest("tbody").find(":checkbox").filter(":visible").not(":checked");return a(this).closest("table").children("thead, tfoot").find(":checkbox").prop("checked",function(){return 0===c.length}),!0}),a("thead, tfoot").find(".check-column :checkbox").on("click.wp-toggle-checkboxes",function(b){var c=a(this),d=c.closest("table"),e=c.prop("checked"),f=b.shiftKey||c.data("wp-toggle");d.children("tbody").filter(":visible").children().children(".check-column").find(":checkbox").prop("checked",function(){return a(this).is(":hidden")?!1:f?!a(this).prop("checked"):e?!0:!1}),d.children("thead, tfoot").filter(":visible").children().children(".check-column").find(":checkbox").prop("checked",function(){return f?!1:e?!0:!1})}),a("#wpbody-content").on({focusin:function(){clearTimeout(n),o=a(this).find(".row-actions"),a(".row-actions").not(this).removeClass("visible"),o.addClass("visible")},focusout:function(){n=setTimeout(function(){o.removeClass("visible")},30)}},"td.post-title, td.title, td.comment, .tags td.column-name, .bookmarks td.column-name, td.blogname, .users-network td.column-blogs, td.username, .dashboard-comment-wrap"),a("#default-password-nag-no").click(function(){return setUserSetting("default_password_nag","hide"),a("div.default-password-nag").hide(),!1}),a("#newcontent").bind("keydown.wpevent_InsertTab",function(b){var c,d,e,f,g,h=b.target;if(27==b.keyCode)return b.preventDefault(),void a(h).data("tab-out",!0);if(!(9!=b.keyCode||b.ctrlKey||b.altKey||b.shiftKey)){if(a(h).data("tab-out"))return void a(h).data("tab-out",!1);c=h.selectionStart,d=h.selectionEnd,e=h.value,document.selection?(h.focus(),g=document.selection.createRange(),g.text=" "):c>=0&&(f=this.scrollTop,h.value=e.substring(0,c).concat(" ",e.substring(d)),h.selectionStart=h.selectionEnd=c+1,this.scrollTop=f),b.stopPropagation&&b.stopPropagation(),b.preventDefault&&b.preventDefault()}}),r.length&&r.closest("form").submit(function(){-1==a('select[name="action"]').val()&&-1==a('select[name="action2"]').val()&&r.val()==s&&r.val("1")}),a('.search-box input[type="search"], .search-box input[type="submit"]').mousedown(function(){a('select[name^="action"]').val("-1")}),a("#contextual-help-link, #show-settings-link").on("focus.scroll-into-view",function(a){a.target.scrollIntoView&&a.target.scrollIntoView(!1)}),function(){function b(){c.prop("disabled",""===d.map(function(){return a(this).val()}).get().join(""))}var c,d,e=a("form.wp-upload-form");e.length&&(c=e.find('input[type="submit"]'),d=e.find('input[type="file"]'),b(),d.on("change",b))}(),t||(x.on("scroll.pin-menu",d),w.on("tinymce-editor-init.pin-menu",function(a,b){b.on("wp-autoresize",e)})),b.wpResponsive={init:function(){var c=this;w.on("wp-responsive-activate.wp-responsive",function(){c.activate()}).on("wp-responsive-deactivate.wp-responsive",function(){c.deactivate()}),a("#wp-admin-bar-menu-toggle a").attr("aria-expanded","false"),a("#wp-admin-bar-menu-toggle").on("click.wp-responsive",function(b){b.preventDefault(),A.toggleClass("wp-responsive-open"),A.hasClass("wp-responsive-open")?(a(this).find("a").attr("aria-expanded","true"),a("#adminmenu a:first").focus()):a(this).find("a").attr("aria-expanded","false")}),B.on("click.wp-responsive","li.wp-has-submenu > a",function(b){B.data("wp-responsive")&&(a(this).parent("li").toggleClass("selected"),b.preventDefault())}),c.trigger(),w.on("wp-window-resized.wp-responsive",a.proxy(this.trigger,this)),x.on("load.wp-responsive",function(){var a=navigator.userAgent.indexOf("AppleWebKit/")>-1?x.width():b.innerWidth;782>=a&&c.disableSortables()})},activate:function(){g(),y.hasClass("auto-fold")||y.addClass("auto-fold"),B.data("wp-responsive",1),this.disableSortables()},deactivate:function(){g(),B.removeData("wp-responsive"),this.enableSortables()},trigger:function(){var a;b.innerWidth&&(a=Math.max(b.innerWidth,document.documentElement.clientWidth),782>=a?G||(w.trigger("wp-responsive-activate"),G=!0):G&&(w.trigger("wp-responsive-deactivate"),G=!1),480>=a?this.enableOverlay():this.disableOverlay())},enableOverlay:function(){0===C.length&&(C=a('

').insertAfter("#wpcontent").hide().on("click.wp-responsive",function(){D.find(".menupop.hover").removeClass("hover"),a(this).hide()})),E.on("click.wp-responsive",function(){C.show()})},disableOverlay:function(){E.off("click.wp-responsive"),C.hide()},disableSortables:function(){if(F.length)try{F.sortable("disable")}catch(a){}},enableSortables:function(){if(F.length)try{F.sortable("enable")}catch(a){}}},b.wpResponsive.init(),g(),w.on("wp-pin-menu wp-window-resized.pin-menu postboxes-columnchange.pin-menu postbox-toggled.pin-menu wp-collapse-menu.pin-menu wp-scroll-start.pin-menu",g)}),function(){function c(){a(document).trigger("wp-window-resized")}function d(){b.clearTimeout(e),e=b.setTimeout(c,200)}var e;a(b).on("resize.wp-fire-once",d)}(),function(){if("-ms-user-select"in document.documentElement.style&&navigator.userAgent.match(/IEMobile\/10\.0/)){var a=document.createElement("style");a.appendChild(document.createTextNode("@-ms-viewport{width:auto!important}")),document.getElementsByTagName("head")[0].appendChild(a)}}()}(jQuery,window); \ No newline at end of file +var showNotice,adminMenu,columns,validateForm,screenMeta;!function(a,b,c){adminMenu={init:function(){},fold:function(){},restoreMenuState:function(){},toggle:function(){},favorites:function(){}},columns={init:function(){var b=this;a(".hide-column-tog","#adv-settings").click(function(){var c=a(this),d=c.val();c.prop("checked")?b.checked(d):b.unchecked(d),columns.saveManageColumnsState()})},saveManageColumnsState:function(){var b=this.hidden();a.post(ajaxurl,{action:"hidden-columns",hidden:b,screenoptionnonce:a("#screenoptionnonce").val(),page:pagenow})},checked:function(b){a(".column-"+b).removeClass("hidden"),this.colSpanChange(1)},unchecked:function(b){a(".column-"+b).addClass("hidden"),this.colSpanChange(-1)},hidden:function(){return a(".manage-column[id]").filter(":hidden").map(function(){return this.id}).get().join(",")},useCheckboxesForHidden:function(){this.hidden=function(){return a(".hide-column-tog").not(":checked").map(function(){var a=this.id;return a.substring(a,a.length-5)}).get().join(",")}},colSpanChange:function(b){var c,d=a("table").find(".colspanchange");d.length&&(c=parseInt(d.attr("colspan"),10)+b,d.attr("colspan",c.toString()))}},a(document).ready(function(){columns.init()}),validateForm=function(b){return!a(b).find(".form-required").filter(function(){return""===a("input:visible",this).val()}).addClass("form-invalid").find("input:visible").change(function(){a(this).closest(".form-invalid").removeClass("form-invalid")}).size()},showNotice={warn:function(){var a=commonL10n.warnDelete||"";return confirm(a)?!0:!1},note:function(a){alert(a)}},screenMeta={element:null,toggles:null,page:null,init:function(){this.element=a("#screen-meta"),this.toggles=a("#screen-meta-links").find(".show-settings"),this.page=a("#wpcontent"),this.toggles.click(this.toggleEvent)},toggleEvent:function(){var b=a("#"+a(this).attr("aria-controls"));b.length&&(b.is(":visible")?screenMeta.close(b,a(this)):screenMeta.open(b,a(this)))},open:function(b,c){a("#screen-meta-links").find(".screen-meta-toggle").not(c.parent()).css("visibility","hidden"),b.parent().show(),b.slideDown("fast",function(){b.focus(),c.addClass("screen-meta-active").attr("aria-expanded",!0)}),a(document).trigger("screen:options:open")},close:function(b,c){b.slideUp("fast",function(){c.removeClass("screen-meta-active").attr("aria-expanded",!1),a(".screen-meta-toggle").css("visibility",""),b.parent().hide()}),a(document).trigger("screen:options:close")}},a(".contextual-help-tabs").delegate("a","click",function(b){var c,d=a(this);return b.preventDefault(),d.is(".active a")?!1:(a(".contextual-help-tabs .active").removeClass("active"),d.parent("li").addClass("active"),c=a(d.attr("href")),a(".help-tab-content").not(c).removeClass("active").hide(),void c.addClass("active").show())}),a(document).ready(function(){function c(a){var b,c,d,e,f,g,h,i=a.find(".wp-submenu");f=a.offset().top,g=x.scrollTop(),h=f-g-30,b=f+i.height()+1,c=A.height(),d=60+b-c,e=x.height()+g-50,b-d>e&&(d=b-e),d>h&&(d=h),d>1?i.css("margin-top","-"+d+"px"):i.css("margin-top","")}function d(a){var b=x.scrollTop(),c=!a||"scroll"!==a.type;if(!(t||v||B.data("wp-responsive"))){if(N.menu+N.adminbarN.wpwrap)return void f();if(M=!0,N.menu+N.adminbar>N.window){if(0>b)return void(J||(J=!0,K=!1,z.css({position:"fixed",top:"",bottom:""})));if(b+N.window>w.height()-1)return void(K||(K=!0,J=!1,z.css({position:"fixed",top:"",bottom:0})));b>I?J?(J=!1,L=z.offset().top-N.adminbar-(b-I),L+N.menu+N.adminbarb?K?(K=!1,L=z.offset().top-N.adminbar+(I-b),L+N.menu>b+N.window&&(L=b),z.css({position:"absolute",top:L,bottom:""})):!J&&z.offset().top>=b+N.adminbar&&(J=!0,z.css({position:"fixed",top:"",bottom:""})):c&&(J=K=!1,L=b+N.window-N.menu-N.adminbar-1,L>0?z.css({position:"absolute",top:L,bottom:""}):f())}I=b}}function e(){N={window:x.height(),wpwrap:A.height(),adminbar:H.height(),menu:z.height()}}function f(){!t&&M&&(J=K=M=!1,z.css({position:"",top:"",bottom:""}))}function g(){e(),B.data("wp-responsive")?(y.removeClass("sticky-menu"),f()):N.menu+N.adminbar>N.window?(d(),y.removeClass("sticky-menu")):(y.addClass("sticky-menu"),f())}var h,i,j,k,l,m,n,o,p,q=!1,r=a("input.current-page"),s=r.val(),t=/iPhone|iPad|iPod/.test(navigator.userAgent),u=-1!==navigator.userAgent.indexOf("Android"),v=a(document.documentElement).hasClass("ie8"),w=a(document),x=a(b),y=a(document.body),z=a("#adminmenuwrap"),A=a("#wpwrap"),B=a("#adminmenu"),C=a("#wp-responsive-overlay"),D=a("#wp-toolbar"),E=D.find('a[aria-haspopup="true"]'),F=a(".meta-box-sortables"),G=!1,H=a("#wpadminbar"),I=0,J=!1,K=!1,L=0,M=!1,N={window:x.height(),wpwrap:A.height(),adminbar:H.height(),menu:z.height()};B.on("click.wp-submenu-head",".wp-submenu-head",function(b){a(b.target).parent().siblings("a").get(0).click()}),a("#collapse-menu").on("click.collapse-menu",function(){var c,d,e=a(document.body);a("#adminmenu div.wp-submenu").css("margin-top",""),c=b.innerWidth?Math.max(b.innerWidth,document.documentElement.clientWidth):961,c&&960>c?e.hasClass("auto-fold")?(e.removeClass("auto-fold").removeClass("folded"),setUserSetting("unfold",1),setUserSetting("mfold","o"),d="open"):(e.addClass("auto-fold"),setUserSetting("unfold",0),d="folded"):e.hasClass("folded")?(e.removeClass("folded"),setUserSetting("mfold","o"),d="open"):(e.addClass("folded"),setUserSetting("mfold","f"),d="folded"),a(document).trigger("wp-collapse-menu",{state:d})}),("ontouchstart"in b||/IEMobile\/[1-9]/.test(navigator.userAgent))&&(m=t?"touchstart":"click",a(document.body).on(m+".wp-mobile-hover",function(b){B.data("wp-responsive")||a(b.target).closest("#adminmenu").length||B.find("li.opensub").removeClass("opensub")}),B.find("a.wp-has-submenu").on(m+".wp-mobile-hover",function(b){var d=a(this).parent();B.data("wp-responsive")||d.hasClass("opensub")||d.hasClass("wp-menu-open")&&!(d.width()<40)||(b.preventDefault(),c(d),B.find("li.opensub").removeClass("opensub"),d.addClass("opensub"))})),t||u||(B.find("li.wp-has-submenu").hoverIntent({over:function(){var b=a(this),d=b.find(".wp-submenu"),e=parseInt(d.css("top"),10);isNaN(e)||e>-5||B.data("wp-responsive")||(c(b),B.find("li.opensub").removeClass("opensub"),b.addClass("opensub"))},out:function(){B.data("wp-responsive")||a(this).removeClass("opensub").find(".wp-submenu").css("margin-top","")},timeout:200,sensitivity:7,interval:90}),B.on("focus.adminmenu",".wp-submenu a",function(b){B.data("wp-responsive")||a(b.target).closest("li.menu-top").addClass("opensub")}).on("blur.adminmenu",".wp-submenu a",function(b){B.data("wp-responsive")||a(b.target).closest("li.menu-top").removeClass("opensub")}).find("li.wp-has-submenu.wp-not-current-submenu").on("focusin.adminmenu",function(){c(a(this))})),p=a(".wrap > h1:first"),p.length||(p=a(".wrap h2:first")),p.nextAll("div.updated, div.error, div.notice").addClass("below-h2"),a("div.updated, div.error, div.notice").not(".below-h2, .inline").insertAfter(p),a(".notice.is-dismissible").each(function(){var b=a(this),c=a(''),d=commonL10n.dismiss||"";c.find(".screen-reader-text").text(d),b.append(c),c.on("click.wp-dismiss-notice",function(c){c.preventDefault(),b.fadeTo(100,0,function(){a(this).slideUp(100,function(){a(this).remove()})})})}),screenMeta.init(),a("tbody").children().children(".check-column").find(":checkbox").click(function(b){if("undefined"==b.shiftKey)return!0;if(b.shiftKey){if(!q)return!0;h=a(q).closest("form").find(":checkbox"),i=h.index(q),j=h.index(this),k=a(this).prop("checked"),i>0&&j>0&&i!=j&&(l=j>i?h.slice(i,j):h.slice(j,i),l.prop("checked",function(){return a(this).closest("tr").is(":visible")?k:!1}))}q=this;var c=a(this).closest("tbody").find(":checkbox").filter(":visible").not(":checked");return a(this).closest("table").children("thead, tfoot").find(":checkbox").prop("checked",function(){return 0===c.length}),!0}),a("thead, tfoot").find(".check-column :checkbox").on("click.wp-toggle-checkboxes",function(b){var c=a(this),d=c.closest("table"),e=c.prop("checked"),f=b.shiftKey||c.data("wp-toggle");d.children("tbody").filter(":visible").children().children(".check-column").find(":checkbox").prop("checked",function(){return a(this).is(":hidden")?!1:f?!a(this).prop("checked"):e?!0:!1}),d.children("thead, tfoot").filter(":visible").children().children(".check-column").find(":checkbox").prop("checked",function(){return f?!1:e?!0:!1})}),a("#wpbody-content").on({focusin:function(){clearTimeout(n),o=a(this).find(".row-actions"),a(".row-actions").not(this).removeClass("visible"),o.addClass("visible")},focusout:function(){n=setTimeout(function(){o.removeClass("visible")},30)}},".has-row-actions"),a("tbody").on("click",".toggle-row",function(){a(this).closest("tr").toggleClass("is-expanded")}),a("#default-password-nag-no").click(function(){return setUserSetting("default_password_nag","hide"),a("div.default-password-nag").hide(),!1}),a("#newcontent").bind("keydown.wpevent_InsertTab",function(b){var c,d,e,f,g,h=b.target;if(27==b.keyCode)return b.preventDefault(),void a(h).data("tab-out",!0);if(!(9!=b.keyCode||b.ctrlKey||b.altKey||b.shiftKey)){if(a(h).data("tab-out"))return void a(h).data("tab-out",!1);c=h.selectionStart,d=h.selectionEnd,e=h.value,document.selection?(h.focus(),g=document.selection.createRange(),g.text=" "):c>=0&&(f=this.scrollTop,h.value=e.substring(0,c).concat(" ",e.substring(d)),h.selectionStart=h.selectionEnd=c+1,this.scrollTop=f),b.stopPropagation&&b.stopPropagation(),b.preventDefault&&b.preventDefault()}}),r.length&&r.closest("form").submit(function(){-1==a('select[name="action"]').val()&&-1==a('select[name="action2"]').val()&&r.val()==s&&r.val("1")}),a('.search-box input[type="search"], .search-box input[type="submit"]').mousedown(function(){a('select[name^="action"]').val("-1")}),a("#contextual-help-link, #show-settings-link").on("focus.scroll-into-view",function(a){a.target.scrollIntoView&&a.target.scrollIntoView(!1)}),function(){function b(){c.prop("disabled",""===d.map(function(){return a(this).val()}).get().join(""))}var c,d,e=a("form.wp-upload-form");e.length&&(c=e.find('input[type="submit"]'),d=e.find('input[type="file"]'),b(),d.on("change",b))}(),t||(x.on("scroll.pin-menu",d),w.on("tinymce-editor-init.pin-menu",function(a,b){b.on("wp-autoresize",e)})),b.wpResponsive={init:function(){var c=this;w.on("wp-responsive-activate.wp-responsive",function(){c.activate()}).on("wp-responsive-deactivate.wp-responsive",function(){c.deactivate()}),a("#wp-admin-bar-menu-toggle a").attr("aria-expanded","false"),a("#wp-admin-bar-menu-toggle").on("click.wp-responsive",function(b){b.preventDefault(),H.find(".hover").removeClass("hover"),A.toggleClass("wp-responsive-open"),A.hasClass("wp-responsive-open")?(a(this).find("a").attr("aria-expanded","true"),a("#adminmenu a:first").focus()):a(this).find("a").attr("aria-expanded","false")}),B.on("click.wp-responsive","li.wp-has-submenu > a",function(b){B.data("wp-responsive")&&(a(this).parent("li").toggleClass("selected"),b.preventDefault())}),c.trigger(),w.on("wp-window-resized.wp-responsive",a.proxy(this.trigger,this)),x.on("load.wp-responsive",function(){var a=navigator.userAgent.indexOf("AppleWebKit/")>-1?x.width():b.innerWidth;782>=a&&c.disableSortables()})},activate:function(){g(),y.hasClass("auto-fold")||y.addClass("auto-fold"),B.data("wp-responsive",1),this.disableSortables()},deactivate:function(){g(),B.removeData("wp-responsive"),this.enableSortables()},trigger:function(){var a;b.innerWidth&&(a=Math.max(b.innerWidth,document.documentElement.clientWidth),782>=a?G||(w.trigger("wp-responsive-activate"),G=!0):G&&(w.trigger("wp-responsive-deactivate"),G=!1),480>=a?this.enableOverlay():this.disableOverlay())},enableOverlay:function(){0===C.length&&(C=a('

'; + } }); /** @@ -376,12 +437,33 @@ * @augments wp.customize.Class */ api.Section = Container.extend({ + containerType: 'section', + defaults: { + title: '', + description: '', + priority: 100, + type: 'default', + content: null, + active: true, + instanceNumber: null, + panel: null, + customizeAction: '' + }, /** * @since 4.1.0 * - * @param {String} id - * @param {Array} options + * @param {string} id - The ID for the section. + * @param {object} options - Object containing one property: params. + * @param {object} options.params - Object containing the following properties. + * @param {string} options.params.title - Title shown when section is collapsed and expanded. + * @param {string=} [options.params.description] - Description shown at the top of the section. + * @param {number=100} [options.params.priority] - The sort priority for the section. + * @param {string=default} [options.params.type] - The type of the section. See wp.customize.sectionConstructor. + * @param {string=} [options.params.content] - The markup to be used for the section container. If empty, a JS template is used. + * @param {boolean=true} [options.params.active] - Whether the section is active or not. + * @param {string} options.params.panel - The ID for the panel this section is associated with. + * @param {string=} [options.params.customizeAction] - Additional context information shown before the section title when expanded. */ initialize: function ( id, options ) { var section = this; @@ -446,7 +528,7 @@ var section = this; // Expand/Collapse accordion sections on click. - section.container.find( '.accordion-section-title' ).on( 'click keydown', function( event ) { + section.container.find( '.accordion-section-title, .customize-section-back' ).on( 'click keydown', function( event ) { if ( api.utils.isKeydownButNotEnterEvent( event ) ) { return; } @@ -500,17 +582,55 @@ */ onChangeExpanded: function ( expanded, args ) { var section = this, + container = section.container.closest( '.wp-full-overlay-sidebar-content' ), content = section.container.find( '.accordion-section-content' ), - expand; + overlay = section.container.closest( '.wp-full-overlay' ), + backBtn = section.container.find( '.customize-section-back' ), + sectionTitle = section.container.find( '.accordion-section-title' ).first(), + headerActionsHeight = $( '#customize-header-actions' ).height(), + resizeContentHeight, expand, position, scroll; - if ( expanded ) { + if ( expanded && ! section.container.hasClass( 'open' ) ) { if ( args.unchanged ) { expand = args.completeCallback; } else { - expand = function () { - content.stop().slideDown( args.duration, args.completeCallback ); + container.scrollTop( 0 ); + resizeContentHeight = function() { + var matchMedia, offset; + matchMedia = window.matchMedia || window.msMatchMedia; + offset = 90; // 45px for customize header actions + 45px for footer actions. + + // No footer on small screens. + if ( matchMedia && matchMedia( '(max-width: 640px)' ).matches ) { + offset = 45; + } + content.css( 'height', ( window.innerHeight - offset ) ); + }; + expand = function() { section.container.addClass( 'open' ); + overlay.addClass( 'section-open' ); + position = content.offset().top; + scroll = container.scrollTop(); + content.css( 'margin-top', ( headerActionsHeight - position - scroll ) ); + resizeContentHeight(); + sectionTitle.attr( 'tabindex', '-1' ); + backBtn.attr( 'tabindex', '0' ); + backBtn.focus(); + if ( args.completeCallback ) { + args.completeCallback(); + } + + // Fix the height after browser resize. + $( window ).on( 'resize.customizer-section', _.debounce( resizeContentHeight, 100 ) ); + + // Fix the top margin after reflow. + api.bind( 'pane-contents-reflowed', _.debounce( function() { + var offset = ( content.offset().top - headerActionsHeight ); + if ( 0 < offset ) { + content.css( 'margin-top', ( parseInt( content.css( 'margin-top' ), 10 ) - offset ) ); + } + }, 100 ) ); }; } @@ -531,9 +651,22 @@ expand(); } - } else { + } else if ( ! expanded && section.container.hasClass( 'open' ) ) { section.container.removeClass( 'open' ); - content.slideUp( args.duration, args.completeCallback ); + overlay.removeClass( 'section-open' ); + content.css( 'margin-top', '' ); + container.scrollTop( 0 ); + backBtn.attr( 'tabindex', '-1' ); + sectionTitle.attr( 'tabindex', '0' ); + sectionTitle.focus(); + if ( args.completeCallback ) { + args.completeCallback(); + } + $( window ).off( 'resize.customizer-section' ); + } else { + if ( args.completeCallback ) { + args.completeCallback(); + } } } }); @@ -718,7 +851,6 @@ overlay = section.closest( '.wp-full-overlay' ), container = section.closest( '.wp-full-overlay-sidebar-content' ), siblings = container.find( '.open' ), - topPanel = overlay.find( '#customize-theme-controls > ul > .accordion-section > .accordion-section-title' ).add( '#customize-info > .accordion-section-title' ), customizeBtn = section.find( '.customize-theme' ), changeBtn = section.find( '.change-theme' ), content = section.find( '.control-panel-content' ); @@ -748,8 +880,6 @@ args.completeCallback(); } } ); - topPanel.attr( 'tabindex', '-1' ); - changeBtn.attr( 'tabindex', '-1' ); customizeBtn.focus(); } else { siblings.removeClass( 'open' ); @@ -762,7 +892,6 @@ args.completeCallback(); } } ); - topPanel.attr( 'tabindex', '0' ); customizeBtn.attr( 'tabindex', '0' ); changeBtn.focus(); container.scrollTop( 0 ); @@ -964,11 +1093,20 @@ * @augments wp.customize.Class */ api.Panel = Container.extend({ + containerType: 'panel', + /** * @since 4.1.0 * - * @param {String} id - * @param {Object} options + * @param {string} id - The ID for the panel. + * @param {object} options - Object containing one property: params. + * @param {object} options.params - Object containing the following properties. + * @param {string} options.params.title - Title shown when panel is collapsed and expanded. + * @param {string=} [options.params.description] - Description shown at the top of the panel. + * @param {number=100} [options.params.priority] - The sort priority for the panel. + * @param {string=default} [options.params.type] - The type of the panel. See wp.customize.panelConstructor. + * @param {string=} [options.params.content] - The markup to be used for the panel container. If empty, a JS template is used. + * @param {boolean=true} [options.params.active] - Whether the panel is active or not. */ initialize: function ( id, options ) { var panel = this; @@ -990,6 +1128,7 @@ if ( ! panel.container.parent().is( parentContainer ) ) { parentContainer.append( panel.container ); + panel.renderContent(); } panel.deferred.embedded.resolve(); }, @@ -1012,25 +1151,40 @@ } }); + // Close panel. + panel.container.find( '.customize-panel-back' ).on( 'click keydown', function( event ) { + if ( api.utils.isKeydownButNotEnterEvent( event ) ) { + return; + } + event.preventDefault(); // Keep this AFTER the key filter above + + if ( panel.expanded() ) { + panel.collapse(); + } + }); + meta = panel.container.find( '.panel-meta:first' ); - meta.find( '> .accordion-section-title' ).on( 'click keydown', function( event ) { + meta.find( '> .accordion-section-title .customize-help-toggle' ).on( 'click keydown', function( event ) { if ( api.utils.isKeydownButNotEnterEvent( event ) ) { return; } event.preventDefault(); // Keep this AFTER the key filter above + meta = panel.container.find( '.panel-meta' ); if ( meta.hasClass( 'cannot-expand' ) ) { return; } - var content = meta.find( '.accordion-section-content:first' ); + var content = meta.find( '.customize-panel-description:first' ); if ( meta.hasClass( 'open' ) ) { meta.toggleClass( 'open' ); content.slideUp( panel.defaultExpandedArguments.duration ); + $( this ).attr( 'aria-expanded', false ); } else { content.slideDown( panel.defaultExpandedArguments.duration ); meta.toggleClass( 'open' ); + $( this ).attr( 'aria-expanded', true ); } }); @@ -1089,14 +1243,15 @@ // Note: there is a second argument 'args' passed var position, scroll, panel = this, - section = panel.container.closest( '.accordion-section' ), + section = panel.container.closest( '.accordion-section' ), // This is actually the panel. overlay = section.closest( '.wp-full-overlay' ), container = section.closest( '.wp-full-overlay-sidebar-content' ), siblings = container.find( '.open' ), - topPanel = overlay.find( '#customize-theme-controls > ul > .accordion-section > .accordion-section-title' ).add( '#customize-info > .accordion-section-title' ), - backBtn = overlay.find( '.control-panel-back' ), + topPanel = overlay.find( '#customize-theme-controls > ul > .accordion-section > .accordion-section-title' ), + backBtn = section.find( '.customize-panel-back' ), panelTitle = section.find( '.accordion-section-title' ).first(), - content = section.find( '.control-panel-content' ); + content = section.find( '.control-panel-content' ), + headerActionsHeight = $( '#customize-header-actions' ).height(); if ( expanded ) { @@ -1116,7 +1271,7 @@ content.parent().show(); position = content.offset().top; scroll = container.scrollTop(); - content.css( 'margin-top', ( $( '#customize-header-actions' ).height() - position - scroll ) ); + content.css( 'margin-top', ( headerActionsHeight - position - scroll ) ); section.addClass( 'current-panel' ); overlay.addClass( 'in-sub-panel' ); container.scrollTop( 0 ); @@ -1127,6 +1282,11 @@ topPanel.attr( 'tabindex', '-1' ); backBtn.attr( 'tabindex', '0' ); backBtn.focus(); + + // Fix the top margin after reflow. + api.bind( 'pane-contents-reflowed', _.debounce( function() { + content.css( 'margin-top', ( parseInt( content.css( 'margin-top' ), 10 ) - ( content.offset().top - headerActionsHeight ) ) ); + }, 100 ) ); } else { siblings.removeClass( 'open' ); section.removeClass( 'current-panel' ); @@ -1142,6 +1302,28 @@ panelTitle.focus(); container.scrollTop( 0 ); } + }, + + /** + * Render the panel from its JS template, if it exists. + * + * The panel's container must already exist in the DOM. + * + * @since 4.3.0 + */ + renderContent: function () { + var template, + panel = this; + + // Add the content to the container. + if ( 0 !== $( '#tmpl-' + panel.templateSelector + '-content' ).length ) { + template = wp.template( panel.templateSelector + '-content' ); + } else { + template = wp.template( 'customize-panel-default-content' ); + } + if ( template && panel.container ) { + panel.container.find( '.accordion-sub-container' ).html( template( panel.params ) ); + } } }); @@ -1684,6 +1866,314 @@ } }); + /** + * A control for selecting and cropping an image. + * + * @class + * @augments wp.customize.MediaControl + * @augments wp.customize.Control + * @augments wp.customize.Class + */ + api.CroppedImageControl = api.MediaControl.extend({ + + /** + * Open the media modal to the library state. + */ + openFrame: function( event ) { + if ( api.utils.isKeydownButNotEnterEvent( event ) ) { + return; + } + + this.initFrame(); + this.frame.setState( 'library' ).open(); + }, + + /** + * Create a media modal select frame, and store it so the instance can be reused when needed. + */ + initFrame: function() { + var l10n = _wpMediaViewsL10n; + + this.frame = wp.media({ + button: { + text: l10n.select, + close: false + }, + states: [ + new wp.media.controller.Library({ + title: this.params.button_labels.frame_title, + library: wp.media.query({ type: 'image' }), + multiple: false, + date: false, + priority: 20, + suggestedWidth: this.params.width, + suggestedHeight: this.params.height + }), + new wp.media.controller.CustomizeImageCropper({ + imgSelectOptions: this.calculateImageSelectOptions, + control: this + }) + ] + }); + + this.frame.on( 'select', this.onSelect, this ); + this.frame.on( 'cropped', this.onCropped, this ); + this.frame.on( 'skippedcrop', this.onSkippedCrop, this ); + }, + + /** + * After an image is selected in the media modal, switch to the cropper + * state if the image isn't the right size. + */ + onSelect: function() { + var attachment = this.frame.state().get( 'selection' ).first().toJSON(); + + if ( this.params.width === attachment.width && this.params.height === attachment.height && ! this.params.flex_width && ! this.params.flex_height ) { + this.setImageFromAttachment( attachment ); + this.frame.close(); + } else { + 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 ) { + this.setImageFromAttachment( croppedImage ); + }, + + /** + * Returns a set of options, computed from the attached image data and + * control-specific data, to be fed to the imgAreaSelect plugin in + * wp.media.view.Cropper. + * + * @param {wp.media.model.Attachment} attachment + * @param {wp.media.controller.Cropper} controller + * @returns {Object} Options + */ + calculateImageSelectOptions: function( attachment, controller ) { + var control = controller.get( 'control' ), + flexWidth = !! parseInt( control.params.flex_width, 10 ), + flexHeight = !! parseInt( control.params.flex_height, 10 ), + realWidth = attachment.get( 'width' ), + realHeight = attachment.get( 'height' ), + xInit = parseInt( control.params.width, 10 ), + yInit = parseInt( control.params.height, 10 ), + ratio = xInit / yInit, + xImg = realWidth, + yImg = realHeight, + x1, y1, imgSelectOptions; + + controller.set( 'canSkipCrop', ! control.mustBeCropped( flexWidth, flexHeight, xInit, yInit, realWidth, realHeight ) ); + + if ( xImg / yImg > ratio ) { + yInit = yImg; + xInit = yInit * ratio; + } else { + xInit = xImg; + yInit = xInit / ratio; + } + + x1 = ( xImg - xInit ) / 2; + y1 = ( yImg - yInit ) / 2; + + imgSelectOptions = { + handles: true, + keys: true, + instance: true, + persistent: true, + imageWidth: realWidth, + imageHeight: realHeight, + x1: x1, + y1: y1, + x2: xInit + x1, + y2: yInit + y1 + }; + + if ( flexHeight === false && flexWidth === false ) { + imgSelectOptions.aspectRatio = xInit + ':' + yInit; + } + if ( flexHeight === false ) { + imgSelectOptions.maxHeight = yInit; + } + if ( flexWidth === false ) { + imgSelectOptions.maxWidth = xInit; + } + + return imgSelectOptions; + }, + + /** + * Return whether the image must be cropped, based on required dimensions. + * + * @param {bool} flexW + * @param {bool} flexH + * @param {int} dstW + * @param {int} dstH + * @param {int} imgW + * @param {int} imgH + * @return {bool} + */ + mustBeCropped: function( flexW, flexH, dstW, dstH, imgW, imgH ) { + if ( true === flexW && true === flexH ) { + return false; + } + + if ( true === flexW && dstH === imgH ) { + return false; + } + + if ( true === flexH && dstW === imgW ) { + return false; + } + + if ( dstW === imgW && dstH === imgH ) { + return false; + } + + if ( imgW <= dstW ) { + return false; + } + + return true; + }, + + /** + * If cropping was skipped, apply the image data directly to the setting. + */ + onSkippedCrop: function() { + var attachment = this.frame.state().get( 'selection' ).first().toJSON(); + this.setImageFromAttachment( attachment ); + }, + + /** + * Updates the setting and re-renders the control UI. + * + * @param {object} attachment + */ + setImageFromAttachment: function( attachment ) { + this.params.attachment = attachment; + + // Set the Customizer setting; the callback takes care of rendering. + this.setting( attachment.id ); + } + }); + + /** + * A control for selecting and cropping Site Icons. + * + * @class + * @augments wp.customize.CroppedImageControl + * @augments wp.customize.MediaControl + * @augments wp.customize.Control + * @augments wp.customize.Class + */ + api.SiteIconControl = api.CroppedImageControl.extend({ + + /** + * Create a media modal select frame, and store it so the instance can be reused when needed. + */ + initFrame: function() { + var l10n = _wpMediaViewsL10n; + + this.frame = wp.media({ + button: { + text: l10n.select, + close: false + }, + states: [ + new wp.media.controller.Library({ + title: this.params.button_labels.frame_title, + library: wp.media.query({ type: 'image' }), + multiple: false, + date: false, + priority: 20, + suggestedWidth: this.params.width, + suggestedHeight: this.params.height + }), + new wp.media.controller.SiteIconCropper({ + imgSelectOptions: this.calculateImageSelectOptions, + control: this + }) + ] + }); + + this.frame.on( 'select', this.onSelect, this ); + this.frame.on( 'cropped', this.onCropped, this ); + this.frame.on( 'skippedcrop', this.onSkippedCrop, this ); + }, + + /** + * After an image is selected in the media modal, switch to the cropper + * state if the image isn't the right size. + */ + onSelect: function() { + var attachment = this.frame.state().get( 'selection' ).first().toJSON(), + controller = this; + + if ( this.params.width === attachment.width && this.params.height === attachment.height && ! this.params.flex_width && ! this.params.flex_height ) { + wp.ajax.post( 'crop-image', { + nonce: attachment.nonces.edit, + id: attachment.id, + context: 'site-icon', + cropDetails: { + x1: 0, + y1: 0, + width: this.params.width, + height: this.params.height, + dst_width: this.params.width, + dst_height: this.params.height + } + } ).done( function( croppedImage ) { + controller.setImageFromAttachment( croppedImage ); + controller.frame.close(); + } ).fail( function() { + controller.trigger('content:error:crop'); + } ); + } else { + this.frame.setState( 'cropper' ); + } + }, + + /** + * Updates the setting and re-renders the control UI. + * + * @param {object} attachment + */ + setImageFromAttachment: function( attachment ) { + var icon = typeof attachment.sizes['site_icon-32'] !== 'undefined' ? attachment.sizes['site_icon-32'] : attachment.sizes.thumbnail; + + this.params.attachment = attachment; + + // Set the Customizer setting; the callback takes care of rendering. + this.setting( attachment.id ); + + + // Update the icon in-browser. + $( 'link[sizes="32x32"]' ).attr( 'href', icon.url ); + }, + + /** + * 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 @@ -2134,7 +2624,11 @@ _( constructs ).each( function ( activeConstructs, type ) { api[ type ].each( function ( construct, id ) { var active = !! ( activeConstructs && activeConstructs[ id ] ); - construct.active( active ); + if ( active ) { + construct.activate(); + } else { + construct.deactivate(); + } } ); } ); } ); @@ -2544,13 +3038,15 @@ }); api.controlConstructor = { - color: api.ColorControl, - media: api.MediaControl, - upload: api.UploadControl, - image: api.ImageControl, - header: api.HeaderControl, - background: api.BackgroundControl, - theme: api.ThemeControl + color: api.ColorControl, + media: api.MediaControl, + upload: api.UploadControl, + image: api.ImageControl, + cropped_image: api.CroppedImageControl, + site_icon: api.SiteIconControl, + header: api.HeaderControl, + background: api.BackgroundControl, + theme: api.ThemeControl }; api.panelConstructor = {}; api.sectionConstructor = { @@ -2566,14 +3062,15 @@ return; } - // Redirect to the fallback preview if any incompatibilities are found. - if ( ! $.support.postMessage || ( ! $.support.cors && api.settings.isCrossDomain ) ) - return window.location = api.settings.url.fallback; + // Bail if any incompatibilities are found. + if ( ! $.support.postMessage || ( ! $.support.cors && api.settings.isCrossDomain ) ) { + return; + } var parent, topFocus, body = $( document.body ), overlay = body.children( '.wp-full-overlay' ), - title = $( '#customize-info .theme-name.site-title' ), + title = $( '#customize-info .panel-title.site-title' ), closeBtn = $( '.customize-controls-close' ), saveBtn = $( '#save' ); @@ -2588,14 +3085,14 @@ }); // Expand/Collapse the main customizer customize info. - $( '#customize-info' ).find( '> .accordion-section-title' ).on( 'click keydown', function( event ) { + $( '.customize-info' ).find( '> .accordion-section-title .customize-help-toggle' ).on( 'click keydown', function( event ) { if ( api.utils.isKeydownButNotEnterEvent( event ) ) { return; } event.preventDefault(); // Keep this AFTER the key filter above - var section = $( this ).parent(), - content = section.find( '.accordion-section-content:first' ); + var section = $( this ).closest( '.accordion-section' ), + content = section.find( '.customize-panel-description:first' ); if ( section.hasClass( 'cannot-expand' ) ) { return; @@ -2604,9 +3101,11 @@ if ( section.hasClass( 'open' ) ) { section.toggleClass( 'open' ); content.slideUp( api.Panel.prototype.defaultExpandedArguments.duration ); + $( this ).attr( 'aria-expanded', false ); } else { content.slideDown( api.Panel.prototype.defaultExpandedArguments.duration ); section.toggleClass( 'open' ); + $( this ).attr( 'aria-expanded', true ); } }); @@ -2840,6 +3339,7 @@ if ( wasReflowed && activeElement ) { activeElement.focus(); } + api.trigger( 'pane-contents-reflowed' ); }, api ); api.bind( 'ready', api.reflowPaneContents ); api.reflowPaneContents = _.debounce( api.reflowPaneContents, 100 ); @@ -2913,18 +3413,6 @@ event.preventDefault(); }); - // Go back to the top-level Customizer accordion. - $( '#customize-header-actions' ).on( 'click keydown', '.control-panel-back', function( event ) { - if ( api.utils.isKeydownButNotEnterEvent( event ) ) { - return; - } - - event.preventDefault(); // Keep this AFTER the key filter above - api.panel.each( function ( panel ) { - panel.collapse(); - }); - }); - closeBtn.keydown( function( event ) { if ( 9 === event.which ) // tab return; @@ -2933,13 +3421,14 @@ event.preventDefault(); }); - $('.collapse-sidebar').on( 'click keydown', function( event ) { - if ( api.utils.isKeydownButNotEnterEvent( event ) ) { - return; + $( '.collapse-sidebar' ).on( 'click', function() { + if ( 'true' === $( this ).attr( 'aria-expanded' ) ) { + $( this ).attr({ 'aria-expanded': 'false', 'aria-label': api.l10n.expandSidebar }); + } else { + $( this ).attr({ 'aria-expanded': 'true', 'aria-label': api.l10n.collapseSidebar }); } overlay.toggleClass( 'collapsed' ).toggleClass( 'expanded' ); - event.preventDefault(); }); $( '.customize-controls-preview-toggle' ).on( 'click keydown', function( event ) { @@ -3057,6 +3546,27 @@ }); }); + // Change previewed URL to the homepage when changing the page_on_front. + api( 'show_on_front', 'page_on_front', function( showOnFront, pageOnFront ) { + var updatePreviewUrl = function() { + if ( showOnFront() === 'page' && parseInt( pageOnFront(), 10 ) > 0 ) { + api.previewer.previewUrl.set( api.settings.url.home ); + } + }; + showOnFront.bind( updatePreviewUrl ); + pageOnFront.bind( updatePreviewUrl ); + }); + + // Change the previewed URL to the selected page when changing the page_for_posts. + api( 'page_for_posts', function( setting ) { + setting.bind(function( pageId ) { + pageId = parseInt( pageId, 10 ); + if ( pageId > 0 ) { + api.previewer.previewUrl.set( api.settings.url.home + '?page_id=' + pageId ); + } + }); + }); + api.trigger( 'ready' ); // Make sure left column gets focus diff --git a/wp-admin/js/customize-controls.min.js b/wp-admin/js/customize-controls.min.js index 2e8a4665..3886da02 100644 --- a/wp-admin/js/customize-controls.min.js +++ b/wp-admin/js/customize-controls.min.js @@ -1,2 +1,2 @@ -!function(a,b){var c,d,e=wp.customize;e.Setting=e.Value.extend({initialize:function(a,b,c){e.Value.prototype.initialize.call(this,b,c),this.id=a,this.transport=this.transport||"refresh",this._dirty=c.dirty||!1,this.bind(this.preview)},preview:function(){switch(this.transport){case"refresh":return this.previewer.refresh();case"postMessage":return this.previewer.send("setting",[this.id,this()])}}}),e.utils={},e.utils.bubbleChildValueChanges=function(a,c){b.each(c,function(b,c){a[c].bind(function(b,c){a.parent&&b!==c&&a.parent.trigger("change",a)})})},d=function(a){var b,c,d;b=this,a=a||{},d=function(){var a;a=b.extended(e.Panel)&&b.expanded()?b.container.find(".control-panel-content:first"):b.container,a.find(":focusable:first").focus(),a[0].scrollIntoView(!0)},a.completeCallback?(c=a.completeCallback,a.completeCallback=function(){d(),c()}):a.completeCallback=d,b.expand?b.expand(a):a.completeCallback()},e.utils.prioritySort=function(a,b){return a.priority()===b.priority()&&"number"==typeof a.params.instanceNumber&&"number"==typeof b.params.instanceNumber?a.params.instanceNumber-b.params.instanceNumber:a.priority()-b.priority()},e.utils.isKeydownButNotEnterEvent=function(a){return"keydown"===a.type&&13!==a.which},e.utils.areElementListsEqual=function(a,c){var d=a.length===c.length&&-1===_.indexOf(_.map(_.zip(a,c),function(a){return b(a[0]).is(a[1])}),!1);return d},c=e.Class.extend({defaultActiveArguments:{duration:"fast",completeCallback:b.noop},defaultExpandedArguments:{duration:"fast",completeCallback:b.noop},initialize:function(a,c){var d=this;d.id=a,d.params={},b.extend(d,c||{}),d.container=b(d.params.content),d.deferred={embedded:new b.Deferred},d.priority=new e.Value,d.active=new e.Value,d.activeArgumentsQueue=[],d.expanded=new e.Value,d.expandedArgumentsQueue=[],d.active.bind(function(a){var c=d.activeArgumentsQueue.shift();c=b.extend({},d.defaultActiveArguments,c),a=a&&d.isContextuallyActive(),d.onChangeActive(a,c)}),d.expanded.bind(function(a){var c=d.expandedArgumentsQueue.shift();c=b.extend({},d.defaultExpandedArguments,c),d.onChangeExpanded(a,c)}),d.attachEvents(),e.utils.bubbleChildValueChanges(d,["priority","active"]),d.priority.set(isNaN(d.params.priority)?100:d.params.priority),d.active.set(d.params.active),d.expanded.set(!1)},ready:function(){},_children:function(a,b){var c=this,d=[];return e[b].each(function(b){b[a].get()===c.id&&d.push(b)}),d.sort(e.utils.prioritySort),d},isContextuallyActive:function(){throw new Error("Container.isContextuallyActive() must be overridden in a subclass.")},onChangeActive:function(a,c){var d="resolved"===e.previewer.deferred.active.state()?c.duration:0;b.contains(document,this.container)?a?this.container.stop(!0,!0).slideDown(d,c.completeCallback):this.container.stop(!0,!0).slideUp(d,c.completeCallback):(this.container.toggle(a),c.completeCallback&&c.completeCallback())},_toggleActive:function(a,b){var c=this;return b=b||{},a&&this.active.get()||!a&&!this.active.get()?(b.unchanged=!0,c.onChangeActive(c.active.get(),b),!1):(b.unchanged=!1,this.activeArgumentsQueue.push(b),this.active.set(a),!0)},activate:function(a){return this._toggleActive(!0,a)},deactivate:function(a){return this._toggleActive(!1,a)},onChangeExpanded:function(){throw new Error("Must override with subclass.")},_toggleExpanded:function(a,b){var c=this;b=b||{};var d=this,e=b.completeCallback;return b.completeCallback=function(){e&&e.apply(d,arguments),d.container.trigger(a?"expanded":"collapsed")},a&&this.expanded.get()||!a&&!this.expanded.get()?(b.unchanged=!0,c.onChangeExpanded(c.expanded.get(),b),!1):(b.unchanged=!1,this.expandedArgumentsQueue.push(b),this.expanded.set(a),!0)},expand:function(a){return this._toggleExpanded(!0,a)},collapse:function(a){return this._toggleExpanded(!1,a)},focus:d}),e.Section=c.extend({initialize:function(a,d){var f=this;c.prototype.initialize.call(f,a,d),f.id=a,f.panel=new e.Value,f.panel.bind(function(a){b(f.container).toggleClass("control-subsection",!!a)}),f.panel.set(f.params.panel||""),e.utils.bubbleChildValueChanges(f,["panel"]),f.embed(),f.deferred.embedded.done(function(){f.ready()})},embed:function(){var a,c=this;a=function(a){var d;a?e.panel(a,function(a){a.deferred.embedded.done(function(){d=a.container.find("ul:first"),c.container.parent().is(d)||d.append(c.container),c.deferred.embedded.resolve()})}):(d=b("#customize-theme-controls").children("ul"),c.container.parent().is(d)||d.append(c.container),c.deferred.embedded.resolve())},c.panel.bind(a),a(c.panel.get())},attachEvents:function(){var a=this;a.container.find(".accordion-section-title").on("click keydown",function(b){e.utils.isKeydownButNotEnterEvent(b)||(b.preventDefault(),a.expanded()?a.collapse():a.expand())})},isContextuallyActive:function(){var a=this,b=a.controls(),c=0;return _(b).each(function(a){a.active()&&(c+=1)}),0!==c},controls:function(){return this._children("section","control")},onChangeExpanded:function(a,b){var c,d=this,f=d.container.find(".accordion-section-content");a?(c=b.unchanged?b.completeCallback:function(){f.stop().slideDown(b.duration,b.completeCallback),d.container.addClass("open")},b.allowMultiple||e.section.each(function(a){a!==d&&a.collapse({duration:b.duration})}),d.panel()?e.panel(d.panel()).expand({duration:b.duration,completeCallback:c}):c()):(d.container.removeClass("open"),f.slideUp(b.duration,b.completeCallback))}}),e.ThemesSection=e.Section.extend({currentTheme:"",overlay:"",template:"",screenshotQueue:null,$window:b(window),initialize:function(){return this.$customizeSidebar=b(".wp-full-overlay-sidebar-content:first"),e.Section.prototype.initialize.apply(this,arguments)},ready:function(){var a=this;a.overlay=a.container.find(".theme-overlay"),a.template=wp.template("customize-themes-details-view"),b("body").on("keyup",function(b){a.overlay.find(".theme-wrap").is(":visible")&&(39===b.keyCode&&a.nextTheme(),37===b.keyCode&&a.previousTheme(),27===b.keyCode&&a.closeDetails())}),_.bindAll(this,"renderScreenshots")},isContextuallyActive:function(){return this.active()},attachEvents:function(){var a=this;a.container.find(".change-theme, .customize-theme").on("click keydown",function(b){e.utils.isKeydownButNotEnterEvent(b)||(b.preventDefault(),a.expanded()?a.collapse():a.expand())}),a.container.on("click keydown",".left",function(b){e.utils.isKeydownButNotEnterEvent(b)||(b.preventDefault(),a.previousTheme())}),a.container.on("click keydown",".right",function(b){e.utils.isKeydownButNotEnterEvent(b)||(b.preventDefault(),a.nextTheme())}),a.container.on("click keydown",".theme-backdrop, .close",function(b){e.utils.isKeydownButNotEnterEvent(b)||(b.preventDefault(),a.closeDetails())});var b=_.throttle(_.bind(a.renderScreenshots,this),100);a.container.on("input","#themes-filter",function(c){var d,e=c.currentTarget.value.toLowerCase().trim().replace("-"," "),f=a.controls();_.each(f,function(a){a.filter(e)}),b(),d=a.container.find("li.customize-control:visible").length,a.container.find(".theme-count").text(d)}),e.bind("ready",function(){_.each(a.controls().slice(0,3),function(a){var b,c=a.params.theme.screenshot[0];c&&(b=new Image,b.src=c)})})},onChangeExpanded:function(a,c){if(c.unchanged)return void(c.completeCallback&&c.completeCallback());var d,f,g=this,h=g.container.closest(".accordion-section"),i=h.closest(".wp-full-overlay"),j=h.closest(".wp-full-overlay-sidebar-content"),k=j.find(".open"),l=i.find("#customize-theme-controls > ul > .accordion-section > .accordion-section-title").add("#customize-info > .accordion-section-title"),m=h.find(".customize-theme"),n=h.find(".change-theme"),o=h.find(".control-panel-content");a?(e.section.each(function(a){a!==g&&a.collapse({duration:c.duration})}),e.panel.each(function(a){a.collapse({duration:0})}),o.show(0,function(){d=o.offset().top,f=j.scrollTop(),o.css("margin-top",b("#customize-header-actions").height()-d-f),h.addClass("current-panel"),i.addClass("in-themes-panel"),j.scrollTop(0),_.delay(g.renderScreenshots,10),g.$customizeSidebar.on("scroll.customize-themes-section",_.throttle(g.renderScreenshots,300)),c.completeCallback&&c.completeCallback()}),l.attr("tabindex","-1"),n.attr("tabindex","-1"),m.focus()):(k.removeClass("open"),h.removeClass("current-panel"),i.removeClass("in-themes-panel"),g.$customizeSidebar.off("scroll.customize-themes-section"),o.delay(180).hide(0,function(){o.css("margin-top","inherit"),c.completeCallback&&c.completeCallback()}),l.attr("tabindex","0"),m.attr("tabindex","0"),n.focus(),j.scrollTop(0))},renderScreenshots:function(){var a=this;null===a.screenshotQueue&&(a.screenshotQueue=a.controls()),a.screenshotQueue.length&&(a.screenshotQueue=_.filter(a.screenshotQueue,function(b){var c=b.container.find(".theme-screenshot"),d=c.find("img");if(!d.length)return!1;if(d.is(":hidden"))return!0;var e=a.$window.scrollTop(),f=e+a.$window.height(),g=d.offset().top,h=c.height(),i=g+h,j=3*h,k=i>=e-j&&f+j>=g;return k&&b.container.trigger("render-screenshot"),!k}))},nextTheme:function(){var a=this;a.getNextTheme()&&a.showDetails(a.getNextTheme(),function(){a.overlay.find(".right").focus()})},getNextTheme:function(){var a,b;return a=e.control("theme_"+this.currentTheme),b=a.container.next("li.customize-control-theme"),b.length?(b=b[0].id.replace("customize-control-",""),a=e.control(b),a.params.theme):!1},previousTheme:function(){var a=this;a.getPreviousTheme()&&a.showDetails(a.getPreviousTheme(),function(){a.overlay.find(".left").focus()})},getPreviousTheme:function(){var a,b;return a=e.control("theme_"+this.currentTheme),b=a.container.prev("li.customize-control-theme"),b.length?(b=b[0].id.replace("customize-control-",""),a=e.control(b),a.params.theme):!1},updateLimits:function(){this.getNextTheme()||this.overlay.find(".right").addClass("disabled"),this.getPreviousTheme()||this.overlay.find(".left").addClass("disabled")},showDetails:function(a,c){var d=this;c=c||function(){},d.currentTheme=a.id,d.overlay.html(d.template(a)).fadeIn("fast").focus(),b("body").addClass("modal-open"),d.containFocus(d.overlay),d.updateLimits(),c()},closeDetails:function(){b("body").removeClass("modal-open"),this.overlay.fadeOut("fast"),e.control("theme_"+this.currentTheme).focus()},containFocus:function(a){var c;a.on("keydown",function(d){return 9===d.keyCode?(c=b(":tabbable",a),c.last()[0]!==d.target||d.shiftKey?c.first()[0]===d.target&&d.shiftKey?(c.last().focus(),!1):void 0:(c.first().focus(),!1)):void 0})}}),e.Panel=c.extend({initialize:function(a,b){var d=this;c.prototype.initialize.call(d,a,b),d.embed(),d.deferred.embedded.done(function(){d.ready()})},embed:function(){var a=this,c=b("#customize-theme-controls > ul");a.container.parent().is(c)||c.append(a.container),a.deferred.embedded.resolve()},attachEvents:function(){var a,b=this;b.container.find(".accordion-section-title").on("click keydown",function(a){e.utils.isKeydownButNotEnterEvent(a)||(a.preventDefault(),b.expanded()||b.expand())}),a=b.container.find(".panel-meta:first"),a.find("> .accordion-section-title").on("click keydown",function(c){if(!e.utils.isKeydownButNotEnterEvent(c)&&(c.preventDefault(),!a.hasClass("cannot-expand"))){var d=a.find(".accordion-section-content:first");a.hasClass("open")?(a.toggleClass("open"),d.slideUp(b.defaultExpandedArguments.duration)):(d.slideDown(b.defaultExpandedArguments.duration),a.toggleClass("open"))}})},sections:function(){return this._children("panel","section")},isContextuallyActive:function(){var a=this,b=a.sections(),c=0;return _(b).each(function(a){a.active()&&a.isContextuallyActive()&&(c+=1)}),0!==c},onChangeExpanded:function(a,c){if(c.unchanged)return void(c.completeCallback&&c.completeCallback());var d,f,g=this,h=g.container.closest(".accordion-section"),i=h.closest(".wp-full-overlay"),j=h.closest(".wp-full-overlay-sidebar-content"),k=j.find(".open"),l=i.find("#customize-theme-controls > ul > .accordion-section > .accordion-section-title").add("#customize-info > .accordion-section-title"),m=i.find(".control-panel-back"),n=h.find(".accordion-section-title").first(),o=h.find(".control-panel-content");a?(e.section.each(function(a){a.panel()||a.collapse({duration:0})}),e.panel.each(function(a){g!==a&&a.collapse({duration:0})}),o.show(0,function(){o.parent().show(),d=o.offset().top,f=j.scrollTop(),o.css("margin-top",b("#customize-header-actions").height()-d-f),h.addClass("current-panel"),i.addClass("in-sub-panel"),j.scrollTop(0),c.completeCallback&&c.completeCallback()}),l.attr("tabindex","-1"),m.attr("tabindex","0"),m.focus()):(k.removeClass("open"),h.removeClass("current-panel"),i.removeClass("in-sub-panel"),o.delay(180).hide(0,function(){o.css("margin-top","inherit"),c.completeCallback&&c.completeCallback()}),l.attr("tabindex","0"),m.attr("tabindex","-1"),n.focus(),j.scrollTop(0))}}),e.Control=e.Class.extend({defaultActiveArguments:{duration:"fast",completeCallback:b.noop},initialize:function(a,c){var d,f,g,h=this;h.params={},b.extend(h,c||{}),h.id=a,h.selector="#customize-control-"+a.replace(/\]/g,"").replace(/\[/g,"-"),h.templateSelector="customize-control-"+h.params.type+"-content",h.container=b(h.params.content?h.params.content:h.selector),h.deferred={embedded:new b.Deferred},h.section=new e.Value,h.priority=new e.Value,h.active=new e.Value,h.activeArgumentsQueue=[],h.elements=[],d=h.container.find("[data-customize-setting-link]"),f={},d.each(function(){var a,c=b(this);if(c.is(":radio")){if(a=c.prop("name"),f[a])return;f[a]=!0,c=d.filter('[name="'+a+'"]')}e(c.data("customizeSettingLink"),function(a){var b=new e.Element(c);h.elements.push(b),b.sync(a),b.set(a())})}),h.active.bind(function(a){var c=h.activeArgumentsQueue.shift();c=b.extend({},h.defaultActiveArguments,c),h.onChangeActive(a,c)}),h.section.set(h.params.section),h.priority.set(isNaN(h.params.priority)?10:h.params.priority),h.active.set(h.params.active),e.utils.bubbleChildValueChanges(h,["section","priority","active"]),g=b.map(h.params.settings,function(a){return a}),e.apply(e,g.concat(function(){var a;h.settings={};for(a in h.params.settings)h.settings[a]=e(h.params.settings[a]);h.setting=h.settings["default"]||null,h.embed()})),h.deferred.embedded.done(function(){h.ready()})},embed:function(){var a,b=this;a=function(a){var c;a&&e.section(a,function(a){a.deferred.embedded.done(function(){c=a.container.find("ul:first"),b.container.parent().is(c)||(c.append(b.container),b.renderContent()),b.deferred.embedded.resolve()})})},b.section.bind(a),a(b.section.get())},ready:function(){},expand:function(a){e.section(this.section()).expand(a)},focus:d,onChangeActive:function(a,c){b.contains(document,this.container)?a?this.container.slideDown(c.duration,c.completeCallback):this.container.slideUp(c.duration,c.completeCallback):(this.container.toggle(a),c.completeCallback&&c.completeCallback())},toggle:function(a){return this.onChangeActive(a,this.defaultActiveArguments)},activate:c.prototype.activate,deactivate:c.prototype.deactivate,_toggleActive:c.prototype._toggleActive,dropdownInit:function(){var a=this,b=this.container.find(".dropdown-status"),c=this.params,d=!1,f=function(a){"string"==typeof a&&c.statuses&&c.statuses[a]?b.html(c.statuses[a]).show():b.hide()};this.container.on("click keydown",".dropdown",function(b){e.utils.isKeydownButNotEnterEvent(b)||(b.preventDefault(),d||a.container.toggleClass("open"),a.container.hasClass("open")&&a.container.parent().parent().find("li.library-selected").focus(),d=!0,setTimeout(function(){d=!1},400))}),this.setting.bind(f),f(this.setting())},renderContent:function(){var a,c=this;0!==b("#tmpl-"+c.templateSelector).length&&(a=wp.template(c.templateSelector),a&&c.container&&c.container.html(a(c.params)))}}),e.ColorControl=e.Control.extend({ready:function(){var a=this,b=this.container.find(".color-picker-hex");b.val(a.setting()).wpColorPicker({change:function(){a.setting.set(b.wpColorPicker("color"))},clear:function(){a.setting.set(!1)}}),this.setting.bind(function(a){b.val(a),b.wpColorPicker("color",a)})}}),e.MediaControl=e.Control.extend({ready:function(){var a=this;_.bindAll(a,"restoreDefault","removeFile","openFrame","select","pausePlayer"),a.container.on("click keydown",".upload-button",a.openFrame),a.container.on("click keydown",".upload-button",a.pausePlayer),a.container.on("click keydown",".thumbnail-image img",a.openFrame),a.container.on("click keydown",".default-button",a.restoreDefault),a.container.on("click keydown",".remove-button",a.pausePlayer),a.container.on("click keydown",".remove-button",a.removeFile),a.container.on("click keydown",".remove-button",a.cleanupPlayer),e.section(a.section()).container.on("expanded",function(){a.player&&a.player.setControlsSize()}).on("collapsed",function(){a.pausePlayer()}),a.setting.bind(function(){a.renderContent()})},pausePlayer:function(){this.player&&this.player.pause()},cleanupPlayer:function(){this.player&&wp.media.mixin.removePlayer(this.player)},openFrame:function(a){e.utils.isKeydownButNotEnterEvent(a)||(a.preventDefault(),this.frame||this.initFrame(),this.frame.open())},initFrame:function(){this.frame=wp.media({button:{text:this.params.button_labels.frame_button},states:[new wp.media.controller.Library({title:this.params.button_labels.frame_title,library:wp.media.query({type:this.params.mime_type}),multiple:!1,date:!1})]}),this.frame.on("select",this.select)},select:function(){var a,b=this.frame.state().get("selection").first().toJSON(),c=window._wpmejsSettings||{};this.params.attachment=b,this.setting(b.id),a=this.container.find("audio, video").get(0),a?this.player=new MediaElementPlayer(a,c):this.cleanupPlayer()},restoreDefault:function(a){e.utils.isKeydownButNotEnterEvent(a)||(a.preventDefault(),this.params.attachment=this.params.defaultAttachment,this.setting(this.params.defaultAttachment.url))},removeFile:function(a){e.utils.isKeydownButNotEnterEvent(a)||(a.preventDefault(),this.params.attachment={},this.setting(""),this.renderContent())}}),e.UploadControl=e.MediaControl.extend({select:function(){var a,b=this.frame.state().get("selection").first().toJSON(),c=window._wpmejsSettings||{};this.params.attachment=b,this.setting(b.url),a=this.container.find("audio, video").get(0),a?this.player=new MediaElementPlayer(a,c):this.cleanupPlayer()},success:function(){},removerVisibility:function(){}}),e.ImageControl=e.UploadControl.extend({thumbnailSrc:function(){}}),e.BackgroundControl=e.UploadControl.extend({ready:function(){e.UploadControl.prototype.ready.apply(this,arguments)},select:function(){e.UploadControl.prototype.select.apply(this,arguments),wp.ajax.post("custom-background-add",{nonce:_wpCustomizeBackground.nonces.add,wp_customize:"on",theme:e.settings.theme.stylesheet,attachment_id:this.params.attachment.id})}}),e.HeaderControl=e.Control.extend({ready:function(){this.btnRemove=b("#customize-control-header_image .actions .remove"),this.btnNew=b("#customize-control-header_image .actions .new"),_.bindAll(this,"openMedia","removeImage"),this.btnNew.on("click",this.openMedia),this.btnRemove.on("click",this.removeImage),e.HeaderTool.currentHeader=this.getInitialHeaderImage(),new e.HeaderTool.CurrentView({model:e.HeaderTool.currentHeader,el:"#customize-control-header_image .current .container"}),new e.HeaderTool.ChoiceListView({collection:e.HeaderTool.UploadsList=new e.HeaderTool.ChoiceList,el:"#customize-control-header_image .choices .uploaded .list"}),new e.HeaderTool.ChoiceListView({collection:e.HeaderTool.DefaultsList=new e.HeaderTool.DefaultsList,el:"#customize-control-header_image .choices .default .list"}),e.HeaderTool.combinedList=e.HeaderTool.CombinedList=new e.HeaderTool.CombinedList([e.HeaderTool.UploadsList,e.HeaderTool.DefaultsList])},getInitialHeaderImage:function(){if(!e.get().header_image||!e.get().header_image_data||_.contains(["remove-header","random-default-image","random-uploaded-image"],e.get().header_image))return new e.HeaderTool.ImageModel;var a=_.find(_wpCustomizeHeader.uploads,function(a){return a.attachment_id===e.get().header_image_data.attachment_id});return a||(a={url:e.get().header_image,thumbnail_url:e.get().header_image,attachment_id:e.get().header_image_data.attachment_id}),new e.HeaderTool.ImageModel({header:a,choice:a.url.split("/").pop()})},calculateImageSelectOptions:function(a,b){var c,d,f,g,h,i,j=parseInt(_wpCustomizeHeader.data.width,10),k=parseInt(_wpCustomizeHeader.data.height,10),l=!!parseInt(_wpCustomizeHeader.data["flex-width"],10),m=!!parseInt(_wpCustomizeHeader.data["flex-height"],10);return h=a.get("width"),g=a.get("height"),this.headerImage=new e.HeaderTool.ImageModel,this.headerImage.set({themeWidth:j,themeHeight:k,themeFlexWidth:l,themeFlexHeight:m,imageWidth:h,imageHeight:g}),b.set("canSkipCrop",!this.headerImage.shouldBeCropped()),c=j/k,d=h,f=g,d/f>c?(k=f,j=k*c):(j=d,k=j/c),i={handles:!0,keys:!0,instance:!0,persistent:!0,imageWidth:h,imageHeight:g,x1:0,y1:0,x2:j,y2:k},m===!1&&l===!1&&(i.aspectRatio=j+":"+k),m===!1&&(i.maxHeight=k),l===!1&&(i.maxWidth=j),i},openMedia:function(a){var b=_wpMediaViewsL10n;a.preventDefault(),this.frame=wp.media({button:{text:b.selectAndCrop,close:!1},states:[new wp.media.controller.Library({title:b.chooseImage,library:wp.media.query({type:"image"}),multiple:!1,date:!1,priority:20,suggestedWidth:_wpCustomizeHeader.data.width,suggestedHeight:_wpCustomizeHeader.data.height}),new wp.media.controller.Cropper({imgSelectOptions:this.calculateImageSelectOptions})]}),this.frame.on("select",this.onSelect,this),this.frame.on("cropped",this.onCropped,this),this.frame.on("skippedcrop",this.onSkippedCrop,this),this.frame.open()},onSelect:function(){this.frame.setState("cropper")},onCropped:function(a){var b=a.post_content,c=a.attachment_id,d=a.width,e=a.height;this.setImageFromURL(b,c,d,e)},onSkippedCrop:function(a){var b=a.get("url"),c=a.get("width"),d=a.get("height");this.setImageFromURL(b,a.id,c,d)},setImageFromURL:function(a,b,c,d){var f,g={};g.url=a,g.thumbnail_url=a,g.timestamp=_.now(),b&&(g.attachment_id=b),c&&(g.width=c),d&&(g.height=d),f=new e.HeaderTool.ImageModel({header:g,choice:a.split("/").pop()}),e.HeaderTool.UploadsList.add(f),e.HeaderTool.currentHeader.set(f.toJSON()),f.save(),f.importImage()},removeImage:function(){e.HeaderTool.currentHeader.trigger("hide"),e.HeaderTool.CombinedList.trigger("control:removeImage")}}),e.ThemeControl=e.Control.extend({touchDrag:!1,isRendered:!1,renderContent:function(){var a=this,b=arguments;e.section(a.section(),function(c){c.expanded()?(e.Control.prototype.renderContent.apply(a,b),a.isRendered=!0):c.expanded.bind(function(c){c&&!a.isRendered&&(e.Control.prototype.renderContent.apply(a,b),a.isRendered=!0)})})},ready:function(){var a=this;a.container.on("touchmove",".theme",function(){a.touchDrag=!0}),a.container.on("click keydown touchend",".theme",function(c){if(!e.utils.isKeydownButNotEnterEvent(c)){if(a.touchDrag===!0)return a.touchDrag=!1;if(!b(c.target).is(".theme-actions .button")){var d=b(this).data("previewUrl");b(".wp-full-overlay").addClass("customize-loading"),window.parent.location=d}}}),a.container.on("click keydown",".theme-actions .theme-details",function(b){e.utils.isKeydownButNotEnterEvent(b)||(b.preventDefault(),e.section(a.section()).showDetails(a.params.theme))}),a.container.on("render-screenshot",function(){var a=b(this).find("img"),c=a.data("src");c&&a.attr("src",c)})},filter:function(a){var b=this,c=b.params.theme.name+" "+b.params.theme.description+" "+b.params.theme.tags+" "+b.params.theme.author;c=c.toLowerCase().replace("-"," "),-1!==c.search(a)?b.activate():b.deactivate()}}),e.defaultConstructor=e.Setting,e.control=new e.Values({defaultConstructor:e.Control}),e.section=new e.Values({defaultConstructor:e.Section}),e.panel=new e.Values({defaultConstructor:e.Panel}),e.PreviewFrame=e.Messenger.extend({sensitivity:2e3,initialize:function(a,c){var d=b.Deferred();d.promise(this),this.container=a.container,this.signature=a.signature,b.extend(a,{channel:e.PreviewFrame.uuid()}),e.Messenger.prototype.initialize.call(this,a,c),this.add("previewUrl",a.previewUrl),this.query=b.extend(a.query||{},{customize_messenger_channel:this.channel()}),this.run(d)},run:function(a){var c=this,d=!1,f=!1;this._ready&&this.unbind("ready",this._ready),this._ready=function(){f=!0,d&&a.resolveWith(c)},this.bind("ready",this._ready),this.bind("ready",function(a){if(this.container.addClass("iframe-ready"),a){var b={panel:a.activePanels,section:a.activeSections,control:a.activeControls};_(b).each(function(a,b){e[b].each(function(b,c){var d=!(!a||!a[c]);b.active(d)})})}}),this.request=b.ajax(this.previewUrl(),{type:"POST",data:this.query,xhrFields:{withCredentials:!0}}),this.request.fail(function(){a.rejectWith(c,["request failure"])}),this.request.done(function(g){var h,i=c.request.getResponseHeader("Location"),j=c.signature;return i&&i!==c.previewUrl()?void a.rejectWith(c,["redirect",i]):"0"===g?void c.login(a):"-1"===g?void a.rejectWith(c,["cheatin"]):(h=g.lastIndexOf(j),-1===h||h")?void a.rejectWith(c,["unsigned"]):(g=g.slice(0,h)+g.slice(h+j.length),c.iframe=b("'; echo '

'; include(ABSPATH . 'wp-admin/admin-footer.php'); @@ -621,7 +653,7 @@ if ( 'upgrade-core' == $action ) { require_once(ABSPATH . 'wp-admin/admin-header.php'); ?>

+

- -

Switch to the list view.' ); ?>

@@ -129,7 +129,7 @@ if ( $doaction ) { wp_die( __( 'You are not allowed to move this post 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; @@ -141,7 +141,7 @@ if ( $doaction ) { wp_die( __( 'You are not allowed to move this post 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; @@ -206,15 +206,15 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>

+

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

+ ' . __('Undo') . ''; -$messages[5] = __('Media restored from the trash.'); +$messages[1] = __( 'Media attachment updated.' ); +$messages[2] = __( 'Media attachment permanently deleted.' ); +$messages[3] = __( 'Error saving media attachment.' ); +$messages[4] = __( 'Media attachment moved to the trash.' ) . ' ' . __( 'Undo' ) . ''; +$messages[5] = __( 'Media attachment restored from the trash.' ); if ( ! empty( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) { $message = $messages[ $_GET['message'] ]; diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php index 29af2431..6143514f 100644 --- a/wp-admin/user-edit.php +++ b/wp-admin/user-edit.php @@ -39,7 +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 of All Other Sessions button.' ) . '

' . + '

' . __( '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.') . '

'; @@ -202,17 +202,17 @@ include(ABSPATH . 'wp-admin/admin-header.php');

+

- + - + -

ID . '_new_email' ); 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' ) ) ); ?>

Cancel' ), + '' . $new_email['newemail'] . '', + esc_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ) ) + ); ?>

@@ -453,22 +458,44 @@ if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_c $show_password_fields = apply_filters( 'show_password_fields', true, $profileuser ); if ( $show_password_fields ) : ?> + + +

+ - + + + + + @@ -476,9 +503,9 @@ if ( $show_password_fields ) : get_all() ) === 1 ) : ?> - + get_all() ) > 1 ) : ?> - + get_all() ) : ?> - + diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php index 45968255..33fd41d6 100644 --- a/wp-admin/user-new.php +++ b/wp-admin/user-new.php @@ -17,6 +17,11 @@ if ( is_multisite() ) { } if ( is_multisite() ) { + /** + * + * @param string $text + * @return string + */ function admin_created_user_email( $text ) { $roles = get_editable_roles(); $role = $roles[ $_REQUEST['role'] ]; @@ -185,7 +190,7 @@ get_current_screen()->set_help_sidebar( ); 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. @@ -232,13 +237,13 @@ if ( isset($_GET['update']) ) { } ?>

-

@@ -350,14 +355,14 @@ $new_user_lastname = $creating && isset( $_POST['last_name'] ) ? wp_unslash( $_P $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_password = $creating && isset( $_POST['send_password'] ) ? wp_unslash( $_POST['send_password'] ) : ''; +$new_user_send_password = $creating && isset( $_POST['send_password'] ) ? wp_unslash( $_POST['send_password'] ) : true; $new_user_ignore_pass = $creating && isset( $_POST['noconfirmation'] ) ? wp_unslash( $_POST['noconfirmation'] ) : ''; ?>

	- - + + + + + + + + +
	- + - - - +
	+ + + +
		- + @@ -486,23 +513,23 @@ if ( IS_PROFILE_PAGE && count( $sessions->get_all() ) === 1 ) : ?>
		- + - +
		- + display_name ); + printf( __( 'Log %s out of all locations.' ), $profileuser->display_name ); ?>

- + @@ -385,25 +390,47 @@ $new_user_ignore_pass = $creating && isset( $_POST['noconfirmation'] ) ? wp_unsl * @param bool $show Whether to show the password fields. Default true. */ if ( apply_filters( 'show_password_fields', true ) ) : ?> - - + + - - + + - - - + + + diff --git a/wp-admin/users.php b/wp-admin/users.php index 27e264ca..df7648b7 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -214,7 +214,7 @@ case 'delete':

@@ -336,8 +336,14 @@ case 'remove':

+ + +

+ +

+

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

+ views(); ?> diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php index 1e34d81b..679f1032 100644 --- a/wp-admin/widgets.php +++ b/wp-admin/widgets.php @@ -21,6 +21,11 @@ if ( isset($_GET['widgets-access']) ) { set_user_setting( 'widgets_access', $widgets_access ); } +/** + * + * @param string $classes + * @return string + */ function wp_widgets_access_body_class($classes) { return "$classes widgets_access "; } @@ -230,7 +235,7 @@ if ( isset($_GET['editwidget']) && $_GET['editwidget'] ) { require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>

@@ -310,12 +315,12 @@ $errors = array( require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>

+

%2$s', + ' %2$s', esc_url( add_query_arg( array( array( 'autofocus' => array( 'panel' => 'widgets' ) ), @@ -327,7 +332,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?> ); } ?> -

diff --git a/wp-config-sample.php b/wp-config-sample.php index 7ca228ee..02091c1b 100644 --- a/wp-config-sample.php +++ b/wp-config-sample.php @@ -1,15 +1,19 @@ protect your blog from comment and trackback spam. It keeps your site protected from spam even while you sleep. To get started: 1) Click the "Activate" link to the left of this description, 2) Sign up for an Akismet API key, and 3) Go to your Akismet configuration page, and save your API key. -Version: 3.1.1 +Version: 3.1.3 Author: Automattic Author URI: http://automattic.com/wordpress-plugins/ License: GPLv2 or later @@ -35,7 +35,7 @@ if ( !function_exists( 'add_action' ) ) { exit; } -define( 'AKISMET_VERSION', '3.1.1' ); +define( 'AKISMET_VERSION', '3.1.3' ); define( 'AKISMET__MINIMUM_WP_VERSION', '3.2' ); define( 'AKISMET__PLUGIN_URL', plugin_dir_url( __FILE__ ) ); define( 'AKISMET__PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); diff --git a/wp-content/plugins/akismet/class.akismet-admin.php b/wp-content/plugins/akismet/class.akismet-admin.php index 840b3674..960739f8 100644 --- a/wp-content/plugins/akismet/class.akismet-admin.php +++ b/wp-content/plugins/akismet/class.akismet-admin.php @@ -232,7 +232,7 @@ class Akismet_Admin { if ( defined( 'WPCOM_API_KEY' ) ) return false; //shouldn't have option to save key if already defined - $new_key = preg_replace( '/[^a-h0-9]/i', '', $_POST['key'] ); + $new_key = preg_replace( '/[^a-f0-9]/i', '', $_POST['key'] ); $old_key = Akismet::get_api_key(); if ( empty( $new_key ) ) { @@ -290,15 +290,6 @@ class Akismet_Admin { // WP 2.5+ public static function rightnow_stats() { - global $submenu, $wp_db_version; - - if ( 8645 < $wp_db_version ) // 2.7 - $link = add_query_arg( array( 'comment_status' => 'spam' ), admin_url( 'edit-comments.php' ) ); - elseif ( isset( $submenu['edit-comments.php'] ) ) - $link = add_query_arg( array( 'page' => 'akismet-admin' ), admin_url( 'edit-comments.php' ) ); - else - $link = add_query_arg( array( 'page' => 'akismet-admin' ), admin_url( 'edit.php' ) ); - if ( $count = get_option('akismet_spam_count') ) { $intro = sprintf( _n( 'Akismet has protected your site from %2$s spam comment already. ', @@ -309,15 +300,16 @@ class Akismet_Admin { $intro = sprintf( __('Akismet blocks spam from getting to your blog. ', 'akismet'), 'https://akismet.com/wordpress/' ); } - $link = function_exists( 'esc_url' ) ? esc_url( $link ) : clean_url( $link ); + $link = add_query_arg( array( 'comment_status' => 'spam' ), admin_url( 'edit-comments.php' ) ); + if ( $queue_count = self::get_spam_count() ) { $queue_text = sprintf( _n( 'There’s %1$s comment in your spam queue right now.', 'There are %1$s comments in your spam queue right now.', $queue_count - , 'akismet'), number_format_i18n( $queue_count ), $link ); + , 'akismet'), number_format_i18n( $queue_count ), esc_url( $link ) ); } else { - $queue_text = sprintf( __( "There’s nothing in your spam queue at the moment." , 'akismet'), $link ); + $queue_text = sprintf( __( "There’s nothing in your spam queue at the moment." , 'akismet'), esc_url( $link ) ); } $text = $intro . '
' . $queue_text; @@ -379,17 +371,22 @@ class Akismet_Admin { update_comment_meta( $c['comment_ID'], 'akismet_result', 'true' ); delete_comment_meta( $c['comment_ID'], 'akismet_error' ); delete_comment_meta( $c['comment_ID'], 'akismet_delayed_moderation_email' ); - Akismet::update_comment_history( $c['comment_ID'], __('Akismet re-checked and caught this comment as spam', 'akismet'), 'check-spam' ); + Akismet::update_comment_history( $c['comment_ID'], '', 'recheck-spam' ); } elseif ( 'false' == $response[1] ) { update_comment_meta( $c['comment_ID'], 'akismet_result', 'false' ); delete_comment_meta( $c['comment_ID'], 'akismet_error' ); delete_comment_meta( $c['comment_ID'], 'akismet_delayed_moderation_email' ); - Akismet::update_comment_history( $c['comment_ID'], __('Akismet re-checked and cleared this comment', 'akismet'), 'check-ham' ); + Akismet::update_comment_history( $c['comment_ID'], '', 'recheck-ham' ); // abnormal result: error } else { update_comment_meta( $c['comment_ID'], 'akismet_result', 'error' ); - Akismet::update_comment_history( $c['comment_ID'], sprintf( __('Akismet was unable to re-check this comment (response: %s)', 'akismet'), substr($response[1], 0, 50)), 'check-error' ); + Akismet::update_comment_history( + $c['comment_ID'], + '', + 'recheck-error', + array( 'response' => substr( $response[1], 0, 50 ) ) + ); } delete_comment_meta( $c['comment_ID'], 'akismet_rechecking' ); @@ -494,11 +491,95 @@ class Akismet_Admin { if ( $history ) { echo '

'; + foreach ( $history as $row ) { $time = date( 'D d M Y @ h:i:m a', $row['time'] ) . ' GMT'; - echo '

' . sprintf( esc_html__('%s ago', 'akismet'), human_time_diff( $row['time'] ) ) . ' - '; - echo esc_html( $row['message'] ) . '

'; + + $message = ''; + + if ( ! empty( $row['message'] ) ) { + // Old versions of Akismet stored the message as a literal string in the commentmeta. + // New versions don't do that for two reasons: + // 1) Save space. + // 2) The message can be translated into the current language of the blog, not stuck + // in the language of the blog when the comment was made. + $message = $row['message']; + } + + // If possible, use a current translation. + switch ( $row['event'] ) { + case 'recheck-spam'; + $message = __( 'Akismet re-checked and caught this comment as spam.', 'akismet' ); + break; + case 'check-spam': + $message = __( 'Akismet caught this comment as spam.', 'akismet' ); + break; + case 'recheck-ham': + $message = __( 'Akismet re-checked and cleared this comment.', 'akismet' ); + break; + case 'check-ham': + $message = __( 'Akismet cleared this comment.', 'akismet' ); + break; + case 'wp-blacklisted': + $message = __( 'Comment was caught by wp_blacklist_check.', 'akismet' ); + break; + case 'report-spam': + if ( isset( $row['user'] ) ) { + $message = sprintf( __( '%s reported this comment as spam.', 'akismet' ), $row['user'] ); + } + else if ( ! $message ) { + $message = __( 'This comment was reported as spam.', 'akismet' ); + } + break; + case 'report-ham': + if ( isset( $row['user'] ) ) { + $message = sprintf( __( '%s reported this comment as not spam.', 'akismet' ), $row['user'] ); + } + else if ( ! $message ) { + $message = __( 'This comment was reported as not spam.', 'akismet' ); + } + break; + case 'cron-retry-spam': + $message = __( 'Akismet caught this comment as spam during an automatic retry.' , 'akismet'); + break; + case 'cron-retry-ham': + $message = __( 'Akismet cleared this comment during an automatic retry.', 'akismet'); + break; + case 'check-error': + if ( isset( $row['meta'], $row['meta']['response'] ) ) { + $message = sprintf( __( 'Akismet was unable to check this comment (response: %s) but will automatically retry later.', 'akismet'), $row['meta']['response'] ); + } + break; + case 'recheck-error': + if ( isset( $row['meta'], $row['meta']['response'] ) ) { + $message = sprintf( __( 'Akismet was unable to recheck this comment (response: %s).', 'akismet'), $row['meta']['response'] ); + } + break; + default: + if ( preg_match( '/^status-changed/', $row['event'] ) ) { + // Half of these used to be saved without the dash after 'status-changed'. + // See https://plugins.trac.wordpress.org/changeset/1150658/akismet/trunk + $new_status = preg_replace( '/^status-changed-?/', '', $row['event'] ); + $message = sprintf( __( 'Comment status was changed to %s', 'akismet' ), $new_status ); + } + else if ( preg_match( '/^status-/', $row['event'] ) ) { + $new_status = preg_replace( '/^status-/', '', $row['event'] ); + + if ( isset( $row['user'] ) ) { + $message = sprintf( __( '%1$s changed the comment status to %2$s.', 'akismet' ), $row['user'], $new_status ); + } + } + break; + + } + + echo '

'; + echo '' . sprintf( esc_html__('%s ago', 'akismet'), human_time_diff( $row['time'] ) ) . ''; + echo ' - '; + echo esc_html( $message ); + echo '

'; } + echo '

'; } } @@ -631,13 +712,16 @@ class Akismet_Admin { } public static function get_akismet_user( $api_key ) { - $akismet_user = Akismet::http_post( Akismet::build_query( array( 'key' => $api_key ) ), 'get-subscription' ); + $akismet_user = false; + + $subscription_verification = Akismet::http_post( Akismet::build_query( array( 'key' => $api_key, 'blog' => get_bloginfo( 'url' ) ) ), 'get-subscription' ); + + if ( ! empty( $subscription_verification[1] ) ) { + if ( 'invalid' !== $subscription_verification[1] ) { + $akismet_user = json_decode( $subscription_verification[1] ); + } + } - if ( ! empty( $akismet_user[1] ) ) - $akismet_user = json_decode( $akismet_user[1] ); - else - $akismet_user = false; - return $akismet_user; } @@ -645,12 +729,13 @@ class Akismet_Admin { $stat_totals = array(); foreach( array( '6-months', 'all' ) as $interval ) { - $response = Akismet::http_post( Akismet::build_query( array( 'blog' => urlencode( get_bloginfo('url') ), 'key' => $api_key, 'from' => $interval ) ), 'get-stats' ); + $response = Akismet::http_post( Akismet::build_query( array( 'blog' => get_bloginfo( 'url' ), 'key' => $api_key, 'from' => $interval ) ), 'get-stats' ); if ( ! empty( $response[1] ) ) { $stat_totals[$interval] = json_decode( $response[1] ); } } + return $stat_totals; } @@ -727,7 +812,7 @@ class Akismet_Admin { } } - if ( $api_key = Akismet::get_api_key() ) { + if ( $api_key = Akismet::get_api_key() && ( empty( self::$notices['status'] ) || 'existing-key-invalid' != self::$notices['status'] ) ) { self::display_configuration_page(); return; } @@ -768,8 +853,16 @@ class Akismet_Admin { public static function display_configuration_page() { $api_key = Akismet::get_api_key(); $akismet_user = self::get_akismet_user( $api_key ); - $stat_totals = self::get_stats( $api_key ); + if ( ! $akismet_user ) { + // This could happen if the user's key became invalid after it was previously valid and successfully set up. + self::$notices['status'] = 'existing-key-invalid'; + self::display_start_page(); + return; + } + + $stat_totals = self::get_stats( $api_key ); + // If unset, create the new strictness option using the old discard option to determine its default if ( get_option( 'akismet_strictness' ) === false ) add_option( 'akismet_strictness', (get_option('akismet_discard_month') === 'true' ? '1' : '0') ); diff --git a/wp-content/plugins/akismet/class.akismet.php b/wp-content/plugins/akismet/class.akismet.php index 5c786526..7a637386 100644 --- a/wp-content/plugins/akismet/class.akismet.php +++ b/wp-content/plugins/akismet/class.akismet.php @@ -9,7 +9,8 @@ class Akismet { private static $initiated = false; private static $prevent_moderation_email_for_these_comments = array(); private static $last_comment_result = null; - + private static $comment_as_submitted_allowed_keys = array( 'blog' => '', 'blog_charset' => '', 'blog_lang' => '', 'blog_ua' => '', 'comment_agent' => '', 'comment_author' => '', 'comment_author_IP' => '', 'comment_author_email' => '', 'comment_author_url' => '', 'comment_content' => '', 'comment_date_gmt' => '', 'comment_tags' => '', 'comment_type' => '', 'guid' => '', 'is_test' => '', 'permalink' => '', 'reporter' => '', 'site_domain' => '', 'submit_referer' => '', 'submit_uri' => '', 'user_ID' => '', 'user_agent' => '', 'user_id' => '', 'user_ip' => '' ); + public static function init() { if ( ! self::$initiated ) { self::init_hooks(); @@ -66,7 +67,14 @@ class Akismet { if ( $response[1] != 'valid' && $response[1] != 'invalid' ) return 'failed'; - self::update_alert( $response ); + return $response[1]; + } + + public static function deactivate_key( $key ) { + $response = self::http_post( Akismet::build_query( array( 'key' => $key, 'blog' => get_option('home') ) ), 'deactivate' ); + + if ( $response[1] != 'deactivated' ) + return 'failed'; return $response[1]; } @@ -124,9 +132,7 @@ class Akismet { do_action( 'akismet_comment_check_response', $response ); - self::update_alert( $response ); - - $commentdata['comment_as_submitted'] = array_intersect_key( $comment, array( 'blog' => '', 'blog_charset' => '', 'blog_lang' => '', 'blog_ua' => '', 'comment_agent' => '', 'comment_author' => '', 'comment_author_IP' => '', 'comment_author_email' => '', 'comment_author_url' => '', 'comment_content' => '', 'comment_date_gmt' => '', 'comment_tags' => '', 'comment_type' => '', 'guid' => '', 'is_test' => '', 'permalink' => '', 'reporter' => '', 'site_domain' => '', 'submit_referer' => '', 'submit_uri' => '', 'user_ID' => '', 'user_agent' => '', 'user_id' => '', 'user_ip' => '' ) ); + $commentdata['comment_as_submitted'] = array_intersect_key( $comment, self::$comment_as_submitted_allowed_keys ); $commentdata['akismet_result'] = $response[1]; if ( isset( $response[0]['x-akismet-pro-tip'] ) ) @@ -228,23 +234,32 @@ class Akismet { // normal result: true or false if ( self::$last_comment['akismet_result'] == 'true' ) { update_comment_meta( $comment->comment_ID, 'akismet_result', 'true' ); - self::update_comment_history( $comment->comment_ID, __('Akismet caught this comment as spam', 'akismet'), 'check-spam' ); + self::update_comment_history( $comment->comment_ID, '', 'check-spam' ); if ( $comment->comment_approved != 'spam' ) - self::update_comment_history( $comment->comment_ID, sprintf( __('Comment status was changed to %s', 'akismet'), $comment->comment_approved), 'status-changed'.$comment->comment_approved ); + self::update_comment_history( + $comment->comment_ID, + '', + 'status-changed-'.$comment->comment_approved + ); } elseif ( self::$last_comment['akismet_result'] == 'false' ) { update_comment_meta( $comment->comment_ID, 'akismet_result', 'false' ); - self::update_comment_history( $comment->comment_ID, __('Akismet cleared this comment', 'akismet'), 'check-ham' ); + self::update_comment_history( $comment->comment_ID, '', 'check-ham' ); if ( $comment->comment_approved == 'spam' ) { if ( wp_blacklist_check($comment->comment_author, $comment->comment_author_email, $comment->comment_author_url, $comment->comment_content, $comment->comment_author_IP, $comment->comment_agent) ) - self::update_comment_history( $comment->comment_ID, __('Comment was caught by wp_blacklist_check', 'akismet'), 'wp-blacklisted' ); + self::update_comment_history( $comment->comment_ID, '', 'wp-blacklisted' ); else - self::update_comment_history( $comment->comment_ID, sprintf( __('Comment status was changed to %s', 'akismet'), $comment->comment_approved), 'status-changed-'.$comment->comment_approved ); + self::update_comment_history( $comment->comment_ID, '', 'status-changed-'.$comment->comment_approved ); } } // abnormal result: error else { update_comment_meta( $comment->comment_ID, 'akismet_error', time() ); - self::update_comment_history( $comment->comment_ID, sprintf( __('Akismet was unable to check this comment (response: %s), will automatically retry again later.', 'akismet'), substr(self::$last_comment['akismet_result'], 0, 50)), 'check-error' ); + self::update_comment_history( + $comment->comment_ID, + '', + 'check-error', + array( 'response' => substr( self::$last_comment['akismet_result'], 0, 50 ) ) + ); } // record the complete original data as submitted for checking @@ -350,8 +365,15 @@ class Akismet { return $history; } - // log an event for a given comment, storing it in comment_meta - public static function update_comment_history( $comment_id, $message, $event=null ) { + /** + * Log an event for a given comment, storing it in comment_meta. + * + * @param int $comment_id The ID of the relevant comment. + * @param string $message The string description of the event. No longer used. + * @param string $event The event code. + * @param array $meta Metadata about the history entry. e.g., the user that reported or changed the status of a given comment. + */ + public static function update_comment_history( $comment_id, $message, $event=null, $meta=null ) { global $current_user; // failsafe for old WP versions @@ -359,15 +381,19 @@ class Akismet { return false; $user = ''; - if ( is_object( $current_user ) && isset( $current_user->user_login ) ) - $user = $current_user->user_login; $event = array( 'time' => self::_get_microtime(), - 'message' => $message, 'event' => $event, - 'user' => $user, ); + + if ( is_object( $current_user ) && isset( $current_user->user_login ) ) { + $event['user'] = $current_user->user_login; + } + + if ( ! empty( $meta ) ) { + $event['meta'] = $meta; + } // $unique = false so as to allow multiple values per comment $r = add_comment_meta( $comment_id, 'akismet_history', $event, false ); @@ -443,7 +469,7 @@ class Akismet { } } - self::update_comment_history( $comment->comment_ID, sprintf( __('%1$s changed the comment status to %2$s', 'akismet'), $reporter, $new_status ), 'status-' . $new_status ); + self::update_comment_history( $comment->comment_ID, '', 'status-' . $new_status ); } public static function submit_spam_comment( $comment_id ) { @@ -460,7 +486,7 @@ class Akismet { return; // use the original version stored in comment_meta if available - $as_submitted = get_comment_meta( $comment_id, 'akismet_as_submitted', true); + $as_submitted = self::sanitize_comment_as_submitted( get_comment_meta( $comment_id, 'akismet_as_submitted', true ) ); if ( $as_submitted && is_array( $as_submitted ) && isset( $as_submitted['comment_content'] ) ) $comment = (object) array_merge( (array)$comment, $as_submitted ); @@ -488,7 +514,7 @@ class Akismet { $response = Akismet::http_post( Akismet::build_query( $comment ), 'submit-spam' ); if ( $comment->reporter ) { - self::update_comment_history( $comment_id, sprintf( __('%s reported this comment as spam', 'akismet'), $comment->reporter ), 'report-spam' ); + self::update_comment_history( $comment_id, '', 'report-spam' ); update_comment_meta( $comment_id, 'akismet_user_result', 'true' ); update_comment_meta( $comment_id, 'akismet_user', $comment->reporter ); } @@ -506,7 +532,7 @@ class Akismet { return; // use the original version stored in comment_meta if available - $as_submitted = get_comment_meta( $comment_id, 'akismet_as_submitted', true); + $as_submitted = self::sanitize_comment_as_submitted( get_comment_meta( $comment_id, 'akismet_as_submitted', true ) ); if ( $as_submitted && is_array($as_submitted) && isset($as_submitted['comment_content']) ) $comment = (object) array_merge( (array)$comment, $as_submitted ); @@ -534,7 +560,7 @@ class Akismet { $response = self::http_post( Akismet::build_query( $comment ), 'submit-ham' ); if ( $comment->reporter ) { - self::update_comment_history( $comment_id, sprintf( __('%s reported this comment as not spam', 'akismet'), $comment->reporter ), 'report-ham' ); + self::update_comment_history( $comment_id, '', 'report-ham' ); update_comment_meta( $comment_id, 'akismet_user_result', 'false' ); update_comment_meta( $comment_id, 'akismet_user', $comment->reporter ); } @@ -573,19 +599,19 @@ class Akismet { add_comment_meta( $comment_id, 'akismet_rechecking', true ); $status = self::check_db_comment( $comment_id, 'retry' ); - $msg = ''; + $event = ''; if ( $status == 'true' ) { - $msg = __( 'Akismet caught this comment as spam during an automatic retry.' , 'akismet'); + $event = 'cron-retry-spam'; } elseif ( $status == 'false' ) { - $msg = __( 'Akismet cleared this comment during an automatic retry.' , 'akismet'); + $event = 'cron-retry-ham'; } // If we got back a legit response then update the comment history // other wise just bail now and try again later. No point in // re-trying all the comments once we hit one failure. - if ( !empty( $msg ) ) { + if ( !empty( $event ) ) { delete_comment_meta( $comment_id, 'akismet_error' ); - self::update_comment_history( $comment_id, $msg, 'cron-retry' ); + self::update_comment_history( $comment_id, '', $event ); update_comment_meta( $comment_id, 'akismet_result', $status ); // make sure the comment status is still pending. if it isn't, that means the user has already moved it elsewhere. $comment = get_comment( $comment_id ); @@ -681,8 +707,16 @@ class Akismet { return ( isset( $comment1['comment_post_ID'], $comment2['comment_post_ID'] ) && intval( $comment1['comment_post_ID'] ) == intval( $comment2['comment_post_ID'] ) - && $comment1['comment_author'] == $comment2['comment_author'] - && $comment1['comment_author_email'] == $comment2['comment_author_email'] + && ( + $comment1['comment_author'] == $comment2['comment_author'] + || stripslashes( $comment1['comment_author'] ) == $comment2['comment_author'] + || $comment1['comment_author'] == stripslashes( $comment2['comment_author'] ) + ) + && ( + $comment1['comment_author_email'] == $comment2['comment_author_email'] + || stripslashes( $comment1['comment_author_email'] ) == $comment2['comment_author_email'] + || $comment1['comment_author_email'] == stripslashes( $comment2['comment_author_email'] ) + ) ); } @@ -882,8 +916,12 @@ class Akismet { do_action( 'akismet_https_disabled' ); } + + $simplified_response = array( $response['headers'], $response['body'] ); + + self::update_alert( $simplified_response ); - return array( $response['headers'], $response['body'] ); + return $simplified_response; } // given a response from an API call like check_key_status(), update the alert code options if an alert is present. @@ -999,7 +1037,7 @@ p { * @static */ public static function plugin_deactivation( ) { - //tidy up + return self::deactivate_key( self::get_api_key() ); } /** @@ -1085,4 +1123,26 @@ p { return $r; } + + /** + * Ensure that we are loading expected scalar values from akismet_as_submitted commentmeta. + * + * @param mixed $meta_value + * @return mixed + */ + private static function sanitize_comment_as_submitted( $meta_value ) { + if ( empty( $meta_value ) ) { + return $meta_value; + } + + $meta_value = (array) $meta_value; + + foreach ( $meta_value as $key => $value ) { + if ( ! isset( self::$comment_as_submitted_allowed_keys[$key] ) || ! is_scalar( $value ) ) { + unset( $meta_value[$key] ); + } + } + + return $meta_value; + } } \ No newline at end of file diff --git a/wp-content/plugins/akismet/readme.txt b/wp-content/plugins/akismet/readme.txt index 00fcd6ae..3aa4dc01 100644 --- a/wp-content/plugins/akismet/readme.txt +++ b/wp-content/plugins/akismet/readme.txt @@ -1,9 +1,9 @@ === Akismet === Contributors: matt, ryan, andy, mdawaffe, tellyworth, josephscott, lessbloat, eoigal, cfinke, automattic, jgs -Tags: akismet, comments, spam +Tags: akismet, comments, spam, antispam, anti-spam, anti spam, comment moderation, comment spam, contact form spam, spam comments Requires at least: 3.2 -Tested up to: 4.2.1 -Stable tag: 3.1.1 +Tested up to: 4.2.2 +Stable tag: 3.1.3 License: GPLv2 or later Akismet checks your comments against the Akismet Web service to see if they look like spam or not. @@ -30,6 +30,21 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co == Changelog == += 3.1.3 = +*Release Date - 6 July 2015* + +* Notify users when their account status changes after previously being successfully set up. This should help any users who are seeing blank Akismet settings screens. + += 3.1.2 = +*Release Date - 7 June 2015* + +* Reduced the amount of space Akismet uses in the commentmeta table. +* Fixed a bug where some comments with quotes in the author name weren't getting history entries +* Pre-emptive security improvements to ensure that the Akismet plugin can't be used by attackers to compromise a WordPress installation. +* Better UI for the key entry field: allow whitespace to be included at the beginning or end of the key and strip it out automatically when the form is submitted. +* When deactivating the plugin, notify the Akismet API so the site can be marked as inactive. +* Clearer error messages. + = 3.1.1 = *Release Date - 17th March, 2015* diff --git a/wp-content/plugins/akismet/views/config.php b/wp-content/plugins/akismet/views/config.php index 232d1078..74701c9e 100644 --- a/wp-content/plugins/akismet/views/config.php +++ b/wp-content/plugins/akismet/views/config.php @@ -67,7 +67,7 @@

diff --git a/wp-content/plugins/akismet/views/notice.php b/wp-content/plugins/akismet/views/notice.php index c2fc45af..182065ed 100644 --- a/wp-content/plugins/akismet/views/notice.php +++ b/wp-content/plugins/akismet/views/notice.php @@ -75,7 +75,11 @@

sign into your account and choose one. Please contact our support team with any questions.', 'akismet'), 'https://akismet.com/account/upgrade/', 'https://akismet.com/contact/' ); ?>

+ sign into your account and choose one.', 'akismet'), 'https://akismet.com/account/upgrade/' ); ?> +

+ contact our support team with any questions.', 'akismet' ), 'https://akismet.com/contact/' ); ?> +

@@ -85,18 +89,31 @@

+ +

our guide about firewalls and check your server configuration.', 'akismet'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

purchase additional Pro subscriptions or upgrade to an Enterprise subscription that allows the use of Akismet on unlimited sites.

If you have any questions, please get in touch with our support team.', 'akismet'), 'https://akismet.com/account/upgrade/', 'https://akismet.com/contact/'); ?>

+ purchase additional Pro subscriptions or upgrade to an Enterprise subscription that allows the use of Akismet on unlimited sites.', 'akismet' ), 'http://docs.akismet.com/billing/add-more-sites/' ); ?> +

+ contact our support team with any questions.', 'akismet' ), 'https://akismet.com/contact/'); ?> +

upgrade to an Enterprise subscription, which covers an unlimited number of sites. Please contact our support team with any questions.', 'akismet'), 'https://akismet.com/account/upgrade/', 'https://akismet.com/contact/'); ?>

+ upgrade to an Enterprise subscription, which covers an unlimited number of sites.', 'akismet'), 'https://akismet.com/account/upgrade/' ); ?>

+

+ contact our support team with any questions.', 'akismet' ), 'https://akismet.com/contact/'); ?>

- + \ No newline at end of file diff --git a/wp-content/plugins/akismet/views/start.php b/wp-content/plugins/akismet/views/start.php index 692b8afe..d6221757 100644 --- a/wp-content/plugins/akismet/views/start.php +++ b/wp-content/plugins/akismet/views/start.php @@ -8,7 +8,7 @@ user_email ); ?>

- + @@ -22,7 +22,7 @@ user_email ); ?> - + @@ -64,7 +64,7 @@

- + @@ -85,7 +85,7 @@

- + diff --git a/wp-content/themes/twentyfifteen/css/editor-style.css b/wp-content/themes/twentyfifteen/css/editor-style.css index ab1b75a5..33db931f 100644 --- a/wp-content/themes/twentyfifteen/css/editor-style.css +++ b/wp-content/themes/twentyfifteen/css/editor-style.css @@ -15,7 +15,6 @@ Description: Used to style the TinyMCE editor. * 6.0 - Galleries * 7.0 - Audio / Video * 8.0 - RTL - * 9.0 - Media Queries */ @@ -297,7 +296,7 @@ table td, img { border: 0; height: auto; - max-width: 660px; + max-width: 100%; vertical-align: middle; } @@ -347,7 +346,7 @@ a { color: #707070; font-family: "Noto Sans", sans-serif; margin: 0 0 28px 0; - max-width: 660px; + max-width: 100%; padding: 0; text-align: inherit; } @@ -476,18 +475,3 @@ body.rtl { .rtl table caption { text-align: right; } - - -/** - * 9.0 Media Queries - */ - -@media screen and (max-width: 740px) { - body, img, .wp-caption { - max-width: 100%; - } - - img, .wp-caption { - width: auto !important; - } -} diff --git a/wp-content/themes/twentyfifteen/functions.php b/wp-content/themes/twentyfifteen/functions.php index 1a8e8a3a..e109a2bc 100644 --- a/wp-content/themes/twentyfifteen/functions.php +++ b/wp-content/themes/twentyfifteen/functions.php @@ -198,7 +198,7 @@ function twentyfifteen_fonts_url() { $fonts_url = add_query_arg( array( 'family' => urlencode( implode( '|', $fonts ) ), 'subset' => urlencode( $subsets ), - ), '//fonts.googleapis.com/css' ); + ), 'https://fonts.googleapis.com/css' ); } return $fonts_url; diff --git a/wp-content/themes/twentyfifteen/inc/custom-header.php b/wp-content/themes/twentyfifteen/inc/custom-header.php index 34994a9f..10d0ef1a 100644 --- a/wp-content/themes/twentyfifteen/inc/custom-header.php +++ b/wp-content/themes/twentyfifteen/inc/custom-header.php @@ -133,7 +133,14 @@ function twentyfifteen_header_style() { if ( ! empty( $header_image ) ) : ?> .site-header { - background: url() no-repeat 50% 50%; + + /* + * No shorthand so the Customizer can override individual properties. + * @see https://core.trac.wordpress.org/ticket/31460 + */ + background-image: url(); + background-repeat: no-repeat; + background-position: 50% 50%; -webkit-background-size: cover; -moz-background-size: cover; -o-background-size: cover; @@ -142,7 +149,14 @@ function twentyfifteen_header_style() { @media screen and (min-width: 59.6875em) { body:before { - background: url() no-repeat 100% 50%; + + /* + * No shorthand so the Customizer can override individual properties. + * @see https://core.trac.wordpress.org/ticket/31460 + */ + background-image: url(); + background-repeat: no-repeat; + background-position: 100% 50%; -webkit-background-size: cover; -moz-background-size: cover; -o-background-size: cover; diff --git a/wp-content/themes/twentyfifteen/inc/template-tags.php b/wp-content/themes/twentyfifteen/inc/template-tags.php index 0a617c09..1baca524 100644 --- a/wp-content/themes/twentyfifteen/inc/template-tags.php +++ b/wp-content/themes/twentyfifteen/inc/template-tags.php @@ -119,7 +119,8 @@ function twentyfifteen_entry_meta() { if ( ! is_single() && ! post_password_required() && ( comments_open() || get_comments_number() ) ) { echo ''; - comments_popup_link( __( 'Leave a comment', 'twentyfifteen' ), __( '1 Comment', 'twentyfifteen' ), __( '% Comments', 'twentyfifteen' ) ); + /* translators: %s: post title */ + comments_popup_link( sprintf( __( 'Leave a comment', 'twentyfifteen' ), get_the_title() ) ); echo ''; } } diff --git a/wp-content/themes/twentyfifteen/js/functions.js b/wp-content/themes/twentyfifteen/js/functions.js index eeeecd22..9adad87e 100644 --- a/wp-content/themes/twentyfifteen/js/functions.js +++ b/wp-content/themes/twentyfifteen/js/functions.js @@ -9,23 +9,39 @@ var $body, $window, $sidebar, adminbarOffset, top = false, bottom = false, windowWidth, windowHeight, lastWindowPos = 0, topOffset = 0, bodyHeight, sidebarHeight, resizeTimer, - secondary, button; - - // Add dropdown toggle that display child menu items. - $( '.main-navigation .menu-item-has-children > a' ).after( '' ); - - // Toggle buttons and submenu items with active children menu items. - $( '.main-navigation .current-menu-ancestor > button' ).addClass( 'toggle-on' ); - $( '.main-navigation .current-menu-ancestor > .sub-menu' ).addClass( 'toggled-on' ); - - $( '.dropdown-toggle' ).click( function( e ) { - var _this = $( this ); - e.preventDefault(); - _this.toggleClass( 'toggle-on' ); - _this.next( '.children, .sub-menu' ).toggleClass( 'toggled-on' ); - _this.attr( 'aria-expanded', _this.attr( 'aria-expanded' ) === 'false' ? 'true' : 'false' ); - _this.html( _this.html() === screenReaderText.expand ? screenReaderText.collapse : screenReaderText.expand ); - } ); + secondary, button; + + function initMainNavigation( container ) { + // Add dropdown toggle that display child menu items. + container.find( '.menu-item-has-children > a' ).after( '' ); + + // Toggle buttons and submenu items with active children menu items. + container.find( '.current-menu-ancestor > button' ).addClass( 'toggle-on' ); + container.find( '.current-menu-ancestor > .sub-menu' ).addClass( 'toggled-on' ); + + container.find( '.dropdown-toggle' ).click( function( e ) { + var _this = $( this ); + e.preventDefault(); + _this.toggleClass( 'toggle-on' ); + _this.next( '.children, .sub-menu' ).toggleClass( 'toggled-on' ); + _this.attr( 'aria-expanded', _this.attr( 'aria-expanded' ) === 'false' ? 'true' : 'false' ); + _this.html( _this.html() === screenReaderText.expand ? screenReaderText.collapse : screenReaderText.expand ); + } ); + } + initMainNavigation( $( '.main-navigation' ) ); + + // Re-initialize the main navigation when it is updated, persisting any existing submenu expanded states. + $( document ).on( 'customize-preview-menu-refreshed', function( e, params ) { + if ( 'primary' === params.wpNavMenuArgs.theme_location ) { + initMainNavigation( params.newContainer ); + + // Re-sync expanded states from oldContainer. + params.oldContainer.find( '.dropdown-toggle.toggle-on' ).each(function() { + var containerId = $( this ).parent().prop( 'id' ); + $( params.newContainer ).find( '#' + containerId + ' > .dropdown-toggle' ).triggerHandler( 'click' ); + }); + } + }); secondary = $( '#secondary' ); button = $( '.site-branding' ).find( '.secondary-toggle' ); diff --git a/wp-content/themes/twentyfifteen/languages/twentyfifteen.pot b/wp-content/themes/twentyfifteen/languages/twentyfifteen.pot index 07f491f8..60a5a634 100644 --- a/wp-content/themes/twentyfifteen/languages/twentyfifteen.pot +++ b/wp-content/themes/twentyfifteen/languages/twentyfifteen.pot @@ -2,9 +2,9 @@ # This file is distributed under the GNU General Public License v2 or later. msgid "" msgstr "" -"Project-Id-Version: Twenty Fifteen 1.1\n" -"Report-Msgid-Bugs-To: http://wordpress.org/support/theme/twentyfifteen\n" -"POT-Creation-Date: 2015-04-23 15:11:26+00:00\n" +"Project-Id-Version: Twenty Fifteen 1.3\n" +"Report-Msgid-Bugs-To: https://wordpress.org/support/theme/twentyfifteen\n" +"POT-Creation-Date: 2015-07-27 19:47:38+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -53,7 +53,7 @@ msgid "Comments are closed." msgstr "" #. translators: %s: Name of current post -#: content-link.php:31 content.php:33 inc/template-tags.php:237 +#: content-link.php:31 content.php:33 inc/template-tags.php:238 msgid "Continue reading %s" msgstr "" @@ -87,7 +87,7 @@ msgid "" "searching can help." msgstr "" -#. #-#-#-#-# twentyfifteen.pot (Twenty Fifteen 1.1) #-#-#-#-# +#. #-#-#-#-# twentyfifteen.pot (Twenty Fifteen 1.3) #-#-#-#-# #. Author URI of the plugin/theme #: footer.php:25 msgid "https://wordpress.org/" @@ -273,16 +273,9 @@ msgctxt "Used before full size attachment link." msgid "Full size" msgstr "" -#: inc/template-tags.php:122 -msgid "Leave a comment" -msgstr "" - -#: inc/template-tags.php:122 -msgid "1 Comment" -msgstr "" - -#: inc/template-tags.php:122 -msgid "% Comments" +#. translators: %s: post title +#: inc/template-tags.php:123 +msgid "Leave a comment" msgstr "" #: search.php:18 diff --git a/wp-content/themes/twentyfifteen/readme.txt b/wp-content/themes/twentyfifteen/readme.txt index aee7f173..540ead0b 100644 --- a/wp-content/themes/twentyfifteen/readme.txt +++ b/wp-content/themes/twentyfifteen/readme.txt @@ -1,16 +1,16 @@ === Twenty Fifteen === Contributors: the WordPress team -Tags: black, blue, gray, pink, purple, white, yellow, dark, light, two-columns, left-sidebar, fixed-layout, responsive-layout, accessibility-ready, custom-background, custom-colors, custom-header, custom-menu, editor-style, featured-images, microformats, post-formats, rtl-language-support, sticky-post, threaded-comments, translation-ready -Requires at least: 4.1 -Tested up to: 4.1 -Stable tag: 4.1 +Requires at least: WordPress 4.1 +Tested up to: WordPress 4.3-trunk +Version: 1.3 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html +Tags: black, blue, gray, pink, purple, white, yellow, dark, light, two-columns, left-sidebar, fixed-layout, responsive-layout, accessibility-ready, custom-background, custom-colors, custom-header, custom-menu, editor-style, featured-images, microformats, post-formats, rtl-language-support, sticky-post, threaded-comments, translation-ready == Description == Our 2015 default theme is clean, blog-focused, and designed for clarity. Twenty Fifteen's simple, straightforward typography is readable on a wide variety of screen sizes, and suitable for multiple languages. We designed it using a mobile-first approach, meaning your content takes center-stage, regardless of whether your visitors arrive by smartphone, tablet, laptop, or desktop computer. -* Responsive Layout +* Mobile-first, Responsive Layout * Custom Colors * Custom Header * Social Links @@ -18,75 +18,59 @@ Our 2015 default theme is clean, blog-focused, and designed for clarity. Twenty * Post Formats * The GPL v2.0 or later license. :) Use it to make something cool. +For more information about Twenty Fifteen please go to https://codex.wordpress.org/Twenty_Fifteen. + == Installation == -1. In your admin panel, go to Appearance -> Themes and click the Add New button. -2. Click Upload and Choose File, then select the theme's ZIP file. Click Install Now. -3. Click Activate to use your new theme right away. - -== Frequently Asked Questions == - -= How do I change the color scheme? = - -You can change the colors of your site easily using Twenty Fifteen. - -1. In your admin panel, go to Appearance -> Customize. -4. Now you will see the Customizer and a tab called 'Colors'. Click this tab. -5. You can now change your color scheme by selecting one of the predefined ones. Choose a color scheme you want from Base Color Scheme dropdown. You can preview the change in the Customizer. -6. Should you wish to create your own color scheme or modify an existing one, you can by selecting the colors for each area listed. -7. Once you are happy with your color changes you can click save and your changes will be reflected on your live site. - -= How do I add the Social Links to the sidebar? = - -Twenty Fifteen allows you display links to your social media profiles, like Twitter and Facebook, with icons. - -1. Create a new Custom Menu, and assign it to the Social Links Menu location. -2. Add links to each of your social services using the Links panel. -3. Icons for your social links will automatically appear if it's available. - -Available icons: (Linking to any of the following sites will automatically display its icon in your social menu). - -* Codepen -* Digg -* Dribbble -* Dropbox -* Facebook -* Flickr -* Foursquare -* GitHub -* Google+ -* Instagram -* LinkedIn -* Email (mailto: links) -* Pinterest -* Pocket -* PollDaddy -* Reddit -* RSS Feed (URLs with /feed/) -* Spotify -* StumbleUpon -* Tumblr -* Twitch -* Twitter -* Vimeo -* WordPress -* YouTube - -Social networks that aren't currently supported will be indicated by a generic share icon. - -= How do I add a description for my menu link in navigation? = - -Twenty Fifteen sports a menu design that's easy to navigate -- especially when you add menu descriptions. - -1. Visit the Menus page in your admin. -2. Use the Screen Options tab to "Show advanced menu properties". -3. Select "Description" there to start editing menu descriptions. -4. Select the menu you want to add links and descriptions to. -5. When in the Menu Structure section, you can click open the link and add a description. -6. Once you save the menu with your link, the new description should show up. - -= Quick Specs = - -1. The main content width is 660px. -2. The sidebar width is 248px. -3. Featured Images are 825px wide by 510px high. +1. In your admin panel, go to Appearance -> Themes and click the 'Add New' button. +2. Type in Twenty Fifteen in the search form and press the 'Enter' key on your keyboard. +3. Click on the 'Activate' button to use your new theme right away. +4. Go to https://codex.wordpress.org/Twenty_Fifteen for a guide on how to customize this theme. +5. Navigate to Appearance > Customize in your admin panel and customize to taste. + +== Copyright == + +Twenty Fifteen WordPress Theme, Copyright 2014-2015 WordPress.org & Automattic.com +Twenty Fifteen is distributed under the terms of the GNU GPL + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +Twenty Fifteen Theme bundles the following third-party resources: + +HTML5 Shiv v3.7.0, Copyright 2014 Alexander Farkas +Licenses: MIT/GPL2 +Source: https://github.com/aFarkas/html5shiv + +Genericons icon font, Copyright 2013-2015 Automattic.com +License: GNU GPL, Version 2 (or later) +Source: http://www.genericons.com + +== Changelog == + += 1.3 = +* Released: August 18, 2015 + +https://codex.wordpress.org/Twenty_Fifteen_Theme_Changelog#Version_1.3 + += 1.2 = +* Released: May 6, 2015 + +https://codex.wordpress.org/Twenty_Fifteen_Theme_Changelog#Version_1.2 + += 1.1 = +* Released: April 23, 2015 + +https://codex.wordpress.org/Twenty_Fifteen_Theme_Changelog#Version_1.1 + += 1.0 = +* Released: December 18, 2014 + +Initial release diff --git a/wp-content/themes/twentyfifteen/style.css b/wp-content/themes/twentyfifteen/style.css index 9ed56fd0..1e4e8e88 100644 --- a/wp-content/themes/twentyfifteen/style.css +++ b/wp-content/themes/twentyfifteen/style.css @@ -4,7 +4,7 @@ Theme URI: https://wordpress.org/themes/twentyfifteen/ Author: the WordPress team Author URI: https://wordpress.org/ Description: Our 2015 default theme is clean, blog-focused, and designed for clarity. Twenty Fifteen's simple, straightforward typography is readable on a wide variety of screen sizes, and suitable for multiple languages. We designed it using a mobile-first approach, meaning your content takes center-stage, regardless of whether your visitors arrive by smartphone, tablet, laptop, or desktop computer. -Version: 1.2 +Version: 1.3 License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Tags: black, blue, gray, pink, purple, white, yellow, dark, light, two-columns, left-sidebar, fixed-layout, responsive-layout, accessibility-ready, custom-background, custom-colors, custom-header, custom-menu, editor-style, featured-images, microformats, post-formats, rtl-language-support, sticky-post, threaded-comments, translation-ready @@ -490,6 +490,10 @@ textarea { button, input { + -webkit-hyphens: none; + -moz-hyphens: none; + -ms-hyphens: none; + hyphens: none; line-height: normal; } @@ -880,6 +884,14 @@ a:focus { content: "\f413"; } +.social-navigation a[href*="path.com"]:before { + content: "\f219"; +} + +.social-navigation a[href*="skype.com"]:before { + content: "\f220"; +} + .secondary-toggle { background-color: transparent; border: 1px solid #eaeaea; diff --git a/wp-content/themes/twentyfourteen/css/editor-style.css b/wp-content/themes/twentyfourteen/css/editor-style.css index b4dd3253..6bd5ac0f 100644 --- a/wp-content/themes/twentyfourteen/css/editor-style.css +++ b/wp-content/themes/twentyfourteen/css/editor-style.css @@ -17,7 +17,6 @@ Description: Used to style the TinyMCE editor. * 8.0 - Galleries * 9.0 - Audio/Video * 10.0 - RTL - * 11.0 - Media Queries * ---------------------------------------------------------------------------- */ @@ -380,7 +379,7 @@ blockquote.alignright p { img { height: auto; - max-width: 474px; + max-width: 100%; vertical-align: middle; } @@ -389,7 +388,7 @@ img { border: none; color: #767676; margin: 0 0 24px 0; - max-width: 474px; + max-width: 100%; padding: 0; text-align: left; } @@ -720,18 +719,3 @@ html .mceContentBody.rtl { .rtl td { text-align: right; } - - -/** - * 11.0 Media Queries - */ - -@media screen and (max-width: 494px) { - body, img, .wp-caption { - max-width: 100%; - } - - img, .wp-caption { - width: auto !important; - } -} diff --git a/wp-content/themes/twentyfourteen/footer.php b/wp-content/themes/twentyfourteen/footer.php index b297a2e9..519e1288 100644 --- a/wp-content/themes/twentyfourteen/footer.php +++ b/wp-content/themes/twentyfourteen/footer.php @@ -18,7 +18,7 @@

- +

diff --git a/wp-content/themes/twentyfourteen/functions.php b/wp-content/themes/twentyfourteen/functions.php index 5bf5ce03..4e65214a 100644 --- a/wp-content/themes/twentyfourteen/functions.php +++ b/wp-content/themes/twentyfourteen/functions.php @@ -215,7 +215,7 @@ function twentyfourteen_font_url() { 'family' => urlencode( 'Lato:300,400,700,900,300italic,400italic,700italic' ), 'subset' => urlencode( 'latin,latin-ext' ), ); - $font_url = add_query_arg( $query_args, '//fonts.googleapis.com/css' ); + $font_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' ); } return $font_url; diff --git a/wp-content/themes/twentyfourteen/languages/twentyfourteen.pot b/wp-content/themes/twentyfourteen/languages/twentyfourteen.pot index e238d266..1acebad9 100644 --- a/wp-content/themes/twentyfourteen/languages/twentyfourteen.pot +++ b/wp-content/themes/twentyfourteen/languages/twentyfourteen.pot @@ -2,9 +2,9 @@ # This file is distributed under the GNU General Public License v2 or later. msgid "" msgstr "" -"Project-Id-Version: Twenty Fourteen 1.4\n" -"Report-Msgid-Bugs-To: http://wordpress.org/support/theme/twentyfourteen\n" -"POT-Creation-Date: 2015-04-23 15:11:25+00:00\n" +"Project-Id-Version: Twenty Fourteen 1.5\n" +"Report-Msgid-Bugs-To: https://wordpress.org/support/theme/twentyfourteen\n" +"POT-Creation-Date: 2015-07-27 19:47:38+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -142,8 +142,10 @@ msgid "" "searching can help." msgstr "" +#. #-#-#-#-# twentyfourteen.pot (Twenty Fourteen 1.5) #-#-#-#-# +#. Author URI of the plugin/theme #: footer.php:21 -msgid "http://wordpress.org/" +msgid "https://wordpress.org/" msgstr "" #: footer.php:21 @@ -277,7 +279,7 @@ msgstr "" msgid "Slider" msgstr "" -#. #-#-#-#-# twentyfourteen.pot (Twenty Fourteen 1.4) #-#-#-#-# +#. #-#-#-#-# twentyfourteen.pot (Twenty Fourteen 1.5) #-#-#-#-# #. Theme Name of the plugin/theme #: inc/customizer.php:105 msgid "Twenty Fourteen" @@ -467,10 +469,6 @@ msgstr "" msgid "the WordPress team" msgstr "" -#. Author URI of the plugin/theme -msgid "https://wordpress.org/" -msgstr "" - #. Template Name of the plugin/theme msgid "Contributor Page" msgstr "" diff --git a/wp-content/themes/twentyfourteen/readme.txt b/wp-content/themes/twentyfourteen/readme.txt new file mode 100644 index 00000000..1b69e67a --- /dev/null +++ b/wp-content/themes/twentyfourteen/readme.txt @@ -0,0 +1,81 @@ +=== Twenty Fourteen === +Contributors: the WordPress team +Requires at least: WordPress 3.6 +Tested up to: WordPress 4.3-trunk +Stable tag: 1.5 +License: GPLv2 or later +License URI: http://www.gnu.org/licenses/gpl-2.0.html +Tags: black, green, white, light, dark, two-columns, three-columns, left-sidebar, right-sidebar, fixed-layout, responsive-layout, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready, accessibility-ready + +== Description == +In 2014, our default theme lets you create a responsive magazine website with a sleek, modern design. Feature your favorite homepage content in either a grid or a slider. Use the three widget areas to customize your website, and change your content's layout with a full-width page template and a contributor page to show off your authors. Creating a magazine website with WordPress has never been easier. + +For more information about Twenty Fourteen please go to https://codex.wordpress.org/Twenty_Fourteen. + +== Installation == + +1. In your admin panel, go to Appearance -> Themes and click the 'Add New' button. +2. Type in Twenty Fourteen in the search form and press the 'Enter' key in your keyboard. +3. Click on the 'Activate' button to use your new theme right away. +4. Go to https://codex.wordpress.org/Twenty_Fourteen for a guide to customize this theme. +5. Navigate to Appearance > Customize in your admin panel. + +== Copyright == + +Twenty Fourteen WordPress Theme, Copyright 2013-2015 WordPress.org & Automattic.com +Twenty Fourteen is Distributed under the terms of the GNU GPL + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +Twenty Fourteen Theme is derived from the Further Theme, Copyright 2013 Takashi Irie +Further Theme is distributed under the terms of the GNU GPL + +Twenty Fourteen Theme bundles the following third-party resources: + +HTML5 Shiv v3.7.0, Copyright 2014 Alexander Farkas +Licenses: MIT/GPL2 +Source: https://github.com/aFarkas/html5shiv + +Genericons icon font, Copyright 2013-2015 Automattic.com +License: GNU GPL, Version 2 (or later) +Source: http://www.genericons.com + +== Changelog == + += 1.5 = +* Released: August 18, 2015 + +https://codex.wordpress.org/Twenty_Fourteen_Theme_Changelog#Version_1.5 + += 1.4 = +* Released: April 23, 2015 + +https://codex.wordpress.org/Twenty_Fourteen_Theme_Changelog#Version_1.4 + += 1.3 = +* Released: December 18, 2014 + +https://codex.wordpress.org/Twenty_Fourteen_Theme_Changelog#Version_1.3 + += 1.2 = +* Released: September 4, 2014 + +https://codex.wordpress.org/Twenty_Fourteen_Theme_Changelog#Version_1.2 + += 1.1 = +* Released: May 8, 2014 + +https://codex.wordpress.org/Twenty_Fourteen_Theme_Changelog#Version_1.1 + += 1.0 = +* Released: December 12, 2013 + +Initial release. diff --git a/wp-content/themes/twentyfourteen/rtl.css b/wp-content/themes/twentyfourteen/rtl.css index 80e16d0d..af7f6f46 100644 --- a/wp-content/themes/twentyfourteen/rtl.css +++ b/wp-content/themes/twentyfourteen/rtl.css @@ -4,7 +4,7 @@ Description: Adds support for languages written in a Right To Left (RTL) directi It's easy, just a matter of overwriting all the horizontal positioning attributes of your CSS stylesheet in a separate stylesheet file named rtl.css. -See http://codex.wordpress.org/Right_to_Left_Language_Support +See https://codex.wordpress.org/Right_to_Left_Language_Support */ /** diff --git a/wp-content/themes/twentyfourteen/style.css b/wp-content/themes/twentyfourteen/style.css index 9b9515f6..91ce0175 100644 --- a/wp-content/themes/twentyfourteen/style.css +++ b/wp-content/themes/twentyfourteen/style.css @@ -4,7 +4,7 @@ Theme URI: https://wordpress.org/themes/twentyfourteen/ Author: the WordPress team Author URI: https://wordpress.org/ Description: In 2014, our default theme lets you create a responsive magazine website with a sleek, modern design. Feature your favorite homepage content in either a grid or a slider. Use the three widget areas to customize your website, and change your content's layout with a full-width page template and a contributor page to show off your authors. Creating a magazine website with WordPress has never been easier. -Version: 1.4 +Version: 1.5 License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Tags: black, green, white, light, dark, two-columns, three-columns, left-sidebar, right-sidebar, fixed-layout, responsive-layout, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready, accessibility-ready diff --git a/wp-content/themes/twentythirteen/css/editor-style.css b/wp-content/themes/twentythirteen/css/editor-style.css index 2e621844..56841899 100644 --- a/wp-content/themes/twentythirteen/css/editor-style.css +++ b/wp-content/themes/twentythirteen/css/editor-style.css @@ -18,7 +18,6 @@ Description: Used to style the TinyMCE editor. * 9.0 - Audio/Video * 10.0 - Post Formats * 11.0 - RTL - * 12.0 - Media Queries * ---------------------------------------------------------------------------- */ @@ -770,18 +769,3 @@ html .mceContentBody.rtl { background: none; content: none; } - - -/** - * 12.0 Media Queries - */ - -@media screen and (max-width: 604px) { - body, img, .wp-caption { - max-width: 100%; - } - - img, .wp-caption { - width: auto !important; - } -} diff --git a/wp-content/themes/twentythirteen/footer.php b/wp-content/themes/twentythirteen/footer.php index 725251c4..6dc4f94b 100644 --- a/wp-content/themes/twentythirteen/footer.php +++ b/wp-content/themes/twentythirteen/footer.php @@ -16,7 +16,7 @@

- +

diff --git a/wp-content/themes/twentythirteen/functions.php b/wp-content/themes/twentythirteen/functions.php index 9c85c993..e87761f2 100644 --- a/wp-content/themes/twentythirteen/functions.php +++ b/wp-content/themes/twentythirteen/functions.php @@ -146,7 +146,7 @@ function twentythirteen_fonts_url() { 'family' => urlencode( implode( '|', $font_families ) ), 'subset' => urlencode( 'latin,latin-ext' ), ); - $fonts_url = add_query_arg( $query_args, '//fonts.googleapis.com/css' ); + $fonts_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' ); } return $fonts_url; diff --git a/wp-content/themes/twentythirteen/languages/twentythirteen.pot b/wp-content/themes/twentythirteen/languages/twentythirteen.pot index 884def61..7706373e 100644 --- a/wp-content/themes/twentythirteen/languages/twentythirteen.pot +++ b/wp-content/themes/twentythirteen/languages/twentythirteen.pot @@ -2,9 +2,9 @@ # This file is distributed under the GNU General Public License v2 or later. msgid "" msgstr "" -"Project-Id-Version: Twenty Thirteen 1.5\n" -"Report-Msgid-Bugs-To: http://wordpress.org/support/theme/twentythirteen\n" -"POT-Creation-Date: 2015-04-23 15:11:25+00:00\n" +"Project-Id-Version: Twenty Thirteen 1.6\n" +"Report-Msgid-Bugs-To: https://wordpress.org/support/theme/twentythirteen\n" +"POT-Creation-Date: 2015-07-27 19:47:38+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -147,8 +147,10 @@ msgid "" "searching can help." msgstr "" +#. #-#-#-#-# twentythirteen.pot (Twenty Thirteen 1.6) #-#-#-#-# +#. Author URI of the plugin/theme #: footer.php:19 -msgid "http://wordpress.org/" +msgid "https://wordpress.org/" msgstr "" #: footer.php:19 @@ -330,7 +332,3 @@ msgstr "" #. Author of the plugin/theme msgid "the WordPress team" msgstr "" - -#. Author URI of the plugin/theme -msgid "https://wordpress.org/" -msgstr "" diff --git a/wp-content/themes/twentythirteen/readme.txt b/wp-content/themes/twentythirteen/readme.txt new file mode 100644 index 00000000..807443d7 --- /dev/null +++ b/wp-content/themes/twentythirteen/readme.txt @@ -0,0 +1,83 @@ +=== Twenty Thirteen === +Contributors: the WordPress team +Requires at least: WordPress 3.6 +Tested up to: WordPress 4.3-trunk +Stable tag: 1.6 +License: GPLv2 or later +License URI: http://www.gnu.org/licenses/gpl-2.0.html +Tags: black, brown, orange, tan, white, yellow, light, one-column, two-columns, right-sidebar, fluid-layout, responsive-layout, custom-header, custom-menu, editor-style, featured-images, microformats, post-formats, rtl-language-support, sticky-post, translation-ready, accessibility-ready + +== Description == +The 2013 theme for WordPress takes us back to the blog, featuring a full range of post formats, each displayed beautifully in their own unique way. Design details abound, starting with a vibrant color scheme and matching header images, beautiful typography and icons, and a flexible layout that looks great on any device, big or small. + +For more information about Twenty Thirteen please go to https://codex.wordpress.org/Twenty_Thirteen. + +== Installation == + +1. In your admin panel, go to Appearance -> Themes and click the 'Add New' button. +2. Type in Twenty Thirteen in the search form and press the 'Enter' key in your keyboard. +3. Click on the 'Activate' button to use your new theme right away. +4. Go to https://codex.wordpress.org/Twenty_Thirteen for a guide to customize this theme. +5. Navigate to Appearance > Customize in your admin panel. + +== Copyright == + +Twenty Thirteen WordPress Theme, Copyright 2013-2015 WordPress.org & Automattic.com +Twenty Thirteen is Distributed under the terms of the GNU GPL + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +Twenty Thirteen Theme bundles the following third-party resources: + +HTML5 Shiv v3.7.0, Copyright 2014 Alexander Farkas +Licenses: MIT/GPL2 +Source: https://github.com/aFarkas/html5shiv + +Genericons icon font, Copyright 2013-2015 Automattic.com +License: GNU GPL, Version 2 (or later) +Source: http://www.genericons.com + +== Changelog == + += 1.6 = +* Released: August 18, 2015 + +https://codex.wordpress.org/Twenty_Thirteen_Theme_Changelog#Version_1.6 + += 1.5 = +* Released: April 23, 2015 + +https://codex.wordpress.org/Twenty_Thirteen_Theme_Changelog#Version_1.5 + += 1.4 = +* Released: December 18, 2014 + +https://codex.wordpress.org/Twenty_Thirteen_Theme_Changelog#Version_1.4 + += 1.3 = +* Released: September 4, 2014 + +https://codex.wordpress.org/Twenty_Thirteen_Theme_Changelog#Version_1.3 + += 1.2 = +* Released: May 8, 2014 + +https://codex.wordpress.org/Twenty_Thirteen_Theme_Changelog#Version_1.2 + += 1.1 = +* Released: October 24, 2013 + +https://codex.wordpress.org/Twenty_Thirteen_Theme_Changelog#Version_1.1 + += 1.0 = +* Released: August 1, 2013 + +Initial release. diff --git a/wp-content/themes/twentythirteen/rtl.css b/wp-content/themes/twentythirteen/rtl.css index 54286302..447d385c 100644 --- a/wp-content/themes/twentythirteen/rtl.css +++ b/wp-content/themes/twentythirteen/rtl.css @@ -4,7 +4,7 @@ Description: Adds support for languages written in a Right To Left (RTL) directi It's easy, just a matter of overwriting all the horizontal positioning attributes of your CSS stylesheet in a separate stylesheet file named rtl.css. -See http://codex.wordpress.org/Right_to_Left_Language_Support +See https://codex.wordpress.org/Right_to_Left_Language_Support */ /** diff --git a/wp-content/themes/twentythirteen/style.css b/wp-content/themes/twentythirteen/style.css index 1322f48c..d547283d 100644 --- a/wp-content/themes/twentythirteen/style.css +++ b/wp-content/themes/twentythirteen/style.css @@ -4,7 +4,7 @@ Theme URI: https://wordpress.org/themes/twentythirteen/ Author: the WordPress team Author URI: https://wordpress.org/ Description: The 2013 theme for WordPress takes us back to the blog, featuring a full range of post formats, each displayed beautifully in their own unique way. Design details abound, starting with a vibrant color scheme and matching header images, beautiful typography and icons, and a flexible layout that looks great on any device, big or small. -Version: 1.5 +Version: 1.6 License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Tags: black, brown, orange, tan, white, yellow, light, one-column, two-columns, right-sidebar, fluid-layout, responsive-layout, custom-header, custom-menu, editor-style, featured-images, microformats, post-formats, rtl-language-support, sticky-post, translation-ready, accessibility-ready diff --git a/wp-cron.php b/wp-cron.php index 75379a05..15c6676b 100644 --- a/wp-cron.php +++ b/wp-cron.php @@ -64,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 ) ) { @@ -79,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; diff --git a/wp-includes/ID3/getid3.lib.php b/wp-includes/ID3/getid3.lib.php index 0c92e060..76e2854a 100644 --- a/wp-includes/ID3/getid3.lib.php +++ b/wp-includes/ID3/getid3.lib.php @@ -519,11 +519,13 @@ class getid3_lib } public static function XML2array($XMLstring) { - if ( function_exists( 'simplexml_load_string' ) && function_exists( 'libxml_disable_entity_loader' ) ) { - $loader = libxml_disable_entity_loader( true ); - $XMLobject = simplexml_load_string( $XMLstring, 'SimpleXMLElement', LIBXML_NOENT ); - $return = self::SimpleXMLelement2array( $XMLobject ); - libxml_disable_entity_loader( $loader ); + 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; @@ -1163,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); } @@ -1373,4 +1377,4 @@ class getid3_lib return substr(basename('X'.$splited[count($splited) - 1], $suffix), 1); } -} \ No newline at end of file +} diff --git a/wp-includes/ID3/getid3.php b/wp-includes/ID3/getid3.php index 394e25e4..714fb027 100644 --- a/wp-includes/ID3/getid3.php +++ b/wp-includes/ID3/getid3.php @@ -28,7 +28,7 @@ $temp_dir = ini_get('upload_tmp_dir'); if ($temp_dir && (!is_dir($temp_dir) || !is_readable($temp_dir))) { $temp_dir = ''; } -if (!$temp_dir) { +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(); } @@ -109,7 +109,7 @@ class getID3 protected $startup_error = ''; protected $startup_warning = ''; - const VERSION = '1.9.8-20140511'; + const VERSION = '1.9.9-20141121'; const FREAD_BUFFER_SIZE = 32768; const ATTACHMENTS_NONE = false; @@ -249,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)) { @@ -1793,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.commercial.txt b/wp-includes/ID3/license.commercial.txt index bc7861bf..416e5a14 100644 --- a/wp-includes/ID3/license.commercial.txt +++ b/wp-includes/ID3/license.commercial.txt @@ -24,4 +24,4 @@ made publicly available to all getID3() users. The licensee may not sub-license getID3() itself, meaning that any commercially released product containing all or parts of getID3() must have added functionality beyond what is available in getID3(); -getID3() itself may not be re-licensed by the licensee. \ No newline at end of file +getID3() itself may not be re-licensed by the licensee. diff --git a/wp-includes/ID3/license.txt b/wp-includes/ID3/license.txt index 32d8ec76..205c7e61 100644 --- a/wp-includes/ID3/license.txt +++ b/wp-includes/ID3/license.txt @@ -26,4 +26,4 @@ getID3 Commercial License: http://getid3.org/#gCL (payment required) ***************************************************************** Copies of each of the above licenses are included in the 'licenses' -directory of the getID3 distribution. \ No newline at end of file +directory of the getID3 distribution. diff --git a/wp-includes/ID3/module.audio-video.asf.php b/wp-includes/ID3/module.audio-video.asf.php index 884e2fff..ee61d7dc 100644 --- a/wp-includes/ID3/module.audio-video.asf.php +++ b/wp-includes/ID3/module.audio-video.asf.php @@ -2010,4 +2010,4 @@ class getid3_asf extends getid3_handler { return $string; } -} \ No newline at end of file +} diff --git a/wp-includes/ID3/module.audio-video.flv.php b/wp-includes/ID3/module.audio-video.flv.php index 2ee077eb..c5fbd4b0 100644 --- a/wp-includes/ID3/module.audio-video.flv.php +++ b/wp-includes/ID3/module.audio-video.flv.php @@ -742,4 +742,4 @@ class AVCSequenceParameterSetReader { public function getHeight() { return $this->height; } -} \ No newline at end of file +} diff --git a/wp-includes/ID3/module.audio-video.matroska.php b/wp-includes/ID3/module.audio-video.matroska.php index 79d0b7de..f2cc5ac0 100644 --- a/wp-includes/ID3/module.audio-video.matroska.php +++ b/wp-includes/ID3/module.audio-video.matroska.php @@ -1748,4 +1748,4 @@ class getid3_matroska extends getid3_handler return $info; } -} \ No newline at end of file +} diff --git a/wp-includes/ID3/module.audio-video.quicktime.php b/wp-includes/ID3/module.audio-video.quicktime.php index 03f7a922..482c0912 100644 --- a/wp-includes/ID3/module.audio-video.quicktime.php +++ b/wp-includes/ID3/module.audio-video.quicktime.php @@ -35,7 +35,7 @@ class getid3_quicktime extends getid3_handler $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'; @@ -68,7 +68,7 @@ class getid3_quicktime extends getid3_handler break; } $atomHierarchy = array(); - $info['quicktime'][$atomname] = $this->QuicktimeParseAtom($atomname, $atomsize, $this->fread(min($atomsize, round($this->getid3->memory_limit / 2))), $offset, $atomHierarchy, $this->ParseAllPossibleAtoms); + $info['quicktime'][$atomname] = $this->QuicktimeParseAtom($atomname, $atomsize, $this->fread(min($atomsize, $atom_data_read_buffer_size)), $offset, $atomHierarchy, $this->ParseAllPossibleAtoms); $offset += $atomsize; $atomcounter++; @@ -799,9 +799,9 @@ if (!empty($atom_structure['sample_description_table'][$i]['width']) && !empty($ //$FrameRateCalculatorArray = array(); $frames_count = 0; - $max_stts_entries_to_scan = min(floor($this->getid3->memory_limit / 10000), $atom_structure['number_entries']); + $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($this->getid3->memory_limit / 1048576).'MB).'; + $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)); @@ -1399,7 +1399,7 @@ if (!empty($atom_structure['sample_description_table'][$i]['width']) && !empty($ 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)); @@ -2243,4 +2243,4 @@ echo 'QuicktimeParseNikonNCTG()::unknown $data_size_type: '.$data_size_type.'
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); } } } @@ -343,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']); } @@ -440,4 +450,4 @@ class getid3_flac extends getid3_handler return (isset($lookup[$type_id]) ? $lookup[$type_id] : 'reserved'); } -} \ No newline at end of file +} diff --git a/wp-includes/ID3/module.audio.mp3.php b/wp-includes/ID3/module.audio.mp3.php index 98877a93..329f7a67 100644 --- a/wp-includes/ID3/module.audio.mp3.php +++ b/wp-includes/ID3/module.audio.mp3.php @@ -2009,4 +2009,4 @@ class getid3_mp3 extends getid3_handler return (isset($LAMEpresetUsedLookup[$LAMEtag['preset_used_id']]) ? $LAMEpresetUsedLookup[$LAMEtag['preset_used_id']] : 'new/unknown preset: '.$LAMEtag['preset_used_id'].' - report to info@getid3.org'); } -} \ No newline at end of file +} diff --git a/wp-includes/ID3/module.audio.ogg.php b/wp-includes/ID3/module.audio.ogg.php index f3bb0047..2a77768b 100644 --- a/wp-includes/ID3/module.audio.ogg.php +++ b/wp-includes/ID3/module.audio.ogg.php @@ -63,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 @@ -255,7 +261,7 @@ $info['warning'][] = 'Ogg Theora (v3) not fully supported in this version of get } 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; @@ -288,8 +294,19 @@ $info['warning'][] = 'Ogg Theora (v3) not fully supported in this version of get $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'])) { @@ -409,6 +426,57 @@ $info['warning'][] = 'Ogg Theora (v3) not fully supported in this version of get 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 @@ -471,6 +539,7 @@ $info['warning'][] = 'Ogg Theora (v3) not fully supported in this version of get 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']; @@ -479,6 +548,10 @@ $info['warning'][] = 'Ogg Theora (v3) not fully supported in this version of get if ($info['audio']['dataformat'] == 'vorbis') { $commentdataoffset += (strlen('vorbis') + 1); } + else if ($info['audio']['dataformat'] == 'opus') { + $commentdataoffset += strlen('OpusTags'); + } + break; case 'flac': @@ -505,6 +578,12 @@ $info['warning'][] = 'Ogg Theora (v3) not fully supported in this version of get $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)) { @@ -615,8 +694,12 @@ $info['warning'][] = 'Ogg Theora (v3) not fully supported in this version of get $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); @@ -753,4 +836,4 @@ $info['warning'][] = 'Ogg Theora (v3) not fully supported in this version of get return (isset($TheoraPixelFormatLookup[$pixelformat_id]) ? $TheoraPixelFormatLookup[$pixelformat_id] : null); } -} \ No newline at end of file +} diff --git a/wp-includes/ID3/module.tag.apetag.php b/wp-includes/ID3/module.tag.apetag.php index 5bd4b835..724b8b0f 100644 --- a/wp-includes/ID3/module.tag.apetag.php +++ b/wp-includes/ID3/module.tag.apetag.php @@ -138,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': @@ -222,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']); @@ -269,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; @@ -317,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); @@ -368,4 +409,4 @@ class getid3_apetag extends getid3_handler return in_array(strtolower($itemkey), $APEtagItemIsUTF8Lookup); } -} \ No newline at end of file +} diff --git a/wp-includes/ID3/module.tag.id3v1.php b/wp-includes/ID3/module.tag.id3v1.php index def281ae..3b4edfd2 100644 --- a/wp-includes/ID3/module.tag.id3v1.php +++ b/wp-includes/ID3/module.tag.id3v1.php @@ -357,4 +357,4 @@ class getid3_id3v1 extends getid3_handler return $ID3v1Tag; } -} \ No newline at end of file +} diff --git a/wp-includes/ID3/module.tag.id3v2.php b/wp-includes/ID3/module.tag.id3v2.php index d1c4fce7..70925048 100644 --- a/wp-includes/ID3/module.tag.id3v2.php +++ b/wp-includes/ID3/module.tag.id3v2.php @@ -625,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); @@ -640,8 +641,8 @@ 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'])) { $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']])) { @@ -717,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); @@ -729,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) { @@ -956,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); @@ -1002,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; @@ -1020,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 { @@ -1060,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); @@ -1330,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) { @@ -1367,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); @@ -1386,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'] = ''; @@ -1443,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); @@ -1462,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); @@ -1472,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; @@ -1607,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 //

@@ -1635,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']); @@ -1729,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); @@ -1752,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); @@ -1944,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; @@ -3344,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) { @@ -3422,3 +3624,4 @@ class getid3_id3v2 extends getid3_handler } } + diff --git a/wp-includes/ID3/module.tag.lyrics3.php b/wp-includes/ID3/module.tag.lyrics3.php index 7891603e..419888bf 100644 --- a/wp-includes/ID3/module.tag.lyrics3.php +++ b/wp-includes/ID3/module.tag.lyrics3.php @@ -101,20 +101,24 @@ class getid3_lyrics3 extends getid3_handler $this->getLyrics3Data($lyrics3offset, $lyrics3version, $lyrics3size); if (!isset($info['ape'])) { - $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); - $getid3_apetag->overrideendoffset = $info['lyrics3']['tag_offset_start']; - $getid3_apetag->Analyze(); - if (!empty($getid3_temp->info['ape'])) { - $info['ape'] = $getid3_temp->info['ape']; - } - if (!empty($getid3_temp->info['replay_gain'])) { - $info['replay_gain'] = $getid3_temp->info['replay_gain']; + 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); + $getid3_apetag->overrideendoffset = $info['lyrics3']['tag_offset_start']; + $getid3_apetag->Analyze(); + if (!empty($getid3_temp->info['ape'])) { + $info['ape'] = $getid3_temp->info['ape']; + } + if (!empty($getid3_temp->info['replay_gain'])) { + $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)'; } - unset($getid3_temp, $getid3_apetag); } } @@ -291,4 +295,4 @@ class getid3_lyrics3 extends getid3_handler } return null; } -} \ No newline at end of file +} diff --git a/wp-includes/Text/Diff.php b/wp-includes/Text/Diff.php index dc24b67f..edcdd3ac 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/Renderer.php b/wp-includes/Text/Diff/Renderer.php index 95c6db4b..712d985a 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 746fdca7..de33f54d 100644 --- a/wp-includes/admin-bar.php +++ b/wp-includes/admin-bar.php @@ -13,6 +13,9 @@ * * @since 3.1.0 * @access private + * + * @global WP_Admin_Bar $wp_admin_bar + * * @return bool Whether the admin bar was successfully initialized. */ function _wp_admin_bar_init() { @@ -55,12 +58,14 @@ function _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. @@ -268,7 +273,7 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) { 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, '…' ); @@ -313,6 +318,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. * @@ -480,6 +512,9 @@ function wp_admin_bar_shortlink_menu( $wp_admin_bar ) { * * @since 3.1.0 * + * @global object $tag + * @global WP_Query $wp_the_query + * * @param WP_Admin_Bar $wp_admin_bar */ function wp_admin_bar_edit_menu( $wp_admin_bar ) { @@ -496,7 +531,7 @@ function wp_admin_bar_edit_menu( $wp_admin_bar ) { && ( $post_type_object->public ) && ( $post_type_object->show_in_admin_bar ) ) { - if( 'draft' == $post->post_status ) { + if ( 'draft' == $post->post_status ) { $preview_link = set_url_scheme( get_permalink( $post->ID ) ); /** This filter is documented in wp-admin/includes/meta-boxes.php */ $preview_link = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ), $post ); @@ -656,44 +691,13 @@ 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' ) ); - $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; - $customize_url = add_query_arg( 'url', urlencode( $current_url ), wp_customize_url() ); - if ( current_user_can( 'switch_themes' ) ) { $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'themes', 'title' => __( 'Themes' ), 'href' => admin_url( 'themes.php' ), - 'meta' => array( - 'class' => 'hide-if-customize', - ), ) ); - - if ( current_user_can( 'customize' ) ) { - $wp_admin_bar->add_menu( array( - 'parent' => 'appearance', - 'id' => 'customize-themes', - 'title' => __( 'Themes' ), - 'href' => add_query_arg( urlencode( 'autofocus[section]' ), 'themes', $customize_url ), // urlencode() needed due to #16859 - 'meta' => array( - 'class' => 'hide-if-no-customize', - ), - ) ); - } - } - - if ( current_user_can( 'customize' ) ) { - $wp_admin_bar->add_menu( array( - 'parent' => 'appearance', - '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' ); } if ( ! current_user_can( 'edit_theme_options' ) ) { @@ -706,22 +710,7 @@ function wp_admin_bar_appearance_menu( $wp_admin_bar ) { 'id' => 'widgets', 'title' => __( 'Widgets' ), 'href' => admin_url( 'widgets.php' ), - 'meta' => array( - 'class' => 'hide-if-customize', - ), ) ); - - if ( current_user_can( 'customize' ) ) { - $wp_admin_bar->add_menu( array( - 'parent' => 'appearance', - 'id' => 'customize-widgets', - 'title' => __( 'Widgets' ), - 'href' => add_query_arg( urlencode( 'autofocus[panel]' ), 'widgets', $customize_url ), // urlencode() needed due to #16859 - 'meta' => array( - 'class' => 'hide-if-no-customize', - ), - ) ); - } } if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) ) @@ -737,18 +726,6 @@ function wp_admin_bar_appearance_menu( $wp_admin_bar ) { 'class' => 'hide-if-customize', ), ) ); - - if ( current_user_can( 'customize' ) ) { - $wp_admin_bar->add_menu( array( - 'parent' => 'appearance', - 'id' => 'customize-background', - 'title' => __( 'Background' ), - 'href' => add_query_arg( urlencode( 'autofocus[control]' ), 'background_image', $customize_url ), // urlencode() needed due to #16859 - 'meta' => array( - 'class' => 'hide-if-no-customize', - ), - ) ); - } } if ( current_theme_supports( 'custom-header' ) ) { @@ -761,18 +738,6 @@ function wp_admin_bar_appearance_menu( $wp_admin_bar ) { 'class' => 'hide-if-customize', ), ) ); - - if ( current_user_can( 'customize' ) ) { - $wp_admin_bar->add_menu( array( - 'parent' => 'appearance', - 'id' => 'customize-header', - 'title' => __( 'Header' ), - 'href' => add_query_arg( urlencode( 'autofocus[control]' ), 'header_image', $customize_url ), // urlencode() needed due to #16859 - 'meta' => array( - 'class' => 'hide-if-no-customize', - ), - ) ); - } } } @@ -890,8 +855,9 @@ function _admin_bar_bump_cb() { ?> * * @since 3.1.0 * + * @global WP_Admin_Bar $wp_admin_bar + * * @param bool $show Whether to allow the admin bar to show. - * @return void */ function show_admin_bar( $show ) { global $show_admin_bar; @@ -903,6 +869,9 @@ function show_admin_bar( $show ) { * * @since 3.1.0 * + * @global WP_Admin_Bar $wp_admin_bar + * @global string $pagenow + * * @return bool Whether the admin bar should be showing. */ function is_admin_bar_showing() { diff --git a/wp-includes/atomlib.php b/wp-includes/atomlib.php index 9d34276a..271635fe 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 2e520f54..36d08bc8 100644 --- a/wp-includes/author-template.php +++ b/wp-includes/author-template.php @@ -15,10 +15,10 @@ * * @since 1.5.0 * - * @uses $authordata The current author's DB object. + * @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; @@ -53,7 +53,7 @@ function get_the_author($deprecated = '') { * * @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 ) ) @@ -70,7 +70,7 @@ function the_author( $deprecated = '', $deprecated_echo = true ) { * * @since 2.8.0 * - * @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) ) { @@ -88,12 +88,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(); @@ -103,11 +103,16 @@ function the_modified_author() { * Retrieve the requested data of the author of the current post. * @link https://codex.wordpress.org/Template_Tags/the_author_meta * @since 2.8.0 + * + * @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; @@ -126,20 +131,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. + * 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 ); @@ -162,6 +171,9 @@ 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. + * + * @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') ) { @@ -219,6 +231,9 @@ function the_author_posts() { * * @link https://codex.wordpress.org/Template_Tags/the_author_posts_link * @since 1.2.0 + * + * @global object $authordata The current author's DB object. + * * @param string $deprecated Deprecated. */ function the_author_posts_link($deprecated = '') { @@ -226,8 +241,10 @@ function the_author_posts_link($deprecated = '') { _deprecated_argument( __FUNCTION__, '2.1' ); 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 ) ), @@ -249,7 +266,9 @@ function the_author_posts_link($deprecated = '') { * 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 + * * @return string The URL to the author's page. */ function get_author_posts_url($author_id, $author_nicename = '') { @@ -291,6 +310,8 @@ function get_author_posts_url($author_id, $author_nicename = '') { * * @since 1.2.0 * + * @global wpdb $wpdb + * * @param string|array $args { * Optional. Array or string of default arguments. * @@ -315,7 +336,7 @@ function get_author_posts_url($author_id, $author_nicename = '') { * @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 null|string The output, if echo is set to false. Otherwise null. + * @return string|void The output, if echo is set to false. */ function wp_list_authors( $args = '' ) { global $wpdb; @@ -422,6 +443,9 @@ function wp_list_authors( $args = '' ) { * Checks to see if more than one author has published posts. * * @since 3.2.0 + * + * @global wpdb $wpdb + * * @return bool Whether or not we have more than one author */ function is_multi_author() { diff --git a/wp-includes/bookmark-template.php b/wp-includes/bookmark-template.php index 54ad5c99..47bfb4a1 100644 --- a/wp-includes/bookmark-template.php +++ b/wp-includes/bookmark-template.php @@ -195,7 +195,7 @@ function _walk_bookmarks( $bookmarks, $args = '' ) { * $categorize is true. Accepts 'ASC' (ascending) or 'DESC' (descending). * Default 'ASC'. * } - * @return string|null Will only return if echo option is set to not echo. Default is not return anything. + * @return string|void Will only return if echo option is set to not echo. Default is not return anything. */ function wp_list_bookmarks( $args = '' ) { $defaults = array( @@ -214,6 +214,12 @@ function wp_list_bookmarks( $args = '' ) { $output = ''; + 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 ( $r['categorize'] ) { $cats = get_terms( 'link_category', array( 'name__like' => $r['category_name'], diff --git a/wp-includes/bookmark.php b/wp-includes/bookmark.php index 47f5d233..1e178f43 100644 --- a/wp-includes/bookmark.php +++ b/wp-includes/bookmark.php @@ -16,7 +16,7 @@ * @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; @@ -65,7 +65,7 @@ function get_bookmark($bookmark, $output = OBJECT, $filter = 'raw') { * @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; diff --git a/wp-includes/cache.php b/wp-includes/cache.php index d75c82c6..d89ac741 100644 --- a/wp-includes/cache.php +++ b/wp-includes/cache.php @@ -12,8 +12,8 @@ * 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() + * + * @global WP_Object_Cache $wp_object_cache * * @param int|string $key The cache key to use for retrieval later * @param mixed $data The data to add to the cache store @@ -37,7 +37,7 @@ function wp_cache_add( $key, $data, $group = '', $expire = 0 ) { * * @since 2.0.0 * - * @return bool Always returns True + * @return true Always returns True */ function wp_cache_close() { return true; @@ -47,8 +47,8 @@ function wp_cache_close() { * Decrement 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 * * @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. @@ -65,8 +65,8 @@ 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 * * @param int|string $key What the contents in the cache are called * @param string $group Where the cache contents are grouped @@ -82,8 +82,8 @@ 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 * * @return bool False on failure, true on success */ @@ -97,15 +97,15 @@ 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() + * + * @global WP_Object_Cache $wp_object_cache * * @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. * @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,8 +117,8 @@ 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 * * @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. @@ -135,7 +135,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,8 +146,8 @@ 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() + * + * @global WP_Object_Cache $wp_object_cache * * @param int|string $key What to call the contents in the cache * @param mixed $data The contents to store in the cache @@ -165,8 +166,7 @@ function wp_cache_replace( $key, $data, $group = '', $expire = 0 ) { * * @since 2.0.0 * - * @uses $wp_object_cache Object Cache Class - * @see WP_Object_Cache::set() + * @global WP_Object_Cache $wp_object_cache * * @param int|string $key What to call the contents in the cache * @param mixed $data The contents to store in the cache @@ -187,12 +187,14 @@ function wp_cache_set( $key, $data, $group = '', $expire = 0 ) { * * @since 3.5.0 * + * @global WP_Object_Cache $wp_object_cache + * * @param int $blog_id Blog 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 +202,14 @@ function wp_cache_switch_to_blog( $blog_id ) { * * @since 2.6.0 * + * @global WP_Object_Cache $wp_object_cache + * * @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 ); } /** @@ -233,13 +237,15 @@ function wp_cache_add_non_persistent_groups( $groups ) { * * @since 2.6.0 * @deprecated 3.5.0 + * + * @global WP_Object_Cache $wp_object_cache */ function wp_cache_reset() { _deprecated_function( __FUNCTION__, '3.5' ); global $wp_object_cache; - return $wp_object_cache->reset(); + $wp_object_cache->reset(); } /** @@ -477,10 +483,10 @@ class WP_Object_Cache { * * @since 2.0.0 * - * @return bool Always returns true + * @return true Always returns true */ public function flush() { - $this->cache = array (); + $this->cache = array(); return true; } @@ -499,8 +505,8 @@ class WP_Object_Cache { * @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 + * @return false|mixed False on failure to retrieve contents or the cache + * contents on success */ public function get( $key, $group = 'default', $force = false, &$found = null ) { if ( empty( $group ) ) @@ -616,7 +622,7 @@ class WP_Object_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 + * @return true Always returns true */ public function set( $key, $data, $group = 'default', $expire = 0 ) { if ( empty( $group ) ) @@ -684,6 +690,8 @@ class WP_Object_Cache { * Sets up object properties; PHP 5 style constructor * * @since 2.0.8 + * + * @global int $blog_id */ public function __construct() { global $blog_id; @@ -706,7 +714,7 @@ class WP_Object_Cache { * * @since 2.0.8 * - * @return bool True value. Won't be used by PHP + * @return true True value. Won't be used by PHP */ public function __destruct() { return true; diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php index 5f4bda08..f75a72ee 100644 --- a/wp-includes/canonical.php +++ b/wp-includes/canonical.php @@ -27,14 +27,16 @@ * 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 * * @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; @@ -447,8 +449,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, '%') ) { @@ -472,8 +475,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 || $redirect_url == $requested_url ) { + return; + } if ( $do_redirect ) { // protect against chained redirects @@ -483,7 +488,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; @@ -522,8 +527,9 @@ function _remove_qs_args_if_not_in_url( $query_string, Array $args_to_check, $ur * @since 2.3.0 * * @global wpdb $wpdb WordPress database abstraction object. + * @global WP_Rewrite $wp_rewrite * - * @return bool|string The correct URL if one is found. False on failure. + * @return false|string The correct URL if one is found. False on failure. */ function redirect_guess_404_permalink() { global $wpdb, $wp_rewrite; @@ -558,6 +564,10 @@ function redirect_guess_404_permalink() { return false; } +/** + * + * @global WP_Rewrite $wp_rewrite + */ function wp_redirect_admin_locations() { global $wp_rewrite; if ( ! ( is_404() && $wp_rewrite->using_permalinks() ) ) diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php index b73eb41b..42133f6f 100644 --- a/wp-includes/capabilities.php +++ b/wp-includes/capabilities.php @@ -87,7 +87,7 @@ class WP_Roles { * * @param callable $name Method to call. * @param array $arguments Arguments to pass when calling. - * @return mixed|bool Return value of the callback, false otherwise. + * @return mixed|false Return value of the callback, false otherwise. */ public function __call( $name, $arguments ) { if ( '_init' === $name ) { @@ -138,6 +138,8 @@ class WP_Roles { * * @since 3.5.0 * @access public + * + * @global wpdb $wpdb */ public function reinit() { // There is no need to reinit if using the wp_user_roles global. @@ -174,7 +176,7 @@ class WP_Roles { * @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. + * @return WP_Role|void WP_Role object, if role is added. */ public function add_role( $role, $display_name, $capabilities = array() ) { if ( isset( $this->roles[$role] ) ) @@ -339,7 +341,6 @@ class WP_Role { /** * Assign role a capability. * - * @see WP_Roles::add_cap() Method uses implementation for role. * @since 2.0.0 * @access public * @@ -347,13 +348,8 @@ class WP_Role { * @param bool $grant Whether role has capability privilege. */ public 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 ); + wp_roles()->add_cap( $this->name, $cap, $grant ); } /** @@ -370,13 +366,8 @@ class WP_Role { * @param string $cap Capability name. */ public 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 ); + wp_roles()->remove_cap( $this->name, $cap ); } /** @@ -498,6 +489,11 @@ class WP_User { */ var $filter = null; + /** + * @static + * @access private + * @var array + */ private static $back_compat_keys; /** @@ -508,6 +504,8 @@ class WP_User { * @since 2.0.0 * @access public * + * @global wpdb $wpdb + * * @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. @@ -569,6 +567,10 @@ class WP_User { * * @since 3.3.0 * + * @static + * + * @global wpdb $wpdb + * * @param string $field The field to query against: 'id', 'slug', 'email' or 'login' * @param string|int $value The field value * @return object|false Raw user object @@ -628,6 +630,23 @@ class WP_User { return $user; } + /** + * Makes private/protected methods readable for backwards compatibility. + * + * @since 4.3.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 ( '_init_caps' === $name ) { + return call_user_func_array( array( $this, $name ), $arguments ); + } + return false; + } + /** * Magic method for checking the existence of a certain custom field * @@ -713,6 +732,7 @@ class WP_User { * @since 3.3.0 * * @param string $key Property + * @return mixed */ public function get( $key ) { return $this->__get( $key ); @@ -726,6 +746,7 @@ class WP_User { * @since 3.3.0 * * @param string $key Property + * @return bool */ public function has_prop( $key ) { return $this->__isset( $key ); @@ -753,9 +774,11 @@ class WP_User { * @access protected * @since 2.1.0 * + * @global wpdb $wpdb + * * @param string $cap_key Optional capability key */ - function _init_caps( $cap_key = '' ) { + protected function _init_caps( $cap_key = '' ) { global $wpdb; if ( empty($cap_key) ) @@ -780,16 +803,12 @@ class WP_User { * granted permission to. * * @since 2.0.0 - * @uses $wp_roles * @access public * * @return array List of all capabilities for the user. */ public function get_role_caps() { - global $wp_roles; - - if ( ! isset( $wp_roles ) ) - $wp_roles = new WP_Roles(); + $wp_roles = wp_roles(); //Filter out caps that are not role names and assign to $this->roles if ( is_array( $this->caps ) ) @@ -821,6 +840,16 @@ class WP_User { update_user_meta( $this->ID, $this->cap_key, $this->caps ); $this->get_role_caps(); $this->update_user_level_from_caps(); + + /** + * Fires immediately after the user has been given a new role. + * + * @since 4.3.0 + * + * @param int $user_id The user ID. + * @param string $role The new role. + */ + do_action( 'add_user_role', $this->ID, $role ); } /** @@ -838,6 +867,16 @@ class WP_User { update_user_meta( $this->ID, $this->cap_key, $this->caps ); $this->get_role_caps(); $this->update_user_level_from_caps(); + + /** + * Fires immediately after a role as been removed from a user. + * + * @since 4.3.0 + * + * @param int $user_id The user ID. + * @param string $role The removed role. + */ + do_action( 'remove_user_role', $this->ID, $role ); } /** @@ -920,6 +959,8 @@ class WP_User { * * @since 2.0.0 * @access public + * + * @global wpdb $wpdb */ public function update_user_level_from_caps() { global $wpdb; @@ -966,6 +1007,8 @@ class WP_User { * * @since 2.1.0 * @access public + * + * @global wpdb $wpdb */ public function remove_all_caps() { global $wpdb; @@ -1047,6 +1090,8 @@ class WP_User { * * @since 3.0.0 * + * @global wpdb $wpdb + * * @param int $blog_id Optional Blog ID, defaults to current blog. */ public function for_blog( $blog_id = '' ) { @@ -1342,7 +1387,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'; @@ -1483,28 +1528,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. @@ -1513,29 +1569,18 @@ 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 ); + 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 ); } /** @@ -1543,7 +1588,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 9a2120c9..d29ae479 100644 --- a/wp-includes/category-template.php +++ b/wp-includes/category-template.php @@ -65,10 +65,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 * * @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' ); @@ -153,6 +158,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. @@ -479,7 +486,7 @@ function wp_dropdown_categories( $args = '' ) { * @since 2.1.0 * * @param string|array $args Optional. Override default arguments. - * @return false|null|string HTML content only if 'echo' argument is 0. + * @return false|string HTML content only if 'echo' argument is 0. */ function wp_list_categories( $args = '' ) { $defaults = array( @@ -532,7 +539,28 @@ function wp_list_categories( $args = '' ) { } } else { if ( ! empty( $show_option_all ) ) { - $posts_page = ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_for_posts' ) ) ? get_permalink( get_option( 'page_for_posts' ) ) : home_url( '/' ); + + $posts_page = ''; + + // For taxonomies that belong only to custom post types, point to a valid archive. + $taxonomy_object = get_taxonomy( $r['taxonomy'] ); + if ( ! in_array( 'post', $taxonomy_object->object_type ) && ! in_array( 'page', $taxonomy_object->object_type ) ) { + foreach ( $taxonomy_object->object_type as $object_type ) { + $_object_type = get_post_type_object( $object_type ); + + // Grab the first one. + if ( ! empty( $_object_type->has_archive ) ) { + $posts_page = get_post_type_archive_link( $object_type ); + break; + } + } + } + + // Fallback for the 'All' link is the front page. + if ( ! $posts_page ) { + $posts_page = 'page' == get_option( 'show_on_front' ) && get_option( 'page_for_posts' ) ? get_permalink( get_option( 'page_for_posts' ) ) : home_url( '/' ); + } + $posts_page = esc_url( $posts_page ); if ( 'list' == $r['style'] ) { $output .= "

$show_option_all

"; @@ -608,7 +636,8 @@ function wp_list_categories( $args = '' ) { * @since 2.3.0 * * @param array|string|null $args Optional. Override default arguments. - * @return null|false Generated tag cloud, only if no failures and 'array' is set for the 'format' argument. + * @return void|array Generated tag cloud, only if no failures and 'array' is set for the 'format' argument. + * Otherwise, this function outputs the tag cloud. */ function wp_tag_cloud( $args = '' ) { $defaults = array( @@ -629,7 +658,7 @@ function wp_tag_cloud( $args = '' ) { else $link = get_term_link( intval($tag->term_id), $tag->taxonomy ); if ( is_wp_error( $link ) ) - return false; + return; $tags[ $key ]->link = $link; $tags[ $key ]->id = $tag->term_id; @@ -656,8 +685,8 @@ function wp_tag_cloud( $args = '' ) { /** * Default topic count scaling for tag links * - * @param integer $count number of posts with that tag - * @return integer scaled count + * @param int $count number of posts with that tag + * @return int scaled count */ function default_topic_count_scale( $count ) { return round(log10($count + 1) * 100); @@ -784,24 +813,46 @@ function wp_generate_tag_cloud( $tags, $args = '' ) { $font_spread = 1; $font_step = $font_spread / $spread; - $a = array(); - + // Assemble the data that will be used to generate the tag cloud markup. + $tags_data = array(); foreach ( $tags as $key => $tag ) { + $tag_id = isset( $tag->id ) ? $tag->id : $key; + $count = $counts[ $key ]; $real_count = $real_counts[ $key ]; - $tag_link = '#' != $tag->link ? esc_url( $tag->link ) : '#'; - $tag_id = isset($tags[ $key ]->id) ? $tags[ $key ]->id : $key; - $tag_name = $tags[ $key ]->name; if ( $translate_nooped_plural ) { - $title_attribute = sprintf( translate_nooped_plural( $translate_nooped_plural, $real_count ), number_format_i18n( $real_count ) ); + $title = sprintf( translate_nooped_plural( $translate_nooped_plural, $real_count ), number_format_i18n( $real_count ) ); } else { - $title_attribute = call_user_func( $args['topic_count_text_callback'], $real_count, $tag, $args ); + $title = call_user_func( $args['topic_count_text_callback'], $real_count, $tag, $args ); } - $a[] = "$tag_name"; + $tags_data[] = array( + 'id' => $tag_id, + 'url' => '#' != $tag->link ? $tag->link : '#', + 'name' => $tag->name, + 'title' => $title, + 'slug' => $tag->slug, + 'real_count' => $real_count, + 'class' => 'tag-link-' . $tag_id, + 'font_size' => $args['smallest'] + ( $count - $min_count ) * $font_step, + ); + } + + /** + * Filter the data used to generate the tag cloud. + * + * @since 4.3.0 + * + * @param array $tags_data An array of term data for term used to generate the tag cloud. + */ + $tags_data = apply_filters( 'wp_generate_tag_cloud_data', $tags_data ); + + $a = array(); + + // generate the output links array + foreach ( $tags_data as $key => $tag_data ) { + $a[] = "" . esc_html( $tag_data['name'] ) . ""; } switch ( $args['format'] ) { @@ -847,6 +898,7 @@ function wp_generate_tag_cloud( $tags, $args = '' ) { * * @since 3.1.0 * @access private + * @return int */ function _wp_object_name_sort_cb( $a, $b ) { return strnatcasecmp( $a->name, $b->name ); @@ -857,6 +909,7 @@ function _wp_object_name_sort_cb( $a, $b ) { * * @since 3.1.0 * @access private + * @return bool */ function _wp_object_count_sort_cb( $a, $b ) { return ( $a->count > $b->count ); @@ -872,6 +925,7 @@ function _wp_object_count_sort_cb( $a, $b ) { * @uses Walker_Category to create HTML list content. * @since 2.1.0 * @see Walker_Category::walk() for parameters and return description. + * @return string */ function walk_category_tree() { $args = func_get_args(); @@ -881,7 +935,7 @@ function walk_category_tree() { } else { $walker = $args[2]['walker']; } - return call_user_func_array(array( &$walker, 'walk' ), $args ); + return call_user_func_array( array( $walker, 'walk' ), $args ); } /** @@ -890,16 +944,17 @@ function walk_category_tree() { * @uses Walker_CategoryDropdown to create HTML dropdown content. * @since 2.1.0 * @see Walker_CategoryDropdown::walk() for parameters and return description. + * @return string */ function walk_category_dropdown_tree() { $args = func_get_args(); // the user's options are the third parameter - if ( empty($args[2]['walker']) || !is_a($args[2]['walker'], 'Walker') ) + if ( empty( $args[2]['walker'] ) || ! ( $args[2]['walker'] instanceof Walker ) ) { $walker = new Walker_CategoryDropdown; - else + } else { $walker = $args[2]['walker']; - - return call_user_func_array(array( &$walker, 'walk' ), $args ); + } + return call_user_func_array( array( $walker, 'walk' ), $args ); } /** @@ -1144,13 +1199,15 @@ class Walker_CategoryDropdown extends Walker { /** 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']} ) ) { - $args['value_field'] = 'term_id'; + if ( isset( $args['value_field'] ) && isset( $category->{$args['value_field']} ) ) { + $value_field = $args['value_field']; + } else { + $value_field = 'term_id'; } - $output .= "\t

'; + + 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 + '

' + + '




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

	- - -
	/>
	+ + + + +
		- +
		`' + key + '`	' + __( text ) + '
' + header.join( '	' ) + '

' + + header + + table1.join('') + + '

' + + '

' + __( 'Additional shortcuts,' ) + ' ' + access + '

' + + '' + + header + + table2.join('') + + '

'; + + if ( editor.plugins.wptextpattern ) { + // 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' }) + + tr({ '-': 'Bullet list' }) + + tr({ '1.': 'Numbered list' }) + + tr({ '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' }) + + '

'; + } + + // 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, - classes: 'wp-help', - buttons: { text: 'Close', onclick: 'close' } - }); - }); + 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 ); } }); @@ -235,7 +365,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', @@ -289,7 +419,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { doc = editor.getDoc(), dom = editor.dom; - if ( tinymce.Env.iOS ) { + if ( env.iOS ) { dom.addClass( doc.documentElement, 'ios' ); } @@ -319,23 +449,22 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { }); // 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 ) ); } }); } @@ -363,50 +492,29 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { } }); - // Word count - if ( typeof window.jQuery !== 'undefined' ) { - editor.on( 'keyup', function( e ) { - var key = e.keyCode || e.charCode; - - if ( key === last ) { - return; - } - - if ( 13 === key || 8 === last || 46 === last ) { - window.jQuery( document ).triggerHandler( 'wpcountwords', [ editor.getContent({ format : 'raw' }) ] ); - } - - last = key; - }); - } - - 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.inline && editor.isHidden() ) { - e.content = e.element.value; + 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 ); - } - }); - - // Remove spaces from empty paragraphs. - editor.on( 'BeforeSetContent', function( event ) { - var paragraph = tinymce.Env.webkit ? '

' : '

'; - - if ( event.content ) { - event.content = event.content.replace( /

(?: |\u00a0|\uFEFF|\s)+<\/p>/gi, paragraph ); + 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 @@ -297,7 +298,7 @@ function wp_print_media_templates() { <# } else if ( 'image' === data.type && data.sizes && data.sizes.full ) { #> <# } else if ( -1 === jQuery.inArray( data.type, [ 'audio', 'video' ] ) ) { #> - + <# } #> <# if ( 'audio' === data.type ) { #> @@ -329,7 +330,7 @@ function wp_print_media_templates() {

<# if ( 'image' === data.type && ! data.uploading && data.sizes && data.can.save ) { #> - + <# } #>

@@ -377,10 +378,12 @@ function wp_print_media_templates() { <# var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly'; #> + + <# if ( 'audio' === data.type ) { #> __( 'Artist' ), @@ -431,12 +434,12 @@ function wp_print_media_templates() { <# if ( ! data.uploading && data.can.remove ) { #> | <# if ( 'trash' === data.status ) { #> - + <# } else { #> - + <# } #> - + <# } #>

@@ -467,11 +470,11 @@ function wp_print_media_templates() { <# } #>

<# if ( data.buttons.close ) { #> - + <# } #>

<# if ( data.buttons.check ) { #> -
+ <# } #> <# var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly'; @@ -523,7 +526,6 @@ function wp_print_media_templates() { <# if ( data.can.save && data.sizes ) { #> - <# } #> <# } #> @@ -534,12 +536,12 @@ function wp_print_media_templates() { <# if ( ! data.uploading && data.can.remove ) { #> <# if ( 'trash' === data.status ) { #> - + <# } else { #> - + <# } #> - + <# } #> @@ -556,10 +558,12 @@ function wp_print_media_templates() { <# var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly'; #> + + <# if ( 'audio' === data.type ) { #> __( 'Artist' ), @@ -591,10 +595,10 @@ function wp_print_media_templates() {
<# if ( data.editable ) { #> - + <# } #> <# if ( data.clearable ) { #> - + <# } #>

@@ -987,7 +991,7 @@ function wp_print_media_templates() {

-
Version 4.2.5 +
Version 4.3

- - - - - - - -

+ + + +

' . $title . "

' . esc_html( $title ) . "

' . $this->upgrader->strings['skin_before_update_header'] . '

' . __( 'Updating translations for %1$s (%2$s)…' ) . '

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

' . __( 'Configuration Error' ) . '

' . __( 'Configuration Error' ) . '

+

- -

+

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

+

- + - + -

-

+

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

+

%2$s', + ' %2$s', esc_url( add_query_arg( array( array( 'autofocus' => array( 'panel' => 'widgets' ) ), @@ -327,7 +332,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?> ); } ?> -

+ + manager->get_panel( 'nav_menus' )->title ) ); + ?> + + +

+ + +

+ + + + +

- title ); ?> + {{ data.title }}

- title ); ?> - + {{ data.title }} +

+ + {{{ data.customizeAction }}} + + {{ data.title }} +

+

+ controls ) + 1 /* Active theme */; ?> -

+ manager->get_panel( 'widgets' )->title ) ); + ?> + +

' + __( 'Default shortcuts,' ) + ' ' + meta + '

' + __( 'Additional shortcuts,' ) + ' ' + access + '

' + __( '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.' ) + '

' + __( 'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' ) + '

' + __( 'Focus shortcuts:' ) + '

- Version 4.2.5 + Version 4.3

- - - - - - - -

+ + + +

' . $title . "

' . esc_html( $title ) . "

' . $this->upgrader->strings['skin_before_update_header'] . '

' . __( 'Updating translations for %1$s (%2$s)…' ) . '

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

' . __( 'Configuration Error' ) . '

' . __( 'Configuration Error' ) . '

+

- -

+

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

+

- + - + -

-

+

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

+

%2$s', + ' %2$s', esc_url( add_query_arg( array( array( 'autofocus' => array( 'panel' => 'widgets' ) ), @@ -327,7 +332,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?> ); } ?> -

+ + manager->get_panel( 'nav_menus' )->title ) ); + ?> + + +

+ + + + + +

+ + + + + + + +

- title ); ?> + {{ data.title }}

- title ); ?> - + {{ data.title }} +

+ + {{{ data.customizeAction }}} + + {{ data.title }} +

+

+ controls ) + 1 /* Active theme */; ?> -

+ manager->get_panel( 'widgets' )->title ) ); + ?> + +

' + __( 'Default shortcuts,' ) + ' ' + meta + '

' + __( 'Additional shortcuts,' ) + ' ' + access + '

' + __( '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.' ) + '

' + __( 'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' ) + '

' + __( 'Focus shortcuts:' ) + '

-
Version 4.2.5 +
Version 4.3

+ + +

+ + + + +