Changeset 46189 for trunk/src/wp-includes/blocks/archives.php

Timestamp:

09/19/2019 03:17:39 PM (5 years ago)

Author:

gziolo

Message:

Block Editor: Update the WordPress Packages to the ones used in the Gutenberg 6.5 release

Updated Packages:

In version 6.2:

@wordpress/a11y@2.5.0
@wordpress/annotations@1.5.0
@wordpress/api-fetch@3.4.0
@wordpress/autop@2.4.0
@wordpress/babel-plugin-import-jsx-pragma@2.3.0
@wordpress/babel-plugin-makepot@3.2.0
@wordpress/babel-preset-default@4.4.0
@wordpress/blob@2.5.0
@wordpress/block-editor@3.0.0
@wordpress/block-library@2.7.0
@wordpress/block-serialization-default-parser@3.3.0
@wordpress/block-serialization-spec-parser@3.2.0
@wordpress/blocks@6.5.0
@wordpress/browserslist-config@2.6.0
@wordpress/components@8.1.0
@wordpress/compose@3.5.0
@wordpress/core-data@2.5.0
@wordpress/custom-templated-path-webpack-plugin@1.5.0
@wordpress/data-controls@1.1.0
@wordpress/data@4.7.0
@wordpress/date@3.4.0
@wordpress/dependency-extraction-webpack-plugin@1.1.0
@wordpress/deprecated@2.5.0
@wordpress/docgen@1.3.0
@wordpress/dom-ready@2.5.0
@wordpress/dom@2.4.0
@wordpress/e2e-test-utils@2.2.0
@wordpress/e2e-tests@1.4.0
@wordpress/edit-post@3.6.0
@wordpress/editor@9.5.0
@wordpress/element@2.6.0
@wordpress/escape-html@1.5.0
@wordpress/eslint-plugin@2.4.0
@wordpress/format-library@1.7.0
@wordpress/hooks@2.5.0
@wordpress/html-entities@2.5.0
@wordpress/i18n@3.6.0
@wordpress/is-shallow-equal@1.5.0
@wordpress/jest-console@3.2.0
@wordpress/jest-preset-default@4.3.0
@wordpress/jest-puppeteer-axe@1.2.0
@wordpress/keycodes@2.5.0
@wordpress/library-export-default-webpack-plugin@1.4.0
@wordpress/list-reusable-blocks@1.6.0
@wordpress/media-utils@1.0.0
@wordpress/notices@1.6.0
@wordpress/npm-package-json-lint-config@2.1.0
@wordpress/nux@3.5.0
@wordpress/plugins@2.5.0
@wordpress/postcss-themes@2.2.0
@wordpress/priority-queue@1.3.0
@wordpress/redux-routine@3.5.0
@wordpress/rich-text@3.5.0
@wordpress/scripts@3.4.0
@wordpress/server-side-render@1.1.0
@wordpress/shortcode@2.4.0
@wordpress/token-list@1.5.0
@wordpress/url@2.7.0
@wordpress/viewport@2.6.0
@wordpress/wordcount@2.5.0

In version 6.4:
@wordpress/annotations@1.6.0
@wordpress/api-fetch@3.5.0
@wordpress/autop@2.5.0
@wordpress/babel-preset-default@4.5.0
@wordpress/block-editor@3.1.0
@wordpress/block-library@2.8.0
@wordpress/block-serialization-default-parser@3.4.0
@wordpress/block-serialization-spec-parser@3.3.0
@wordpress/blocks@6.6.0
@wordpress/components@8.2.0
@wordpress/compose@3.6.0
@wordpress/core-data@2.6.0
@wordpress/data-controls@1.2.0
@wordpress/data@4.8.0
@wordpress/date@3.5.0
@wordpress/dependency-extraction-webpack-plugin@1.2.0
@wordpress/deprecated@2.6.0
@wordpress/docgen@1.4.0
@wordpress/dom@2.5.0
@wordpress/e2e-test-utils@2.3.0
@wordpress/e2e-tests@1.5.0
@wordpress/edit-post@3.7.0
@wordpress/editor@9.6.0
@wordpress/element@2.7.0
@wordpress/eslint-plugin@3.0.0
@wordpress/format-library@1.8.0
@wordpress/hooks@2.6.0
@wordpress/is-shallow-equal@1.6.0
@wordpress/jest-console@3.3.0
@wordpress/jest-preset-default@5.0.0
@wordpress/jest-puppeteer-axe@1.3.0
@wordpress/keycodes@2.6.0
@wordpress/list-reusable-blocks@1.7.0
@wordpress/media-utils@1.1.0
@wordpress/notices@1.7.0
@wordpress/nux@3.6.0
@wordpress/plugins@2.6.0
@wordpress/project-management-automation@1.0.0
@wordpress/redux-routine@3.6.0
@wordpress/rich-text@3.6.0
@wordpress/scripts@4.0.0
@wordpress/server-side-render@1.2.0
@wordpress/token-list@1.6.0
@wordpress/viewport@2.7.0
@wordpress/wordcount@2.6.0

In version 6.5:
@wordpress/annotations@1.7.0
@wordpress/api-fetch@3.6.0
@wordpress/babel-preset-default@4.6.0
@wordpress/block-directory@1.0.0
@wordpress/block-editor@3.2.0
@wordpress/block-library@2.9.0
@wordpress/blocks@6.7.0
@wordpress/components@8.3.0
@wordpress/compose@3.7.0
@wordpress/core-data@2.7.0
@wordpress/data-controls@1.3.0
@wordpress/data@4.9.0
@wordpress/dependency-extraction-webpack-plugin@2.0.0
@wordpress/e2e-test-utils@2.4.0
@wordpress/e2e-tests@1.7.0
@wordpress/edit-post@3.8.0
@wordpress/editor@9.7.0
@wordpress/element@2.8.0
@wordpress/eslint-plugin@3.1.0
@wordpress/format-library@1.9.0
@wordpress/list-reusable-blocks@1.8.0
@wordpress/media-utils@1.2.0
@wordpress/notices@1.8.0
@wordpress/nux@3.7.0
@wordpress/plugins@2.7.0
@wordpress/rich-text@3.7.0
@wordpress/scripts@5.0.0
@wordpress/server-side-render@1.3.0
@wordpress/url@2.8.0
@wordpress/viewport@2.8.0

Props youknowriad desrosj noisysocks pento jorgefilipecosta iseulde

Fixes: #47843

File:

• trunk/src/wp-includes/blocks/archives.php (modified) (3 diffs)

trunk/src/wp-includes/blocks/archives.php

@@ -73 +73 @@
     <option value="">' . $label . '</option>' . $archives . '</select>';
 
-        $block_content = sprintf(
+        return sprintf(
             '<div class="%1$s">%2$s</div>',
             esc_attr( $class ),
             $block_content
         );
-    } else {
-
-        $class .= ' wp-block-archives-list';
-
-        /** This filter is documented in wp-includes/widgets/class-wp-widget-archives.php */
-        $archives_args = apply_filters(
-            'widget_archives_args',
-            array(
-                'type'            => 'monthly',
-                'show_post_count' => $show_post_count,
-            )
-        );
-
-        $archives_args['echo'] = 0;
-
-        $archives = wp_get_archives( $archives_args );
-
-        $classnames = esc_attr( $class );
-
-        if ( empty( $archives ) ) {
-
-            $block_content = sprintf(
-                '<div class="%1$s">%2$s</div>',
-                $classnames,
-                __( 'No archives to show.' )
-            );
-        } else {
-
-            $block_content = sprintf(
-                '<ul class="%1$s">%2$s</ul>',
-                $classnames,
-                $archives
-            );
-        }
     }
 
-    return $block_content;
+    $class .= ' wp-block-archives-list';
+
+    /** This filter is documented in wp-includes/widgets/class-wp-widget-archives.php */
+    $archives_args = apply_filters(
+        'widget_archives_args',
+        array(
+            'type'            => 'monthly',
+            'show_post_count' => $show_post_count,
+        )
+    );
+
+    $archives_args['echo'] = 0;
+
+    $archives = wp_get_archives( $archives_args );
+
+    $classnames = esc_attr( $class );
+
+    if ( empty( $archives ) ) {
+
+        return sprintf(
+            '<div class="%1$s">%2$s</div>',
+            $classnames,
+            __( 'No archives to show.' )
+        );
+    }
+
+    return sprintf(
+        '<ul class="%1$s">%2$s</ul>',
+        $classnames,
+        $archives
+    );
 }
 
@@ -127 +123 @@
                 'align'             => array(
                     'type' => 'string',
+                    'enum' => array( 'left', 'center', 'right', 'wide', 'full' ),
                 ),
                 'className'         => array(
@@ -144 +141 @@
     );
 }
-
 add_action( 'init', 'register_block_core_archives' );