diff --git a/src/wp-includes/blocks.php b/src/wp-includes/blocks.php
index 422b75e945..15a667bdbe 100644
|
a
|
b
|
function strip_core_block_namespace( $block_name = null ) { |
| 188 | 188 | * @param string $content Block save content. |
| 189 | 189 | * @return string Comment-delimited block content. |
| 190 | 190 | */ |
| 191 | | function get_comment_delimited_block_content( $block_name = null, $block_attributes, $block_content ) { |
| | 191 | function get_comment_delimited_block_content( $block_name = null, $block_attributes = array(), $block_content = '' ) { |
| 192 | 192 | if ( is_null( $block_name ) ) { |
| 193 | 193 | return $block_content; |
| 194 | 194 | } |
diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
index 35c1e2e2f3..b44909a794 100644
|
a
|
b
|
function wp_extract_urls( $content ) { |
| 828 | 828 | * |
| 829 | 829 | * @global wpdb $wpdb WordPress database abstraction object. |
| 830 | 830 | * |
| 831 | | * @param string $content Post content. If `null`, the `post_content` field from `$post` is used. |
| 832 | | * @param int|WP_Post $post Post ID or post object. |
| | 831 | * @param string $content Post content. If `null`, the `post_content` field from `$post` is used. |
| | 832 | * @param int|WP_Post|null $post Post ID or post object. |
| 833 | 833 | * @return null|bool Returns false if post is not found. |
| 834 | 834 | */ |
| 835 | | function do_enclose( $content = null, $post ) { |
| | 835 | function do_enclose( $content = null, $post = null ) { |
| 836 | 836 | global $wpdb; |
| 837 | 837 | |
| 838 | 838 | // @todo Tidy this code and make the debug code optional. |
diff --git a/src/wp-includes/nav-menu.php b/src/wp-includes/nav-menu.php
index e786d786db..570026ac88 100644
|
a
|
b
|
function _wp_delete_post_menu_item( $object_id = 0 ) { |
| 1054 | 1054 | * @since 3.0.0 |
| 1055 | 1055 | * @access private |
| 1056 | 1056 | * |
| 1057 | | * @param int $object_id Optional. The ID of the original object being trashed. Default 0. |
| 1058 | | * @param int $tt_id Term taxonomy ID. Unused. |
| 1059 | | * @param string $taxonomy Taxonomy slug. |
| | 1057 | * @param int $object_id Optional. The ID of the original object being trashed. Default 0. |
| | 1058 | * @param int|null $tt_id Term taxonomy ID. Unused. |
| | 1059 | * @param string $taxonomy Taxonomy slug. |
| 1060 | 1060 | */ |
| 1061 | | function _wp_delete_tax_menu_item( $object_id = 0, $tt_id, $taxonomy ) { |
| | 1061 | function _wp_delete_tax_menu_item( $object_id = 0, $tt_id = null, $taxonomy = '' ) { |
| 1062 | 1062 | $object_id = (int) $object_id; |
| 1063 | 1063 | |
| 1064 | 1064 | $menu_item_ids = wp_get_associated_nav_menu_items( $object_id, 'taxonomy', $taxonomy ); |
diff --git a/tests/phpunit/tests/rest-api/rest-attachments-controller.php b/tests/phpunit/tests/rest-api/rest-attachments-controller.php
index f6adcf78c8..f88f120cd9 100644
|
a
|
b
|
public function tearDown() { |
| 1552 | 1552 | $this->remove_added_uploads(); |
| 1553 | 1553 | } |
| 1554 | 1554 | |
| 1555 | | protected function check_post_data( $attachment, $data, $context = 'view', $links ) { |
| | 1555 | protected function check_post_data( $attachment, $data, $context = 'view', $links = array() ) { |
| 1556 | 1556 | parent::check_post_data( $attachment, $data, $context, $links ); |
| 1557 | 1557 | |
| 1558 | 1558 | $this->assertArrayNotHasKey( 'content', $data ); |