Skip to content

Commit 49093f1

Browse files
dmsnelldmsnell
committed
Merge branch 'restore/gb-files' into build/restore-deleted-files-preserving-history
2 parents d2fd852 + 1b446a9 commit 49093f1

File tree

7 files changed

+51
-51
lines changed

7 files changed

+51
-51
lines changed

‎src/wp-includes/build/pages.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Pages loader - Auto-generated by build process.
44
* Do not edit this file manually.
55
*
6-
* @package wp
6+
* @package gutenberg
77
*/
88

99
require_once __DIR__ . '/pages/site-editor/page.php';

‎src/wp-includes/build/pages/font-library/page-wp-admin.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
* This version integrates with the standard WordPress admin interface,
88
* keeping the wp-admin sidebar and scripts/styles intact.
99
*
10-
* @package wp
10+
* @package gutenberg
1111
*/
1212

1313
// Global storage for font-library routes and menu items
14-
global $wp_font_library_wp_admin_routes, $wp_font_library_wp_admin_menu_items;
15-
$wp_font_library_wp_admin_routes = array();
16-
$wp_font_library_wp_admin_menu_items = array();
14+
global $gutenberg_font_library_wp_admin_routes, $gutenberg_font_library_wp_admin_menu_items;
15+
$gutenberg_font_library_wp_admin_routes = array();
16+
$gutenberg_font_library_wp_admin_menu_items = array();
1717

1818
if ( ! function_exists( 'register_font_library_wp_admin_route' ) ) {
1919
/**
@@ -24,7 +24,7 @@
2424
* @param string|null $route_module Script module ID for route lifecycle hooks.
2525
*/
2626
function register_font_library_wp_admin_route( $path, $content_module = null, $route_module = null ) {
27-
global $wp_font_library_wp_admin_routes;
27+
global $gutenberg_font_library_wp_admin_routes;
2828

2929
$route = array( 'path' => $path );
3030
if ( ! empty( $content_module ) ) {
@@ -34,7 +34,7 @@ function register_font_library_wp_admin_route( $path, $content_module = null, $r
3434
$route['route_module'] = $route_module;
3535
}
3636

37-
$wp_font_library_wp_admin_routes[] = $route;
37+
$gutenberg_font_library_wp_admin_routes[] = $route;
3838
}
3939
}
4040

@@ -49,7 +49,7 @@ function register_font_library_wp_admin_route( $path, $content_module = null, $r
4949
* @param string $parent_id Optional. Parent menu item ID.
5050
*/
5151
function register_font_library_wp_admin_menu_item( $id, $label, $to, $parent_id = '' ) {
52-
global $wp_font_library_wp_admin_menu_items;
52+
global $gutenberg_font_library_wp_admin_menu_items;
5353

5454
$menu_item = array(
5555
'id' => $id,
@@ -61,7 +61,7 @@ function register_font_library_wp_admin_menu_item( $id, $label, $to, $parent_id
6161
$menu_item['parent'] = $parent_id;
6262
}
6363

64-
$wp_font_library_wp_admin_menu_items[] = $menu_item;
64+
$gutenberg_font_library_wp_admin_menu_items[] = $menu_item;
6565
}
6666
}
6767

@@ -72,8 +72,8 @@ function register_font_library_wp_admin_menu_item( $id, $label, $to, $parent_id
7272
* @return array Array of route objects.
7373
*/
7474
function get_font_library_wp_admin_routes() {
75-
global $wp_font_library_wp_admin_routes;
76-
return $wp_font_library_wp_admin_routes ?? array();
75+
global $gutenberg_font_library_wp_admin_routes;
76+
return $gutenberg_font_library_wp_admin_routes ?? array();
7777
}
7878
}
7979

@@ -84,8 +84,8 @@ function get_font_library_wp_admin_routes() {
8484
* @return array Array of menu item objects.
8585
*/
8686
function get_font_library_wp_admin_menu_items() {
87-
global $wp_font_library_wp_admin_menu_items;
88-
return $wp_font_library_wp_admin_menu_items ?? array();
87+
global $gutenberg_font_library_wp_admin_menu_items;
88+
return $gutenberg_font_library_wp_admin_menu_items ?? array();
8989
}
9090
}
9191

‎src/wp-includes/build/pages/font-library/page.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
* Auto-generated by build process.
55
* Do not edit this file manually.
66
*
7-
* @package wp
7+
* @package gutenberg
88
*/
99

1010
// Global storage for font-library routes and menu items
11-
global $wp_font_library_routes, $wp_font_library_menu_items;
12-
$wp_font_library_routes = array();
13-
$wp_font_library_menu_items = array();
11+
global $gutenberg_font_library_routes, $gutenberg_font_library_menu_items;
12+
$gutenberg_font_library_routes = array();
13+
$gutenberg_font_library_menu_items = array();
1414

1515
if ( ! function_exists( 'register_font_library_route' ) ) {
1616
/**
@@ -21,7 +21,7 @@
2121
* @param string|null $route_module Script module ID for route lifecycle hooks.
2222
*/
2323
function register_font_library_route( $path, $content_module = null, $route_module = null ) {
24-
global $wp_font_library_routes;
24+
global $gutenberg_font_library_routes;
2525

2626
$route = array( 'path' => $path );
2727
if ( ! empty( $content_module ) ) {
@@ -31,7 +31,7 @@ function register_font_library_route( $path, $content_module = null, $route_modu
3131
$route['route_module'] = $route_module;
3232
}
3333

34-
$wp_font_library_routes[] = $route;
34+
$gutenberg_font_library_routes[] = $route;
3535
}
3636
}
3737

@@ -46,7 +46,7 @@ function register_font_library_route( $path, $content_module = null, $route_modu
4646
* @param string $parent_type Optional. Parent type: 'drilldown' or 'dropdown'.
4747
*/
4848
function register_font_library_menu_item( $id, $label, $to, $parent_id = '', $parent_type = '' ) {
49-
global $wp_font_library_menu_items;
49+
global $gutenberg_font_library_menu_items;
5050

5151
$menu_item = array(
5252
'id' => $id,
@@ -62,7 +62,7 @@ function register_font_library_menu_item( $id, $label, $to, $parent_id = '', $pa
6262
$menu_item['parent_type'] = $parent_type;
6363
}
6464

65-
$wp_font_library_menu_items[] = $menu_item;
65+
$gutenberg_font_library_menu_items[] = $menu_item;
6666
}
6767
}
6868

@@ -73,8 +73,8 @@ function register_font_library_menu_item( $id, $label, $to, $parent_id = '', $pa
7373
* @return array Array of route objects.
7474
*/
7575
function get_font_library_routes() {
76-
global $wp_font_library_routes;
77-
return $wp_font_library_routes ?? array();
76+
global $gutenberg_font_library_routes;
77+
return $gutenberg_font_library_routes ?? array();
7878
}
7979
}
8080

@@ -85,8 +85,8 @@ function get_font_library_routes() {
8585
* @return array Array of menu item objects.
8686
*/
8787
function get_font_library_menu_items() {
88-
global $wp_font_library_menu_items;
89-
return $wp_font_library_menu_items ?? array();
88+
global $gutenberg_font_library_menu_items;
89+
return $gutenberg_font_library_menu_items ?? array();
9090
}
9191
}
9292

‎src/wp-includes/build/pages/site-editor/page-wp-admin.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
* This version integrates with the standard WordPress admin interface,
88
* keeping the wp-admin sidebar and scripts/styles intact.
99
*
10-
* @package wp
10+
* @package gutenberg
1111
*/
1212

1313
// Global storage for site-editor routes and menu items
14-
global $wp_site_editor_wp_admin_routes, $wp_site_editor_wp_admin_menu_items;
15-
$wp_site_editor_wp_admin_routes = array();
16-
$wp_site_editor_wp_admin_menu_items = array();
14+
global $gutenberg_site_editor_wp_admin_routes, $gutenberg_site_editor_wp_admin_menu_items;
15+
$gutenberg_site_editor_wp_admin_routes = array();
16+
$gutenberg_site_editor_wp_admin_menu_items = array();
1717

1818
if ( ! function_exists( 'register_site_editor_wp_admin_route' ) ) {
1919
/**
@@ -24,7 +24,7 @@
2424
* @param string|null $route_module Script module ID for route lifecycle hooks.
2525
*/
2626
function register_site_editor_wp_admin_route( $path, $content_module = null, $route_module = null ) {
27-
global $wp_site_editor_wp_admin_routes;
27+
global $gutenberg_site_editor_wp_admin_routes;
2828

2929
$route = array( 'path' => $path );
3030
if ( ! empty( $content_module ) ) {
@@ -34,7 +34,7 @@ function register_site_editor_wp_admin_route( $path, $content_module = null, $ro
3434
$route['route_module'] = $route_module;
3535
}
3636

37-
$wp_site_editor_wp_admin_routes[] = $route;
37+
$gutenberg_site_editor_wp_admin_routes[] = $route;
3838
}
3939
}
4040

@@ -49,7 +49,7 @@ function register_site_editor_wp_admin_route( $path, $content_module = null, $ro
4949
* @param string $parent_id Optional. Parent menu item ID.
5050
*/
5151
function register_site_editor_wp_admin_menu_item( $id, $label, $to, $parent_id = '' ) {
52-
global $wp_site_editor_wp_admin_menu_items;
52+
global $gutenberg_site_editor_wp_admin_menu_items;
5353

5454
$menu_item = array(
5555
'id' => $id,
@@ -61,7 +61,7 @@ function register_site_editor_wp_admin_menu_item( $id, $label, $to, $parent_id =
6161
$menu_item['parent'] = $parent_id;
6262
}
6363

64-
$wp_site_editor_wp_admin_menu_items[] = $menu_item;
64+
$gutenberg_site_editor_wp_admin_menu_items[] = $menu_item;
6565
}
6666
}
6767

@@ -72,8 +72,8 @@ function register_site_editor_wp_admin_menu_item( $id, $label, $to, $parent_id =
7272
* @return array Array of route objects.
7373
*/
7474
function get_site_editor_wp_admin_routes() {
75-
global $wp_site_editor_wp_admin_routes;
76-
return $wp_site_editor_wp_admin_routes ?? array();
75+
global $gutenberg_site_editor_wp_admin_routes;
76+
return $gutenberg_site_editor_wp_admin_routes ?? array();
7777
}
7878
}
7979

@@ -84,8 +84,8 @@ function get_site_editor_wp_admin_routes() {
8484
* @return array Array of menu item objects.
8585
*/
8686
function get_site_editor_wp_admin_menu_items() {
87-
global $wp_site_editor_wp_admin_menu_items;
88-
return $wp_site_editor_wp_admin_menu_items ?? array();
87+
global $gutenberg_site_editor_wp_admin_menu_items;
88+
return $gutenberg_site_editor_wp_admin_menu_items ?? array();
8989
}
9090
}
9191

‎src/wp-includes/build/pages/site-editor/page.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
* Auto-generated by build process.
55
* Do not edit this file manually.
66
*
7-
* @package wp
7+
* @package gutenberg
88
*/
99

1010
// Global storage for site-editor routes and menu items
11-
global $wp_site_editor_routes, $wp_site_editor_menu_items;
12-
$wp_site_editor_routes = array();
13-
$wp_site_editor_menu_items = array();
11+
global $gutenberg_site_editor_routes, $gutenberg_site_editor_menu_items;
12+
$gutenberg_site_editor_routes = array();
13+
$gutenberg_site_editor_menu_items = array();
1414

1515
if ( ! function_exists( 'register_site_editor_route' ) ) {
1616
/**
@@ -21,7 +21,7 @@
2121
* @param string|null $route_module Script module ID for route lifecycle hooks.
2222
*/
2323
function register_site_editor_route( $path, $content_module = null, $route_module = null ) {
24-
global $wp_site_editor_routes;
24+
global $gutenberg_site_editor_routes;
2525

2626
$route = array( 'path' => $path );
2727
if ( ! empty( $content_module ) ) {
@@ -31,7 +31,7 @@ function register_site_editor_route( $path, $content_module = null, $route_modul
3131
$route['route_module'] = $route_module;
3232
}
3333

34-
$wp_site_editor_routes[] = $route;
34+
$gutenberg_site_editor_routes[] = $route;
3535
}
3636
}
3737

@@ -46,7 +46,7 @@ function register_site_editor_route( $path, $content_module = null, $route_modul
4646
* @param string $parent_type Optional. Parent type: 'drilldown' or 'dropdown'.
4747
*/
4848
function register_site_editor_menu_item( $id, $label, $to, $parent_id = '', $parent_type = '' ) {
49-
global $wp_site_editor_menu_items;
49+
global $gutenberg_site_editor_menu_items;
5050

5151
$menu_item = array(
5252
'id' => $id,
@@ -62,7 +62,7 @@ function register_site_editor_menu_item( $id, $label, $to, $parent_id = '', $par
6262
$menu_item['parent_type'] = $parent_type;
6363
}
6464

65-
$wp_site_editor_menu_items[] = $menu_item;
65+
$gutenberg_site_editor_menu_items[] = $menu_item;
6666
}
6767
}
6868

@@ -73,8 +73,8 @@ function register_site_editor_menu_item( $id, $label, $to, $parent_id = '', $par
7373
* @return array Array of route objects.
7474
*/
7575
function get_site_editor_routes() {
76-
global $wp_site_editor_routes;
77-
return $wp_site_editor_routes ?? array();
76+
global $gutenberg_site_editor_routes;
77+
return $gutenberg_site_editor_routes ?? array();
7878
}
7979
}
8080

@@ -85,8 +85,8 @@ function get_site_editor_routes() {
8585
* @return array Array of menu item objects.
8686
*/
8787
function get_site_editor_menu_items() {
88-
global $wp_site_editor_menu_items;
89-
return $wp_site_editor_menu_items ?? array();
88+
global $gutenberg_site_editor_menu_items;
89+
return $gutenberg_site_editor_menu_items ?? array();
9090
}
9191
}
9292

‎src/wp-includes/build/routes.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Registers all routes on their respective page init hooks.
55
* Do not edit this file manually.
66
*
7-
* @package wp
7+
* @package gutenberg
88
*/
99

1010
// Load routes registry

‎src/wp-includes/build/routes/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Route registry - Auto-generated by build process.
44
* Do not edit this file manually.
55
*
6-
* @package wp
6+
* @package gutenberg
77
*/
88

99
return array(

0 commit comments

Comments
 (0)