Skip to content

Commit

Permalink
Merge pull request #1240 from semperfiwebdesign/development
Browse files Browse the repository at this point in the history
Development to master for 2.4.1
  • Loading branch information
michaeltorbert authored Oct 2, 2017
2 parents 2d97c11 + f8289cc commit 7fab9f4
Show file tree
Hide file tree
Showing 5 changed files with 176 additions and 33 deletions.
7 changes: 4 additions & 3 deletions all_in_one_seo_pack.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Plugin Name: All In One SEO Pack
Plugin URI: https://semperplugins.com/all-in-one-seo-pack-pro-version/
Description: Out-of-the-box SEO for your WordPress blog. Features like XML Sitemaps, SEO for custom post types, SEO for blogs or business sites, SEO for ecommerce sites, and much more. More than 30 million downloads since 2007.
Version: 2.4
Version: 2.4.1
Author: Michael Torbert
Author URI: https://semperplugins.com/all-in-one-seo-pack-pro-version/
Text Domain: all-in-one-seo-pack
Expand Down Expand Up @@ -31,14 +31,14 @@
* The original WordPress SEO plugin.
*
* @package All-in-One-SEO-Pack
* @version 2.4
* @version 2.4.1
*/

if ( ! defined( 'AIOSEOPPRO' ) ) {
define( 'AIOSEOPPRO', false );
}
if ( ! defined( 'AIOSEOP_VERSION' ) ) {
define( 'AIOSEOP_VERSION', '2.4' );
define( 'AIOSEOP_VERSION', '2.4.1' );
}
global $aioseop_plugin_name;
$aioseop_plugin_name = 'All in One SEO Pack';
Expand Down Expand Up @@ -464,6 +464,7 @@ function aioseop_welcome(){
add_action( 'wp_ajax_aioseo_dismiss_yst_notice', 'aioseop_update_yst_detected_notice' );
add_action( 'wp_ajax_aioseo_dismiss_visibility_notice', 'aioseop_update_user_visibilitynotice' );
add_action( 'wp_ajax_aioseo_dismiss_woo_upgrade_notice', 'aioseop_woo_upgrade_notice_dismissed' );
add_action( 'wp_ajax_aioseo_dismiss_sitemap_max_url_notice', 'aioseop_sitemap_max_url_notice_dismissed' );
if ( AIOSEOPPRO ) {
add_action( 'wp_ajax_aioseop_ajax_update_oembed', 'aioseop_ajax_update_oembed' );
}
Expand Down
5 changes: 5 additions & 0 deletions inc/aioseop_functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -958,6 +958,11 @@ function aioseop_woo_upgrade_notice_dismissed() {
update_user_meta( get_current_user_id(), 'aioseop_woo_upgrade_notice_dismissed', true );
}

function aioseop_sitemap_max_url_notice_dismissed() {

update_user_meta( get_current_user_id(), 'aioseop_sitemap_max_url_notice_dismissed', true );
}

/**
* Returns home_url() value compatible for any use.
* Thought for compatibility purposes.
Expand Down
17 changes: 14 additions & 3 deletions js/quickedit_functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,17 @@ jQuery(document).on( 'click', '.woo-upgrade-notice', function() {

})

jQuery(document).on( 'click', '.sitemap_max_urls_notice', function() {

jQuery.ajax({
url: ajaxurl,
data: {
action: 'aioseo_dismiss_sitemap_max_url_notice'
}
})

})


function aioseop_ajax_edit_meta_form( post_id, meta, nonce ) {
var uform = jQuery('#aioseop_'+meta+'_' + post_id);
Expand Down Expand Up @@ -63,7 +74,7 @@ function handle_post_meta( p, t, m, n ) {
loading += '</label><div style="float:left">Please wait…</div>';
jQuery("div#aioseop_"+m+"_"+p).fadeIn('fast', function() {
var aioseop_sack = new sack(aioseopadmin.requestUrl);
aioseop_sack.execute = 1;
aioseop_sack.execute = 1;
aioseop_sack.method = 'POST';
aioseop_sack.setVar( "action", "aioseop_ajax_save_meta");
aioseop_sack.setVar( "post_id", p );
Expand All @@ -76,6 +87,6 @@ function handle_post_meta( p, t, m, n ) {
})
jQuery("div#aioseop_"+m+"_"+p).html(loading);
jQuery("div#aioseop_"+m+"_"+p).attr( "class", "aioseop_mpc_admin_meta_options" );

})
}
}
Loading

0 comments on commit 7fab9f4

Please sign in to comment.