Merge branch 'dev-hiresuit' into staging

awsmin · Jan 2, 2025 · 0b31fca · 0b31fca
2 parents 2b0645f + ffcb7fb
commit 0b31fca
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/inc/template-functions-block.php b/inc/template-functions-block.php
@@ -114,7 +114,7 @@ function awsm_block_jobs_load_more( $query, $shortcode_atts = array() ) {
 			if ( AWSM_Job_Openings::is_default_pagination( $shortcode_atts ) ) {
 				$paged = ( $query->query_vars['paged'] ) ? $query->query_vars['paged'] : 1;
 				if ( $paged < $max_num_pages ) {
-					 $load_more_content = sprintf( '<div class="awsm-b-jobs-pagination awsm-b-load-more-main"><a href="#" class="awsm-b-load-more awsm-b-load-more-btn" data-page="%2$s">%1$s</a></div>', esc_html__( 'Load more...', 'wp-job-openings' ), esc_attr( $paged ) );
+					 $load_more_content = sprintf( '<div class="awsm-b-jobs-pagination awsm-b-load-more-main"><a href="#" class="awsm-b-load-more awsm-b-load-more-btn" data-page="%2$s">%1$s</a></div>', esc_html__( 'Load more', 'wp-job-openings' ), esc_attr( $paged ) );
 					/**
 					 * Filters the load more content.
 					 *

diff --git a/inc/template-functions.php b/inc/template-functions.php
@@ -272,7 +272,7 @@ function awsm_jobs_load_more( $query, $shortcode_atts = array() ) {
 			if ( AWSM_Job_Openings::is_default_pagination( $shortcode_atts ) ) {
 				$paged = ( $query->query_vars['paged'] ) ? $query->query_vars['paged'] : 1;
 				if ( $paged < $max_num_pages ) {
-					$load_more_content = sprintf( '<div class="awsm-jobs-pagination awsm-load-more-main"><a href="#" class="awsm-load-more awsm-load-more-btn" data-page="%2$s">%1$s</a></div>', esc_html__( 'Load more...', 'wp-job-openings' ), esc_attr( $paged ) );
+					$load_more_content = sprintf( '<div class="awsm-jobs-pagination awsm-load-more-main"><a href="#" class="awsm-load-more awsm-load-more-btn" data-page="%2$s">%1$s</a></div>', esc_html__( 'Load more', 'wp-job-openings' ), esc_attr( $paged ) );
 					/**
 					 * Filters the load more content.
 					 *

diff --git a/wp-job-openings.php b/wp-job-openings.php
@@ -170,7 +170,6 @@ public function check_pro_version_for_free_plugin() {
 
 					if ( version_compare( $pro_version, $required_pro_version, '<' ) ) {
 						add_action( 'admin_notices', array( $this, 'pro_version_admin_notice' ) );
-						deactivate_plugins( AWSM_JOBS_PRO_PLUGIN_BASENAME );
 					}
 				}
 			}
-Original file line number
+Diff line change
@@ Expand Up / @@ -170,7 +170,6 @@ public function check_pro_version_for_free_plugin() { @@
     					if ( version_compare( $pro_version, $required_pro_version, '<' ) ) {
     						add_action( 'admin_notices', array( $this, 'pro_version_admin_notice' ) );
-    						deactivate_plugins( AWSM_JOBS_PRO_PLUGIN_BASENAME );
     					}
     				}
     			}
@@ Expand Down @@