Skip to content

Option lock stuck locked with '' #1289

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

Open
wants to merge 6 commits into
base: trunk
Choose a base branch
from
Open

Option lock stuck locked with '' #1289

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b13d5d
Fix possible error when option value is ''
superdav42 Sep 25, 2025
2409719
Avoid type warnings
superdav42 Sep 25, 2025
ee8f881
remove unnecessary cast
superdav42 Sep 25, 2025
14a54c8
fix code style
superdav42 Sep 25, 2025
70baa7f
use get_row which does not return null for ''
superdav42 Sep 25, 2025
517f7ae
style change
superdav42 Sep 25, 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
14 changes: 10 additions & 4 deletions classes/ActionScheduler_OptionLock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function set( $lock_type ) {
$new_lock_value = $this->new_lock_value( $lock_type );

// The lock may not exist yet, or may have been deleted.
if ( empty( $existing_lock_value ) ) {
if ( null === $existing_lock_value ) {
return (bool) $wpdb->insert(
$wpdb->options,
array(
Expand Down Expand Up @@ -65,7 +65,7 @@ public function set( $lock_type ) {
* @return bool|int False if no lock is set, otherwise the timestamp for when the lock is set to expire.
*/
public function get_expiration( $lock_type ) {
return $this->get_expiration_from( $this->get_existing_lock( $lock_type ) );
return $this->get_expiration_from( (string) $this->get_existing_lock( $lock_type ) );
}

/**
Expand Down Expand Up @@ -106,18 +106,24 @@ protected function get_key( $lock_type ) {
*
* @param string $lock_type A string to identify different lock types.
*
* @return string
* @return string|null
*/
private function get_existing_lock( $lock_type ) {
global $wpdb;

// Now grab the existing lock value, if there is one.
return (string) $wpdb->get_var(
// get_var() returns null for the empty string ('') so we must use get_row().
$row = $wpdb->get_row( // phpcs:ignore WordPress.DB.DirectDatabaseQuery
$wpdb->prepare(
"SELECT option_value FROM $wpdb->options WHERE option_name = %s",
$this->get_key( $lock_type )
)
);

if ($row) {
return $row->option_value;
}
return null;
}

/**
Expand Down