Skip to content

Update @wordpress packages #1883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
noisysocks wants to merge 4 commits into from
Closed

Update @wordpress packages #1883

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
32f1dd4
Update @wordpress packages
noisysocks Nov 15, 2021
b942510
Changes from lib/block-supports/layout.php
noisysocks Nov 15, 2021
81b5daf
Rename fse_navigation_areas to wp_navigation_areas
noisysocks Nov 15, 2021
c7ca187
Changes from lib/navigation.php
noisysocks Nov 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename fse_navigation_areas to wp_navigation_areas
  • Loading branch information
@noisysocks
noisysocks committed Nov 15, 2021
commit 81b5dafb216b2e3d908b8bb8c28e255eac999397
2 changes: 1 addition & 1 deletion src/wp-admin/site-editor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ static function( $classes ) {
'/wp/v2/block-navigation-areas?context=edit',
);

$areas = get_option( 'fse_navigation_areas', array() );
$areas = get_option( 'wp_navigation_areas', array() );
$active_areas = array_intersect_key( $areas, get_navigation_areas() );
foreach ( $active_areas as $post_id ) {
if ( $post_id ) {
Expand Down
4 changes: 2 additions & 2 deletions src/wp-includes/navigation-areas.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ function _wp_migrate_menu_to_navigation_post( $new_name, WP_Theme $new_theme, WP
add_filter( 'option_stylesheet', $get_old_theme_stylesheet );

$locations = get_nav_menu_locations();
$area_mapping = get_option( 'fse_navigation_areas', array() );
$area_mapping = get_option( 'wp_navigation_areas', array() );

foreach ( $locations as $location_name => $menu_id ) {
// Get the menu from the location, skipping if there is no
Expand Down Expand Up @@ -130,7 +130,7 @@ function _wp_migrate_menu_to_navigation_post( $new_name, WP_Theme $new_theme, WP
}
remove_filter( 'option_stylesheet', $get_old_theme_stylesheet );

update_option( 'fse_navigation_areas', $area_mapping );
update_option( 'wp_navigation_areas', $area_mapping );
}

/**
Expand Down
6 changes: 3 additions & 3 deletions src/wp-includes/rest-api/endpoints/class-wp-rest-block-navigation-areas-controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,9 @@ public function get_item( $request ) {
public function update_item( $request ) {
$name = $request['area'];

$mapping = get_option( 'fse_navigation_areas', array() );
$mapping = get_option( 'wp_navigation_areas', array() );
$mapping[ $name ] = $request['navigation'];
update_option( 'fse_navigation_areas', $mapping );
update_option( 'wp_navigation_areas', $mapping );

$area = $this->get_navigation_area_object( $name );
$data = $this->prepare_item_for_response( $area, $request );
Expand All @@ -196,7 +196,7 @@ public function update_item( $request ) {
*/
protected function get_navigation_area_object( $name ) {
$available_areas = get_navigation_areas();
$mapping = get_option( 'fse_navigation_areas', array() );
$mapping = get_option( 'wp_navigation_areas', array() );
$area = new stdClass();
$area->name = $name;
$area->navigation = ! empty( $mapping[ $name ] ) ? $mapping[ $name ] : null;
Expand Down
2 changes: 1 addition & 1 deletion tests/phpunit/tests/rest-api/wpRestBlockNavigationAreasController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
class Tests_REST_WpRestBlockNavigationAreasController extends WP_Test_REST_Controller_Testcase {

const OPTION = 'fse_navigation_areas';
const OPTION = 'wp_navigation_areas';

/**
* @var int Administrator user ID
Expand Down