Updated to 2.2.3.1 from http://plugins.svn.wordpress.org/all-in-one-s…

…eo-pack/tags/2.2.3.1/
crowdfavorite-mirrors · Sep 8, 2014 · b0073fa · b0073fa
1 parent f22723c
commit b0073fa
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/aioseop_functions.php b/aioseop_functions.php
@@ -52,9 +52,13 @@ function aioseop_update_settings_check() {
 				unset( $aioseop_options['aiosp_archive_noindex'] );
 				$update_options = true;
 			}
-			if ( !empty( $aioseop_options['archive_title_format'] ) && empty( $aioseop_options['date_title_format'] ) ) {
-				$aioseop_options['date_title_format'] = $aioseop_options['archive_title_format'];
-				unset( $aioseop_options['archive_title_format'] );
+			if ( !empty( $aioseop_options['aiosp_archive_title_format'] ) && empty( $aioseop_options['aiosp_date_title_format'] ) ) {
+				$aioseop_options['aiosp_date_title_format'] = $aioseop_options['archive_title_format'];
+				unset( $aioseop_options['aiosp_archive_title_format'] );
+				$update_options = true;
+			}
+			if ( !empty( $aioseop_options['aiosp_archive_title_format'] ) && ( $aioseop_options['aiosp_archive_title_format'] == '%date% | %blog_title%' ) ) {
+				$aioseop_options['aiosp_archive_title_format'] = '%archive_title% | %blog_title%';
 				$update_options = true;
 			}
 			if ( $update_options )

diff --git a/aioseop_module_manager.php b/aioseop_module_manager.php
@@ -36,7 +36,8 @@ function return_module( $class ) {
 			if ( $class == get_class( $aiosp ) )	return $aiosp;
 			if ( $class == get_class( $this ) )		return $this;
 			foreach( $this->modules as $m )
-				if ( $class == get_class( $m ) )	return $m;
+				if ( is_object( $m ) && ( $class == get_class( $m ) ) )
+					return $m;
 			return false;
 		}
 

diff --git a/all_in_one_seo_pack.php b/all_in_one_seo_pack.php
@@ -3,7 +3,7 @@
 Plugin Name: All In One SEO Pack
 Plugin URI: http://semperfiwebdesign.com
 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>
-Version: 2.2.3
+Version: 2.2.3.1
 Author: Michael Torbert
 Author URI: http://michaeltorbert.com
 */
@@ -30,11 +30,11 @@
 
 /**
  * @package All-in-One-SEO-Pack
- * @version 2.2.3
+ * @version 2.2.3.1
  */
 
 if ( ! defined( 'AIOSEOP_VERSION' ) )
-    define( 'AIOSEOP_VERSION', '2.2.3' );
+    define( 'AIOSEOP_VERSION', '2.2.3.1' );
 
 if ( ! defined( 'AIOSEOP_PLUGIN_DIR' ) ) {
     define( 'AIOSEOP_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );

diff --git a/readme.txt b/readme.txt
@@ -3,7 +3,7 @@ Contributors: hallsofmontezuma
 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
 Tags: all in one, all in one seo, all in one seo pack, seo, search engine optimization, google
 Requires at least: 3.3
-Tested up to: 3.9.2
+Tested up to: 4.0
 Stable tag: trunk
 
 All in One SEO Pack is a WordPress SEO plugin to automatically optimize your WordPress blog for Search Engines such as Google.