Skip to content

Try to cut back on calls to get option #2652

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.

Sign up for GitHub

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

Merged
Crabcyborg merged 8 commits into from
Dec 12, 2025
Merged

Try to cut back on calls to get option #2652

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d4adf8f
Try to cut back on calls to get option
Crabcyborg Dec 12, 2025
8df5486
Remove var
Crabcyborg Dec 12, 2025
c44be72
Use autoload
Crabcyborg Dec 12, 2025
ee786a9
Clean up
Crabcyborg Dec 12, 2025
9cedb8a
Drop unused var
Crabcyborg Dec 12, 2025
a9adfb5
Simplify
Crabcyborg Dec 12, 2025
13a0c45
Add comments
Crabcyborg Dec 12, 2025
b449ec9
Improve / optimize logic
Crabcyborg Dec 12, 2025
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
25 changes: 12 additions & 13 deletions classes/models/FrmFormApi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,20 +301,17 @@ protected function get_cached() {
return false;
}

// If the api call is running, we can use the expired cache.
if ( ! $this->is_running() ) {
if ( empty( $cache['timeout'] ) || time() > $cache['timeout'] ) {
// Cache is expired.
return false;
}
$is_expired = empty( $cache['timeout'] ) || time() > $cache['timeout'];

$version = FrmAppHelper::plugin_version();
$for_current = isset( $cache['version'] ) && $cache['version'] == $version;
if ( ! $is_expired && isset( $cache['version'] ) && $cache['version'] !== FrmAppHelper::plugin_version() ) {
$is_expired = true;
}

if ( ! $for_current ) {
// Force a new check.
return false;
}
// Avoid old cached data, unless we're currently trying to query for new data.
// The call to $this->is_running likely triggers a database query, so only call if if we're expired.
// (Rather than the other way around, which is less efficient).
if ( $is_expired && ! $this->is_running() ) {
return false;
}

$values = json_decode( $cache['value'], true );
Expand Down Expand Up @@ -358,7 +355,9 @@ protected function set_cached( $addons ) {
if ( is_multisite() ) {
update_site_option( $this->cache_key, $data );
} else {
update_option( $this->cache_key, $data, 'no' );
// Autoload the license cache because it gets called everywhere.
$autoload = 0 === strpos( $this->cache_key, 'frm_addons_l' );
update_option( $this->cache_key, $data, $autoload );
}
}

Expand Down