Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Load SDK from vendor folder when multiple plugins or themes use the same version #755

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions start.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
* @var string
*/
$this_sdk_version = '2.9.0';
$this_sdk_version = '2.9.1';

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

Expand Down Expand Up @@ -198,9 +198,18 @@ function_exists( 'wp_is_json_request' ) &&
fs_update_sdk_newest_version( $this_sdk_relative_path, $fs_active_plugins->plugins[ $this_sdk_relative_path ]->plugin_path );

$is_current_sdk_newest = true;
} else if ( version_compare( $fs_active_plugins->newest->version, $this_sdk_version, '<' ) ) {
} else if (
version_compare($fs_active_plugins->newest->version, $this_sdk_version, '<') ||
(
version_compare($fs_active_plugins->newest->version, $this_sdk_version, '==') &&
(
! str_contains($fs_active_plugins->newest->sdk_path, '/vendor/') &&
str_contains($this_sdk_relative_path, '/vendor/')
)
)
) {
/**
* Current SDK is newer than the newest stored SDK.
* Current SDK is newer than the newest stored SDK or current SDK is stored under /vendor/ folder while newest is not
*/
fs_update_sdk_newest_version( $this_sdk_relative_path, $fs_active_plugins->plugins[ $this_sdk_relative_path ]->plugin_path );

Expand Down
Loading