Update load order for templates.

Signed-off-by: Kevin Provance <[email protected]>

Author: kprovance

redux-core/class-redux-core.php

@@ -328,6 +328,8 @@ private function init() {
 
 			// phpcs:ignore WordPress.NamingConventions.ValidHookName
 			self::$upload_url = apply_filters( 'redux/upload_url', self::$upload_url );
+
+			self::load_template_libraries();
 		}
 
 		/**
@@ -343,6 +345,28 @@ public static function core_construct( $parent, array $args ) {
 
 		}
 
+		/**
+		 * Load Redux and Extendify template libraries.
+		 *
+		 * @return void
+		 */
+		private static function load_template_libraries(){
+			self::$redux_templates_enabled     = (bool) get_option( 'use_redux_templates' );
+			self::$extendify_templates_enabled = (bool) get_option( 'use_extendify_templates', true );
+
+			// Including extendify sdk.
+			if ( true === (bool) get_option( 'use_extendify_templates', true ) ) {
+				if ( file_exists( dirname( __FILE__ ) . '/extendify-sdk/loader.php' ) ) {
+					$GLOBALS['extendifySdkSourcePlugin'] = 'Redux';
+					require_once dirname( __FILE__ ) . '/extendify-sdk/loader.php';
+				}
+			}
+
+			if ( file_exists( dirname( __FILE__ ) . '/redux-templates/redux-templates.php' ) ) {
+				require_once dirname( __FILE__ ) . '/redux-templates/redux-templates.php';
+			}
+		}
+
 		/**
 		 * Autoregister run.
 		 *
@@ -353,9 +377,6 @@ private function includes() {
 				self::$pro_loaded = true;
 			}
 
-			self::$redux_templates_enabled     = (bool) get_option( 'use_redux_templates' );
-			self::$extendify_templates_enabled = (bool) get_option( 'use_extendify_templates', true );
-
 			require_once dirname( __FILE__ ) . '/inc/classes/class-redux-path.php';
 			require_once dirname( __FILE__ ) . '/inc/classes/class-redux-functions-ex.php';
 			require_once dirname( __FILE__ ) . '/inc/classes/class-redux-helpers.php';
@@ -368,18 +389,6 @@ private function includes() {
 			self::$welcome = new Redux_Welcome();
 			new Redux_Rest_Api_Builder( $this );
 
-			// Including extendify sdk.
-			if ( true === (bool) get_option( 'use_extendify_templates', true ) ) {
-				if ( file_exists( dirname( __FILE__ ) . '/extendify-sdk/loader.php' ) ) {
-					$GLOBALS['extendifySdkSourcePlugin'] = 'Redux';
-					require_once dirname( __FILE__ ) . '/extendify-sdk/loader.php';
-				}
-			}
-
-			if ( file_exists( dirname( __FILE__ ) . '/redux-templates/redux-templates.php' ) ) {
-				require_once dirname( __FILE__ ) . '/redux-templates/redux-templates.php';
-			}
-
 			add_action( 'admin_init', array( $this, 'admin_init' ) );
 
 			add_filter( 'debug_information', array( $this, 'add_debug_info' ) );