fix load main static page

Author: VaLeXaR

core/class-wpm-setup.php

@@ -12,7 +12,7 @@
  * Class WPM_Setup
  * @package  WPM\Core
  * @author   VaLeXaR
- * @version  1.2.1
+ * @version  1.2.2
  */
 class WPM_Setup {
 
@@ -93,22 +93,14 @@ public function __construct() {
 		add_filter( 'query_vars', array( $this, 'set_lang_var' ) );
 		add_filter( 'option_home', array( $this, 'set_home_url' ), 99 );
 		add_action( 'change_locale', array( $this, 'change_locale' ), 0 );
-		add_action( 'after_setup_theme', array( $this, 'setup_lang_query' ), 0 );
+		add_action( 'wp', array( $this, 'setup_lang_query' ), 0 );
 		add_action( 'after_switch_theme', __NAMESPACE__ . '\WPM_Config::load_config_run' );
 		add_action( 'activated_plugin', __NAMESPACE__ . '\WPM_Config::load_config_run' );
 		add_action( 'upgrader_process_complete', __NAMESPACE__ . '\WPM_Config::load_config_run' );
 		add_action( 'wpm_init', array( $this, 'load_vendor' ) );
 		add_action( 'template_redirect', array( $this, 'set_not_found' ) );
 		add_action( 'init', array( $this, 'switch_to_language' ) );
-		$this->init();
-	}
-
-
-	/**
-	 * Set locale, load vendor classes
-	 */
-	public function init() {
-		$this->set_locale();
+		add_action( 'setup_theme', array( $this, 'set_locale' ), 0 );
 	}
 
 
@@ -373,7 +365,7 @@ public function change_locale( $new_locale ) {
 	 */
 	public function set_home_url( $value ) {
 
-		if ( is_admin() && ! defined( 'DOING_AJAX' ) ) {
+		if ( ( is_admin() && ! defined( 'DOING_AJAX' ) ) ) {
 			return $value;
 		}
 

readme.txt

@@ -4,7 +4,7 @@ Contributors: valexar
 Tags: localization, multilanguage, multilingual, translation, multilang
 Requires at least: 4.7
 Tested up to: 4.8
-Stable tag: 1.3.5
+Stable tag: 1.3.6
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -133,6 +133,9 @@ Compatible with multisite not tested.
 
 == Changelog ==
 
+= 1.3.6 =
+* fix load main static page
+
 = 1.3.5 =
 * hide wp language settings
 * fix load theme localization files

wp-multilang.php

@@ -8,7 +8,7 @@
  * License URI: https://www.gnu.org/licenses/gpl-2.0.html
  * Text Domain:     wpm
  * Domain Path:     /languages
- * Version:         1.3.5
+ * Version:         1.3.6
  *
  * @package  WPM
  * @category Core
@@ -42,7 +42,7 @@ final class WP_Multilang {
 		 *
 		 * @var string
 		 */
-		public $version = '1.3.5';
+		public $version = '1.3.6';
 
 		/**
 		 * The single instance of the class.
@@ -99,7 +99,6 @@ public function __construct() {
 		private function init_hooks() {
 			register_activation_hook( __FILE__, array( 'WPM\Core\WPM_Install', 'install' ) );
 			add_action( 'init', array( $this, 'init' ), 0 );
-			add_action( 'setup_theme', array( $this, 'setup' ), 0 );
 		}
 
 		/**
@@ -153,17 +152,14 @@ public function includes() {
 			include_once( 'core/wpm-widget-functions.php' );
 			include_once( 'core/abstracts/abstract-wpm-object.php' );
 
+			Core\WPM_Setup::instance();
+
 			if ( $this->is_request( 'frontend' ) ) {
 				include_once( 'core/wpm-template-hooks.php' );
 				Core\WPM_Frontend_Scripts::init();               // Frontend Scripts
 			}
 		}
 
-
-		public function setup() {
-			Core\WPM_Setup::instance();
-		}
-
 		/**
 		 * Init Multilang when WordPress Initialises.
 		 */