diff --git a/includes/admin/feedzy-rss-feeds-import.php b/includes/admin/feedzy-rss-feeds-import.php index d6ba3ad7..55df985f 100644 --- a/includes/admin/feedzy-rss-feeds-import.php +++ b/includes/admin/feedzy-rss-feeds-import.php @@ -834,8 +834,10 @@ public function manage_feedzy_import_columns( $column, $post_id ) { if ( ! $next ) { $next = Feedzy_Rss_Feeds_Util_Scheduler::is_scheduled( 'feedzy_cron' ); } - if ( $next ) { + if ( is_numeric( $next ) ) { echo wp_kses_post( human_time_diff( $next, time() ) ); + } elseif ( $next ) { + echo esc_html__( 'in-progress', 'feedzy-rss-feeds' ); } break; default: diff --git a/includes/util/feedzy-rss-feeds-util-scheduler.php b/includes/util/feedzy-rss-feeds-util-scheduler.php index 20737408..6cf4662b 100644 --- a/includes/util/feedzy-rss-feeds-util-scheduler.php +++ b/includes/util/feedzy-rss-feeds-util-scheduler.php @@ -28,14 +28,13 @@ class Feedzy_Rss_Feeds_Util_Scheduler { * @return bool|int */ public static function is_scheduled( string $hook, array $args = array() ) { - if ( function_exists( 'as_has_scheduled_action' ) ) { - return as_has_scheduled_action( $hook, $args ); - } - if ( function_exists( 'as_next_scheduled_action' ) ) { // For older versions of AS. return as_next_scheduled_action( $hook, $args ); } + if ( function_exists( 'as_has_scheduled_action' ) ) { + return as_has_scheduled_action( $hook, $args ); + } return wp_next_scheduled( $hook, $args ); } diff --git a/includes/views/import-metabox-edit.php b/includes/views/import-metabox-edit.php index 94ac7566..4c0b74ae 100644 --- a/includes/views/import-metabox-edit.php +++ b/includes/views/import-metabox-edit.php @@ -674,9 +674,9 @@ class="fz-switch-toggle" type="checkbox" value="yes" > - -