Fix maintenance mode issue for previously logged users #321

girishpanchal30 · girishpanchal30 · commit 0850e6f98a1d · 2022-09-26T11:03:13.000+05:30
diff --git a/includes/classes/wp-maintenance-mode.php b/includes/classes/wp-maintenance-mode.php
@@ -78,7 +78,7 @@ private function __construct() {
 				add_filter(
 					'pre_option_page_on_front',
 					function ( $value ) {
-						if ( ! is_user_logged_in() && isset( $this->plugin_settings['design']['page_id'] ) && get_option( 'wpmm_new_look' ) ) {
+						if ( ( ! $this->check_user_role() && ! $this->check_exclude() ) && isset( $this->plugin_settings['design']['page_id'] ) && get_option( 'wpmm_new_look' ) ) {
 							$page_id = $this->plugin_settings['design']['page_id'];
 
 							if ( ! function_exists( 'is_plugin_active' ) ) {
@@ -997,11 +997,11 @@ public function use_maintenance_template( $template ) {
 			}
 
 			$current_template = get_post_meta( $post->ID, '_wp_page_template', true );
-			if ( 'templates/wpmm-page-template.php' !== $current_template ) {
+			if ( ! empty( $current_template ) && 'templates/wpmm-page-template.php' !== $current_template ) {
 				return $template;
 			}
 
-			$file = WPMM_VIEWS_PATH . '/wpmm-page-template.php';
+			$file = WPMM_VIEWS_PATH . 'wpmm-page-template.php';
 			if ( file_exists( $file ) ) {
 				return $file;
 			}

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ private function __construct() {`
`78`	`78`	`add_filter(`
`79`	`79`	`'pre_option_page_on_front',`
`80`	`80`	`function ( $value ) {`
`81`		`- if ( ! is_user_logged_in() && isset( $this->plugin_settings['design']['page_id'] ) && get_option( 'wpmm_new_look' ) ) {`
	`81`	`+ if ( ( ! $this->check_user_role() && ! $this->check_exclude() ) && isset( $this->plugin_settings['design']['page_id'] ) && get_option( 'wpmm_new_look' ) ) {`
`82`	`82`	`$page_id = $this->plugin_settings['design']['page_id'];`
`83`	`83`
`84`	`84`	`if ( ! function_exists( 'is_plugin_active' ) ) {`
`@@ -997,11 +997,11 @@ public function use_maintenance_template( $template ) {`
`997`	`997`	`}`
`998`	`998`
`999`	`999`	`$current_template = get_post_meta( $post->ID, '_wp_page_template', true );`
`1000`		`- if ( 'templates/wpmm-page-template.php' !== $current_template ) {`
	`1000`	`+ if ( ! empty( $current_template ) && 'templates/wpmm-page-template.php' !== $current_template ) {`
`1001`	`1001`	`return $template;`
`1002`	`1002`	`}`
`1003`	`1003`
`1004`		`- $file = WPMM_VIEWS_PATH . '/wpmm-page-template.php';`
	`1004`	`+ $file = WPMM_VIEWS_PATH . 'wpmm-page-template.php';`
`1005`	`1005`	`if ( file_exists( $file ) ) {`
`1006`	`1006`	`return $file;`
`1007`	`1007`	`}`