Skip to content

Commit

Permalink
Merge pull request #251 from ConvertKit/fix-1.9.5.2
Browse files Browse the repository at this point in the history
Fix 1.9.5.2
  • Loading branch information
corydhmiller committed Jul 28, 2021
2 parents 6442c42 + ab2816f commit 6bca758
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 11 deletions.
2 changes: 1 addition & 1 deletion admin/section/class-convertkit-settings-general.php
Expand Up @@ -394,7 +394,7 @@ public function debug_callback() {
__( 'Save connection data to a log file.','convertkit' )
);

$html .= '<p class="description">' . __( 'You can ignore this unless you\'re working with our support team to resolve an issue.', 'convertkit' ) . '</p>';
$html .= '<p class="description">' . __( 'You can ignore this unless you\'re working with our support team to resolve an issue. Decheck this option to improve performance.', 'convertkit' ) . '</p>';

echo $html;
}
Expand Down
23 changes: 20 additions & 3 deletions admin/section/class-convertkit-settings-tools.php
Expand Up @@ -67,9 +67,26 @@ public function render() {
*/
public function view_log() {
// Only try to get file contents if the file exists; otherwise default to empty string
$log_file = trailingslashit( CONVERTKIT_PLUGIN_PATH ) . 'log.txt';
$log = file_exists( $log_file ) ? file_get_contents( $log_file ) : '';

$log_file = trailingslashit(CONVERTKIT_PLUGIN_PATH) . 'log.txt';
$log = "No logs have been generated.";
if (file_exists($log_file)) :
$log = file_get_contents($log_file);
$fp = fopen($log_file, 'r');
$log = "";
$log_limit = 1000;
for ($i = 0; $i < $log_limit; $i++) {
if (feof($fp)) {
$log .= 'End of file reached.';
break;
}
if ($i === $log_limit - 1) {
$log .= '--- 1,000 lines reached, end of log print. Click "Clear Log" if your logs are taking too long to load. ---';
break;
}
$log .= fgets($fp);
}
fclose($fp);
endif;
?>
<div class="metabox-holder">
<div class="postbox ck-debug-log">
Expand Down
2 changes: 1 addition & 1 deletion bin/package.sh
Expand Up @@ -9,7 +9,7 @@ download() {
curl -s "$1" > "$2";
}

download https://github.com/ConvertKit/ConvertKit-WordPress/archive/$RELEASE_VERSION.zip $DOWNLOAD_LOCATION/convertkit.zip
download https://codeload.github.com/ConvertKit/convertkit-wordpress/zip/$RELEASE_VERSION $DOWNLOAD_LOCATION/convertkit.zip

cd $DOWNLOAD_LOCATION

Expand Down
2 changes: 1 addition & 1 deletion includes/class-convertkit-api.php
Expand Up @@ -113,7 +113,7 @@ public function update_resources( $api_key, $api_secret ) {
WP_ConvertKit::log( 'Updating resource with API key: ' . $api_key );
// Forms and Landing Pages
$api_response = $this->_get_api_response( 'forms' );
WP_ConvertKit::log( 'API Response: ' . print_r( $api_response, true ) );
WP_ConvertKit::log( 'API Response: Success (Returned ' . count($api_response['forms']) . " forms.)");

if ( is_null( $api_response )
|| is_wp_error( $api_response )
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -3,7 +3,7 @@
"title": "ConvertKit",
"author": "ConvertKit",
"license": "GPL-2.0",
"version": "1.9.4",
"version": "1.9.5.2",
"description": "",
"homepage": "https://github.com/convertkit/ConvertKit-WordPress",
"main": "Gruntfile.js",
Expand Down
14 changes: 12 additions & 2 deletions readme.txt
Expand Up @@ -3,8 +3,8 @@ Contributors: nathanbarry, growdev, travisnorthcutt, ggwicz
Donate link: https://convertkit.com
Tags: email, marketing, embed form, convertkit, capture
Requires at least: 4.9
Tested up to: 5.6.2
Stable tag: 1.9.4
Tested up to: 5.8
Stable tag: 1.9.5.2
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -49,6 +49,16 @@ No. You must first have an account on ConvertKit.com, but you do not have to use

== Changelog ==

### 1.9.5.2 2021-07-28
* Fix: Fixed an issue where the ConvertKit shortcode would not function properly.

### 1.9.5.1 2021-07-27
* Fix: Updated GitHub zip URL for build.

### 1.9.5 2021-07-21
* Fix: Changed how API responses are logged.
* Fix: Reduced Debug output to improve performance.

### 1.9.4 2021-02-22
* New: Increase minimum supported WordPress version to 4.9 and maximum supported WordPress version to 5.6.2
* Fix: Restore original plugin file name (`wp-convertkit.php`), which reverts the breaking file name change (`plugin.php`) released in 1.9.3
Expand Down
4 changes: 2 additions & 2 deletions wp-convertkit.php
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: ConvertKit
* Plugin URI: https://convertkit.com/
* Description: Quickly and easily integrate ConvertKit forms into your site.
* Version: 1.9.4
* Version: 1.9.5.2
* Author: ConvertKit
* Author URI: https://convertkit.com/
* Text Domain: convertkit
Expand All @@ -16,7 +16,7 @@
define( 'CONVERTKIT_PLUGIN_FILE', plugin_basename( __FILE__ ) );
define( 'CONVERTKIT_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
define( 'CONVERTKIT_PLUGIN_PATH', __DIR__ );
define( 'CONVERTKIT_PLUGIN_VERSION', '1.9.4' );
define( 'CONVERTKIT_PLUGIN_VERSION', '1.9.5.2' );

require_once CONVERTKIT_PLUGIN_PATH . '/vendor/autoload.php';

Expand Down

0 comments on commit 6bca758

Please sign in to comment.