All in One SEO Pack - Version 2.0.1

Version Description

Download this release

Release Info

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

Code changes from version 2.0 to 2.0.1

Files changed (8) hide show
  1. aioseop_class.php +136 -44
  2. aioseop_functions.php +2 -16
  3. aioseop_module.css +29 -7
  4. aioseop_module_class.php +22 -3
  5. aioseop_performance.php +3 -9
  6. all_in_one_seo_pack-ru_RU.mo +0 -0
  7. all_in_one_seo_pack.php +4 -6
  8. readme.txt +1 -1
aioseop_class.php CHANGED
@@ -270,6 +270,11 @@ class All_in_One_SEO_Pack extends All_in_One_SEO_Pack_Module {
270
  'help_text' => __( 'Check this for easy access to settings from the admin menu bar.', 'all_in_one_seo_pack' ),
271
  'default' => 'on',
272
  ),
 
 
 
 
 
273
  "google_verify" => Array(
274
  'name' => __( 'Google Webmaster Tools:', 'all_in_one_seo_pack' ),
275
  'help_text' => __( 'Enter your verification code here to add a meta tag to your homepage to verify your site.', 'all_in_one_seo_pack' ),
@@ -414,7 +419,7 @@ class All_in_One_SEO_Pack extends All_in_One_SEO_Pack_Module {
414
  ),
415
  'display' => Array(
416
  'name' => __( 'Display Settings', 'all_in_one_seo_pack' ),
417
- 'options' => Array( "posttypecolumns", "admin_bar" )
418
  ),
419
  'webmaster' => Array(
420
  'name' => __( 'Webmaster Verification', 'all_in_one_seo_pack' ),
@@ -452,7 +457,8 @@ class All_in_One_SEO_Pack extends All_in_One_SEO_Pack_Module {
452
  if ( is_object( $post ) ) {
453
  $post_id = $post->ID;
454
  $p = $post; $w = $wp_query;
455
- $wp_query = new WP_Query( array( 'p' => $post_id, 'post_type' => $post->post_type ) );
 
456
  if ( $post->post_type == 'page' ) $wp_query->is_page = true;
457
 
458
  $args['options']['type'] = 'html';
@@ -466,7 +472,7 @@ class All_in_One_SEO_Pack extends All_in_One_SEO_Pack_Module {
466
  if ( ( $aioseop_options['aiosp_can'] ) && ( $url = $this->aiosp_mrt_get_url( $wp_query ) ) )
467
  $url = apply_filters( 'aioseop_canonical_url',$url );
468
  if ( !$url ) $url = get_permalink();
469
-
470
  $description = $this->get_post_description( $post );
471
 
472
  if ( strlen( $title ) > 70 ) $title = $this->trim_excerpt_without_filters( $title, 70 ) . '...';
@@ -522,7 +528,7 @@ class All_in_One_SEO_Pack extends All_in_One_SEO_Pack_Module {
522
  }
523
  }
524
 
525
- $this->pointers['aioseop_welcome'] = Array( 'pointer_target' => '#aiosp_settings_form',
526
  'pointer_text' => '<h3>' . sprintf( __( 'Welcome to Version %s!', 'all_in_one_seo_pack' ), AIOSEOP_VERSION )
527
  . '</h3><p>' . __( 'Thank you for running the latest and greatest All in One SEO Pack ever! New in 2.0: manage your performance with our Performance module; enable it from our new feature manager! And please review your settings, we have added some new ones!', 'all_in_one_seo_pack' ) . '</p>'
528
  );
@@ -619,7 +625,7 @@ class All_in_One_SEO_Pack extends All_in_One_SEO_Pack_Module {
619
  return $options;
620
  }
621
 
622
- function display_side_metaboxes( $add, $meta ) {
623
  echo "<div class='aioseop_metabox_wrapper' >";
624
  switch ( $meta['id'] ) {
625
  case "aioseop-about":
@@ -632,13 +638,6 @@ class All_in_One_SEO_Pack extends All_in_One_SEO_Pack_Module {
632
  | <strong><a target="_blank" title="<?php _e('Pro Version', 'all_in_one_seo_pack' ); ?>"
633
  href="http://semperplugins.com/plugins/all-in-one-seo-pack-pro-version/">
634
  <?php _e('UPGRADE TO PRO VERSION', 'all_in_one_seo_pack' ); ?></a></strong></p>
635
- <form action="http://semperfiwebdesign.us1.list-manage.com/subscribe/post?u=794674d3d54fdd912f961ef14&amp;id=af0a96d3d9"
636
- method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank">
637
- <h2>Join our mailing list for tips, tricks, and WordPress secrets.</h2>
638
- <p><i>Sign up today and receive a free copy of the e-book 5 SEO Tips for WordPress ($39 value).</i></p>
639
- <p><input type="text" value="" name="EMAIL" class="required email" id="mce-EMAIL" placeholder="Email Address">
640
- <input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="btn"></p>
641
- </form>
642
  </div>
643
  <?php
644
  case "aioseop-donate":
@@ -665,6 +664,19 @@ class All_in_One_SEO_Pack extends All_in_One_SEO_Pack_Module {
665
  </div>
666
  <?php
667
  break;
 
 
 
 
 
 
 
 
 
 
 
 
 
668
  case "aioseop-support":
669
  ?><div class="aioseop_metabox_text">
670
  <p><?php _e( 'For support please visit the Semper Plugins Support Forum at http://semperplugins.com/support/', 'all_in_one_seo_pack' ); ?></p>
@@ -839,32 +851,41 @@ class All_in_One_SEO_Pack extends All_in_One_SEO_Pack_Module {
839
  echo "ob_start_detected ";
840
  echo "[$this->title_start,$this->title_end] ";
841
  echo "-->\n";
842
-
843
  $is_front_page = is_front_page();
844
 
845
- $is_front_page_keywords = ( ( is_home() && $aioseop_options['aiosp_home_keywords'] && !$this->is_static_posts_page() ) || $this->is_static_front_page() );
 
 
 
 
 
846
 
847
  if ( $is_front_page_keywords ) {
848
  $keywords = trim( $this->internationalize( $aioseop_options['aiosp_home_keywords'] ) );
849
  } elseif ( $this->is_static_posts_page() && !$aioseop_options['aiosp_dynamic_postspage_keywords'] ) { // and if option = use page set keywords instead of keywords from recent posts
850
  $keywords = stripcslashes( $this->internationalize( get_post_meta( $post->ID, "_aioseop_keywords", true ) ) );
 
 
851
  } else {
852
  $keywords = $this->get_all_keywords();
853
  }
854
- if ( is_single() || is_page() || $this->is_static_posts_page() ) {
855
- if ( $this->is_static_front_page() ) {
856
  $description = trim( stripcslashes( $this->internationalize( $aioseop_options['aiosp_home_description'] ) ) );
857
- } else {
858
- $description = $this->get_post_description( $post );
859
- $description = apply_filters( 'aioseop_description', $description );
860
- }
861
- } else if ( is_home() ) {
862
  $description = trim( stripcslashes( $this->internationalize( $aioseop_options['aiosp_home_description'] ) ) );
863
- } else if ( is_category() ) {
864
  $description = $this->internationalize( category_description() );
865
- }
866
-
867
- if ( isset($description) && (strlen($description) > $this->minimum_description_length ) && !( is_home() && is_paged() ) ) {
 
 
 
 
 
868
  $description = trim( strip_tags( $description ) );
869
  $description = str_replace( '"', '', $description );
870
 
@@ -960,9 +981,12 @@ class All_in_One_SEO_Pack extends All_in_One_SEO_Pack_Module {
960
  if ( empty( $googleplus ) && !empty( $aioseop_options['aiosp_google_publisher'] ) )
961
  $googleplus = $aioseop_options['aiosp_google_publisher'];
962
 
 
 
 
963
  if ( is_singular() && ( $googleplus ) ) {
964
  $meta_string = '<link rel="author" href="' . $googleplus . '" />' . "\n" . $meta_string;
965
- } else if ( !is_home() && !empty( $aioseop_options['aiosp_google_publisher'] ) ) {
966
  $meta_string = '<link rel="author" href="' . $aioseop_options['aiosp_google_publisher'] . '" />' . "\n" . $meta_string;
967
  }
968
 
@@ -1124,7 +1148,7 @@ function aiosp_google_analytics() {
1124
  }
1125
 
1126
  function yoast_get_paged( $link ) {
1127
- $page = get_query_var( 'paged' );
1128
  if ( $page && $page > 1 ) {
1129
  $link = trailingslashit( $link ) ."page/". "$page";
1130
  $link = user_trailingslashit( $link, 'paged' );
@@ -1223,6 +1247,20 @@ function aiosp_google_analytics() {
1223
  $tag = $this->internationalize( single_term_title( '', false ) );
1224
  }
1225
  if ( $tag ) $title = $tag;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1226
  } else if ( is_archive() ) {
1227
  $title = $this->internationalize( post_type_archive_title( '', false) );
1228
  } else if ( is_404() ) {
@@ -1242,12 +1280,13 @@ function aiosp_google_analytics() {
1242
  global $aioseop_options;
1243
  // simple tagging support
1244
  global $STagging;
1245
-
1246
- if ( is_paged() || ( isset($STagging) && $STagging->is_tag_view() && $paged ) ) {
 
1247
  $part = $this->internationalize( $aioseop_options['aiosp_paged_format'] );
1248
  if ( isset( $part ) || !empty( $part ) ) {
1249
  $part = " " . trim( $part );
1250
- $part = str_replace( '%page%', $paged, $part );
1251
  $this->log( "paged_title() [$title] [$part]" );
1252
  $title .= $part;
1253
  }
@@ -1258,19 +1297,24 @@ function aiosp_google_analytics() {
1258
  /*** Gets the title that will be used by AIOSEOP for title rewrites or returns false. ***/
1259
  function get_aioseop_title( $post ) {
1260
  global $aioseop_options;
1261
-
1262
  // the_search_query() is not suitable, it cannot just return
1263
  global $s, $STagging;
1264
- if ( is_home() && !$this->is_static_posts_page() ) {
1265
  $title = $this->internationalize( $aioseop_options['aiosp_home_title'] );
 
 
 
 
 
 
 
1266
  if (empty( $title ) )
1267
  $title = $this->internationalize( get_option( 'blogname' ) );
1268
-
1269
  return $this->paged_title( $title );
1270
  } else if ( is_attachment() ) {
1271
  if ( $post === null ) return false;
1272
  return get_the_title( $post->post_parent ) . ' ' . $post->post_title . ' – ' . get_option( 'blogname' );
1273
- } else if ( is_page() || $this->is_static_posts_page() ) {
1274
  if ( $post === null ) return false;
1275
  // we're not in the loop :(
1276
  $authordata = get_userdata( $post->post_author );
@@ -1278,9 +1322,24 @@ function aiosp_google_analytics() {
1278
  //home title filter
1279
  return apply_filters( 'aioseop_home_page_title', $home_title );
1280
  } else {
1281
- $title = $this->internationalize( get_post_meta( $post->ID, "_aioseop_title", true ) );
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1282
  if ( !$title )
1283
  $title = $this->internationalize( $this->get_original_title( '', false ) );
 
1284
  $title_format = $aioseop_options['aiosp_page_title_format'];
1285
  $new_title = str_replace( '%blog_title%', $this->internationalize( get_bloginfo( 'name' ) ), $title_format );
1286
  $new_title = str_replace( '%blog_description%', $this->internationalize( get_bloginfo( 'description' ) ), $new_title );
@@ -1322,6 +1381,7 @@ function aiosp_google_analytics() {
1322
  $r_title = array( '%blog_title%', '%blog_description%', '%post_title%', '%category%', '%category_title%', '%post_author_login%', '%post_author_nicename%', '%post_author_firstname%', '%post_author_lastname%' );
1323
  $d_title = array( $this->internationalize( get_bloginfo('name') ), $this->internationalize( get_bloginfo( 'description' ) ), $title, $category, $category, $authordata->user_login, $authordata->user_nicename, ucwords( $authordata->first_name ), ucwords( $authordata->last_name ) );
1324
  $title = trim( str_replace( $r_title, $d_title, $title_format ) );
 
1325
  return apply_filters( 'aioseop_title_single', $title );
1326
  } else if ( is_search() && isset( $s ) && !empty( $s ) ) {
1327
  $search = esc_attr( stripcslashes( $s ) );
@@ -1417,7 +1477,8 @@ function aiosp_google_analytics() {
1417
  return $header;
1418
  }
1419
  $title = $this->wp_title();
1420
- $header = $this->replace_title( $header, $title );
 
1421
  return $header;
1422
  }
1423
 
@@ -1647,24 +1708,40 @@ function aiosp_google_analytics() {
1647
  return 5;
1648
  }
1649
 
1650
- function admin_menu() {
1651
  $file = plugin_basename( __FILE__ );
1652
  $menu_name = __( 'All in One SEO', 'all_in_one_seo_pack' );
1653
- add_menu_page( $menu_name, $menu_name, 'manage_options', $file, Array( $this, 'display_settings_page' ) );
1654
- add_meta_box('aioseop-about', "About <span style='float:right;'>Version <b>" . AIOSEOP_VERSION . "</b></span>", array( $this, 'display_side_metaboxes'), 'aioseop_metaboxes', 'side', 'core');
1655
- add_filter( 'custom_menu_order', '__return_true' );
1656
- add_filter( 'menu_order', array( $this, 'set_menu_order' ) );
1657
 
1658
  $this->locations['aiosp']['default_options']['nonce-aioseop-edit']['default'] = wp_create_nonce('edit-aioseop-nonce');
1659
 
 
 
 
 
 
1660
  $this->update_options( );
1661
 
1662
  $donated = false;
1663
- if ( ( isset( $_POST ) ) && ( isset( $_POST['nonce-aioseop'] ) ) && ( wp_verify_nonce( $_POST['nonce-aioseop'], 'aioseop-nonce' ) ) ) {
1664
  if ( isset( $_POST["aiosp_donate"] ) )
1665
  $donated = $_POST["aiosp_donate"];
1666
- } elseif ( isset( $this->options["aiosp_donate"] ) ) {
1667
- $donated = $this->options["aiosp_donate"];
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1668
  }
1669
 
1670
  if ( $donated ) {
@@ -1684,6 +1761,16 @@ function aiosp_google_analytics() {
1684
  } else {
1685
  $this->locations['aiosp']['display'] = Array( 'post', 'page' );
1686
  }
 
 
 
 
 
 
 
 
 
 
1687
  add_action( 'aioseop_modules_add_menus', Array( $this, 'add_menu' ), 5 );
1688
  do_action( 'aioseop_modules_add_menus', $file );
1689
 
@@ -1780,6 +1867,11 @@ function aiosp_google_analytics() {
1780
  }
1781
 
1782
  ?>
 
 
 
 
 
1783
  <style>
1784
  #wpbody-content {
1785
  min-width: 900px;
270
  'help_text' => __( 'Check this for easy access to settings from the admin menu bar.', 'all_in_one_seo_pack' ),
271
  'default' => 'on',
272
  ),
273
+ "custom_menu_order" => Array(
274
+ 'name' => __( 'Display Menu At The Top:', 'all_in_one_seo_pack' ),
275
+ 'help_text' => __( 'Check this for easy access to settings from the top of your WordPress Dashboard.', 'all_in_one_seo_pack' ),
276
+ 'default' => 'on',
277
+ ),
278
  "google_verify" => Array(
279
  'name' => __( 'Google Webmaster Tools:', 'all_in_one_seo_pack' ),
280
  'help_text' => __( 'Enter your verification code here to add a meta tag to your homepage to verify your site.', 'all_in_one_seo_pack' ),
419
  ),
420
  'display' => Array(
421
  'name' => __( 'Display Settings', 'all_in_one_seo_pack' ),
422
+ 'options' => Array( "posttypecolumns", "admin_bar", "custom_menu_order" )
423
  ),
424
  'webmaster' => Array(
425
  'name' => __( 'Webmaster Verification', 'all_in_one_seo_pack' ),
457
  if ( is_object( $post ) ) {
458
  $post_id = $post->ID;
459
  $p = $post; $w = $wp_query;
460
+ if (! $post->post_modified_gmt != '' )
461
+ $wp_query = new WP_Query( array( 'p' => $post_id, 'post_type' => $post->post_type ) );
462
  if ( $post->post_type == 'page' ) $wp_query->is_page = true;
463
 
464
  $args['options']['type'] = 'html';
472
  if ( ( $aioseop_options['aiosp_can'] ) && ( $url = $this->aiosp_mrt_get_url( $wp_query ) ) )
473
  $url = apply_filters( 'aioseop_canonical_url',$url );
474
  if ( !$url ) $url = get_permalink();
475
+
476
  $description = $this->get_post_description( $post );
477
 
478
  if ( strlen( $title ) > 70 ) $title = $this->trim_excerpt_without_filters( $title, 70 ) . '...';
528
  }
529
  }
530
 
531
+ $this->pointers['aioseop_welcome_201'] = Array( 'pointer_target' => '#aiosp_settings_form',
532
  'pointer_text' => '<h3>' . sprintf( __( 'Welcome to Version %s!', 'all_in_one_seo_pack' ), AIOSEOP_VERSION )
533
  . '</h3><p>' . __( 'Thank you for running the latest and greatest All in One SEO Pack ever! New in 2.0: manage your performance with our Performance module; enable it from our new feature manager! And please review your settings, we have added some new ones!', 'all_in_one_seo_pack' ) . '</p>'
534
  );
625
  return $options;
626
  }
627
 
628
+ function display_extra_metaboxes( $add, $meta ) {
629
  echo "<div class='aioseop_metabox_wrapper' >";
630
  switch ( $meta['id'] ) {
631
  case "aioseop-about":
638
  | <strong><a target="_blank" title="<?php _e('Pro Version', 'all_in_one_seo_pack' ); ?>"
639
  href="http://semperplugins.com/plugins/all-in-one-seo-pack-pro-version/">
640
  <?php _e('UPGRADE TO PRO VERSION', 'all_in_one_seo_pack' ); ?></a></strong></p>
 
 
 
 
 
 
 
641
  </div>
642
  <?php
643
  case "aioseop-donate":
664
  </div>
665
  <?php
666
  break;
667
+ case "aioseop-list":
668
+ ?>
669
+ <div class="aioseop_metabox_text">
670
+ <form action="http://semperfiwebdesign.us1.list-manage.com/subscribe/post?u=794674d3d54fdd912f961ef14&amp;id=af0a96d3d9"
671
+ method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank">
672
+ <h2><?php _e( 'Join our mailing list for tips, tricks, and WordPress secrets.', 'all_in_one_seo_pack' ); ?></h2>
673
+ <p><i><?php _e( 'Sign up today and receive a free copy of the e-book 5 SEO Tips for WordPress ($39 value).', 'all_in_one_seo_pack' ); ?></i></p>
674
+ <p><input type="text" value="" name="EMAIL" class="required email" id="mce-EMAIL" placeholder="Email Address">
675
+ <input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="btn"></p>
676
+ </form>
677
+ </div>
678
+ <?php
679
+ break;
680
  case "aioseop-support":
681
  ?><div class="aioseop_metabox_text">
682
  <p><?php _e( 'For support please visit the Semper Plugins Support Forum at http://semperplugins.com/support/', 'all_in_one_seo_pack' ); ?></p>
851
  echo "ob_start_detected ";
852
  echo "[$this->title_start,$this->title_end] ";
853
  echo "-->\n";
 
854
  $is_front_page = is_front_page();
855
 
856
+ $is_front_page_keywords = ( ( $is_front_page && $aioseop_options['aiosp_home_keywords'] && !$this->is_static_posts_page() ) || $this->is_static_front_page() );
857
+
858
+ $page_for_posts = get_option( 'page_for_posts' );
859
+ $blog_page = '';
860
+ if ( $page_for_posts && ( !is_object( $post ) || ( $page_for_posts != $post->ID ) ) && is_home() )
861
+ $blog_page = get_post( $page_for_posts );
862
 
863
  if ( $is_front_page_keywords ) {
864
  $keywords = trim( $this->internationalize( $aioseop_options['aiosp_home_keywords'] ) );
865
  } elseif ( $this->is_static_posts_page() && !$aioseop_options['aiosp_dynamic_postspage_keywords'] ) { // and if option = use page set keywords instead of keywords from recent posts
866
  $keywords = stripcslashes( $this->internationalize( get_post_meta( $post->ID, "_aioseop_keywords", true ) ) );
867
+ } elseif ( $blog_page ) {
868
+ $keywords = stripcslashes( $this->internationalize( get_post_meta( $blog_page->ID, "_aioseop_keywords", true ) ) );
869
  } else {
870
  $keywords = $this->get_all_keywords();
871
  }
872
+ if ( is_single() || is_page() || is_home() || $this->is_static_posts_page() )
873
+ if ( $this->is_static_front_page() )
874
  $description = trim( stripcslashes( $this->internationalize( $aioseop_options['aiosp_home_description'] ) ) );
875
+ elseif ( $blog_page )
876
+ $description = $this->get_post_description( $blog_page );
877
+ else if ( $is_front_page )
 
 
878
  $description = trim( stripcslashes( $this->internationalize( $aioseop_options['aiosp_home_description'] ) ) );
879
+ else if ( is_category() )
880
  $description = $this->internationalize( category_description() );
881
+
882
+ if ( empty( $description ) && is_object( $post ) )
883
+ $description = $this->get_post_description( $post );
884
+
885
+ if ( !empty( $description ) )
886
+ $description = apply_filters( 'aioseop_description', $description );
887
+
888
+ if ( isset($description) && (strlen($description) > $this->minimum_description_length ) && !( $is_front_page && is_paged() ) ) {
889
  $description = trim( strip_tags( $description ) );
890
  $description = str_replace( '"', '', $description );
891
 
981
  if ( empty( $googleplus ) && !empty( $aioseop_options['aiosp_google_publisher'] ) )
982
  $googleplus = $aioseop_options['aiosp_google_publisher'];
983
 
984
+ if ( $is_front_page && !empty( $aioseop_options['aiosp_google_publisher'] ) )
985
+ $meta_string = '<link rel="publisher" href="' . $aioseop_options['aiosp_google_publisher'] . '" />' . "\n" . $meta_string;
986
+
987
  if ( is_singular() && ( $googleplus ) ) {
988
  $meta_string = '<link rel="author" href="' . $googleplus . '" />' . "\n" . $meta_string;
989
+ } else if ( !empty( $aioseop_options['aiosp_google_publisher'] ) ) {
990
  $meta_string = '<link rel="author" href="' . $aioseop_options['aiosp_google_publisher'] . '" />' . "\n" . $meta_string;
991
  }
992
 
1148
  }
1149
 
1150
  function yoast_get_paged( $link ) {
1151
+ $page = get_query_var( 'page' );
1152
  if ( $page && $page > 1 ) {
1153
  $link = trailingslashit( $link ) ."page/". "$page";
1154
  $link = user_trailingslashit( $link, 'paged' );
1247
  $tag = $this->internationalize( single_term_title( '', false ) );
1248
  }
1249
  if ( $tag ) $title = $tag;
1250
+ } else if ( is_author() ) {
1251
+ $author = get_userdata( get_query_var( 'author' ) );
1252
+ if ( $author === false ) {
1253
+ global $wp_query;
1254
+ $author = $wp_query->get_queried_object();
1255
+ }
1256
+ if ($author !== false)
1257
+ $title = $author->display_name;
1258
+ } else if ( is_day() ) {
1259
+ $title = get_the_date();
1260
+ } else if ( is_month() ) {
1261
+ $title = get_the_date( 'F, Y' );
1262
+ } else if ( is_year() ) {
1263
+ $title = get_the_date( 'Y' );
1264
  } else if ( is_archive() ) {
1265
  $title = $this->internationalize( post_type_archive_title( '', false) );
1266
  } else if ( is_404() ) {
1280
  global $aioseop_options;
1281
  // simple tagging support
1282
  global $STagging;
1283
+ $page = get_query_var( 'page' );
1284
+ if ( $paged > $page ) $page = $paged;
1285
+ if ( is_paged() || ( isset($STagging) && $STagging->is_tag_view() && $paged ) || $page ) {
1286
  $part = $this->internationalize( $aioseop_options['aiosp_paged_format'] );
1287
  if ( isset( $part ) || !empty( $part ) ) {
1288
  $part = " " . trim( $part );
1289
+ $part = str_replace( '%page%', $page, $part );
1290
  $this->log( "paged_title() [$title] [$part]" );
1291
  $title .= $part;
1292
  }
1297
  /*** Gets the title that will be used by AIOSEOP for title rewrites or returns false. ***/
1298
  function get_aioseop_title( $post ) {
1299
  global $aioseop_options;
 
1300
  // the_search_query() is not suitable, it cannot just return
1301
  global $s, $STagging;
1302
+ if ( is_front_page() ) {
1303
  $title = $this->internationalize( $aioseop_options['aiosp_home_title'] );
1304
+ if ( empty( $title ) && !empty( $post ) && $this->is_static_front_page() ) {
1305
+ $title = $this->internationalize( get_post_meta( $post->ID, "_aioseop_title", true ) );
1306
+ if ( !$title )
1307
+ $title = $this->internationalize( $post->post_title );
1308
+ if ( !$title )
1309
+ $title = $this->internationalize( $this->get_original_title( '', false ) );
1310
+ }
1311
  if (empty( $title ) )
1312
  $title = $this->internationalize( get_option( 'blogname' ) );
 
1313
  return $this->paged_title( $title );
1314
  } else if ( is_attachment() ) {
1315
  if ( $post === null ) return false;
1316
  return get_the_title( $post->post_parent ) . ' ' . $post->post_title . ' – ' . get_option( 'blogname' );
1317
+ } else if ( is_page() || $this->is_static_posts_page() || ( is_home() && !$this->is_static_posts_page() ) ) {
1318
  if ( $post === null ) return false;
1319
  // we're not in the loop :(
1320
  $authordata = get_userdata( $post->post_author );
1322
  //home title filter
1323
  return apply_filters( 'aioseop_home_page_title', $home_title );
1324
  } else {
1325
+ $page_for_posts = '';
1326
+ if ( is_home() ) {
1327
+ $page_for_posts = get_option( 'page_for_posts' );
1328
+ }
1329
+ if ( $page_for_posts ) {
1330
+ $title = $this->internationalize( get_post_meta( $page_for_posts, "_aioseop_title", true ) );
1331
+ if ( !$title ) {
1332
+ $post_page = get_post( $page_for_posts );
1333
+ $title = $this->internationalize( $post_page->post_title );
1334
+ }
1335
+ } else {
1336
+ $title = $this->internationalize( get_post_meta( $post->ID, "_aioseop_title", true ) );
1337
+ if ( !$title )
1338
+ $title = $this->internationalize( $post->post_title );
1339
+ }
1340
  if ( !$title )
1341
  $title = $this->internationalize( $this->get_original_title( '', false ) );
1342
+
1343
  $title_format = $aioseop_options['aiosp_page_title_format'];
1344
  $new_title = str_replace( '%blog_title%', $this->internationalize( get_bloginfo( 'name' ) ), $title_format );
1345
  $new_title = str_replace( '%blog_description%', $this->internationalize( get_bloginfo( 'description' ) ), $new_title );
1381
  $r_title = array( '%blog_title%', '%blog_description%', '%post_title%', '%category%', '%category_title%', '%post_author_login%', '%post_author_nicename%', '%post_author_firstname%', '%post_author_lastname%' );
1382
  $d_title = array( $this->internationalize( get_bloginfo('name') ), $this->internationalize( get_bloginfo( 'description' ) ), $title, $category, $category, $authordata->user_login, $authordata->user_nicename, ucwords( $authordata->first_name ), ucwords( $authordata->last_name ) );
1383
  $title = trim( str_replace( $r_title, $d_title, $title_format ) );
1384
+ $title = $this->paged_title( $title );
1385
  return apply_filters( 'aioseop_title_single', $title );
1386
  } else if ( is_search() && isset( $s ) && !empty( $s ) ) {
1387
  $search = esc_attr( stripcslashes( $s ) );
1477
  return $header;
1478
  }
1479
  $title = $this->wp_title();
1480
+ if ( !empty( $title ) )
1481
+ $header = $this->replace_title( $header, $title );
1482
  return $header;
1483
  }
1484
 
1708
  return 5;
1709
  }
1710
 
1711
+ function admin_menu() {
1712
  $file = plugin_basename( __FILE__ );
1713
  $menu_name = __( 'All in One SEO', 'all_in_one_seo_pack' );
 
 
 
 
1714
 
1715
  $this->locations['aiosp']['default_options']['nonce-aioseop-edit']['default'] = wp_create_nonce('edit-aioseop-nonce');
1716
 
1717
+ $custom_menu_order = false;
1718
+ global $aioseop_options;
1719
+ if ( !isset( $aioseop_options['custom_menu_order'] ) )
1720
+ $custom_menu_order = true;
1721
+
1722
  $this->update_options( );
1723
 
1724
  $donated = false;
1725
+ if ( ( isset( $_POST ) ) && ( isset( $_POST['module'] ) ) && ( isset( $_POST['nonce-aioseop'] ) ) && ( $_POST['module'] == 'All_in_One_SEO_Pack' ) && ( wp_verify_nonce( $_POST['nonce-aioseop'], 'aioseop-nonce' ) ) ) {
1726
  if ( isset( $_POST["aiosp_donate"] ) )
1727
  $donated = $_POST["aiosp_donate"];
1728
+ if ( isset($_POST["Submit"] ) ) {
1729
+ if ( isset( $_POST["aiosp_custom_menu_order"] ) )
1730
+ $custom_menu_order = $_POST["aiosp_custom_menu_order"];
1731
+ else
1732
+ $custom_menu_order = false;
1733
+ } else if ( ( isset($_POST["Submit_Default"] ) ) || ( ( isset($_POST["Submit_All_Default"] ) ) ) ) {
1734
+ $custom_menu_order = true;
1735
+ }
1736
+ } else {
1737
+ if ( isset( $this->options["aiosp_donate"] ) )
1738
+ $donated = $this->options["aiosp_donate"];
1739
+ if ( isset( $this->options["aiosp_custom_menu_order"] ) )
1740
+ $custom_menu_order = $this->options["aiosp_custom_menu_order"];
1741
+ }
1742
+ if ( $custom_menu_order ) {
1743
+ add_filter( 'custom_menu_order', '__return_true' );
1744
+ add_filter( 'menu_order', array( $this, 'set_menu_order' ) );
1745
  }
1746
 
1747
  if ( $donated ) {
1761
  } else {
1762
  $this->locations['aiosp']['display'] = Array( 'post', 'page' );
1763
  }
1764
+
1765
+ if ( $custom_menu_order )
1766
+ add_menu_page( $menu_name, $menu_name, 'manage_options', $file, Array( $this, 'display_settings_page' ) );
1767
+ else
1768
+ add_utility_page( $menu_name, $menu_name, 'manage_options', $file, Array( $this, 'display_settings_page' ) );
1769
+
1770
+ add_meta_box('aioseop-list', "Join Our Mailing List", array( $this, 'display_extra_metaboxes'), 'aioseop_metaboxes', 'normal', 'core');
1771
+ add_meta_box('aioseop-about', "About <span style='float:right;'>Version <b>" . AIOSEOP_VERSION . "</b></span>", array( $this, 'display_extra_metaboxes'), 'aioseop_metaboxes', 'side', 'core');
1772
+
1773
+
1774
  add_action( 'aioseop_modules_add_menus', Array( $this, 'add_menu' ), 5 );
1775
  do_action( 'aioseop_modules_add_menus', $file );
1776
 
1867
  }
1868
 
1869
  ?>
1870
+ <div class="aioseop_top">
1871
+ <div class="aioseop_top_sidebar aioseop_options_wrapper">
1872
+ <?php do_meta_boxes( 'aioseop_metaboxes', 'normal', Array( 'test' ) ); ?>
1873
+ </div>
1874
+ </div>
1875
  <style>
1876
  #wpbody-content {
1877
  min-width: 900px;
aioseop_functions.php CHANGED
@@ -192,10 +192,10 @@ if ( !function_exists( 'aioseop_mrt_pcolumns' ) ) {
192
  function aioseop_mrt_pcolumns( $aioseopc ) {
193
  global $aioseop_options;
194
  $aioseopc['seotitle'] = __( 'SEO Title', 'all_in_one_seo_pack' );
195
- if ($aioseop_options['aiosp_togglekeywords'] == 0) $aioseopc['seokeywords'] = __( 'SEO Keywords', 'all_in_one_seo_pack' );
196
  $aioseopc['seodesc'] = __( 'SEO Description', 'all_in_one_seo_pack' );
197
  return $aioseopc;
198
- }
199
  }
200
 
201
  if ( !function_exists( 'aioseop_admin_head' ) ) {
@@ -405,20 +405,6 @@ if ( !function_exists( 'aioseop_add_contactmethods' ) ) {
405
  }
406
  }
407
 
408
- /***
409
- * Backwards compatibility - see http://php.net/manual/en/function.str-getcsv.php
410
- */
411
- if( !function_exists( 'str_getcsv' ) ) {
412
- function str_getcsv( $input, $delimiter = ",", $enclosure = '"', $escape = "\\" ) {
413
- $fp = fopen( "php://memory", 'r+' );
414
- fputs( $fp, $input );
415
- rewind( $fp );
416
- $data = fgetcsv( $fp, null, $delimiter, $enclosure ); // $escape only got added in 5.3.0
417
- fclose( $fp );
418
- return $data;
419
- }
420
- }
421
-
422
  /***
423
  * JSON support for PHP < 5.2
424
  */
192
  function aioseop_mrt_pcolumns( $aioseopc ) {
193
  global $aioseop_options;
194
  $aioseopc['seotitle'] = __( 'SEO Title', 'all_in_one_seo_pack' );
195
+ if ( !empty( $aioseop_options['aiosp_togglekeywords'] ) ) $aioseopc['seokeywords'] = __( 'SEO Keywords', 'all_in_one_seo_pack' );
196
  $aioseopc['seodesc'] = __( 'SEO Description', 'all_in_one_seo_pack' );
197
  return $aioseopc;
198
+ }
199
  }
200
 
201
  if ( !function_exists( 'aioseop_admin_head' ) ) {
405
  }
406
  }
407
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
408
  /***
409
  * JSON support for PHP < 5.2
410
  */
aioseop_module.css CHANGED
@@ -147,6 +147,7 @@
147
  .aioseop_advert p {
148
  margin: 25px 0 25px 0;
149
  }
 
150
  .widget, #widget-list .widget-top, .postbox, #titlediv, .aioseop_options_wrapper .postarea, .stuffbox {
151
  border-color: #DFDFDF;
152
  -moz-box-shadow: inset 0 1px 0 #fff;
@@ -157,6 +158,17 @@
157
  -webkit-border-radius: 3px;
158
  border-radius: 3px;
159
  }
 
 
 
 
 
 
 
 
 
 
 
160
  .aioseop_advert h3 {
161
  padding: 0;
162
  margin-top: 6px;
@@ -229,9 +241,22 @@
229
  height: 30px;
230
  }
231
 
 
 
 
 
 
 
 
 
 
 
 
 
 
232
  .aioseop_right_sidebar {
233
  float: right;
234
- margin-top: 30px;
235
  }
236
  /*
237
  #wpbody-content {
@@ -395,7 +420,7 @@ only screen and ( min-resolution: 1.5dppx) {
395
  min-width: 160px;
396
  /* max-width: 900px; */
397
  }
398
- div.preview_snippet {
399
  border: 1px solid #ebebeb;
400
  padding: 15px 15px 20px 7px;
401
  background-color: #fff;
@@ -483,15 +508,12 @@ div#aioseop_snippet > div > span {
483
  vertical-align: text-bottom;
484
  margin: 15px 0 0 0;
485
  }
486
-
487
  #aiosp {
488
  width: 100%;
489
  }
490
-
491
  .aioseop_input.aioseop_top_label .aioseop_option_input {
492
  margin: 0 0 10px 0;
493
  }
494
-
495
  .aioseop_option_docs {
496
  width: 98%;
497
  display: none;
@@ -514,7 +536,6 @@ div#aioseop_snippet > div > span {
514
  .aioseop_help_text ul {
515
  margin: 15px 0 0 20px;
516
  }
517
-
518
  .aioseop_help_text ul li {
519
  line-height: 20px;
520
  margin: 0;
@@ -522,7 +543,6 @@ div#aioseop_snippet > div > span {
522
  .aioseop_sidebar #side-sortables {
523
  width: 98%;
524
  }
525
-
526
  .aioseop_tabs {
527
  padding-top: 6px;
528
  }
@@ -590,6 +610,7 @@ div#aioseop_snippet > div > span {
590
  form#aiosp_settings_form, .aioseop_tabs_div {
591
  padding-right: 477px;
592
  }
 
593
  .wrap > h2 {
594
  padding-bottom: 14px;
595
  }
@@ -600,6 +621,7 @@ div.wrap > form table.form-table {
600
  div.wrap > div#message.error {
601
  max-width: 540px;
602
  }
 
603
  #aiosp_settings_form ul.sfwd_debug_settings li strong {
604
  display: block;
605
  float: left;
147
  .aioseop_advert p {
148
  margin: 25px 0 25px 0;
149
  }
150
+ /*
151
  .widget, #widget-list .widget-top, .postbox, #titlediv, .aioseop_options_wrapper .postarea, .stuffbox {
152
  border-color: #DFDFDF;
153
  -moz-box-shadow: inset 0 1px 0 #fff;
158
  -webkit-border-radius: 3px;
159
  border-radius: 3px;
160
  }
161
+ */
162
+ .aioseop_options_wrapper .postarea {
163
+ border-color: #DFDFDF;
164
+ -moz-box-shadow: inset 0 1px 0 #fff;
165
+ -webkit-box-shadow: inset 0 1px 0 #fff;
166
+ box-shadow: inset 0 1px 0 #fff;
167
+ -moz-border-radius: 3px;
168
+ -khtml-border-radius: 3px;
169
+ -webkit-border-radius: 3px;
170
+ border-radius: 3px;
171
+ }
172
  .aioseop_advert h3 {
173
  padding: 0;
174
  margin-top: 6px;
241
  height: 30px;
242
  }
243
 
244
+ #aioseop-list #mce-EMAIL {
245
+ margin-top: 5px;
246
+ width: 250px;
247
+ }
248
+
249
+ .aioseop_top {
250
+ margin: 10px 10px 0px 0px;
251
+ /* margin: 10px 477px 0px 0px; */
252
+ }
253
+
254
+ .aioseop_top #aioseop-list {
255
+ margin-bottom: 0px;
256
+ }
257
  .aioseop_right_sidebar {
258
  float: right;
259
+ margin-top: 35px;
260
  }
261
  /*
262
  #wpbody-content {
420
  min-width: 160px;
421
  /* max-width: 900px; */
422
  }
423
+ #aiosp div.preview_snippet {
424
  border: 1px solid #ebebeb;
425
  padding: 15px 15px 20px 7px;
426
  background-color: #fff;
508
  vertical-align: text-bottom;
509
  margin: 15px 0 0 0;
510
  }
 
511
  #aiosp {
512
  width: 100%;
513
  }
 
514
  .aioseop_input.aioseop_top_label .aioseop_option_input {
515
  margin: 0 0 10px 0;
516
  }
 
517
  .aioseop_option_docs {
518
  width: 98%;
519
  display: none;
536
  .aioseop_help_text ul {
537
  margin: 15px 0 0 20px;
538
  }
 
539
  .aioseop_help_text ul li {
540
  line-height: 20px;
541
  margin: 0;
543
  .aioseop_sidebar #side-sortables {
544
  width: 98%;
545
  }
 
546
  .aioseop_tabs {
547
  padding-top: 6px;
548
  }
610
  form#aiosp_settings_form, .aioseop_tabs_div {
611
  padding-right: 477px;
612
  }
613
+ /*
614
  .wrap > h2 {
615
  padding-bottom: 14px;
616
  }
621
  div.wrap > div#message.error {
622
  max-width: 540px;
623
  }
624
+ */
625
  #aiosp_settings_form ul.sfwd_debug_settings li strong {
626
  display: block;
627
  float: left;
aioseop_module_class.php CHANGED
@@ -321,7 +321,9 @@ if ( !class_exists( 'All_in_One_SEO_Pack_Module' ) ) {
321
  $post_types = null;
322
  $has_data = null;
323
  $general_settings = null;
324
- $exporter_choices = $_REQUEST[ 'aiosp_importer_exporter_export_choices' ];
 
 
325
  if ( !empty( $exporter_choices ) && is_array( $exporter_choices ) ) {
326
  foreach( $exporter_choices as $ex ) {
327
  if ( $ex == 1 ) $general_settings = true;
@@ -408,12 +410,27 @@ if ( !class_exists( 'All_in_One_SEO_Pack_Module' ) ) {
408
  return FALSE;
409
  }
410
 
 
 
 
 
 
 
 
 
 
 
 
 
411
  /***
412
  * Helper function to convert csv in key/value pair format to an associative array.
413
  */
414
  function csv_to_array( $csv ) {
415
  $args = Array();
416
- $v = str_getcsv( $csv );
 
 
 
417
  $size = count( $v );
418
  if ( is_array( $v ) && isset( $v[0] ) && $size >= 2 )
419
  for( $i = 0; $i < $size; $i += 2 )
@@ -609,7 +626,9 @@ if ( !class_exists( 'All_in_One_SEO_Pack_Module' ) ) {
609
  * Load scripts and styles for metaboxes.
610
  */
611
  function enqueue_metabox_scripts( ) {
612
- $screen = get_current_screen();
 
 
613
  if ( empty( $screen ) ) return;
614
  if ( ( $screen->base != 'post' ) && ( $screen->base != 'toplevel_page_shopp-products' ) ) return;
615
  foreach( $this->locations as $k => $v ) {
321
  $post_types = null;
322
  $has_data = null;
323
  $general_settings = null;
324
+ $exporter_choices = '';
325
+ if ( !empty( $_REQUEST[ 'aiosp_importer_exporter_export_choices' ] ) )
326
+ $exporter_choices = $_REQUEST[ 'aiosp_importer_exporter_export_choices' ];
327
  if ( !empty( $exporter_choices ) && is_array( $exporter_choices ) ) {
328
  foreach( $exporter_choices as $ex ) {
329
  if ( $ex == 1 ) $general_settings = true;
410
  return FALSE;
411
  }
412
 
413
+ /***
414
+ * Backwards compatibility - see http://php.net/manual/en/function.str-getcsv.php
415
+ */
416
+ function str_getcsv( $input, $delimiter = ",", $enclosure = '"', $escape = "\\" ) {
417
+ $fp = fopen( "php://memory", 'r+' );
418
+ fputs( $fp, $input );
419
+ rewind( $fp );
420
+ $data = fgetcsv( $fp, null, $delimiter, $enclosure ); // $escape only got added in 5.3.0
421
+ fclose( $fp );
422
+ return $data;
423
+ }
424
+
425
  /***
426
  * Helper function to convert csv in key/value pair format to an associative array.
427
  */
428
  function csv_to_array( $csv ) {
429
  $args = Array();
430
+ if ( !function_exists( 'str_getcsv' ) )
431
+ $v = $this->str_getcsv( $csv );
432
+ else
433
+ $v = str_getcsv( $csv );
434
  $size = count( $v );
435
  if ( is_array( $v ) && isset( $v[0] ) && $size >= 2 )
436
  for( $i = 0; $i < $size; $i += 2 )
626
  * Load scripts and styles for metaboxes.
627
  */
628
  function enqueue_metabox_scripts( ) {
629
+ $screen = '';
630
+ if ( function_exists( 'get_current_screen' ) )
631
+ $screen = get_current_screen();
632
  if ( empty( $screen ) ) return;
633
  if ( ( $screen->base != 'post' ) && ( $screen->base != 'toplevel_page_shopp-products' ) ) return;
634
  foreach( $this->locations as $k => $v ) {
aioseop_performance.php CHANGED
@@ -216,18 +216,12 @@ if ( !class_exists( 'All_in_One_SEO_Pack_Performance' ) ) {
216
  }
217
  }
218
 
219
- do if ( !empty( $_REQUEST['sfwd_debug_submit'] ) || !empty( $_REQUEST['sfwd_update_check'] ) ) {
220
  $nonce=$_REQUEST['sfwd_debug_nonce'];
221
  if (! wp_verify_nonce($nonce, 'sfwd-debug-nonce') ) {
222
  echo "<div class='sfwd_debug_error'>" . __( "Form submission error: verification check failed.", 'all_in_one_seo_pack' ) . "</div>";
223
  break;
224
  }
225
- if ( $_REQUEST['sfwd_update_check'] ) {
226
- global $aioseop_update_checker;
227
- $aioseop_update_checker->checkForUpdates();
228
- echo "<div class='sfwd_debug_mail_sent'>" . sprintf( __( "%s has checked for updates.", 'all_in_one_seo_pack' ), AIOSEOP_PLUGIN_NAME ) . "</div>";
229
- break;
230
- }
231
  if ($_REQUEST['sfwd_debug_send_email']) {
232
  if (wp_mail($_REQUEST['sfwd_debug_send_email'], sprintf( __( "SFWD Debug Mail From Site %s.", 'all_in_one_seo_pack'), $siteurl), $mail_text ) ) {
233
  echo "<div class='sfwd_debug_mail_sent'>" . sprintf( __( "Sent to %s.", 'all_in_one_seo_pack' ), $_REQUEST['sfwd_debug_send_email'] ) . "</div>";
@@ -241,8 +235,8 @@ if ( !class_exists( 'All_in_One_SEO_Pack_Performance' ) ) {
241
  $nonce = wp_create_nonce('sfwd-debug-nonce');
242
  $buf = "<ul class='sfwd_debug_settings'>\n{$page_text}\n</ul>\n<p>\n" .
243
  '<input name="sfwd_debug_send_email" type="text" value="" placeholder="' . __( "E-mail debug information", 'all_in_one_seo_pack' ) . '"><input name="sfwd_debug_nonce" type="hidden" value="' .
244
- $nonce . '"><input name="sfwd_debug_submit" type="submit" value="' . __( 'Submit', 'all_in_one_seo_pack' ) . '" class="button-primary"><p><input name="sfwd_update_check" type="submit" value="' . __( 'Check For Updates', 'all_in_one_seo_pack' ) . '" class="button-primary">';
245
  return $buf;
246
  }
247
  }
248
- }
216
  }
217
  }
218
 
219
+ do if ( !empty( $_REQUEST['sfwd_debug_submit'] ) ) {
220
  $nonce=$_REQUEST['sfwd_debug_nonce'];
221
  if (! wp_verify_nonce($nonce, 'sfwd-debug-nonce') ) {
222
  echo "<div class='sfwd_debug_error'>" . __( "Form submission error: verification check failed.", 'all_in_one_seo_pack' ) . "</div>";
223
  break;
224
  }
 
 
 
 
 
 
225
  if ($_REQUEST['sfwd_debug_send_email']) {
226
  if (wp_mail($_REQUEST['sfwd_debug_send_email'], sprintf( __( "SFWD Debug Mail From Site %s.", 'all_in_one_seo_pack'), $siteurl), $mail_text ) ) {
227
  echo "<div class='sfwd_debug_mail_sent'>" . sprintf( __( "Sent to %s.", 'all_in_one_seo_pack' ), $_REQUEST['sfwd_debug_send_email'] ) . "</div>";
235
  $nonce = wp_create_nonce('sfwd-debug-nonce');
236
  $buf = "<ul class='sfwd_debug_settings'>\n{$page_text}\n</ul>\n<p>\n" .
237
  '<input name="sfwd_debug_send_email" type="text" value="" placeholder="' . __( "E-mail debug information", 'all_in_one_seo_pack' ) . '"><input name="sfwd_debug_nonce" type="hidden" value="' .
238
+ $nonce . '"><input name="sfwd_debug_submit" type="submit" value="' . __( 'Submit', 'all_in_one_seo_pack' ) . '" class="button-primary"><p>';
239
  return $buf;
240
  }
241
  }
242
+ }
all_in_one_seo_pack-ru_RU.mo CHANGED
Binary file
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/">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.0
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.0
34
  */
35
 
36
  if ( ! defined( 'AIOSEOP_VERSION' ) )
37
- define( 'AIOSEOP_VERSION', '2.0' );
38
 
39
  if ( ! defined( 'AIOSEOP_PLUGIN_DIR' ) ) {
40
  define( 'AIOSEOP_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
@@ -133,7 +133,7 @@ $aiosp = new All_in_One_SEO_Pack();
133
 
134
  register_activation_hook( __FILE__, 'aioseop_activate' );
135
 
136
- add_action( 'plugins_loaded', 'aioseop_load_modules' );
137
 
138
  add_action( 'init', array( $aiosp, 'add_hooks' ) );
139
 
@@ -143,5 +143,3 @@ if ( is_admin() ) {
143
 
144
  if ( aioseop_option_isset( 'aiosp_unprotect_meta' ) )
145
  add_filter( 'is_protected_meta', 'aioseop_unprotect_meta', 10, 3 );
146
-
147
- add_action( 'init', array( $aiosp, 'add_hooks' ) );
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/">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.0.1
7
  Author: Michael Torbert
8
  Author URI: http://michaeltorbert.com
9
  */
30
 
31
  /**
32
  * @package All-in-One-SEO-Pack
33
+ * @version 2.0.1
34
  */
35
 
36
  if ( ! defined( 'AIOSEOP_VERSION' ) )
37
+ define( 'AIOSEOP_VERSION', '2.0.1' );
38
 
39
  if ( ! defined( 'AIOSEOP_PLUGIN_DIR' ) ) {
40
  define( 'AIOSEOP_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
133
 
134
  register_activation_hook( __FILE__, 'aioseop_activate' );
135
 
136
+ add_action( 'after_setup_theme', 'aioseop_load_modules' );
137
 
138
  add_action( 'init', array( $aiosp, 'add_hooks' ) );
139
 
143
 
144
  if ( aioseop_option_isset( 'aiosp_unprotect_meta' ) )
145
  add_filter( 'is_protected_meta', 'aioseop_unprotect_meta', 10, 3 );
 
 
readme.txt CHANGED
@@ -2,7 +2,7 @@
2
  Contributors: hallsofmontezuma
3
  Donate link: 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
4
  Tags: seo, search engine optimization, google
5
- Requires at least: 3.0
6
  Tested up to: 3.5.1
7
  Stable tag: trunk
8
 
2
  Contributors: hallsofmontezuma
3
  Donate link: 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
4
  Tags: seo, search engine optimization, google
5
+ Requires at least: 3.3
6
  Tested up to: 3.5.1
7
  Stable tag: trunk
8