Merge branch 'master' into development

awesomemotive · Jan 11, 2018 · 5d6c23b · 5d6c23b
2 parents e0ff057 + 350b32f
commit 5d6c23b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,10 @@
 # All in One SEO Pack
 
-One of the most downloaded plugins for WordPress... more than 30 million downloads!
+One of the most downloaded plugins, All in One SEO Pack is THE ORIGINAL WordPress SEO plugin!<br />
+![Plugin Version](https://img.shields.io/wordpress/plugin/v/all-in-one-seo-pack.svg?maxAge=2592000&style=flat-square) 
+![Total Downloads](https://img.shields.io/wordpress/plugin/dt/all-in-one-seo-pack.svg?maxAge=2592000&style=flat-square)
+![WordPress Compatibility](https://img.shields.io/wordpress/v/all-in-one-seo-pack.svg?maxAge=2592000&style=flat-square)
+[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%205.2-8892BF.svg?style=flat-square)](https://php.net/)
 
 ## Help
 

diff --git a/all_in_one_seo_pack.php b/all_in_one_seo_pack.php
@@ -304,6 +304,9 @@ function aiosp_plugin_row_meta( $actions, $plugin_file ) {
 	 * @return array
 	 */
 	function aiosp_add_action_links( $actions, $plugin_file ) {
+		if ( ! is_array( $actions ) ) {
+			return $actions;
+		}
 
 		$aioseop_plugin_dirname = AIOSEOP_PLUGIN_DIRNAME;
 		$action_links           = array();

diff --git a/readme.txt b/readme.txt
@@ -3,8 +3,8 @@ Contributors: hallsofmontezuma, semperplugins, wpsmort, arnaudbroes, dougal, pba
 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: SEO, all in one seo, WordPress SEO, Google Search Console, XML Sitemap, image seo
 Requires at least: 4.0
-Tested up to: 4.8
-Stable tag: 2.4.2
+Tested up to: 4.9
+Stable tag: 2.4.3
 License: GPLv2 or later
 Requires PHP: 5.2.4