Changeset 44960 for trunk/src/wp-includes/blocks/calendar.php

Timestamp:

03/21/2019 12:46:11 PM (6 years ago)

Author:

iseulde

Message:

Block Editor: Update the WordPress Packages from Gutenberg 5.3

• @wordpress/a11y@2.2.0
• @wordpress/annotations@1.2.0
• @wordpress/api-fetch@3.1.0
• @wordpress/autop@2.2.0
• @wordpress/babel-plugin-import-jsx-pragma@2.1.0
• @wordpress/babel-preset-default@4.1.0
• @wordpress/blob@2.3.0
• @wordpress/block-editor@1.1.0
• @wordpress/block-library@2.4.0
• @wordpress/block-serialization-default-parser@3.1.0
• @wordpress/blocks@6.2.0
• @wordpress/components@7.2.0
• @wordpress/compose@3.2.0
• @wordpress/core-data@2.2.0
• @wordpress/data@4.4.0
• @wordpress/date@3.2.0
• @wordpress/deprecated@2.2.0
• @wordpress/docgen@1.1.0
• @wordpress/dom-ready@2.2.0
• @wordpress/dom@2.2.0
• @wordpress/e2e-test-utils@1.1.0
• @wordpress/e2e-tests@1.1.0
• @wordpress/edit-post@3.3.0
• @wordpress/edit-widgets@0.2.0
• @wordpress/editor@9.2.0
• @wordpress/element@2.3.0
• @wordpress/escape-html@1.2.0
• @wordpress/eslint-plugin@2.1.0
• @wordpress/format-library@1.4.0
• @wordpress/hooks@2.2.0
• @wordpress/html-entities@2.2.0
• @wordpress/i18n@3.3.0
• @wordpress/keycodes@2.2.0
• @wordpress/list-reusable-blocks@1.3.0
• @wordpress/notices@1.3.0
• @wordpress/nux@3.2.0
• @wordpress/plugins@2.2.0
• @wordpress/priority-queue@1.1.0
• @wordpress/redux-routine@3.2.0
• @wordpress/rich-text@3.2.0
• @wordpress/scripts@3.1.0
• @wordpress/shortcode@2.2.0
• @wordpress/url@2.5.0
• @wordpress/viewport@2.3.0
• @wordpress/wordcount@2.2.0

File:

• trunk/src/wp-includes/blocks/calendar.php (modified) (1 diff)

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

@@ -14 +14 @@
  */
 function render_block_core_calendar( $attributes ) {
-    global $monthnum, $year, $post;
+    global $monthnum, $year;
+
     $previous_monthnum = $monthnum;
     $previous_year     = $year;
 
-    if ( isset( $attributes['month'] ) ) {
-        // phpcs:ignore WordPress.WP.GlobalVariablesOverride.OverrideProhibited
-        $monthnum = $attributes['month'];
-    }
-
-    if ( isset( $attributes['year'] ) ) {
-        // phpcs:ignore WordPress.WP.GlobalVariablesOverride.OverrideProhibited
-        $year = $attributes['year'];
+    if ( isset( $attributes['month'] ) && isset( $attributes['year'] ) ) {
+        $permalink_structure = get_option( 'permalink_structure' );
+        if (
+            strpos( $permalink_structure, '%monthnum%' ) !== false &&
+            strpos( $permalink_structure, '%year%' ) !== false
+        ) {
+            // phpcs:ignore WordPress.WP.GlobalVariablesOverride.OverrideProhibited
+            $monthnum = $attributes['month'];
+            // phpcs:ignore WordPress.WP.GlobalVariablesOverride.OverrideProhibited
+            $year = $attributes['year'];
+        }
     }