WordPress 6.7 対応

vektor-inc · Dec 5, 2024 · b0a991b · b0a991b
1 parent e5756f1
commit b0a991b
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 37 deletions.
diff --git a/_g2/functions.php b/_g2/functions.php
@@ -122,6 +122,39 @@ function lightning_theme_setup() {
 	/*-------------------------------------------*/
 	add_theme_support( 'customize-selective-refresh-widgets' );
 
+	require __DIR__ . '/functions-compatible.php';
+
+	/*
+		Load Custom template tags for this theme.
+	/*-------------------------------------------*/
+	require __DIR__ . '/inc/template-tags.php';
+	require __DIR__ . '/inc/template-tags-old.php';
+	require __DIR__ . '/inc/vk-helpers/config.php';
+
+	/*
+		Load Theme Customizer additions.
+	/*-------------------------------------------*/
+	require __DIR__ . '/inc/customize/customize-design.php';
+	require __DIR__ . '/inc/customize/customize-top-slide.php';
+	require __DIR__ . '/inc/customize/customize-functions.php';
+
+	/*
+		Load allow customize modules
+	/*-------------------------------------------*/
+	require __DIR__ . '/inc/vk-mobile-nav/vk-mobile-nav-config.php';
+
+	/*
+		Load modules
+	/*-------------------------------------------*/
+	require __DIR__ . '/inc/package-manager.php';
+	require __DIR__ . '/inc/class-design-manager.php';
+	require __DIR__ . '/inc/term-color/term-color-config.php';
+	require __DIR__ . '/inc/vk-components/vk-components-config.php';
+	require __DIR__ . '/inc/template-redirect.php';
+	require __DIR__ . '/inc/layout-controller/layout-controller.php';
+	require __DIR__ . '/inc/vk-footer-customize/vk-footer-customize-config.php';
+	require __DIR__ . '/inc/vk-css-optimize/config.php';
+
 	/*
 		Option init
 	/*-------------------------------------------*/
@@ -216,42 +249,6 @@ function lightning_load_common_editor_css_to_gutenberg() {
 	);
 }
 
-
-require __DIR__ . '/functions-compatible.php';
-
-
-/*
-	Load Custom template tags for this theme.
-/*-------------------------------------------*/
-require __DIR__ . '/inc/template-tags.php';
-require __DIR__ . '/inc/template-tags-old.php';
-require __DIR__ . '/inc/vk-helpers/config.php';
-
-/*
-	Load Theme Customizer additions.
-/*-------------------------------------------*/
-require __DIR__ . '/inc/customize/customize-design.php';
-require __DIR__ . '/inc/customize/customize-top-slide.php';
-require __DIR__ . '/inc/customize/customize-functions.php';
-
-/*
-	Load allow customize modules
-/*-------------------------------------------*/
-require __DIR__ . '/inc/vk-mobile-nav/vk-mobile-nav-config.php';
-
-/*
-	Load modules
-/*-------------------------------------------*/
-require __DIR__ . '/inc/package-manager.php';
-require __DIR__ . '/inc/class-design-manager.php';
-// require dirname( __FILE__ ) . '/inc/font-awesome/font-awesome-config.php';
-require __DIR__ . '/inc/term-color/term-color-config.php';
-require __DIR__ . '/inc/vk-components/vk-components-config.php';
-require __DIR__ . '/inc/template-redirect.php';
-require __DIR__ . '/inc/layout-controller/layout-controller.php';
-require __DIR__ . '/inc/vk-footer-customize/vk-footer-customize-config.php';
-require __DIR__ . '/inc/vk-css-optimize/config.php';
-
 /*
 	Plugin support
 /*

diff --git a/_g2/inc/package-manager.php b/_g2/inc/package-manager.php
@@ -8,7 +8,7 @@
 /*
 	Load Package
 /*-------------------------------------------*/
-add_action( 'after_setup_theme', 'Lightning_load_packages' );
+add_action( 'after_setup_theme', 'Lightning_load_packages', 11 );
 function Lightning_load_packages() {
 	$options  = get_option( 'lightning_theme_options' );
 	$packages = lightning_old_packages_array();