diff --git a/README.md b/README.md deleted file mode 100644 index b0e00f1ce..000000000 --- a/README.md +++ /dev/null @@ -1,59 +0,0 @@ -# WP ConvertKit - -Contributors: nickohrn, davidlamarwheeler -Tags: admin, api, forms, web service -Requires at least: 3.6 -Tested up to: 3.6 -Stable tag: 1.0.0 -License: GPLv2 or later -License URI: http://www.gnu.org/licenses/gpl-2.0.html - -Quickly and easily integrate [ConvertKit](https://convertkit.com) into your WordPress site. - -## Description - -[ConvertKit](https://convertkit.com) makes it easy to capture more leads and sell more products by easily -embedding email capture forms anywhere. This plugin makes it a little bit easier for those of us using WordPress -blogs, by automatically appending a lead capture form to any post or page. - -If you choose a default form on the settings page, that form will be embedded at the bottom of every post or page -(in single view only) across your site. If you wish to turn off form embedding or select a different form for -an individual post or page, you can do so within the ConvertKit meta box on the editing form. - -Finally, you can insert the default form into the middle of post or page content by using the `[convertkit]` shortcode. - -## Installation - -1. Upload `wp-convertkit` to the `/wp-content/plugins/` directory -1. Activate the plugin through the 'Plugins' menu in WordPress -1. Visit the settings page by clicking on the link under the plugin's name -1. Enter your ConvertKit API key, which you can find [here](https://app.convertkit.com/account/edit), and save the settings -1. Select your default form and save the settings -1. If you wish, choose particular forms for each post or page by visiting the edit screen and choosing the correct form - -## Changelog - -### 1.3.2 - -* Another fix for a pesky bug causing syntax errors - -### 1.3.1 - -* Fixes a bug causing syntax error when getting options - -### 1.3.0 - -* Added WishList Member integration -* Updated API methods - -### 1.2.1 - -* Fixed a warning that appeared sometimes when no forms were loaded. - -### 1.2.0 - -* Updated to use responsive forms - -### 1.0.0 - -* Initial release diff --git a/lib/multi_value_field_table.php b/lib/multi_value_field_table.php index fb7d47c1a..95b9aede2 100644 --- a/lib/multi_value_field_table.php +++ b/lib/multi_value_field_table.php @@ -54,6 +54,15 @@ public function get_bulk_actions() { return $this->_bulk_actions; } + /** + * Get a list of columns + * + * @return array + */ + public function get_columns() { + return $this->_columns; + } + /** * Add a column to the table * diff --git a/readme.txt b/readme.txt index 5e0e42af2..3985ec154 100755 --- a/readme.txt +++ b/readme.txt @@ -1,14 +1,14 @@ === ConvertKit === -Contributors: nickohrn, davidlamarwheeler +Contributors: nickohrn, davidlamarwheeler Donate link: https://convertkit.com Tags: email, marketing, embed form, convertkit, capture -Requires at least: 3.6 -Tested up to: 3.6 -Stable tag: 1.0.0 +Requires at least: 3.6 +Tested up to: 4.3 +Stable tag: 1.3.3 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html -ConvertKit is an email marketing platform for capturing leads from your WordPress blog. +ConvertKit is an email marketing platform for capturing leads from your WordPress blog. == Description == @@ -44,6 +44,10 @@ Yes, for it to work you must first have an account on ConvertKit.com == Changelog == +### 1.3.3 + +* Updated for compatibility with WordPress 4.3 + ### 1.3.2 * Another fix for a pesky bug causing syntax errors @@ -70,4 +74,3 @@ Yes, for it to work you must first have an account on ConvertKit.com * Initial release == Upgrade notice == - diff --git a/vendor/url-to-absolute/url-to-absolute.php b/vendor/url-to-absolute/url-to-absolute.php index c6df5c24b..f3705c6d4 100644 --- a/vendor/url-to-absolute/url-to-absolute.php +++ b/vendor/url-to-absolute/url-to-absolute.php @@ -439,12 +439,12 @@ function join_url( $parts, $encode=FALSE) } /** - * This function encodes URL to form a URL which is properly + * This function encodes URL to form a URL which is properly * percent encoded to replace disallowed characters. * * RFC3986 specifies the allowed characters in the URL as well as - * reserved characters in the URL. This function replaces all the - * disallowed characters in the URL with their repective percent + * reserved characters in the URL. This function replaces all the + * disallowed characters in the URL with their repective percent * encodings. Already encoded characters are not encoded again, * such as '%20' is not encoded to '%2520'. * @@ -452,7 +452,7 @@ function join_url( $parts, $encode=FALSE) * url the url to encode. * * Return values: - * Returns the encoded URL string. + * Returns the encoded URL string. */ function encode_url($url) { $reserved = array( @@ -482,4 +482,4 @@ function encode_url($url) { return $url; } -?> \ No newline at end of file +?> diff --git a/wp-convertkit.php b/wp-convertkit.php index 3b77f88e4..cf2d7f710 100644 --- a/wp-convertkit.php +++ b/wp-convertkit.php @@ -3,13 +3,13 @@ Plugin Name: WP ConvertKit Plugin URI: http://convertkit.com/ Description: Quickly and easily integrate ConvertKit forms into your site. - Version: 1.2.1 + Version: 1.3.3 Author: ConvertKit Author URI: http://convertkit.com/ */ -require_once('lib/convertkit-api.php'); -require_once('lib/integration/wishlist_member.php'); +require_once plugin_dir_path( __FILE__ ) . "/lib/convertkit-api.php"; +require_once plugin_dir_path( __FILE__ ) . "/lib/integration/wishlist_member.php"; if(!class_exists('WP_ConvertKit')) { class WP_ConvertKit {