Merge pull request #341 from semperfiwebdesign/development

Development into master for 2.3.5.1
awesomemotive · Jun 19, 2016 · 91762c1 · 91762c1
2 parents eec90f9 + a66bac8
commit 91762c1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 53 deletions.
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. Features like XML Sitemaps, SEO for custom post types, SEO for blogs or business sites, SEO for ecommerce sites, and much more. Almost 30 million downloads since 2007.
-Version: 2.3.5
+Version: 2.3.5.1
 Author: Michael Torbert
 Author URI: http://michaeltorbert.com
 Text Domain: all-in-one-seo-pack
@@ -29,14 +29,14 @@
 
 /**
  * @package All-in-One-SEO-Pack
- * @version 2.3.5
+ * @version 2.3.5.1
  */
 
 if ( ! defined( 'AIOSEOPPRO' ) ) {
 	define( 'AIOSEOPPRO', false );
 }
 if ( ! defined( 'AIOSEOP_VERSION' ) ) {
-	define( 'AIOSEOP_VERSION', '2.3.5' );
+	define( 'AIOSEOP_VERSION', '2.3.5.1' );
 }
 global $aioseop_plugin_name;
 $aioseop_plugin_name = 'All in One SEO Pack';

diff --git a/modules/aioseop_importer_exporter.php b/modules/aioseop_importer_exporter.php
@@ -19,38 +19,15 @@ function __construct() {
 			parent::__construct();
 			$help_text             = Array(
 				'import_submit'     => __(
-					"Select a valid All in One SEO Pack ini file and
-						click 'Import' to import options from a
-						previous state or install of All in
-						One SEO Pack.<br />
-						<a
-							href='http://semperplugins.com/documentation/importer-exporter-module/'
-							target='_blank'
-						>
-							Click here for documentation on this setting
-						</a>",
+					"Select a valid All in One SEO Pack ini file and click 'Import' to import options from a previous state or install of All in One SEO Pack.<br /><a href='http://semperplugins.com/documentation/importer-exporter-module/' target='_blank'>Click here for documentation on this setting</a>",
 					'all-in-one-seo-pack'
 				),
 				'export_choices'    => __(
-					"You may choose to export settings from active modules,
-						and content from post data.<br />
-						<a
-							href='http://semperplugins.com/documentation/importer-exporter-module/'
-							target='_blank'
-						>
-							Click here for documentation on this setting
-						</a>",
+					"You may choose to export settings from active modules, and content from post data.<br /><a href='http://semperplugins.com/documentation/importer-exporter-module/' target='_blank'>Click here for documentation on this setting</a>",
 					'all-in-one-seo-pack'
 				),
 				'export_post_types' => __(
-					"Select which Post Types you want to export your
-						All in One SEO Pack meta data for.<br />
-						<a
-							href='http://semperplugins.com/documentation/importer-exporter-module/'
-							target='_blank'
-						>
-							Click here for documentation on this setting
-						</a>",
+					"Select which Post Types you want to export your All in One SEO Pack meta data for.<br /><a href='http://semperplugins.com/documentation/importer-exporter-module/' target='_blank'>Click here for documentation on this setting</a>",
 					'all-in-one-seo-pack'
 				)
 			);
@@ -437,17 +414,7 @@ function do_importer_exporter() {
 								} else {
 									$this->warnings[] = sprintf(
 										__(
-											'<b>
-												Warning:
-											</b>
-											Line not matched:
-											<b>
-												"%s"
-											</b>
-											, On Line:
-											<b>
-												%s
-											</b>',
+											'<b>Warning:</b> Line not matched: <b>"%s"</b>, On Line: <b>%s</b>',
 											'all-in-one-seo-pack'
 										),
 										$line,
@@ -496,13 +463,7 @@ function do_importer_exporter() {
 													$target_title = $module_options[ $key ]['post_title'];
 													$post_warning = sprintf(
 														__(
-															'<b>
-																Warning:
-															</b>
-															This following post could not be found:
-															<b>
-																"%s"
-															</b>',
+															'<b>Warning:</b> This following post could not be found: <b>"%s"</b>',
 															'all-in-one-seo-pack'
 														),
 														$target_title

diff --git a/public/opengraph.php b/public/opengraph.php
@@ -62,11 +62,17 @@ public static function prepare_twitter_username( $twitter_profile ) {
 		 *
 		 * @return mixed
 		 * @since 2.3.5
+		 * @since 2.3.5.1 Bail if < WordPress 4.4 for now.
 		 */
 		public static function twitter_url_to_user( $twitter_profile ) {
 
+			// If they're below 4.4 (no wp_parse_url) bail. We can improve this for <4.4 later or just hold out until we drop 4.4 support.
+			if ( ! function_exists( 'wp_parse_url' ) ) {
+				return $twitter_profile;
+			}
+
 			//extract the twitter username from the url
-			
+
 			$parsed_twitter_profile = wp_parse_url( $twitter_profile );
 
 			$path            = $parsed_twitter_profile['path'];

diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=mrtor
 Tags: seo, all in one seo, google, twitter, page, image seo, social, search engine optimization, sitemap, WordPress SEO, meta, meta description, xml sitemap, google sitemap, sitemaps, robots meta, yahoo, bing, news sitemaps, multisite, canonical, nofollow, noindex, keywords, description, webmaster tools, google webmaster tools, google analytics
 Requires at least: 3.3
 Tested up to: 4.5
-Stable tag: 2.3.4.2
+Stable tag: 2.3.5.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -24,7 +24,7 @@ First created in 2007, see why AIOSEO is the most downloaded plugin for WordPres
 * Google Analytics support
 * Support for SEO on Custom Post Types
 * Advanced Canonical URLs
-* Fine tune Page Navigational Links 
+* Fine tune Page Navigational Links
 * Built-in API so other plugins/themes can access and extend functionality
 * ONLY free plugin to provide SEO Integration for e-Commerce sites, including WooCommerce
 * Nonce Security built into All in One SEO Pack
@@ -55,13 +55,13 @@ manually.
 
 1. Visit 'Plugins > Add New'
 2. Search for 'All in One SEO'
-3. Activate All in One SEO Pack from your Plugins page. 
+3. Activate All in One SEO Pack from your Plugins page.
 
 = From WordPress.org =
 
 1. Download All in One SEO Pack.
 2. Upload the 'All in One SEO Pack' directory to your '/wp-content/plugins/' directory, using your favorite method (ftp, sftp, scp, etc...)
-3. Activate All in One SEO Pack from your Plugins page. 
+3. Activate All in One SEO Pack from your Plugins page.
 
 = Once Activated =
 
@@ -146,7 +146,7 @@ enhancements:
 -futureproofing the file editor function for PHP7,8
 -futureproofing the import-export function for PHP7,8
 
-= 2.2.7.4 = 
+= 2.2.7.4 =
 
 -Update for WordPress 4.4
 -CSS fixes