Merge pull request #157 from semperfiwebdesign/development

Development to master for 2.4.11.1

classes/ft-ps-client.php

@@ -102,7 +102,7 @@ function init_premium_support() {
 				// Ping server for response
 				if ( $request = wp_remote_post( $this->server_url, array( 'body' => $body, 'timeout' => 20 ) ) ) {
 
-					if ( isset( $request['response']['code'] ) && 200 == $request['response']['code'] ) {
+					if ( ! is_wp_error( $request ) && isset( $request['response']['code'] ) && 200 == $request['response']['code'] ) {
 
 						// Response found a server, lets see if it hit a script we recognize
 						$response = json_decode( $request['body'] );

classes/import-export.php

@@ -501,7 +501,7 @@ public function import_csv() {
 						echo '<h2>' . sprintf( __( 'View them <a href="%s">here</a>', 'SimpleMap' ), admin_url( 'edit.php?post_type=sm-location' ) ) . '</h2>';
 					}
 
-					// Import is finished, delete csv and redirect to edit locaitons page.
+					// Import is finished, delete csv and redirect to edit locations page.
 					unlink( $file_location );
 				}
 				echo '
@@ -789,10 +789,6 @@ public function print_page() {
 
 				printf( __( 'Geocoding your own data will allow you to import thousands of records very quickly. If your locations need to be geocoded by SimpleMap, any file with more than 100 records might stall your server. %s Resources for geocoding your own locations can be found here.%s', 'SimpleMap' ), '<a href="http://groups.google.com/group/Google-Maps-API/web/resources-non-google-geocoders" target="_blank">', '</a>' );
 
-				echo '</p><p>';
-
-
-				_e( 'If you are importing a file you exported from SimpleMap (and haven\'t changed since), be sure to check the box below since the locations are already geocoded.', 'SimpleMap' );
 				echo '</p>
 <form name="import_form" method="post"
       action="';
@@ -826,7 +822,7 @@ public function print_page() {
 				_e( 'Import CSV File', 'SimpleMap' );
 				echo '"/>';
 				if ( '' == $options['api_key'] ) : ?>
-															   <?php printf( __( "Warning: You still need to enter an <a href='%s'>API key</a> if you need your locaitons geocoded.", 'SimpleMap' ), admin_url( "admin.php?page=simplemap" ) ); ?>
+															   <?php printf( __( "Warning: You still need to enter an <a href='%s'>API key</a> if you need your locations geocoded.", 'SimpleMap' ), admin_url( "admin.php?page=simplemap" ) ); ?>
 														   <?php endif;
 
 				echo '</form>

readme.txt

@@ -4,8 +4,8 @@ Contributors: hallsofmontezuma, fullthrottledevelopment
 Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=mrtorbert%40gmail%2ecom&item_name=SimpleMap&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: map, maps, store locator, database, locations, stores, Google maps, locator
 Requires at least: 3.3
-Tested up to: 4.6
-Stable tag: 2.4.11
+Tested up to: 4.7
+Stable tag: 2.4.11.1
 
 Easy to use Store Locator plugin (supports international stores) using Google Maps
 
@@ -49,29 +49,7 @@ With SimpleMap, you can easily put a store locator on your WordPress site in sec
 
 == Frequently Asked Questions ==
 
-= How do I put SimpleMap on my website? =
-
-Simply insert the following shortcode into any page or post: `[simplemap]`
-
-= I've put in the shortcode, but my map isn't showing up. Why? =
-
-If the search form is showing up, but the map is blank, it's probably a Javascript error. Check to see if any other plugins are throwing Javascript errors before the SimpleMap Javascript gets loaded.
-
-= What is the "Special Location Label"? =
-
-This is meant to flag certain locations with a specific label. It shows up in the search results with a gold star next to it. Originally this was developed for an organization that wanted to highlight people that had been members for more than ten years. It could be used for something like that, or for "Favorite Spots," or "Free Wi-Fi," or anything you want. You can also leave it blank to disable it.
-
-= Why can't my map load more than 100 search results at a time? =
-
-On most browsers, loading more than 100 locations at once will really slow things down. In some cases, such as a slower internet connection, it can crash the browser completely. We put that limit on there to prevent that from happening.
-
-= Can I suggest a feature for SimpleMap? =
-
-Of course! Visit [the SimpleMap home page](http://simplemap-plugin.com/) to do so.
-
-= What if I have a problem with SimpleMap, or find a bug? =
-
-Please open a ticket on [the SimpleMap project's repo on Github](https://github.com/semperfiwebdesign/simplemap/issues) if you have a bug to report. Otherwise, you may access premium support inside the plugin dashboard.
+FAQs can be found on our [website](http://simplemap-plugin.com/faqs/)
 
 == Changelog ==
 

simplemap.php

@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: SimpleMap
-Version: 2.4.11
+Version: 2.4.11.1
 Plugin URI: http://simplemap-plugin.com/
 Author: Michael Torbert
 Author URI: http://fullthrottledevelopment.com/
@@ -15,7 +15,7 @@
 #### CONSTANTS ####
 
 // Plugin Version Number
-define( 'SIMPLEMAP_VERSION', '2.4.11' );
+define( 'SIMPLEMAP_VERSION', '2.4.11.1' );
 
 if ( ! defined( 'WP_PLUGIN_DIR' ) ) {
 	define( 'WP_PLUGIN_DIR', ABSPATH . 'wp-content/plugins' );