Skip to content

Commit

Permalink
update freemius/wordpress-sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
afragen committed Jul 8, 2024
1 parent 3d1eb15 commit 4ec956d
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 27 deletions.
12 changes: 6 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion git-updater.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Plugin Name: Git Updater
* Plugin URI: https://git-updater.com
* Description: A plugin to automatically update GitHub hosted plugins, themes, and language packs. Additional API plugins available for Bitbucket, GitLab, Gitea, and Gist.
* Version: 12.4.0.4
* Version: 12.4.0.5
* Author: Andy Fragen
* License: MIT
* Domain Path: /languages
Expand Down
14 changes: 7 additions & 7 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -344,17 +344,17 @@
},
{
"name": "freemius/wordpress-sdk",
"version": "2.7.2",
"version_normalized": "2.7.2.0",
"version": "2.7.3",
"version_normalized": "2.7.3.0",
"source": {
"type": "git",
"url": "https://github.com/Freemius/wordpress-sdk.git",
"reference": "eeac5f905746822207729ed0d944c4434ee165ff"
"reference": "dad8c4f268f826d1f5a98737d26216d6dede5b03"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Freemius/wordpress-sdk/zipball/eeac5f905746822207729ed0d944c4434ee165ff",
"reference": "eeac5f905746822207729ed0d944c4434ee165ff",
"url": "https://api.github.com/repos/Freemius/wordpress-sdk/zipball/dad8c4f268f826d1f5a98737d26216d6dede5b03",
"reference": "dad8c4f268f826d1f5a98737d26216d6dede5b03",
"shasum": ""
},
"require": {
Expand All @@ -369,7 +369,7 @@
"szepeviktor/phpstan-wordpress": "^1.3",
"wp-coding-standards/wpcs": "^2.3"
},
"time": "2024-04-24T10:16:16+00:00",
"time": "2024-07-01T05:51:06+00:00",
"type": "library",
"installation-source": "dist",
"notification-url": "https://packagist.org/downloads/",
Expand All @@ -389,7 +389,7 @@
],
"support": {
"issues": "https://github.com/Freemius/wordpress-sdk/issues",
"source": "https://github.com/Freemius/wordpress-sdk/tree/2.7.2"
"source": "https://github.com/Freemius/wordpress-sdk/tree/2.7.3"
},
"install-path": "../freemius/wordpress-sdk"
},
Expand Down
10 changes: 5 additions & 5 deletions vendor/composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'name' => 'afragen/git-updater',
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
'reference' => '5e8c6977d522159b4703460eecaab1ee4d66e2e2',
'reference' => '3d1eb15c3cd082c42b31640f8454f3a9682ba3df',
'type' => 'wordpress-plugin',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand All @@ -13,7 +13,7 @@
'afragen/git-updater' => array(
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
'reference' => '5e8c6977d522159b4703460eecaab1ee4d66e2e2',
'reference' => '3d1eb15c3cd082c42b31640f8454f3a9682ba3df',
'type' => 'wordpress-plugin',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand Down Expand Up @@ -78,9 +78,9 @@
'dev_requirement' => false,
),
'freemius/wordpress-sdk' => array(
'pretty_version' => '2.7.2',
'version' => '2.7.2.0',
'reference' => 'eeac5f905746822207729ed0d944c4434ee165ff',
'pretty_version' => '2.7.3',
'version' => '2.7.3.0',
'reference' => 'dad8c4f268f826d1f5a98737d26216d6dede5b03',
'type' => 'library',
'install_path' => __DIR__ . '/../freemius/wordpress-sdk',
'aliases' => array(),
Expand Down

Large diffs are not rendered by default.

19 changes: 14 additions & 5 deletions vendor/freemius/wordpress-sdk/includes/class-freemius.php
Original file line number Diff line number Diff line change
Expand Up @@ -4174,13 +4174,17 @@ function has_api_connectivity( $flush_if_no_connectivity = false ) {
! empty( $this->_storage->connectivity_test ) &&
isset( $this->_storage->connectivity_test['is_active'] )
) {
$is_active = $this->_storage->connectivity_test['is_active'];
$is_connected = isset( $this->_storage->connectivity_test['is_connected'] ) ?
$this->_storage->connectivity_test['is_connected'] :
null;
$is_active = ( $this->_storage->connectivity_test['is_active'] || is_object( $this->_site ) );
} else {
$is_active = $this->should_turn_fs_on( $this->apply_filters( 'is_plugin_update', $this->is_plugin_update() ) );

$this->store_connectivity_info( (object) array( 'is_active' => $is_active ), null );
$is_connected = null;
$is_active = $this->should_turn_fs_on( $this->apply_filters( 'is_plugin_update', $this->is_plugin_update() ) );
}

$this->store_connectivity_info( (object) array( 'is_active' => $is_active ), $is_connected );

if ( $is_active ) {
$this->_is_on = true;
}
Expand Down Expand Up @@ -5484,7 +5488,12 @@ private function parse_settings( &$plugin_info ) {
'affiliate_moderation' => $this->get_option( $plugin_info, 'has_affiliation' ),
'bundle_id' => $this->get_option( $plugin_info, 'bundle_id', null ),
'bundle_public_key' => $this->get_option( $plugin_info, 'bundle_public_key', null ),
'opt_in_moderation' => $this->get_option( $plugin_info, 'opt_in', null ),
'opt_in_moderation' => $this->get_option(
$plugin_info,
'opt_in',
// For backward compatibility, we support both parameter names: opt_in and opt_in_moderation.
$this->get_option( $plugin_info, 'opt_in_moderation', null )
),
) );

if ( $plugin->is_updated() ) {
Expand Down
2 changes: 1 addition & 1 deletion vendor/freemius/wordpress-sdk/start.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
* @var string
*/
$this_sdk_version = '2.7.2';
$this_sdk_version = '2.7.3';

#region SDK Selection Logic --------------------------------------------------------------------

Expand Down
1 change: 0 additions & 1 deletion vendor/freemius/wordpress-sdk/templates/connect.php
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ class="wrap<?php if ( ! fs_is_network_admin() && ( ! $fs->is_enable_anonymous()

fs_require_once_template( 'plugin-icon.php', $vars );
?>
<!-- <img class="fs-connect-logo" width="--><?php //echo $size ?><!--" height="--><?php //echo $size ?><!--" src="//img.freemius.com/logo/connect.svg"/>-->
</div>
<div class="fs-box-container">
<div class="fs-content">
Expand Down

0 comments on commit 4ec956d

Please sign in to comment.