Ticket #45145: 45145.8.diff

package-lock.json

@@ -280 +280 @@
                         }
                 },
                 "@wordpress/block-library": {
-                        "version": "2.2.7",
-                        "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-2.2.7.tgz",
-                        "integrity": "sha512-QehEhRkNWGi8JUowwm4/EW6Yd1Hay8q3adEPJND/1nWHZBVPe7dgIRgOkrC8Y/61a7+YfKmi34nO+Z7TpRYW5Q==",
+                        "version": "2.2.8",
+                        "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-2.2.8.tgz",
+                        "integrity": "sha512-86DiBPFQwGDWf/s4OwmTp2q+VoeNhmW1OQXu/on+c5MHgJh7W2uFasO4bhmz31+U9KwAFHQr3pCcxaasdP17vQ==",
                         "requires": {
                                 "@babel/runtime": "^7.0.0",
                                 "@wordpress/autop": "^2.0.2",
                                 "@wordpress/blob": "^2.1.0",
                                 "@wordpress/blocks": "^6.0.2",
-                                "@wordpress/components": "^7.0.2",
+                                "@wordpress/components": "^7.0.3",
                                 "@wordpress/compose": "^3.0.0",
                                 "@wordpress/core-data": "^2.0.14",
                                 "@wordpress/data": "^4.0.1",
                                 "@wordpress/deprecated": "^2.0.3",
-                                "@wordpress/editor": "^9.0.2",
+                                "@wordpress/editor": "^9.0.3",
                                 "@wordpress/element": "^2.1.8",
                                 "@wordpress/html-entities": "^2.0.3",
                                 "@wordpress/i18n": "^3.1.0",
@@ -349 +349 @@
                         }
                 },
                 "@wordpress/components": {
-                        "version": "7.0.2",
-                        "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-7.0.2.tgz",
-                        "integrity": "sha512-uML/DB4ISmgGotijx5PfgRlRsUzNPnWjBrbrHNiFCy1O87jLObipRi3bETMO6GY13PgTu4SeLIEh6E2V85jNyQ==",
+                        "version": "7.0.3",
+                        "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-7.0.3.tgz",
+                        "integrity": "sha512-7TgmhXz8+KRknFNYe+AYHpq3EreB40OZWEYzXF5tSJdjC6wElrDMKqRCGgWdTlpgZ/09g2cDo7a+GJ8iQTm9ig==",
                         "requires": {
                                 "@babel/runtime": "^7.0.0",
                                 "@wordpress/a11y": "^2.0.2",
@@ -470 +470 @@
                         }
                 },
                 "@wordpress/edit-post": {
-                        "version": "3.1.2",
-                        "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-3.1.2.tgz",
-                        "integrity": "sha512-uVl4VddTQSHEEdriMTGFJYBzEqI7tavnLSfRFva9jwhofgr+tw5arj6a82rZ9KBkWSC/zEVQCjEzsHbiaf7y5g==",
+                        "version": "3.1.3",
+                        "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-3.1.3.tgz",
+                        "integrity": "sha512-bA9OIkzInCLvf2YB4b6H0Ubghmv+AjOrCpZcp/5sdWLAg7hE6ZzZZ5Pz/2o5bBd+mTkalALJFMxgy7DKvH3WgQ==",
                         "requires": {
                                 "@babel/runtime": "^7.0.0",
                                 "@wordpress/a11y": "^2.0.2",
                                 "@wordpress/api-fetch": "^2.2.5",
-                                "@wordpress/block-library": "^2.2.7",
+                                "@wordpress/block-library": "^2.2.8",
                                 "@wordpress/blocks": "^6.0.2",
-                                "@wordpress/components": "^7.0.2",
+                                "@wordpress/components": "^7.0.3",
                                 "@wordpress/compose": "^3.0.0",
                                 "@wordpress/core-data": "^2.0.14",
                                 "@wordpress/data": "^4.0.1",
-                                "@wordpress/editor": "^9.0.2",
+                                "@wordpress/editor": "^9.0.3",
                                 "@wordpress/element": "^2.1.8",
-                                "@wordpress/format-library": "^1.2.5",
+                                "@wordpress/format-library": "^1.2.6",
                                 "@wordpress/hooks": "^2.0.3",
                                 "@wordpress/i18n": "^3.1.0",
                                 "@wordpress/keycodes": "^2.0.5",
-                                "@wordpress/nux": "^3.0.3",
+                                "@wordpress/nux": "^3.0.4",
                                 "@wordpress/plugins": "^2.0.9",
                                 "@wordpress/url": "^2.3.1",
                                 "@wordpress/viewport": "^2.0.12",
@@ -499 +499 @@
                         }
                 },
                 "@wordpress/editor": {
-                        "version": "9.0.2",
-                        "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-9.0.2.tgz",
-                        "integrity": "sha512-uejLtZW6TXqaMxluDGsHAfWm07FhswAU6DTArEC1bLvGK72i4LRXN/kTb4jD8hoiYcMu9jgM6BuzA5+G2XKaPQ==",
+                        "version": "9.0.3",
+                        "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-9.0.3.tgz",
+                        "integrity": "sha512-Iz2B2JccsluiV0CdIkeH7sdl+3JcM7u9OqQSRC+0G2gfq8c09c98BE9myRUN16EVvL6zf025DzRU3hSx9r3AbQ==",
                         "requires": {
                                 "@babel/runtime": "^7.0.0",
                                 "@wordpress/a11y": "^2.0.2",
                                 "@wordpress/api-fetch": "^2.2.5",
                                 "@wordpress/blob": "^2.1.0",
                                 "@wordpress/blocks": "^6.0.2",
-                                "@wordpress/components": "^7.0.2",
+                                "@wordpress/components": "^7.0.3",
                                 "@wordpress/compose": "^3.0.0",
                                 "@wordpress/core-data": "^2.0.14",
                                 "@wordpress/data": "^4.0.1",
@@ -522 +522 @@
                                 "@wordpress/is-shallow-equal": "^1.1.4",
                                 "@wordpress/keycodes": "^2.0.5",
                                 "@wordpress/notices": "^1.1.0",
-                                "@wordpress/nux": "^3.0.3",
+                                "@wordpress/nux": "^3.0.4",
                                 "@wordpress/token-list": "^1.1.0",
                                 "@wordpress/url": "^2.3.1",
                                 "@wordpress/viewport": "^2.0.12",
@@ -597 +597 @@
                         }
                 },
                 "@wordpress/format-library": {
-                        "version": "1.2.5",
-                        "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-1.2.5.tgz",
-                        "integrity": "sha512-tij5m2brX0n+dmchqqvM6Fk2a26Q5+aI+DPbYw5BSGKFrN4fna7mLvPBhMo3knxuZv3y/GBSl+AmZobaQI9ngg==",
+                        "version": "1.2.6",
+                        "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-1.2.6.tgz",
+                        "integrity": "sha512-8GkrMRSZ287qotsYzJh0kzDRjDAYJLicwbSRSv4AR2+4dSW6ZX1CK2jt/ihxg5cbqxMitPPTqRA0PmUk+AtdDA==",
                         "requires": {
                                 "@babel/runtime": "^7.0.0",
-                                "@wordpress/components": "^7.0.2",
+                                "@wordpress/components": "^7.0.3",
                                 "@wordpress/dom": "^2.0.7",
-                                "@wordpress/editor": "^9.0.2",
+                                "@wordpress/editor": "^9.0.3",
                                 "@wordpress/element": "^2.1.8",
                                 "@wordpress/i18n": "^3.1.0",
                                 "@wordpress/keycodes": "^2.0.5",
@@ -678 +678 @@
                         }
                 },
                 "@wordpress/list-reusable-blocks": {
-                        "version": "1.1.15",
-                        "resolved": "https://registry.npmjs.org/@wordpress/list-reusable-blocks/-/list-reusable-blocks-1.1.15.tgz",
-                        "integrity": "sha512-uHOC7HKlnXJfGzHM9XV+24XJ9U5pgTqn1IH+IiHxop1P2BV2sPr38VyfzlLAeo/Fu9gfaRYPG8OT6OtP8E9Snw==",
+                        "version": "1.1.16",
+                        "resolved": "https://registry.npmjs.org/@wordpress/list-reusable-blocks/-/list-reusable-blocks-1.1.16.tgz",
+                        "integrity": "sha512-kkamXKC6lp7ZddFt+VPOaiTftXfldU6qiRNab9JU9BXBD0XmyWl1Ee24RjQtO9ILA8UK9OpYsYCAMP/LSA1Cgg==",
                         "requires": {
                                 "@babel/runtime": "^7.0.0",
                                 "@wordpress/api-fetch": "^2.2.5",
-                                "@wordpress/components": "^7.0.2",
+                                "@wordpress/components": "^7.0.3",
                                 "@wordpress/compose": "^3.0.0",
                                 "@wordpress/element": "^2.1.8",
                                 "@wordpress/i18n": "^3.1.0",
@@ -703 +703 @@
                         }
                 },
                 "@wordpress/nux": {
-                        "version": "3.0.3",
-                        "resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-3.0.3.tgz",
-                        "integrity": "sha512-cpG1ZRBeva6W3l9QWFIj66WtdDs5WIK0psyJf7567U1zp7gxdK4RwrM9o3WL8Ep/lPv5bvuyLhtO6WdSWUAfhg==",
+                        "version": "3.0.4",
+                        "resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-3.0.4.tgz",
+                        "integrity": "sha512-0GjMmEI8GM/lbRLAxPel6fMjf5rbEB9wGRzVr1dDD7Ak6CfgVfasK/B9UMgngcO0sbCCXkHopjd8QQhUobffPg==",
                         "requires": {
                                 "@babel/runtime": "^7.0.0",
-                                "@wordpress/components": "^7.0.2",
+                                "@wordpress/components": "^7.0.3",
                                 "@wordpress/compose": "^3.0.0",
                                 "@wordpress/data": "^4.0.1",
                                 "@wordpress/element": "^2.1.8",
@@ -1476 +1476 @@
                                 },
                                 "util": {
                                         "version": "0.10.3",
-                                        "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+                                        "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz",
                                         "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
                                         "dev": true,
                                         "requires": {
@@ -2452 +2452 @@
                 },
                 "browserify-rsa": {
                         "version": "4.0.1",
-                        "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+                        "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
                         "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
                         "dev": true,
                         "requires": {
@@ -2749 +2749 @@
                 },
                 "chalk": {
                         "version": "1.1.3",
-                        "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+                        "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
                         "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
                         "requires": {
                                 "ansi-styles": "^2.2.1",
@@ -4544 +4544 @@
                 },
                 "events": {
                         "version": "1.1.1",
-                        "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+                        "resolved": "http://registry.npmjs.org/events/-/events-1.1.1.tgz",
                         "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
                         "dev": true
                 },
@@ -10194 +10194 @@
                 },
                 "onetime": {
                         "version": "1.1.0",
-                        "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+                        "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
                         "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
                         "dev": true
                 },
@@ -10616 +10616 @@
                         "dependencies": {
                                 "async": {
                                         "version": "1.5.2",
-                                        "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+                                        "resolved": "http://registry.npmjs.org/async/-/async-1.5.2.tgz",
                                         "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
                                         "dev": true
                                 }
@@ -11415 +11415 @@
                         }
                 },
                 "react-portal": {
-                        "version": "4.1.5",
-                        "resolved": "https://registry.npmjs.org/react-portal/-/react-portal-4.1.5.tgz",
-                        "integrity": "sha512-jJMy9DoVr4HRWPdO8IP/mDHP1Q972/aKkulVQeIrttOIyRNmCkR2IH7gK3HVjhzxy6M+k9TopSWN5q41wO/o6A==",
+                        "version": "4.2.0",
+                        "resolved": "https://registry.npmjs.org/react-portal/-/react-portal-4.2.0.tgz",
+                        "integrity": "sha512-Zf+vGQ/VEAb5XAy+muKEn48yhdCNYPZaB1BWg1xc8sAZWD8pXTgPtQT4ihBdmWzsfCq8p8/kqf0GWydSBqc+Eg==",
                         "requires": {
                                 "prop-types": "^15.5.8"
                         }
@@ -11961 +11961 @@
                 },
                 "regjsgen": {
                         "version": "0.2.0",
-                        "resolved": "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+                        "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
                         "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc="
                 },
                 "regjsparser": {
@@ -13691 +13691 @@
                         "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g="
                 },
                 "tinymce": {
-                        "version": "4.8.5",
-                        "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-4.8.5.tgz",
-                        "integrity": "sha512-1V6+PxP5Kp8H/Kuf+EOe6vyrtj1Dlj98q33DgiKGoGPTmbcQaVZWiT+lhqj8ICXKVLV3YxAieOJyJXai4SLHQg=="
+                        "version": "4.9.0",
+                        "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-4.9.0.tgz",
+                        "integrity": "sha512-hrPeCLXY/sVCo3i64CTW8P5xbDiEI8Uii/vWpcmQWAMhex6GWWd2U+L8WIMj5tKKGdfcIQAJfpfQthc/92bcKw=="
                 },
                 "tmp": {
                         "version": "0.0.33",

package.json

@@ -55 +55 @@
                 "@wordpress/api-fetch": "^2.2.5",
                 "@wordpress/autop": "^2.0.2",
                 "@wordpress/blob": "^2.1.0",
-                "@wordpress/block-library": "^2.2.7",
+                "@wordpress/block-library": "^2.2.8",
                 "@wordpress/block-serialization-default-parser": "^2.0.0",
                 "@wordpress/blocks": "^6.0.2",
-                "@wordpress/components": "^7.0.2",
+                "@wordpress/components": "^7.0.3",
                 "@wordpress/compose": "^3.0.0",
                 "@wordpress/core-data": "^2.0.14",
                 "@wordpress/data": "^4.0.1",
@@ -66 +66 @@
                 "@wordpress/deprecated": "^2.0.3",
                 "@wordpress/dom": "^2.0.7",
                 "@wordpress/dom-ready": "^2.0.2",
-                "@wordpress/edit-post": "^3.1.2",
-                "@wordpress/editor": "^9.0.2",
+                "@wordpress/edit-post": "^3.1.3",
+                "@wordpress/editor": "^9.0.3",
                 "@wordpress/element": "^2.1.8",
                 "@wordpress/escape-html": "^1.0.1",
-                "@wordpress/format-library": "^1.2.5",
+                "@wordpress/format-library": "^1.2.6",
                 "@wordpress/hooks": "^2.0.3",
                 "@wordpress/html-entities": "^2.0.3",
                 "@wordpress/i18n": "^3.1.0",
                 "@wordpress/is-shallow-equal": "^1.1.4",
                 "@wordpress/keycodes": "^2.0.5",
-                "@wordpress/list-reusable-blocks": "^1.1.15",
+                "@wordpress/list-reusable-blocks": "^1.1.16",
                 "@wordpress/notices": "^1.1.0",
-                "@wordpress/nux": "^3.0.3",
+                "@wordpress/nux": "^3.0.4",
                 "@wordpress/plugins": "^2.0.9",
                 "@wordpress/redux-routine": "^3.0.3",
                 "@wordpress/rich-text": "^3.0.2",

src/wp-admin/edit-form-blocks.php

@@ -178 +178 @@
         ),
 );
 
-/*
- * Set a locale specific default font.
- * Translators: Use this to specify the CSS font family for the default font
- */
+/* Translators: Use this to specify the CSS font family for the default font */
 $locale_font_family = esc_html_x( 'Noto Serif', 'CSS Font Family for Editor Font' );
 $styles[]           = array(
         'css' => "body { font-family: '$locale_font_family' }",

src/wp-includes/blocks/archives.php

@@ -2 +2 @@
 /**
  * Server-side rendering of the `core/archives` block.
  *
- * @package gutenberg
+ * @package WordPress
  */
 
 /**

src/wp-includes/blocks/block.php

@@ -2 +2 @@
 /**
  * Server-side rendering of the `core/block` block.
  *
- * @package gutenberg
+ * @package WordPress
  */
 
 /**

src/wp-includes/blocks/categories.php

@@ -2 +2 @@
 /**
  * Server-side rendering of the `core/categories` block.
  *
- * @package gutenberg
+ * @package WordPress
  */
 
 /**

src/wp-includes/blocks/latest-comments.php

@@ -2 +2 @@
 /**
  * Server-side rendering of the `core/latest-comments` block.
  *
- * @package gutenberg
+ * @package WordPress
  */
 
-if ( ! function_exists( 'gutenberg_draft_or_post_title' ) ) {
+if ( ! function_exists( 'wp_latest_comments_draft_or_post_title' ) ) {
         /**
          * Get the post title.
          *
@@ -26 +26 @@
          * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
          * @return string The post title if set; "(no title)" if no title is set.
          */
-        function gutenberg_draft_or_post_title( $post = 0 ) {
+        function wp_latest_comments_draft_or_post_title( $post = 0 ) {
                 $title = get_the_title( $post );
                 if ( empty( $title ) ) {
                         $title = __( '(no title)' );
@@ -42 +42 @@
  *
  * @return string Returns the post content with latest comments added.
  */
-function gutenberg_render_block_core_latest_comments( $attributes = array() ) {
+function render_block_core_latest_comments( $attributes = array() ) {
         // This filter is documented in wp-includes/widgets/class-wp-widget-recent-comments.php.
         $comments = get_comments(
                 apply_filters(
@@ -94 +94 @@
 
                         // `_draft_or_post_title` calls `esc_html()` so we don't need to wrap that call in
                         // `esc_html`.
-                        $post_title = '<a class="wp-block-latest-comments__comment-link" href="' . esc_url( get_comment_link( $comment ) ) . '">' . gutenberg_draft_or_post_title( $comment->comment_post_ID ) . '</a>';
+                        $post_title = '<a class="wp-block-latest-comments__comment-link" href="' . esc_url( get_comment_link( $comment ) ) . '">' . wp_latest_comments_draft_or_post_title( $comment->comment_post_ID ) . '</a>';
 
                         $list_items_markup .= sprintf(
                                 /* translators: 1: author name (inside <a> or <span> tag, based on if they have a URL), 2: post title related to this comment */
@@ -179 +179 @@
                                 'enum' => array( 'center', 'left', 'right', 'wide', 'full', '' ),
                         ),
                 ),
-                'render_callback' => 'gutenberg_render_block_core_latest_comments',
+                'render_callback' => 'render_block_core_latest_comments',
         )
 );

src/wp-includes/blocks/latest-posts.php

@@ -2 +2 @@
 /**
  * Server-side rendering of the `core/latest-posts` block.
  *
- * @package gutenberg
+ * @package WordPress
  */
 
 /**
@@ -21 +21 @@
         );
 
         if ( isset( $attributes['categories'] ) ) {
-                $args['categories'] = $attributes['categories'];
+                $args['category'] = $attributes['categories'];
         }
 
         $recent_posts = wp_get_recent_posts( $args );

src/wp-includes/blocks/shortcode.php

@@ -2 +2 @@
 /**
  * Server-side rendering of the `core/shortcode` block.
  *
- * @package gutenberg
+ * @package WordPress
  */
 
 /**

src/wp-includes/script-loader.php

@@ -212 +212 @@
                 'annotations' => '1.0.3',
                 'autop' => '2.0.2',
                 'blob' => '2.1.0',
-                'block-library' => '2.2.7',
+                'block-library' => '2.2.8',
                 'block-serialization-default-parser' => '2.0.0',
                 'blocks' => '6.0.2',
-                'components' => '7.0.2',
+                'components' => '7.0.3',
                 'compose' => '3.0.0',
                 'core-data' => '2.0.14',
                 'data' => '4.0.1',
@@ -223 +223 @@
                 'deprecated' => '2.0.3',
                 'dom' => '2.0.7',
                 'dom-ready' => '2.0.2',
-                'edit-post' => '3.1.2',
-                'editor' => '9.0.2',
+                'edit-post' => '3.1.3',
+                'editor' => '9.0.3',
                 'element' => '2.1.8',
                 'escape-html' => '1.0.1',
-                'format-library' => '1.2.5',
+                'format-library' => '1.2.6',
                 'hooks' => '2.0.3',
                 'html-entities' => '2.0.3',
                 'i18n' => '3.1.0',
                 'is-shallow-equal' => '1.1.4',
                 'keycodes' => '2.0.5',
-                'list-reusable-blocks' => '1.1.15',
+                'list-reusable-blocks' => '1.1.16',
                 'notices' => '1.1.0',
-                'nux' => '3.0.3',
+                'nux' => '3.0.4',
                 'plugins' => '2.0.9',
                 'redux-routine' => '3.0.3',
                 'rich-text' => '3.0.2',
@@ -276 +276 @@
                 'block-library' => array(
                         'editor',
                         'lodash',
-                        'moment',
                         'wp-api-fetch',
                         'wp-autop',
                         'wp-blob',