All in One SEO Pack - Version 2.2.1

Version Description

Download this release

Release Info

Developer pbaylies
Plugin Icon 128x128 All in One SEO Pack
Version 2.2.1
Comparing to
See all releases

Code changes from version 2.2 to 2.2.1

aioseop_class.php CHANGED
@@ -1104,7 +1104,7 @@ class All_in_One_SEO_Pack extends All_in_One_SEO_Pack_Module {
1104
  $post = $this->get_queried_object();
1105
  if( empty( $aioseop_options['aiosp_enablecpost'] ) ) {
1106
  $wp_post_types = get_post_types( Array( '_builtin' => true ) ); // don't display meta if SEO isn't enabled on custom post types -- pdb
1107
- if( !is_singular( $wp_post_types ) && !is_front_page() ) return false;
1108
  } elseif ( !empty( $aioseop_options['aiosp_cpostadvanced'] ) ) {
1109
  $wp_post_types = $aioseop_options['aiosp_cpostactive'];
1110
  if ( is_singular() && !is_singular( $wp_post_types ) && !is_front_page() ) return false;
@@ -1934,7 +1934,7 @@ function aiosp_google_analytics() {
1934
 
1935
  // Thank you, Yoast de Valk, for much of this code.
1936
 
1937
- function aiosp_mrt_get_url( $query ) {
1938
  if ( $query->is_404 || $query->is_search )
1939
  return false;
1940
 
@@ -1996,7 +1996,9 @@ function aiosp_google_analytics() {
1996
  return false;
1997
  }
1998
  if ( empty( $link ) || !is_string( $link ) ) return false;
1999
- return $this->get_paged( $link );
 
 
2000
  }
2001
 
2002
  function get_page_number() {
1104
  $post = $this->get_queried_object();
1105
  if( empty( $aioseop_options['aiosp_enablecpost'] ) ) {
1106
  $wp_post_types = get_post_types( Array( '_builtin' => true ) ); // don't display meta if SEO isn't enabled on custom post types -- pdb
1107
+ if( is_singular() && !is_singular( $wp_post_types ) && !is_front_page() ) return false;
1108
  } elseif ( !empty( $aioseop_options['aiosp_cpostadvanced'] ) ) {
1109
  $wp_post_types = $aioseop_options['aiosp_cpostactive'];
1110
  if ( is_singular() && !is_singular( $wp_post_types ) && !is_front_page() ) return false;
1934
 
1935
  // Thank you, Yoast de Valk, for much of this code.
1936
 
1937
+ function aiosp_mrt_get_url( $query, $show_page = true ) {
1938
  if ( $query->is_404 || $query->is_search )
1939
  return false;
1940
 
1996
  return false;
1997
  }
1998
  if ( empty( $link ) || !is_string( $link ) ) return false;
1999
+ if ( apply_filters( 'aioseop_canonical_url_pagination', $show_page ) )
2000
+ $link = $this->get_paged( $link );
2001
+ return $link;
2002
  }
2003
 
2004
  function get_page_number() {
aioseop_module.js CHANGED
@@ -312,10 +312,10 @@ jQuery(document).ready(function() {
312
  aioseop_handle_post_url('aioseop_ajax_scan_header', 'opengraph_scan_header', jQuery('div#aiosp_opengraph_scan_header').serialize() );
313
  return false;
314
  });
315
- jQuery( 'input[name="aiosp_sitemap_posttypes[]"][value="all"]', 'input[name="aiosp_sitemap_taxonomies[]"][value="all"]' ).click(function () {
316
  jQuery(this).parents('div:eq(0)').find(':checkbox').attr('checked', this.checked);
317
  });
318
- jQuery( 'input[name="aiosp_sitemap_posttypes[]"][value!="all"]', 'input[name="aiosp_sitemap_taxonomies[]"][value!="all"]' ).click(function () {
319
  if ( !this.checked )
320
  jQuery(this).parents('div:eq(0)').find('input[value="all"]:checkbox').attr('checked', this.checked);
321
  });
312
  aioseop_handle_post_url('aioseop_ajax_scan_header', 'opengraph_scan_header', jQuery('div#aiosp_opengraph_scan_header').serialize() );
313
  return false;
314
  });
315
+ jQuery( 'input[name="aiosp_sitemap_posttypes[]"][value="all"], input[name="aiosp_sitemap_taxonomies[]"][value="all"]' ).click(function () {
316
  jQuery(this).parents('div:eq(0)').find(':checkbox').attr('checked', this.checked);
317
  });
318
+ jQuery( 'input[name="aiosp_sitemap_posttypes[]"][value!="all"], input[name="aiosp_sitemap_taxonomies[]"][value!="all"]' ).click(function () {
319
  if ( !this.checked )
320
  jQuery(this).parents('div:eq(0)').find('input[value="all"]:checkbox').attr('checked', this.checked);
321
  });
aioseop_module_class.php CHANGED
@@ -984,7 +984,7 @@ if ( !class_exists( 'All_in_One_SEO_Pack_Module' ) ) {
984
  if ( !empty( $this->pointers ) ) {
985
  wp_enqueue_script( 'wp-pointer', false, array( 'jquery' ) );
986
  }
987
- wp_enqueue_script( 'aioseop-module-script', $this->plugin_path['url'] . 'aioseop_module.js' );
988
  if ( !empty( $this->script_data ) ) {
989
  aioseop_localize_script_data();
990
  }
@@ -1408,7 +1408,7 @@ if ( !class_exists( 'All_in_One_SEO_Pack_Module' ) ) {
1408
  case 'checkbox':
1409
  case 'radio':
1410
  case 'select':
1411
- default: $this->options[$k] = esc_attr( $this->options[$k] );
1412
  }
1413
  }
1414
  }
984
  if ( !empty( $this->pointers ) ) {
985
  wp_enqueue_script( 'wp-pointer', false, array( 'jquery' ) );
986
  }
987
+ wp_enqueue_script( 'aioseop-module-script', $this->plugin_path['url'] . 'aioseop_module.js', Array(), AIOSEOP_VERSION );
988
  if ( !empty( $this->script_data ) ) {
989
  aioseop_localize_script_data();
990
  }
1408
  case 'checkbox':
1409
  case 'radio':
1410
  case 'select':
1411
+ default: if ( !is_array( $this->options[$k] ) ) $this->options[$k] = esc_attr( $this->options[$k] );
1412
  }
1413
  }
1414
  }
aioseop_opengraph.php CHANGED
@@ -318,9 +318,10 @@ if ( !class_exists( 'All_in_One_SEO_Pack_Opengraph' ) ) {
318
  add_filter( 'jetpack_enable_open_graph', '__return_false', 100 );
319
  add_filter( 'jetpack_disable_twitter_cards', '__return_false', 100 );
320
  }
321
- foreach( Array( 'xmlns="http://www.w3.org/1999/xhtml"', 'xmlns:og="http://ogp.me/ns#"', 'xmlns:fb="http://www.facebook.com/2008/fbml"' ) as $xmlns ) {
322
- if ( strpos( $output, $xmlns ) === false ) {
323
- $output .= "\n\t$xmlns ";
 
324
  }
325
  }
326
  return $output;
318
  add_filter( 'jetpack_enable_open_graph', '__return_false', 100 );
319
  add_filter( 'jetpack_disable_twitter_cards', '__return_false', 100 );
320
  }
321
+ $attributes = apply_filters( $this->prefix . 'attributes', Array( 'xmlns="http://www.w3.org/1999/xhtml"', 'xmlns:og="http://ogp.me/ns#"', 'xmlns:fb="http://www.facebook.com/2008/fbml"' ) );
322
+ foreach( $attributes as $attr ) {
323
+ if ( strpos( $output, $attr ) === false ) {
324
+ $output .= "\n\t$attr ";
325
  }
326
  }
327
  return $output;
aioseop_sitemap.php CHANGED
@@ -354,6 +354,7 @@ if ( !class_exists( 'All_in_One_SEO_Pack_Sitemap' ) ) {
354
 
355
  /** Handle 'all' option for post types / taxonomies, further sanitization of filename, rewrites on for multisite, setting up addl pages option. **/
356
  function filter_options( $options ) {
 
357
  if ( is_array( $options["{$this->prefix}posttypes"] ) && in_array( 'all', $options["{$this->prefix}posttypes"] ) && is_array( $this->default_options['posttypes' ]['initial_options'] ) )
358
  $options["{$this->prefix}posttypes"] = array_keys( $this->default_options['posttypes' ]['initial_options'] );
359
  if ( is_array( $options["{$this->prefix}taxonomies"] ) && in_array( 'all', $options["{$this->prefix}taxonomies"] ) && is_array( $this->default_options['taxonomies' ]['initial_options'] ) )
354
 
355
  /** Handle 'all' option for post types / taxonomies, further sanitization of filename, rewrites on for multisite, setting up addl pages option. **/
356
  function filter_options( $options ) {
357
+ if ( !isset( $this->default_options['posttypes' ]['initial_options'] ) ) $this->add_post_types();
358
  if ( is_array( $options["{$this->prefix}posttypes"] ) && in_array( 'all', $options["{$this->prefix}posttypes"] ) && is_array( $this->default_options['posttypes' ]['initial_options'] ) )
359
  $options["{$this->prefix}posttypes"] = array_keys( $this->default_options['posttypes' ]['initial_options'] );
360
  if ( is_array( $options["{$this->prefix}taxonomies"] ) && in_array( 'all', $options["{$this->prefix}taxonomies"] ) && is_array( $this->default_options['taxonomies' ]['initial_options'] ) )
all_in_one_seo_pack.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: All In One SEO Pack
4
  Plugin URI: http://semperfiwebdesign.com
5
  Description: Out-of-the-box SEO for your WordPress blog. <a href="admin.php?page=all-in-one-seo-pack/aioseop_class.php">Options configuration panel</a> | <a href="http://semperplugins.com/plugins/all-in-one-seo-pack-pro-version/?loc=plugins" target="_blank">Upgrade to Pro Version</a> | <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=mrtorbert%40gmail%2ecom&item_name=All%20In%20One%20SEO%20Pack&item_number=Support%20Open%20Source&no_shipping=0&no_note=1&tax=0&currency_code=USD&lc=US&bn=PP%2dDonationsBF&charset=UTF%2d8">Donate</a> | <a href="http://semperplugins.com/support/" >Support</a> | <a href="https://www.amazon.com/wishlist/1NFQ133FNCOOA/ref=wl_web" target="_blank" title="Amazon Wish List">Amazon Wishlist</a>
6
- Version: 2.2
7
  Author: Michael Torbert
8
  Author URI: http://michaeltorbert.com
9
  */
@@ -30,11 +30,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
30
 
31
  /**
32
  * @package All-in-One-SEO-Pack
33
- * @version 2.2
34
  */
35
 
36
  if ( ! defined( 'AIOSEOP_VERSION' ) )
37
- define( 'AIOSEOP_VERSION', '2.2' );
38
 
39
  if ( ! defined( 'AIOSEOP_PLUGIN_DIR' ) ) {
40
  define( 'AIOSEOP_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
3
  Plugin Name: All In One SEO Pack
4
  Plugin URI: http://semperfiwebdesign.com
5
  Description: Out-of-the-box SEO for your WordPress blog. <a href="admin.php?page=all-in-one-seo-pack/aioseop_class.php">Options configuration panel</a> | <a href="http://semperplugins.com/plugins/all-in-one-seo-pack-pro-version/?loc=plugins" target="_blank">Upgrade to Pro Version</a> | <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=mrtorbert%40gmail%2ecom&item_name=All%20In%20One%20SEO%20Pack&item_number=Support%20Open%20Source&no_shipping=0&no_note=1&tax=0&currency_code=USD&lc=US&bn=PP%2dDonationsBF&charset=UTF%2d8">Donate</a> | <a href="http://semperplugins.com/support/" >Support</a> | <a href="https://www.amazon.com/wishlist/1NFQ133FNCOOA/ref=wl_web" target="_blank" title="Amazon Wish List">Amazon Wishlist</a>
6
+ Version: 2.2.1
7
  Author: Michael Torbert
8
  Author URI: http://michaeltorbert.com
9
  */
30
 
31
  /**
32
  * @package All-in-One-SEO-Pack
33
+ * @version 2.2.1
34
  */
35
 
36
  if ( ! defined( 'AIOSEOP_VERSION' ) )
37
+ define( 'AIOSEOP_VERSION', '2.2.1' );
38
 
39
  if ( ! defined( 'AIOSEOP_PLUGIN_DIR' ) ) {
40
  define( 'AIOSEOP_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );