Merge pull request #442 from Codeinwp/bugfix/441

Fixed compatibility issue with Elementor
Codeinwp · Sep 17, 2024 · 82150ae · 82150ae
2 parents 743dd86 + 1f18d12
commit 82150ae
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Setup PHP version
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.1'
+          php-version: '7.2'
           extensions: simplexml
           tools: composer:v2.1
       - name: Checkout source code

diff --git a/includes/classes/wp-maintenance-mode.php b/includes/classes/wp-maintenance-mode.php
@@ -1067,6 +1067,21 @@ public function add_maintenance_template( $templates ) {
 		 */
 		public function use_maintenance_template( $template ) {
 			global $post;
+
+			// Return the default template for Elementor when:
+			if (
+				class_exists( '\Elementor\Plugin', false ) &&
+				(
+					// Edit Mode is on.
+					( isset( $_GET['action'] ) && 'elementor' === $_GET['action'] ) || // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+					// Preview Mode is on.
+					isset( $_GET['elementor-preview'] ) // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+				)
+			) {
+				return $template;
+			}
+
+			// Return the default template if the current post is empty.
 			if ( empty( $post ) ) {
 				return $template;
 			}

diff --git a/views/wpmm-page-template.php b/views/wpmm-page-template.php
@@ -24,8 +24,10 @@
 	<?php
 	wp_body_open();
 
-	the_post();
-	the_content();
+	while ( have_posts() ) {
+		the_post();
+		the_content();
+	}
 
 	if ( isset( $settings['bot']['status'] ) && $settings['bot']['status'] === 1 ) {
 		?>