From 3b6833111d4308fd05ee25bac5f98a19cad4d27e Mon Sep 17 00:00:00 2001 From: Michael Torbert Date: Thu, 30 May 2019 19:15:59 -0400 Subject: [PATCH 1/4] fix variable name --- inc/aioseop_functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/aioseop_functions.php b/inc/aioseop_functions.php index 6d1bdc47d..c6b33e28a 100644 --- a/inc/aioseop_functions.php +++ b/inc/aioseop_functions.php @@ -358,9 +358,9 @@ function aioseop_ajax_save_meta() { die(); } if ( $result != '' ) : - $label = "'; + $label = "'; else : - $label = "" . __( 'No', 'all-in-one-seo-pack' ) . ' ' . $target . ''; + $label = "" . __( 'No', 'all-in-one-seo-pack' ) . ' ' . $target . ''; endif; $nonce = wp_create_nonce( "aioseop_meta_{$target}_{$post_id}" ); $output = ' Date: Thu, 30 May 2019 21:51:17 -0400 Subject: [PATCH 2/4] Make Button Orange Again #2405 --- admin/display/notices/wc-detected-notice.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/display/notices/wc-detected-notice.php b/admin/display/notices/wc-detected-notice.php index 0dc3080ab..032e25e8e 100644 --- a/admin/display/notices/wc-detected-notice.php +++ b/admin/display/notices/wc-detected-notice.php @@ -30,7 +30,7 @@ function aioseop_notice_pro_promo_woocommerce() { 'text' => __( 'Upgrade', 'all-in-one-seo-pack' ), 'link' => 'https://semperplugins.com/plugins/all-in-one-seo-pack-pro-version/?loc=woo', 'dismiss' => false, - 'class' => 'button-primary', + 'class' => 'button-primary button-orange', ), array( 'time' => 2592000, // 30 days. From 7348314d017e3e299636a4522cead73f1b80935f Mon Sep 17 00:00:00 2001 From: EkoJR Date: Fri, 31 May 2019 16:04:03 -0700 Subject: [PATCH 3/4] Fix sitemap index 1000+ posts notice check (#2541) * Fix sitemap index 1000+ posts notice check * Fix reset_notice not resetting user notices * Grunt --- admin/class-aioseop-notices.php | 9 ++++++++- modules/aioseop_sitemap.php | 24 +++++++++++++++++------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/admin/class-aioseop-notices.php b/admin/class-aioseop-notices.php index f587f367f..ab64cda66 100644 --- a/admin/class-aioseop-notices.php +++ b/admin/class-aioseop-notices.php @@ -467,7 +467,14 @@ public function deactivate_notice( $slug ) { * @return bool */ public function reset_notice( $slug ) { - if ( empty( $slug ) || ! isset( $this->notices[ $slug ] ) ) { + if ( + empty( $slug ) || + ( + ! isset( $this->notices[ $slug ] ) && + ! get_user_meta( get_current_user_id(), 'aioseop_notice_display_time_' . $slug, true ) && + ! get_user_meta( get_current_user_id(), 'aioseop_notice_dismissed_' . $slug, true ) + ) + ) { return false; } diff --git a/modules/aioseop_sitemap.php b/modules/aioseop_sitemap.php index 050c70132..9f2eb69a0 100644 --- a/modules/aioseop_sitemap.php +++ b/modules/aioseop_sitemap.php @@ -402,6 +402,8 @@ public function __construct() { * * @todo Move admin notice functions. Possibly to where it is first saved & loaded (`load_sitemap_options`). * + * @global AIOSEOP_Notices $aioseop_notices + * * @since 2.4.1 */ public function sitemap_notices() { @@ -409,12 +411,19 @@ public function sitemap_notices() { return; } + global $aioseop_notices; $options = $this->options; if ( - isset( $options[ "{$this->prefix}indexes" ] ) && - 'on ' !== $options[ "{$this->prefix}indexes" ] && - 1001 < $options[ "{$this->prefix}max_posts" ] + ( + isset( $options[ "{$this->prefix}indexes" ] ) && + 'on' !== $options[ "{$this->prefix}indexes" ] + ) || + ( + isset( $options[ "{$this->prefix}indexes" ] ) && + 'on' === $options[ "{$this->prefix}indexes" ] && + 1000 < $options[ "{$this->prefix}max_posts" ] + ) ) { $num_terms = 0; $post_counts = $this->get_total_post_count( @@ -431,12 +440,13 @@ public function sitemap_notices() { $sitemap_urls = $post_counts + $num_terms; - global $aioseop_notices; - if ( 1001 > $sitemap_urls ) { - $aioseop_notices->deactivate_notice( 'sitemap_max_warning' ); - } else { + if ( 1000 < $sitemap_urls ) { $aioseop_notices->activate_notice( 'sitemap_max_warning' ); + } else { + $aioseop_notices->deactivate_notice( 'sitemap_max_warning' ); } + } else { + $aioseop_notices->deactivate_notice( 'sitemap_max_warning' ); } } From c5c8e4d802903084f1958e964724997a9a97d807 Mon Sep 17 00:00:00 2001 From: Michael Torbert Date: Fri, 31 May 2019 19:05:46 -0400 Subject: [PATCH 4/4] Welcome page changes for 3.0 (#2539) * fix variable name * welcome page updates * Use tabs instead of spaces to indent * Fix Grunt issuees in welcome-content.php * Remove whitespace at end of line --- admin/display/credits-content.php | 54 +++++++++++++++---------------- admin/display/welcome-content.php | 10 ++++-- 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/admin/display/credits-content.php b/admin/display/credits-content.php index 87c181d6a..220db008f 100644 --- a/admin/display/credits-content.php +++ b/admin/display/credits-content.php @@ -84,33 +84,33 @@ Shohei Tanaka
  • - - Ross McKay -
    • -
  • - - Adam Silverstein -
    • -
  • - - Vinicius Schettino -
    • -
  • - - Srdjan Jocic -
    • -
  • - - Gennady Kovshenin -
    • + + Ross McKay + +
  • + + John Wright +
    • +
  • + + Md Jahidul Islam +
    • +
  • + + Adam Silverstein +
    • +
  • + + Vinicius Schettino +
    • +
  • + + Srdjan Jocic +
    • +
  • + + Gennady Kovshenin +

    • diff --git a/admin/display/welcome-content.php b/admin/display/welcome-content.php index 37c8d9203..74a6b4010 100644 --- a/admin/display/welcome-content.php +++ b/admin/display/welcome-content.php @@ -1,10 +1,16 @@
    +
    +

    +
    -

    +

    + echo esc_html( sprintf( __( 'Support %s', 'all-in-one-seo-pack' ), AIOSEOP_PLUGIN_NAME ) ); + ?> +