Skip to content

Commit

Permalink
Merge pull request #203 from ConvertKit/release/1.7.5
Browse files Browse the repository at this point in the history
Release/1.7.5
  • Loading branch information
tnorthcutt authored Apr 30, 2019
2 parents 774545f + 861aa7f commit bf21f71
Show file tree
Hide file tree
Showing 18 changed files with 6,100 additions and 443 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
convertkit-svn
node_modules/
.env
.env.testing
.DS_Store
inc/log.txt
log.txt
Expand Down
2 changes: 1 addition & 1 deletion admin/class-convertkit-settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public function display_settings_page() {
<p>
<strong>
<?php
echo sprintf( __( 'Notice: Your database does not appear to support the %s. If you experience difficulties connecting to ConvertKit this may be why. Please contact your webhost to have your database upgraded.',
echo sprintf( __( 'Notice: Your database does not appear to support the %s. <em>If you experience difficulties</em> connecting to ConvertKit, this may be why. Please contact your webhost to have your database upgraded. If you do not notice any issues, you may safely ignore this message.',
'convertkit' ),
'<a href="https://make.wordpress.org/core/2015/04/02/the-utf8mb4-upgrade/">utf8mb4 character set</a>' );
?>
Expand Down
3 changes: 2 additions & 1 deletion admin/section/class-convertkit-settings-tools.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,9 @@ public function render() {
* View the Log
*/
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_get_contents( $log_file );
$log = file_exists( $log_file ) ? file_get_contents( $log_file ) : '';

?>
<div class="metabox-holder">
Expand Down
2 changes: 1 addition & 1 deletion codeception.dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ extensions:
- Codeception\Command\GenerateWPCanonical
- Codeception\Command\GenerateWPXMLRPC
params:
- .env
- .env.testing
8 changes: 5 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,17 @@
{
"type": "vcs",
"url": "https://github.com/ConvertKit/relative-to-absolute-url"
},
{
"type": "vcs",
"url": "https://github.com/ConvertKit/php-simple-html-dom-parser"
}
],
"require": {
"kub-at/php-simple-html-dom-parser": "~1.7.1",
"kub-at/php-simple-html-dom-parser": "~1.8.2",
"oldmine/relative-to-absolute-url": "~1.0"
},
"require-dev": {
"phpunit/phpunit": "^6.5",
"vlucas/phpdotenv": "^2.4",
"lucatume/wp-browser": "^2.2"
},
"minimum-stability": "dev",
Expand Down
Loading

0 comments on commit bf21f71

Please sign in to comment.